Eliminate PREDICATE->CHAR-SET, and tweak documentation.

diff --git a/doc/ref-manual/characters.texi b/doc/ref-manual/characters.texi
index 72342bca85ea7cb74cef7ad90512e1e2280f30d6..403e57aaba3dbfe925844fe4b8042d7cd6a50e3d 100644 (file)
--- a/doc/ref-manual/characters.texi
+++ b/doc/ref-manual/characters.texi
@@ -624,24 +624,25 @@ Returns a character set consisting of all the characters that occur in
 @end deffn
 
 @deffn procedure scalar-values->char-set items
-Returns a character set containing the scalar values described by
-@var{items}.  @var{Items} must satisfy
+Returns a character set containing the Unicode scalar values described
+by @var{items}.  @var{Items} must satisfy
 @code{well-formed-scalar-values-list?}.
 @end deffn
 
 @deffn procedure char-set->scalar-values char-set
-Returns a well-formed scalar-values list that describes the scalar values
-represented by @var{char-set}.
+Returns a well-formed scalar-values list that describes the Unicode
+scalar values represented by @var{char-set}.
 @end deffn
 
 @deffn procedure well-formed-scalar-values-list? object
 Returns @code{#t} if @var{object} is a well-formed scalar-values list,
 otherwise returns @code{#f}.  A well-formed scalar-values list is a
-proper list, each element of which is either a unicode scalar value or a
-pair of unicode scalar values.  A pair of scalar values represents a
-contiguous range of scalar values.  The @sc{car} of the pair is the
-inclusive lower limit, and the @sc{cdr} is the exclusive upper limit.
-The lower limit must be strictly less than to the upper limit.
+proper list, each element of which is either a Unicode scalar value or
+a pair of Unicode scalar values.  A pair of Unicode scalar values
+represents a contiguous range of Unicode scalar values.  The @sc{car}
+of the pair is the inclusive lower limit, and the @sc{cdr} is the
+exclusive upper limit.  The lower limit must be strictly less than to
+the upper limit.
 @end deffn
 
 @deffn procedure char-set-invert char-set
@@ -665,8 +666,8 @@ least one o the @var{char-set}s.
 @end deffn
 
 @deffn procedure 8-bit-char-set? char-set
-Returns @code{#t} if @var{char-set} contains only 8-bit scalar values,
-otherwise returns @code{#f}.
+Returns @code{#t} if @var{char-set} contains only 8-bit scalar values
+(i.e.@. @acronym{ISO-8859-1} characters), otherwise returns @code{#f}.
 @end deffn
 
 @deffn procedure ascii-range->char-set lower upper
@@ -680,27 +681,22 @@ This procedure is obsolete.  Instead use
 @deffn procedure char-set-members char-set
 This procedure is obsolete; instead use @code{char-set->scalar-values}.
 
-Returns a newly allocated list of the @acronym{ISO-8859-1} characters in
-@var{char-set}, ignoring any characters outside of that set.
-@end deffn
-
-@deffn procedure predicate->char-set predicate
-@var{Predicate} must be a procedure of one argument.
-@code{predicate->char-set} creates and returns a character set
-consisting of the @acronym{ISO-8859-1} characters for which
-@var{predicate} is true.
+Returns a newly allocated list of the @acronym{ISO-8859-1} characters
+in @var{char-set}.  If @var{char-set} contains any characters outside
+of the @acronym{ISO-8859-1} range, they will not be in the returned
+list.
 @end deffn
 
 @node Unicode,  , Character Sets, Characters
 @section Unicode
 
 @cindex Unicode
-MIT/GNU Scheme provides rudimentary support for Unicode characters.  In
-an ideal world, Unicode would be the base character set for MIT/GNU
+MIT/GNU Scheme provides rudimentary support for Unicode characters.
+In an ideal world, Unicode would be the base character set for MIT/GNU
 Scheme.  But MIT/GNU Scheme predates the invention of Unicode, and
 converting an application of this size is a considerable undertaking.
-So for the time being, the base character set for @acronym{I/O} and
-strings is @acronym{ISO-8859-1}, and Unicode support is grafted on.
+So for the time being, the base character set for strings is
+@acronym{ISO-8859-1}, and Unicode support is grafted on.
 
 This Unicode support was implemented as a part of the @acronym{XML}
 parser (@pxref{XML Support}) implementation.  @acronym{XML} uses

diff --git a/doc/ref-manual/scheme.texinfo b/doc/ref-manual/scheme.texinfo
index 67d1a90c9d01835d9889a7cff418b2949a0f1645..2e3cd4247f4a52ee25196e332610551b6d576edb 100644 (file)
--- a/doc/ref-manual/scheme.texinfo
+++ b/doc/ref-manual/scheme.texinfo
@@ -210,7 +210,6 @@ Unicode
 
 * Wide Strings::                
 * Unicode Representations::     
-* Alphabets::                   
 
 Strings
 

diff --git a/src/runtime/chrset.scm b/src/runtime/chrset.scm
index fd44250be079c3f23aa5ced877dc5a72dc619384..986da3729a81b02fb5b43c332e270e09a7d208f5 100644 (file)
--- a/src/runtime/chrset.scm
+++ b/src/runtime/chrset.scm
@@ -554,12 +554,6 @@ USA.
              (loop (fix:+ code 1)))
          '()))))
 
-(define (predicate->char-set predicate)
-  (%scalar-values->char-set
-   (filter (lambda (i)
-            (predicate (integer->char i)))
-          (iota #x100))))
-
 (define (char-set . chars)
   (for-each (lambda (char)
              (guarantee-unicode-char char 'CHAR-SET))

diff --git a/src/runtime/runtime.pkg b/src/runtime/runtime.pkg
index 9bfb10ce3543517164d3c049152f0a9ab01136d2..617fdf0973026b2c8c5461a2ee2fdabeeb018673 100644 (file)
--- a/src/runtime/runtime.pkg
+++ b/src/runtime/runtime.pkg
@@ -1137,7 +1137,6 @@ USA.
          guarantee-char-set
          guarantee-well-formed-scalar-value-list
          guarantee-well-formed-scalar-value-range
-         predicate->char-set
          scalar-values->char-set
          string->char-set
          well-formed-scalar-value-list?