]> git.cameronkatri.com Git - mandoc.git/blobdiff - man_term.c
git.ckatri.com / mandoc.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Removed superfluous HTML_NEWLINE.
[mandoc.git] / man_term.c
diff --git a/man_term.c b/man_term.c
index d5d95edc94530856da3d95b2c139b3efee2660fa..fefbc1cb99bc58dfb3378048feb97c20d72abe2d 100644 (file)
--- a/man_term.c
+++ b/man_term.c
@@ -1,31 +1,60 @@
-/* $Id: man_term.c,v 1.1 2009/03/26 14:38:11 kristaps Exp $ */
+/*     $Id: man_term.c,v 1.54 2009/11/12 08:21:05 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
  *
  * 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 <sys/types.h>
+
 #include <assert.h>
 #include <assert.h>
-#include <err.h>
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "term.h"
+#include "out.h"
 #include "man.h"
 #include "man.h"
+#include "term.h"
+#include "chars.h"
+#include "main.h"
+
+#define        INDENT            7
+#define        HALFINDENT        3
+
+/* FIXME: have PD set the default vspace width. */
+
+struct mtermp {
+       int               fl;
+#define        MANT_LITERAL     (1 << 0)
+       /* 
+        * Default amount to indent the left margin after leading text
+        * has been printed (e.g., `HP' left-indent, `TP' and `IP' body
+        * indent).  This needs to be saved because `HP' and so on, if
+        * not having a specified value, must default.
+        *
+        * Note that this is the indentation AFTER the left offset, so
+        * the total offset is usually offset + lmargin.
+        */
+       size_t            lmargin;
+       /*
+        * The default offset, i.e., the amount between any text and the
+        * page boundary.
+        */
+       size_t            offset;
+};
 
 #define        DECL_ARGS         struct termp *p, \
 
 #define        DECL_ARGS         struct termp *p, \
+                         struct mtermp *mt, \
                          const struct man_node *n, \
                          const struct man_meta *m
 
                          const struct man_node *n, \
                          const struct man_meta *m
 
@@ -34,250 +63,783 @@ struct    termact {
        void            (*post)(DECL_ARGS);
 };
 
        void            (*post)(DECL_ARGS);
 };
 
+#ifdef __linux__
+extern size_t            strlcpy(char *, const char *, size_t);
+extern size_t            strlcat(char *, const char *, size_t);
+#endif
+
+static int               a2width(const struct man_node *);
+static int               a2height(const struct man_node *);
+
+static void              print_man_head(struct termp *, 
+                               const struct man_meta *);
+static void              print_man_nodelist(DECL_ARGS);
+static void              print_man_node(DECL_ARGS);
+static void              print_man_foot(struct termp *, 
+                               const struct man_meta *);
+static void              print_bvspace(struct termp *, 
+                               const struct man_node *);
+
 static int               pre_B(DECL_ARGS);
 static int               pre_B(DECL_ARGS);
+static int               pre_BI(DECL_ARGS);
+static int               pre_HP(DECL_ARGS);
 static int               pre_I(DECL_ARGS);
 static int               pre_I(DECL_ARGS);
+static int               pre_IP(DECL_ARGS);
 static int               pre_PP(DECL_ARGS);
 static int               pre_PP(DECL_ARGS);
+static int               pre_RB(DECL_ARGS);
+static int               pre_RI(DECL_ARGS);
+static int               pre_RS(DECL_ARGS);
 static int               pre_SH(DECL_ARGS);
 static int               pre_SS(DECL_ARGS);
 static int               pre_TP(DECL_ARGS);
 static int               pre_SH(DECL_ARGS);
 static int               pre_SS(DECL_ARGS);
 static int               pre_TP(DECL_ARGS);
-
-static void              post_B(DECL_ARGS);
-static void              post_I(DECL_ARGS);
+static int               pre_br(DECL_ARGS);
+static int               pre_fi(DECL_ARGS);
+static int               pre_ign(DECL_ARGS);
+static int               pre_nf(DECL_ARGS);
+static int               pre_sp(DECL_ARGS);
+
+static void              post_IP(DECL_ARGS);
+static void              post_HP(DECL_ARGS);
+static void              post_RS(DECL_ARGS);
 static void              post_SH(DECL_ARGS);
 static void              post_SS(DECL_ARGS);
 static void              post_SH(DECL_ARGS);
 static void              post_SS(DECL_ARGS);
