Support nesting of elements with next-line scope.

[mandoc.git] / term_ascii.c

diff --git a/term_ascii.c b/term_ascii.c
index f47ffd75d9c306e007f3a6b8ce405b33f04e2e25..4ff93da1d3930bdcdc07465f9eb55e0d357b4afe 100644 (file)
--- a/term_ascii.c
+++ b/term_ascii.c
@@ -1,4 +1,4 @@
-/*     $Id: term_ascii.c,v 1.61 2018/05/20 21:37:34 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) 2014, 2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2017, 2018 Ingo Schwarze <schwarze@openbsd.org>


@@ -196,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


@@ -311,7 +310,7 @@ ascii_uc2str(int uc)
        "<88>", "<89>", "<8A>", "<8B>", "<8C>", "<8D>", "<8E>", "<8F>",
        "<90>", "<91>", "<92>", "<93>", "<94>", "<95>", "<96>", "<97>",
        "<98>", "<99>", "<9A>", "<9B>", "<9C>", "<9D>", "<9E>", "<9F>",
        "<88>", "<89>", "<8A>", "<8B>", "<8C>", "<8D>", "<8E>", "<8F>",
        "<90>", "<91>", "<92>", "<93>", "<94>", "<95>", "<96>", "<97>",
        "<98>", "<99>", "<9A>", "<9B>", "<9C>", "<9D>", "<9E>", "<9F>",

-       nbrsp,  "!",    "/\bc", "GBP",  "o\bx", "=\bY", "|",    "<section>",
+       nbrsp,  "!",    "/\bc", "-\bL", "o\bx", "=\bY", "|",    "<section>",

        "\"",   "(C)",  "_\ba", "<<",   "~",    "",     "(R)",  "-",
        "<degree>","+-","^2",   "^3",   "'","<micro>","<paragraph>",".",
        ",",    "^1",   "_\bo", ">>",   "1/4",  "1/2",  "3/4",  "?",
        "\"",   "(C)",  "_\ba", "<<",   "~",    "",     "(R)",  "-",
        "<degree>","+-","^2",   "^3",   "'","<micro>","<paragraph>",".",
        ",",    "^1",   "_\bo", ">>",   "1/4",  "1/2",  "3/4",  "?",