]> git.cameronkatri.com Git - mandoc.git/blobdiff - mdoc_term.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
disable some tests that expose wcwidth(3) differences among systems
[mandoc.git] / mdoc_term.c
diff --git a/mdoc_term.c b/mdoc_term.c
index 0442165ae1176fd0da1398f0aa8251afee1778e9..dc17de54accdad10030638f53da57fd40aaa0427 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.339 2017/01/10 21:59:47 schwarze Exp $ */
+/*     $Id: mdoc_term.c,v 1.343 2017/02/06 03:44:58 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -91,8 +91,6 @@ static        int       termp_bf_pre(DECL_ARGS);
 static int       termp_bk_pre(DECL_ARGS);
 static int       termp_bl_pre(DECL_ARGS);
 static int       termp_bold_pre(DECL_ARGS);
-static int       termp_bt_pre(DECL_ARGS);
-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);
@@ -115,7 +113,6 @@ static      int       termp_nm_pre(DECL_ARGS);
 static int       termp_ns_pre(DECL_ARGS);
 static int       termp_quote_pre(DECL_ARGS);
 static int       termp_rs_pre(DECL_ARGS);
-static int       termp_rv_pre(DECL_ARGS);
 static int       termp_sh_pre(DECL_ARGS);
 static int       termp_skip_pre(DECL_ARGS);
 static int       termp_sm_pre(DECL_ARGS);
@@ -124,7 +121,6 @@ static      int       termp_ss_pre(DECL_ARGS);
 static int       termp_sy_pre(DECL_ARGS);
 static int       termp_tag_pre(DECL_ARGS);
 static int       termp_under_pre(DECL_ARGS);
-static int       termp_ud_pre(DECL_ARGS);
 static int       termp_vt_pre(DECL_ARGS);
 static int       termp_xr_pre(DECL_ARGS);
 static int       termp_xx_pre(DECL_ARGS);
@@ -166,7 +162,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_quote_pre, termp_quote_post }, /* Op */
        { termp_ft_pre, NULL }, /* Ot */
        { termp_under_pre, NULL }, /* Pa */
-       { termp_rv_pre, NULL }, /* Rv */
+       { termp_ex_pre, NULL }, /* Rv */
        { NULL, NULL }, /* St */
        { termp_under_pre, NULL }, /* Va */
        { termp_vt_pre, NULL }, /* Vt */
@@ -191,7 +187,7 @@ static      const struct termact termacts[MDOC_MAX] = {
        { termp_quote_pre, termp_quote_post }, /* Bo */
        { termp_quote_pre, termp_quote_post }, /* Bq */
        { termp_xx_pre, termp_xx_post }, /* Bsx */
-       { termp_bx_pre, NULL }, /* Bx */
+       { NULL, NULL }, /* Bx */
        { termp_skip_pre, NULL }, /* Db */
        { NULL, NULL }, /* Dc */
        { termp_quote_pre, termp_quote_post }, /* Do */
@@ -232,10 +228,10 @@ static    const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Oc */
        { termp_bk_pre, termp_bk_post }, /* Bk */
        { NULL, NULL }, /* Ek */
-       { termp_bt_pre, NULL }, /* Bt */
+       { NULL, NULL }, /* Bt */
        { NULL, NULL }, /* Hf */
        { termp_under_pre, NULL }, /* Fr */
-       { termp_ud_pre, NULL }, /* Ud */
+       { NULL, NULL }, /* Ud */
        { NULL, termp_lb_post }, /* Lb */
        { termp_sp_pre, NULL }, /* Lp */
        { termp_lk_pre, NULL }, /* Lk */
@@ -262,6 +258,7 @@ terminal_mdoc(void *arg, const struct roff_man *mdoc)
 {
        struct roff_node        *n;
        struct termp            *p;
+       size_t                   save_defindent;
 
        p = (struct termp *)arg;
        p->overstep = 0;
@@ -282,6 +279,7 @@ terminal_mdoc(void *arg, const struct roff_man *mdoc)
                        n = n->next;
                }
        } else {
+               save_defindent = p->defindent;
                if (p->defindent == 0)
                        p->defindent = 5;
                term_begin(p, print_mdoc_head, print_mdoc_foot,
@@ -294,6 +292,7 @@ terminal_mdoc(void *arg, const struct roff_man *mdoc)
                        print_mdoc_nodelist(p, NULL, &mdoc->meta, n);
                }
                term_end(p);
+               p->defindent = save_defindent;
        }
 }
 
@@ -997,7 +996,7 @@ termp_nm_pre(DECL_ARGS)
                return 1;
        }
 
