-/* $Id: man_term.c,v 1.38 2009/10/18 11:52:18 kristaps Exp $ */
+/* $Id: man_term.c,v 1.54 2009/11/12 08:21:05 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
#include <assert.h>
#include <ctype.h>
-#include <err.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
+#include "out.h"
#include "man.h"
#include "term.h"
#include "chars.h"
#include "main.h"
-#include "out.h"
#define INDENT 7
#define HALFINDENT 3
+/* FIXME: have PD set the default vspace width. */
+
struct mtermp {
int fl;
#define MANT_LITERAL (1 << 0)
void (*post)(DECL_ARGS);
};
+#ifdef __linux__
+extern size_t strlcpy(char *, const char *, size_t);
+extern size_t strlcat(char *, const char *, size_t);
+#endif
+
+static int a2width(const struct man_node *);
+static int a2height(const struct man_node *);
+
+static void print_man_head(struct termp *,
+ const struct man_meta *);
+static void print_man_nodelist(DECL_ARGS);
+static void print_man_node(DECL_ARGS);
+static void print_man_foot(struct termp *,
+ const struct man_meta *);
+static void print_bvspace(struct termp *,
+ const struct man_node *);
+
static int pre_B(DECL_ARGS);
static int pre_BI(DECL_ARGS);
static int pre_HP(DECL_ARGS);
static int pre_I(DECL_ARGS);
static int pre_IP(DECL_ARGS);
-static int pre_IR(DECL_ARGS);
static int pre_PP(DECL_ARGS);
static int pre_RB(DECL_ARGS);
static int pre_RI(DECL_ARGS);
static int pre_fi(DECL_ARGS);
static int pre_ign(DECL_ARGS);
static int pre_nf(DECL_ARGS);
-static int pre_r(DECL_ARGS);
static int pre_sp(DECL_ARGS);
-static void post_B(DECL_ARGS);
-static void post_I(DECL_ARGS);
static void post_IP(DECL_ARGS);
static void post_HP(DECL_ARGS);
static void post_RS(DECL_ARGS);
static void post_SH(DECL_ARGS);
static void post_SS(DECL_ARGS);
static void post_TP(DECL_ARGS);
-static void post_i(DECL_ARGS);
static const struct termact termacts[MAN_MAX] = {
{ pre_br, NULL }, /* br */
{ pre_IP, post_IP }, /* IP */
{ pre_HP, post_HP }, /* HP */
{ NULL, NULL }, /* SM */
- { pre_B, post_B }, /* SB */
+ { pre_B, NULL }, /* SB */
{ pre_BI, NULL }, /* BI */
{ pre_BI, NULL }, /* IB */
{ pre_RB, NULL }, /* BR */
{ pre_RB, NULL }, /* RB */
{ NULL, NULL }, /* R */
- { pre_B, post_B }, /* B */
- { pre_I, post_I }, /* I */
- { pre_IR, NULL }, /* IR */
+ { pre_B, NULL }, /* B */
+ { pre_I, NULL }, /* I */
+ { pre_RI, NULL }, /* IR */
{ pre_RI, NULL }, /* RI */
{ NULL, NULL }, /* na */
- { pre_I, post_i }, /* i */
+ { pre_I, NULL }, /* i */
{ pre_sp, NULL }, /* sp */
{ pre_nf, NULL }, /* nf */
{ pre_fi, NULL }, /* fi */
- { pre_r, NULL }, /* r */
+ { NULL, NULL }, /* r */
{ NULL, NULL }, /* RE */
{ pre_RS, post_RS }, /* RS */
{ pre_ign, NULL }, /* DT */
{ pre_ign, NULL }, /* UC */
+ { pre_ign, NULL }, /* PD */
};
-#ifdef __linux__
-extern size_t strlcpy(char *, const char *, size_t);
-extern size_t strlcat(char *, const char *, size_t);
-#endif
-
-static void print_head(struct termp *,
- const struct man_meta *);
-static void print_body(DECL_ARGS);
-static void print_node(DECL_ARGS);
-static void print_foot(struct termp *,
- const struct man_meta *);
-static void fmt_block_vspace(struct termp *,
- const struct man_node *);
-static int a2width(const char *);
-static int a2height(const char *);
void
n = man_node(man);
m = man_meta(man);
- print_head(p, m);
+ print_man_head(p, m);
p->flags |= TERMP_NOSPACE;
mt.fl = 0;
mt.offset = INDENT;
if (n->child)
- print_body(p, &mt, n->child, m);
- print_foot(p, m);
+ print_man_nodelist(p, &mt, n->child, m);
+ print_man_foot(p, m);
}
-static void
-fmt_block_vspace(struct termp *p, const struct man_node *n)
+static int
+a2height(const struct man_node *n)
{
- term_newln(p);
-
- if (NULL == n->prev)
- return;
+ struct roffsu su;
- if (MAN_SS == n->prev->tok)
- return;
- if (MAN_SH == n->prev->tok)
- return;
+ assert(MAN_TEXT == n->type);
+ assert(n->string);
+ if ( ! a2roffsu(n->string, &su, SCALE_VS))
+ SCALE_VS_INIT(&su, strlen(n->string));
- term_vspace(p);
+ return((int)term_vspan(&su));
}
static int
-a2height(const char *p)
+a2width(const struct man_node *n)
{
struct roffsu su;
- double r;
-
- if ( ! a2roffsu(p, &su))
- return(1);
- switch (su.unit) {
- case (SCALE_CM):
- r = su.scale * 2;
- break;
- case (SCALE_IN):
- r = su.scale * 6;
- break;
- case (SCALE_PC):
- r = su.scale;
- break;
- case (SCALE_PT):
- r = su.scale / 8;
- break;
- case (SCALE_MM):
- r = su.scale / 1000;
- break;
- case (SCALE_VS):
- r = su.scale;
- break;
- default:
- r = su.scale - 1;
- break;
- }
+ assert(MAN_TEXT == n->type);
+ assert(n->string);
+ if ( ! a2roffsu(n->string, &su, SCALE_BU))
+ return(-1);
- if (r < 0.0)
- r = 0.0;
- return(/* LINTED */(int)
- r);
+ return((int)term_hspan(&su));
}
-static int
-a2width(const char *p)
+static void
+print_bvspace(struct termp *p, const struct man_node *n)
{
- struct roffsu su;
- double r;
+ term_newln(p);
- if ( ! a2roffsu(p, &su))
- return(-1);
+ if (NULL == n->prev)
+ return;
- switch (su.unit) {
- case (SCALE_CM):
- r = 4 * su.scale;
- break;
- case (SCALE_IN):
- r = 10 * su.scale;
- break;
- case (SCALE_PC):
- r = 2 * su.scale;
- break;
- case (SCALE_PT):
- r = (su.scale / 10) + 1;
- break;
- case (SCALE_MM):
- r = su.scale / 1000;
- break;
- case (SCALE_VS):
- r = su.scale * 2 - 1;
- break;
- default:
- r = su.scale + 1;
- break;
- }
+ if (MAN_SS == n->prev->tok)
+ return;
+ if (MAN_SH == n->prev->tok)
+ return;
- if (r < 0.0)
- r = 0.0;
- return((int)/* LINTED */
- r);
+ term_vspace(p);
}
pre_I(DECL_ARGS)
{
- p->under++;
+ term_fontrepl(p, TERMFONT_UNDER);
return(1);
}
-/* ARGSUSED */
-static int
-pre_r(DECL_ARGS)
-{
-
- p->bold = p->under = 0;
- return(1);
-}
-
-
-/* ARGSUSED */
-static void
-post_i(DECL_ARGS)
-{
-
- if (n->nchild)
- p->under--;
-}
-
-
-/* ARGSUSED */
-static void
-post_I(DECL_ARGS)
-{
-
- p->under--;
-}
-
-
/* ARGSUSED */
static int
pre_fi(DECL_ARGS)
}
-/* ARGSUSED */
-static int
-pre_IR(DECL_ARGS)
-{
- const struct man_node *nn;
- int i;
-
- for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
- if ( ! (i % 2))
- p->under++;
- if (i > 0)
- p->flags |= TERMP_NOSPACE;
- print_node(p, mt, nn, m);
- if ( ! (i % 2))
- p->under--;
- }
- return(0);
-}
-
-
/* ARGSUSED */
static int
pre_RB(DECL_ARGS)
for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
if (i % 2 && MAN_RB == n->tok)
- p->bold++;
+ term_fontrepl(p, TERMFONT_BOLD);
else if ( ! (i % 2) && MAN_RB != n->tok)
- p->bold++;
+ term_fontrepl(p, TERMFONT_BOLD);
+ else
+ term_fontrepl(p, TERMFONT_NONE);
if (i > 0)
p->flags |= TERMP_NOSPACE;
- print_node(p, mt, nn, m);
-
- if (i % 2 && MAN_RB == n->tok)
- p->bold--;
- else if ( ! (i % 2) && MAN_RB != n->tok)
- p->bold--;
+ print_man_node(p, mt, nn, m);
}
return(0);
}
int i;
for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
- if ( ! (i % 2))
- p->under++;
+ if (i % 2 && MAN_RI == n->tok)
+ term_fontrepl(p, TERMFONT_UNDER);
+ else if ( ! (i % 2) && MAN_RI != n->tok)
+ term_fontrepl(p, TERMFONT_UNDER);
+ else
+ term_fontrepl(p, TERMFONT_NONE);
+
if (i > 0)
p->flags |= TERMP_NOSPACE;
- print_node(p, mt, nn, m);
- if ( ! (i % 2))
- p->under--;
+
+ print_man_node(p, mt, nn, m);
}
return(0);
}
for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
if (i % 2 && MAN_BI == n->tok)
- p->under++;
+ term_fontrepl(p, TERMFONT_UNDER);
else if (i % 2)
- p->bold++;
+ term_fontrepl(p, TERMFONT_BOLD);
else if (MAN_BI == n->tok)
- p->bold++;
+ term_fontrepl(p, TERMFONT_BOLD);
else
- p->under++;
+ term_fontrepl(p, TERMFONT_UNDER);
if (i)
p->flags |= TERMP_NOSPACE;
- print_node(p, mt, nn, m);
- if (i % 2 && MAN_BI == n->tok)
- p->under--;
- else if (i % 2)
- p->bold--;
- else if (MAN_BI == n->tok)
- p->bold--;
- else
- p->under--;
+ print_man_node(p, mt, nn, m);
}
return(0);
}
pre_B(DECL_ARGS)
{
- p->bold++;
+ term_fontrepl(p, TERMFONT_BOLD);
return(1);
}
-/* ARGSUSED */
-static void
-post_B(DECL_ARGS)
-{
-
- p->bold--;
-}
-
-
/* ARGSUSED */
static int
pre_sp(DECL_ARGS)
{
int i, len;
- if (NULL == n->child) {
- term_vspace(p);
- return(0);
- }
-
- assert(MAN_TEXT == n->child->type);
- len = a2height(n->child->string);
+ len = n->child ? a2height(n->child) : 1;
if (0 == len)
term_newln(p);
switch (n->type) {
case (MAN_BLOCK):
- fmt_block_vspace(p, n);
+ print_bvspace(p, n);
return(1);
case (MAN_BODY):
p->flags |= TERMP_NOBREAK;
/* Calculate offset. */
- if (NULL != (nn = n->parent->head->child)) {
- assert(MAN_TEXT == nn->type);
- if ((ival = a2width(nn->string)) >= 0)
+ if (NULL != (nn = n->parent->head->child))
+ if ((ival = a2width(nn)) >= 0)
len = (size_t)ival;
- }
if (0 == len)
len = 1;
switch (n->type) {
case (MAN_BLOCK):
mt->lmargin = INDENT;
- fmt_block_vspace(p, n);
+ print_bvspace(p, n);
break;
default:
p->offset = mt->offset;
p->flags |= TERMP_TWOSPACE;
break;
case (MAN_BLOCK):
- fmt_block_vspace(p, n);
+ print_bvspace(p, n);
/* FALLTHROUGH */
default:
return(1);
if (NULL != (nn = nn->next)) {
for ( ; nn->next; nn = nn->next)
/* Do nothing. */ ;
- assert(MAN_TEXT == nn->type);
- if ((ival = a2width(nn->string)) >= 0)
+ if ((ival = a2width(nn)) >= 0)
len = (size_t)ival;
}
/* Don't print the length value. */
for (nn = n->child; nn->next; nn = nn->next)
- print_node(p, mt, nn, m);
+ print_man_node(p, mt, nn, m);
return(0);
case (MAN_BODY):
p->offset = mt->offset + len;
p->flags |= TERMP_NOSPACE;
break;
case (MAN_BLOCK):
- fmt_block_vspace(p, n);
+ print_bvspace(p, n);
/* FALLTHROUGH */
default:
return(1);
/* Calculate offset. */
if (NULL != (nn = n->parent->head->child))
- if (NULL != nn->next) {
- assert(MAN_TEXT == nn->type);
- if ((ival = a2width(nn->string)) >= 0)
+ if (NULL != nn->next)
+ if ((ival = a2width(nn)) >= 0)
len = (size_t)ival;
- }
switch (n->type) {
case (MAN_HEAD):
/* Don't print same-line elements. */
for (nn = n->child; nn; nn = nn->next)
if (nn->line > n->line)
- print_node(p, mt, nn, m);
+ print_man_node(p, mt, nn, m);
if (ival >= 0)
mt->lmargin = (size_t)ival;
term_vspace(p);
break;
case (MAN_HEAD):
- p->bold++;
+ term_fontrepl(p, TERMFONT_BOLD);
p->offset = HALFINDENT;
break;
case (MAN_BODY):
switch (n->type) {
case (MAN_HEAD):
term_newln(p);
- p->bold--;
break;
case (MAN_BODY):
term_newln(p);
term_vspace(p);
break;
case (MAN_HEAD):
- p->bold++;
+ term_fontrepl(p, TERMFONT_BOLD);
p->offset = 0;
break;
case (MAN_BODY):
switch (n->type) {
case (MAN_HEAD):
term_newln(p);
- p->bold--;
break;
case (MAN_BODY):
term_newln(p);
return(1);
}
- assert(MAN_TEXT == nn->type);
- if ((ival = a2width(nn->string)) < 0)
+ if ((ival = a2width(nn)) < 0)
return(1);
mt->offset = INDENT + (size_t)ival;
static void
-print_node(DECL_ARGS)
+print_man_node(DECL_ARGS)
{
- int c, sz;
+ int c;
c = 1;
term_vspace(p);
break;
}
- /*
- * Note! This is hacky. Here, we recognise the `\c'
- * escape embedded in so many -man pages. It's supposed
- * to remove the subsequent space, so we mark NOSPACE if
- * it's encountered in the string.
- */
- sz = (int)strlen(n->string);
+
term_word(p, n->string);
- if (sz >= 2 && n->string[sz - 1] == 'c' &&
- n->string[sz - 2] == '\\')
- p->flags |= TERMP_NOSPACE;
+
/* FIXME: this means that macro lines are munged! */
+
if (MANT_LITERAL & mt->fl) {
p->flags |= TERMP_NOSPACE;
term_flushln(p);
}
break;
default:
+ term_fontrepl(p, TERMFONT_NONE);
if (termacts[n->tok].pre)
c = (*termacts[n->tok].pre)(p, mt, n, m);
break;
}
if (c && n->child)
- print_body(p, mt, n->child, m);
+ print_man_nodelist(p, mt, n->child, m);
- if (MAN_TEXT != n->type)
+ if (MAN_TEXT != n->type) {
if (termacts[n->tok].post)
(*termacts[n->tok].post)(p, mt, n, m);
+ term_fontrepl(p, TERMFONT_NONE);
+ }
}
static void
-print_body(DECL_ARGS)
+print_man_nodelist(DECL_ARGS)
{
- print_node(p, mt, n, m);
+ print_man_node(p, mt, n, m);
if ( ! n->next)
return;
- print_body(p, mt, n->next, m);
+ print_man_nodelist(p, mt, n->next, m);
}
static void
-print_foot(struct termp *p, const struct man_meta *meta)
+print_man_foot(struct termp *p, const struct man_meta *meta)
{
- struct tm *tm;
- char buf[BUFSIZ];
+ char buf[DATESIZ];
- tm = localtime(&meta->date);
+ term_fontrepl(p, TERMFONT_NONE);
- if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
- (void)strlcpy(buf, "(invalid date)", BUFSIZ);
+ time2a(meta->date, buf, DATESIZ);
term_vspace(p);
static void
-print_head(struct termp *p, const struct man_meta *meta)
+print_man_head(struct termp *p, const struct man_meta *m)
{
- char *buf, *title;
+ char buf[BUFSIZ], title[BUFSIZ];
p->rmargin = p->maxrmargin;
p->offset = 0;
+ buf[0] = title[0] = '\0';
- if (NULL == (buf = malloc(p->rmargin)))
- err(EXIT_FAILURE, "malloc");
- if (NULL == (title = malloc(p->rmargin)))
- err(EXIT_FAILURE, "malloc");
-
- if (meta->vol)
- (void)strlcpy(buf, meta->vol, p->rmargin);
- else
- *buf = 0;
+ if (m->vol)
+ strlcpy(buf, m->vol, BUFSIZ);
- (void)snprintf(title, p->rmargin, "%s(%d)",
- meta->title, meta->msec);
+ snprintf(title, BUFSIZ, "%s(%d)", m->title, m->msec);
p->offset = 0;
p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2;
p->rmargin = p->maxrmargin;
p->offset = 0;
p->flags &= ~TERMP_NOSPACE;
-
- free(title);
- free(buf);
}
-
git.ckatri.com / mandoc.git / blobdiff