version 1.108, 2019/04/12 09:39:21 |
version 1.117, 2019/04/13 15:13:31 |
Line 70 pnode_printtext(struct format *f, struct pnode *n) |
|
Line 70 pnode_printtext(struct format *f, struct pnode *n) |
|
*/ |
*/ |
|
|
if (f->linestate != LINE_MACRO && |
if (f->linestate != LINE_MACRO && |
(nn = TAILQ_NEXT(n, child)) != NULL && nn->spc == 0 && |
(nn = TAILQ_NEXT(n, child)) != NULL && nn->spc == 0) { |
(nn->node != NODE_TEXT && nn->node != NODE_ESCAPE)) { |
switch (pnode_class(nn->node)) { |
macro_open(f, "Pf"); |
case CLASS_LINE: |
accept_arg = 1; |
case CLASS_ENCL: |
f->flags |= FMT_CHILD; |
macro_open(f, "Pf"); |
nn->spc = 1; |
accept_arg = 1; |
|
f->flags |= FMT_CHILD; |
|
nn->spc = 1; |
|
break; |
|
default: |
|
break; |
|
} |
} |
} |
|
|
switch (f->linestate) { |
switch (f->linestate) { |
Line 150 pnode_printpara(struct format *f, struct pnode *n) |
|
Line 156 pnode_printpara(struct format *f, struct pnode *n) |
|
macro_line(f, "Pp"); |
macro_line(f, "Pp"); |
} |
} |
|
|
|
static void |
|
pnode_printrefnamediv(struct format *f, struct pnode *n) |
|
{ |
|
struct pnode *nc, *nn; |
|
int comma; |
|
|
|
macro_line(f, "Sh NAME"); |
|
comma = 0; |
|
TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) { |
|
if (nc->node != NODE_REFNAME) |
|
continue; |
|
if (comma) |
|
macro_addarg(f, ",", ARG_SPACE); |
|
macro_open(f, "Nm"); |
|
macro_addnode(f, nc, ARG_SPACE); |
|
pnode_unlink(nc); |
|
comma = 1; |
|
} |
|
macro_close(f); |
|
} |
|
|
/* |
/* |
* If the SYNOPSIS macro has a superfluous title, kill it. |
* If the SYNOPSIS macro has a superfluous title, kill it. |
*/ |
*/ |
Line 171 pnode_printrefsynopsisdiv(struct format *f, struct pno |
|
Line 198 pnode_printrefsynopsisdiv(struct format *f, struct pno |
|
static void |
static void |
pnode_printrefsect(struct format *f, struct pnode *n) |
pnode_printrefsect(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *nc; |
struct pnode *nc, *ncc; |
const char *title; |
const char *title; |
int flags, level; |
int flags, level; |
|
|
Line 243 pnode_printrefsect(struct format *f, struct pnode *n) |
|
Line 270 pnode_printrefsect(struct format *f, struct pnode *n) |
|
break; |
break; |
} |
} |
|
|
if (nc != NULL) { |
if (nc != NULL) |
macro_addnode(f, nc, flags); |
macro_addnode(f, nc, flags); |
pnode_unlink(nc); |
else |
} else |
|
macro_addarg(f, title, flags | ARG_QUOTED); |
macro_addarg(f, title, flags | ARG_QUOTED); |
macro_close(f); |
macro_close(f); |
|
|
|
/* |
|
* DocBook has no equivalent for -split mode, |
|
* so just switch the default in the AUTHORS section. |
|
*/ |
|
|
|
if (nc != NULL) { |
|
ncc = TAILQ_FIRST(&nc->childq); |
|
if (ncc != NULL && ncc->node == NODE_TEXT && |
|
strcasecmp(ncc->b, "AUTHORS") == 0) |
|
macro_line(f, "An -nosplit"); |
|
pnode_unlink(nc); |
|
} |
} |
} |
|
|
/* |
/* |
Line 279 pnode_printciterefentry(struct format *f, struct pnode |
|
Line 318 pnode_printciterefentry(struct format *f, struct pnode |
|
} |
} |
|
|
static void |
static void |
pnode_printrefmeta(struct format *f, struct pnode *n) |
|
{ |
|
struct pnode *nc, *title, *manvol; |
|
|
|
title = manvol = NULL; |
|
TAILQ_FOREACH(nc, &n->childq, child) { |
|
if (nc->node == NODE_MANVOLNUM) |
|
manvol = nc; |
|
else if (nc->node == NODE_REFENTRYTITLE) |
|
title = nc; |
|
} |
|
macro_close(f); |
|
macro_open(f, "Dt"); |
|
if (title == NULL) |
|
macro_addarg(f, "UNKNOWN", ARG_SPACE); |
|
else |
|
macro_addnode(f, title, ARG_SPACE | ARG_SINGLE | ARG_UPPER); |
|
if (manvol == NULL) |
|
macro_addarg(f, "1", ARG_SPACE); |
|
else |
|
macro_addnode(f, manvol, ARG_SPACE | ARG_SINGLE); |
|
macro_close(f); |
|
pnode_unlink(n); |
|
} |
|
|
|
static void |
|
pnode_printfuncdef(struct format *f, struct pnode *n) |
pnode_printfuncdef(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *nc; |
struct pnode *nc; |
Line 429 pnode_printarg(struct format *f, struct pnode *n) |
|
Line 442 pnode_printarg(struct format *f, struct pnode *n) |
|
f->flags |= FMT_IMPL; |
f->flags |= FMT_IMPL; |
} |
} |
} |
} |
|
|
TAILQ_FOREACH(nc, &n->childq, child) { |
TAILQ_FOREACH(nc, &n->childq, child) { |
if (nc->node == NODE_TEXT) |
if (nc->node == NODE_TEXT) |
macro_open(f, "Ar"); |
macro_open(f, "Ar"); |
pnode_print(f, nc); |
pnode_print(f, nc); |
if (isrep && nc->node == NODE_TEXT) |
|
macro_addarg(f, "...", ARG_SPACE); |
|
} |
} |
|
if (isrep && f->linestate == LINE_MACRO) |
|
macro_addarg(f, "...", ARG_SPACE); |
if (isop) { |
if (isop) { |
if (was_impl) |
if (was_impl) |
macro_open(f, "Oc"); |
macro_open(f, "Oc"); |
Line 449 pnode_printarg(struct format *f, struct pnode *n) |
|
Line 461 pnode_printarg(struct format *f, struct pnode *n) |
|
static void |
static void |
pnode_printgroup(struct format *f, struct pnode *n) |
pnode_printgroup(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *nc, *nn; |
struct pnode *nc; |
struct pattr *a; |
struct pattr *a; |
int isop, sv; |
int bar, isop, isrep, was_impl; |
|
|
isop = 1; |
isop = 1; |
TAILQ_FOREACH(a, &n->attrq, child) |
isrep = was_impl = 0; |
|
TAILQ_FOREACH(a, &n->attrq, child) { |
if (a->key == ATTRKEY_CHOICE && |
if (a->key == ATTRKEY_CHOICE && |
(a->val == ATTRVAL_PLAIN || a->val == ATTRVAL_REQ)) { |
(a->val == ATTRVAL_PLAIN || a->val == ATTRVAL_REQ)) |
isop = 0; |
isop = 0; |
break; |
else if (a->key == ATTRKEY_REP && a->val == ATTRVAL_REPEAT) |
|
isrep = 1; |
|
} |
|
if (isop) { |
|
if (f->flags & FMT_IMPL) { |
|
was_impl = 1; |
|
macro_open(f, "Oo"); |
|
} else { |
|
macro_open(f, "Op"); |
|
f->flags |= FMT_IMPL; |
} |
} |
|
} else if (isrep) { |
/* |
if (f->flags & FMT_IMPL) { |
* Make sure we're on a macro line. |
was_impl = 1; |
* This will prevent pnode_print() for putting us on a |
macro_open(f, "Bro"); |
* subsequent line. |
} else { |
*/ |
macro_open(f, "Brq"); |
sv = f->linestate == LINE_NEW; |
f->flags |= FMT_IMPL; |
if (isop) |
} |
macro_open(f, "Op"); |
} |
else if (sv) |
bar = 0; |
macro_open(f, "No"); |
|
f->flags |= FMT_IMPL; |
|
|
|
/* |
|
* Keep on printing text separated by the vertical bar as long |
|
* as we're within the same origin node as the group. |
|
* This is kind of a nightmare. |
|
* Eh, DocBook... |
|
* FIXME: if there's a "Fl", we don't cut off the leading "-" |
|
* like we do in pnode_print(). |
|
*/ |
|
TAILQ_FOREACH(nc, &n->childq, child) { |
TAILQ_FOREACH(nc, &n->childq, child) { |
pnode_print(f, nc); |
if (bar && f->linestate == LINE_MACRO) |
nn = TAILQ_NEXT(nc, child); |
|
while (nn != NULL) { |
|
if (nc->node != nn->node) |
|
break; |
|
macro_addarg(f, "|", ARG_SPACE); |
macro_addarg(f, "|", ARG_SPACE); |
macro_addnode(f, nn, ARG_SPACE); |
pnode_print(f, nc); |
nc = nn; |
bar = 1; |
nn = TAILQ_NEXT(nn, child); |
|
} |
|
} |
} |
if (sv) |
if (isop) { |
macro_close(f); |
if (was_impl) |
f->flags &= ~FMT_IMPL; |
macro_open(f, "Oc"); |
|
else |
|
f->flags &= ~FMT_IMPL; |
|
} else if (isrep) { |
|
if (was_impl) |
|
macro_open(f, "Brc"); |
|
else |
|
f->flags &= ~FMT_IMPL; |
|
} |
|
if (isrep && f->linestate == LINE_MACRO) |
|
macro_addarg(f, "...", ARG_SPACE); |
pnode_unlinksub(n); |
pnode_unlinksub(n); |
} |
} |
|
|
Line 554 pnode_printauthor(struct format *f, struct pnode *n) |
|
Line 569 pnode_printauthor(struct format *f, struct pnode *n) |
|
|
|
if ((nc = pnode_findfirst(n, NODE_EMAIL)) != NULL) { |
if ((nc = pnode_findfirst(n, NODE_EMAIL)) != NULL) { |
f->flags |= FMT_CHILD; |
f->flags |= FMT_CHILD; |
pnode_print(f, nc); |
macro_open(f, "Aq Mt"); |
|
macro_addnode(f, nc, ARG_SPACE); |
pnode_unlink(nc); |
pnode_unlink(nc); |
} |
} |
|
|
Line 573 pnode_printauthor(struct format *f, struct pnode *n) |
|
Line 589 pnode_printauthor(struct format *f, struct pnode *n) |
|
static void |
static void |
pnode_printlink(struct format *f, struct pnode *n) |
pnode_printlink(struct format *f, struct pnode *n) |
{ |
{ |
|
struct pnode *nc; |
const char *uri, *text; |
const char *uri, *text; |
|
|
uri = pnode_getattr_raw(n, ATTRKEY_LINKEND, NULL); |
uri = pnode_getattr_raw(n, ATTRKEY_LINKEND, NULL); |
if (uri != NULL) { |
if (uri != NULL) { |
if (TAILQ_FIRST(&n->childq) != NULL) { |
if (TAILQ_FIRST(&n->childq) != NULL) { |
print_textnode(f, n); |
TAILQ_FOREACH(nc, &n->childq, child) |
|
pnode_print(f, nc); |
text = ""; |
text = ""; |
} else { |
} else if ((text = pnode_getattr_raw(n, |
text = pnode_getattr_raw(n, ATTRKEY_ENDTERM, NULL); |
ATTRKEY_ENDTERM, NULL)) != NULL) { |
if (text != NULL) |
if (f->linestate == LINE_MACRO && f->flags & FMT_ARG) |
|
macro_addarg(f, text, ARG_SPACE); |
|
else |
print_text(f, text, ARG_SPACE); |
print_text(f, text, ARG_SPACE); |
} |
} |
if (text != NULL) { |
if (text != NULL) { |
macro_open(f, "Pq"); |
if (f->flags & FMT_IMPL) |
f->flags |= FMT_CHILD; |
macro_open(f, "Po"); |
|
else { |
|
macro_open(f, "Pq"); |
|
f->flags |= FMT_CHILD; |
|
} |
} |
} |
macro_open(f, "Sx"); |
macro_open(f, "Sx"); |
macro_addarg(f, uri, ARG_SPACE); |
macro_addarg(f, uri, ARG_SPACE); |
|
if (text != NULL && f->flags & FMT_IMPL) |
|
macro_open(f, "Pc"); |
pnode_unlinksub(n); |
pnode_unlinksub(n); |
return; |
return; |
} |
} |
Line 608 pnode_printlink(struct format *f, struct pnode *n) |
|
Line 634 pnode_printlink(struct format *f, struct pnode *n) |
|
} |
} |
|
|
static void |
static void |
pnode_printprologue(struct format *f, struct ptree *tree) |
pnode_printprologue(struct format *f, struct pnode *root) |
{ |
{ |
struct pnode *refmeta; |
struct pnode *date, *refmeta, *name, *vol, *descr, *nc; |
|
const char *sname; |
|
|
refmeta = tree->root == NULL ? NULL : |
/* Collect information. */ |
pnode_findfirst(tree->root, NODE_REFMETA); |
|
|
|
macro_line(f, "Dd $Mdocdate" "$"); |
if ((date = pnode_takefirst(root, NODE_PUBDATE)) == NULL) |
if (refmeta == NULL) { |
date = pnode_takefirst(root, NODE_DATE); |
macro_open(f, "Dt"); |
|
macro_addarg(f, |
name = vol = NULL; |
pnode_getattr_raw(tree->root, ATTRKEY_ID, "UNKNOWN"), |
if ((refmeta = pnode_takefirst(root, NODE_REFMETA)) != NULL) { |
ARG_SPACE | ARG_SINGLE | ARG_UPPER); |
TAILQ_FOREACH(nc, &refmeta->childq, child) { |
macro_addarg(f, "1", ARG_SPACE); |
switch (nc->node) { |
macro_close(f); |
case NODE_REFENTRYTITLE: |
|
name = nc; |
|
break; |
|
case NODE_MANVOLNUM: |
|
vol = nc; |
|
break; |
|
default: |
|
break; |
|
} |
|
} |
|
} |
|
|
|
if (pnode_findfirst(root, NODE_REFNAMEDIV) == NULL && |
|
((nc = pnode_findfirst(root, NODE_BOOKINFO)) != NULL || |
|
(nc = pnode_findfirst(root, NODE_REFENTRYINFO)) != NULL)) |
|
descr = pnode_takefirst(nc, NODE_TITLE); |
|
else |
|
descr = NULL; |
|
|
|
/* Print prologue. */ |
|
|
|
if (date == NULL) |
|
macro_line(f, "Dd $Mdocdate" "$"); |
|
else |
|
macro_nodeline(f, "Dd", date, 0); |
|
|
|
macro_open(f, "Dt"); |
|
if (name == NULL) { |
|
sname = pnode_getattr_raw(root, ATTRKEY_ID, "UNKNOWN"); |
|
macro_addarg(f, sname, ARG_SPACE | ARG_SINGLE | ARG_UPPER); |
} else |
} else |
pnode_printrefmeta(f, refmeta); |
macro_addnode(f, name, ARG_SPACE | ARG_SINGLE | ARG_UPPER); |
|
if (vol == NULL) |
|
macro_addarg(f, "1", ARG_SPACE); |
|
else |
|
macro_addnode(f, vol, ARG_SPACE | ARG_SINGLE); |
|
|
macro_line(f, "Os"); |
macro_line(f, "Os"); |
|
|
if (tree->flags & TREE_EQN) { |
if (descr != NULL) { |
macro_line(f, "EQ"); |
macro_line(f, "Sh NAME"); |
print_text(f, "delim $$", 0); |
if (name == NULL) |
macro_line(f, "EN"); |
macro_argline(f, "Nm", sname); |
|
else |
|
macro_nodeline(f, "Nm", name, ARG_SINGLE); |
|
macro_nodeline(f, "Nd", descr, 0); |
} |
} |
|
|
|
/* Clean up. */ |
|
|
|
pnode_unlink(date); |
|
pnode_unlink(refmeta); |
|
pnode_unlink(descr); |
} |
} |
|
|
/* |
/* |
|
|
pnode_print(struct format *f, struct pnode *n) |
pnode_print(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *nc, *nn; |
struct pnode *nc, *nn; |
enum linestate sv; |
int was_impl; |
|
|
if (n == NULL) |
if (n == NULL) |
return; |
return; |
|
|
sv = f->linestate; |
was_impl = f->flags & FMT_IMPL; |
if (n->spc) |
if (n->spc) |
f->flags &= ~FMT_NOSPC; |
f->flags &= ~FMT_NOSPC; |
else |
else |
Line 832 pnode_print(struct format *f, struct pnode *n) |
|
Line 901 pnode_print(struct format *f, struct pnode *n) |
|
case NODE_BLOCKQUOTE: |
case NODE_BLOCKQUOTE: |
macro_line(f, "Bd -ragged -offset indent"); |
macro_line(f, "Bd -ragged -offset indent"); |
break; |
break; |
case NODE_BOOKINFO: |
|
macro_line(f, "Sh NAME"); |
|
break; |
|
case NODE_CITEREFENTRY: |
case NODE_CITEREFENTRY: |
pnode_printciterefentry(f, n); |
pnode_printciterefentry(f, n); |
break; |
break; |
Line 849 pnode_print(struct format *f, struct pnode *n) |
|
Line 915 pnode_print(struct format *f, struct pnode *n) |
|
break; |
break; |
case NODE_EDITOR: |
case NODE_EDITOR: |
print_text(f, "editor:", ARG_SPACE); |
print_text(f, "editor:", ARG_SPACE); |
sv = LINE_TEXT; |
|
macro_open(f, "An"); |
macro_open(f, "An"); |
break; |
break; |
case NODE_EMAIL: |
case NODE_EMAIL: |
macro_open(f, "Aq Mt"); |
if (was_impl) |
|
macro_open(f, "Ao Mt"); |
|
else { |
|
macro_open(f, "Aq Mt"); |
|
f->flags |= FMT_IMPL; |
|
} |
break; |
break; |
case NODE_EMPHASIS: |
case NODE_EMPHASIS: |
case NODE_FIRSTTERM: |
case NODE_FIRSTTERM: |
Line 879 pnode_print(struct format *f, struct pnode *n) |
|
Line 949 pnode_print(struct format *f, struct pnode *n) |
|
macro_open(f, "Fd"); |
macro_open(f, "Fd"); |
break; |
break; |
case NODE_INFORMALEQUATION: |
case NODE_INFORMALEQUATION: |
|
macro_line(f, "Bd -ragged -offset indent"); |
|
/* FALLTHROUGH */ |
|
case NODE_INLINEEQUATION: |
macro_line(f, "EQ"); |
macro_line(f, "EQ"); |
break; |
break; |
case NODE_INLINEEQUATION: |
|
if (f->linestate == LINE_NEW) |
|
f->linestate = LINE_TEXT; |
|
putchar('$'); |
|
break; |
|
case NODE_ITEMIZEDLIST: |
case NODE_ITEMIZEDLIST: |
pnode_printlist(f, n); |
pnode_printlist(f, n); |
break; |
break; |
Line 899 pnode_print(struct format *f, struct pnode *n) |
|
Line 967 pnode_print(struct format *f, struct pnode *n) |
|
pnode_printlink(f, n); |
pnode_printlink(f, n); |
break; |
break; |
case NODE_LITERAL: |
case NODE_LITERAL: |
macro_open(f, "Ql"); |
if (was_impl) |
|
macro_open(f, "So"); |
|
else { |
|
macro_open(f, "Ql"); |
|
f->flags |= FMT_IMPL; |
|
} |
break; |
break; |
case NODE_LITERALLAYOUT: |
case NODE_LITERALLAYOUT: |
macro_close(f); |
macro_close(f); |
Line 942 pnode_print(struct format *f, struct pnode *n) |
|
Line 1015 pnode_print(struct format *f, struct pnode *n) |
|
pnode_unlinksub(n); |
pnode_unlinksub(n); |
break; |
break; |
case NODE_QUOTE: |
case NODE_QUOTE: |
macro_open(f, "Qo"); |
if (was_impl) |
|
macro_open(f, "Do"); |
|
else { |
|
macro_open(f, "Dq"); |
|
f->flags |= FMT_IMPL; |
|
} |
break; |
break; |
case NODE_PROGRAMLISTING: |
case NODE_PROGRAMLISTING: |
case NODE_SCREEN: |
case NODE_SCREEN: |
Line 954 pnode_print(struct format *f, struct pnode *n) |
|
Line 1032 pnode_print(struct format *f, struct pnode *n) |
|
pnode_unlinksub(n); |
pnode_unlinksub(n); |
break; |
break; |
case NODE_REFNAME: |
case NODE_REFNAME: |
/* Suppress non-text children... */ |
/* More often, these appear inside NODE_REFNAMEDIV. */ |
macro_open(f, "Nm"); |
macro_open(f, "Nm"); |
macro_addnode(f, n, ARG_SPACE | ARG_SINGLE); |
|
pnode_unlinksub(n); |
|
break; |
break; |
case NODE_REFNAMEDIV: |
case NODE_REFNAMEDIV: |
macro_line(f, "Sh NAME"); |
pnode_printrefnamediv(f, n); |
break; |
break; |
case NODE_REFPURPOSE: |
case NODE_REFPURPOSE: |
macro_open(f, "Nd"); |
macro_open(f, "Nd"); |
Line 992 pnode_print(struct format *f, struct pnode *n) |
|
Line 1068 pnode_print(struct format *f, struct pnode *n) |
|
pnode_printtgroup(f, n); |
pnode_printtgroup(f, n); |
break; |
break; |
case NODE_TITLE: |
case NODE_TITLE: |
if (n->parent != NULL && |
|
n->parent->node == NODE_BOOKINFO) { |
|
macro_open(f, "Nd"); |
|
break; |
|
} |
|
pnode_printpara(f, n); |
pnode_printpara(f, n); |
macro_nodeline(f, "Sy", n, 0); |
macro_nodeline(f, "Sy", n, 0); |
pnode_unlinksub(n); |
pnode_unlinksub(n); |
Line 1018 pnode_print(struct format *f, struct pnode *n) |
|
Line 1089 pnode_print(struct format *f, struct pnode *n) |
|
pnode_print(f, nc); |
pnode_print(f, nc); |
|
|
switch (n->node) { |
switch (n->node) { |
|
case NODE_EMAIL: |
|
if (was_impl) { |
|
f->flags &= ~FMT_NOSPC; |
|
macro_open(f, "Ac"); |
|
} else |
|
f->flags &= ~FMT_IMPL; |
|
break; |
case NODE_ESCAPE: |
case NODE_ESCAPE: |
case NODE_TERM: |
case NODE_TERM: |
case NODE_TEXT: |
case NODE_TEXT: |
Line 1025 pnode_print(struct format *f, struct pnode *n) |
|
Line 1103 pnode_print(struct format *f, struct pnode *n) |
|
return; |
return; |
case NODE_INFORMALEQUATION: |
case NODE_INFORMALEQUATION: |
macro_line(f, "EN"); |
macro_line(f, "EN"); |
|
macro_line(f, "Ed"); |
break; |
break; |
case NODE_INLINEEQUATION: |
case NODE_INLINEEQUATION: |
fputs("$ ", stdout); |
macro_line(f, "EN"); |
f->linestate = sv; |
|
break; |
break; |
|
case NODE_LITERAL: |
|
if (was_impl) { |
|
f->flags &= ~FMT_NOSPC; |
|
macro_open(f, "Sc"); |
|
} else |
|
f->flags &= ~FMT_IMPL; |
|
break; |
case NODE_MEMBER: |
case NODE_MEMBER: |
if ((nn = TAILQ_NEXT(n, child)) != NULL && |
if ((nn = TAILQ_NEXT(n, child)) != NULL && |
nn->node != NODE_MEMBER) |
nn->node != NODE_MEMBER) |
Line 1057 pnode_print(struct format *f, struct pnode *n) |
|
Line 1142 pnode_print(struct format *f, struct pnode *n) |
|
fputs(" } ", stdout); |
fputs(" } ", stdout); |
break; |
break; |
case NODE_QUOTE: |
case NODE_QUOTE: |
if (sv == LINE_NEW) |
if (was_impl) { |
macro_close(f); |
f->flags &= ~FMT_NOSPC; |
sv = f->linestate; |
macro_open(f, "Dc"); |
macro_open(f, "Qc"); |
} else |
if (sv == LINE_NEW) |
f->flags &= ~FMT_IMPL; |
macro_close(f); |
|
break; |
break; |
case NODE_REFNAME: |
|
/* |
|
* If we're in the NAME macro and we have multiple |
|
* <refname> macros in sequence, then print out a |
|
* trailing comma before the newline. |
|
*/ |
|
if (n->parent != NULL && |
|
n->parent->node == NODE_REFNAMEDIV && |
|
TAILQ_NEXT(n, child) != NULL && |
|
TAILQ_NEXT(n, child)->node == NODE_REFNAME) |
|
macro_addarg(f, ",", ARG_SPACE); |
|
if (sv == LINE_NEW) |
|
macro_close(f); |
|
break; |
|
case NODE_PREFACE: |
case NODE_PREFACE: |
case NODE_SECTION: |
case NODE_SECTION: |
case NODE_APPENDIX: |
case NODE_APPENDIX: |
Line 1095 pnode_print(struct format *f, struct pnode *n) |
|
Line 1165 pnode_print(struct format *f, struct pnode *n) |
|
case NODE_SYNOPSIS: |
case NODE_SYNOPSIS: |
macro_line(f, "Ed"); |
macro_line(f, "Ed"); |
break; |
break; |
case NODE_TITLE: |
|
if (n->parent != NULL && |
|
n->parent->node == NODE_BOOKINFO) |
|
macro_line(f, "Sh AUTHORS"); |
|
break; |
|
default: |
default: |
break; |
break; |
} |
} |
Line 1107 pnode_print(struct format *f, struct pnode *n) |
|
Line 1172 pnode_print(struct format *f, struct pnode *n) |
|
} |
} |
|
|
void |
void |
ptree_print(struct ptree *tree) |
ptree_print_mdoc(struct ptree *tree) |
{ |
{ |
struct format formatter; |
struct format formatter; |
|
|
formatter.level = 0; |
formatter.level = 0; |
formatter.linestate = LINE_NEW; |
formatter.linestate = LINE_NEW; |
pnode_printprologue(&formatter, tree); |
pnode_printprologue(&formatter, tree->root); |
pnode_print(&formatter, tree->root); |
pnode_print(&formatter, tree->root); |
if (formatter.linestate != LINE_NEW) |
if (formatter.linestate != LINE_NEW) |
putchar('\n'); |
putchar('\n'); |