version 1.98, 2014/11/26 23:42:14 |
version 1.102, 2014/11/30 02:36:38 |
Line 97 static const char * const mandocerrs[MANDOCERR_MAX] = |
|
Line 97 static const char * const mandocerrs[MANDOCERR_MAX] = |
|
"lower case character in document title", |
"lower case character in document title", |
"missing manual section, using \"\"", |
"missing manual section, using \"\"", |
"unknown manual section", |
"unknown manual section", |
"unknown manual volume or arch", |
|
"missing date, using today's date", |
"missing date, using today's date", |
"cannot parse date, using it verbatim", |
"cannot parse date, using it verbatim", |
"missing Os macro, using \"\"", |
"missing Os macro, using \"\"", |
Line 121 static const char * const mandocerrs[MANDOCERR_MAX] = |
|
Line 120 static const char * const mandocerrs[MANDOCERR_MAX] = |
|
|
|
/* related to macros and nesting */ |
/* related to macros and nesting */ |
"obsolete macro", |
"obsolete macro", |
|
"macro neither callable nor escaped", |
"skipping paragraph macro", |
"skipping paragraph macro", |
"moving paragraph macro out of list", |
"moving paragraph macro out of list", |
"skipping no-space macro", |
"skipping no-space macro", |
Line 202 static const char * const mandocerrs[MANDOCERR_MAX] = |
|
Line 202 static const char * const mandocerrs[MANDOCERR_MAX] = |
|
/* related to request and macro arguments */ |
/* related to request and macro arguments */ |
"escaped character not allowed in a name", |
"escaped character not allowed in a name", |
"argument count wrong", |
"argument count wrong", |
|
"NOT IMPLEMENTED: Bd -file", |
"missing list type, using -item", |
"missing list type, using -item", |
"missing manual name, using \"\"", |
"missing manual name, using \"\"", |
"uname(3) system call failed, using UNKNOWN", |
"uname(3) system call failed, using UNKNOWN", |
Line 214 static const char * const mandocerrs[MANDOCERR_MAX] = |
|
Line 215 static const char * const mandocerrs[MANDOCERR_MAX] = |
|
"generic fatal error", |
"generic fatal error", |
|
|
"input too large", |
"input too large", |
"NOT IMPLEMENTED: Bd -file", |
|
"NOT IMPLEMENTED: .so with absolute path or \"..\"", |
"NOT IMPLEMENTED: .so with absolute path or \"..\"", |
".so request failed", |
".so request failed", |
|
|
Line 317 mparse_buf_r(struct mparse *curp, struct buf blk, size |
|
Line 317 mparse_buf_r(struct mparse *curp, struct buf blk, size |
|
struct buf ln; |
struct buf ln; |
size_t pos; /* byte number in the ln buffer */ |
size_t pos; /* byte number in the ln buffer */ |
enum rofferr rr; |
enum rofferr rr; |
int of, rc; |
int of; |
int lnn; /* line number in the real file */ |
int lnn; /* line number in the real file */ |
unsigned char c; |
unsigned char c; |
|
|
|
|
* Do the same for ROFF_EQN. |
* Do the same for ROFF_EQN. |
*/ |
*/ |
|
|
rc = -1; |
if (rr == ROFF_TBL) { |
|
while ((span = roff_span(curp->roff)) != NULL) |
if (ROFF_TBL == rr) |
if (curp->man == NULL) |
while (NULL != (span = roff_span(curp->roff))) { |
mdoc_addspan(curp->mdoc, span); |
rc = curp->man ? |
else |
man_addspan(curp->man, span) : |
man_addspan(curp->man, span); |
mdoc_addspan(curp->mdoc, span); |
} else if (rr == ROFF_EQN) { |
if (0 == rc) |
if (curp->man == NULL) |
break; |
mdoc_addeqn(curp->mdoc, roff_eqn(curp->roff)); |
} |
else |
else if (ROFF_EQN == rr) |
man_addeqn(curp->man, roff_eqn(curp->roff)); |
rc = curp->mdoc ? |
} else if ((curp->man == NULL ? |
mdoc_addeqn(curp->mdoc, |
mdoc_parseln(curp->mdoc, curp->line, ln.buf, of) : |
roff_eqn(curp->roff)) : |
man_parseln(curp->man, curp->line, ln.buf, of)) == 2) |
man_addeqn(curp->man, |
break; |
roff_eqn(curp->roff)); |
|
else if (curp->man || curp->mdoc) |
|
rc = curp->man ? |
|
man_parseln(curp->man, |
|
curp->line, ln.buf, of) : |
|
mdoc_parseln(curp->mdoc, |
|
curp->line, ln.buf, of); |
|
|
|
if (0 == rc) { |
|
assert(MANDOCLEVEL_FATAL <= curp->file_status); |
|
break; |
|
} else if (2 == rc) |
|
break; |
|
|
|
/* Temporary buffers typically are not full. */ |
/* Temporary buffers typically are not full. */ |
|
|