version 1.169, 2017/04/24 23:06:18 |
version 1.172, 2017/05/05 15:17:32 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2013, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011 Joerg Sonnenberger <joerg@netbsd.org> |
* Copyright (c) 2011 Joerg Sonnenberger <joerg@netbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
Line 97 man_ptext(struct roff_man *man, int line, char *buf, i |
|
Line 97 man_ptext(struct roff_man *man, int line, char *buf, i |
|
/* Allocate a blank entry. */ |
/* Allocate a blank entry. */ |
if (man->last->tok != MAN_SH && |
if (man->last->tok != MAN_SH && |
man->last->tok != MAN_SS) { |
man->last->tok != MAN_SS) { |
roff_elem_alloc(man, line, offs, MAN_sp); |
roff_elem_alloc(man, line, offs, ROFF_sp); |
man->next = ROFF_NEXT_SIBLING; |
man->next = ROFF_NEXT_SIBLING; |
} |
} |
return 1; |
return 1; |
Line 145 man_pmacro(struct roff_man *man, int ln, char *buf, in |
|
Line 145 man_pmacro(struct roff_man *man, int ln, char *buf, in |
|
{ |
{ |
struct roff_node *n; |
struct roff_node *n; |
const char *cp; |
const char *cp; |
int tok; |
size_t sz; |
int i, ppos; |
enum roff_tok tok; |
|
int ppos; |
int bline; |
int bline; |
char mac[5]; |
|
|
|
ppos = offs; |
/* Determine the line macro. */ |
|
|
/* |
ppos = 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 > 0 && sz < 4) |
i = 0; |
tok = roffhash_find(man->manmac, buf + ppos, sz); |
while (i < 4 && strchr(" \t\\", buf[offs]) == NULL) |
|
mac[i++] = buf[offs++]; |
|
|
|
mac[i] = '\0'; |
|
|
|
tok = (i > 0 && i < 4) ? man_hash_find(mac) : TOKEN_NONE; |
|
|
|
if (tok == TOKEN_NONE) { |
if (tok == TOKEN_NONE) { |
mandoc_msg(MANDOCERR_MACRO, man->parse, |
mandoc_msg(MANDOCERR_MACRO, man->parse, |
ln, ppos, buf + ppos - 1); |
ln, ppos, buf + ppos - 1); |
Line 207 man_pmacro(struct roff_man *man, int ln, char *buf, in |
|
Line 200 man_pmacro(struct roff_man *man, int ln, char *buf, in |
|
|
|
man_breakscope(man, tok); |
man_breakscope(man, tok); |
bline = man->flags & MAN_BLINE; |
bline = man->flags & MAN_BLINE; |
|
|
|
/* |
|
* If the line in next-line scope ends with \c, keep the |
|
* next-line scope open for the subsequent input line. |
|
* That is not at all portable, only groff >= 1.22.4 |
|
* does it, but *if* this weird idiom occurs in a manual |
|
* page, that's very likely what the author intended. |
|
*/ |
|
|
|
if (bline) { |
|
cp = strchr(buf + offs, '\0') - 2; |
|
if (cp >= buf && cp[0] == '\\' && cp[1] == 'c') |
|
bline = 0; |
|
} |
|
|
/* Call to handler... */ |
/* Call to handler... */ |
|
|