version 1.262, 2017/04/24 23:06:18 |
version 1.268, 2017/08/11 16:56:21 |
|
|
mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs) |
mdoc_ptext(struct roff_man *mdoc, int line, char *buf, int offs) |
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
|
const char *cp, *sp; |
char *c, *ws, *end; |
char *c, *ws, *end; |
|
|
n = mdoc->last; |
n = mdoc->last; |
Line 244 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
Line 245 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse, |
mandoc_msg(MANDOCERR_SPACE_EOL, mdoc->parse, |
line, (int)(ws-buf), NULL); |
line, (int)(ws-buf), NULL); |
|
|
|
/* |
|
* Blank lines are allowed in no-fill mode |
|
* and cancel preceding \c, |
|
* but add a single vertical space elsewhere. |
|
*/ |
|
|
if (buf[offs] == '\0' && ! (mdoc->flags & MDOC_LITERAL)) { |
if (buf[offs] == '\0' && ! (mdoc->flags & MDOC_LITERAL)) { |
|
switch (mdoc->last->type) { |
|
case ROFFT_TEXT: |
|
sp = mdoc->last->string; |
|
cp = end = strchr(sp, '\0') - 2; |
|
if (cp < sp || cp[0] != '\\' || cp[1] != 'c') |
|
break; |
|
while (cp > sp && cp[-1] == '\\') |
|
cp--; |
|
if ((end - cp) % 2) |
|
break; |
|
*end = '\0'; |
|
return 1; |
|
default: |
|
break; |
|
} |
mandoc_msg(MANDOCERR_FI_BLANK, mdoc->parse, |
mandoc_msg(MANDOCERR_FI_BLANK, mdoc->parse, |
line, (int)(c - buf), NULL); |
line, (int)(c - buf), NULL); |
|
roff_elem_alloc(mdoc, line, offs, ROFF_sp); |
/* |
|
* Insert a `sp' in the case of a blank line. Technically, |
|
* blank lines aren't allowed, but enough manuals assume this |
|
* behaviour that we want to work around it. |
|
*/ |
|
roff_elem_alloc(mdoc, line, offs, MDOC_sp); |
|
mdoc->last->flags |= NODE_VALID | NODE_ENDED; |
mdoc->last->flags |= NODE_VALID | NODE_ENDED; |
mdoc->next = ROFF_NEXT_SIBLING; |
mdoc->next = ROFF_NEXT_SIBLING; |
return 1; |
return 1; |
Line 278 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
Line 294 mdoc_ptext(struct roff_man *mdoc, int line, char *buf, |
|
for (c = buf + offs; c != NULL; c = strchr(c + 1, '.')) { |
for (c = buf + offs; c != NULL; c = strchr(c + 1, '.')) { |
if (c - buf < offs + 2) |
if (c - buf < offs + 2) |
continue; |
continue; |
if (end - c < 4) |
if (end - c < 3) |
break; |
break; |
if (isalpha((unsigned char)c[-2]) && |
if (c[1] != ' ' || |
isalpha((unsigned char)c[-1]) && |
isalnum((unsigned char)c[-2]) == 0 || |
c[1] == ' ' && |
isalnum((unsigned char)c[-1]) == 0 || |
isupper((unsigned char)(c[2] == ' ' ? c[3] : c[2])) && |
(c[-2] == 'n' && c[-1] == 'c') || |
(c[-2] != 'n' || c[-1] != 'c') && |
(c[-2] == 'v' && c[-1] == 's')) |
(c[-2] != 'v' || c[-1] != 's')) |
continue; |
|
c += 2; |
|
if (*c == ' ') |
|
c++; |
|
if (*c == ' ') |
|
c++; |
|
if (isupper((unsigned char)(*c))) |
mandoc_msg(MANDOCERR_EOS, mdoc->parse, |
mandoc_msg(MANDOCERR_EOS, mdoc->parse, |
line, (int)(c - buf), NULL); |
line, (int)(c - buf), NULL); |
} |
} |
Line 302 mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, |
|
Line 324 mdoc_pmacro(struct roff_man *mdoc, int ln, char *buf, |
|
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
const char *cp; |
const char *cp; |
|
size_t sz; |
enum roff_tok tok; |
enum roff_tok tok; |
int i, sv; |
int sv; |
char mac[5]; |
|
|
|
sv = offs; |
/* Determine the line macro. */ |
|
|
/* |
sv = offs; |
* Copy the first word into a nil-terminated buffer. |
tok = TOKEN_NONE; |
* Stop when a space, tab, escape, or eoln is encountered. |
for (sz = 0; sz < 4 && strchr(" \t\\", buf[offs]) == NULL; sz++) |
*/ |
offs++; |
|
if (sz == 2 || sz == 3) |
i = 0; |
tok = roffhash_find(mdoc->mdocmac, buf + sv, sz); |
while (i < 4 && strchr(" \t\\", buf[offs]) == NULL) |
|
mac[i++] = buf[offs++]; |
|
|
|
mac[i] = '\0'; |
|
|
|
tok = (i > 1 && i < 4) ? mdoc_hash_find(mac) : TOKEN_NONE; |
|
|
|
if (tok == TOKEN_NONE) { |
if (tok == TOKEN_NONE) { |
mandoc_msg(MANDOCERR_MACRO, mdoc->parse, |
mandoc_msg(MANDOCERR_MACRO, mdoc->parse, |
ln, sv, buf + sv - 1); |
ln, sv, buf + sv - 1); |