Place mandoc.css into the public domain.

[mandoc.git] / term_ascii.c

diff --git a/term_ascii.c b/term_ascii.c
index 439056346c1a4d63937150078fc9b8dee1436d84..4ff93da1d3930bdcdc07465f9eb55e0d357b4afe 100644 (file)
--- a/term_ascii.c
+++ b/term_ascii.c
@@ -1,4 +1,4 @@
-/*     $Id: term_ascii.c,v 1.60 2018/04/13 18:31:00 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>
@@ -133,6 +133,8 @@ ascii_init(enum termenc enc, const struct manoutput *outopts)
        if (outopts->synopsisonly)
                p->synopsisonly = 1;
 
+       assert(p->defindent < UINT16_MAX);
+       assert(p->defrmargin < UINT16_MAX);
        return p;
 }
 
@@ -171,6 +173,8 @@ ascii_setwidth(struct termp *p, int iop, int width)
                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;
 }
@@ -192,8 +196,7 @@ terminal_sepline(void *arg)
 static size_t
 ascii_width(const struct termp *p, int c)
 {
-
-       return 1;
+       return c != ASCII_BREAK;
 }
 
 void
@@ -239,6 +242,7 @@ ascii_advance(struct termp *p, size_t len)
 {
        size_t          i;
 
+       assert(len < UINT16_MAX);
        for (i = 0; i < len; i++)
                putchar(' ');
 }
@@ -306,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>",
-       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",  "?",
@@ -376,6 +380,7 @@ locale_advance(struct termp *p, size_t len)
 {
        size_t          i;
 
+       assert(len < UINT16_MAX);
        for (i = 0; i < len; i++)
                putwchar(L' ');
 }