[FriBidi-commit] fribidi/lib .cvsignore, 1.2, 1.3 Makefile.am, 1.5, 1.6 common.h, 1.7, 1.8 fribidi-bidi-type.c, 1.5, 1.6 fribidi-common.h, 1.4, 1.5 fribidi-unicode.h, 1.2, 1.3

[Behdad Esfahbod]

Update of /cvs/fribidi/fribidi/lib
In directory pdx:/tmp/cvs-serv19424/lib

Modified Files:
	.cvsignore Makefile.am common.h fribidi-bidi-type.c 
	fribidi-common.h fribidi-unicode.h 
Log Message:
Better handling with Unicode info.


Index: .cvsignore
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/.cvsignore	12 May 2004 07:09:09 -0000	1.2
+++ b/.cvsignore	12 May 2004 08:17:19 -0000	1.3
@@ -1,3 +1,3 @@
 *.i
-fribidi-config.h
 fribidi-unicode-version.h
+fribidi-config.h

Index: Makefile.am
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/Makefile.am	7 May 2004 06:30:38 -0000	1.5
+++ b/Makefile.am	12 May 2004 08:17:19 -0000	1.6
@@ -50,8 +50,8 @@
 BUILT_SOURCES= \
 		bidi-type.tab.i \
 		mirroring.tab.i \
-		fribidi-config.h \
-		fribidi-unicode-version.h
+		fribidi-unicode-version.h \
+		fribidi-config.h
 
 MAINTAINERCLEANFILES = $(BUILT_SOURCES)
 

Index: common.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/common.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- a/common.h	12 May 2004 07:06:21 -0000	1.7
+++ b/common.h	12 May 2004 08:17:19 -0000	1.8
@@ -149,6 +149,7 @@
 # define FRIBIDI_EMPTY_STMT FRIBIDI_BEGIN_STMT (void) 0; FRIBIDI_END_STMT
 #endif /* !FRIBIDI_EMPTY_STMT */
 
+
 #include "debug.h"
 
 #endif /* !_COMMON_H */

Index: fribidi-bidi-type.c
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-bidi-type.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/fribidi-bidi-type.c	12 May 2004 07:06:21 -0000	1.5
+++ b/fribidi-bidi-type.c	12 May 2004 08:17:19 -0000	1.6
@@ -34,17 +34,11 @@
 #include "common.h"
 
 #include <fribidi-bidi-type.h>
+#include <fribidi-unicode.h>
 
 #include "bidi-types.h"
 
-/*
- * Define character types that char_type_tables use.
- * define them to be 0, 1, 2, ... and then in fribidi_get_type.c map them
- * to FriBidiCharTypes.
- */
-typedef unsigned char FriBidiPropCharType;
-
-enum FriBidiPropEnum
+enum FriBidiCharTypeLinearEnum
 {
 # define _FRIBIDI_ADD_TYPE(TYPE,SYMBOL) TYPE,
 # include "bidi-types-list.h"
@@ -54,8 +48,8 @@
 
 #include "bidi-type.tab.i"
 
-/* Map fribidi_prop_types to fribidi_types. */
-static const FriBidiCharType prop_to_type[] = {
+/* Map FriBidiCharTypeLinearEnum to FriBidiCharType. */
+static const FriBidiCharType linear_enum_to_char_type[] = {
 # define _FRIBIDI_ADD_TYPE(TYPE,SYMBOL) FRIBIDI_TYPE_##TYPE,
 # include "bidi-types-list.h"
 # undef _FRIBIDI_ADD_TYPE
@@ -67,8 +61,8 @@
   FriBidiChar uch
 )
 {
-  if (uch < 0x110000)
-    return prop_to_type[FRIBIDI_GET_BIDI_TYPE (uch)];
+  if (uch < FRIBIDI_UNICODE_CHARS)
+    return linear_enum_to_char_type[FRIBIDI_GET_BIDI_TYPE (uch)];
   else
     return FRIBIDI_TYPE_LTR;
   /* Non-Unicode chars */

Index: fribidi-common.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-common.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/fribidi-common.h	7 May 2004 06:30:38 -0000	1.4
+++ b/fribidi-common.h	12 May 2004 08:17:19 -0000	1.5
@@ -100,10 +100,6 @@
 /* An string containing the version information of the library. */
 extern const char *fribidi_version_info;
 
-#define fribidi_unicode_version FRIBIDI_NAMESPACE(unicode_version)
-/* An string containing the version the Unicode standard implemented. */
-extern const char *fribidi_unicode_version;
-
 #endif /* !_FRIBIDI_COMMON_H */
 /* Editor directions:
  * vim:textwidth=78:tabstop=8:shiftwidth=2:autoindent:cindent

Index: fribidi-unicode.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-unicode.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/fribidi-unicode.h	7 May 2004 06:30:38 -0000	1.2
+++ b/fribidi-unicode.h	12 May 2004 08:17:19 -0000	1.3
@@ -41,6 +41,7 @@
 
 /* We do not support surrogates yet */
 #define FRIBIDI_UNICODE_CHARS	(sizeof(FriBidiChar) >= 4 ? 0x110000 : 0xFFFE)
+
 /* Unicode version - FRIBIDI_UNICODE_VERSION */
 #if !DONT_HAVE_FRIBIDI_UNICODE_VERSION_H
 # include "fribidi-unicode-version.h"
@@ -48,6 +49,10 @@
 # define FRIBIDI_UNICODE_VERSION "unknown"
 #endif /* DONT_HAVE_FRIBIDI_UNICODE_VERSION_H */
 
+#define fribidi_unicode_version FRIBIDI_NAMESPACE(unicode_version)
+/* An string containing the version the Unicode standard implemented,
+ * in the form of "x.y.z", or "unknown". */
+extern const char *fribidi_unicode_version;
 
 
 /* The Unicode Bidirectional Algorithm constants */