summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1041
-rw-r--r--Makefile.in7
-rw-r--r--NEWS14
-rw-r--r--bin/Makefile.am1
-rw-r--r--bin/Makefile.in2
-rw-r--r--bin/fribidi-main.c6
-rw-r--r--bin/meson.build8
-rwxr-xr-xconfigure32
-rw-r--r--configure.ac11
-rw-r--r--doc/Makefile.in1
-rw-r--r--doc/fribidi_charset_to_unicode.33
-rw-r--r--doc/fribidi_debug_status.35
-rw-r--r--doc/fribidi_get_bidi_type.33
-rw-r--r--doc/fribidi_get_bidi_type_name.33
-rw-r--r--doc/fribidi_get_bidi_types.33
-rw-r--r--doc/fribidi_get_bracket.33
-rw-r--r--doc/fribidi_get_bracket_types.33
-rw-r--r--doc/fribidi_get_joining_type.33
-rw-r--r--doc/fribidi_get_joining_type_name.33
-rw-r--r--doc/fribidi_get_joining_types.33
-rw-r--r--doc/fribidi_get_mirror_char.33
-rw-r--r--doc/fribidi_get_par_direction.33
-rw-r--r--doc/fribidi_get_par_embedding_levels.33
-rw-r--r--doc/fribidi_get_par_embedding_levels_ex.33
-rw-r--r--doc/fribidi_get_type.33
-rw-r--r--doc/fribidi_get_type_internal.33
-rw-r--r--doc/fribidi_join_arabic.33
-rw-r--r--doc/fribidi_log2vis.39
-rw-r--r--doc/fribidi_log2vis_get_embedding_levels.33
-rw-r--r--doc/fribidi_mirroring_status.33
-rw-r--r--doc/fribidi_parse_charset.33
-rw-r--r--doc/fribidi_remove_bidi_marks.39
-rw-r--r--doc/fribidi_reorder_line.33
-rw-r--r--doc/fribidi_reorder_nsm_status.33
-rw-r--r--doc/fribidi_set_debug.35
-rw-r--r--doc/fribidi_set_mirroring.33
-rw-r--r--doc/fribidi_set_reorder_nsm.33
-rw-r--r--doc/fribidi_shape.33
-rw-r--r--doc/fribidi_shape_arabic.33
-rw-r--r--doc/fribidi_shape_mirroring.33
-rw-r--r--doc/fribidi_unicode_to_charset.33
-rw-r--r--fribidi.pc.in1
-rw-r--r--gen.tab/Makefile.am1
-rw-r--r--gen.tab/Makefile.in3
-rw-r--r--lib/Makefile.am6
-rw-r--r--lib/Makefile.in298
-rw-r--r--lib/fribidi-bidi-types.h2
-rw-r--r--lib/fribidi-bidi.c28
-rw-r--r--lib/fribidi-bidi.h2
-rw-r--r--lib/fribidi-common.h34
-rw-r--r--lib/fribidi-deprecated.c13
-rw-r--r--lib/fribidi-deprecated.h8
-rw-r--r--lib/fribidi-joining-types.h4
-rw-r--r--lib/fribidi-unicode.h2
-rw-r--r--lib/fribidi.h8
-rw-r--r--lib/meson.build2
-rw-r--r--meson.build36
-rw-r--r--meson_options.txt4
-rw-r--r--test/Makefile.in1
-rw-r--r--test/unicode-conformance/Makefile.am1
-rw-r--r--test/unicode-conformance/Makefile.in2
-rw-r--r--test/unicode-conformance/meson.build2
62 files changed, 1087 insertions, 603 deletions
diff --git a/ChangeLog b/ChangeLog
index 51af35d..1190b35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,220 @@
+commit 5464c284034da9c058269377b7f5013bb089f553
+Author: Dov Grobgeld <dov.grobgeld@gmail.com>
+Date: Sun Jul 5 22:22:23 2020 +0300
+
+ Bumped version to 1.0.10
+
+ NEWS | 5 +++++
+ configure.ac | 2 +-
+ meson.build | 2 +-
+ 3 files changed, 7 insertions(+), 2 deletions(-)
+
+commit 4d4e15fb6d1046327e371897fbe71171c87681dc
+Merge: 85eb863 edfd72f
+Author: Dov Grobgeld <dov.grobgeld@gmail.com>
+Date: Thu Jun 18 08:04:19 2020 +0300
+
+ Merge pull request #145 from vtorri/master
+
+ Fix FRIBIDI_ENTRY on Windows
+
+commit edfd72ff6c5325835f55082485a13c9bce61345a
+Author: Vincent Torri <vincent.torri@gmail.com>
+Date: Thu Jun 11 06:29:52 2020 +0200
+
+ fribidi-common.h: in static mode, define FRIBIDI_ENTRY only if not
+ already defined
+
+ lib/fribidi-common.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+commit a1f3ce9b60529b01592a02afcd2b9dfc49ccd40d
+Author: Vincent Torri <vincent.torri@gmail.com>
+Date: Thu Jun 11 06:23:45 2020 +0200
+
+ meson: remove wrong additional 'extern' in FRIBIDI_ENTRY
+
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 46ec6f04820d97159c1008539ed5fc846eefb671
+Author: Vincent Torri <vincent.torri@gmail.com>
+Date: Tue Jun 9 16:51:10 2020 +0200
+
+ Fix FRIBIDI_ENTRY on Windows
+ * when the shared library is compiled, it is set to dllexport
+ * when the shared library is used, it is set to dllimport
+ * when the static library is used, it is set to nothing
+ (FRIBIDI_LIB_STATIC must be passed to the preprocessor)
+ * Cflags.private is set to -DFRIBIDI_LIB_STATIC in fribidi.pc (used
+ with pkgconf)
+
+ bin/Makefile.am | 1 +
+ bin/meson.build | 8 ++++----
+ configure.ac | 7 +++++++
+ fribidi.pc.in | 1 +
+ lib/Makefile.am | 6 +++---
+ lib/fribidi-bidi-types.h | 2 +-
+ lib/fribidi-bidi.h | 2 +-
+ lib/fribidi-common.h | 32
+ ++++++++++++++++++++------------
+ lib/fribidi-deprecated.h | 8 ++++----
+ lib/fribidi-joining-types.h | 4 ++--
+ lib/fribidi-unicode.h | 2 +-
+ lib/fribidi.h | 2 +-
+ lib/meson.build | 2 +-
+ meson.build | 19 ++++++++++++-------
+ test/unicode-conformance/Makefile.am | 1 +
+ test/unicode-conformance/meson.build | 2 +-
+ 16 files changed, 61 insertions(+), 38 deletions(-)
+
+commit 85eb863a42bcf8636d1d865625ebfc3b4eb36577
+Merge: e8aebfb 331dfa9
+Author: Khaled Hosny <khaledhosny@eglug.org>
+Date: Sat Jun 6 02:12:27 2020 +0200
+
+ Merge pull request #140 from cben/drop-changes-from-help
+
+ Drop non-existent --changes from help text
+
+commit 331dfa991b314fe6835efcd35bea733341147cb6
+Author: Beni Cherniavsky-Paskin <cben@redhat.com>
+Date: Fri Feb 21 13:59:47 2020 +0200
+
+ Drop non-existent --changes from help text
+
+ bin/fribidi-main.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+commit e8aebfbf9db8a69a2b0321279f28818a9c95e9a8
+Merge: 4364534 0252d6c
+Author: Khaled Hosny <khaledhosny@eglug.org>
+Date: Sat Jun 6 02:08:21 2020 +0200
+
+ Merge pull request #143 from nirbheek/fix-buildtype-usage
+
+ meson: Use the `debug` option directly instead of `buildtype`
+
+commit 436453435423311ec496957d8fc4cdb52c8f9fdf
+Merge: f9e8e71 84d7caf
+Author: Dov Grobgeld <dov.grobgeld@gmail.com>
+Date: Sun May 31 20:22:40 2020 +0300
+
+ Merge pull request #142 from jbkempf/meson_tests
+
+ meson: allow to disable building tests and binaries
+
+commit 0252d6c4f2f7fef733c9c789afba46aa6d20f350
+Author: Nirbheek Chauhan <nirbheek@centricular.com>
+Date: Fri Apr 3 17:21:29 2020 +0530
+
+ meson: Use the `debug` option directly instead of `buildtype`
+
+ `get_option('buildtype')` returns `'custom'` in most of the cases
+ where `-Ddebug` is set. However, `get_option('debug')` will always be
+ set correctly if the user sets `-Dbuildtype`. See the following table
+ for the mapping:
+
+ https://mesonbuild.com/Builtin-options.html#build-type-options
+
+ meson.build | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+commit 84d7caf52322a33deed868655d19ed2b41c226a9
+Author: Jean-Baptiste Kempf <jb@videolan.org>
+Date: Sun Mar 29 18:57:39 2020 +0200
+
+ meson: allow to disable building tests and binaries
+
+ meson.build | 8 ++++++--
+ meson_options.txt | 4 ++++
+ 2 files changed, 10 insertions(+), 2 deletions(-)
+
+commit f9e8e71a6fbf4a4619481284c9f484d10e559995
+Author: Dov Grobgeld <dov.grobgeld@gmail.com>
+Date: Mon Mar 2 18:00:36 2020 +0200
+
+ Bumped version to 1.0.9
+
+ NEWS | 9 +++++++++
+ configure.ac | 2 +-
+ meson.build | 2 +-
+ 3 files changed, 11 insertions(+), 2 deletions(-)
+
+commit 71530f4f6fd3748306ac507511406d2295688fb9
+Author: Dov Grobgeld <dov.grobgeld@gmail.com>
+Date: Sat Feb 29 21:18:32 2020 +0200
+
+ Fixed bug in algorithm causing erroneous connections between isolate
+ runs. Issue: 141
+
+ - Isolate runs were connected even if the isolate level somewhere
+ between them went below the runs isolate level.
+
+ lib/fribidi-bidi.c | 28 ++++++++++++++++++++++++++--
+ 1 file changed, 26 insertions(+), 2 deletions(-)
+
+commit edb58d3fbd99726673b821f708a99182928bd452
+Author: Dov Grobgeld <dov.grobgeld@gmail.com>
+Date: Wed Dec 25 19:53:03 2019 +0100
+
+ Changed \-1 to \(mi1 in fribidi_remove_bidi_marks docs. Issue #135
+
+ - To get rid of warnings from debian man page linter.
+
+ lib/fribidi.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+commit 175447c590ef99e869e9f75ed479425a74fe7f95
+Author: Dov Grobgeld <dov.grobgeld@gmail.com>
+Date: Sat Dec 21 22:21:20 2019 +0100
+
+ Use LDFLAGS_FOR_BUILD for cross compilation #115
+
+ gen.tab/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+commit f144bfc85f17b54ef869e1ddc60825dab8c4207e
+Author: Dov Grobgeld <dov.grobgeld@gmail.com>
+Date: Sat Dec 21 22:11:44 2019 +0100
+
+ Workaround for man2c error. Issue #129.
+
+ lib/fribidi.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+commit 3692ae23a828775b6fdfdc0ea2dcf8822fe51d7c
+Author: Dov Grobgeld <dov.grobgeld@gmail.com>
+Date: Sat Dec 21 22:01:43 2019 +0100
+
+ Restored mistakenly removed deprecated function
+ fribidi_log2vis_get_embedding_levels()
+
+ - Issue #134
+
+ lib/fribidi-deprecated.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+commit 3eb411afe1f0cee54a67c0140f33324b715df1db
+Author: Vincent Torri <vincent.torri@gmail.com>
+Date: Fri Dec 13 10:05:08 2019 +0100
+
+ autotools: generate xz archive instead of bzip2 one
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 2e9bd91cfd857c5b78a210d8f24862a4bb704059
+Author: Dov Grobgeld <dov.grobgeld@gmail.com>
+Date: Fri Dec 13 10:52:21 2019 +0200
+
+ Bumped version to 1.0.8
+
+ NEWS | 8 ++++++++
+ configure.ac | 2 +-
+ meson.build | 2 +-
+ 3 files changed, 10 insertions(+), 2 deletions(-)
+
commit c7d6e1668e94bb6418ea5769f4b186ac375a115d
Author: Dov Grobgeld <dov.grobgeld@gmail.com>
Date: Fri Dec 13 10:45:34 2019 +0200
@@ -55,11 +272,11 @@ Date: Sun Oct 13 11:18:50 2019 +0300
bin/fribidi-main.c | 7 +-
lib/fribidi-deprecated.c | 232
- --------------------------------------------------
- lib/fribidi-deprecated.h | 85 -------------------
+ ----------------------------------------------
+ lib/fribidi-deprecated.h | 85 -----------------
lib/fribidi.c | 233
- ++++++++++++++++++++++++++++++++++++++++++++++++++-
- lib/fribidi.h | 84 +++++++++++++++++++
+ ++++++++++++++++++++++++++++++++++++++++++++++-
+ lib/fribidi.h | 84 +++++++++++++++++
5 files changed, 319 insertions(+), 322 deletions(-)
commit 9e5c3f630198793492352959c1e68ee4303b7c2a
@@ -451,8 +668,8 @@ Date: Sat Jun 30 23:15:21 2018 +0300
Reduce dynamic allocations by using arrays for all small arrays.
lib/fribidi-bidi.c | 64
- +++++++++++++++++++++++++---------------------------
- lib/fribidi-deprecated.c | 44 +++++++++++++++++++++++++++---------
+ +++++++++++++++++++++++-------------------------
+ lib/fribidi-deprecated.c | 44 ++++++++++++++++++++++++---------
2 files changed, 64 insertions(+), 44 deletions(-)
commit 902618192f1cdb4430e4f2dfc032d9fb36fccc5b
@@ -497,10 +714,10 @@ Date: Wed Jun 6 03:44:22 2018 +0200
gen.tab/unidata/ArabicShaping.txt | 104 +++-
gen.tab/unidata/BidiBrackets.txt | 6 +-
- gen.tab/unidata/BidiMirroring.txt | 141 +++---
+ gen.tab/unidata/BidiMirroring.txt | 141 +++--
gen.tab/unidata/ReadMe.txt | 9 +-
gen.tab/unidata/UnicodeData.txt | 778
- +++++++++++++++++++++++++++--
+ +++++++++++++++++++++++--
test/unicode-conformance/BidiCharacterTest.txt | 6 +-
test/unicode-conformance/BidiTest.txt | 11 +-
7 files changed, 917 insertions(+), 138 deletions(-)
@@ -666,11 +883,11 @@ Date: Sat Mar 10 18:37:47 2018 +0200
configure.ac | 20 ---
meson_options.txt | 2 -
test/unicode-conformance/Makefile.am | 2 -
- test/unicode-conformance/meson.build | 31 ++---
+ test/unicode-conformance/meson.build | 31 ++--
test/unicode-conformance/test-character.c | 218
- ++++++++++++++++++------------
+ ++++++++++++++++-----------
test/unicode-conformance/test.c | 242
- +++++++++++++++++++++-------------
+ +++++++++++++++++++-----------
6 files changed, 299 insertions(+), 216 deletions(-)
commit 565f83a13099dfdcec083f4d3e5293df4ed36e63
@@ -878,17 +1095,16 @@ Date: Fri Feb 16 00:09:33 2018 +0000
http://mesonbuild.com for more information.
- bin/meson.build | 27 +++++++++++
- doc/meson.build | 39 +++++++++++++++
- gen.tab/meson.build | 79
- +++++++++++++++++++++++++++++++
- lib/meson.build | 75 +++++++++++++++++++++++++++++
+ bin/meson.build | 27 ++++++++++
+ doc/meson.build | 39 ++++++++++++++
+ gen.tab/meson.build | 79 +++++++++++++++++++++++++++
+ lib/meson.build | 75 ++++++++++++++++++++++++++
meson.build | 100
- +++++++++++++++++++++++++++++++++++++++
+ +++++++++++++++++++++++++++++++++++
meson_options.txt | 6 +++
- test/meson.build | 20 ++++++++
- test/test-runner.py | 25 ++++++++++
- test/unicode-conformance/meson.build | 19 ++++++++
+ test/meson.build | 20 +++++++
+ test/test-runner.py | 25 +++++++++
+ test/unicode-conformance/meson.build | 19 +++++++
9 files changed, 390 insertions(+)
commit 4c97999ad09f683560bfdf69b4539558401cad41
@@ -967,14 +1183,14 @@ Date: Wed Feb 14 21:06:06 2018 +0200
Makefile.am | 2 +-
bin/Makefile.am | 3 +--
- charset/Headers.mk | 8 -------
+ charset/Headers.mk | 8 ------
charset/Makefile.am | 36
- ------------------------------
+ --------------------------
configure.ac | 1 -
doc/Makefile.am | 6 -----
gen.tab/Makefile.am | 3 +--
lib/Headers.mk | 2 ++
- lib/Makefile.am | 20 +++++++++++------
+ lib/Makefile.am | 20 +++++++++-----
{charset => lib}/fribidi-char-sets-cap-rtl.c | 0
{charset => lib}/fribidi-char-sets-cap-rtl.h | 0
{charset => lib}/fribidi-char-sets-cp1255.c | 0
@@ -1142,12 +1358,12 @@ Date: Sun Feb 11 00:49:13 2018 +0200
Fixes the rest of https://github.com/fribidi/fribidi/issues/35
- .travis.yml | 5 +--
+ .travis.yml | 5 +-
Makefile.am | 2 +-
README.md | 2 +-
- autogen.sh | 35 +++++++++++++++
+ autogen.sh | 35 ++++++++++++++
bootstrap | 154
- ----------------------------------------------------------------
+ ------------------------------------------------------------
5 files changed, 38 insertions(+), 160 deletions(-)
commit 3b5baaebf3dead4d2c1ed7a04278cc58b8c3fc85
@@ -1194,7 +1410,7 @@ Date: Sun Jan 28 11:43:11 2018 -0800
Remove notes.org
notes.org | 318
- ------------------------------------------------------------------
+ --------------------------------------------------------------
1 file changed, 318 deletions(-)
commit 544b56553b94a2425f52f4b6c29f0a9abe403161
@@ -1318,10 +1534,10 @@ Date: Sun Jan 28 11:46:28 2018 -0800
Update git.mk
- Makefile.am | 19 ++----
+ Makefile.am | 19 ++---
configure.ac | 2 +-
git.mk | 228
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
3 files changed, 207 insertions(+), 42 deletions(-)
commit 5a99e2895bcf50c0ee3bb9445e45b8cbff6ebc4d
@@ -1401,9 +1617,9 @@ Date: Sat Jan 13 23:56:30 2018 +0200
m4_ax_prog_cc_for_build.m4 instead as suggested by Khaled.
configure.ac | 22 +-------
- gen.tab/Makefile.am | 20 ++++----
+ gen.tab/Makefile.am | 20 +++----
m4/m4_ax_prog_cc_for_build.m4 | 125
- ++++++++++++++++++++++++++++++++++++++++++++++
+ ++++++++++++++++++++++++++++++++++++++++++
3 files changed, 137 insertions(+), 30 deletions(-)
commit 4a732cf9d28228a0698e9c6fa76206874b6125dd
@@ -1456,10 +1672,10 @@ Date: Thu Nov 23 10:34:44 2017 -0800
Misc warning fixes
- fribidi-vs-unicode/test-character.c | 22 +++++++------
+ fribidi-vs-unicode/test-character.c | 22 ++++++------
fribidi-vs-unicode/test.c | 6 ++--
lib/fribidi-bidi.c | 72
- +++++++++++++++++++++--------------------
+ +++++++++++++++++++------------------
lib/fribidi-brackets.c | 3 +-
4 files changed, 53 insertions(+), 50 deletions(-)
@@ -1657,7 +1873,7 @@ Date: Mon Nov 13 17:14:20 2017 +0200
lib/fribidi-flags.h | 2 +-
lib/fribidi-joining-types.h | 4 +-
lib/fribidi-types.h | 96
- ++++++++++-----------------------------------
+ +++++++++--------------------------------
12 files changed, 48 insertions(+), 108 deletions(-)
commit c8e9c5d684f1ba15ca46e38493c995ad5be3646c
@@ -1939,13 +2155,13 @@ Date: Tue Nov 7 21:55:06 2017 +0200
test.c and test-character.c .
fribidi-vs-unicode/test-character.c | 35
- +++++++++++++++++++----------------
+ ++++++++++++++++++----------------
fribidi-vs-unicode/test.c | 38
- +++++++++++++++++++++-----------------
+ ++++++++++++++++++++-----------------
lib/fribidi-bidi.c | 2 +-
lib/fribidi-bidi.h | 6 +++---
- lib/fribidi-deprecated.c | 27 +++++++++++++++++++++++----
- lib/fribidi-deprecated.h | 21 ++++++++++++++++++---
+ lib/fribidi-deprecated.c | 27 ++++++++++++++++++++++----
+ lib/fribidi-deprecated.h | 21 +++++++++++++++++---
6 files changed, 85 insertions(+), 44 deletions(-)
commit a0ab164431e18fa7cdf5b0a8ce4fcbe26f7b022b
@@ -1955,10 +2171,9 @@ Date: Mon Nov 6 17:35:28 2017 -0800
Update README.md
HACKING | 2 -
- README | 158
- +-----------------------------------------------------------
+ README | 158 +-------------------------------------------------------
README.md | 174
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 175 insertions(+), 159 deletions(-)
commit 75c350705ef09e6505aa1080188b75a8b4fccc5e
@@ -1970,7 +2185,7 @@ Date: Mon Nov 6 17:23:10 2017 -0500
Oops.
build/fribidi-vs-unicode/Makefile | 698
- ------------------------------------------
+ --------------------------------------
1 file changed, 698 deletions(-)
commit 7be4e8f87c77d0ff4bdbd1638768e8772d89f7b2
@@ -2037,7 +2252,7 @@ Date: Tue Aug 1 20:18:38 2017 +0300
THANKS | 12 +-
bin/fribidi-benchmark.c | 2 +-
bin/fribidi-main.c | 2 +-
- charset/fribidi-char-sets-cap-rtl.c | 38 ++-
+ charset/fribidi-char-sets-cap-rtl.c | 38 +-
charset/fribidi-char-sets-cap-rtl.h | 2 +-
charset/fribidi-char-sets-cp1255.c | 2 +-
charset/fribidi-char-sets-cp1255.h | 2 +-
@@ -2055,13 +2270,13 @@ Date: Tue Aug 1 20:18:38 2017 +0300
configure.ac | 11 +-
doc/Makefile.am | 3 +-
fribidi-vs-unicode/Makefile.am | 27 ++
- fribidi-vs-unicode/test-character.c | 409 +++++++++++++++++++++++
- fribidi-vs-unicode/test.c | 391 ++++++++++++++++++++++
+ fribidi-vs-unicode/test-character.c | 409 ++++++++++++++++++++
+ fribidi-vs-unicode/test.c | 391 +++++++++++++++++++
gen.tab/Makefile.am | 32 +-
gen.tab/gen-arabic-shaping-tab.c | 2 +-
gen.tab/gen-bidi-type-tab.c | 2 +-
- gen.tab/gen-brackets-tab.c | 345 +++++++++++++++++++
- gen.tab/gen-brackets-type-tab.c | 238 +++++++++++++
+ gen.tab/gen-brackets-tab.c | 345 +++++++++++++++++
+ gen.tab/gen-brackets-type-tab.c | 238 ++++++++++++
gen.tab/gen-joining-type-tab.c | 2 +-
gen.tab/gen-mirroring-tab.c | 2 +-
gen.tab/gen-unicode-version.c | 2 +-
@@ -2076,7 +2291,7 @@ Date: Tue Aug 1 20:18:38 2017 +0300
lib/fribidi-bidi-types.c | 2 +-
lib/fribidi-bidi-types.h | 31 +-
lib/fribidi-bidi.c | 681
- ++++++++++++++++++++++++++++++++++----
+ +++++++++++++++++++++++++++++++---
lib/fribidi-bidi.h | 4 +-
lib/fribidi-brackets.c | 106 ++++++
lib/fribidi-brackets.h | 90 +++++
@@ -2092,7 +2307,7 @@ Date: Tue Aug 1 20:18:38 2017 +0300
lib/fribidi-mem.c | 2 +-
lib/fribidi-mirroring.c | 4 +-
lib/fribidi-mirroring.h | 4 +-
- lib/fribidi-run.c | 77 ++---
+ lib/fribidi-run.c | 77 +---
lib/fribidi-shape.c | 2 +-
lib/fribidi-shape.h | 2 +-
lib/fribidi-types.h | 14 +-
@@ -2112,9 +2327,9 @@ Date: Tue Aug 1 20:10:28 2017 +0300
Updated Unicode data tables to version 10.
- fribidi-vs-unicode/BidiCharacterTest.txt | 96437 +++++++
+ fribidi-vs-unicode/BidiCharacterTest.txt | 96437 ++++++
fribidi-vs-unicode/BidiTest.txt | 497588
- ++++++++++++++++++++++++++++++++
+ ++++++++++++++++++++++++++++
gen.tab/unidata/ArabicShaping.txt | 442 +-
gen.tab/unidata/BidiBrackets.txt | 185 +
gen.tab/unidata/BidiMirroring.txt | 38 +-
@@ -2150,7 +2365,7 @@ Date: Tue Aug 4 15:56:21 2015 +0200
even build, better to clean up the unnecessary #if #else maze.
bin/fribidi-main.c | 61
- +---------------------------------------------------------
+ +-----------------------------------------------------
1 file changed, 1 insertion(+), 60 deletions(-)
commit e71e49f9645d21ab511723caf8c75e8d9880aacf
@@ -2190,7 +2405,7 @@ Date: Wed Dec 21 17:24:36 2016 -0600
Makefile.am | 2 +-
build/fribidi-vs-unicode/Makefile | 698
- ++++++++++++++++++++++++++++++++++++++++++
+ ++++++++++++++++++++++++++++++++++++++
configure.ac | 3 +-
3 files changed, 701 insertions(+), 2 deletions(-)
@@ -2212,10 +2427,10 @@ Date: Wed Dec 21 16:11:11 2016 -0600
I need to redo this without exposing full FriBidiRun struct.
lib/fribidi-bidi.c | 112
- -------------------------------------------------------
- lib/fribidi-bidi.h | 29 --------------
+ ---------------------------------------------------
+ lib/fribidi-bidi.h | 29 -------------
lib/fribidi-common.h | 14 ++-----
- lib/run.h | 11 ++++++
+ lib/run.h | 11 +++++
4 files changed, 15 insertions(+), 151 deletions(-)
commit 3cbee0b737393c631debeddd71fa631282f74a5c
@@ -2228,7 +2443,7 @@ Date: Sat Jan 30 22:50:13 2016 +0200
fribidi-vs-unicode/test-character.c | 4 +-
fribidi-vs-unicode/test.c | 2 +-
notes.org | 149
- ++++++++++++++++++++++++++++++++++++++--
+ ++++++++++++++++++++++++++++++++++--
4 files changed, 147 insertions(+), 9 deletions(-)
commit 32a6cc7141052764065d7714240e782366a8e61b
@@ -2237,9 +2452,9 @@ Date: Mon Jan 25 21:48:24 2016 +0200
Dov's work area for unicode63 development.
- fribidi-vs-unicode/BidiCharacterTest.txt | 96392 +++++++
+ fribidi-vs-unicode/BidiCharacterTest.txt | 96392 ++++++
fribidi-vs-unicode/BidiTest.txt | 497588
- ++++++++++++++++++++++++++++++++
+ ++++++++++++++++++++++++++++
fribidi-vs-unicode/SConstruct | 15 +
fribidi-vs-unicode/test-character.c | 379 +
fribidi-vs-unicode/test.c | 384 +
@@ -2283,23 +2498,23 @@ Date: Mon Jan 25 21:31:13 2016 +0200
charset/fribidi-char-sets.c | 2 +-
doc/Makefile.am | 3 +-
gen.tab/gen-joining-type-tab.c | 4 +
- gen.tab/unidata/ArabicShaping.txt | 227 ++++++++++++++++++++++++++++--
+ gen.tab/unidata/ArabicShaping.txt | 227 +++++++++++++++++++++++++--
gen.tab/unidata/BidiMirroring.txt | 14 +-
gen.tab/unidata/ReadMe.txt | 8 +-
- gen.tab/unidata/UnicodeData.txt | 21 +--
+ gen.tab/unidata/UnicodeData.txt | 21 ++-
lib/common.h | 2 +-
lib/debug.h | 4 +
lib/fribidi-bidi-types-list.h | 4 +
lib/fribidi-bidi-types.h | 29 +++-
lib/fribidi-bidi.c | 301
- ++++++++++++++++++++++++++++++++++------
+ ++++++++++++++++++++++++++++++------
lib/fribidi-common.h | 1 +
lib/fribidi-deprecated.c | 1 +
lib/fribidi-run.c | 6 +-
lib/fribidi-unicode.h | 10 +-
test/Makefile.am | 4 +-
- test/test_CapRTL_isolate.input | 8 ++
- test/test_CapRTL_isolate.reference | 8 ++
+ test/test_CapRTL_isolate.input | 8 +
+ test/test_CapRTL_isolate.reference | 8 +
22 files changed, 613 insertions(+), 96 deletions(-)
commit 881b8d891cc61989ab8811b74d0e721f72bf913b
@@ -2336,10 +2551,10 @@ Date: Thu Dec 24 11:27:47 2015 +0400
lib/fribidi-bidi.c | 1 -
lib/fribidi-joining.c | 1 -
lib/fribidi-mem.c | 140
- ------------------------------------------------------
- lib/fribidi-run.c | 38 ---------------
+ --------------------------------------------------
+ lib/fribidi-run.c | 38 --------------
lib/fribidi.c | 3 --
- lib/mem.h | 97 -------------------------------------
+ lib/mem.h | 97 ----------------------------------
8 files changed, 285 deletions(-)
commit 9d8c69b4aea7302391b1cafb3c1fa5c3d8c95198
@@ -2364,10 +2579,10 @@ Date: Thu Nov 26 14:52:13 2015 +0400
it can be used e.g. with HarfBuzz.
lib/fribidi-bidi.c | 112
- +++++++++++++++++++++++++++++++++++++++++++++++++++++++
- lib/fribidi-bidi.h | 29 ++++++++++++++
+ +++++++++++++++++++++++++++++++++++++++++++++++++++
+ lib/fribidi-bidi.h | 29 +++++++++++++
lib/fribidi-common.h | 14 +++++--
- lib/run.h | 11 ------
+ lib/run.h | 11 -----
4 files changed, 151 insertions(+), 15 deletions(-)
commit 7fd7d2badedffce5a3328301ba86204a24eed0a3
@@ -2741,7 +2956,7 @@ Date: Sat Aug 25 17:41:02 2012 -0400
doc/Makefile.am | 2 +
gen.tab/Makefile.am | 2 +
git.mk | 224
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++
lib/Makefile.am | 2 +
test/Makefile.am | 2 +
8 files changed, 238 insertions(+)
@@ -2761,11 +2976,11 @@ Date: Sat Aug 25 17:36:07 2012 -0400
Update Unicode data files to 6.1.0
- gen.tab/unidata/ArabicShaping.txt | 287 ++++++++-------
+ gen.tab/unidata/ArabicShaping.txt | 287 ++++++++------
gen.tab/unidata/BidiMirroring.txt | 28 +-
gen.tab/unidata/ReadMe.txt | 6 +-
gen.tab/unidata/UnicodeData.txt | 799
- ++++++++++++++++++++++++++++++++++++++++--
+ ++++++++++++++++++++++++++++++++++++--
4 files changed, 956 insertions(+), 164 deletions(-)
commit d39b179d8de65a19390e50cfb39bb36ae193d65b
@@ -2797,7 +3012,7 @@ Date: Fri Jan 21 22:49:59 2011 +0000
gen.tab/unidata/BidiMirroring.txt | 27 +-
gen.tab/unidata/ReadMe.txt | 12 +-
gen.tab/unidata/UnicodeData.txt | 5261
- +++++++++++++++++++++++++++++++++++++----
+ +++++++++++++++++++++++++++++++++----
5 files changed, 4882 insertions(+), 498 deletions(-)
commit 6c535469bfbff7983f5052fa3cf6f8eb8dc2f26a
@@ -2898,7 +3113,7 @@ Date: Tue Apr 8 21:38:22 2008 +0000
gen.tab/unidata/BidiMirroring.txt | 42 +-
gen.tab/unidata/ReadMe.txt | 10 +-
gen.tab/unidata/UnicodeData.txt | 1694
- ++++++++++++++++++++++++++++++++++++++++-
+ ++++++++++++++++++++++++++++++++++++-
lib/Makefile.am | 2 +-
lib/common.h | 10 +-
6 files changed, 1721 insertions(+), 71 deletions(-)
@@ -2931,7 +3146,7 @@ Date: Tue Jan 15 19:59:34 2008 +0000
configure.ac | 9 ++--
fribidi.spec.in | 145
- ------------------------------------------------------------
+ --------------------------------------------------------
2 files changed, 4 insertions(+), 150 deletions(-)
commit 753ed9aed90f9d31e6ff404c0c7befadbfd18d23
@@ -2991,7 +3206,7 @@ Date: Fri Jul 21 22:29:10 2006 +0000
gen.tab/unidata/BidiMirroring.txt | 42 +-
gen.tab/unidata/ReadMe.txt | 31 +-
gen.tab/unidata/UnicodeData.txt | 1493
- +++++++++++++++++++++++++++++++++++++++--
+ +++++++++++++++++++++++++++++++++++--
4 files changed, 1520 insertions(+), 91 deletions(-)
commit 105e8f3c8f67fcd5a1620f9a9059b550067c1ac0
@@ -3036,39 +3251,38 @@ Date: Tue Jan 31 03:23:12 2006 +0000
Add an option --disable-deprecated.
- bin/fribidi-benchmark.c | 16 ++++++++--------
+ bin/fribidi-benchmark.c | 16 +++++++-------
bin/fribidi-main.c | 45
- +++++++++++++++++++++++++-------------------
- charset/fribidi-char-sets.c | 16 ++++++++--------
- configure.ac | 23 ++++++++++++++++------
- gen.tab/gen-arabic-shaping-tab.c | 12 ++++++------
- gen.tab/gen-bidi-type-tab.c | 12 ++++++------
- gen.tab/gen-joining-type-tab.c | 12 ++++++------
- gen.tab/gen-mirroring-tab.c | 12 ++++++------
- gen.tab/gen-unicode-version.c | 12 ++++++------
- gen.tab/packtab.c | 8 ++++----
- lib/bidi-types.h | 8 ++++----
- lib/common.h | 21 ++++++++++-----------
- lib/debug.h | 8 ++++----
- lib/fribidi-arabic.c | 8 ++++----
- lib/fribidi-bidi-types.c | 8 ++++----
- lib/fribidi-bidi-types.h | 17 +++--------------
- lib/fribidi-bidi.c | 8 ++++----
- lib/fribidi-common.h | 18 +++++++++---------
- lib/fribidi-deprecated.c | 11 +++++++----
- lib/fribidi-deprecated.h | 30 ++++++++++++++++++++++++++---
- lib/fribidi-joining-types.c | 8 ++++----
- lib/fribidi-joining.c | 8 ++++----
- lib/fribidi-mem.c | 12 +++++++-----
- lib/fribidi-run.c | 30 ++++++++++++++---------------
- lib/fribidi-types.h | 39
- +++++++++++++++++++-------------------
- lib/fribidi-unicode.h | 33 +++++++-------------------------
- lib/fribidi.c | 21 +++++++++++----------
- lib/fribidi.h | 13 ++++++++-----
- lib/joining-types.h | 8 ++++----
- lib/mem.h | 34 ++++++++++++++++-----------------
- lib/run.h | 8 ++++----
+ +++++++++++++++++++++++-----------------
+ charset/fribidi-char-sets.c | 16 +++++++-------
+ configure.ac | 23 ++++++++++++++------
+ gen.tab/gen-arabic-shaping-tab.c | 12 +++++------
+ gen.tab/gen-bidi-type-tab.c | 12 +++++------
+ gen.tab/gen-joining-type-tab.c | 12 +++++------
+ gen.tab/gen-mirroring-tab.c | 12 +++++------
+ gen.tab/gen-unicode-version.c | 12 +++++------
+ gen.tab/packtab.c | 8 +++----
+ lib/bidi-types.h | 8 +++----
+ lib/common.h | 21 +++++++++----------
+ lib/debug.h | 8 +++----
+ lib/fribidi-arabic.c | 8 +++----
+ lib/fribidi-bidi-types.c | 8 +++----
+ lib/fribidi-bidi-types.h | 17 +++------------
+ lib/fribidi-bidi.c | 8 +++----
+ lib/fribidi-common.h | 18 ++++++++--------
+ lib/fribidi-deprecated.c | 11 ++++++----
+ lib/fribidi-deprecated.h | 30 ++++++++++++++++++++++++---
+ lib/fribidi-joining-types.c | 8 +++----
+ lib/fribidi-joining.c | 8 +++----
+ lib/fribidi-mem.c | 12 ++++++-----
+ lib/fribidi-run.c | 30 +++++++++++++--------------
+ lib/fribidi-types.h | 39 +++++++++++++++++-----------------
+ lib/fribidi-unicode.h | 33 +++++++----------------------
+ lib/fribidi.c | 21 ++++++++++---------
+ lib/fribidi.h | 13 +++++++-----
+ lib/joining-types.h | 8 +++----
+ lib/mem.h | 34 +++++++++++++++---------------
+ lib/run.h | 8 +++----
31 files changed, 269 insertions(+), 250 deletions(-)
commit 570efad0b961ad106a05f2dbabeedbed477ea161
@@ -3172,9 +3386,9 @@ Date: Thu Nov 3 01:39:01 2005 +0000
configure.ac | 20 +--
doc/Makefile.am | 2 +-
gen.tab/Makefile.am | 16 +-
- gen.tab/gen-arabic-liga.sh | 9 ++
+ gen.tab/gen-arabic-liga.sh | 9 +
gen.tab/gen-arabic-shaping-tab.c | 310
- +++++++++++++++++++++++++++++++++++++++
+ +++++++++++++++++++++++++++++++++++
gen.tab/gen-bidi-type-tab.c | 12 +-
gen.tab/gen-joining-type-tab.c | 10 +-
gen.tab/gen-mirroring-tab.c | 12 +-
@@ -3182,32 +3396,32 @@ Date: Thu Nov 3 01:39:01 2005 +0000
gen.tab/packtab.c | 1 +
lib/Headers.mk | 5 +-
lib/Makefile.am | 8 +-
- lib/arabic-misc.tab.i | 94 ++++++++++++
+ lib/arabic-misc.tab.i | 94 +++++++++++
lib/debug.h | 7 +-
- lib/fribidi-arabic.c | 190 ++++++++++++++++++++++++
- lib/fribidi-arabic.h | 88 +++++++++++
- lib/fribidi-bidi.c | 62 ++------
+ lib/fribidi-arabic.c | 190 +++++++++++++++++++++
+ lib/fribidi-arabic.h | 88 ++++++++++
+ lib/fribidi-bidi.c | 62 ++-----
lib/fribidi-bidi.h | 31 ++--
lib/fribidi-common.h | 29 +++-
lib/fribidi-config.h.in | 3 -
lib/fribidi-deprecated.c | 296
- +++++++++++++++++++++++++++++++++++++
- lib/fribidi-deprecated.h | 210 ++++++++++++++++++++++++++
- lib/fribidi-env.c | 121 ---------------
- lib/fribidi-env.h | 126 ----------------
- lib/fribidi-flags.h | 78 ++++++++++
+ +++++++++++++++++++++++++++++++++
+ lib/fribidi-deprecated.h | 210 ++++++++++++++++++++++++
+ lib/fribidi-env.c | 121 --------------
+ lib/fribidi-env.h | 126 --------------
+ lib/fribidi-flags.h | 78 +++++++++
lib/fribidi-joining-types.c | 10 +-
lib/fribidi-joining-types.h | 9 +-
lib/fribidi-joining.c | 40 +++--
lib/fribidi-mem.c | 8 +-
lib/fribidi-mirroring.c | 10 +-
lib/fribidi-run.c | 13 +-
- lib/{env.h => fribidi-shape.c} | 53 ++++---
- lib/fribidi-shape.h | 77 ++++++++++
+ lib/{env.h => fribidi-shape.c} | 53 +++---
+ lib/fribidi-shape.h | 77 +++++++++
lib/fribidi-types.h | 24 +--
lib/fribidi-unicode.h | 12 +-
- lib/fribidi.c | 213 ++++-----------------------
- lib/fribidi.h | 116 ++-------------
+ lib/fribidi.c | 213 +++---------------------
+ lib/fribidi.h | 116 ++-----------
lib/joining-types.h | 8 +-
test/test_UTF-8_persian.reference | 28 ++--
test/test_UTF-8_reordernsm.reference | 14 +-
@@ -3312,19 +3526,19 @@ Date: Sat Jul 30 09:06:27 2005 +0000
.cvsignore | 1 +
Makefile.am | 7 ++--
- USERS | 4 ++-
- bin/fribidi-benchmark.c | 17 +++++----
- bin/fribidi-bidi-types.c | 7 ++--
- bin/fribidi-caprtl2utf8.c | 17 +++++----
- bin/fribidi-main.c | 30 ++++++++--------
+ USERS | 4 +-
+ bin/fribidi-benchmark.c | 17 ++++----
+ bin/fribidi-bidi-types.c | 7 +++-
+ bin/fribidi-caprtl2utf8.c | 17 ++++----
+ bin/fribidi-main.c | 30 +++++++-------
charset/fribidi-char-sets-cap-rtl.c | 78
- ++++++++++++++++++++++++-----------------
- charset/fribidi-char-sets-utf8.c | 12 +++----
- configure.ac | 20 +++++------
- gen.tab/gen-unicode-version.c | 33 ++++++++---------
- lib/fribidi-bidi.c | 10 +++---
- lib/fribidi-types.h | 10 +++---
- lib/fribidi.c | 8 ++---
+ +++++++++++++++++++++----------------
+ charset/fribidi-char-sets-utf8.c | 12 +++---
+ configure.ac | 20 +++++-----
+ gen.tab/gen-unicode-version.c | 33 ++++++++--------
+ lib/fribidi-bidi.c | 10 ++---
+ lib/fribidi-types.h | 10 ++---
+ lib/fribidi.c | 8 ++--
14 files changed, 138 insertions(+), 116 deletions(-)
commit 6f84aff9f7901178ef9e7e2e463a04e639b5a606
@@ -3358,9 +3572,9 @@ Date: Tue Jun 7 08:43:17 2005 +0000
Updated to read version from BidiMirroring.txt, if not found in
ReadMe.txt.
- gen.tab/Makefile.am | 5 ++--
+ gen.tab/Makefile.am | 5 +--
gen.tab/gen-unicode-version.c | 75
- +++++++++++++++++++++++++++++++----------------
+ ++++++++++++++++++++++++++++---------------
gen.tab/unidata/ReadMe.txt | 3 --
3 files changed, 53 insertions(+), 30 deletions(-)
@@ -3391,9 +3605,9 @@ Date: Tue Jun 7 08:39:14 2005 +0000
An integrated CapRTL to UTF-8 converter added.
bin/Makefile.am | 2 +-
- bin/fribidi-caprtl2utf8.c | 32 ++++++++++++++++
+ bin/fribidi-caprtl2utf8.c | 32 +++++++++++++++
test/caprtl2unicode.py | 102
- --------------------------------------------------
+ ----------------------------------------------
3 files changed, 33 insertions(+), 103 deletions(-)
commit 10a1d7d29e5fc41f27e6296382c6de9a82aa5a99
@@ -3412,11 +3626,11 @@ Date: Tue Jun 7 07:31:13 2005 +0000
Unicode 4.1 character database update.
- gen.tab/unidata/ArabicShaping.txt | 105 +++-
+ gen.tab/unidata/ArabicShaping.txt | 105 ++-
gen.tab/unidata/BidiMirroring.txt | 39 +-
gen.tab/unidata/ReadMe.txt | 47 +-
gen.tab/unidata/UnicodeData.txt | 1383
- +++++++++++++++++++++++++++++++++++++++--
+ +++++++++++++++++++++++++++++++++++--
4 files changed, 1448 insertions(+), 126 deletions(-)
commit 004756f080f6bf20b27b61b419317a05a529227a
@@ -3426,7 +3640,7 @@ Date: Mon Jan 10 06:43:53 2005 +0000
Better conversion table from CapRTL to Unicode.
charset/fribidi-char-sets-cap-rtl.c | 40
- ++++++++++++++++++++++++++++++----------
+ +++++++++++++++++++++++++++----------
1 file changed, 30 insertions(+), 10 deletions(-)
commit 294e001ae47168d63a2e7e7eaf7ede2a7a3dc1ae
@@ -3463,7 +3677,7 @@ Date: Wed Jan 5 16:45:56 2005 +0000
Adding CapRTL to Unicode (UTF-8) convertor.
test/caprtl2unicode.py | 104
- +++++++++++++++++++++++++++++++++++++++++++++++++++++
+ +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 104 insertions(+)
commit 5db31e96f3c6b904325939e648a363cbcac56b14
@@ -3583,11 +3797,11 @@ Date: Mon Jun 21 21:15:31 2004 +0000
which is a proposed changed to be applied for Unicode 4.1.
.indent.pro | 2 +-
- lib/fribidi-bidi.h | 17 ++++---
- lib/fribidi-joining-types.h | 18 ++++---
+ lib/fribidi-bidi.h | 17 +++---
+ lib/fribidi-joining-types.h | 18 ++++--
lib/fribidi-joining.c | 133
- ++++++++++++++++++++++++++++--------------------
- lib/fribidi-joining.h | 15 +++---
+ ++++++++++++++++++++++++++------------------
+ lib/fribidi-joining.h | 15 +++--
lib/fribidi-unicode.h | 14 ++---
lib/fribidi.c | 10 ++--
lib/fribidi.h | 8 +--
@@ -3603,17 +3817,17 @@ Date: Mon Jun 21 18:49:23 2004 +0000
need str
anymore: they just need this bidi_types.
- lib/bidi-types.h | 8 +++-----
- lib/common.h | 11 ++++++++---
- lib/fribidi-bidi-types.h | 14 ++++++++-----
+ lib/bidi-types.h | 8 +++----
+ lib/common.h | 11 +++++++---
+ lib/fribidi-bidi-types.h | 14 +++++++-----
lib/fribidi-bidi.c | 55
- +++++++++++++++++++++++-----------------------------
- lib/fribidi-bidi.h | 43 +++++++---------------------------------
- lib/fribidi-joining.c | 17 ++++++++++++----
- lib/fribidi-run.c | 15 +++++++-------
- lib/fribidi-unicode.h | 18 ++++++++++++-----
- lib/fribidi.c | 20 ++++++++++++++-----
- lib/run.h | 11 +++++------
+ +++++++++++++++++++++---------------------------
+ lib/fribidi-bidi.h | 43 ++++++-------------------------------
+ lib/fribidi-joining.c | 17 +++++++++++----
+ lib/fribidi-run.c | 15 ++++++-------
+ lib/fribidi-unicode.h | 18 +++++++++++-----
+ lib/fribidi.c | 20 +++++++++++++-----
+ lib/run.h | 11 +++++-----
10 files changed, 104 insertions(+), 108 deletions(-)
commit b1a9af57fe88c46b5f9f7fd47db37895b3e58e78
@@ -3651,12 +3865,12 @@ Date: Fri Jun 18 19:21:33 2004 +0000
breaking. Also calculate more reasonable levels for explicit marks
and BN.
- lib/fribidi-bidi-types.h | 13 +++++++-----
+ lib/fribidi-bidi-types.h | 13 ++++++-----
lib/fribidi-bidi.c | 56
- ++++++++++++++++++++++++++++++++++++++++------------
- lib/fribidi-bidi.h | 30 +++++++++++++++++-----------
- lib/fribidi-types.h | 10 +++++-----
- lib/fribidi.c | 10 ++++------
+ +++++++++++++++++++++++++++++++++++++-----------
+ lib/fribidi-bidi.h | 30 ++++++++++++++++----------
+ lib/fribidi-types.h | 10 ++++-----
+ lib/fribidi.c | 10 ++++-----
5 files changed, 79 insertions(+), 40 deletions(-)
commit 7ca6352ed7890ea20a23e6957c7cd4928c0fe7d1
@@ -3683,29 +3897,29 @@ Date: Tue Jun 15 11:52:02 2004 +0000
charset/fribidi-char-sets-cap-rtl.c | 8 +-
configure.ac | 10 +--
gen.tab/Makefile.am | 16 +++-
- gen.tab/gen-bidi-type-tab.c | 9 ++-
- gen.tab/gen-joining-type-tab.c | 9 ++-
- gen.tab/gen-mirroring-tab.c | 9 ++-
- gen.tab/gen-unicode-version.c | 9 ++-
+ gen.tab/gen-bidi-type-tab.c | 9 +-
+ gen.tab/gen-joining-type-tab.c | 9 +-
+ gen.tab/gen-mirroring-tab.c | 9 +-
+ gen.tab/gen-unicode-version.c | 9 +-
lib/Makefile.am | 4 +-
lib/common.h | 10 ++-
lib/fribidi-bidi-types.c | 12 +--
- lib/fribidi-bidi-types.h | 68 ++++++++++++-----
- lib/fribidi-bidi.c | 119 ++++++++++++++++-------------
- lib/fribidi-bidi.h | 94 ++++++++++++++++-------
+ lib/fribidi-bidi-types.h | 68 +++++++++++----
+ lib/fribidi-bidi.c | 119 +++++++++++++++-----------
+ lib/fribidi-bidi.h | 94 +++++++++++++++------
lib/fribidi-joining-types-list.h | 10 +--
- lib/fribidi-joining-types.c | 30 ++++----
- lib/fribidi-joining-types.h | 124 +++++++++++++++++++++++++------
+ lib/fribidi-joining-types.c | 30 ++++---
+ lib/fribidi-joining-types.h | 124 ++++++++++++++++++++++-----
lib/fribidi-joining.c | 161
- ++++++++++++++++++++++++++++++++++++++++
- lib/fribidi-joining.h | 36 ++++++++-
+ ++++++++++++++++++++++++++++++++++++
+ lib/fribidi-joining.h | 36 +++++++-
lib/fribidi-mirroring.c | 14 ++--
- lib/fribidi-mirroring.h | 27 ++++---
+ lib/fribidi-mirroring.h | 27 +++---
lib/fribidi-types.h | 24 +++++-
- lib/fribidi.c | 97 ++++++++++++++----------
+ lib/fribidi.c | 97 +++++++++++++---------
lib/fribidi.def | 6 +-
- lib/fribidi.h | 93 +++++++++++++----------
- lib/joining-types.h | 9 ++-
+ lib/fribidi.h | 93 ++++++++++++---------
+ lib/joining-types.h | 9 +-
27 files changed, 734 insertions(+), 286 deletions(-)
commit 8a20d52ddb30e073762ec17afda2e1b9257be568
@@ -3735,32 +3949,30 @@ Date: Mon Jun 14 18:43:48 2004 +0000
fribidi-bidi-type.[ch] merged into fribidi-bidi-types.[ch].
fribidi-joining-type.[ch] merged into fribidi-joining-types.[ch].
- charset/fribidi-char-sets-cap-rtl.c | 8 ++---
- configure.ac | 22 +++++++++---
- doc/Makefile.am | 14 ++++----
+ charset/fribidi-char-sets-cap-rtl.c | 8 ++--
+ configure.ac | 22 +++++++---
+ doc/Makefile.am | 14 +++----
lib/Headers.mk | 3 +-
- lib/Makefile.am | 2 --
+ lib/Makefile.am | 2 -
lib/fribidi-bidi-type.c | 80
- -----------------------------------------
- lib/fribidi-bidi-type.h | 72
-------------------------------------
- lib/fribidi-bidi-types.c | 69
- ++++++++++++++++++++++++++++-------
- lib/fribidi-bidi-types.h | 34 +++++++++++++++---
- lib/fribidi-bidi.c | 48 ++++++-------------------
- lib/fribidi-bidi.h | 27 ++++----------
+ lib/fribidi-bidi-type.h | 72
+ ---------------------------------
+ lib/fribidi-bidi-types.c | 69 ++++++++++++++++++++++++++------
+ lib/fribidi-bidi-types.h | 34 +++++++++++++---
+ lib/fribidi-bidi.c | 48 +++++-----------------
+ lib/fribidi-bidi.h | 27 +++----------
lib/fribidi-config.h.in | 3 ++
- lib/fribidi-joining-type.c | 56 -----------------------------
- lib/fribidi-joining-type.h | 59 ------------------------------
- lib/fribidi-joining-types.c | 66
- +++++++++++++++++++++++++++-------
- lib/fribidi-joining-types.h | 36 ++++++++++++++++---
- lib/fribidi-mirroring.c | 34 ++++++++++++++++--
- lib/fribidi-mirroring.h | 22 ++++++++++--
- lib/fribidi-run.c | 8 ++---
- lib/fribidi.c | 11 +++---
- lib/fribidi.def | 18 ++++++----
- lib/fribidi.h | 14 +++++---
+ lib/fribidi-joining-type.c | 56 --------------------------
+ lib/fribidi-joining-type.h | 59 ---------------------------
+ lib/fribidi-joining-types.c | 66 ++++++++++++++++++++++++------
+ lib/fribidi-joining-types.h | 36 ++++++++++++++---
+ lib/fribidi-mirroring.c | 34 ++++++++++++++--
+ lib/fribidi-mirroring.h | 22 ++++++++--
+ lib/fribidi-run.c | 8 ++--
+ lib/fribidi.c | 11 ++---
+ lib/fribidi.def | 18 +++++----
+ lib/fribidi.h | 14 ++++---
22 files changed, 296 insertions(+), 410 deletions(-)
commit 5e32eff3de2d41d4a1674e28991eb82c1d00dd79
@@ -3771,12 +3983,12 @@ Date: Mon Jun 14 17:00:33 2004 +0000
get_par_embedding_levels and reorder_line functions.
lib/bidi-types.h | 8 +++++---
- lib/fribidi-bidi-type.c | 24 +++++++++++++++++++++---
- lib/fribidi-bidi-type.h | 19 ++++++++++++++++---
+ lib/fribidi-bidi-type.c | 24 +++++++++++++++++++---
+ lib/fribidi-bidi-type.h | 19 +++++++++++++++---
lib/fribidi-bidi.c | 53
- ++++++++++++++++++++++++++++++-----------------------
- lib/fribidi-bidi.h | 33 ++++++++++++++++++++++++++-------
- lib/fribidi-run.c | 13 +++++++------
+ ++++++++++++++++++++++++++++---------------------
+ lib/fribidi-bidi.h | 33 +++++++++++++++++++++++-------
+ lib/fribidi-run.c | 13 ++++++------
lib/fribidi.c | 10 +++++-----
lib/run.h | 9 +++++----
8 files changed, 115 insertions(+), 54 deletions(-)
@@ -3792,37 +4004,37 @@ Date: Sun Jun 13 20:11:41 2004 +0000
accompanying functions and macros.
.indent.pro | 3 +-
- TODO | 20 ++-
+ TODO | 20 +-
charset/Makefile.am | 10 +-
charset/fribidi-char-sets-cap-rtl.c | 8 +-
doc/Makefile.am | 10 +-
- gen.tab/Makefile.am | 92 ++++-------
- gen.tab/gen-bidi-type-tab.c | 65 ++++----
+ gen.tab/Makefile.am | 92 ++++------
+ gen.tab/gen-bidi-type-tab.c | 65 ++++---
gen.tab/gen-joining-type-tab.c | 355
- ++++++++++++++++++++++++++++++++++++++++
+ ++++++++++++++++++++++++++++++++++++
gen.tab/gen-mirroring-tab.c | 52 +++---
gen.tab/gen-unicode-version.c | 42 ++---
gen.tab/packtab.c | 16 +-
gen.tab/packtab.h | 2 +-
lib/Headers.mk | 7 +-
- lib/Makefile.am | 29 +++-
+ lib/Makefile.am | 29 ++-
lib/common.h | 12 +-
lib/debug.h | 11 +-
lib/env.h | 7 +-
lib/fribidi-bidi-type.c | 9 +-
lib/fribidi-bidi-types-list.h | 8 +-
lib/fribidi-bidi-types.c | 8 +-
- lib/fribidi-bidi-types.h | 140 ++++++++--------
- lib/fribidi-joining-type.c | 56 +++++++
- lib/fribidi-joining-type.h | 59 +++++++
- lib/fribidi-joining-types-list.h | 50 ++++++
- lib/fribidi-joining-types.c | 78 +++++++++
- lib/fribidi-joining-types.h | 143 ++++++++++++++++
+ lib/fribidi-bidi-types.h | 140 +++++++-------
+ lib/fribidi-joining-type.c | 56 ++++++
+ lib/fribidi-joining-type.h | 59 ++++++
+ lib/fribidi-joining-types-list.h | 50 +++++
+ lib/fribidi-joining-types.c | 78 ++++++++
+ lib/fribidi-joining-types.h | 143 +++++++++++++++
lib/fribidi-joining.c | 0
- lib/fribidi-joining.h | 50 ++++++
+ lib/fribidi-joining.h | 50 +++++
lib/fribidi-mirroring.c | 12 +-
lib/fribidi.def | 9 +-
- lib/joining-types.h | 58 +++++++
+ lib/joining-types.h | 58 ++++++
lib/run.h | 10 +-
32 files changed, 1147 insertions(+), 284 deletions(-)
@@ -3836,19 +4048,19 @@ Date: Wed Jun 9 20:01:00 2004 +0000
Moreover,
packtab deals with tables with empty heads much better. Voila!
- bin/fribidi-main.c | 13 +++--
+ bin/fribidi-main.c | 13 ++--
charset/fribidi-char-sets.c | 7 ++-
configure.ac | 9 ++-
gen.tab/Makefile.am | 4 +-
gen.tab/gen-bidi-type-tab.c | 15 +++--
- gen.tab/gen-mirroring-tab.c | 99 +++++++++++++++++++++-----------
+ gen.tab/gen-mirroring-tab.c | 99 +++++++++++++++++++----------
gen.tab/packtab.c | 147
- +++++++++++++++++++++++++++++++++++++-----------
- gen.tab/packtab.h | 13 +++--
+ ++++++++++++++++++++++++++++++++++----------
+ gen.tab/packtab.h | 13 ++--
lib/fribidi-bidi-type.c | 14 ++---
- lib/fribidi-bidi-types.h | 10 ++--
- lib/fribidi-mirroring.c | 48 +++-------------
- lib/fribidi-types.h | 79 ++++++++++++++------------
+ lib/fribidi-bidi-types.h | 10 +--
+ lib/fribidi-mirroring.c | 48 +++------------
+ lib/fribidi-types.h | 79 +++++++++++++-----------
lib/fribidi.h | 8 +--
13 files changed, 276 insertions(+), 190 deletions(-)
@@ -3861,35 +4073,35 @@ Date: Wed Jun 9 14:59:21 2004 +0000
AbiWord from CVS. The most important is the FRIBIDI_TYPE_PRIVATE in
fribidi-bidi-types.h
- bin/fribidi-main.c | 25 ++++++++++++----
+ bin/fribidi-main.c | 25 +++++++++++---
charset/Headers.mk | 8 +----
charset/fribidi-char-sets-cap-rtl.h | 8 +++--
charset/fribidi-char-sets-cp1255.h | 8 +++--
charset/fribidi-char-sets-cp1256.h | 8 +++--
charset/fribidi-char-sets-iso8859-6.h | 8 +++--
charset/fribidi-char-sets-iso8859-8.h | 8 +++--
- charset/fribidi-char-sets-list.h | 14 ++++-----
+ charset/fribidi-char-sets-list.h | 14 ++++----
charset/fribidi-char-sets-utf8.h | 8 +++--
- charset/fribidi-char-sets.c | 18 ++++++++----
+ charset/fribidi-char-sets.c | 18 ++++++----
charset/fribidi-char-sets.h | 13 ++------
- configure.ac | 18 ++++--------
+ configure.ac | 18 ++++------
doc/Makefile.am | 1 +
- lib/common.h | 28 +++++++++---------
- lib/debug.h | 10 +++----
+ lib/common.h | 28 ++++++++--------
+ lib/debug.h | 10 +++---
lib/fribidi-bidi-type.c | 62
- ++++-----------------------------------
- lib/fribidi-bidi-type.h | 39 ++----------------------
- lib/fribidi-bidi-types-list.h | 14 ++++-----
- lib/fribidi-bidi-types.h | 35 ++++++++++++----------
- lib/fribidi-bidi.h | 7 ++---
- lib/fribidi-common.h | 14 ++++-----
- lib/fribidi-mirroring.c | 12 ++++----
- lib/fribidi-mirroring.h | 12 ++++----
- lib/fribidi-types.h | 26 ++++++++--------
+ +++--------------------------------
+ lib/fribidi-bidi-type.h | 39 ++--------------------
+ lib/fribidi-bidi-types-list.h | 14 ++++----
+ lib/fribidi-bidi-types.h | 35 +++++++++++---------
+ lib/fribidi-bidi.h | 7 ++--
+ lib/fribidi-common.h | 14 +++-----
+ lib/fribidi-mirroring.c | 12 +++----
+ lib/fribidi-mirroring.h | 12 +++----
+ lib/fribidi-types.h | 26 +++++++--------
lib/fribidi.c | 8 ++---
lib/fribidi.def | 3 --
- lib/fribidi.h | 18 ++++++++----
- lib/mem.h | 10 +++----
+ lib/fribidi.h | 18 +++++++---
+ lib/mem.h | 10 +++---
28 files changed, 189 insertions(+), 254 deletions(-)
commit 7e382d2cc7f5c08bda7d0d7195b074d91811c5d7
@@ -3919,16 +4131,16 @@ Date: Mon Jun 7 20:38:21 2004 +0000
.indent.pro | 4 +-
TODO | 2 +
lib/fribidi-bidi-types-list.h | 11 +-
- lib/fribidi-bidi-types.h | 134 ++++++++++++------
+ lib/fribidi-bidi-types.h | 134 +++++++++++-----
lib/fribidi-bidi.c | 314
- +++++++++++++++++-------------------------
- lib/fribidi-bidi.h | 100 ++++++--------
+ +++++++++++++++-----------------------
+ lib/fribidi-bidi.h | 100 +++++-------
lib/fribidi-mirroring.c | 9 +-
lib/fribidi-mirroring.h | 9 +-
- lib/fribidi.c | 170 ++++++++++++++++++++++-
+ lib/fribidi.c | 170 ++++++++++++++++++++-
lib/fribidi.def | 2 +-
- lib/fribidi.h | 95 ++++++++++++-
- test/test_UTF-8_persian.reference | 16 +--
+ lib/fribidi.h | 95 +++++++++++-
+ test/test_UTF-8_persian.reference | 16 +-
13 files changed, 541 insertions(+), 327 deletions(-)
commit 8fee958d0e10db5516f3897e6dc832ef56b13fcd
@@ -3938,7 +4150,7 @@ Date: Fri Jun 4 16:43:51 2004 +0000
Isolating bidi reordering call, take 1.
lib/fribidi-bidi.c | 338
- ++++++++++++++++++++-------------------------------------
+ ++++++++++++++++++-----------------------------------
lib/fribidi-bidi.h | 14 +--
lib/fribidi-run.c | 39 ++++---
lib/run.h | 8 +-
@@ -3959,24 +4171,24 @@ Date: Fri Jun 4 09:41:11 2004 +0000
Cleaning up here and there. Last lingers before adding joining.
- Makefile.am | 49 ++++---
+ Makefile.am | 49 ++++--
TODO | 9 +-
bin/fribidi-main.c | 12 +-
- bootstrap | 130 ++++++++++++------
+ bootstrap | 130 +++++++++++-----
charset/fribidi-char-sets-cap-rtl.c | 12 +-
configure.ac | 9 +-
- doc/Makefile.am | 18 +--
+ doc/Makefile.am | 18 ++-
gen.tab/.cvsignore | 4 +-
gen.tab/Makefile.am | 1 +
gen.tab/gen-bidi-type-tab.c | 20 +--
lib/Headers.mk | 2 +-
lib/fribidi-bidi-type.c | 17 ++-
- lib/fribidi-bidi-type.h | 23 ++--
- lib/fribidi-bidi-types-list.h | 39 ++++--
+ lib/fribidi-bidi-type.h | 23 +--
+ lib/fribidi-bidi-types-list.h | 39 +++--
lib/fribidi-bidi-types.c | 10 +-
lib/fribidi-bidi-types.h | 17 ++-
lib/fribidi-bidi.c | 297
- ++++++++++++++++++++--------------------
+ ++++++++++++++++++------------------
lib/fribidi-bidi.h | 28 +++-
lib/fribidi-common.h | 8 +-
lib/fribidi-config.h.in | 3 +
@@ -3989,25 +4201,24 @@ Date: Mon May 31 18:43:26 2004 +0000
GNU Coding Standards applied and typos fixed.
- AUTHORS | 45
- ++++++++++++++++++++++--
- Makefile.am | 10 +++---
- README | 26 +++++++-------
- THANKS | 2 +-
- TODO | 41
- +++++++++++++++++++++
- bin/fribidi-main.c | 10 +++---
- charset/fribidi-char-sets-cap-rtl.c | 8 ++---
- configure.ac | 40
- +++++++++++----------
- doc/Makefile.am | 4 +--
- gen.tab/Makefile.am | 12 +++----
- gen.tab/gen-bidi-type-tab.c | 8 ++---
- gen.tab/gen-mirroring-tab.c | 8 ++---
- gen.tab/gen-unicode-version.c | 20 +++++++----
- lib/fribidi-bidi-type.c | 10 +++---
- lib/{bidi-types-list.h => fribidi-bidi-types-list.h} | 31
- +++++++++-------
+ AUTHORS | 45
+ +++++++++++++++++++++-
+ Makefile.am | 10 ++---
+ README | 26 +++++++------
+ THANKS | 2 +-
+ TODO | 41
+ ++++++++++++++++++++
+ bin/fribidi-main.c | 10 ++---
+ charset/fribidi-char-sets-cap-rtl.c | 8 ++--
+ configure.ac | 40
+ ++++++++++---------
+ doc/Makefile.am | 4 +-
+ gen.tab/Makefile.am | 12 +++---
+ gen.tab/gen-bidi-type-tab.c | 8 ++--
+ gen.tab/gen-mirroring-tab.c | 8 ++--
+ gen.tab/gen-unicode-version.c | 20 +++++++---
+ lib/fribidi-bidi-type.c | 10 ++---
+ ...bidi-types-list.h => fribidi-bidi-types-list.h} | 31 ++++++++-------
15 files changed, 187 insertions(+), 88 deletions(-)
commit 339717751b86715f78bd9d02159813c29c650a0a
@@ -4018,14 +4229,14 @@ Date: Mon May 31 18:39:39 2004 +0000
lib/Headers.mk | 1 +
lib/Makefile.am | 1 -
- lib/common.h | 10 ++++---
+ lib/common.h | 10 +++---
lib/debug.h | 8 ++---
- lib/fribidi-bidi-types.c | 10 +++----
+ lib/fribidi-bidi-types.c | 10 +++---
lib/fribidi-bidi.c | 84
- ++++++++++++++++++++++++++--------------------------
- lib/fribidi-common.h | 33 +++++++++++----------
+ ++++++++++++++++++++++++------------------------
+ lib/fribidi-common.h | 33 ++++++++++---------
lib/fribidi-config.h.in | 3 +-
- lib/fribidi.c | 20 ++++++-------
+ lib/fribidi.c | 20 ++++++------
lib/run.h | 8 ++---
10 files changed, 91 insertions(+), 87 deletions(-)
@@ -4048,13 +4259,13 @@ Date: Mon May 31 10:43:44 2004 +0000
files
anymore. :-(
- gen.tab/unidata/ArabicShaping.txt | 240 +
- gen.tab/unidata/README | 1 +
- gen.tab/unidata/UnicodeData.txt | 15100
- ++++++++++++++++++++
- gen.tab/unidata/extracted/DerivedBidiClass.txt | 1299 --
- .../unidata/extracted/DerivedDecompositionType.txt | 933 --
- gen.tab/unidata/extracted/DerivedJoiningType.txt | 215 -
+ gen.tab/unidata/ArabicShaping.txt | 240 +
+ gen.tab/unidata/README | 1 +
+ gen.tab/unidata/UnicodeData.txt | 15100
+ +++++++++++++++++++
+ gen.tab/unidata/extracted/DerivedBidiClass.txt | 1299 --
+ .../unidata/extracted/DerivedDecompositionType.txt | 933 --
+ gen.tab/unidata/extracted/DerivedJoiningType.txt | 215 -
6 files changed, 15341 insertions(+), 2447 deletions(-)
commit 28f7f004848d56fb148290428ecff8ab3b568cdd
@@ -4194,19 +4405,19 @@ Date: Sat May 22 11:21:39 2004 +0000
Make gen-mirroring-tab and gen-unicode-version work. gen.tab/
works now.
- Makefile.am | 10 +++--
+ Makefile.am | 10 ++--
bin/Makefile.am | 4 +-
bin/fribidi-benchmark.c | 16 ++++---
charset/fribidi-char-sets-cap-rtl.c | 16 +++----
charset/fribidi-char-sets.c | 8 ++--
gen.tab/Makefile.am | 95
- ++++++++++++++++++++++++++++++-----------
+ +++++++++++++++++++++++++++----------
gen.tab/gen-bidi-type-tab.c | 8 ++--
- gen.tab/gen-mirroring-tab.c | 10 ++---
- gen.tab/gen-unicode-version.c | 11 +++--
- lib/common.h | 20 ++++-----
+ gen.tab/gen-mirroring-tab.c | 10 ++--
+ gen.tab/gen-unicode-version.c | 11 ++---
+ lib/common.h | 20 ++++----
lib/fribidi-bidi-type.c | 7 ++-
- lib/fribidi-mem.c | 13 +++---
+ lib/fribidi-mem.c | 13 +++--
12 files changed, 137 insertions(+), 81 deletions(-)
commit 285b3de138e8a4f790fe07519c1a90d759a61598
@@ -4217,18 +4428,18 @@ Date: Sat May 22 10:35:30 2004 +0000
bin/Makefile.am | 4 +-
charset/Makefile.am | 2 +-
- configure.ac | 29 +++++----
+ configure.ac | 29 ++++----
doc/Makefile.am | 2 +-
fribidi.pc.in | 2 +-
- gen.tab/Makefile.am | 52 ++++++++++++++-
+ gen.tab/Makefile.am | 52 +++++++++++++-
gen.tab/gen-bidi-type-tab.c | 163
- +++++++++++++++++++++++++++++++++-------------
- gen.tab/gen-mirroring-tab.c | 79 ++++++++++++++--------
- gen.tab/gen-unicode-version.c | 48 +++++++-------
+ ++++++++++++++++++++++++++++++------------
+ gen.tab/gen-mirroring-tab.c | 79 +++++++++++++-------
+ gen.tab/gen-unicode-version.c | 48 ++++++-------
gen.tab/packtab.c | 5 +-
gen.tab/packtab.h | 2 +-
- lib/Makefile.am | 31 +++------
- lib/common.h | 48 ++++++++------
+ lib/Makefile.am | 31 +++-----
+ lib/common.h | 48 +++++++------
lib/fribidi-bidi.h | 12 ++--
lib/fribidi-mirroring.c | 10 +--
lib/fribidi-mirroring.h | 10 +--
@@ -4243,9 +4454,9 @@ Date: Wed May 12 23:13:55 2004 +0000
gen.tab/.cvsignore | 5 +-
gen.tab/Makefile.am | 6 +-
gen.tab/gen-bidi-type-tab.c | 10 +--
- gen.tab/gen-mirroring-tab.c | 8 +--
+ gen.tab/gen-mirroring-tab.c | 8 +-
gen.tab/gen-unicode-version.c | 170
- ++++++++++++++++++++++++++++++++++++++++++++++
+ ++++++++++++++++++++++++++++++++++++++++++
5 files changed, 187 insertions(+), 12 deletions(-)
commit 8bc4b0a145e828a6c9e90d18e4f06900291d1d3a
@@ -4287,13 +4498,13 @@ Date: Wed May 12 07:06:21 2004 +0000
charset/fribidi-char-sets.c | 12 +-
gen.tab/Makefile.am | 9 ++
gen.tab/gen-bidi-type-tab.c | 298
- +++++++++++++++++++++++-------------------------
- gen.tab/gen-mirroring-tab.c | 223 ++++++++++++++++++++----------------
+ +++++++++++++++++++++-----------------------
+ gen.tab/gen-mirroring-tab.c | 223 +++++++++++++++++++--------------
gen.tab/packtab.c | 18 ++-
lib/bidi-types-list.h | 18 ++-
lib/common.h | 12 +-
lib/fribidi-bidi-type.c | 8 +-
- lib/fribidi-mirroring.h | 13 ++-
+ lib/fribidi-mirroring.h | 13 +-
13 files changed, 340 insertions(+), 294 deletions(-)
commit 4b03bbd7b4368cde918197875a83ff4661ca4857
@@ -4310,7 +4521,7 @@ Date: Fri May 7 06:30:37 2004 +0000
doc/Makefile.am | 2 +
lib/Makefile.am | 8 +-
lib/bidi-type-table.i | 5228
- ---------------------------------------
+ -----------------------------------
lib/bidi-types-list.h | 11 +-
lib/bidi-types.h | 25 +-
lib/common.h | 10 +-
@@ -4368,21 +4579,21 @@ Date: Mon May 3 22:05:19 2004 +0000
lib/bidi-types-list.h | 15 +-
lib/bidi-types.h | 20 +-
lib/common.h | 48 +-
- lib/debug.h | 66 ++-
+ lib/debug.h | 66 +-
lib/env.h | 10 +-
lib/fribidi-bidi-type.c | 37 +-
lib/fribidi-bidi-type.h | 33 +-
lib/fribidi-bidi-types.c | 12 +-
lib/fribidi-bidi-types.h | 50 +-
lib/fribidi-bidi.c | 1173
- +++++++++++++++++++------------------
+ +++++++++++++++++----------------
lib/fribidi-bidi.h | 19 +-
lib/fribidi-common.h | 29 +-
lib/fribidi-env.c | 17 +-
lib/fribidi-env.h | 27 +-
lib/fribidi-mem.c | 39 +-
lib/fribidi-mirroring.c | 24 +-
- lib/fribidi-run.c | 395 ++++++++-----
+ lib/fribidi-run.c | 395 ++++++-----
lib/fribidi-types.h | 10 +-
lib/fribidi.c | 10 +-
lib/fribidi.def | 13 +
@@ -4398,13 +4609,13 @@ Date: Wed Apr 28 03:20:22 2004 +0000
Cleaning up exported symbols.
- THANKS | 23 +++++++++------------
+ THANKS | 23 +++++++++----------
bin/fribidi-main.c | 62
- ++++++++++++++++++++++++++++----------------------------
- charset/Makefile.am | 13 +-----------
+ ++++++++++++++++++++++++++--------------------------
+ charset/Makefile.am | 13 +----------
doc/Makefile.am | 1 +
- lib/Makefile.am | 16 +++++++--------
- lib/fribidi-common.h | 8 ++++----
+ lib/Makefile.am | 16 +++++++-------
+ lib/fribidi-common.h | 8 +++----
6 files changed, 55 insertions(+), 68 deletions(-)
commit 1fb4c69145a5222169e8b8f852807046a30d6870
@@ -4416,18 +4627,18 @@ Date: Wed Apr 28 02:37:56 2004 +0000
lib/Makefile.am | 5 +-
lib/bidi-types.h | 12 +-
- lib/common.h | 23 ++--
+ lib/common.h | 23 +--
lib/env.h | 63 +++++++++
lib/fribidi-bidi-type.c | 8 +-
lib/fribidi-bidi-types.c | 8 +-
lib/fribidi-bidi-types.h | 8 +-
lib/fribidi-bidi.c | 357
- ++++++++-------------------------------------------
+ ++++++++---------------------------------------
lib/fribidi-env.c | 27 ++--
lib/fribidi-mem.c | 64 ++++++---
- lib/fribidi-run.c | 267 ++++++++++++++++++++++++++++++++++++++
+ lib/fribidi-run.c | 267 +++++++++++++++++++++++++++++++++++
lib/mem.h | 16 ++-
- lib/run.h | 86 +++++++++++++
+ lib/run.h | 86 ++++++++++++
13 files changed, 587 insertions(+), 357 deletions(-)
commit ac43f238748ad5b874089a8c27d8c1eb7150859d
@@ -4447,17 +4658,17 @@ Date: Tue Apr 27 16:47:22 2004 +0000
First try to integrate c2man manual generation in build system.
- charset/Headers.mk | 21 +++++++++------
- charset/fribidi-char-sets-list.h | 10 ++++---
+ charset/Headers.mk | 21 ++++++++------
+ charset/fribidi-char-sets-list.h | 10 +++++--
doc/Makefile.am | 62
- ++++++++++++++++++++++++++++++--------------
- lib/Headers.mk | 16 +++++++++++-
+ ++++++++++++++++++++++++++++------------
+ lib/Headers.mk | 16 ++++++++++-
lib/bidi-types-list.h | 10 +++----
lib/common.h | 10 +++----
lib/debug.h | 8 +++---
lib/fribidi-begindecls.h | 2 ++
lib/fribidi-enddecls.h | 2 ++
- lib/fribidi-types.h | 14 +++++-----
+ lib/fribidi-types.h | 14 ++++-----
lib/mem.h | 8 +++---
11 files changed, 107 insertions(+), 56 deletions(-)
@@ -4530,7 +4741,7 @@ Date: Sun Apr 25 18:49:12 2004 +0000
The ChangeLog from the old days.
ChangeLog.old | 703
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 703 insertions(+)
commit 63d12e574eb5cfe95290b303bac0950c25afe397
@@ -4539,96 +4750,96 @@ Date: Sun Apr 25 18:47:56 2004 +0000
Initial revision
- .cvsignore | 19 +
- .indent.pro | 19 +
- AUTHORS | 1 +
- COPYING | 504 ++
- HACKING | 7 +
- HISTORY | 34 +
- Makefile.am | 54 +
- NEWS | 18 +
- README | 152 +
- THANKS | 33 +
- TODO | 13 +
- bin/Makefile.am | 25 +
- bin/fribidi-benchmark.c | 278 ++
- bin/fribidi-main.c | 597 +++
- bin/getopt.c | 1268 +++++
- bin/getopt.h | 187 +
- bin/getopt1.c | 213 +
- bin/getopt_int.h | 145 +
- bootstrap | 110 +
- charset/Headers.mk | 9 +
- charset/Makefile.am | 48 +
- charset/fribidi-char-sets-cap-rtl.c | 336 ++
- charset/fribidi-char-sets-cap-rtl.h | 70 +
- charset/fribidi-char-sets-cp1255.c | 106 +
- charset/fribidi-char-sets-cp1255.h | 62 +
- charset/fribidi-char-sets-cp1256.c | 223 +
- charset/fribidi-char-sets-cp1256.h | 62 +
- charset/fribidi-char-sets-iso8859-6.c | 81 +
- charset/fribidi-char-sets-iso8859-6.h | 62 +
- charset/fribidi-char-sets-iso8859-8.c | 120 +
- charset/fribidi-char-sets-iso8859-8.h | 62 +
- charset/fribidi-char-sets-list.h | 56 +
- charset/fribidi-char-sets-utf8.c | 126 +
- charset/fribidi-char-sets-utf8.h | 66 +
- charset/fribidi-char-sets.c | 230 +
- charset/fribidi-char-sets.h | 125 +
- configure.ac | 208 +
- doc/Makefile.am | 27 +
- fribidi.pc.in | 13 +
- fribidi.spec.in | 145 +
- gen.tab/Makefile.am | 0
- gen.tab/gen-bidi-type-tab.c | 267 ++
- gen.tab/gen-mirroring-tab.c | 152 +
- gen.tab/packtab.c | 364 ++
- gen.tab/packtab.h | 49 +
- gen.tab/unidata/BidiMirroring.txt | 525 +++
- gen.tab/unidata/ReadMe.txt | 40 +
- gen.tab/unidata/extracted/DerivedBidiClass.txt | 1299 +++++
- .../unidata/extracted/DerivedDecompositionType.txt | 933 ++++
- gen.tab/unidata/extracted/DerivedJoiningType.txt | 215 +
- lib/Headers.mk | 14 +
- lib/Makefile.am | 75 +
- lib/bidi-type-table.i | 5228
- +++++++++++++++++++++
- lib/bidi-types-list.h | 69 +
- lib/bidi-types.h | 78 +
- lib/common.h | 110 +
- lib/debug.h | 87 +
- lib/fribidi-begindecls.h | 1 +
- lib/fribidi-bidi-type.c | 79 +
- lib/fribidi-bidi-type.h | 74 +
- lib/fribidi-bidi-types.c | 76 +
- lib/fribidi-bidi-types.h | 278 ++
- lib/fribidi-bidi.c | 1424 ++++++
- lib/fribidi-bidi.h | 112 +
- lib/fribidi-common.h | 83 +
- lib/fribidi-config.h.in | 22 +
- lib/fribidi-enddecls.h | 1 +
- lib/fribidi-env.c | 107 +
- lib/fribidi-env.h | 125 +
- lib/fribidi-mem.c | 94 +
- lib/fribidi-mirroring.c | 90 +
- lib/fribidi-mirroring.h | 67 +
- lib/fribidi-types.h | 143 +
- lib/fribidi-unicode-version.h | 4 +
- lib/fribidi-unicode.h | 101 +
- lib/fribidi.c | 68 +
- lib/fribidi.h | 48 +
- lib/mem.h | 90 +
- lib/mirroring-table.i | 358 ++
- test/Makefile.am | 33 +
- test/run.tests | 74 +
- test/test_CapRTL_explicit.input | 13 +
- test/test_CapRTL_explicit.reference | 13 +
- test/test_CapRTL_implicit.input | 26 +
- test/test_CapRTL_implicit.reference | 26 +
- test/test_ISO8859-8_hebrew.input | 17 +
- test/test_ISO8859-8_hebrew.reference | 17 +
- test/test_UTF-8_persian.input | 14 +
- test/test_UTF-8_persian.reference | 14 +
- test/test_UTF-8_reordernsm.input | 7 +
- test/test_UTF-8_reordernsm.reference | 7 +
+ .cvsignore | 19 +
+ .indent.pro | 19 +
+ AUTHORS | 1 +
+ COPYING | 504 ++
+ HACKING | 7 +
+ HISTORY | 34 +
+ Makefile.am | 54 +
+ NEWS | 18 +
+ README | 152 +
+ THANKS | 33 +
+ TODO | 13 +
+ bin/Makefile.am | 25 +
+ bin/fribidi-benchmark.c | 278 ++
+ bin/fribidi-main.c | 597 +++
+ bin/getopt.c | 1268 +++++
+ bin/getopt.h | 187 +
+ bin/getopt1.c | 213 +
+ bin/getopt_int.h | 145 +
+ bootstrap | 110 +
+ charset/Headers.mk | 9 +
+ charset/Makefile.am | 48 +
+ charset/fribidi-char-sets-cap-rtl.c | 336 ++
+ charset/fribidi-char-sets-cap-rtl.h | 70 +
+ charset/fribidi-char-sets-cp1255.c | 106 +
+ charset/fribidi-char-sets-cp1255.h | 62 +
+ charset/fribidi-char-sets-cp1256.c | 223 +
+ charset/fribidi-char-sets-cp1256.h | 62 +
+ charset/fribidi-char-sets-iso8859-6.c | 81 +
+ charset/fribidi-char-sets-iso8859-6.h | 62 +
+ charset/fribidi-char-sets-iso8859-8.c | 120 +
+ charset/fribidi-char-sets-iso8859-8.h | 62 +
+ charset/fribidi-char-sets-list.h | 56 +
+ charset/fribidi-char-sets-utf8.c | 126 +
+ charset/fribidi-char-sets-utf8.h | 66 +
+ charset/fribidi-char-sets.c | 230 +
+ charset/fribidi-char-sets.h | 125 +
+ configure.ac | 208 +
+ doc/Makefile.am | 27 +
+ fribidi.pc.in | 13 +
+ fribidi.spec.in | 145 +
+ gen.tab/Makefile.am | 0
+ gen.tab/gen-bidi-type-tab.c | 267 +
+ gen.tab/gen-mirroring-tab.c | 152 +
+ gen.tab/packtab.c | 364 ++
+ gen.tab/packtab.h | 49 +
+ gen.tab/unidata/BidiMirroring.txt | 525 ++
+ gen.tab/unidata/ReadMe.txt | 40 +
+ gen.tab/unidata/extracted/DerivedBidiClass.txt | 1299 +++++
+ .../unidata/extracted/DerivedDecompositionType.txt | 933 ++++
+ gen.tab/unidata/extracted/DerivedJoiningType.txt | 215 +
+ lib/Headers.mk | 14 +
+ lib/Makefile.am | 75 +
+ lib/bidi-type-table.i | 5228
+ ++++++++++++++++++++
+ lib/bidi-types-list.h | 69 +
+ lib/bidi-types.h | 78 +
+ lib/common.h | 110 +
+ lib/debug.h | 87 +
+ lib/fribidi-begindecls.h | 1 +
+ lib/fribidi-bidi-type.c | 79 +
+ lib/fribidi-bidi-type.h | 74 +
+ lib/fribidi-bidi-types.c | 76 +
+ lib/fribidi-bidi-types.h | 278 ++
+ lib/fribidi-bidi.c | 1424 ++++++
+ lib/fribidi-bidi.h | 112 +
+ lib/fribidi-common.h | 83 +
+ lib/fribidi-config.h.in | 22 +
+ lib/fribidi-enddecls.h | 1 +
+ lib/fribidi-env.c | 107 +
+ lib/fribidi-env.h | 125 +
+ lib/fribidi-mem.c | 94 +
+ lib/fribidi-mirroring.c | 90 +
+ lib/fribidi-mirroring.h | 67 +
+ lib/fribidi-types.h | 143 +
+ lib/fribidi-unicode-version.h | 4 +
+ lib/fribidi-unicode.h | 101 +
+ lib/fribidi.c | 68 +
+ lib/fribidi.h | 48 +
+ lib/mem.h | 90 +
+ lib/mirroring-table.i | 358 ++
+ test/Makefile.am | 33 +
+ test/run.tests | 74 +
+ test/test_CapRTL_explicit.input | 13 +
+ test/test_CapRTL_explicit.reference | 13 +
+ test/test_CapRTL_implicit.input | 26 +
+ test/test_CapRTL_implicit.reference | 26 +
+ test/test_ISO8859-8_hebrew.input | 17 +
+ test/test_ISO8859-8_hebrew.reference | 17 +
+ test/test_UTF-8_persian.input | 14 +
+ test/test_UTF-8_persian.reference | 14 +
+ test/test_UTF-8_reordernsm.input | 7 +
+ test/test_UTF-8_reordernsm.reference | 7 +
91 files changed, 19125 insertions(+)
diff --git a/Makefile.in b/Makefile.in
index 1c28164..c93dd9a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -231,8 +231,8 @@ am__relativize = \
done; \
reldir="$$dir2"
GZIP_ENV = --best
-DIST_ARCHIVES = $(distdir).tar.bz2
-DIST_TARGETS = dist-bzip2
+DIST_ARCHIVES = $(distdir).tar.xz
+DIST_TARGETS = dist-xz
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -269,6 +269,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FRIBIDI_BINARY_AGE = @FRIBIDI_BINARY_AGE@
+FRIBIDI_CPPFLAGS = @FRIBIDI_CPPFLAGS@
FRIBIDI_INTERFACE_AGE = @FRIBIDI_INTERFACE_AGE@
FRIBIDI_INTERFACE_VERSION = @FRIBIDI_INTERFACE_VERSION@
FRIBIDI_MAJOR_VERSION = @FRIBIDI_MAJOR_VERSION@
@@ -674,6 +675,7 @@ distdir-am: $(DISTFILES)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
+
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
$(am__post_remove_distdir)
@@ -681,7 +683,6 @@ dist-bzip2: distdir
dist-lzip: distdir
tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
$(am__post_remove_distdir)
-
dist-xz: distdir
tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
$(am__post_remove_distdir)
diff --git a/NEWS b/NEWS
index cd762fa..138f8e7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Overview of changes between 1.0.9 and 1.0.10
+=============================================
+
+* Fixed various compilation problems and symbol exports necessary for proper compilation under windows.
+
+Overview of changes between 1.0.8 and 1.0.9
+=============================================
+
+* A bug fix in the fribidi unicode algorithm where isolate sequences were not really isolated.
+
+* Restored mistakenly removed deprecated function fribidi_log2vis_get_embedding_levels()
+
+* autotools now generates xz archives instead of bzip2 archives
+
Overview of changes between 1.0.7 and 1.0.8
=============================================
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 9427873..b0600ce 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -9,6 +9,7 @@ fribidi_SOURCES = fribidi-main.c $(getopt_SOURCES)
fribidi_benchmark_SOURCES = fribidi-benchmark.c $(getopt_SOURCES)
AM_CPPFLAGS = \
+ @FRIBIDI_CPPFLAGS@ \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib
diff --git a/bin/Makefile.in b/bin/Makefile.in
index 2983c87..a068ea8 100644
--- a/bin/Makefile.in
+++ b/bin/Makefile.in
@@ -229,6 +229,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FRIBIDI_BINARY_AGE = @FRIBIDI_BINARY_AGE@
+FRIBIDI_CPPFLAGS = @FRIBIDI_CPPFLAGS@
FRIBIDI_INTERFACE_AGE = @FRIBIDI_INTERFACE_AGE@
FRIBIDI_INTERFACE_VERSION = @FRIBIDI_INTERFACE_VERSION@
FRIBIDI_MAJOR_VERSION = @FRIBIDI_MAJOR_VERSION@
@@ -338,6 +339,7 @@ getopt_SOURCES = getopt.c getopt1.c getopt_int.h getopt.h gettext.h
fribidi_SOURCES = fribidi-main.c $(getopt_SOURCES)
fribidi_benchmark_SOURCES = fribidi-benchmark.c $(getopt_SOURCES)
AM_CPPFLAGS = \
+ @FRIBIDI_CPPFLAGS@ \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib
diff --git a/bin/fribidi-main.c b/bin/fribidi-main.c
index 437dad0..3cf9fe1 100644
--- a/bin/fribidi-main.c
+++ b/bin/fribidi-main.c
@@ -104,7 +104,7 @@ help (
" -h, --help Display this information and exit\n"
" -V, --version Display version information and exit\n"
" -v, --verbose Verbose mode, same as --basedir --ltov --vtol\n"
- " --levels --changes\n");
+ " --levels\n");
printf (" -d, --debug Output debug information\n"
" -t, --test Test " FRIBIDI_NAME
", same as --clean --nobreak\n"
@@ -139,11 +139,11 @@ help (
" --vtol Output Visual to Logical position map\n"
" --levels Output Embedding Levels\n"
" --novisual Do not output the visual string, to be used with\n"
- " --basedir, --ltov, --vtol, --levels, --changes\n");
+ " --basedir, --ltov, --vtol, --levels\n");
printf (" All string indexes are zero based\n" "\n" "Output:\n"
" For each line of input, output something like this:\n"
" [input-str` => '][BOL][[padding space]visual-str][EOL]\n"
- " [\\n base-dir][\\n ltov-map][\\n vtol-map][\\n levels][\\n changes]\n");
+ " [\\n base-dir][\\n ltov-map][\\n vtol-map][\\n levels]\n");
{
int i;
diff --git a/bin/meson.build b/bin/meson.build
index 66326d8..1d8c81f 100644
--- a/bin/meson.build
+++ b/bin/meson.build
@@ -1,27 +1,27 @@
fribidi = executable('fribidi',
'fribidi-main.c', 'getopt.c', 'getopt1.c', fribidi_unicode_version_h,
- c_args: ['-DHAVE_CONFIG_H'] + visibility_args,
+ c_args: ['-DHAVE_CONFIG_H'] + fribidi_static_cargs + visibility_args,
include_directories: incs,
link_with: libfribidi,
install: true)
executable('fribidi-benchmark',
'fribidi-benchmark.c', 'getopt.c', 'getopt1.c', fribidi_unicode_version_h,
- c_args: ['-DHAVE_CONFIG_H'] + visibility_args,
+ c_args: ['-DHAVE_CONFIG_H'] + fribidi_static_cargs + visibility_args,
include_directories: incs,
link_with: libfribidi,
install: false)
executable('fribidi-bidi-types',
'fribidi-bidi-types.c', fribidi_unicode_version_h,
- c_args: ['-DHAVE_CONFIG_H'] + visibility_args,
+ c_args: ['-DHAVE_CONFIG_H'] + fribidi_static_cargs + visibility_args,
include_directories: incs,
link_with: libfribidi,
install: false)
executable('fribidi-caprtl2utf8',
'fribidi-caprtl2utf8.c', fribidi_unicode_version_h,
- c_args: ['-DHAVE_CONFIG_H'] + visibility_args,
+ c_args: ['-DHAVE_CONFIG_H'] + fribidi_static_cargs + visibility_args,
include_directories: incs,
link_with: libfribidi,
install: false)
diff --git a/configure b/configure
index 810a9ce..1f927da 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for GNU FriBidi 1.0.8.
+# Generated by GNU Autoconf 2.69 for GNU FriBidi 1.0.10.
#
# Report bugs to <https://github.com/fribidi/fribidi/issues/new>.
#
@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='GNU FriBidi'
PACKAGE_TARNAME='fribidi'
-PACKAGE_VERSION='1.0.8'
-PACKAGE_STRING='GNU FriBidi 1.0.8'
+PACKAGE_VERSION='1.0.10'
+PACKAGE_STRING='GNU FriBidi 1.0.10'
PACKAGE_BUGREPORT='https://github.com/fribidi/fribidi/issues/new'
PACKAGE_URL='http://fribidi.org/'
@@ -636,6 +636,7 @@ ac_subst_vars='am__EXEEXT_FALSE
am__EXEEXT_TRUE
LTLIBOBJS
LIBOBJS
+FRIBIDI_CPPFLAGS
LDFLAGS_FOR_BUILD
CPPFLAGS_FOR_BUILD
CFLAGS_FOR_BUILD
@@ -1344,7 +1345,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GNU FriBidi 1.0.8 to adapt to many kinds of systems.
+\`configure' configures GNU FriBidi 1.0.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1414,7 +1415,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GNU FriBidi 1.0.8:";;
+ short | recursive ) echo "Configuration of GNU FriBidi 1.0.10:";;
esac
cat <<\_ACEOF
@@ -1533,7 +1534,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GNU FriBidi configure 1.0.8
+GNU FriBidi configure 1.0.10
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2085,7 +2086,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GNU FriBidi $as_me 1.0.8, which was
+It was created by GNU FriBidi $as_me 1.0.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2954,7 +2955,7 @@ fi
# Define the identity of the package.
PACKAGE='fribidi'
- VERSION='1.0.8'
+ VERSION='1.0.10'
# Some tools Automake needs.
@@ -12365,8 +12366,8 @@ CC=$lt_save_CC
FRIBIDI_MAJOR_VERSION=1
FRIBIDI_MINOR_VERSION=0
-FRIBIDI_MICRO_VERSION=8
-FRIBIDI_VERSION=1.0.8
+FRIBIDI_MICRO_VERSION=10
+FRIBIDI_VERSION=1.0.10
FRIBIDI_INTERFACE_VERSION=4
FRIBIDI_INTERFACE_AGE=0
FRIBIDI_BINARY_AGE=4
@@ -14604,6 +14605,13 @@ $as_echo "#define FRIBIDI_NO_DEPRECATED 1" >>confdefs.h
fi
+# define FRIBIDI_LIB_STATIC if in static mode
+if test "$enable_static" = "yes" ; then
+ FRIBIDI_CPPFLAGS="-DFRIBIDI_LIB_STATIC"
+fi
+
+
+
# Generate output
ac_config_files="$ac_config_files fribidi.pc lib/fribidi-config.h Makefile gen.tab/Makefile lib/Makefile bin/Makefile doc/Makefile test/Makefile test/unicode-conformance/Makefile"
@@ -15153,7 +15161,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GNU FriBidi $as_me 1.0.8, which was
+This file was extended by GNU FriBidi $as_me 1.0.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15221,7 +15229,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-GNU FriBidi config.status 1.0.8
+GNU FriBidi config.status 1.0.10
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 19995d2..c9bb466 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl FRIBIDI_BINARY_AGE = FRIBIDI_INTERFACE_AGE = 0;
dnl
m4_define(fribidi_major_version, 1)dnl
m4_define(fribidi_minor_version, 0)dnl
-m4_define(fribidi_micro_version, 8)dnl
+m4_define(fribidi_micro_version, 10)dnl
m4_define(fribidi_interface_version, 4)dnl
m4_define(fribidi_interface_age, 0)dnl
m4_define(fribidi_binary_age, 4)dnl
@@ -38,7 +38,7 @@ AC_CONFIG_SRCDIR([fribidi.pc.in])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.11.1 gnits dist-bzip2 no-dist-gzip -Wall no-define])
+AM_INIT_AUTOMAKE([1.11.1 gnits dist-xz no-dist-gzip -Wall no-define])
AM_SILENT_RULES([yes])
AM_PROG_AR
@@ -147,6 +147,13 @@ if test x$enable_deprecated = xno; then
[Don not build deprecated functionality])
fi
+# define FRIBIDI_LIB_STATIC if in static mode
+if test "$enable_static" = "yes" ; then
+ FRIBIDI_CPPFLAGS="-DFRIBIDI_LIB_STATIC"
+fi
+AC_SUBST(FRIBIDI_CPPFLAGS)
+
+
# Generate output
AC_CONFIG_FILES([fribidi.pc
lib/fribidi-config.h
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 95c3213..8f91041 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -187,6 +187,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FRIBIDI_BINARY_AGE = @FRIBIDI_BINARY_AGE@
+FRIBIDI_CPPFLAGS = @FRIBIDI_CPPFLAGS@
FRIBIDI_INTERFACE_AGE = @FRIBIDI_INTERFACE_AGE@
FRIBIDI_INTERFACE_VERSION = @FRIBIDI_INTERFACE_VERSION@
FRIBIDI_MAJOR_VERSION = @FRIBIDI_MAJOR_VERSION@
diff --git a/doc/fribidi_charset_to_unicode.3 b/doc/fribidi_charset_to_unicode.3
index d84ac66..ec7a9d9 100644
--- a/doc/fribidi_charset_to_unicode.3
+++ b/doc/fribidi_charset_to_unicode.3
@@ -94,4 +94,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_debug_status.3 b/doc/fribidi_debug_status.3
index ab33a10..c7eca34 100644
--- a/doc/fribidi_debug_status.3
+++ b/doc/fribidi_debug_status.3
@@ -1,6 +1,6 @@
.\" WARNING! THIS FILE WAS GENERATED AUTOMATICALLY BY c2man!
.\" DO NOT EDIT! CHANGES MADE TO THIS FILE WILL BE LOST!
-.TH "fribidi_debug_status" 3 "27 September 2019" "c2man fribidi-common.h" "Programmer's Manual"
+.TH "fribidi_debug_status" 3 "2 March 2020" "c2man fribidi-common.h" "Programmer's Manual"
.SH "NAME"
fribidi_debug_status \- get current debug state
.SH "SYNOPSIS"
@@ -40,4 +40,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_get_bidi_type.3 b/doc/fribidi_get_bidi_type.3
index 545c488..2c90b75 100644
--- a/doc/fribidi_get_bidi_type.3
+++ b/doc/fribidi_get_bidi_type.3
@@ -54,4 +54,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_get_bidi_type_name.3 b/doc/fribidi_get_bidi_type_name.3
index c58c309..56c8f6d 100644
--- a/doc/fribidi_get_bidi_type_name.3
+++ b/doc/fribidi_get_bidi_type_name.3
@@ -52,4 +52,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_get_bidi_types.3 b/doc/fribidi_get_bidi_types.3
index b8a187d..dfe45e4 100644
--- a/doc/fribidi_get_bidi_types.3
+++ b/doc/fribidi_get_bidi_types.3
@@ -64,4 +64,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_get_bracket.3 b/doc/fribidi_get_bracket.3
index c7705a5..9c52209 100644
--- a/doc/fribidi_get_bracket.3
+++ b/doc/fribidi_get_bracket.3
@@ -55,4 +55,5 @@ fribidi_get_mirror_char(3),
fribidi_shape_mirroring(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_get_bracket_types.3 b/doc/fribidi_get_bracket_types.3
index e0b2cf7..ab3f797 100644
--- a/doc/fribidi_get_bracket_types.3
+++ b/doc/fribidi_get_bracket_types.3
@@ -69,4 +69,5 @@ fribidi_get_mirror_char(3),
fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_get_joining_type.3 b/doc/fribidi_get_joining_type.3
index 50a6d1b..2f49e12 100644
--- a/doc/fribidi_get_joining_type.3
+++ b/doc/fribidi_get_joining_type.3
@@ -83,4 +83,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_get_joining_type_name.3 b/doc/fribidi_get_joining_type_name.3
index 3e22cc8..2b59a5b 100644
--- a/doc/fribidi_get_joining_type_name.3
+++ b/doc/fribidi_get_joining_type_name.3
@@ -79,4 +79,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_get_joining_types.3 b/doc/fribidi_get_joining_types.3
index 7427f50..d6e5de8 100644
--- a/doc/fribidi_get_joining_types.3
+++ b/doc/fribidi_get_joining_types.3
@@ -92,4 +92,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_get_mirror_char.3 b/doc/fribidi_get_mirror_char.3
index 8f4fcf0..ff7deeb 100644
--- a/doc/fribidi_get_mirror_char.3
+++ b/doc/fribidi_get_mirror_char.3
@@ -64,4 +64,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_get_par_direction.3 b/doc/fribidi_get_par_direction.3
index 93c83d3..b9f45bd 100644
--- a/doc/fribidi_get_par_direction.3
+++ b/doc/fribidi_get_par_direction.3
@@ -96,4 +96,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_get_par_embedding_levels.3 b/doc/fribidi_get_par_embedding_levels.3
index bfb9ba6..21d9128 100644
--- a/doc/fribidi_get_par_embedding_levels.3
+++ b/doc/fribidi_get_par_embedding_levels.3
@@ -94,4 +94,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_get_par_embedding_levels_ex.3 b/doc/fribidi_get_par_embedding_levels_ex.3
index a32f158..98962e4 100644
--- a/doc/fribidi_get_par_embedding_levels_ex.3
+++ b/doc/fribidi_get_par_embedding_levels_ex.3
@@ -110,4 +110,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_get_type.3 b/doc/fribidi_get_type.3
index 582cd39..a1343f6 100644
--- a/doc/fribidi_get_type.3
+++ b/doc/fribidi_get_type.3
@@ -46,4 +46,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_get_type_internal.3 b/doc/fribidi_get_type_internal.3
index dbe5875..bd64a1e 100644
--- a/doc/fribidi_get_type_internal.3
+++ b/doc/fribidi_get_type_internal.3
@@ -46,4 +46,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_join_arabic.3 b/doc/fribidi_join_arabic.3
index f9a89c2..d95ada2 100644
--- a/doc/fribidi_join_arabic.3
+++ b/doc/fribidi_join_arabic.3
@@ -88,4 +88,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_log2vis.3 b/doc/fribidi_log2vis.3
index cf76530..8948d9a 100644
--- a/doc/fribidi_log2vis.3
+++ b/doc/fribidi_log2vis.3
@@ -1,6 +1,6 @@
.\" WARNING! THIS FILE WAS GENERATED AUTOMATICALLY BY c2man!
.\" DO NOT EDIT! CHANGES MADE TO THIS FILE WILL BE LOST!
-.TH "fribidi_log2vis" 3 "13 October 2019" "c2man fribidi.h" "Programmer's Manual"
+.TH "fribidi_log2vis" 3 "2 March 2020" "c2man fribidi.h" "Programmer's Manual"
.SH "NAME"
fribidi_log2vis \- get visual string
.SH "SYNOPSIS"
@@ -86,8 +86,10 @@ list of embedding levels as defined by the algorithm.
If NULL is passed as any of the the lists, the list is ignored and not
filled.
-This function is obsolete because it only handles one-line paragraphs.
-Please consider using other functions instead. Deprecated.
+Note that this function handles one-line paragraphs. For multi-
+paragraph texts it is necessary to first split the text into
+separate paragraphs and then carry over the resolved pbase_dir
+between the subsequent invocations.
.SH "RETURNS"
Maximum level found plus one, or zero if any error occurred
(memory allocation failure most probably).
@@ -111,6 +113,7 @@ fribidi_set_reorder_nsm(3),
fribidi_log2vis_get_embedding_levels(3),
fribidi_get_type(3),
fribidi_get_type_internal(3),
+fribidi_get_par_embedding_levels(3),
fribidi_join_arabic(3),
fribidi_get_joining_type(3),
fribidi_get_joining_types(3),
diff --git a/doc/fribidi_log2vis_get_embedding_levels.3 b/doc/fribidi_log2vis_get_embedding_levels.3
index 16a6452..d3328a5 100644
--- a/doc/fribidi_log2vis_get_embedding_levels.3
+++ b/doc/fribidi_log2vis_get_embedding_levels.3
@@ -93,4 +93,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_mirroring_status.3 b/doc/fribidi_mirroring_status.3
index 93d6b61..234f7de 100644
--- a/doc/fribidi_mirroring_status.3
+++ b/doc/fribidi_mirroring_status.3
@@ -40,4 +40,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_parse_charset.3 b/doc/fribidi_parse_charset.3
index b441b40..b82b0d3 100644
--- a/doc/fribidi_parse_charset.3
+++ b/doc/fribidi_parse_charset.3
@@ -74,4 +74,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_remove_bidi_marks.3 b/doc/fribidi_remove_bidi_marks.3
index e9cf157..798a117 100644
--- a/doc/fribidi_remove_bidi_marks.3
+++ b/doc/fribidi_remove_bidi_marks.3
@@ -1,6 +1,6 @@
.\" WARNING! THIS FILE WAS GENERATED AUTOMATICALLY BY c2man!
.\" DO NOT EDIT! CHANGES MADE TO THIS FILE WILL BE LOST!
-.TH "fribidi_remove_bidi_marks" 3 "21 October 2019" "c2man fribidi.h" "Programmer's Manual"
+.TH "fribidi_remove_bidi_marks" 3 "2 March 2020" "c2man fribidi.h" "Programmer's Manual"
.SH "NAME"
fribidi_remove_bidi_marks \- remove bidi marks out of an string
.SH "SYNOPSIS"
@@ -54,13 +54,13 @@ position_from_this_list is positions_V_to_L; if str is the logical
string, the other way. Moreover, the position maps should be filled with
valid entries.
-A position map pointing to a removed character is filled with \-1. By the
+A position map pointing to a removed character is filled with \(mi1. By the
way, you should not use embedding_levels if str is visual string.
For best results this function should be run on a whole paragraph, not
lines; but feel free to do otherwise if you know what you are doing.
.SH "RETURNS"
-New length of the string, or \-1 if an error occurred (memory
+New length of the string, or \(mi1 if an error occurred (memory
allocation failure most probably).
.SH "SEE ALSO"
fribidi_shape_arabic(3),
@@ -91,4 +91,5 @@ fribidi_get_mirror_char(3),
fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
-fribidi_shape(3)
+fribidi_shape(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_reorder_line.3 b/doc/fribidi_reorder_line.3
index 8694735..d37b636 100644
--- a/doc/fribidi_reorder_line.3
+++ b/doc/fribidi_reorder_line.3
@@ -142,4 +142,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_reorder_nsm_status.3 b/doc/fribidi_reorder_nsm_status.3
index 5a3f4e1..3c0542f 100644
--- a/doc/fribidi_reorder_nsm_status.3
+++ b/doc/fribidi_reorder_nsm_status.3
@@ -40,4 +40,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_set_debug.3 b/doc/fribidi_set_debug.3
index ff3cdd6..a88ab8f 100644
--- a/doc/fribidi_set_debug.3
+++ b/doc/fribidi_set_debug.3
@@ -1,6 +1,6 @@
.\" WARNING! THIS FILE WAS GENERATED AUTOMATICALLY BY c2man!
.\" DO NOT EDIT! CHANGES MADE TO THIS FILE WILL BE LOST!
-.TH "fribidi_set_debug" 3 "27 September 2019" "c2man fribidi-common.h" "Programmer's Manual"
+.TH "fribidi_set_debug" 3 "2 March 2020" "c2man fribidi-common.h" "Programmer's Manual"
.SH "NAME"
fribidi_set_debug \- set debug state
.SH "SYNOPSIS"
@@ -44,4 +44,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_set_mirroring.3 b/doc/fribidi_set_mirroring.3
index 70d4404..bacc414 100644
--- a/doc/fribidi_set_mirroring.3
+++ b/doc/fribidi_set_mirroring.3
@@ -54,4 +54,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_set_reorder_nsm.3 b/doc/fribidi_set_reorder_nsm.3
index bed140e..d01f31a 100644
--- a/doc/fribidi_set_reorder_nsm.3
+++ b/doc/fribidi_set_reorder_nsm.3
@@ -56,4 +56,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_shape.3 b/doc/fribidi_shape.3
index 4a23e6c..06d7162 100644
--- a/doc/fribidi_shape.3
+++ b/doc/fribidi_shape.3
@@ -85,4 +85,5 @@ fribidi_get_mirror_char(3),
fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_shape_arabic.3 b/doc/fribidi_shape_arabic.3
index e218245..d8bcd6c 100644
--- a/doc/fribidi_shape_arabic.3
+++ b/doc/fribidi_shape_arabic.3
@@ -91,4 +91,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_shape_mirroring.3 b/doc/fribidi_shape_mirroring.3
index 6489277..9f2cae2 100644
--- a/doc/fribidi_shape_mirroring.3
+++ b/doc/fribidi_shape_mirroring.3
@@ -67,4 +67,5 @@ fribidi_get_mirror_char(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/doc/fribidi_unicode_to_charset.3 b/doc/fribidi_unicode_to_charset.3
index 5358b0f..fed23e8 100644
--- a/doc/fribidi_unicode_to_charset.3
+++ b/doc/fribidi_unicode_to_charset.3
@@ -95,4 +95,5 @@ fribidi_shape_mirroring(3),
fribidi_get_bracket(3),
fribidi_get_bracket_types(3),
fribidi_shape(3),
-fribidi_remove_bidi_marks(3)
+fribidi_remove_bidi_marks(3),
+fribidi_log2vis(3)
diff --git a/fribidi.pc.in b/fribidi.pc.in
index bb3a51c..bd7efc4 100644
--- a/fribidi.pc.in
+++ b/fribidi.pc.in
@@ -10,3 +10,4 @@ Description: Unicode Bidirectional Algorithm Library
Version: @VERSION@
Libs: -L${libdir} -lfribidi
Cflags: -I${includedir}/@PACKAGE@
+CFLAGS.private: -DFRIBIDI_LIB_STATIC
diff --git a/gen.tab/Makefile.am b/gen.tab/Makefile.am
index fe3c80f..014c646 100644
--- a/gen.tab/Makefile.am
+++ b/gen.tab/Makefile.am
@@ -26,6 +26,7 @@ gen_brackets_type_tab_CPPFLAGS = $(AM_CPPFLAGS)
CFLAGS_FOR_BUILD += -DHAVE_CONFIG_H -I$(top_builddir) -I$(top_builddir)/lib -I$(top_srcdir)/lib
CC = $(CC_FOR_BUILD)
CFLAGS = $(CFLAGS_FOR_BUILD)
+LDFLAGS = $(LDFLAGS_FOR_BUILD)
CLEANFILES = $(EXTRA_PROGRAMS)
DISTCLEANFILES =
diff --git a/gen.tab/Makefile.in b/gen.tab/Makefile.in
index 78b2eed..48c910b 100644
--- a/gen.tab/Makefile.in
+++ b/gen.tab/Makefile.in
@@ -255,6 +255,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FRIBIDI_BINARY_AGE = @FRIBIDI_BINARY_AGE@
+FRIBIDI_CPPFLAGS = @FRIBIDI_CPPFLAGS@
FRIBIDI_INTERFACE_AGE = @FRIBIDI_INTERFACE_AGE@
FRIBIDI_INTERFACE_VERSION = @FRIBIDI_INTERFACE_VERSION@
FRIBIDI_MAJOR_VERSION = @FRIBIDI_MAJOR_VERSION@
@@ -269,7 +270,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LD = @LD@
-LDFLAGS = @LDFLAGS@
+LDFLAGS = $(LDFLAGS_FOR_BUILD)
LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 1752485..22b680a 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -8,9 +8,7 @@ libfribidi_la_LDFLAGS = -no-undefined -version-info $(LT_VERSION_INFO)
libfribidi_la_LIBADD =
libfribidi_la_DEPENDENCIES =
-if OS_WIN32
-libfribidi_la_LDFLAGS += -export-symbols $(srcdir)/fribidi.def
-else
+if !OS_WIN32
libfribidi_la_LDFLAGS += -export-symbols-regex "^fribidi_.*"
endif # OS_WIN32
@@ -56,6 +54,8 @@ libfribidi_la_SOURCES = \
brackets-type.tab.i \
run.h
+libfribidi_la_CPPFLAGS = @FRIBIDI_CPPFLAGS@ -DFRIBIDI_BUILD
+
GENERATEDSOURCES = \
fribidi-unicode-version.h \
arabic-shaping.tab.i \
diff --git a/lib/Makefile.in b/lib/Makefile.in
index e9691d5..4f09036 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -89,8 +89,7 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-@OS_WIN32_TRUE@am__append_1 = -export-symbols $(srcdir)/fribidi.def
-@OS_WIN32_FALSE@am__append_2 = -export-symbols-regex "^fribidi_.*"
+@OS_WIN32_FALSE@am__append_1 = -export-symbols-regex "^fribidi_.*"
subdir = lib
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
@@ -136,14 +135,22 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgincludedir)" \
"$(DESTDIR)$(pkgincludedir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
-am_libfribidi_la_OBJECTS = fribidi.lo fribidi-arabic.lo \
- fribidi-bidi.lo fribidi-bidi-types.lo fribidi-char-sets.lo \
- fribidi-char-sets-cap-rtl.lo fribidi-char-sets-cp1255.lo \
- fribidi-char-sets-cp1256.lo fribidi-char-sets-iso8859-6.lo \
- fribidi-char-sets-iso8859-8.lo fribidi-char-sets-utf8.lo \
- fribidi-deprecated.lo fribidi-joining.lo \
- fribidi-joining-types.lo fribidi-mirroring.lo \
- fribidi-brackets.lo fribidi-run.lo fribidi-shape.lo
+am_libfribidi_la_OBJECTS = libfribidi_la-fribidi.lo \
+ libfribidi_la-fribidi-arabic.lo libfribidi_la-fribidi-bidi.lo \
+ libfribidi_la-fribidi-bidi-types.lo \
+ libfribidi_la-fribidi-char-sets.lo \
+ libfribidi_la-fribidi-char-sets-cap-rtl.lo \
+ libfribidi_la-fribidi-char-sets-cp1255.lo \
+ libfribidi_la-fribidi-char-sets-cp1256.lo \
+ libfribidi_la-fribidi-char-sets-iso8859-6.lo \
+ libfribidi_la-fribidi-char-sets-iso8859-8.lo \
+ libfribidi_la-fribidi-char-sets-utf8.lo \
+ libfribidi_la-fribidi-deprecated.lo \
+ libfribidi_la-fribidi-joining.lo \
+ libfribidi_la-fribidi-joining-types.lo \
+ libfribidi_la-fribidi-mirroring.lo \
+ libfribidi_la-fribidi-brackets.lo libfribidi_la-fribidi-run.lo \
+ libfribidi_la-fribidi-shape.lo
libfribidi_la_OBJECTS = $(am_libfribidi_la_OBJECTS)
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -167,21 +174,24 @@ am__v_at_1 =
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__maybe_remake_depfiles = depfiles
-am__depfiles_remade = ./$(DEPDIR)/fribidi-arabic.Plo \
- ./$(DEPDIR)/fribidi-bidi-types.Plo \
- ./$(DEPDIR)/fribidi-bidi.Plo ./$(DEPDIR)/fribidi-brackets.Plo \
- ./$(DEPDIR)/fribidi-char-sets-cap-rtl.Plo \
- ./$(DEPDIR)/fribidi-char-sets-cp1255.Plo \
- ./$(DEPDIR)/fribidi-char-sets-cp1256.Plo \
- ./$(DEPDIR)/fribidi-char-sets-iso8859-6.Plo \
- ./$(DEPDIR)/fribidi-char-sets-iso8859-8.Plo \
- ./$(DEPDIR)/fribidi-char-sets-utf8.Plo \
- ./$(DEPDIR)/fribidi-char-sets.Plo \
- ./$(DEPDIR)/fribidi-deprecated.Plo \
- ./$(DEPDIR)/fribidi-joining-types.Plo \
- ./$(DEPDIR)/fribidi-joining.Plo \
- ./$(DEPDIR)/fribidi-mirroring.Plo ./$(DEPDIR)/fribidi-run.Plo \
- ./$(DEPDIR)/fribidi-shape.Plo ./$(DEPDIR)/fribidi.Plo
+am__depfiles_remade = ./$(DEPDIR)/libfribidi_la-fribidi-arabic.Plo \
+ ./$(DEPDIR)/libfribidi_la-fribidi-bidi-types.Plo \
+ ./$(DEPDIR)/libfribidi_la-fribidi-bidi.Plo \
+ ./$(DEPDIR)/libfribidi_la-fribidi-brackets.Plo \
+ ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cap-rtl.Plo \
+ ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1255.Plo \
+ ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1256.Plo \
+ ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-6.Plo \
+ ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-8.Plo \
+ ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-utf8.Plo \
+ ./$(DEPDIR)/libfribidi_la-fribidi-char-sets.Plo \
+ ./$(DEPDIR)/libfribidi_la-fribidi-deprecated.Plo \
+ ./$(DEPDIR)/libfribidi_la-fribidi-joining-types.Plo \
+ ./$(DEPDIR)/libfribidi_la-fribidi-joining.Plo \
+ ./$(DEPDIR)/libfribidi_la-fribidi-mirroring.Plo \
+ ./$(DEPDIR)/libfribidi_la-fribidi-run.Plo \
+ ./$(DEPDIR)/libfribidi_la-fribidi-shape.Plo \
+ ./$(DEPDIR)/libfribidi_la-fribidi.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -263,6 +273,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FRIBIDI_BINARY_AGE = @FRIBIDI_BINARY_AGE@
+FRIBIDI_CPPFLAGS = @FRIBIDI_CPPFLAGS@
FRIBIDI_INTERFACE_AGE = @FRIBIDI_INTERFACE_AGE@
FRIBIDI_INTERFACE_VERSION = @FRIBIDI_INTERFACE_VERSION@
FRIBIDI_MAJOR_VERSION = @FRIBIDI_MAJOR_VERSION@
@@ -372,7 +383,7 @@ EXTRA_DIST = fribidi.def
lib_LTLIBRARIES = libfribidi.la
AM_CPPFLAGS =
libfribidi_la_LDFLAGS = -no-undefined -version-info $(LT_VERSION_INFO) \
- $(am__append_1) $(am__append_2)
+ $(am__append_1)
libfribidi_la_LIBADD =
libfribidi_la_DEPENDENCIES =
libfribidi_la_headers = \
@@ -440,6 +451,7 @@ libfribidi_la_SOURCES = \
brackets-type.tab.i \
run.h
+libfribidi_la_CPPFLAGS = @FRIBIDI_CPPFLAGS@ -DFRIBIDI_BUILD
GENERATEDSOURCES = \
fribidi-unicode-version.h \
arabic-shaping.tab.i \
@@ -536,24 +548,24 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-arabic.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-bidi-types.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-bidi.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-brackets.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-char-sets-cap-rtl.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-char-sets-cp1255.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-char-sets-cp1256.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-char-sets-iso8859-6.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-char-sets-iso8859-8.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-char-sets-utf8.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-char-sets.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-deprecated.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-joining-types.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-joining.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-mirroring.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-run.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi-shape.Plo@am__quote@ # am--include-marker
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fribidi.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-arabic.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-bidi-types.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-bidi.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-brackets.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cap-rtl.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1255.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1256.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-6.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-8.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-char-sets-utf8.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-char-sets.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-deprecated.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-joining-types.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-joining.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-mirroring.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-run.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi-shape.Plo@am__quote@ # am--include-marker
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libfribidi_la-fribidi.Plo@am__quote@ # am--include-marker
$(am__depfiles_remade):
@$(MKDIR_P) $(@D)
@@ -582,6 +594,132 @@ am--depfiles: $(am__depfiles_remade)
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+libfribidi_la-fribidi.lo: fribidi.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi.Tpo -c -o libfribidi_la-fribidi.lo `test -f 'fribidi.c' || echo '$(srcdir)/'`fribidi.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi.Tpo $(DEPDIR)/libfribidi_la-fribidi.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fribidi.c' object='libfribidi_la-fribidi.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi.lo `test -f 'fribidi.c' || echo '$(srcdir)/'`fribidi.c
+
+libfribidi_la-fribidi-arabic.lo: fribidi-arabic.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-arabic.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-arabic.Tpo -c -o libfribidi_la-fribidi-arabic.lo `test -f 'fribidi-arabic.c' || echo '$(srcdir)/'`fribidi-arabic.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-arabic.Tpo $(DEPDIR)/libfribidi_la-fribidi-arabic.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fribidi-arabic.c' object='libfribidi_la-fribidi-arabic.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-arabic.lo `test -f 'fribidi-arabic.c' || echo '$(srcdir)/'`fribidi-arabic.c
+
+libfribidi_la-fribidi-bidi.lo: fribidi-bidi.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-bidi.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-bidi.Tpo -c -o libfribidi_la-fribidi-bidi.lo `test -f 'fribidi-bidi.c' || echo '$(srcdir)/'`fribidi-bidi.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-bidi.Tpo $(DEPDIR)/libfribidi_la-fribidi-bidi.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fribidi-bidi.c' object='libfribidi_la-fribidi-bidi.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-bidi.lo `test -f 'fribidi-bidi.c' || echo '$(srcdir)/'`fribidi-bidi.c
+
+libfribidi_la-fribidi-bidi-types.lo: fribidi-bidi-types.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-bidi-types.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-bidi-types.Tpo -c -o libfribidi_la-fribidi-bidi-types.lo `test -f 'fribidi-bidi-types.c' || echo '$(srcdir)/'`fribidi-bidi-types.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-bidi-types.Tpo $(DEPDIR)/libfribidi_la-fribidi-bidi-types.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fribidi-bidi-types.c' object='libfribidi_la-fribidi-bidi-types.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-bidi-types.lo `test -f 'fribidi-bidi-types.c' || echo '$(srcdir)/'`fribidi-bidi-types.c
+
+libfribidi_la-fribidi-char-sets.lo: fribidi-char-sets.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-char-sets.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-char-sets.Tpo -c -o libfribidi_la-fribidi-char-sets.lo `test -f 'fribidi-char-sets.c' || echo '$(srcdir)/'`fribidi-char-sets.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-char-sets.Tpo $(DEPDIR)/libfribidi_la-fribidi-char-sets.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fribidi-char-sets.c' object='libfribidi_la-fribidi-char-sets.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-char-sets.lo `test -f 'fribidi-char-sets.c' || echo '$(srcdir)/'`fribidi-char-sets.c
+
+libfribidi_la-fribidi-char-sets-cap-rtl.lo: fribidi-char-sets-cap-rtl.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-char-sets-cap-rtl.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-char-sets-cap-rtl.Tpo -c -o libfribidi_la-fribidi-char-sets-cap-rtl.lo `test -f 'fribidi-char-sets-cap-rtl.c' || echo '$(srcdir)/'`fribidi-char-sets-cap-rtl.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-char-sets-cap-rtl.Tpo $(DEPDIR)/libfribidi_la-fribidi-char-sets-cap-rtl.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fribidi-char-sets-cap-rtl.c' object='libfribidi_la-fribidi-char-sets-cap-rtl.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-char-sets-cap-rtl.lo `test -f 'fribidi-char-sets-cap-rtl.c' || echo '$(srcdir)/'`fribidi-char-sets-cap-rtl.c
+
+libfribidi_la-fribidi-char-sets-cp1255.lo: fribidi-char-sets-cp1255.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-char-sets-cp1255.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1255.Tpo -c -o libfribidi_la-fribidi-char-sets-cp1255.lo `test -f 'fribidi-char-sets-cp1255.c' || echo '$(srcdir)/'`fribidi-char-sets-cp1255.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1255.Tpo $(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1255.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fribidi-char-sets-cp1255.c' object='libfribidi_la-fribidi-char-sets-cp1255.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-char-sets-cp1255.lo `test -f 'fribidi-char-sets-cp1255.c' || echo '$(srcdir)/'`fribidi-char-sets-cp1255.c
+
+libfribidi_la-fribidi-char-sets-cp1256.lo: fribidi-char-sets-cp1256.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-char-sets-cp1256.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1256.Tpo -c -o libfribidi_la-fribidi-char-sets-cp1256.lo `test -f 'fribidi-char-sets-cp1256.c' || echo '$(srcdir)/'`fribidi-char-sets-cp1256.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1256.Tpo $(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1256.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fribidi-char-sets-cp1256.c' object='libfribidi_la-fribidi-char-sets-cp1256.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-char-sets-cp1256.lo `test -f 'fribidi-char-sets-cp1256.c' || echo '$(srcdir)/'`fribidi-char-sets-cp1256.c
+
+libfribidi_la-fribidi-char-sets-iso8859-6.lo: fribidi-char-sets-iso8859-6.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-char-sets-iso8859-6.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-6.Tpo -c -o libfribidi_la-fribidi-char-sets-iso8859-6.lo `test -f 'fribidi-char-sets-iso8859-6.c' || echo '$(srcdir)/'`fribidi-char-sets-iso8859-6.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-6.Tpo $(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-6.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fribidi-char-sets-iso8859-6.c' object='libfribidi_la-fribidi-char-sets-iso8859-6.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-char-sets-iso8859-6.lo `test -f 'fribidi-char-sets-iso8859-6.c' || echo '$(srcdir)/'`fribidi-char-sets-iso8859-6.c
+
+libfribidi_la-fribidi-char-sets-iso8859-8.lo: fribidi-char-sets-iso8859-8.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-char-sets-iso8859-8.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-8.Tpo -c -o libfribidi_la-fribidi-char-sets-iso8859-8.lo `test -f 'fribidi-char-sets-iso8859-8.c' || echo '$(srcdir)/'`fribidi-char-sets-iso8859-8.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-8.Tpo $(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-8.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fribidi-char-sets-iso8859-8.c' object='libfribidi_la-fribidi-char-sets-iso8859-8.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-char-sets-iso8859-8.lo `test -f 'fribidi-char-sets-iso8859-8.c' || echo '$(srcdir)/'`fribidi-char-sets-iso8859-8.c
+
+libfribidi_la-fribidi-char-sets-utf8.lo: fribidi-char-sets-utf8.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-char-sets-utf8.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-char-sets-utf8.Tpo -c -o libfribidi_la-fribidi-char-sets-utf8.lo `test -f 'fribidi-char-sets-utf8.c' || echo '$(srcdir)/'`fribidi-char-sets-utf8.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-char-sets-utf8.Tpo $(DEPDIR)/libfribidi_la-fribidi-char-sets-utf8.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fribidi-char-sets-utf8.c' object='libfribidi_la-fribidi-char-sets-utf8.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-char-sets-utf8.lo `test -f 'fribidi-char-sets-utf8.c' || echo '$(srcdir)/'`fribidi-char-sets-utf8.c
+
+libfribidi_la-fribidi-deprecated.lo: fribidi-deprecated.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-deprecated.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-deprecated.Tpo -c -o libfribidi_la-fribidi-deprecated.lo `test -f 'fribidi-deprecated.c' || echo '$(srcdir)/'`fribidi-deprecated.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-deprecated.Tpo $(DEPDIR)/libfribidi_la-fribidi-deprecated.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fribidi-deprecated.c' object='libfribidi_la-fribidi-deprecated.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-deprecated.lo `test -f 'fribidi-deprecated.c' || echo '$(srcdir)/'`fribidi-deprecated.c
+
+libfribidi_la-fribidi-joining.lo: fribidi-joining.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-joining.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-joining.Tpo -c -o libfribidi_la-fribidi-joining.lo `test -f 'fribidi-joining.c' || echo '$(srcdir)/'`fribidi-joining.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-joining.Tpo $(DEPDIR)/libfribidi_la-fribidi-joining.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fribidi-joining.c' object='libfribidi_la-fribidi-joining.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-joining.lo `test -f 'fribidi-joining.c' || echo '$(srcdir)/'`fribidi-joining.c
+
+libfribidi_la-fribidi-joining-types.lo: fribidi-joining-types.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-joining-types.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-joining-types.Tpo -c -o libfribidi_la-fribidi-joining-types.lo `test -f 'fribidi-joining-types.c' || echo '$(srcdir)/'`fribidi-joining-types.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-joining-types.Tpo $(DEPDIR)/libfribidi_la-fribidi-joining-types.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fribidi-joining-types.c' object='libfribidi_la-fribidi-joining-types.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-joining-types.lo `test -f 'fribidi-joining-types.c' || echo '$(srcdir)/'`fribidi-joining-types.c
+
+libfribidi_la-fribidi-mirroring.lo: fribidi-mirroring.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-mirroring.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-mirroring.Tpo -c -o libfribidi_la-fribidi-mirroring.lo `test -f 'fribidi-mirroring.c' || echo '$(srcdir)/'`fribidi-mirroring.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-mirroring.Tpo $(DEPDIR)/libfribidi_la-fribidi-mirroring.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fribidi-mirroring.c' object='libfribidi_la-fribidi-mirroring.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-mirroring.lo `test -f 'fribidi-mirroring.c' || echo '$(srcdir)/'`fribidi-mirroring.c
+
+libfribidi_la-fribidi-brackets.lo: fribidi-brackets.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-brackets.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-brackets.Tpo -c -o libfribidi_la-fribidi-brackets.lo `test -f 'fribidi-brackets.c' || echo '$(srcdir)/'`fribidi-brackets.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-brackets.Tpo $(DEPDIR)/libfribidi_la-fribidi-brackets.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fribidi-brackets.c' object='libfribidi_la-fribidi-brackets.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-brackets.lo `test -f 'fribidi-brackets.c' || echo '$(srcdir)/'`fribidi-brackets.c
+
+libfribidi_la-fribidi-run.lo: fribidi-run.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-run.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-run.Tpo -c -o libfribidi_la-fribidi-run.lo `test -f 'fribidi-run.c' || echo '$(srcdir)/'`fribidi-run.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-run.Tpo $(DEPDIR)/libfribidi_la-fribidi-run.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fribidi-run.c' object='libfribidi_la-fribidi-run.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-run.lo `test -f 'fribidi-run.c' || echo '$(srcdir)/'`fribidi-run.c
+
+libfribidi_la-fribidi-shape.lo: fribidi-shape.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT libfribidi_la-fribidi-shape.lo -MD -MP -MF $(DEPDIR)/libfribidi_la-fribidi-shape.Tpo -c -o libfribidi_la-fribidi-shape.lo `test -f 'fribidi-shape.c' || echo '$(srcdir)/'`fribidi-shape.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/libfribidi_la-fribidi-shape.Tpo $(DEPDIR)/libfribidi_la-fribidi-shape.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='fribidi-shape.c' object='libfribidi_la-fribidi-shape.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libfribidi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o libfribidi_la-fribidi-shape.lo `test -f 'fribidi-shape.c' || echo '$(srcdir)/'`fribidi-shape.c
+
mostlyclean-libtool:
-rm -f *.lo
@@ -762,24 +900,24 @@ clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
mostlyclean-am
distclean: distclean-am
- -rm -f ./$(DEPDIR)/fribidi-arabic.Plo
- -rm -f ./$(DEPDIR)/fribidi-bidi-types.Plo
- -rm -f ./$(DEPDIR)/fribidi-bidi.Plo
- -rm -f ./$(DEPDIR)/fribidi-brackets.Plo
- -rm -f ./$(DEPDIR)/fribidi-char-sets-cap-rtl.Plo
- -rm -f ./$(DEPDIR)/fribidi-char-sets-cp1255.Plo
- -rm -f ./$(DEPDIR)/fribidi-char-sets-cp1256.Plo
- -rm -f ./$(DEPDIR)/fribidi-char-sets-iso8859-6.Plo
- -rm -f ./$(DEPDIR)/fribidi-char-sets-iso8859-8.Plo
- -rm -f ./$(DEPDIR)/fribidi-char-sets-utf8.Plo
- -rm -f ./$(DEPDIR)/fribidi-char-sets.Plo
- -rm -f ./$(DEPDIR)/fribidi-deprecated.Plo
- -rm -f ./$(DEPDIR)/fribidi-joining-types.Plo
- -rm -f ./$(DEPDIR)/fribidi-joining.Plo
- -rm -f ./$(DEPDIR)/fribidi-mirroring.Plo
- -rm -f ./$(DEPDIR)/fribidi-run.Plo
- -rm -f ./$(DEPDIR)/fribidi-shape.Plo
- -rm -f ./$(DEPDIR)/fribidi.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-arabic.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-bidi-types.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-bidi.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-brackets.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cap-rtl.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1255.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1256.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-6.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-8.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-utf8.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-deprecated.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-joining-types.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-joining.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-mirroring.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-run.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-shape.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi.Plo
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
distclean-tags
@@ -826,24 +964,24 @@ install-ps-am:
installcheck-am:
maintainer-clean: maintainer-clean-am
- -rm -f ./$(DEPDIR)/fribidi-arabic.Plo
- -rm -f ./$(DEPDIR)/fribidi-bidi-types.Plo
- -rm -f ./$(DEPDIR)/fribidi-bidi.Plo
- -rm -f ./$(DEPDIR)/fribidi-brackets.Plo
- -rm -f ./$(DEPDIR)/fribidi-char-sets-cap-rtl.Plo
- -rm -f ./$(DEPDIR)/fribidi-char-sets-cp1255.Plo
- -rm -f ./$(DEPDIR)/fribidi-char-sets-cp1256.Plo
- -rm -f ./$(DEPDIR)/fribidi-char-sets-iso8859-6.Plo
- -rm -f ./$(DEPDIR)/fribidi-char-sets-iso8859-8.Plo
- -rm -f ./$(DEPDIR)/fribidi-char-sets-utf8.Plo
- -rm -f ./$(DEPDIR)/fribidi-char-sets.Plo
- -rm -f ./$(DEPDIR)/fribidi-deprecated.Plo
- -rm -f ./$(DEPDIR)/fribidi-joining-types.Plo
- -rm -f ./$(DEPDIR)/fribidi-joining.Plo
- -rm -f ./$(DEPDIR)/fribidi-mirroring.Plo
- -rm -f ./$(DEPDIR)/fribidi-run.Plo
- -rm -f ./$(DEPDIR)/fribidi-shape.Plo
- -rm -f ./$(DEPDIR)/fribidi.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-arabic.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-bidi-types.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-bidi.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-brackets.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cap-rtl.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1255.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-cp1256.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-6.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-iso8859-8.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets-utf8.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-char-sets.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-deprecated.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-joining-types.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-joining.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-mirroring.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-run.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi-shape.Plo
+ -rm -f ./$(DEPDIR)/libfribidi_la-fribidi.Plo
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
diff --git a/lib/fribidi-bidi-types.h b/lib/fribidi-bidi-types.h
index d243c5d..cfe3cf0 100644
--- a/lib/fribidi-bidi-types.h
+++ b/lib/fribidi-bidi-types.h
@@ -377,7 +377,7 @@ fribidi_get_bidi_type (
* fribidi_get_bidi_type() for more information about the bidi types returned
* by this function.
*/
- FRIBIDI_ENTRY void fribidi_get_bidi_types (
+FRIBIDI_ENTRY void fribidi_get_bidi_types (
const FriBidiChar *str, /* input string */
const FriBidiStrIndex len, /* input string length */
FriBidiCharType *btypes /* output bidi types */
diff --git a/lib/fribidi-bidi.c b/lib/fribidi-bidi.c
index f3389bd..634546d 100644
--- a/lib/fribidi-bidi.c
+++ b/lib/fribidi-bidi.c
@@ -592,6 +592,7 @@ fribidi_get_par_embedding_levels_ex (
} status_stack[FRIBIDI_BIDI_MAX_RESOLVED_LEVELS];
FriBidiRun temp_link;
FriBidiRun *run_per_isolate_level[FRIBIDI_BIDI_MAX_RESOLVED_LEVELS];
+ int prev_isolate_level = 0; /* When running over the isolate levels, remember the previous level */
memset(run_per_isolate_level, 0, sizeof(run_per_isolate_level[0])
* FRIBIDI_BIDI_MAX_RESOLVED_LEVELS);
@@ -782,9 +783,19 @@ fribidi_get_par_embedding_levels_ex (
}
/* Build the isolate_level connections */
+ prev_isolate_level = 0;
for_run_list (pp, main_run_list)
{
int isolate_level = RL_ISOLATE_LEVEL (pp);
+ int i;
+
+ /* When going from an upper to a lower level, zero out all higher levels
+ in order not erroneous connections! */
+ if (isolate_level<prev_isolate_level)
+ for (i=isolate_level+1; i<=prev_isolate_level; i++)
+ run_per_isolate_level[i]=0;
+ prev_isolate_level = isolate_level;
+
if (run_per_isolate_level[isolate_level])
{
run_per_isolate_level[isolate_level]->next_isolate = pp;
@@ -824,7 +835,7 @@ fribidi_get_par_embedding_levels_ex (
/* 4. Resolving weak types. Also calculate the maximum isolate level */
max_iso_level = 0;
- DBG ("resolving weak types");
+ DBG ("4a. resolving weak types");
{
int last_strong_stack[FRIBIDI_BIDI_MAX_RESOLVED_LEVELS];
FriBidiCharType prev_type_orig;
@@ -902,9 +913,22 @@ fribidi_get_par_embedding_levels_ex (
}
}
+# if DEBUG
+ if UNLIKELY
+ (fribidi_debug_status ())
+ {
+ print_resolved_levels (main_run_list);
+ print_resolved_types (main_run_list);
+ }
+# endif /* DEBUG */
+ /* The last iso level is used to invalidate the the last strong values when going from
+ a higher to a lower iso level. When this occur, all "last_strong" values are
+ set to the base_dir. */
last_strong_stack[0] = base_dir;
+ DBG ("4b. resolving weak types. W4 and W5");
+
/* Resolving dependency of loops for rules W4 and W5, W5 may
want to prevent W4 to take effect in the next turn, do this
through "w4". */
@@ -1006,7 +1030,7 @@ fribidi_get_par_embedding_levels_ex (
/* 5. Resolving Neutral Types */
- DBG ("resolving neutral types - N0");
+ DBG ("5. resolving neutral types - N0");
{
/* BD16 - Build list of all pairs*/
int num_iso_levels = max_iso_level + 1;
diff --git a/lib/fribidi-bidi.h b/lib/fribidi-bidi.h
index 10672a6..4e3277c 100644
--- a/lib/fribidi-bidi.h
+++ b/lib/fribidi-bidi.h
@@ -118,7 +118,7 @@ fribidi_get_par_embedding_levels_ex (
* Returns: Maximum level found in this line plus one, or zero if any error
* occurred (memory allocation failure most probably).
*/
- FRIBIDI_ENTRY FriBidiLevel fribidi_reorder_line (
+FRIBIDI_ENTRY FriBidiLevel fribidi_reorder_line (
FriBidiFlags flags, /* reorder flags */
const FriBidiCharType *bidi_types, /* input list of bidi types as returned by
fribidi_get_bidi_types() */
diff --git a/lib/fribidi-common.h b/lib/fribidi-common.h
index 4db1f22..0d80922 100644
--- a/lib/fribidi-common.h
+++ b/lib/fribidi-common.h
@@ -42,19 +42,29 @@
/* FRIBIDI_ENTRY is a macro used to declare library entry points. */
-#ifndef FRIBIDI_ENTRY
-# if (defined(_MSC_VER) || defined(FRIBIDI_BUILT_WITH_MSVC)) && !defined(FRIBIDI_STATIC)
-/* if we're building fribidi itself with MSVC, FRIBIDI_ENTRY will be defined,
- * so if we're here then this is an external user including fribidi headers.
- * The dllimport is needed here mostly for the fribidi_version_info variable,
- * for functions it's not required. Probably needs more fine-tuning if
- * someone starts building fribidi as static library with MSVC. We'll cross
- * that bridge when we get there. */
-# define FRIBIDI_ENTRY __declspec(dllimport) extern
+#ifndef FRIBIDI_LIB_STATIC
+# ifdef _WIN32
+# ifdef FRIBIDI_BUILD
+# define FRIBIDI_ENTRY __declspec(dllexport)
+# else
+# define FRIBIDI_ENTRY __declspec(dllimport)
+# endif
+# elif (defined(__SUNPRO_C) || defined(__SUNPRO_CC))
+# define FRIBIDI_ENTRY __global
# else
-# define FRIBIDI_ENTRY extern
+# if (defined(__GNUC__) && __GNUC__ >= 4) || defined(__ICC)
+# define FRIBIDI_ENTRY __attribute__ ((visibility("default")))
+# else
+# define FRIBIDI_ENTRY
+# endif
# endif
-#endif /* !FRIBIDI_ENTRY */
+#else
+# ifndef FRIBIDI_ENTRY
+# define FRIBIDI_ENTRY
+# endif
+#endif
+
+#define FRIBIDI_EXTERN extern
#ifdef __ICC
#define FRIBIDI_BEGIN_IGNORE_DEPRECATIONS \
@@ -85,7 +95,7 @@
#define FRIBIDI_END_IGNORE_DEPRECATIONS
#endif
-#if defined(__GNUC__) && (__GNUC__ > 2)
+#if (defined(__GNUC__) && (__GNUC__ > 2)) && ! defined(_WIN32)
# define FRIBIDI_GNUC_WARN_UNUSED __attribute__((__warn_unused_result__))
# define FRIBIDI_GNUC_MALLOC __attribute__((__malloc__))
# define FRIBIDI_GNUC_HIDDEN __attribute__((__visibility__ ("hidden")))
diff --git a/lib/fribidi-deprecated.c b/lib/fribidi-deprecated.c
index 7a97292..bc0b8e2 100644
--- a/lib/fribidi-deprecated.c
+++ b/lib/fribidi-deprecated.c
@@ -76,6 +76,19 @@ fribidi_reorder_nsm_status (
+FRIBIDI_ENTRY FriBidiLevel
+fribidi_log2vis_get_embedding_levels (
+ const FriBidiCharType *bidi_types, /* input list of bidi types as returned by
+ fribidi_get_bidi_types() */
+ const FriBidiStrIndex len, /* input string length of the paragraph */
+ FriBidiParType *pbase_dir, /* requested and resolved paragraph
+ * base direction */
+ FriBidiLevel *embedding_levels /* output list of embedding levels */
+)
+{
+ return fribidi_get_par_embedding_levels_ex (bidi_types, NULL, len, pbase_dir, embedding_levels);
+}
+
FRIBIDI_ENTRY FriBidiCharType
fribidi_get_type (
FriBidiChar ch /* input character */
diff --git a/lib/fribidi-deprecated.h b/lib/fribidi-deprecated.h
index 56b5ea3..cb2322d 100644
--- a/lib/fribidi-deprecated.h
+++ b/lib/fribidi-deprecated.h
@@ -41,7 +41,7 @@
*
* This function is deprecated and only used with other deprecated functions.
*/
- FRIBIDI_ENTRY fribidi_boolean fribidi_mirroring_status (
+FRIBIDI_ENTRY fribidi_boolean fribidi_mirroring_status (
void
) FRIBIDI_GNUC_DEPRECATED;
@@ -59,7 +59,7 @@
*
* Returns: the new mirroring status.
*/
- FRIBIDI_ENTRY fribidi_boolean fribidi_set_mirroring (
+FRIBIDI_ENTRY fribidi_boolean fribidi_set_mirroring (
fribidi_boolean state /* new state to set */
) FRIBIDI_GNUC_DEPRECATED;
@@ -68,7 +68,7 @@
*
* This function is deprecated and only used with other deprecated functions.
*/
- FRIBIDI_ENTRY fribidi_boolean fribidi_reorder_nsm_status (
+FRIBIDI_ENTRY fribidi_boolean fribidi_reorder_nsm_status (
void
) FRIBIDI_GNUC_DEPRECATED;
@@ -88,7 +88,7 @@
*
* Returns: the new marks reordering status.
*/
- FRIBIDI_ENTRY fribidi_boolean fribidi_set_reorder_nsm (
+FRIBIDI_ENTRY fribidi_boolean fribidi_set_reorder_nsm (
fribidi_boolean state /* new state to set */
) FRIBIDI_GNUC_DEPRECATED;
diff --git a/lib/fribidi-joining-types.h b/lib/fribidi-joining-types.h
index 7f6750a..99bbd80 100644
--- a/lib/fribidi-joining-types.h
+++ b/lib/fribidi-joining-types.h
@@ -222,7 +222,7 @@ fribidi_get_joining_type (
* fribidi_get_joining_type for more information about the joining types
* returned by this function.
*/
- FRIBIDI_ENTRY void fribidi_get_joining_types (
+FRIBIDI_ENTRY void fribidi_get_joining_types (
const FriBidiChar *str, /* input string */
const FriBidiStrIndex len, /* input string length */
FriBidiJoiningType *jtypes /* output joining types */
@@ -237,7 +237,7 @@ fribidi_get_joining_type (
* Joining Classes of the Unicode standard available at
* http://www.unicode.org/versions/Unicode4.0.0/ch08.pdf#G7462.
*/
- FRIBIDI_ENTRY const char *fribidi_get_joining_type_name (
+FRIBIDI_ENTRY const char *fribidi_get_joining_type_name (
FriBidiJoiningType j /* input joining type */
) FRIBIDI_GNUC_CONST;
diff --git a/lib/fribidi-unicode.h b/lib/fribidi-unicode.h
index 745a312..f5a5783 100644
--- a/lib/fribidi-unicode.h
+++ b/lib/fribidi-unicode.h
@@ -45,7 +45,7 @@
/* An string containing the version the Unicode standard implemented,
* in the form of "x.y.z", or "unknown". */
-FRIBIDI_ENTRY const char *fribidi_unicode_version;
+FRIBIDI_ENTRY FRIBIDI_EXTERN const char *fribidi_unicode_version;
/* Unicode Bidirectional Algorithm definitions: */
diff --git a/lib/fribidi.h b/lib/fribidi.h
index 9124624..6157a3a 100644
--- a/lib/fribidi.h
+++ b/lib/fribidi.h
@@ -57,13 +57,13 @@
* string, the other way. Moreover, the position maps should be filled with
* valid entries.
*
- * A position map pointing to a removed character is filled with \-1. By the
+ * A position map pointing to a removed character is filled with \(mi1. By the
* way, you should not use embedding_levels if str is visual string.
*
* For best results this function should be run on a whole paragraph, not
* lines; but feel free to do otherwise if you know what you are doing.
*
- * Returns: New length of the string, or \-1 if an error occurred (memory
+ * Returns: New length of the string, or \(mi1 if an error occurred (memory
* allocation failure most probably).
*/
FRIBIDI_ENTRY FriBidiStrIndex
@@ -110,6 +110,8 @@ FRIBIDI_ENTRY FriBidiLevel fribidi_log2vis (
FriBidiLevel *embedding_levels /* output list of embedding levels */
);
+/* End of functions */
+
#ifdef FRIBIDI_NO_DEPRECATED
#else
# include "fribidi-deprecated.h"
@@ -117,7 +119,7 @@ FRIBIDI_ENTRY FriBidiLevel fribidi_log2vis (
/* An string containing the version information of the library. */
-FRIBIDI_ENTRY const char *fribidi_version_info;
+FRIBIDI_ENTRY FRIBIDI_EXTERN const char *fribidi_version_info;
#include "fribidi-enddecls.h"
diff --git a/lib/meson.build b/lib/meson.build
index 573d47f..aaf2aed 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -75,7 +75,7 @@ libfribidi = library('fribidi',
fribidi_sources, fribidi_unicode_version_h, fribidi_config_h,
generated_tab_include_files, config_h,
include_directories: incs,
- c_args: ['-DHAVE_CONFIG_H'] + visibility_args,
+ c_args: ['-DHAVE_CONFIG_H', '-DFRIBIDI_BUILD'] + fribidi_static_cargs + visibility_args,
version: libversion,
soversion: soversion,
install: true)
diff --git a/meson.build b/meson.build
index 939646a..6c69ed9 100644
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
-project('fribidi', 'c', version: '1.0.8',
- meson_version : '>= 0.44')
+project('fribidi', 'c', version: '1.0.10',
+ meson_version : '>= 0.48')
# New release:
# interface_age++
@@ -26,19 +26,24 @@ if cc.get_id() == 'gcc' and cc.has_argument('-ansi')
endif
# Symbol visibility
-have_visibility_hidden = cc.has_argument('-fvisibility=hidden')
-if have_visibility_hidden
- add_project_arguments('-fvisibility=hidden', language: 'c')
+have_visibility_hidden = false
+if host_machine.system() != 'windows'
+ have_visibility_hidden = cc.has_argument('-fvisibility=hidden')
+ if have_visibility_hidden
+ add_project_arguments('-fvisibility=hidden', language: 'c')
+ endif
endif
# Must explicitly make symbols public if default visibility is hidden
+visibility_args = []
+fribidi_static_cargs = []
if have_visibility_hidden
- visibility_args = ['-DFRIBIDI_ENTRY=extern __attribute__ ((visibility ("default")))']
+ visibility_args = ['-DFRIBIDI_ENTRY=__attribute__ ((visibility ("default")))']
else
- if host_machine.system() == 'windows' and get_option('default_library') != 'static'
- visibility_args = ['-DFRIBIDI_ENTRY=__declspec(dllexport)']
- else
- visibility_args = ['-DFRIBIDI_ENTRY=extern']
+ if host_machine.system() == 'windows'
+ if get_option('default_library') == 'static'
+ fribidi_static_cargs = ['-DFRIBIDI_LIB_STATIC']
+ endif
endif
endif
@@ -69,8 +74,7 @@ endif
# This is available pretty much everywhere
cdata.set('HAVE_STRINGIZE', 1)
-buildtype = get_option('buildtype')
-if buildtype == 'debug' or buildtype == 'debugoptimized'
+if get_option('debug')
cdata.set('DEBUG', 1)
endif
@@ -84,8 +88,12 @@ incs = include_directories('.', 'lib', 'gen.tab')
subdir('gen.tab')
subdir('lib')
-subdir('bin')
-subdir('test')
+if get_option('bin')
+ subdir('bin')
+endif
+if get_option('tests')
+ subdir('test')
+endif
if get_option('docs')
subdir('doc')
endif
diff --git a/meson_options.txt b/meson_options.txt
index c312fe8..11cae8d 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -2,3 +2,7 @@ option('deprecated', type : 'boolean', value : true,
description: 'Build deprecated functionality')
option('docs', type : 'boolean', value : true,
description: 'Build documentation')
+option('bin', type : 'boolean', value : true,
+ description: 'Build binaries')
+option('tests', type : 'boolean', value : true,
+ description: 'Build tests')
diff --git a/test/Makefile.in b/test/Makefile.in
index fb0367f..89c2123 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -418,6 +418,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FRIBIDI_BINARY_AGE = @FRIBIDI_BINARY_AGE@
+FRIBIDI_CPPFLAGS = @FRIBIDI_CPPFLAGS@
FRIBIDI_INTERFACE_AGE = @FRIBIDI_INTERFACE_AGE@
FRIBIDI_INTERFACE_VERSION = @FRIBIDI_INTERFACE_VERSION@
FRIBIDI_MAJOR_VERSION = @FRIBIDI_MAJOR_VERSION@
diff --git a/test/unicode-conformance/Makefile.am b/test/unicode-conformance/Makefile.am
index 9f8cd59..634b42d 100644
--- a/test/unicode-conformance/Makefile.am
+++ b/test/unicode-conformance/Makefile.am
@@ -15,6 +15,7 @@ TEST_DATAS = \
TXT_LOG_COMPILER = sh $(srcdir)/run.tests
AM_CPPFLAGS = \
+ @FRIBIDI_CPPFLAGS@ \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/charset
diff --git a/test/unicode-conformance/Makefile.in b/test/unicode-conformance/Makefile.in
index 5c389a2..4e06d0d 100644
--- a/test/unicode-conformance/Makefile.in
+++ b/test/unicode-conformance/Makefile.in
@@ -412,6 +412,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
FRIBIDI_BINARY_AGE = @FRIBIDI_BINARY_AGE@
+FRIBIDI_CPPFLAGS = @FRIBIDI_CPPFLAGS@
FRIBIDI_INTERFACE_AGE = @FRIBIDI_INTERFACE_AGE@
FRIBIDI_INTERFACE_VERSION = @FRIBIDI_INTERFACE_VERSION@
FRIBIDI_MAJOR_VERSION = @FRIBIDI_MAJOR_VERSION@
@@ -531,6 +532,7 @@ TEST_DATAS = \
TXT_LOG_COMPILER = sh $(srcdir)/run.tests
AM_CPPFLAGS = \
+ @FRIBIDI_CPPFLAGS@ \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/charset
diff --git a/test/unicode-conformance/meson.build b/test/unicode-conformance/meson.build
index 62a7e41..354872c 100644
--- a/test/unicode-conformance/meson.build
+++ b/test/unicode-conformance/meson.build
@@ -5,7 +5,7 @@ tests = [
foreach t : tests
exe = executable(t[0],
t[1], fribidi_unicode_version_h,
- c_args: ['-DHAVE_CONFIG_H'] + visibility_args,
+ c_args: ['-DHAVE_CONFIG_H'] + fribidi_static_cargs + visibility_args,
include_directories: incs,
link_with: libfribidi)
test(t[0], exe, args: files('@0@.txt'.format(t[0])))