version 1.124, 2019/04/14 20:13:25 |
version 1.144, 2019/05/01 11:34:19 |
|
|
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
|
|
|
#include "xmalloc.h" |
#include "node.h" |
#include "node.h" |
#include "macro.h" |
#include "macro.h" |
#include "format.h" |
#include "format.h" |
|
|
*/ |
*/ |
|
|
static void pnode_print(struct format *, struct pnode *); |
static void pnode_print(struct format *, struct pnode *); |
static void pnode_printrefentry(struct format *, struct pnode *); |
|
|
|
|
|
static void |
static void |
Line 42 pnode_printtext(struct format *f, struct pnode *n) |
|
Line 42 pnode_printtext(struct format *f, struct pnode *n) |
|
|
|
cp = n->b; |
cp = n->b; |
accept_arg = f->flags & FMT_ARG; |
accept_arg = f->flags & FMT_ARG; |
if (f->linestate == LINE_MACRO && !n->spc && !accept_arg) { |
if (f->linestate == LINE_MACRO && !accept_arg && |
|
(n->flags & NFLAG_SPC) == 0) { |
for (;;) { |
for (;;) { |
if (*cp == '\0') |
if (*cp == '\0') |
return; |
return; |
Line 71 pnode_printtext(struct format *f, struct pnode *n) |
|
Line 72 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->flags & NFLAG_SPC) == 0) { |
switch (pnode_class(nn->node)) { |
switch (pnode_class(nn->node)) { |
case CLASS_LINE: |
case CLASS_LINE: |
case CLASS_ENCL: |
case CLASS_ENCL: |
macro_open(f, "Pf"); |
macro_open(f, "Pf"); |
accept_arg = 1; |
accept_arg = 1; |
f->flags |= FMT_CHILD; |
f->flags |= FMT_CHILD; |
nn->spc = 1; |
nn->flags |= NFLAG_SPC; |
break; |
break; |
default: |
default: |
break; |
break; |
Line 89 pnode_printtext(struct format *f, struct pnode *n) |
|
Line 91 pnode_printtext(struct format *f, struct pnode *n) |
|
case LINE_NEW: |
case LINE_NEW: |
break; |
break; |
case LINE_TEXT: |
case LINE_TEXT: |
if (n->spc) { |
if (n->flags & NFLAG_SPC) { |
if (n->node == NODE_TEXT) |
if (n->flags & NFLAG_LINE && |
|
pnode_class(n->node) == CLASS_TEXT) |
macro_close(f); |
macro_close(f); |
else |
else |
putchar(' '); |
putchar(' '); |
} |
} |
break; |
break; |
case LINE_MACRO: |
case LINE_MACRO: |
if (accept_arg) |
if (accept_arg == 0) |
putchar(' '); |
|
else |
|
macro_close(f); |
macro_close(f); |
|
else if (n->flags & NFLAG_SPC || |
|
(f->flags & FMT_ARG) == 0 || |
|
(nn = TAILQ_PREV(n, pnodeq, child)) == NULL || |
|
pnode_class(nn->node) != CLASS_TEXT) |
|
putchar(' '); |
break; |
break; |
} |
} |
|
|
Line 126 pnode_printtext(struct format *f, struct pnode *n) |
|
Line 132 pnode_printtext(struct format *f, struct pnode *n) |
|
} |
} |
|
|
static void |
static void |
pnode_printpara(struct format *f, struct pnode *n) |
pnode_printimagedata(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *np; |
const char *cp; |
|
|
if (n->parent == NULL) |
if ((cp = pnode_getattr_raw(n, ATTRKEY_FILEREF, NULL)) == NULL) |
return; |
cp = pnode_getattr_raw(n, ATTRKEY_ENTITYREF, NULL); |
|
if (cp != NULL) { |
if ((np = TAILQ_PREV(n, pnodeq, child)) == NULL) |
print_text(f, "[image:", ARG_SPACE); |
np = n->parent; |
print_text(f, cp, ARG_SPACE); |
|
print_text(f, "]", 0); |
f->flags = 0; |
} else |
|
print_text(f, "[image]", ARG_SPACE); |
switch (np->node) { |
|
case NODE_ENTRY: |
|
case NODE_GLOSSTERM: |
|
case NODE_LISTITEM: |
|
case NODE_TERM: |
|
return; |
|
case NODE_APPENDIX: |
|
case NODE_LEGALNOTICE: |
|
case NODE_PREFACE: |
|
case NODE_SECTION: |
|
if (f->level < 3) |
|
return; |
|
break; |
|
default: |
|
break; |
|
} |
|
macro_line(f, "Pp"); |
|
} |
} |
|
|
static void |
static void |
Line 163 pnode_printrefnamediv(struct format *f, struct pnode * |
|
Line 152 pnode_printrefnamediv(struct format *f, struct pnode * |
|
struct pnode *nc, *nn; |
struct pnode *nc, *nn; |
int comma; |
int comma; |
|
|
|
f->parastate = PARA_HAVE; |
macro_line(f, "Sh NAME"); |
macro_line(f, "Sh NAME"); |
|
f->parastate = PARA_HAVE; |
comma = 0; |
comma = 0; |
TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) { |
TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) { |
if (nc->node != NODE_REFNAME) |
if (nc->node != NODE_REFNAME) |
Line 190 pnode_printrefsynopsisdiv(struct format *f, struct pno |
|
Line 181 pnode_printrefsynopsisdiv(struct format *f, struct pno |
|
if (nc->node == NODE_TITLE) |
if (nc->node == NODE_TITLE) |
pnode_unlink(nc); |
pnode_unlink(nc); |
|
|
|
f->parastate = PARA_HAVE; |
macro_line(f, "Sh SYNOPSIS"); |
macro_line(f, "Sh SYNOPSIS"); |
|
f->parastate = PARA_HAVE; |
} |
} |
|
|
/* |
/* |
|
|
pnode_printsection(struct format *f, struct pnode *n) |
pnode_printsection(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *nc, *ncc; |
struct pnode *nc, *ncc; |
const char *title; |
|
int flags, level; |
int flags, level; |
|
|
if (n->parent == NULL) { |
if (n->parent == NULL) |
pnode_printrefentry(f, n); |
|
return; |
return; |
} |
|
|
|
level = ++f->level; |
level = ++f->level; |
flags = ARG_SPACE; |
flags = ARG_SPACE; |
switch (n->node) { |
switch (n->node) { |
case NODE_PREFACE: |
|
case NODE_SECTION: |
case NODE_SECTION: |
case NODE_APPENDIX: |
case NODE_APPENDIX: |
if (level == 1) |
if (level == 1) |
flags |= ARG_UPPER; |
flags |= ARG_UPPER; |
break; |
break; |
case NODE_SIMPLESECT: |
case NODE_SIMPLESECT: |
case NODE_LEGALNOTICE: |
|
if (level < 2) |
if (level < 2) |
level = 2; |
level = 2; |
break; |
break; |
default: |
case NODE_NOTE: |
if (level < 3) |
if (level < 3) |
level = 3; |
level = 3; |
break; |
break; |
|
default: |
|
abort(); |
} |
} |
|
|
TAILQ_FOREACH(nc, &n->childq, child) |
TAILQ_FOREACH(nc, &n->childq, child) |
if (nc->node == NODE_TITLE) |
if (nc->node == NODE_TITLE) |
break; |
break; |
|
|
if (nc == NULL) { |
|
switch (n->node) { |
|
case NODE_PREFACE: |
|
title = "Preface"; |
|
break; |
|
case NODE_APPENDIX: |
|
title = "Appendix"; |
|
break; |
|
case NODE_LEGALNOTICE: |
|
title = "Legal Notice"; |
|
break; |
|
case NODE_CAUTION: |
|
title = "Caution"; |
|
break; |
|
case NODE_NOTE: |
|
title = "Note"; |
|
break; |
|
case NODE_TIP: |
|
title = "Tip"; |
|
break; |
|
case NODE_WARNING: |
|
title = "Warning"; |
|
break; |
|
default: |
|
title = "Unknown"; |
|
break; |
|
} |
|
} |
|
|
|
switch (level) { |
switch (level) { |
case 1: |
case 1: |
macro_close(f); |
macro_close(f); |
|
f->parastate = PARA_HAVE; |
macro_open(f, "Sh"); |
macro_open(f, "Sh"); |
break; |
break; |
case 2: |
case 2: |
macro_close(f); |
macro_close(f); |
|
f->parastate = PARA_HAVE; |
macro_open(f, "Ss"); |
macro_open(f, "Ss"); |
break; |
break; |
default: |
default: |
pnode_printpara(f, n); |
if (f->parastate == PARA_MID) |
|
f->parastate = PARA_WANT; |
macro_open(f, "Sy"); |
macro_open(f, "Sy"); |
break; |
break; |
} |
} |
|
macro_addnode(f, nc, flags); |
if (nc != NULL) |
|
macro_addnode(f, nc, flags); |
|
else |
|
macro_addarg(f, title, flags | ARG_QUOTED); |
|
macro_close(f); |
macro_close(f); |
|
|
/* |
/* |
Line 288 pnode_printsection(struct format *f, struct pnode *n) |
|
Line 248 pnode_printsection(struct format *f, struct pnode *n) |
|
*/ |
*/ |
|
|
if (nc != NULL) { |
if (nc != NULL) { |
ncc = TAILQ_FIRST(&nc->childq); |
if (level == 1 && |
if (ncc != NULL && ncc->node == NODE_TEXT && |
(ncc = TAILQ_FIRST(&nc->childq)) != NULL && |
|
ncc->node == NODE_TEXT && |
strcasecmp(ncc->b, "AUTHORS") == 0) |
strcasecmp(ncc->b, "AUTHORS") == 0) |
macro_line(f, "An -nosplit"); |
macro_line(f, "An -nosplit"); |
pnode_unlink(nc); |
pnode_unlink(nc); |
} |
} |
|
f->parastate = level > 2 ? PARA_WANT : PARA_HAVE; |
} |
} |
|
|
/* |
/* |
Line 323 pnode_printciterefentry(struct format *f, struct pnode |
|
Line 285 pnode_printciterefentry(struct format *f, struct pnode |
|
pnode_unlinksub(n); |
pnode_unlinksub(n); |
} |
} |
|
|
static void |
|
pnode_printfuncdef(struct format *f, struct pnode *n) |
|
{ |
|
struct pnode *nc; |
|
|
|
nc = TAILQ_FIRST(&n->childq); |
|
if (nc != NULL && nc->node == NODE_TEXT) { |
|
macro_argline(f, "Ft", nc->b); |
|
pnode_unlink(nc); |
|
} |
|
macro_nodeline(f, "Fo", n, ARG_SINGLE); |
|
pnode_unlinksub(n); |
|
} |
|
|
|
/* |
/* |
* The <mml:mfenced> node is a little peculiar. |
* The <mml:mfenced> node is a little peculiar. |
* First, it can have arbitrary open and closing tokens, which default |
* First, it can have arbitrary open and closing tokens, which default |
Line 397 pnode_printmath(struct format *f, struct pnode *n) |
|
Line 345 pnode_printmath(struct format *f, struct pnode *n) |
|
static void |
static void |
pnode_printfuncprototype(struct format *f, struct pnode *n) |
pnode_printfuncprototype(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *nc, *fdef; |
struct pnode *fdef, *ftype, *nc, *nn; |
|
|
TAILQ_FOREACH(fdef, &n->childq, child) |
/* |
if (fdef->node == NODE_FUNCDEF) |
* Extract <funcdef> child and ignore <void> child. |
|
* Leave other children in place, to be treated as parameters. |
|
*/ |
|
|
|
fdef = NULL; |
|
TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) { |
|
switch (nc->node) { |
|
case NODE_FUNCDEF: |
|
if (fdef == NULL) { |
|
fdef = nc; |
|
TAILQ_REMOVE(&n->childq, nc, child); |
|
nc->parent = NULL; |
|
} |
break; |
break; |
|
case NODE_VOID: |
|
pnode_unlink(nc); |
|
break; |
|
default: |
|
break; |
|
} |
|
} |
|
|
|
/* |
|
* If no children are left, the function is void; use .Fn. |
|
* Otherwise, use .Fo. |
|
*/ |
|
|
|
nc = TAILQ_FIRST(&n->childq); |
if (fdef != NULL) { |
if (fdef != NULL) { |
pnode_printfuncdef(f, fdef); |
ftype = TAILQ_FIRST(&fdef->childq); |
|
if (ftype != NULL && ftype->node == NODE_TEXT) { |
|
macro_argline(f, "Ft", ftype->b); |
|
pnode_unlink(ftype); |
|
} |
|
if (nc == NULL) { |
|
macro_open(f, "Fn"); |
|
macro_addnode(f, fdef, ARG_SPACE | ARG_SINGLE); |
|
macro_addarg(f, "void", ARG_SPACE); |
|
macro_close(f); |
|
} else |
|
macro_nodeline(f, "Fo", fdef, ARG_SINGLE); |
pnode_unlink(fdef); |
pnode_unlink(fdef); |
} else |
} else if (nc == NULL) |
|
macro_line(f, "Fn UNKNOWN void"); |
|
else |
macro_line(f, "Fo UNKNOWN"); |
macro_line(f, "Fo UNKNOWN"); |
|
|
TAILQ_FOREACH(nc, &n->childq, child) |
if (nc == NULL) |
macro_nodeline(f, "Fa", nc, ARG_SINGLE); |
return; |
|
|
|
while (nc != NULL) { |
|
macro_nodeline(f, "Fa", nc, ARG_SINGLE); |
|
pnode_unlink(nc); |
|
nc = TAILQ_FIRST(&n->childq); |
|
} |
macro_line(f, "Fc"); |
macro_line(f, "Fc"); |
pnode_unlinksub(n); |
|
} |
} |
|
|
/* |
/* |
Line 609 pnode_printauthor(struct format *f, struct pnode *n) |
|
Line 599 pnode_printauthor(struct format *f, struct pnode *n) |
|
} |
} |
|
|
static void |
static void |
|
pnode_printxref(struct format *f, struct pnode *n) |
|
{ |
|
const char *linkend; |
|
|
|
linkend = pnode_getattr_raw(n, ATTRKEY_LINKEND, NULL); |
|
if (linkend != NULL) { |
|
macro_open(f, "Sx"); |
|
macro_addarg(f, linkend, ARG_SPACE); |
|
} |
|
} |
|
|
|
static void |
pnode_printlink(struct format *f, struct pnode *n) |
pnode_printlink(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *nc; |
struct pnode *nc; |
Line 651 pnode_printlink(struct format *f, struct pnode *n) |
|
Line 653 pnode_printlink(struct format *f, struct pnode *n) |
|
if (TAILQ_FIRST(&n->childq) != NULL) |
if (TAILQ_FIRST(&n->childq) != NULL) |
macro_addnode(f, n, ARG_SPACE | ARG_SINGLE); |
macro_addnode(f, n, ARG_SPACE | ARG_SINGLE); |
pnode_unlinksub(n); |
pnode_unlinksub(n); |
return; |
|
} |
} |
} |
} |
|
|
static void |
static void |
pnode_printprologue(struct format *f, struct pnode *root) |
pnode_printolink(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *date, *refmeta, *name, *vol, *descr, *nc, *nn; |
const char *uri, *ptr, *local; |
const char *sname; |
|
|
|
/* Collect information. */ |
uri = pnode_getattr_raw(n, ATTRKEY_TARGETDOC, NULL); |
|
ptr = pnode_getattr_raw(n, ATTRKEY_TARGETPTR, NULL); |
|
local = pnode_getattr_raw(n, ATTRKEY_LOCALINFO, NULL); |
|
if (uri == NULL) { |
|
uri = ptr; |
|
ptr = NULL; |
|
} |
|
if (uri == NULL) { |
|
uri = local; |
|
local = NULL; |
|
} |
|
if (uri == NULL) |
|
return; |
|
|
if ((date = pnode_takefirst(root, NODE_PUBDATE)) == NULL) |
macro_open(f, "Lk"); |
date = pnode_takefirst(root, NODE_DATE); |
macro_addarg(f, uri, ARG_SPACE | ARG_SINGLE); |
|
macro_addnode(f, n, ARG_SPACE | ARG_SINGLE); |
name = vol = NULL; |
if (ptr != NULL || local != NULL) { |
if ((refmeta = pnode_findfirst(root, NODE_REFMETA)) != NULL) { |
macro_close(f); |
TAILQ_FOREACH_SAFE(nc, &refmeta->childq, child, nn) { |
macro_open(f, "Pq"); |
switch (nc->node) { |
if (ptr != NULL) |
case NODE_REFENTRYTITLE: |
macro_addarg(f, ptr, ARG_SPACE); |
name = nc; |
if (local != NULL) |
break; |
macro_addarg(f, local, ARG_SPACE); |
case NODE_MANVOLNUM: |
|
vol = nc; |
|
break; |
|
default: |
|
continue; |
|
} |
|
TAILQ_REMOVE(&refmeta->childq, nc, child); |
|
} |
|
} |
} |
|
pnode_unlinksub(n); |
|
} |
|
|
if (pnode_findfirst(root, NODE_REFNAMEDIV) == NULL && |
static void |
((nc = pnode_findfirst(root, NODE_BOOKINFO)) != NULL || |
pnode_printprologue(struct format *f, struct pnode *root) |
(nc = pnode_findfirst(root, NODE_REFENTRYINFO)) != NULL)) |
{ |
descr = pnode_takefirst(nc, NODE_TITLE); |
struct pnode *name, *nc; |
else |
|
descr = NULL; |
|
|
|
/* Print prologue. */ |
nc = TAILQ_FIRST(&root->childq); |
|
assert(nc->node == NODE_DATE); |
|
macro_nodeline(f, "Dd", nc, 0); |
|
pnode_unlink(nc); |
|
|
if (date == NULL) |
|
macro_line(f, "Dd $Mdocdate" "$"); |
|
else |
|
macro_nodeline(f, "Dd", date, 0); |
|
|
|
macro_open(f, "Dt"); |
macro_open(f, "Dt"); |
if (name == NULL) { |
name = TAILQ_FIRST(&root->childq); |
sname = pnode_getattr_raw(root, ATTRKEY_ID, "UNKNOWN"); |
assert(name->node == NODE_REFENTRYTITLE); |
macro_addarg(f, sname, ARG_SPACE | ARG_SINGLE | ARG_UPPER); |
macro_addnode(f, name, ARG_SPACE | ARG_SINGLE | ARG_UPPER); |
} else |
TAILQ_REMOVE(&root->childq, name, child); |
macro_addnode(f, name, ARG_SPACE | ARG_SINGLE | ARG_UPPER); |
name->parent = NULL; |
if (vol == NULL) |
nc = TAILQ_FIRST(&root->childq); |
macro_addarg(f, "1", ARG_SPACE); |
assert (nc->node == NODE_MANVOLNUM); |
else |
macro_addnode(f, nc, ARG_SPACE | ARG_SINGLE); |
macro_addnode(f, vol, ARG_SPACE | ARG_SINGLE); |
pnode_unlink(nc); |
|
|
macro_line(f, "Os"); |
macro_line(f, "Os"); |
|
|
if (descr != NULL) { |
nc = TAILQ_FIRST(&root->childq); |
|
if (nc != NULL && nc->node == NODE_TITLE) { |
macro_line(f, "Sh NAME"); |
macro_line(f, "Sh NAME"); |
if (name == NULL) |
macro_nodeline(f, "Nm", name, ARG_SINGLE); |
macro_argline(f, "Nm", sname); |
macro_nodeline(f, "Nd", nc, 0); |
else |
pnode_unlink(nc); |
macro_nodeline(f, "Nm", name, ARG_SINGLE); |
|
macro_nodeline(f, "Nd", descr, 0); |
|
} |
} |
|
|
/* Clean up. */ |
|
|
|
pnode_unlink(date); |
|
pnode_unlink(name); |
pnode_unlink(name); |
pnode_unlink(vol); |
f->parastate = PARA_HAVE; |
pnode_unlink(descr); |
|
} |
} |
|
|
static void |
|
pnode_printrefentry(struct format *f, struct pnode *n) |
|
{ |
|
struct pnode *info, *meta, *nc, *title; |
|
struct pnode *match, *later; |
|
|
|
/* Collect nodes that remained behind when writing the prologue. */ |
|
|
|
meta = NULL; |
|
info = pnode_takefirst(n, NODE_BOOKINFO); |
|
if (info != NULL && TAILQ_FIRST(&info->childq) == NULL) { |
|
pnode_unlink(info); |
|
info = NULL; |
|
} |
|
if (info == NULL) { |
|
info = pnode_takefirst(n, NODE_REFENTRYINFO); |
|
if (info != NULL && TAILQ_FIRST(&info->childq) == NULL) { |
|
pnode_unlink(info); |
|
info = NULL; |
|
} |
|
meta = pnode_takefirst(n, NODE_REFMETA); |
|
if (meta != NULL && TAILQ_FIRST(&meta->childq) == NULL) { |
|
pnode_unlink(meta); |
|
meta = NULL; |
|
} |
|
} |
|
if (info == NULL && meta == NULL) |
|
return; |
|
|
|
/* |
|
* Find the best place to put this information. |
|
* Use the last existing AUTHORS node, if any. |
|
* Otherwise, put it behind all standard sections that |
|
* conventionally precede AUTHORS, and also behind any |
|
* non-standard sections that follow the last of these, |
|
* but before the next standard section. |
|
*/ |
|
|
|
match = later = NULL; |
|
TAILQ_FOREACH(nc, &n->childq, child) { |
|
switch (nc->node) { |
|
case NODE_REFENTRY: |
|
case NODE_REFNAMEDIV: |
|
case NODE_REFSYNOPSISDIV: |
|
case NODE_PREFACE: |
|
later = NULL; |
|
continue; |
|
case NODE_APPENDIX: |
|
case NODE_INDEX: |
|
if (later == NULL) |
|
later = nc; |
|
continue; |
|
default: |
|
break; |
|
} |
|
if ((title = pnode_findfirst(nc, NODE_TITLE)) == NULL || |
|
(title = TAILQ_FIRST(&title->childq)) == NULL || |
|
title->node != NODE_TEXT) |
|
continue; |
|
if (strcasecmp(title->b, "AUTHORS") == 0 || |
|
strcasecmp(title->b, "AUTHOR") == 0) |
|
match = nc; |
|
else if (strcasecmp(title->b, "NAME") == 0 || |
|
strcasecmp(title->b, "SYNOPSIS") == 0 || |
|
strcasecmp(title->b, "DESCRIPTION") == 0 || |
|
strcasecmp(title->b, "RETURN VALUES") == 0 || |
|
strcasecmp(title->b, "ENVIRONMENT") == 0 || |
|
strcasecmp(title->b, "FILES") == 0 || |
|
strcasecmp(title->b, "EXIT STATUS") == 0 || |
|
strcasecmp(title->b, "EXAMPLES") == 0 || |
|
strcasecmp(title->b, "DIAGNOSTICS") == 0 || |
|
strcasecmp(title->b, "ERRORS") == 0 || |
|
strcasecmp(title->b, "SEE ALSO") == 0 || |
|
strcasecmp(title->b, "STANDARDS") == 0 || |
|
strcasecmp(title->b, "HISTORY") == 0) |
|
later = NULL; |
|
else if ((strcasecmp(title->b, "CAVEATS") == 0 || |
|
strcasecmp(title->b, "BUGS") == 0) && |
|
later == NULL) |
|
later = nc; |
|
} |
|
|
|
/* |
|
* If no AUTHORS section was found, create one from scratch, |
|
* and insert that at the place selected earlier. |
|
*/ |
|
|
|
if (match == NULL) { |
|
if ((match = calloc(1, sizeof(*match))) == NULL) { |
|
perror(NULL); |
|
exit(1); |
|
} |
|
match->node = NODE_SECTION; |
|
match->spc = 1; |
|
match->parent = n; |
|
TAILQ_INIT(&match->childq); |
|
TAILQ_INIT(&match->attrq); |
|
if ((nc = pnode_alloc(match)) == NULL) { |
|
perror(NULL); |
|
exit(1); |
|
} |
|
nc->node = NODE_TITLE; |
|
nc->spc = 1; |
|
if ((nc = pnode_alloc(nc)) == NULL) { |
|
perror(NULL); |
|
exit(1); |
|
} |
|
nc->node = NODE_TEXT; |
|
if ((nc->b = strdup("AUTHORS")) == NULL) { |
|
perror(NULL); |
|
exit(1); |
|
} |
|
nc->spc = 1; |
|
if (later == NULL) |
|
TAILQ_INSERT_TAIL(&n->childq, match, child); |
|
else |
|
TAILQ_INSERT_BEFORE(later, match, child); |
|
} |
|
|
|
/* |
|
* Dump the stuff excised at the beginning |
|
* into this AUTHORS section. |
|
*/ |
|
|
|
if (info != NULL) |
|
TAILQ_INSERT_TAIL(&match->childq, info, child); |
|
if (meta != NULL) |
|
TAILQ_INSERT_TAIL(&match->childq, meta, child); |
|
} |
|
|
|
/* |
/* |
* We can have multiple <term> elements within a <varlistentry>, which |
* We can have multiple <term> elements within a <varlistentry>, which |
* we should comma-separate as list headers. |
* we should comma-separate as list headers. |
Line 864 pnode_printrefentry(struct format *f, struct pnode *n) |
|
Line 730 pnode_printrefentry(struct format *f, struct pnode *n) |
|
static void |
static void |
pnode_printvarlistentry(struct format *f, struct pnode *n) |
pnode_printvarlistentry(struct format *f, struct pnode *n) |
{ |
{ |
struct pnode *nc, *nn; |
struct pnode *nc, *nn, *ncc; |
int first = 1; |
int comma; |
|
|
macro_open(f, "It"); |
macro_open(f, "It"); |
|
f->parastate = PARA_HAVE; |
f->flags |= FMT_IMPL; |
f->flags |= FMT_IMPL; |
|
comma = -1; |
TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) { |
TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) { |
if (nc->node != NODE_TERM && nc->node != NODE_GLOSSTERM) |
if (nc->node != NODE_TERM && nc->node != NODE_GLOSSTERM) |
continue; |
continue; |
if (first == 0) { |
if (comma != -1) { |
switch (f->linestate) { |
switch (f->linestate) { |
case LINE_NEW: |
case LINE_NEW: |
break; |
break; |
Line 880 pnode_printvarlistentry(struct format *f, struct pnode |
|
Line 748 pnode_printvarlistentry(struct format *f, struct pnode |
|
print_text(f, ",", 0); |
print_text(f, ",", 0); |
break; |
break; |
case LINE_MACRO: |
case LINE_MACRO: |
macro_addarg(f, ",", 0); |
macro_addarg(f, ",", comma); |
break; |
break; |
} |
} |
} |
} |
|
f->parastate = PARA_HAVE; |
|
comma = (ncc = TAILQ_FIRST(&nc->childq)) == NULL || |
|
pnode_class(ncc->node) == CLASS_TEXT ? 0 : ARG_SPACE; |
pnode_print(f, nc); |
pnode_print(f, nc); |
pnode_unlink(nc); |
pnode_unlink(nc); |
first = 0; |
|
} |
} |
macro_close(f); |
macro_close(f); |
|
f->parastate = PARA_HAVE; |
while ((nc = TAILQ_FIRST(&n->childq)) != NULL) { |
while ((nc = TAILQ_FIRST(&n->childq)) != NULL) { |
pnode_print(f, nc); |
pnode_print(f, nc); |
pnode_unlink(nc); |
pnode_unlink(nc); |
} |
} |
macro_close(f); |
macro_close(f); |
|
f->parastate = PARA_HAVE; |
} |
} |
|
|
static void |
static void |
Line 903 pnode_printtitle(struct format *f, struct pnode *n) |
|
Line 775 pnode_printtitle(struct format *f, struct pnode *n) |
|
|
|
TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) { |
TAILQ_FOREACH_SAFE(nc, &n->childq, child, nn) { |
if (nc->node == NODE_TITLE) { |
if (nc->node == NODE_TITLE) { |
pnode_printpara(f, nc); |
if (f->parastate == PARA_MID) |
pnode_print(f, nc); |
f->parastate = PARA_WANT; |
|
macro_nodeline(f, "Sy", nc, 0); |
pnode_unlink(nc); |
pnode_unlink(nc); |
} |
} |
} |
} |
Line 932 pnode_printtgroup1(struct format *f, struct pnode *n) |
|
Line 805 pnode_printtgroup1(struct format *f, struct pnode *n) |
|
macro_line(f, "Bl -bullet -compact"); |
macro_line(f, "Bl -bullet -compact"); |
while ((nc = pnode_findfirst(n, NODE_ENTRY)) != NULL) { |
while ((nc = pnode_findfirst(n, NODE_ENTRY)) != NULL) { |
macro_line(f, "It"); |
macro_line(f, "It"); |
|
f->parastate = PARA_HAVE; |
pnode_print(f, nc); |
pnode_print(f, nc); |
|
f->parastate = PARA_HAVE; |
pnode_unlink(nc); |
pnode_unlink(nc); |
} |
} |
macro_line(f, "El"); |
macro_line(f, "El"); |
Line 944 pnode_printtgroup2(struct format *f, struct pnode *n) |
|
Line 819 pnode_printtgroup2(struct format *f, struct pnode *n) |
|
{ |
{ |
struct pnode *nr, *ne; |
struct pnode *nr, *ne; |
|
|
|
f->parastate = PARA_HAVE; |
macro_line(f, "Bl -tag -width Ds"); |
macro_line(f, "Bl -tag -width Ds"); |
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_open(f, "It"); |
macro_open(f, "It"); |
f->flags |= FMT_IMPL; |
f->flags |= FMT_IMPL; |
|
f->parastate = PARA_HAVE; |
pnode_print(f, ne); |
pnode_print(f, ne); |
macro_close(f); |
macro_close(f); |
pnode_unlink(ne); |
pnode_unlink(ne); |
|
f->parastate = PARA_HAVE; |
pnode_print(f, nr); |
pnode_print(f, nr); |
|
f->parastate = PARA_HAVE; |
pnode_unlink(nr); |
pnode_unlink(nr); |
} |
} |
macro_line(f, "El"); |
macro_line(f, "El"); |
|
f->parastate = PARA_WANT; |
pnode_unlinksub(n); |
pnode_unlinksub(n); |
} |
} |
|
|
Line 976 pnode_printtgroup(struct format *f, struct pnode *n) |
|
Line 856 pnode_printtgroup(struct format *f, struct pnode *n) |
|
break; |
break; |
} |
} |
|
|
|
f->parastate = PARA_HAVE; |
macro_line(f, "Bl -ohang"); |
macro_line(f, "Bl -ohang"); |
while ((nc = pnode_findfirst(n, NODE_ROW)) != NULL) { |
while ((nc = pnode_findfirst(n, NODE_ROW)) != NULL) { |
macro_line(f, "It Table Row"); |
macro_line(f, "It Table Row"); |
pnode_printrow(f, nc); |
pnode_printrow(f, nc); |
} |
} |
macro_line(f, "El"); |
macro_line(f, "El"); |
|
f->parastate = PARA_WANT; |
pnode_unlinksub(n); |
pnode_unlinksub(n); |
} |
} |
|
|
Line 991 pnode_printlist(struct format *f, struct pnode *n) |
|
Line 873 pnode_printlist(struct format *f, struct pnode *n) |
|
struct pnode *nc; |
struct pnode *nc; |
|
|
pnode_printtitle(f, n); |
pnode_printtitle(f, n); |
|
f->parastate = PARA_HAVE; |
macro_argline(f, "Bl", |
macro_argline(f, "Bl", |
n->node == NODE_ORDEREDLIST ? "-enum" : "-bullet"); |
n->node == NODE_ORDEREDLIST ? "-enum" : "-bullet"); |
TAILQ_FOREACH(nc, &n->childq, child) { |
TAILQ_FOREACH(nc, &n->childq, child) { |
macro_line(f, "It"); |
macro_line(f, "It"); |
|
f->parastate = PARA_HAVE; |
pnode_print(f, nc); |
pnode_print(f, nc); |
|
f->parastate = PARA_HAVE; |
} |
} |
macro_line(f, "El"); |
macro_line(f, "El"); |
|
f->parastate = PARA_WANT; |
pnode_unlinksub(n); |
pnode_unlinksub(n); |
} |
} |
|
|
Line 1007 pnode_printvariablelist(struct format *f, struct pnode |
|
Line 893 pnode_printvariablelist(struct format *f, struct pnode |
|
struct pnode *nc; |
struct pnode *nc; |
|
|
pnode_printtitle(f, n); |
pnode_printtitle(f, n); |
|
f->parastate = PARA_HAVE; |
macro_line(f, "Bl -tag -width Ds"); |
macro_line(f, "Bl -tag -width Ds"); |
TAILQ_FOREACH(nc, &n->childq, child) { |
TAILQ_FOREACH(nc, &n->childq, child) { |
if (nc->node == NODE_VARLISTENTRY) |
if (nc->node == NODE_VARLISTENTRY) |
Line 1015 pnode_printvariablelist(struct format *f, struct pnode |
|
Line 902 pnode_printvariablelist(struct format *f, struct pnode |
|
macro_nodeline(f, "It", nc, 0); |
macro_nodeline(f, "It", nc, 0); |
} |
} |
macro_line(f, "El"); |
macro_line(f, "El"); |
|
f->parastate = PARA_WANT; |
pnode_unlinksub(n); |
pnode_unlinksub(n); |
} |
} |
|
|
Line 1034 pnode_print(struct format *f, struct pnode *n) |
|
Line 922 pnode_print(struct format *f, struct pnode *n) |
|
return; |
return; |
|
|
was_impl = f->flags & FMT_IMPL; |
was_impl = f->flags & FMT_IMPL; |
if (n->spc) |
if (n->flags & NFLAG_SPC) |
f->flags &= ~FMT_NOSPC; |
f->flags &= ~FMT_NOSPC; |
else |
else |
f->flags |= FMT_NOSPC; |
f->flags |= FMT_NOSPC; |
Line 1050 pnode_print(struct format *f, struct pnode *n) |
|
Line 938 pnode_print(struct format *f, struct pnode *n) |
|
macro_line(f, "An -split"); |
macro_line(f, "An -split"); |
break; |
break; |
case NODE_BLOCKQUOTE: |
case NODE_BLOCKQUOTE: |
|
f->parastate = PARA_HAVE; |
macro_line(f, "Bd -ragged -offset indent"); |
macro_line(f, "Bd -ragged -offset indent"); |
|
f->parastate = PARA_HAVE; |
break; |
break; |
case NODE_CITEREFENTRY: |
case NODE_CITEREFENTRY: |
pnode_printciterefentry(f, n); |
pnode_printciterefentry(f, n); |
Line 1086 pnode_print(struct format *f, struct pnode *n) |
|
Line 976 pnode_print(struct format *f, struct pnode *n) |
|
if ((nc = TAILQ_FIRST(&n->childq)) != NULL && |
if ((nc = TAILQ_FIRST(&n->childq)) != NULL && |
pnode_class(nc->node) < CLASS_LINE) |
pnode_class(nc->node) < CLASS_LINE) |
macro_open(f, "Em"); |
macro_open(f, "Em"); |
|
if (n->node == NODE_GLOSSTERM) |
|
f->parastate = PARA_HAVE; |
break; |
break; |
case NODE_ENVAR: |
case NODE_ENVAR: |
macro_open(f, "Ev"); |
macro_open(f, "Ev"); |
Line 1096 pnode_print(struct format *f, struct pnode *n) |
|
Line 988 pnode_print(struct format *f, struct pnode *n) |
|
case NODE_FILENAME: |
case NODE_FILENAME: |
macro_open(f, "Pa"); |
macro_open(f, "Pa"); |
break; |
break; |
|
case NODE_FOOTNOTE: |
|
macro_line(f, "Bo"); |
|
f->parastate = PARA_HAVE; |
|
break; |
case NODE_FUNCTION: |
case NODE_FUNCTION: |
macro_open(f, "Fn"); |
macro_open(f, "Fn"); |
break; |
break; |
Line 1105 pnode_print(struct format *f, struct pnode *n) |
|
Line 1001 pnode_print(struct format *f, struct pnode *n) |
|
case NODE_FUNCSYNOPSISINFO: |
case NODE_FUNCSYNOPSISINFO: |
macro_open(f, "Fd"); |
macro_open(f, "Fd"); |
break; |
break; |
|
case NODE_IMAGEDATA: |
|
pnode_printimagedata(f, n); |
|
break; |
case NODE_INFORMALEQUATION: |
case NODE_INFORMALEQUATION: |
|
f->parastate = PARA_HAVE; |
macro_line(f, "Bd -ragged -offset indent"); |
macro_line(f, "Bd -ragged -offset indent"); |
|
f->parastate = PARA_HAVE; |
/* FALLTHROUGH */ |
/* FALLTHROUGH */ |
case NODE_INLINEEQUATION: |
case NODE_INLINEEQUATION: |
macro_line(f, "EQ"); |
macro_line(f, "EQ"); |
Line 1118 pnode_print(struct format *f, struct pnode *n) |
|
Line 1019 pnode_print(struct format *f, struct pnode *n) |
|
pnode_printgroup(f, n); |
pnode_printgroup(f, n); |
break; |
break; |
case NODE_KEYSYM: |
case NODE_KEYSYM: |
|
case NODE_PRODUCTNAME: |
macro_open(f, "Sy"); |
macro_open(f, "Sy"); |
break; |
break; |
case NODE_LINK: |
case NODE_LINK: |
Line 1135 pnode_print(struct format *f, struct pnode *n) |
|
Line 1037 pnode_print(struct format *f, struct pnode *n) |
|
break; |
break; |
case NODE_LITERALLAYOUT: |
case NODE_LITERALLAYOUT: |
macro_close(f); |
macro_close(f); |
|
f->parastate = PARA_HAVE; |
macro_argline(f, "Bd", pnode_getattr(n, ATTRKEY_CLASS) == |
macro_argline(f, "Bd", pnode_getattr(n, ATTRKEY_CLASS) == |
ATTRVAL_MONOSPACED ? "-literal" : "-unfilled"); |
ATTRVAL_MONOSPACED ? "-literal" : "-unfilled"); |
|
f->parastate = PARA_HAVE; |
break; |
break; |
case NODE_MARKUP: |
case NODE_MARKUP: |
macro_open(f, "Ic"); |
macro_open(f, "Ic"); |
Line 1157 pnode_print(struct format *f, struct pnode *n) |
|
Line 1061 pnode_print(struct format *f, struct pnode *n) |
|
case NODE_MML_MSUP: |
case NODE_MML_MSUP: |
pnode_printmath(f, n); |
pnode_printmath(f, n); |
break; |
break; |
|
case NODE_OLINK: |
|
pnode_printolink(f, n); |
|
break; |
case NODE_OPTION: |
case NODE_OPTION: |
if ((nc = TAILQ_FIRST(&n->childq)) != NULL && |
if ((nc = TAILQ_FIRST(&n->childq)) != NULL && |
pnode_class(nc->node) < CLASS_LINE) |
pnode_class(nc->node) < CLASS_LINE) |
Line 1166 pnode_print(struct format *f, struct pnode *n) |
|
Line 1073 pnode_print(struct format *f, struct pnode *n) |
|
pnode_printlist(f, n); |
pnode_printlist(f, n); |
break; |
break; |
case NODE_PARA: |
case NODE_PARA: |
pnode_printpara(f, n); |
if (f->parastate == PARA_MID) |
|
f->parastate = PARA_WANT; |
break; |
break; |
case NODE_PARAMDEF: |
case NODE_PARAMDEF: |
case NODE_PARAMETER: |
case NODE_PARAMETER: |
Line 1176 pnode_print(struct format *f, struct pnode *n) |
|
Line 1084 pnode_print(struct format *f, struct pnode *n) |
|
pnode_unlinksub(n); |
pnode_unlinksub(n); |
break; |
break; |
case NODE_QUOTE: |
case NODE_QUOTE: |
if (was_impl) |
if ((nc = TAILQ_FIRST(&n->childq)) != NULL && |
|
nc->node == NODE_FILENAME && |
|
TAILQ_NEXT(nc, child) == NULL) { |
|
if (n->flags & NFLAG_SPC) |
|
nc->flags |= NFLAG_SPC; |
|
} else if (was_impl) |
macro_open(f, "Do"); |
macro_open(f, "Do"); |
else { |
else { |
macro_open(f, "Dq"); |
macro_open(f, "Dq"); |
Line 1186 pnode_print(struct format *f, struct pnode *n) |
|
Line 1099 pnode_print(struct format *f, struct pnode *n) |
|
case NODE_PROGRAMLISTING: |
case NODE_PROGRAMLISTING: |
case NODE_SCREEN: |
case NODE_SCREEN: |
case NODE_SYNOPSIS: |
case NODE_SYNOPSIS: |
|
f->parastate = PARA_HAVE; |
macro_line(f, "Bd -literal"); |
macro_line(f, "Bd -literal"); |
|
f->parastate = PARA_HAVE; |
break; |
break; |
case NODE_SYSTEMITEM: |
case NODE_SYSTEMITEM: |
pnode_printsystemitem(f, n); |
pnode_printsystemitem(f, n); |
break; |
break; |
case NODE_REFENTRY: |
|
pnode_printrefentry(f, n); |
|
break; |
|
case NODE_REFNAME: |
case NODE_REFNAME: |
/* More often, these appear inside NODE_REFNAMEDIV. */ |
/* More often, these appear inside NODE_REFNAMEDIV. */ |
macro_open(f, "Nm"); |
macro_open(f, "Nm"); |
Line 1207 pnode_print(struct format *f, struct pnode *n) |
|
Line 1119 pnode_print(struct format *f, struct pnode *n) |
|
case NODE_REFSYNOPSISDIV: |
case NODE_REFSYNOPSISDIV: |
pnode_printrefsynopsisdiv(f, n); |
pnode_printrefsynopsisdiv(f, n); |
break; |
break; |
case NODE_PREFACE: |
|
case NODE_SECTION: |
case NODE_SECTION: |
case NODE_SIMPLESECT: |
case NODE_SIMPLESECT: |
case NODE_APPENDIX: |
case NODE_APPENDIX: |
case NODE_LEGALNOTICE: |
|
case NODE_NOTE: |
case NODE_NOTE: |
case NODE_TIP: |
|
case NODE_CAUTION: |
|
case NODE_WARNING: |
|
pnode_printsection(f, n); |
pnode_printsection(f, n); |
break; |
break; |
case NODE_REPLACEABLE: |
case NODE_REPLACEABLE: |
macro_open(f, "Ar"); |
macro_open(f, "Ar"); |
break; |
break; |
case NODE_SBR: |
case NODE_SBR: |
macro_line(f, "br"); |
if (f->parastate == PARA_MID) |
|
macro_line(f, "br"); |
break; |
break; |
case NODE_SUBSCRIPT: |
case NODE_SUBSCRIPT: |
if (f->linestate == LINE_MACRO) |
if (f->linestate == LINE_MACRO) |
Line 1230 pnode_print(struct format *f, struct pnode *n) |
|
Line 1138 pnode_print(struct format *f, struct pnode *n) |
|
else |
else |
print_text(f, "_", 0); |
print_text(f, "_", 0); |
if ((nc = TAILQ_FIRST(&n->childq)) != NULL) |
if ((nc = TAILQ_FIRST(&n->childq)) != NULL) |
nc->spc = 0; |
nc->flags &= ~(NFLAG_LINE | NFLAG_SPC); |
break; |
break; |
case NODE_SUPERSCRIPT: |
case NODE_SUPERSCRIPT: |
fputs("\\(ha", stdout); |
fputs("\\(ha", stdout); |
if ((nc = TAILQ_FIRST(&n->childq)) != NULL) |
if ((nc = TAILQ_FIRST(&n->childq)) != NULL) |
nc->spc = 0; |
nc->flags &= ~(NFLAG_LINE | NFLAG_SPC); |
break; |
break; |
case NODE_TEXT: |
case NODE_TEXT: |
case NODE_ESCAPE: |
case NODE_ESCAPE: |
Line 1246 pnode_print(struct format *f, struct pnode *n) |
|
Line 1154 pnode_print(struct format *f, struct pnode *n) |
|
break; |
break; |
case NODE_TITLE: |
case NODE_TITLE: |
case NODE_SUBTITLE: |
case NODE_SUBTITLE: |
pnode_printpara(f, n); |
if (f->parastate == PARA_MID) |
|
f->parastate = PARA_WANT; |
macro_nodeline(f, "Sy", n, 0); |
macro_nodeline(f, "Sy", n, 0); |
pnode_unlinksub(n); |
pnode_unlinksub(n); |
break; |
break; |
Line 1259 pnode_print(struct format *f, struct pnode *n) |
|
Line 1168 pnode_print(struct format *f, struct pnode *n) |
|
case NODE_VARNAME: |
case NODE_VARNAME: |
macro_open(f, "Va"); |
macro_open(f, "Va"); |
break; |
break; |
|
case NODE_VOID: |
|
print_text(f, "void", ARG_SPACE); |
|
break; |
|
case NODE_XREF: |
|
pnode_printxref(f, n); |
|
break; |
|
case NODE_CAUTION: |
|
case NODE_LEGALNOTICE: |
|
case NODE_PREFACE: |
|
case NODE_TIP: |
|
case NODE_WARNING: |
|
abort(); |
default: |
default: |
break; |
break; |
} |
} |
Line 1279 pnode_print(struct format *f, struct pnode *n) |
|
Line 1200 pnode_print(struct format *f, struct pnode *n) |
|
case NODE_TEXT: |
case NODE_TEXT: |
/* Accept more arguments to the previous macro. */ |
/* Accept more arguments to the previous macro. */ |
return; |
return; |
|
case NODE_FOOTNOTE: |
|
f->parastate = PARA_HAVE; |
|
macro_line(f, "Bc"); |
|
break; |
|
case NODE_GLOSSTERM: |
|
f->parastate = PARA_HAVE; |
|
break; |
case NODE_INFORMALEQUATION: |
case NODE_INFORMALEQUATION: |
macro_line(f, "EN"); |
macro_line(f, "EN"); |
macro_line(f, "Ed"); |
macro_line(f, "Ed"); |
Line 1321 pnode_print(struct format *f, struct pnode *n) |
|
Line 1249 pnode_print(struct format *f, struct pnode *n) |
|
break; |
break; |
fputs(" } ", stdout); |
fputs(" } ", stdout); |
break; |
break; |
|
case NODE_PARA: |
|
if (f->parastate == PARA_MID) |
|
f->parastate = PARA_WANT; |
|
break; |
case NODE_QUOTE: |
case NODE_QUOTE: |
if (was_impl) { |
if ((nc = TAILQ_FIRST(&n->childq)) != NULL && |
|
nc->node == NODE_FILENAME && |
|
TAILQ_NEXT(nc, child) == NULL) |
|
/* nothing */; |
|
else if (was_impl) { |
f->flags &= ~FMT_NOSPC; |
f->flags &= ~FMT_NOSPC; |
macro_open(f, "Dc"); |
macro_open(f, "Dc"); |
} else |
} else |
f->flags &= ~FMT_IMPL; |
f->flags &= ~FMT_IMPL; |
break; |
break; |
case NODE_PREFACE: |
|
case NODE_SECTION: |
case NODE_SECTION: |
|
case NODE_SIMPLESECT: |
case NODE_APPENDIX: |
case NODE_APPENDIX: |
case NODE_LEGALNOTICE: |
|
case NODE_NOTE: |
case NODE_NOTE: |
case NODE_TIP: |
if (n->parent != NULL) |
case NODE_CAUTION: |
f->level--; |
case NODE_WARNING: |
|
f->level--; |
|
break; |
break; |
case NODE_BLOCKQUOTE: |
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: |
|
f->parastate = PARA_HAVE; |
macro_line(f, "Ed"); |
macro_line(f, "Ed"); |
|
f->parastate = PARA_WANT; |
break; |
break; |
|
case NODE_TITLE: |
|
case NODE_SUBTITLE: |
|
f->parastate = PARA_WANT; |
|
break; |
|
case NODE_YEAR: |
|
if ((nn = TAILQ_NEXT(n, child)) != NULL && |
|
nn->node == NODE_YEAR && |
|
f->linestate == LINE_TEXT) { |
|
print_text(f, ",", 0); |
|
nn->flags |= NFLAG_SPC; |
|
if ((nc = TAILQ_FIRST(&nn->childq)) != NULL) |
|
nc->flags |= NFLAG_SPC; |
|
} |
default: |
default: |
break; |
break; |
} |
} |
Line 1358 ptree_print_mdoc(struct ptree *tree) |
|
Line 1306 ptree_print_mdoc(struct ptree *tree) |
|
|
|
formatter.level = 0; |
formatter.level = 0; |
formatter.linestate = LINE_NEW; |
formatter.linestate = LINE_NEW; |
|
formatter.parastate = PARA_HAVE; |
pnode_printprologue(&formatter, tree->root); |
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) |