Continue parser unification:

[mandoc.git] / mdoc_man.c

diff --git a/mdoc_man.c b/mdoc_man.c
index 88d39370e8c2a872badcdad69c81ee3340df741d..d1f903723c5eb260de7aa2ed4bc1851d9d88e1f4 100644 (file)
--- a/mdoc_man.c
+++ b/mdoc_man.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_man.c,v 1.104 2017/02/17 19:15:41 schwarze Exp $ */
+/*     $Id: mdoc_man.c,v 1.109 2017/04/24 23:06:18 schwarze Exp $ */
 /*
  * Copyright (c) 2011-2017 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -44,6 +44,7 @@ static        int       cond_body(DECL_ARGS);
 static int       cond_head(DECL_ARGS);
 static  void     font_push(char);
 static void      font_pop(void);
+static int       man_strlen(const char *);
 static void      mid_it(void);
 static void      post__t(DECL_ARGS);
 static void      post_aq(DECL_ARGS);
@@ -118,8 +119,7 @@ static      void      print_width(const struct mdoc_bl *,
 static void      print_count(int *);
 static void      print_node(DECL_ARGS);
 
-static const struct manact manacts[MDOC_MAX + 1] = {
-       { NULL, pre_ap, NULL, NULL, NULL }, /* Ap */
+static const struct manact __manacts[MDOC_MAX - MDOC_Dd] = {
        { NULL, NULL, NULL, NULL, NULL }, /* Dd */
        { NULL, NULL, NULL, NULL, NULL }, /* Dt */
        { NULL, NULL, NULL, NULL, NULL }, /* Os */
@@ -135,6 +135,7 @@ static      const struct manact manacts[MDOC_MAX + 1] = {
        { NULL, pre_it, post_it, NULL, NULL }, /* It */
        { NULL, pre_em, post_font, NULL, NULL }, /* Ad */
        { NULL, pre_an, NULL, NULL, NULL }, /* An */
+       { NULL, pre_ap, NULL, NULL, NULL }, /* Ap */
        { NULL, pre_em, post_font, NULL, NULL }, /* Ar */
        { NULL, pre_sy, post_font, NULL, NULL }, /* Cd */
        { NULL, pre_sy, post_font, NULL, NULL }, /* Cm */
@@ -242,8 +243,8 @@ static      const struct manact manacts[MDOC_MAX + 1] = {
        { NULL, NULL, post_percent, NULL, NULL }, /* %U */
        { NULL, NULL, NULL, NULL, NULL }, /* Ta */
        { NULL, pre_ll, post_sp, NULL, NULL }, /* ll */
-       { NULL, NULL, NULL, NULL, NULL }, /* ROOT */
 };
+static const struct manact *const manacts = __manacts - MDOC_Dd;
 
 static int             outflags;
 #define        MMAN_spc        (1 << 0)  /* blank character before next word */
@@ -274,6 +275,49 @@ static     struct {
 }      fontqueue;
 
 
+static int
+man_strlen(const char *cp)
+{
+       size_t   rsz;
+       int      skip, sz;
+
+       sz = 0;
+       skip = 0;
+       for (;;) {
+               rsz = strcspn(cp, "\\");
+               if (rsz) {
+                       cp += rsz;
+                       if (skip) {
+                               skip = 0;
+                               rsz--;
+                       }
+                       sz += rsz;
+               }
+               if ('\0' == *cp)
+                       break;
+               cp++;
+               switch (mandoc_escape(&cp, NULL, NULL)) {
+               case ESCAPE_ERROR:
+                       return sz;
+               case ESCAPE_UNICODE:
+               case ESCAPE_NUMBERED:
+               case ESCAPE_SPECIAL:
+               case ESCAPE_OVERSTRIKE:
+                       if (skip)
+                               skip = 0;
+                       else
+                               sz++;
+                       break;
+               case ESCAPE_SKIPCHAR:
+                       skip = 1;
+                       break;
+               default:
+                       break;
+               }
+       }
+       return sz;
+}
+
 static void
 font_push(char newfont)
 {
@@ -447,7 +491,7 @@ print_offs(const char *v, int keywords)
                        return;
                }
        } else
-               sz = strlen(v);
+               sz = man_strlen(v);
 
        /*
         * We are inside an enclosing list.
@@ -485,13 +529,13 @@ print_width(const struct mdoc_bl *bl, const struct roff_node *child)
                        numeric = 0;
                }
        } else
-               sz = strlen(bl->width);
+               sz = man_strlen(bl->width);
 
        /* XXX Rough estimation, might have multiple parts. */
        if (bl->type == LIST_enum)
                chsz = (bl->count > 8) + 1;
        else if (child != NULL && child->type == ROFFT_TEXT)
-               chsz = strlen(child->string);
+               chsz = man_strlen(child->string);
        else
                chsz = 0;
 
@@ -715,8 +759,7 @@ static int
 pre__t(DECL_ARGS)
 {
 
-       if (n->parent && MDOC_Rs == n->parent->tok &&
-           n->parent->norm->Rs.quote_T) {
+       if (n->parent->tok == MDOC_Rs && n->parent->norm->Rs.quote_T) {
                print_word("\\(lq");
                outflags &= ~MMAN_spc;
        } else
@@ -728,8 +771,7 @@ static void
 post__t(DECL_ARGS)
 {
 
-       if (n->parent && MDOC_Rs == n->parent->tok &&
-           n->parent->norm->Rs.quote_T) {
+       if (n->parent->tok  == MDOC_Rs && n->parent->norm->Rs.quote_T) {
                outflags &= ~MMAN_spc;
                print_word("\\(rq");
        } else
@@ -1466,23 +1508,40 @@ static int
 pre_lk(DECL_ARGS)
 {
        const struct roff_node *link, *descr;
+       int display;
 
-       if (NULL == (link = n->child))
+       if ((link = n->child) == NULL)
                return 0;
 
-       if (NULL != (descr = link->next)) {
+       /* Link text. */
+       if ((descr = link->next) != NULL && !(descr->flags & NODE_DELIMC)) {
                font_push('I');
-               while (NULL != descr) {
+               while (descr != NULL && !(descr->flags & NODE_DELIMC)) {
                        print_word(descr->string);
                        descr = descr->next;
                }
-               print_word(":");
                font_pop();
+               print_word(":");
        }
 
+       /* Link target. */
+       display = man_strlen(link->string) >= 26;
+       if (display) {
+               print_line(".RS", MMAN_Bk_susp);
+               print_word("6n");
+               outflags |= MMAN_nl;
+       }
        font_push('B');
        print_word(link->string);
        font_pop();
+
+       /* Trailing punctuation. */
+       while (descr != NULL) {
+               print_word(descr->string);
+               descr = descr->next;
+       }
+       if (display)
+               print_line(".RE", MMAN_nl);
        return 0;
 }
 
@@ -1520,7 +1579,7 @@ pre_nm(DECL_ARGS)
                if (NULL == n->parent->prev)
                        outflags |= MMAN_sp;
                print_block(".HP", 0);
-               printf(" %zun", strlen(name) + 1);
+               printf(" %dn", man_strlen(name) + 1);
                outflags |= MMAN_nl;
        }
        font_push('B');