Version.

[mandoc.git] / man_term.c

diff --git a/man_term.c b/man_term.c
index 58fcee0d22358560d7bd10eed7e076fef01ee36f..8b1c623696b473d4824176691f6b03b772055ca9 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,20 +1,18 @@
-/* $Id: man_term.c,v 1.4 2009/03/26 16:23:22 kristaps Exp $ */
+/*     $Id: man_term.c,v 1.16 2009/06/18 20:46:19 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
  * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <assert.h>
 #include <err.h>
@@ -42,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);
@@ -59,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 */
@@ -80,6 +79,8 @@ static const struct termact termacts[MAN_MAX] = {
        { pre_I, post_I }, /* I */
        { pre_IR, NULL }, /* IR */
        { pre_RI, NULL }, /* RI */
+       { NULL, NULL }, /* na */
+       { pre_I, post_I }, /* i */
 };
 
 static void              print_head(struct termp *, 
@@ -96,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);
@@ -257,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)
@@ -272,26 +286,33 @@ 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);
-
-       /* FIXME - ignore the designator. */
-       nn = nn->next;
-
        if (MAN_TEXT != nn->type)
                errx(1, "expected text line argument");
 
-       offs = (size_t)atoi(nn->string);
-       nn = nn->next;
+       if (nn->next) {
+               if (MAN_TEXT != nn->next->type)
+                       errx(1, "expected text line argument");
+               offs = (size_t)atoi(nn->next->string);
+       } else
+               offs = strlen(nn->string);
 
        p->flags |= TERMP_NOSPACE;
-       p->offset += offs;
+       /* FIXME */
+       if ((p->offset += offs) > p->rmargin)
+               errx(1, "line too long");
+#endif
+
        return(0);
 }
 
@@ -304,6 +325,7 @@ pre_TP(DECL_ARGS)
        size_t           offs;
 
        term_vspace(p);
+
        p->offset = INDENT;
 
        if (NULL == (nn = n->child))
@@ -441,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);
@@ -494,7 +512,7 @@ print_head(struct termp *p, const struct man_meta *meta)
                        meta->title, meta->msec);
 
        p->offset = 0;
-       p->rmargin = (p->maxrmargin - strlen(buf)) / 2;
+       p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2;
        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
 
        term_word(p, title);