ISO C99 7.19.2.5 doesn't like mixing putchar(3) and putwchar(3) on

[mandoc.git] / term_ascii.c

diff --git a/term_ascii.c b/term_ascii.c
index f217b9a405bc62b16f3a64a670558f1731b0df18..fecdb0a964dc9adf76885e1c4def527f1baca695 100644 (file)
--- a/term_ascii.c
+++ b/term_ascii.c
@@ -1,4 +1,4 @@
-/*     $Id: term_ascii.c,v 1.44 2015/03/27 21:33:20 schwarze Exp $ */
+/*     $Id: term_ascii.c,v 1.53 2016/07/08 22:29:05 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -38,9 +38,8 @@
 #include "manconf.h"
 #include "main.h"
 
-static struct termp     *ascii_init(enum termenc, const struct mchars *,
-                               const struct manoutput *);
-static double            ascii_hspan(const struct termp *,
+static struct termp     *ascii_init(enum termenc, const struct manoutput *);
+static int               ascii_hspan(const struct termp *,
                                const struct roffsu *);
 static size_t            ascii_width(const struct termp *, int);
 static void              ascii_advance(struct termp *, size_t);
@@ -48,7 +47,7 @@ static        void              ascii_begin(struct termp *);
 static void              ascii_end(struct termp *);
 static void              ascii_endline(struct termp *);
 static void              ascii_letter(struct termp *, int);
-static void              ascii_setwidth(struct termp *, int, size_t);
+static void              ascii_setwidth(struct termp *, int, int);
 
 #if HAVE_WCHAR
 static void              locale_advance(struct termp *, size_t);
@@ -59,15 +58,16 @@ static      size_t            locale_width(const struct termp *, int);
 
 
 static struct termp *
-ascii_init(enum termenc enc, const struct mchars *mchars,
-       const struct manoutput *outopts)
+ascii_init(enum termenc enc, const struct manoutput *outopts)
 {
+#if HAVE_WCHAR
        char            *v;
+#endif
        struct termp    *p;
 
        p = mandoc_calloc(1, sizeof(struct termp));
 
-       p->symtab = mchars;
+       p->line = 1;
        p->tabwidth = 5;
        p->defrmargin = p->lastrmargin = 78;
        p->fontq = mandoc_reallocarray(NULL,
@@ -88,8 +88,16 @@ ascii_init(enum termenc enc, const struct mchars *mchars,
 
 #if HAVE_WCHAR
        if (TERMENC_ASCII != enc) {
+
+               /*
+                * Do not change any of this to LC_ALL.  It might break
+                * the formatting by subtly changing the behaviour of
+                * various functions, for example strftime(3).  As a
+                * worst case, it might even cause buffer overflows.
+                */
+
                v = TERMENC_LOCALE == enc ?
