version 1.5, 2017/03/07 13:09:27 |
version 1.10, 2017/03/08 15:08:36 |
Line 90 static void md_post_En(struct roff_node *); |
|
Line 90 static void md_post_En(struct roff_node *); |
|
static void md_post_Eo(struct roff_node *); |
static void md_post_Eo(struct roff_node *); |
static void md_post_Fa(struct roff_node *); |
static void md_post_Fa(struct roff_node *); |
static void md_post_Fd(struct roff_node *); |
static void md_post_Fd(struct roff_node *); |
|
static void md_post_Fl(struct roff_node *); |
static void md_post_Fn(struct roff_node *); |
static void md_post_Fn(struct roff_node *); |
static void md_post_Fo(struct roff_node *); |
static void md_post_Fo(struct roff_node *); |
static void md_post_In(struct roff_node *); |
static void md_post_In(struct roff_node *); |
Line 126 static const struct md_act md_acts[MDOC_MAX + 1] = { |
|
Line 127 static const struct md_act md_acts[MDOC_MAX + 1] = { |
|
{ NULL, NULL, NULL, NULL, NULL }, /* Ex */ |
{ NULL, NULL, NULL, NULL, NULL }, /* Ex */ |
{ NULL, md_pre_Fa, md_post_Fa, NULL, NULL }, /* Fa */ |
{ NULL, md_pre_Fa, md_post_Fa, NULL, NULL }, /* Fa */ |
{ NULL, md_pre_Fd, md_post_Fd, "**", "**" }, /* Fd */ |
{ NULL, md_pre_Fd, md_post_Fd, "**", "**" }, /* Fd */ |
{ NULL, md_pre_raw, md_post_raw, "**-", "**" }, /* Fl */ |
{ NULL, md_pre_raw, md_post_Fl, "**-", "**" }, /* Fl */ |
{ NULL, md_pre_Fn, md_post_Fn, NULL, NULL }, /* Fn */ |
{ NULL, md_pre_Fn, md_post_Fn, NULL, NULL }, /* Fn */ |
{ NULL, md_pre_Fd, md_post_raw, "*", "*" }, /* Ft */ |
{ NULL, md_pre_Fd, md_post_raw, "*", "*" }, /* Ft */ |
{ NULL, md_pre_raw, md_post_raw, "**", "**" }, /* Ic */ |
{ NULL, md_pre_raw, md_post_raw, "**", "**" }, /* Ic */ |
Line 246 static int escflags; /* Escape in generated markdown |
|
Line 247 static int escflags; /* Escape in generated markdown |
|
#define ESC_PAR (1 << 3) /* ")" when "(" is open. */ |
#define ESC_PAR (1 << 3) /* ")" when "(" is open. */ |
#define ESC_SQU (1 << 4) /* "]" when "[" is open. */ |
#define ESC_SQU (1 << 4) /* "]" when "[" is open. */ |
#define ESC_FON (1 << 5) /* "*" immediately after unrelated "*". */ |
#define ESC_FON (1 << 5) /* "*" immediately after unrelated "*". */ |
|
#define ESC_EOL (1 << 6) /* " " at the and of a line. */ |
|
|
static int code_blocks, quote_blocks, list_blocks; |
static int code_blocks, quote_blocks, list_blocks; |
static int outcount; |
static int outcount; |
Line 373 md_stack(char c) |
|
Line 375 md_stack(char c) |
|
static void |
static void |
md_preword(void) |
md_preword(void) |
{ |
{ |
|
const char *cp; |
|
|
/* |
/* |
* If a list block is nested inside a code block or a blockquote, |
* If a list block is nested inside a code block or a blockquote, |
* blank lines for paragraph breaks no longer work; instead, |
* blank lines for paragraph breaks no longer work; instead, |
* they terminate the list. Work around this markdown issue |
* they terminate the list. Work around this markdown issue |
* by using mere line breaks instead. |
* by using mere line breaks instead. |
*/ |
*/ |
|
|
if (list_blocks && outflags & MD_sp) { |
if (list_blocks && outflags & MD_sp) { |
outflags &= ~MD_sp; |
outflags &= ~MD_sp; |
outflags |= MD_br; |
outflags |= MD_br; |
} |
} |
|
|
/* End the old line if requested. */ |
/* |
|
* End the old line if requested. |
|
* Escape whitespace at the end of the markdown line |
|
* such that it won't look like an output line break. |
|
*/ |
|
|
if (outflags & MD_sp) |
if (outflags & MD_sp) |
putchar('\n'); |
putchar('\n'); |
else if (outflags & MD_br) { |
else if (outflags & MD_br) { |
putchar(' '); |
putchar(' '); |
putchar(' '); |
putchar(' '); |
#ifdef DEBUG |
} else if (outflags & MD_nl && escflags & ESC_EOL) |
putchar(':'); |
md_named("zwnj"); |
putchar(':'); |
|
putchar(' '); |
|
putchar(' '); |
|
#endif |
|
} |
|
|
|
/* Start a new line if necessary. */ |
/* Start a new line if necessary. */ |
|
|
if (outflags & (MD_nl | MD_br | MD_sp)) { |
if (outflags & (MD_nl | MD_br | MD_sp)) { |
putchar('\n'); |
putchar('\n'); |
fputs(md_stack('\0'), stdout); |
for (cp = md_stack('\0'); *cp != '\0'; cp++) { |
|
putchar(*cp); |
|
if (*cp == '>') |
|
putchar(' '); |
|
} |
outflags &= ~(MD_nl | MD_br | MD_sp); |
outflags &= ~(MD_nl | MD_br | MD_sp); |
escflags = ESC_BOL; |
escflags = ESC_BOL; |
outcount = 0; |
outcount = 0; |
Line 436 md_rawword(const char *s) |
|
Line 444 md_rawword(const char *s) |
|
{ |
{ |
md_preword(); |
md_preword(); |
|
|
if (*s == 0) |
if (*s == '\0') |
return; |
return; |
|
|
if (escflags & ESC_FON) { |
if (escflags & ESC_FON) { |
Line 469 md_rawword(const char *s) |
|
Line 477 md_rawword(const char *s) |
|
} |
} |
md_char(*s++); |
md_char(*s++); |
} |
} |
|
if (s[-1] == ' ') |
|
escflags |= ESC_EOL; |
|
else |
|
escflags &= ~ESC_EOL; |
} |
} |
|
|
/* |
/* |
Line 489 md_word(const char *s) |
|
Line 501 md_word(const char *s) |
|
|
|
md_preword(); |
md_preword(); |
|
|
|
if (*s == '\0') |
|
return; |
|
|
/* No spacing after opening delimiters. */ |
/* No spacing after opening delimiters. */ |
if ((s[0] == '(' || s[0] == '[') && s[1] == '\0') |
if ((s[0] == '(' || s[0] == '[') && s[1] == '\0') |
outflags &= ~MD_spc; |
outflags &= ~MD_spc; |
Line 629 md_word(const char *s) |
|
Line 644 md_word(const char *s) |
|
if (*currfont != '\0') { |
if (*currfont != '\0') { |
outflags &= ~MD_spc; |
outflags &= ~MD_spc; |
md_rawword(currfont); |
md_rawword(currfont); |
} |
} else if (s[-2] == ' ') |
|
escflags |= ESC_EOL; |
|
else |
|
escflags &= ~ESC_EOL; |
} |
} |
|
|
/* |
/* |
|
|
md_named(const char *s) |
md_named(const char *s) |
{ |
{ |
printf("&%s;", s); |
printf("&%s;", s); |
escflags &= ~ESC_FON; |
escflags &= ~(ESC_FON | ESC_EOL); |
outcount++; |
outcount++; |
} |
} |
|
|
Line 956 md_pre_Eo(struct roff_node *n) |
|
Line 974 md_pre_Eo(struct roff_node *n) |
|
static void |
static void |
md_post_Eo(struct roff_node *n) |
md_post_Eo(struct roff_node *n) |
{ |
{ |
int body, tail; |
|
|
|
if (n->end != ENDBODY_NOT) { |
if (n->end != ENDBODY_NOT) { |
outflags |= MD_spc; |
outflags |= MD_spc; |
return; |
return; |
} |
} |
|
|
body = n->child != NULL || n->parent->head->child != NULL; |
if (n->child == NULL && n->parent->head->child == NULL) |
tail = n->parent->tail != NULL && n->parent->tail->child != NULL; |
return; |
|
|
if (body && tail) |
if (n->parent->tail != NULL && n->parent->tail->child != NULL) |
outflags &= ~MD_spc; |
outflags &= ~MD_spc; |
else if ( ! (body || tail)) |
else |
md_preword(); |
|
else if ( ! tail) |
|
outflags |= MD_spc; |
outflags |= MD_spc; |
} |
} |
|
|
Line 1018 md_post_Fd(struct roff_node *n) |
|
Line 1032 md_post_Fd(struct roff_node *n) |
|
outflags |= MD_br; |
outflags |= MD_br; |
} |
} |
|
|
|
static void |
|
md_post_Fl(struct roff_node *n) |
|
{ |
|
md_post_raw(n); |
|
if (n->child == NULL && n->next != NULL && |
|
n->next->type != ROFFT_TEXT && !(n->next->flags & NODE_LINE)) |
|
outflags &= ~MD_spc; |
|
} |
|
|
static int |
static int |
md_pre_Fn(struct roff_node *n) |
md_pre_Fn(struct roff_node *n) |
{ |
{ |
Line 1128 md_pre_It(struct roff_node *n) |
|
Line 1151 md_pre_It(struct roff_node *n) |
|
|
|
case ROFFT_HEAD: |
case ROFFT_HEAD: |
bln = n->parent->parent; |
bln = n->parent->parent; |
if (bln->norm->Bl.comp == 0) |
if (bln->norm->Bl.comp == 0 && |
|
bln->norm->Bl.type != LIST_column) |
outflags |= MD_sp; |
outflags |= MD_sp; |
outflags |= MD_nl; |
outflags |= MD_nl; |
|
|
Line 1157 md_pre_It(struct roff_node *n) |
|
Line 1181 md_pre_It(struct roff_node *n) |
|
printf("%d.\t", ++bln->norm->Bl.count); |
printf("%d.\t", ++bln->norm->Bl.count); |
escflags &= ~ESC_FON; |
escflags &= ~ESC_FON; |
break; |
break; |
|
case LIST_column: |
|
outflags |= MD_br; |
|
return 0; |
default: |
default: |
return 0; |
return 0; |
} |
} |