+static void              post_TP(DECL_ARGS);
 
 
-static const struct termact termacts[MAN_MAX] = {
-       { NULL, NULL }, /* __ */
+static const struct termact termacts[MAN_MAX] = {
+       { pre_br, NULL }, /* br */
        { NULL, NULL }, /* TH */
        { pre_SH, post_SH }, /* SH */
        { pre_SS, post_SS }, /* SS */
        { NULL, NULL }, /* TH */
        { pre_SH, post_SH }, /* SH */
        { pre_SS, post_SS }, /* SS */
-       { pre_TP, NULL }, /* TP */
+       { pre_TP, post_TP }, /* TP */
        { pre_PP, NULL }, /* LP */
        { pre_PP, NULL }, /* PP */
        { pre_PP, NULL }, /* P */
        { pre_PP, NULL }, /* LP */
        { pre_PP, NULL }, /* PP */
        { pre_PP, NULL }, /* P */
-       { NULL, NULL }, /* IP */
-       { pre_PP, NULL }, /* HP */ /* XXX */
+       { pre_IP, post_IP }, /* IP */
+       { pre_HP, post_HP }, /* HP */ 
        { NULL, NULL }, /* SM */
        { NULL, NULL }, /* SM */
-       { pre_B, post_B }, /* SB */
-       { NULL, NULL }, /* BI */
-       { NULL, NULL }, /* IB */
-       { NULL, NULL }, /* BR */
-       { NULL, NULL }, /* RB */
+       { pre_B, NULL }, /* SB */
+       { pre_BI, NULL }, /* BI */
+       { pre_BI, NULL }, /* IB */
+       { pre_RB, NULL }, /* BR */
+       { pre_RB, NULL }, /* RB */
        { NULL, NULL }, /* R */
        { NULL, NULL }, /* R */
-       { pre_B, post_B }, /* B */
-       { pre_I, post_I }, /* I */
-       { NULL, NULL }, /* IR */
-       { NULL, NULL }, /* RI */
+       { pre_B, NULL }, /* B */
+       { pre_I, NULL }, /* I */
+       { pre_RI, NULL }, /* IR */
+       { pre_RI, NULL }, /* RI */
+       { NULL, NULL }, /* na */
+       { pre_I, NULL }, /* i */
+       { pre_sp, NULL }, /* sp */
+       { pre_nf, NULL }, /* nf */
+       { pre_fi, NULL }, /* fi */
+       { NULL, NULL }, /* r */
+       { NULL, NULL }, /* RE */
+       { pre_RS, post_RS }, /* RS */
+       { pre_ign, NULL }, /* DT */
+       { pre_ign, NULL }, /* UC */
+       { pre_ign, NULL }, /* PD */
 };
 
 };
 
-static void              print_head(struct termp *, 
-                               const struct man_meta *);
-static void              print_body(DECL_ARGS);
-static void              print_node(DECL_ARGS);
-static void              print_foot(struct termp *, 
-                               const struct man_meta *);
 
 
 
 
-int
-man_run(struct termp *p, const struct man *m)
+void
+terminal_man(void *arg, const struct man *man)
 {
 {
+       struct termp            *p;
+       const struct man_node   *n;
+       const struct man_meta   *m;
+       struct mtermp            mt;
+
+       p = (struct termp *)arg;
+
+       if (NULL == p->symtab)
+               switch (p->enc) {
+               case (TERMENC_ASCII):
+                       p->symtab = chars_init(CHARS_ASCII);
+                       break;
+               default:
+                       abort();
+                       /* NOTREACHED */
+               }
+
+       n = man_node(man);
+       m = man_meta(man);
 
 
-       print_head(p, man_meta(m));
+       print_man_head(p, m);
        p->flags |= TERMP_NOSPACE;
        p->flags |= TERMP_NOSPACE;
-       print_body(p, man_node(m), man_meta(m));
-       print_foot(p, man_meta(m));
 
 
-       return(1);
+       mt.fl = 0;
+       mt.lmargin = INDENT;
+       mt.offset = INDENT;
+
+       if (n->child)
+               print_man_nodelist(p, &mt, n->child, m);
+       print_man_foot(p, m);
+}
+
+
+static int
+a2height(const struct man_node *n)
+{
+       struct roffsu    su;
+
+       assert(MAN_TEXT == n->type);
+       assert(n->string);
+       if ( ! a2roffsu(n->string, &su, SCALE_VS))
+               SCALE_VS_INIT(&su, strlen(n->string));
+
+       return((int)term_vspan(&su));
 }
 
 
 }
 
 
