Replacement of `Lb' in mdoc_action.c.

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index f108bfec42e63e0260aa0fa2e901a2838d200ff0..208dc94c4a12b04b60149a2b8b0454db20cb11eb 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.31 2009/07/12 19:13:12 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.37 2009/07/12 20:50:08 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -127,7 +127,6 @@ static      int       termp__t_pre(DECL_ARGS);
 static int       termp_ap_pre(DECL_ARGS);
 static int       termp_aq_pre(DECL_ARGS);
 static int       termp_ar_pre(DECL_ARGS);
 static int       termp_ap_pre(DECL_ARGS);
 static int       termp_aq_pre(DECL_ARGS);
 static int       termp_ar_pre(DECL_ARGS);

-static int       termp_at_pre(DECL_ARGS);

 static int       termp_bd_pre(DECL_ARGS);
 static int       termp_bf_pre(DECL_ARGS);
 static int       termp_bq_pre(DECL_ARGS);
 static int       termp_bd_pre(DECL_ARGS);
 static int       termp_bf_pre(DECL_ARGS);
 static int       termp_bq_pre(DECL_ARGS);


@@ -148,7 +147,6 @@ static      int       termp_ft_pre(DECL_ARGS);
 static int       termp_ic_pre(DECL_ARGS);
 static int       termp_in_pre(DECL_ARGS);
 static int       termp_it_pre(DECL_ARGS);
 static int       termp_ic_pre(DECL_ARGS);
 static int       termp_in_pre(DECL_ARGS);
 static int       termp_it_pre(DECL_ARGS);

-static int       termp_lb_pre(DECL_ARGS);

 static int       termp_lk_pre(DECL_ARGS);
 static int       termp_ms_pre(DECL_ARGS);
 static int       termp_mt_pre(DECL_ARGS);
 static int       termp_lk_pre(DECL_ARGS);
 static int       termp_ms_pre(DECL_ARGS);
 static int       termp_mt_pre(DECL_ARGS);


@@ -167,7 +165,6 @@ static      int       termp_sh_pre(DECL_ARGS);
 static int       termp_sm_pre(DECL_ARGS);
 static int       termp_sq_pre(DECL_ARGS);
 static int       termp_ss_pre(DECL_ARGS);
 static int       termp_sm_pre(DECL_ARGS);
 static int       termp_sq_pre(DECL_ARGS);
 static int       termp_ss_pre(DECL_ARGS);

-static int       termp_st_pre(DECL_ARGS);

 static int       termp_sx_pre(DECL_ARGS);
 static int       termp_sy_pre(DECL_ARGS);
 static int       termp_ud_pre(DECL_ARGS);
 static int       termp_sx_pre(DECL_ARGS);
 static int       termp_sy_pre(DECL_ARGS);
 static int       termp_ud_pre(DECL_ARGS);


@@ -214,7 +211,7 @@ static const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Ot */
        { termp_pa_pre, NULL }, /* Pa */
        { termp_rv_pre, NULL }, /* Rv */
        { NULL, NULL }, /* Ot */
        { termp_pa_pre, NULL }, /* Pa */
        { termp_rv_pre, NULL }, /* Rv */

-       { termp_st_pre, NULL }, /* St */ 
+       { NULL, NULL }, /* St */ 

        { termp_va_pre, NULL }, /* Va */
        { termp_vt_pre, termp_vt_post }, /* Vt */ 
        { termp_xr_pre, NULL }, /* Xr */
        { termp_va_pre, NULL }, /* Va */
        { termp_vt_pre, termp_vt_post }, /* Vt */ 
        { termp_xr_pre, NULL }, /* Xr */


@@ -232,7 +229,7 @@ static const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Ac */
        { termp_aq_pre, termp_aq_post }, /* Ao */
        { termp_aq_pre, termp_aq_post }, /* Aq */
        { NULL, NULL }, /* Ac */
        { termp_aq_pre, termp_aq_post }, /* Ao */
        { termp_aq_pre, termp_aq_post }, /* Aq */

-       { termp_at_pre, NULL }, /* At */
+       { NULL, NULL }, /* At */

        { NULL, NULL }, /* Bc */
        { termp_bf_pre, NULL }, /* Bf */ 
        { termp_bq_pre, termp_bq_post }, /* Bo */
        { NULL, NULL }, /* Bc */
        { termp_bf_pre, NULL }, /* Bf */ 
        { termp_bq_pre, termp_bq_post }, /* Bo */


@@ -283,7 +280,7 @@ static const struct termact termacts[MDOC_MAX] = {
        { NULL, NULL }, /* Hf */
        { NULL, NULL }, /* Fr */
        { termp_ud_pre, NULL }, /* Ud */
        { NULL, NULL }, /* Hf */
        { NULL, NULL }, /* Fr */
        { termp_ud_pre, NULL }, /* Ud */

-       { termp_lb_pre, termp_lb_post }, /* Lb */
+       { NULL, termp_lb_post }, /* Lb */

        { termp_pp_pre, NULL }, /* Lp */ 
        { termp_lk_pre, NULL }, /* Lk */ 
        { termp_mt_pre, NULL }, /* Mt */ 
        { termp_pp_pre, NULL }, /* Lp */ 
        { termp_lk_pre, NULL }, /* Lk */ 
        { termp_mt_pre, NULL }, /* Mt */ 


@@ -1041,18 +1038,6 @@ termp_pp_pre(DECL_ARGS)
 }
 
 
 }
 
 

-/* ARGSUSED */
-static int
-termp_st_pre(DECL_ARGS)
-{
-       const char      *cp;
-
-       if (node->child && (cp = mdoc_a2st(node->child->string)))
-               term_word(p, cp);
-       return(0);
-}
-
-

 /* ARGSUSED */
 static int
 termp_rs_pre(DECL_ARGS)
 /* ARGSUSED */
 static int
 termp_rs_pre(DECL_ARGS)


@@ -1070,12 +1055,9 @@ termp_rv_pre(DECL_ARGS)
 {
        int              i;
 
 {
        int              i;
 

-       /* FIXME: mandated by parser. */
-
-       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");
+       i = arg_getattr(MDOC_Std, node);
+       assert(-1 != i);
+       assert(node->args->argv[i].sz);

 
        term_newln(p);
        term_word(p, "The");
 
        term_newln(p);
        term_word(p, "The");


@@ -1105,12 +1087,9 @@ termp_ex_pre(DECL_ARGS)
 {
        int              i;
 
 {
        int              i;
 

-       /* FIXME: mandated by parser? */
-
-       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");
+       i = arg_getattr(MDOC_Std, node);
+       assert(-1 != i);
+       assert(node->args->argv[i].sz);

 
        term_word(p, "The");
        p->flags |= ttypes[TTYPE_PROG];
 
        term_word(p, "The");
        p->flags |= ttypes[TTYPE_PROG];


@@ -1204,7 +1183,11 @@ static void
 termp_vt_post(DECL_ARGS)
 {
 
 termp_vt_post(DECL_ARGS)
 {
 

-       if (node->sec == SEC_SYNOPSIS)
+       if (node->sec != SEC_SYNOPSIS)
+               return;
+       if (node->next && MDOC_Vt == node->next->tok)
+               term_newln(p);
+       else if (node->next)

                term_vspace(p);
 }
 
                term_vspace(p);
 }
 


@@ -1299,23 +1282,6 @@ termp_bt_pre(DECL_ARGS)
 }
 
 
 }
 
 

-/* ARGSUSED */
-static int
-termp_lb_pre(DECL_ARGS)
-{
-       const char      *lb;
-
-       assert(node->child && MDOC_TEXT == node->child->type);
-       lb = mdoc_a2lib(node->child->string);
-       if (lb) {
-               term_word(p, lb);
-               return(0);
-       }
-       term_word(p, "library");
-       return(1);
-}
-
-

 /* ARGSUSED */
 static void
 termp_lb_post(DECL_ARGS)
 /* ARGSUSED */
 static void
 termp_lb_post(DECL_ARGS)


@@ -1838,24 +1804,6 @@ termp_in_post(DECL_ARGS)
 }
 
 
 }
 
 

-/* ARGSUSED */
-static int
-termp_at_pre(DECL_ARGS)
-{
-       const char      *att;
-
-       att = NULL;
-
-       if (node->child)
-               att = mdoc_a2att(node->child->string);
-       if (NULL == att)
-               att = "AT&T UNIX";
-
-       term_word(p, att);
-       return(0);
-}
-
-

 /* ARGSUSED */
 static int
 termp_brq_pre(DECL_ARGS)
 /* ARGSUSED */
 static int
 termp_brq_pre(DECL_ARGS)


@@ -1937,14 +1885,13 @@ termp_fo_pre(DECL_ARGS)
        const struct mdoc_node *n;
 
        if (MDOC_BODY == node->type) {
        const struct mdoc_node *n;
 
        if (MDOC_BODY == node->type) {

+               p->flags |= TERMP_NOSPACE;

                term_word(p, "(");
                p->flags |= TERMP_NOSPACE;
                return(1);
        } else if (MDOC_HEAD != node->type) 
                return(1);
 
                term_word(p, "(");
                p->flags |= TERMP_NOSPACE;
                return(1);
        } else if (MDOC_HEAD != node->type) 
                return(1);
 

-       /* XXX - groff shows only first parameter */
-

        p->flags |= ttypes[TTYPE_FUNC_NAME];
        for (n = node->child; n; n = n->next) {
                assert(MDOC_TEXT == n->type);
        p->flags |= ttypes[TTYPE_FUNC_NAME];
        for (n = node->child; n; n = n->next) {
                assert(MDOC_TEXT == n->type);