Make sure manuals in architecture-independent directories are treated

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index bed304c18544da0232251efaba8717eead68bbb0..e846436273da6d8117c6a89d432c2b295e3beec0 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,7 +1,7 @@
-/*     $Id: mdoc_term.c,v 1.321 2015/07/25 14:02:06 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.331 2016/01/08 17:48:09 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2016 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -95,6 +95,7 @@ static        int       termp_bx_pre(DECL_ARGS);
 static int       termp_cd_pre(DECL_ARGS);
 static int       termp_d1_pre(DECL_ARGS);
 static int       termp_eo_pre(DECL_ARGS);
+static int       termp_er_pre(DECL_ARGS);
 static int       termp_ex_pre(DECL_ARGS);
 static int       termp_fa_pre(DECL_ARGS);
 static int       termp_fd_pre(DECL_ARGS);
@@ -145,8 +146,8 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_under_pre, NULL }, /* Ar */
        { termp_cd_pre, NULL }, /* Cd */
        { termp_bold_pre, NULL }, /* Cm */
-       { NULL, NULL }, /* Dv */
-       { NULL, NULL }, /* Er */
+       { termp_li_pre, NULL }, /* Dv */
+       { termp_er_pre, NULL }, /* Er */
        { termp_tag_pre, NULL }, /* Ev */
        { termp_ex_pre, NULL }, /* Ex */
        { termp_fa_pre, NULL }, /* Fa */
@@ -251,6 +252,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_ll_pre, NULL }, /* ll */
 };
 
+static int      fn_prio;
 
 void
 terminal_mdoc(void *arg, const struct roff_man *mdoc)
@@ -355,7 +357,7 @@ print_mdoc_node(DECL_ARGS)
                break;
        default:
                if (termacts[n->tok].pre &&
-                   (n->end == ENDBODY_NOT || n->nchild))
+                   (n->end == ENDBODY_NOT || n->child != NULL))
                        chld = (*termacts[n->tok].pre)
                                (p, &npair, meta, n);
                break;
@@ -533,7 +535,7 @@ a2width(const struct termp *p, const char *v)
                SCALE_HS_INIT(&su, term_strlen(p, v));
                su.scale /= term_strlen(p, "0");
        }
-       return(term_hspan(p, &su) / 24);
+       return term_hspan(p, &su) / 24;
 }
 
 /*
@@ -596,8 +598,8 @@ static int
 termp_ll_pre(DECL_ARGS)
 {
 
-       term_setwidth(p, n->nchild ? n->child->string : NULL);
-       return(0);
+       term_setwidth(p, n->child != NULL ? n->child->string : NULL);
+       return 0;
 }
 
 static int
@@ -611,7 +613,7 @@ termp_it_pre(DECL_ARGS)
 
        if (n->type == ROFFT_BLOCK) {
                print_bvspace(p, n->parent->parent, n);
-               return(1);
+               return 1;
        }
 
        bl = n->parent->parent->parent;
@@ -623,11 +625,8 @@ termp_it_pre(DECL_ARGS)
 
        switch (type) {
        case LIST_bullet:
-               /* FALLTHROUGH */
        case LIST_dash:
-               /* FALLTHROUGH */
        case LIST_hyphen:
-               /* FALLTHROUGH */
        case LIST_enum:
                width = term_len(p, 2);
                break;
@@ -635,7 +634,6 @@ termp_it_pre(DECL_ARGS)
                width = term_len(p, 8);
                break;
        case LIST_column:
-               /* FALLTHROUGH */
        case LIST_tag:
                width = term_len(p, 10);
                break;
@@ -733,7 +731,7 @@ termp_it_pre(DECL_ARGS)
                        term_word(p, "\\ \\ ");
                break;
        case LIST_inset:
-               if (n->type == ROFFT_BODY && n->parent->head->nchild)
+               if (n->type == ROFFT_BODY && n->parent->head->child != NULL)
                        term_word(p, "\\ ");
                break;
        default:
