diff options
| author |   Ingo Schwarze <schwarze@openbsd.org> | 2020-01-20 10:37:15 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@openbsd.org> | 2020-01-20 10:37:15 +0000 |
| commit | 3127746e1c5864e767914a2fbeaf4564be79e2c8 (patch) | |
| tree | 7dbabb7d3a52079ddbb213926efae06a13934afa /mdoc_term.c | |
| parent | 23f80e14e78282088dabbf1cfe358c07030dc9e7 (diff) | |
| download | mandoc-3127746e1c5864e767914a2fbeaf4564be79e2c8.tar.gz mandoc-3127746e1c5864e767914a2fbeaf4564be79e2c8.tar.zst mandoc-3127746e1c5864e767914a2fbeaf4564be79e2c8.zip | |
Make the code more readable by introducing
symbolic constants for tagging priorities.
This review also made me find a minor bug: do not upgrade
TAG_FALLBACK to TAG_WEAK when there is trailing whitespace.
Diffstat (limited to 'mdoc_term.c')
| -rw-r--r-- | mdoc_term.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/mdoc_term.c b/mdoc_term.c index 134f82b8..e50f5423 100644 --- a/mdoc_term.c +++ b/mdoc_term.c @@ -1,4 +1,4 @@ -/* $Id: mdoc_term.c,v 1.375 2020/01/19 18:02:00 schwarze Exp $ */ +/* $Id: mdoc_term.c,v 1.376 2020/01/20 10:37:15 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2012-2020 Ingo Schwarze <schwarze@openbsd.org> @@ -249,7 +249,7 @@ static const struct mdoc_term_act mdoc_term_acts[MDOC_MAX - MDOC_Dd] = { { termp_tg_pre, NULL }, /* Tg */ }; -static int fn_prio; +static int fn_prio = TAG_STRONG; void @@ -1294,7 +1294,7 @@ termp_sh_pre(DECL_ARGS) term_tab_set(p, ".5i"); switch (n->sec) { case SEC_DESCRIPTION: - fn_prio = 0; + fn_prio = TAG_STRONG; break; case SEC_AUTHORS: p->flags &= ~(TERMP_SPLIT|TERMP_NOSPLIT); @@ -1383,7 +1383,7 @@ termp_fn_pre(DECL_ARGS) term_fontpop(p); if (n->sec == SEC_DESCRIPTION || n->sec == SEC_CUSTOM) - tag_put(n->string, ++fn_prio, p->line); + tag_put(n->string, fn_prio++, p->line); if (pretty) { term_flushln(p); @@ -1614,7 +1614,7 @@ termp_in_post(DECL_ARGS) static int termp_pp_pre(DECL_ARGS) { - fn_prio = 0; + fn_prio = TAG_STRONG; term_vspace(p); return 0; } @@ -2039,7 +2039,7 @@ termp_em_pre(DECL_ARGS) { if (n->child != NULL && n->child->type == ROFFT_TEXT) - tag_put(n->child->string, 0, p->line); + tag_put(n->child->string, TAG_FALLBACK, p->line); term_fontpush(p, TERMFONT_UNDER); return 1; } @@ -2049,7 +2049,7 @@ termp_sy_pre(DECL_ARGS) { if (n->child != NULL && n->child->type == ROFFT_TEXT) - tag_put(n->child->string, 0, p->line); + tag_put(n->child->string, TAG_FALLBACK, p->line); term_fontpush(p, TERMFONT_BOLD); return 1; } @@ -2062,7 +2062,7 @@ termp_er_pre(DECL_ARGS) (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); + tag_put(n->child->string, TAG_STRONG, p->line); return 1; } @@ -2079,14 +2079,14 @@ termp_tag_pre(DECL_ARGS) (n->parent->tok == MDOC_Xo && n->parent->parent->prev == NULL && n->parent->parent->parent->tok == MDOC_It))) - tag_put(n->child->string, 1, p->line); + tag_put(n->child->string, TAG_STRONG, p->line); return 1; } static int termp_tg_pre(DECL_ARGS) { - tag_put(n->child->string, -2, p->line); + tag_put(n->child->string, TAG_MANUAL, p->line); return 0; } |