-/* $Id: mdoc_term.c,v 1.237 2011/11/03 20:36:59 schwarze Exp $ */
+/* $Id: mdoc_term.c,v 1.248 2013/05/29 16:11:40 schwarze Exp $ */
/*
* Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010, 2012 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
#include "mdoc.h"
#include "main.h"
-#define INDENT 5
-#define HALFINDENT 3
-
struct termpair {
struct termpair *ppair;
int count;
#define DECL_ARGS struct termp *p, \
struct termpair *pair, \
- const struct mdoc_meta *m, \
- const struct mdoc_node *n
+ const struct mdoc_meta *meta, \
+ struct mdoc_node *n
struct termact {
int (*pre)(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_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);
{ 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_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 }, /* Ev */
{ termp_ex_pre, NULL }, /* Ex */
{ termp_fa_pre, NULL }, /* Fa */
- { termp_fd_pre, NULL }, /* Fd */
+ { termp_fd_pre, termp_fd_post }, /* Fd */
{ termp_fl_pre, NULL }, /* Fl */
{ termp_fn_pre, NULL }, /* Fn */
{ termp_ft_pre, NULL }, /* Ft */
{ NULL, termp____post }, /* %Q */
{ termp_sp_pre, NULL }, /* br */
{ termp_sp_pre, NULL }, /* sp */
- { termp_under_pre, termp____post }, /* %U */
+ { NULL, termp____post }, /* %U */
{ NULL, NULL }, /* Ta */
};
terminal_mdoc(void *arg, const struct mdoc *mdoc)
{
const struct mdoc_node *n;
- const struct mdoc_meta *m;
+ const struct mdoc_meta *meta;
struct termp *p;
p = (struct termp *)arg;
+ if (0 == p->defindent)
+ p->defindent = 5;
+
p->overstep = 0;
p->maxrmargin = p->defrmargin;
p->tabwidth = term_len(p, 5);
p->symtab = mchars_alloc();
n = mdoc_node(mdoc);
- m = mdoc_meta(mdoc);
+ meta = mdoc_meta(mdoc);
- term_begin(p, print_mdoc_head, print_mdoc_foot, m);
+ term_begin(p, print_mdoc_head, print_mdoc_foot, meta);
if (n->child)
- print_mdoc_nodelist(p, NULL, m, n->child);
+ print_mdoc_nodelist(p, NULL, meta, n->child);
term_end(p);
}
print_mdoc_nodelist(DECL_ARGS)
{
- print_mdoc_node(p, pair, m, n);
+ print_mdoc_node(p, pair, meta, n);
if (n->next)
- print_mdoc_nodelist(p, pair, m, n->next);
+ print_mdoc_nodelist(p, pair, meta, n->next);
}
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);
+ n->prev_font = term_fontq(p);
memset(&npair, 0, sizeof(struct termpair));
npair.ppair = pair;
*/
if (TERMP_KEEP & p->flags || MDOC_SYNPRETTY & n->flags) {
- if (n->prev && n->prev->line != n->line) {
+ if (n->prev ? (n->prev->line != n->line) :
+ (n->parent && n->parent->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;
- }
}
}
default:
if (termacts[n->tok].pre && ENDBODY_NOT == n->end)
chld = (*termacts[n->tok].pre)
- (p, &npair, m, n);
+ (p, &npair, meta, n);
break;
}
if (chld && n->child)
- print_mdoc_nodelist(p, &npair, m, n->child);
+ print_mdoc_nodelist(p, &npair, meta, n->child);
- term_fontpopq(p, font);
+ term_fontpopq(p,
+ (ENDBODY_NOT == n->end ? n : n->pending)->prev_font);
switch (n->type) {
case (MDOC_TEXT):
default:
if ( ! termacts[n->tok].post || MDOC_ENDED & n->flags)
break;
- (void)(*termacts[n->tok].post)(p, &npair, m, n);
+ (void)(*termacts[n->tok].post)(p, &npair, meta, n);
/*
* Explicit end tokens not only call the post
static void
print_mdoc_foot(struct termp *p, const void *arg)
{
- const struct mdoc_meta *m;
+ const struct mdoc_meta *meta;
- m = (const struct mdoc_meta *)arg;
+ meta = (const struct mdoc_meta *)arg;
term_fontrepl(p, TERMFONT_NONE);
p->offset = 0;
p->rmargin = (p->maxrmargin -
- term_strlen(p, m->date) + term_len(p, 1)) / 2;
+ term_strlen(p, meta->date) + term_len(p, 1)) / 2;
p->flags |= TERMP_NOSPACE | TERMP_NOBREAK;
- term_word(p, m->os);
+ term_word(p, meta->os);
term_flushln(p);
p->offset = p->rmargin;
- p->rmargin = p->maxrmargin - term_strlen(p, m->os);
+ p->rmargin = p->maxrmargin - term_strlen(p, meta->os);
p->flags |= TERMP_NOSPACE;
- term_word(p, m->date);
+ term_word(p, meta->date);
term_flushln(p);
p->offset = p->rmargin;
p->flags &= ~TERMP_NOBREAK;
p->flags |= TERMP_NOSPACE;
- term_word(p, m->os);
+ term_word(p, meta->os);
term_flushln(p);
p->offset = 0;
{
char buf[BUFSIZ], title[BUFSIZ];
size_t buflen, titlen;
- const struct mdoc_meta *m;
+ const struct mdoc_meta *meta;
- m = (const struct mdoc_meta *)arg;
+ meta = (const struct mdoc_meta *)arg;
/*
* The header is strange. It has three components, which are
p->offset = 0;
p->rmargin = p->maxrmargin;
- assert(m->vol);
- strlcpy(buf, m->vol, BUFSIZ);
+ assert(meta->vol);
+ strlcpy(buf, meta->vol, BUFSIZ);
buflen = term_strlen(p, buf);
- if (m->arch) {
+ if (meta->arch) {
strlcat(buf, " (", BUFSIZ);
- strlcat(buf, m->arch, BUFSIZ);
+ strlcat(buf, meta->arch, BUFSIZ);
strlcat(buf, ")", BUFSIZ);
}
- snprintf(title, BUFSIZ, "%s(%s)", m->title, m->msec);
+ snprintf(title, BUFSIZ, "%s(%s)", meta->title, meta->msec);
titlen = term_strlen(p, title);
p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
else if (0 == strcmp(v, "left"))
return(0);
else if (0 == strcmp(v, "indent"))
- return(term_len(p, INDENT + 1));
+ return(term_len(p, p->defindent + 1));
else if (0 == strcmp(v, "indent-two"))
- return(term_len(p, (INDENT + 1) * 2));
+ return(term_len(p, (p->defindent + 1) * 2));
else if ( ! a2roffsu(v, &su, SCALE_MAX))
SCALE_HS_INIT(&su, term_strlen(p, v));
case (LIST_dash):
/* FALLTHROUGH */
case (LIST_hyphen):
- if (width < term_len(p, 4))
- width = term_len(p, 4);
- break;
+ /* FALLTHROUGH */
case (LIST_enum):
- if (width < term_len(p, 5))
- width = term_len(p, 5);
+ if (width < term_len(p, 2))
+ width = term_len(p, 2);
break;
case (LIST_hang):
if (0 == width)
*/
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_enum):
- /* FALLTHROUGH */
case (LIST_hyphen):
if (MDOC_HEAD == n->type)
p->flags |= TERMP_NOBREAK;
return(0);
p->flags |= TERMP_NOSPACE;
p->offset += term_len(p, 1) +
- (NULL == n->prev->child ? term_strlen(p, m->name) :
+ (NULL == n->prev->child ?
+ term_strlen(p, meta->name) :
MDOC_TEXT == n->prev->child->type ?
- term_strlen(p, n->prev->child->string) :
+ term_strlen(p, n->prev->child->string) :
term_len(p, 5));
return(1);
}
- if (NULL == n->child && NULL == m->name)
+ if (NULL == n->child && NULL == meta->name)
return(0);
if (MDOC_HEAD == n->type)
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);
+ 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)
term_fontpush(p, TERMFONT_BOLD);
if (NULL == n->child)
- term_word(p, m->name);
+ term_word(p, meta->name);
return(1);
}
if (MDOC_ELEM == n->type) {
synopsis_pre(p, n);
- return(termp_under_pre(p, pair, m, 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, m, n));
+ return(termp_under_pre(p, pair, meta, n));
}
{
synopsis_pre(p, n);
- return(termp_bold_pre(p, pair, m, n));
+ return(termp_bold_pre(p, pair, meta, n));
+}
+
+
+/* ARGSUSED */
+static void
+termp_fd_post(DECL_ARGS)
+{
+
+ term_newln(p);
}
term_fontpush(p, TERMFONT_BOLD);
break;
case (MDOC_BODY):
- p->offset = term_len(p, INDENT);
+ p->offset = term_len(p, p->defindent);
+ if (SEC_AUTHORS == n->sec)
+ p->flags &= ~(TERMP_SPLIT|TERMP_NOSPLIT);
break;
default:
break;
if (MDOC_BLOCK != n->type)
return(1);
term_newln(p);
- p->offset += term_len(p, (INDENT + 1));
+ p->offset += term_len(p, p->defindent + 1);
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)
termp_bd_pre(DECL_ARGS)
{
size_t tabwidth, rm, rmax;
- const struct mdoc_node *nn;
+ struct mdoc_node *nn;
if (MDOC_BLOCK == n->type) {
print_bvspace(p, n, n);
p->rmargin = p->maxrmargin = TERM_MAXMARGIN;
for (nn = n->child; nn; nn = nn->next) {
- print_mdoc_node(p, pair, m, nn);
+ 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
pp = "UNIX";
break;
default:
- break;
+ abort();
+ /* NOTREACHED */
}
term_word(p, pp);
break;
case (MDOC_HEAD):
term_fontpush(p, TERMFONT_BOLD);
- p->offset = term_len(p, HALFINDENT);
+ p->offset = term_len(p, (p->defindent+1)/2);
break;
default:
break;
if (MDOC_HEAD == n->type)
return(0);
- else if (MDOC_BLOCK != n->type)
+ else if (MDOC_BODY != n->type)
return(1);
if (FONT_Em == n->norm->Bf.font)
static int
termp_lk_pre(DECL_ARGS)
{
- const struct mdoc_node *nn, *sv;
-
- term_fontpush(p, TERMFONT_UNDER);
-
- nn = sv = n->child;
+ const struct mdoc_node *link, *descr;
- if (NULL == nn || NULL == nn->next)
- return(1);
-
- for (nn = nn->next; nn; nn = nn->next)
- term_word(p, nn->string);
-
- term_fontpop(p);
+ if (NULL == (link = n->child))
+ return(0);
- p->flags |= TERMP_NOSPACE;
- term_word(p, ":");
+ 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, sv->string);
+ term_word(p, link->string);
term_fontpop(p);
return(0);
termp_bk_post(DECL_ARGS)
{
- if (MDOC_BODY == n->type)
+ if (MDOC_BODY == n->type && ! (MDOC_SYNPRETTY & n->flags))
p->flags &= ~(TERMP_KEEP | TERMP_PREKEEP);
}
*/
if (n->parent && MDOC_Rs == n->parent->tok &&
n->parent->norm->Rs.quote_T)
- termp_quote_post(p, pair, m, n);
+ termp_quote_post(p, pair, meta, n);
- termp____post(p, pair, m, n);
+ termp____post(p, pair, meta, n);
}
/* ARGSUSED */
*/
if (n->parent && MDOC_Rs == n->parent->tok &&
n->parent->norm->Rs.quote_T)
- return(termp_quote_pre(p, pair, m, n));
+ return(termp_quote_pre(p, pair, meta, n));
term_fontpush(p, TERMFONT_UNDER);
return(1);
git.ckatri.com / mandoc.git / blobdiff