Fixed STRUCTURE repeat (schwarze@openbsd.org).

[mandoc.git] / man_term.c

diff --git a/man_term.c b/man_term.c
index 786f1b4bb9540eee81b19d6b75b17ee46e5450c9..8b1c623696b473d4824176691f6b03b772055ca9 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,4 +1,4 @@
-/*     $Id: man_term.c,v 1.11 2009/06/11 12:07:49 kristaps Exp $ */
+/*     $Id: man_term.c,v 1.16 2009/06/18 20:46:19 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -40,6 +40,7 @@ struct        termact {
 static int               pre_B(DECL_ARGS);
 static int               pre_BI(DECL_ARGS);
 static int               pre_BR(DECL_ARGS);
+static int               pre_br(DECL_ARGS);
 static int               pre_I(DECL_ARGS);
 static int               pre_IB(DECL_ARGS);
 static int               pre_IP(DECL_ARGS);
@@ -57,7 +58,7 @@ static        void              post_SH(DECL_ARGS);
 static void              post_SS(DECL_ARGS);
 
 static const struct termact termacts[MAN_MAX] = {
-       { NULL, NULL }, /* __ */
+       { pre_br, NULL }, /* br */
        { NULL, NULL }, /* TH */
        { pre_SH, post_SH }, /* SH */
        { pre_SS, post_SS }, /* SS */
@@ -78,7 +79,6 @@ static const struct termact termacts[MAN_MAX] = {
        { pre_I, post_I }, /* I */
        { pre_IR, NULL }, /* IR */
        { pre_RI, NULL }, /* RI */
-       { pre_PP, NULL }, /* br */
        { NULL, NULL }, /* na */
        { pre_I, post_I }, /* i */
 };
@@ -97,7 +97,10 @@ man_run(struct termp *p, const struct man *m)
 
        print_head(p, man_meta(m));
        p->flags |= TERMP_NOSPACE;
-       print_body(p, man_node(m), man_meta(m));
+       assert(man_node(m));
+       assert(MAN_ROOT == man_node(m)->type);
+       if (man_node(m)->child)
+               print_body(p, man_node(m)->child, man_meta(m));
        print_foot(p, man_meta(m));
 
        return(1);
@@ -258,6 +261,16 @@ post_B(DECL_ARGS)
 }
 
 
+/* ARGSUSED */
+static int
+pre_br(DECL_ARGS)
+{
+
+       term_newln(p);
+       return(0);
+}
+
+
 /* ARGSUSED */
 static int
 pre_PP(DECL_ARGS)
@@ -273,12 +286,15 @@ pre_PP(DECL_ARGS)
 static int
 pre_IP(DECL_ARGS)
 {
+#if 0
        const struct man_node *nn;
        size_t           offs;
+#endif
 
        term_vspace(p);
        p->offset = INDENT;
 
+#if 0
        if (NULL == (nn = n->child))
                return(1);
        if (MAN_TEXT != nn->type)
@@ -295,6 +311,8 @@ pre_IP(DECL_ARGS)
        /* FIXME */
        if ((p->offset += offs) > p->rmargin)
                errx(1, "line too long");
+#endif
+
        return(0);
 }
 
@@ -307,6 +325,7 @@ pre_TP(DECL_ARGS)
        size_t           offs;
 
        term_vspace(p);
+
        p->offset = INDENT;
 
        if (NULL == (nn = n->child))
@@ -444,11 +463,7 @@ print_foot(struct termp *p, const struct man_meta *meta)
 
        tm = localtime(&meta->date);
 
-#ifdef __OpenBSD__
-       if (NULL == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-#else
        if (0 == strftime(buf, p->rmargin, "%B %d, %Y", tm))
-#endif
                err(1, "strftime");
 
        term_vspace(p);