Added enum mdoc_disp (similar to enum mdoc_list). Display types are now

[mandoc.git] / mdoc_html.c

diff --git a/mdoc_html.c b/mdoc_html.c
index 1ac0139e6c296d2b7fcbd9fe0bb0b14dbd30787a..0df11dc355e3b2836a7e7db90709ccd05ff80b16 100644 (file)
--- a/mdoc_html.c
+++ b/mdoc_html.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_html.c,v 1.78 2010/06/07 11:01:15 kristaps Exp $ */
+/*     $Id: mdoc_html.c,v 1.79 2010/06/12 10:09:19 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -1353,7 +1353,7 @@ static int
 mdoc_bd_pre(MDOC_ARGS)
 {
        struct htmlpair          tag[2];
-       int                      type, comp, i;
+       int                      comp, i;
        const struct mdoc_node  *bl, *nn;
        struct roffsu            su;
 
@@ -1366,7 +1366,7 @@ mdoc_bd_pre(MDOC_ARGS)
 
        SCALE_VS_INIT(&su, 0);
 
-       type = comp = 0;
+       comp = 0;
        for (i = 0; bl->args && i < (int)bl->args->argc; i++) 
                switch (bl->args->argv[i].arg) {
                case (MDOC_Offset):
@@ -1375,17 +1375,6 @@ mdoc_bd_pre(MDOC_ARGS)
                case (MDOC_Compact):
                        comp = 1;
                        break;
-               case (MDOC_Centred):
-                       /* FALLTHROUGH */
-               case (MDOC_Ragged):
-                       /* FALLTHROUGH */
-               case (MDOC_Filled):
-                       /* FALLTHROUGH */
-               case (MDOC_Unfilled):
-                       /* FALLTHROUGH */
-               case (MDOC_Literal):
-                       type = bl->args->argv[i].arg;
-                       break;
                default:
                        break;
                }
@@ -1415,7 +1404,8 @@ mdoc_bd_pre(MDOC_ARGS)
                return(1);
        }
 
-       if (MDOC_Unfilled != type && MDOC_Literal != type)
+       if (DISP_unfilled != n->data.disp && 
+                       DISP_literal != n->data.disp)
                return(1);
 
        PAIR_CLASS_INIT(&tag[0], "lit");