version 1.56, 2019/05/01 11:34:20 |
version 1.57, 2019/05/01 17:20:47 |
Line 268 xml_text(struct parse *p, const char *word, int sz) |
|
Line 268 xml_text(struct parse *p, const char *word, int sz) |
|
|
|
n = pnode_alloc(p->cur); |
n = pnode_alloc(p->cur); |
n->node = NODE_TEXT; |
n->node = NODE_TEXT; |
n->flags = ((p->flags & PFLAG_LINE) ? NFLAG_LINE : 0) | |
if (p->flags & PFLAG_LINE && TAILQ_PREV(n, pnodeq, child) != NULL) |
((p->flags & PFLAG_SPC) ? NFLAG_SPC : 0); |
n->flags |= NFLAG_LINE; |
|
if (p->flags & PFLAG_SPC) |
|
n->flags |= NFLAG_SPC; |
p->flags &= ~(PFLAG_LINE | PFLAG_SPC); |
p->flags &= ~(PFLAG_LINE | PFLAG_SPC); |
|
|
/* |
/* |
Line 433 xml_entity(struct parse *p, const char *name) |
|
Line 435 xml_entity(struct parse *p, const char *name) |
|
n->b = xstrdup(entity->roff); |
n->b = xstrdup(entity->roff); |
done: |
done: |
n->node = NODE_ESCAPE; |
n->node = NODE_ESCAPE; |
n->flags = ((p->flags & PFLAG_LINE) ? NFLAG_LINE : 0) | |
if (p->flags & PFLAG_LINE && TAILQ_PREV(n, pnodeq, child) != NULL) |
((p->flags & PFLAG_SPC) ? NFLAG_SPC : 0); |
n->flags |= NFLAG_LINE; |
|
if (p->flags & PFLAG_SPC) |
|
n->flags |= NFLAG_SPC; |
p->flags &= ~(PFLAG_LINE | PFLAG_SPC); |
p->flags &= ~(PFLAG_LINE | PFLAG_SPC); |
} |
} |
|
|
Line 506 xml_elem_start(struct parse *p, const char *name) |
|
Line 510 xml_elem_start(struct parse *p, const char *name) |
|
} |
} |
|
|
n = pnode_alloc(p->cur); |
n = pnode_alloc(p->cur); |
|
if (p->flags & PFLAG_LINE && p->cur != NULL && |
|
TAILQ_PREV(n, pnodeq, child) != NULL) |
|
n->flags |= NFLAG_LINE; |
|
p->flags &= ~PFLAG_LINE; |
|
|
/* |
/* |
* Some elements are self-closing. |
* Some elements are self-closing. |
Line 526 xml_elem_start(struct parse *p, const char *name) |
|
Line 534 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->flags = ((p->flags & PFLAG_LINE) ? NFLAG_LINE : 0) | |
if (p->flags & PFLAG_SPC) |
((p->flags & PFLAG_SPC) ? NFLAG_SPC : 0); |
n->flags |= NFLAG_SPC; |
break; |
break; |
case CLASS_NOFILL: |
case CLASS_NOFILL: |
p->nofill++; |
p->nofill++; |