@@ -760,16 +758,13 @@ termp_it_pre(DECL_ARGS)
 
        switch (type) {
        case LIST_enum:
+       case LIST_bullet:
+       case LIST_dash:
+       case LIST_hyphen:
                /*
                 * Weird special case.
                 * Some very narrow lists actually hang.
                 */
-               /* FALLTHROUGH */
-       case LIST_bullet:
-               /* FALLTHROUGH */
-       case LIST_dash:
-               /* FALLTHROUGH */
-       case LIST_hyphen:
                if (width <= (int)term_len(p, 2))
                        p->flags |= TERMP_HANG;
                if (n->type != ROFFT_HEAD)
@@ -800,7 +795,7 @@ termp_it_pre(DECL_ARGS)
                if (n->type != ROFFT_HEAD)
                        break;
 
-               p->flags |= TERMP_NOBREAK | TERMP_BRIND;
+               p->flags |= TERMP_NOBREAK | TERMP_BRTRSP | TERMP_BRIND;
                p->trailspace = 2;
 
                if (NULL == n->next || NULL == n->next->child)
@@ -852,13 +847,9 @@ termp_it_pre(DECL_ARGS)
                        break;
                /* FALLTHROUGH */
        case LIST_bullet:
-               /* FALLTHROUGH */
        case LIST_dash:
-               /* FALLTHROUGH */
        case LIST_enum:
-               /* FALLTHROUGH */
        case LIST_hyphen:
-               /* FALLTHROUGH */
        case LIST_tag:
                if (n->type == ROFFT_HEAD)
                        p->rmargin = p->offset + width;
@@ -894,10 +885,9 @@ termp_it_pre(DECL_ARGS)
                        term_fontpop(p);
                        break;
                case LIST_dash:
-                       /* FALLTHROUGH */
                case LIST_hyphen:
                        term_fontpush(p, TERMFONT_BOLD);
-                       term_word(p, "\\(hy");
+                       term_word(p, "-");
                        term_fontpop(p);
                        break;
                case LIST_enum:
@@ -916,26 +906,22 @@ termp_it_pre(DECL_ARGS)
 
        switch (type) {
        case LIST_bullet:
-               /* FALLTHROUGH */
        case LIST_item:
-               /* FALLTHROUGH */
        case LIST_dash:
-               /* FALLTHROUGH */
        case LIST_hyphen:
-               /* FALLTHROUGH */
        case LIST_enum:
                if (n->type == ROFFT_HEAD)
-                       return(0);
+                       return 0;
                break;
        case LIST_column:
                if (n->type == ROFFT_HEAD)
-                       return(0);
+                       return 0;
                break;
        default:
                break;
        }
 
-       return(1);
+       return 1;
 }
 
 static void
@@ -950,9 +936,7 @@ termp_it_post(DECL_ARGS)
 
        switch (type) {
        case LIST_item:
-               /* FALLTHROUGH */
        case LIST_diag:
-               /* FALLTHROUGH */
        case LIST_inset:
                if (n->type == ROFFT_BODY)
                        term_newln(p);
@@ -972,7 +956,7 @@ termp_it_post(DECL_ARGS)
         * has munged them in the meanwhile.
         */
 
-       p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND |
+       p->flags &= ~(TERMP_NOBREAK | TERMP_BRTRSP | TERMP_BRIND |
                        TERMP_DANGLE | TERMP_HANG);
        p->trailspace = 0;
 }
@@ -984,12 +968,12 @@ termp_nm_pre(DECL_ARGS)
 
        if (n->type == ROFFT_BLOCK) {
                p->flags |= TERMP_PREKEEP;
-               return(1);
+               return 1;
        }
 
        if (n->type == ROFFT_BODY) {
                if (NULL == n->child)
-                       return(0);
+                       return 0;
                p->flags |= TERMP_NOSPACE;
                cp = NULL;
                if (n->prev->child != NULL)
@@ -1000,11 +984,11 @@ termp_nm_pre(DECL_ARGS)
                        p->offset += term_len(p, 6);
                else
                        p->offset += term_len(p, 1) + term_strlen(p, cp);
-               return(1);
+               return 1;
        }
 
        if (NULL == n->child && NULL == meta->name)
-               return(0);
+               return 0;
 
        if (n->type == ROFFT_HEAD)
                synopsis_pre(p, n->parent);
