]> git.cameronkatri.com Git - mandoc.git/blobdiff - mdoc_man.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
warning about unknown .Lb arguments; inspired by mdoclint(1)
[mandoc.git] / mdoc_man.c
diff --git a/mdoc_man.c b/mdoc_man.c
index 38fb57e6ea52249176f700bfeee7cb437f236adb..5e6283456e00960ae7da7c44997aa2f0548308c5 100644 (file)
--- a/mdoc_man.c
+++ b/mdoc_man.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_man.c,v 1.110 2017/05/04 17:48:29 schwarze Exp $ */
+/*     $Id: mdoc_man.c,v 1.118 2017/06/06 15:01:04 schwarze Exp $ */
 /*
  * Copyright (c) 2011-2017 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -33,10 +33,13 @@
 
 #define        DECL_ARGS const struct roff_meta *meta, struct roff_node *n
 
+typedef        int     (*int_fp)(DECL_ARGS);
+typedef        void    (*void_fp)(DECL_ARGS);
+
 struct manact {
-       int             (*cond)(DECL_ARGS); /* DON'T run actions */
-       int             (*pre)(DECL_ARGS); /* pre-node action */
-       void            (*post)(DECL_ARGS); /* post-node action */
+       int_fp            cond; /* DON'T run actions */
+       int_fp            pre; /* pre-node action */
+       void_fp           post; /* post-node action */
        const char       *prefix; /* pre-node string constant */
        const char       *suffix; /* post-node string constant */
 };
@@ -70,7 +73,6 @@ static        void      post_nm(DECL_ARGS);
 static void      post_percent(DECL_ARGS);
 static void      post_pf(DECL_ARGS);
 static void      post_sect(DECL_ARGS);
-static void      post_sp(DECL_ARGS);
 static void      post_vt(DECL_ARGS);
 static int       pre__t(DECL_ARGS);
 static int       pre_an(DECL_ARGS);
@@ -80,7 +82,7 @@ static        int       pre_bd(DECL_ARGS);
 static int       pre_bf(DECL_ARGS);
 static int       pre_bk(DECL_ARGS);
 static int       pre_bl(DECL_ARGS);
-static int       pre_br(DECL_ARGS);
+static void      pre_br(DECL_ARGS);
 static int       pre_dl(DECL_ARGS);
 static int       pre_en(DECL_ARGS);
 static int       pre_enc(DECL_ARGS);
@@ -93,22 +95,24 @@ static      int       pre_fd(DECL_ARGS);
 static int       pre_fl(DECL_ARGS);
 static int       pre_fn(DECL_ARGS);
 static int       pre_fo(DECL_ARGS);
-static int       pre_ft(DECL_ARGS);
+static void      pre_ft(DECL_ARGS);
+static int       pre_Ft(DECL_ARGS);
 static int       pre_in(DECL_ARGS);
 static int       pre_it(DECL_ARGS);
 static int       pre_lk(DECL_ARGS);
 static int       pre_li(DECL_ARGS);
-static int       pre_ll(DECL_ARGS);
 static int       pre_nm(DECL_ARGS);
 static int       pre_no(DECL_ARGS);
 static int       pre_ns(DECL_ARGS);
+static void      pre_onearg(DECL_ARGS);
 static int       pre_pp(DECL_ARGS);
 static int       pre_rs(DECL_ARGS);
 static int       pre_sm(DECL_ARGS);
-static int       pre_sp(DECL_ARGS);
+static void      pre_sp(DECL_ARGS);
 static int       pre_sect(DECL_ARGS);
 static int       pre_sy(DECL_ARGS);
 static void      pre_syn(const struct roff_node *);
+static void      pre_ta(DECL_ARGS);
 static int       pre_vt(DECL_ARGS);
 static int       pre_xr(DECL_ARGS);
 static void      print_word(const char *);