-       if (NULL == n->child && NULL == meta->name)
+       if (n->child == NULL)
                return 0;
 
        if (n->type == ROFFT_HEAD)
@@ -1021,8 +1020,6 @@ termp_nm_pre(DECL_ARGS)
        }
 
        term_fontpush(p, TERMFONT_BOLD);
-       if (NULL == n->child)
-               term_word(p, meta->name);
        return 1;
 }
 
@@ -1113,92 +1110,11 @@ termp_rs_pre(DECL_ARGS)
        return 1;
 }
 
-static int
-termp_rv_pre(DECL_ARGS)
-{
-       struct roff_node *nch;
-
-       term_newln(p);
-
-       if (n->child != NULL) {
-               term_word(p, "The");
-
-               for (nch = n->child; nch != NULL; nch = nch->next) {
-                       term_fontpush(p, TERMFONT_BOLD);
-                       term_word(p, nch->string);
-                       term_fontpop(p);
-
-                       p->flags |= TERMP_NOSPACE;
-                       term_word(p, "()");
-
-                       if (nch->next == NULL)
-                               continue;
-
-                       if (nch->prev != NULL || nch->next->next != NULL) {
-                               p->flags |= TERMP_NOSPACE;
-                               term_word(p, ",");
-                       }
-                       if (nch->next->next == NULL)
-                               term_word(p, "and");
-               }
-
-               if (n->child != NULL && n->child->next != NULL)
-                       term_word(p, "functions return");
-               else
-                       term_word(p, "function returns");
-
-               term_word(p, "the value\\~0 if successful;");
-       } else
-               term_word(p, "Upon successful completion,"
-                   " the value\\~0 is returned;");
-
-       term_word(p, "otherwise the value\\~\\-1 is returned"
-           " and the global variable");
-
-       term_fontpush(p, TERMFONT_UNDER);
-       term_word(p, "errno");
-       term_fontpop(p);
-
-       term_word(p, "is set to indicate the error.");
-       p->flags |= TERMP_SENTENCE;
-
-       return 0;
-}
-
 static int
 termp_ex_pre(DECL_ARGS)
 {
-       struct roff_node *nch;
-
        term_newln(p);
-       term_word(p, "The");
-
-       for (nch = n->child; nch != NULL; nch = nch->next) {
-               term_fontpush(p, TERMFONT_BOLD);
-               term_word(p, nch->string);
-               term_fontpop(p);
-
-               if (nch->next == NULL)
-                       continue;
-
-               if (nch->prev != NULL || nch->next->next != NULL) {
-                       p->flags |= TERMP_NOSPACE;
-                       term_word(p, ",");
-               }
-
-               if (nch->next->next == NULL)
-                       term_word(p, "and");
-       }
-
-       if (n->child != NULL && n->child->next != NULL)
-               term_word(p, "utilities exit\\~0");
-       else
-               term_word(p, "utility exits\\~0");
-
-       term_word(p, "on success, and\\~>0 if an error occurs.");
-
-       p->flags |= TERMP_SENTENCE;
-       return 0;
+       return 1;
 }
 
 static int
@@ -1399,15 +1315,6 @@ termp_sh_post(DECL_ARGS)
        }
 }
 
-static int
-termp_bt_pre(DECL_ARGS)
-{
-
-       term_word(p, "is currently in beta test.");
-       p->flags |= TERMP_SENTENCE;
-       return 0;
-}
-
 static void
 termp_lb_post(DECL_ARGS)
 {
@@ -1416,15 +1323,6 @@ termp_lb_post(DECL_ARGS)
                term_newln(p);
 }
 
-static int
-termp_ud_pre(DECL_ARGS)
-{
-
-       term_word(p, "currently under development.");
-       p->flags |= TERMP_SENTENCE;
-       return 0;
-}
-
 static int
 termp_d1_pre(DECL_ARGS)
 {
@@ -1652,29 +1550,6 @@ termp_bd_post(DECL_ARGS)
        p->maxrmargin = rmax;
 }
 
-static int
-termp_bx_pre(DECL_ARGS)
-{
-
-       if (NULL != (n = n->child)) {
-               term_word(p, n->string);
-               p->flags |= TERMP_NOSPACE;
-               term_word(p, "BSD");
-       } else {
-               term_word(p, "BSD");
-               return 0;
-       }
-
-       if (NULL != (n = n->next)) {
-               p->flags |= TERMP_NOSPACE;
-               term_word(p, "-");
-               p->flags |= TERMP_NOSPACE;
-               term_word(p, n->string);
-       }
-
-       return 0;
-}
-
 static int
 termp_xx_pre(DECL_ARGS)
 {
A git conversion mirror of mandoc.bsd.lv