version 1.305, 2015/01/31 00:12:41 |
version 1.313, 2015/03/06 15:48:52 |
Line 67 static void termp__t_post(DECL_ARGS); |
|
Line 67 static void termp__t_post(DECL_ARGS); |
|
static void termp_bd_post(DECL_ARGS); |
static void termp_bd_post(DECL_ARGS); |
static void termp_bk_post(DECL_ARGS); |
static void termp_bk_post(DECL_ARGS); |
static void termp_bl_post(DECL_ARGS); |
static void termp_bl_post(DECL_ARGS); |
|
static void termp_eo_post(DECL_ARGS); |
static void termp_fd_post(DECL_ARGS); |
static void termp_fd_post(DECL_ARGS); |
static void termp_fo_post(DECL_ARGS); |
static void termp_fo_post(DECL_ARGS); |
static void termp_in_post(DECL_ARGS); |
static void termp_in_post(DECL_ARGS); |
Line 91 static int termp_bt_pre(DECL_ARGS); |
|
Line 92 static int termp_bt_pre(DECL_ARGS); |
|
static int termp_bx_pre(DECL_ARGS); |
static int termp_bx_pre(DECL_ARGS); |
static int termp_cd_pre(DECL_ARGS); |
static int termp_cd_pre(DECL_ARGS); |
static int termp_d1_pre(DECL_ARGS); |
static int termp_d1_pre(DECL_ARGS); |
|
static int termp_eo_pre(DECL_ARGS); |
static int termp_ex_pre(DECL_ARGS); |
static int termp_ex_pre(DECL_ARGS); |
static int termp_fa_pre(DECL_ARGS); |
static int termp_fa_pre(DECL_ARGS); |
static int termp_fd_pre(DECL_ARGS); |
static int termp_fd_pre(DECL_ARGS); |
Line 190 static const struct termact termacts[MDOC_MAX] = { |
|
Line 192 static const struct termact termacts[MDOC_MAX] = { |
|
{ NULL, NULL }, /* Ec */ /* FIXME: no space */ |
{ NULL, NULL }, /* Ec */ /* FIXME: no space */ |
{ NULL, NULL }, /* Ef */ |
{ NULL, NULL }, /* Ef */ |
{ termp_under_pre, NULL }, /* Em */ |
{ termp_under_pre, NULL }, /* Em */ |
{ termp_quote_pre, termp_quote_post }, /* Eo */ |
{ termp_eo_pre, termp_eo_post }, /* Eo */ |
{ termp_xx_pre, NULL }, /* Fx */ |
{ termp_xx_pre, NULL }, /* Fx */ |
{ termp_bold_pre, NULL }, /* Ms */ |
{ termp_bold_pre, NULL }, /* Ms */ |
{ termp_li_pre, NULL }, /* No */ |
{ termp_li_pre, NULL }, /* No */ |
Line 307 print_mdoc_node(DECL_ARGS) |
|
Line 309 print_mdoc_node(DECL_ARGS) |
|
chld = 1; |
chld = 1; |
offset = p->offset; |
offset = p->offset; |
rmargin = p->rmargin; |
rmargin = p->rmargin; |
|
n->flags &= ~MDOC_ENDED; |
n->prev_font = p->fonti; |
n->prev_font = p->fonti; |
|
|
memset(&npair, 0, sizeof(struct termpair)); |
memset(&npair, 0, sizeof(struct termpair)); |
Line 317 print_mdoc_node(DECL_ARGS) |
|
Line 320 print_mdoc_node(DECL_ARGS) |
|
* invoked in a prior line, revert it to PREKEEP. |
* invoked in a prior line, revert it to PREKEEP. |
*/ |
*/ |
|
|
if (TERMP_KEEP & p->flags) { |
if (p->flags & TERMP_KEEP && n->flags & MDOC_LINE) { |
if (n->prev ? (n->prev->lastline != n->line) : |
p->flags &= ~TERMP_KEEP; |
(n->parent && n->parent->line != n->line)) { |
p->flags |= TERMP_PREKEEP; |
p->flags &= ~TERMP_KEEP; |
|
p->flags |= TERMP_PREKEEP; |
|
} |
|
} |
} |
|
|
/* |
/* |
Line 348 print_mdoc_node(DECL_ARGS) |
|
Line 348 print_mdoc_node(DECL_ARGS) |
|
p->flags |= TERMP_NOSPACE; |
p->flags |= TERMP_NOSPACE; |
break; |
break; |
case MDOC_TBL: |
case MDOC_TBL: |
|
if (p->tbl.cols == NULL) |
|
term_newln(p); |
term_tbl(p, n->span); |
term_tbl(p, n->span); |
break; |
break; |
default: |
default: |
Line 362 print_mdoc_node(DECL_ARGS) |
|
Line 364 print_mdoc_node(DECL_ARGS) |
|
print_mdoc_nodelist(p, &npair, meta, n->child); |
print_mdoc_nodelist(p, &npair, meta, n->child); |
|
|
term_fontpopq(p, |
term_fontpopq(p, |
(ENDBODY_NOT == n->end ? n : n->pending)->prev_font); |
(ENDBODY_NOT == n->end ? n : n->body)->prev_font); |
|
|
switch (n->type) { |
switch (n->type) { |
case MDOC_TEXT: |
case MDOC_TEXT: |
Line 382 print_mdoc_node(DECL_ARGS) |
|
Line 384 print_mdoc_node(DECL_ARGS) |
|
* that it must not call the post handler again. |
* that it must not call the post handler again. |
*/ |
*/ |
if (ENDBODY_NOT != n->end) |
if (ENDBODY_NOT != n->end) |
n->pending->flags |= MDOC_ENDED; |
n->body->flags |= MDOC_ENDED; |
|
|
/* |
/* |
* End of line terminating an implicit block |
* End of line terminating an implicit block |
Line 1092 termp_an_pre(DECL_ARGS) |
|
Line 1094 termp_an_pre(DECL_ARGS) |
|
return(0); |
return(0); |
} |
} |
|
|
if (n->child == NULL) |
|
return(0); |
|
|
|
if (p->flags & TERMP_SPLIT) |
if (p->flags & TERMP_SPLIT) |
term_newln(p); |
term_newln(p); |
|
|
|
|
termp_sp_pre(DECL_ARGS) |
termp_sp_pre(DECL_ARGS) |
{ |
{ |
struct roffsu su; |
struct roffsu su; |
size_t i, len; |
int i, len; |
|
|
switch (n->tok) { |
switch (n->tok) { |
case MDOC_sp: |
case MDOC_sp: |
Line 1832 termp_sp_pre(DECL_ARGS) |
|
Line 1831 termp_sp_pre(DECL_ARGS) |
|
|
|
if (0 == len) |
if (0 == len) |
term_newln(p); |
term_newln(p); |
for (i = 0; i < len; i++) |
else if (len < 0) |
term_vspace(p); |
p->skipvsp -= len; |
|
else |
|
for (i = 0; i < len; i++) |
|
term_vspace(p); |
|
|
return(0); |
return(0); |
} |
} |
Line 1876 termp_quote_pre(DECL_ARGS) |
|
Line 1878 termp_quote_pre(DECL_ARGS) |
|
case MDOC_Do: |
case MDOC_Do: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_Dq: |
case MDOC_Dq: |
term_word(p, "\\(lq"); |
term_word(p, "\\(Lq"); |
break; |
break; |
case MDOC_En: |
case MDOC_En: |
if (NULL == n->norm->Es || |
if (NULL == n->norm->Es || |
Line 1884 termp_quote_pre(DECL_ARGS) |
|
Line 1886 termp_quote_pre(DECL_ARGS) |
|
return(1); |
return(1); |
term_word(p, n->norm->Es->child->string); |
term_word(p, n->norm->Es->child->string); |
break; |
break; |
case MDOC_Eo: |
|
break; |
|
case MDOC_Po: |
case MDOC_Po: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_Pq: |
case MDOC_Pq: |
Line 1921 termp_quote_post(DECL_ARGS) |
|
Line 1921 termp_quote_post(DECL_ARGS) |
|
if (n->type != MDOC_BODY && n->type != MDOC_ELEM) |
if (n->type != MDOC_BODY && n->type != MDOC_ELEM) |
return; |
return; |
|
|
if ( ! (n->tok == MDOC_En || |
p->flags |= TERMP_NOSPACE; |
(n->tok == MDOC_Eo && n->end == ENDBODY_SPACE))) |
|
p->flags |= TERMP_NOSPACE; |
|
|
|
switch (n->tok) { |
switch (n->tok) { |
case MDOC_Ao: |
case MDOC_Ao: |
Line 1949 termp_quote_post(DECL_ARGS) |
|
Line 1947 termp_quote_post(DECL_ARGS) |
|
case MDOC_Do: |
case MDOC_Do: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_Dq: |
case MDOC_Dq: |
term_word(p, "\\(rq"); |
term_word(p, "\\(Rq"); |
break; |
break; |
case MDOC_En: |
case MDOC_En: |
if (NULL != n->norm->Es && |
if (n->norm->Es == NULL || |
NULL != n->norm->Es->child && |
n->norm->Es->child == NULL || |
NULL != n->norm->Es->child->next) { |
n->norm->Es->child->next == NULL) |
p->flags |= TERMP_NOSPACE; |
p->flags &= ~TERMP_NOSPACE; |
|
else |
term_word(p, n->norm->Es->child->next->string); |
term_word(p, n->norm->Es->child->next->string); |
} |
|
break; |
break; |
case MDOC_Eo: |
|
break; |
|
case MDOC_Po: |
case MDOC_Po: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_Pq: |
case MDOC_Pq: |
Line 1984 termp_quote_post(DECL_ARGS) |
|
Line 1980 termp_quote_post(DECL_ARGS) |
|
abort(); |
abort(); |
/* NOTREACHED */ |
/* NOTREACHED */ |
} |
} |
|
} |
|
|
|
static int |
|
termp_eo_pre(DECL_ARGS) |
|
{ |
|
|
|
if (n->type != MDOC_BODY) |
|
return(1); |
|
|
|
if (n->end == ENDBODY_NOT && |
|
n->parent->head->child == NULL && |
|
n->child != NULL && |
|
n->child->end != ENDBODY_NOT) |
|
term_word(p, "\\&"); |
|
else if (n->end != ENDBODY_NOT ? n->child != NULL : |
|
n->parent->head->child != NULL && (n->child != NULL || |
|
(n->parent->tail != NULL && n->parent->tail->child != NULL))) |
|
p->flags |= TERMP_NOSPACE; |
|
|
|
return(1); |
|
} |
|
|
|
static void |
|
termp_eo_post(DECL_ARGS) |
|
{ |
|
int body, tail; |
|
|
|
if (n->type != MDOC_BODY) |
|
return; |
|
|
|
if (n->end != ENDBODY_NOT) { |
|
p->flags &= ~TERMP_NOSPACE; |
|
return; |
|
} |
|
|
|
body = n->child != NULL || n->parent->head->child != NULL; |
|
tail = n->parent->tail != NULL && n->parent->tail->child != NULL; |
|
|
|
if (body && tail) |
|
p->flags |= TERMP_NOSPACE; |
|
else if ( ! (body || tail)) |
|
term_word(p, "\\&"); |
|
else if ( ! tail) |
|
p->flags &= ~TERMP_NOSPACE; |
} |
} |
|
|
static int |
static int |