*** empty log message ***

[mandoc.git] / mdocterm.c

diff --git a/mdocterm.c b/mdocterm.c
index faa06717ea7053bcd5ede42d37c701fad507f4cb..9a344639b153d469c307f63d864e8978931f2afb 100644 (file)
--- a/mdocterm.c
+++ b/mdocterm.c
@@ -1,4 +1,4 @@
-       /* $Id: mdocterm.c,v 1.3 2009/02/23 07:09:13 kristaps Exp $ */
+/* $Id: mdocterm.c,v 1.13 2009/02/25 17:02:47 kristaps Exp $ */

 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -24,9 +24,19 @@
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdlib.h>
 #include <string.h>
 

+#ifndef __OpenBSD__
+#include <time.h>
+#endif
+

 #include "mmain.h"
 #include "term.h"
 
 #include "mmain.h"
 #include "term.h"
 

+#ifdef __NetBSD__
+#define xisspace(x) isspace((int)(x))
+#else
+#define        xisspace(x) isspace((x))
+#endif
+

 enum   termstyle {
        STYLE_CLEAR,
        STYLE_BOLD,
 enum   termstyle {
        STYLE_CLEAR,
        STYLE_BOLD,


@@ -34,6 +44,7 @@ enum  termstyle {
 };
 
 static void              body(struct termp *,
 };
 
 static void              body(struct termp *,

+                               struct termpair *,

                                const struct mdoc_meta *,
                                const struct mdoc_node *);
 static void              header(struct termp *,
                                const struct mdoc_meta *,
                                const struct mdoc_node *);
 static void              header(struct termp *,


@@ -44,7 +55,10 @@ static       void              footer(struct termp *,
 static void              pword(struct termp *, const char *, size_t);
 static void              pescape(struct termp *, 
                                const char *, size_t *, size_t);
 static void              pword(struct termp *, const char *, size_t);
 static void              pescape(struct termp *, 
                                const char *, size_t *, size_t);

+static void              nescape(struct termp *, 
+                               const char *, size_t);

 static void              chara(struct termp *, char);
 static void              chara(struct termp *, char);

+static void              stringa(struct termp *, const char *);

 static void              style(struct termp *, enum termstyle);
 
 #ifdef __linux__
 static void              style(struct termp *, enum termstyle);
 
 #ifdef __linux__


@@ -60,9 +74,6 @@ main(int argc, char *argv[])
        const struct mdoc *mdoc;
        struct termp     termp;
 
        const struct mdoc *mdoc;
        struct termp     termp;
 

-       extern int       optreset;
-       extern int       optind;
-

        p = mmain_alloc();
 
        if ( ! mmain_getopt(p, argc, argv, NULL, NULL, NULL, NULL))
        p = mmain_alloc();
 
        if ( ! mmain_getopt(p, argc, argv, NULL, NULL, NULL, NULL))


@@ -81,7 +92,7 @@ main(int argc, char *argv[])
                err(1, "malloc");
 
        header(&termp, mdoc_meta(mdoc));
                err(1, "malloc");
 
        header(&termp, mdoc_meta(mdoc));

-       body(&termp, mdoc_meta(mdoc), mdoc_node(mdoc));
+       body(&termp, NULL, mdoc_meta(mdoc), mdoc_node(mdoc));

        footer(&termp, mdoc_meta(mdoc));
 
        free(termp.buf);
        footer(&termp, mdoc_meta(mdoc));
 
        free(termp.buf);


@@ -135,11 +146,11 @@ flushln(struct termp *p)
                 * Count up visible word characters.  Control sequences
                 * (starting with the CSI) aren't counted. 
                 */
                 * Count up visible word characters.  Control sequences
                 * (starting with the CSI) aren't counted. 
                 */

-               assert( ! isspace(p->buf[i]));
+               assert( ! xisspace(p->buf[i]));

 
                /* LINTED */
                for (j = i, vsz = 0; j < p->col; j++) {
 
                /* LINTED */
                for (j = i, vsz = 0; j < p->col; j++) {

-                       if (isspace(p->buf[j]))
+                       if (xisspace(p->buf[j]))

                                break;
                        else if (27 == p->buf[j]) {
                                assert(j + 4 <= p->col);
                                break;
                        else if (27 == p->buf[j]) {
                                assert(j + 4 <= p->col);


@@ -165,10 +176,9 @@ flushln(struct termp *p)
                        for (j = 0; j < p->offset; j++)
                                putchar(' ');
                        vis = 0;
                        for (j = 0; j < p->offset; j++)
                                putchar(' ');
                        vis = 0;

-               } else if (vis + vsz >= maxvis) {
+               } else if (vis + vsz >= maxvis)

                        /* FIXME */
                        errx(1, "word breaks right margin");
                        /* FIXME */
                        errx(1, "word breaks right margin");

-               }

 
                /* 
                 * Write out the word and a trailing space.  Omit the
 
                /* 
                 * Write out the word and a trailing space.  Omit the


@@ -176,7 +186,7 @@ flushln(struct termp *p)
                 */
 
                for ( ; i < p->col; i++) {
                 */
 
                for ( ; i < p->col; i++) {

-                       if (isspace(p->buf[i]))
+                       if (xisspace(p->buf[i]))

                                break;
                        putchar(p->buf[i]);
                }
                                break;
                        putchar(p->buf[i]);
                }


@@ -193,7 +203,7 @@ flushln(struct termp *p)
         */
 
        if (p->flags & TERMP_NOBREAK) {
         */
 
        if (p->flags & TERMP_NOBREAK) {

-               for ( ; vis <= maxvis; vis++)
+               for ( ; vis < maxvis; vis++)

                        putchar(' ');
        } else
                putchar('\n');
                        putchar(' ');
        } else
                putchar('\n');


@@ -211,9 +221,12 @@ newln(struct termp *p)
         * vertical space.
         */
        p->flags |= TERMP_NOSPACE;
         * vertical space.
         */
        p->flags |= TERMP_NOSPACE;

-       if (0 == p->col) 
+       if (0 == p->col) {
+               p->flags &= ~TERMP_NOLPAD;

                return;
                return;

+       }

        flushln(p);
        flushln(p);

+       p->flags &= ~TERMP_NOLPAD;

 }
 
 
 }
 
 


@@ -230,6 +243,16 @@ vspace(struct termp *p)
 }
 
 
 }
 
 

+static void
+stringa(struct termp *p, const char *s)
+{
+
+       /* XXX - speed up if not passing to chara. */
+       for ( ; *s; s++)
+               chara(p, *s);
+}
+
+

 static void
 chara(struct termp *p, char c)
 {
 static void
 chara(struct termp *p, char c)
 {


@@ -268,9 +291,37 @@ style(struct termp *p, enum termstyle esc)
 }
 
 
 }
 
 

+static void
+nescape(struct termp *p, const char *word, size_t len)
+{
+
+       switch (len) {
+       case (2):
+               if ('r' == word[0] && 'B' == word[1])
+                       chara(p, ']');
+               else if ('l' == word[0] && 'B' == word[1])
+                       chara(p, '[');
+               else if ('<' == word[0] && '-' == word[1])
+                       stringa(p, "<-");
+               else if ('-' == word[0] && '>' == word[1])
+                       stringa(p, "->");
+               else if ('l' == word[0] && 'q' == word[1])
+                       chara(p, '\"');
+               else if ('r' == word[0] && 'q' == word[1])
+                       chara(p, '\"');
+               else if ('b' == word[0] && 'u' == word[1])
+                       chara(p, 'o');
+               break;
+       default:
+               break;
+       }
+}
+
+

 static void
 pescape(struct termp *p, const char *word, size_t *i, size_t len)
 {
 static void
 pescape(struct termp *p, const char *word, size_t *i, size_t len)
 {

+       size_t           j;

 
        (*i)++;
        assert(*i < len);
 
        (*i)++;
        assert(*i < len);


@@ -279,12 +330,7 @@ pescape(struct termp *p, const char *word, size_t *i, size_t len)
                /* Two-character escapes. */
                (*i)++;
                assert(*i + 1 < len);
                /* Two-character escapes. */
                (*i)++;
                assert(*i + 1 < len);

-
-               if ('r' == word[*i] && 'B' == word[*i + 1])
-                       chara(p, ']');
-               else if ('l' == word[*i] && 'B' == word[*i + 1])
-                       chara(p, '[');
-
+               nescape(p, &word[*i], 2);

                (*i)++;
                return;
 
                (*i)++;
                return;
 


@@ -299,6 +345,8 @@ pescape(struct termp *p, const char *word, size_t *i, size_t len)
                        /* FALLTHROUGH */
                case ('-'):
                        /* FALLTHROUGH */
                        /* FALLTHROUGH */
                case ('-'):
                        /* FALLTHROUGH */

+               case (' '):
+                       /* FALLTHROUGH */

                case ('.'):
                        chara(p, word[*i]);
                default:
                case ('.'):
                        chara(p, word[*i]);
                default:


@@ -306,7 +354,12 @@ pescape(struct termp *p, const char *word, size_t *i, size_t len)
                }
                return;
        }
                }
                return;
        }

