-/* $Id: mdoc_term.c,v 1.323 2015/07/25 14:23:08 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-2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012-2017 Ingo Schwarze <schwarze@openbsd.org>
* Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
*
* Permission to use, copy, modify, and distribute this software for any
static void termp_quote_post(DECL_ARGS);
static void termp_sh_post(DECL_ARGS);
static void termp_ss_post(DECL_ARGS);
+static void termp_xx_post(DECL_ARGS);
static int termp__a_pre(DECL_ARGS);
static int termp__t_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);
+static int termp_em_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_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);
static int termp_sp_pre(DECL_ARGS);
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);
{ termp_under_pre, NULL }, /* Ar */
{ termp_cd_pre, NULL }, /* Cd */
{ termp_bold_pre, NULL }, /* Cm */
- { NULL, NULL }, /* Dv */
+ { termp_li_pre, NULL }, /* Dv */
{ termp_er_pre, NULL }, /* Er */
{ termp_tag_pre, NULL }, /* Ev */
{ termp_ex_pre, NULL }, /* Ex */
{ 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 */
{ termp_bf_pre, NULL }, /* Bf */
{ termp_quote_pre, termp_quote_post }, /* Bo */
{ termp_quote_pre, termp_quote_post }, /* Bq */
- { termp_xx_pre, NULL }, /* Bsx */
- { termp_bx_pre, NULL }, /* Bx */
+ { termp_xx_pre, termp_xx_post }, /* Bsx */
+ { NULL, NULL }, /* Bx */
{ termp_skip_pre, NULL }, /* Db */
{ NULL, NULL }, /* Dc */
{ termp_quote_pre, termp_quote_post }, /* Do */
{ termp_quote_pre, termp_quote_post }, /* Dq */
{ NULL, NULL }, /* Ec */ /* FIXME: no space */
{ NULL, NULL }, /* Ef */
- { termp_under_pre, NULL }, /* Em */
+ { termp_em_pre, NULL }, /* Em */
{ termp_eo_pre, termp_eo_post }, /* Eo */
- { termp_xx_pre, NULL }, /* Fx */
+ { termp_xx_pre, termp_xx_post }, /* Fx */
{ termp_bold_pre, NULL }, /* Ms */
{ termp_li_pre, NULL }, /* No */
{ termp_ns_pre, NULL }, /* Ns */
- { termp_xx_pre, NULL }, /* Nx */
- { termp_xx_pre, NULL }, /* Ox */
+ { termp_xx_pre, termp_xx_post }, /* Nx */
+ { termp_xx_pre, termp_xx_post }, /* Ox */
{ NULL, NULL }, /* Pc */
{ NULL, termp_pf_post }, /* Pf */
{ termp_quote_pre, termp_quote_post }, /* Po */
{ termp_quote_pre, termp_quote_post }, /* Sq */
{ termp_sm_pre, NULL }, /* Sm */
{ termp_under_pre, NULL }, /* Sx */
- { termp_bold_pre, NULL }, /* Sy */
+ { termp_sy_pre, NULL }, /* Sy */
{ NULL, NULL }, /* Tn */
- { termp_xx_pre, NULL }, /* Ux */
+ { termp_xx_pre, termp_xx_post }, /* Ux */
{ NULL, NULL }, /* Xc */
{ NULL, NULL }, /* Xo */
{ termp_fo_pre, termp_fo_post }, /* Fo */
{ 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 */
{ NULL, termp____post }, /* %C */
{ termp_skip_pre, NULL }, /* Es */
{ termp_quote_pre, termp_quote_post }, /* En */
- { termp_xx_pre, NULL }, /* Dx */
+ { termp_xx_pre, termp_xx_post }, /* Dx */
{ NULL, termp____post }, /* %Q */
{ termp_sp_pre, NULL }, /* br */
{ termp_sp_pre, NULL }, /* sp */
{
struct roff_node *n;
struct termp *p;
+ size_t save_defindent;
p = (struct termp *)arg;
p->overstep = 0;
n = n->next;
}
} else {
+ save_defindent = p->defindent;
if (p->defindent == 0)
p->defindent = 5;
term_begin(p, print_mdoc_head, print_mdoc_foot,
&mdoc->meta);
+ while (n != NULL && n->flags & NODE_NOPRT)
+ n = n->next;
if (n != NULL) {
if (n->tok != MDOC_Sh)
term_vspace(p);
print_mdoc_nodelist(p, NULL, &mdoc->meta, n);
}
term_end(p);
+ p->defindent = save_defindent;
}
}
struct termpair npair;
size_t offset, rmargin;
+ if (n->flags & NODE_NOPRT)
+ return;
+
chld = 1;
offset = p->offset;
rmargin = p->rmargin;
- n->flags &= ~MDOC_ENDED;
+ n->flags &= ~NODE_ENDED;
n->prev_font = p->fonti;
memset(&npair, 0, sizeof(struct termpair));
* invoked in a prior line, revert it to PREKEEP.
*/
- if (p->flags & TERMP_KEEP && n->flags & MDOC_LINE) {
+ if (p->flags & TERMP_KEEP && n->flags & NODE_LINE) {
p->flags &= ~TERMP_KEEP;
p->flags |= TERMP_PREKEEP;
}
switch (n->type) {
case ROFFT_TEXT:
- if (' ' == *n->string && MDOC_LINE & n->flags)
+ if (' ' == *n->string && NODE_LINE & n->flags)
term_newln(p);
- if (MDOC_DELIMC & n->flags)
+ if (NODE_DELIMC & n->flags)
p->flags |= TERMP_NOSPACE;
term_word(p, n->string);
- if (MDOC_DELIMO & n->flags)
+ if (NODE_DELIMO & n->flags)
p->flags |= TERMP_NOSPACE;
break;
case ROFFT_EQN:
- if ( ! (n->flags & MDOC_LINE))
+ if ( ! (n->flags & NODE_LINE))
p->flags |= TERMP_NOSPACE;
term_eqn(p, n->eqn);
- if (n->next != NULL && ! (n->next->flags & MDOC_LINE))
+ if (n->next != NULL && ! (n->next->flags & NODE_LINE))
p->flags |= TERMP_NOSPACE;
break;
case ROFFT_TBL:
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;
case ROFFT_EQN:
break;
default:
- if ( ! termacts[n->tok].post || MDOC_ENDED & n->flags)
+ if ( ! termacts[n->tok].post || NODE_ENDED & n->flags)
break;
(void)(*termacts[n->tok].post)(p, &npair, meta, n);
* that it must not call the post handler again.
*/
if (ENDBODY_NOT != n->end)
- n->body->flags |= MDOC_ENDED;
+ n->body->flags |= NODE_ENDED;
/*
* End of line terminating an implicit block
break;
}
- if (MDOC_EOS & n->flags)
+ if (NODE_EOS & n->flags)
p->flags |= TERMP_SENTENCE;
if (MDOC_ll != n->tok) {
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;
}
/*
/* Do not vspace directly after Ss/Sh. */
nn = n;
+ while (nn->prev != NULL && nn->prev->flags & NODE_NOPRT)
+ nn = nn->prev;
while (nn->prev == NULL) {
do {
nn = nn->parent;
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
if (n->type == ROFFT_BLOCK) {
print_bvspace(p, n->parent->parent, n);
- return(1);
+ return 1;
}
bl = n->parent->parent->parent;
switch (type) {
case LIST_bullet:
- /* FALLTHROUGH */
case LIST_dash:
- /* FALLTHROUGH */
case LIST_hyphen:
- /* FALLTHROUGH */
case LIST_enum:
width = term_len(p, 2);
break;
case LIST_hang:
+ case LIST_tag:
width = term_len(p, 8);
break;
case LIST_column:
- /* FALLTHROUGH */
- case LIST_tag:
width = term_len(p, 10);
break;
default:
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:
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)
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)
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;
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:
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
switch (type) {
case LIST_item:
- /* FALLTHROUGH */
case LIST_diag:
- /* FALLTHROUGH */
case LIST_inset:
if (n->type == ROFFT_BODY)
term_newln(p);
* 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;
}
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)
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);
+ if (n->child == NULL)
+ return 0;
if (n->type == ROFFT_HEAD)
synopsis_pre(p, n->parent);
}
term_fontpush(p, TERMFONT_BOLD);
- if (NULL == n->child)
- term_word(p, meta->name);
- return(1);
+ return 1;
}
static void
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)))
+ n->next->flags & NODE_LINE)))
p->flags |= TERMP_NOSPACE;
- return(1);
+ return 1;
}
static int
if (NULL == n->next || MDOC__A != n->next->tok)
term_word(p, "and");
- return(1);
+ return 1;
}
static int
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)
if (n->sec == SEC_AUTHORS && ! (p->flags & TERMP_NOSPLIT))
p->flags |= TERMP_SPLIT;
- return(1);
+ return 1;
}
static int
termp_ns_pre(DECL_ARGS)
{
- if ( ! (MDOC_LINE & n->flags))
+ if ( ! (NODE_LINE & n->flags))
p->flags |= TERMP_NOSPACE;
- return(1);
+ return 1;
}
static int
{
if (SEC_SEE_ALSO != n->sec)
- return(1);
+ return 1;
if (n->type == ROFFT_BLOCK && n->prev != NULL)
term_vspace(p);
- return(1);
-}
-
-static int
-termp_rv_pre(DECL_ARGS)
-{
- int nchild;
-
- term_newln(p);
-
- nchild = n->nchild;
- if (nchild > 0) {
- term_word(p, "The");
-
- for (n = n->child; n; n = n->next) {
- term_fontpush(p, TERMFONT_BOLD);
- term_word(p, n->string);
- term_fontpop(p);
-
- p->flags |= TERMP_NOSPACE;
- term_word(p, "()");
-
- if (n->next == NULL)
- continue;
-
- if (nchild > 2) {
- p->flags |= TERMP_NOSPACE;
- term_word(p, ",");
- }
- if (n->next->next == NULL)
- term_word(p, "and");
- }
-
- if (nchild > 1)
- 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);
+ return 1;
}
static int
termp_ex_pre(DECL_ARGS)
{
- int nchild;
-
term_newln(p);
- term_word(p, "The");
-
- nchild = n->nchild;
- for (n = n->child; n; n = n->next) {
- term_fontpush(p, TERMFONT_BOLD);
- term_word(p, n->string);
- term_fontpop(p);
-
- if (nchild > 2 && n->next) {
- p->flags |= TERMP_NOSPACE;
- term_word(p, ",");
- }
-
- if (n->next && NULL == n->next->next)
- term_word(p, "and");
- }
-
- if (nchild > 1)
- 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
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
{
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, "(");
p->flags |= TERMP_NOSPACE;
term_word(p, ")");
- return(0);
+ return 0;
}
/*
* Obviously, if we're not in a SYNOPSIS or no prior macros
* exist, do nothing.
*/
- if (NULL == n->prev || ! (MDOC_SYNPRETTY & n->flags))
+ if (NULL == n->prev || ! (NODE_SYNPRETTY & n->flags))
return;
/*
*/
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;
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
termp_tag_pre(p, pair, meta, n);
term_fontpush(p, TERMFONT_BOLD);
- return(1);
+ return 1;
}
static int
{
synopsis_pre(p, n);
- return(termp_bold_pre(p, pair, meta, n));
+ return termp_bold_pre(p, pair, meta, n);
}
static void
default:
break;
}
- return(1);
+ return 1;
}
static void
}
}
-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)
{
- if (SEC_LIBRARY == n->sec && MDOC_LINE & n->flags)
+ if (SEC_LIBRARY == n->sec && NODE_LINE & n->flags)
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)
{
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
termp_ft_pre(DECL_ARGS)
{
- /* NB: MDOC_LINE does not effect this! */
+ /* NB: NODE_LINE does not effect this! */
synopsis_pre(p, n);
term_fontpush(p, TERMFONT_UNDER);
- return(1);
+ return 1;
}
static int
size_t rmargin = 0;
int pretty;
- pretty = MDOC_SYNPRETTY & n->flags;
+ pretty = NODE_SYNPRETTY & n->flags;
synopsis_pre(p, n);
if (NULL == (n = n->child))
- return(0);
+ return 0;
if (pretty) {
rmargin = p->rmargin;
term_word(p, n->string);
term_fontpop(p);
- if (n->sec == SEC_DESCRIPTION) {
- if ( ! tag_get(n->string, 0, ++fn_prio))
- tag_put(n->string, 0, fn_prio, p->line);
- }
+ if (n->sec == SEC_DESCRIPTION || n->sec == SEC_CUSTOM)
+ tag_put(n->string, ++fn_prio, p->line);
if (pretty) {
term_flushln(p);
term_flushln(p);
}
- return(0);
+ return 0;
}
static int
if (n->parent->tok != MDOC_Fo) {
term_fontpush(p, TERMFONT_UNDER);
- return(1);
+ return 1;
}
for (nn = n->child; nn; nn = nn->next) {
}
}
- return(0);
+ return 0;
}
static int
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. */
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)
*/
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:
break;
}
if (p->flags & TERMP_NONEWLINE ||
- (nn->next && ! (nn->next->flags & MDOC_LINE)))
+ (nn->next && ! (nn->next->flags & NODE_LINE)))
continue;
term_flushln(p);
p->flags |= TERMP_NOSPACE;
p->tabwidth = tabwidth;
p->rmargin = rm;
p->maxrmargin = rmax;
- return(0);
+ return 0;
}
static void
}
static int
-termp_bx_pre(DECL_ARGS)
+termp_xx_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);
+ if ((n->aux = p->flags & TERMP_PREKEEP) == 0)
+ p->flags |= TERMP_PREKEEP;
+ return 1;
}
-static int
-termp_xx_pre(DECL_ARGS)
+static void
+termp_xx_post(DECL_ARGS)
{
- const char *pp;
- int flags;
-
- pp = NULL;
- switch (n->tok) {
- case MDOC_Bsx:
- pp = "BSD/OS";
- break;
- case MDOC_Dx:
- pp = "DragonFly";
- break;
- case MDOC_Fx:
- pp = "FreeBSD";
- break;
- case MDOC_Nx:
- pp = "NetBSD";
- break;
- case MDOC_Ox:
- pp = "OpenBSD";
- break;
- case MDOC_Ux:
- pp = "UNIX";
- break;
- default:
- abort();
- /* NOTREACHED */
- }
-
- term_word(p, pp);
- if (n->child) {
- flags = p->flags;
- p->flags |= TERMP_KEEP;
- term_word(p, n->child->string);
- p->flags = flags;
- }
- return(0);
+ if (n->aux == 0)
+ p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
}
static void
termp_pf_post(DECL_ARGS)
{
- if ( ! (n->next == NULL || n->next->flags & MDOC_LINE))
+ if ( ! (n->next == NULL || n->next->flags & NODE_LINE))
p->flags |= TERMP_NOSPACE;
}
static int
termp_ss_pre(DECL_ARGS)
{
+ struct roff_node *nn;
switch (n->type) {
case ROFFT_BLOCK:
term_newln(p);
- if (n->prev)
+ for (nn = n->prev; nn != NULL; nn = nn->prev)
+ if ((nn->flags & NODE_NOPRT) == 0)
+ break;
+ if (nn != NULL)
term_vspace(p);
break;
case ROFFT_HEAD:
break;
}
- return(1);
+ return 1;
}
static void
synopsis_pre(p, n);
term_fontpush(p, TERMFONT_BOLD);
- return(1);
+ return 1;
}
static int
synopsis_pre(p, n);
- if (MDOC_SYNPRETTY & n->flags && MDOC_LINE & n->flags) {
+ if (NODE_SYNPRETTY & n->flags && NODE_LINE & n->flags) {
term_fontpush(p, TERMFONT_BOLD);
term_word(p, "#include");
term_word(p, "<");
}
p->flags |= TERMP_NOSPACE;
- return(1);
+ return 1;
}
static void
termp_in_post(DECL_ARGS)
{
- if (MDOC_SYNPRETTY & n->flags)
+ if (NODE_SYNPRETTY & n->flags)
term_fontpush(p, TERMFONT_BOLD);
p->flags |= TERMP_NOSPACE;
term_word(p, ">");
- if (MDOC_SYNPRETTY & n->flags)
+ if (NODE_SYNPRETTY & n->flags)
term_fontpop(p);
}
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
{
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
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;
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 */
}
}
{
if (n->type != ROFFT_BODY)
- return(1);
+ return 1;
if (n->end == ENDBODY_NOT &&
n->parent->head->child == NULL &&
(n->parent->tail != NULL && n->parent->tail->child != NULL)))
p->flags |= TERMP_NOSPACE;
- return(1);
+ return 1;
}
static void
size_t rmargin = 0;
int pretty;
- pretty = MDOC_SYNPRETTY & n->flags;
+ pretty = NODE_SYNPRETTY & n->flags;
if (n->type == ROFFT_BLOCK) {
synopsis_pre(p, n);
- return(1);
+ return 1;
} else if (n->type == ROFFT_BODY) {
if (pretty) {
rmargin = p->rmargin;
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
p->flags |= TERMP_NOSPACE;
term_word(p, ")");
- if (MDOC_SYNPRETTY & n->flags) {
+ if (NODE_SYNPRETTY & n->flags) {
p->flags |= TERMP_NOSPACE;
term_word(p, ";");
term_flushln(p);
{
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);
else
term_fontpush(p, TERMFONT_NONE);
- return(1);
+ return 1;
}
static int
if (p->col && ! (TERMP_NONOSPACE & p->flags))
p->flags &= ~TERMP_NOSPACE;
- return(0);
+ return 0;
}
static int
p->flags |= TERMP_NOSPACE;
term_word(p, "'");
p->flags |= TERMP_NOSPACE;
- return(1);
+ return 1;
}
static void
termp_li_pre(DECL_ARGS)
{
+ termp_tag_pre(p, pair, meta, n);
term_fontpush(p, TERMFONT_NONE);
- return(1);
+ return 1;
}
static int
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);
term_word(p, link->string);
term_fontpop(p);
- return(0);
+ return 0;
}
static int
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
*/
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
{
term_fontpush(p, TERMFONT_UNDER);
- return(1);
+ return 1;
+}
+
+static int
+termp_em_pre(DECL_ARGS)
+{
+ if (n->child != NULL &&
+ n->child->type == ROFFT_TEXT)
+ tag_put(n->child->string, 0, p->line);
+ term_fontpush(p, TERMFONT_UNDER);
+ return 1;
+}
+
+static int
+termp_sy_pre(DECL_ARGS)
+{
+ if (n->child != NULL &&
+ n->child->type == ROFFT_TEXT)
+ tag_put(n->child->string, 0, p->line);
+ term_fontpush(p, TERMFONT_BOLD);
+ return 1;
}
static int
if (n->sec == SEC_ERRORS &&
(n->parent->tok == MDOC_It ||
(n->parent->tok == MDOC_Bq &&
- 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;
}
static int
if (n->child != NULL &&
n->child->type == ROFFT_TEXT &&
- n->prev == NULL &&
+ (n->prev == NULL ||
+ (n->prev->type == ROFFT_TEXT &&
+ strcmp(n->prev->string, "|") == 0)) &&
(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;
}
git.ckatri.com / mandoc.git / blobdiff