Oh, no need to add tables for general category Cf, it can roughly be obtained

by doing JOINING_TYPE_T - BIDI_TYPE_NSM...

diff --git a/gen.tab/Makefile.am b/gen.tab/Makefile.am
index a1daff0f6b10c38f57c83d5c68559b78fb325a0f..b02c5a1992ea3e652c1b9514a88208f8619e6429 100644 (file)
--- a/gen.tab/Makefile.am
+++ b/gen.tab/Makefile.am
@@ -2,13 +2,11 @@ EXTRA_PROGRAMS = \
                gen-unicode-version \
                gen-bidi-type-tab \
                gen-joining-type-tab \
-               gen-mirroring-tab \
-               gen-cf-bn-nsm-tab
+               gen-mirroring-tab
 
 gen_bidi_type_tab_SOURCES = gen-bidi-type-tab.c packtab.c packtab.h
 gen_joining_type_tab_SOURCES = gen-joining-type-tab.c packtab.c packtab.h
 gen_mirroring_tab_SOURCES = gen-mirroring-tab.c packtab.c packtab.h
-gen_cf_bn_nsm_tab_SOURCES = gen-cf-bn-nsm-tab.c packtab.c packtab.h
 gen_unicode_version_SOURCES = gen-unicode-version.c
 
 CLEANFILES = $(EXTRA_PROGRAMS)
@@ -78,18 +76,6 @@ mirroring.tab.i: \
        ./$(gen_mirroring_tab) $(COMPRESSION) $^ > $@ \
        || ($(RM) $@ && false)
 
-# generate cf-bn-nsm.tab.i
-
-gen_cf_bn_nsm_tab = gen-cf-bn-nsm-tab$(EXEEXT)
-
-cf-bn-nsm.tab.i: \
-               UnicodeData.txt \
-               fribidi-unicode-version.h \
-               $(gen_cf_bn_nsm_tab_SOURCES)
-       $(MAKE) $(AM_MAKEFLAGS) $(gen_cf_bn_nsm_tab)
-       ./$(gen_cf_bn_nsm_tab) $(COMPRESSION) $^ > $@ \
-       || ($(RM) $@ && false)
-
 # generate fribidi-unicode-version.h
 
 gen_unicode_version = gen-unicode-version$(EXEEXT)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index b97ee2f821676b64387fcdb1ce6f7b91a2c6c288..8084590d38125e3b4e1f6585cc5652898182c17c 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -33,7 +33,6 @@ pkginclude_HEADERS = $(libfribidi_la_headers) fribidi-config.h
 libfribidi_la_SOURCES =        \
                bidi-type.tab.i \
                bidi-types.h \
-               cf-bn-nsm.tab.i \
                common.h \
                debug.h \
                env.h \
@@ -56,8 +55,7 @@ BUILT_SOURCES= \
                fribidi-unicode-version.h \
                bidi-type.tab.i \
                joining-type.tab.i \
-               mirroring.tab.i \
-               cf-bn-nsm.tab.i
+               mirroring.tab.i
 
 $(BUILT_SOURCES):
        @(cd $(top_builddir)/gen.tab && \

diff --git a/lib/fribidi-bidi-types.h b/lib/fribidi-bidi-types.h
index 069610a27ffa63e64e046b34f32db68499cb100f..95bd8ab261a80a6589d4dcc6fe0013debeb67ac7 100644 (file)
--- a/lib/fribidi-bidi-types.h
+++ b/lib/fribidi-bidi-types.h
@@ -1,10 +1,10 @@
 /* FriBidi
  * fribidi-bidi-types.h - character bidi types
  *
- * $Id: fribidi-bidi-types.h,v 1.10 2004-06-15 11:52:02 behdad Exp $
+ * $Id: fribidi-bidi-types.h,v 1.11 2004-06-15 20:54:00 behdad Exp $
  * $Author: behdad $
- * $Date: 2004-06-15 11:52:02 $
- * $Revision: 1.10 $
+ * $Date: 2004-06-15 20:54:00 $
+ * $Revision: 1.11 $
  * $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/lib/fribidi-bidi-types.h,v $
  *
  * Author:
@@ -385,17 +385,6 @@ fribidi_get_bidi_type (
   FriBidiCharType t            /* input bidi type */
 ) FRIBIDI_GNUC_CONST;
 
-#define fribidi_is_cf_minus_bn_and_nsm FRIBIDI_NAMESPACE(is_cf_minus_bn_and_nsm)
-/* fribidi_is_cf_minus_bn_and_nsm - is other format control character?
- *
- * This function finds the bidi types of an string of characters.  See
- * fribidi_get_bidi_type() for more information about the bidi types returned
- * by this function.
- */
-     FRIBIDI_ENTRY fribidi_boolean fribidi_get_bidi_types (
-  const FriBidiChar ch         /* input character */
-);
-
 #include "fribidi-enddecls.h"
 
 #endif /* !_FRIBIDI_BIDI_TYPES_H */