summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--doc/regex.texi8
2 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index a641418208..6cdba97f84 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2021-09-22 Bruno Haible <bruno@clisp.org>
+
+ doc: Don't assume that the output format is TeX-based or info.
+ Reported by Dietmar Schindler in
+ <https://lists.gnu.org/archive/html/bug-gnulib/2021-09/msg00095.html>.
+ * doc/regex.texi (Collating Elements vs. Characters): Assume a texinfo
+ version that groks UTF-8 encoded ISO-8859-1 characters.
+
2021-09-21 Paul Eggert <eggert@cs.ucla.edu>
regex: sync with glibc
diff --git a/doc/regex.texi b/doc/regex.texi
index 91d6bb7b4e..19a12cfa38 100644
--- a/doc/regex.texi
+++ b/doc/regex.texi
@@ -385,13 +385,7 @@ as a unit of collation.''
This generalizes the notion of a character in
two ways. First, a single character can map into two or more collating
-elements. For example, the German
-@tex
-``\ss''
-@end tex
-@ifinfo
-``es-zet''
-@end ifinfo
+elements. For example, the German ``ß''
collates as the collating element @samp{s} followed by another collating
element @samp{s}. Second, two or more characters can map into one
collating element. For example, the Spanish @samp{ll} collates after