GNU Coding Standards applied and typos fixed.

4 files changed, 28 insertions, 20 deletions

diff --git a/gen.tab/Makefile.am b/gen.tab/Makefile.am
index aad691d..c0eab3c 100644
--- a/gen.tab/Makefile.am
+++ b/gen.tab/Makefile.am
@@ -53,11 +53,11 @@ $(BIDI_TYPE_TAB_VARIANTS):
 
 bidi-type.tab.i:
 	@for x in $(BIDI_TYPE_TAB_VARIANTS); do \
-	   if $(MAKE) $(AM_MAKEFLAGS) $$x && mv $$x $@; then \
+	   if $(MAKE) $(AM_MAKEFLAGS) $$x && mv $$x bidi-type.tab.i; then \
 	     break; \
 	   fi; \
 	 done; \
-	 test -f $@ || (echo Could not build $@; false)
+	 test -f bidi-type.tab.i || (echo Could not build $@; false)
 
 DISTCLEANFILES += $(BIDI_TYPE_TAB_VARIANTS)
 
@@ -79,11 +79,11 @@ BidiMirroring_mirroring.tab.i: \
 
 mirroring.tab.i:
 	@for x in $(MIRRORING_TAB_VARIANTS); do \
-	   if $(MAKE) $(AM_MAKEFLAGS) $$x && mv $$x $@; then \
+	   if $(MAKE) $(AM_MAKEFLAGS) $$x && mv $$x mirroring.tab.i; then \
 	     break; \
 	   fi; \
 	 done; \
-	 test -f $@ || (echo Could not build $@; false)
+	 test -f mirroring.tab.i || (echo Could not build $@; false)
 
 DISTCLEANFILES += $(MIRRORING_TAB_VARIANTS)
 
@@ -104,11 +104,11 @@ ReadMe_fribidi-unicode-version.h: \
 
 fribidi-unicode-version.h:
 	@for x in $(UNICODE_VERSION_VARIANTS); do \
-	   if $(MAKE) $(AM_MAKEFLAGS) $$x && mv $$x $@; then \
+	   if $(MAKE) $(AM_MAKEFLAGS) $$x && mv $$x fribidi-unicode-version.h; then \
 	     break; \
 	   fi; \
 	 done; \
-	 test -f $@ || (echo Could not build $@; false)
+	 test -f fribidi-unicode-version.h || (echo Could not build $@; false)
 
 DISTCLEANFILES += $(UNICODE_VERSION_VARIANTS)
 
diff --git a/gen.tab/gen-bidi-type-tab.c b/gen.tab/gen-bidi-type-tab.c
index a5945d5..6690c34 100644
--- a/gen.tab/gen-bidi-type-tab.c
+++ b/gen.tab/gen-bidi-type-tab.c
@@ -1,10 +1,10 @@
 /* FriBidi
  * gen-bidi-type-tab.c - generate bidi-type.tab.i for libfribidi
  *
- * $Id: gen-bidi-type-tab.c,v 1.8 2004-05-24 06:45:42 behdad Exp $
+ * $Id: gen-bidi-type-tab.c,v 1.9 2004-05-31 18:43:26 behdad Exp $
  * $Author: behdad $
- * $Date: 2004-05-24 06:45:42 $
- * $Revision: 1.8 $
+ * $Date: 2004-05-31 18:43:26 $
+ * $Revision: 1.9 $
  * $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/gen.tab/gen-bidi-type-tab.c,v $
  *
  * Author:
@@ -307,7 +307,7 @@ gen_bidi_type_tab (
 )
 {
   fprintf (stderr, "Generating output, it may take up to a few minutes\n");
-  printf ("/* " outputname "\n * generated by " appname " (" FRIBIDI_NAME
+  printf ("/* " outputname "\n * generated by " appname " (" FRIBIDI_NAME " "
 	  FRIBIDI_VERSION ")\n" " * from the file %s of Unicode version "
 	  FRIBIDI_UNICODE_VERSION ". */\n\n", data_file_type);
 
