version 1.96, 2019/04/07 17:00:56 |
version 1.109, 2019/04/12 10:34:48 |
|
|
#include <ctype.h> |
#include <ctype.h> |
#include <stdio.h> |
#include <stdio.h> |
#include <stdlib.h> |
#include <stdlib.h> |
|
#include <string.h> |
|
|
#include "node.h" |
#include "node.h" |
#include "macro.h" |
#include "macro.h" |
Line 36 pnode_printtext(struct format *f, struct pnode *n) |
|
Line 37 pnode_printtext(struct format *f, struct pnode *n) |
|
{ |
{ |
struct pnode *nn; |
struct pnode *nn; |
char *cp; |
char *cp; |
char last; |
int accept_arg; |
|
|
if (n->bsz == 0) { |
cp = n->b; |
assert(n->real < n->b); |
accept_arg = f->flags & FMT_ARG; |
return; |
if (f->linestate == LINE_MACRO && !n->spc && !accept_arg) { |
|
for (;;) { |
|
if (*cp == '\0') |
|
return; |
|
if (strchr("!),.:;?]", *cp) == NULL) |
|
break; |
|
printf(" %c", *cp++); |
|
} |
|
if (isspace((unsigned char)*cp)) { |
|
while (isspace((unsigned char)*cp)) |
|
cp++; |
|
macro_close(f); |
|
} else { |
|
fputs(" Ns", stdout); |
|
f->flags &= FMT_IMPL; |
|
accept_arg = 1; |
|
} |
} |
} |
|
if (f->linestate == LINE_MACRO && !accept_arg && |
|
(f->flags & (FMT_CHILD | FMT_IMPL)) == 0) |
|
macro_close(f); |
|
|
/* |
/* |
* Text preceding a macro without intervening whitespace |
* Text preceding a macro without intervening whitespace |
Line 53 pnode_printtext(struct format *f, struct pnode *n) |
|
Line 73 pnode_printtext(struct format *f, struct pnode *n) |
|
(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)) { |
(nn->node != NODE_TEXT && nn->node != NODE_ESCAPE)) { |
macro_open(f, "Pf"); |
macro_open(f, "Pf"); |
|
accept_arg = 1; |
|
f->flags |= FMT_CHILD; |
nn->spc = 1; |
nn->spc = 1; |
} |
} |
|
|
if (f->linestate == LINE_NEW) { |
switch (f->linestate) { |
last = '\n'; |
case LINE_NEW: |
f->linestate = LINE_TEXT; |
break; |
} else { |
case LINE_TEXT: |
last = ' '; |
if (n->spc) { |
if (n->spc || f->linestate == LINE_MACRO) |
if (n->node == NODE_TEXT) |
|
macro_close(f); |
|
else |
|
putchar(' '); |
|
} |
|
break; |
|
case LINE_MACRO: |
|
if (accept_arg) |
putchar(' '); |
putchar(' '); |
|
else |
|
macro_close(f); |
|
break; |
} |
} |
|
|
if (n->node == NODE_ESCAPE) { |
if (n->node == NODE_ESCAPE) { |
fputs(n->b, stdout); |
fputs(n->b, stdout); |
|
if (f->linestate == LINE_NEW) |
|
f->linestate = LINE_TEXT; |
return; |
return; |
} |
} |
|
|
Line 75 pnode_printtext(struct format *f, struct pnode *n) |
|
Line 109 pnode_printtext(struct format *f, struct pnode *n) |
|
* because the arguments of .Fl macros do not need it. |
* because the arguments of .Fl macros do not need it. |
*/ |
*/ |
|
|
cp = n->b; |
|
if (n->parent != NULL && n->parent->node == NODE_OPTION && *cp == '-') |
if (n->parent != NULL && n->parent->node == NODE_OPTION && *cp == '-') |
cp++; |
cp++; |
|
|
/* |
if (f->linestate == LINE_MACRO) |
* Print the text, skipping whitespace on new lines, |
macro_addarg(f, cp, 0); |
* escaping control characters on new lines, |
else |
* and escaping backslashes. |
print_text(f, cp, 0); |
*/ |
|
|
|
for (; *cp != '\0'; cp++) { |
|
if (last == '\n') { |
|
if (isspace((unsigned char)*cp)) |
|
continue; |
|
if (*cp == '\'' || *cp == '.') |
|
fputs("\\&", stdout); |
|
} |
|
putchar(last = *cp); |
|
if (last == '\\') |
|
putchar('e'); |
|
} |
|
} |
} |
|
|
static void |
static void |
pnode_printpara(struct format *p, struct pnode *pn) |
pnode_printpara(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *pp; |
struct pnode *np; |
|
|
if ((pp = TAILQ_PREV(pn, pnodeq, child)) == NULL && |
if (n->parent == NULL) |
(pp = pn->parent) == NULL) |
|
return; |
return; |
|
|
switch (pp->node) { |
if ((np = TAILQ_PREV(n, pnodeq, child)) == NULL) |
|
np = n->parent; |
|
|
|
f->flags = 0; |
|
|
|
switch (np->node) { |
case NODE_ENTRY: |
case NODE_ENTRY: |
|
case NODE_GLOSSTERM: |
case NODE_LISTITEM: |
case NODE_LISTITEM: |
|
case NODE_TERM: |
return; |
return; |
|
case NODE_APPENDIX: |
|
case NODE_LEGALNOTICE: |
case NODE_PREFACE: |
case NODE_PREFACE: |
case NODE_SECTION: |
case NODE_SECTION: |
if (p->level < 3) |
if (f->level < 3) |
return; |
return; |
break; |
break; |
default: |
default: |
break; |
break; |
} |
} |
macro_line(p, "Pp"); |
macro_line(f, "Pp"); |
} |
} |
|
|
/* |
/* |
* If the SYNOPSIS macro has a superfluous title, kill it. |
* If the SYNOPSIS macro has a superfluous title, kill it. |
*/ |
*/ |
static void |
static void |
pnode_printrefsynopsisdiv(struct format *p, struct pnode *pn) |
pnode_printrefsynopsisdiv(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *pp, *pq; |
struct pnode *nc, *nn; |
|
|
TAILQ_FOREACH_SAFE(pp, &pn->childq, child, pq) |
TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) |
if (pp->node == NODE_TITLE) |
if (nc->node == NODE_TITLE) |
pnode_unlink(pp); |
pnode_unlink(nc); |
|
|
macro_line(p, "Sh SYNOPSIS"); |
macro_line(f, "Sh SYNOPSIS"); |
} |
} |
|
|
/* |
/* |
* Start a hopefully-named `Sh' section. |
* Start a hopefully-named `Sh' section. |
*/ |
*/ |
static void |
static void |
pnode_printrefsect(struct format *p, struct pnode *pn) |
pnode_printrefsect(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *pp; |
struct pnode *nc; |
const char *title; |
const char *title; |
int flags, level; |
int flags, level; |
|
|
if (pn->parent == NULL) |
if (n->parent == NULL) |
return; |
return; |
|
|
level = ++p->level; |
level = ++f->level; |
flags = ARG_SPACE; |
flags = ARG_SPACE; |
if (level == 1) |
if (level == 1) |
flags |= ARG_UPPER; |
flags |= ARG_UPPER; |
if (level < 3) { |
if (level < 3) { |
switch (pn->node) { |
switch (n->node) { |
case NODE_CAUTION: |
case NODE_CAUTION: |
case NODE_NOTE: |
case NODE_NOTE: |
case NODE_TIP: |
case NODE_TIP: |
Line 167 pnode_printrefsect(struct format *p, struct pnode *pn) |
|
Line 195 pnode_printrefsect(struct format *p, struct pnode *pn) |
|
} |
} |
} |
} |
|
|
TAILQ_FOREACH(pp, &pn->childq, child) |
TAILQ_FOREACH(nc, &n->childq, child) |
if (pp->node == NODE_TITLE) |
if (nc->node == NODE_TITLE) |
break; |
break; |
|
|
if (pp == NULL) { |
if (nc == NULL) { |
switch (pn->node) { |
switch (n->node) { |
case NODE_PREFACE: |
case NODE_PREFACE: |
title = "Preface"; |
title = "Preface"; |
break; |
break; |
|
case NODE_APPENDIX: |
|
title = "Appendix"; |
|
break; |
|
case NODE_LEGALNOTICE: |
|
title = "Legal Notice"; |
|
break; |
case NODE_CAUTION: |
case NODE_CAUTION: |
title = "Caution"; |
title = "Caution"; |
break; |
break; |
Line 196 pnode_printrefsect(struct format *p, struct pnode *pn) |
|
Line 230 pnode_printrefsect(struct format *p, struct pnode *pn) |
|
|
|
switch (level) { |
switch (level) { |
case 1: |
case 1: |
macro_close(p); |
macro_close(f); |
macro_open(p, "Sh"); |
macro_open(f, "Sh"); |
break; |
break; |
case 2: |
case 2: |
macro_close(p); |
macro_close(f); |
macro_open(p, "Ss"); |
macro_open(f, "Ss"); |
break; |
break; |
default: |
default: |
pnode_printpara(p, pn); |
pnode_printpara(f, n); |
macro_open(p, "Sy"); |
macro_open(f, "Sy"); |
break; |
break; |
} |
} |
|
|
if (pp != NULL) { |
if (nc != NULL) { |
macro_addnode(p, pp, flags); |
macro_addnode(f, nc, flags); |
pnode_unlink(pp); |
pnode_unlink(nc); |
} else |
} else |
macro_addarg(p, title, ARG_SPACE | ARG_QUOTED); |
macro_addarg(f, title, flags | ARG_QUOTED); |
macro_close(p); |
macro_close(f); |
} |
} |
|
|
/* |
/* |
* Start a reference, extracting the title and volume. |
* Start a reference, extracting the title and volume. |
*/ |
*/ |
static void |
static void |
pnode_printciterefentry(struct format *p, struct pnode *pn) |
pnode_printciterefentry(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *pp, *title, *manvol; |
struct pnode *nc, *title, *manvol; |
|
|
title = manvol = NULL; |
title = manvol = NULL; |
TAILQ_FOREACH(pp, &pn->childq, child) { |
TAILQ_FOREACH(nc, &n->childq, child) { |
if (pp->node == NODE_MANVOLNUM) |
if (nc->node == NODE_MANVOLNUM) |
manvol = pp; |
manvol = nc; |
else if (pp->node == NODE_REFENTRYTITLE) |
else if (nc->node == NODE_REFENTRYTITLE) |
title = pp; |
title = nc; |
} |
} |
macro_open(p, "Xr"); |
macro_open(f, "Xr"); |
if (title == NULL) |
if (title == NULL) |
macro_addarg(p, "unknown", ARG_SPACE); |
macro_addarg(f, "unknown", ARG_SPACE); |
else |
else |
macro_addnode(p, title, ARG_SPACE | ARG_SINGLE); |
macro_addnode(f, title, ARG_SPACE | ARG_SINGLE); |
if (manvol == NULL) |
if (manvol == NULL) |
macro_addarg(p, "1", ARG_SPACE); |
macro_addarg(f, "1", ARG_SPACE); |
else |
else |
macro_addnode(p, manvol, ARG_SPACE | ARG_SINGLE); |
macro_addnode(f, manvol, ARG_SPACE | ARG_SINGLE); |
pnode_unlinksub(pn); |
pnode_unlinksub(n); |
} |
} |
|
|
static void |
static void |
pnode_printrefmeta(struct format *p, struct pnode *pn) |
pnode_printrefmeta(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *pp, *title, *manvol; |
struct pnode *nc, *title, *manvol; |
|
|
title = manvol = NULL; |
title = manvol = NULL; |
TAILQ_FOREACH(pp, &pn->childq, child) { |
TAILQ_FOREACH(nc, &n->childq, child) { |
if (pp->node == NODE_MANVOLNUM) |
if (nc->node == NODE_MANVOLNUM) |
manvol = pp; |
manvol = nc; |
else if (pp->node == NODE_REFENTRYTITLE) |
else if (nc->node == NODE_REFENTRYTITLE) |
title = pp; |
title = nc; |
} |
} |
macro_close(p); |
macro_close(f); |
macro_open(p, "Dt"); |
macro_open(f, "Dt"); |
if (title == NULL) |
if (title == NULL) |
macro_addarg(p, "UNKNOWN", ARG_SPACE); |
macro_addarg(f, "UNKNOWN", ARG_SPACE); |
else |
else |
macro_addnode(p, title, ARG_SPACE | ARG_SINGLE | ARG_UPPER); |
macro_addnode(f, title, ARG_SPACE | ARG_SINGLE | ARG_UPPER); |
if (manvol == NULL) |
if (manvol == NULL) |
macro_addarg(p, "1", ARG_SPACE); |
macro_addarg(f, "1", ARG_SPACE); |
else |
else |
macro_addnode(p, manvol, ARG_SPACE | ARG_SINGLE); |
macro_addnode(f, manvol, ARG_SPACE | ARG_SINGLE); |
macro_close(p); |
macro_close(f); |
pnode_unlink(pn); |
pnode_unlink(n); |
} |
} |
|
|
static void |
static void |
Line 291 pnode_printfuncdef(struct format *f, struct pnode *n) |
|
Line 325 pnode_printfuncdef(struct format *f, struct pnode *n) |
|
* Second, >1 arguments are separated by commas. |
* Second, >1 arguments are separated by commas. |
*/ |
*/ |
static void |
static void |
pnode_printmathfenced(struct format *p, struct pnode *pn) |
pnode_printmathfenced(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *pp; |
struct pnode *nc; |
|
|
printf("left %s ", pnode_getattr_raw(pn, ATTRKEY_OPEN, "(")); |
printf("left %s ", pnode_getattr_raw(n, ATTRKEY_OPEN, "(")); |
|
|
pp = TAILQ_FIRST(&pn->childq); |
nc = TAILQ_FIRST(&n->childq); |
pnode_print(p, pp); |
pnode_print(f, nc); |
|
|
while ((pp = TAILQ_NEXT(pp, child)) != NULL) { |
while ((nc = TAILQ_NEXT(nc, child)) != NULL) { |
putchar(','); |
putchar(','); |
pnode_print(p, pp); |
pnode_print(f, nc); |
} |
} |
printf("right %s ", pnode_getattr_raw(pn, ATTRKEY_CLOSE, ")")); |
printf("right %s ", pnode_getattr_raw(n, ATTRKEY_CLOSE, ")")); |
pnode_unlinksub(pn); |
pnode_unlinksub(n); |
} |
} |
|
|
/* |
/* |
Line 315 pnode_printmathfenced(struct format *p, struct pnode * |
|
Line 349 pnode_printmathfenced(struct format *p, struct pnode * |
|
* particular eqn(7) word. |
* particular eqn(7) word. |
*/ |
*/ |
static void |
static void |
pnode_printmath(struct format *p, struct pnode *pn) |
pnode_printmath(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *pp; |
struct pnode *nc; |
|
|
pp = TAILQ_FIRST(&pn->childq); |
nc = TAILQ_FIRST(&n->childq); |
pnode_print(p, pp); |
pnode_print(f, nc); |
|
|
switch (pn->node) { |
switch (n->node) { |
case NODE_MML_MSUP: |
case NODE_MML_MSUP: |
fputs(" sup ", stdout); |
fputs(" sup ", stdout); |
break; |
break; |
Line 336 pnode_printmath(struct format *p, struct pnode *pn) |
|
Line 370 pnode_printmath(struct format *p, struct pnode *pn) |
|
break; |
break; |
} |
} |
|
|
pp = TAILQ_NEXT(pp, child); |
nc = TAILQ_NEXT(nc, child); |
pnode_print(p, pp); |
pnode_print(f, nc); |
pnode_unlinksub(pn); |
pnode_unlinksub(n); |
} |
} |
|
|
static void |
static void |
pnode_printfuncprototype(struct format *p, struct pnode *pn) |
pnode_printfuncprototype(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *pp, *fdef; |
struct pnode *nc, *fdef; |
|
|
TAILQ_FOREACH(fdef, &pn->childq, child) |
TAILQ_FOREACH(fdef, &n->childq, child) |
if (fdef->node == NODE_FUNCDEF) |
if (fdef->node == NODE_FUNCDEF) |
break; |
break; |
|
|
if (fdef != NULL) { |
if (fdef != NULL) { |
pnode_printfuncdef(p, fdef); |
pnode_printfuncdef(f, fdef); |
pnode_unlink(fdef); |
pnode_unlink(fdef); |
} else |
} else |
macro_line(p, "Fo UNKNOWN"); |
macro_line(f, "Fo UNKNOWN"); |
|
|
TAILQ_FOREACH(pp, &pn->childq, child) |
TAILQ_FOREACH(nc, &n->childq, child) |
macro_nodeline(p, "Fa", pp, ARG_SINGLE); |
macro_nodeline(f, "Fa", nc, ARG_SINGLE); |
|
|
macro_line(p, "Fc"); |
macro_line(f, "Fc"); |
pnode_unlinksub(pn); |
pnode_unlinksub(n); |
} |
} |
|
|
/* |
/* |
Line 371 pnode_printfuncprototype(struct format *p, struct pnod |
|
Line 405 pnode_printfuncprototype(struct format *p, struct pnod |
|
* ellipsis following an argument) and optionality. |
* ellipsis following an argument) and optionality. |
*/ |
*/ |
static void |
static void |
pnode_printarg(struct format *p, struct pnode *pn) |
pnode_printarg(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *pp; |
struct pnode *nc; |
struct pattr *ap; |
struct pattr *a; |
int isop, isrep; |
int isop, isrep, was_impl; |
|
|
isop = 1; |
isop = 1; |
isrep = 0; |
isrep = was_impl = 0; |
TAILQ_FOREACH(ap, &pn->attrq, child) { |
TAILQ_FOREACH(a, &n->attrq, child) { |
if (ap->key == ATTRKEY_CHOICE && |
if (a->key == ATTRKEY_CHOICE && |
(ap->val == ATTRVAL_PLAIN || ap->val == ATTRVAL_REQ)) |
(a->val == ATTRVAL_PLAIN || a->val == ATTRVAL_REQ)) |
isop = 0; |
isop = 0; |
else if (ap->key == ATTRKEY_REP && ap->val == ATTRVAL_REPEAT) |
else if (a->key == ATTRKEY_REP && a->val == ATTRVAL_REPEAT) |
isrep = 1; |
isrep = 1; |
} |
} |
if (isop) |
if (isop) { |
macro_open(p, "Op"); |
if (f->flags & FMT_IMPL) { |
|
was_impl = 1; |
|
macro_open(f, "Oo"); |
|
} else { |
|
macro_open(f, "Op"); |
|
f->flags |= FMT_IMPL; |
|
} |
|
} |
|
|
TAILQ_FOREACH(pp, &pn->childq, child) { |
TAILQ_FOREACH(nc, &n->childq, child) { |
if (pp->node == NODE_TEXT) |
if (nc->node == NODE_TEXT) |
macro_open(p, "Ar"); |
macro_open(f, "Ar"); |
pnode_print(p, pp); |
pnode_print(f, nc); |
if (isrep && pp->node == NODE_TEXT) |
if (isrep && nc->node == NODE_TEXT) |
macro_addarg(p, "...", ARG_SPACE); |
macro_addarg(f, "...", ARG_SPACE); |
} |
} |
pnode_unlinksub(pn); |
if (isop) { |
|
if (was_impl) |
|
macro_open(f, "Oc"); |
|
else |
|
f->flags &= ~FMT_IMPL; |
|
} |
|
pnode_unlinksub(n); |
} |
} |
|
|
static void |
static void |
pnode_printgroup(struct format *p, struct pnode *pn) |
pnode_printgroup(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *pp, *np; |
struct pnode *nc, *nn; |
struct pattr *ap; |
struct pattr *a; |
int isop, sv; |
int isop, sv; |
|
|
isop = 1; |
isop = 1; |
TAILQ_FOREACH(ap, &pn->attrq, child) |
TAILQ_FOREACH(a, &n->attrq, child) |
if (ap->key == ATTRKEY_CHOICE && |
if (a->key == ATTRKEY_CHOICE && |
(ap->val == ATTRVAL_PLAIN || ap->val == ATTRVAL_REQ)) { |
(a->val == ATTRVAL_PLAIN || a->val == ATTRVAL_REQ)) { |
isop = 0; |
isop = 0; |
break; |
break; |
} |
} |
Line 419 pnode_printgroup(struct format *p, struct pnode *pn) |
|
Line 466 pnode_printgroup(struct format *p, struct pnode *pn) |
|
* This will prevent pnode_print() for putting us on a |
* This will prevent pnode_print() for putting us on a |
* subsequent line. |
* subsequent line. |
*/ |
*/ |
sv = p->linestate == LINE_NEW; |
sv = f->linestate == LINE_NEW; |
if (isop) |
if (isop) |
macro_open(p, "Op"); |
macro_open(f, "Op"); |
else if (sv) |
else if (sv) |
macro_open(p, "No"); |
macro_open(f, "No"); |
|
f->flags |= FMT_IMPL; |
|
|
/* |
/* |
* Keep on printing text separated by the vertical bar as long |
* Keep on printing text separated by the vertical bar as long |
Line 433 pnode_printgroup(struct format *p, struct pnode *pn) |
|
Line 481 pnode_printgroup(struct format *p, struct pnode *pn) |
|
* FIXME: if there's a "Fl", we don't cut off the leading "-" |
* FIXME: if there's a "Fl", we don't cut off the leading "-" |
* like we do in pnode_print(). |
* like we do in pnode_print(). |
*/ |
*/ |
TAILQ_FOREACH(pp, &pn->childq, child) { |
TAILQ_FOREACH(nc, &n->childq, child) { |
pnode_print(p, pp); |
pnode_print(f, nc); |
np = TAILQ_NEXT(pp, child); |
nn = TAILQ_NEXT(nc, child); |
while (np != NULL) { |
while (nn != NULL) { |
if (pp->node != np->node) |
if (nc->node != nn->node) |
break; |
break; |
macro_addarg(p, "|", ARG_SPACE); |
macro_addarg(f, "|", ARG_SPACE); |
macro_addnode(p, np, ARG_SPACE); |
macro_addnode(f, nn, ARG_SPACE); |
pp = np; |
nc = nn; |
np = TAILQ_NEXT(np, child); |
nn = TAILQ_NEXT(nn, child); |
} |
} |
} |
} |
if (sv) |
if (sv) |
macro_close(p); |
macro_close(f); |
pnode_unlinksub(pn); |
f->flags &= ~FMT_IMPL; |
|
pnode_unlinksub(n); |
} |
} |
|
|
static void |
static void |
pnode_printauthor(struct format *f, struct pnode *n) |
pnode_printauthor(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *nc, *ncn; |
struct pnode *nc, *nn; |
int have_contrib, have_name; |
int have_contrib, have_name; |
|
|
/* |
/* |
Line 462 pnode_printauthor(struct format *f, struct pnode *n) |
|
Line 511 pnode_printauthor(struct format *f, struct pnode *n) |
|
*/ |
*/ |
|
|
have_contrib = have_name = 0; |
have_contrib = have_name = 0; |
TAILQ_FOREACH_SAFE(nc, &n->childq, child, ncn) { |
TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) { |
switch (nc->node) { |
switch (nc->node) { |
case NODE_CONTRIB: |
case NODE_CONTRIB: |
if (have_contrib) |
if (have_contrib) |
Line 491 pnode_printauthor(struct format *f, struct pnode *n) |
|
Line 540 pnode_printauthor(struct format *f, struct pnode *n) |
|
*/ |
*/ |
|
|
macro_open(f, "An"); |
macro_open(f, "An"); |
TAILQ_FOREACH_SAFE(nc, &n->childq, child, ncn) { |
TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) { |
if (nc->node == NODE_PERSONNAME || have_name == 0) { |
if (nc->node == NODE_PERSONNAME || have_name == 0) { |
macro_addnode(f, nc, ARG_SPACE); |
macro_addnode(f, nc, ARG_SPACE); |
pnode_unlink(nc); |
pnode_unlink(nc); |
Line 504 pnode_printauthor(struct format *f, struct pnode *n) |
|
Line 553 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; |
pnode_print(f, nc); |
pnode_print(f, nc); |
pnode_unlink(nc); |
pnode_unlink(nc); |
} |
} |
Line 523 pnode_printauthor(struct format *f, struct pnode *n) |
|
Line 573 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) |
|
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 556 pnode_printlink(struct format *f, struct pnode *n) |
|
Line 618 pnode_printlink(struct format *f, struct pnode *n) |
|
} |
} |
|
|
static void |
static void |
pnode_printprologue(struct format *p, struct ptree *tree) |
pnode_printprologue(struct format *f, struct ptree *tree) |
{ |
{ |
struct pnode *refmeta; |
struct pnode *refmeta; |
|
|
refmeta = tree->root == NULL ? NULL : |
refmeta = tree->root == NULL ? NULL : |
pnode_findfirst(tree->root, NODE_REFMETA); |
pnode_findfirst(tree->root, NODE_REFMETA); |
|
|
macro_line(p, "Dd $Mdocdate" "$"); |
macro_line(f, "Dd $Mdocdate" "$"); |
if (refmeta == NULL) { |
if (refmeta == NULL) { |
macro_open(p, "Dt"); |
macro_open(f, "Dt"); |
macro_addarg(p, |
macro_addarg(f, |
pnode_getattr_raw(tree->root, ATTRKEY_ID, "UNKNOWN"), |
pnode_getattr_raw(tree->root, ATTRKEY_ID, "UNKNOWN"), |
ARG_SPACE | ARG_SINGLE | ARG_UPPER); |
ARG_SPACE | ARG_SINGLE | ARG_UPPER); |
macro_addarg(p, "1", ARG_SPACE); |
macro_addarg(f, "1", ARG_SPACE); |
macro_close(p); |
macro_close(f); |
} else |
} else |
pnode_printrefmeta(p, refmeta); |
pnode_printrefmeta(f, refmeta); |
macro_line(p, "Os"); |
macro_line(f, "Os"); |
|
|
if (tree->flags & TREE_EQN) { |
if (tree->flags & TREE_EQN) { |
macro_line(p, "EQ"); |
macro_line(f, "EQ"); |
print_text(p, "delim $$", 0); |
print_text(f, "delim $$", 0); |
macro_line(p, "EN"); |
macro_line(f, "EN"); |
} |
} |
} |
} |
|
|
Line 587 pnode_printprologue(struct format *p, struct ptree *tr |
|
Line 649 pnode_printprologue(struct format *p, struct ptree *tr |
|
* we should comma-separate as list headers. |
* we should comma-separate as list headers. |
*/ |
*/ |
static void |
static void |
pnode_printvarlistentry(struct format *p, struct pnode *pn) |
pnode_printvarlistentry(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *pp; |
struct pnode *nc, *nn; |
int first = 1; |
int first = 1; |
|
|
macro_close(p); |
macro_open(f, "It"); |
macro_open(p, "It"); |
f->flags |= FMT_IMPL; |
TAILQ_FOREACH(pp, &pn->childq, child) { |
TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) { |
if (pp->node != NODE_TERM) |
if (nc->node != NODE_TERM && nc->node != NODE_GLOSSTERM) |
continue; |
continue; |
if ( ! first) |
if (first == 0) { |
macro_addarg(p, ",", 0); |
switch (f->linestate) { |
pnode_print(p, pp); |
case LINE_NEW: |
|
break; |
|
case LINE_TEXT: |
|
print_text(f, ",", 0); |
|
break; |
|
case LINE_MACRO: |
|
macro_addarg(f, ",", 0); |
|
break; |
|
} |
|
} |
|
pnode_print(f, nc); |
|
pnode_unlink(nc); |
first = 0; |
first = 0; |
} |
} |
macro_close(p); |
macro_close(f); |
TAILQ_FOREACH(pp, &pn->childq, child) |
while ((nc = TAILQ_FIRST(&n->childq)) != NULL) { |
if (pp->node != NODE_TERM) |
pnode_print(f, nc); |
pnode_print(p, pp); |
pnode_unlink(nc); |
pnode_unlinksub(pn); |
} |
|
macro_close(f); |
} |
} |
|
|
static void |
static void |
pnode_printtitle(struct format *p, struct pnode *pn) |
pnode_printtitle(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *pp, *pq; |
struct pnode *nc, *nn; |
|
|
TAILQ_FOREACH_SAFE(pp, &pn->childq, child, pq) { |
TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) { |
if (pp->node == NODE_TITLE) { |
if (nc->node == NODE_TITLE) { |
pnode_printpara(p, pp); |
pnode_printpara(f, nc); |
pnode_print(p, pp); |
pnode_print(f, nc); |
pnode_unlink(pp); |
pnode_unlink(nc); |
} |
} |
} |
} |
} |
} |
|
|
static void |
static void |
pnode_printrow(struct format *p, struct pnode *pn) |
pnode_printrow(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *pp; |
struct pnode *nc; |
|
|
macro_line(p, "Bl -dash -compact"); |
macro_line(f, "Bl -dash -compact"); |
TAILQ_FOREACH(pp, &pn->childq, child) { |
TAILQ_FOREACH(nc, &n->childq, child) { |
macro_line(p, "It"); |
macro_line(f, "It"); |
pnode_print(p, pp); |
pnode_print(f, nc); |
} |
} |
macro_line(p, "El"); |
macro_line(f, "El"); |
pnode_unlink(pn); |
pnode_unlink(n); |
} |
} |
|
|
static void |
static void |
Line 661 pnode_printtgroup2(struct format *f, struct pnode *n) |
|
Line 735 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"); |
|
f->flags |= FMT_IMPL; |
pnode_print(f, ne); |
pnode_print(f, ne); |
macro_close(f); |
macro_close(f); |
pnode_unlink(ne); |
pnode_unlink(ne); |
Line 699 pnode_printtgroup(struct format *f, struct pnode *n) |
|
Line 773 pnode_printtgroup(struct format *f, struct pnode *n) |
|
} |
} |
|
|
static void |
static void |
pnode_printlist(struct format *p, struct pnode *pn) |
pnode_printlist(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *pp; |
struct pnode *nc; |
|
|
pnode_printtitle(p, pn); |
pnode_printtitle(f, n); |
macro_argline(p, "Bl", |
macro_argline(f, "Bl", |
pn->node == NODE_ORDEREDLIST ? "-enum" : "-bullet"); |
n->node == NODE_ORDEREDLIST ? "-enum" : "-bullet"); |
TAILQ_FOREACH(pp, &pn->childq, child) { |
TAILQ_FOREACH(nc, &n->childq, child) { |
macro_line(p, "It"); |
macro_line(f, "It"); |
pnode_print(p, pp); |
pnode_print(f, nc); |
} |
} |
macro_line(p, "El"); |
macro_line(f, "El"); |
pnode_unlinksub(pn); |
pnode_unlinksub(n); |
} |
} |
|
|
static void |
static void |
pnode_printvariablelist(struct format *p, struct pnode *pn) |
pnode_printvariablelist(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *pp; |
struct pnode *nc; |
|
|
pnode_printtitle(p, pn); |
pnode_printtitle(f, n); |
macro_line(p, "Bl -tag -width Ds"); |
macro_line(f, "Bl -tag -width Ds"); |
TAILQ_FOREACH(pp, &pn->childq, child) { |
TAILQ_FOREACH(nc, &n->childq, child) { |
if (pp->node == NODE_VARLISTENTRY) |
if (nc->node == NODE_VARLISTENTRY) |
pnode_printvarlistentry(p, pp); |
pnode_printvarlistentry(f, nc); |
else |
else |
macro_nodeline(p, "It", pp, 0); |
macro_nodeline(f, "It", nc, 0); |
} |
} |
macro_line(p, "El"); |
macro_line(f, "El"); |
pnode_unlinksub(pn); |
pnode_unlinksub(n); |
} |
} |
|
|
/* |
/* |
Line 738 pnode_printvariablelist(struct format *p, struct pnode |
|
Line 812 pnode_printvariablelist(struct format *p, struct pnode |
|
* whatever), don't print inline macros. |
* whatever), don't print inline macros. |
*/ |
*/ |
static void |
static void |
pnode_print(struct format *p, struct pnode *pn) |
pnode_print(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *pp; |
struct pnode *nc, *nn; |
enum linestate sv; |
enum linestate sv; |
|
|
if (pn == NULL) |
if (n == NULL) |
return; |
return; |
|
|
p->spc = pn->spc; |
sv = f->linestate; |
sv = p->linestate; |
if (n->spc) |
|
f->flags &= ~FMT_NOSPC; |
|
else |
|
f->flags |= FMT_NOSPC; |
|
|
switch (pn->node) { |
switch (n->node) { |
case NODE_APPLICATION: |
case NODE_APPLICATION: |
macro_open(p, "Nm"); |
macro_open(f, "Nm"); |
break; |
break; |
case NODE_ARG: |
case NODE_ARG: |
pnode_printarg(p, pn); |
pnode_printarg(f, n); |
break; |
break; |
case NODE_AUTHOR: |
case NODE_AUTHOR: |
pnode_printauthor(p, pn); |
pnode_printauthor(f, n); |
break; |
break; |
case NODE_AUTHORGROUP: |
case NODE_AUTHORGROUP: |
macro_line(p, "An -split"); |
macro_line(f, "An -split"); |
break; |
break; |
|
case NODE_BLOCKQUOTE: |
|
macro_line(f, "Bd -ragged -offset indent"); |
|
break; |
case NODE_BOOKINFO: |
case NODE_BOOKINFO: |
macro_line(p, "Sh NAME"); |
macro_line(f, "Sh NAME"); |
break; |
break; |
case NODE_CITEREFENTRY: |
case NODE_CITEREFENTRY: |
pnode_printciterefentry(p, pn); |
pnode_printciterefentry(f, n); |
break; |
break; |
case NODE_CITETITLE: |
case NODE_CITETITLE: |
macro_open(p, "%T"); |
macro_open(f, "%T"); |
break; |
break; |
case NODE_COMMAND: |
case NODE_COMMAND: |
macro_open(p, "Nm"); |
macro_open(f, "Nm"); |
break; |
break; |
case NODE_CONSTANT: |
case NODE_CONSTANT: |
macro_open(p, "Dv"); |
macro_open(f, "Dv"); |
break; |
break; |
case NODE_EDITOR: |
case NODE_EDITOR: |
print_text(p, "editor:", ARG_SPACE); |
print_text(f, "editor:", ARG_SPACE); |
sv = LINE_TEXT; |
sv = LINE_TEXT; |
macro_open(p, "An"); |
macro_open(f, "An"); |
break; |
break; |
case NODE_EMAIL: |
case NODE_EMAIL: |
macro_open(p, "Aq Mt"); |
macro_open(f, "Aq Mt"); |
break; |
break; |
case NODE_EMPHASIS: |
case NODE_EMPHASIS: |
case NODE_FIRSTTERM: |
case NODE_FIRSTTERM: |
macro_open(p, "Em"); |
case NODE_GLOSSTERM: |
|
macro_open(f, "Em"); |
break; |
break; |
case NODE_ENVAR: |
case NODE_ENVAR: |
macro_open(p, "Ev"); |
macro_open(f, "Ev"); |
break; |
break; |
case NODE_ERRORNAME: |
case NODE_ERRORNAME: |
macro_open(p, "Er"); |
macro_open(f, "Er"); |
break; |
break; |
case NODE_FILENAME: |
case NODE_FILENAME: |
macro_open(p, "Pa"); |
macro_open(f, "Pa"); |
break; |
break; |
case NODE_FUNCTION: |
case NODE_FUNCTION: |
macro_open(p, "Fn"); |
macro_open(f, "Fn"); |
break; |
break; |
case NODE_FUNCPROTOTYPE: |
case NODE_FUNCPROTOTYPE: |
pnode_printfuncprototype(p, pn); |
pnode_printfuncprototype(f, n); |
break; |
break; |
case NODE_FUNCSYNOPSISINFO: |
case NODE_FUNCSYNOPSISINFO: |
macro_open(p, "Fd"); |
macro_open(f, "Fd"); |
break; |
break; |
case NODE_INFORMALEQUATION: |
case NODE_INFORMALEQUATION: |
macro_line(p, "EQ"); |
macro_line(f, "EQ"); |
break; |
break; |
case NODE_INLINEEQUATION: |
case NODE_INLINEEQUATION: |
if (p->linestate == LINE_NEW) |
if (f->linestate == LINE_NEW) |
p->linestate = LINE_TEXT; |
f->linestate = LINE_TEXT; |
putchar('$'); |
putchar('$'); |
break; |
break; |
case NODE_ITEMIZEDLIST: |
case NODE_ITEMIZEDLIST: |
pnode_printlist(p, pn); |
pnode_printlist(f, n); |
break; |
break; |
case NODE_GROUP: |
case NODE_GROUP: |
pnode_printgroup(p, pn); |
pnode_printgroup(f, n); |
break; |
break; |
case NODE_KEYSYM: |
case NODE_KEYSYM: |
macro_open(p, "Sy"); |
macro_open(f, "Sy"); |
break; |
break; |
case NODE_LEGALNOTICE: |
|
macro_line(p, "Sh LEGAL NOTICE"); |
|
break; |
|
case NODE_LINK: |
case NODE_LINK: |
pnode_printlink(p, pn); |
pnode_printlink(f, n); |
break; |
break; |
case NODE_LITERAL: |
case NODE_LITERAL: |
macro_open(p, "Ql"); |
macro_open(f, "Ql"); |
break; |
break; |
case NODE_LITERALLAYOUT: |
case NODE_LITERALLAYOUT: |
macro_close(p); |
macro_close(f); |
macro_argline(p, "Bd", pnode_getattr(pn, ATTRKEY_CLASS) == |
macro_argline(f, "Bd", pnode_getattr(n, ATTRKEY_CLASS) == |
ATTRVAL_MONOSPACED ? "-literal" : "-unfilled"); |
ATTRVAL_MONOSPACED ? "-literal" : "-unfilled"); |
break; |
break; |
|
case NODE_MARKUP: |
|
macro_open(f, "Ic"); |
|
break; |
case NODE_MML_MFENCED: |
case NODE_MML_MFENCED: |
pnode_printmathfenced(p, pn); |
pnode_printmathfenced(f, n); |
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: |
case NODE_MML_MO: |
case NODE_MML_MO: |
if (TAILQ_EMPTY(&pn->childq)) |
if (TAILQ_EMPTY(&n->childq)) |
break; |
break; |
fputs(" { ", stdout); |
fputs(" { ", stdout); |
break; |
break; |
case NODE_MML_MFRAC: |
case NODE_MML_MFRAC: |
case NODE_MML_MSUB: |
case NODE_MML_MSUB: |
case NODE_MML_MSUP: |
case NODE_MML_MSUP: |
pnode_printmath(p, pn); |
pnode_printmath(f, n); |
break; |
break; |
case NODE_OPTION: |
case NODE_OPTION: |
macro_open(p, "Fl"); |
macro_open(f, "Fl"); |
break; |
break; |
case NODE_ORDEREDLIST: |
case NODE_ORDEREDLIST: |
pnode_printlist(p, pn); |
pnode_printlist(f, n); |
break; |
break; |
case NODE_PARA: |
case NODE_PARA: |
pnode_printpara(p, pn); |
pnode_printpara(f, n); |
break; |
break; |
case NODE_PARAMDEF: |
case NODE_PARAMDEF: |
case NODE_PARAMETER: |
case NODE_PARAMETER: |
macro_nodeline(p, "Fa", pn, ARG_SINGLE); |
/* More often, these appear inside NODE_FUNCPROTOTYPE. */ |
pnode_unlinksub(pn); |
macro_open(f, "Fa"); |
|
macro_addnode(f, n, ARG_SPACE | ARG_SINGLE); |
|
pnode_unlinksub(n); |
break; |
break; |
case NODE_QUOTE: |
case NODE_QUOTE: |
macro_open(p, "Qo"); |
macro_open(f, "Qo"); |
break; |
break; |
case NODE_PROGRAMLISTING: |
case NODE_PROGRAMLISTING: |
case NODE_SCREEN: |
case NODE_SCREEN: |
case NODE_SYNOPSIS: |
case NODE_SYNOPSIS: |
macro_line(p, "Bd -literal"); |
macro_line(f, "Bd -literal"); |
break; |
break; |
case NODE_REFENTRYINFO: |
case NODE_REFENTRYINFO: |
/* Suppress. */ |
/* Suppress. */ |
pnode_unlinksub(pn); |
pnode_unlinksub(n); |
break; |
break; |
case NODE_REFNAME: |
case NODE_REFNAME: |
/* Suppress non-text children... */ |
/* Suppress non-text children... */ |
macro_open(p, "Nm"); |
macro_open(f, "Nm"); |
macro_addnode(p, pn, ARG_SPACE | ARG_SINGLE); |
macro_addnode(f, n, ARG_SPACE | ARG_SINGLE); |
pnode_unlinksub(pn); |
pnode_unlinksub(n); |
break; |
break; |
case NODE_REFNAMEDIV: |
case NODE_REFNAMEDIV: |
macro_line(p, "Sh NAME"); |
macro_line(f, "Sh NAME"); |
break; |
break; |
case NODE_REFPURPOSE: |
case NODE_REFPURPOSE: |
macro_open(p, "Nd"); |
macro_open(f, "Nd"); |
break; |
break; |
case NODE_REFSYNOPSISDIV: |
case NODE_REFSYNOPSISDIV: |
pnode_printrefsynopsisdiv(p, pn); |
pnode_printrefsynopsisdiv(f, n); |
break; |
break; |
case NODE_PREFACE: |
case NODE_PREFACE: |
case NODE_SECTION: |
case NODE_SECTION: |
|
case NODE_APPENDIX: |
|
case NODE_LEGALNOTICE: |
case NODE_NOTE: |
case NODE_NOTE: |
case NODE_TIP: |
case NODE_TIP: |
case NODE_CAUTION: |
case NODE_CAUTION: |
case NODE_WARNING: |
case NODE_WARNING: |
pnode_printrefsect(p, pn); |
pnode_printrefsect(f, n); |
break; |
break; |
case NODE_REPLACEABLE: |
case NODE_REPLACEABLE: |
macro_open(p, "Ar"); |
macro_open(f, "Ar"); |
break; |
break; |
case NODE_SBR: |
case NODE_SBR: |
macro_line(p, "br"); |
macro_line(f, "br"); |
break; |
break; |
case NODE_SGMLTAG: |
|
macro_open(p, "Ic"); |
|
break; |
|
case NODE_TEXT: |
case NODE_TEXT: |
case NODE_ESCAPE: |
case NODE_ESCAPE: |
pnode_printtext(p, pn); |
pnode_printtext(f, n); |
break; |
break; |
case NODE_TGROUP: |
case NODE_TGROUP: |
pnode_printtgroup(p, pn); |
pnode_printtgroup(f, n); |
break; |
break; |
case NODE_TITLE: |
case NODE_TITLE: |
if (pn->parent->node == NODE_BOOKINFO) { |
if (n->parent != NULL && |
macro_open(p, "Nd"); |
n->parent->node == NODE_BOOKINFO) { |
|
macro_open(f, "Nd"); |
break; |
break; |
} |
} |
pnode_printpara(p, pn); |
pnode_printpara(f, n); |
macro_nodeline(p, "Sy", pn, 0); |
macro_nodeline(f, "Sy", n, 0); |
pnode_unlinksub(pn); |
pnode_unlinksub(n); |
break; |
break; |
case NODE_TYPE: |
case NODE_TYPE: |
macro_open(p, "Vt"); |
macro_open(f, "Vt"); |
break; |
break; |
case NODE_VARIABLELIST: |
case NODE_VARIABLELIST: |
pnode_printvariablelist(p, pn); |
pnode_printvariablelist(f, n); |
break; |
break; |
case NODE_VARNAME: |
case NODE_VARNAME: |
macro_open(p, "Va"); |
macro_open(f, "Va"); |
break; |
break; |
default: |
default: |
break; |
break; |
} |
} |
|
|
TAILQ_FOREACH(pp, &pn->childq, child) |
TAILQ_FOREACH(nc, &n->childq, child) |
pnode_print(p, pp); |
pnode_print(f, nc); |
|
|
switch (pn->node) { |
switch (n->node) { |
|
case NODE_ESCAPE: |
|
case NODE_TERM: |
|
case NODE_TEXT: |
|
/* Accept more arguments to the previous macro. */ |
|
return; |
case NODE_INFORMALEQUATION: |
case NODE_INFORMALEQUATION: |
macro_line(p, "EN"); |
macro_line(f, "EN"); |
break; |
break; |
case NODE_INLINEEQUATION: |
case NODE_INLINEEQUATION: |
fputs("$ ", stdout); |
fputs("$ ", stdout); |
p->linestate = sv; |
f->linestate = sv; |
break; |
break; |
case NODE_MEMBER: |
case NODE_MEMBER: |
if ((pp = TAILQ_NEXT(pn, child)) != NULL && |
if ((nn = TAILQ_NEXT(n, child)) != NULL && |
pp->node != NODE_MEMBER) |
nn->node != NODE_MEMBER) |
pp = NULL; |
nn = NULL; |
switch (p->linestate) { |
switch (f->linestate) { |
case LINE_TEXT: |
case LINE_TEXT: |
if (pp != NULL) |
if (nn != NULL) |
print_text(p, ",", 0); |
print_text(f, ",", 0); |
break; |
break; |
case LINE_MACRO: |
case LINE_MACRO: |
if (pp != NULL) |
if (nn != NULL) |
macro_addarg(p, ",", ARG_SPACE); |
macro_addarg(f, ",", ARG_SPACE); |
macro_close(p); |
macro_close(f); |
break; |
break; |
case LINE_NEW: |
case LINE_NEW: |
break; |
break; |
Line 974 pnode_print(struct format *p, struct pnode *pn) |
|
Line 1062 pnode_print(struct format *p, struct pnode *pn) |
|
case NODE_MML_MI: |
case NODE_MML_MI: |
case NODE_MML_MN: |
case NODE_MML_MN: |
case NODE_MML_MO: |
case NODE_MML_MO: |
if (TAILQ_EMPTY(&pn->childq)) |
if (TAILQ_EMPTY(&n->childq)) |
break; |
break; |
fputs(" } ", stdout); |
fputs(" } ", stdout); |
break; |
break; |
case NODE_APPLICATION: |
|
case NODE_ARG: |
|
case NODE_AUTHOR: |
|
case NODE_CITEREFENTRY: |
|
case NODE_CITETITLE: |
|
case NODE_COMMAND: |
|
case NODE_CONSTANT: |
|
case NODE_EDITOR: |
|
case NODE_EMAIL: |
|
case NODE_EMPHASIS: |
|
case NODE_ENVAR: |
|
case NODE_ERRORNAME: |
|
case NODE_FILENAME: |
|
case NODE_FIRSTTERM: |
|
case NODE_FUNCTION: |
|
case NODE_FUNCSYNOPSISINFO: |
|
case NODE_KEYSYM: |
|
case NODE_LINK: |
|
case NODE_LITERAL: |
|
case NODE_OPTION: |
|
case NODE_PARAMETER: |
|
case NODE_REPLACEABLE: |
|
case NODE_REFPURPOSE: |
|
case NODE_SGMLTAG: |
|
case NODE_TYPE: |
|
case NODE_VARNAME: |
|
if (sv != LINE_MACRO && p->linestate == LINE_MACRO && |
|
(pn->parent == NULL || pn->parent->node != NODE_MEMBER)) |
|
macro_closepunct(p, pn); |
|
break; |
|
case NODE_QUOTE: |
case NODE_QUOTE: |
if (sv == LINE_NEW) |
if (sv == LINE_NEW) |
macro_close(p); |
macro_close(f); |
sv = p->linestate; |
sv = f->linestate; |
macro_open(p, "Qc"); |
macro_open(f, "Qc"); |
if (sv == LINE_NEW) |
if (sv == LINE_NEW) |
macro_close(p); |
macro_close(f); |
break; |
break; |
case NODE_REFNAME: |
case NODE_REFNAME: |
/* |
/* |
Line 1022 pnode_print(struct format *p, struct pnode *pn) |
|
Line 1080 pnode_print(struct format *p, struct pnode *pn) |
|
* <refname> macros in sequence, then print out a |
* <refname> macros in sequence, then print out a |
* trailing comma before the newline. |
* trailing comma before the newline. |
*/ |
*/ |
if (pn->parent != NULL && |
if (n->parent != NULL && |
pn->parent->node == NODE_REFNAMEDIV && |
n->parent->node == NODE_REFNAMEDIV && |
TAILQ_NEXT(pn, child) != NULL && |
TAILQ_NEXT(n, child) != NULL && |
TAILQ_NEXT(pn, child)->node == NODE_REFNAME) |
TAILQ_NEXT(n, child)->node == NODE_REFNAME) |
macro_addarg(p, ",", ARG_SPACE); |
macro_addarg(f, ",", ARG_SPACE); |
if (sv == LINE_NEW) |
if (sv == LINE_NEW) |
macro_close(p); |
macro_close(f); |
break; |
break; |
case NODE_PREFACE: |
case NODE_PREFACE: |
case NODE_SECTION: |
case NODE_SECTION: |
|
case NODE_APPENDIX: |
|
case NODE_LEGALNOTICE: |
case NODE_NOTE: |
case NODE_NOTE: |
case NODE_TIP: |
case NODE_TIP: |
case NODE_CAUTION: |
case NODE_CAUTION: |
case NODE_WARNING: |
case NODE_WARNING: |
p->level--; |
f->level--; |
break; |
break; |
|
case NODE_BLOCKQUOTE: |
case NODE_LITERALLAYOUT: |
case NODE_LITERALLAYOUT: |
case NODE_PROGRAMLISTING: |
case NODE_PROGRAMLISTING: |
case NODE_SCREEN: |
case NODE_SCREEN: |
case NODE_SYNOPSIS: |
case NODE_SYNOPSIS: |
macro_line(p, "Ed"); |
macro_line(f, "Ed"); |
break; |
break; |
case NODE_TITLE: |
case NODE_TITLE: |
if (pn->parent->node == NODE_BOOKINFO) |
if (n->parent != NULL && |
macro_line(p, "Sh AUTHORS"); |
n->parent->node == NODE_BOOKINFO) |
|
macro_line(f, "Sh AUTHORS"); |
break; |
break; |
default: |
default: |
break; |
break; |
} |
} |
|
f->flags &= ~FMT_ARG; |
} |
} |
|
|
void |
void |