Locale support. I'm checking this in to clean up fall-out in-tree, but

[mandoc.git] / term_ascii.c

diff --git a/term_ascii.c b/term_ascii.c
index fd7005f0858f879c2274bf8c878428bd266307db..7619907ed14479d348d35cbbdebe4d6a9d9d48e0 100644 (file)
--- a/term_ascii.c
+++ b/term_ascii.c
@@ -1,4 +1,4 @@
-/*     $Id: term_ascii.c,v 1.13 2011/05/14 17:54:42 kristaps Exp $ */
+/*     $Id: term_ascii.c,v 1.15 2011/05/17 22:32:45 kristaps Exp $ */

 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *


@@ -21,16 +21,27 @@
 #include <sys/types.h>
 
 #include <assert.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 <unistd.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>

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

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

+#if ! defined(__STDC_ISO_10646__)
+# undef USE_WCHAR
+#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 double            ascii_hspan(const struct termp *,
                                const struct roffsu *);
 static size_t            ascii_width(const struct termp *, int);


@@ -40,28 +51,48 @@ static      void              ascii_end(struct termp *);
 static void              ascii_endline(struct termp *);
 static void              ascii_letter(struct termp *, int);
 
 static void              ascii_endline(struct termp *);
 static void              ascii_letter(struct termp *, int);
 

+#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];
        char            *v;
        const char      *toks[2];
        char            *v;

+       struct termp    *p;

 
 

-       p = term_alloc(TERMENC_ASCII);
+       p = mandoc_calloc(1, sizeof(struct termp));
+       p->enc = enc;

 
        p->tabwidth = 5;
        p->defrmargin = 78;
 
 
        p->tabwidth = 5;
        p->defrmargin = 78;
 

-       p->advance = ascii_advance;

        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->hspan = ascii_hspan;

-       p->letter = ascii_letter;

        p->type = TERMTYPE_CHAR;
        p->type = TERMTYPE_CHAR;

+
+       p->enc = TERMENC_ASCII;
+       p->advance = ascii_advance;
+       p->endline = ascii_endline;
+       p->letter = ascii_letter;

        p->width = ascii_width;
 
        p->width = ascii_width;
 

+#if defined (USE_WCHAR)
+       if (TERMENC_LOCALE == enc)
+               if (setlocale(LC_ALL, "") && 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] = "width";
        toks[1] = NULL;
 


@@ -81,6 +112,19 @@ ascii_alloc(char *outopts)
        return(p);
 }
 
        return(p);
 }
 

+void *
+ascii_alloc(char *outopts)
+{
+
+       return(ascii_init(TERMENC_ASCII, outopts));
+}
+
+void *
+locale_alloc(char *outopts)
+{
+
+       return(ascii_init(TERMENC_LOCALE, outopts));
+}

 
 /* ARGSUSED */
 static size_t
 
 /* ARGSUSED */
 static size_t


@@ -90,7 +134,6 @@ ascii_width(const struct termp *p, int c)
        return(1);
 }
 
        return(1);
 }
 

-

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


@@ -98,17 +141,14 @@ ascii_free(void *arg)
        term_free((struct termp *)arg);
 }
 
        term_free((struct termp *)arg);
 }
 

-

 /* ARGSUSED */
 static void
 ascii_letter(struct termp *p, int c)
 {
        
 /* ARGSUSED */
 static void
 ascii_letter(struct termp *p, int c)
 {
        

-       /* LINTED */

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

-

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


@@ -116,7 +156,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)
 {


@@ -124,7 +163,6 @@ ascii_end(struct termp *p)
        (*p->footf)(p, p->argf);
 }
 
        (*p->footf)(p, p->argf);
 }
 

-

 /* ARGSUSED */
 static void
 ascii_endline(struct termp *p)
 /* ARGSUSED */
 static void
 ascii_endline(struct termp *p)


@@ -133,19 +171,16 @@ ascii_endline(struct termp *p)
        putchar('\n');
 }
 
        putchar('\n');
 }
 

-

 /* ARGSUSED */
 static void
 ascii_advance(struct termp *p, size_t len)
 {
        size_t          i;
 
 /* ARGSUSED */
 static void
 ascii_advance(struct termp *p, size_t len)
 {
        size_t          i;
 

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

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

-

 /* ARGSUSED */
 static double
 ascii_hspan(const struct termp *p, const struct roffsu *su)
 /* ARGSUSED */
 static double
 ascii_hspan(const struct termp *p, const struct roffsu *su)


@@ -184,3 +219,39 @@ ascii_hspan(const struct termp *p, const struct roffsu *su)
        return(r);
 }
 
        return(r);
 }
 

+#ifdef USE_WCHAR
+/* ARGSUSED */
+static size_t
+locale_width(const struct termp *p, int c)
+{
+       int             rc;
+
+       return((rc = wcwidth(c)) < 0 ? 0 : rc);
+}
+
+/* ARGSUSED */
+static void
+locale_advance(struct termp *p, size_t len)
+{
+       size_t          i;
+
+       for (i = 0; i < len; i++)
+               putwchar(L' ');
+}
+
+/* ARGSUSED */
+static void
+locale_endline(struct termp *p)
+{
+
+       putwchar(L'\n');
+}
+
+/* ARGSUSED */
+static void
+locale_letter(struct termp *p, int c)
+{
+       
+       putwchar(c);
+}
+#endif