version 1.17, 2017/04/24 23:06:18 |
version 1.23, 2017/06/14 01:31:26 |
Line 222 static const struct md_act __md_acts[MDOC_MAX - MDOC_D |
|
Line 222 static const struct md_act __md_acts[MDOC_MAX - MDOC_D |
|
{ md_cond_body, md_pre_En, md_post_En, NULL, NULL }, /* En */ |
{ md_cond_body, md_pre_En, md_post_En, NULL, NULL }, /* En */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Dx */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Dx */ |
{ NULL, NULL, md_post_pc, NULL, NULL }, /* %Q */ |
{ NULL, NULL, md_post_pc, NULL, NULL }, /* %Q */ |
{ NULL, md_pre_br, NULL, NULL, NULL }, /* br */ |
|
{ NULL, md_pre_Pp, NULL, NULL, NULL }, /* sp */ |
|
{ NULL, md_pre_Lk, md_post_pc, NULL, NULL }, /* %U */ |
{ NULL, md_pre_Lk, md_post_pc, NULL, NULL }, /* %U */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Ta */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Ta */ |
{ NULL, NULL, NULL, NULL, NULL }, /* ll */ |
|
}; |
}; |
static const struct md_act *const md_acts = __md_acts - MDOC_Dd; |
static const struct md_act *const md_acts = __md_acts - MDOC_Dd; |
|
|
Line 310 md_node(struct roff_node *n) |
|
Line 307 md_node(struct roff_node *n) |
|
process_children = 1; |
process_children = 1; |
n->flags &= ~NODE_ENDED; |
n->flags &= ~NODE_ENDED; |
|
|
switch (n->type) { |
if (n->type == ROFFT_TEXT) { |
case ROFFT_TEXT: |
|
if (n->flags & NODE_DELIMC) |
if (n->flags & NODE_DELIMC) |
outflags &= ~(MD_spc | MD_spc_force); |
outflags &= ~(MD_spc | MD_spc_force); |
else if (outflags & MD_Sm) |
else if (outflags & MD_Sm) |
Line 321 md_node(struct roff_node *n) |
|
Line 317 md_node(struct roff_node *n) |
|
outflags &= ~(MD_spc | MD_spc_force); |
outflags &= ~(MD_spc | MD_spc_force); |
else if (outflags & MD_Sm) |
else if (outflags & MD_Sm) |
outflags |= MD_spc; |
outflags |= MD_spc; |
break; |
} else if (n->tok < ROFF_MAX) { |
default: |
switch (n->tok) { |
|
case ROFF_br: |
|
process_children = md_pre_br(n); |
|
break; |
|
case ROFF_sp: |
|
process_children = md_pre_Pp(n); |
|
break; |
|
default: |
|
process_children = 0; |
|
break; |
|
} |
|
} else { |
|
assert(n->tok >= MDOC_Dd && n->tok < MDOC_MAX); |
act = md_acts + n->tok; |
act = md_acts + n->tok; |
cond = act->cond == NULL || (*act->cond)(n); |
cond = act->cond == NULL || (*act->cond)(n); |
if (cond && act->pre != NULL && |
if (cond && act->pre != NULL && |
(n->end == ENDBODY_NOT || n->child != NULL)) |
(n->end == ENDBODY_NOT || n->child != NULL)) |
process_children = (*act->pre)(n); |
process_children = (*act->pre)(n); |
break; |
|
} |
} |
|
|
if (process_children && n->child != NULL) |
if (process_children && n->child != NULL) |
Line 486 md_word(const char *s) |
|
Line 493 md_word(const char *s) |
|
{ |
{ |
const char *seq, *prevfont, *currfont, *nextfont; |
const char *seq, *prevfont, *currfont, *nextfont; |
char c; |
char c; |
int bs, sz, uc; |
int bs, sz, uc, breakline; |
|
|
/* No spacing before closing delimiters. */ |
/* No spacing before closing delimiters. */ |
if (s[0] != '\0' && s[1] == '\0' && |
if (s[0] != '\0' && s[1] == '\0' && |
Line 503 md_word(const char *s) |
|
Line 510 md_word(const char *s) |
|
if ((s[0] == '(' || s[0] == '[') && s[1] == '\0') |
if ((s[0] == '(' || s[0] == '[') && s[1] == '\0') |
outflags &= ~MD_spc; |
outflags &= ~MD_spc; |
|
|
|
breakline = 0; |
prevfont = currfont = ""; |
prevfont = currfont = ""; |
while ((c = *s++) != '\0') { |
while ((c = *s++) != '\0') { |
bs = 0; |
bs = 0; |
Line 588 md_word(const char *s) |
|
Line 596 md_word(const char *s) |
|
case ESCAPE_FONTPREV: |
case ESCAPE_FONTPREV: |
nextfont = prevfont; |
nextfont = prevfont; |
break; |
break; |
|
case ESCAPE_BREAK: |
|
breakline = 1; |
|
break; |
case ESCAPE_NOSPACE: |
case ESCAPE_NOSPACE: |
case ESCAPE_SKIPCHAR: |
case ESCAPE_SKIPCHAR: |
case ESCAPE_OVERSTRIKE: |
case ESCAPE_OVERSTRIKE: |
Line 635 md_word(const char *s) |
|
Line 646 md_word(const char *s) |
|
if (bs) |
if (bs) |
putchar('\\'); |
putchar('\\'); |
md_char(c); |
md_char(c); |
|
if (breakline && |
|
(*s == '\0' || *s == ' ' || *s == ASCII_NBRSP)) { |
|
printf(" \n"); |
|
breakline = 0; |
|
while (*s == ' ' || *s == ASCII_NBRSP) |
|
s++; |
|
} |
} |
} |
if (*currfont != '\0') { |
if (*currfont != '\0') { |
outflags &= ~MD_spc; |
outflags &= ~MD_spc; |
Line 1299 md_uri(const char *s) |
|
Line 1317 md_uri(const char *s) |
|
static int |
static int |
md_pre_Lk(struct roff_node *n) |
md_pre_Lk(struct roff_node *n) |
{ |
{ |
const struct roff_node *link, *descr; |
const struct roff_node *link, *descr, *punct; |
|
|
if ((link = n->child) == NULL) |
if ((link = n->child) == NULL) |
return 0; |
return 0; |
|
|
|
/* Find beginning of trailing punctuation. */ |
|
punct = n->last; |
|
while (punct != link && punct->flags & NODE_DELIMC) |
|
punct = punct->prev; |
|
punct = punct->next; |
|
|
/* Link text. */ |
/* Link text. */ |
descr = link->next; |
descr = link->next; |
if (descr == NULL || descr->flags & NODE_DELIMC) |
if (descr == punct) |
descr = link; /* no text */ |
descr = link; /* no text */ |
md_rawword("["); |
md_rawword("["); |
outflags &= ~MD_spc; |
outflags &= ~MD_spc; |
do { |
do { |
md_word(descr->string); |
md_word(descr->string); |
descr = descr->next; |
descr = descr->next; |
} while (descr != NULL && !(descr->flags & NODE_DELIMC)); |
} while (descr != punct); |
outflags &= ~MD_spc; |
outflags &= ~MD_spc; |
|
|
/* Link target. */ |
/* Link target. */ |
Line 1323 md_pre_Lk(struct roff_node *n) |
|
Line 1347 md_pre_Lk(struct roff_node *n) |
|
md_rawword(")"); |
md_rawword(")"); |
|
|
/* Trailing punctuation. */ |
/* Trailing punctuation. */ |
while (descr != NULL) { |
while (punct != NULL) { |
md_word(descr->string); |
md_word(punct->string); |
descr = descr->next; |
punct = punct->next; |
} |
} |
return 0; |
return 0; |
} |
} |