+static int
+a2width(const struct man_node *n)
+{
+       struct roffsu    su;
+
+       assert(MAN_TEXT == n->type);
+       assert(n->string);
+       if ( ! a2roffsu(n->string, &su, SCALE_BU))
+               return(-1);
+
+       return((int)term_hspan(&su));
+}
+
+
+static void
+print_bvspace(struct termp *p, const struct man_node *n)
+{
+       term_newln(p);
+
+       if (NULL == n->prev)
+               return;
+
+       if (MAN_SS == n->prev->tok)
+               return;
+       if (MAN_SH == n->prev->tok)
+               return;
+
+       term_vspace(p);
+}
+
+
+/* ARGSUSED */
+static int
+pre_ign(DECL_ARGS)
+{
+
+       return(0);
+}
+
+
+/* ARGSUSED */
 static int
 pre_I(DECL_ARGS)
 {
 
 static int
 pre_I(DECL_ARGS)
 {
 
-       p->flags |= TERMP_UNDER;
+       term_fontrepl(p, TERMFONT_UNDER);
        return(1);
 }
 
 
        return(1);
 }
 
 
-static void
-post_I(DECL_ARGS)
+/* ARGSUSED */
+static int
+pre_fi(DECL_ARGS)
 {
 
 {
 
-       p->flags &= ~TERMP_UNDER;
+       mt->fl &= ~MANT_LITERAL;
+       return(1);
 }
 
 
 }
 
 
+/* ARGSUSED */
+static int
+pre_nf(DECL_ARGS)
+{
+
+       term_newln(p);
+       mt->fl |= MANT_LITERAL;
+       return(1);
+}
+
+
+/* ARGSUSED */
+static int
+pre_RB(DECL_ARGS)
+{
+       const struct man_node *nn;
+       int              i;
+
+       for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
+               if (i % 2 && MAN_RB == n->tok)
+                       term_fontrepl(p, TERMFONT_BOLD);
+               else if ( ! (i % 2) && MAN_RB != n->tok)
+                       term_fontrepl(p, TERMFONT_BOLD);
+               else
+                       term_fontrepl(p, TERMFONT_NONE);
+
+               if (i > 0)
+                       p->flags |= TERMP_NOSPACE;
+
+               print_man_node(p, mt, nn, m);
+       }
+       return(0);
+}
+
+
+/* ARGSUSED */
+static int
+pre_RI(DECL_ARGS)
+{
+       const struct man_node *nn;
+       int              i;
+
+       for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
+               if (i % 2 && MAN_RI == n->tok)
+                       term_fontrepl(p, TERMFONT_UNDER);
+               else if ( ! (i % 2) && MAN_RI != n->tok)
+                       term_fontrepl(p, TERMFONT_UNDER);
+               else
+                       term_fontrepl(p, TERMFONT_NONE);
+
+               if (i > 0)
+                       p->flags |= TERMP_NOSPACE;
+
+               print_man_node(p, mt, nn, m);
+       }
+       return(0);
+}
+
+
+/* ARGSUSED */
+static int
+pre_BI(DECL_ARGS)
+{
+       const struct man_node   *nn;
+       int                      i;
+
+       for (i = 0, nn = n->child; nn; nn = nn->next, i++) {
+               if (i % 2 && MAN_BI == n->tok)
+                       term_fontrepl(p, TERMFONT_UNDER);
+               else if (i % 2)
+                       term_fontrepl(p, TERMFONT_BOLD);
+               else if (MAN_BI == n->tok)
+                       term_fontrepl(p, TERMFONT_BOLD);
+               else
+                       term_fontrepl(p, TERMFONT_UNDER);
+
+               if (i)
+                       p->flags |= TERMP_NOSPACE;
+
+               print_man_node(p, mt, nn, m);
+       }
+       return(0);
+}
+
+
+/* ARGSUSED */
 static int
 pre_B(DECL_ARGS)
 {
 
 static int
 pre_B(DECL_ARGS)
 {
 
-       p->flags |= TERMP_BOLD;
+       term_fontrepl(p, TERMFONT_BOLD);
+       return(1);
+}
+
+
+/* ARGSUSED */
+static int
+pre_sp(DECL_ARGS)
+{
+       int              i, len;
+
+       len = n->child ? a2height(n->child) : 1;
+
+       if (0 == len)
+               term_newln(p);
+       for (i = 0; i < len; i++)
+               term_vspace(p);
+
+       return(0);
+}
+
+
+/* ARGSUSED */
+static int
+pre_br(DECL_ARGS)
+{
+
+       term_newln(p);
+       return(0);
+}
+
+
+/* ARGSUSED */
+static int
+pre_HP(DECL_ARGS)
+{
+       size_t                   len;
+       int                      ival;
+       const struct man_node   *nn;
+
+       switch (n->type) {
+       case (MAN_BLOCK):
+               print_bvspace(p, n);
+               return(1);
+       case (MAN_BODY):
+               p->flags |= TERMP_NOBREAK;
+               p->flags |= TERMP_TWOSPACE;
+               break;
+       default:
+               return(0);
+       }
+
+       len = mt->lmargin;
+       ival = -1;
+
+       /* Calculate offset. */
+
+       if (NULL != (nn = n->parent->head->child))
+               if ((ival = a2width(nn)) >= 0)
+                       len = (size_t)ival;
+
+       if (0 == len)
+               len = 1;
+
+       p->offset = mt->offset;
+       p->rmargin = mt->offset + len;
+
+       if (ival >= 0)
+               mt->lmargin = (size_t)ival;
+
        return(1);
 }
 
 
        return(1);
 }
 
 
