More fixes (hard-escapes, etc.).

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index 6b8a3fe3a0588f2558b6f351a9919661ddfeef01..66847ea245afaddd05e6a1b817be88ecefc26881 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/* $Id: term.c,v 1.26 2009/02/27 08:20:15 kristaps Exp $ */
+/* $Id: term.c,v 1.29 2009/02/28 20:13:06 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -108,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);
@@ -150,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);
@@ -160,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] = {
@@ -171,7 +174,7 @@ const       struct termact __termacts[MDOC_MAX] = {
        { 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 */
@@ -204,17 +207,17 @@ 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, 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 */
@@ -248,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 */
@@ -277,7 +280,8 @@ const struct termact *termacts = __termacts;
 static size_t
 arg_width(const struct mdoc_arg *arg)
 {
-       size_t           len, i, v;
+       size_t           v;
+       int              i, len;
 
        assert(*arg->value);
        if (0 == strcmp(*arg->value, "indent"))
@@ -285,7 +289,7 @@ arg_width(const struct mdoc_arg *arg)
        if (0 == strcmp(*arg->value, "indent-two"))
                return(INDENT * 2);
 
-       len = strlen(*arg->value);
+       len = (int)strlen(*arg->value);
        assert(len > 0);
 
        for (i = 0; i < len - 1; i++) 
@@ -299,7 +303,7 @@ arg_width(const struct mdoc_arg *arg)
                }
 
        }
-       return(strlen(*arg->value));
+       return(strlen(*arg->value) + 2);
 }
 
 
@@ -391,10 +395,10 @@ termp_it_pre(DECL_ARGS)
        bl = &n->data.block;
 
        if (MDOC_BLOCK == node->type) {
-               if (arg_hasattr(MDOC_Compact, bl->argc, bl->argv))
-                       newln(p);
-               else
-                       vspace(p);
+               newln(p);
+               if ( ! arg_hasattr(MDOC_Compact, bl->argc, bl->argv))
+                       if (node->prev || n->prev)
+                               vspace(p);
                return(1);
        }
 
@@ -559,6 +563,9 @@ static int
 termp_nm_pre(DECL_ARGS)
 {
 
+       if (SEC_SYNOPSIS == node->sec)
+               newln(p);
+
        TERMPAIR_SETFLAG(pair, ttypes[TTYPE_PROG]);
        if (NULL == node->child)
                word(p, meta->name);
@@ -583,9 +590,14 @@ static int
 termp_ar_pre(DECL_ARGS)
 {
 
-       TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_ARG]);
-       if (NULL == node->child)
-               word(p, "...");
+       if (node->child) {
+               TERMPAIR_SETFLAG(pair, ttypes[TTYPE_CMD_ARG]);
+               return(1);
+       }
+       p->flags |= ttypes[TTYPE_CMD_ARG];
+       word(p, "file");
+       word(p, "...");
+       p->flags &= ~ttypes[TTYPE_CMD_ARG];
        return(1);
 }
 
@@ -625,6 +637,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)
@@ -1172,7 +1195,7 @@ termp_sq_pre(DECL_ARGS)
 
        if (MDOC_BODY != node->type)
                return(1);
-       word(p, "\'");
+       word(p, "`");
        p->flags |= TERMP_NOSPACE;
        return(1);
 }
@@ -1484,3 +1507,35 @@ termp_sm_pre(DECL_ARGS)
 
        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 ? "," : ".");
+}