Let .it accept numerical expressions, not just numerical constants.

[mandoc.git] / mdoc_man.c

diff --git a/mdoc_man.c b/mdoc_man.c
index 75b68e62d6dec171e98e2b0ff5056424c25f7e03..08d1a4272d31c92002c746aae1825995388dc2fa 100644 (file)
--- a/mdoc_man.c
+++ b/mdoc_man.c
@@ -1,6 +1,6 @@
-/*     $Id: mdoc_man.c,v 1.74 2014/11/19 22:00:37 schwarze Exp $ */
+/*     $Id: mdoc_man.c,v 1.87 2015/02/12 12:24:33 schwarze Exp $ */
 /*
- * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011-2015 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -29,8 +29,7 @@
 #include "mdoc.h"
 #include "main.h"
 
-#define        DECL_ARGS const struct mdoc_meta *meta, \
-                 const struct mdoc_node *n
+#define        DECL_ARGS const struct mdoc_meta *meta, struct mdoc_node *n
 
 struct manact {
        int             (*cond)(DECL_ARGS); /* DON'T run actions */
@@ -84,7 +83,8 @@ static        int       pre_dl(DECL_ARGS);
 static int       pre_en(DECL_ARGS);
 static int       pre_enc(DECL_ARGS);
 static int       pre_em(DECL_ARGS);
-static int       pre_es(DECL_ARGS);
+static int       pre_skip(DECL_ARGS);
+static int       pre_eo(DECL_ARGS);
 static int       pre_ex(DECL_ARGS);
 static int       pre_fa(DECL_ARGS);
 static int       pre_fd(DECL_ARGS);
@@ -115,8 +115,8 @@ static      void      print_word(const char *);
 static void      print_line(const char *, int);
 static void      print_block(const char *, int);
 static void      print_offs(const char *, int);
-static void      print_width(const char *,
-                               const struct mdoc_node *, size_t);
+static void      print_width(const struct mdoc_bl *,
+                       const struct mdoc_node *);
 static void      print_count(int *);
 static void      print_node(DECL_ARGS);
 
