X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=makedoc.c;h=e2cfc67cfd759436d76da7a14f55e85e5031d0cd;hp=52e15d879d6bd23e4e063b00a836c5deb493a8bc;hb=6ebff74ad242d4c56fb7762965b19cee14fd2daa;hpb=b1b9961ff1c305dff57f547d28cb509bf007bad7 diff --git a/makedoc.c b/makedoc.c index 52e15d8..e2cfc67 100644 --- a/makedoc.c +++ b/makedoc.c @@ -1,20 +1,14 @@ /* + * Copyright notice from original mutt: * Copyright (C) 1999-2000 Thomas Roessler - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. - */ + * + * Parts were written/modified by: + * Rocco Rutte + * + * This file is part of mutt-ng, see http://www.muttng.org/. + * It's licensed under the GNU General Public License, + * please see the file GPL in the top level source directory. + */ /** ** This program parses mutt's init.h and generates documentation in @@ -27,20 +21,7 @@ ** **/ -#if HAVE_CONFIG_H -# include "config.h" -#endif - -#include -#include -#include -#include - -#include - -#ifdef HAVE_UNISTD_H -# include -#endif +#include #ifdef HAVE_GETOPT_H # include @@ -63,36 +44,40 @@ extern int optind; typedef struct { short seen; - char* name; - char* descr; + char *name; + char *descr; } var_t; static int outcount = 0; -static var_t* outbuf = NULL; +static var_t *outbuf = NULL; -static int var_cmp (const void* a, const void* b) { - return (strcmp (((var_t*) a)->name, ((var_t*) b)->name)); +static int var_cmp (const void *a, const void *b) +{ + return (strcmp (((var_t *) a)->name, ((var_t *) b)->name)); } -enum output_formats_t -{ +enum output_formats_t { F_CONF, F_MAN, F_SGML, F_NONE }; #define D_NL (1 << 0) #define D_EM (1 << 1) #define D_BF (1 << 2) -#define D_TAB (1 << 3) -#define D_NP (1 << 4) -#define D_INIT (1 << 5) -#define D_DL (1 << 6) -#define D_DT (1 << 7) - -enum -{ +#define D_TT (1 << 3) +#define D_TAB (1 << 4) +#define D_NP (1 << 5) +#define D_INIT (1 << 6) +#define D_DL (1 << 7) +#define D_DT (1 << 8) +#define D_DD (1 << 9) +#define D_PA (1 << 10) + +enum { SP_START_EM, SP_START_BF, + SP_START_TT, SP_END_FT, + SP_END_PAR, SP_NEWLINE, SP_NEWPAR, SP_STR, @@ -101,13 +86,14 @@ enum SP_START_DL, SP_DT, SP_DD, + SP_END_DD, SP_END_DL, + SP_END_SECT, SP_REFER }; enum output_formats_t OutputFormat = F_NONE; char *Progname; -short Debug = 0; static char *get_token (char *, size_t, char *); static char *skip_ws (char *); @@ -119,11 +105,11 @@ static int print_it (int, char *, int); static void print_confline (const char *, int, const char *); static void handle_confline (char *); static void makedoc (FILE *, FILE *); -static void pretty_default (char *, size_t, const char *, int); static int sgml_fputc (int); static int sgml_fputs (const char *); -static void add_var (const char*); -static int add_s (const char*); +static int sgml_id_fputs (const char *); +static void add_var (const char *); +static int add_s (const char *); static int add_c (int); int main (int argc, char *argv[]) @@ -135,16 +121,19 @@ int main (int argc, char *argv[]) Progname++; else Progname = argv[0]; - - while ((c = getopt (argc, argv, "cmsd")) != EOF) - { - switch (c) - { - case 'c': OutputFormat = F_CONF; break; - case 'm': OutputFormat = F_MAN; break; - case 's': OutputFormat = F_SGML; break; - case 'd': Debug++; break; - default: + + while ((c = getopt (argc, argv, "cmsd")) != EOF) { + switch (c) { + case 'c': + OutputFormat = F_CONF; + break; + case 'm': + OutputFormat = F_MAN; + break; + case 's': + OutputFormat = F_SGML; + break; + default: { fprintf (stderr, "%s: bad command line parameter.\n", Progname); exit (1); @@ -152,71 +141,74 @@ int main (int argc, char *argv[]) } } - if (optind != argc) - { - if ((f = fopen (argv[optind], "r")) == NULL) - { + if (optind != argc) { + if ((f = fopen (argv[optind], "r")) == NULL) { fprintf (stderr, "%s: Can't open %s (%s).\n", Progname, argv[optind], strerror (errno)); exit (1); } } - else + else f = stdin; - switch (OutputFormat) - { - case F_CONF: - case F_MAN: - case F_SGML: makedoc (f, stdout); break; - default: + switch (OutputFormat) { + case F_CONF: + case F_MAN: + case F_SGML: + makedoc (f, stdout); + break; + default: { - fprintf (stderr, "%s: No output format specified.\n", - Progname); + fprintf (stderr, "%s: No output format specified.\n", Progname); exit (1); } } - + if (f != stdin) - fclose (f); - + m_fclose(&f); + exit (1); } -static void add_var (const char* name) { - outbuf = realloc (outbuf, (++outcount) * sizeof(var_t)); - outbuf[outcount-1].seen = 0; - outbuf[outcount-1].name = strdup (name); - outbuf[outcount-1].descr = NULL; +static void add_var (const char *name) +{ + outbuf = realloc (outbuf, (++outcount) * sizeof (var_t)); + outbuf[outcount - 1].seen = 0; + outbuf[outcount - 1].name = strdup(name); + outbuf[outcount - 1].descr = NULL; } -static int add (const char* s) { - size_t lnew = STRLEN(s), lold = STRLEN(outbuf[outcount-1].descr); +static int add_s (const char *s) +{ + size_t lnew = STRLEN (s), lold = STRLEN (outbuf[outcount - 1].descr); if (lnew == 0) return (0); - if (!outbuf[outcount-1].seen) { + if (!outbuf[outcount - 1].seen) { lold = 0; - outbuf[outcount-1].seen = 1; + outbuf[outcount - 1].seen = 1; } if (lold == 0) - outbuf[outcount-1].descr = strdup (s); + outbuf[outcount - 1].descr = strdup(s); else { - outbuf[outcount-1].descr = realloc (outbuf[outcount-1].descr, lold + lnew + 1); - memcpy (&(outbuf[outcount-1].descr[lold-1])+1, s, lnew); + outbuf[outcount - 1].descr = + realloc (outbuf[outcount - 1].descr, lold + lnew + 1); + memcpy (&(outbuf[outcount - 1].descr[lold - 1]) + 1, s, lnew); } - outbuf[outcount-1].descr[lold+lnew] = '\0'; + outbuf[outcount - 1].descr[lold + lnew] = '\0'; return (1); } -static int add_c (int c) { +static int add_c (int c) +{ char buf[2] = "\0\0"; + buf[0] = c; - return (add (buf)); + return (add_s (buf)); } -static void makedoc (FILE *in, FILE *out) +static void makedoc (FILE * in, FILE * out) { char buffer[BUFFSIZE]; char token[BUFFSIZE]; @@ -225,13 +217,11 @@ static void makedoc (FILE *in, FILE *out) int line = 0; int docstat = D_INIT; - while ((fgets (buffer, sizeof (buffer), in))) - { + while ((fgets (buffer, sizeof (buffer), in))) { line++; - if ((p = strchr (buffer, '\n')) == NULL) - { + if ((p = strchr (buffer, '\n')) == NULL) { fprintf (stderr, "%s: Line %d too long. Ask a wizard to enlarge\n" - "%s: my buffer size.\n", Progname, line, Progname); + "%s: my buffer size.\n", Progname, line, Progname); exit (1); } else @@ -240,23 +230,15 @@ static void makedoc (FILE *in, FILE *out) if (!(p = get_token (token, sizeof (token), buffer))) continue; - if (Debug) - { - fprintf (stderr, "%s: line %d. first token: \"%s\".\n", - Progname, line, token); - } - if (!strcmp (token, "/*++*/")) active = 1; - else if (!strcmp (token, "/*--*/")) - { + else if (!strcmp (token, "/*--*/")) { docstat = flush_doc (docstat); active = 0; } else if (active && (!strcmp (token, "/**") || !strcmp (token, "**"))) docstat = handle_docline (p, docstat); - else if (active && !strcmp (token, "{")) - { + else if (active && !strcmp (token, "{")) { docstat = flush_doc (docstat); handle_confline (p); } @@ -294,67 +276,48 @@ static char *get_token (char *d, size_t l, char *s) short is_quoted = 0; char *dd = d; - if (Debug) - fprintf (stderr, "%s: get_token called for `%s'.\n", - Progname, s); - s = skip_ws (s); - if (Debug > 1) - fprintf (stderr, "%s: argumet after skip_ws(): `%s'.\n", - Progname, s); - - if (!*s) - { - if (Debug) - fprintf (stderr, "%s: no more tokens on this line.\n", Progname); + if (!*s) { return NULL; } - if (strchr (single_char_tokens, *s)) - { - if (Debug) - { - fprintf (stderr, "%s: found single character token `%c'.\n", - Progname, *s); - } + if (strchr (single_char_tokens, *s)) { d[0] = *s++; d[1] = 0; return s; } - if (*s == '"') - { - if (Debug) - { - fprintf (stderr, "%s: found quote character.\n", Progname); - } - + if (*s == '"') { s++; is_quoted = 1; } - for (t = s; *t && --l > 0; t++) - { + for (t = s; *t && --l > 0; t++) { if (*t == '\\' && !t[1]) break; - if (is_quoted && *t == '\\') - { - switch ((*d = *++t)) - { - case 'n': *d = '\n'; break; - case 't': *d = '\t'; break; - case 'r': *d = '\r'; break; - case 'a': *d = '\a'; break; + if (is_quoted && *t == '\\') { + switch ((*d = *++t)) { + case 'n': + *d = '\n'; + break; + case 't': + *d = '\t'; + break; + case 'r': + *d = '\r'; + break; + case 'a': + *d = '\a'; + break; } d++; continue; } - if (is_quoted && *t == '"') - { + if (is_quoted && *t == '"') { t++; break; } @@ -368,14 +331,6 @@ static char *get_token (char *d, size_t l, char *s) *d = '\0'; - if (Debug) - { - fprintf (stderr, "%s: Got %stoken: `%s'.\n", - Progname, is_quoted ? "quoted " : "", dd); - fprintf (stderr, "%s: Remainder: `%s'.\n", - Progname, t); - } - return t; } @@ -392,8 +347,7 @@ static char *get_token (char *d, size_t l, char *s) * following string definitions! */ -enum -{ +enum { DT_NONE = 0, DT_BOOL, DT_NUM, @@ -404,39 +358,39 @@ enum DT_RX, DT_MAGIC, DT_SYN, - DT_ADDR + DT_ADDR, + DT_SYS }; -struct -{ +struct { char *machine; char *human; -} -types[] = -{ - { "DT_NONE", "-none-" }, - { "DT_BOOL", "boolean" }, - { "DT_NUM", "number" }, - { "DT_STR", "string" }, - { "DT_PATH", "path" }, - { "DT_QUAD", "quadoption" }, - { "DT_SORT", "sort order" }, - { "DT_RX", "regular expression" }, - { "DT_MAGIC", "folder magic" }, - { "DT_SYN", NULL }, - { "DT_ADDR", "e-mail address" }, - { NULL, NULL } +} types[] = { + { + "DT_NONE", "-none-"}, { + "DT_BOOL", "boolean"}, { + "DT_NUM", "number"}, { + "DT_STR", "string"}, { + "DT_PATH", "path"}, { + "DT_QUAD", "quadoption"}, { + "DT_SORT", "sort order"}, { + "DT_RX", "regular expression"}, { + "DT_MAGIC", "folder magic"}, { + "DT_SYN", NULL}, { + "DT_ADDR", "e-mail address"}, { + "DT_SYS", "system property"}, { + NULL, NULL} }; - + static int buff2type (const char *s) { int type; - + for (type = DT_NONE; types[type].machine; type++) if (!strcmp (types[type].machine, s)) - return type; - + return type; + return DT_NONE; } @@ -448,161 +402,117 @@ static void handle_confline (char *s) { char varname[BUFFSIZE]; char buff[BUFFSIZE]; - char tmp[BUFFSIZE]; int type; - + char val[BUFFSIZE]; /* xxx - put this into an actual state machine? */ /* variable name */ - if (!(s = get_token (varname, sizeof (varname), s))) return; - + if (!(s = get_token (varname, sizeof (varname), s))) + return; + /* comma */ - if (!(s = get_token (buff, sizeof (buff), s))) return; - + if (!(s = get_token (buff, sizeof (buff), s))) + return; + /* type */ - if (!(s = get_token (buff, sizeof (buff), s))) return; + if (!(s = get_token (buff, sizeof (buff), s))) + return; type = buff2type (buff); /* possibly a "|" or comma */ - if (!(s = get_token (buff, sizeof (buff), s))) return; + if (!(s = get_token (buff, sizeof (buff), s))) + return; - if (!strcmp (buff, "|")) - { - if (Debug) fprintf (stderr, "%s: Expecting .\n", Progname); + if (!strcmp (buff, "|")) { /* ignore subtype and comma */ - if (!(s = get_token (buff, sizeof (buff), s))) return; - if (!(s = get_token (buff, sizeof (buff), s))) return; + if (!(s = get_token (buff, sizeof (buff), s))) + return; + if (!(s = get_token (buff, sizeof (buff), s))) + return; } /* redraw, comma */ - - while (1) - { - if (!(s = get_token (buff, sizeof (buff), s))) return; + + while (1) { + if (!(s = get_token (buff, sizeof (buff), s))) + return; if (!strcmp (buff, ",")) break; } /* option name or UL &address */ - if (!(s = get_token (buff, sizeof (buff), s))) return; + if (!(s = get_token (buff, sizeof (buff), s))) + return; if (!strcmp (buff, "UL")) - if (!(s = get_token (buff, sizeof (buff), s))) return; + if (!(s = get_token (buff, sizeof (buff), s))) + return; /* comma */ - if (!(s = get_token (buff, sizeof (buff), s))) return; + if (!(s = get_token (buff, sizeof (buff), s))) + return; - if (Debug) fprintf (stderr, "%s: Expecting default value.\n", Progname); - /* or UL */ - if (!(s = get_token (buff, sizeof (buff), s))) return; - if (!strcmp (buff, "UL")) - { - if (Debug) fprintf (stderr, "%s: Skipping UL.\n", Progname); - if (!(s = get_token (buff, sizeof (buff), s))) return; + if (!(s = get_token (buff, sizeof (buff), s))) + return; + if (!strcmp (buff, "UL")) { + if (!(s = get_token (buff, sizeof (buff), s))) + return; } - memset (tmp, 0, sizeof (tmp)); + memset(val, 0, sizeof(val)); - do - { + do { if (!strcmp (buff, "}")) break; - strncpy (tmp + STRLEN(tmp), buff, sizeof (tmp) - STRLEN(tmp)); + m_strcat(val, sizeof(val), buff); } while ((s = get_token (buff, sizeof (buff), s))); - pretty_default (val, sizeof (val), tmp, type); add_var (varname); print_confline (varname, type, val); } -static void pretty_default (char *t, size_t l, const char *s, int type) -{ - memset (t, 0, l); - l--; - - switch (type) - { - case DT_QUAD: - { - if (!strcasecmp (s, "M_YES")) strncpy (t, "yes", l); - else if (!strcasecmp (s, "M_NO")) strncpy (t, "no", l); - else if (!strcasecmp (s, "M_ASKYES")) strncpy (t, "ask-yes", l); - else if (!strcasecmp (s, "M_ASKNO")) strncpy (t, "ask-no", l); - break; - } - case DT_BOOL: - { - if (atoi (s)) - strncpy (t, "yes", l); - else - strncpy (t, "no", l); - break; - } - case DT_SORT: - { - /* heuristic! */ - strncpy (t, s + 5, l); - for (; *t; t++) *t = tolower ((unsigned char) *t); - break; - } - case DT_MAGIC: - { - /* heuristic! */ - strncpy (t, s + 2, l); - for (; *t; t++) *t = tolower ((unsigned char) *t); - break; - } - case DT_STR: - case DT_RX: - case DT_ADDR: - case DT_PATH: - { - if (!strcmp (s, "0")) - break; - /* fallthrough */ - } - default: - { - strncpy (t, s, l); - break; - } - } -} - static void char_to_escape (char *dest, unsigned int c) { - switch (c) - { - case '\r': strcpy (dest, "\\r"); break; /* __STRCPY_CHECKED__ */ - case '\n': strcpy (dest, "\\n"); break; /* __STRCPY_CHECKED__ */ - case '\t': strcpy (dest, "\\t"); break; /* __STRCPY_CHECKED__ */ - case '\f': strcpy (dest, "\\f"); break; /* __STRCPY_CHECKED__ */ - default: sprintf (dest, "\\%03o", c); break; + switch (c) { + case '\r': + strcpy (dest, "\\r"); + break; /* __STRCPY_CHECKED__ */ + case '\n': + strcpy (dest, "\\n"); + break; /* __STRCPY_CHECKED__ */ + case '\t': + strcpy (dest, "\\t"); + break; /* __STRCPY_CHECKED__ */ + case '\f': + strcpy (dest, "\\f"); + break; /* __STRCPY_CHECKED__ */ + default: + sprintf (dest, "\\%03o", c); + break; } } static void conf_char_to_escape (unsigned int c) { char buff[16]; + char_to_escape (buff, c); - add (buff); + add_s (buff); } static void conf_print_strval (const char *v) { - for (; *v; v++) - { - if (*v < ' ' || *v & 0x80) - { + for (; *v; v++) { + if (*v < ' ' || *v & 0x80) { conf_char_to_escape ((unsigned int) *v); continue; } - if (*v == '"' || *v == '\\') + if (*v == '"' || *v == '\\') add_c ('\\'); add_c (*v); } @@ -610,19 +520,17 @@ static void conf_print_strval (const char *v) static void man_print_strval (const char *v) { - for (; *v; v++) - { - if (*v < ' ' || *v & 0x80) - { + for (; *v; v++) { + if (*v < ' ' || *v & 0x80) { add_c ('\\'); conf_char_to_escape ((unsigned int) *v); continue; } - + if (*v == '"') - add ("\\(rq"); + add_s ("\\(rq"); else if (*v == '\\') - add ("\\\\"); + add_s ("\\\\"); else add_c (*v); } @@ -631,10 +539,9 @@ static void man_print_strval (const char *v) static void sgml_print_strval (const char *v) { char buff[16]; - for (; *v; v++) - { - if (*v < ' ' || *v & 0x80) - { + + for (; *v; v++) { + if (*v < ' ' || *v & 0x80) { char_to_escape (buff, (unsigned int) *v); sgml_fputs (buff); continue; @@ -645,20 +552,35 @@ static void sgml_print_strval (const char *v) static int sgml_fputc (int c) { - switch (c) - { - case '<': return add ("<"); - case '>': return add (">"); - case '$': return add ("$"); - case '_': return add ("_"); - case '%': return add ("%"); - case '&': return add ("&"); - case '\\': return add ("\"); - case '"': return add ("&dquot;"); - case '[': return add ("["); - case ']': return add ("]"); - case '~': return add ("˜"); - default: return add_c (c); + switch (c) { + case '<': + return add_s ("<"); + case '>': + return add_s (">"); +#if 0 + case '$': + return add_s ("$"); + case '_': + return add_s ("_"); + case '%': + return add_s ("%"); +#endif + case '&': + return add_s ("&"); +#if 0 + case '\\': + return add_s ("\"); + case '"': + return add_s ("""); + case '[': + return add_s ("["); + case ']': + return add_s ("]"); + case '~': + return add_s ("˜"); +#endif + default: + return add_c (c); } } @@ -667,109 +589,128 @@ static int sgml_fputs (const char *s) for (; *s; s++) if (sgml_fputc ((unsigned int) *s) == EOF) return EOF; - + return 0; } +/* reduce CDATA to ID */ +static int sgml_id_fputs (const char *s) { + char id; + + for (; *s; s++) { + if (*s == '_') + id = '-'; + else + id = *s; + if (sgml_fputc ((unsigned int) id) == EOF) + return EOF; + } + return 0; +} + static void print_confline (const char *varname, int type, const char *val) { - if (type == DT_SYN) return; - - switch (OutputFormat) - { + if (type == DT_SYN) + return; + + switch (OutputFormat) { /* configuration file */ - case F_CONF: + case F_CONF: { - if (type == DT_STR || type == DT_RX || type == DT_ADDR || type == DT_PATH) - { - add ("\n# set "); - add (varname); - add ("\""); + if (type == DT_SYS) { + add_s ("\n# set ?"); + add_s (varname); + add_s (" prints "); + add_s (val); + break; + } + if (type == DT_STR || type == DT_RX || type == DT_ADDR + || type == DT_PATH) { + add_s ("\n# set "); + add_s (varname); + add_s ("=\""); conf_print_strval (val); - add ("\""); + add_s ("\""); } - else if (type != DT_SYN) - { - add ("\n# set "); - add (varname); - add ("="); - add (val); + else if (type != DT_SYN) { + add_s ("\n# set "); + add_s (varname); + add_s ("="); + add_s (val); } - - add ("\n#\n# Name: "); - add (varname); - add ("\n# Type: "); - add (type2human (type)); - if (type == DT_STR || type == DT_RX || type == DT_ADDR || type == DT_PATH) - { - add ("\n# Default: \""); + + add_s ("\n#\n# Name: "); + add_s (varname); + add_s ("\n# Type: "); + add_s (type2human (type)); + if (type == DT_STR || type == DT_RX || type == DT_ADDR + || type == DT_PATH) { + add_s ("\n# Default: \""); conf_print_strval (val); - add ("\""); + add_s ("\""); } - else - { - add ("\n# Default: "); - add (val); + else { + add_s ("\n# Default: "); + add_s (val); } - add ("\n# "); + add_s ("\n# "); break; } /* manual page */ - case F_MAN: + case F_MAN: { - add ("\n.TP\n.B %s\n"); - add (varname); - add (".nf\n"); - add ("Type: %s\n"); - add (type2human (type)); - if (type == DT_STR || type == DT_RX || type == DT_ADDR || type == DT_PATH) - { - add ("Default: \\(lq"); + add_s (".TP\n.B "); + add_s (varname); + add_s ("\n.nf\n"); + add_s ("Type: "); + add_s (type2human (type)); + add_c ('\n'); + if (type == DT_STR || type == DT_RX || type == DT_ADDR + || type == DT_PATH) { + add_s ("Default: \\(lq"); man_print_strval (val); - add ("\\(rq\n"); + add_s ("\\(rq\n"); } else { - add ("Default: "); - add (val); + add_s (type == DT_SYS ? "Value: " : "Default: "); + add_s (val); add_c ('\n'); } - - add (".fi"); + add_s (".fi"); break; } - + /* SGML based manual */ - case F_SGML: + case F_SGML: { - add ("\n"); + add_s ("\n"); - add ("\n

