=================================================================== RCS file: /cvs/mandoc/Attic/mdocterm.c,v retrieving revision 1.16 retrieving revision 1.19 diff -u -p -r1.16 -r1.19 --- mandoc/Attic/mdocterm.c 2009/02/27 08:20:15 1.16 +++ mandoc/Attic/mdocterm.c 2009/02/28 14:43:35 1.19 @@ -1,4 +1,4 @@ -/* $Id: mdocterm.c,v 1.16 2009/02/27 08:20:15 kristaps Exp $ */ +/* $Id: mdocterm.c,v 1.19 2009/02/28 14:43:35 kristaps Exp $ */ /* * Copyright (c) 2008 Kristaps Dzonsons * @@ -16,6 +16,8 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ +#include + #include #include #include @@ -36,6 +38,7 @@ #define TERMSYM_LARROW "<-" #define TERMSYM_RARROW "->" #define TERMSYM_UARROW "^" +#define TERMSYM_DARROW "v" #define TERMSYM_LSQUOTE "`" #define TERMSYM_RSQUOTE "\'" #define TERMSYM_SQUOTE "\'" @@ -52,7 +55,8 @@ #define TERMSYM_GRAVE "`" #define TERMSYM_PI "pi" #define TERMSYM_PLUSMINUS "+=" -#define TERMSYM_INFINITY "infinity" +#define TERMSYM_INF "oo" +#define TERMSYM_INF2 "infinity" #define TERMSYM_NAN "NaN" #define TERMSYM_BAR "|" #define TERMSYM_BULLET "o" @@ -108,7 +112,7 @@ main(int argc, char *argv[]) if (NULL == (mdoc = mmain_mdoc(p))) mmain_exit(p, 1); - termp.maxrmargin = 80; /* XXX */ + termp.maxrmargin = 78; /* XXX */ termp.rmargin = termp.maxrmargin; termp.maxcols = 1024; termp.offset = termp.col = 0; @@ -338,50 +342,70 @@ nescape(struct termp *p, const char *word, size_t len) stringa(p, TERMSYM_RBRACK); else if ('l' == word[0] && 'B' == word[1]) stringa(p, TERMSYM_LBRACK); + else if ('l' == word[0] && 'q' == word[1]) + stringa(p, TERMSYM_LDQUOTE); + else if ('r' == word[0] && 'q' == word[1]) + stringa(p, TERMSYM_RDQUOTE); + else if ('o' == word[0] && 'q' == word[1]) + stringa(p, TERMSYM_LSQUOTE); + else if ('a' == word[0] && 'q' == word[1]) + stringa(p, TERMSYM_RSQUOTE); else if ('<' == word[0] && '-' == word[1]) stringa(p, TERMSYM_LARROW); else if ('-' == word[0] && '>' == word[1]) stringa(p, TERMSYM_RARROW); - else if ('l' == word[0] && 'q' == word[1]) - stringa(p, TERMSYM_DQUOTE); - else if ('r' == word[0] && 'q' == word[1]) - stringa(p, TERMSYM_DQUOTE); else if ('b' == word[0] && 'u' == word[1]) stringa(p, TERMSYM_BULLET); - else if ('L' == word[0] && 'e' == word[1]) - stringa(p, TERMSYM_LE); else if ('<' == word[0] && '=' == word[1]) stringa(p, TERMSYM_LE); - else if ('G' == word[0] && 'e' == word[1]) - stringa(p, TERMSYM_GE); else if ('>' == word[0] && '=' == word[1]) stringa(p, TERMSYM_GE); - else if ('R' == word[0] && 'q' == word[1]) - stringa(p, TERMSYM_RDQUOTE); - else if ('L' == word[0] && 'q' == word[1]) - stringa(p, TERMSYM_LDQUOTE); + else if ('=' == word[0] && '=' == word[1]) + stringa(p, TERMSYM_EQ); + else if ('+' == word[0] && '-' == word[1]) + stringa(p, TERMSYM_PLUSMINUS); else if ('u' == word[0] && 'a' == word[1]) stringa(p, TERMSYM_UARROW); + else if ('d' == word[0] && 'a' == word[1]) + stringa(p, TERMSYM_DARROW); else if ('a' == word[0] && 'a' == word[1]) stringa(p, TERMSYM_ACUTE); else if ('g' == word[0] && 'a' == word[1]) stringa(p, TERMSYM_GRAVE); - else if ('P' == word[0] && 'i' == word[1]) - stringa(p, TERMSYM_PI); - else if ('N' == word[0] && 'e' == word[1]) + else if ('!' == word[0] && '=' == word[1]) stringa(p, TERMSYM_NEQ); - else if ('L' == word[0] && 't' == word[1]) - stringa(p, TERMSYM_LT); + else if ('i' == word[0] && 'f' == word[1]) + stringa(p, TERMSYM_INF); + else if ('n' == word[0] && 'a' == word[1]) + stringa(p, TERMSYM_NAN); + else if ('b' == word[0] && 'a' == word[1]) + stringa(p, TERMSYM_BAR); + + /* Deprecated forms. */ + else if ('B' == word[0] && 'a' == word[1]) + stringa(p, TERMSYM_BAR); + else if ('I' == word[0] && 'f' == word[1]) + stringa(p, TERMSYM_INF2); + else if ('G' == word[0] && 'e' == word[1]) + stringa(p, TERMSYM_GE); else if ('G' == word[0] && 't' == word[1]) stringa(p, TERMSYM_GT); - else if ('P' == word[0] && 'm' == word[1]) - stringa(p, TERMSYM_PLUSMINUS); - else if ('I' == word[0] && 'f' == word[1]) - stringa(p, TERMSYM_INFINITY); + else if ('L' == word[0] && 'e' == word[1]) + stringa(p, TERMSYM_LE); + else if ('L' == word[0] && 'q' == word[1]) + stringa(p, TERMSYM_LDQUOTE); + else if ('L' == word[0] && 't' == word[1]) + stringa(p, TERMSYM_LT); else if ('N' == word[0] && 'a' == word[1]) stringa(p, TERMSYM_NAN); - else if ('B' == word[0] && 'a' == word[1]) - stringa(p, TERMSYM_BAR); + else if ('N' == word[0] && 'e' == word[1]) + stringa(p, TERMSYM_NEQ); + else if ('P' == word[0] && 'i' == word[1]) + stringa(p, TERMSYM_PI); + else if ('P' == word[0] && 'm' == word[1]) + stringa(p, TERMSYM_PLUSMINUS); + else if ('R' == word[0] && 'q' == word[1]) + stringa(p, TERMSYM_RDQUOTE); break; default: break; @@ -652,15 +676,21 @@ footer(struct termp *p, const struct mdoc_meta *meta) static void header(struct termp *p, const struct mdoc_meta *meta) { - char *buf, *title, *bufp; + char *buf, *title, *bufp, *vbuf; const char *pp; + struct utsname uts; + p->rmargin = p->maxrmargin; + p->offset = 0; + if (NULL == (buf = malloc(p->rmargin))) err(1, "malloc"); if (NULL == (title = malloc(p->rmargin))) err(1, "malloc"); + if (NULL == (vbuf = malloc(p->rmargin))) + err(1, "malloc"); - if (NULL == (pp = mdoc_vol2a(meta->vol))) + if (NULL == (pp = mdoc_vol2a(meta->vol))) { switch (meta->msec) { case (MSEC_1): /* FALLTHROUGH */ @@ -685,12 +715,21 @@ header(struct termp *p, const struct mdoc_meta *meta) pp = mdoc_vol2a(VOL_KM); break; default: - /* FIXME: capitalise. */ - if (NULL == (pp = mdoc_msec2a(meta->msec))) - pp = mdoc_msec2a(MSEC_local); break; } + } + vbuf[0] = 0; + if (pp) { + if (-1 == uname(&uts)) + err(1, "uname"); + (void)strlcat(vbuf, uts.sysname, p->rmargin); + (void)strlcat(vbuf, " ", p->rmargin); + } else if (NULL == (pp = mdoc_msec2a(meta->msec))) + pp = mdoc_msec2a(MSEC_local); + + (void)strlcat(vbuf, pp, p->rmargin); + /* * The header is strange. It has three components, which are * really two with the first duplicated. It goes like this: @@ -706,9 +745,9 @@ header(struct termp *p, const struct mdoc_meta *meta) if (mdoc_arch2a(meta->arch)) (void)snprintf(buf, p->rmargin, "%s (%s)", - pp, mdoc_arch2a(meta->arch)); + vbuf, mdoc_arch2a(meta->arch)); else - (void)strlcpy(buf, pp, p->rmargin); + (void)strlcpy(buf, vbuf, p->rmargin); pp = mdoc_msec2a(meta->msec); @@ -745,5 +784,6 @@ header(struct termp *p, const struct mdoc_meta *meta) p->flags &= ~TERMP_NOSPACE; free(title); + free(vbuf); free(buf); }