@@ -1029,7 +1013,7 @@ termp_nm_pre(DECL_ARGS)
        term_fontpush(p, TERMFONT_BOLD);
        if (NULL == n->child)
                term_word(p, meta->name);
-       return(1);
+       return 1;
 }
 
 static void
@@ -1055,13 +1039,13 @@ termp_fl_pre(DECL_ARGS)
        term_fontpush(p, TERMFONT_BOLD);
        term_word(p, "\\-");
 
-       if ( ! (n->nchild == 0 &&
+       if (!(n->child == NULL &&
            (n->next == NULL ||
             n->next->type == ROFFT_TEXT ||
             n->next->flags & MDOC_LINE)))
                p->flags |= TERMP_NOSPACE;
 
-       return(1);
+       return 1;
 }
 
 static int
@@ -1072,7 +1056,7 @@ termp__a_pre(DECL_ARGS)
                if (NULL == n->next || MDOC__A != n->next->tok)
                        term_word(p, "and");
 
-       return(1);
+       return 1;
 }
 
 static int
@@ -1082,12 +1066,12 @@ termp_an_pre(DECL_ARGS)
        if (n->norm->An.auth == AUTH_split) {
                p->flags &= ~TERMP_NOSPLIT;
                p->flags |= TERMP_SPLIT;
-               return(0);
+               return 0;
        }
        if (n->norm->An.auth == AUTH_nosplit) {
                p->flags &= ~TERMP_SPLIT;
                p->flags |= TERMP_NOSPLIT;
-               return(0);
+               return 0;
        }
 
        if (p->flags & TERMP_SPLIT)
@@ -1096,7 +1080,7 @@ termp_an_pre(DECL_ARGS)
        if (n->sec == SEC_AUTHORS && ! (p->flags & TERMP_NOSPLIT))
                p->flags |= TERMP_SPLIT;
 
-       return(1);
+       return 1;
 }
 
 static int
@@ -1105,7 +1089,7 @@ termp_ns_pre(DECL_ARGS)
 
        if ( ! (MDOC_LINE & n->flags))
                p->flags |= TERMP_NOSPACE;
-       return(1);
+       return 1;
 }
 
 static int
