Support nesting of elements with next-line scope.

[mandoc.git] / term_ascii.c

diff --git a/term_ascii.c b/term_ascii.c
index 1efd76d833ff0e4df9be53a3ec3fd83e9ebeba03..4ff93da1d3930bdcdc07465f9eb55e0d357b4afe 100644 (file)
--- a/term_ascii.c
+++ b/term_ascii.c
@@ -1,7 +1,7 @@
-/*     $Id: term_ascii.c,v 1.57 2017/06/07 17:38:26 schwarze Exp $ */
+/*     $Id: term_ascii.c,v 1.63 2018/08/21 16:06:48 schwarze Exp $ */

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

- * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014, 2015, 2017, 2018 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


@@ -21,11 +21,13 @@
 
 #include <assert.h>
 #if HAVE_WCHAR
 
 #include <assert.h>
 #if HAVE_WCHAR

+#include <langinfo.h>

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

+#include <string.h>

 #include <unistd.h>
 #if HAVE_WCHAR
 #include <wchar.h>
 #include <unistd.h>
 #if HAVE_WCHAR
 #include <wchar.h>


@@ -100,7 +102,17 @@ ascii_init(enum termenc enc, const struct manoutput *outopts)
                v = TERMENC_LOCALE == enc ?
                    setlocale(LC_CTYPE, "") :
                    setlocale(LC_CTYPE, UTF8_LOCALE);
                v = TERMENC_LOCALE == enc ?
                    setlocale(LC_CTYPE, "") :
                    setlocale(LC_CTYPE, UTF8_LOCALE);

-               if (NULL != v && MB_CUR_MAX > 1) {
+
+               /*
+                * We only support UTF-8,
+                * so revert to ASCII for anything else.
+                */
+
+               if (v != NULL &&
+                   strcmp(nl_langinfo(CODESET), "UTF-8") != 0)
+                       v = setlocale(LC_CTYPE, "C");
+
+               if (v != NULL && MB_CUR_MAX > 1) {

                        p->enc = enc;
                        p->advance = locale_advance;
                        p->endline = locale_endline;
                        p->enc = enc;
                        p->advance = locale_advance;
                        p->endline = locale_endline;


@@ -121,6 +133,8 @@ ascii_init(enum termenc enc, const struct manoutput *outopts)
        if (outopts->synopsisonly)
                p->synopsisonly = 1;
 
        if (outopts->synopsisonly)
                p->synopsisonly = 1;
 

+       assert(p->defindent < UINT16_MAX);
+       assert(p->defrmargin < UINT16_MAX);

        return p;
 }
 
        return p;
 }
 


@@ -159,6 +173,8 @@ ascii_setwidth(struct termp *p, int iop, int width)
                p->defrmargin -= width;
        else
                p->defrmargin = 0;
                p->defrmargin -= width;
        else
                p->defrmargin = 0;

+       if (p->defrmargin > 1000)
+               p->defrmargin = 1000;

        p->lastrmargin = p->tcol->rmargin;
        p->tcol->rmargin = p->maxrmargin = p->defrmargin;
 }
        p->lastrmargin = p->tcol->rmargin;
        p->tcol->rmargin = p->maxrmargin = p->defrmargin;
 }


@@ -180,8 +196,7 @@ terminal_sepline(void *arg)
 static size_t
 ascii_width(const struct termp *p, int c)
 {
 static size_t
 ascii_width(const struct termp *p, int c)
 {

-
-       return 1;
+       return c != ASCII_BREAK;

 }
 
 void
 }
 
 void


