version 1.7, 2017/03/07 14:04:08 |
version 1.12, 2017/03/08 17:51:58 |
Line 247 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 374 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 437 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 470 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 490 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 521 md_word(const char *s) |
|
Line 535 md_word(const char *s) |
|
bs = escflags & ESC_HYP && !code_blocks; |
bs = escflags & ESC_HYP && !code_blocks; |
break; |
break; |
case ')': |
case ')': |
bs = escflags & ESC_PAR && !code_blocks; |
bs = escflags & (ESC_NUM | ESC_PAR) && !code_blocks; |
break; |
break; |
case '*': |
case '*': |
case '[': |
case '[': |
Line 630 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 1134 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 1160 md_pre_It(struct roff_node *n) |
|
Line 1178 md_pre_It(struct roff_node *n) |
|
break; |
break; |
case LIST_enum: |
case LIST_enum: |
md_preword(); |
md_preword(); |
printf("%d.\t", ++bln->norm->Bl.count); |
if (bln->norm->Bl.count < 99) |
|
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; |
} |
} |