[FriBidi-commit] fribidi/gen.tab Makefile.am, 1.8, 1.9 gen-bidi-type-tab.c, 1.8, 1.9 gen-mirroring-tab.c, 1.6, 1.7 gen-unicode-version.c, 1.4, 1.5

[Behdad Esfahbod]

Update of /cvs/fribidi/fribidi/gen.tab
In directory pdx:/tmp/cvs-serv21116/gen.tab

Modified Files:
	Makefile.am gen-bidi-type-tab.c gen-mirroring-tab.c 
	gen-unicode-version.c 
Log Message:
GNU Coding Standards applied and typos fixed.


Index: Makefile.am
===================================================================
RCS file: /cvs/fribidi/fribidi/gen.tab/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/Makefile.am	25 May 2004 11:27:50 -0000	1.8
+++ b/Makefile.am	31 May 2004 18:43:26 -0000	1.9
@@ -53,11 +53,11 @@
 
 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 @@
 
 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 @@
 
 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)
 

Index: gen-bidi-type-tab.c
===================================================================
RCS file: /cvs/fribidi/fribidi/gen.tab/gen-bidi-type-tab.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- a/gen-bidi-type-tab.c	24 May 2004 06:45:42 -0000	1.8
+++ b/gen-bidi-type-tab.c	31 May 2004 18:43:26 -0000	1.9
@@ -307,7 +307,7 @@
 )
 {
   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);
 

Index: gen-mirroring-tab.c
===================================================================
RCS file: /cvs/fribidi/fribidi/gen.tab/gen-mirroring-tab.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- a/gen-mirroring-tab.c	24 May 2004 06:45:42 -0000	1.6
+++ b/gen-mirroring-tab.c	31 May 2004 18:43:26 -0000	1.7
@@ -162,7 +162,7 @@
   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);
 

Index: gen-unicode-version.c
===================================================================
RCS file: /cvs/fribidi/fribidi/gen.tab/gen-unicode-version.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/gen-unicode-version.c	24 May 2004 06:45:42 -0000	1.4
+++ b/gen-unicode-version.c	31 May 2004 18:43:26 -0000	1.5
@@ -135,14 +135,22 @@
 )
 {
   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");
 }