Using perror() instead of fprintf for failure from library functions.

[mandoc.git] / mdoc_term.c

diff --git a/mdoc_term.c b/mdoc_term.c
index 0a13e5a687061b6ed29772e8e6585b95221269ff..1e47dc62fa237013bf99cfb95ba5b1d54f5ee376 100644 (file)
--- a/mdoc_term.c
+++ b/mdoc_term.c
@@ -1,4 +1,4 @@
-/*     $Id: mdoc_term.c,v 1.87 2009/10/07 12:20:20 kristaps Exp $ */
+/*     $Id: mdoc_term.c,v 1.99 2009/10/30 18:53:09 kristaps Exp $ */

 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *


@@ -18,48 +18,15 @@
 
 #include <assert.h>
 #include <ctype.h>
 
 #include <assert.h>
 #include <ctype.h>

-#include <err.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 

+#include "out.h"

 #include "term.h"
 #include "mdoc.h"
 #include "term.h"
 #include "mdoc.h"

-
-/* FIXME: check HANG lists: they seem to be broken... :
- * .Bl -hang -width Ds
- * .It a
- * b
- * .It Fl f Ns Ar option...
- * Override default compiler behaviour.  See
- * .Sx Compiler Options
- * for details.
- * Override default compiler behaviour.  See
- * .Sx Compiler Options
- * for details.
- * Override default compiler behaviour.  See
- * .Sx Compiler Options
- * for details.
- * Override default compiler behaviour.  See
- * .Sx Compiler Options
- * for details.
- * .
- * .It a sasd fasd as afsd sfad sfds sadfs sd sfd ssfad asfd
- * Override default compiler behaviour.  See
- * .Sx Compiler Options
- * for details.
- * Override default compiler behaviour.  See
- * .Sx Compiler Options
- * for details.
- * Override default compiler behaviour.  See
- * .Sx Compiler Options
- * for details.
- * Override default compiler behaviour.  See
- * .Sx Compiler Options
- * for details.
- * .El
- *
- */
+#include "chars.h"
+#include "main.h"

 
 #define        INDENT            5
 #define        HALFINDENT        3
 
 #define        INDENT            5
 #define        HALFINDENT        3


@@ -80,6 +47,28 @@ struct       termact {
        void    (*post)(DECL_ARGS);
 };
 
        void    (*post)(DECL_ARGS);
 };
 

+static size_t    a2width(const struct mdoc_argv *, int);
+static size_t    a2height(const struct mdoc_node *);
+static size_t    a2offs(const struct mdoc_argv *);
+
+static int       arg_hasattr(int, const struct mdoc_node *);
+static int       arg_getattrs(const int *, int *, size_t,
+                       const struct mdoc_node *);
+static int       arg_getattr(int, const struct mdoc_node *);
+static int       arg_listtype(const struct mdoc_node *);
+static void      print_bvspace(struct termp *,
+                       const struct mdoc_node *,
+                       const struct mdoc_node *);
+static void      print_node(DECL_ARGS);
+static void      print_head(DECL_ARGS);
+static void      print_body(DECL_ARGS);
+static void      print_foot(DECL_ARGS);
+
+#ifdef __linux__
+extern size_t    strlcpy(char *, const char *, size_t);
+extern size_t    strlcat(char *, const char *, size_t);
+#endif
+

 static void      termp____post(DECL_ARGS);
 static void      termp_an_post(DECL_ARGS);
 static void      termp_aq_post(DECL_ARGS);
 static void      termp____post(DECL_ARGS);
 static void      termp_an_post(DECL_ARGS);
 static void      termp_aq_post(DECL_ARGS);


@@ -268,34 +257,28 @@ static    const struct termact termacts[MDOC_MAX] = {
        { NULL, termp____post }, /* %Q */ 
        { termp_sp_pre, NULL }, /* br */
        { termp_sp_pre, NULL }, /* sp */ 
        { NULL, termp____post }, /* %Q */ 
        { termp_sp_pre, NULL }, /* br */
        { termp_sp_pre, NULL }, /* sp */ 

+       { termp_under_pre, termp____post }, /* %U */ 

 };
 
 };
 