-       /* n-character escapes. */
+
+       (*i)++;
+       for (j = 0; word[*i] && ']' != word[*i]; (*i)++, j++)
+               /* Loop... */ ;
+
+       nescape(p, &word[*i - j], j);

 }
 
 
 }
 
 


@@ -321,7 +374,8 @@ pword(struct termp *p, const char *word, size_t len)
                        ! (p->flags & TERMP_LITERAL))
                chara(p, ' ');
 
                        ! (p->flags & TERMP_LITERAL))
                chara(p, ' ');
 

-       p->flags &= ~TERMP_NOSPACE;
+       if ( ! (p->flags & TERMP_NONOSPACE))
+               p->flags &= ~TERMP_NOSPACE;

 
        if (p->flags & TERMP_BOLD)
                style(p, STYLE_BOLD);
 
        if (p->flags & TERMP_BOLD)
                style(p, STYLE_BOLD);


@@ -363,7 +417,7 @@ word(struct termp *p, const char *word)
 
        /* LINTED */
        for (j = i = 0; i < len; i++) {
 
        /* LINTED */
        for (j = i = 0; i < len; i++) {

-               if ( ! isspace(word[i])) {
+               if ( ! xisspace(word[i])) {

                        j++;
                        continue;
                }
                        j++;
                        continue;
                }


@@ -381,37 +435,50 @@ word(struct termp *p, const char *word)
 
 
 static void
 
 
 static void

-body(struct termp *p, const struct mdoc_meta *meta,
+body(struct termp *p, struct termpair *ppair,
+               const struct mdoc_meta *meta,

                const struct mdoc_node *node)
 {
        int              dochild;
                const struct mdoc_node *node)
 {
        int              dochild;

+       struct termpair  pair;

 
        /* Pre-processing. */
 
        dochild = 1;
 
        /* Pre-processing. */
 
        dochild = 1;

+       pair.ppair = ppair;
+       pair.type = 0;
+       pair.offset = pair.rmargin = 0;
+       pair.flag = 0;
+       pair.count = 0;

 
        if (MDOC_TEXT != node->type) {
                if (termacts[node->tok].pre)
 
        if (MDOC_TEXT != node->type) {
                if (termacts[node->tok].pre)

-                       if ( ! (*termacts[node->tok].pre)(p, meta, node))
+                       if ( ! (*termacts[node->tok].pre)(p, &pair, meta, node))

                                dochild = 0;
        } else /* MDOC_TEXT == node->type */
                word(p, node->data.text.string);
 
        /* Children. */
 
                                dochild = 0;
        } else /* MDOC_TEXT == node->type */
                word(p, node->data.text.string);
 
        /* Children. */
 

+       if (TERMPAIR_FLAG & pair.type)
+               p->flags |= pair.flag;
+

        if (dochild && node->child)
        if (dochild && node->child)

-               body(p, meta, node->child);
+               body(p, &pair, meta, node->child);
+
+       if (TERMPAIR_FLAG & pair.type)
+               p->flags &= ~pair.flag;

 
        /* Post-processing. */
 
        if (MDOC_TEXT != node->type)
                if (termacts[node->tok].post)
 
        /* Post-processing. */
 
        if (MDOC_TEXT != node->type)
                if (termacts[node->tok].post)

-                       (*termacts[node->tok].post)(p, meta, node);
+                       (*termacts[node->tok].post)(p, &pair, meta, node);

 
        /* Siblings. */
 
        if (node->next)
 
        /* Siblings. */
 
        if (node->next)

-               body(p, meta, node->next);
+               body(p, ppair, meta, node->next);

 }
 
 
 }
 
 


@@ -429,10 +496,10 @@ footer(struct termp *p, const struct mdoc_meta *meta)
 
        tm = localtime(&meta->date);
 
 
        tm = localtime(&meta->date);
 

-#ifdef __linux__
-       if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-#else
+#ifdef __OpenBSD__

        if (NULL == strftime(buf, p->rmargin, "%B %d, %Y", tm))
        if (NULL == strftime(buf, p->rmargin, "%B %d, %Y", tm))

+#else
+       if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))

 #endif
                err(1, "strftime");
 
 #endif
                err(1, "strftime");
 


