version 1.94, 2019/04/07 14:49:26 |
version 1.99, 2019/04/07 18:51:53 |
Line 103 pnode_printpara(struct format *p, struct pnode *pn) |
|
Line 103 pnode_printpara(struct format *p, struct pnode *pn) |
|
{ |
{ |
struct pnode *pp; |
struct pnode *pp; |
|
|
if ((pp = TAILQ_PREV(pn, pnodeq, child)) == NULL && |
if (pn->parent == NULL) |
(pp = pn->parent) == NULL) |
|
return; |
return; |
|
|
|
if ((pp = TAILQ_PREV(pn, pnodeq, child)) == NULL) |
|
pp = pn->parent; |
|
|
switch (pp->node) { |
switch (pp->node) { |
case NODE_ENTRY: |
case NODE_ENTRY: |
|
case NODE_GLOSSTERM: |
case NODE_LISTITEM: |
case NODE_LISTITEM: |
|
case NODE_TERM: |
return; |
return; |
case NODE_PREFACE: |
case NODE_PREFACE: |
case NODE_SECTION: |
case NODE_SECTION: |
Line 196 pnode_printrefsect(struct format *p, struct pnode *pn) |
|
Line 200 pnode_printrefsect(struct format *p, struct pnode *pn) |
|
|
|
switch (level) { |
switch (level) { |
case 1: |
case 1: |
|
macro_close(p); |
macro_open(p, "Sh"); |
macro_open(p, "Sh"); |
break; |
break; |
case 2: |
case 2: |
|
macro_close(p); |
macro_open(p, "Ss"); |
macro_open(p, "Ss"); |
break; |
break; |
default: |
default: |
Line 254 pnode_printrefmeta(struct format *p, struct pnode *pn) |
|
Line 260 pnode_printrefmeta(struct format *p, struct pnode *pn) |
|
else if (pp->node == NODE_REFENTRYTITLE) |
else if (pp->node == NODE_REFENTRYTITLE) |
title = pp; |
title = pp; |
} |
} |
|
macro_close(p); |
macro_open(p, "Dt"); |
macro_open(p, "Dt"); |
if (title == NULL) |
if (title == NULL) |
macro_addarg(p, "UNKNOWN", ARG_SPACE); |
macro_addarg(p, "UNKNOWN", ARG_SPACE); |
Line 518 pnode_printauthor(struct format *f, struct pnode *n) |
|
Line 525 pnode_printauthor(struct format *f, struct pnode *n) |
|
} |
} |
|
|
static void |
static void |
|
pnode_printlink(struct format *f, struct pnode *n) |
|
{ |
|
const char *uri, *text; |
|
|
|
uri = pnode_getattr_raw(n, ATTRKEY_LINKEND, NULL); |
|
if (uri != NULL) { |
|
if (TAILQ_FIRST(&n->childq) != NULL) { |
|
print_textnode(f, n); |
|
text = ""; |
|
} else { |
|
text = pnode_getattr_raw(n, ATTRKEY_ENDTERM, NULL); |
|
if (text != NULL) |
|
print_text(f, text, ARG_SPACE); |
|
} |
|
if (text != NULL) |
|
macro_open(f, "Pq"); |
|
macro_open(f, "Sx"); |
|
macro_addarg(f, uri, ARG_SPACE); |
|
pnode_unlinksub(n); |
|
return; |
|
} |
|
uri = pnode_getattr_raw(n, ATTRKEY_XLINK_HREF, NULL); |
|
if (uri == NULL) |
|
uri = pnode_getattr_raw(n, ATTRKEY_URL, NULL); |
|
if (uri != NULL) { |
|
macro_open(f, "Lk"); |
|
macro_addarg(f, uri, ARG_SPACE | ARG_SINGLE); |
|
if (TAILQ_FIRST(&n->childq) != NULL) |
|
macro_addnode(f, n, ARG_SPACE | ARG_SINGLE); |
|
pnode_unlinksub(n); |
|
return; |
|
} |
|
} |
|
|
|
static void |
pnode_printprologue(struct format *p, struct ptree *tree) |
pnode_printprologue(struct format *p, struct ptree *tree) |
{ |
{ |
struct pnode *refmeta; |
struct pnode *refmeta; |
Line 554 pnode_printvarlistentry(struct format *p, struct pnode |
|
Line 596 pnode_printvarlistentry(struct format *p, struct pnode |
|
struct pnode *pp; |
struct pnode *pp; |
int first = 1; |
int first = 1; |
|
|
|
macro_close(p); |
macro_open(p, "It"); |
macro_open(p, "It"); |
TAILQ_FOREACH(pp, &pn->childq, child) { |
TAILQ_FOREACH(pp, &pn->childq, child) { |
if (pp->node != NODE_TERM) |
if (pp->node != NODE_TERM && pp->node != NODE_GLOSSTERM) |
continue; |
continue; |
if ( ! first) |
if ( ! first) |
macro_addarg(p, ",", 0); |
macro_addarg(p, ",", 0); |
Line 565 pnode_printvarlistentry(struct format *p, struct pnode |
|
Line 608 pnode_printvarlistentry(struct format *p, struct pnode |
|
} |
} |
macro_close(p); |
macro_close(p); |
TAILQ_FOREACH(pp, &pn->childq, child) |
TAILQ_FOREACH(pp, &pn->childq, child) |
if (pp->node != NODE_TERM) |
if (pp->node != NODE_TERM && pp->node != NODE_GLOSSTERM) |
pnode_print(p, pp); |
pnode_print(p, pp); |
pnode_unlinksub(pn); |
pnode_unlinksub(pn); |
} |
} |
Line 622 pnode_printtgroup2(struct format *f, struct pnode *n) |
|
Line 665 pnode_printtgroup2(struct format *f, struct pnode *n) |
|
while ((nr = pnode_findfirst(n, NODE_ROW)) != NULL) { |
while ((nr = pnode_findfirst(n, NODE_ROW)) != NULL) { |
if ((ne = pnode_findfirst(n, NODE_ENTRY)) == NULL) |
if ((ne = pnode_findfirst(n, NODE_ENTRY)) == NULL) |
break; |
break; |
|
macro_close(f); |
macro_open(f, "It"); |
macro_open(f, "It"); |
pnode_print(f, ne); |
pnode_print(f, ne); |
macro_close(f); |
macro_close(f); |
|
|
pnode_print(struct format *p, struct pnode *pn) |
pnode_print(struct format *p, struct pnode *pn) |
{ |
{ |
struct pnode *pp; |
struct pnode *pp; |
const char *ccp; |
|
enum linestate sv; |
enum linestate sv; |
|
|
if (pn == NULL) |
if (pn == NULL) |
Line 723 pnode_print(struct format *p, struct pnode *pn) |
|
Line 766 pnode_print(struct format *p, struct pnode *pn) |
|
case NODE_AUTHORGROUP: |
case NODE_AUTHORGROUP: |
macro_line(p, "An -split"); |
macro_line(p, "An -split"); |
break; |
break; |
|
case NODE_BLOCKQUOTE: |
|
macro_line(p, "Bd -ragged -offset indent"); |
|
break; |
case NODE_BOOKINFO: |
case NODE_BOOKINFO: |
macro_line(p, "Sh NAME"); |
macro_line(p, "Sh NAME"); |
break; |
break; |
Line 748 pnode_print(struct format *p, struct pnode *pn) |
|
Line 794 pnode_print(struct format *p, struct pnode *pn) |
|
break; |
break; |
case NODE_EMPHASIS: |
case NODE_EMPHASIS: |
case NODE_FIRSTTERM: |
case NODE_FIRSTTERM: |
|
case NODE_GLOSSTERM: |
macro_open(p, "Em"); |
macro_open(p, "Em"); |
break; |
break; |
case NODE_ENVAR: |
case NODE_ENVAR: |
Line 789 pnode_print(struct format *p, struct pnode *pn) |
|
Line 836 pnode_print(struct format *p, struct pnode *pn) |
|
macro_line(p, "Sh LEGAL NOTICE"); |
macro_line(p, "Sh LEGAL NOTICE"); |
break; |
break; |
case NODE_LINK: |
case NODE_LINK: |
ccp = pnode_getattr_raw(pn, ATTRKEY_LINKEND, NULL); |
pnode_printlink(p, pn); |
if (ccp == NULL) |
break; |
break; |
|
macro_argline(p, "Sx", ccp); |
|
return; |
|
case NODE_LITERAL: |
case NODE_LITERAL: |
macro_open(p, "Ql"); |
macro_open(p, "Ql"); |
break; |
break; |
case NODE_LITERALLAYOUT: |
case NODE_LITERALLAYOUT: |
|
macro_close(p); |
macro_argline(p, "Bd", pnode_getattr(pn, ATTRKEY_CLASS) == |
macro_argline(p, "Bd", pnode_getattr(pn, ATTRKEY_CLASS) == |
ATTRVAL_MONOSPACED ? "-literal" : "-unfilled"); |
ATTRVAL_MONOSPACED ? "-literal" : "-unfilled"); |
break; |
break; |
Line 883 pnode_print(struct format *p, struct pnode *pn) |
|
Line 928 pnode_print(struct format *p, struct pnode *pn) |
|
pnode_printtgroup(p, pn); |
pnode_printtgroup(p, pn); |
break; |
break; |
case NODE_TITLE: |
case NODE_TITLE: |
if (pn->parent->node == NODE_BOOKINFO) { |
if (pn->parent != NULL && |
|
pn->parent->node == NODE_BOOKINFO) { |
macro_open(p, "Nd"); |
macro_open(p, "Nd"); |
break; |
break; |
} |
} |
Line 958 pnode_print(struct format *p, struct pnode *pn) |
|
Line 1004 pnode_print(struct format *p, struct pnode *pn) |
|
case NODE_FUNCTION: |
case NODE_FUNCTION: |
case NODE_FUNCSYNOPSISINFO: |
case NODE_FUNCSYNOPSISINFO: |
case NODE_KEYSYM: |
case NODE_KEYSYM: |
|
case NODE_LINK: |
case NODE_LITERAL: |
case NODE_LITERAL: |
case NODE_OPTION: |
case NODE_OPTION: |
case NODE_PARAMETER: |
case NODE_PARAMETER: |
Line 1000 pnode_print(struct format *p, struct pnode *pn) |
|
Line 1047 pnode_print(struct format *p, struct pnode *pn) |
|
case NODE_WARNING: |
case NODE_WARNING: |
p->level--; |
p->level--; |
break; |
break; |
|
case NODE_BLOCKQUOTE: |
case NODE_LITERALLAYOUT: |
case NODE_LITERALLAYOUT: |
case NODE_PROGRAMLISTING: |
case NODE_PROGRAMLISTING: |
case NODE_SCREEN: |
case NODE_SCREEN: |
Line 1007 pnode_print(struct format *p, struct pnode *pn) |
|
Line 1055 pnode_print(struct format *p, struct pnode *pn) |
|
macro_line(p, "Ed"); |
macro_line(p, "Ed"); |
break; |
break; |
case NODE_TITLE: |
case NODE_TITLE: |
if (pn->parent->node == NODE_BOOKINFO) |
if (pn->parent != NULL && |
|
pn->parent->node == NODE_BOOKINFO) |
macro_line(p, "Sh AUTHORS"); |
macro_line(p, "Sh AUTHORS"); |
break; |
break; |
default: |
default: |