Quotes sync'd with newest groff.

3 files changed, 32 insertions, 20 deletions

diff --git a/chars.c b/chars.c
index dae4f4c3..d575cd2f 100644
--- a/chars.c
+++ b/chars.c
@@ -38,7 +38,7 @@ struct	ln {
 #define CHARS_BOTH	 (0x03)
 };
 
-#define	LINES_MAX	  302
+#define	LINES_MAX	  304
 
 #define CHAR(w, x, y, z, a, b) \
 	{ NULL, (w), (y), (a), (x), (z), (b), CHARS_CHAR },
diff --git a/chars.in b/chars.in
index ab8ad281..6311f527 100644
--- a/chars.in
+++ b/chars.in
@@ -74,8 +74,21 @@ CHAR("ho",			2,	",",		1,	"̨",	6)
 CHAR("ha",			2,	"^",		1,	"^",		1)
 CHAR("ti",			2,	"~",		1,	"~",		1)
 
+/* Quotes. */
+CHAR("Bq",			2, 	",,",		2,	"„",	7)
+CHAR("bq",			2, 	",",		1,	"‚",	7)
 BOTH("lq",			2, 	"``",		2,	"“",	7)
 BOTH("rq",			2, 	"\'\'",		2,	"”",	7)
+CHAR("oq",			2, 	"`",		1,	"‘",	7)
+CHAR("cq",			2, 	"\'",		1,	"’",	7)
+CHAR("aq",			2, 	"\'",		1,	"\'",		1)
+CHAR("dq",			2, 	"\"",		1,	"\"",		1)
+CHAR("Fo",			2,	"<<",		2,	"&#171;",	6)
+CHAR("Fc",			2,	">>",		2,	"&#187;",	6)
+CHAR("fo",			2,	"<",		1,	"&#8249;",	7)
+CHAR("fc",			2,	">",		1,	"&#8250;",	7)
+
+
 BOTH("ua",			2,	"^",		1,	"",	0)
 
 /* Punctuation. */
@@ -281,15 +294,12 @@ CHAR("pd",			2,	"a",		1,	"&#8706;",	7)
 CHAR("-h",			2,	"/h",		2,	"&#8463;",	7)
 
 CHAR("AE",			2,	"AE",		2,	"&#198;",	6)
-CHAR("Bq",			2, 	",,",		2,	"&#8222;",	7)
 CHAR("Cs",			2,	"x",		1,	"",	0)
 CHAR("Do",			2,	"$",		1,	"",	0)
 CHAR("Eu",			2,	"EUR",		3,	"",	0)
-CHAR("Fc",			2,	">>",		2,	"",	0)
 CHAR("Fi",			2,	"ffi",		3,	"",	0)
 CHAR("Fl",			2,	"ffl",		3,	"",	0)
 CHAR("Fn",			2,	"f",		1,	"",	0)
-CHAR("Fo",			2,	"<<",		2,	"",	0)
 CHAR("OE",			2,	"OE",		2,	"",	0)
 CHAR("Po",			2,	"L",		1,	"",	0)
 CHAR("Sd",			2,	"o",		1,	"",	0)
@@ -302,10 +312,8 @@ CHAR("^",			1,	"",		0,	"",		0)
 CHAR("`",			1,	"`",		1,	"",	0)
 CHAR("aa",			2, 	"\'",		1,	"",	0)
 CHAR("ae",			2,	"ae",		2,	"",	0)
-CHAR("aq",			2, 	"\'",		1,	"&#8217;",	7)
 CHAR("ba",			2, 	"|",		1,	"",	0)
 CHAR("bb",			2, 	"|",		1,	"",	0)
-CHAR("bq",			2, 	",",		1,	"",	0)
 CHAR("bu",			2, 	"o",		1,	"&#8226;",	7)
 CHAR("c",			1,	"",		0,	"",	0)
 CHAR("ci",			2, 	"O",		1,	"",	0)
