-/* $Id: term.c,v 1.21 2009/02/25 15:12:26 kristaps Exp $ */
+/* $Id: term.c,v 1.45 2009/03/08 13:57:07 kristaps Exp $ */
/*
* Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
*
* PERFORMANCE OF THIS SOFTWARE.
*/
#include <assert.h>
+#include <ctype.h>
+#include <err.h>
+#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "term.h"
-#define INDENT 4
-
/*
* Performs actions on nodes of the abstract syntax tree. Both pre- and
* post-fix operations are defined here.
*/
-/* FIXME: indent/tab. */
/* FIXME: macro arguments can be escaped. */
#define TTYPE_PROG 0
#define TTYPE_INCLUDE 15
#define TTYPE_SYMB 16
#define TTYPE_SYMBOL 17
-#define TTYPE_NMAX 18
+#define TTYPE_DIAG 18
+#define TTYPE_NMAX 19
/*
* These define "styles" for element types, like command arguments or
* the same thing (like .Ex -std cmd and .Nm cmd).
*/
+/* TODO: abstract this into mdocterm.c. */
+
const int ttypes[TTYPE_NMAX] = {
TERMP_BOLD, /* TTYPE_PROG */
TERMP_BOLD, /* TTYPE_CMD_FLAG */
TERMP_BOLD, /* TTYPE_CMD */
TERMP_BOLD, /* TTYPE_INCLUDE */
TERMP_BOLD, /* TTYPE_SYMB */
- TERMP_BOLD /* TTYPE_SYMBOL */
+ TERMP_BOLD, /* TTYPE_SYMBOL */
+ TERMP_BOLD /* TTYPE_DIAG */
};
-static int arg_hasattr(int, size_t,
- const struct mdoc_arg *);
-static int arg_getattr(int, size_t,
- const struct mdoc_arg *);
-static size_t arg_offset(const struct mdoc_arg *);
-static size_t arg_width(const struct mdoc_arg *);
+static int arg_hasattr(int, const struct mdoc_node *);
+static int arg_getattr(int, const struct mdoc_node *);
+static size_t arg_offset(const struct mdoc_argv *);
+static size_t arg_width(const struct mdoc_argv *);
+static int arg_listtype(const struct mdoc_node *);
/*
* What follows describes prefix and postfix operations for the abstract
DECL_PRE(name); \
DECL_POST(name);
+DECL_PREPOST(termp__t);
DECL_PREPOST(termp_aq);
DECL_PREPOST(termp_bd);
DECL_PREPOST(termp_bq);
DECL_PREPOST(termp_fn);
DECL_PREPOST(termp_fo);
DECL_PREPOST(termp_ft);
+DECL_PREPOST(termp_in);
DECL_PREPOST(termp_it);
DECL_PREPOST(termp_op);
DECL_PREPOST(termp_pf);
DECL_PRE(termp_bf);
DECL_PRE(termp_bsx);
DECL_PRE(termp_bt);
-DECL_PRE(termp_bx);
DECL_PRE(termp_cd);
DECL_PRE(termp_cm);
DECL_PRE(termp_em);
DECL_PRE(termp_fl);
DECL_PRE(termp_fx);
DECL_PRE(termp_ic);
-DECL_PRE(termp_in);
DECL_PRE(termp_ms);
DECL_PRE(termp_nd);
DECL_PRE(termp_nm);
DECL_PRE(termp_ox);
DECL_PRE(termp_pa);
DECL_PRE(termp_pp);
+DECL_PRE(termp_rs);
DECL_PRE(termp_rv);
+DECL_PRE(termp_sm);
DECL_PRE(termp_st);
DECL_PRE(termp_sx);
DECL_PRE(termp_sy);
DECL_PRE(termp_va);
DECL_PRE(termp_xr);
+DECL_POST(termp___);
DECL_POST(termp_bl);
+DECL_POST(termp_bx);
+DECL_POST(termp_lb);
const struct termact __termacts[MDOC_MAX] = {
{ NULL, NULL }, /* \" */
{ termp_ss_pre, termp_ss_post }, /* Ss */
{ termp_pp_pre, NULL }, /* Pp */
{ termp_d1_pre, termp_d1_post }, /* D1 */
- { NULL, NULL }, /* Dl */
+ { termp_d1_pre, termp_d1_post }, /* Dl */
{ termp_bd_pre, termp_bd_post }, /* Bd */
{ NULL, NULL }, /* Ed */
{ NULL, termp_bl_post }, /* Bl */
{ termp_fn_pre, termp_fn_post }, /* Fn */
{ termp_ft_pre, termp_ft_post }, /* Ft */
{ termp_ic_pre, NULL }, /* Ic */
- { termp_in_pre, NULL }, /* In */
+ { termp_in_pre, termp_in_post }, /* In */
{ NULL, NULL }, /* Li */
{ termp_nd_pre, NULL }, /* Nd */
{ termp_nm_pre, NULL }, /* Nm */
{ termp_va_pre, NULL }, /* Va */
{ termp_vt_pre, termp_vt_post }, /* Vt */
{ termp_xr_pre, NULL }, /* Xr */
- { NULL, NULL }, /* %A */
- { NULL, NULL }, /* %B */
- { NULL, NULL }, /* %D */
- { NULL, NULL }, /* %I */
- { NULL, NULL }, /* %J */
- { NULL, NULL }, /* %N */
- { NULL, NULL }, /* %O */
- { NULL, NULL }, /* %P */
- { NULL, NULL }, /* %R */
- { NULL, NULL }, /* %T */
- { NULL, NULL }, /* %V */
+ { NULL, termp____post }, /* %A */
+ { NULL, termp____post }, /* %B */
+ { NULL, termp____post }, /* %D */
+ { NULL, termp____post }, /* %I */
+ { NULL, termp____post }, /* %J */
+ { NULL, termp____post }, /* %N */
+ { NULL, termp____post }, /* %O */
+ { NULL, termp____post }, /* %P */
+ { NULL, termp____post }, /* %R */
+ { termp__t_pre, termp__t_post }, /* %T */
+ { NULL, termp____post }, /* %V */
{ NULL, NULL }, /* Ac */
{ termp_aq_pre, termp_aq_post }, /* Ao */
{ termp_aq_pre, termp_aq_post }, /* Aq */
{ termp_bq_pre, termp_bq_post }, /* Bo */
{ termp_bq_pre, termp_bq_post }, /* Bq */
{ termp_bsx_pre, NULL }, /* Bsx */
- { termp_bx_pre, NULL }, /* Bx */
+ { NULL, termp_bx_post }, /* Bx */
{ NULL, NULL }, /* Db */
{ NULL, NULL }, /* Dc */
{ termp_dq_pre, termp_dq_post }, /* Do */
{ termp_qq_pre, termp_qq_post }, /* Qo */
{ termp_qq_pre, termp_qq_post }, /* Qq */
{ NULL, NULL }, /* Re */
- { NULL, NULL }, /* Rs */
+ { termp_rs_pre, NULL }, /* Rs */
{ NULL, NULL }, /* Sc */
{ termp_sq_pre, termp_sq_post }, /* So */
{ termp_sq_pre, termp_sq_post }, /* Sq */
- { NULL, NULL }, /* Sm */
+ { termp_sm_pre, NULL }, /* Sm */
{ termp_sx_pre, NULL }, /* Sx */
{ termp_sy_pre, NULL }, /* Sy */
{ NULL, NULL }, /* Tn */
{ NULL, NULL }, /* Hf */
{ NULL, NULL }, /* Fr */
{ termp_ud_pre, NULL }, /* Ud */
+ { NULL, termp_lb_post }, /* lb */
};
const struct termact *termacts = __termacts;
static size_t
-arg_width(const struct mdoc_arg *arg)
+arg_width(const struct mdoc_argv *arg)
{
+ size_t v;
+ int i, len;
- /* TODO */
assert(*arg->value);
- return(strlen(*arg->value));
+ if (0 == strcmp(*arg->value, "indent"))
+ return(INDENT);
+ if (0 == strcmp(*arg->value, "indent-two"))
+ return(INDENT * 2);
+
+ len = (int)strlen(*arg->value);
+ assert(len > 0);
+
+ for (i = 0; i < len - 1; i++)
+ if ( ! isdigit((u_char)(*arg->value)[i]))
+ break;
+
+ if (i == len - 1) {
+ if ('n' == (*arg->value)[len - 1]) {
+ v = (size_t)atoi(*arg->value);
+ return(v);
+ }
+
+ }
+ return(strlen(*arg->value) + 1);
+}
+
+
+static int
+arg_listtype(const struct mdoc_node *n)
+{
+ int i, len;
+
+ assert(MDOC_BLOCK == n->type);
+
+ len = n->args ? n->args->argc : 0;
+
+ for (i = 0; i < len; i++)
+ switch (n->args->argv[i].arg) {
+ case (MDOC_Bullet):
+ /* FALLTHROUGH */
+ case (MDOC_Dash):
+ /* FALLTHROUGH */
+ case (MDOC_Enum):
+ /* FALLTHROUGH */
+ case (MDOC_Hyphen):
+ /* FALLTHROUGH */
+ case (MDOC_Tag):
+ /* FALLTHROUGH */
+ case (MDOC_Inset):
+ /* FALLTHROUGH */
+ case (MDOC_Diag):
+ /* FALLTHROUGH */
+ case (MDOC_Item):
+ /* FALLTHROUGH */
+ case (MDOC_Ohang):
+ return(n->args->argv[i].arg);
+ default:
+ break;
+ }
+
+ errx(1, "list type not supported");
+ /* NOTREACHED */
}
static size_t
-arg_offset(const struct mdoc_arg *arg)
+arg_offset(const struct mdoc_argv *arg)
{
/* TODO */
return(INDENT);
if (0 == strcmp(*arg->value, "indent-two"))
return(INDENT * 2);
-
return(strlen(*arg->value));
}
static int
-arg_hasattr(int arg, size_t argc, const struct mdoc_arg *argv)
+arg_hasattr(int arg, const struct mdoc_node *n)
{
- return(-1 != arg_getattr(arg, argc, argv));
+ return(-1 != arg_getattr(arg, n));
}
static int
-arg_getattr(int arg, size_t argc, const struct mdoc_arg *argv)
+arg_getattr(int arg, const struct mdoc_node *n)
{
int i;
- for (i = 0; i < (int)argc; i++)
- if (argv[i].arg == arg)
+ if (NULL == n->args)
+ return(-1);
+ for (i = 0; i < (int)n->args->argc; i++)
+ if (n->args->argv[i].arg == arg)
return(i);
return(-1);
}
}
+/* ARGSUSED */
+static int
+termp_it_pre_block(DECL_ARGS)
+{
+
+ newln(p);
+ if ( ! arg_hasattr(MDOC_Compact, node->parent->parent))
+ if (node->prev || node->parent->parent->prev)
+ vspace(p);
+
+ return(1);
+}
+
+
/* ARGSUSED */
static int
termp_it_pre(DECL_ARGS)
{
- const struct mdoc_node *n, *it;
- const struct mdoc_block *bl;
+ const struct mdoc_node *bl;
char buf[7];
- int i;
+ int i, type;
size_t width, offset;
- switch (node->type) {
- case (MDOC_BODY):
+ if (MDOC_BLOCK == node->type)
+ return(termp_it_pre_block(p, pair, meta, node));
+
+ /* Get ptr to list block, type, etc. */
+
+ bl = node->parent->parent->parent;
+ type = arg_listtype(bl);
+
+ /* Save parent attributes. */
+
+ pair->offset = p->offset;
+ pair->rmargin = p->rmargin;
+ pair->flag = p->flags;
+
+ /* Get list width and offset. */
+
+ i = arg_getattr(MDOC_Width, bl);
+ width = i >= 0 ? arg_width(&bl->args->argv[i]) : 0;
+
+ i = arg_getattr(MDOC_Offset, bl);
+ offset = i >= 0 ? arg_offset(&bl->args->argv[i]) : 0;
+
+ /*
+ * List-type can override the width in the case of fixed-head
+ * values (bullet, dash/hyphen, enum). Tags need a non-zero
+ * offset.
+ */
+
+ switch (type) {
+ case (MDOC_Bullet):
/* FALLTHROUGH */
- case (MDOC_HEAD):
- it = node->parent;
- break;
- case (MDOC_BLOCK):
- it = node;
+ case (MDOC_Dash):
+ /* FALLTHROUGH */
+ case (MDOC_Enum):
+ /* FALLTHROUGH */
+ case (MDOC_Hyphen):
+ width = width > 4 ? width : 4;
break;
+ case (MDOC_Tag):
+ if (width)
+ break;
+ errx(1, "need non-zero %s for list type",
+ mdoc_argnames[MDOC_Width]);
default:
- return(1);
+ break;
}
- n = it->parent->parent;
- bl = &n->data.block;
+ /*
+ * Whitespace control. Inset bodies need an initial space.
+ */
- if (MDOC_BLOCK == node->type) {
- if (arg_hasattr(MDOC_Compact, bl->argc, bl->argv))
- newln(p);
+ switch (type) {
+ case (MDOC_Diag):
+ /* FALLTHROUGH */
+ case (MDOC_Inset):
+ if (MDOC_BODY == node->type)
+ p->flags &= ~TERMP_NOSPACE;
else
- vspace(p);
- return(1);
+ p->flags |= TERMP_NOSPACE;
+ break;
+ default:
+ p->flags |= TERMP_NOSPACE;
+ break;
}
- pair->offset = p->offset;
- pair->rmargin = p->rmargin;
-
- /* FIXME: auto-size. */
- i = arg_getattr(MDOC_Width, bl->argc, bl->argv);
- width = i >= 0 ? arg_width(&bl->argv[i]) : 10;
+ /*
+ * Style flags. Diagnostic heads need TTYPE_DIAG.
+ */
- i = arg_getattr(MDOC_Offset, bl->argc, bl->argv);
- offset = i >= 0 ? arg_offset(&bl->argv[i]) : 0;
+ switch (type) {
+ case (MDOC_Diag):
+ if (MDOC_HEAD == node->type)
+ p->flags |= ttypes[TTYPE_DIAG];
+ break;
+ default:
+ break;
+ }
- assert(MDOC_HEAD == node->type ||
- MDOC_BODY == node->type);
+ /*
+ * Pad and break control. This is the tricker part. Lists with
+ * set right-margins for the head get TERMP_NOBREAK because, if
+ * they overrun the margin, they wrap to the new margin.
+ * Correspondingly, the body for these types don't left-pad, as
+ * the head will pad out to to the right.
+ */
- if (arg_hasattr(MDOC_Tag, bl->argc, bl->argv)) {
- p->flags |= TERMP_NOSPACE;
- if (MDOC_BODY == node->type) {
+ switch (type) {
+ case (MDOC_Bullet):
+ /* FALLTHROUGH */
+ case (MDOC_Dash):
+ /* FALLTHROUGH */
+ case (MDOC_Enum):
+ /* FALLTHROUGH */
+ case (MDOC_Hyphen):
+ /* FALLTHROUGH */
+ case (MDOC_Tag):
+ if (MDOC_HEAD == node->type)
+ p->flags |= TERMP_NOBREAK;
+ else
p->flags |= TERMP_NOLPAD;
- p->offset += width;
- } else {
+ if (MDOC_HEAD == node->type && MDOC_Tag == type)
+ if (NULL == node->next ||
+ NULL == node->next->child)
+ p->flags |= TERMP_NONOBREAK;
+ break;
+ case (MDOC_Diag):
+ if (MDOC_HEAD == node->type)
p->flags |= TERMP_NOBREAK;
- p->rmargin = p->offset + offset + width;
- }
+ break;
+ default:
+ break;
+ }
- } else if (arg_hasattr(MDOC_Ohang, bl->argc, bl->argv)) {
- p->flags |= TERMP_NOSPACE;
+ /*
+ * Margin control. Set-head-width lists have their right
+ * margins shortened. The body for these lists has the offset
+ * necessarily lengthened. Everybody gets the offset.
+ */
- } else if (arg_hasattr(MDOC_Diag, bl->argc, bl->argv)) {
- /* TODO. */
+ p->offset += offset;
- } else if (arg_hasattr(MDOC_Hang, bl->argc, bl->argv)) {
- /* TODO. */
+ switch (type) {
+ case (MDOC_Bullet):
+ /* FALLTHROUGH */
+ case (MDOC_Dash):
+ /* FALLTHROUGH */
+ case (MDOC_Enum):
+ /* FALLTHROUGH */
+ case (MDOC_Hyphen):
+ /* FALLTHROUGH */
+ case (MDOC_Tag):
+ if (MDOC_HEAD == node->type)
+ p->rmargin = p->offset + width;
+ else
+ p->offset += width;
+ /* FALLTHROUGH */
+ default:
+ break;
+ }
- } else if (arg_hasattr(MDOC_Bullet, bl->argc, bl->argv)) {
- p->flags |= TERMP_NOSPACE;
- if (MDOC_BODY == node->type) {
- p->flags |= TERMP_NOLPAD;
- p->offset += 6;
- } else {
- word(p, "\\[bu]");
- p->flags |= TERMP_NOBREAK;
- p->rmargin = p->offset + offset + 6;
- }
+ /*
+ * The dash, hyphen, bullet and enum lists all have a special
+ * HEAD character. Print it now.
+ */
- } else if (arg_hasattr(MDOC_Enum, bl->argc, bl->argv)) {
- p->flags |= TERMP_NOSPACE;
- if (MDOC_BODY == node->type) {
- p->flags |= TERMP_NOLPAD;
- p->offset += 6;
- } else {
+ if (MDOC_HEAD == node->type)
+ switch (type) {
+ case (MDOC_Bullet):
+ word(p, "\\[bu]");
+ break;
+ case (MDOC_Dash):
+ /* FALLTHROUGH */
+ case (MDOC_Hyphen):
+ word(p, "\\-");
+ break;
+ case (MDOC_Enum):
+ /* TODO: have a wordfmt or something. */
(pair->ppair->ppair->count)++;
(void)snprintf(buf, sizeof(buf), "%d.",
pair->ppair->ppair->count);
word(p, buf);
- p->flags |= TERMP_NOBREAK;
- p->rmargin = p->offset + offset + 6;
+ break;
+ default:
+ break;
}
- } else if (arg_hasattr(MDOC_Dash, bl->argc, bl->argv) ||
- arg_hasattr(MDOC_Hyphen, bl->argc, bl->argv)) {
- p->flags |= TERMP_NOSPACE;
- if (MDOC_BODY == node->type) {
- p->flags |= TERMP_NOLPAD;
- p->offset += 6;
- return(1);
- } else {
- word(p, "\\-");
- p->flags |= TERMP_NOBREAK;
- p->rmargin = p->offset + offset + 6;
- }
- }
+ /*
+ * If we're not going to process our header children, indicate
+ * so here.
+ */
+
+ if (MDOC_HEAD == node->type)
+ switch (type) {
+ case (MDOC_Bullet):
+ /* FALLTHROUGH */
+ case (MDOC_Item):
+ /* FALLTHROUGH */
+ case (MDOC_Dash):
+ /* FALLTHROUGH */
+ case (MDOC_Hyphen):
+ /* FALLTHROUGH */
+ case (MDOC_Enum):
+ return(0);
+ default:
+ break;
+ }
- p->offset += offset;
return(1);
}
static void
termp_it_post(DECL_ARGS)
{
- const struct mdoc_node *n, *it;
- const struct mdoc_block *bl;
+ int type;
if (MDOC_BODY != node->type && MDOC_HEAD != node->type)
return;
- it = node->parent;
- n = it->parent->parent;
- bl = &n->data.block;
+ type = arg_listtype(node->parent->parent->parent);
- if (arg_hasattr(MDOC_Tag, bl->argc, bl->argv) ||
- arg_hasattr(MDOC_Bullet, bl->argc, bl->argv) ||
- arg_hasattr(MDOC_Dash, bl->argc, bl->argv) ||
- arg_hasattr(MDOC_Enum, bl->argc, bl->argv) ||
- arg_hasattr(MDOC_Hyphen, bl->argc, bl->argv)) {
+ switch (type) {
+ case (MDOC_Diag):
+ /* FALLTHROUGH */
+ case (MDOC_Item):
+ /* FALLTHROUGH */
+ case (MDOC_Inset):
+ if (MDOC_BODY != node->type)
+ break;
flushln(p);
- if (MDOC_HEAD == node->type) {
- p->rmargin = pair->rmargin;
- p->flags &= ~TERMP_NOBREAK;
- } else
- p->flags &= ~TERMP_NOLPAD;
-
- } else if (arg_hasattr(MDOC_Ohang, bl->argc, bl->argv)) {
+ break;
+ default:
flushln(p);
-
- } else if (arg_hasattr(MDOC_Inset, bl->argc, bl->argv)) {
- if (MDOC_BODY == node->type)
- flushln(p);
-
- } else if (arg_hasattr(MDOC_Item, bl->argc, bl->argv)) {
- if (MDOC_BODY == node->type)
- flushln(p);
+ break;
}
p->offset = pair->offset;
+ p->rmargin = pair->rmargin;
+ p->flags = pair->flag;
}
termp_nm_pre(DECL_ARGS)
{
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_PROG]);
+ if (SEC_SYNOPSIS == node->sec)
+ newln(p);
+
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_PROG]);
if (NULL == node->child)
word(p, meta->name);
+
return(1);
}
termp_fl_pre(DECL_ARGS)
{
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_FLAG]);
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_FLAG]);
word(p, "\\-");
p->flags |= TERMP_NOSPACE;
return(1);
termp_ar_pre(DECL_ARGS)
{
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_ARG]);
- if (NULL == node->child)
- word(p, "...");
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_ARG]);
return(1);
}
static int
termp_st_pre(DECL_ARGS)
{
- const char *tp;
+ const char *cp;
+
+ if (node->child) {
+ if (MDOC_TEXT != node->child->type)
+ errx(1, "expected text line arguments");
+ if ((cp = mdoc_a2st(node->child->string)))
+ word(p, cp);
+ }
+ return(0);
+}
- assert(1 == node->data.elem.argc);
- tp = mdoc_st2a(node->data.elem.argv[0].arg);
- word(p, tp);
+/* ARGSUSED */
+static int
+termp_rs_pre(DECL_ARGS)
+{
+ if (MDOC_BLOCK == node->type && node->prev)
+ vspace(p);
return(1);
}
{
int i;
- i = arg_getattr(MDOC_Std, node->data.elem.argc,
- node->data.elem.argv);
- assert(i >= 0);
+ if (-1 == (i = arg_getattr(MDOC_Std, node)))
+ errx(1, "expected -std argument");
+ if (1 != node->args->argv[i].sz)
+ errx(1, "expected -std argument");
newln(p);
word(p, "The");
p->flags |= ttypes[TTYPE_FUNC_NAME];
- word(p, *node->data.elem.argv[i].value);
+ word(p, *node->args->argv[i].value);
p->flags &= ~ttypes[TTYPE_FUNC_NAME];
word(p, "() function returns the value 0 if successful;");
{
int i;
- i = arg_getattr(MDOC_Std, node->data.elem.argc,
- node->data.elem.argv);
- assert(i >= 0);
+ if (-1 == (i = arg_getattr(MDOC_Std, node)))
+ errx(1, "expected -std argument");
+ if (1 != node->args->argv[i].sz)
+ errx(1, "expected -std argument");
word(p, "The");
p->flags |= ttypes[TTYPE_PROG];
- word(p, *node->data.elem.argv[i].value);
+ word(p, *node->args->argv[i].value);
p->flags &= ~ttypes[TTYPE_PROG];
word(p, "utility exits 0 on success, and >0 if an error occurs.");
{
const struct mdoc_node *n;
- n = node->child;
- assert(n);
+ if (NULL == (n = node->child))
+ errx(1, "expected text line argument");
+ if (MDOC_TEXT != n->type)
+ errx(1, "expected text line argument");
- assert(MDOC_TEXT == n->type);
- word(p, n->data.text.string);
+ word(p, n->string);
if (NULL == (n = n->next))
return(0);
+ if (MDOC_TEXT != n->type)
+ errx(1, "expected text line argument");
- assert(MDOC_TEXT == n->type);
p->flags |= TERMP_NOSPACE;
word(p, "(");
p->flags |= TERMP_NOSPACE;
- word(p, n->data.text.string);
+ word(p, n->string);
p->flags |= TERMP_NOSPACE;
word(p, ")");
{
/* FIXME: this can be "type name". */
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_VAR_DECL]);
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_VAR_DECL]);
return(1);
}
* FIXME: this naming is bad. This value is used, in general,
* for the #include header or other preprocessor statement.
*/
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_DECL]);
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_DECL]);
return(1);
}
termp_fd_post(DECL_ARGS)
{
- if (node->sec == SEC_SYNOPSIS)
+ if (node->sec != SEC_SYNOPSIS)
+ return;
+ newln(p);
+ if (node->next && MDOC_Fd != node->next->tok)
vspace(p);
}
switch (node->type) {
case (MDOC_HEAD):
vspace(p);
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SECTION]);
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SECTION]);
break;
case (MDOC_BODY):
p->offset = INDENT;
}
+/* ARGSUSED */
+static void
+termp_lb_post(DECL_ARGS)
+{
+
+ newln(p);
+}
+
+
/* ARGSUSED */
static int
termp_ud_pre(DECL_ARGS)
if (MDOC_BODY != node->type)
return(1);
- word(p, "<");
+ word(p, "\\(la");
p->flags |= TERMP_NOSPACE;
return(1);
}
if (MDOC_BODY != node->type)
return;
p->flags |= TERMP_NOSPACE;
- word(p, ">");
+ word(p, "\\(ra");
}
termp_ft_pre(DECL_ARGS)
{
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_TYPE]);
+ if (SEC_SYNOPSIS == node->sec)
+ if (node->prev && MDOC_Fo == node->prev->tok)
+ vspace(p);
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_TYPE]);
return(1);
}
termp_ft_post(DECL_ARGS)
{
- if (node->sec == SEC_SYNOPSIS)
+ if (SEC_SYNOPSIS == node->sec)
newln(p);
}
{
const struct mdoc_node *n;
- assert(node->child);
- assert(MDOC_TEXT == node->child->type);
+ if (NULL == node->child)
+ errx(1, "expected text line arguments");
+ if (MDOC_TEXT != node->child->type)
+ errx(1, "expected text line arguments");
/* FIXME: can be "type funcname" "type varname"... */
p->flags |= ttypes[TTYPE_FUNC_NAME];
- word(p, node->child->data.text.string);
+ word(p, node->child->string);
p->flags &= ~ttypes[TTYPE_FUNC_NAME];
word(p, "(");
p->flags |= TERMP_NOSPACE;
for (n = node->child->next; n; n = n->next) {
- assert(MDOC_TEXT == n->type);
+ if (MDOC_TEXT != n->type)
+ errx(1, "expected text line arguments");
p->flags |= ttypes[TTYPE_FUNC_ARG];
- word(p, n->data.text.string);
+ word(p, n->string);
p->flags &= ~ttypes[TTYPE_FUNC_ARG];
if (n->next)
word(p, ",");
termp_fn_post(DECL_ARGS)
{
- if (node->sec == SEC_SYNOPSIS)
+ if (node->sec == SEC_SYNOPSIS && node->next)
vspace(p);
}
termp_sx_pre(DECL_ARGS)
{
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_LINK]);
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_LINK]);
return(1);
}
struct mdoc_node *n;
if (node->parent->tok != MDOC_Fo) {
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FUNC_ARG]);
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FUNC_ARG]);
return(1);
}
for (n = node->child; n; n = n->next) {
- assert(MDOC_TEXT == n->type);
+ if (MDOC_TEXT != n->type)
+ errx(1, "expected text line arguments");
p->flags |= ttypes[TTYPE_FUNC_ARG];
- word(p, n->data.text.string);
+ word(p, n->string);
p->flags &= ~ttypes[TTYPE_FUNC_ARG];
if (n->next)
termp_va_pre(DECL_ARGS)
{
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_VAR_DECL]);
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_VAR_DECL]);
return(1);
}
static int
termp_bd_pre(DECL_ARGS)
{
- const struct mdoc_block *bl;
- const struct mdoc_node *n;
- int i;
+ const struct mdoc_node *n;
+ int i, type;
if (MDOC_BLOCK == node->type) {
- vspace(p);
+ if (node->prev)
+ vspace(p);
return(1);
} else if (MDOC_BODY != node->type)
return(1);
- assert(MDOC_BLOCK == node->parent->type);
+ if (NULL == node->parent->args)
+ errx(1, "missing display type");
+
pair->offset = p->offset;
- bl = &node->parent->data.block;
+ for (type = -1, i = 0;
+ i < (int)node->parent->args->argc; i++) {
+ switch (node->parent->args->argv[i].arg) {
+ case (MDOC_Ragged):
+ /* FALLTHROUGH */
+ case (MDOC_Filled):
+ /* FALLTHROUGH */
+ case (MDOC_Unfilled):
+ /* FALLTHROUGH */
+ case (MDOC_Literal):
+ type = node->parent->args->argv[i].arg;
+ i = (int)node->parent->args->argc;
+ break;
+ default:
+ break;
+ }
+ }
+ if (NULL == node->parent->args)
+ errx(1, "missing display type");
- i = arg_getattr(MDOC_Offset, bl->argc, bl->argv);
+ i = arg_getattr(MDOC_Offset, node->parent);
if (-1 != i) {
- assert(1 == bl->argv[i].sz);
- p->offset += arg_offset(&bl->argv[i]);
+ if (1 != node->parent->args->argv[i].sz)
+ errx(1, "expected single value");
+ p->offset += arg_offset(&node->parent->args->argv[i]);
}
- if ( ! arg_hasattr(MDOC_Literal, bl->argc, bl->argv))
+ switch (type) {
+ case (MDOC_Literal):
+ /* FALLTHROUGH */
+ case (MDOC_Unfilled):
+ break;
+ default:
return(1);
+ }
p->flags |= TERMP_LITERAL;
for (n = node->child; n; n = n->next) {
- assert(MDOC_TEXT == n->type); /* FIXME */
- if ((*n->data.text.string)) {
- word(p, n->data.text.string);
- flushln(p);
- } else
- vspace(p);
-
+ if (MDOC_TEXT != n->type) {
+ warnx("non-text children not yet allowed");
+ continue;
+ }
+ word(p, n->string);
+ flushln(p);
}
- p->flags &= ~TERMP_LITERAL;
return(0);
}
if (MDOC_BODY != node->type)
return;
- newln(p);
+
+ if ( ! (p->flags & TERMP_LITERAL))
+ flushln(p);
+
+ p->flags &= ~TERMP_LITERAL;
p->offset = pair->offset;
}
/* ARGSUSED */
-static int
-termp_bx_pre(DECL_ARGS)
+static void
+termp_bx_post(DECL_ARGS)
{
+ if (node->child)
+ p->flags |= TERMP_NOSPACE;
word(p, "BSD");
- return(1);
}
if (MDOC_BODY != node->type)
return(1);
- word(p, "\'");
+ word(p, "`");
p->flags |= TERMP_NOSPACE;
return(1);
}
switch (node->type) {
case (MDOC_HEAD):
vspace(p);
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SSECTION]);
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SSECTION]);
p->offset = INDENT / 2;
break;
default:
termp_pa_pre(DECL_ARGS)
{
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_FILE]);
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_FILE]);
return(1);
}
termp_em_pre(DECL_ARGS)
{
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]);
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);
return(1);
}
termp_cd_pre(DECL_ARGS)
{
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CONFIG]);
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CONFIG]);
+ newln(p);
return(1);
}
termp_cm_pre(DECL_ARGS)
{
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_FLAG]);
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_FLAG]);
return(1);
}
termp_ic_pre(DECL_ARGS)
{
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD]);
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD]);
return(1);
}
termp_in_pre(DECL_ARGS)
{
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_INCLUDE]);
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_INCLUDE]);
+ word(p, "#include");
+ word(p, "<");
+ p->flags |= TERMP_NOSPACE;
return(1);
}
+/* ARGSUSED */
+static void
+termp_in_post(DECL_ARGS)
+{
+
+ p->flags |= TERMP_NOSPACE;
+ word(p, ">");
+
+ newln(p);
+ if (SEC_SYNOPSIS != node->sec)
+ return;
+ if (node->next && MDOC_In != node->next->tok)
+ vspace(p);
+}
+
+
/* ARGSUSED */
static int
termp_at_pre(DECL_ARGS)
{
- enum mdoc_att c;
+ const char *att;
+
+ att = NULL;
- c = ATT_DEFAULT;
if (node->child) {
- assert(MDOC_TEXT == node->child->type);
- c = mdoc_atoatt(node->child->data.text.string);
+ if (MDOC_TEXT != node->child->type)
+ errx(1, "expected text line argument");
+ att = mdoc_a2att(node->child->string);
}
- word(p, mdoc_att2a(c));
+ if (NULL == att)
+ att = "AT&T UNIX";
+
+ word(p, att);
return(0);
}
if (MDOC_BODY != node->type)
return(1);
- word(p, "(");
+ word(p, "\\&(");
p->flags |= TERMP_NOSPACE;
return(1);
}
p->flags |= ttypes[TTYPE_FUNC_NAME];
for (n = node->child; n; n = n->next) {
- assert(MDOC_TEXT == n->type);
- word(p, n->data.text.string);
+ if (MDOC_TEXT != n->type)
+ errx(1, "expected text line argument");
+ word(p, n->string);
}
p->flags &= ~ttypes[TTYPE_FUNC_NAME];
termp_bf_pre(DECL_ARGS)
{
const struct mdoc_node *n;
- const struct mdoc_block *b;
-
- /* XXX - we skip over possible trailing HEAD tokens. */
- if (MDOC_HEAD == node->type)
+ if (MDOC_HEAD == node->type) {
return(0);
- else if (MDOC_BLOCK != node->type)
+ } else if (MDOC_BLOCK != node->type)
return(1);
- b = &node->data.block;
-
- if (NULL == (n = b->head->child)) {
- if (arg_hasattr(MDOC_Emphasis, b->argc, b->argv))
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]);
- else if (arg_hasattr(MDOC_Symbolic, b->argc, b->argv))
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMB]);
+ if (NULL == (n = node->head->child)) {
+ if (arg_hasattr(MDOC_Emphasis, node))
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);
+ else if (arg_hasattr(MDOC_Symbolic, node))
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMB]);
return(1);
}
- assert(MDOC_TEXT == n->type);
+ if (MDOC_TEXT != n->type)
+ errx(1, "expected text line arguments");
- if (0 == strcmp("Em", n->data.text.string))
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]);
- else if (0 == strcmp("Sy", n->data.text.string))
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_EMPH]);
+ if (0 == strcmp("Em", n->string))
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);
+ else if (0 == strcmp("Sy", n->string))
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_EMPH]);
return(1);
}
termp_sy_pre(DECL_ARGS)
{
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMB]);
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMB]);
return(1);
}
termp_ms_pre(DECL_ARGS)
{
- TERMPAIR_SETFLAG(pair, ttypes[TTYPE_SYMBOL]);
+ TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_SYMBOL]);
return(1);
}
+
+
+/* ARGSUSED */
+static int
+termp_sm_pre(DECL_ARGS)
+{
+
+#if notyet
+ assert(node->child);
+ if (0 == strcmp("off", node->child->data.text.string)) {
+ p->flags &= ~TERMP_NONOSPACE;
+ p->flags &= ~TERMP_NOSPACE;
+ } else {
+ p->flags |= TERMP_NONOSPACE;
+ p->flags |= TERMP_NOSPACE;
+ }
+#endif
+
+ return(0);
+}
+
+
+/* ARGSUSED */
+static int
+termp__t_pre(DECL_ARGS)
+{
+
+ /* FIXME: titles are underlined. */
+ word(p, "\"");
+ p->flags |= TERMP_NOSPACE;
+ return(1);
+}
+
+
+/* ARGSUSED */
+static void
+termp__t_post(DECL_ARGS)
+{
+
+ p->flags |= TERMP_NOSPACE;
+ /* FIXME: titles are underlined. */
+ word(p, "\"");
+ word(p, node->next ? "," : ".");
+}
+
+
+/* ARGSUSED */
+static void
+termp____post(DECL_ARGS)
+{
+
+ p->flags |= TERMP_NOSPACE;
+ word(p, node->next ? "," : ".");
+}
git.ckatri.com / mandoc.git / blobdiff