-/* $Id: term.c,v 1.36 2009/03/02 17:29:16 kristaps Exp $ */
+/* $Id: term.c,v 1.43 2009/03/06 14:13:47 kristaps Exp $ */
/*
* Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
*
#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
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 size_t arg_offset(const struct mdoc_arg *);
static size_t arg_width(const struct mdoc_arg *);
+static int arg_listtype(const struct mdoc_node *);
/*
* What follows describes prefix and postfix operations for the abstract
DECL_POST(termp___);
DECL_POST(termp_bl);
DECL_POST(termp_bx);
+DECL_POST(termp_lb);
const struct termact __termacts[MDOC_MAX] = {
{ NULL, NULL }, /* \" */
{ NULL, NULL }, /* Hf */
{ NULL, NULL }, /* Fr */
{ termp_ud_pre, NULL }, /* Ud */
+ { NULL, termp_lb_post }, /* lb */
};
const struct termact *termacts = __termacts;
assert(len > 0);
for (i = 0; i < len - 1; i++)
- if ( ! isdigit((int)(*arg->value)[i]))
+ if ( ! isdigit((u_char)(*arg->value)[i]))
break;
if (i == len - 1) {
}
+static int
+arg_listtype(const struct mdoc_node *n)
+{
+ const struct mdoc_block *bl;
+ int i, len;
+
+ bl = &n->data.block;
+ len = (int)bl->argc;
+
+ for (i = 0; i < len; i++)
+ switch (bl->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(bl->argv[i].arg);
+ default:
+ break;
+ }
+
+ errx(1, "list type not supported");
+ /* NOTREACHED */
+}
+
+
static size_t
arg_offset(const struct mdoc_arg *arg)
{
/* ARGSUSED */
static int
-termp_it_pre(DECL_ARGS)
+termp_it_pre_block(DECL_ARGS)
{
- const struct mdoc_node *n, *it;
+ const struct mdoc_node *n;
const struct mdoc_block *bl;
- char buf[7], *tp;
- int i, type;
- size_t width, offset;
- switch (node->type) {
- case (MDOC_BODY):
- /* FALLTHROUGH */
- case (MDOC_HEAD):
- it = node->parent;
- break;
- case (MDOC_BLOCK):
- it = node;
- break;
- default:
- return(1);
- }
-
- n = it->parent->parent;
+ n = node->parent->parent;
bl = &n->data.block;
- if (MDOC_BLOCK == node->type) {
- newln(p);
- if ( ! arg_hasattr(MDOC_Compact, bl->argc, bl->argv))
- if (node->prev || n->prev)
- vspace(p);
- return(1);
- }
+ newln(p);
+ if ( ! arg_hasattr(MDOC_Compact, bl->argc, bl->argv))
+ if (node->prev || n->prev)
+ vspace(p);
- /* Get our list type. */
+ return(1);
+}
- for (type = -1, i = 0; i < (int)bl->argc; i++)
- switch (bl->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_Ohang):
- type = bl->argv[i].arg;
- i = (int)bl->argc;
- break;
- default:
- errx(1, "list type not supported");
- /* NOTREACHED */
- }
- assert(-1 != type);
+/* ARGSUSED */
+static int
+termp_it_pre(DECL_ARGS)
+{
+ const struct mdoc_block *bl;
+ char buf[7];
+ int i, type;
+ size_t width, offset;
+
+ 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->data.block;
+ type = arg_listtype(node->parent->parent->parent);
- /* Save our existing (inherited) margin and offset. */
+ /* Save parent attributes. */
pair->offset = p->offset;
pair->rmargin = p->rmargin;
+ pair->flag = p->flags;
/* Get list width and offset. */
i = arg_getattr(MDOC_Offset, bl->argc, bl->argv);
offset = i >= 0 ? arg_offset(&bl->argv[i]) : 0;
- /* Override the width. */
+ /*
+ * 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):
case (MDOC_Enum):
/* FALLTHROUGH */
case (MDOC_Hyphen):
- width = width > 6 ? width : 6;
+ width = width > 4 ? width : 4;
break;
case (MDOC_Tag):
- /* FIXME: auto-size. */
- if (0 == width)
- errx(1, "need non-zero -width");
+ if (width)
+ break;
+ errx(1, "need non-zero %s for list type",
+ mdoc_argnames[MDOC_Width]);
+ default:
+ break;
+ }
+
+ /*
+ * Whitespace control. Inset bodies need an initial space.
+ */
+
+ switch (type) {
+ case (MDOC_Diag):
+ /* FALLTHROUGH */
+ case (MDOC_Inset):
+ if (MDOC_BODY == node->type)
+ p->flags &= ~TERMP_NOSPACE;
+ else
+ p->flags |= TERMP_NOSPACE;
break;
default:
+ p->flags |= TERMP_NOSPACE;
break;
}
- /* Word-wrap control. */
+ /*
+ * Style flags. Diagnostic heads need TTYPE_DIAG.
+ */
- p->flags |= TERMP_NOSPACE;
+ switch (type) {
+ case (MDOC_Diag):
+ if (MDOC_HEAD == node->type)
+ p->flags |= ttypes[TTYPE_DIAG];
+ break;
+ default:
+ break;
+ }
+
+ /*
+ * 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.
+ */
switch (type) {
case (MDOC_Bullet):
case (MDOC_Tag):
if (MDOC_HEAD == node->type)
p->flags |= TERMP_NOBREAK;
- else if (MDOC_BODY == node->type)
+ else
p->flags |= TERMP_NOLPAD;
+ 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;
break;
default:
break;
}
/*
- * Get a token to use as the HEAD lead-in. If NULL, we use the
- * HEAD child.
+ * 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.
*/
- tp = NULL;
-
- if (MDOC_HEAD == node->type) {
- if (arg_hasattr(MDOC_Bullet, bl->argc, bl->argv))
- tp = "\\[bu]";
- if (arg_hasattr(MDOC_Dash, bl->argc, bl->argv))
- tp = "\\-";
- if (arg_hasattr(MDOC_Enum, bl->argc, bl->argv)) {
- (pair->ppair->ppair->count)++;
- (void)snprintf(buf, sizeof(buf), "%d.",
- pair->ppair->ppair->count);
- tp = buf;
- }
- if (arg_hasattr(MDOC_Hyphen, bl->argc, bl->argv))
- tp = "\\-";
- }
-
- /* Margin control. */
-
p->offset += offset;
switch (type) {
case (MDOC_Tag):
if (MDOC_HEAD == node->type)
p->rmargin = p->offset + width;
- else if (MDOC_BODY == node->type)
+ else
p->offset += width;
- break;
+ /* FALLTHROUGH */
default:
break;
}
- if (NULL == tp)
- return(1);
+ /*
+ * The dash, hyphen, bullet and enum lists all have a special
+ * HEAD character. Print it now.
+ */
- word(p, tp);
- return(0);
+ 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);
+ break;
+ default:
+ break;
+ }
+
+ /*
+ * 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;
+ }
+
+ return(1);
}
static void
termp_it_post(DECL_ARGS)
{
+ int type;
if (MDOC_BODY != node->type && MDOC_HEAD != node->type)
return;
- flushln(p);
+ type = arg_listtype(node->parent->parent->parent);
+
+ switch (type) {
+ case (MDOC_Diag):
+ /* FALLTHROUGH */
+ case (MDOC_Item):
+ /* FALLTHROUGH */
+ case (MDOC_Inset):
+ if (MDOC_BODY != node->type)
+ break;
+ flushln(p);
+ break;
+ default:
+ flushln(p);
+ break;
+ }
p->offset = pair->offset;
p->rmargin = pair->rmargin;
-
- if (MDOC_HEAD == node->type)
- p->flags &= ~TERMP_NOBREAK;
- else if (MDOC_BODY == node->type)
- p->flags &= ~TERMP_NOLPAD;
+ p->flags = pair->flag;
}
{
TERMPAIR_SETFLAG(p, pair, ttypes[TTYPE_CMD_ARG]);
- if (NULL == node->child) {
- word(p, "file");
- word(p, "...");
- }
return(1);
}
static int
termp_st_pre(DECL_ARGS)
{
- const char *tp;
+ const char *cp;
- assert(1 == node->data.elem.argc);
-
- tp = mdoc_st2a(node->data.elem.argv[0].arg);
- word(p, tp);
-
- return(1);
+ /* XXX - if child isn't text? */
+ if (node->child)
+ if ((cp = mdoc_a2st(node->child->data.text.string)))
+ word(p, cp);
+ return(0);
}
}
+/* 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");
}
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);
+ att = mdoc_a2att(node->child->data.text.string);
}
- word(p, mdoc_att2a(c));
+ if (NULL == att)
+ att = "AT&T UNIX";
+
+ word(p, att);
return(0);
}
termp__t_pre(DECL_ARGS)
{
+ /* FIXME: titles are underlined. */
word(p, "\"");
p->flags |= TERMP_NOSPACE;
return(1);
{
p->flags |= TERMP_NOSPACE;
+ /* FIXME: titles are underlined. */
word(p, "\"");
word(p, node->next ? "," : ".");
}
git.ckatri.com / mandoc.git / blobdiff