@@ -1113,43 +1097,42 @@ termp_rs_pre(DECL_ARGS)
 {
 
        if (SEC_SEE_ALSO != n->sec)
-               return(1);
+               return 1;
        if (n->type == ROFFT_BLOCK && n->prev != NULL)
                term_vspace(p);
-       return(1);
+       return 1;
 }
 
 static int
 termp_rv_pre(DECL_ARGS)
 {
-       int              nchild;
+       struct roff_node *nch;
 
        term_newln(p);
 
-       nchild = n->nchild;
-       if (nchild > 0) {
+       if (n->child != NULL) {
                term_word(p, "The");
 
-               for (n = n->child; n; n = n->next) {
+               for (nch = n->child; nch != NULL; nch = nch->next) {
                        term_fontpush(p, TERMFONT_BOLD);
-                       term_word(p, n->string);
+                       term_word(p, nch->string);
                        term_fontpop(p);
 
                        p->flags |= TERMP_NOSPACE;
                        term_word(p, "()");
 
-                       if (n->next == NULL)
+                       if (nch->next == NULL)
                                continue;
 
-                       if (nchild > 2) {
+                       if (nch->prev != NULL || nch->next->next != NULL) {
                                p->flags |= TERMP_NOSPACE;
                                term_word(p, ",");
                        }
-                       if (n->next->next == NULL)
+                       if (nch->next->next == NULL)
                                term_word(p, "and");
                }
 
-               if (nchild > 1)
+               if (n->child != NULL && n->child->next != NULL)
                        term_word(p, "functions return");
                else
                        term_word(p, "function returns");
@@ -1169,33 +1152,35 @@ termp_rv_pre(DECL_ARGS)
        term_word(p, "is set to indicate the error.");
        p->flags |= TERMP_SENTENCE;
 
-       return(0);
+       return 0;
 }
 
 static int
 termp_ex_pre(DECL_ARGS)
 {
-       int              nchild;
+       struct roff_node *nch;
 
        term_newln(p);
        term_word(p, "The");
 
-       nchild = n->nchild;
-       for (n = n->child; n; n = n->next) {
+       for (nch = n->child; nch != NULL; nch = nch->next) {
                term_fontpush(p, TERMFONT_BOLD);
-               term_word(p, n->string);
+               term_word(p, nch->string);
                term_fontpop(p);
 
-               if (nchild > 2 && n->next) {
+               if (nch->next == NULL)
+                       continue;
+
+               if (nch->prev != NULL || nch->next->next != NULL) {
                        p->flags |= TERMP_NOSPACE;
                        term_word(p, ",");
                }
 
-               if (n->next && NULL == n->next->next)
+               if (nch->next->next == NULL)
                        term_word(p, "and");
        }
 
-       if (nchild > 1)
+       if (n->child != NULL && n->child->next != NULL)
                term_word(p, "utilities exit\\~0");
        else
                term_word(p, "utility exits\\~0");
@@ -1203,7 +1188,7 @@ termp_ex_pre(DECL_ARGS)
        term_word(p, "on success, and\\~>0 if an error occurs.");
 
        p->flags |= TERMP_SENTENCE;
-       return(0);
+       return 0;
 }
 
 static int
@@ -1212,14 +1197,14 @@ termp_nd_pre(DECL_ARGS)
 
        if (n->type == ROFFT_BODY)
                term_word(p, "\\(en");
-       return(1);
+       return 1;
 }
 
 static int
 termp_bl_pre(DECL_ARGS)
 {
 
-       return(n->type != ROFFT_HEAD);
+       return n->type != ROFFT_HEAD;
 }
 
 static void
@@ -1235,13 +1220,13 @@ termp_xr_pre(DECL_ARGS)
 {
 
        if (NULL == (n = n->child))
-               return(0);
+               return 0;
 
        assert(n->type == ROFFT_TEXT);
        term_word(p, n->string);
 
        if (NULL == (n = n->next))
-               return(0);
+               return 0;
 
        p->flags |= TERMP_NOSPACE;
        term_word(p, "(");
@@ -1253,7 +1238,7 @@ termp_xr_pre(DECL_ARGS)
        p->flags |= TERMP_NOSPACE;
        term_word(p, ")");
 
-       return(0);
+       return 0;
 }
 
 /*
@@ -1291,13 +1276,9 @@ synopsis_pre(struct termp *p, const struct roff_node *n)
         */
        switch (n->prev->tok) {
        case MDOC_Fd:
-               /* FALLTHROUGH */
        case MDOC_Fn:
-               /* FALLTHROUGH */
        case MDOC_Fo:
-               /* FALLTHROUGH */
        case MDOC_In:
-               /* FALLTHROUGH */
        case MDOC_Vt:
                term_vspace(p);
                break;
@@ -1319,14 +1300,14 @@ termp_vt_pre(DECL_ARGS)
 
        if (n->type == ROFFT_ELEM) {
                synopsis_pre(p, n);
-               return(termp_under_pre(p, pair, meta, n));
+               return termp_under_pre(p, pair, meta, n);
        } else if (n->type == ROFFT_BLOCK) {
                synopsis_pre(p, n);
-               return(1);
+               return 1;
        } else if (n->type == ROFFT_HEAD)
-               return(0);
+               return 0;
 
-       return(termp_under_pre(p, pair, meta, n));
+       return termp_under_pre(p, pair, meta, n);
 }
 
 static int
@@ -1335,7 +1316,7 @@ termp_bold_pre(DECL_ARGS)
 
        termp_tag_pre(p, pair, meta, n);
        term_fontpush(p, TERMFONT_BOLD);
-       return(1);
+       return 1;
 }
 
 static int
@@ -1343,7 +1324,7 @@ termp_fd_pre(DECL_ARGS)
 {
 
        synopsis_pre(p, n);
-       return(termp_bold_pre(p, pair, meta, n));
+       return termp_bold_pre(p, pair, meta, n);
 }
 
 static void
@@ -1364,7 +1345,7 @@ termp_sh_pre(DECL_ARGS)
                 * when the previous section was empty.
                 */
                if (n->prev == NULL ||
-                   MDOC_Sh != n->prev->tok ||
+                   n->prev->tok != MDOC_Sh ||
                    (n->prev->body != NULL &&
                     n->prev->body->child != NULL))
                        term_vspace(p);
@@ -1374,13 +1355,21 @@ termp_sh_pre(DECL_ARGS)
                break;
        case ROFFT_BODY:
                p->offset = term_len(p, p->defindent);
-               if (SEC_AUTHORS == n->sec)
+               switch (n->sec) {
+               case SEC_DESCRIPTION:
+                       fn_prio = 0;
+                       break;
+               case SEC_AUTHORS:
                        p->flags &= ~(TERMP_SPLIT|TERMP_NOSPLIT);
+                       break;
+               default:
+                       break;
+               }
                break;
        default:
                break;
        }
-       return(1);
+       return 1;
 }
 
 static void
@@ -1406,7 +1395,7 @@ termp_bt_pre(DECL_ARGS)
 
        term_word(p, "is currently in beta test.");
        p->flags |= TERMP_SENTENCE;
-       return(0);
+       return 0;
 }
 
 static void
@@ -1423,7 +1412,7 @@ termp_ud_pre(DECL_ARGS)
 
        term_word(p, "currently under development.");
        p->flags |= TERMP_SENTENCE;
-       return(0);
+       return 0;
 }
 
 static int