@@ -227,6 +242,7 @@ ascii_advance(struct termp *p, size_t len)
 {
        size_t          i;
 
 {
        size_t          i;
 

+       assert(len < UINT16_MAX);

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


@@ -293,18 +309,18 @@ ascii_uc2str(int uc)
        "<80>", "<81>", "<82>", "<83>", "<84>", "<85>", "<86>", "<87>",
        "<88>", "<89>", "<8A>", "<8B>", "<8C>", "<8D>", "<8E>", "<8F>",
        "<90>", "<91>", "<92>", "<93>", "<94>", "<95>", "<96>", "<97>",
        "<80>", "<81>", "<82>", "<83>", "<84>", "<85>", "<86>", "<87>",
        "<88>", "<89>", "<8A>", "<8B>", "<8C>", "<8D>", "<8E>", "<8F>",
        "<90>", "<91>", "<92>", "<93>", "<94>", "<95>", "<96>", "<97>",

-       "<99>", "<99>", "<9A>", "<9B>", "<9C>", "<9D>", "<9E>", "<9F>",
-       nbrsp,  "!",    "/\bc", "GBP",  "o\bx", "=\bY", "|",    "<sec>",
+       "<98>", "<99>", "<9A>", "<9B>", "<9C>", "<9D>", "<9E>", "<9F>",
+       nbrsp,  "!",    "/\bc", "-\bL", "o\bx", "=\bY", "|",    "<section>",

        "\"",   "(C)",  "_\ba", "<<",   "~",    "",     "(R)",  "-",
        "\"",   "(C)",  "_\ba", "<<",   "~",    "",     "(R)",  "-",

-       "<deg>","+-",   "2",    "3",    "'",    ",\bu", "<par>",".",
-       ",",    "1",    "_\bo", ">>",   "1/4",  "1/2",  "3/4",  "?",
+       "<degree>","+-","^2",   "^3",   "'","<micro>","<paragraph>",".",
+       ",",    "^1",   "_\bo", ">>",   "1/4",  "1/2",  "3/4",  "?",

        "`\bA", "'\bA", "^\bA", "~\bA", "\"\bA","o\bA", "AE",   ",\bC",
        "`\bE", "'\bE", "^\bE", "\"\bE","`\bI", "'\bI", "^\bI", "\"\bI",
        "`\bA", "'\bA", "^\bA", "~\bA", "\"\bA","o\bA", "AE",   ",\bC",
        "`\bE", "'\bE", "^\bE", "\"\bE","`\bI", "'\bI", "^\bI", "\"\bI",

-       "-\bD", "~\bN", "`\bO", "'\bO", "^\bO", "~\bO", "\"\bO","x",
+       "Dh",   "~\bN", "`\bO", "'\bO", "^\bO", "~\bO", "\"\bO","x",

        "/\bO", "`\bU", "'\bU", "^\bU", "\"\bU","'\bY", "Th",   "ss",
        "`\ba", "'\ba", "^\ba", "~\ba", "\"\ba","o\ba", "ae",   ",\bc",
        "`\be", "'\be", "^\be", "\"\be","`\bi", "'\bi", "^\bi", "\"\bi",
        "/\bO", "`\bU", "'\bU", "^\bU", "\"\bU","'\bY", "Th",   "ss",
        "`\ba", "'\ba", "^\ba", "~\ba", "\"\ba","o\ba", "ae",   ",\bc",
        "`\be", "'\be", "^\be", "\"\be","`\bi", "'\bi", "^\bi", "\"\bi",

-       "d",    "~\bn", "`\bo", "'\bo", "^\bo", "~\bo", "\"\bo","-:-",
+       "dh",   "~\bn", "`\bo", "'\bo", "^\bo", "~\bo", "\"\bo","/",

        "/\bo", "`\bu", "'\bu", "^\bu", "\"\bu","'\by", "th",   "\"\by",
        "A",    "a",    "A",    "a",    "A",    "a",    "'\bC", "'\bc",
        "^\bC", "^\bc", "C",    "c",    "C",    "c",    "D",    "d",
        "/\bo", "`\bu", "'\bu", "^\bu", "\"\bu","'\by", "th",   "\"\by",
        "A",    "a",    "A",    "a",    "A",    "a",    "'\bC", "'\bc",
        "^\bC", "^\bc", "C",    "c",    "C",    "c",    "D",    "d",


@@ -364,6 +380,7 @@ locale_advance(struct termp *p, size_t len)
 {
        size_t          i;
 
 {
        size_t          i;
 

+       assert(len < UINT16_MAX);

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