+/* ARGSUSED */
 static void
 static void
-post_B(DECL_ARGS)
+post_HP(DECL_ARGS)
 {
 
 {
 
-       p->flags &= ~TERMP_BOLD;
+       switch (n->type) {
+       case (MAN_BLOCK):
+               term_flushln(p);
+               break;
+       case (MAN_BODY):
+               term_flushln(p);
+               p->flags &= ~TERMP_NOBREAK;
+               p->flags &= ~TERMP_TWOSPACE;
+               p->offset = mt->offset;
+               p->rmargin = p->maxrmargin;
+               break;
+       default:
+               break;
+       }
 }
 
 
 }
 
 
+/* ARGSUSED */
 static int
 pre_PP(DECL_ARGS)
 {
 
 static int
 pre_PP(DECL_ARGS)
 {
 
-       term_vspace(p);
-       p->offset = INDENT;
-       return(0);
+       switch (n->type) {
+       case (MAN_BLOCK):
+               mt->lmargin = INDENT;
+               print_bvspace(p, n);
+               break;
+       default:
+               p->offset = mt->offset;
+               break;
+       }
+
+       return(1);
 }
 
 
 }
 
 
+/* ARGSUSED */
 static int
 static int
-pre_TP(DECL_ARGS)
+pre_IP(DECL_ARGS)
 {
 {
-       const struct man_node *nn;
-       size_t           offs;
+       const struct man_node   *nn;
+       size_t                   len;
+       int                      ival;
 
 
-       term_vspace(p);
-       p->offset = INDENT;
+       switch (n->type) {
+       case (MAN_BODY):
+               p->flags |= TERMP_NOLPAD;
+               p->flags |= TERMP_NOSPACE;
+               break;
+       case (MAN_HEAD):
+               p->flags |= TERMP_NOBREAK;
+               p->flags |= TERMP_TWOSPACE;
+               break;
+       case (MAN_BLOCK):
+               print_bvspace(p, n);
+               /* FALLTHROUGH */
+       default:
+               return(1);
+       }
+
+       len = mt->lmargin;
+       ival = -1;
 
 
-       if (NULL == (nn = n->child))
+       /* Calculate offset. */
+
+       if (NULL != (nn = n->parent->head->child))
+               if (NULL != (nn = nn->next)) {
+                       for ( ; nn->next; nn = nn->next)
+                               /* Do nothing. */ ;
+                       if ((ival = a2width(nn)) >= 0)
+                               len = (size_t)ival;
+               }
+
+       switch (n->type) {
+       case (MAN_HEAD):
+               /* Handle zero-width lengths. */
+               if (0 == len)
+                       len = 1;
+
+               p->offset = mt->offset;
+               p->rmargin = mt->offset + len;
+               if (ival < 0)
+                       break;
+
+               /* Set the saved left-margin. */
+               mt->lmargin = (size_t)ival;
+
+               /* Don't print the length value. */
+               for (nn = n->child; nn->next; nn = nn->next)
+                       print_man_node(p, mt, nn, m);
+               return(0);
+       case (MAN_BODY):
+               p->offset = mt->offset + len;
+               p->rmargin = p->maxrmargin;
+               break;
+       default:
+               break;
+       }
+
+       return(1);
+}
+
+
+/* ARGSUSED */
+static void
+post_IP(DECL_ARGS)
+{
+
+       switch (n->type) {
+       case (MAN_HEAD):
+               term_flushln(p);
+               p->flags &= ~TERMP_NOBREAK;
+               p->flags &= ~TERMP_TWOSPACE;
+               p->rmargin = p->maxrmargin;
+               break;
+       case (MAN_BODY):
+               term_flushln(p);
+               p->flags &= ~TERMP_NOLPAD;
+               break;
+       default:
+               break;
+       }
+}
+
+
+/* ARGSUSED */
+static int
+pre_TP(DECL_ARGS)
+{
+       const struct man_node   *nn;
+       size_t                   len;
+       int                      ival;
+
+       switch (n->type) {
+       case (MAN_HEAD):
+               p->flags |= TERMP_NOBREAK;
+               p->flags |= TERMP_TWOSPACE;
+               break;
+       case (MAN_BODY):
+               p->flags |= TERMP_NOLPAD;
+               p->flags |= TERMP_NOSPACE;
+               break;
+       case (MAN_BLOCK):
+               print_bvspace(p, n);
+               /* FALLTHROUGH */
+       default:
                return(1);
                return(1);
+       }
 
 
-       if (nn->line == n->line) {
-               if (MAN_TEXT != nn->type)
-                       errx(1, "expected text line argument");
-               offs = atoi(nn->string);
-               nn = nn->next;
-       } else
-               offs = INDENT;
+       len = (size_t)mt->lmargin;
+       ival = -1;
 
 
-       for ( ; nn; nn = nn->next)
-               print_node(p, nn, m);
+       /* Calculate offset. */
 
 
-       term_flushln(p);
-       p->flags |= TERMP_NOSPACE;
-       p->offset += offs;
-       return(0);
+       if (NULL != (nn = n->parent->head->child))
+               if (NULL != nn->next)
+                       if ((ival = a2width(nn)) >= 0)
+                               len = (size_t)ival;
+
+       switch (n->type) {
+       case (MAN_HEAD):
+               /* Handle zero-length properly. */
+               if (0 == len)
+                       len = 1;
+
+               p->offset = mt->offset;
+               p->rmargin = mt->offset + len;
+
+               /* Don't print same-line elements. */
+               for (nn = n->child; nn; nn = nn->next) 
+                       if (nn->line > n->line)
+                               print_man_node(p, mt, nn, m);
+
+               if (ival >= 0)
+                       mt->lmargin = (size_t)ival;
+
+               return(0);
+       case (MAN_BODY):
+               p->offset = mt->offset + len;
+               p->rmargin = p->maxrmargin;
+               break;
+       default:
+               break;
+       }
+
+       return(1);
 }
 
 
 }
 
 
