version 1.49, 2019/04/23 14:01:55 |
version 1.51, 2019/04/24 18:38:02 |
|
|
int nofill; /* Levels of open no-fill displays. */ |
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_LINE (1 << 1) /* New line before the next element. */ |
#define PFLAG_ATTR (1 << 2) /* The most recent attribute is valid. */ |
#define PFLAG_SPC (1 << 2) /* Whitespace before the next element. */ |
#define PFLAG_EEND (1 << 3) /* This element is self-closing. */ |
#define PFLAG_ATTR (1 << 3) /* The most recent attribute is valid. */ |
|
#define PFLAG_EEND (1 << 4) /* This element is self-closing. */ |
}; |
}; |
|
|
struct alias { |
struct alias { |
Line 261 xml_text(struct parse *p, const char *word, int sz) |
|
Line 262 xml_text(struct parse *p, const char *word, int sz) |
|
n->b[oldsz++] = ' '; |
n->b[oldsz++] = ' '; |
memcpy(n->b + oldsz, word, sz); |
memcpy(n->b + oldsz, word, sz); |
n->b[newsz] = '\0'; |
n->b[newsz] = '\0'; |
p->flags &= ~PFLAG_SPC; |
p->flags &= ~(PFLAG_LINE | PFLAG_SPC); |
return; |
return; |
} |
} |
|
|
Line 273 xml_text(struct parse *p, const char *word, int sz) |
|
Line 274 xml_text(struct parse *p, const char *word, int sz) |
|
if ((n = pnode_alloc(p->cur)) == NULL) |
if ((n = pnode_alloc(p->cur)) == NULL) |
fatal(p); |
fatal(p); |
n->node = NODE_TEXT; |
n->node = NODE_TEXT; |
n->spc = (p->flags & PFLAG_SPC) != 0; |
n->flags = ((p->flags & PFLAG_LINE) ? NFLAG_LINE : 0) | |
p->flags &= ~PFLAG_SPC; |
((p->flags & PFLAG_SPC) ? NFLAG_SPC : 0); |
|
p->flags &= ~(PFLAG_LINE | PFLAG_SPC); |
|
|
/* |
/* |
* If this node follows an in-line macro without intervening |
* If this node follows an in-line macro without intervening |
Line 282 xml_text(struct parse *p, const char *word, int sz) |
|
Line 284 xml_text(struct parse *p, const char *word, int sz) |
|
* and do not keep it open. |
* and do not keep it open. |
*/ |
*/ |
|
|
np = n->spc ? NULL : TAILQ_PREV(n, pnodeq, child); |
np = n->flags & NFLAG_SPC ? NULL : TAILQ_PREV(n, pnodeq, child); |
while (np != NULL) { |
while (np != NULL) { |
switch (pnode_class(np->node)) { |
switch (pnode_class(np->node)) { |
case CLASS_VOID: |
case CLASS_VOID: |
Line 320 xml_text(struct parse *p, const char *word, int sz) |
|
Line 322 xml_text(struct parse *p, const char *word, int sz) |
|
if ((n = pnode_alloc(p->cur)) == NULL) |
if ((n = pnode_alloc(p->cur)) == NULL) |
fatal(p); |
fatal(p); |
n->node = NODE_TEXT; |
n->node = NODE_TEXT; |
n->spc = 1; |
n->flags |= NFLAG_SPC; |
word += i; |
word += i; |
sz -= i; |
sz -= i; |
} |
} |
Line 371 pnode_closetext(struct parse *p, int check_last_word) |
|
Line 373 pnode_closetext(struct parse *p, int check_last_word) |
|
if ((n = pnode_alloc(p->cur)) == NULL) |
if ((n = pnode_alloc(p->cur)) == NULL) |
fatal(p); |
fatal(p); |
n->node = NODE_TEXT; |
n->node = NODE_TEXT; |
n->spc = 1; |
n->flags |= NFLAG_SPC; |
if ((n->b = strdup(last_word)) == NULL) |
if ((n->b = strdup(last_word)) == NULL) |
fatal(p); |
fatal(p); |
} |
} |
Line 413 xml_entity(struct parse *p, const char *name) |
|
Line 415 xml_entity(struct parse *p, const char *name) |
|
if ((ccp = pnode_getattr_raw(n, |
if ((ccp = pnode_getattr_raw(n, |
ATTRKEY_SYSTEM, NULL)) != NULL) { |
ATTRKEY_SYSTEM, NULL)) != NULL) { |
parse_file(p, -1, ccp); |
parse_file(p, -1, ccp); |
p->flags &= ~PFLAG_SPC; |
p->flags &= ~(PFLAG_LINE | PFLAG_SPC); |
return; |
return; |
} |
} |
if ((ccp = pnode_getattr_raw(n, |
if ((ccp = pnode_getattr_raw(n, |
Line 423 xml_entity(struct parse *p, const char *name) |
|
Line 425 xml_entity(struct parse *p, const char *name) |
|
fatal(p); |
fatal(p); |
pstate = PARSE_ELEM; |
pstate = PARSE_ELEM; |
parse_string(p, cp, strlen(cp), &pstate, 0); |
parse_string(p, cp, strlen(cp), &pstate, 0); |
p->flags &= ~PFLAG_SPC; |
p->flags &= ~(PFLAG_LINE | PFLAG_SPC); |
free(cp); |
free(cp); |
return; |
return; |
} |
} |
Line 448 xml_entity(struct parse *p, const char *name) |
|
Line 450 xml_entity(struct parse *p, const char *name) |
|
fatal(p); |
fatal(p); |
done: |
done: |
n->node = NODE_ESCAPE; |
n->node = NODE_ESCAPE; |
n->spc = (p->flags & PFLAG_SPC) != 0; |
n->flags = ((p->flags & PFLAG_LINE) ? NFLAG_LINE : 0) | |
p->flags &= ~PFLAG_SPC; |
((p->flags & PFLAG_SPC) ? NFLAG_SPC : 0); |
|
p->flags &= ~(PFLAG_LINE | PFLAG_SPC); |
} |
} |
|
|
/* |
/* |
Line 541 xml_elem_start(struct parse *p, const char *name) |
|
Line 544 xml_elem_start(struct parse *p, const char *name) |
|
switch (pnode_class(p->ncur)) { |
switch (pnode_class(p->ncur)) { |
case CLASS_LINE: |
case CLASS_LINE: |
case CLASS_ENCL: |
case CLASS_ENCL: |
n->spc = (p->flags & PFLAG_SPC) != 0; |
n->flags = ((p->flags & PFLAG_LINE) ? NFLAG_LINE : 0) | |
|
((p->flags & PFLAG_SPC) ? NFLAG_SPC : 0); |
break; |
break; |
case CLASS_NOFILL: |
case CLASS_NOFILL: |
p->nofill++; |
p->nofill++; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
default: |
default: |
n->spc = 1; |
n->flags |= NFLAG_SPC; |
break; |
break; |
} |
} |
p->cur = n; |
p->cur = n; |
Line 638 xml_elem_end(struct parse *p, const char *name) |
|
Line 642 xml_elem_end(struct parse *p, const char *name) |
|
if (p->del == 0) |
if (p->del == 0) |
pnode_closetext(p, 0); |
pnode_closetext(p, 0); |
|
|
|
n = p->cur; |
node = name == NULL ? p->ncur : xml_name2node(p, name); |
node = name == NULL ? p->ncur : xml_name2node(p, name); |
|
|
switch (node) { |
switch (node) { |
Line 650 xml_elem_end(struct parse *p, const char *name) |
|
Line 655 xml_elem_end(struct parse *p, const char *name) |
|
case NODE_UNKNOWN: |
case NODE_UNKNOWN: |
break; |
break; |
case NODE_INCLUDE: |
case NODE_INCLUDE: |
n = p->cur; |
p->cur = n->parent; |
p->cur = p->cur->parent; |
|
cp = pnode_getattr_raw(n, ATTRKEY_HREF, NULL); |
cp = pnode_getattr_raw(n, ATTRKEY_HREF, NULL); |
if (cp == NULL) |
if (cp == NULL) |
error_msg(p, "<xi:include> element " |
error_msg(p, "<xi:include> element " |
Line 659 xml_elem_end(struct parse *p, const char *name) |
|
Line 663 xml_elem_end(struct parse *p, const char *name) |
|
else |
else |
parse_file(p, -1, cp); |
parse_file(p, -1, cp); |
pnode_unlink(n); |
pnode_unlink(n); |
p->flags &= ~PFLAG_SPC; |
p->flags &= ~(PFLAG_LINE | PFLAG_SPC); |
break; |
break; |
case NODE_DOCTYPE: |
case NODE_DOCTYPE: |
case NODE_SBR: |
case NODE_SBR: |
Line 667 xml_elem_end(struct parse *p, const char *name) |
|
Line 671 xml_elem_end(struct parse *p, const char *name) |
|
p->flags &= ~PFLAG_EEND; |
p->flags &= ~PFLAG_EEND; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
default: |
default: |
if (p->cur == NULL || node != p->cur->node) { |
if (n == NULL || node != n->node) { |
warn_msg(p, "element not open: </%s>", name); |
warn_msg(p, "element not open: </%s>", name); |
break; |
break; |
} |
} |
Line 681 xml_elem_end(struct parse *p, const char *name) |
|
Line 685 xml_elem_end(struct parse *p, const char *name) |
|
* obviously better than discarding it or crashing. |
* obviously better than discarding it or crashing. |
*/ |
*/ |
|
|
if (p->cur->parent != NULL || node == NODE_DOCTYPE) { |
if (n->parent != NULL || node == NODE_DOCTYPE) { |
p->cur = p->cur->parent; |
p->cur = n->parent; |
if (p->cur != NULL) |
if (p->cur != NULL) |
p->ncur = p->cur->node; |
p->ncur = p->cur->node; |
} else |
} else |
p->tree->flags |= TREE_CLOSED; |
p->tree->flags |= TREE_CLOSED; |
p->flags &= ~PFLAG_SPC; |
p->flags &= ~(PFLAG_LINE | PFLAG_SPC); |
|
|
|
/* Include a file containing entity declarations. */ |
|
|
|
if (node == NODE_ENTITY && strcmp("%", |
|
pnode_getattr_raw(n, ATTRKEY_NAME, "")) == 0 && |
|
(cp = pnode_getattr_raw(n, ATTRKEY_SYSTEM, NULL)) != NULL) |
|
parse_file(p, -1, cp); |
|
|
break; |
break; |
} |
} |
assert(p->del == 0); |
assert(p->del == 0); |
Line 798 parse_string(struct parse *p, char *b, size_t rlen, |
|
Line 810 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') |
if (b[pend] == '\n') { |
|
p->flags |= PFLAG_LINE; |
pws = pend + 1; |
pws = pend + 1; |
|
} |
increment(p, b, &pend, refill); |
increment(p, b, &pend, refill); |
continue; |
continue; |
} |
} |