version 1.134, 2019/04/23 22:25:28 |
version 1.138, 2019/04/24 18:38:02 |
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 887 pnode_printrefentry(struct format *f, struct pnode *n) |
|
Line 893 pnode_printrefentry(struct format *f, struct pnode *n) |
|
exit(1); |
exit(1); |
} |
} |
match->node = NODE_SECTION; |
match->node = NODE_SECTION; |
match->spc = 1; |
match->flags |= NFLAG_SPC; |
match->parent = n; |
match->parent = n; |
TAILQ_INIT(&match->childq); |
TAILQ_INIT(&match->childq); |
TAILQ_INIT(&match->attrq); |
TAILQ_INIT(&match->attrq); |
Line 896 pnode_printrefentry(struct format *f, struct pnode *n) |
|
Line 902 pnode_printrefentry(struct format *f, struct pnode *n) |
|
exit(1); |
exit(1); |
} |
} |
nc->node = NODE_TITLE; |
nc->node = NODE_TITLE; |
nc->spc = 1; |
nc->flags |= NFLAG_SPC; |
if ((nc = pnode_alloc(nc)) == NULL) { |
if ((nc = pnode_alloc(nc)) == NULL) { |
perror(NULL); |
perror(NULL); |
exit(1); |
exit(1); |
Line 906 pnode_printrefentry(struct format *f, struct pnode *n) |
|
Line 912 pnode_printrefentry(struct format *f, struct pnode *n) |
|
perror(NULL); |
perror(NULL); |
exit(1); |
exit(1); |
} |
} |
nc->spc = 1; |
nc->flags |= NFLAG_SPC; |
if (later == NULL) |
if (later == NULL) |
TAILQ_INSERT_TAIL(&n->childq, match, child); |
TAILQ_INSERT_TAIL(&n->childq, match, child); |
else |
else |
Line 1037 pnode_printtgroup2(struct format *f, struct pnode *n) |
|
Line 1043 pnode_printtgroup2(struct format *f, struct pnode *n) |
|
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 1063 pnode_printtgroup(struct format *f, struct pnode *n) |
|
Line 1070 pnode_printtgroup(struct format *f, struct pnode *n) |
|
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 1082 pnode_printlist(struct format *f, struct pnode *n) |
|
Line 1090 pnode_printlist(struct format *f, struct pnode *n) |
|
f->parastate = PARA_HAVE; |
f->parastate = PARA_HAVE; |
} |
} |
macro_line(f, "El"); |
macro_line(f, "El"); |
|
f->parastate = PARA_WANT; |
pnode_unlinksub(n); |
pnode_unlinksub(n); |
} |
} |
|
|
Line 1100 pnode_printvariablelist(struct format *f, struct pnode |
|
Line 1109 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 1119 pnode_print(struct format *f, struct pnode *n) |
|
Line 1129 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 1284 pnode_print(struct format *f, struct pnode *n) |
|
Line 1294 pnode_print(struct format *f, struct pnode *n) |
|
if ((nc = TAILQ_FIRST(&n->childq)) != NULL && |
if ((nc = TAILQ_FIRST(&n->childq)) != NULL && |
nc->node == NODE_FILENAME && |
nc->node == NODE_FILENAME && |
TAILQ_NEXT(nc, child) == NULL) { |
TAILQ_NEXT(nc, child) == NULL) { |
if (n->spc) |
if (n->flags & NFLAG_SPC) |
nc->spc = 1; |
nc->flags |= NFLAG_SPC; |
} else if (was_impl) |
} else if (was_impl) |
macro_open(f, "Do"); |
macro_open(f, "Do"); |
else { |
else { |
Line 1343 pnode_print(struct format *f, struct pnode *n) |
|
Line 1353 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 1480 pnode_print(struct format *f, struct pnode *n) |
|
Line 1490 pnode_print(struct format *f, struct pnode *n) |
|
case NODE_SYNOPSIS: |
case NODE_SYNOPSIS: |
f->parastate = PARA_HAVE; |
f->parastate = PARA_HAVE; |
macro_line(f, "Ed"); |
macro_line(f, "Ed"); |
|
f->parastate = PARA_WANT; |
break; |
break; |
case NODE_TITLE: |
case NODE_TITLE: |
case NODE_SUBTITLE: |
case NODE_SUBTITLE: |