version 1.215, 2014/06/20 17:24:00 |
version 1.218, 2014/07/06 19:09:00 |
|
|
#include "libmdoc.h" |
#include "libmdoc.h" |
#include "libmandoc.h" |
#include "libmandoc.h" |
|
|
const char *const __mdoc_macronames[MDOC_MAX] = { |
const char *const __mdoc_macronames[MDOC_MAX + 1] = { |
"Ap", "Dd", "Dt", "Os", |
"Ap", "Dd", "Dt", "Os", |
"Sh", "Ss", "Pp", "D1", |
"Sh", "Ss", "Pp", "D1", |
"Dl", "Bd", "Ed", "Bl", |
"Dl", "Bd", "Ed", "Bl", |
Line 66 const char *const __mdoc_macronames[MDOC_MAX] = { |
|
Line 66 const char *const __mdoc_macronames[MDOC_MAX] = { |
|
"Lk", "Mt", "Brq", "Bro", |
"Lk", "Mt", "Brq", "Bro", |
"Brc", "%C", "Es", "En", |
"Brc", "%C", "Es", "En", |
"Dx", "%Q", "br", "sp", |
"Dx", "%Q", "br", "sp", |
"%U", "Ta", "ll", |
"%U", "Ta", "ll", "text", |
}; |
}; |
|
|
const char *const __mdoc_argnames[MDOC_ARG_MAX] = { |
const char *const __mdoc_argnames[MDOC_ARG_MAX] = { |
Line 516 mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, |
|
Line 516 mdoc_block_alloc(struct mdoc *mdoc, int line, int pos, |
|
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case MDOC_Bl: |
case MDOC_Bl: |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
|
case MDOC_En: |
|
/* FALLTHROUGH */ |
case MDOC_Rs: |
case MDOC_Rs: |
p->norm = mandoc_calloc(1, sizeof(union mdoc_data)); |
p->norm = mandoc_calloc(1, sizeof(union mdoc_data)); |
break; |
break; |
Line 795 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
Line 797 mdoc_ptext(struct mdoc *mdoc, int line, char *buf, int |
|
*end = '\0'; |
*end = '\0'; |
|
|
if (ws) |
if (ws) |
mdoc_pmsg(mdoc, line, (int)(ws-buf), MANDOCERR_EOLNSPACE); |
mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse, |
|
line, (int)(ws-buf), NULL); |
|
|
if ('\0' == buf[offs] && ! (MDOC_LITERAL & mdoc->flags)) { |
if ('\0' == buf[offs] && ! (MDOC_LITERAL & mdoc->flags)) { |
mdoc_pmsg(mdoc, line, (int)(c-buf), MANDOCERR_NOBLANKLN); |
mandoc_msg(MANDOCERR_FI_BLANK, mdoc->parse, |
|
line, (int)(c - buf), NULL); |
|
|
/* |
/* |
* Insert a `sp' in the case of a blank line. Technically, |
* Insert a `sp' in the case of a blank line. Technically, |
Line 848 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
Line 852 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
/* Empty post-control lines are ignored. */ |
/* Empty post-control lines are ignored. */ |
|
|
if ('"' == buf[offs]) { |
if ('"' == buf[offs]) { |
mdoc_pmsg(mdoc, ln, offs, MANDOCERR_BADCOMMENT); |
mandoc_msg(MANDOCERR_COMMENT_BAD, mdoc->parse, |
|
ln, offs, NULL); |
return(1); |
return(1); |
} else if ('\0' == buf[offs]) |
} else if ('\0' == buf[offs]) |
return(1); |
return(1); |
Line 891 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
Line 896 mdoc_pmacro(struct mdoc *mdoc, int ln, char *buf, int |
|
*/ |
*/ |
|
|
if ('\0' == buf[offs] && ' ' == buf[offs - 1]) |
if ('\0' == buf[offs] && ' ' == buf[offs - 1]) |
mdoc_pmsg(mdoc, ln, offs - 1, MANDOCERR_EOLNSPACE); |
mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse, |
|
ln, offs - 1, NULL); |
|
|
/* |
/* |
* If an initial macro or a list invocation, divert directly |
* If an initial macro or a list invocation, divert directly |