version 1.250, 2013/12/22 23:34:13 |
version 1.262, 2014/04/08 04:40:47 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org> |
|
* Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 100 static int termp_fl_pre(DECL_ARGS); |
|
Line 101 static int termp_fl_pre(DECL_ARGS); |
|
static int termp_fn_pre(DECL_ARGS); |
static int termp_fn_pre(DECL_ARGS); |
static int termp_fo_pre(DECL_ARGS); |
static int termp_fo_pre(DECL_ARGS); |
static int termp_ft_pre(DECL_ARGS); |
static int termp_ft_pre(DECL_ARGS); |
static int termp_igndelim_pre(DECL_ARGS); |
|
static int termp_in_pre(DECL_ARGS); |
static int termp_in_pre(DECL_ARGS); |
static int termp_it_pre(DECL_ARGS); |
static int termp_it_pre(DECL_ARGS); |
static int termp_li_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_lk_pre(DECL_ARGS); |
static int termp_nd_pre(DECL_ARGS); |
static int termp_nd_pre(DECL_ARGS); |
static int termp_nm_pre(DECL_ARGS); |
static int termp_nm_pre(DECL_ARGS); |
Line 194 static const struct termact termacts[MDOC_MAX] = { |
|
Line 195 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_quote_pre, termp_quote_post }, /* Eo */ |
{ termp_quote_pre, termp_quote_post }, /* Eo */ |
{ termp_xx_pre, NULL }, /* Fx */ |
{ termp_xx_pre, NULL }, /* Fx */ |
{ termp_bold_pre, NULL }, /* Ms */ |
{ termp_bold_pre, NULL }, /* Ms */ |
{ termp_igndelim_pre, NULL }, /* No */ |
{ NULL, NULL }, /* No */ |
{ termp_ns_pre, NULL }, /* Ns */ |
{ termp_ns_pre, NULL }, /* Ns */ |
{ termp_xx_pre, NULL }, /* Nx */ |
{ termp_xx_pre, NULL }, /* Nx */ |
{ termp_xx_pre, NULL }, /* Ox */ |
{ termp_xx_pre, NULL }, /* Ox */ |
{ NULL, NULL }, /* Pc */ |
{ NULL, NULL }, /* Pc */ |
{ termp_igndelim_pre, termp_pf_post }, /* Pf */ |
{ NULL, termp_pf_post }, /* Pf */ |
{ termp_quote_pre, termp_quote_post }, /* Po */ |
{ termp_quote_pre, termp_quote_post }, /* Po */ |
{ termp_quote_pre, termp_quote_post }, /* Pq */ |
{ termp_quote_pre, termp_quote_post }, /* Pq */ |
{ NULL, NULL }, /* Qc */ |
{ NULL, NULL }, /* Qc */ |
Line 244 static const struct termact termacts[MDOC_MAX] = { |
|
Line 245 static const struct termact termacts[MDOC_MAX] = { |
|
{ termp_sp_pre, NULL }, /* sp */ |
{ termp_sp_pre, NULL }, /* sp */ |
{ NULL, termp____post }, /* %U */ |
{ NULL, termp____post }, /* %U */ |
{ NULL, NULL }, /* Ta */ |
{ NULL, NULL }, /* Ta */ |
|
{ termp_ll_pre, NULL }, /* ll */ |
}; |
}; |
|
|
|
|
Line 307 print_mdoc_node(DECL_ARGS) |
|
Line 309 print_mdoc_node(DECL_ARGS) |
|
/* |
/* |
* Keeps only work until the end of a line. If a keep was |
* Keeps only work until the end of a line. If a keep was |
* invoked in a prior line, revert it to PREKEEP. |
* invoked in a prior line, revert it to PREKEEP. |
* |
|
* Also let SYNPRETTY sections behave as if they were wrapped |
|
* in a `Bk' block. |
|
*/ |
*/ |
|
|
if (TERMP_KEEP & p->flags || MDOC_SYNPRETTY & n->flags) { |
if (TERMP_KEEP & p->flags) { |
if (n->prev ? (n->prev->line != n->line) : |
if (n->prev ? (n->prev->lastline != n->line) : |
(n->parent && n->parent->line != n->line)) { |
(n->parent && n->parent->line != n->line)) { |
p->flags &= ~TERMP_KEEP; |
p->flags &= ~TERMP_KEEP; |
p->flags |= TERMP_PREKEEP; |
p->flags |= TERMP_PREKEEP; |
Line 321 print_mdoc_node(DECL_ARGS) |
|
Line 320 print_mdoc_node(DECL_ARGS) |
|
} |
} |
|
|
/* |
/* |
* Since SYNPRETTY sections aren't "turned off" with `Ek', |
|
* we have to intuit whether we should disable formatting. |
|
*/ |
|
|
|
if ( ! (MDOC_SYNPRETTY & n->flags) && |
|
((n->prev && MDOC_SYNPRETTY & n->prev->flags) || |
|
(n->parent && MDOC_SYNPRETTY & n->parent->flags))) |
|
p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); |
|
|
|
/* |
|
* After the keep flags have been set up, we may now |
* After the keep flags have been set up, we may now |
* produce output. Note that some pre-handlers do so. |
* produce output. Note that some pre-handlers do so. |
*/ |
*/ |
Line 397 print_mdoc_node(DECL_ARGS) |
|
Line 386 print_mdoc_node(DECL_ARGS) |
|
if (MDOC_EOS & n->flags) |
if (MDOC_EOS & n->flags) |
p->flags |= TERMP_SENTENCE; |
p->flags |= TERMP_SENTENCE; |
|
|
p->offset = offset; |
if (MDOC_ll != n->tok) { |
p->rmargin = rmargin; |
p->offset = offset; |
|
p->rmargin = rmargin; |
|
} |
} |
} |
|
|
|
|
Line 628 print_bvspace(struct termp *p, |
|
Line 619 print_bvspace(struct termp *p, |
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static int |
static int |
|
termp_ll_pre(DECL_ARGS) |
|
{ |
|
|
|
term_setwidth(p, n->nchild ? n->child->string : NULL); |
|
return(0); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static int |
termp_it_pre(DECL_ARGS) |
termp_it_pre(DECL_ARGS) |
{ |
{ |
const struct mdoc_node *bl, *nn; |
const struct mdoc_node *bl, *nn; |
Line 886 termp_it_pre(DECL_ARGS) |
|
Line 887 termp_it_pre(DECL_ARGS) |
|
assert(width); |
assert(width); |
if (MDOC_HEAD == n->type) |
if (MDOC_HEAD == n->type) |
p->rmargin = p->offset + width; |
p->rmargin = p->offset + width; |
else |
else { |
p->offset += width; |
p->offset += width; |
|
if (p->rmargin < p->offset) |
|
p->rmargin = p->offset; |
|
} |
break; |
break; |
case (LIST_column): |
case (LIST_column): |
assert(width); |
assert(width); |
|
|
termp_nm_pre(DECL_ARGS) |
termp_nm_pre(DECL_ARGS) |
{ |
{ |
|
|
if (MDOC_BLOCK == n->type) |
if (MDOC_BLOCK == n->type) { |
|
p->flags |= TERMP_PREKEEP; |
return(1); |
return(1); |
|
} |
|
|
if (MDOC_BODY == n->type) { |
if (MDOC_BODY == n->type) { |
if (NULL == n->child) |
if (NULL == n->child) |
Line 1023 termp_nm_pre(DECL_ARGS) |
|
Line 1029 termp_nm_pre(DECL_ARGS) |
|
MDOC_TEXT == n->prev->child->type ? |
MDOC_TEXT == n->prev->child->type ? |
term_strlen(p, n->prev->child->string) : |
term_strlen(p, n->prev->child->string) : |
term_len(p, 5)); |
term_len(p, 5)); |
|
if (p->rmargin < p->offset) |
|
p->rmargin = p->offset; |
return(1); |
return(1); |
} |
} |
|
|
|
|
termp_nm_post(DECL_ARGS) |
termp_nm_post(DECL_ARGS) |
{ |
{ |
|
|
if (MDOC_HEAD == n->type && n->next->child) { |
if (MDOC_BLOCK == n->type) { |
|
p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); |
|
} else if (MDOC_HEAD == n->type && n->next->child) { |
term_flushln(p); |
term_flushln(p); |
p->flags &= ~(TERMP_NOBREAK | TERMP_HANG); |
p->flags &= ~(TERMP_NOBREAK | TERMP_HANG); |
p->trailspace = 0; |
p->trailspace = 0; |
Line 1538 termp_ft_pre(DECL_ARGS) |
|
Line 1548 termp_ft_pre(DECL_ARGS) |
|
static int |
static int |
termp_fn_pre(DECL_ARGS) |
termp_fn_pre(DECL_ARGS) |
{ |
{ |
|
size_t rmargin = 0; |
int pretty; |
int pretty; |
|
|
pretty = MDOC_SYNPRETTY & n->flags; |
pretty = MDOC_SYNPRETTY & n->flags; |
Line 1547 termp_fn_pre(DECL_ARGS) |
|
Line 1558 termp_fn_pre(DECL_ARGS) |
|
if (NULL == (n = n->child)) |
if (NULL == (n = n->child)) |
return(0); |
return(0); |
|
|
|
if (pretty) { |
|
rmargin = p->rmargin; |
|
p->rmargin = p->offset + term_len(p, 4); |
|
p->flags |= TERMP_NOBREAK | TERMP_HANG; |
|
} |
|
|
assert(MDOC_TEXT == n->type); |
assert(MDOC_TEXT == n->type); |
term_fontpush(p, TERMFONT_BOLD); |
term_fontpush(p, TERMFONT_BOLD); |
term_word(p, n->string); |
term_word(p, n->string); |
term_fontpop(p); |
term_fontpop(p); |
|
|
|
if (pretty) { |
|
term_flushln(p); |
|
p->flags &= ~(TERMP_NOBREAK | TERMP_HANG); |
|
p->offset = p->rmargin; |
|
p->rmargin = rmargin; |
|
} |
|
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, "("); |
term_word(p, "("); |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
Line 1559 termp_fn_pre(DECL_ARGS) |
|
Line 1583 termp_fn_pre(DECL_ARGS) |
|
for (n = n->next; n; n = n->next) { |
for (n = n->next; n; n = n->next) { |
assert(MDOC_TEXT == n->type); |
assert(MDOC_TEXT == n->type); |
term_fontpush(p, TERMFONT_UNDER); |
term_fontpush(p, TERMFONT_UNDER); |
|
if (pretty) |
|
p->flags |= TERMP_NBRWORD; |
term_word(p, n->string); |
term_word(p, n->string); |
term_fontpop(p); |
term_fontpop(p); |
|
|
Line 1574 termp_fn_pre(DECL_ARGS) |
|
Line 1600 termp_fn_pre(DECL_ARGS) |
|
if (pretty) { |
if (pretty) { |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ";"); |
term_word(p, ";"); |
|
term_flushln(p); |
} |
} |
|
|
return(0); |
return(0); |
Line 1593 termp_fa_pre(DECL_ARGS) |
|
Line 1620 termp_fa_pre(DECL_ARGS) |
|
|
|
for (nn = n->child; nn; nn = nn->next) { |
for (nn = n->child; nn; nn = nn->next) { |
term_fontpush(p, TERMFONT_UNDER); |
term_fontpush(p, TERMFONT_UNDER); |
|
p->flags |= TERMP_NBRWORD; |
term_word(p, nn->string); |
term_word(p, nn->string); |
term_fontpop(p); |
term_fontpop(p); |
|
|
if (nn->next) { |
if (nn->next || (n->next && n->next->tok == MDOC_Fa)) { |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ","); |
term_word(p, ","); |
} |
} |
} |
} |
|
|
if (n->child && n->next && n->next->tok == MDOC_Fa) { |
|
p->flags |= TERMP_NOSPACE; |
|
term_word(p, ","); |
|
} |
|
|
|
return(0); |
return(0); |
} |
} |
|
|
Line 1781 termp_xx_pre(DECL_ARGS) |
|
Line 1804 termp_xx_pre(DECL_ARGS) |
|
|
|
|
|
/* ARGSUSED */ |
/* ARGSUSED */ |
static int |
|
termp_igndelim_pre(DECL_ARGS) |
|
{ |
|
|
|
p->flags |= TERMP_IGNDELIM; |
|
return(1); |
|
} |
|
|
|
|
|
/* ARGSUSED */ |
|
static void |
static void |
termp_pf_post(DECL_ARGS) |
termp_pf_post(DECL_ARGS) |
{ |
{ |
Line 2038 termp_quote_post(DECL_ARGS) |
|
Line 2051 termp_quote_post(DECL_ARGS) |
|
static int |
static int |
termp_fo_pre(DECL_ARGS) |
termp_fo_pre(DECL_ARGS) |
{ |
{ |
|
size_t rmargin = 0; |
|
int pretty; |
|
|
|
pretty = MDOC_SYNPRETTY & n->flags; |
|
|
if (MDOC_BLOCK == n->type) { |
if (MDOC_BLOCK == n->type) { |
synopsis_pre(p, n); |
synopsis_pre(p, n); |
return(1); |
return(1); |
} else if (MDOC_BODY == n->type) { |
} else if (MDOC_BODY == n->type) { |
|
if (pretty) { |
|
rmargin = p->rmargin; |
|
p->rmargin = p->offset + term_len(p, 4); |
|
p->flags |= TERMP_NOBREAK | TERMP_HANG; |
|
} |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, "("); |
term_word(p, "("); |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
|
if (pretty) { |
|
term_flushln(p); |
|
p->flags &= ~(TERMP_NOBREAK | TERMP_HANG); |
|
p->offset = p->rmargin; |
|
p->rmargin = rmargin; |
|
} |
return(1); |
return(1); |
} |
} |
|
|
if (NULL == n->child) |
if (NULL == n->child) |
return(0); |
return(0); |
Line 2075 termp_fo_post(DECL_ARGS) |
|
Line 2103 termp_fo_post(DECL_ARGS) |
|
if (MDOC_SYNPRETTY & n->flags) { |
if (MDOC_SYNPRETTY & n->flags) { |
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
term_word(p, ";"); |
term_word(p, ";"); |
|
term_flushln(p); |
} |
} |
} |
} |
|
|
|
|
termp_bk_post(DECL_ARGS) |
termp_bk_post(DECL_ARGS) |
{ |
{ |
|
|
if (MDOC_BODY == n->type && ! (MDOC_SYNPRETTY & n->flags)) |
if (MDOC_BODY == n->type) |
p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); |
p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP); |
} |
} |
|
|