POSIX make(1) does not support prerequisites on suffix rules.

[mandoc.git] / chars.c

diff --git a/chars.c b/chars.c
index 46f408d4bbb8b391bf39e56c520df90b0c503bb0..d54fc458aea2c05aab00491b805de18394c81dea 100644 (file)
--- a/chars.c
+++ b/chars.c
@@ -1,7 +1,8 @@
-/*     $Id: chars.c,v 1.75 2018/08/21 01:59:22 schwarze Exp $ */
+/*     $Id: chars.c,v 1.79 2020/02/13 16:18:29 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, 2020
+ *               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 +24,7 @@
 #include <ctype.h>
 #include <stddef.h>
 #include <stdint.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
@@ -46,22 +48,14 @@ static struct ln lines[] = {
        /* Spacing. */
        { " ",                  ascii_nbrsp,    0x00a0  },
        { "~",                  ascii_nbrsp,    0x00a0  },
-       { "0",                  " ",            0x2002  },
-       { "|",                  "",             0       },
-       { "^",                  "",             0       },
-       { "&",                  "",             0       },
-       { ")",                  "",             0       },
-       { "%",                  "",             0       },
+       { "0",                  ascii_nbrsp,    0x00a0  },
        { ":",                  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  },
@@ -83,10 +77,10 @@ static struct ln lines[] = {
        { "sh",                 "#",            0x0023  },
        { "CR",                 "<cr>",         0x21b5  },
        { "OK",                 "\\/",          0x2713  },
-       { "CL",                 "<club>",       0x2663  },
-       { "SP",                 "<spade>",      0x2660  },
-       { "HE",                 "<heart>",      0x2665  },
-       { "DI",                 "<diamond>",    0x2666  },
+       { "CL",                 "C",            0x2663  },
+       { "SP",                 "S",            0x2660  },
+       { "HE",                 "H",            0x2665  },
+       { "DI",                 "D",            0x2666  },
 
        /* Legal symbols. */
        { "co",                 "(C)",          0x00a9  },
@@ -363,7 +357,7 @@ static struct ln lines[] = {
        { "Eu",                 "EUR",          0x20ac  },
        { "eu",                 "EUR",          0x20ac  },
        { "Ye",                 "=\bY",         0x00a5  },
-       { "Po",                 "GBP",          0x00a3  },
+       { "Po",                 "-\bL",         0x00a3  },
        { "Cs",                 "o\bx",         0x00a4  },
        { "Fn",                 ",\bf",         0x0192  },
 
@@ -464,7 +458,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 +488,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;