-/* $Id: man_term.c,v 1.18 2009/08/10 10:09:51 kristaps Exp $ */
+/* $Id: man_term.c,v 1.21 2009/08/13 12:31:50 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
extern size_t strlcat(char *, const char *, size_t);
#endif
+#define MANT_LITERAL (1 << 0)
+
#define DECL_ARGS struct termp *p, \
+ int *fl, \
const struct man_node *n, \
const struct man_meta *m
static int pre_B(DECL_ARGS);
static int pre_BI(DECL_ARGS);
static int pre_BR(DECL_ARGS);
-static int pre_br(DECL_ARGS);
+static int pre_HP(DECL_ARGS);
static int pre_I(DECL_ARGS);
static int pre_IB(DECL_ARGS);
static int pre_IP(DECL_ARGS);
static int pre_SH(DECL_ARGS);
static int pre_SS(DECL_ARGS);
static int pre_TP(DECL_ARGS);
+static int pre_br(DECL_ARGS);
+static int pre_fi(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_HP(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 */
{ NULL, NULL }, /* TH */
{ pre_SH, post_SH }, /* SH */
{ pre_SS, post_SS }, /* SS */
- { pre_TP, NULL }, /* TP */
+ { pre_TP, post_TP }, /* TP */
{ pre_PP, NULL }, /* LP */
{ pre_PP, NULL }, /* PP */
{ pre_PP, NULL }, /* P */
{ pre_IP, NULL }, /* IP */
- { pre_PP, NULL }, /* HP */ /* FIXME */
+ { pre_HP, post_HP }, /* HP */
{ NULL, NULL }, /* SM */
{ pre_B, post_B }, /* SB */
{ pre_BI, NULL }, /* BI */
{ pre_I, post_I }, /* I */
{ pre_IR, NULL }, /* IR */
{ pre_RI, NULL }, /* RI */
- { NULL, NULL }, /* na */
- { pre_I, post_I }, /* i */
- { NULL, NULL }, /* sp */
+ { NULL, NULL }, /* na */ /* TODO: document that has no effect */
+ { pre_I, post_i }, /* i */
+ { pre_sp, NULL }, /* sp */
+ { pre_nf, NULL }, /* nf */
+ { pre_fi, NULL }, /* fi */
+ { pre_r, NULL }, /* r */
};
static void print_head(struct termp *,
int
man_run(struct termp *p, const struct man *m)
{
+ int fl;
print_head(p, man_meta(m));
p->flags |= TERMP_NOSPACE;
assert(man_node(m));
assert(MAN_ROOT == man_node(m)->type);
+
+ fl = 0;
if (man_node(m)->child)
- print_body(p, man_node(m)->child, man_meta(m));
+ print_body(p, &fl, man_node(m)->child, man_meta(m));
print_foot(p, man_meta(m));
return(1);
}
+/* ARGSUSED */
+static int
+pre_r(DECL_ARGS)
+{
+
+ p->flags &= ~TERMP_UNDER;
+ p->flags &= ~TERMP_BOLD;
+ return(1);
+}
+
+
+/* ARGSUSED */
+static void
+post_i(DECL_ARGS)
+{
+
+ if (n->nchild)
+ p->flags &= ~TERMP_UNDER;
+}
+
+
/* ARGSUSED */
static void
post_I(DECL_ARGS)
}
+/* ARGSUSED */
+static int
+pre_fi(DECL_ARGS)
+{
+
+ *fl &= ~MANT_LITERAL;
+ return(1);
+}
+
+
+/* ARGSUSED */
+static int
+pre_nf(DECL_ARGS)
+{
+
+ term_newln(p);
+ *fl |= MANT_LITERAL;
+ return(1);
+}
+
+
/* ARGSUSED */
static int
pre_IR(DECL_ARGS)
p->flags |= TERMP_UNDER;
if (i > 0)
p->flags |= TERMP_NOSPACE;
- print_node(p, nn, m);
+ print_node(p, fl, nn, m);
if ( ! (i % 2))
p->flags &= ~TERMP_UNDER;
}
p->flags |= i % 2 ? TERMP_BOLD : TERMP_UNDER;
if (i > 0)
p->flags |= TERMP_NOSPACE;
- print_node(p, nn, m);
+ print_node(p, fl, nn, m);
p->flags &= i % 2 ? ~TERMP_BOLD : ~TERMP_UNDER;
}
return(0);
p->flags |= TERMP_BOLD;
if (i > 0)
p->flags |= TERMP_NOSPACE;
- print_node(p, nn, m);
+ print_node(p, fl, nn, m);
if (i % 2)
p->flags &= ~TERMP_BOLD;
}
p->flags |= TERMP_UNDER;
if (i > 0)
p->flags |= TERMP_NOSPACE;
- print_node(p, nn, m);
+ print_node(p, fl, nn, m);
if ( ! (i % 2))
p->flags &= ~TERMP_UNDER;
}
p->flags |= TERMP_BOLD;
if (i > 0)
p->flags |= TERMP_NOSPACE;
- print_node(p, nn, m);
+ print_node(p, fl, nn, m);
if ( ! (i % 2))
p->flags &= ~TERMP_BOLD;
}
p->flags |= i % 2 ? TERMP_UNDER : TERMP_BOLD;
if (i > 0)
p->flags |= TERMP_NOSPACE;
- print_node(p, nn, m);
+ print_node(p, fl, nn, m);
p->flags &= i % 2 ? ~TERMP_UNDER : ~TERMP_BOLD;
}
return(0);
}
+/* ARGSUSED */
+static int
+pre_sp(DECL_ARGS)
+{
+ int i, len;
+
+ if (NULL == n->child) {
+ term_vspace(p);
+ return(0);
+ }
+
+ len = atoi(n->child->string);
+ if (0 == len)
+ term_newln(p);
+ for (i = 0; i < len; i++)
+ term_vspace(p);
+
+ return(0);
+}
+
+
/* ARGSUSED */
static int
pre_br(DECL_ARGS)
}
+/* ARGSUSED */
+static int
+pre_HP(DECL_ARGS)
+{
+
+ switch (n->type) {
+ case (MAN_BLOCK):
+ fmt_block_vspace(p, n);
+ break;
+ case (MAN_BODY):
+ p->flags |= TERMP_NOBREAK;
+ p->flags |= TERMP_TWOSPACE;
+ p->offset = INDENT;
+ p->rmargin = INDENT * 2;
+ break;
+ default:
+ return(0);
+ }
+
+ return(1);
+}
+
+
+/* ARGSUSED */
+static void
+post_HP(DECL_ARGS)
+{
+
+ switch (n->type) {
+ case (MAN_BODY):
+ term_flushln(p);
+ p->flags &= ~TERMP_NOBREAK;
+ p->flags &= ~TERMP_TWOSPACE;
+ p->offset = INDENT;
+ p->rmargin = p->maxrmargin;
+ break;
+ default:
+ break;
+ }
+}
+
+
/* ARGSUSED */
static int
pre_PP(DECL_ARGS)
{
- term_vspace(p);
- term_vspace(p);
- p->offset = INDENT;
- p->flags |= TERMP_NOSPACE;
- return(0);
+ switch (n->type) {
+ case (MAN_BLOCK):
+ fmt_block_vspace(p, n);
+ break;
+ default:
+ p->offset = INDENT;
+ break;
+ }
+
+ return(1);
}
static int
pre_IP(DECL_ARGS)
{
+ /* TODO */
+#if 0
const struct man_node *nn;
size_t offs, sv;
int ival;
break;
}
}
- print_node(p, nn, m);
+ print_node(p, fl, nn, m);
}
p->rmargin = p->offset + offs;
p->flags |= TERMP_NOLPAD | TERMP_NOSPACE;
return(0);
+#endif
+ return(1);
}
static int
pre_TP(DECL_ARGS)
{
- const struct man_node *nn;
- size_t offs;
-
- term_vspace(p);
- p->offset = INDENT;
+ switch (n->type) {
+ case (MAN_BLOCK):
+ fmt_block_vspace(p, n);
+ break;
+ case (MAN_HEAD):
+ p->rmargin = INDENT * 2;
+ p->offset = INDENT;
+ p->flags |= TERMP_NOBREAK;
+ p->flags |= TERMP_TWOSPACE;
+ break;
+ case (MAN_BODY):
+ p->flags |= TERMP_NOLPAD;
+ p->flags |= TERMP_NOSPACE;
+ p->offset = INDENT * 2;
+ break;
+ default:
+ break;
+ }
- if (NULL == (nn = n->child))
- return(1);
+ return(1);
+}
- if (nn->line == n->line) {
- if (MAN_TEXT != nn->type)
- errx(1, "expected text line argument");
- offs = (size_t)atoi(nn->string);
- nn = nn->next;
- } else
- offs = INDENT;
- for ( ; nn; nn = nn->next)
- print_node(p, nn, m);
+/* ARGSUSED */
+static void
+post_TP(DECL_ARGS)
+{
- term_flushln(p);
- p->flags |= TERMP_NOSPACE;
- p->offset += offs;
- return(0);
+ switch (n->type) {
+ case (MAN_HEAD):
+ term_flushln(p);
+ p->flags &= ~TERMP_NOBREAK;
+ p->flags &= ~TERMP_TWOSPACE;
+ p->rmargin = p->maxrmargin;
+ break;
+ case (MAN_BODY):
+ term_flushln(p);
+ p->flags &= ~TERMP_NOLPAD;
+ break;
+ default:
+ break;
+ }
}
pre_SS(DECL_ARGS)
{
- term_vspace(p);
- p->flags |= TERMP_BOLD;
+ switch (n->type) {
+ case (MAN_BLOCK):
+ term_newln(p);
+ if (n->prev)
+ term_vspace(p);
+ break;
+ case (MAN_HEAD):
+ p->flags |= TERMP_BOLD;
+ p->offset = HALFINDENT;
+ break;
+ default:
+ p->offset = INDENT;
+ break;
+ }
+
return(1);
}
post_SS(DECL_ARGS)
{
- term_flushln(p);
- p->flags &= ~TERMP_BOLD;
- p->flags |= TERMP_NOSPACE;
+ switch (n->type) {
+ case (MAN_HEAD):
+ term_newln(p);
+ p->flags &= ~TERMP_BOLD;
+ break;
+ default:
+ break;
+ }
}
static int
pre_SH(DECL_ARGS)
{
+ /*
+ * XXX: undocumented: using two `SH' macros in sequence has no
+ * vspace between calls, only a newline.
+ */
+ switch (n->type) {
+ case (MAN_BLOCK):
+ if (n->prev && MAN_SH == n->prev->tok)
+ if (NULL == n->prev->body->child)
+ break;
+ term_vspace(p);
+ break;
+ case (MAN_HEAD):
+ p->flags |= TERMP_BOLD;
+ p->offset = 0;
+ break;
+ case (MAN_BODY):
+ p->offset = INDENT;
+ break;
+ default:
+ break;
+ }
- term_vspace(p);
- p->offset = 0;
- p->flags |= TERMP_BOLD;
return(1);
}
post_SH(DECL_ARGS)
{
- term_flushln(p);
- p->offset = INDENT;
- p->flags &= ~TERMP_BOLD;
- p->flags |= TERMP_NOSPACE;
+ switch (n->type) {
+ case (MAN_HEAD):
+ term_newln(p);
+ p->flags &= ~TERMP_BOLD;
+ break;
+ case (MAN_BODY):
+ term_newln(p);
+ break;
+ default:
+ break;
+ }
}
c = 1;
switch (n->type) {
- case(MAN_ELEM):
- if (termacts[n->tok].pre)
- c = (*termacts[n->tok].pre)(p, n, m);
- break;
case(MAN_TEXT):
if (0 == *n->string) {
term_vspace(p);
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 & *fl) {
+ p->flags |= TERMP_NOSPACE;
+ term_flushln(p);
+ }
break;
default:
+ if (termacts[n->tok].pre)
+ c = (*termacts[n->tok].pre)(p, fl, n, m);
break;
}
if (c && n->child)
- print_body(p, n->child, m);
+ print_body(p, fl, n->child, m);
- switch (n->type) {
- case (MAN_ELEM):
+ if (MAN_TEXT != n->type)
if (termacts[n->tok].post)
- (*termacts[n->tok].post)(p, n, m);
- break;
- default:
- break;
- }
+ (*termacts[n->tok].post)(p, fl, n, m);
}
static void
print_body(DECL_ARGS)
{
- print_node(p, n, m);
+
+ print_node(p, fl, n, m);
if ( ! n->next)
return;
- print_body(p, n->next, m);
+ print_body(p, fl, n->next, m);
}
git.ckatri.com / mandoc.git / blobdiff