version 1.86, 2019/04/03 15:05:08 |
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 666 pnode_print(struct format *p, struct pnode *pn) |
|
Line 667 pnode_print(struct format *p, struct pnode *pn) |
|
case NODE_CITETITLE: |
case NODE_CITETITLE: |
macro_open(p, "%T"); |
macro_open(p, "%T"); |
break; |
break; |
case NODE_CODE: |
|
macro_open(p, "Li"); |
|
break; |
|
case NODE_COMMAND: |
case NODE_COMMAND: |
macro_open(p, "Nm"); |
macro_open(p, "Nm"); |
break; |
break; |
Line 677 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 689 pnode_print(struct format *p, struct pnode *pn) |
|
Line 688 pnode_print(struct format *p, struct pnode *pn) |
|
case NODE_ENVAR: |
case NODE_ENVAR: |
macro_open(p, "Ev"); |
macro_open(p, "Ev"); |
break; |
break; |
|
case NODE_ERRORNAME: |
|
macro_open(p, "Er"); |
|
break; |
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 735 pnode_print(struct format *p, struct pnode *pn) |
|
Line 737 pnode_print(struct format *p, struct pnode *pn) |
|
macro_argline(p, "Sx", ccp); |
macro_argline(p, "Sx", ccp); |
return; |
return; |
case NODE_LITERAL: |
case NODE_LITERAL: |
macro_open(p, "Li"); |
macro_open(p, "Ql"); |
break; |
break; |
case NODE_LITERALLAYOUT: |
case NODE_LITERALLAYOUT: |
macro_argline(p, "Bd", pnode_getattr(pn, ATTRKEY_CLASS) == |
macro_argline(p, "Bd", pnode_getattr(pn, ATTRKEY_CLASS) == |
Line 766 pnode_print(struct format *p, struct pnode *pn) |
|
Line 768 pnode_print(struct format *p, struct pnode *pn) |
|
case NODE_PARA: |
case NODE_PARA: |
pnode_printpara(p, pn); |
pnode_printpara(p, pn); |
break; |
break; |
|
case NODE_PARAMDEF: |
case NODE_PARAMETER: |
case NODE_PARAMETER: |
macro_nodeline(p, "Fa", pn, ARG_SINGLE); |
macro_nodeline(p, "Fa", pn, ARG_SINGLE); |
pnode_unlinksub(pn); |
pnode_unlinksub(pn); |
Line 775 pnode_print(struct format *p, struct pnode *pn) |
|
Line 778 pnode_print(struct format *p, struct pnode *pn) |
|
break; |
break; |
case NODE_PROGRAMLISTING: |
case NODE_PROGRAMLISTING: |
case NODE_SCREEN: |
case NODE_SCREEN: |
|
case NODE_SYNOPSIS: |
macro_line(p, "Bd -literal"); |
macro_line(p, "Bd -literal"); |
break; |
break; |
case NODE_REFENTRYINFO: |
case NODE_REFENTRYINFO: |
/* Suppress. */ |
/* Suppress. */ |
pnode_unlinksub(pn); |
pnode_unlinksub(pn); |
break; |
break; |
case NODE_REFMETA: |
|
abort(); |
|
break; |
|
case NODE_REFNAME: |
case NODE_REFNAME: |
/* Suppress non-text children... */ |
/* Suppress non-text children... */ |
macro_open(p, "Nm"); |
macro_open(p, "Nm"); |
Line 814 pnode_print(struct format *p, struct pnode *pn) |
|
Line 815 pnode_print(struct format *p, struct pnode *pn) |
|
macro_line(p, "br"); |
macro_line(p, "br"); |
break; |
break; |
case NODE_SGMLTAG: |
case NODE_SGMLTAG: |
macro_open(p, "Li"); |
macro_open(p, "Ic"); |
break; |
break; |
case NODE_STRUCTNAME: |
|
macro_open(p, "Vt"); |
|
break; |
|
case NODE_TEXT: |
case NODE_TEXT: |
if (pn->bsz == 0) { |
if (pn->bsz == 0) { |
assert(pn->real != pn->b); |
assert(pn->real != pn->b); |
Line 826 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 877 pnode_print(struct format *p, struct pnode *pn) |
|
Line 875 pnode_print(struct format *p, struct pnode *pn) |
|
case NODE_TYPE: |
case NODE_TYPE: |
macro_open(p, "Vt"); |
macro_open(p, "Vt"); |
break; |
break; |
case NODE_USERINPUT: |
|
macro_open(p, "Li"); |
|
break; |
|
case NODE_VARIABLELIST: |
case NODE_VARIABLELIST: |
pnode_printvariablelist(p, pn); |
pnode_printvariablelist(p, pn); |
break; |
break; |
Line 901 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 914 pnode_print(struct format *p, struct pnode *pn) |
|
Line 927 pnode_print(struct format *p, struct pnode *pn) |
|
case NODE_AUTHOR: |
case NODE_AUTHOR: |
case NODE_CITEREFENTRY: |
case NODE_CITEREFENTRY: |
case NODE_CITETITLE: |
case NODE_CITETITLE: |
case NODE_CODE: |
|
case NODE_COMMAND: |
case NODE_COMMAND: |
case NODE_CONSTANT: |
case NODE_CONSTANT: |
case NODE_EDITOR: |
case NODE_EDITOR: |
case NODE_EMAIL: |
case NODE_EMAIL: |
case NODE_EMPHASIS: |
case NODE_EMPHASIS: |
case NODE_ENVAR: |
case NODE_ENVAR: |
|
case NODE_ERRORNAME: |
case NODE_FILENAME: |
case NODE_FILENAME: |
case NODE_FIRSTTERM: |
case NODE_FIRSTTERM: |
case NODE_FUNCTION: |
case NODE_FUNCTION: |
Line 932 pnode_print(struct format *p, struct pnode *pn) |
|
Line 945 pnode_print(struct format *p, struct pnode *pn) |
|
case NODE_REPLACEABLE: |
case NODE_REPLACEABLE: |
case NODE_REFPURPOSE: |
case NODE_REFPURPOSE: |
case NODE_SGMLTAG: |
case NODE_SGMLTAG: |
case NODE_STRUCTNAME: |
|
case NODE_TYPE: |
case NODE_TYPE: |
case NODE_USERINPUT: |
|
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: |
Line 972 pnode_print(struct format *p, struct pnode *pn) |
|
Line 984 pnode_print(struct format *p, struct pnode *pn) |
|
case NODE_LITERALLAYOUT: |
case NODE_LITERALLAYOUT: |
case NODE_PROGRAMLISTING: |
case NODE_PROGRAMLISTING: |
case NODE_SCREEN: |
case NODE_SCREEN: |
|
case NODE_SYNOPSIS: |
macro_line(p, "Ed"); |
macro_line(p, "Ed"); |
break; |
break; |
case NODE_TITLE: |
case NODE_TITLE: |