In quoted macro arguments, double quotes can be quoted by doubling them.

[mandoc.git] / term_ascii.c

diff --git a/term_ascii.c b/term_ascii.c
index b926a5b378aa511b4b995e4a224bbda5aa1dc7ab..cb7ac294059e995d51219c55b207175009445143 100644 (file)
--- a/term_ascii.c
+++ b/term_ascii.c
@@ -1,6 +1,6 @@
-/*     $Id: term_ascii.c,v 1.11 2011/01/02 12:21:07 kristaps Exp $ */
+/*     $Id: term_ascii.c,v 1.21 2013/06/01 14:27:20 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>

  *
  * 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


@@ -21,56 +21,109 @@
 #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"
 

+/* 
+ * 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 double            ascii_hspan(const struct termp *,
                                const struct roffsu *);

-static size_t            ascii_width(const struct termp *, char);
+static size_t            ascii_width(const struct termp *, int);

 static void              ascii_advance(struct termp *, size_t);
 static void              ascii_begin(struct termp *);
 static void              ascii_end(struct termp *);
 static void              ascii_endline(struct termp *);
 static void              ascii_advance(struct termp *, size_t);
 static void              ascii_begin(struct termp *);
 static void              ascii_end(struct termp *);
 static void              ascii_endline(struct termp *);

-static void              ascii_letter(struct termp *, char);
+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];
+       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 = 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;
 

-       toks[0] = "width";
-       toks[1] = NULL;
+#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] = "indent";
+       toks[1] = "width";
+       toks[2] = "mdoc";
+       toks[3] = NULL;

 
        while (outopts && *outopts)
                switch (getsubopt(&outopts, UNCONST(toks), &v)) {
                case (0):
 
        while (outopts && *outopts)
                switch (getsubopt(&outopts, UNCONST(toks), &v)) {
                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;
                }


@@ -82,16 +135,36 @@ 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));
+}

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

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

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

-

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


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

-

 /* ARGSUSED */
 static void
 /* ARGSUSED */
 static void

-ascii_letter(struct termp *p, char c)
+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)
 {


@@ -117,7 +187,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)
 {


@@ -125,7 +194,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)


@@ -134,19 +202,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)


@@ -185,3 +250,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