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

[Behdad Esfahbod]

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

Modified Files:
	Makefile.am common.h fribidi-bidi.h fribidi-mirroring.c 
	fribidi-mirroring.h 
Log Message:
Making gen-bidi-tab work, and more clean up.


Index: Makefile.am
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/Makefile.am	12 May 2004 08:17:19 -0000	1.6
+++ b/Makefile.am	22 May 2004 10:35:31 -0000	1.7
@@ -1,9 +1,9 @@
 lib_LTLIBRARIES = libfribidi.la
 
-AM_CPPFLAGS = $(GLIB_CFLAGS)
+AM_CPPFLAGS = $(MISC_CFLAGS)
 
 libfribidi_la_LDFLAGS = -version-info $(LT_VERSION_INFO)
-libfribidi_la_LIBADD = $(GLIB_LIBS)
+libfribidi_la_LIBADD = $(MISC_LIBS)
 libfribidi_la_DEPENDENCIES =
 
 if PLATFORM_WIN32
@@ -50,29 +50,14 @@
 BUILT_SOURCES= \
 		bidi-type.tab.i \
 		mirroring.tab.i \
-		fribidi-unicode-version.h \
-		fribidi-config.h
-
-MAINTAINERCLEANFILES = $(BUILT_SOURCES)
+		fribidi-unicode-version.h
 
-fribidi_tab_mirroring_0.i: $(fribidi_create_mirroring_SOURCES) fribidi_types.h	\
-		unidata/BidiMirroring.txt
-	$(MAKE) fribidi_create_mirroring
-	if test -d unidata; then UNIDATA=unidata;	\
-	else UNIDATA="$(srcdir)/unidata"; fi &&	\
-	./fribidi_create_mirroring "$$UNIDATA" ||	\
-	($(RM) "$@"; false)
+$(BUILT_SOURCES):
+	(cd $(top_builddir)/gen.tab && \
+	 $(MAKE) $(AM_MAKEFLAGS) $@) && \
+	mv $(top_builddir)/gen.tab/$@ .
 
-fribidi_tab_bidi_type.i: $(fribidi_create_char_types_SOURCES)	\
-		unidata/UnicodeData.txt
-	$(MAKE) fribidi_create_char_types
-	if test -d unidata; then UNIDATA=unidata;	\
-	else UNIDATA="$(srcdir)/unidata"; fi &&	\
-	./fribidi_create_char_types "`echo "$@"	\
-	  | $(SED) 's/[^0-9]*//g'`" "$$UNIDATA" ||	\
-	($(RM) "$@"; false)
-	$(RM) fribidi_tab_char_type_stamp
-	$(MAKE) fribidi_tab_char_type_stamp
+MAINTAINERCLEANFILES = $(BUILT_SOURCES)
 
 $(top_builddir)/config.h: $(top_srcdir)/config.h.in
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) config.h

Index: common.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/common.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/common.h	12 May 2004 08:17:19 -0000	1.8
+++ b/common.h	22 May 2004 10:35:31 -0000	1.9
@@ -47,18 +47,6 @@
 # define FRIBIDI_ENTRY __declspec(dllexport)
 #endif /* WIN32 */
 
-#ifndef false
-# define false (0==1)
-#endif /* !false */
-
-#ifndef true
-# define true (!false)
-#endif /* !true */
-
-#ifndef NULL
-# define NULL (void *) 0
-#endif /* !NULL */
-
 #if FRIBIDI_USE_GLIB
 # ifndef SIZEOF_LONG
 #  define SIZEOF_LONG GLIB_SIZEOF_LONG
@@ -79,22 +67,40 @@
 #  endif /* !__C2MAN__ */
 #  define fribidi_assert g_assert
 # endif	/* !fribidi_assert */
+# ifndef __C2MAN__
+#  include <glib/gmacros.h>
+# endif /* !__C2MAN__ */
 # ifndef FRIBIDI_BEGIN_STMT
-#  ifndef __C2MAN__
-#   include <glib/gmacros.h>
-#  endif /* !__C2MAN__ */
 #  define FRIBIDI_BEGIN_STMT G_STMT_START {
 #  define FRIBIDI_END_STMT } G_STMT_END
 # endif	/* !FRIBIDI_BEGIN_STMT */
 # ifndef LIKELY
