When finding a bogus database entry,

[mandoc.git] / term_ascii.c

diff --git a/term_ascii.c b/term_ascii.c
index 7215a5971665ab692c7d236b68cc46ef9ebbf323..e819c0ef8a86ede20881f3b3a0e9cd84b13aef1a 100644 (file)
--- a/term_ascii.c
+++ b/term_ascii.c
@@ -1,7 +1,7 @@
-/*     $Id: term_ascii.c,v 1.52 2015/11/12 21:50:03 schwarze Exp $ */
+/*     $Id: term_ascii.c,v 1.58 2017/06/14 14:24:20 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2014, 2015, 2017 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
@@ -65,13 +65,14 @@ ascii_init(enum termenc enc, const struct manoutput *outopts)
 #endif
        struct termp    *p;
 
-       p = mandoc_calloc(1, sizeof(struct termp));
+       p = mandoc_calloc(1, sizeof(*p));
+       p->tcol = p->tcols = mandoc_calloc(1, sizeof(*p->tcol));
+       p->maxtcol = 1;
 
        p->line = 1;
-       p->tabwidth = 5;
        p->defrmargin = p->lastrmargin = 78;
        p->fontq = mandoc_reallocarray(NULL,
-            (p->fontsz = 8), sizeof(enum termfont));
+            (p->fontsz = 8), sizeof(*p->fontq));
        p->fontq[0] = p->fontl = TERMFONT_NONE;
 
        p->begin = ascii_begin;
@@ -98,7 +99,7 @@ ascii_init(enum termenc enc, const struct manoutput *outopts)
 
                v = TERMENC_LOCALE == enc ?
                    setlocale(LC_CTYPE, "") :
-                   setlocale(LC_CTYPE, "en_US.UTF-8");
+                   setlocale(LC_CTYPE, UTF8_LOCALE);
                if (NULL != v && MB_CUR_MAX > 1) {
                        p->enc = enc;
                        p->advance = locale_advance;
@@ -149,7 +150,7 @@ ascii_setwidth(struct termp *p, int iop, int width)
 {
 
        width /= 24;
-       p->rmargin = p->defrmargin;
+       p->tcol->rmargin = p->defrmargin;
        if (iop > 0)
                p->defrmargin += width;
        else if (iop == 0)
@@ -158,23 +159,22 @@ ascii_setwidth(struct termp *p, int iop, int width)
                p->defrmargin -= width;
        else
                p->defrmargin = 0;
-       p->lastrmargin = p->rmargin;
-       p->rmargin = p->maxrmargin = p->defrmargin;
+       p->lastrmargin = p->tcol->rmargin;
+       p->tcol->rmargin = p->maxrmargin = p->defrmargin;
 }
 
 void
-ascii_sepline(void *arg)
+terminal_sepline(void *arg)
 {
        struct termp    *p;
        size_t           i;
 
        p = (struct termp *)arg;
-       p->line += 3;
-       putchar('\n');
+       (*p->endline)(p);
        for (i = 0; i < p->defrmargin; i++)
-               putchar('-');
-       putchar('\n');
-       putchar('\n');
+               (*p->letter)(p, '-');
+       (*p->endline)(p);
+       (*p->endline)(p);
 }
 
 static size_t
@@ -217,6 +217,8 @@ ascii_endline(struct termp *p)
 {
 
        p->line++;
+       p->tcol->offset -= p->ti;
+       p->ti = 0;
        putchar('\n');
 }
 
@@ -291,7 +293,7 @@ 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>",
-       "<99>", "<99>", "<9A>", "<9B>", "<9C>", "<9D>", "<9E>", "<9F>",
+       "<98>", "<99>", "<9A>", "<9B>", "<9C>", "<9D>", "<9E>", "<9F>",
        nbrsp,  "!",    "/\bc", "GBP",  "o\bx", "=\bY", "|",    "<sec>",
        "\"",   "(C)",  "_\ba", "<<",   "~",    "",     "(R)",  "-",
        "<deg>","+-",   "2",    "3",    "'",    ",\bu", "<par>",".",
@@ -371,6 +373,8 @@ locale_endline(struct termp *p)
 {
 
        p->line++;
+       p->tcol->offset -= p->ti;
+       p->ti = 0;
        putwchar(L'\n');
 }