-#ifdef __linux__
-extern size_t    strlcpy(char *, const char *, size_t);
-extern size_t    strlcat(char *, const char *, size_t);
-#endif
-
-static int       arg_hasattr(int, const struct mdoc_node *);
-static int       arg_getattrs(const int *, int *, size_t,
-                       const struct mdoc_node *);
-static int       arg_getattr(int, const struct mdoc_node *);
-static size_t    arg_offset(const struct mdoc_argv *);
-static size_t    arg_width(const struct mdoc_argv *, int);
-static int       arg_listtype(const struct mdoc_node *);
-static void      fmt_block_vspace(struct termp *,
-                       const struct mdoc_node *,
-                       const struct mdoc_node *);
-static void      print_node(DECL_ARGS);
-static void      print_head(DECL_ARGS);
-static void      print_body(DECL_ARGS);
-static void      print_foot(DECL_ARGS);
-

 
 void
 
 void

-mdoc_run(struct termp *p, const struct mdoc *mdoc)
+terminal_mdoc(void *arg, const struct mdoc *mdoc)

 {
        const struct mdoc_node  *n;
        const struct mdoc_meta  *m;
 {
        const struct mdoc_node  *n;
        const struct mdoc_meta  *m;

+       struct termp            *p;
+
+       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 = mdoc_node(mdoc);
        m = mdoc_meta(mdoc);
 
        n = mdoc_node(mdoc);
        m = mdoc_meta(mdoc);


@@ -331,7 +314,7 @@ print_node(DECL_ARGS)
        bold = p->bold;
        under = p->under;
 
        bold = p->bold;
        under = p->under;
 

-       bzero(&npair, sizeof(struct termpair));
+       memset(&npair, 0, sizeof(struct termpair));

        npair.ppair = pair;
 
        if (MDOC_TEXT != n->type) {
        npair.ppair = pair;
 
        if (MDOC_TEXT != n->type) {


@@ -364,8 +347,7 @@ print_node(DECL_ARGS)
 static void
 print_foot(DECL_ARGS)
 {
 static void
 print_foot(DECL_ARGS)
 {

-       struct tm       *tm;
-       char            *buf, *os;
+       char            buf[DATESIZ], os[BUFSIZ];

 
        /* 
         * Output the footer in new-groff style, that is, three columns
 
        /* 
         * Output the footer in new-groff style, that is, three columns


@@ -375,17 +357,8 @@ print_foot(DECL_ARGS)
         * SYSTEM                  DATE                    SYSTEM
         */
 
         * SYSTEM                  DATE                    SYSTEM
         */
 

-       if (NULL == (buf = malloc(p->rmargin)))
-               err(EXIT_FAILURE, "malloc");
-       if (NULL == (os = malloc(p->rmargin)))
-               err(EXIT_FAILURE, "malloc");
-
-       tm = localtime(&m->date);
-
-       if (0 == strftime(buf, p->rmargin, "%B %e, %Y", tm))
-               err(EXIT_FAILURE, "strftime");
-
-       (void)strlcpy(os, m->os, p->rmargin);
+       time2a(m->date, buf, DATESIZ);
+       strlcpy(os, m->os, BUFSIZ);

 
        term_vspace(p);
 
 
        term_vspace(p);
 


@@ -414,9 +387,6 @@ print_foot(DECL_ARGS)
        p->offset = 0;
        p->rmargin = p->maxrmargin;
        p->flags = 0;
        p->offset = 0;
        p->rmargin = p->maxrmargin;
        p->flags = 0;

-
-       free(buf);
-       free(os);

 }
 
 
 }
 
 


@@ -425,16 +395,11 @@ print_foot(DECL_ARGS)
 static void
 print_head(DECL_ARGS)
 {
 static void
 print_head(DECL_ARGS)
 {

-       char            *buf, *title;
+       char            buf[BUFSIZ], title[BUFSIZ];

 
        p->rmargin = p->maxrmargin;
        p->offset = 0;
 
 
        p->rmargin = p->maxrmargin;
        p->offset = 0;
 

-       if (NULL == (buf = malloc(p->rmargin)))
-               err(EXIT_FAILURE, "malloc");
-       if (NULL == (title = malloc(p->rmargin)))
-               err(EXIT_FAILURE, "malloc");
-

        /*
         * The header is strange.  It has three components, which are
         * really two with the first duplicated.  It goes like this:
        /*
         * The header is strange.  It has three components, which are
         * really two with the first duplicated.  It goes like this:


@@ -449,15 +414,15 @@ print_head(DECL_ARGS)
         */
 
        assert(m->vol);
         */
 
        assert(m->vol);

-       (void)strlcpy(buf, m->vol, p->rmargin);
+       strlcpy(buf, m->vol, BUFSIZ);

 
        if (m->arch) {
 
        if (m->arch) {

-               (void)strlcat(buf, " (", p->rmargin);
-               (void)strlcat(buf, m->arch, p->rmargin);
-               (void)strlcat(buf, ")", p->rmargin);
+               strlcat(buf, " (", BUFSIZ);
+               strlcat(buf, m->arch, BUFSIZ);
+               strlcat(buf, ")", BUFSIZ);

        }
 
        }
 

-       snprintf(title, p->rmargin, "%s(%d)", m->title, m->msec);
+       snprintf(title, BUFSIZ, "%s(%d)", m->title, m->msec);

 
        p->offset = 0;
        p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2;
 
        p->offset = 0;
        p->rmargin = (p->maxrmargin - strlen(buf) + 1) / 2;


@@ -484,40 +449,37 @@ print_head(DECL_ARGS)
        p->offset = 0;
        p->rmargin = p->maxrmargin;
        p->flags &= ~TERMP_NOSPACE;
        p->offset = 0;
        p->rmargin = p->maxrmargin;
        p->flags &= ~TERMP_NOSPACE;

-
-       free(title);
-       free(buf);

 }
 
 
 }
 
 

-/* FIXME: put in utility file for front-ends. */

 static size_t
 static size_t

-arg_width(const struct mdoc_argv *arg, int pos)
+a2height(const struct mdoc_node *n)

 {
 {

-       int              i, len;
-       const char      *p;
+       struct roffsu    su;

 
 

-       assert(pos < (int)arg->sz && pos >= 0);
-       assert(arg->value[pos]);
+       assert(MDOC_TEXT == n->type);
+       assert(n->string);
+       if ( ! a2roffsu(n->string, &su, SCALE_VS))
+               SCALE_VS_INIT(&su, strlen(n->string));

 
 

-       p = arg->value[pos];
+       return(term_vspan(&su));
+}

 
 

-       if (0 == (len = (int)strlen(p)))
-               return(0);

 
 

-       for (i = 0; i < len - 1; i++) 
-               if ( ! isdigit((u_char)p[i]))
-                       break;
+static size_t
+a2width(const struct mdoc_argv *arg, int pos)
+{
+       struct roffsu    su;

 
 

-       if (i == len - 1) 
-               if ('n' == p[len - 1] || 'm' == p[len - 1])
-                       return((size_t)atoi(p) + 2);
+       assert(arg->value[pos]);
+       if ( ! a2roffsu(arg->value[pos], &su, SCALE_MAX))
+               SCALE_HS_INIT(&su, strlen(arg->value[pos]));

 
 

-       return((size_t)len + 2);
+       /* XXX: pachemu? */
+       return(term_hspan(&su) + 2);

 }
 
 
 }
 
 

-/* FIXME: put in utility file for front-ends. */

 static int
 arg_listtype(const struct mdoc_node *n)
 {
 static int
 arg_listtype(const struct mdoc_node *n)
 {


@@ -559,35 +521,23 @@ arg_listtype(const struct mdoc_node *n)
 }
 
 
 }
 
 

-/* FIXME: put in utility file for front-ends. */

 static size_t
 static size_t

-arg_offset(const struct mdoc_argv *arg)
+a2offs(const struct mdoc_argv *arg)

 {
 {

-       int              len, i;
-       const char      *p;
-
-       assert(*arg->value);
-       p = *arg->value;
+       struct roffsu    su;

 
 

-       if (0 == strcmp(p, "left"))
+       if ('\0' == arg->value[0][0])

                return(0);
                return(0);

-       if (0 == strcmp(p, "indent"))
+       else if (0 == strcmp(arg->value[0], "left"))
+               return(0);
+       else if (0 == strcmp(arg->value[0], "indent"))

                return(INDENT + 1);
                return(INDENT + 1);

-       if (0 == strcmp(p, "indent-two"))
+       else if (0 == strcmp(arg->value[0], "indent-two"))

                return((INDENT + 1) * 2);
                return((INDENT + 1) * 2);

+       else if ( ! a2roffsu(arg->value[0], &su, SCALE_MAX))
+               SCALE_HS_INIT(&su, strlen(arg->value[0]));

 
 

-       if (0 == (len = (int)strlen(p)))
-               return(0);
-
-       for (i = 0; i < len - 1; i++) 
-               if ( ! isdigit((u_char)p[i]))
-                       break;
-
-       if (i == len - 1) 
-               if ('n' == p[len - 1] || 'm' == p[len - 1])
-                       return((size_t)atoi(p));
-
-       return((size_t)len);
+       return(term_hspan(&su));

 }
 
 
 }
 
 


@@ -627,9 +577,8 @@ arg_getattrs(const int *keys, int *vals,
 }
 
 
 }
 
 

-/* ARGSUSED */

 static void
 static void

-fmt_block_vspace(struct termp *p, 
+print_bvspace(struct termp *p, 

                const struct mdoc_node *bl, 
                const struct mdoc_node *n)
 {
                const struct mdoc_node *bl, 
                const struct mdoc_node *n)
 {


@@ -709,7 +658,7 @@ termp_it_pre(DECL_ARGS)
        size_t                  width, offset;
 
        if (MDOC_BLOCK == n->type) {
        size_t                  width, offset;
 
        if (MDOC_BLOCK == n->type) {

-               fmt_block_vspace(p, n->parent->parent, n);
+               print_bvspace(p, n->parent->parent, n);

                return(1);
        }
 
                return(1);
        }
 


@@ -752,23 +701,23 @@ termp_it_pre(DECL_ARGS)
                for (i = 0, nn = n->prev; nn && 
                                i < (int)bl->args->argv[vals[2]].sz; 
                                nn = nn->prev, i++)
                for (i = 0, nn = n->prev; nn && 
                                i < (int)bl->args->argv[vals[2]].sz; 
                                nn = nn->prev, i++)

-                       offset += arg_width 
+                       offset += a2width 

                                (&bl->args->argv[vals[2]], i);
 
                /* Whether exceeds maximum column. */
                if (i < (int)bl->args->argv[vals[2]].sz)
                                (&bl->args->argv[vals[2]], i);
 
                /* Whether exceeds maximum column. */
                if (i < (int)bl->args->argv[vals[2]].sz)

-                       width = arg_width(&bl->args->argv[vals[2]], i);
+                       width = a2width(&bl->args->argv[vals[2]], i);

                else
                        width = 0;
 
                if (vals[1] >= 0) 
                else
                        width = 0;
 
                if (vals[1] >= 0) 

-                       offset += arg_offset(&bl->args->argv[vals[1]]);
+                       offset += a2offs(&bl->args->argv[vals[1]]);

                break;
        default:
                if (vals[0] >= 0) 
                break;
        default:
                if (vals[0] >= 0) 

-                       width = arg_width(&bl->args->argv[vals[0]], 0);
+                       width = a2width(&bl->args->argv[vals[0]], 0);

                if (vals[1] >= 0) 
                if (vals[1] >= 0) 

-                       offset += arg_offset(&bl->args->argv[vals[1]]);
+                       offset += a2offs(&bl->args->argv[vals[1]]);

                break;
        }
 
                break;
        }
 


@@ -1570,7 +1519,7 @@ termp_bd_pre(DECL_ARGS)
        const struct mdoc_node  *nn;
 
        if (MDOC_BLOCK == n->type) {
        const struct mdoc_node  *nn;
 
        if (MDOC_BLOCK == n->type) {

-               fmt_block_vspace(p, n, n);
+               print_bvspace(p, n, n);

                return(1);
        } else if (MDOC_BODY != n->type)
                return(1);
                return(1);
        } else if (MDOC_BODY != n->type)
                return(1);


@@ -1579,6 +1528,8 @@ termp_bd_pre(DECL_ARGS)
 
        for (type = -1, i = 0; i < (int)nn->args->argc; i++) {
                switch (nn->args->argv[i].arg) {
 
        for (type = -1, i = 0; i < (int)nn->args->argc; i++) {
                switch (nn->args->argv[i].arg) {

+               case (MDOC_Centred):
+                       /* FALLTHROUGH */

                case (MDOC_Ragged):
                        /* FALLTHROUGH */
                case (MDOC_Filled):
                case (MDOC_Ragged):
                        /* FALLTHROUGH */
                case (MDOC_Filled):


@@ -1589,7 +1540,7 @@ termp_bd_pre(DECL_ARGS)
                        type = nn->args->argv[i].arg;
                        break;
                case (MDOC_Offset):
                        type = nn->args->argv[i].arg;
                        break;
                case (MDOC_Offset):

-                       p->offset += arg_offset(&nn->args->argv[i]);
+                       p->offset += a2offs(&nn->args->argv[i]);

                        break;
                default:
                        break;
                        break;
                default:
                        break;


@@ -1840,11 +1791,11 @@ termp_in_post(DECL_ARGS)
 static int
 termp_sp_pre(DECL_ARGS)
 {
 static int
 termp_sp_pre(DECL_ARGS)
 {

-       int              i, len;
+       size_t           i, len;

 
        switch (n->tok) {
        case (MDOC_sp):
 
        switch (n->tok) {
        case (MDOC_sp):

-               len = n->child ? atoi(n->child->string) : 1;
+               len = n->child ? a2height(n->child) : 1;

                break;
        case (MDOC_br):
                len = 0;
                break;
        case (MDOC_br):
                len = 0;


@@ -2040,6 +1991,8 @@ static void
 termp____post(DECL_ARGS)
 {
 
 termp____post(DECL_ARGS)
 {
 

+       /* TODO: %U. */
+

        p->flags |= TERMP_NOSPACE;
        switch (n->tok) {
        case (MDOC__T):
        p->flags |= TERMP_NOSPACE;
        switch (n->tok) {
        case (MDOC__T):


@@ -2059,16 +2012,17 @@ termp_lk_pre(DECL_ARGS)
 {
        const struct mdoc_node *nn;
 
 {
        const struct mdoc_node *nn;
 

-       if (NULL == (nn = n->child->next)) {
-               p->under++;
+       p->under++;
+       nn = n->child;
+
+       if (NULL == nn->next)

                return(1);
                return(1);

-       }

 
 

-       p->under++;

        term_word(p, nn->string);
        term_word(p, nn->string);

+       p->under--;
+

        p->flags |= TERMP_NOSPACE;
        term_word(p, ":");
        p->flags |= TERMP_NOSPACE;
        term_word(p, ":");

-       p->under--;

 
        p->bold++;
        for (nn = nn->next; nn; nn = nn->next) 
 
        p->bold++;
        for (nn = nn->next; nn; nn = nn->next)