summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbehdad <behdad>2004-01-30 20:25:11 +0000
committerbehdad <behdad>2004-01-30 20:25:11 +0000
commit2abb4e34b4a9215a03905888f1ff7f3856690f86 (patch)
tree2e91a44a95f480bb614e87e041999c07be95b0c7
parentc76165ec60bce7f7b4f6d729b781d61fff708b18 (diff)
Small changes here and there.
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.am8
-rw-r--r--fribidi.pc.in2
-rw-r--r--fribidi_create_mirroring.c2
-rw-r--r--fribidi_tab_mirroring.i2
-rw-r--r--fribidi_types.c2
-rw-r--r--fribidi_types.h2
-rwxr-xr-xrun.tests3
8 files changed, 16 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 9326ea4..023f98f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2002-12-22 Behdad Esfahbod <fribidi@behdad.org>
+ * Makefile.am: Added fribidi_types.i to
+ libfribidiinc_HEADERS, to fix bug reported by Omer Zak.
+
2002-12-10 Behdad Esfahbod <fribidi@behdad.org>
* Created CVSROOT entries.
diff --git a/Makefile.am b/Makefile.am
index 630b25f..591ae27 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@ libfribidi_charsets_extra = \
libfribidi_charsets_h = \
fribidi_char_sets.h \
+ fribidi_char_sets.i \
fribidi_char_sets_utf8.h
libfribidi_charsets_extra_h = \
@@ -29,8 +30,7 @@ libfribidi_charsets_extra_h = \
fribidi_char_sets_iso8859_6.h \
fribidi_char_sets_iso8859_8.h
-libfribidi_extra_h = \
- fribidi_mem.h
+libfribidi_extra_h =
lib_LTLIBRARIES = libfribidi.la
@@ -53,10 +53,12 @@ libfribidiincdir = $(includedir)/fribidi
libfribidiinc_HEADERS = \
fribidi.h \
fribidi_types.h \
+ fribidi_types.i \
fribidi_env.h \
fribidi_unicode.h \
$(libfribidi_charsets_h) \
$(libfribidi_charsets_extra_h) \
+ fribidi_mem.h \
fribidi_config.h
GETOPT_SRC = \
@@ -77,8 +79,6 @@ TEST_FILES = \
tests/test_UTF-8_persian.reference
TABLE_FILES = \
- fribidi_types.i \
- fribidi_char_sets.i \
fribidi_tab_mirroring.i \
fribidi_tab_char_type_2.i \
fribidi_tab_char_type_9.i
diff --git a/fribidi.pc.in b/fribidi.pc.in
index 64590f7..205376a 100644
--- a/fribidi.pc.in
+++ b/fribidi.pc.in
@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
-Name: @PACKAGE@
+Name: FriBidi
Description: Unicode BiDirectional algorithm library
Version: @VERSION@
Libs: -L${libdir} -lfribidi
diff --git a/fribidi_create_mirroring.c b/fribidi_create_mirroring.c
index d0aa9be..a1aef1f 100644
--- a/fribidi_create_mirroring.c
+++ b/fribidi_create_mirroring.c
@@ -123,7 +123,7 @@ write_mirror (char *file)
fprintf (f, " {0x%04X, 0x%04X},\n", i, table[i]);
fprintf (f, "} ;\n\n");
fprintf (f, "/* *INDE" "NT-ON* */\n\n");
- fprintf (f, "const int nFriBidiMirroredChars = %d;\n\n", mirroring_count);
+ fprintf (f, "static const int nFriBidiMirroredChars = %d;\n\n", mirroring_count);
fprintf (f, "\n#endif /* %s */\n", FILENAME);
fclose (f);
}
diff --git a/fribidi_tab_mirroring.i b/fribidi_tab_mirroring.i
index ef7382d..61db52f 100644
--- a/fribidi_tab_mirroring.i
+++ b/fribidi_tab_mirroring.i
@@ -352,7 +352,7 @@ FriBidiMirroredChars[] =
/* *INDENT-ON* */
-const int nFriBidiMirroredChars = 318;
+static const int nFriBidiMirroredChars = 318;
#endif /* FRIBIDI_TAB_MIRRORING_I */
diff --git a/fribidi_types.c b/fribidi_types.c
index f1e2c7c..b05536b 100644
--- a/fribidi_types.c
+++ b/fribidi_types.c
@@ -76,7 +76,7 @@ fribidi_char_from_type (FriBidiCharType c)
default:
return '?';
}
-};
+}
#endif
diff --git a/fribidi_types.h b/fribidi_types.h
index 28aea43..e7870c9 100644
--- a/fribidi_types.h
+++ b/fribidi_types.h
@@ -163,7 +163,7 @@ extern "C"
/* European number terminator */
#define FRIBIDI_TYPE_ET ( FRIBIDI_MASK_WEAK + FRIBIDI_MASK_NUMSEPTER \
+ FRIBIDI_MASK_ET )
-/* Common Separator */
+/* Common separator */
#define FRIBIDI_TYPE_CS ( FRIBIDI_MASK_WEAK + FRIBIDI_MASK_NUMSEPTER \
+ FRIBIDI_MASK_CS )
/* Non spacing mark */
diff --git a/run.tests b/run.tests
index 4ef8e8f..cb615a2 100755
--- a/run.tests
+++ b/run.tests
@@ -21,6 +21,9 @@
# For licensing issues, contact <dov@imagic.weizmann.ac.il> and
# <fwpg@sharif.edu>.
+COLUMNS=80
+export COLUMNS
+
if test -z "$srcdir"; then
srcdir=.
test "${VERBOSE+set}" != "set" && VERBOSE=yes