+/* ARGSUSED */
+static void
+post_TP(DECL_ARGS)
+{
+
+       switch (n->type) {
+       case (MAN_HEAD):
+               term_flushln(p);
+               p->flags &= ~TERMP_NOBREAK;
+               p->flags &= ~TERMP_TWOSPACE;
+               p->rmargin = p->maxrmargin;
+               break;
+       case (MAN_BODY):
+               term_flushln(p);
+               p->flags &= ~TERMP_NOLPAD;
+               break;
+       default:
+               break;
+       }
+}
+
+
+/* ARGSUSED */
 static int
 pre_SS(DECL_ARGS)
 {
 
 static int
 pre_SS(DECL_ARGS)
 {
 
-       term_vspace(p);
-       p->flags |= TERMP_BOLD;
+       switch (n->type) {
+       case (MAN_BLOCK):
+               mt->lmargin = INDENT;
+               mt->offset = INDENT;
+               /* If following a prior empty `SS', no vspace. */
+               if (n->prev && MAN_SS == n->prev->tok)
+                       if (NULL == n->prev->body->child)
+                               break;
+               if (NULL == n->prev)
+                       break;
+               term_vspace(p);
+               break;
+       case (MAN_HEAD):
+               term_fontrepl(p, TERMFONT_BOLD);
+               p->offset = HALFINDENT;
+               break;
+       case (MAN_BODY):
+               p->offset = mt->offset;
+               break;
+       default:
+               break;
+       }
+
        return(1);
 }
 
 
        return(1);
 }
 
 
