version 1.44, 2019/04/14 22:37:56 |
version 1.49, 2019/04/23 14:01:55 |
|
|
int nline; /* Line number of next token. */ |
int nline; /* Line number of next token. */ |
int ncol; /* Column number of next token. */ |
int ncol; /* Column number of next token. */ |
int del; /* Levels of nested nodes being deleted. */ |
int del; /* Levels of nested nodes being deleted. */ |
|
int nofill; /* Levels of open no-fill displays. */ |
int flags; |
int flags; |
#define PFLAG_WARN (1 << 0) /* Print warning messages. */ |
#define PFLAG_WARN (1 << 0) /* Print warning messages. */ |
#define PFLAG_SPC (1 << 1) /* Whitespace before the next element. */ |
#define PFLAG_SPC (1 << 1) /* Whitespace before the next element. */ |
Line 111 static const struct alias aliases[] = { |
|
Line 112 static const struct alias aliases[] = { |
|
{ "secondary", NODE_DELETE }, |
{ "secondary", NODE_DELETE }, |
{ "sect1", NODE_SECTION }, |
{ "sect1", NODE_SECTION }, |
{ "sect2", NODE_SECTION }, |
{ "sect2", NODE_SECTION }, |
|
{ "sect3", NODE_SECTION }, |
|
{ "sect4", NODE_SECTION }, |
{ "sgmltag", NODE_MARKUP }, |
{ "sgmltag", NODE_MARKUP }, |
{ "simpara", NODE_PARA }, |
{ "simpara", NODE_PARA }, |
{ "structfield", NODE_PARAMETER }, |
{ "structfield", NODE_PARAMETER }, |
{ "structname", NODE_TYPE }, |
{ "structname", NODE_TYPE }, |
{ "surname", NODE_PERSONNAME }, |
{ "surname", NODE_PERSONNAME }, |
{ "symbol", NODE_CONSTANT }, |
{ "symbol", NODE_CONSTANT }, |
|
{ "tag", NODE_MARKUP }, |
{ "trademark", NODE_IGNORE }, |
{ "trademark", NODE_IGNORE }, |
{ "ulink", NODE_LINK }, |
{ "ulink", NODE_LINK }, |
{ "userinput", NODE_LITERAL }, |
{ "userinput", NODE_LITERAL }, |
Line 284 xml_text(struct parse *p, const char *word, int sz) |
|
Line 288 xml_text(struct parse *p, const char *word, int sz) |
|
case CLASS_VOID: |
case CLASS_VOID: |
case CLASS_TEXT: |
case CLASS_TEXT: |
case CLASS_BLOCK: |
case CLASS_BLOCK: |
|
case CLASS_NOFILL: |
np = NULL; |
np = NULL; |
break; |
break; |
case CLASS_TRANS: |
case CLASS_TRANS: |
Line 378 xml_entity(struct parse *p, const char *name) |
|
Line 383 xml_entity(struct parse *p, const char *name) |
|
struct pnode *n; |
struct pnode *n; |
const char *ccp; |
const char *ccp; |
char *cp; |
char *cp; |
|
unsigned int codepoint; |
enum pstate pstate; |
enum pstate pstate; |
|
|
if (p->del > 0) |
if (p->del > 0) |
Line 422 xml_entity(struct parse *p, const char *name) |
|
Line 428 xml_entity(struct parse *p, const char *name) |
|
return; |
return; |
} |
} |
} |
} |
|
if (*name == '#') { |
|
codepoint = strtonum(name + 1, 0, 0x10ffff, &ccp); |
|
if (ccp == NULL) { |
|
if ((n = pnode_alloc(p->cur)) == NULL || |
|
asprintf(&n->b, "\\[u%4.4X]", |
|
codepoint) < 0) |
|
fatal(p); |
|
goto done; |
|
} |
|
} |
error_msg(p, "unknown entity &%s;", name); |
error_msg(p, "unknown entity &%s;", name); |
return; |
return; |
} |
} |
Line 430 xml_entity(struct parse *p, const char *name) |
|
Line 446 xml_entity(struct parse *p, const char *name) |
|
if ((n = pnode_alloc(p->cur)) == NULL || |
if ((n = pnode_alloc(p->cur)) == NULL || |
(n->b = strdup(entity->roff)) == NULL) |
(n->b = strdup(entity->roff)) == NULL) |
fatal(p); |
fatal(p); |
|
done: |
n->node = NODE_ESCAPE; |
n->node = NODE_ESCAPE; |
n->spc = (p->flags & PFLAG_SPC) != 0; |
n->spc = (p->flags & PFLAG_SPC) != 0; |
p->flags &= ~PFLAG_SPC; |
p->flags &= ~PFLAG_SPC; |
Line 515 xml_elem_start(struct parse *p, const char *name) |
|
Line 532 xml_elem_start(struct parse *p, const char *name) |
|
case NODE_DOCTYPE: |
case NODE_DOCTYPE: |
case NODE_ENTITY: |
case NODE_ENTITY: |
case NODE_SBR: |
case NODE_SBR: |
|
case NODE_VOID: |
p->flags |= PFLAG_EEND; |
p->flags |= PFLAG_EEND; |
break; |
break; |
default: |
default: |
Line 525 xml_elem_start(struct parse *p, const char *name) |
|
Line 543 xml_elem_start(struct parse *p, const char *name) |
|
case CLASS_ENCL: |
case CLASS_ENCL: |
n->spc = (p->flags & PFLAG_SPC) != 0; |
n->spc = (p->flags & PFLAG_SPC) != 0; |
break; |
break; |
|
case CLASS_NOFILL: |
|
p->nofill++; |
|
/* FALLTHROUGH */ |
default: |
default: |
n->spc = 1; |
n->spc = 1; |
break; |
break; |
Line 546 xml_attrkey(struct parse *p, const char *name) |
|
Line 567 xml_attrkey(struct parse *p, const char *name) |
|
const char *value; |
const char *value; |
enum attrkey key; |
enum attrkey key; |
|
|
if (p->del > 0 || p->ncur == NODE_IGNORE || *name == '\0') |
if (p->del > 0 || p->ncur >= NODE_UNKNOWN || *name == '\0') |
return; |
return; |
|
|
if ((p->ncur == NODE_DOCTYPE || p->ncur == NODE_ENTITY) && |
if ((p->ncur == NODE_DOCTYPE || p->ncur == NODE_ENTITY) && |
Line 583 xml_attrval(struct parse *p, const char *name) |
|
Line 604 xml_attrval(struct parse *p, const char *name) |
|
{ |
{ |
struct pattr *a; |
struct pattr *a; |
|
|
if (p->del > 0 || p->ncur == NODE_IGNORE || |
if (p->del > 0 || p->ncur >= NODE_UNKNOWN || |
(p->flags & PFLAG_ATTR) == 0) |
(p->flags & PFLAG_ATTR) == 0) |
return; |
return; |
if ((a = TAILQ_LAST(&p->cur->attrq, pattrq)) == NULL) |
if ((a = TAILQ_LAST(&p->cur->attrq, pattrq)) == NULL) |
Line 642 xml_elem_end(struct parse *p, const char *name) |
|
Line 663 xml_elem_end(struct parse *p, const char *name) |
|
break; |
break; |
case NODE_DOCTYPE: |
case NODE_DOCTYPE: |
case NODE_SBR: |
case NODE_SBR: |
|
case NODE_VOID: |
p->flags &= ~PFLAG_EEND; |
p->flags &= ~PFLAG_EEND; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
default: |
default: |
Line 649 xml_elem_end(struct parse *p, const char *name) |
|
Line 671 xml_elem_end(struct parse *p, const char *name) |
|
warn_msg(p, "element not open: </%s>", name); |
warn_msg(p, "element not open: </%s>", name); |
break; |
break; |
} |
} |
|
if (pnode_class(node) == CLASS_NOFILL) |
|
p->nofill--; |
|
|
/* |
/* |
* Refrain from actually closing the document element. |
* Refrain from actually closing the document element. |
Line 756 parse_string(struct parse *p, char *b, size_t rlen, |
|
Line 780 parse_string(struct parse *p, char *b, size_t rlen, |
|
enum pstate *pstate, int refill) |
enum pstate *pstate, int refill) |
{ |
{ |
char *cp; |
char *cp; |
|
size_t pws; /* Parse offset including whitespace. */ |
size_t poff; /* Parse offset in b[]. */ |
size_t poff; /* Parse offset in b[]. */ |
size_t pend; /* Offset of the end of the current word. */ |
size_t pend; /* Offset of the end of the current word. */ |
int elem_end; |
int elem_end; |
|
|
pend = 0; |
pend = pws = 0; |
for (;;) { |
for (;;) { |
|
|
/* Proceed to the next token, skipping whitespace. */ |
/* Proceed to the next token, skipping whitespace. */ |
Line 773 parse_string(struct parse *p, char *b, size_t rlen, |
|
Line 798 parse_string(struct parse *p, char *b, size_t rlen, |
|
break; |
break; |
if (isspace((unsigned char)b[pend])) { |
if (isspace((unsigned char)b[pend])) { |
p->flags |= PFLAG_SPC; |
p->flags |= PFLAG_SPC; |
|
if (b[pend] == '\n') |
|
pws = pend + 1; |
increment(p, b, &pend, refill); |
increment(p, b, &pend, refill); |
continue; |
continue; |
} |
} |
Line 934 parse_string(struct parse *p, char *b, size_t rlen, |
|
Line 961 parse_string(struct parse *p, char *b, size_t rlen, |
|
advance(p, b, rlen, &pend, |
advance(p, b, rlen, &pend, |
p->ncur == NODE_DOCTYPE ? "<&]\n" : "<&\n", |
p->ncur == NODE_DOCTYPE ? "<&]\n" : "<&\n", |
refill); |
refill); |
|
if (p->nofill) |
|
poff = pws; |
xml_text(p, b + poff, pend - poff); |
xml_text(p, b + poff, pend - poff); |
if (b[pend] == '\n') |
if (b[pend] == '\n') |
pnode_closetext(p, 0); |
pnode_closetext(p, 0); |
} |
} |
|
pws = pend; |
} |
} |
return poff; |
return poff; |
} |
} |