#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)
+#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,
SP_START_DL,
SP_DT,
SP_DD,
+ SP_END_DD,
SP_END_DL,
+ SP_END_SECT,
SP_REFER
};
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 int sgml_id_fputs (const char *);
static void add_var (const char *);
static int add_s (const char *);
static int add_c (int);
{
outbuf = realloc (outbuf, (++outcount) * sizeof (var_t));
outbuf[outcount - 1].seen = 0;
- outbuf[outcount - 1].name = strdup (name);
+ outbuf[outcount - 1].name = p_strdup(name, str_len(name));
outbuf[outcount - 1].descr = NULL;
}
-static int add (const char *s)
+static int add_s (const char *s)
{
size_t lnew = STRLEN (s), lold = STRLEN (outbuf[outcount - 1].descr);
}
if (lold == 0)
- outbuf[outcount - 1].descr = strdup (s);
+ outbuf[outcount - 1].descr = p_strdup(s, str_len(s));
else {
outbuf[outcount - 1].descr =
realloc (outbuf[outcount - 1].descr, lold + lnew + 1);
char buf[2] = "\0\0";
buf[0] = c;
- return (add (buf));
+ return (add_s (buf));
}
static void makedoc (FILE * in, FILE * out)
DT_RX,
DT_MAGIC,
DT_SYN,
- DT_ADDR
+ DT_ADDR,
+ DT_SYS
};
struct {
"DT_MAGIC", "folder magic"}, {
"DT_SYN", NULL}, {
"DT_ADDR", "e-mail address"}, {
+ "DT_SYS", "system property"}, {
NULL, NULL}
};
{
char varname[BUFFSIZE];
char buff[BUFFSIZE];
- char tmp[BUFFSIZE];
int type;
char val[BUFFSIZE];
return;
}
- memset (tmp, 0, sizeof (tmp));
+ memset (val, 0, sizeof (val));
do {
if (!strcmp (buff, "}"))
break;
- strncpy (tmp + STRLEN (tmp), buff, sizeof (tmp) - STRLEN (tmp));
+ strncpy (val + STRLEN (val), buff, sizeof (val) - STRLEN (val));
}
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) {
char buff[16];
char_to_escape (buff, c);
- add (buff);
+ add_s (buff);
}
static void conf_print_strval (const char *v)
}
if (*v == '"')
- add ("\\(rq");
+ add_s ("\\(rq");
else if (*v == '\\')
- add ("\\\\");
+ add_s ("\\\\");
else
add_c (*v);
}
{
switch (c) {
case '<':
- return add ("<");
+ return add_s ("<");
case '>':
- return add (">");
+ return add_s (">");
+#if 0
case '$':
- return add ("$");
+ return add_s ("$");
case '_':
- return add ("_");
+ return add_s ("_");
case '%':
- return add ("%");
+ return add_s ("%");
+#endif
case '&':
- return add ("&");
+ return add_s ("&");
+#if 0
case '\\':
- return add ("\");
+ return add_s ("\");
case '"':
- return add ("&dquot;");
+ return add_s (""");
case '[':
- return add ("[");
+ return add_s ("[");
case ']':
- return add ("]");
+ return add_s ("]");
case '~':
- return add ("˜");
+ return add_s ("˜");
+#endif
default:
return add_c (c);
}
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)
/* configuration file */
case F_CONF:
{
+ 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 ("\n# set ");
- add (varname);
- add ("\"");
+ 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);
+ add_s ("\n# set ");
+ add_s (varname);
+ add_s ("=");
+ add_s (val);
}
- add ("\n#\n# Name: ");
- add (varname);
- add ("\n# Type: ");
- add (type2human (type));
+ 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 ("\n# Default: \"");
+ add_s ("\n# Default: \"");
conf_print_strval (val);
- add ("\"");
+ add_s ("\"");
}
else {
- add ("\n# Default: ");
- add (val);
+ add_s ("\n# Default: ");
+ add_s (val);
}
- add ("\n# ");
+ add_s ("\n# ");
break;
}
/* manual page */
case F_MAN:
{
- add (".TP\n.B ");
- add (varname);
- add ("\n.nf\n");
- add ("Type: ");
- add (type2human (type));
+ 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 ("Default: \\(lq");
+ 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:
{
- add ("\n<sect2>");
+ add_s ("\n<muttng-doc:vardef name=\"");
sgml_fputs (varname);
- add ("<label id=\"");
- add (varname);
- add ("\">");
- add ("\n<p>\nType: <tt>");
- add (type2human (type));
- add ("</tt>\n\n");
+ add_s ("\">\n<para>Type: <literal>");
+ add_s (type2human (type));
+ add_s ("</literal></para>\n");
if (type == DT_STR || type == DT_RX || type == DT_ADDR
|| type == DT_PATH) {
- add ("<p>\nDefault: <tt>&dquot;");
+ add_s ("<para>\nDefault: <literal>"");
sgml_print_strval (val);
- add ("&dquot;</tt>");
+ add_s (""</literal>");
}
else {
- add ("<p>\nDefault: <tt>");
- add (val);
- add ("</tt>");
+ add_s ("<para>\n");
+ add_s (type == DT_SYS ? "Value: " : "Default: ");
+ add_s ("<literal>");
+ add_s (val);
+ add_s ("</literal>");
}
+ add_s ("</para>\n");
break;
}
/* make gcc happy */
**
** - \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.
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--;
static int Continuation = 0;
case SP_END_FT:
- docstat &= ~(D_EM | D_BF);
+ docstat &= ~(D_EM | D_BF | D_TT);
break;
case SP_START_BF:
docstat |= D_BF;
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# ");
+ add_s ("\n# ");
docstat |= D_NL;
}
if (docstat & D_DL)
}
if (!(onl & D_NL))
- add ("\n# ");
- add ("\n# ");
+ add_s ("\n# ");
+ add_s ("\n# ");
docstat |= D_NP;
break;
}
case SP_START_TAB:
{
if (!onl)
- add ("\n# ");
+ add_s ("\n# ");
docstat |= D_TAB;
break;
}
{
if (Continuation) {
Continuation = 0;
- add (" ");
+ add_s (" ");
}
- add (str);
+ add_s (str);
if (docstat & D_DT) {
int i;
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:
{
- add ("\\fB");
+ add_s ("\\fB");
docstat |= D_BF;
- docstat &= ~D_EM;
+ docstat &= ~(D_EM | D_TT);
break;
}
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:
if (!(onl & D_NL))
add_c ('\n');
- add (".IP\n");
+ add_s (".IP\n");
docstat |= D_NP;
break;
}
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:
{
- 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:
{
- add ("\n.RS");
+ add_s ("\n.RS");
docstat |= D_DL;
break;
}
case SP_DT:
{
- add ("\n.IP ");
+ add_s ("\n.IP ");
break;
}
case SP_DD:
{
- add ("\n");
+ add_s ("\n");
break;
}
case SP_END_DL:
{
- add ("\n.RE");
+ add_s ("\n.RE");
docstat &= ~D_DL;
break;
}
while (*str) {
for (; *str; str++) {
if (*str == '"')
- add ("\\(rq");
+ add_s ("\\(rq");
else if (*str == '\\')
- add ("\\\\");
+ add_s ("\\\\");
else if (!strncmp (str, "``", 2)) {
- add ("\\(lq");
+ add_s ("\\(lq");
str++;
}
else if (!strncmp (str, "''", 2)) {
- add ("\\(rq");
+ add_s ("\\(rq");
str++;
}
else
case SP_END_FT:
{
if (docstat & D_EM)
- add ("</em>");
+ add_s ("</emphasis>");
if (docstat & D_BF)
- add ("</bf>");
- docstat &= ~(D_EM | D_BF);
+ add_s ("</emphasis>");
+ if (docstat & D_TT)
+ add_s ("</literal>");
+ docstat &= ~(D_EM | D_BF | D_TT);
break;
}
case SP_START_BF:
{
- add ("<bf>");
+ add_s ("<emphasis role=\"bold\">");
docstat |= D_BF;
- docstat &= ~D_EM;
+ docstat &= ~(D_EM | D_TT);
break;
}
case SP_START_EM:
{
- add ("<em>");
+ add_s ("<emphasis>");
docstat |= D_EM;
- docstat &= ~D_BF;
+ docstat &= ~(D_BF | D_TT);
+ break;
+ }
+ case SP_START_TT:
+ {
+ add_s ("<literal>");
+ docstat |= D_TT;
+ docstat &= ~(D_EM | D_BF);
break;
}
case SP_NEWLINE:
if (onl)
docstat |= onl;
else {
- add ("\n");
+ add_s ("\n");
docstat |= D_NL;
}
break;
}
if (!(onl & D_NL))
- add ("\n");
- add ("\n<p>\n");
+ add_s ("\n");
+ if (docstat & D_PA)
+ add_s ("</para>\n");
+ add_s ("<para>\n");
docstat |= D_NP;
+ docstat |= D_PA;
break;
}
case SP_START_TAB:
{
- add ("\n<tscreen><verb>\n");
+ add_s ("\n<screen>\n");
docstat |= D_TAB | D_NL;
break;
}
case SP_END_TAB:
{
- add ("\n</verb></tscreen>");
+ add_s ("\n</screen>");
docstat &= ~D_TAB;
docstat |= D_NL;
break;
}
case SP_START_DL:
{
- add ("\n<descrip>\n");
+ add_s ("\n<variablelist>\n");
docstat |= D_DL;
break;
}
case SP_DT:
{
- add ("<tag>");
+ add_s ("<varlistentry><term>");
break;
}
case SP_DD:
{
- add ("</tag>");
+ add_s ("</term>\n<listitem><para>\n");
+ docstat |= D_DD;
break;
}
case SP_END_DL:
{
- add ("</descrip>\n");
- docstat &= ~D_DL;
+ add_s ("</para></listitem></varlistentry></variablelist>\n");
+ docstat &= ~(D_DL|D_DD);
+ break;
+ }
+ case SP_END_PAR:
+ {
+ add_s ("</para>\n");
+ docstat &= ~D_PA;
+ break;
+ }
+ case SP_END_DD:
+ {
+ add_s ("</para></listitem></varlistentry>\n");
+ docstat &= ~D_DD;
+ break;
+ }
+ case SP_END_SECT:
+ {
+ add_s ("</muttng-doc:vardef>\n");
break;
}
case SP_STR:
{
if (docstat & D_TAB)
- add (str);
+ add_s (str);
else
sgml_fputs (str);
break;
case F_MAN:
if (output_dollar)
add_c ('$');
- add (ref);
+ add_s (ref);
break;
case F_SGML:
- add ("<ref id=\"");
- add (ref);
- add ("\" name=\"");
+ add_s ("<link linkend=\"");
+ sgml_id_fputs (ref);
+ add_s ("\">\n");
if (output_dollar)
- add ("$");
+ add_s ("$");
sgml_fputs (ref);
- add ("\">");
+ add_s ("</link>");
break;
default:
docstat = print_it (SP_START_BF, NULL, docstat);
s += 2;
}
+ 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)) {
+ 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;
projects / apps / madmutt.git / blobdiff