@@ -1431,10 +1420,10 @@ termp_d1_pre(DECL_ARGS)
 {
 
        if (n->type != ROFFT_BLOCK)
-               return(1);
+               return 1;
        term_newln(p);
        p->offset += term_len(p, p->defindent + 1);
-       return(1);
+       return 1;
 }
 
 static int
@@ -1444,7 +1433,7 @@ termp_ft_pre(DECL_ARGS)
        /* NB: MDOC_LINE does not effect this! */
        synopsis_pre(p, n);
        term_fontpush(p, TERMFONT_UNDER);
-       return(1);
+       return 1;
 }
 
 static int
@@ -1458,7 +1447,7 @@ termp_fn_pre(DECL_ARGS)
        synopsis_pre(p, n);
 
        if (NULL == (n = n->child))
-               return(0);
+               return 0;
 
        if (pretty) {
                rmargin = p->rmargin;
@@ -1471,6 +1460,9 @@ termp_fn_pre(DECL_ARGS)
        term_word(p, n->string);
        term_fontpop(p);
 
+       if (n->sec == SEC_DESCRIPTION)
+               tag_put(n->string, ++fn_prio, p->line);
+
        if (pretty) {
                term_flushln(p);
                p->flags &= ~(TERMP_NOBREAK | TERMP_BRIND | TERMP_HANG);
@@ -1505,7 +1497,7 @@ termp_fn_pre(DECL_ARGS)
                term_flushln(p);
        }
 
-       return(0);
+       return 0;
 }
 
 static int
@@ -1515,7 +1507,7 @@ termp_fa_pre(DECL_ARGS)
 
        if (n->parent->tok != MDOC_Fo) {
                term_fontpush(p, TERMFONT_UNDER);
-               return(1);
+               return 1;
        }
 
        for (nn = n->child; nn; nn = nn->next) {
@@ -1530,7 +1522,7 @@ termp_fa_pre(DECL_ARGS)
                }
        }
 
-       return(0);
+       return 0;
 }
 
 static int
@@ -1542,9 +1534,9 @@ termp_bd_pre(DECL_ARGS)
 
        if (n->type == ROFFT_BLOCK) {
                print_bvspace(p, n, n);
-               return(1);
+               return 1;
        } else if (n->type == ROFFT_HEAD)
-               return(0);
+               return 0;
 
        /* Handle the -offset argument. */
 
@@ -1574,7 +1566,7 @@ termp_bd_pre(DECL_ARGS)
        if (DISP_literal != n->norm->Bd.type &&
            DISP_unfilled != n->norm->Bd.type &&
            DISP_centered != n->norm->Bd.type)
-               return(1);
+               return 1;
 
        tabwidth = p->tabwidth;
        if (DISP_literal == n->norm->Bd.type)
