Turn on -Tutf8 in the frontend. Here we go!

diff --git a/main.c b/main.c
index f7edf473decaa7f9c13919d06a2d5385873728a5..4c2e7e790ca8e22ce21a69daf65288c3c9907521 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*     $Id: main.c,v 1.162 2011/05/17 14:38:34 kristaps Exp $ */
+/*     $Id: main.c,v 1.163 2011/05/20 15:51:18 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -44,6 +44,7 @@ typedef       void            (*out_free)(void *);
 enum   outt {
        OUTT_ASCII = 0, /* -Tascii */
        OUTT_LOCALE,    /* -Tlocale */
+       OUTT_UTF8,      /* -Tutf8 */
        OUTT_TREE,      /* -Ttree */
        OUTT_HTML,      /* -Thtml */
        OUTT_XHTML,     /* -Txhtml */
@@ -213,6 +214,10 @@ parse(struct curparse *curp, int fd,
                        curp->outdata = html_alloc(curp->outopts);
                        curp->outfree = html_free;
                        break;
+               case (OUTT_UTF8):
+                       curp->outdata = utf8_alloc(curp->outopts);
+                       curp->outfree = ascii_free;
+                       break;
                case (OUTT_LOCALE):
                        curp->outdata = locale_alloc(curp->outopts);
                        curp->outfree = ascii_free;
@@ -248,6 +253,8 @@ parse(struct curparse *curp, int fd,
                        /* FALLTHROUGH */
                case (OUTT_ASCII):
                        /* FALLTHROUGH */
+               case (OUTT_UTF8):
+                       /* FALLTHROUGH */
                case (OUTT_LOCALE):
                        /* FALLTHROUGH */
                case (OUTT_PS):
@@ -307,6 +314,8 @@ toptions(struct curparse *curp, char *arg)
                curp->outtype = OUTT_TREE;
        else if (0 == strcmp(arg, "html"))
                curp->outtype = OUTT_HTML;
+       else if (0 == strcmp(arg, "utf8"))
+               curp->outtype = OUTT_UTF8;
        else if (0 == strcmp(arg, "locale"))
                curp->outtype = OUTT_LOCALE;
        else if (0 == strcmp(arg, "xhtml"))

diff --git a/mandoc.1 b/mandoc.1
index de4b970d6b79d84a387dcf23e4eef1fefb334c9b..7cf9ca5c9b2f5cf4bb17c6cbff2b0d68a6278e73 100644 (file)
--- a/mandoc.1
+++ b/mandoc.1
@@ -1,4 +1,4 @@
-.\"    $Id: mandoc.1,v 1.87 2011/05/17 22:32:45 kristaps Exp $
+.\"    $Id: mandoc.1,v 1.88 2011/05/20 15:51:18 kristaps Exp $
 .\"
 .\" Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: May 17 2011 $
+.Dd $Mdocdate: May 20 2011 $
 .Dt MANDOC 1
 .Os
 .Sh NAME
@@ -158,10 +158,13 @@ utility accepts the following
 .Fl T
 arguments, which correspond to output modes:
 .Bl -tag -width Ds
+.It Fl T Ns Cm utf8
+Encode output in the UTF-8 multi-byte format.
+See
+.Xr UTF-8 Output .
 .It Fl T Ns Cm locale
-This option encodes output characters using the current
-.Xr locale 1
-configuration.
+Encode output using the current
+.Xr locale 1 .
 See
 .Sx Locale Output .
 .It Fl T Ns Cm ascii
@@ -195,6 +198,13 @@ See
 .Pp
 If multiple input files are specified, these will be processed by the
 corresponding filter in-order.
+.Ss UTF-8 Output
+Use
+.Fl T Ns Cm utf8
+to force a UTF-8 locale.
+See
+.Sx Locale Output
+for details and options.
 .Ss Locale Output
 Locale-depending output encoding is triggered with
 .Fl T Ns Cm locale .