+/* ARGSUSED */
 static void
 post_SS(DECL_ARGS)
 {
        
 static void
 post_SS(DECL_ARGS)
 {
        
-       term_flushln(p);
-       p->flags &= ~TERMP_BOLD;
-       p->flags |= TERMP_NOSPACE;
+       switch (n->type) {
+       case (MAN_HEAD):
+               term_newln(p);
+               break;
+       case (MAN_BODY):
+               term_newln(p);
+               break;
+       default:
+               break;
+       }
 }
 
 
 }
 
 
+/* ARGSUSED */
 static int
 pre_SH(DECL_ARGS)
 {
 
 static int
 pre_SH(DECL_ARGS)
 {
 
-       term_vspace(p);
-       p->offset = 0;
-       p->flags |= TERMP_BOLD;
+       switch (n->type) {
+       case (MAN_BLOCK):
+               mt->lmargin = INDENT;
+               mt->offset = INDENT;
+               /* If following a prior empty `SH', no vspace. */
+               if (n->prev && MAN_SH == n->prev->tok)
+                       if (NULL == n->prev->body->child)
+                               break;
+               term_vspace(p);
+               break;
+       case (MAN_HEAD):
+               term_fontrepl(p, TERMFONT_BOLD);
+               p->offset = 0;
+               break;
+       case (MAN_BODY):
+               p->offset = mt->offset;
+               break;
+       default:
+               break;
+       }
+
        return(1);
 }
 
 
        return(1);
 }
 
 
+/* ARGSUSED */
 static void
 post_SH(DECL_ARGS)
 {
        
 static void
 post_SH(DECL_ARGS)
 {
        
-       term_flushln(p);
-       p->offset = INDENT;
-       p->flags &= ~TERMP_BOLD;
-       p->flags |= TERMP_NOSPACE;
+       switch (n->type) {
+       case (MAN_HEAD):
+               term_newln(p);
+               break;
+       case (MAN_BODY):
+               term_newln(p);
+               break;
+       default:
+               break;
+       }
+}
+
+
+/* ARGSUSED */
+static int
+pre_RS(DECL_ARGS)
+{
+       const struct man_node   *nn;
+       int                      ival;
+
+       switch (n->type) {
+       case (MAN_BLOCK):
+               term_newln(p);
+               return(1);
+       case (MAN_HEAD):
+               return(0);
+       default:
+               break;
+       }
+
+       if (NULL == (nn = n->parent->head->child)) {
+               mt->offset = mt->lmargin + INDENT;
+               p->offset = mt->offset;
+               return(1);
+       }
+
+       if ((ival = a2width(nn)) < 0)
+               return(1);
+
+       mt->offset = INDENT + (size_t)ival;
+       p->offset = mt->offset;
+
+       return(1);
 }
 
 
 }
 
 
+/* ARGSUSED */
 static void
 static void
-print_node(DECL_ARGS)
+post_RS(DECL_ARGS)
+{
+
+       switch (n->type) {
+       case (MAN_BLOCK):
+               mt->offset = mt->lmargin = INDENT;
+               break;
+       default:
+               term_newln(p);
+               p->offset = INDENT;
+               break;
+       }
+}
+
+
+static void
+print_man_node(DECL_ARGS)
 {
        int              c;
 
        c = 1;
 
        switch (n->type) {
 {
        int              c;
 
        c = 1;
 
        switch (n->type) {
-       case(MAN_ELEM):
-               if (termacts[n->tok].pre)
-                       c = (*termacts[n->tok].pre)(p, n, m);
-               break;
        case(MAN_TEXT):
        case(MAN_TEXT):
-               if (*n->string) {
-                       term_word(p, n->string);
+               if (0 == *n->string) {
+                       term_vspace(p);
                        break;
                }
                        break;
                }
-               term_vspace(p);
+
+               term_word(p, n->string);
+
+               /* FIXME: this means that macro lines are munged!  */
+
+               if (MANT_LITERAL & mt->fl) {
+                       p->flags |= TERMP_NOSPACE;
+                       term_flushln(p);
+               }
                break;
        default:
                break;
        default:
+               term_fontrepl(p, TERMFONT_NONE);
+               if (termacts[n->tok].pre)
+                       c = (*termacts[n->tok].pre)(p, mt, n, m);
                break;
        }
 
        if (c && n->child)
                break;
        }
 
        if (c && n->child)
-               print_body(p, n->child, m);
+               print_man_nodelist(p, mt, n->child, m);
 
 
-       switch (n->type) {
-       case (MAN_ELEM):
+       if (MAN_TEXT != n->type) {
                if (termacts[n->tok].post)
                if (termacts[n->tok].post)
-                       (*termacts[n->tok].post)(p, n, m);
-               break;
-       default:
-               break;
+                       (*termacts[n->tok].post)(p, mt, n, m);
+               term_fontrepl(p, TERMFONT_NONE);
        }
 }
 
 
 static void
        }
 }
 
 
 static void