@@ -320,11 +328,9 @@ CHAR("e",			1,	"\\",		1,	"\\",		1)
 CHAR("em",			2, 	"--",		2,	"&#8212;",	7)
 CHAR("en",			2, 	"-",		1,	"&#8211;",	7)
 CHAR("eu",			2,	"EUR",		3,	"",	0)
-CHAR("fc",			2,	">",		1,	"",	0)
 CHAR("ff",			2,	"ff",		2,	"",	0)
 CHAR("fi",			2,	"fi",		2,	"",	0)
 CHAR("fl",			2,	"fl",		2,	"",	0)
-CHAR("fo",			2,	"<",		1,	"",	0)
 CHAR("hA",			2, 	"<=>",		3,	"",	0)
 CHAR("hy",			2, 	"-",		1,	"",	0)
 CHAR("lA",			2, 	"<=",		2,	"",	0)
@@ -335,7 +341,6 @@ CHAR("lh",			2,	"<=",		2,	"",	0)
 CHAR("oA",			2,	"A",		1,	"",	0)
 CHAR("oa",			2,	"a",		1,	"",	0)
 CHAR("oe",			2,	"oe",		2,	"",	0)
-CHAR("oq",			2, 	"`",		1,	"&#8216;",	7)
 CHAR("ps",			2,	"9|",		2,	"",	0)
 CHAR("r!",			2,	"i",		1,	"",	0)
 CHAR("r?",			2,	"c",		1,	"",	0)
diff --git a/mandoc_char.7 b/mandoc_char.7
index 62bd9322..02fb108e 100644
--- a/mandoc_char.7
+++ b/mandoc_char.7
@@ -111,26 +111,33 @@ Grammatic:
 .El
 .\" PARAGRAPH
 .Pp
-Enclosures:
+Quotes:
 .Bl -offset indent -column 10n 10n 10n
-.It \e(lh      Ta \(lh     Ta left hand
-.It \e(rh      Ta \(rh     Ta right hand
+.It \e(Bq      Ta \(Bq     Ta right low double-quote
+.It \e(bq      Ta \(bq     Ta right low single-quote
+.It \e(lq      Ta \(lq     Ta left double-quote
+.It \e(rq      Ta \(rq     Ta right double-quote
+.It \e(oq      Ta \(oq     Ta left single-quote
+.It \e(cq      Ta \(cq     Ta right single-quote
+.It \e(aq      Ta \(aq     Ta apostrophe quote (text)
+.It \e(dq      Ta \(dq     Ta double quote (text)
 .It \e(Fo      Ta \(Fo     Ta left guillemet
 .It \e(Fc      Ta \(Fc     Ta right guillemet
-.It \e(fo      Ta \(fo     Ta left guilsing
-.It \e(fc      Ta \(fc     Ta right guilsing
+.It \e(fo      Ta \(fo     Ta left single guillemet
+.It \e(fc      Ta \(fc     Ta right single guillemet
+.El
+.\" PARAGRAPH
+.Pp
+Brackets:
+.Bl -offset indent -column 10n 10n 10n
+.It \e(lh      Ta \(lh     Ta left hand
+.It \e(rh      Ta \(rh     Ta right hand
 .It \e(rC      Ta \(rC     Ta right brace
 .It \e(lC      Ta \(lC     Ta left brace
 .It \e(ra      Ta \(ra     Ta right angle
 .It \e(la      Ta \(la     Ta left angle
 .It \e(rB      Ta \(rB     Ta right bracket
 .It \e(lB      Ta \(lB     Ta left bracket
-.It \e(lq      Ta \(lq     Ta left double-quote
-.It \e(rq      Ta \(rq     Ta right double-quote
-.It \e(oq      Ta \(oq     Ta left single-quote
-.It \e(aq      Ta \(aq     Ta right single-quote
-.It \e(Bq      Ta \(Bq     Ta right low double-quote
-.It \e(bq      Ta \(ba     Ta right low single-quote
 .El
 .\" PARAGRAPH
 .Pp