Fix evaluation of "Before C" condition of FINAL_SIGMA.

[gnulib.git] / lib / unicase / ignorable.c

diff --git a/lib/unicase/ignorable.c b/lib/unicase/ignorable.c
index 609c3d3..84b2634 100644 (file)
--- a/lib/unicase/ignorable.c
+++ b/lib/unicase/ignorable.c
@@ -1,5 +1,5 @@
 /* Test whether a Unicode character is case-ignorable.
-   Copyright (C) 2009 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2006-2007, 2009 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2009.
 
    This program is free software: you can redistribute it and/or modify it
@@ -20,21 +20,30 @@
 /* Specification.  */
 #include "caseprop.h"
 
+/* Quoting the Unicode standard:
+     Definition: A character is defined to be "case-ignorable" if it has the
+     value MidLetter {or the value MidNumLet} for the Word_Break property or
+     its General_Category is one of Nonspacing_Mark (Mn), Enclosing_Mark (Me),
+     Format (Cf), Modifier_Letter (Lm), or Modifier_Symbol (Sk).
+   The text marked in braces was added in Unicode 5.1.0, see
+   <http://www.unicode.org/versions/Unicode5.1.0/> section "Update of
+   Definition of case-ignorable".   */
+/* Since this predicate is only used for the "Before C" and "After C"
+   conditions of FINAL_SIGMA, we exclude the "cased" characters here.
+   This simplifies the evaluation of the regular expressions
+     \p{cased} (\p{case-ignorable})* C
+   and
+     C (\p{case-ignorable})* \p{cased}
+ */
+
+#if 0
+
 #include "unictype.h"
 #include "uniwbrk.h"
 
 bool
 uc_is_case_ignorable (ucs4_t uc)
 {
-  /* Quoting the Unicode standard:
-       Definition: A character is defined to be "case-ignorable" if it has the
-       value MidLetter {or the value MidNumLet} for the Word_Break property or
-       its General_Category is one of Nonspacing_Mark (Mn), Enclosing_Mark (Me),
-       Format (Cf), Modifier_Letter (Lm), or Modifier_Symbol (Sk).
-     The text marked in braces was added in Unicode 5.1.0, see
-     <http://www.unicode.org/versions/Unicode5.1.0/> section "Update of
-     Definition of case-ignorable".   */
-
   int wbp = uc_wordbreak_property (uc);
 
   return (wbp == WBP_MIDLETTER || wbp == WBP_MIDNUMLET
@@ -42,5 +51,21 @@ uc_is_case_ignorable (ucs4_t uc)
                                                   | UC_CATEGORY_MASK_Me
                                                   | UC_CATEGORY_MASK_Cf
                                                   | UC_CATEGORY_MASK_Lm
-                                                  | UC_CATEGORY_MASK_Sk));
+                                                  | UC_CATEGORY_MASK_Sk))
+        && !uc_is_cased (uc);
+}
+
+#else
+
+#include "unictype/bitmap.h"
+
+/* Define u_casing_property_case_ignorable table.  */
+#include "ignorable.h"
+
+bool
+uc_is_case_ignorable (ucs4_t uc)
+{
+  return bitmap_lookup (&u_casing_property_case_ignorable, uc);
 }
+
+#endif