@@ -1604,19 +1596,12 @@ termp_bd_pre(DECL_ARGS)
                 */
                switch (nn->tok) {
                case MDOC_Sm:
-                       /* FALLTHROUGH */
                case MDOC_br:
-                       /* FALLTHROUGH */
                case MDOC_sp:
-                       /* FALLTHROUGH */
                case MDOC_Bl:
-                       /* FALLTHROUGH */
                case MDOC_D1:
-                       /* FALLTHROUGH */
                case MDOC_Dl:
-                       /* FALLTHROUGH */
                case MDOC_Lp:
-                       /* FALLTHROUGH */
                case MDOC_Pp:
                        continue;
                default:
@@ -1632,7 +1617,7 @@ termp_bd_pre(DECL_ARGS)
        p->tabwidth = tabwidth;
        p->rmargin = rm;
        p->maxrmargin = rmax;
-       return(0);
+       return 0;
 }
 
 static void
@@ -1667,7 +1652,7 @@ termp_bx_pre(DECL_ARGS)
                term_word(p, "BSD");
        } else {
                term_word(p, "BSD");
-               return(0);
+               return 0;
        }
 
        if (NULL != (n = n->next)) {
@@ -1677,7 +1662,7 @@ termp_bx_pre(DECL_ARGS)
                term_word(p, n->string);
        }
 
-       return(0);
+       return 0;
 }
 
 static int
@@ -1708,7 +1693,6 @@ termp_xx_pre(DECL_ARGS)
                break;
        default:
                abort();
-               /* NOTREACHED */
        }
 
        term_word(p, pp);
@@ -1718,7 +1702,7 @@ termp_xx_pre(DECL_ARGS)
                term_word(p, n->child->string);
                p->flags = flags;
        }
-       return(0);
+       return 0;
 }
 
 static void
@@ -1750,7 +1734,7 @@ termp_ss_pre(DECL_ARGS)
                break;
        }
 
-       return(1);
+       return 1;
 }
 
 static void
@@ -1767,7 +1751,7 @@ termp_cd_pre(DECL_ARGS)
 
        synopsis_pre(p, n);
        term_fontpush(p, TERMFONT_BOLD);
-       return(1);
+       return 1;
 }
 
 static int
@@ -1786,7 +1770,7 @@ termp_in_pre(DECL_ARGS)
        }
 
        p->flags |= TERMP_NOSPACE;
-       return(1);
+       return 1;
 }
 
 static void
@@ -1823,6 +1807,7 @@ termp_sp_pre(DECL_ARGS)
                break;
        default:
                len = 1;
+               fn_prio = 0;
                break;
        }
 
@@ -1834,14 +1819,14 @@ termp_sp_pre(DECL_ARGS)
                for (i = 0; i < len; i++)
                        term_vspace(p);
 
-       return(0);
+       return 0;
 }
 
 static int
 termp_skip_pre(DECL_ARGS)
 {
 
-       return(0);
+       return 0;
 }
 
 static int
