Formatting.

[mandoc.git] / term.c

diff --git a/term.c b/term.c
index db9261e4cd156d3f6d91b7c474c5a11c0a75e5d1..c69210d6f17e4b2b2e43e15ef8a14d62db50ae47 100644 (file)
--- a/term.c
+++ b/term.c
@@ -1,4 +1,4 @@
-/* $Id: term.c,v 1.18 2009/02/25 12:09:20 kristaps Exp $ */
+/* $Id: term.c,v 1.19 2009/02/25 12:27:37 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -653,25 +653,6 @@ termp_op_post(DECL_ARGS)
 }
 
 
-/* ARGSUSED */
-static void
-termp_sh_post(DECL_ARGS)
-{
-
-       switch (node->type) {
-       case (MDOC_HEAD):
-               newln(p);
-               break;
-       case (MDOC_BODY):
-               newln(p);
-               p->offset = 0;
-               break;
-       default:
-               break;
-       }
-}
-
-
 /* ARGSUSED */
 static int
 termp_xr_pre(DECL_ARGS)
@@ -764,6 +745,25 @@ termp_sh_pre(DECL_ARGS)
 }
 
 
+/* ARGSUSED */
+static void
+termp_sh_post(DECL_ARGS)
+{
+
+       switch (node->type) {
+       case (MDOC_HEAD):
+               newln(p);
+               break;
+       case (MDOC_BODY):
+               newln(p);
+               p->offset = 0;
+               break;
+       default:
+               break;
+       }
+}
+
+
 /* ARGSUSED */
 static int
 termp_op_pre(DECL_ARGS)
@@ -809,7 +809,7 @@ termp_d1_pre(DECL_ARGS)
        if (MDOC_BODY != node->type)
                return(1);
        newln(p);
-       p->offset += INDENT;
+       p->offset += (pair->offset = INDENT);
        return(1);
 }
 
@@ -822,7 +822,7 @@ termp_d1_post(DECL_ARGS)
        if (MDOC_BODY != node->type) 
                return;
        newln(p);
-       p->offset -= INDENT;
+       p->offset -= pair->offset;
 }
 
 
@@ -988,7 +988,8 @@ termp_bd_pre(DECL_ARGS)
        i = arg_getattr(MDOC_Offset, bl->argc, bl->argv);
        if (-1 != i) {
                assert(1 == bl->argv[i].sz);
-               p->offset += arg_offset(&bl->argv[i]);
+               pair->offset = arg_offset(&bl->argv[i]);
+               p->offset += pair->offset;
        }
 
        if ( ! arg_hasattr(MDOC_Literal, bl->argc, bl->argv))
@@ -1015,20 +1016,9 @@ termp_bd_pre(DECL_ARGS)
 static void
 termp_bd_post(DECL_ARGS)
 {
-       int              i;
-       const struct mdoc_block *bl;
-
-       if (MDOC_BODY != node->type)
-               return;
-
-       assert(MDOC_BLOCK == node->parent->type);
-       bl = &node->parent->data.block;
 
-       i = arg_getattr(MDOC_Offset, bl->argc, bl->argv);
-       if (-1 != i) {
-               assert(1 == bl->argv[i].sz);
-               p->offset -= arg_offset(&bl->argv[i]);
-       }
+       if (MDOC_BODY == node->type)
+               p->offset -= pair->offset;
 }