=================================================================== RCS file: /cvs/mandoc/term.c,v retrieving revision 1.23 retrieving revision 1.28 diff -u -p -r1.23 -r1.28 --- mandoc/term.c 2009/02/25 23:18:50 1.23 +++ mandoc/term.c 2009/02/28 19:15:28 1.28 @@ -1,4 +1,4 @@ -/* $Id: term.c,v 1.23 2009/02/25 23:18:50 kristaps Exp $ */ +/* $Id: term.c,v 1.28 2009/02/28 19:15:28 kristaps Exp $ */ /* * Copyright (c) 2009 Kristaps Dzonsons * @@ -17,6 +17,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ #include +#include #include #include #include @@ -24,7 +25,7 @@ #include "term.h" -#define INDENT 4 +#define INDENT 8 /* * Performs actions on nodes of the abstract syntax tree. Both pre- and @@ -107,6 +108,7 @@ static void name##_post(DECL_ARGS) DECL_PRE(name); \ DECL_POST(name); +DECL_PREPOST(termp__t); DECL_PREPOST(termp_aq); DECL_PREPOST(termp_bd); DECL_PREPOST(termp_bq); @@ -149,6 +151,7 @@ DECL_PRE(termp_nx); 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); @@ -159,6 +162,7 @@ DECL_PRE(termp_ux); DECL_PRE(termp_va); DECL_PRE(termp_xr); +DECL_POST(termp___); DECL_POST(termp_bl); const struct termact __termacts[MDOC_MAX] = { @@ -203,16 +207,16 @@ const struct termact __termacts[MDOC_MAX] = { { termp_va_pre, NULL }, /* Va */ { termp_vt_pre, termp_vt_post }, /* Vt */ { termp_xr_pre, NULL }, /* Xr */ - { NULL, NULL }, /* %A */ + { NULL, termp____post }, /* %A */ { NULL, NULL }, /* %B */ - { NULL, NULL }, /* %D */ + { NULL, termp____post }, /* %D */ { NULL, NULL }, /* %I */ - { NULL, NULL }, /* %J */ + { NULL, termp____post }, /* %J */ { NULL, NULL }, /* %N */ { NULL, NULL }, /* %O */ { NULL, NULL }, /* %P */ { NULL, NULL }, /* %R */ - { NULL, NULL }, /* %T */ + { termp__t_pre, termp__t_post }, /* %T */ { NULL, NULL }, /* %V */ { NULL, NULL }, /* Ac */ { termp_aq_pre, termp_aq_post }, /* Ao */ @@ -247,7 +251,7 @@ const struct termact __termacts[MDOC_MAX] = { { 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 */ @@ -276,10 +280,30 @@ const struct termact *termacts = __termacts; static size_t arg_width(const struct mdoc_arg *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((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) + 1); } @@ -293,7 +317,6 @@ arg_offset(const struct mdoc_arg *arg) return(INDENT); if (0 == strcmp(*arg->value, "indent-two")) return(INDENT * 2); - return(strlen(*arg->value)); } @@ -381,7 +404,7 @@ termp_it_pre(DECL_ARGS) /* Get our list type. */ - for (i = 0; i < (int)bl->argc; i++) + for (type = -1, i = 0; i < (int)bl->argc; i++) switch (bl->argv[i].arg) { case (MDOC_Bullet): /* FALLTHROUGH */ @@ -391,27 +414,19 @@ termp_it_pre(DECL_ARGS) /* FALLTHROUGH */ case (MDOC_Hyphen): /* FALLTHROUGH */ - case (MDOC_Item): - /* FALLTHROUGH */ case (MDOC_Tag): /* FALLTHROUGH */ case (MDOC_Ohang): type = bl->argv[i].arg; i = (int)bl->argc; break; - case (MDOC_Inset): - /* FALLTHROUGH */ - case (MDOC_Hang): - /* FALLTHROUGH */ - case (MDOC_Diag): - /* FALLTHROUGH */ - case (MDOC_Column): + default: errx(1, "list type not supported"); /* NOTREACHED */ - default: - break; } + assert(-1 != type); + /* Save our existing (inherited) margin and offset. */ pair->offset = p->offset; @@ -419,7 +434,6 @@ termp_it_pre(DECL_ARGS) /* Get list width and offset. */ - /* FIXME: auto-size. */ i = arg_getattr(MDOC_Width, bl->argc, bl->argv); width = i >= 0 ? arg_width(&bl->argv[i]) : 0; @@ -439,6 +453,7 @@ termp_it_pre(DECL_ARGS) width = width > 6 ? width : 6; break; case (MDOC_Tag): + /* FIXME: auto-size. */ if (0 == width) errx(1, "need non-zero -width"); break; @@ -465,7 +480,7 @@ termp_it_pre(DECL_ARGS) else if (MDOC_BODY == node->type) p->flags |= TERMP_NOLPAD; break; - case (MDOC_Ohang): + default: break; } @@ -475,6 +490,7 @@ termp_it_pre(DECL_ARGS) */ tp = NULL; + if (MDOC_HEAD == node->type) { if (arg_hasattr(MDOC_Bullet, bl->argc, bl->argv)) tp = "\\[bu]"; @@ -488,8 +504,6 @@ termp_it_pre(DECL_ARGS) } if (arg_hasattr(MDOC_Hyphen, bl->argc, bl->argv)) tp = "\\-"; - if (arg_hasattr(MDOC_Item, bl->argc, bl->argv)) - tp = ""; } /* Margin control. */ @@ -505,23 +519,19 @@ termp_it_pre(DECL_ARGS) /* FALLTHROUGH */ case (MDOC_Hyphen): /* FALLTHROUGH */ - case (MDOC_Item): - /* FALLTHROUGH */ case (MDOC_Tag): if (MDOC_HEAD == node->type) p->rmargin = p->offset + width; else if (MDOC_BODY == node->type) p->offset += width; break; - case (MDOC_Ohang): + default: break; } if (NULL == tp) return(1); - /* XXX - ignoring children. */ - word(p, tp); return(0); } @@ -621,6 +631,17 @@ termp_st_pre(DECL_ARGS) /* ARGSUSED */ static int +termp_rs_pre(DECL_ARGS) +{ + + if (MDOC_BLOCK == node->type) + vspace(p); + return(1); +} + + +/* ARGSUSED */ +static int termp_rv_pre(DECL_ARGS) { int i; @@ -1166,7 +1187,7 @@ termp_sq_pre(DECL_ARGS) if (MDOC_BODY != node->type) return(1); - word(p, "\'"); + word(p, "`"); p->flags |= TERMP_NOSPACE; return(1); } @@ -1323,7 +1344,7 @@ termp_bq_pre(DECL_ARGS) if (MDOC_BODY != node->type) return(1); - word(p, "["); + word(p, "\\["); p->flags |= TERMP_NOSPACE; return(1); } @@ -1347,7 +1368,7 @@ termp_pq_pre(DECL_ARGS) if (MDOC_BODY != node->type) return(1); - word(p, "("); + word(p, "\\&("); p->flags |= TERMP_NOSPACE; return(1); } @@ -1477,4 +1498,36 @@ termp_sm_pre(DECL_ARGS) #endif return(0); +} + + +/* ARGSUSED */ +static int +termp__t_pre(DECL_ARGS) +{ + + word(p, "\""); + p->flags |= TERMP_NOSPACE; + return(1); +} + + +/* ARGSUSED */ +static void +termp__t_post(DECL_ARGS) +{ + + p->flags |= TERMP_NOSPACE; + word(p, "\""); + word(p, node->next ? "," : "."); +} + + +/* ARGSUSED */ +static void +termp____post(DECL_ARGS) +{ + + p->flags |= TERMP_NOSPACE; + word(p, node->next ? "," : "."); }