@@ -1849,66 +1834,54 @@ termp_quote_pre(DECL_ARGS)
 {
 
        if (n->type != ROFFT_BODY && n->type != ROFFT_ELEM)
-               return(1);
+               return 1;
 
        switch (n->tok) {
        case MDOC_Ao:
-               /* FALLTHROUGH */
        case MDOC_Aq:
-               term_word(p, n->nchild == 1 &&
+               term_word(p, n->child != NULL && n->child->next == NULL &&
                    n->child->tok == MDOC_Mt ? "<" : "\\(la");
                break;
        case MDOC_Bro:
-               /* FALLTHROUGH */
        case MDOC_Brq:
                term_word(p, "{");
                break;
        case MDOC_Oo:
-               /* FALLTHROUGH */
        case MDOC_Op:
-               /* FALLTHROUGH */
        case MDOC_Bo:
-               /* FALLTHROUGH */
        case MDOC_Bq:
                term_word(p, "[");
                break;
        case MDOC_Do:
-               /* FALLTHROUGH */
        case MDOC_Dq:
                term_word(p, "\\(Lq");
                break;
        case MDOC_En:
                if (NULL == n->norm->Es ||
                    NULL == n->norm->Es->child)
-                       return(1);
+                       return 1;
                term_word(p, n->norm->Es->child->string);
                break;
        case MDOC_Po:
-               /* FALLTHROUGH */
        case MDOC_Pq:
                term_word(p, "(");
                break;
        case MDOC__T:
-               /* FALLTHROUGH */
        case MDOC_Qo:
-               /* FALLTHROUGH */
        case MDOC_Qq:
                term_word(p, "\"");
                break;
        case MDOC_Ql:
-               /* FALLTHROUGH */
        case MDOC_So:
-               /* FALLTHROUGH */
        case MDOC_Sq:
                term_word(p, "\\(oq");
                break;
        default:
                abort();
-               /* NOTREACHED */
        }
 
        p->flags |= TERMP_NOSPACE;
-       return(1);
+       return 1;
 }
 
 static void
@@ -1922,27 +1895,21 @@ termp_quote_post(DECL_ARGS)
 
        switch (n->tok) {
        case MDOC_Ao:
-               /* FALLTHROUGH */
        case MDOC_Aq:
-               term_word(p, n->nchild == 1 &&
+               term_word(p, n->child != NULL && n->child->next == NULL &&
                    n->child->tok == MDOC_Mt ? ">" : "\\(ra");
                break;
        case MDOC_Bro:
-               /* FALLTHROUGH */
        case MDOC_Brq:
                term_word(p, "}");
                break;
        case MDOC_Oo:
-               /* FALLTHROUGH */
        case MDOC_Op:
-               /* FALLTHROUGH */
        case MDOC_Bo:
-               /* FALLTHROUGH */
        case MDOC_Bq:
                term_word(p, "]");
                break;
        case MDOC_Do:
-               /* FALLTHROUGH */
        case MDOC_Dq:
                term_word(p, "\\(Rq");
                break;
@@ -1955,27 +1922,21 @@ termp_quote_post(DECL_ARGS)
                        term_word(p, n->norm->Es->child->next->string);
                break;
        case MDOC_Po:
-               /* FALLTHROUGH */
        case MDOC_Pq:
                term_word(p, ")");
                break;
        case MDOC__T:
-               /* FALLTHROUGH */
        case MDOC_Qo:
-               /* FALLTHROUGH */
        case MDOC_Qq:
                term_word(p, "\"");
                break;
        case MDOC_Ql:
-               /* FALLTHROUGH */
        case MDOC_So:
-               /* FALLTHROUGH */
        case MDOC_Sq:
                term_word(p, "\\(cq");
                break;
        default:
                abort();
-               /* NOTREACHED */
        }
 }
 
@@ -1984,7 +1945,7 @@ termp_eo_pre(DECL_ARGS)
 {
 
        if (n->type != ROFFT_BODY)
-               return(1);
+               return 1;
 
        if (n->end == ENDBODY_NOT &&
            n->parent->head->child == NULL &&
@@ -1996,7 +1957,7 @@ termp_eo_pre(DECL_ARGS)
             (n->parent->tail != NULL && n->parent->tail->child != NULL)))
                p->flags |= TERMP_NOSPACE;
 
-       return(1);
+       return 1;
 }
 
 static void
@@ -2033,7 +1994,7 @@ termp_fo_pre(DECL_ARGS)
 
        if (n->type == ROFFT_BLOCK) {
                synopsis_pre(p, n);
-               return(1);
+               return 1;
        } else if (n->type == ROFFT_BODY) {
                if (pretty) {
                        rmargin = p->rmargin;
@@ -2051,18 +2012,18 @@ termp_fo_pre(DECL_ARGS)
                        p->offset = p->rmargin;
                        p->rmargin = rmargin;
                }
-               return(1);
+               return 1;
        }
 
        if (NULL == n->child)
-               return(0);
+               return 0;
 
        /* XXX: we drop non-initial arguments as per groff. */
 
        assert(n->child->string);
        term_fontpush(p, TERMFONT_BOLD);
        term_word(p, n->child->string);
-       return(0);
+       return 0;
 }
 
 static void
