improve SQL style: avoid "SELECT *", be explicit in what columns we want;

[mandoc.git] / term_ascii.c

diff --git a/term_ascii.c b/term_ascii.c
index 7619907ed14479d348d35cbbdebe4d6a9d9d48e0..a2ab4839c1be983e12d6d645fc327dc64f879ac9 100644 (file)
--- a/term_ascii.c
+++ b/term_ascii.c
@@ -1,6 +1,7 @@
-/*     $Id: term_ascii.c,v 1.15 2011/05/17 22:32:45 kristaps Exp $ */
+/*     $Id: term_ascii.c,v 1.25 2014/04/20 16:46:05 schwarze Exp $ */
 /*
- * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2014 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -20,7 +21,6 @@
 
 #include <sys/types.h>
 
-#include <assert.h>
 #ifdef USE_WCHAR
 # include <locale.h>
 #endif
@@ -33,13 +33,21 @@
 #endif
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "out.h"
 #include "term.h"
 #include "main.h"
 
+/* 
+ * Sadly, this doesn't seem to be defined on systems even when they
+ * support it.  For the time being, remove it and let those compiling
+ * the software decide for themselves what to use.
+ */
+#if 0
 #if ! defined(__STDC_ISO_10646__)
 # undef USE_WCHAR
 #endif
+#endif
 
 static struct termp     *ascii_init(enum termenc, char *);
 static double            ascii_hspan(const struct termp *,
@@ -50,6 +58,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);
 
 #ifdef USE_WCHAR
 static void              locale_advance(struct termp *, size_t);
@@ -58,18 +67,18 @@ static      void              locale_letter(struct termp *, int);
 static size_t            locale_width(const struct termp *, int);
 #endif
 
+
 static struct termp *
 ascii_init(enum termenc enc, char *outopts)
 {
-       const char      *toks[2];
+       const char      *toks[4];
        char            *v;
        struct termp    *p;
 
        p = mandoc_calloc(1, sizeof(struct termp));
-       p->enc = enc;
 
        p->tabwidth = 5;
-       p->defrmargin = 78;
+       p->defrmargin = p->lastrmargin = 78;
 
        p->begin = ascii_begin;
        p->end = ascii_end;
@@ -80,27 +89,45 @@ ascii_init(enum termenc enc, char *outopts)
        p->advance = ascii_advance;
        p->endline = ascii_endline;
        p->letter = ascii_letter;
+       p->setwidth = ascii_setwidth;
        p->width = ascii_width;
 
-#if defined (USE_WCHAR)
-       if (TERMENC_LOCALE == enc)
-               if (setlocale(LC_ALL, "") && MB_CUR_MAX > 1) {
+#ifdef USE_WCHAR
+       if (TERMENC_ASCII != enc) {
+               v = TERMENC_LOCALE == enc ?
+                   setlocale(LC_ALL, "") :
+                   setlocale(LC_CTYPE, "en_US.UTF-8");
+               if (NULL != v && MB_CUR_MAX > 1) {
                        p->enc = enc;
                        p->advance = locale_advance;
                        p->endline = locale_endline;
                        p->letter = locale_letter;
                        p->width = locale_width;
                }
+       }
 #endif
 
-       toks[0] = "width";
-       toks[1] = NULL;
+       toks[0] = "indent";
+       toks[1] = "width";
+       toks[2] = "mdoc";
+       toks[3] = NULL;
 
        while (outopts && *outopts)
                switch (getsubopt(&outopts, UNCONST(toks), &v)) {
-               case (0):
+               case 0:
+                       p->defindent = (size_t)atoi(v);
+                       break;
+               case 1:
                        p->defrmargin = (size_t)atoi(v);
                        break;
+               case 2:
+                       /*
+                        * Temporary, undocumented mode
+                        * to imitate mdoc(7) output style.
+                        */
+                       p->mdocstyle = 1;
+                       p->defindent = 5;
+                       break;
                default:
                        break;
                }
@@ -119,6 +146,13 @@ ascii_alloc(char *outopts)
        return(ascii_init(TERMENC_ASCII, outopts));
 }
 
+void *
+utf8_alloc(char *outopts)
+{
+
+       return(ascii_init(TERMENC_UTF8, outopts));
+}
+
 void *
 locale_alloc(char *outopts)
 {
@@ -126,7 +160,21 @@ locale_alloc(char *outopts)
        return(ascii_init(TERMENC_LOCALE, outopts));
 }
 
-/* ARGSUSED */
+static void
+ascii_setwidth(struct termp *p, int iop, size_t width)
+{
+
+       p->rmargin = p->defrmargin;
+       if (0 < iop)
+               p->defrmargin += width;
+       else if (0 > iop)
+               p->defrmargin -= width;
+       else
+               p->defrmargin = width ? width : p->lastrmargin;
+       p->lastrmargin = p->rmargin;
+       p->rmargin = p->maxrmargin = p->defrmargin;
+}
+
 static size_t
 ascii_width(const struct termp *p, int c)
 {
@@ -141,11 +189,10 @@ ascii_free(void *arg)
        term_free((struct termp *)arg);
 }
 
-/* ARGSUSED */
 static void
 ascii_letter(struct termp *p, int c)
 {
-       
+
        putchar(c);
 }
 
@@ -163,7 +210,6 @@ ascii_end(struct termp *p)
        (*p->footf)(p, p->argf);
 }
 