@@ -183,14 +183,14 @@ static    const struct manact manacts[MDOC_MAX + 1] = {
        { cond_body, pre_enc, post_enc, "[", "]" }, /* Bq */
        { NULL, pre_ux, NULL, "BSD/OS", NULL }, /* Bsx */
        { NULL, pre_bx, NULL, NULL, NULL }, /* Bx */
-       { NULL, NULL, NULL, NULL, NULL }, /* Db */
+       { NULL, pre_skip, NULL, NULL, NULL }, /* Db */
        { NULL, NULL, NULL, NULL, NULL }, /* Dc */
        { cond_body, pre_enc, post_enc, "\\(lq", "\\(rq" }, /* Do */
        { cond_body, pre_enc, post_enc, "\\(lq", "\\(rq" }, /* Dq */
        { NULL, NULL, NULL, NULL, NULL }, /* Ec */
        { NULL, NULL, NULL, NULL, NULL }, /* Ef */
        { NULL, pre_em, post_font, NULL, NULL }, /* Em */
-       { NULL, NULL, post_eo, NULL, NULL }, /* Eo */
+       { cond_body, pre_eo, post_eo, NULL, NULL }, /* Eo */
        { NULL, pre_ux, NULL, "FreeBSD", NULL }, /* Fx */
        { NULL, pre_sy, post_font, NULL, NULL }, /* Ms */
        { NULL, pre_no, NULL, NULL, NULL }, /* No */
@@ -235,7 +235,7 @@ static      const struct manact manacts[MDOC_MAX + 1] = {
        { cond_body, pre_enc, post_enc, "{", "}" }, /* Bro */
        { NULL, NULL, NULL, NULL, NULL }, /* Brc */
        { NULL, NULL, post_percent, NULL, NULL }, /* %C */
-       { NULL, pre_es, NULL, NULL, NULL }, /* Es */
+       { NULL, pre_skip, NULL, NULL, NULL }, /* Es */
        { cond_body, pre_en, post_en, NULL, NULL }, /* En */
        { NULL, pre_ux, NULL, "DragonFly", NULL }, /* Dx */
        { NULL, NULL, post_percent, NULL, NULL }, /* %Q */
@@ -264,7 +264,7 @@ static      int             outflags;
 
 #define        BL_STACK_MAX    32
 
-static size_t          Bl_stack[BL_STACK_MAX];  /* offsets [chars] */
+static int             Bl_stack[BL_STACK_MAX];  /* offsets [chars] */
 static int             Bl_stack_post[BL_STACK_MAX];  /* add final .RE */
 static int             Bl_stack_len;  /* number of nested Bl blocks */
 static int             TPremain;  /* characters before tag is full */
@@ -422,7 +422,7 @@ print_offs(const char *v, int keywords)
 {
        char              buf[24];
        struct roffsu     su;
-       size_t            sz;
+       int               sz;
 
        print_line(".RS", MMAN_Bk_susp);
 
@@ -433,7 +433,7 @@ print_offs(const char *v, int keywords)
                sz = 6;
        else if (keywords && !strcmp(v, "indent-two"))
                sz = 12;
-       else if (a2roffsu(v, &su, SCALE_MAX)) {
+       else if (a2roffsu(v, &su, SCALE_EN) > 1) {
                if (SCALE_EN == su.unit)
                        sz = su.scale;
                else {
@@ -458,7 +458,7 @@ print_offs(const char *v, int keywords)
        if (Bl_stack_len)
                sz += Bl_stack[Bl_stack_len - 1];
 
-       (void)snprintf(buf, sizeof(buf), "%zun", sz);
+       (void)snprintf(buf, sizeof(buf), "%dn", sz);
        print_word(buf);
        outflags |= MMAN_nl;
 }
@@ -467,20 +467,19 @@ print_offs(const char *v, int keywords)
  * Set up the indentation for a list item; used from pre_it().
  */
 static void
-print_width(const char *v, const struct mdoc_node *child, size_t defsz)
+print_width(const struct mdoc_bl *bl, const struct mdoc_node *child)
 {
        char              buf[24];
        struct roffsu     su;
-       size_t            sz, chsz;
-       int               numeric, remain;
+       int               numeric, remain, sz, chsz;
 
        numeric = 1;
        remain = 0;
 
-       /* Convert v into a number (of characters). */
-       if (NULL == v)
-               sz = defsz;
-       else if (a2roffsu(v, &su, SCALE_MAX)) {
+       /* Convert the width into a number (of characters). */
+       if (bl->width == NULL)
+               sz = (bl->type == LIST_hang) ? 6 : 0;
+       else if (a2roffsu(bl->width, &su, SCALE_MAX) > 1) {
                if (SCALE_EN == su.unit)
                        sz = su.scale;
                else {
@@ -488,11 +487,15 @@ print_width(const char *v, const struct mdoc_node *child, size_t defsz)
                        numeric = 0;
                }
        } else
-               sz = strlen(v);
+               sz = strlen(bl->width);
 
        /* XXX Rough estimation, might have multiple parts. */
-       chsz = (NULL != child && MDOC_TEXT == child->type) ?
-           strlen(child->string) : 0;
+       if (bl->type == LIST_enum)
+               chsz = (bl->count > 8) + 1;
+       else if (child != NULL && child->type == MDOC_TEXT)
+               chsz = strlen(child->string);
+       else
+               chsz = 0;
 
        /* Maybe we are inside an enclosing list? */
        mid_it();
@@ -504,17 +507,17 @@ print_width(const char *v, const struct mdoc_node *child, size_t defsz)
        Bl_stack[Bl_stack_len++] = sz + 2;
 
        /* Set up the current list. */
-       if (defsz && chsz > sz)
+       if (chsz > sz && bl->type != LIST_tag)
                print_block(".HP", 0);
        else {
                print_block(".TP", 0);
                remain = sz + 2;
        }
        if (numeric) {
-               (void)snprintf(buf, sizeof(buf), "%zun", sz + 2);
+               (void)snprintf(buf, sizeof(buf), "%dn", sz + 2);
                print_word(buf);
        } else
-               print_word(v);
+               print_word(bl->width);
        TPremain = remain;
 }
 
@@ -523,7 +526,7 @@ print_count(int *count)
 {
        char              buf[24];
 
-       (void)snprintf(buf, sizeof(buf), "%d.", ++*count);
+       (void)snprintf(buf, sizeof(buf), "%d.\\&", ++*count);
        print_word(buf);
 }
 
@@ -544,10 +547,10 @@ void
 man_mdoc(void *arg, const struct mdoc *mdoc)
 {
        const struct mdoc_meta *meta;
-       const struct mdoc_node *n;
+       struct mdoc_node *n;
 
        meta = mdoc_meta(mdoc);
-       n = mdoc_node(mdoc);
+       n = mdoc_node(mdoc)->child;
 
        printf(".TH \"%s\" \"%s\" \"%s\" \"%s\" \"%s\"\n",
            meta->title,
@@ -563,15 +566,18 @@ man_mdoc(void *arg, const struct mdoc *mdoc)
                fontqueue.head = fontqueue.tail = mandoc_malloc(8);
                *fontqueue.tail = 'R';
        }
-       print_node(meta, n);
+       while (n != NULL) {
+               print_node(meta, n);
+               n = n->next;
+       }
        putchar('\n');
 }
 
 static void
 print_node(DECL_ARGS)
 {
-       const struct mdoc_node  *sub;
        const struct manact     *act;
+       struct mdoc_node        *sub;
        int                      cond, do_sub;
 
        /*
@@ -584,6 +590,7 @@ print_node(DECL_ARGS)
        act = NULL;
        cond = 0;
        do_sub = 1;
+       n->flags &= ~MDOC_ENDED;
 
        if (MDOC_TEXT == n->type) {
                /*
@@ -607,8 +614,8 @@ print_node(DECL_ARGS)
                 * node.
                 */
                act = manacts + n->tok;
-               cond = NULL == act->cond || (*act->cond)(meta, n);
-               if (cond && act->pre && ENDBODY_NOT == n->end)
+               cond = act->cond == NULL || (*act->cond)(meta, n);
+               if (cond && act->pre && (n->end == ENDBODY_NOT || n->nchild))
                        do_sub = (*act->pre)(meta, n);
        }
 
@@ -631,7 +638,7 @@ print_node(DECL_ARGS)
                (*act->post)(meta, n);
 
        if (ENDBODY_NOT != n->end)
-               n->pending->flags |= MDOC_ENDED;
+               n->body->flags |= MDOC_ENDED;
 
        if (ENDBODY_NOSPACE == n->end)
                outflags &= ~(MMAN_spc | MMAN_nl);
@@ -875,8 +882,8 @@ static int
 pre_aq(DECL_ARGS)
 {
 
-       print_word(n->parent->prev != NULL &&
-           n->parent->prev->tok == MDOC_An ?  "<" : "\\(la");
+       print_word(n->nchild == 1 &&
+           n->child->tok == MDOC_Mt ?  "<" : "\\(la");
        outflags &= ~MMAN_spc;
        return(1);
 }
@@ -886,8 +893,8 @@ post_aq(DECL_ARGS)
 {
 
        outflags &= ~(MMAN_spc | MMAN_nl);
-       print_word(n->parent->prev != NULL &&
-           n->parent->prev->tok == MDOC_An ?  ">" : "\\(ra");
+       print_word(n->nchild == 1 &&
+           n->child->tok == MDOC_Mt ?  ">" : "\\(ra");
 }
 
 static int
@@ -1002,10 +1009,12 @@ pre_bl(DECL_ARGS)
                return(1);
        }
 
-       print_line(".TS", MMAN_nl);
-       for (icol = 0; icol < n->norm->Bl.ncols; icol++)
-               print_word("l");
-       print_word(".");
+       if (n->nchild) {
+               print_line(".TS", MMAN_nl);
+               for (icol = 0; icol < n->norm->Bl.ncols; icol++)
+                       print_word("l");
+               print_word(".");
+       }
        outflags |= MMAN_nl;
        return(1);
 }
@@ -1016,7 +1025,8 @@ post_bl(DECL_ARGS)
 
        switch (n->norm->Bl.type) {
        case LIST_column:
-               print_line(".TE", 0);
+               if (n->nchild)
+                       print_line(".TE", 0);
                break;
        case LIST_enum:
                n->norm->Bl.count = 0;
@@ -1123,19 +1133,41 @@ post_en(DECL_ARGS)
        return;
 }
 
-static void
-post_eo(DECL_ARGS)
+static int
+pre_eo(DECL_ARGS)
 {
 
-       if (MDOC_HEAD == n->type || MDOC_BODY == n->type)
-               outflags &= ~MMAN_spc;
+       if (n->end == ENDBODY_NOT &&
+           n->parent->head->child == NULL &&
+           n->child != NULL &&
+           n->child->end != ENDBODY_NOT)
+               print_word("\\&");
+       else if (n->end != ENDBODY_NOT ? n->child != NULL :
+           n->parent->head->child != NULL && (n->child != NULL ||
+           (n->parent->tail != NULL && n->parent->tail->child != NULL)))
+               outflags &= ~(MMAN_spc | MMAN_nl);
+       return(1);
 }
 
-static int
-pre_es(DECL_ARGS)
+static void
+post_eo(DECL_ARGS)
 {
+       int      body, tail;
 
-       return(0);
+       if (n->end != ENDBODY_NOT) {
+               outflags |= MMAN_spc;
+               return;
+       }
+
+       body = n->child != NULL || n->parent->head->child != NULL;
+       tail = n->parent->tail != NULL && n->parent->tail->child != NULL;
+
+       if (body && tail)
+               outflags &= ~MMAN_spc;
+       else if ( ! (body || tail))
+               print_word("\\&");
+       else if ( ! tail)
+               outflags |= MMAN_spc;
 }
 
 static int
@@ -1254,12 +1286,14 @@ pre_fo(DECL_ARGS)
                pre_syn(n);
                break;
        case MDOC_HEAD:
+               if (n->child == NULL)
+                       return(0);
                if (MDOC_SYNPRETTY & n->flags)
                        print_block(".HP 4n", MMAN_nl);
                font_push('B');
                break;
        case MDOC_BODY:
-               outflags &= ~MMAN_spc;
+               outflags &= ~(MMAN_spc | MMAN_nl);
                print_word("(");
                outflags &= ~MMAN_spc;
                break;
@@ -1275,7 +1309,8 @@ post_fo(DECL_ARGS)
 
        switch (n->type) {
        case MDOC_HEAD:
-               font_pop();
+               if (n->child != NULL)
+                       font_pop();
                break;
        case MDOC_BODY:
                post_fn(meta, n);
@@ -1360,7 +1395,7 @@ pre_it(DECL_ARGS)
                case LIST_dash:
                        /* FALLTHROUGH */
                case LIST_hyphen:
-                       print_width(bln->norm->Bl.width, NULL, 0);
+                       print_width(&bln->norm->Bl, NULL);
                        TPremain = 0;
                        outflags |= MMAN_nl;
                        font_push('B');
@@ -1372,19 +1407,19 @@ pre_it(DECL_ARGS)
                        outflags |= MMAN_nl;
                        return(0);
                case LIST_enum:
-                       print_width(bln->norm->Bl.width, NULL, 0);
+                       print_width(&bln->norm->Bl, NULL);
                        TPremain = 0;
                        outflags |= MMAN_nl;
                        print_count(&bln->norm->Bl.count);
                        outflags |= MMAN_nl;
                        return(0);
                case LIST_hang:
-                       print_width(bln->norm->Bl.width, n->child, 6);
+                       print_width(&bln->norm->Bl, n->child);
                        TPremain = 0;
                        outflags |= MMAN_nl;
                        return(1);
                case LIST_tag:
-                       print_width(bln->norm->Bl.width, n->child, 0);
+                       print_width(&bln->norm->Bl, n->child);
                        putchar('\n');
                        outflags &= ~MMAN_spc;
                        return(1);
@@ -1416,7 +1451,7 @@ mid_it(void)
 
        /* Restore the indentation of the enclosing list. */
        print_line(".RS", MMAN_Bk_susp);
-       (void)snprintf(buf, sizeof(buf), "%zun",
+       (void)snprintf(buf, sizeof(buf), "%dn",
            Bl_stack[Bl_stack_len - 1]);
        print_word(buf);
 
@@ -1600,7 +1635,8 @@ static void
 post_pf(DECL_ARGS)
 {
 
-       outflags &= ~MMAN_spc;
+       if ( ! (n->next == NULL || n->next->flags & MDOC_LINE))
+               outflags &= ~MMAN_spc;
 }
 
 static int
@@ -1677,6 +1713,13 @@ pre_rv(DECL_ARGS)
        return(0);
 }
 
+static int
+pre_skip(DECL_ARGS)
+{
+
+       return(0);
+}
+
 static int
 pre_sm(DECL_ARGS)
 {