version 1.16, 2017/04/17 12:53:29 |
version 1.22, 2017/05/30 16:31:29 |
Line 103 static void md_post_Pf(struct roff_node *); |
|
Line 103 static void md_post_Pf(struct roff_node *); |
|
static void md_post_Vt(struct roff_node *); |
static void md_post_Vt(struct roff_node *); |
static void md_post__T(struct roff_node *); |
static void md_post__T(struct roff_node *); |
|
|
static const struct md_act md_acts[MDOC_MAX + 1] = { |
static const struct md_act __md_acts[MDOC_MAX - MDOC_Dd] = { |
{ NULL, md_pre_Ap, NULL, NULL, NULL }, /* Ap */ |
|
{ NULL, NULL, NULL, NULL, NULL }, /* Dd */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Dd */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Dt */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Dt */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Os */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Os */ |
Line 120 static const struct md_act md_acts[MDOC_MAX + 1] = { |
|
Line 119 static const struct md_act md_acts[MDOC_MAX + 1] = { |
|
{ NULL, md_pre_It, md_post_It, NULL, NULL }, /* It */ |
{ NULL, md_pre_It, md_post_It, NULL, NULL }, /* It */ |
{ NULL, md_pre_raw, md_post_raw, "*", "*" }, /* Ad */ |
{ NULL, md_pre_raw, md_post_raw, "*", "*" }, /* Ad */ |
{ NULL, md_pre_An, NULL, NULL, NULL }, /* An */ |
{ NULL, md_pre_An, NULL, NULL, NULL }, /* An */ |
|
{ NULL, md_pre_Ap, NULL, NULL, NULL }, /* Ap */ |
{ NULL, md_pre_raw, md_post_raw, "*", "*" }, /* Ar */ |
{ NULL, md_pre_raw, md_post_raw, "*", "*" }, /* Ar */ |
{ NULL, md_pre_raw, md_post_raw, "**", "**" }, /* Cd */ |
{ NULL, md_pre_raw, md_post_raw, "**", "**" }, /* Cd */ |
{ NULL, md_pre_raw, md_post_raw, "**", "**" }, /* Cm */ |
{ NULL, md_pre_raw, md_post_raw, "**", "**" }, /* Cm */ |
Line 222 static const struct md_act md_acts[MDOC_MAX + 1] = { |
|
Line 222 static const struct md_act md_acts[MDOC_MAX + 1] = { |
|
{ 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 */ |
|
{ NULL, NULL, NULL, NULL, NULL }, /* ROOT */ |
|
}; |
}; |
|
static const struct md_act *const md_acts = __md_acts - MDOC_Dd; |
|
|
static int outflags; |
static int outflags; |
#define MD_spc (1 << 0) /* Blank character before next word. */ |
#define MD_spc (1 << 0) /* Blank character before next word. */ |
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 1299 md_uri(const char *s) |
|
Line 1306 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 1336 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; |
} |
} |