@@ -120,6 +124,17 @@ static     void      print_width(const struct mdoc_bl *,
 static void      print_count(int *);
 static void      print_node(DECL_ARGS);
 
+static const void_fp roff_manacts[ROFF_MAX] = {
+       pre_br,
+       pre_onearg,
+       pre_ft,
+       pre_onearg,
+       pre_onearg,
+       pre_sp,
+       pre_ta,
+       pre_onearg,
+};
+
 static const struct manact __manacts[MDOC_MAX - MDOC_Dd] = {
        { NULL, NULL, NULL, NULL, NULL }, /* Dd */
        { NULL, NULL, NULL, NULL, NULL }, /* Dt */
@@ -148,14 +163,14 @@ static    const struct manact __manacts[MDOC_MAX - MDOC_Dd] = {
        { NULL, pre_fd, post_fd, NULL, NULL }, /* Fd */
        { NULL, pre_fl, post_fl, NULL, NULL }, /* Fl */
        { NULL, pre_fn, post_fn, NULL, NULL }, /* Fn */
-       { NULL, pre_ft, post_font, NULL, NULL }, /* Ft */
+       { NULL, pre_Ft, post_font, NULL, NULL }, /* Ft */
        { NULL, pre_sy, post_font, NULL, NULL }, /* Ic */
        { NULL, pre_in, post_in, NULL, NULL }, /* In */
        { NULL, pre_li, post_font, NULL, NULL }, /* Li */
        { cond_head, pre_enc, NULL, "\\- ", NULL }, /* Nd */
        { NULL, pre_nm, post_nm, NULL, NULL }, /* Nm */
        { cond_body, pre_enc, post_enc, "[", "]" }, /* Op */
-       { NULL, pre_ft, post_font, NULL, NULL }, /* Ot */
+       { NULL, pre_Ft, post_font, NULL, NULL }, /* Ot */
        { NULL, pre_em, post_font, NULL, NULL }, /* Pa */
        { NULL, pre_ex, NULL, NULL, NULL }, /* Rv */
        { NULL, NULL, NULL, NULL, NULL }, /* St */
@@ -239,10 +254,8 @@ static     const struct manact __manacts[MDOC_MAX - MDOC_Dd] = {
        { cond_body, pre_en, post_en, NULL, NULL }, /* En */
        { NULL, NULL, NULL, NULL, NULL }, /* Dx */
        { NULL, NULL, post_percent, NULL, NULL }, /* %Q */
-       { NULL, pre_sp, post_sp, NULL, NULL }, /* sp */
        { NULL, NULL, post_percent, NULL, NULL }, /* %U */
        { NULL, NULL, NULL, NULL, NULL }, /* Ta */
-       { NULL, pre_ll, post_sp, NULL, NULL }, /* ll */
 };
 static const struct manact *const manacts = __manacts - MDOC_Dd;
 
@@ -435,7 +448,6 @@ static void
 print_line(const char *s, int newflags)
 {
 
-       outflags &= ~MMAN_br;
        outflags |= MMAN_nl;
        print_word(s);
        outflags |= newflags;
@@ -652,13 +664,8 @@ print_node(DECL_ARGS)
                else if (outflags & MMAN_Sm)
                        outflags |= MMAN_spc;
        } else if (n->tok < ROFF_MAX) {
-               switch (n->tok) {
-               case ROFF_br:
-                       pre_br(meta, n);
-                       break;
-               default:
-                       abort();
-               }
+               (*roff_manacts[n->tok])(meta, n);
+               return;
        } else {
                assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX);
                /*
@@ -1064,12 +1071,10 @@ post_bl(DECL_ARGS)
 
 }
 
-static int
+static void
 pre_br(DECL_ARGS)
 {
-
        outflags |= MMAN_br;
-       return 0;
 }
 
 static int
@@ -1314,7 +1319,7 @@ post_fo(DECL_ARGS)
 }
 
 static int
-pre_ft(DECL_ARGS)
+pre_Ft(DECL_ARGS)
 {
 
        pre_syn(n);
@@ -1322,6 +1327,14 @@ pre_ft(DECL_ARGS)
        return 1;
 }
 
+static void
+pre_ft(DECL_ARGS)
+{
+       print_line(".ft", 0);
+       print_word(n->child->string);
+       outflags |= MMAN_nl;
+}
+
 static int
 pre_in(DECL_ARGS)
 {
@@ -1516,16 +1529,22 @@ post_lb(DECL_ARGS)
 static int
 pre_lk(DECL_ARGS)
 {
-       const struct roff_node *link, *descr;
+       const struct roff_node *link, *descr, *punct;
        int display;
 
        if ((link = n->child) == NULL)
                return 0;
 
+       /* Find beginning of trailing punctuation. */
+       punct = n->last;
+       while (punct != link && punct->flags & NODE_DELIMC)
+               punct = punct->prev;
+       punct = punct->next;
+
        /* Link text. */
-       if ((descr = link->next) != NULL && !(descr->flags & NODE_DELIMC)) {
+       if ((descr = link->next) != NULL && descr != punct) {
                font_push('I');
-               while (descr != NULL && !(descr->flags & NODE_DELIMC)) {
+               while (descr != punct) {
                        print_word(descr->string);
                        descr = descr->next;
                }
@@ -1545,21 +1564,28 @@ pre_lk(DECL_ARGS)
        font_pop();
 
        /* Trailing punctuation. */
-       while (descr != NULL) {
-               print_word(descr->string);
-               descr = descr->next;
+       while (punct != NULL) {
+               print_word(punct->string);
+               punct = punct->next;
        }
        if (display)
                print_line(".RE", MMAN_nl);
        return 0;
 }
 
-static int
-pre_ll(DECL_ARGS)
+static void
+pre_onearg(DECL_ARGS)
 {
-
-       print_line(".ll", 0);
-       return 1;
+       outflags |= MMAN_nl;
+       print_word(".");
+       outflags &= ~MMAN_spc;
+       print_word(roff_name[n->tok]);
+       if (n->child != NULL)
+               print_word(n->child->string);
+       outflags |= MMAN_nl;
+       if (n->tok == ROFF_ce)
+               for (n = n->child->next; n != NULL; n = n->next)
+                       print_node(meta, n);
 }
 
 static int
@@ -1683,22 +1709,17 @@ pre_sm(DECL_ARGS)
        return 0;
 }
 
-static int
+static void
 pre_sp(DECL_ARGS)
 {
-
-       if (MMAN_PP & outflags) {
+       if (outflags & MMAN_PP) {
                outflags &= ~MMAN_PP;
                print_line(".PP", 0);
-       } else
+       } else {
                print_line(".sp", 0);
-       return 1;
-}
-
-static void
-post_sp(DECL_ARGS)
-{
-
+               if (n->child != NULL)
+                       print_word(n->child->string);
+       }
        outflags |= MMAN_nl;
 }
 
@@ -1710,6 +1731,15 @@ pre_sy(DECL_ARGS)
        return 1;
 }
 
+static void
+pre_ta(DECL_ARGS)
+{
+       print_line(".ta", 0);
+       for (n = n->child; n != NULL; n = n->next)
+               print_word(n->string);
+       outflags |= MMAN_nl;
+}
+
 static int
 pre_vt(DECL_ARGS)
 {
A git conversion mirror of mandoc.bsd.lv