-#  ifndef __C2MAN__
-#   include <glib/gmacros.h>
-#  endif /* !__C2MAN__ */
 #  define LIKELY G_LIKELY
 #  define UNLIKELY G_UNLIKELY
 # endif	/* !LIKELY */
+# ifndef false
+#  define false FALSE
+# endif /* !false */
+# ifndef true
+#  define true TRUE
+# endif /* !true */
 #endif /* FRIBIDI_USE_GLIB */
 
+#ifndef false
+# define false (0)
+# endif /* !false */
+# ifndef true
+#  define true (!false)
+# endif /* !true */
+
+#ifndef NULL
+#  ifdef __cplusplus
+#    define NULL        (0L)
+#  else /* !__cplusplus */
+#    define NULL        ((void*) 0)
+#  endif /* !__cplusplus */
+#endif /* !NULL */
+
 /* fribidi_malloc and fribidi_free should be used instead of malloc and free. 
  * No need to include any headers. */
 #ifndef fribidi_malloc

Index: fribidi-bidi.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-bidi.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/fribidi-bidi.h	3 May 2004 22:05:19 -0000	1.2
+++ b/fribidi-bidi.h	22 May 2004 10:35:31 -0000	1.3
@@ -51,7 +51,8 @@
  * list of embedding levels as defined by the algorithm.  If any of the the
  * lists are passed as NULL, the list is ignored and not filled.
  *
- * Returns: Non-zero if it was successful, or zero if any error occured.
+ * Returns: Non-zero if it was successful, or zero if any error occured
+ * (memory allocation failure most probably).
  */
 FRIBIDI_ENTRY fribidi_boolean
 fribidi_log2vis (
@@ -74,7 +75,8 @@
  * This function finds the bidi embedding levels of a single paragraph,
  * as defined by the Unicode Bidirectional Algorithm.
  *
- * Returns: Non-zero if it was successful, or zero if any error occured.
+ * Returns: Non-zero if it was successful, or zero if any error occured
+ * (memory allocation failure most probably).
  */
      FRIBIDI_ENTRY fribidi_boolean fribidi_log2vis_get_embedding_levels (
   const FriBidiChar *str,	/* input logical string */

Index: fribidi-mirroring.c
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-mirroring.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- a/fribidi-mirroring.c	7 May 2004 06:30:38 -0000	1.5
+++ b/fribidi-mirroring.c	22 May 2004 10:35:31 -0000	1.6
@@ -2,8 +2,8 @@
  * fribidi-mirroring.c - get mirrored character
  *
  * Copyright (C) 2004 Sharif FarsiWeb, Inc
- * Copyright (C) 2001,2002 Behdad Esfahbod
- * Copyright (C) 1999,2000 Dov Grobgeld
+ * Copyright (C) 2001, 2002, 2004 Behdad Esfahbod
+ * Copyright (C) 1999, 2000 Dov Grobgeld
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public

Index: fribidi-mirroring.h
===================================================================
RCS file: /cvs/fribidi/fribidi/lib/fribidi-mirroring.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- a/fribidi-mirroring.h	12 May 2004 07:06:21 -0000	1.3
+++ b/fribidi-mirroring.h	22 May 2004 10:35:31 -0000	1.4
@@ -2,7 +2,7 @@
  * fribidi-mirroring.h - get mirrored character
  *
  * Copyright (C) 2004 Sharif FarsiWeb, Inc
- * Copyright (C) 2001,2002 Behdad Esfahbod
+ * Copyright (C) 2001, 2002, 2004 Behdad Esfahbod
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -47,7 +47,7 @@
  * and has a mirrored equivalent.  The matching mirrored character is put in
  * the output, otherwise the input character itself is put.
  *
- * Returns: if the character has a mirror or not.
+ * Returns: if the character has a mirroring equivalent or not.
  */
 FRIBIDI_ENTRY fribidi_boolean fribidi_get_mirror_char (
   FriBidiChar ch,		/* input character */