Print this page
Update to 1.12.3.
*** 1,9 ****
! /* $Id: mdoc_term.c,v 1.238 2011/11/13 13:15:14 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
! * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
--- 1,10 ----
! /* $Id: mdoc_term.c,v 1.258 2013/12/25 21:24:12 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
! * Copyright (c) 2010, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
! * Copyright (c) 2013 Franco Fichtner <franco@lastsummer.de>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
* copyright notice and this permission notice appear in all copies.
*
*** 39,50 ****
int count;
};
#define DECL_ARGS struct termp *p, \
struct termpair *pair, \
! const struct mdoc_meta *m, \
! const struct mdoc_node *n
struct termact {
int (*pre)(DECL_ARGS);
void (*post)(DECL_ARGS);
};
--- 40,51 ----
int count;
};
#define DECL_ARGS struct termp *p, \
struct termpair *pair, \
! const struct mdoc_meta *meta, \
! struct mdoc_node *n
struct termact {
int (*pre)(DECL_ARGS);
void (*post)(DECL_ARGS);
};
*** 67,77 ****
static void termp__t_post(DECL_ARGS);
static void termp_an_post(DECL_ARGS);
static void termp_bd_post(DECL_ARGS);
static void termp_bk_post(DECL_ARGS);
static void termp_bl_post(DECL_ARGS);
! static void termp_d1_post(DECL_ARGS);
static void termp_fo_post(DECL_ARGS);
static void termp_in_post(DECL_ARGS);
static void termp_it_post(DECL_ARGS);
static void termp_lb_post(DECL_ARGS);
static void termp_nm_post(DECL_ARGS);
--- 68,78 ----
static void termp__t_post(DECL_ARGS);
static void termp_an_post(DECL_ARGS);
static void termp_bd_post(DECL_ARGS);
static void termp_bk_post(DECL_ARGS);
static void termp_bl_post(DECL_ARGS);
! static void termp_fd_post(DECL_ARGS);
static void termp_fo_post(DECL_ARGS);
static void termp_in_post(DECL_ARGS);
static void termp_it_post(DECL_ARGS);
static void termp_lb_post(DECL_ARGS);
static void termp_nm_post(DECL_ARGS);
*** 98,108 ****
static int termp_fd_pre(DECL_ARGS);
static int termp_fl_pre(DECL_ARGS);
static int termp_fn_pre(DECL_ARGS);
static int termp_fo_pre(DECL_ARGS);
static int termp_ft_pre(DECL_ARGS);
- static int termp_igndelim_pre(DECL_ARGS);
static int termp_in_pre(DECL_ARGS);
static int termp_it_pre(DECL_ARGS);
static int termp_li_pre(DECL_ARGS);
static int termp_lk_pre(DECL_ARGS);
static int termp_nd_pre(DECL_ARGS);
--- 99,108 ----
*** 127,138 ****
{ NULL, NULL }, /* Dt */
{ NULL, NULL }, /* Os */
{ termp_sh_pre, termp_sh_post }, /* Sh */
{ termp_ss_pre, termp_ss_post }, /* Ss */
{ termp_sp_pre, NULL }, /* Pp */
! { termp_d1_pre, termp_d1_post }, /* D1 */
! { termp_d1_pre, termp_d1_post }, /* Dl */
{ termp_bd_pre, termp_bd_post }, /* Bd */
{ NULL, NULL }, /* Ed */
{ termp_bl_pre, termp_bl_post }, /* Bl */
{ NULL, NULL }, /* El */
{ termp_it_pre, termp_it_post }, /* It */
--- 127,138 ----
{ NULL, NULL }, /* Dt */
{ NULL, NULL }, /* Os */
{ termp_sh_pre, termp_sh_post }, /* Sh */
{ termp_ss_pre, termp_ss_post }, /* Ss */
{ termp_sp_pre, NULL }, /* Pp */
! { termp_d1_pre, termp_bl_post }, /* D1 */
! { termp_d1_pre, termp_bl_post }, /* Dl */
{ termp_bd_pre, termp_bd_post }, /* Bd */
{ NULL, NULL }, /* Ed */
{ termp_bl_pre, termp_bl_post }, /* Bl */
{ NULL, NULL }, /* El */
{ termp_it_pre, termp_it_post }, /* It */
*** 144,154 ****
{ NULL, NULL }, /* Dv */
{ NULL, NULL }, /* Er */
{ NULL, NULL }, /* Ev */
{ termp_ex_pre, NULL }, /* Ex */
{ termp_fa_pre, NULL }, /* Fa */
! { termp_fd_pre, NULL }, /* Fd */
{ termp_fl_pre, NULL }, /* Fl */
{ termp_fn_pre, NULL }, /* Fn */
{ termp_ft_pre, NULL }, /* Ft */
{ termp_bold_pre, NULL }, /* Ic */
{ termp_in_pre, termp_in_post }, /* In */
--- 144,154 ----
{ NULL, NULL }, /* Dv */
{ NULL, NULL }, /* Er */
{ NULL, NULL }, /* Ev */
{ termp_ex_pre, NULL }, /* Ex */
{ termp_fa_pre, NULL }, /* Fa */
! { termp_fd_pre, termp_fd_post }, /* Fd */
{ termp_fl_pre, NULL }, /* Fl */
{ termp_fn_pre, NULL }, /* Fn */
{ termp_ft_pre, NULL }, /* Ft */
{ termp_bold_pre, NULL }, /* Ic */
{ termp_in_pre, termp_in_post }, /* In */
*** 192,207 ****
{ NULL, NULL }, /* Ef */
{ termp_under_pre, NULL }, /* Em */
{ termp_quote_pre, termp_quote_post }, /* Eo */
{ termp_xx_pre, NULL }, /* Fx */
{ termp_bold_pre, NULL }, /* Ms */
! { termp_igndelim_pre, NULL }, /* No */
{ termp_ns_pre, NULL }, /* Ns */
{ termp_xx_pre, NULL }, /* Nx */
{ termp_xx_pre, NULL }, /* Ox */
{ NULL, NULL }, /* Pc */
! { termp_igndelim_pre, termp_pf_post }, /* Pf */
{ termp_quote_pre, termp_quote_post }, /* Po */
{ termp_quote_pre, termp_quote_post }, /* Pq */
{ NULL, NULL }, /* Qc */
{ termp_quote_pre, termp_quote_post }, /* Ql */
{ termp_quote_pre, termp_quote_post }, /* Qo */
--- 192,207 ----
{ NULL, NULL }, /* Ef */
{ termp_under_pre, NULL }, /* Em */
{ termp_quote_pre, termp_quote_post }, /* Eo */
{ termp_xx_pre, NULL }, /* Fx */
{ termp_bold_pre, NULL }, /* Ms */
! { NULL, NULL }, /* No */
{ termp_ns_pre, NULL }, /* Ns */
{ termp_xx_pre, NULL }, /* Nx */
{ termp_xx_pre, NULL }, /* Ox */
{ NULL, NULL }, /* Pc */
! { NULL, termp_pf_post }, /* Pf */
{ termp_quote_pre, termp_quote_post }, /* Po */
{ termp_quote_pre, termp_quote_post }, /* Pq */
{ NULL, NULL }, /* Qc */
{ termp_quote_pre, termp_quote_post }, /* Ql */
{ termp_quote_pre, termp_quote_post }, /* Qo */
*** 240,259 ****
{ NULL, NULL }, /* En */ /* TODO */
{ termp_xx_pre, NULL }, /* Dx */
{ NULL, termp____post }, /* %Q */
{ termp_sp_pre, NULL }, /* br */
{ termp_sp_pre, NULL }, /* sp */
! { termp_under_pre, termp____post }, /* %U */
{ NULL, NULL }, /* Ta */
};
void
terminal_mdoc(void *arg, const struct mdoc *mdoc)
{
const struct mdoc_node *n;
! const struct mdoc_meta *m;
struct termp *p;
p = (struct termp *)arg;
if (0 == p->defindent)
--- 240,259 ----
{ NULL, NULL }, /* En */ /* TODO */
{ termp_xx_pre, NULL }, /* Dx */
{ NULL, termp____post }, /* %Q */
{ termp_sp_pre, NULL }, /* br */
{ termp_sp_pre, NULL }, /* sp */
! { NULL, termp____post }, /* %U */
{ NULL, NULL }, /* Ta */
};
void
terminal_mdoc(void *arg, const struct mdoc *mdoc)
{
const struct mdoc_node *n;
! const struct mdoc_meta *meta;
struct termp *p;
p = (struct termp *)arg;
if (0 == p->defindent)
*** 265,343 ****
if (NULL == p->symtab)
p->symtab = mchars_alloc();
n = mdoc_node(mdoc);
! m = mdoc_meta(mdoc);
! term_begin(p, print_mdoc_head, print_mdoc_foot, m);
if (n->child)
! print_mdoc_nodelist(p, NULL, m, n->child);
term_end(p);
}
static void
print_mdoc_nodelist(DECL_ARGS)
{
! print_mdoc_node(p, pair, m, n);
if (n->next)
! print_mdoc_nodelist(p, pair, m, n->next);
}
/* ARGSUSED */
static void
print_mdoc_node(DECL_ARGS)
{
int chld;
- const void *font;
struct termpair npair;
size_t offset, rmargin;
chld = 1;
offset = p->offset;
rmargin = p->rmargin;
! font = term_fontq(p);
memset(&npair, 0, sizeof(struct termpair));
npair.ppair = pair;
/*
* Keeps only work until the end of a line. If a keep was
* invoked in a prior line, revert it to PREKEEP.
- *
- * Also let SYNPRETTY sections behave as if they were wrapped
- * in a `Bk' block.
*/
! if (TERMP_KEEP & p->flags || MDOC_SYNPRETTY & n->flags) {
! if (n->prev && n->prev->line != n->line) {
p->flags &= ~TERMP_KEEP;
p->flags |= TERMP_PREKEEP;
- } else if (NULL == n->prev) {
- if (n->parent && n->parent->line != n->line) {
- p->flags &= ~TERMP_KEEP;
- p->flags |= TERMP_PREKEEP;
}
}
- }
/*
- * Since SYNPRETTY sections aren't "turned off" with `Ek',
- * we have to intuit whether we should disable formatting.
- */
-
- if ( ! (MDOC_SYNPRETTY & n->flags) &&
- ((n->prev && MDOC_SYNPRETTY & n->prev->flags) ||
- (n->parent && MDOC_SYNPRETTY & n->parent->flags)))
- p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
-
- /*
* After the keep flags have been set up, we may now
* produce output. Note that some pre-handlers do so.
*/
switch (n->type) {
--- 265,325 ----
if (NULL == p->symtab)
p->symtab = mchars_alloc();
n = mdoc_node(mdoc);
! meta = mdoc_meta(mdoc);
! term_begin(p, print_mdoc_head, print_mdoc_foot, meta);
if (n->child)
! print_mdoc_nodelist(p, NULL, meta, n->child);
term_end(p);
}
static void
print_mdoc_nodelist(DECL_ARGS)
{
! print_mdoc_node(p, pair, meta, n);
if (n->next)
! print_mdoc_nodelist(p, pair, meta, n->next);
}
/* ARGSUSED */
static void
print_mdoc_node(DECL_ARGS)
{
int chld;
struct termpair npair;
size_t offset, rmargin;
chld = 1;
offset = p->offset;
rmargin = p->rmargin;
! n->prev_font = term_fontq(p);
memset(&npair, 0, sizeof(struct termpair));
npair.ppair = pair;
/*
* Keeps only work until the end of a line. If a keep was
* invoked in a prior line, revert it to PREKEEP.
*/
! if (TERMP_KEEP & p->flags) {
! if (n->prev ? (n->prev->lastline != n->line) :
! (n->parent && n->parent->line != n->line)) {
p->flags &= ~TERMP_KEEP;
p->flags |= TERMP_PREKEEP;
}
}
/*
* After the keep flags have been set up, we may now
* produce output. Note that some pre-handlers do so.
*/
switch (n->type) {
*** 357,374 ****
term_tbl(p, n->span);
break;
default:
if (termacts[n->tok].pre && ENDBODY_NOT == n->end)
chld = (*termacts[n->tok].pre)
! (p, &npair, m, n);
break;
}
if (chld && n->child)
! print_mdoc_nodelist(p, &npair, m, n->child);
! term_fontpopq(p, font);
switch (n->type) {
case (MDOC_TEXT):
break;
case (MDOC_TBL):
--- 339,357 ----
term_tbl(p, n->span);
break;
default:
if (termacts[n->tok].pre && ENDBODY_NOT == n->end)
chld = (*termacts[n->tok].pre)
! (p, &npair, meta, n);
break;
}
if (chld && n->child)
! print_mdoc_nodelist(p, &npair, meta, n->child);
! term_fontpopq(p,
! (ENDBODY_NOT == n->end ? n : n->pending)->prev_font);
switch (n->type) {
case (MDOC_TEXT):
break;
case (MDOC_TBL):
*** 376,386 ****
case (MDOC_EQN):
break;
default:
if ( ! termacts[n->tok].post || MDOC_ENDED & n->flags)
break;
! (void)(*termacts[n->tok].post)(p, &npair, m, n);
/*
* Explicit end tokens not only call the post
* handler, but also tell the respective block
* that it must not call the post handler again.
--- 359,369 ----
case (MDOC_EQN):
break;
default:
if ( ! termacts[n->tok].post || MDOC_ENDED & n->flags)
break;
! (void)(*termacts[n->tok].post)(p, &npair, meta, n);
/*
* Explicit end tokens not only call the post
* handler, but also tell the respective block
* that it must not call the post handler again.
*** 407,419 ****
static void
print_mdoc_foot(struct termp *p, const void *arg)
{
! const struct mdoc_meta *m;
! m = (const struct mdoc_meta *)arg;
term_fontrepl(p, TERMFONT_NONE);
/*
* Output the footer in new-groff style, that is, three columns
--- 390,402 ----
static void
print_mdoc_foot(struct termp *p, const void *arg)
{
! const struct mdoc_meta *meta;
! meta = (const struct mdoc_meta *)arg;
term_fontrepl(p, TERMFONT_NONE);
/*
* Output the footer in new-groff style, that is, three columns
*** 425,453 ****
term_vspace(p);
p->offset = 0;
p->rmargin = (p->maxrmargin -
! term_strlen(p, m->date) + term_len(p, 1)) / 2;
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
! term_word(p, m->os);
term_flushln(p);
p->offset = p->rmargin;
! p->rmargin = p->maxrmargin - term_strlen(p, m->os);
p->flags |= TERMP_NOSPACE;
! term_word(p, m->date);
term_flushln(p);
p->offset = p->rmargin;
p->rmargin = p->maxrmargin;
p->flags &= ~TERMP_NOBREAK;
p->flags |= TERMP_NOSPACE;
! term_word(p, m->os);
term_flushln(p);
p->offset = 0;
p->rmargin = p->maxrmargin;
p->flags = 0;
--- 408,438 ----
term_vspace(p);
p->offset = 0;
p->rmargin = (p->maxrmargin -
! term_strlen(p, meta->date) + term_len(p, 1)) / 2;
! p->trailspace = 1;
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
! term_word(p, meta->os);
term_flushln(p);
p->offset = p->rmargin;
! p->rmargin = p->maxrmargin - term_strlen(p, meta->os);
p->flags |= TERMP_NOSPACE;
! term_word(p, meta->date);
term_flushln(p);
p->offset = p->rmargin;
p->rmargin = p->maxrmargin;
+ p->trailspace = 0;
p->flags &= ~TERMP_NOBREAK;
p->flags |= TERMP_NOSPACE;
! term_word(p, meta->os);
term_flushln(p);
p->offset = 0;
p->rmargin = p->maxrmargin;
p->flags = 0;
*** 457,469 ****
static void
print_mdoc_head(struct termp *p, const void *arg)
{
char buf[BUFSIZ], title[BUFSIZ];
size_t buflen, titlen;
! const struct mdoc_meta *m;
! m = (const struct mdoc_meta *)arg;
/*
* The header is strange. It has three components, which are
* really two with the first duplicated. It goes like this:
*
--- 442,454 ----
static void
print_mdoc_head(struct termp *p, const void *arg)
{
char buf[BUFSIZ], title[BUFSIZ];
size_t buflen, titlen;
! const struct mdoc_meta *meta;
! meta = (const struct mdoc_meta *)arg;
/*
* The header is strange. It has three components, which are
* really two with the first duplicated. It goes like this:
*
*** 477,500 ****
*/
p->offset = 0;
p->rmargin = p->maxrmargin;
! assert(m->vol);
! strlcpy(buf, m->vol, BUFSIZ);
buflen = term_strlen(p, buf);
! if (m->arch) {
strlcat(buf, " (", BUFSIZ);
! strlcat(buf, m->arch, BUFSIZ);
strlcat(buf, ")", BUFSIZ);
}
! snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec);
titlen = term_strlen(p, title);
p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
p->offset = 0;
p->rmargin = 2 * (titlen+1) + buflen < p->maxrmargin ?
(p->maxrmargin -
term_strlen(p, buf) + term_len(p, 1)) / 2 :
p->maxrmargin - buflen;
--- 462,486 ----
*/
p->offset = 0;
p->rmargin = p->maxrmargin;
! assert(meta->vol);
! strlcpy(buf, meta->vol, BUFSIZ);
buflen = term_strlen(p, buf);
! if (meta->arch) {
strlcat(buf, " (", BUFSIZ);
! strlcat(buf, meta->arch, BUFSIZ);
strlcat(buf, ")", BUFSIZ);
}
! snprintf(title, BUFSIZ, "%s(%s)", meta->title, meta->msec);
titlen = term_strlen(p, title);
p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
+ p->trailspace = 1;
p->offset = 0;
p->rmargin = 2 * (titlen+1) + buflen < p->maxrmargin ?
(p->maxrmargin -
term_strlen(p, buf) + term_len(p, 1)) / 2 :
p->maxrmargin - buflen;
*** 509,518 ****
--- 495,505 ----
term_word(p, buf);
term_flushln(p);
p->flags &= ~TERMP_NOBREAK;
+ p->trailspace = 0;
if (p->rmargin + titlen <= p->maxrmargin) {
p->flags |= TERMP_NOSPACE;
p->offset = p->rmargin;
p->rmargin = p->maxrmargin;
term_word(p, title);
*** 725,740 ****
case (LIST_bullet):
/* FALLTHROUGH */
case (LIST_dash):
/* FALLTHROUGH */
case (LIST_hyphen):
! if (width < term_len(p, 4))
! width = term_len(p, 4);
! break;
case (LIST_enum):
! if (width < term_len(p, 5))
! width = term_len(p, 5);
break;
case (LIST_hang):
if (0 == width)
width = term_len(p, 8);
break;
--- 712,725 ----
case (LIST_bullet):
/* FALLTHROUGH */
case (LIST_dash):
/* FALLTHROUGH */
case (LIST_hyphen):
! /* FALLTHROUGH */
case (LIST_enum):
! if (width < term_len(p, 2))
! width = term_len(p, 2);
break;
case (LIST_hang):
if (0 == width)
width = term_len(p, 8);
break;
*** 785,808 ****
* going to unset all of these flags in termp_it_post() when we
* exit.
*/
switch (type) {
case (LIST_bullet):
/* FALLTHROUGH */
case (LIST_dash):
/* FALLTHROUGH */
- case (LIST_enum):
- /* FALLTHROUGH */
case (LIST_hyphen):
! if (MDOC_HEAD == n->type)
p->flags |= TERMP_NOBREAK;
break;
case (LIST_hang):
! if (MDOC_HEAD == n->type)
! p->flags |= TERMP_NOBREAK;
! else
break;
/*
* This is ugly. If `-hang' is specified and the body
* is a `Bl' or `Bd', then we want basically to nullify
--- 770,799 ----
* going to unset all of these flags in termp_it_post() when we
* exit.
*/
switch (type) {
+ case (LIST_enum):
+ /*
+ * Weird special case.
+ * Very narrow enum lists actually hang.
+ */
+ if (width == term_len(p, 2))
+ p->flags |= TERMP_HANG;
+ /* FALLTHROUGH */
case (LIST_bullet):
/* FALLTHROUGH */
case (LIST_dash):
/* FALLTHROUGH */
case (LIST_hyphen):
! if (MDOC_HEAD != n->type)
! break;
p->flags |= TERMP_NOBREAK;
+ p->trailspace = 1;
break;
case (LIST_hang):
! if (MDOC_HEAD != n->type)
break;
/*
* This is ugly. If `-hang' is specified and the body
* is a `Bl' or `Bd', then we want basically to nullify
*** 810,845 ****
* this as a `-ohang' list instead.
*/
if (n->next->child &&
(MDOC_Bl == n->next->child->tok ||
MDOC_Bd == n->next->child->tok))
- p->flags &= ~TERMP_NOBREAK;
- else
- p->flags |= TERMP_HANG;
break;
- case (LIST_tag):
- if (MDOC_HEAD == n->type)
- p->flags |= TERMP_NOBREAK | TERMP_TWOSPACE;
if (MDOC_HEAD != n->type)
break;
if (NULL == n->next || NULL == n->next->child)
p->flags |= TERMP_DANGLE;
break;
case (LIST_column):
if (MDOC_HEAD == n->type)
break;
! if (NULL == n->next)
p->flags &= ~TERMP_NOBREAK;
! else
p->flags |= TERMP_NOBREAK;
break;
case (LIST_diag):
! if (MDOC_HEAD == n->type)
p->flags |= TERMP_NOBREAK;
break;
default:
break;
}
--- 801,843 ----
* this as a `-ohang' list instead.
*/
if (n->next->child &&
(MDOC_Bl == n->next->child->tok ||
MDOC_Bd == n->next->child->tok))
break;
+ p->flags |= TERMP_NOBREAK | TERMP_HANG;
+ p->trailspace = 1;
+ break;
+ case (LIST_tag):
if (MDOC_HEAD != n->type)
break;
+
+ p->flags |= TERMP_NOBREAK;
+ p->trailspace = 2;
+
if (NULL == n->next || NULL == n->next->child)
p->flags |= TERMP_DANGLE;
break;
case (LIST_column):
if (MDOC_HEAD == n->type)
break;
! if (NULL == n->next) {
p->flags &= ~TERMP_NOBREAK;
! p->trailspace = 0;
! } else {
p->flags |= TERMP_NOBREAK;
+ p->trailspace = 1;
+ }
break;
case (LIST_diag):
! if (MDOC_HEAD != n->type)
! break;
p->flags |= TERMP_NOBREAK;
+ p->trailspace = 1;
break;
default:
break;
}
*** 987,1032 ****
* has munged them in the meanwhile.
*/
p->flags &= ~TERMP_DANGLE;
p->flags &= ~TERMP_NOBREAK;
- p->flags &= ~TERMP_TWOSPACE;
p->flags &= ~TERMP_HANG;
}
/* ARGSUSED */
static int
termp_nm_pre(DECL_ARGS)
{
! if (MDOC_BLOCK == n->type)
return(1);
if (MDOC_BODY == n->type) {
if (NULL == n->child)
return(0);
p->flags |= TERMP_NOSPACE;
p->offset += term_len(p, 1) +
! (NULL == n->prev->child ? term_strlen(p, m->name) :
MDOC_TEXT == n->prev->child->type ?
term_strlen(p, n->prev->child->string) :
term_len(p, 5));
return(1);
}
! if (NULL == n->child && NULL == m->name)
return(0);
if (MDOC_HEAD == n->type)
synopsis_pre(p, n->parent);
if (MDOC_HEAD == n->type && n->next->child) {
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
p->rmargin = p->offset + term_len(p, 1);
if (NULL == n->child) {
! p->rmargin += term_strlen(p, m->name);
} else if (MDOC_TEXT == n->child->type) {
p->rmargin += term_strlen(p, n->child->string);
if (n->child->next)
p->flags |= TERMP_HANG;
} else {
--- 985,1034 ----
* has munged them in the meanwhile.
*/
p->flags &= ~TERMP_DANGLE;
p->flags &= ~TERMP_NOBREAK;
p->flags &= ~TERMP_HANG;
+ p->trailspace = 0;
}
/* ARGSUSED */
static int
termp_nm_pre(DECL_ARGS)
{
! if (MDOC_BLOCK == n->type) {
! p->flags |= TERMP_PREKEEP;
return(1);
+ }
if (MDOC_BODY == n->type) {
if (NULL == n->child)
return(0);
p->flags |= TERMP_NOSPACE;
p->offset += term_len(p, 1) +
! (NULL == n->prev->child ?
! term_strlen(p, meta->name) :
MDOC_TEXT == n->prev->child->type ?
term_strlen(p, n->prev->child->string) :
term_len(p, 5));
return(1);
}
! if (NULL == n->child && NULL == meta->name)
return(0);
if (MDOC_HEAD == n->type)
synopsis_pre(p, n->parent);
if (MDOC_HEAD == n->type && n->next->child) {
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
+ p->trailspace = 1;
p->rmargin = p->offset + term_len(p, 1);
if (NULL == n->child) {
! p->rmargin += term_strlen(p, meta->name);
} else if (MDOC_TEXT == n->child->type) {
p->rmargin += term_strlen(p, n->child->string);
if (n->child->next)
p->flags |= TERMP_HANG;
} else {
*** 1035,1057 ****
}
}
term_fontpush(p, TERMFONT_BOLD);
if (NULL == n->child)
! term_word(p, m->name);
return(1);
}
/* ARGSUSED */
static void
termp_nm_post(DECL_ARGS)
{
! if (MDOC_HEAD == n->type && n->next->child) {
term_flushln(p);
p->flags &= ~(TERMP_NOBREAK | TERMP_HANG);
} else if (MDOC_BODY == n->type && n->child)
term_flushln(p);
}
--- 1037,1062 ----
}
}
term_fontpush(p, TERMFONT_BOLD);
if (NULL == n->child)
! term_word(p, meta->name);
return(1);
}
/* ARGSUSED */
static void
termp_nm_post(DECL_ARGS)
{
! if (MDOC_BLOCK == n->type) {
! p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
! } else if (MDOC_HEAD == n->type && n->next->child) {
term_flushln(p);
p->flags &= ~(TERMP_NOBREAK | TERMP_HANG);
+ p->trailspace = 0;
} else if (MDOC_BODY == n->type && n->child)
term_flushln(p);
}
*** 1373,1390 ****
termp_vt_pre(DECL_ARGS)
{
if (MDOC_ELEM == n->type) {
synopsis_pre(p, n);
! return(termp_under_pre(p, pair, m, n));
} else if (MDOC_BLOCK == n->type) {
synopsis_pre(p, n);
return(1);
} else if (MDOC_HEAD == n->type)
return(0);
! return(termp_under_pre(p, pair, m, n));
}
/* ARGSUSED */
static int
--- 1378,1395 ----
termp_vt_pre(DECL_ARGS)
{
if (MDOC_ELEM == n->type) {
synopsis_pre(p, n);
! return(termp_under_pre(p, pair, meta, n));
} else if (MDOC_BLOCK == n->type) {
synopsis_pre(p, n);
return(1);
} else if (MDOC_HEAD == n->type)
return(0);
! return(termp_under_pre(p, pair, meta, n));
}
/* ARGSUSED */
static int
*** 1400,1414 ****
static int
termp_fd_pre(DECL_ARGS)
{
synopsis_pre(p, n);
! return(termp_bold_pre(p, pair, m, n));
}
/* ARGSUSED */
static int
termp_sh_pre(DECL_ARGS)
{
/* No vspace between consecutive `Sh' calls. */
--- 1405,1428 ----
static int
termp_fd_pre(DECL_ARGS)
{
synopsis_pre(p, n);
! return(termp_bold_pre(p, pair, meta, n));
}
/* ARGSUSED */
+ static void
+ termp_fd_post(DECL_ARGS)
+ {
+
+ term_newln(p);
+ }
+
+
+ /* ARGSUSED */
static int
termp_sh_pre(DECL_ARGS)
{
/* No vspace between consecutive `Sh' calls. */
*** 1423,1432 ****
--- 1437,1448 ----
case (MDOC_HEAD):
term_fontpush(p, TERMFONT_BOLD);
break;
case (MDOC_BODY):
p->offset = term_len(p, p->defindent);
+ if (SEC_AUTHORS == n->sec)
+ p->flags &= ~(TERMP_SPLIT|TERMP_NOSPLIT);
break;
default:
break;
}
return(1);
*** 1496,1516 ****
return(1);
}
/* ARGSUSED */
- static void
- termp_d1_post(DECL_ARGS)
- {
-
- if (MDOC_BLOCK != n->type)
- return;
- term_newln(p);
- }
-
-
- /* ARGSUSED */
static int
termp_ft_pre(DECL_ARGS)
{
/* NB: MDOC_LINE does not effect this! */
--- 1512,1521 ----
*** 1522,1552 ****
--- 1527,1573 ----
/* ARGSUSED */
static int
termp_fn_pre(DECL_ARGS)
{
+ size_t rmargin = 0;
int pretty;
pretty = MDOC_SYNPRETTY & n->flags;
synopsis_pre(p, n);
if (NULL == (n = n->child))
return(0);
+ if (pretty) {
+ rmargin = p->rmargin;
+ p->rmargin = p->offset + term_len(p, 4);
+ p->flags |= TERMP_NOBREAK | TERMP_HANG;
+ }
+
assert(MDOC_TEXT == n->type);
term_fontpush(p, TERMFONT_BOLD);
term_word(p, n->string);
term_fontpop(p);
+ if (pretty) {
+ term_flushln(p);
+ p->flags &= ~(TERMP_NOBREAK | TERMP_HANG);
+ p->offset = p->rmargin;
+ p->rmargin = rmargin;
+ }
+
p->flags |= TERMP_NOSPACE;
term_word(p, "(");
p->flags |= TERMP_NOSPACE;
for (n = n->next; n; n = n->next) {
assert(MDOC_TEXT == n->type);
term_fontpush(p, TERMFONT_UNDER);
+ if (pretty)
+ p->flags |= TERMP_NBRWORD;
term_word(p, n->string);
term_fontpop(p);
if (n->next) {
p->flags |= TERMP_NOSPACE;
*** 1558,1567 ****
--- 1579,1589 ----
term_word(p, ")");
if (pretty) {
p->flags |= TERMP_NOSPACE;
term_word(p, ";");
+ term_flushln(p);
}
return(0);
}
*** 1577,1610 ****
return(1);
}
for (nn = n->child; nn; nn = nn->next) {
term_fontpush(p, TERMFONT_UNDER);
term_word(p, nn->string);
term_fontpop(p);
! if (nn->next) {
p->flags |= TERMP_NOSPACE;
term_word(p, ",");
}
}
- if (n->child && n->next && n->next->tok == MDOC_Fa) {
- p->flags |= TERMP_NOSPACE;
- term_word(p, ",");
- }
-
return(0);
}
/* ARGSUSED */
static int
termp_bd_pre(DECL_ARGS)
{
size_t tabwidth, rm, rmax;
! const struct mdoc_node *nn;
if (MDOC_BLOCK == n->type) {
print_bvspace(p, n, n);
return(1);
} else if (MDOC_HEAD == n->type)
--- 1599,1628 ----
return(1);
}
for (nn = n->child; nn; nn = nn->next) {
term_fontpush(p, TERMFONT_UNDER);
+ p->flags |= TERMP_NBRWORD;
term_word(p, nn->string);
term_fontpop(p);
! if (nn->next || (n->next && n->next->tok == MDOC_Fa)) {
p->flags |= TERMP_NOSPACE;
term_word(p, ",");
}
}
return(0);
}
/* ARGSUSED */
static int
termp_bd_pre(DECL_ARGS)
{
size_t tabwidth, rm, rmax;
! struct mdoc_node *nn;
if (MDOC_BLOCK == n->type) {
print_bvspace(p, n, n);
return(1);
} else if (MDOC_HEAD == n->type)
*** 1632,1642 ****
rm = p->rmargin;
rmax = p->maxrmargin;
p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
for (nn = n->child; nn; nn = nn->next) {
! print_mdoc_node(p, pair, m, nn);
/*
* If the printed node flushes its own line, then we
* needn't do it here as well. This is hacky, but the
* notion of selective eoln whitespace is pretty dumb
* anyway, so don't sweat it.
--- 1650,1660 ----
rm = p->rmargin;
rmax = p->maxrmargin;
p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
for (nn = n->child; nn; nn = nn->next) {
! print_mdoc_node(p, pair, meta, nn);
/*
* If the printed node flushes its own line, then we
* needn't do it here as well. This is hacky, but the
* notion of selective eoln whitespace is pretty dumb
* anyway, so don't sweat it.
*** 1749,1759 ****
break;
case (MDOC_Ux):
pp = "UNIX";
break;
default:
! break;
}
term_word(p, pp);
if (n->child) {
flags = p->flags;
--- 1767,1778 ----
break;
case (MDOC_Ux):
pp = "UNIX";
break;
default:
! abort();
! /* NOTREACHED */
}
term_word(p, pp);
if (n->child) {
flags = p->flags;
*** 1764,1783 ****
return(0);
}
/* ARGSUSED */
- static int
- termp_igndelim_pre(DECL_ARGS)
- {
-
- p->flags |= TERMP_IGNDELIM;
- return(1);
- }
-
-
- /* ARGSUSED */
static void
termp_pf_post(DECL_ARGS)
{
p->flags |= TERMP_NOSPACE;
--- 1783,1792 ----
*** 1921,1931 ****
term_word(p, "[");
break;
case (MDOC_Do):
/* FALLTHROUGH */
case (MDOC_Dq):
! term_word(p, "``");
break;
case (MDOC_Eo):
break;
case (MDOC_Po):
/* FALLTHROUGH */
--- 1930,1940 ----
term_word(p, "[");
break;
case (MDOC_Do):
/* FALLTHROUGH */
case (MDOC_Dq):
! term_word(p, "\\(lq");
break;
case (MDOC_Eo):
break;
case (MDOC_Po):
/* FALLTHROUGH */
*** 1942,1952 ****
case (MDOC_Ql):
/* FALLTHROUGH */
case (MDOC_So):
/* FALLTHROUGH */
case (MDOC_Sq):
! term_word(p, "`");
break;
default:
abort();
/* NOTREACHED */
}
--- 1951,1961 ----
case (MDOC_Ql):
/* FALLTHROUGH */
case (MDOC_So):
/* FALLTHROUGH */
case (MDOC_Sq):
! term_word(p, "\\(oq");
break;
default:
abort();
/* NOTREACHED */
}
*** 1987,1997 ****
term_word(p, "]");
break;
case (MDOC_Do):
/* FALLTHROUGH */
case (MDOC_Dq):
! term_word(p, "''");
break;
case (MDOC_Eo):
break;
case (MDOC_Po):
/* FALLTHROUGH */
--- 1996,2006 ----
term_word(p, "]");
break;
case (MDOC_Do):
/* FALLTHROUGH */
case (MDOC_Dq):
! term_word(p, "\\(rq");
break;
case (MDOC_Eo):
break;
case (MDOC_Po):
/* FALLTHROUGH */
*** 2008,2018 ****
case (MDOC_Ql):
/* FALLTHROUGH */
case (MDOC_So):
/* FALLTHROUGH */
case (MDOC_Sq):
! term_word(p, "'");
break;
default:
abort();
/* NOTREACHED */
}
--- 2017,2027 ----
case (MDOC_Ql):
/* FALLTHROUGH */
case (MDOC_So):
/* FALLTHROUGH */
case (MDOC_Sq):
! term_word(p, "\\(cq");
break;
default:
abort();
/* NOTREACHED */
}
*** 2021,2038 ****
--- 2030,2062 ----
/* ARGSUSED */
static int
termp_fo_pre(DECL_ARGS)
{
+ size_t rmargin = 0;
+ int pretty;
+ pretty = MDOC_SYNPRETTY & n->flags;
+
if (MDOC_BLOCK == n->type) {
synopsis_pre(p, n);
return(1);
} else if (MDOC_BODY == n->type) {
+ if (pretty) {
+ rmargin = p->rmargin;
+ p->rmargin = p->offset + term_len(p, 4);
+ p->flags |= TERMP_NOBREAK | TERMP_HANG;
+ }
p->flags |= TERMP_NOSPACE;
term_word(p, "(");
p->flags |= TERMP_NOSPACE;
+ if (pretty) {
+ term_flushln(p);
+ p->flags &= ~(TERMP_NOBREAK | TERMP_HANG);
+ p->offset = p->rmargin;
+ p->rmargin = rmargin;
+ }
return(1);
}
if (NULL == n->child)
return(0);
*** 2058,2067 ****
--- 2082,2092 ----
term_word(p, ")");
if (MDOC_SYNPRETTY & n->flags) {
p->flags |= TERMP_NOSPACE;
term_word(p, ";");
+ term_flushln(p);
}
}
/* ARGSUSED */
*** 2069,2079 ****
termp_bf_pre(DECL_ARGS)
{
if (MDOC_HEAD == n->type)
return(0);
! else if (MDOC_BLOCK != n->type)
return(1);
if (FONT_Em == n->norm->Bf.font)
term_fontpush(p, TERMFONT_UNDER);
else if (FONT_Sy == n->norm->Bf.font)
--- 2094,2104 ----
termp_bf_pre(DECL_ARGS)
{
if (MDOC_HEAD == n->type)
return(0);
! else if (MDOC_BODY != n->type)
return(1);
if (FONT_Em == n->norm->Bf.font)
term_fontpush(p, TERMFONT_UNDER);
else if (FONT_Sy == n->norm->Bf.font)
*** 2155,2183 ****
/* ARGSUSED */
static int
termp_lk_pre(DECL_ARGS)
{
! const struct mdoc_node *nn, *sv;
! term_fontpush(p, TERMFONT_UNDER);
! nn = sv = n->child;
!
! if (NULL == nn || NULL == nn->next)
! return(1);
!
! for (nn = nn->next; nn; nn = nn->next)
! term_word(p, nn->string);
!
! term_fontpop(p);
!
p->flags |= TERMP_NOSPACE;
term_word(p, ":");
term_fontpush(p, TERMFONT_BOLD);
! term_word(p, sv->string);
term_fontpop(p);
return(0);
}
--- 2180,2207 ----
/* ARGSUSED */
static int
termp_lk_pre(DECL_ARGS)
{
! const struct mdoc_node *link, *descr;
! if (NULL == (link = n->child))
! return(0);
! if (NULL != (descr = link->next)) {
! term_fontpush(p, TERMFONT_UNDER);
! while (NULL != descr) {
! term_word(p, descr->string);
! descr = descr->next;
! }
p->flags |= TERMP_NOSPACE;
term_word(p, ":");
+ term_fontpop(p);
+ }
term_fontpush(p, TERMFONT_BOLD);
! term_word(p, link->string);
term_fontpop(p);
return(0);
}
*** 2223,2235 ****
* If we're in an `Rs' and there's a journal present, then quote
* us instead of underlining us (for disambiguation).
*/
if (n->parent && MDOC_Rs == n->parent->tok &&
n->parent->norm->Rs.quote_T)
! termp_quote_post(p, pair, m, n);
! termp____post(p, pair, m, n);
}
/* ARGSUSED */
static int
termp__t_pre(DECL_ARGS)
--- 2247,2259 ----
* If we're in an `Rs' and there's a journal present, then quote
* us instead of underlining us (for disambiguation).
*/
if (n->parent && MDOC_Rs == n->parent->tok &&
n->parent->norm->Rs.quote_T)
! termp_quote_post(p, pair, meta, n);
! termp____post(p, pair, meta, n);
}
/* ARGSUSED */
static int
termp__t_pre(DECL_ARGS)
*** 2239,2249 ****
* If we're in an `Rs' and there's a journal present, then quote
* us instead of underlining us (for disambiguation).
*/
if (n->parent && MDOC_Rs == n->parent->tok &&
n->parent->norm->Rs.quote_T)
! return(termp_quote_pre(p, pair, m, n));
term_fontpush(p, TERMFONT_UNDER);
return(1);
}
--- 2263,2273 ----
* If we're in an `Rs' and there's a journal present, then quote
* us instead of underlining us (for disambiguation).
*/
if (n->parent && MDOC_Rs == n->parent->tok &&
n->parent->norm->Rs.quote_T)
! return(termp_quote_pre(p, pair, meta, n));
term_fontpush(p, TERMFONT_UNDER);
return(1);
}