@@ -466,8 +533,7 @@ static void
 header(struct termp *p, const struct mdoc_meta *meta)
 {
        char            *buf, *title;
 header(struct termp *p, const struct mdoc_meta *meta)
 {
        char            *buf, *title;

-       const char      *pp, *msec;
-       size_t           ssz, tsz, ttsz, i;;
+       const char      *pp;

 
        if (NULL == (buf = malloc(p->rmargin)))
                err(1, "malloc");
 
        if (NULL == (buf = malloc(p->rmargin)))
                err(1, "malloc");


@@ -504,50 +570,44 @@ header(struct termp *p, const struct mdoc_meta *meta)
                                pp = mdoc_msec2a(MSEC_local);
                        break;
                }
                                pp = mdoc_msec2a(MSEC_local);
                        break;
                }

-       assert(pp);
-
-       tsz = strlcpy(buf, pp, p->rmargin);
-       assert(tsz < p->rmargin);
-
-       if ((pp = mdoc_arch2a(meta->arch))) {
-               tsz = strlcat(buf, " (", p->rmargin);
-               assert(tsz < p->rmargin);
-               tsz = strlcat(buf, pp, p->rmargin);
-               assert(tsz < p->rmargin);
-               tsz = strlcat(buf, ")", p->rmargin);
-               assert(tsz < p->rmargin);
-       }

 
 

