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 36b4942a189d0b4f105a22794de40db5344919a0..a2ab4839c1be983e12d6d645fc327dc64f879ac9 100644 (file)
--- a/term_ascii.c
+++ b/term_ascii.c
@@ -1,6 +1,7 @@
-/*     $Id: term_ascii.c,v 1.1 2010/06/08 15:00:17 kristaps Exp $ */
+/*     $Id: term_ascii.c,v 1.25 2014/04/20 16:46:05 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
+ * 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
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above


@@ -20,47 +21,113 @@
 
 #include <sys/types.h>
 
 
 #include <sys/types.h>
 

-#include <assert.h>
+#ifdef USE_WCHAR
+# include <locale.h>
+#endif

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

+#include <unistd.h>
+#ifdef USE_WCHAR
+# include <wchar.h>
+#endif

 
 

+#include "mandoc.h"
+#include "mandoc_aux.h"

 #include "out.h"
 #include "term.h"
 #include "main.h"
 
 #include "out.h"
 #include "term.h"
 #include "main.h"
 

-static void              ascii_endline(struct termp *);
-static void              ascii_letter(struct termp *, char);
-static void              ascii_begin(struct termp *);
+/* 
+ * 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 *,
+                               const struct roffsu *);
+static size_t            ascii_width(const struct termp *, int);

 static void              ascii_advance(struct termp *, size_t);
 static void              ascii_advance(struct termp *, size_t);

+static void              ascii_begin(struct termp *);

 static void              ascii_end(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);
+static void              locale_endline(struct termp *);
+static void              locale_letter(struct termp *, int);
+static size_t            locale_width(const struct termp *, int);
+#endif

 
 
 
 

-void *
-ascii_alloc(char *outopts)
+static struct termp *
+ascii_init(enum termenc enc, char *outopts)

 {
 {

-       struct termp    *p;
-       const char      *toks[2];
+       const char      *toks[4];

        char            *v;
        char            *v;

+       struct termp    *p;

 
 

-       if (NULL == (p = term_alloc(TERMENC_ASCII)))
-               return(NULL);
+       p = mandoc_calloc(1, sizeof(struct termp));
+
+       p->tabwidth = 5;
+       p->defrmargin = p->lastrmargin = 78;

 
 

-       p->type = TERMTYPE_CHAR;
-       p->letter = ascii_letter;

        p->begin = ascii_begin;
        p->end = ascii_end;
        p->begin = ascii_begin;
        p->end = ascii_end;

-       p->endline = ascii_endline;
+       p->hspan = ascii_hspan;
+       p->type = TERMTYPE_CHAR;
+
+       p->enc = TERMENC_ASCII;

        p->advance = ascii_advance;
        p->advance = ascii_advance;

+       p->endline = ascii_endline;
+       p->letter = ascii_letter;
+       p->setwidth = ascii_setwidth;
+       p->width = ascii_width;
+
+#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)) {
 
        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;
                        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;
                }
                default:
                        break;
                }


@@ -72,6 +139,48 @@ ascii_alloc(char *outopts)
        return(p);
 }
 
        return(p);
 }
 

+void *
+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)
+{
+
+       return(ascii_init(TERMENC_LOCALE, outopts));
+}
+
+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)
+{
+
+       return(1);
+}

 
 void
 ascii_free(void *arg)
 
 void
 ascii_free(void *arg)


@@ -80,17 +189,13 @@ ascii_free(void *arg)
        term_free((struct termp *)arg);
 }
 
        term_free((struct termp *)arg);
 }
 

-
-/* ARGSUSED */

 static void
 static void

-ascii_letter(struct termp *p, char c)
+ascii_letter(struct termp *p, int c)

 {
 {

-       
-       /* Just push onto the screen. */
+

        putchar(c);
 }
 
        putchar(c);
 }
 

-

 static void
 ascii_begin(struct termp *p)
 {
 static void
 ascii_begin(struct termp *p)
 {


@@ -98,7 +203,6 @@ ascii_begin(struct termp *p)
        (*p->headf)(p, p->argf);
 }
 
        (*p->headf)(p, p->argf);
 }
 

-

 static void
 ascii_end(struct termp *p)
 {
 static void
 ascii_end(struct termp *p)
 {


@@ -106,8 +210,6 @@ ascii_end(struct termp *p)
        (*p->footf)(p, p->argf);
 }
 
        (*p->footf)(p, p->argf);
 }
 

-
-/* ARGSUSED */

 static void
 ascii_endline(struct termp *p)
 {
 static void
 ascii_endline(struct termp *p)
 {


@@ -115,14 +217,81 @@ ascii_endline(struct termp *p)
        putchar('\n');
 }
 
        putchar('\n');
 }
 

-
-/* ARGSUSED */

 static void
 ascii_advance(struct termp *p, size_t len)
 {
 static void
 ascii_advance(struct termp *p, size_t len)
 {

-       size_t          i;
+       size_t          i;

 
 

-       /* Just print whitespace on the terminal. */

        for (i = 0; i < len; i++)
                putchar(' ');
 }
        for (i = 0; i < len; i++)
                putchar(' ');
 }

+
+static double
+ascii_hspan(const struct termp *p, const struct roffsu *su)
+{
+       double           r;
+
+       /*
+        * Approximate based on character width.  These are generated
+        * entirely by eyeballing the screen, but appear to be correct.
+        */
+
+       switch (su->unit) {
+       case SCALE_CM:
+               r = 4 * su->scale;
+               break;
+       case SCALE_IN:
+               r = 10 * su->scale;
+               break;
+       case SCALE_PC:
+               r = (10 * su->scale) / 6;
+               break;
+       case SCALE_PT:
+               r = (10 * su->scale) / 72;
+               break;
+       case SCALE_MM:
+               r = su->scale / 1000;
+               break;
+       case SCALE_VS:
+               r = su->scale * 2 - 1;
+               break;
+       default:
+               r = su->scale;
+               break;
+       }
+
+       return(r);
+}
+
+#ifdef USE_WCHAR
+static size_t
+locale_width(const struct termp *p, int c)
+{
+       int             rc;
+
+       return((rc = wcwidth(c)) < 0 ? 0 : rc);
+}
+
+static void
+locale_advance(struct termp *p, size_t len)
+{
+       size_t          i;
+
+       for (i = 0; i < len; i++)
+               putwchar(L' ');
+}
+
+static void
+locale_endline(struct termp *p)
+{
+
+       putwchar(L'\n');
+}
+
+static void
+locale_letter(struct termp *p, int c)
+{
+
+       putwchar(c);
+}
+#endif