diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2017-05-05 13:17:05 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2017-05-05 13:17:05 +0000 |
| commit | 27a1cf5acd5def5732a4221c0b35f65989da1650 (patch) | |
| tree | edb5a03bb916a7d3afce69372d01d51b3974df87 /usr.bin/mandoc/mdoc_term.c | |
| parent | 570cf3baf7f4cdac50d43956ee4be111d1ab26c4 (diff) | |
move .ll to the roff modules
Diffstat (limited to 'usr.bin/mandoc/mdoc_term.c')
| -rw-r--r-- | usr.bin/mandoc/mdoc_term.c | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/usr.bin/mandoc/mdoc_term.c b/usr.bin/mandoc/mdoc_term.c index 076516515de..49142bbf7ee 100644 --- a/usr.bin/mandoc/mdoc_term.c +++ b/usr.bin/mandoc/mdoc_term.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mdoc_term.c,v 1.252 2017/05/05 02:06:17 schwarze Exp $ */ +/* $OpenBSD: mdoc_term.c,v 1.253 2017/05/05 13:17:04 schwarze Exp $ */ /* * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org> @@ -104,7 +104,6 @@ static int termp_ft_pre(DECL_ARGS); static int termp_in_pre(DECL_ARGS); static int termp_it_pre(DECL_ARGS); static int termp_li_pre(DECL_ARGS); -static int termp_ll_pre(DECL_ARGS); static int termp_lk_pre(DECL_ARGS); static int termp_nd_pre(DECL_ARGS); static int termp_nm_pre(DECL_ARGS); @@ -245,7 +244,6 @@ static const struct termact __termacts[MDOC_MAX - MDOC_Dd] = { { termp_sp_pre, NULL }, /* sp */ { NULL, termp____post }, /* %U */ { NULL, NULL }, /* Ta */ - { termp_ll_pre, NULL }, /* ll */ }; static const struct termact *const termacts = __termacts - MDOC_Dd; @@ -364,8 +362,7 @@ print_mdoc_node(DECL_ARGS) default: if (n->tok < ROFF_MAX) { roff_term_pre(p, n); - chld = 0; - break; + return; } assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX); if (termacts[n->tok].pre != NULL && @@ -389,9 +386,7 @@ print_mdoc_node(DECL_ARGS) case ROFFT_EQN: break; default: - if (n->tok < ROFF_MAX || - termacts[n->tok].post == NULL || - n->flags & NODE_ENDED) + if (termacts[n->tok].post == NULL || n->flags & NODE_ENDED) break; (void)(*termacts[n->tok].post)(p, &npair, meta, n); @@ -408,10 +403,8 @@ print_mdoc_node(DECL_ARGS) if (NODE_EOS & n->flags) p->flags |= TERMP_SENTENCE; - if (MDOC_ll != n->tok) { - p->offset = offset; - p->rmargin = rmargin; - } + p->offset = offset; + p->rmargin = rmargin; } static void @@ -603,14 +596,6 @@ print_bvspace(struct termp *p, static int -termp_ll_pre(DECL_ARGS) -{ - - term_setwidth(p, n->child != NULL ? n->child->string : NULL); - return 0; -} - -static int termp_it_pre(DECL_ARGS) { struct roffsu su; |