=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.22 retrieving revision 1.25 diff -u -p -r1.22 -r1.25 --- mandoc/term.c 2009/02/25 17:02:47 1.22 +++ mandoc/term.c 2009/02/26 16:08:11 1.25 @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.22 2009/02/25 17:02:47 kristaps Exp $ */ +/* $Id: term.c,v 1.25 2009/02/26 16:08:11 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -17,6 +17,8 @@ * PERFORMANCE OF THIS SOFTWARE. */ #include +#include +#include #include #include #include @@ -275,9 +277,29 @@ const struct termact *termacts = __termacts; static size_t arg_width(const struct mdoc_arg *arg) { + size_t len, i, v; /* TODO */ assert(*arg->value); + if (0 == strcmp(*arg->value, "indent")) + return(INDENT); + if (0 == strcmp(*arg->value, "indent-two")) + return(INDENT * 2); + + len = strlen(*arg->value); + assert(len > 0); + + for (i = 0; i < len - 1; i++) + if ( ! isdigit((int)(*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)); } @@ -292,7 +314,6 @@ arg_offset(const struct mdoc_arg *arg) return(INDENT); if (0 == strcmp(*arg->value, "indent-two")) return(INDENT * 2); - return(strlen(*arg->value)); } @@ -350,8 +371,8 @@ termp_it_pre(DECL_ARGS) { const struct mdoc_node *n, *it; const struct mdoc_block *bl; - char buf[7]; - int i; + char buf[7], *tp; + int i, type; size_t width, offset; switch (node->type) { @@ -378,79 +399,138 @@ termp_it_pre(DECL_ARGS) return(1); } + /* Get our list type. */ + + 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); + + /* Save our existing (inherited) margin and offset. */ + pair->offset = p->offset; pair->rmargin = p->rmargin; - /* FIXME: auto-size. */ + /* Get list width and offset. */ + i = arg_getattr(MDOC_Width, bl->argc, bl->argv); - width = i >= 0 ? arg_width(&bl->argv[i]) : 10; + width = i >= 0 ? arg_width(&bl->argv[i]) : 0; i = arg_getattr(MDOC_Offset, bl->argc, bl->argv); offset = i >= 0 ? arg_offset(&bl->argv[i]) : 0; - assert(MDOC_HEAD == node->type || - MDOC_BODY == node->type); + /* Override the width. */ - if (arg_hasattr(MDOC_Tag, bl->argc, bl->argv)) { - p->flags |= TERMP_NOSPACE; - if (MDOC_BODY == node->type) { - p->flags |= TERMP_NOLPAD; - p->offset += width; - } else { - p->flags |= TERMP_NOBREAK; - p->rmargin = p->offset + offset + width; - } + switch (type) { + case (MDOC_Bullet): + /* FALLTHROUGH */ + case (MDOC_Dash): + /* FALLTHROUGH */ + case (MDOC_Enum): + /* FALLTHROUGH */ + case (MDOC_Hyphen): + width = width > 6 ? width : 6; + break; + case (MDOC_Tag): + /* FIXME: auto-size. */ + if (0 == width) + errx(1, "need non-zero -width"); + break; + default: + break; + } - } else if (arg_hasattr(MDOC_Ohang, bl->argc, bl->argv)) { - p->flags |= TERMP_NOSPACE; + /* Word-wrap control. */ - } else if (arg_hasattr(MDOC_Diag, bl->argc, bl->argv)) { - /* TODO. */ + p->flags |= TERMP_NOSPACE; - } else if (arg_hasattr(MDOC_Hang, bl->argc, bl->argv)) { - /* TODO. */ - - } 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]"); + 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; - p->rmargin = p->offset + offset + 6; - } - - } else if (arg_hasattr(MDOC_Enum, bl->argc, bl->argv)) { - p->flags |= TERMP_NOSPACE; - if (MDOC_BODY == node->type) { + else if (MDOC_BODY == node->type) p->flags |= TERMP_NOLPAD; - p->offset += 6; - } else { + break; + default: + break; + } + + /* + * Get a token to use as the HEAD lead-in. If NULL, we use the + * HEAD child. + */ + + 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); - word(p, buf); - p->flags |= TERMP_NOBREAK; - p->rmargin = p->offset + offset + 6; + tp = buf; } + if (arg_hasattr(MDOC_Hyphen, bl->argc, bl->argv)) + tp = "\\-"; + } - } 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; - } - } + /* Margin control. */ p->offset += offset; - return(1); + + 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 if (MDOC_BODY == node->type) + p->offset += width; + break; + default: + break; + } + + if (NULL == tp) + return(1); + + word(p, tp); + return(0); } @@ -458,41 +538,20 @@ termp_it_pre(DECL_ARGS) static void termp_it_post(DECL_ARGS) { - const struct mdoc_node *n, *it; - const struct mdoc_block *bl; if (MDOC_BODY != node->type && MDOC_HEAD != node->type) return; - it = node->parent; - n = it->parent->parent; - bl = &n->data.block; + flushln(p); - 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)) { - 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)) { - 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); - } - p->offset = pair->offset; + p->rmargin = pair->rmargin; + + if (MDOC_HEAD == node->type) { + p->flags &= ~TERMP_NOBREAK; + p->flags &= ~TERMP_NORPAD; + } else if (MDOC_BODY == node->type) + p->flags &= ~TERMP_NOLPAD; }