diff --git a/gen.tab/gen-mirroring-tab.c b/gen.tab/gen-mirroring-tab.c
index 29ef054..92d4ad5 100644
--- a/gen.tab/gen-mirroring-tab.c
+++ b/gen.tab/gen-mirroring-tab.c
@@ -1,10 +1,10 @@
 /* FriBidi
  * gen-mirroring-tab.c - generate mirroring.tab.i for libfribidi
  *
- * $Id: gen-mirroring-tab.c,v 1.6 2004-05-24 06:45:42 behdad Exp $
+ * $Id: gen-mirroring-tab.c,v 1.7 2004-05-31 18:43:26 behdad Exp $
  * $Author: behdad $
- * $Date: 2004-05-24 06:45:42 $
- * $Revision: 1.6 $
+ * $Date: 2004-05-31 18:43:26 $
+ * $Revision: 1.7 $
  * $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/gen.tab/gen-mirroring-tab.c,v $
  *
  * Author:
@@ -162,7 +162,7 @@ gen_mirroring_tab (
   FriBidiChar i;
 
   fprintf (stderr, "Generating output, it may take up to a few seconds\n");
-  printf ("/* " outputname "\n * generated by " appname " (" FRIBIDI_NAME
+  printf ("/* " outputname "\n * generated by " appname " (" FRIBIDI_NAME " "
 	  FRIBIDI_VERSION ")\n" " * from the file %s of Unicode version "
 	  FRIBIDI_UNICODE_VERSION ". */\n\n", data_file_type);
 
diff --git a/gen.tab/gen-unicode-version.c b/gen.tab/gen-unicode-version.c
index 6f2c965..5ef6ee6 100644
--- a/gen.tab/gen-unicode-version.c
+++ b/gen.tab/gen-unicode-version.c
@@ -1,10 +1,10 @@
 /* FriBidi
  * gen-unicode-version.c - generate fribidi-unicode-version.h for libfribidi
  *
- * $Id: gen-unicode-version.c,v 1.4 2004-05-24 06:45:42 behdad Exp $
+ * $Id: gen-unicode-version.c,v 1.5 2004-05-31 18:43:26 behdad Exp $
  * $Author: behdad $
- * $Date: 2004-05-24 06:45:42 $
- * $Revision: 1.4 $
+ * $Date: 2004-05-31 18:43:26 $
+ * $Revision: 1.5 $
  * $Source: /home/behdad/src/fdo/fribidi/togit/git/../fribidi/fribidi2/gen.tab/gen-unicode-version.c,v $
  *
  * Author:
@@ -135,14 +135,22 @@ gen_unicode_version (
 )
 {
   fprintf (stderr, "Generating output\n");
-  printf ("/* " outputname "\n * generated by " appname " (" FRIBIDI_NAME
+  printf ("/* " outputname "\n * generated by " appname " (" FRIBIDI_NAME " "
 	  FRIBIDI_VERSION ")\n" " * from the file %s */\n\n", data_file_type);
 
   printf ("#define FRIBIDI_UNICODE_VERSION \"%s\"\n"
 	  "#define FRIBIDI_UNICODE_MAJOR_VERSION %d\n"
 	  "#define FRIBIDI_UNICODE_MINOR_VERSION %d\n"
-	  "#define FRIBIDI_UNICODE_MICRO_VERSION %d\n\n",
-	  unicode_version, version_major, version_minor, version_micro);
+	  "#define FRIBIDI_UNICODE_MICRO_VERSION %d\n"
+	  "#define FRIBIDI_UNICODE_NAMESPACE(SYMBOL) \\\n"
+	  "	FRIBIDI_NAMESPACE(SYMBOL##_unicode_%d_%d_%d)\n"
+	  "#define FRIBIDI_UNICODE_PRIVATESPACE(SYMBOL) \\\n"
+	  "	FRIBIDI_PRIVATESPACE(SYMBOL##_unicode_%d_%d_%d)\n"
+	  "\n",
+	  unicode_version,
+	  version_major, version_minor, version_micro,
+	  version_major, version_minor, version_micro,
+	  version_major, version_minor, version_micro);
 
   printf ("/* End of generated " outputname " */\n");
 }