-/* ARGSUSED */
 static void
 ascii_endline(struct termp *p)
 {
@@ -171,17 +217,15 @@ ascii_endline(struct termp *p)
        putchar('\n');
 }
 
-/* ARGSUSED */
 static void
 ascii_advance(struct termp *p, size_t len)
 {
-       size_t          i;
+       size_t          i;
 
        for (i = 0; i < len; i++)
                putchar(' ');
 }
 
-/* ARGSUSED */
 static double
 ascii_hspan(const struct termp *p, const struct roffsu *su)
 {
@@ -193,22 +237,22 @@ ascii_hspan(const struct termp *p, const struct roffsu *su)
         */
 
        switch (su->unit) {
-       case (SCALE_CM):
+       case SCALE_CM:
                r = 4 * su->scale;
                break;
-       case (SCALE_IN):
+       case SCALE_IN:
                r = 10 * su->scale;
                break;
-       case (SCALE_PC):
+       case SCALE_PC:
                r = (10 * su->scale) / 6;
                break;
-       case (SCALE_PT):
+       case SCALE_PT:
                r = (10 * su->scale) / 72;
                break;
-       case (SCALE_MM):
+       case SCALE_MM:
                r = su->scale / 1000;
                break;
-       case (SCALE_VS):
+       case SCALE_VS:
                r = su->scale * 2 - 1;
                break;
        default:
@@ -220,7 +264,6 @@ ascii_hspan(const struct termp *p, const struct roffsu *su)
 }
 
 #ifdef USE_WCHAR
-/* ARGSUSED */
 static size_t
 locale_width(const struct termp *p, int c)
 {
@@ -229,17 +272,15 @@ locale_width(const struct termp *p, int c)
        return((rc = wcwidth(c)) < 0 ? 0 : rc);
 }
 
-/* ARGSUSED */
 static void
 locale_advance(struct termp *p, size_t len)
 {
-       size_t          i;
+       size_t          i;
 
        for (i = 0; i < len; i++)
                putwchar(L' ');
 }
 
-/* ARGSUSED */
 static void
 locale_endline(struct termp *p)
 {
@@ -247,11 +288,10 @@ locale_endline(struct termp *p)
        putwchar(L'\n');
 }
 
-/* ARGSUSED */
 static void
 locale_letter(struct termp *p, int c)
 {
-       
+
        putwchar(c);
 }
 #endif