\nType: "); - add (type2human (type)); - add ("\n\n"); - - if (type == DT_STR || type == DT_RX || type == DT_ADDR || type == DT_PATH) - { - add ("

\nDefault: &dquot;"); + add_s ("\">\nType: "); + add_s (type2human (type)); + add_s ("\n"); + + if (type == DT_STR || type == DT_RX || type == DT_ADDR + || type == DT_PATH) { + add_s ("\nDefault: ""); sgml_print_strval (val); - add ("&dquot;"); + add_s ("""); } - else - { - add ("

\nDefault: "); - add (val); - add (""); + else { + add_s ("\n"); + add_s (type == DT_SYS ? "Value: " : "Default: "); + add_s (""); + add_s (val); + add_s (""); } + add_s ("\n"); break; } /* make gcc happy */ - default: - break; + default: + break; } } @@ -785,6 +726,7 @@ static void print_confline (const char *varname, int type, const char *val) ** ** - \fI switches to italics ** - \fB switches to boldface + ** - \fT switches to typewriter for SGML ** - \fP switches to normal display ** - .dl on a line starts a definition list (name taken taken from HTML). ** - .dt starts a term in a definition list. @@ -808,21 +750,26 @@ static int flush_doc (int docstat) if (docstat & D_INIT) return D_INIT; - if (fd_recurse++) - { - fprintf (stderr, "%s: Internal error, recursion in flush_doc()!\n", Progname); + if (fd_recurse++) { + fprintf (stderr, "%s: Internal error, recursion in flush_doc()!\n", + Progname); exit (1); } + if (docstat & (D_PA)) + docstat = print_it (SP_END_PAR, NULL, docstat); + if (docstat & (D_TAB)) docstat = print_it (SP_END_TAB, NULL, docstat); if (docstat & (D_DL)) docstat = print_it (SP_END_DL, NULL, docstat); - if (docstat & (D_EM | D_BF)) + if (docstat & (D_EM | D_BF | D_TT)) docstat = print_it (SP_END_FT, NULL, docstat); + docstat = print_it (SP_END_SECT, NULL, docstat); + docstat = print_it (SP_NEWLINE, NULL, 0); fd_recurse--; @@ -833,97 +780,100 @@ static int flush_doc (int docstat) static int print_it (int special, char *str, int docstat) { - int onl = docstat & (D_NL|D_NP); - - docstat &= ~(D_NL|D_NP|D_INIT); + int onl = docstat & (D_NL | D_NP); - switch (OutputFormat) - { + docstat &= ~(D_NL | D_NP | D_INIT); + + switch (OutputFormat) { /* configuration file */ - case F_CONF: + case F_CONF: { - switch (special) - { + switch (special) { static int Continuation = 0; - case SP_END_FT: docstat &= ~(D_EM|D_BF); break; - case SP_START_BF: docstat |= D_BF; break; - case SP_START_EM: docstat |= D_EM; break; - case SP_NEWLINE: + case SP_END_FT: + docstat &= ~(D_EM | D_BF | D_TT); + break; + case SP_START_BF: + docstat |= D_BF; + break; + case SP_START_EM: + docstat |= D_EM; + break; + case SP_START_TT: + docstat |= D_TT; + break; + case SP_NEWLINE: { if (onl) docstat |= onl; - else - { - add ("\n# "); + else { + add_s ("\n# "); docstat |= D_NL; } if (docstat & D_DL) - ++ Continuation; + ++Continuation; break; } - case SP_NEWPAR: + case SP_NEWPAR: { - if (onl & D_NP) - { + if (onl & D_NP) { docstat |= onl; break; } if (!(onl & D_NL)) - add ("\n# "); - add ("\n# "); + add_s ("\n# "); + add_s ("\n# "); docstat |= D_NP; break; } - case SP_START_TAB: + case SP_START_TAB: { - if (!onl) - add ("\n# "); + if (!onl) + add_s ("\n# "); docstat |= D_TAB; break; } - case SP_END_TAB: + case SP_END_TAB: { docstat &= ~D_TAB; docstat |= D_NL; break; } - case SP_START_DL: + case SP_START_DL: { docstat |= D_DL; break; } - case SP_DT: + case SP_DT: { Continuation = 0; docstat |= D_DT; break; } - case SP_DD: + case SP_DD: { Continuation = 0; break; } - case SP_END_DL: + case SP_END_DL: { Continuation = 0; docstat &= ~D_DL; break; } - case SP_STR: + case SP_STR: { - if (Continuation) - { + if (Continuation) { Continuation = 0; - add (" "); + add_s (" "); } - add (str); - if (docstat & D_DT) - { + add_s (str); + if (docstat & D_DT) { int i; - for (i = STRLEN(str) ; i < 8 ; i++) + for (i = STRLEN (str); i < 8; i++) add_c (' '); docstat &= ~D_DT; docstat |= D_NL; @@ -935,109 +885,108 @@ static int print_it (int special, char *str, int docstat) } /* manual page */ - case F_MAN: + case F_MAN: { - switch (special) - { - case SP_END_FT: + switch (special) { + case SP_END_FT: { - add ("\\fP"); - docstat &= ~(D_EM|D_BF); + add_s ("\\fP"); + docstat &= ~(D_EM | D_BF | D_TT); break; } - case SP_START_BF: + case SP_START_BF: { - add ("\\fB"); + add_s ("\\fB"); docstat |= D_BF; - docstat &= ~D_EM; + docstat &= ~(D_EM | D_TT); break; } - case SP_START_EM: + case SP_START_EM: { - add ("\\fI"); + add_s ("\\fI"); docstat |= D_EM; - docstat &= ~D_BF; + docstat &= ~(D_BF | D_TT); + break; + } + case SP_START_TT: + { + docstat |= D_TT; + docstat &= ~(D_BF | D_EM); break; } - case SP_NEWLINE: + case SP_NEWLINE: { if (onl) docstat |= onl; - else - { + else { add_c ('\n'); docstat |= D_NL; } break; } - case SP_NEWPAR: + case SP_NEWPAR: { - if (onl & D_NP) - { + if (onl & D_NP) { docstat |= onl; break; } if (!(onl & D_NL)) add_c ('\n'); - add (".IP\n"); + add_s (".IP\n"); docstat |= D_NP; break; } - case SP_START_TAB: + case SP_START_TAB: { - add ("\n.IP\n.DS\n.sp\n.ft CR\n.nf\n"); + add_s ("\n.IP\n.DS\n.sp\n.ft CR\n.nf\n"); docstat |= D_TAB | D_NL; break; } - case SP_END_TAB: + case SP_END_TAB: { - add ("\n.fi\n.ec\n.ft P\n.sp\n"); + add_s ("\n.fi\n.ec\n.ft P\n.sp\n"); docstat &= ~D_TAB; docstat |= D_NL; break; } - case SP_START_DL: + case SP_START_DL: { - add ("\n.RS"); + add_s ("\n.RS"); docstat |= D_DL; break; } - case SP_DT: + case SP_DT: { - add ("\n.IP "); + add_s ("\n.IP "); break; } - case SP_DD: + case SP_DD: { - add ("\n"); + add_s ("\n"); break; } - case SP_END_DL: + case SP_END_DL: { - add ("\n.RE"); + add_s ("\n.RE"); docstat &= ~D_DL; break; } - case SP_STR: + case SP_STR: { - while (*str) - { - for (; *str; str++) - { + while (*str) { + for (; *str; str++) { if (*str == '"') - add ("\\(rq"); + add_s ("\\(rq"); else if (*str == '\\') - add ("\\\\"); - else if (!strncmp (str, "``", 2)) - { - add ("\\(lq"); + add_s ("\\\\"); + else if (!strncmp (str, "``", 2)) { + add_s ("\\(lq"); str++; } - else if (!strncmp (str, "''", 2)) - { - add ("\\(rq"); + else if (!strncmp (str, "''", 2)) { + add_s ("\\(rq"); str++; } else @@ -1051,96 +1000,125 @@ static int print_it (int special, char *str, int docstat) } /* SGML based manual */ - case F_SGML: + case F_SGML: { - switch (special) - { - case SP_END_FT: + switch (special) { + case SP_END_FT: { - if (docstat & D_EM) add(""); - if (docstat & D_BF) add(""); - docstat &= ~(D_EM|D_BF); + if (docstat & D_EM) + add_s (""); + if (docstat & D_BF) + add_s (""); + if (docstat & D_TT) + add_s (""); + docstat &= ~(D_EM | D_BF | D_TT); break; } - case SP_START_BF: + case SP_START_BF: { - add (""); + add_s (""); docstat |= D_BF; - docstat &= ~D_EM; + docstat &= ~(D_EM | D_TT); break; } - case SP_START_EM: + case SP_START_EM: { - add (""); + add_s (""); docstat |= D_EM; - docstat &= ~D_BF; + docstat &= ~(D_BF | D_TT); + break; + } + case SP_START_TT: + { + add_s (""); + docstat |= D_TT; + docstat &= ~(D_EM | D_BF); break; } - case SP_NEWLINE: + case SP_NEWLINE: { if (onl) docstat |= onl; - else - { - add ("\n"); - docstat |= D_NL; + else { + add_s ("\n"); + docstat |= D_NL; } break; } - case SP_NEWPAR: + case SP_NEWPAR: { - if (onl & D_NP) - { + if (onl & D_NP) { docstat |= onl; break; } if (!(onl & D_NL)) - add ("\n"); - add ("\n

\n"); + add_s ("\n"); + if (docstat & D_PA) + add_s ("\n"); + add_s ("\n"); docstat |= D_NP; + docstat |= D_PA; break; } - case SP_START_TAB: + case SP_START_TAB: { - add ("\n\n"); + add_s ("\n\n"); docstat |= D_TAB | D_NL; break; } - case SP_END_TAB: + case SP_END_TAB: { - add ("\n"); + add_s ("\n"); docstat &= ~D_TAB; docstat |= D_NL; break; } - case SP_START_DL: + case SP_START_DL: { - add ("\n\n"); + add_s ("\n\n"); docstat |= D_DL; break; } - case SP_DT: + case SP_DT: { - add (""); + add_s (""); break; } - case SP_DD: + case SP_DD: { - add (""); + add_s ("\n\n"); + docstat |= D_DD; break; } - case SP_END_DL: + case SP_END_DL: { - add ("\n"); - docstat &= ~D_DL; + add_s ("\n"); + docstat &= ~(D_DL|D_DD); + break; + } + case SP_END_PAR: + { + add_s ("\n"); + docstat &= ~D_PA; + break; + } + case SP_END_DD: + { + add_s ("\n"); + docstat &= ~D_DD; + break; + } + case SP_END_SECT: + { + add_s ("\n"); break; } - case SP_STR: + case SP_STR: { if (docstat & D_TAB) - add (str); + add_s (str); else sgml_fputs (str); break; @@ -1149,8 +1127,8 @@ static int print_it (int special, char *str, int docstat) break; } /* make gcc happy (unreached) */ - default: - break; + default: + break; } return docstat; @@ -1158,23 +1136,22 @@ static int print_it (int special, char *str, int docstat) void print_ref (int output_dollar, const char *ref) { - switch (OutputFormat) - { + switch (OutputFormat) { case F_CONF: case F_MAN: if (output_dollar) add_c ('$'); - add (ref); + add_s (ref); break; case F_SGML: - add ("\n"); if (output_dollar) - add ("$"); + add_s ("$"); sgml_fputs (ref); - add ("\">"); + add_s (""); break; default: @@ -1184,8 +1161,7 @@ void print_ref (int output_dollar, const char *ref) static int commit_buff (char *buff, char **d, int docstat) { - if (*d > buff) - { + if (*d > buff) { **d = '\0'; docstat = print_it (SP_STR, buff, docstat); *d = buff; @@ -1198,11 +1174,9 @@ static int handle_docline (char *l, int docstat) { char buff[BUFFSIZE]; char *s, *d; + l = skip_ws (l); - if (Debug) - fprintf (stderr, "%s: handle_docline `%s'\n", Progname, l); - if (!strncmp (l, ".pp", 3)) return print_it (SP_NEWPAR, NULL, docstat); else if (!strncmp (l, ".ts", 3)) @@ -1216,66 +1190,63 @@ static int handle_docline (char *l, int docstat) else if (!strncmp (l, ". ", 2)) *l = ' '; - for (s = l, d = buff; *s; s++) - { - if (!strncmp (s, "\\(as", 4)) - { + for (s = l, d = buff; *s; s++) { + if (!strncmp (s, "\\(as", 4)) { *d++ = '*'; s += 3; } - else if (!strncmp (s, "\\(rs", 4)) - { + else if (!strncmp (s, "\\(rs", 4)) { *d++ = '\\'; s += 3; } - else if (!strncmp (s, "\\fI", 3)) - { + else if (!strncmp (s, "\\fI", 3)) { docstat = commit_buff (buff, &d, docstat); docstat = print_it (SP_START_EM, NULL, docstat); s += 2; } - else if (!strncmp (s, "\\fB", 3)) - { + else if (!strncmp (s, "\\fB", 3)) { docstat = commit_buff (buff, &d, docstat); docstat = print_it (SP_START_BF, NULL, docstat); s += 2; } - else if (!strncmp (s, "\\fP", 3)) - { + else if (!strncmp (s, "\\fT", 3)) { + docstat = commit_buff (buff, &d, docstat); + docstat = print_it (SP_START_TT, NULL, docstat); + s += 2; + } + else if (!strncmp (s, "\\fP", 3)) { docstat = commit_buff (buff, &d, docstat); docstat = print_it (SP_END_FT, NULL, docstat); s += 2; } - else if (!strncmp (s, ".dt", 3)) - { + else if (!strncmp (s, ".dt", 3)) { + if (docstat & D_DD) { + docstat = commit_buff (buff, &d, docstat); + docstat = print_it (SP_END_DD, NULL, docstat); + } docstat = commit_buff (buff, &d, docstat); docstat = print_it (SP_DT, NULL, docstat); s += 3; } - else if (!strncmp (s, ".dd", 3)) - { + else if (!strncmp (s, ".dd", 3)) { docstat = commit_buff (buff, &d, docstat); docstat = print_it (SP_DD, NULL, docstat); s += 3; } - else if (*s == '$') - { + else if (*s == '$') { int output_dollar = 0; char *ref; char save; ++s; - if (*s == '$') - { + if (*s == '$') { output_dollar = 1; ++s; } - if (*s == '$') - { + if (*s == '$') { *d++ = '$'; } - else - { + else { ref = s; while (isalnum ((unsigned char) *s) || *s == '-' || *s == '_') ++s;