-print_body(DECL_ARGS)
+print_man_nodelist(DECL_ARGS)
 {
 {
-       print_node(p, n, m);
+
+       print_man_node(p, mt, n, m);
        if ( ! n->next)
                return;
        if ( ! n->next)
                return;
-       print_body(p, n->next, m);
+       print_man_nodelist(p, mt, n->next, m);
 }
 
 
 static void
 }
 
 
 static void
-print_foot(struct termp *p, const struct man_meta *meta)
+print_man_foot(struct termp *p, const struct man_meta *meta)
 {
 {
-       struct tm       *tm;
-       char            *buf;
-
-       if (NULL == (buf = malloc(p->rmargin)))
-               err(1, "malloc");
+       char            buf[DATESIZ];
 
 
-       tm = localtime(&meta->date);
+       term_fontrepl(p, TERMFONT_NONE);
 
 
-#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");
-
-       /*
-        * This is /slightly/ different from regular groff output
-        * because we don't have page numbers.  Print the following:
-        *
-        * OS                                            MDOCDATE
-        */
+       time2a(meta->date, buf, DATESIZ);
 
        term_vspace(p);
 
 
        term_vspace(p);
 
@@ -298,47 +860,25 @@ print_foot(struct termp *p, const struct man_meta *meta)
 
        term_word(p, buf);
        term_flushln(p);
 
        term_word(p, buf);
        term_flushln(p);
-
-       free(buf);
 }
 
 
 static void
 }
 
 
 static void
-print_head(struct termp *p, const struct man_meta *meta)
+print_man_head(struct termp *p, const struct man_meta *m)
 {
 {
-       char            *buf, *title;
+       char            buf[BUFSIZ], title[BUFSIZ];
 
        p->rmargin = p->maxrmargin;
        p->offset = 0;
 
        p->rmargin = p->maxrmargin;
        p->offset = 0;
+       buf[0] = title[0] = '\0';
 
 
-       if (NULL == (buf = malloc(p->rmargin)))
-               err(1, "malloc");
-       if (NULL == (title = malloc(p->rmargin)))
-               err(1, "malloc");
+       if (m->vol)
+               strlcpy(buf, m->vol, BUFSIZ);
 
 
-       /*
-        * The header is strange.  It has three components, which are
-        * really two with the first duplicated.  It goes like this:
-        *
-        * IDENTIFIER              TITLE                   IDENTIFIER
-        *
-        * The IDENTIFIER is NAME(SECTION), which is the command-name
-        * (if given, or "unknown" if not) followed by the manual page
-        * section.  These are given in `Dt'.  The TITLE is a free-form
-        * string depending on the manual volume.  If not specified, it
-        * switches on the manual section.
-        */
-
-       if (meta->vol)
-               (void)strlcpy(buf, meta->vol, p->rmargin);
-       else
-               *buf = 0;
-
-       (void)snprintf(title, p->rmargin, "%s(%d)", 
-                       meta->title, meta->msec);
+       snprintf(title, BUFSIZ, "%s(%d)", m->title, m->msec);
 
        p->offset = 0;
 
        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);
        p->flags |= TERMP_NOBREAK | TERMP_NOSPACE;
 
        term_word(p, title);
@@ -362,8 +902,4 @@ print_head(struct termp *p, const struct man_meta *meta)
        p->rmargin = p->maxrmargin;
        p->offset = 0;
        p->flags &= ~TERMP_NOSPACE;
        p->rmargin = p->maxrmargin;
        p->offset = 0;
        p->flags &= ~TERMP_NOSPACE;
-
-       free(title);
-       free(buf);
 }
 }
-
A git conversion mirror of mandoc.bsd.lv