-                   setlocale(LC_ALL, "") :
+                   setlocale(LC_CTYPE, "") :
                    setlocale(LC_CTYPE, "en_US.UTF-8");
                if (NULL != v && MB_CUR_MAX > 1) {
                        p->enc = enc;
@@ -112,40 +120,41 @@ ascii_init(enum termenc enc, const struct mchars *mchars,
        if (outopts->synopsisonly)
                p->synopsisonly = 1;
 
-       return(p);
+       return p;
 }
 
 void *
-ascii_alloc(const struct mchars *mchars, const struct manoutput *outopts)
+ascii_alloc(const struct manoutput *outopts)
 {
 
-       return(ascii_init(TERMENC_ASCII, mchars, outopts));
+       return ascii_init(TERMENC_ASCII, outopts);
 }
 
 void *
-utf8_alloc(const struct mchars *mchars, const struct manoutput *outopts)
+utf8_alloc(const struct manoutput *outopts)
 {
 
-       return(ascii_init(TERMENC_UTF8, mchars, outopts));
+       return ascii_init(TERMENC_UTF8, outopts);
 }
 
 void *
-locale_alloc(const struct mchars *mchars, const struct manoutput *outopts)
+locale_alloc(const struct manoutput *outopts)
 {
 
-       return(ascii_init(TERMENC_LOCALE, mchars, outopts));
+       return ascii_init(TERMENC_LOCALE, outopts);
 }
 
 static void
-ascii_setwidth(struct termp *p, int iop, size_t width)
+ascii_setwidth(struct termp *p, int iop, int width)
 {
 
+       width /= 24;
        p->rmargin = p->defrmargin;
        if (iop > 0)
                p->defrmargin += width;
        else if (iop == 0)
-               p->defrmargin = width ? width : p->lastrmargin;
-       else if (p->defrmargin > width)
+               p->defrmargin = width ? (size_t)width : p->lastrmargin;
+       else if (p->defrmargin > (size_t)width)
                p->defrmargin -= width;
        else
                p->defrmargin = 0;
@@ -154,24 +163,24 @@ ascii_setwidth(struct termp *p, int iop, size_t width)
 }
 
 void
-ascii_sepline(void *arg)
+terminal_sepline(void *arg)
 {
        struct termp    *p;
        size_t           i;
 
        p = (struct termp *)arg;
-       putchar('\n');
+       (*p->endline)(p);
        for (i = 0; i < p->defrmargin; i++)
-               putchar('-');
-       putchar('\n');
-       putchar('\n');
+               (*p->letter)(p, '-');
+       (*p->endline)(p);
+       (*p->endline)(p);
 }
 
 static size_t
 ascii_width(const struct termp *p, int c)
 {
 
-       return(1);
+       return 1;
 }
 
 void
@@ -206,6 +215,7 @@ static void
 ascii_endline(struct termp *p)
 {
 
+       p->line++;
        putchar('\n');
 }
 
@@ -218,52 +228,42 @@ ascii_advance(struct termp *p, size_t len)
                putchar(' ');
 }
 
-static double
+static int
 ascii_hspan(const struct termp *p, const struct roffsu *su)
 {
        double           r;
 
-       /*
-        * Approximate based on character width.
-        * None of these will be actually correct given that an inch on
-        * the screen depends on character size, terminal, etc., etc.
-        */
        switch (su->unit) {
        case SCALE_BU:
-               r = su->scale * 10.0 / 240.0;
+               r = su->scale;
                break;
        case SCALE_CM:
-               r = su->scale * 10.0 / 2.54;
+               r = su->scale * 240.0 / 2.54;
                break;
        case SCALE_FS:
-               r = su->scale * 2730.666;
+               r = su->scale * 65536.0;
                break;
        case SCALE_IN:
-               r = su->scale * 10.0;
+               r = su->scale * 240.0;
                break;
        case SCALE_MM:
-               r = su->scale / 100.0;
+               r = su->scale * 0.24;
                break;
+       case SCALE_VS:
        case SCALE_PC:
-               r = su->scale * 10.0 / 6.0;
+               r = su->scale * 40.0;
                break;
        case SCALE_PT:
-               r = su->scale * 10.0 / 72.0;
-               break;
-       case SCALE_VS:
-               r = su->scale * 2.0 - 1.0;
+               r = su->scale * 10.0 / 3.0;
                break;
        case SCALE_EN:
-               /* FALLTHROUGH */
        case SCALE_EM:
-               r = su->scale;
+               r = su->scale * 24.0;
                break;
        default:
                abort();
-               /* NOTREACHED */
        }
-
-       return(r);
+       return r > 0.0 ? r + 0.01 : r - 0.01;
 }
 
 const char *
@@ -338,8 +338,8 @@ ascii_uc2str(int uc)
 
        assert(uc >= 0);
        if ((size_t)uc < sizeof(tab)/sizeof(tab[0]))
-               return(tab[uc]);
-       return(mchars_uc2str(uc));
+               return tab[uc];
+       return mchars_uc2str(uc);
 }
 
 #if HAVE_WCHAR
@@ -353,7 +353,7 @@ locale_width(const struct termp *p, int c)
        rc = wcwidth(c);
        if (rc < 0)
                rc = 0;
-       return(rc);
+       return rc;
 }
 
 static void
@@ -369,6 +369,7 @@ static void
 locale_endline(struct termp *p)
 {
 
+       p->line++;
        putwchar(L'\n');
 }