-       ttsz = strlcpy(title, meta->title, p->rmargin);
+       if (mdoc_arch2a(meta->arch))
+               (void)snprintf(buf, p->rmargin, "%s(%s)",
+                               pp, mdoc_arch2a(meta->arch));
+       else
+               (void)strlcpy(buf, pp, p->rmargin);

 
 

-       if (NULL == (msec = mdoc_msec2a(meta->msec)))
-               msec = "";
+       pp = mdoc_msec2a(meta->msec);

 
 

-       ssz = (2 * (ttsz + 2 + strlen(msec))) + tsz + 2;
+       (void)snprintf(title, p->rmargin, "%s(%s)",
+                       meta->title, pp ? pp : "");

 
 

-       if (ssz > p->rmargin) {
-               if ((ssz -= p->rmargin) % 2)
-                       ssz++;
-               ssz /= 2;
-       
-               assert(ssz <= ttsz);
-               title[ttsz - ssz] = 0;
-               ssz = 1;
-       } else
-               ssz = ((p->rmargin - ssz) / 2) + 1;
+       p->offset = 0;
+       p->rmargin = (p->maxrmargin - strlen(buf)) / 2;
+       p->flags |= TERMP_NOBREAK;
+       p->flags |= TERMP_NOSPACE;

 
 

-       printf("%s(%s)", title, msec);
+       word(p, title);
+       flushln(p);

 
 

-       for (i = 0; i < ssz; i++)
-               printf(" ");
+       p->offset = p->rmargin;
+       p->rmargin += strlen(buf);
+
+       word(p, buf);
+       flushln(p);

 
 

-       printf("%s", buf);
+       exit(1);

 
 

-       for (i = 0; i < ssz; i++)
-               printf(" ");
+       p->offset = p->rmargin;
+       p->rmargin = p->maxrmargin;
+       p->flags &= ~TERMP_NOBREAK;

 
 

-       printf("%s(%s)\n", title, msec);
-       fflush(stdout);
+       word(p, title);
+       flushln(p);
+
+       p->rmargin = p->maxrmargin;
+       p->offset = 0;
+       p->flags &= ~TERMP_NOSPACE;

 
        free(title);
        free(buf);
 
        free(title);
        free(buf);