If messages are shown and output is printed without a pager, display

[mandoc.git] / chars.c

diff --git a/chars.c b/chars.c
index c55f9e27c4f10c2982034b0d6e86c16ac38f75e4..24166dbd9f8fd020b5aecdc9d2ebf5f346b3caa4 100644 (file)
--- a/chars.c
+++ b/chars.c
@@ -1,7 +1,7 @@
-/*     $Id: chars.c,v 1.76 2018/08/21 16:06:48 schwarze Exp $ */
+/*     $Id: chars.c,v 1.78 2018/12/15 19:30:26 schwarze Exp $ */
 /*
  * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2011, 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011,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
@@ -23,6 +23,7 @@
 #include <ctype.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -47,21 +48,13 @@ static struct ln lines[] = {
        { " ",                  ascii_nbrsp,    0x00a0  },
        { "~",                  ascii_nbrsp,    0x00a0  },
        { "0",                  " ",            0x2002  },
-       { "|",                  "",             0       },
-       { "^",                  "",             0       },
-       { "&",                  "",             0       },
-       { ")",                  "",             0       },
-       { "%",                  "",             0       },
        { ":",                  ascii_break,    0       },
-       /* XXX The following three do not really belong here. */
-       { "t",                  "",             0       },
-       { "c",                  "",             0       },
-       { "}",                  "",             0       },
 
        /* Lines. */
        { "ba",                 "|",            0x007c  },
        { "br",                 "|",            0x2502  },
        { "ul",                 "_",            0x005f  },
+       { "_",                  "_",            0x005f  },
        { "ru",                 "_",            0x005f  },
        { "rn",                 "-",            0x203e  },
        { "bb",                 "|",            0x00a6  },
@@ -464,7 +457,7 @@ mchars_spec2cp(const char *p, size_t sz)
 
        end = p + sz;
        ln = ohash_find(&mchars, ohash_qlookupi(&mchars, p, &end));
-       return ln != NULL ? ln->unicode : sz == 1 ? (unsigned char)*p : -1;
+       return ln != NULL ? ln->unicode : -1;
 }
 
 int
@@ -494,10 +487,8 @@ mchars_spec2str(const char *p, size_t sz, size_t *rsz)
 
        end = p + sz;
        ln = ohash_find(&mchars, ohash_qlookupi(&mchars, p, &end));
-       if (ln == NULL) {
-               *rsz = 1;
-               return sz == 1 ? p : NULL;
-       }
+       if (ln == NULL)
+               return NULL;
 
        *rsz = strlen(ln->ascii);
        return ln->ascii;