Simplify the roff(7) .ce and .rj terminal formatter by using the

[mandoc.git] / mdoc_state.c

diff --git a/mdoc_state.c b/mdoc_state.c
index eaf2051147f6f0bf24cc8f2e5b81297402d03071..f9a585e736236c8897807ba5148c29390fb79701 100644 (file)
--- a/mdoc_state.c
+++ b/mdoc_state.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_state.c,v 1.10 2018/08/17 20:33:38 schwarze Exp $ */
+/*     $Id: mdoc_state.c,v 1.15 2019/01/01 07:42:04 schwarze Exp $ */
 /*
  * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
  *
@@ -17,6 +17,7 @@
 #include <sys/types.h>
 
 #include <assert.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -24,15 +25,14 @@
 #include "roff.h"
 #include "mdoc.h"
 #include "libmandoc.h"
+#include "roff_int.h"
 #include "libmdoc.h"
 
 #define STATE_ARGS  struct roff_man *mdoc, struct roff_node *n
 
 typedef        void    (*state_handler)(STATE_ARGS);
 
-static void     state_bd(STATE_ARGS);
 static void     state_bl(STATE_ARGS);
-static void     state_dl(STATE_ARGS);
 static void     state_sh(STATE_ARGS);
 static void     state_sm(STATE_ARGS);
 
@@ -44,8 +44,8 @@ static        const state_handler state_handlers[MDOC_MAX - MDOC_Dd] = {
        NULL,           /* Ss */
        NULL,           /* Pp */
        NULL,           /* D1 */
-       state_dl,       /* Dl */
-       state_bd,       /* Bd */
+       NULL,           /* Dl */
+       NULL,           /* Bd */
        NULL,           /* Ed */
        state_bl,       /* Bl */
        NULL,           /* El */
@@ -177,33 +177,6 @@ mdoc_state(struct roff_man *mdoc, struct roff_node *n)
                (*handler)(mdoc, n);
 }
 
-void
-mdoc_state_reset(struct roff_man *mdoc)
-{
-
-       roff_setreg(mdoc->roff, "nS", 0, '=');
-       mdoc->flags = 0;
-}
-
-static void
-state_bd(STATE_ARGS)
-{
-       enum mdocargt arg;
-
-       if (n->type != ROFFT_HEAD &&
-           (n->type != ROFFT_BODY || n->end != ENDBODY_NOT))
-               return;
-
-       if (n->parent->args == NULL)
-               return;
-
-       arg = n->parent->args->argv[0].arg;
-       if (arg != MDOC_Literal && arg != MDOC_Unfilled)
-               return;
-
-       state_dl(mdoc, n);
-}
-
 static void
 state_bl(STATE_ARGS)
 {
@@ -228,22 +201,6 @@ state_bl(STATE_ARGS)
        }
 }
 
-static void
-state_dl(STATE_ARGS)
-{
-
-       switch (n->type) {
-       case ROFFT_HEAD:
-               mdoc->flags |= MDOC_LITERAL;
-               break;
-       case ROFFT_BODY:
-               mdoc->flags &= ~MDOC_LITERAL;
-               break;
-       default:
-               break;
-       }
-}
-
 static void
 state_sh(STATE_ARGS)
 {