version 1.90, 2019/04/03 17:53:02 |
version 1.92, 2019/04/06 22:37:57 |
Line 642 pnode_print(struct format *p, struct pnode *pn) |
|
Line 642 pnode_print(struct format *p, struct pnode *pn) |
|
if (pn == NULL) |
if (pn == NULL) |
return; |
return; |
|
|
|
p->spc = pn->spc; |
sv = p->linestate; |
sv = p->linestate; |
|
|
switch (pn->node) { |
switch (pn->node) { |
Line 674 pnode_print(struct format *p, struct pnode *pn) |
|
Line 675 pnode_print(struct format *p, struct pnode *pn) |
|
break; |
break; |
case NODE_EDITOR: |
case NODE_EDITOR: |
print_text(p, "editor:", ARG_SPACE); |
print_text(p, "editor:", ARG_SPACE); |
|
sv = LINE_TEXT; |
macro_open(p, "An"); |
macro_open(p, "An"); |
break; |
break; |
case NODE_EMAIL: |
case NODE_EMAIL: |
Line 692 pnode_print(struct format *p, struct pnode *pn) |
|
Line 694 pnode_print(struct format *p, struct pnode *pn) |
|
case NODE_ESCAPE: |
case NODE_ESCAPE: |
if (p->linestate == LINE_NEW) |
if (p->linestate == LINE_NEW) |
p->linestate = LINE_TEXT; |
p->linestate = LINE_TEXT; |
else |
else if (pn->spc || p->linestate == LINE_MACRO) |
putchar(' '); |
putchar(' '); |
fputs(pn->b, stdout); |
fputs(pn->b, stdout); |
break; |
break; |
Line 822 pnode_print(struct format *p, struct pnode *pn) |
|
Line 824 pnode_print(struct format *p, struct pnode *pn) |
|
} |
} |
if (p->linestate == LINE_NEW) |
if (p->linestate == LINE_NEW) |
p->linestate = LINE_TEXT; |
p->linestate = LINE_TEXT; |
else |
else if (pn->spc || p->linestate == LINE_MACRO) |
putchar(' '); |
putchar(' '); |
|
|
/* |
/* |
Line 894 pnode_print(struct format *p, struct pnode *pn) |
|
Line 896 pnode_print(struct format *p, struct pnode *pn) |
|
fputs("$ ", stdout); |
fputs("$ ", stdout); |
p->linestate = sv; |
p->linestate = sv; |
break; |
break; |
|
case NODE_MEMBER: |
|
if ((pp = TAILQ_NEXT(pn, child)) != NULL && |
|
pp->node != NODE_MEMBER) |
|
pp = NULL; |
|
switch (p->linestate) { |
|
case LINE_TEXT: |
|
if (pp != NULL) |
|
print_text(p, ",", 0); |
|
break; |
|
case LINE_MACRO: |
|
if (pp != NULL) |
|
macro_addarg(p, ",", ARG_SPACE); |
|
macro_close(p); |
|
break; |
|
case LINE_NEW: |
|
break; |
|
} |
|
break; |
case NODE_MML_MROW: |
case NODE_MML_MROW: |
case NODE_MML_MI: |
case NODE_MML_MI: |
case NODE_MML_MN: |
case NODE_MML_MN: |
Line 927 pnode_print(struct format *p, struct pnode *pn) |
|
Line 947 pnode_print(struct format *p, struct pnode *pn) |
|
case NODE_SGMLTAG: |
case NODE_SGMLTAG: |
case NODE_TYPE: |
case NODE_TYPE: |
case NODE_VARNAME: |
case NODE_VARNAME: |
if (sv != LINE_MACRO && p->linestate == LINE_MACRO) |
if (sv != LINE_MACRO && p->linestate == LINE_MACRO && |
|
(pn->parent == NULL || pn->parent->node != NODE_MEMBER)) |
macro_closepunct(p, pn); |
macro_closepunct(p, pn); |
break; |
break; |
case NODE_QUOTE: |
case NODE_QUOTE: |