@@ -2087,9 +2048,9 @@ termp_bf_pre(DECL_ARGS)
 {
 
        if (n->type == ROFFT_HEAD)
-               return(0);
+               return 0;
        else if (n->type != ROFFT_BODY)
-               return(1);
+               return 1;
 
        if (FONT_Em == n->norm->Bf.font)
                term_fontpush(p, TERMFONT_UNDER);
@@ -2098,7 +2059,7 @@ termp_bf_pre(DECL_ARGS)
        else
                term_fontpush(p, TERMFONT_NONE);
 
-       return(1);
+       return 1;
 }
 
 static int
@@ -2115,7 +2076,7 @@ termp_sm_pre(DECL_ARGS)
        if (p->col && ! (TERMP_NONOSPACE & p->flags))
                p->flags &= ~TERMP_NOSPACE;
 
-       return(0);
+       return 0;
 }
 
 static int
@@ -2125,7 +2086,7 @@ termp_ap_pre(DECL_ARGS)
        p->flags |= TERMP_NOSPACE;
        term_word(p, "'");
        p->flags |= TERMP_NOSPACE;
-       return(1);
+       return 1;
 }
 
 static void
@@ -2160,7 +2121,7 @@ termp_li_pre(DECL_ARGS)
 {
 
        term_fontpush(p, TERMFONT_NONE);
-       return(1);
+       return 1;
 }
 
 static int
@@ -2169,7 +2130,7 @@ termp_lk_pre(DECL_ARGS)
        const struct roff_node *link, *descr;
 
        if (NULL == (link = n->child))
-               return(0);
+               return 0;
 
        if (NULL != (descr = link->next)) {
                term_fontpush(p, TERMFONT_UNDER);
@@ -2186,7 +2147,7 @@ termp_lk_pre(DECL_ARGS)
        term_word(p, link->string);
        term_fontpop(p);
 
-       return(0);
+       return 0;
 }
 
 static int
@@ -2197,17 +2158,16 @@ termp_bk_pre(DECL_ARGS)
        case ROFFT_BLOCK:
                break;
        case ROFFT_HEAD:
-               return(0);
+               return 0;
        case ROFFT_BODY:
-               if (n->parent->args || 0 == n->prev->nchild)
+               if (n->parent->args != NULL || n->prev->child == NULL)
                        p->flags |= TERMP_PREKEEP;
                break;
        default:
                abort();
-               /* NOTREACHED */
        }
 
-       return(1);
+       return 1;
 }
 
 static void
@@ -2243,10 +2203,10 @@ termp__t_pre(DECL_ARGS)
         */
        if (n->parent && MDOC_Rs == n->parent->tok &&
            n->parent->norm->Rs.quote_T)
-               return(termp_quote_pre(p, pair, meta, n));
+               return termp_quote_pre(p, pair, meta, n);
 
        term_fontpush(p, TERMFONT_UNDER);
-       return(1);
+       return 1;
 }
 
 static int
@@ -2254,7 +2214,19 @@ termp_under_pre(DECL_ARGS)
 {
 
        term_fontpush(p, TERMFONT_UNDER);
-       return(1);
+       return 1;
+}
+
+static int
+termp_er_pre(DECL_ARGS)
+{
+
+       if (n->sec == SEC_ERRORS &&
+           (n->parent->tok == MDOC_It ||
+            (n->parent->tok == MDOC_Bq &&
+             n->parent->parent->parent->tok == MDOC_It)))
+               tag_put(n->child->string, 1, p->line);
+       return 1;
 }
 
 static int
@@ -2267,8 +2239,7 @@ termp_tag_pre(DECL_ARGS)
            (n->parent->tok == MDOC_It ||
             (n->parent->tok == MDOC_Xo &&
              n->parent->parent->prev == NULL &&
-             n->parent->parent->parent->tok == MDOC_It)) &&
-           ! tag_get(n->child->string, 0, 1))
-               tag_put(n->child->string, 0, 1, p->line);
-       return(1);
+             n->parent->parent->parent->tok == MDOC_It)))
+               tag_put(n->child->string, 1, p->line);
+       return 1;
 }