Tentative fix of quoted punctuation issue noted by Jason McIntyre, e.g., `Li "!"...

[mandoc.git] / chars.in

diff --git a/chars.in b/chars.in
index 429fb237e6b65752e0a0e32463b5d8a989e4cd4c..61a99e1d93d4d1afa9de67e1dd17acfb0b9f0654 100644 (file)
--- a/chars.in
+++ b/chars.in
@@ -1,4 +1,4 @@
-/*     $Id: chars.in,v 1.17 2009/09/23 11:02:21 kristaps Exp $ */
+/*     $Id: chars.in,v 1.22 2010/03/30 19:20:33 kristaps Exp $ */
 /*
  * Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -30,11 +30,16 @@
  * XXX - update LINES_MAX if adding more!
  */
 
+/* Non-breaking, non-collapsing space uses unit separator. */
+static const char ascii_nbrsp[2] = { 31, 0 };
+
+CHAR_TBL_START
+
 /* Spacing. */
 CHAR("c",                      1,      "",             0,      "",             0)
-CHAR("0",                      1,      " ",            1,      "&#8194;",      6)
+CHAR("0",                      1,      " ",            1,      "&#8194;",      7)
 CHAR(" ",                      1,      " ",            1,      "&#8194;",      7)
-CHAR("~",                      1,      " ",            1,      "&#160;",       6)
+CHAR("~",                      1,      ascii_nbrsp,    1,      "&#160;",       6)
 CHAR("%",                      1,      "",             0,      "",             0)
 CHAR("&",                      1,      "",             0,      "",             0)
 CHAR("^",                      1,      "",             0,      "",             0)
@@ -45,10 +50,10 @@ CHAR("a\"",                 2,      "\"",           1,      "&#779;",       6)
 CHAR("a-",                     2,      "-",            1,      "&#175;",       6)
 CHAR("a.",                     2,      ".",            1,      "&#729;",       6)
 CHAR("a^",                     2,      "^",            1,      "&#770;",       6)
-CHAR("\'",                     1,      "\'",           1,      "&#769;",       6)
+BOTH("\'",                     1,      "\'",           1,      "&#769;",       6)
 BOTH("aa",                     2,      "\'",           1,      "&#769;",       6)
 BOTH("ga",                     2,      "`",            1,      "&#768;",       6)
-CHAR("`",                      1,      "`",            1,      "&#768;",       6)
+BOTH("`",                      1,      "`",            1,      "&#768;",       6)
 CHAR("ab",                     2,      "`",            1,      "&#774;",       6)
 CHAR("ac",                     2,      ",",            1,      "&#807;",       6)
 CHAR("ad",                     2,      "\"",           1,      "&#776;",       6)
@@ -316,8 +321,8 @@ CHAR("fi",                  2,      "fi",           2,      "&#64257;",     8)
 CHAR("fl",                     2,      "fl",           2,      "&#64258;",     8)
 CHAR("Fi",                     2,      "ffi",          3,      "&#64259;",     8)
 CHAR("Fl",                     2,      "ffl",          3,      "&#64260;",     8)
-CHAR("AE",                     2,      "AE",           2,      "&#198;",       6)
-CHAR("ae",                     2,      "ae",           2,      "&#230;",       6)
+BOTH("AE",                     2,      "AE",           2,      "&#198;",       6)
+BOTH("ae",                     2,      "ae",           2,      "&#230;",       6)
 CHAR("OE",                     2,      "OE",           2,      "&#338;",       6)
 CHAR("oe",                     2,      "oe",           2,      "&#339;",       6)
 CHAR("ss",                     2,      "ss",           2,      "&#223;",       6)
@@ -342,6 +347,27 @@ CHAR("Po",                 2,      "L",            1,      "&#163;",       6)
 CHAR("Cs",                     2,      "x",            1,      "&#164;",       6)
 CHAR("Fn",                     2,      "f",            1,      "&#402;",       6)
 
+/* pod2man holdovers. */
+STRING("--",                   2,      "--",           2,      "&#8212;",      7)
+STRING("PI",                   2,      "pi",           2,      "&#960;",       6)
+STRING("L\"",                  2,      "``",           2,      "&#8220;",      7)
+STRING("R\"",                  2,      "\'\'",         2,      "&#8221;",      7)
+STRING("C+",                   2,      "C++",          3,      "C++",          3)
+STRING("C`",                   2,      "`",            1,      "&#8216;",      7)
+STRING("C\'",                  2,      "\'",           1,      "&#8217;",      7)
+STRING("Aq",                   2,      "\'",           1,      "\'",           1)
+STRING("^",                    1,      "^",            1,      "^",            1)
+STRING(",",                    1,      ",",            1,      ",",            1)
+STRING("~",                    1,      "~",            1,      "~",            1)
+STRING("/",                    1,      "/",            1,      "/",            1)
+STRING(":",                    1,      "\"",           1,      "&#776;",       6)
+STRING("8",                    1,      "B",            1,      "&#946;",       6)
+STRING("o",                    1,      "o",            1,      "&#176;",       6)
+STRING("D-",                   2,      "D",            1,      "&#208;",       6)
+STRING("d-",                   2,      "o",            1,      "&#240;",       6)
+STRING("Th",                   2,      "b",            1,      "&#222;",       6)
+STRING("th",                   2,      "b",            1,      "&#254;",       6)
+
 /* Old style. */
 STRING("Am",                   2,      "&",            1,      "&amp;",        5)
 STRING("Ba",                   2,      "|",            1,      "|",            1)
@@ -407,7 +433,6 @@ CHAR("r?",                  2,      "c",            1,      "&#191;",       6)
 CHAR("em",                     2,      "--",           2,      "&#8212;",      7)
 CHAR("en",                     2,      "-",            1,      "&#8211;",      7)
 CHAR("hy",                     2,      "-",            1,      "&#8208;",      7)
-CHAR("\\",                     1,      "\\",           1,      "\\",           1)
 CHAR("e",                      1,      "\\",           1,      "\\",           1)
 
 /* Units. */
@@ -416,3 +441,5 @@ CHAR("%0",                  2,      "%o",           2,      "&#8240;",      7)
 CHAR("fm",                     2,      "\'",           1,      "&#8242;",      7)
 CHAR("sd",                     2,      "\"",           1,      "&#8243;",      7)
 CHAR("mc",                     2,      "mu",           2,      "&#181;",       6)
+
+CHAR_TBL_END