From cd3285e8443e6cca8814f8c542b6655ac3548406 Mon Sep 17 00:00:00 2001
From: Chris Hanson <org/chris-hanson/cph>
Date: Fri, 5 May 2017 00:08:47 -0700
Subject: [PATCH] Document named arguments to char-set and char-set*.

---
 doc/ref-manual/characters.texi | 106 ++++++++++++++-------------------
 1 file changed, 45 insertions(+), 61 deletions(-)

diff --git a/doc/ref-manual/characters.texi b/doc/ref-manual/characters.texi
index 3bc735744..63783ba3c 100644
--- a/doc/ref-manual/characters.texi
+++ b/doc/ref-manual/characters.texi
@@ -454,66 +454,36 @@ Returns the Unicode general category of @var{char} (or
 
 @multitable @columnfractions .1 .4
 @headitem Category @tab Symbol
-@item Lu
-@tab @code{letter:uppercase}
-@item Ll
-@tab @code{letter:lowercase}
-@item Lt
-@tab @code{letter:titlecase}
-@item Lm
-@tab @code{letter:modifier}
-@item Lo
-@tab @code{letter:other}
-@item Mn
-@tab @code{mark:nonspacing}
-@item Mc
-@tab @code{mark:spacing-combining}
-@item Me
-@tab @code{mark:enclosing}
-@item Nd
-@tab @code{number:decimal-digit}
-@item Nl
-@tab @code{number:letter}
-@item No
-@tab @code{number:other}
-@item Pc
-@tab @code{punctuation:connector}
-@item Pd
-@tab @code{punctuation:dash}
-@item Ps
-@tab @code{punctuation:open}
-@item Pe
-@tab @code{punctuation:close}
-@item Pi
-@tab @code{punctuation:initial-quote}
-@item Pf
-@tab @code{punctuation:final-quote}
-@item Po
-@tab @code{punctuation:other}
-@item Sm
-@tab @code{symbol:math}
-@item Sc
-@tab @code{symbol:currency}
-@item Sk
-@tab @code{symbol:modifier}
-@item So
-@tab @code{symbol:other}
-@item Zs
-@tab @code{separator:space}
-@item Zl
-@tab @code{separator:line}
-@item Zp
-@tab @code{separator:paragraph}
-@item Cc
-@tab @code{other:control}
-@item Cf
-@tab @code{other:format}
-@item Cs
-@tab @code{other:surrogate}
-@item Co
-@tab @code{other:private-use}
-@item Cn
-@tab @code{other:not-assigned}
+@item Lu @tab @code{letter:uppercase}
+@item Ll @tab @code{letter:lowercase}
+@item Lt @tab @code{letter:titlecase}
+@item Lm @tab @code{letter:modifier}
+@item Lo @tab @code{letter:other}
+@item Mn @tab @code{mark:nonspacing}
+@item Mc @tab @code{mark:spacing-combining}
+@item Me @tab @code{mark:enclosing}
+@item Nd @tab @code{number:decimal-digit}
+@item Nl @tab @code{number:letter}
+@item No @tab @code{number:other}
+@item Pc @tab @code{punctuation:connector}
+@item Pd @tab @code{punctuation:dash}
+@item Ps @tab @code{punctuation:open}
+@item Pe @tab @code{punctuation:close}
+@item Pi @tab @code{punctuation:initial-quote}
+@item Pf @tab @code{punctuation:final-quote}
+@item Po @tab @code{punctuation:other}
+@item Sm @tab @code{symbol:math}
+@item Sc @tab @code{symbol:currency}
+@item Sk @tab @code{symbol:modifier}
+@item So @tab @code{symbol:other}
+@item Zs @tab @code{separator:space}
+@item Zl @tab @code{separator:line}
+@item Zp @tab @code{separator:paragraph}
+@item Cc @tab @code{other:control}
+@item Cf @tab @code{other:format}
+@item Cs @tab @code{other:surrogate}
+@item Co @tab @code{other:private-use}
+@item Cn @tab @code{other:not-assigned}
 @end multitable
 @end deffn
 
@@ -581,6 +551,20 @@ or more characters to include in the resulting character set: a
 (bitless) character includes itself; a string includes all of the characters it
 contains; a character set includes its members; or a code-point range
 includes the corresponding characters.
+
+In addition, an @var{element} may be a symbol from the following
+table, which represents the characters as shown:
+@multitable @columnfractions .2 .8
+@headitem Name @tab Unicode character specification
+@item @code{alphabetic} @tab Alphabetic = True
+@item @code{alphanumeric} @tab Alphabetic = True | Numeric_Type = Decimal
+@item @code{cased} @tab Cased = True
+@item @code{lower-case} @tab Lowercase = True
+@item @code{numeric} @tab Numeric_Type = Decimal
+@item @code{unicode} @tab General_Category != (Cs | Cn)
+@item @code{upper-case} @tab Uppercase = True
+@item @code{whitespace} @tab White_Space = True
+@end multitable
 @end deffn
 
 @deffn procedure char-set->code-points char-set
@@ -628,6 +612,6 @@ These constants are the character sets corresponding to
 
 @deffn procedure 8-bit-char-set? char-set
 Returns @code{#t} if @var{char-set} contains only 8-bit code points
-(i.e.@. @acronym{ISO-8859-1} characters), otherwise it returns
+(i.e.@. @acronym{ISO} 8859-1 characters), otherwise it returns
 @code{#f}.
 @end deffn
-- 
2.25.1