diff options
| author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-06-24 06:44:52 +0000 |
|---|---|---|
| committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2013-06-24 06:44:52 +0000 |
| commit | 11eb5b823f29c3666e9f4d2cf72a2a3fee73ff9c (patch) | |
| tree | cd0b46b7c263ec1dfaf29871e9425d4c974a721e /Build/source/libs | |
| parent | c1d8a05ae33d287f84ab102c1ef6635dccf33116 (diff) | |
harfbuzz 0.9.18
git-svn-id: svn://tug.org/texlive/trunk@30879 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs')
139 files changed, 530 insertions, 74483 deletions
diff --git a/Build/source/libs/harfbuzz/ChangeLog b/Build/source/libs/harfbuzz/ChangeLog index d341fb1e0b7..b451a86c1c1 100644 --- a/Build/source/libs/harfbuzz/ChangeLog +++ b/Build/source/libs/harfbuzz/ChangeLog @@ -1,3 +1,8 @@ +2013-06-02 Peter Breitenlohner <peb@mppmu.mpg.de> + + Import harfbuzz-0.9.18. + * version.ac, Makefile.am, configure.ac: Adjust. + 2013-04-06 Khaled Hosny <khaledhosny@eglug.org> Import harfbuzz-0.9.15. diff --git a/Build/source/libs/harfbuzz/Makefile.am b/Build/source/libs/harfbuzz/Makefile.am index 8b3036da85b..d469e36914d 100644 --- a/Build/source/libs/harfbuzz/Makefile.am +++ b/Build/source/libs/harfbuzz/Makefile.am @@ -32,7 +32,7 @@ SUBDIRS = . include noinst_LIBRARIES = libharfbuzz.a ## common -AM_CPPFLAGS = -DHB_NO_MT -I$(top_srcdir)/$(HARFBUZZ_SRC) +AM_CPPFLAGS = -DHB_NO_MT -DHB_NO_UNICODE_FUNCS -I$(top_srcdir)/$(HARFBUZZ_SRC) libharfbuzz_dependencies = libharfbuzz_a_SOURCES = \ @HARFBUZZ_TREE@/src/hb-atomic-private.hh \ diff --git a/Build/source/libs/harfbuzz/Makefile.in b/Build/source/libs/harfbuzz/Makefile.in index b2eaf5616c4..f679b938e95 100644 --- a/Build/source/libs/harfbuzz/Makefile.in +++ b/Build/source/libs/harfbuzz/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ esac; \ - test $$am__dry = yes; \ - } + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -54,12 +82,14 @@ subdir = . DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ $(srcdir)/config.h.in \ - $(top_srcdir)/harfbuzz-0.9.15/src/hb-version.h.in \ + $(top_srcdir)/harfbuzz-0.9.18/src/hb-version.h.in \ $(top_srcdir)/../../build-aux/depcomp ChangeLog \ - ../../build-aux/config.guess ../../build-aux/config.sub \ - ../../build-aux/depcomp ../../build-aux/install-sh \ - ../../build-aux/missing ../../build-aux/texinfo.tex \ - ../../build-aux/ylwrap ../../build-aux/ltmain.sh \ + ../../build-aux/compile ../../build-aux/config.guess \ + ../../build-aux/config.sub ../../build-aux/depcomp \ + ../../build-aux/install-sh ../../build-aux/missing \ + ../../build-aux/texinfo.tex ../../build-aux/ylwrap \ + ../../build-aux/ltmain.sh \ + $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/config.guess \ $(top_srcdir)/../../build-aux/config.sub \ $(top_srcdir)/../../build-aux/install-sh \ @@ -415,8 +445,9 @@ EXTRA_DIST = $(HARFBUZZ_TREE) $(HARFBUZZ_TREE)-PATCHES HARFBUZZ_SRC = $(HARFBUZZ_TREE)/src SUBDIRS = . include noinst_LIBRARIES = libharfbuzz.a -AM_CPPFLAGS = -DHB_NO_MT -I$(top_srcdir)/$(HARFBUZZ_SRC) \ - $(ICU_INCLUDES) $(GRAPHITE2_INCLUDES) +AM_CPPFLAGS = -DHB_NO_MT -DHB_NO_UNICODE_FUNCS \ + -I$(top_srcdir)/$(HARFBUZZ_SRC) $(ICU_INCLUDES) \ + $(GRAPHITE2_INCLUDES) libharfbuzz_dependencies = $(ICU_DEPEND) $(GRAPHITE2_DEPEND) libharfbuzz_a_SOURCES = @HARFBUZZ_TREE@/src/hb-atomic-private.hh \ @HARFBUZZ_TREE@/src/hb-blob.cc \ @@ -528,8 +559,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -541,7 +572,7 @@ $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) distclean-hdr: -rm -f config.h stamp-h1 -hb-version.h: $(top_builddir)/config.status $(top_srcdir)/harfbuzz-0.9.15/src/hb-version.h.in +hb-version.h: $(top_builddir)/config.status $(top_srcdir)/harfbuzz-0.9.18/src/hb-version.h.in cd $(top_builddir) && $(SHELL) ./config.status $@ clean-noinstLIBRARIES: @@ -636,6 +667,7 @@ clean-noinstLIBRARIES: @HARFBUZZ_TREE@/src/hb-graphite2.$(OBJEXT): \ @HARFBUZZ_TREE@/src/$(am__dirstamp) \ @HARFBUZZ_TREE@/src/$(DEPDIR)/$(am__dirstamp) + libharfbuzz.a: $(libharfbuzz_a_OBJECTS) $(libharfbuzz_a_DEPENDENCIES) $(EXTRA_libharfbuzz_a_DEPENDENCIES) $(AM_V_at)-rm -f libharfbuzz.a $(AM_V_AR)$(libharfbuzz_a_AR) libharfbuzz.a $(libharfbuzz_a_OBJECTS) $(libharfbuzz_a_LIBADD) @@ -717,13 +749,12 @@ distclean-libtool: # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. $(am__recursive_targets): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -901,10 +932,16 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) diff --git a/Build/source/libs/harfbuzz/aclocal.m4 b/Build/source/libs/harfbuzz/aclocal.m4 index 21188b1c2d2..65e3d4f8005 100644 --- a/Build/source/libs/harfbuzz/aclocal.m4 +++ b/Build/source/libs/harfbuzz/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.13.1 -*- Autoconf -*- +# generated automatically by aclocal 1.14 -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.1], [], +m4_if([$1], [1.14], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.1])dnl +[AM_AUTOMAKE_VERSION([1.14])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -373,7 +373,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the @@ -418,6 +418,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -526,7 +532,48 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -534,7 +581,6 @@ dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -752,6 +798,70 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + # Check to make sure that the build environment is sane. -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -961,76 +1071,114 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of '-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar <conftest.tar]) + AM_RUN_LOG([cat conftest.dir/file]) + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar <conftest.tar]) - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR diff --git a/Build/source/libs/harfbuzz/configure b/Build/source/libs/harfbuzz/configure index 40808477065..2c45d673535 100755 --- a/Build/source/libs/harfbuzz/configure +++ b/Build/source/libs/harfbuzz/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for harfbuzz for TeX Live 0.9.15. +# Generated by GNU Autoconf 2.69 for harfbuzz for TeX Live 0.9.18. # # Report bugs to <tex-k@tug.org>. # @@ -590,12 +590,12 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='harfbuzz for TeX Live' PACKAGE_TARNAME='harfbuzz-for-tex-live' -PACKAGE_VERSION='0.9.15' -PACKAGE_STRING='harfbuzz for TeX Live 0.9.15' +PACKAGE_VERSION='0.9.18' +PACKAGE_STRING='harfbuzz for TeX Live 0.9.18' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' -ac_unique_file="harfbuzz-0.9.15/harfbuzz.pc.in" +ac_unique_file="harfbuzz-0.9.18/src/harfbuzz.pc.in" # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> @@ -1360,7 +1360,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 harfbuzz for TeX Live 0.9.15 to adapt to many kinds of systems. +\`configure' configures harfbuzz for TeX Live 0.9.18 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1431,7 +1431,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of harfbuzz for TeX Live 0.9.15:";; + short | recursive ) echo "Configuration of harfbuzz for TeX Live 0.9.18:";; esac cat <<\_ACEOF @@ -1555,7 +1555,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -harfbuzz for TeX Live configure 0.9.15 +harfbuzz for TeX Live configure 0.9.18 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2045,7 +2045,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 harfbuzz for TeX Live $as_me 0.9.15, which was +It was created by harfbuzz for TeX Live $as_me 0.9.18, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2426,7 +2426,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -am__api_version='1.13' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3742,6 +3742,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -3909,7 +3968,7 @@ fi # Define the identity of the package. PACKAGE='harfbuzz-for-tex-live' - VERSION='0.9.15' + VERSION='0.9.18' cat >>confdefs.h <<_ACEOF @@ -3949,6 +4008,10 @@ mkdir_p='$(MKDIR_P)' # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -3956,6 +4019,48 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -4065,8 +4170,8 @@ WARNING_CFLAGS=$kpse_cv_warning_cflags HB_VERSION_MAJOR=0 HB_VERSION_MINOR=9 -HB_VERSION_MICRO=15 -HB_VERSION=0.9.15 +HB_VERSION_MICRO=18 +HB_VERSION=0.9.18 ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -4607,6 +4712,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -16486,7 +16650,7 @@ Usage: $0 [OPTIONS] Report bugs to <bug-libtool@gnu.org>." lt_cl_version="\ -harfbuzz for TeX Live config.lt 0.9.15 +harfbuzz for TeX Live config.lt 0.9.18 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -18279,14 +18443,14 @@ $as_echo "#define HAVE_INTEL_ATOMIC_PRIMITIVES 1" >>confdefs.h fi -HARFBUZZ_TREE=harfbuzz-0.9.15 +HARFBUZZ_TREE=harfbuzz-0.9.18 if test -f $srcdir/$HARFBUZZ_TREE/src/hb-version.h; then as_fn_error $? "Sorry, you must remove the file $HARFBUZZ_TREE/src/hb-version.h" "$LINENO" 5 fi -ac_config_files="$ac_config_files Makefile include/Makefile hb-version.h:harfbuzz-0.9.15/src/hb-version.h.in" +ac_config_files="$ac_config_files Makefile include/Makefile hb-version.h:harfbuzz-0.9.18/src/hb-version.h.in" cat >confcache <<\_ACEOF @@ -18835,7 +18999,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 harfbuzz for TeX Live $as_me 0.9.15, which was +This file was extended by harfbuzz for TeX Live $as_me 0.9.18, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18901,7 +19065,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="\\ -harfbuzz for TeX Live config.status 0.9.15 +harfbuzz for TeX Live config.status 0.9.18 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -19411,7 +19575,7 @@ do "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "include/Makefile") CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; - "hb-version.h") CONFIG_FILES="$CONFIG_FILES hb-version.h:harfbuzz-0.9.15/src/hb-version.h.in" ;; + "hb-version.h") CONFIG_FILES="$CONFIG_FILES hb-version.h:harfbuzz-0.9.18/src/hb-version.h.in" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac @@ -20059,7 +20223,7 @@ $as_echo X"$mf" | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the diff --git a/Build/source/libs/harfbuzz/configure.ac b/Build/source/libs/harfbuzz/configure.ac index 3a345c4df50..623dbdd8fd7 100644 --- a/Build/source/libs/harfbuzz/configure.ac +++ b/Build/source/libs/harfbuzz/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2012, 2013 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -9,7 +9,7 @@ dnl m4_include([version.ac])[] dnl define harfbuzz_version AC_INIT([harfbuzz for TeX Live], harfbuzz_version, [tex-k@tug.org]) AC_PREREQ([2.65]) -AC_CONFIG_SRCDIR([harfbuzz-]harfbuzz_version[/harfbuzz.pc.in]) +AC_CONFIG_SRCDIR([harfbuzz-]harfbuzz_version[/src/harfbuzz.pc.in]) AC_CONFIG_AUX_DIR([../../build-aux]) AC_CONFIG_MACRO_DIR([../../m4]) diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/AUTHORS b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/AUTHORS deleted file mode 100644 index c611d7d4769..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/AUTHORS +++ /dev/null @@ -1,8 +0,0 @@ -Behdad Esfahbod -Simon Hausmann -Martin Hosken -Jonathan Kew -Lars Knoll -Werner Lemberg -Owen Taylor -David Turner diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/Android.mk b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/Android.mk deleted file mode 100644 index 3ada5f2e884..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/Android.mk +++ /dev/null @@ -1,78 +0,0 @@ -## -## Copyright (C) 2012 The Android Open Source Project -## -## Licensed under the Apache License, Version 2.0 (the "License"); -## you may not use this file except in compliance with the License. -## You may obtain a copy of the License at -## -## http://www.apache.org/licenses/LICENSE-2.0 -## -## Unless required by applicable law or agreed to in writing, software -## distributed under the License is distributed on an "AS IS" BASIS, -## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -## See the License for the specific language governing permissions and -## limitations under the License. -## - -LOCAL_PATH:= $(call my-dir) - -############################################################# -# build the harfbuzz library -# - -include $(CLEAR_VARS) - -LOCAL_ARM_MODE := arm - -LOCAL_MODULE_TAGS := optional - -LOCAL_SRC_FILES:= \ - src/hb-blob.cc \ - src/hb-buffer-serialize.cc \ - src/hb-buffer.cc \ - src/hb-common.cc \ - src/hb-fallback-shape.cc \ - src/hb-font.cc \ - src/hb-ot-tag.cc \ - src/hb-set.cc \ - src/hb-shape.cc \ - src/hb-shape-plan.cc \ - src/hb-shaper.cc \ - src/hb-tt-font.cc \ - src/hb-unicode.cc \ - src/hb-warning.cc \ - src/hb-ot-layout.cc \ - src/hb-ot-map.cc \ - src/hb-ot-shape.cc \ - src/hb-ot-shape-complex-arabic.cc \ - src/hb-ot-shape-complex-default.cc \ - src/hb-ot-shape-complex-indic.cc \ - src/hb-ot-shape-complex-indic-table.cc \ - src/hb-ot-shape-complex-myanmar.cc \ - src/hb-ot-shape-complex-sea.cc \ - src/hb-ot-shape-complex-thai.cc \ - src/hb-ot-shape-normalize.cc \ - src/hb-ot-shape-fallback.cc \ - src/hb-icu.cc - -LOCAL_CPP_EXTENSION := .cc - -LOCAL_SHARED_LIBRARIES := \ - libcutils \ - libicuuc \ - libicui18n \ - libutils - -LOCAL_C_INCLUDES += \ - $(LOCAL_PATH)/src \ - external/icu4c/common - -LOCAL_CFLAGS += -DHB_NO_MT -DHAVE_OT -DHAVE_ICU - -LOCAL_LDLIBS += -lpthread - -LOCAL_MODULE:= libharfbuzz_ng - -include $(BUILD_SHARED_LIBRARY) - - diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/ChangeLog deleted file mode 100644 index 014604b9691..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/ChangeLog +++ /dev/null @@ -1,34192 +0,0 @@ -commit ac064a2db2b7a010d99527e183145286215aea81 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 21 01:14:19 2012 -0500 - - Rename hb_set_population() to hb_set_get_population() - - src/hb-set.cc | 2 +- - src/hb-set.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 16c914c2a6efeb6999054333985b1f711e33cf94 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 21 01:04:15 2012 -0500 - - [Indic] One more try at unbreaking Khmer fonts - - See comments and discussion on the list. - - src/hb-ot-shape-complex-private.hh | 16 ++++++++++------ - 1 files changed, 10 insertions(+), 6 deletions(-) - -commit e8cfdd7fa8d0fb66e0a261f3547e5824897e5131 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 16 19:07:06 2012 -0800 - - Start implementing collect_glyphs() operation - - Not functional yet. - - src/hb-ot-layout-gsub-table.hh | 185 - ++++++++++++++++++++++++++++++++++ - src/hb-ot-layout-gsubgpos-private.hh | 57 +++++++++++ - src/hb-ot-layout.cc | 29 ++++++ - src/hb-ot-layout.h | 4 +- - 4 files changed, 272 insertions(+), 3 deletions(-) - -commit 7d52e6601f0e695690cd168a288466746cf25300 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 16 18:49:54 2012 -0800 - - Whitespace - - src/hb-coretext.cc | 32 ++++------ - src/hb-icu-le.cc | 2 +- - src/hb-old.cc | 10 ++-- - src/hb-open-file-private.hh | 2 +- - src/hb-open-type-private.hh | 2 +- - src/hb-ot-head-table.hh | 2 +- - src/hb-ot-hhea-table.hh | 2 +- - src/hb-ot-hmtx-table.hh | 2 +- - src/hb-ot-layout-common-private.hh | 2 +- - src/hb-ot-layout-gdef-table.hh | 2 +- - src/hb-ot-layout-gpos-table.hh | 2 +- - src/hb-ot-layout-gsub-table.hh | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - src/hb-ot-maxp-table.hh | 2 +- - src/hb-ot-name-table.hh | 2 +- - src/hb-ot-shape-complex-default.cc | 109 - +++++++++++++++++----------------- - src/hb-tt-font.cc | 2 +- - 17 files changed, 87 insertions(+), 92 deletions(-) - -commit 51bb498b7b07bff4a447405b72f09b68d07a3e95 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 16 14:08:05 2012 -0800 - - Minor - - src/hb-ot-shape.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 89ca8eeb83fedde06727d386369a0a39d410f12b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 16 13:53:40 2012 -0800 - - Implement hb_ot_layout_get_glyphs_in_class() - - src/hb-ot-layout-common-private.hh | 24 ++++++++++++++++++++++++ - src/hb-ot-layout-gdef-table.hh | 2 ++ - src/hb-ot-layout.cc | 8 ++++++++ - src/hb-ot-layout.h | 5 ++--- - 4 files changed, 36 insertions(+), 3 deletions(-) - -commit 5a08ecf9200a6ac9b4ebb7ec5c13dcb42d8820ce -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 16 13:34:29 2012 -0800 - - Implement hb_ot_layout_get_glyph_class() - - src/hb-ot-layout-gdef-table.hh | 10 +++++----- - src/hb-ot-layout-gpos-table.hh | 8 ++++---- - src/hb-ot-layout-gsub-table.hh | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 10 +++++----- - src/hb-ot-layout-private.hh | 10 +++++++++- - src/hb-ot-layout.cc | 6 ++++++ - src/hb-ot-layout.h | 14 ++++++-------- - src/hb-ot-shape.cc | 4 ++-- - 8 files changed, 38 insertions(+), 26 deletions(-) - -commit f9edd5d56bd219625f5b16b23eac53b4c4a8b194 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 16 13:23:37 2012 -0800 - - Implement hb_shape_plan_get_shaper() - - Untested. - - src/hb-shape-plan-private.hh | 1 + - src/hb-shape-plan.cc | 7 +++++++ - src/hb-shape-plan.h | 4 +--- - 3 files changed, 9 insertions(+), 3 deletions(-) - -commit 43b653150081a2f9dc6b7481229ac4cd952575dc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 16 13:12:35 2012 -0800 - - [Indic] Another try to unbreak Sinhala split matras - - Just read the comments... - - src/hb-ot-shape-complex-indic.cc | 43 - ++++++++++++++++---- - .../indic/script-sinhala/misc/MANIFEST | 1 + - .../indic/script-sinhala/misc/split-matras.txt | 4 ++ - 3 files changed, 40 insertions(+), 8 deletions(-) - -commit 977f1740ace730dcdff8221a17f2a592c2ec7c74 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 16 13:10:07 2012 -0800 - - Unbreak tests - - src/hb-ot-layout.h | 14 +++++++------- - src/hb-shape-plan.h | 2 +- - 2 files changed, 8 insertions(+), 8 deletions(-) - -commit eba312c8d1b2bbe8cb9b6414e843e78d2c521aa4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 16 12:39:23 2012 -0800 - - Plumbing to get shape plan and font into complex decompose function - - So we can handle Sinhala split matras smartly... Coming soon. - - src/hb-ot-shape-complex-default.cc | 6 ++-- - src/hb-ot-shape-complex-indic.cc | 14 ++++---- - src/hb-ot-shape-complex-private.hh | 16 +++++----- - src/hb-ot-shape-normalize-private.hh | 22 ++++++++++++- - src/hb-ot-shape-normalize.cc | 56 - +++++++++++++-------------------- - src/hb-ot-shape.cc | 2 +- - 6 files changed, 61 insertions(+), 55 deletions(-) - -commit 3f82f8ff07a9d16a7c047129658c1bbedfdb5436 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 15 18:45:31 2012 -0800 - - Rename hb_buffer_guess_properties() to - hb_buffer_guess_segment_properties() - - src/hb-buffer-private.hh | 2 +- - src/hb-buffer.cc | 6 +++--- - src/hb-buffer.h | 2 +- - src/hb-fallback-shape.cc | 2 +- - src/hb-ot-shape.cc | 2 +- - src/hb-shape.cc | 2 +- - 6 files changed, 8 insertions(+), 8 deletions(-) - -commit f30641038ba96e83950729b1bd9d86d2e98e46c5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 15 18:39:46 2012 -0800 - - Bunch of independent changes (ouch) - - API additions: - - hb_segment_properties_t - HB_SEGMENT_PROPERTIES_DEFAULT - hb_segment_properties_equal() - hb_segment_properties_hash() - - hb_buffer_set_segment_properties() - hb_buffer_get_segment_properties() - - hb_ot_layout_glyph_class_t - - hb_shape_plan_t - hb_shape_plan_create() - hb_shape_plan_create_cached() - hb_shape_plan_get_empty() - hb_shape_plan_reference() - hb_shape_plan_destroy() - hb_shape_plan_set_user_data() - hb_shape_plan_get_user_data() - hb_shape_plan_execute() - - hb_ot_shape_plan_collect_lookups() - - API changes: - - Rename hb_ot_layout_feature_get_lookup_indexes() to - hb_ot_layout_feature_get_lookups(). - - New header file: - - hb-shape-plan.h - - And a bunch of prototyped but not implemented stuff. Coming soon. - (Tests fail because of the prototypes right now.) - - src/Makefile.am | 2 +- - src/hb-buffer-private.hh | 37 -------------- - src/hb-buffer.cc | 45 +++++++++++++++++- - src/hb-buffer.h | 47 ++++++++++++++++-- - src/hb-ot-layout-private.hh | 8 --- - src/hb-ot-layout.cc | 12 ++-- - src/hb-ot-layout.h | 108 - +++++++++++++++++++++++++++++++++++++++-- - src/hb-ot-map-private.hh | 2 +- - src/hb-ot-map.cc | 15 +++--- - src/hb-ot-shape-private.hh | 11 ++++- - src/hb-ot-shape.cc | 52 ++++++++++++++------ - src/hb-ot.h | 1 + - src/hb-shape-plan-private.hh | 3 +- - src/hb-shape-plan.cc | 23 +++++++-- - src/hb-shape-plan.h | 50 +++++++++++++------- - src/hb-shaper-private.hh | 2 - - src/hb-shaper.cc | 2 +- - src/hb.h | 1 + - 18 files changed, 304 insertions(+), 117 deletions(-) - -commit 75da37dcb17aacc0be6bb006683a84aa31155938 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 15 18:39:23 2012 -0800 - - Minor - - util/hb-ot-shape-closure.cc | 24 ++++++++++++------------ - 1 files changed, 12 insertions(+), 12 deletions(-) - -commit e05a999495e6575f7cebd7f35db087d964f11ef6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 15 16:23:21 2012 -0800 - - Add hb_face_[sg]et_glyph_count() - - src/hb-font-private.hh | 9 +++++++++ - src/hb-font.cc | 29 ++++++++++++++++++++++++++++- - src/hb-font.h | 7 +++++++ - 3 files changed, 44 insertions(+), 1 deletions(-) - -commit aec89de5641fbe1c3031d63dd5f40ec99bf2a538 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 15 16:15:42 2012 -0800 - - Add / modify set API a bit - - src/hb-ot-shape.cc | 2 +- - src/hb-set-private.hh | 35 ++++++++++++++++- - src/hb-set.cc | 86 - +++++++++++++++++++++++++++++-------------- - src/hb-set.h | 55 ++++++++++++++++++--------- - util/hb-ot-shape-closure.cc | 2 +- - 5 files changed, 128 insertions(+), 52 deletions(-) - -commit c54599ad269380c7aa28d885fcfd660fc2c10a7b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 15 16:14:23 2012 -0800 - - Minor - - src/hb-buffer.cc | 2 +- - src/hb-buffer.h | 8 +++----- - 2 files changed, 4 insertions(+), 6 deletions(-) - -commit d1aa143ca434fe272de21d2002768c83387b583b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 15 15:38:08 2012 -0800 - - [Thai] Remove U+0E2C from "AC" consonants - - WinXP doesn't include it. - - src/hb-ot-shape-complex-thai.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 362a990b2246f5448ecb9d600761f710aea7d42d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 15 14:57:31 2012 -0800 - - Rename hb_ot_layout_would_substitute_lookup() and - hb_ot_layout_substitute_closure_lookup() - - To match upcoming API. - - src/hb-ot-layout-private.hh | 2 +- - src/hb-ot-layout.cc | 8 ++++---- - src/hb-ot-layout.h | 4 ++-- - src/hb-ot-map.cc | 2 +- - src/hb-ot-shape-complex-indic.cc | 2 +- - src/test-would-substitute.cc | 2 +- - 6 files changed, 10 insertions(+), 10 deletions(-) - -commit a4bef84e375b090c1bc7e4221b8e0ee435dfcbba -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 15 13:29:51 2012 -0800 - - [util] Make hb-shape err if output-format is not understood - - And list supported formats. - - util/hb-shape.cc | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 3cec819d39e45470d03085bb6fa132882cc85943 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 15 13:15:39 2012 -0800 - - Make the OT shaper default, even if CoreText or Uniscribe is enabled - - src/hb-shaper-list.hh | 15 ++++++++------- - 1 files changed, 8 insertions(+), 7 deletions(-) - -commit 072ae7a982bf640804eee0b41525e7c328806bf5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 15 13:14:12 2012 -0800 - - Add hb_buffer_serialize_list_formats() - - src/hb-buffer.cc | 6 ++++++ - src/hb-buffer.h | 3 +++ - 2 files changed, 9 insertions(+), 0 deletions(-) - -commit f9edf1672511c3bcc3796cc79578ffea43b2bda1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 15 12:14:09 2012 -0800 - - Add buffer serialization / deserialization API - - Two output formats for now: TEXT, and JSON. For example: - - hb-shape --output-format=json - - Deserialization API is added, but not implemented yet. - - src/hb-buffer.cc | 222 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-buffer.h | 42 ++++++++++ - util/hb-shape.cc | 21 +++++- - util/options.cc | 57 ++++---------- - util/options.hh | 7 +- - 5 files changed, 304 insertions(+), 45 deletions(-) - -commit fd0de881f4fc004da6f36d50a91d0e62f8eb4d8c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 15 10:47:14 2012 -0800 - - Avoid C++ undefined behavior - - https://bugzilla.mozilla.org/show_bug.cgi?id=810823 - - src/hb-open-type-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit f41dc2d35b23220d59d38990bb66f1cbd66a55b3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 15 10:36:43 2012 -0800 - - Fix undefined behavior in Indic dottedcircle - - Chromium Issue 158998: Conditional jump in harfbuzz-ng - http://code.google.com/p/chromium/issues/detail?id=158998 - - src/hb-ot-shape-complex-indic.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1eb3e94fe99a072ce422e60ac4d4d89ef489b08a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 14 17:25:03 2012 -0800 - - [Thai] Implement PUA-based fallback shaping - - As explained here: - - http://linux.thai.net/~thep/th-otf/shaping.html - - Our output now matches Uniscribe for old fonts (eg. XP Tahoma) with no - Thai GSUB table. - - src/hb-ot-shape-complex-thai.cc | 217 - +++++++++++++++++++++++++++++++++++++++ - 1 files changed, 217 insertions(+), 0 deletions(-) - -commit 851784f8372004e0a40b698c0cdc2d7db8629aa2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 14 16:24:05 2012 -0800 - - Improve shaper selection - - src/hb-ot-map-private.hh | 8 ++++---- - src/hb-ot-map.cc | 6 ++++-- - src/hb-ot-shape-complex-indic.cc | 2 +- - src/hb-ot-shape-complex-private.hh | 13 ++++++++----- - src/hb-ot-shape-complex-thai.cc | 24 ++++++++++++++++++++++-- - 5 files changed, 39 insertions(+), 14 deletions(-) - -commit f3584d3a3a627e38dfd7769975a670db340d2a48 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 14 15:55:17 2012 -0800 - - Add test cases for Thai PUA shaping - - .../in-tree/shaper-thai/script-thai/misc/MANIFEST | 1 + - .../shaper-thai/script-thai/misc/pua-shaping.txt | 11 +++++++++++ - 2 files changed, 12 insertions(+), 0 deletions(-) - -commit 43f04a7456419153cb03e610a825056a47824780 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 14 15:51:54 2012 -0800 - - Move Thai shaper into a separate file - - src/Makefile.am | 3 +- - src/hb-ot-shape-complex-default.cc | 225 ++++++++++++++++++++++++ - src/hb-ot-shape-complex-misc.cc | 339 - ------------------------------------ - src/hb-ot-shape-complex-thai.cc | 141 +++++++++++++++ - 4 files changed, 368 insertions(+), 340 deletions(-) - -commit ba82325b7a6311b787ae47f41a56964e2f2cba9f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 14 15:36:53 2012 -0800 - - Add note re 'Phags-pa letter U+A872, which is Joining_Type=L - - src/hb-ot-shape-complex-arabic.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit d469fadce8290c7dda559c5927dd19df65f91c1a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 14 15:07:36 2012 -0800 - - [Indic] Exchange abort() for assert() - - src/hb-ot-shape-complex-indic.cc | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 0f80a89de99293ddbf0b8b815fe360677d057e38 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 14 15:05:19 2012 -0800 - - Don't route Kharoshthi through the Indic shaper - - It's a simple, right-to-left, script. - - src/hb-ot-shape-complex-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e67072bb179a5c17db04075de74215597fb43c82 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 14 15:00:53 2012 -0800 - - [Indic] Handle overstruck matra position - - src/hb-ot-shape-complex-indic-private.hh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 7e99e4f0740e47efda5882604954cb7d12700a4b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 14 14:09:46 2012 -0800 - - Reposition Lao marks - - Lao marks are center-aligned, unlike Thai ones. - - src/hb-ot-shape-fallback.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 865745b5b87236651f5663cae3461db9cb505eed -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 14 13:48:26 2012 -0800 - - Don't do fallback positioning for Indic and Thai shapers - - src/hb-ot-shape-complex-arabic.cc | 1 + - src/hb-ot-shape-complex-indic.cc | 1 + - src/hb-ot-shape-complex-misc.cc | 2 ++ - src/hb-ot-shape-complex-private.hh | 1 + - src/hb-ot-shape.cc | 20 +++++--------------- - 5 files changed, 10 insertions(+), 15 deletions(-) - -commit 981748cb2e9b48b77177b19ec1f972cab7afda89 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 14 13:38:16 2012 -0800 - - [Indic] If Khmer fonts have a 'liga' feature, use generic shaper - - Seems to produce more coherent results than trying the Indic shaper on - them. I'm looking at you, Kh-* fonts... - - src/hb-ot-shape-complex-private.hh | 21 +++++++++++++++++---- - 1 files changed, 17 insertions(+), 4 deletions(-) - -commit 6b19fa48621dbf36d471d5005f6ae20df350954f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 14 11:38:50 2012 -0800 - - Adjust diff rule for the new hb-shape output format - - test/shaping/hb_test_tools.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit dde5506fd963e3cec27c3389bb1fc092f86d1e06 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 14 11:37:04 2012 -0800 - - [Indic] Don't move virama with left matra - - This is important for the Sinhala U+0DDA split matra since it - decomposes - to U+0DD9,U+0DCA where U+0DD9 is a left matra and U+0DCA is the - virama. - We don't want to move the virama with the left matra. - TEST: U+0D9A,U+0DDA - - Note that we were already doing this in the Uniscribe bug - compatibility - mode. We now do it all the time. - - src/hb-ot-shape-complex-indic.cc | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 82c4d9880a2cd321f6426888511c5f0318f96ad5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 14 10:56:02 2012 -0800 - - Add Sinhala test case for split matra U+0DDA - - .../indic/script-sinhala/misc/misc.txt | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit d04b12853167d756a8cccaf4154f0fd894bce6de -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 14 10:53:10 2012 -0800 - - Fix test - - test/api/test-buffer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 92f9bfed42f720c1fd78e795845542661aaf4f8a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 13 16:50:45 2012 -0800 - - Minor - - src/hb-buffer.h | 26 ++++++++++++++------------ - 1 files changed, 14 insertions(+), 12 deletions(-) - -commit 66ac2ff32e24f0d5658ca172147613081a133847 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 13 16:26:32 2012 -0800 - - API change: Remove "mask" from hb_buffer_add() - - I don't expect anybody using hb_buffer_add(), so this shouldn't break - anyone's code. - - src/hb-buffer-private.hh | 1 - - src/hb-buffer.cc | 8 +++----- - src/hb-buffer.h | 1 - - 3 files changed, 3 insertions(+), 7 deletions(-) - -commit 407f80d62589774f845ef1a6a0a7d841b09d57c6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 13 15:33:27 2012 -0800 - - [util] Add --bot / --eot / --preserve-default-ignorables - - util/options.cc | 3 +++ - util/options.hh | 12 ++++++++++++ - 2 files changed, 15 insertions(+), 0 deletions(-) - -commit 78d41d8d69142ae95928b51215c0c0c5e3f5b3f0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 13 15:15:09 2012 -0800 - - Minor - - util/options.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 321f73c16efa0730c96e001d65268f4927a0f735 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 13 15:12:24 2012 -0800 - - [util] Add --text-before and --text-after to hb-shape / hb-view - - Use with Arabic, for example, to see the effect on joining. - - util/hb-ot-shape-closure.cc | 4 +++- - util/main-font-text.hh | 2 +- - util/options.cc | 2 ++ - util/options.hh | 18 ++++++++++++++++-- - util/shape-consumer.hh | 6 ++++-- - 5 files changed, 26 insertions(+), 6 deletions(-) - -commit e13f8d280bafc6a6b6e31e2eee587660b8333c56 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 13 15:12:06 2012 -0800 - - Fix UTF-8 backward iteration - - Ouch! - - src/hb-utf-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 5669a6cf418f3a8b9281c36e9d662d843be80433 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 13 15:11:51 2012 -0800 - - [Arabic] Fix post-context handling - - Ouch! - - src/hb-ot-shape-complex-arabic.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0c7df2222862122ebbdc8665a21d6771ef5e0252 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 13 14:42:35 2012 -0800 - - Add buffer flags - - New API: - - hb_buffer_flags_t - - HB_BUFFER_FLAGS_DEFAULT - HB_BUFFER_FLAG_BOT - HB_BUFFER_FLAG_EOT - HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES - - hb_buffer_set_flags() - hb_buffer_get_flags() - - We use the BOT flag to decide whether to insert dottedcircle if the - first char in the buffer is a combining mark. - - The PRESERVE_DEFAULT_IGNORABLES flag prevents removal of characters - like - ZWNJ/ZWJ/... - - src/hb-buffer-private.hh | 1 + - src/hb-buffer.cc | 18 ++++++++++++++++ - src/hb-buffer.h | 13 ++++++++++++ - src/hb-ot-shape-complex-arabic.cc | 40 - +++++++++++++++++++----------------- - src/hb-ot-shape.cc | 9 +++++-- - test/api/test-buffer.c | 9 ++++++++ - 6 files changed, 68 insertions(+), 22 deletions(-) - -commit 1c7e55511a870f2689680ca8f977e00879f3b3e3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 13 14:42:22 2012 -0800 - - Minor fix - - Ouch - - src/hb-shape.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c8d4f8b0fe56ce909e3ca07f8a30cb4fb940868b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 13 14:10:19 2012 -0800 - - Minor - - test/api/test-object.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 82ecaff736e245e117d70b6ec1497508c6eb08d2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 13 13:57:52 2012 -0800 - - Add hb_buffer_clear() - - Which is like _reset(), but does NOT clear unicode-funcs. - - src/hb-buffer-private.hh | 1 + - src/hb-buffer.cc | 15 +++++++++++++++ - src/hb-buffer.h | 4 ++++ - test/api/test-buffer.c | 22 +++++++++++++++++++++- - 4 files changed, 41 insertions(+), 1 deletions(-) - -commit da43a92b04929e93356ae393803ef101154d2267 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 13 13:48:26 2012 -0800 - - 0.9.6 - - NEWS | 28 ++++++++++++++++++++++++++++ - configure.ac | 2 +- - 2 files changed, 29 insertions(+), 1 deletions(-) - -commit 0736915b8ed789a209205fec762997af3a8af89c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 13 12:35:35 2012 -0800 - - [Indic] Decompose Sinhala split matras the way old HarfBuzz / - Pango did - - Had to do some refactoring to make this happen... - - Under uniscribe bug compatibility mode, we still plit them - Uniscrie-style, but Jonathan and I convinced ourselves that there - is no - harm doing this the Unicode way. This change makes that happen, and - unbreaks free Sinhala fonts. - - src/hb-ot-shape-complex-arabic.cc | 2 + - src/hb-ot-shape-complex-indic.cc | 74 +++++++++- - src/hb-ot-shape-complex-misc.cc | 133 ++++++++++++++++- - src/hb-ot-shape-complex-private.hh | 28 +++- - src/hb-ot-shape-normalize-private.hh | 6 +- - src/hb-ot-shape-normalize.cc | 278 - +++++++++------------------------- - src/hb-ot-shape.cc | 5 +- - 7 files changed, 312 insertions(+), 214 deletions(-) - -commit c8149ca85ed97112778590bc9f090f3ee0254100 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 13 11:07:20 2012 -0800 - - [hb-shape] Adjust postioning output format - - 1. If there is any offset (x or y), print out both x and y offsets. - - 2. Always print out the advance in the major direction of the buffer. - Ie. even for zero-advance glyphs, print a "+0". This is more - intuitive. - - util/options.cc | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) - -commit 6fd5335622087e87739684f581aa9f88635ff970 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 18:42:18 2012 -0800 - - [Indic] Update auto-generated Indic machine to reflect previous commit - - src/hb-ot-shape-complex-indic-machine.hh | 1126 - +++++++++++++++--------------- - 1 files changed, 567 insertions(+), 559 deletions(-) - -commit 9cac1338c4bc3e9034cbfa104291ed0329debefe -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 18:41:22 2012 -0800 - - [Indic] Allow Consonant_Medial's after Consonant's - - Mostly affects Myanmar, but also Tai Tham, Javanese, and Cham. The - latter three are untested (no fonts!). - - src/hb-ot-shape-complex-indic-machine.rl | 3 ++- - src/hb-ot-shape-complex-indic-private.hh | 7 ++++--- - 2 files changed, 6 insertions(+), 4 deletions(-) - -commit d187099cbab8e75f870a2bc9c23b6a1cf226905e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 18:38:06 2012 -0800 - - [Indic] Categorize Myanmar "tone marks" as nuktas - - src/hb-ot-shape-complex-indic-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8173f23f3f16972c2e8e0a120724533100acfda2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 18:37:20 2012 -0800 - - [Indic] Add config for Myanmar - - src/hb-ot-shape-complex-indic.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 9e92978c8aa3d3cdab4d20c81698c56adbb3dbdd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 18:36:10 2012 -0800 - - [Indic] Route "new" Myanmar tag through the Indic shaper - - Windows 8 adds a Myanmar shaper using the 'mym2' tag. Route that - through the Indic shaper. It's still very broken, but at least this - does NOT break old-style Myanmar shaping using the generic shaper. - - src/hb-ot-shape-complex-private.hh | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit 5ab3855f8106158ee7e68797e8c35e63e9216e5d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 18:27:42 2012 -0800 - - Choose shaper based on chosen OT script tag - - For Arabic and Indic shapers, if the font doesn't have a script system - for the script, use default shaper. - - Make an exception for Arabic script since we have fallback logic for - that one. - - src/hb-ot-map-private.hh | 4 ++++ - src/hb-ot-shape-complex-private.hh | 11 +++++++++-- - 2 files changed, 13 insertions(+), 2 deletions(-) - -commit 9b37b4c5800b158f61602d2aba8a01349e24d251 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 18:23:38 2012 -0800 - - Make planner available to complex shaper choosing logic - - src/hb-ot-shape-complex-private.hh | 4 ++-- - src/hb-ot-shape.cc | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit 6fddf2d7397411bba8a23ac535e8b851495d3105 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 17:57:24 2012 -0800 - - Refactoring ot-map building to make chosen script available earlier - - src/hb-ot-map-private.hh | 13 +++++++--- - src/hb-ot-map.cc | 51 - +++++++++++++++++++++++++------------------- - src/hb-ot-shape-private.hh | 4 +- - 3 files changed, 40 insertions(+), 28 deletions(-) - -commit f17ed8116e7b6429af3fa60bb43d5f4fac66eae3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 17:48:26 2012 -0800 - - Minor TODO - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit de796a6fb98f4deda276caa82266b7c830978e0b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 17:27:51 2012 -0800 - - Add "new" Myanmar OT Script tag - - Windows 8 added support for Myanmar shaping using the "mym2" - script tag, - even though Windows never supported the old "mymr" tag. - - src/hb-ot-tag.cc | 2 ++ - test/api/test-ot-tag.c | 1 + - 2 files changed, 3 insertions(+), 0 deletions(-) - -commit 27f52dc3f6bbb97594a44f27b180aed73d9e5608 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 16:54:03 2012 -0800 - - Add Myanmar tests from UTN#11 - - .../south-east-asian/script-myanmar/misc/MANIFEST | 1 + - .../south-east-asian/script-myanmar/misc/utn11.txt | 34 - ++++++++++++++++++++ - 2 files changed, 35 insertions(+), 0 deletions(-) - -commit e9334ce97bb7f1de87fb211bb5a8168033629b14 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 14:57:02 2012 -0800 - - Break build when ragel is needed and missing - - src/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit dba186711e3f5e723f917b7104e849c4c525d3b8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 14:48:33 2012 -0800 - - [Indic] Make more room in the table - - To be used in upcoming commits. - - src/hb-ot-shape-complex-indic-private.hh | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit c4be9917438c45b972ec76dc68409014110f0837 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 14:27:33 2012 -0800 - - Typo - - src/hb-ot-shape-complex-indic.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 56be677781736bbedc80df6f6aaa2b5f0bc4041c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 14:09:40 2012 -0800 - - [Indic] Port 'pref' logic to look into font tables - - ...instead of using a hardcoded list of Ra characters. - - src/hb-ot-shape-complex-indic.cc | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit f2c0f59043c93c225274fc0c8177077d16c89d61 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 14:02:02 2012 -0800 - - [Indic] Port reph handling logic to look into font features - - ...instead of using a hardcoded list of Ra characters. - - src/hb-ot-shape-complex-indic.cc | 48 - +++++++++++++++++++++++-------------- - 1 files changed, 30 insertions(+), 18 deletions(-) - -commit 43149afbc0007ea075a7017c0e56056c3c0f3614 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 13:34:17 2012 -0800 - - Route MEETEI_MAYEK through the Indic shaper - - Since it has a couple of left-"matras". - - src/hb-ot-shape-complex-private.hh | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit d0905c3400085f9c0901c558ba1b81b5039510e4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 13:02:20 2012 -0800 - - Minor - - src/hb-ot-head-table.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 365f27ab5ba025bf1be6a882ed213c695cbfed7e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 11:16:57 2012 -0800 - - Work around older compilers - - As reported on the list: - - I am seeing a similar problem building harfbuzz 0.9.5 with Apple gcc - 4.0.1 on OS X 10.5 Leopard: - - hb-ot-layout-common-private.hh:406: error: 'struct - OT::CoverageFormat1::Iter' is private - hb-ot-layout-common-private.hh:646: error: within this context - hb-ot-layout-common-private.hh:500: error: 'struct - OT::CoverageFormat2::Iter' is private - hb-ot-layout-common-private.hh:647: error: within this context - make[4]: *** [libharfbuzz_la-hb-ot-layout.lo] Error 1 - - Also reported as happening with MSVC 2005. - - src/hb-ot-layout-common-private.hh | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 6b389ddc3623d042ded4731f4d62dc354002fdd0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 11:02:56 2012 -0800 - - [Indic] Don't apply 'liga' - - Uniscribe doesn't. And some fonts abuse this feature to get Indic - shaping working in non-complex applications like Adobe's apps. - - No change in numbers: - - BENGALI: 353897 out of 354188 tests passed. 291 failed (0.0821598%) - DEVANAGARI: 707337 out of 707394 tests passed. 57 failed (0.00805774%) - GUJARATI: 366440 out of 366457 tests passed. 17 failed (0.00463902%) - GURMUKHI: 60704 out of 60747 tests passed. 43 failed (0.0707854%) - KANNADA: 951046 out of 951913 tests passed. 867 failed (0.0910798%) - KHMER: 299074 out of 299124 tests passed. 50 failed (0.0167155%) - LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) - MALAYALAM: 1048011 out of 1048334 tests passed. 323 failed - (0.0308108%) - ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) - SINHALA: 271666 out of 271847 tests passed. 181 failed (0.0665816%) - TAMIL: 1091754 out of 1091754 tests passed. 0 failed (0%) - TELUGU: 970557 out of 970573 tests passed. 16 failed (0.00164851%) - TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) - - src/hb-ot-shape-complex-indic.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit d05ac7dc3f2949e85f1fe996315b31b7aae370fe -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 10:26:50 2012 -0800 - - Fix hb-ft glyph name for broken fonts that return empty glyph names - - src/hb-ft.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3bc22eb7b843c77706bb13fc332009097f247813 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 12 10:07:28 2012 -0800 - - Minor - - util/options.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4899801155cc0fef7a8aa58c33ac2d30ba34bcc3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 8 15:08:26 2012 -0800 - - U+A872 PHAGS-PA SUPERFIXED LETTER RA is "Right"-Joining - - src/hb-ot-shape-complex-arabic.cc | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 22a685836a59d1c02914761c02d3852810b83ec5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 5 15:20:10 2012 -0800 - - Adjust Mongolian shaping - - For U+1880..U+1886 Uniscribe thinks they are non-joining. - For U+1887 Uniscribe thinks it's joining, but looks wrong to me. - For now, match Uniscribe. - - src/hb-ot-shape-complex-arabic.cc | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit e6b86c8519f894bf7fe18d5c143276521fcacece -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 5 15:18:49 2012 -0800 - - Add test for non-joining Mongolian letters - - For U+1880..U+1886 Uniscribe thinks they are non-joining. - For U+1887 Uniscribe thinks it's joining, but looks wrong to me. - - .../shaper-arabic/script-mongolian/misc/MANIFEST | 1 + - .../script-mongolian/misc/non-joining.txt | 8 ++++++++ - 2 files changed, 9 insertions(+), 0 deletions(-) - -commit c26a52fbe62e5ba4d0e1e2ba13bfb6ceb3f773dc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Nov 4 16:48:45 2012 -0800 - - Minor - - src/hb-ot-shape-fallback.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f60d3ed35d94f1adcfd73ca05d03d7e81fb5de03 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Nov 4 16:44:47 2012 -0800 - - Minor - - src/hb-set-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f5e55754f962184d2fb7dcab837cdba56e8c7731 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 2 13:53:18 2012 -0700 - - Add Tifinagh test data - - test/shaping/texts/in-tree/shaper-default/MANIFEST | 2 ++ - .../shaper-default/script-tifinagh/MANIFEST | 1 + - .../shaper-default/script-tifinagh/misc/MANIFEST | 1 + - .../shaper-default/script-tifinagh/misc/misc.txt | 11 +++++++++++ - 4 files changed, 15 insertions(+), 0 deletions(-) - -commit 10a33296e674ee84b9ed2df25cf373de7d020b8d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 2 13:38:55 2012 -0700 - - Minor - - src/hb-ot-tag.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit c21498afd857e78230f761ee5c9e73adece89dd0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 2 10:21:26 2012 -0700 - - Add Mongolian and 'Phags-pa joining test cases - - test/shaping/texts/in-tree/shaper-arabic/MANIFEST | 1 + - .../shaper-arabic/script-mongolian/misc/misc.txt | 3 +++ - .../in-tree/shaper-arabic/script-phags-pa/MANIFEST | 1 + - .../shaper-arabic/script-phags-pa/misc/MANIFEST | 1 + - .../shaper-arabic/script-phags-pa/misc/misc.txt | 14 ++++++++++++++ - 5 files changed, 20 insertions(+), 0 deletions(-) - -commit 3ba7bc14ea652d27639f34109e51a497a678a54a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 1 20:05:04 2012 -0700 - - Implement 'Phags-pa shaping - - Through the Arabic shaper. It's similar to Mongolian. - - src/hb-ot-shape-complex-arabic.cc | 15 ++++++++++++--- - src/hb-ot-shape-complex-private.hh | 4 +--- - 2 files changed, 13 insertions(+), 6 deletions(-) - -commit 431bef2e16c7888ca3960f5797432d3a20903550 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 1 16:26:01 2012 -0700 - - Minor build fix - - test/api/Makefile.am | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) - -commit da70111ab234e8b740ce6fb1789a1809fbec0c44 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 31 13:45:30 2012 -0700 - - Don't clear buffer pre-context if no new context is being provided - - Patch from Jonathan Kew. - - Part of fixing: - - Mozilla Bug 801410 - avoid inserting dotted-circle for run-initial - Unicode combining characters in "simple" scripts such as Latin - - https://bugzilla.mozilla.org/show_bug.cgi?id=801410 - - src/hb-buffer.cc | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -commit 0bc7a38463bfb37f12efeb1b8cb2024cf4a347bc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Oct 29 22:02:45 2012 -0700 - - [OT] Fix ReverseChainingSubst - - We should make it clear that we don't want output buffer in this case, - otherwise buffer->backtrack_len() would be wrong. - - src/hb-buffer-private.hh | 1 + - src/hb-buffer.cc | 13 +++++++++++++ - src/hb-ot-layout-gsub-table.hh | 1 + - 3 files changed, 15 insertions(+), 0 deletions(-) - -commit 2616689d159024d2b1cb1e68f9936b2129bf9be6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Oct 29 21:51:56 2012 -0700 - - More tracing fixups - - src/hb-ot-layout-gsubgpos-private.hh | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) - -commit 937f8d3871863b8b1ed1d8900cf41999d92ba30f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Oct 29 21:49:33 2012 -0700 - - [Arabic] Enable dlig and mset for Arabic - - That's what the spec says, and what Uniscribe does. - - src/hb-ot-shape-complex-arabic.cc | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 911ed096980630fd4a37bf2024036daae13a6056 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Oct 29 19:42:19 2012 -0700 - - Ignore gid0 in test results - - test/shaping/hb_test_tools.py | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit bc513add7999baf32f126ceebbd318105ee66985 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Oct 29 19:03:55 2012 -0700 - - Add missing TRACE_RETURN - - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 10b88d89ef1efcfddbbfabd3669399b472c8a900 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Oct 29 18:18:24 2012 -0700 - - Add Ethiopic test case - - This sequence: U+120B,U+135F,U+120B with the Nyala font from Win7 - exposes a GPOS bug in Uniscribe, in that the positioned mark is - wrongly - moved as a result a following kern. - - This is the one "failure" in the Ethiopic test suite :-). - - ETHIOPIC: 118900 out of 118901 tests passed. 1 failed (0.000841036%) - - .../shaper-default/script-ethiopic/MANIFEST | 1 + - .../shaper-default/script-ethiopic/misc/MANIFEST | 1 + - .../shaper-default/script-ethiopic/misc/misc.txt | 1 + - 3 files changed, 3 insertions(+), 0 deletions(-) - -commit 88d3c98e309e14c3115825d1d8d40d0b3eec2d97 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Oct 29 16:27:02 2012 -0700 - - [Indic] Position pre-base reordering Ra after Chillus in Malayalam - - The logic for pre-base reordering follows the left matra logic. - We had an exception for Malayalam/Tamil in the left matra - repositioning - which was not reflected in pre-base reordering. - - Malayalam failures down from 337 to 323. - - BENGALI: 353996 out of 354285 tests passed. 289 failed (0.0815727%) - DEVANAGARI: 707339 out of 707394 tests passed. 55 failed (0.00777502%) - GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) - GURMUKHI: 60769 out of 60809 tests passed. 40 failed (0.0657797%) - KANNADA: 951086 out of 951913 tests passed. 827 failed (0.0868777%) - KHMER: 299106 out of 299124 tests passed. 18 failed (0.00601757%) - LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) - MALAYALAM: 1048011 out of 1048334 tests passed. 323 failed - (0.0308108%) - ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) - SINHALA: 271726 out of 271847 tests passed. 121 failed (0.0445103%) - TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) - TELUGU: 970558 out of 970573 tests passed. 15 failed (0.00154548%) - TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) - - src/hb-ot-shape-complex-indic.cc | 35 - +++++++++++++++++++++-------------- - 1 files changed, 21 insertions(+), 14 deletions(-) - -commit 21bf796954678d02f136709cade43adef6f8f42b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Oct 29 14:21:09 2012 -0700 - - Add missed file - - src/hb-ucdn/COPYING | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) - -commit 01013a0f5c58d5d54a37e5b4d6692e0bbd4baf80 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Oct 29 10:56:04 2012 -0700 - - Include config.h.in in tree - - I typically don't like including generating files in tree. - But like to - make an exception for this, since this forms the canonical list of - options one would need to go through when building with alternative - build systems. - - Makefile.am | 1 - - config.h.in | 160 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 160 insertions(+), 1 deletions(-) - -commit 02ed52169ad3bb48f4989f721b0c6572e064a712 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Oct 28 21:26:19 2012 -0700 - - Improve license information - - COPYING | 2 ++ - src/hb-icu-le/COPYING | 2 ++ - src/hb-icu-le/Makefile.am | 2 +- - src/hb-ucdn/Makefile.am | 2 +- - src/hb-ucdn/README | 7 +++++++ - 5 files changed, 13 insertions(+), 2 deletions(-) - -commit 4c1d9244617e472464722e64d2cdbc1f9e8827f6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Oct 28 20:27:25 2012 -0700 - - Minor - - src/hb-icu-le.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 38b015e57ffa75d3b078a368c23685beb7c3f946 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Oct 28 20:11:47 2012 -0700 - - Fix hb_buffer_set_length(buffer, 0) - - Was causing invalid realloc()s. - - src/hb-buffer.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b7115b63be72e109b51f538ba581aed1017b2d55 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Oct 28 20:11:42 2012 -0700 - - Add XXX - - src/hb-icu-le.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 71ee1f24503cd066ffc1a36cc5dd9a3c1d1a6dfd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Oct 28 19:18:11 2012 -0700 - - Port to ICU LayoutEngine C API - - Incidentally, this makes it not crash with icu-le-hb anymore... - I'm not smart / stupid enough to spend two more days debugging C++ - linking issues, and this is ABI-stable at least. - - src/hb-icu-le.cc | 31 ++++++++++++++++--------------- - 1 files changed, 16 insertions(+), 15 deletions(-) - -commit 0144f05e57088b30ac894cdae8b04b265d4dfbe7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Oct 26 13:48:06 2012 -0700 - - Remove unused members - - src/hb-icu-le/PortableFontInstance.h | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit cf3afd8979b1db76d437f428cbd51cb363e0d18e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Oct 25 16:32:54 2012 -0700 - - Rename and revamp is_zero_width() to be is_default_ignorable() - - That's really the logic desired. Except that MONGOLIAN VOWEL - SEPARATOR - is not default_ignorable but it really should be. Reported to - Unicode. - - Based on suggestion from Konstantin Ritt. - - src/hb-fallback-shape.cc | 2 +- - src/hb-ot-shape-private.hh | 4 +- - src/hb-ot-shape.cc | 2 +- - src/hb-unicode-private.hh | 90 - ++++++++++++++++++++++++++++--------------- - 4 files changed, 62 insertions(+), 36 deletions(-) - -commit a724139e641bf1592b1ff786a75a9de2ea8163cf -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 24 14:02:15 2012 -0700 - - Update TODO - - TODO | 14 ++++++++++---- - 1 files changed, 10 insertions(+), 4 deletions(-) - -commit 13c058472913b7b6d689f9022226079da65420b0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Oct 14 18:37:09 2012 -0500 - - 0.9.5 - - NEWS | 23 +++++++++++++++++++++++ - configure.ac | 2 +- - 2 files changed, 24 insertions(+), 1 deletions(-) - -commit fecdfa95daf4916695f23e7dab89ab363be11b89 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Oct 7 17:19:58 2012 -0400 - - Fixup hb_ot_shape_closure() - - Broke it when merged cmap mapping and normalizer. Ouch! - - src/hb-ot-shape.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 2d1dcb3ce3354c2d5e2b4d1d291beb8d23cdea22 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Oct 7 17:13:46 2012 -0400 - - Mark debug message functions static - - src/hb-private.hh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 9947bd6daffb5ec76b67536575e7617ba4f10b1e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 2 20:44:43 2012 -0400 - - Update UCDN to upstream commit - 3f159c87824230b59af56e40e2db32caf6afa51a - - - Unicode 6.2.0 goodness, - - Unassigned codepoints now have correct properties. Passes test - suite. - - src/hb-ucdn/unicodedata_db.h | 1966 - ++++++++++++++++++++++-------------------- - 1 files changed, 1036 insertions(+), 930 deletions(-) - -commit 32dbfcf763d1ae497d3c95de986a83441331678f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 2 17:42:13 2012 -0400 - - Fix visibility of UCDN symbols - - src/hb-ucdn.cc | 2 -- - src/hb-ucdn/ucdn.h | 19 +++++++++++++++++++ - 2 files changed, 19 insertions(+), 2 deletions(-) - -commit 3f33f0d1f2603f22e86adffe3c3836136ba5e5fd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 2 16:03:18 2012 -0400 - - Import UCDN into source tree - - https://github.com/grigorig/ucdn - - configure.ac | 11 +- - src/Makefile.am | 7 + - src/hb-ucdn.cc | 207 ++ - src/hb-ucdn/Makefile.am | 18 + - src/hb-ucdn/README | 33 + - src/hb-ucdn/ucdn.c | 282 +++ - src/hb-ucdn/ucdn.h | 290 +++ - src/hb-ucdn/unicodedata_db.h | 4648 - ++++++++++++++++++++++++++++++++++++++++++ - src/hb-unicode.cc | 3 + - 9 files changed, 5498 insertions(+), 1 deletions(-) - -commit 0e292eb2a2abbac152eeea2060e58b7a66449745 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 2 14:59:00 2012 -0400 - - Remove Glib thread-safety support - - Now that we have pthread detection in configure, we don't need Glib - anymore. Glib will only be a Unicode data provider. - - configure.ac | 8 ++++---- - src/hb-atomic-private.hh | 13 ------------- - src/hb-mutex-private.hh | 20 -------------------- - 3 files changed, 4 insertions(+), 37 deletions(-) - -commit 66efe896483c58f3ef9bd218c02bb7ea604f68ee -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 2 14:55:32 2012 -0400 - - Check for pthreads - - configure.ac | 7 +++++++ - src/Makefile.am | 5 +++++ - 2 files changed, 12 insertions(+), 0 deletions(-) - -commit 10a8162dddb8b39ae130fe5bb7d1819471fa7e06 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 2 14:46:34 2012 -0400 - - Add ax_pthread.m4 - - m4/ax_pthread.m4 | 309 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 309 insertions(+), 0 deletions(-) - -commit 8ac34bc6ff1d0646503a45659b1846d8cf9c0603 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 2 14:46:04 2012 -0400 - - Add pkg.m4 to git repo - - m4/pkg.m4 | 157 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 157 insertions(+), 0 deletions(-) - -commit c7afac0aa6e51e6a49ebf13f72537398698c9e49 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 2 14:44:47 2012 -0400 - - Add AC_CONFIG_MACRODIR - - Makefile.am | 2 ++ - configure.ac | 2 ++ - 2 files changed, 4 insertions(+), 0 deletions(-) - -commit f2eb3fa9dca8d21fae20c9b9dddad3245df74a05 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 25 21:35:35 2012 -0400 - - [OT] Only insert dottedcircle if at the beginning of paragraph - - If the first char in the run is a combining mark, but there is text - before the run, don't insert dottedcircle. - - Part of addressing: - https://bugzilla.redhat.com/show_bug.cgi?id=858736 - - src/hb-ot-shape.cc | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit bdc2fc8294da7f374701aafe9f5a82d60633946f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 25 21:32:35 2012 -0400 - - [Arabic] Respect Arabic joining from neighboring context - - Now we respect Arabic joining across runs. - - src/hb-ot-shape-complex-arabic.cc | 31 +++++++++++++++++++++++++++++-- - 1 files changed, 29 insertions(+), 2 deletions(-) - -commit 05207a79e0ae1769c5feaebe3fd99bdf9cfcf834 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 25 17:44:53 2012 -0400 - - [buffer] Save pre/post textual context - - To be used for a variety of purposes. We save up to five characters - in each direction. No public API changes, everything is taken care - of already. All clients need to do is to call hb_buffer_add_utf* with - the full text + segment info (or at least some context) instead of - just passing in the segment. - - Various operations (hb_buffer_reset, hb_buffer_set_length, - hb_buffer_add*) automatically reset the relevant contexts. - - src/hb-buffer-private.hh | 13 ++++++++++++- - src/hb-buffer.cc | 44 - ++++++++++++++++++++++++++++++++++++++++---- - src/hb-buffer.h | 2 +- - 3 files changed, 53 insertions(+), 6 deletions(-) - -commit 89ac39dbbe028e6379f64392f2e590e3f1fdd847 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 25 13:59:24 2012 -0400 - - Add hb_utf_prev() - - src/hb-utf-private.hh | 71 - +++++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 69 insertions(+), 2 deletions(-) - -commit 70ea4ac6887c7057113d714a98e55738b6196562 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 25 12:30:16 2012 -0400 - - Slightly optimize UTF-8 parsing - - src/hb-utf-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 4445e5e2ecc257a5d0fa2f2715bb7181a47346da -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 25 12:26:12 2012 -0400 - - [buffer] Cleanup / optimize UTF-16 parsing a bit - - src/hb-utf-private.hh | 12 +++++++----- - 1 files changed, 7 insertions(+), 5 deletions(-) - -commit 1f66c3c1a0eb869c0d85a015235313177e0cec62 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 25 11:42:16 2012 -0400 - - Add hb_utf_strlen() - - Speeds up UTF-8 parsing by calling strlen(). - - src/hb-buffer.cc | 13 ++----------- - src/hb-utf-private.hh | 22 ++++++++++++++++++++++ - 2 files changed, 24 insertions(+), 11 deletions(-) - -commit 7f19ae7b9f806a2e35206b2ad41651c5f80b2537 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 25 11:22:28 2012 -0400 - - [buffer] Templatize UTF handling - - Also move UTF routines into a separate file, to be reused from shapers - that need it. - - src/Makefile.am | 1 + - src/hb-buffer.cc | 157 - +++++++++++++------------------------------------ - src/hb-utf-private.hh | 113 +++++++++++++++++++++++++++++++++++ - 3 files changed, 155 insertions(+), 116 deletions(-) - -commit 0e0a4da9b7677a09e00d27313236e1f333864dd6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 25 11:09:04 2012 -0400 - - [buffer] Towards template'izing different UTF adders - - src/hb-buffer.cc | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) - -commit 7d37280600c157f3c4eae8746e99511702a58e8f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 25 11:04:41 2012 -0400 - - Minor - - src/hb-buffer.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 54d5da4ee9d902ff36473cec558137eef8f23825 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 25 10:50:41 2012 -0400 - - Remove unused indic.cc - - src/Makefile.am | 6 +----- - src/indic.cc | 51 - --------------------------------------------------- - 2 files changed, 1 insertions(+), 56 deletions(-) - -commit fab7a71f110ed646745d54b23284537c50058c21 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 24 21:51:13 2012 -0400 - - [Indic] Import ragel-generated Indic machine in git - - I don't expect ragel to be creating too much noise in its generated - output, and including this in-tree helps users right now. We can - revisit this later if it proved to be too much trouble. - - autogen.sh | 6 - - src/Makefile.am | 1 - - src/hb-ot-shape-complex-indic-machine.hh | 1314 - ++++++++++++++++++++++++++++++ - 3 files changed, 1314 insertions(+), 7 deletions(-) - -commit 20a840c7cd08069720050782b4533cde505df09a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 24 20:23:00 2012 -0400 - - Use a C++ linker on Windows - - On Windows we don't care whether or not we link to libstdc++. - Seems to fix build with mingw32 on msys, as reported by Werner. - - src/Makefile.am | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit eb7669a38072b66eef3bd905a93c4815bef3f0e5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 18 19:42:06 2012 -0400 - - Better autofoo - - src/Makefile.am | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -commit d00f7d83750258eff915a3826700c4819e63e481 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 17 20:59:09 2012 -0400 - - Fix dependencies - - src/Makefile.am | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 811eefe225d20b20f1de20c6e62a0ebd6d89102a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 10 09:56:27 2012 -0400 - - Return NULL, not false - - Oh well... - - src/hb-open-type-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 166b5cf7ec2d37fb54a909c437ccdec1edaf37aa -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Sep 7 14:55:07 2012 -0400 - - [Indic] Find syllables before any features are applied - - With FreeSerif, it seems that the 'ccmp' feature does ligature - substituttions. That was then causing syllable match failures. - We now - find syllables before any features have been applied. - - Test sequence: U+0D9A,U+0DCA,U+200D,U+0DBB,U+0DCF - - src/hb-ot-shape-complex-indic-machine.rl | 4 +- - src/hb-ot-shape-complex-indic.cc | 56 - ++++++++++++++------ - .../indic/script-sinhala/misc/misc.txt | 1 + - 3 files changed, 43 insertions(+), 18 deletions(-) - -commit 96fdc04e5c6daafce3d45e7508418e4db94df44c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Sep 6 22:26:16 2012 -0400 - - Add hb_buffer_[sg]et_content_type - - And hb_buffer_content_type_t and enum values. - - TODO | 1 + - src/hb-buffer-private.hh | 2 ++ - src/hb-buffer.cc | 34 ++++++++++++++++++++++++++++++++++ - src/hb-buffer.h | 14 ++++++++++++++ - src/hb-shape.cc | 5 +++++ - 5 files changed, 56 insertions(+), 0 deletions(-) - -commit e30ebd2794b37bd8ec716a258d5cb017fb1dfadc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Sep 6 22:09:06 2012 -0400 - - Add hb_feature_to/from_string() - - TODO | 4 +- - src/hb-common.cc | 9 +++ - src/hb-common.h | 6 ++- - src/hb-shape.cc | 168 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-shape.h | 13 ++++ - util/options.cc | 132 +----------------------------------------- - 6 files changed, 201 insertions(+), 131 deletions(-) - -commit f67917161bbe317a33d6407fbc62ebffcafe7154 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Sep 6 17:22:31 2012 -0400 - - [OT] Do per-ligature-component fallback mark positioning - - With this in place, you can remove GDEF/GSUB/GPOS tables from Arabic - fonts and still get per-component marks positioned on - oh-yeah-fallback-formed LAM-ALEF ligatures with marks in between - the LAM - and ALEF. - - Now *that*'s pretty cool, if a bit anachronistic... - - src/hb-ot-shape-fallback.cc | 43 - ++++++++++++++++++++++++++++++++++++------- - 1 files changed, 36 insertions(+), 7 deletions(-) - -commit 525c6855783a018d52867b9ece2ee90868ff1f91 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Sep 6 16:02:07 2012 -0400 - - [OT] Make fallback mark positioning more robust - - ...with clusters spanning multiple base characters. - - src/hb-ot-shape-fallback.cc | 11 +++++++++-- - 1 files changed, 9 insertions(+), 2 deletions(-) - -commit 5d502443f5a07cbd0aa860dd71a0fa4ea8b6ff9f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Sep 6 15:29:29 2012 -0400 - - [old] Clear offset array - - src/hb-old.cc | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 9433c218b4853442dd9ad53d0588a837a33dbf1e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Sep 6 14:27:15 2012 -0400 - - [OT] Simplify fallback positioning condition - - src/hb-ot-shape-fallback.cc | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 028a1706f898bfcee0d14acfba47ebe1de09f0c4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Sep 6 14:25:48 2012 -0400 - - Refactor common macro - - src/hb-ot-shape-fallback.cc | 5 +---- - src/hb-ot-shape-normalize.cc | 5 +---- - src/hb-ot-shape.cc | 5 +---- - src/hb-unicode-private.hh | 9 +++++++++ - 4 files changed, 12 insertions(+), 12 deletions(-) - -commit 07cfbe21b511056d5c3c75cbfe84e4e982c3e8fb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Sep 6 01:16:39 2012 -0400 - - [OT] Streamline Arabic fallback shaping table - - src/gen-arabic-table.py | 6 +- - src/hb-ot-shape-complex-arabic-fallback.hh | 2 +- - src/hb-ot-shape-complex-arabic-table.hh | 266 - ++++++++++++++-------------- - 3 files changed, 137 insertions(+), 137 deletions(-) - -commit 82f6b6f388b801a1483854cb56a2cadbb94e0f2b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Sep 6 01:12:50 2012 -0400 - - Minor - - src/hb-ot-shape-complex-arabic-fallback.hh | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) - -commit fabd3113a98c5f4114f48920fa7ea38bd65a8d32 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Sep 5 22:19:28 2012 -0400 - - [OT] Port Arabic fallback shaping to synthetic GSUB - - All of init/medi/fina/isol and rlig implemented. - - Let there be dragons... ⻯ - - src/Makefile.am | 1 + - src/hb-open-type-private.hh | 69 +++++--- - src/hb-ot-layout-common-private.hh | 9 +- - src/hb-ot-layout-gsub-table.hh | 11 +- - src/hb-ot-map-private.hh | 6 + - src/hb-ot-map.cc | 1 + - src/hb-ot-shape-complex-arabic-fallback.hh | 252 - ++++++++++++++++++++++++++++ - src/hb-ot-shape-complex-arabic.cc | 158 +++++------------- - src/hb-ot-shape.cc | 7 +- - src/hb-private.hh | 11 +- - 10 files changed, 369 insertions(+), 156 deletions(-) - -commit f0b8ed1b6dd9f1d2b9084c101a6fc5dee0cc22a8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Sep 5 17:32:57 2012 -0400 - - [Indic] Allow "H,ZWJ,M" - - Uniscribe accepts a Halant,ZWJ before matras. Allow that. - - BENGALI down from 295 to 291 - DEVANAGARI down from 69 to 57 - GUJARATI down from 19 to 17 - KANNADA down from 871 to 867 - MALAYALAM down from 340 to 337 - TELUGU down from 20 to 16 - - Currently at: - - BENGALI: 353897 out of 354188 tests passed. 291 failed (0.0821598%) - DEVANAGARI: 707337 out of 707394 tests passed. 57 failed (0.00805774%) - GUJARATI: 366440 out of 366457 tests passed. 17 failed (0.00463902%) - GURMUKHI: 60704 out of 60747 tests passed. 43 failed (0.0707854%) - KANNADA: 951046 out of 951913 tests passed. 867 failed (0.0910798%) - KHMER: 299077 out of 299124 tests passed. 47 failed (0.0157125%) - LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) - MALAYALAM: 1047997 out of 1048334 tests passed. 337 failed - (0.0321462%) - ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) - SINHALA: 271666 out of 271847 tests passed. 181 failed (0.0665816%) - TAMIL: 1091754 out of 1091754 tests passed. 0 failed (0%) - TELUGU: 970557 out of 970573 tests passed. 16 failed (0.00164851%) - TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) - - src/hb-ot-shape-complex-indic-machine.rl | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4ed717ef61813fa16cf74f2874848e9feb81568f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Sep 5 17:21:17 2012 -0400 - - [Indic] Relax grammar - - Now that we insert dotted-circle, tests break more easily when - our indic - machine breaks. - - In particular, a few Devanagari tests were having sequences like - "C,H,ZWJ,N", and because of the ZWJ the Nukta does NOT get reordered - to - before the Halant as the grammar used to expect... Fixup. - - Another case is as simple as "C,ZWJ,SM". - - Fixes 10 out of 79 failures: - - DEVANAGARI: 707325 out of 707394 tests passed. 69 failed (0.00975411%) - - src/hb-ot-shape-complex-indic-machine.rl | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit aa7141efe49991a1160489106984e95163fe2ab8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Sep 5 15:54:21 2012 -0400 - - [Indic] Fix Khmer syllable-final coeng-consonant - - Brings down Khmer failures from 162 to 47. - - KHMER: 299077 out of 299124 tests passed. 47 failed (0.0157125%) - - Also rebaselined some of the test files that had only-inherited lines. - Removing those, the stats are: - - BENGALI: 353893 out of 354188 tests passed. 295 failed (0.0832891%) - DEVANAGARI: 707315 out of 707394 tests passed. 79 failed (0.0111678%) - GUJARATI: 366438 out of 366457 tests passed. 19 failed (0.00518478%) - GURMUKHI: 60704 out of 60747 tests passed. 43 failed (0.0707854%) - KANNADA: 951042 out of 951913 tests passed. 871 failed (0.0915%) - KHMER: 299077 out of 299124 tests passed. 47 failed (0.0157125%) - LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) - MALAYALAM: 1047994 out of 1048334 tests passed. 340 failed - (0.0324324%) - ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) - SINHALA: 271666 out of 271847 tests passed. 181 failed (0.0665816%) - TAMIL: 1091754 out of 1091754 tests passed. 0 failed (0%) - TELUGU: 970553 out of 970573 tests passed. 20 failed (0.00206064%) - TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) - - Still some regressions, but some of the more egregious cases are - addressed. - - src/hb-ot-shape-complex-indic-machine.rl | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit efb8d3eb713bca7cbfca41380a012bdb4d380e5c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Sep 5 15:50:47 2012 -0400 - - Fixup test failure reporting - - After we implemented dotted-circle, we were still ignoring any tests - that had dottedcircle in it for any of the shapers. That meant - that if - we wrongly outputted dottedcircle, the test was being ignored. Ouch! - - Fixing that shows regressions across the board. Most are Uniscribe - bugs: NOT inserting dotted-circle when it should. Some are arou - machine bugs. This is in fact a nice way to catch Indic-machine - deficiencies and when I fix the regressions, our clusters should be - much closer to Uniscribe. For now, we regressed from: - - BENGALI: 353997 out of 354285 tests passed. 288 failed (0.0812905%) - DEVANAGARI: 707339 out of 707394 tests passed. 55 failed (0.00777502%) - GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) - GURMUKHI: 60769 out of 60809 tests passed. 40 failed (0.0657797%) - KANNADA: 951086 out of 951913 tests passed. 827 failed (0.0868777%) - KHMER: 299106 out of 299124 tests passed. 18 failed (0.00601757%) - LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) - MALAYALAM: 1048104 out of 1048416 tests passed. 312 failed - (0.0297592%) - ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) - SINHALA: 271747 out of 271847 tests passed. 100 failed (0.0367854%) - TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) - TELUGU: 970558 out of 970573 tests passed. 15 failed (0.00154548%) - TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) - - To: - - BENGALI: 353990 out of 354285 tests passed. 295 failed (0.0832663%) - DEVANAGARI: 707315 out of 707394 tests passed. 79 failed (0.0111678%) - GUJARATI: 366447 out of 366506 tests passed. 59 failed (0.016098%) - GURMUKHI: 60707 out of 60809 tests passed. 102 failed (0.167738%) - KANNADA: 951042 out of 951913 tests passed. 871 failed (0.0915%) - KHMER: 298962 out of 299124 tests passed. 162 failed (0.0541581%) - LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) - MALAYALAM: 1048074 out of 1048416 tests passed. 342 failed - (0.0326206%) - ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) - SINHALA: 271666 out of 271847 tests passed. 181 failed (0.0665816%) - TAMIL: 1091835 out of 1091837 tests passed. 2 failed (0.000183178%) - TELUGU: 970553 out of 970573 tests passed. 20 failed (0.00206064%) - TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) - - Investigating. - - test/shaping/hb_test_tools.py | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit 27bd55bd2ca599d501f10c2fae81861137517e46 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Sep 5 15:11:14 2012 -0400 - - [Indic] Tamil does not have half-forms either - - The Win7 Tamil font does not realy on this behavior, but the WinXP - version does. Handle Tamil like Malayalam: Matras always move to - before base. - - WinXP Tamil failures went down from 168964 (15.4752%) to 167 - (0.0152953%) (two orders of magnitude reduction!). - - Included in this is a minor fixup that actually fixed a few tests - with non-Tamil too. Numbers at: - - BENGALI: 353997 out of 354285 tests passed. 288 failed (0.0812905%) - DEVANAGARI: 707339 out of 707394 tests passed. 55 failed (0.00777502%) - GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) - GURMUKHI: 60769 out of 60809 tests passed. 40 failed (0.0657797%) - KANNADA: 951086 out of 951913 tests passed. 827 failed (0.0868777%) - KHMER: 299106 out of 299124 tests passed. 18 failed (0.00601757%) - LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) - MALAYALAM: 1048104 out of 1048416 tests passed. 312 failed - (0.0297592%) - ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) - SINHALA: 271747 out of 271847 tests passed. 100 failed (0.0367854%) - TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) - TELUGU: 970558 out of 970573 tests passed. 15 failed (0.00154548%) - TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) - - src/hb-ot-shape-complex-indic.cc | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 87b75d0a4aa03fe7a03e3bf7baf8ece131aec1bb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 4 23:06:38 2012 -0400 - - [OT] Allow adding features with fallback implementation - - src/hb-ot-map-private.hh | 7 ++++--- - src/hb-ot-map.cc | 6 ++++-- - 2 files changed, 8 insertions(+), 5 deletions(-) - -commit 1d3947a6bda6986c9c7d993589053051c119cc81 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 4 22:42:17 2012 -0400 - - Minor - - src/hb-ot-layout-gpos-table.hh | 2 +- - src/hb-ot-layout-gsub-table.hh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit b3b89b66586897a69b410ef02e7434691de84ae6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 4 21:13:17 2012 -0400 - - [OT] Add SubstLookup serialize API - - src/hb-ot-layout-common-private.hh | 2 +- - src/hb-ot-layout-gsub-table.hh | 65 - +++++++++++++++++++++++++++++++++++- - 2 files changed, 65 insertions(+), 2 deletions(-) - -commit 715e03bc21d6adaa8e1f647235843839dc47dad1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 4 20:10:17 2012 -0400 - - Minor - - src/hb-open-type-private.hh | 7 ++----- - 1 files changed, 2 insertions(+), 5 deletions(-) - -commit 652d1e0d64e47313ead2fc8318d1236f0e0d80ca -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 4 20:00:44 2012 -0400 - - [OT] Start adding Lookup-level serialize API - - src/hb-ot-layout-common-private.hh | 20 +++++++++++++++++++- - 1 files changed, 19 insertions(+), 1 deletions(-) - -commit a930c68e9c50aade78c1eb0eef075c9c117e4ef6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 4 18:17:57 2012 -0400 - - [OT] More serialize. Implements all basic GSUB subtables - - src/hb-open-type-private.hh | 53 +++++++++++++++- - src/hb-ot-layout-common-private.hh | 8 ++- - src/hb-ot-layout-gsub-table.hh | 125 - ++++++++++++++++++++++++++++-------- - 3 files changed, 156 insertions(+), 30 deletions(-) - -commit 1b38b4e817d871b9549be65af6030bd0eea7f775 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 4 18:17:21 2012 -0400 - - Minor - - src/hb-ot-layout-gsub-table.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit f7e81ce0b882aa942ae33c787e741c5e8e5a0173 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 4 15:32:37 2012 -0400 - - 0.9.4 - - NEWS | 18 ++++++++++++++++++ - configure.ac | 2 +- - 2 files changed, 19 insertions(+), 1 deletions(-) - -commit 2bd9fe359839a653f7caae534bf768af1735f155 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 4 15:15:19 2012 -0400 - - Refactor - - src/hb-ot-layout-gpos-table.hh | 7 ++----- - src/hb-ot-layout-gsub-table.hh | 16 +++++----------- - src/hb-ot-layout-gsubgpos-private.hh | 13 +++---------- - src/hb-ot-layout.cc | 23 +++++++++++++++++------ - src/hb-ot-shape-complex-arabic.cc | 4 +--- - 5 files changed, 28 insertions(+), 35 deletions(-) - -commit a5ddd9e31cd7906c4b559aa5b2fafdae4b9c8935 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 4 14:55:00 2012 -0400 - - [OT] Really fix possible NULL dereference this time - - src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- - src/hb-ot-layout.cc | 6 +++--- - src/hb-ot-shape-complex-arabic.cc | 4 +++- - 3 files changed, 10 insertions(+), 8 deletions(-) - -commit 29416833584d7831ece84aaeada6f5ebba7828c0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 3 23:31:14 2012 -0400 - - [OT] Implement serialize() for AlternateSubst - - src/hb-ot-layout-gsub-table.hh | 33 +++++++++++++++++++++++++++++++++ - 1 files changed, 33 insertions(+), 0 deletions(-) - -commit 1f07e3382a1608b054cbf88b89fef74f6c485434 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 3 23:28:34 2012 -0400 - - [OT] Implement serialize() for MultiSubst - - src/hb-open-type-private.hh | 10 +++++++++ - src/hb-ot-layout-gsub-table.hh | 43 - ++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 53 insertions(+), 0 deletions(-) - -commit 4912030dfba740c822e200d33cbb5c6dbbeaf79e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 3 20:58:03 2012 -0400 - - Minor - - src/hb-open-type-private.hh | 4 ++-- - src/hb-ot-layout-gsub-table.hh | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit f8fa2b5cf67b02d74514dec7885d03de73ec7349 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 3 20:19:46 2012 -0400 - - Fix possible NULL dereference - - As reported by Kenichi Ishibashi. - - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4b312fb288faa383a2c5bd3be0428f0e58e02699 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Sep 1 21:56:06 2012 -0400 - - [OT] Remove serialize alignment - - Will reintroduce in a different way when we actually need it. - - src/hb-open-type-private.hh | 24 +++++++++++------------- - 1 files changed, 11 insertions(+), 13 deletions(-) - -commit c61be03d6df122f18eebda3b29e42c9e768d45b9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Sep 1 21:43:38 2012 -0400 - - [OT] A bit more serialize - - src/hb-open-type-private.hh | 14 +++++++++++ - src/hb-ot-layout-common-private.hh | 2 +- - src/hb-ot-layout-gsub-table.hh | 43 - ++++++++++++++++++++++++++++++++++- - 3 files changed, 56 insertions(+), 3 deletions(-) - -commit abcc5ac1fde1c493e4055dd2f27b8aade7713156 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Sep 1 21:30:17 2012 -0400 - - [OT] Improve serialize syntax - - For some definition of improvement... - - src/hb-open-type-private.hh | 6 ++++-- - src/hb-ot-layout-gsub-table.hh | 3 +-- - 2 files changed, 5 insertions(+), 4 deletions(-) - -commit bc5be24014371ceb811b9ffd37062ede63d87bb1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Sep 1 20:48:22 2012 -0400 - - [OT] Restart work on serialize() - - src/hb-open-type-private.hh | 39 +++++++++++++++++----- - src/hb-ot-layout-common-private.hh | 61 - +++++++++++++++++------------------ - src/hb-ot-layout-gsub-table.hh | 13 ++++++++ - 3 files changed, 73 insertions(+), 40 deletions(-) - -commit 6912e476dd92639c3ddf07ca51c8d4a262c8b3a5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Sep 1 20:38:45 2012 -0400 - - [OT] Insert dotted-circle for run-initial marks - - Unfortunately if the font has GPOS and 'mark' feature does - not position mark on dotted-circle, our inserted dotted-circle - will not get the mark repositioned to itself. Uniscribe cheats - here. - - If there is no GPOS however, the fallback positioning kicks in - and sorts this out. - - I'm not willing to address the first case. - - src/hb-ot-shape.cc | 32 ++++++++++++++++++++++++++++++++ - 1 files changed, 32 insertions(+), 0 deletions(-) - -commit 1d581ec384bc1780995e32e1c44103af57596eda -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Sep 1 20:06:26 2012 -0400 - - [OT] Fallback-position ccc=0 Thai / Lao marks - - Not perfect, but so is fallback positioning in 2012... - - src/hb-ot-shape-fallback.cc | 56 - +++++++++++++++++++++++++++++++++++------- - 1 files changed, 46 insertions(+), 10 deletions(-) - -commit 3992b5ec4cb43d114d87ff7ee2b992bcf819c9cd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Sep 1 19:20:41 2012 -0400 - - Move code around - - src/hb-ot-shape-fallback-private.hh | 5 ++++ - src/hb-ot-shape-fallback.cc | 46 - +++++++++++++++++++++++----------- - src/hb-ot-shape-private.hh | 6 ++++ - src/hb-ot-shape.cc | 4 +++ - 4 files changed, 46 insertions(+), 15 deletions(-) - -commit b85800f9de8976a7418ef9df467d3080c6ab0199 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 31 18:12:01 2012 -0400 - - [Indic] Implement dotted-circle insertion for broken clusters - - No panic, we reeally insert dotted circle when it's absolutely broken. - - Fixes most of the dotted-circle cases against Uniscribe. (for - Devanagari - fixes 80% of them, for Khmer 70%; the rest look like Uniscribe being - really bogus...) - - I had to make a decision. Apparently Uniscribe adds one dotted circle - to each broken character. I tried that, but that goes wrong - easily with - split matras. So I made it add only one dotted circle to an entire - broken syllable tail. As in: "if there was a dotted circle here, this - would have formed a correct cluster." That works better for split - stuff, and I like it more. - - src/hb-buffer-private.hh | 1 + - src/hb-buffer.cc | 10 ++++ - src/hb-ot-shape-complex-indic-machine.rl | 4 +- - src/hb-ot-shape-complex-indic-private.hh | 2 +- - src/hb-ot-shape-complex-indic.cc | 67 - +++++++++++++++++++++++++++--- - src/hb-ot-shape-normalize-private.hh | 1 + - src/hb-ot-shape-normalize.cc | 11 +++-- - 7 files changed, 83 insertions(+), 13 deletions(-) - -commit 327d14ef188396006d54af976506ab6f8bb2869a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 31 16:49:34 2012 -0400 - - [Indic] Start adding dotted-circle instrastructure - - src/hb-ot-shape-complex-indic-machine.rl | 19 ++++++------ - src/hb-ot-shape-complex-indic.cc | 46 - +++++++++++++++++++++++++++-- - 2 files changed, 51 insertions(+), 14 deletions(-) - -commit 1be368e96fb7de8c77bf992874e0d5bd6b272ebe -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 31 16:29:17 2012 -0400 - - Minor - - src/hb-buffer-private.hh | 16 +++++++++++++++- - src/hb-buffer.cc | 15 --------------- - 2 files changed, 15 insertions(+), 16 deletions(-) - -commit 784f29d061a2939562eca0c4943feb01174aee00 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 31 14:06:26 2012 -0400 - - Minor - - src/hb-ot-shape.cc | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) - -commit 5a7f18767a87a3f07269d0814f984a98f86ab852 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 30 22:53:29 2012 -0400 - - [OT] Better fallback-position Thai / Lao ccc!=0 marks - - src/hb-ot-shape-fallback.cc | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 9f2348de58f0f85593027378169bc03c4dd64e59 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 29 21:08:59 2012 -0400 - - [OT] Add serialize() for Coverage - - src/hb-open-type-private.hh | 34 ++++++++++++++++--- - src/hb-ot-layout-common-private.hh | 62 - ++++++++++++++++++++++++++++++++++++ - 2 files changed, 90 insertions(+), 6 deletions(-) - -commit e901b954c6ec44ac3ae7fb3c326e6e7a40718e4b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 29 20:26:08 2012 -0400 - - [OT] Start adding serialize() API - - src/hb-open-type-private.hh | 77 - +++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 77 insertions(+), 0 deletions(-) - -commit 965c280de09b49d711cb78d629da321c802084de -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 29 13:59:16 2012 -0400 - - Add HB_BUFFER_ASSERT_VAR - - To be used in places we access buffer vars... - - src/hb-buffer-private.hh | 3 +++ - src/hb-buffer.cc | 16 ++++++++++++++++ - 2 files changed, 19 insertions(+), 0 deletions(-) - -commit 0ccf9b64736559a230425fd131c9eb8aa3048221 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 29 11:53:26 2012 -0400 - - Move code around - - src/hb-ot-shape.cc | 21 ++++++++++----------- - 1 files changed, 10 insertions(+), 11 deletions(-) - -commit 2fcbbdb41a322f54b61d9ce983ab54434504c5ed -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 29 11:11:54 2012 -0400 - - Port Arabic fallback ligating to share code with GSUB - - This will eventually allow us to skip marks, as well as (fallback) - attach marks to ligature components of fallback-shaped Arabic. - That would be pretty cool. I kludged GDEF props in, so mark-skipping - works, but the produced ligature id/components will be cleared later - by substitute_start() et al. - - Perhaps using a synthetic table for Arabic fallback shaping was - a better - idea. The current approach has way too many layering violations... - - src/hb-ot-layout-gsubgpos-private.hh | 4 ++ - src/hb-ot-shape-complex-arabic.cc | 72 - +++++++++++++++++++++++----------- - src/hb-ot-shape.cc | 4 +- - 3 files changed, 56 insertions(+), 24 deletions(-) - -commit 5e399a8a45bddb49e06e2ca39df1ed04398c0aff -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 29 10:40:49 2012 -0400 - - Minor - - src/hb-ot-layout-gsub-table.hh | 1 - - src/hb-ot-layout-gsubgpos-private.hh | 1 - - 2 files changed, 0 insertions(+), 2 deletions(-) - -commit a177d027d1d0ad9539e30ed75d8652e0e8da20ff -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 28 23:18:22 2012 -0400 - - [GSUB] Move ligation logic over - - src/hb-ot-layout-gsub-table.hh | 78 - ++++----------------------------- - src/hb-ot-layout-gsubgpos-private.hh | 80 - ++++++++++++++++++++++++++++++++++ - 2 files changed, 89 insertions(+), 69 deletions(-) - -commit 191fa885d9e0a2dce92dd8727cddd18495e62409 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 28 22:58:55 2012 -0400 - - [GSUB] Merge Ligature and context input matching - - Looks better now... - - TODO | 4 -- - src/hb-ot-layout-gsub-table.hh | 71 - ++++++--------------------------- - src/hb-ot-layout-gsubgpos-private.hh | 29 +++++++++++++- - 3 files changed, 40 insertions(+), 64 deletions(-) - -commit 93814ca7dc2a7251f861c1c47ba155ba6e6bdf19 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 28 22:24:51 2012 -0400 - - Start converging Ligature and match_input - - src/hb-ot-layout-gsub-table.hh | 58 - ++++++++++++++++--------------- - src/hb-ot-layout-gsubgpos-private.hh | 62 - ++++++++++++++++++++++++++-------- - 2 files changed, 78 insertions(+), 42 deletions(-) - -commit 2eef71737ea29ffadbb5a2be4a898b44f53f66ac -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 28 19:16:38 2012 -0400 - - [hb-icu-le] Add visbility - - src/hb-icu-le/FontTableCache.h | 6 ++++- - src/hb-icu-le/PortableFontInstance.cpp | 39 - -------------------------------- - src/hb-icu-le/PortableFontInstance.h | 7 ++++- - src/hb-icu-le/cmaps.cpp | 2 +- - src/hb-icu-le/cmaps.h | 5 +++- - src/hb-icu-le/letest.h | 14 +++++++++++ - src/hb-icu-le/sfnt.h | 6 ++++- - 7 files changed, 34 insertions(+), 45 deletions(-) - -commit d59e28e49204ed609d8a1bf3c0f21ab5fc178337 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 28 19:08:36 2012 -0400 - - Minor - - src/Makefile.am | 6 +++++- - src/check-libstdc++.sh | 2 +- - src/check-static-inits.sh | 4 ++-- - 3 files changed, 8 insertions(+), 4 deletions(-) - -commit af169d2813ff8075288cd4a7811f0715e4fea3da -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 28 19:08:22 2012 -0400 - - Minor - - src/hb-icu-le/PortableFontInstance.h | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 52ff2681d88886e2165ced397966ba29c2073583 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 28 18:03:35 2012 -0400 - - Use VisualStudio-style atomic intrinsics on mingw32 - - src/hb-atomic-private.hh | 25 ++++++++++++++++++------- - 1 files changed, 18 insertions(+), 7 deletions(-) - -commit 7c8e844d92aa604fc4b396343721ea90eb83adb8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 28 17:57:49 2012 -0400 - - Use namespace for OpenType tables - - Avoids USHORT, SHORT, ULONG, LONG clashes with Windows API. - - src/hb-font.cc | 12 ++-- - src/hb-open-file-private.hh | 4 ++ - src/hb-open-type-private.hh | 9 ++-- - src/hb-ot-head-table.hh | 4 ++ - src/hb-ot-hhea-table.hh | 5 ++ - src/hb-ot-hmtx-table.hh | 6 ++ - src/hb-ot-layout-common-private.hh | 5 ++ - src/hb-ot-layout-gdef-table.hh | 4 ++ - src/hb-ot-layout-gpos-table.hh | 4 ++ - src/hb-ot-layout-gsub-table.hh | 4 ++ - src/hb-ot-layout-gsubgpos-private.hh | 4 ++ - src/hb-ot-layout-private.hh | 12 +++- - src/hb-ot-layout.cc | 91 - +++++++++++++++++----------------- - src/hb-ot-maxp-table.hh | 4 ++ - src/hb-ot-name-table.hh | 4 ++ - src/hb-uniscribe.cc | 8 +-- - src/main.cc | 2 + - 17 files changed, 117 insertions(+), 65 deletions(-) - -commit dc5df5af6b349c3d9e4ab876864d9dec8096401f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 28 16:31:23 2012 -0400 - - Revert "Minor" - - This reverts commit 3e0a03978b91994bb7fa7922593cbdfc50878dfc. - - I know remember why that line is there :). - - src/hb-ot-shape-complex-arabic.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 3e0a03978b91994bb7fa7922593cbdfc50878dfc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 27 17:10:02 2012 -0400 - - Minor - - src/hb-ot-shape-complex-arabic.cc | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 667218a5b134728863a318c73070f4e323590bbd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 27 17:00:44 2012 -0400 - - Minor - - src/hb-ot-shape-fallback.cc | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit 30dd62251fcd04c2cbaa9b979d47ddbf62c6d460 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 27 16:54:34 2012 -0400 - - Only fallback-position glyphs if we have the ccc - - Previously, ccc=0 Thai / Lao marks were being - mispositioned. Don't touch them. - - src/hb-ot-shape-fallback.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e1ba62811a61afb046d349e578cd141363c7fb34 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 27 16:28:05 2012 -0400 - - Center unknown marks horizontally - - src/hb-ot-shape-fallback.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit a4e75e4128751bb902117abc1a59dce4f2147672 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 27 15:54:15 2012 -0400 - - Minor - - test/shaping/hb_test_tools.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 23b0e9d7dc801e11640979af3c2b00649a519bb1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 26 14:30:18 2012 -0400 - - [Indic] Fix switch - - D'oh. Was working by pure chance :)). - - src/hb-ot-shape-complex-indic.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ae4d4e1de6b4512576080e95896383887b30982f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 26 14:27:44 2012 -0400 - - Bug 53815 - CoreText backend doesn't link - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ec0e46376a2afec4ff7606f95582b0ec49c2a44a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 24 00:44:53 2012 -0400 - - Remove TODO items - - TODO | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit 56e878ab875ff06d74702145e380e198be967bd6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 24 00:41:51 2012 -0400 - - [graphite2] Cleanup scratch buffer allocation - - src/hb-graphite2.cc | 77 - +++++++++++++++++++++++++++++---------------------- - 1 files changed, 44 insertions(+), 33 deletions(-) - -commit 2f7586c6229096143ca0a96712a27416ee0d3c85 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 23 23:59:55 2012 -0400 - - [icu-le] Implement icu layout engine shaper - - configure.ac | 2 +- - src/hb-icu-le.cc | 113 - ++++++++++++++++++++++++++++++++++++++++++++---- - src/hb-icu-le/cmaps.h | 1 - - src/hb-shaper-list.hh | 4 ++ - 4 files changed, 108 insertions(+), 12 deletions(-) - -commit ba7f6c3797e5b440557bacd9b666bf09713dca76 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 23 21:52:44 2012 -0400 - - [icu-le] Hook up to hb_face_t - - src/hb-icu-le.cc | 17 +++- - src/hb-icu-le/FontTableCache.cpp | 34 ++++---- - src/hb-icu-le/FontTableCache.h | 9 ++- - src/hb-icu-le/PortableFontInstance.cpp | 144 - +++----------------------------- - src/hb-icu-le/PortableFontInstance.h | 21 ++--- - src/hb-icu-le/README | 1 + - 6 files changed, 57 insertions(+), 169 deletions(-) - -commit e96bb36995b2a5321b4d32bb11906e1701aaf115 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 23 21:37:51 2012 -0400 - - [icu-le] Actually use the FontTableCache - - src/hb-icu-le/PortableFontInstance.cpp | 25 ++++++++----------------- - 1 files changed, 8 insertions(+), 17 deletions(-) - -commit 7d242364ea647f655a7092bda25f9a10774c57f5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 23 21:23:41 2012 -0400 - - [icu-le] Start adding a icu-layout-engine backend - - Import PortableFontInstance and add shaper stub. - - configure.ac | 9 + - src/Makefile.am | 8 + - src/hb-icu-le.cc | 111 ++++++++ - src/hb-icu-le/FontTableCache.cpp | 91 +++++++ - src/hb-icu-le/FontTableCache.h | 41 +++ - src/hb-icu-le/Makefile.am | 25 ++ - src/hb-icu-le/PortableFontInstance.cpp | 436 - +++++++++++++++++++++++++++++++ - src/hb-icu-le/PortableFontInstance.h | 117 +++++++++ - src/hb-icu-le/README | 2 + - src/hb-icu-le/cmaps.cpp | 200 ++++++++++++++ - src/hb-icu-le/cmaps.h | 85 ++++++ - src/hb-icu-le/letest.h | 49 ++++ - src/hb-icu-le/license.html | 51 ++++ - src/hb-icu-le/sfnt.h | 449 - ++++++++++++++++++++++++++++++++ - 14 files changed, 1674 insertions(+), 0 deletions(-) - -commit b5584ee4be46b47e1678acf28426970a6d670b4f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 23 16:26:07 2012 -0400 - - [Indic] For old-spec, match non-zero context - - Fixes consonant-position with old-spec Malayalam. Uniscribe seem - to be - doing this. Fixes below-base La (eg. Pa,H,La) with AnjaliNewLipi.ttf. - Doesn't regress new-spec or other scripts. - - src/hb-ot-shape-complex-indic.cc | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit d9b204d3d24cde165167714728bf380267903d6a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 23 16:22:28 2012 -0400 - - [GSUB] Allow non-zero-context matching in would_apply() - - To be used in the next patch. - - src/hb-ot-layout-gsubgpos-private.hh | 6 ++++-- - src/hb-ot-layout-private.hh | 3 ++- - src/hb-ot-layout.cc | 14 ++++++++------ - src/hb-ot-layout.h | 7 ++++--- - src/hb-ot-map.cc | 12 ++---------- - src/hb-ot-shape-complex-indic.cc | 2 +- - src/test-would-substitute.cc | 2 +- - 7 files changed, 22 insertions(+), 24 deletions(-) - -commit 1f2bb172fe9a173ecfd61054f1fdd850943ef059 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 23 16:10:37 2012 -0400 - - Revert "[Indic/GSUB] Ignore context when matching would_apply()" - - This reverts commit 24dd4e56743c6ce5e01cb710ca9e01b3e527af58. - - Oops. My bad. The change _regressed_ Malayalam test suite, not - improved it. I'll redo it, differentiating between old-spec and - new-spec cases. - - src/hb-ot-layout-gsubgpos-private.hh | 8 +++----- - 1 files changed, 3 insertions(+), 5 deletions(-) - -commit 24dd4e56743c6ce5e01cb710ca9e01b3e527af58 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 23 15:47:10 2012 -0400 - - [Indic/GSUB] Ignore context when matching would_apply() - - The MS Indic specs say "...all classifications are determined - ... using - context-free substitutions." However, testing shows that MS's - Malayalam - shapers (both old and new), "match" even if there is no zero-context - rule. - We follow. - - Fixes below-base La (eg. Pa,H,La) with AnjaliNewLipi.ttf (old spec). - Moreover, test suite Malayalam failures are down to 312 from 875! No - change in other scripts. - - Current numbers: - - BENGALI: 353996 out of 354285 tests passed. 289 failed (0.0815727%) - DEVANAGARI: 707339 out of 707394 tests passed. 55 failed (0.00777502%) - GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) - GURMUKHI: 60769 out of 60809 tests passed. 40 failed (0.0657797%) - KANNADA: 951086 out of 951913 tests passed. 827 failed (0.0868777%) - KHMER: 299106 out of 299124 tests passed. 18 failed (0.00601757%) - LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) - MALAYALAM: 1047541 out of 1048416 tests passed. 875 failed - (0.0834592%) - ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) - SINHALA: 271726 out of 271847 tests passed. 121 failed (0.0445103%) - TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) - TELUGU: 970558 out of 970573 tests passed. 15 failed (0.00154548%) - TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) - - src/hb-ot-layout-gsubgpos-private.hh | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit 6732d62e78b13842ead9549c97bede25c73976cb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 23 15:19:45 2012 -0400 - - [Indic] Implement pre-base reordering Ra for old-spec Malayalam - - Fixes Pa,H,Ra sequence with AnjaliNewLipi.ttf. - - src/hb-ot-shape-complex-indic.cc | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 80cd92326f8a3f48a7821e720e8ecb2072e73286 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 23 12:06:14 2012 -0400 - - [Indic] Only apply basic features per-syllable - - Free up syllables and let features work across syllables for the - presentation forms features and GPOS. - - Fixed: - - 1 GURMUKHI test (remains 40) - - 12 KHMER tests (remains 18) - - 11 SINHALA tests (remains 121) - - Regresses: - - 5 MALAYALAM tests (up to 312) - - Current numbers: - - BENGALI: 353996 out of 354285 tests passed. 289 failed (0.0815727%) - DEVANAGARI: 707339 out of 707394 tests passed. 55 failed (0.00777502%) - GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) - GURMUKHI: 60769 out of 60809 tests passed. 40 failed (0.0657797%) - KANNADA: 951086 out of 951913 tests passed. 827 failed (0.0868777%) - KHMER: 299106 out of 299124 tests passed. 18 failed (0.00601757%) - LAO: 53611 out of 53644 tests passed. 33 failed (0.0615167%) - MALAYALAM: 1048104 out of 1048416 tests passed. 312 failed - (0.0297592%) - ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) - SINHALA: 271726 out of 271847 tests passed. 121 failed (0.0445103%) - TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) - TELUGU: 970558 out of 970573 tests passed. 15 failed (0.00154548%) - TIBETAN: 208469 out of 208469 tests passed. 0 failed (0%) - - src/hb-ot-shape-complex-indic.cc | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit df5d5c68f3a5cab17bf4a429802a1a1a834c3456 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 23 09:33:30 2012 -0400 - - Whitespace - - src/hb-ot-layout-gpos-table.hh | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) - -commit 7fe00d15da20193ca94a8ead9aee60df24074a9e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 18 13:59:46 2012 -0400 - - Release 0.9.3 - - NEWS | 16 ++++++++++++++++ - configure.ac | 2 +- - 2 files changed, 17 insertions(+), 1 deletions(-) - -commit 7068e534c4ef7ed2eb7ef8e1370fd4a449556ce8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 18 13:56:10 2012 -0400 - - Fix ChangeLog generation rule - - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 2f1747ed7d28148807ad07eb8e22db3ab5c54966 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 16 11:46:46 2012 -0400 - - Add comment - - src/hb-ot-shape-complex-arabic.cc | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit bd08d5d126aa878d1dbf7bfd4b1a764c170cd9ad -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 16 11:35:50 2012 -0400 - - [OT] Fix Arabic shaper OOB access - - https://bugzilla.mozilla.org/show_bug.cgi?id=782908 - - src/hb-ot-shape-complex-arabic.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b161bfc4f6f2db0edea780b95b798ff7b559cf33 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 16 08:09:44 2012 -0400 - - [configure] Cleanup check for ICU - - Check for upstream-provided 'icu-uc' pkgconfig package. - - configure.ac | 21 +-------------------- - 1 files changed, 1 insertions(+), 20 deletions(-) - -commit daf0731865f91da960446928667d4095bde471ea -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 16 07:32:59 2012 -0400 - - [ICU] Fix includes - - As reported by Steven Loomis, including uversion.h works everywhere. - - src/hb-icu.cc | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -commit a67ba9c0fe6798a3500af9f4acee8d678f5144ee -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 15 18:52:17 2012 -0400 - - Whitespace - - src/hb-old/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 9fe76051f7003d6b6a10486c5595bf1a4dbf5fe6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 15 17:24:28 2012 -0400 - - [NEWS] Fix date - - Oops! - - NEWS | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 45c1383cc7315f89c23c0ed388b99e87224884e7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 14 09:33:18 2012 -0400 - - Minor - - src/hb-coretext.cc | 8 ++++---- - src/hb-fallback-shape.cc | 8 ++++---- - src/hb-graphite2.cc | 8 ++++---- - src/hb-uniscribe.cc | 8 ++++---- - 4 files changed, 16 insertions(+), 16 deletions(-) - -commit 4ac4c6f2e12ddc8bf5e750671321458218b6e0c8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 13 10:52:52 2012 -0400 - - Fix ICU build with older ICUs - - src/hb-icu.cc | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit 883cbf5ed79d2b60191f803a5ee3f3e4496f3441 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 12 17:11:27 2012 -0400 - - Minor - - contrib/README | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit b7a4d37d0b162f2222b65d09b9271b8c636086f8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 11 21:32:23 2012 -0400 - - minor - - configure.ac | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit d5045a5f4017631a4660f985fe451c5a64c42ca0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 11 21:26:25 2012 -0400 - - [ICU] Use new normalizer2 compose/decompose API - - It's considerably faster than the fallback implementation we had - previously! - - src/hb-buffer.cc | 9 ++--- - src/hb-glib.cc | 26 ++++++--------- - src/hb-icu.cc | 75 - ++++++++++++++++++++++++++++++++++++--------- - src/hb-unicode-private.hh | 13 +------ - src/hb-unicode.cc | 35 ++++++++++++++++++++- - src/hb-warning.cc | 8 ----- - 6 files changed, 110 insertions(+), 56 deletions(-) - -commit 2b73a1f112c489c2553743c08dc03cd89f60cb2d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 11 19:17:54 2012 -0400 - - Add TODO - - TODO | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 9f9f04c2229227bb0712166e824157bbbf5cef80 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 11 18:34:13 2012 -0400 - - [OT] Unbreak Thai shaping and fallback Arabic shaping - - The merger of normalizer and glyph-mapping broke shapers that - modified text stream. Unbreak them by adding a new preprocess_text - shaping stage that happens before normalizing/cmap and disallow - setup_mask modification of actual text. - - src/hb-ot-shape-complex-arabic.cc | 42 - ++++++++++++++++++++++++++--------- - src/hb-ot-shape-complex-indic.cc | 1 + - src/hb-ot-shape-complex-misc.cc | 12 ++++++---- - src/hb-ot-shape-complex-private.hh | 15 ++++++++++-- - src/hb-ot-shape.cc | 3 ++ - 5 files changed, 54 insertions(+), 19 deletions(-) - -commit e9f28a38f54b98fa59f9159ccaaa3be6027e1378 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 11 18:20:28 2012 -0400 - - [OT] Add shape_plan to Arabic shaper - - src/hb-ot-shape-complex-arabic.cc | 82 - ++++++++++++++++++++++++------------- - 1 files changed, 53 insertions(+), 29 deletions(-) - -commit 344cc56698a8c84c4c1a05a71d829e5171aa3a60 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 11 17:36:23 2012 -0400 - - Add TODO - - TODO | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit daf13afb0801740dcc7900c4af190e24b80a05c0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 10 16:38:44 2012 -0400 - - [OT] Implement fallback mark positioning for "double" combining marks - - src/hb-ot-shape-fallback.cc | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -commit d345313104d9e3c8a8533ccdebd74e0648d0bee3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 10 16:34:04 2012 -0400 - - [OT] Fix fallback mark positioning with left-to-right text - - Ouch! - - src/hb-ot-shape-fallback.cc | 13 +++++++++++-- - 1 files changed, 11 insertions(+), 2 deletions(-) - -commit e297ee4acd6f9d950f8542fc6ad71fd580b69284 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 10 14:49:37 2012 -0400 - - Bump version to 0.9.2 - - A *real* release this time, with NEWS, ChangeLog, etc. - - AUTHORS | 8 +++ - COPYING | 9 +++- - Makefile.am | 13 +++--- - NEWS | 136 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - THANKS | 7 +++ - configure.ac | 4 +- - 6 files changed, 165 insertions(+), 12 deletions(-) - -commit 6efe1200b97cefe019857b0b5951a4a87deeb02b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 10 13:49:32 2012 -0400 - - Bump version to 0.9.1 - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 206ab6057303273590a3d005660e075bdcee0f5f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 10 09:06:30 2012 -0400 - - [test] Move around - - .../in-tree/shaper-arabic/script-arabic/MANIFEST | 2 +- - .../shaper-arabic/script-arabic/crulp/MANIFEST | 1 - - .../script-arabic/crulp/ligatures/2grams.txt | 601 -- - .../script-arabic/crulp/ligatures/3grams.txt | 3415 ----------- - .../script-arabic/crulp/ligatures/4grams.txt | 6316 - -------------------- - .../script-arabic/crulp/ligatures/5grams.txt | 5029 - ---------------- - .../script-arabic/crulp/ligatures/6grams.txt | 1542 ----- - .../script-arabic/crulp/ligatures/7grams.txt | 354 -- - .../script-arabic/crulp/ligatures/8grams.txt | 26 - - .../script-arabic/crulp/ligatures/LICENSE | 3 - - .../script-arabic/crulp/ligatures/MANIFEST | 7 - - .../script-arabic/crulp/ligatures/README | 16 - - .../script-arabic/crulp/ligatures/SOURCES | 4 - - .../script-arabic/language-urdu/MANIFEST | 1 + - .../script-arabic/language-urdu/crulp/MANIFEST | 1 + - .../language-urdu/crulp/ligatures/2grams.txt | 601 ++ - .../language-urdu/crulp/ligatures/3grams.txt | 3415 +++++++++++ - .../language-urdu/crulp/ligatures/4grams.txt | 6316 - ++++++++++++++++++++ - .../language-urdu/crulp/ligatures/5grams.txt | 5029 - ++++++++++++++++ - .../language-urdu/crulp/ligatures/6grams.txt | 1542 +++++ - .../language-urdu/crulp/ligatures/7grams.txt | 354 ++ - .../language-urdu/crulp/ligatures/8grams.txt | 26 + - .../language-urdu/crulp/ligatures/LICENSE | 3 + - .../language-urdu/crulp/ligatures/MANIFEST | 7 + - .../language-urdu/crulp/ligatures/README | 16 + - .../language-urdu/crulp/ligatures/SOURCES | 4 + - 26 files changed, 17316 insertions(+), 17315 deletions(-) - -commit 7a484c601e0958533eb85a6902296733c39537fe -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 10 09:05:29 2012 -0400 - - [test] Add Urdu ligature sequences from CRULP - - .../in-tree/shaper-arabic/script-arabic/MANIFEST | 1 + - .../shaper-arabic/script-arabic/crulp/MANIFEST | 1 + - .../script-arabic/crulp/ligatures/2grams.txt | 601 ++ - .../script-arabic/crulp/ligatures/3grams.txt | 3415 +++++++++++ - .../script-arabic/crulp/ligatures/4grams.txt | 6316 - ++++++++++++++++++++ - .../script-arabic/crulp/ligatures/5grams.txt | 5029 - ++++++++++++++++ - .../script-arabic/crulp/ligatures/6grams.txt | 1542 +++++ - .../script-arabic/crulp/ligatures/7grams.txt | 354 ++ - .../script-arabic/crulp/ligatures/8grams.txt | 26 + - .../script-arabic/crulp/ligatures/LICENSE | 3 + - .../script-arabic/crulp/ligatures/MANIFEST | 7 + - .../script-arabic/crulp/ligatures/README | 16 + - .../script-arabic/crulp/ligatures/SOURCES | 4 + - 13 files changed, 17315 insertions(+), 0 deletions(-) - -commit f4cb4762986a28634fa7de9b706f9d37859b881e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 10 03:51:44 2012 -0400 - - [OT] Slightly adjust normalizer - - The change is very subtle. If we have a single-char cluster that - decomposes to three or more characters, then try recomposition, in - case the farther mark may compose with the base. - - src/hb-ot-shape-normalize.cc | 81 - ++++++++++++++++++++++++++++-------------- - 1 files changed, 54 insertions(+), 27 deletions(-) - -commit 07d682806349aee81f53114778ce0beb23909ed7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 10 03:28:50 2012 -0400 - - Minor - - src/hb-ot-shape-normalize.cc | 25 ++++++++----------------- - src/hb-ot-shape.cc | 2 +- - 2 files changed, 9 insertions(+), 18 deletions(-) - -commit b00321ea78793d9b3592b5173a9800e6322424fe -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 9 22:33:32 2012 -0400 - - [OT] Avoid calling get_glyph() twice - - Essentially move the glyph mapping to normalization process. - The effect on Devanagari is small (but observable). Should be more - observable in simple text, like ASCII. - - src/hb-ot-shape-normalize-private.hh | 2 + - src/hb-ot-shape-normalize.cc | 76 - ++++++++++++++++++++++++---------- - src/hb-ot-shape.cc | 44 +++++++++---------- - 3 files changed, 77 insertions(+), 45 deletions(-) - -commit 12c0875eafa4bd92db650e5acca046d99594d1e6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 9 22:00:53 2012 -0400 - - [OT] Remove redundant check - - src/hb-ot-shape.cc | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -commit 5c60b70c89b4e0a6512d9fd1ab5394dd76feb742 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 9 21:58:07 2012 -0400 - - [OT] More code shuffling around - - Preparing for merging map_glyphs() and normalize(). - - src/hb-ot-shape.cc | 167 - +++++++++++++++++++++++++++------------------------- - 1 files changed, 86 insertions(+), 81 deletions(-) - -commit cd0c6e148f6d078b364370cb2f808b793b921be2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 9 21:48:55 2012 -0400 - - Shuffle buffer variable allocations around - - To room for more allocations, coming. - - src/hb-ot-layout-private.hh | 6 +++--- - src/hb-ot-shape-complex-arabic.cc | 2 +- - src/hb-ot-shape-complex-indic-private.hh | 4 ++-- - src/hb-ot-shape-complex-private.hh | 5 ++--- - src/hb-ot-shape-private.hh | 4 ++-- - 5 files changed, 10 insertions(+), 11 deletions(-) - -commit 8d1eef3f32fb539de2a72804fa3834acc18daab5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 9 21:31:52 2012 -0400 - - Minor - - src/hb-ot-shape-normalize.cc | 50 - ++++++++++++++++++++++++++---------------- - 1 files changed, 31 insertions(+), 19 deletions(-) - -commit 56c9e7c004e802ddcb8c704346026f1d7a812f9f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 9 21:12:30 2012 -0400 - - Fill out combining class resetting for fallback shaping - Thai/Lao/Tibetan - - src/hb-ot-shape-fallback.cc | 38 +++++++++++++++++++++++++++++++++++++- - src/hb-unicode-private.hh | 7 ++++--- - src/hb-unicode.cc | 2 +- - 3 files changed, 42 insertions(+), 5 deletions(-) - -commit a321e1d51e0e7fa02738410e8d6e77c841bc6b13 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 9 18:30:34 2012 -0400 - - Revert "Reject lookups with no subTable" - - This reverts commit 30ec9002d84e8b49290e782e6192069821ffa942. - - See previous commit. - - src/hb-ot-layout-common-private.hh | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 2eaf482b371034ce6ebfaedee98049b036fd3493 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 9 18:30:05 2012 -0400 - - Revert "[GSUB/GPOS] Reject Context/ChainContext lookups with zero - input" - - This reverts commit 0981068b75710397f08e0d2d776a0a2ea68d7117. - - I was confused. Even if we access coverage[0] unconditionally, - we don't - need bound checks since the array machinary already handles that. - - src/hb-ot-layout-gsubgpos-private.hh | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit a02d86484be870615297abfc7be9f94645434762 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 8 18:04:29 2012 -0400 - - Add check-exported-symbols.sh - - And misc linking fixes. - - src/Makefile.am | 1 + - src/check-exported-symbols.sh | 40 - ++++++++++++++++++++++++++++++++++++++ - src/check-internal-symbols.sh | 2 +- - src/hb-ot-shape-complex-indic.cc | 2 +- - src/hb-ot-shape.cc | 6 ++-- - 5 files changed, 46 insertions(+), 5 deletions(-) - -commit 4c8ac4f47e95d2b266b2f64e75c55af8233b6b91 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 8 17:44:19 2012 -0400 - - Misc minor fixes - - src/check-internal-symbols.sh | 10 +-- - src/hb-font-private.hh | 29 +++++++- - src/hb-font.cc | 63 +++++++--------- - src/hb-font.h | 2 +- - src/hb-graphite2.cc | 4 +- - src/hb-old.cc | 2 +- - src/hb-ot-layout.cc | 6 +- - src/hb-ot-shape-fallback.cc | 10 +-- - src/hb-ot-shape.cc | 2 +- - src/hb-shape-plan.cc | 2 +- - src/hb-shape-plan.h | 2 +- - src/hb-tt-font.cc | 166 - +---------------------------------------- - 12 files changed, 72 insertions(+), 226 deletions(-) - -commit 560d68af8168d1baff607b9616a3590af70fe9ec -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 8 17:16:01 2012 -0400 - - Use a export-file for Windows builds - - Apparently even that doesn't make check-internal-symbols.sh happy with - mingw32. Going to disable that for DLLs again, but hopefully the - export-file is doing *something*. - - configure.ac | 14 +++++++++++++- - src/Makefile.am | 22 +++++++++++++++++++++- - src/hb-buffer.h | 4 ++-- - 3 files changed, 36 insertions(+), 4 deletions(-) - -commit f8751cf8e0a16125d63a88da65fdbfa76a19453f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 8 17:15:44 2012 -0400 - - [hb-old] speed-up build - - src/hb-old/harfbuzz-external.h | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 5f4c52867ce67faa15f5d26b59c18c8d068e9261 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 8 16:53:37 2012 -0400 - - Minor - - src/hb-ot-layout.h | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit fe2b8a7777ab1c84980424ede713cb0d6701f987 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 8 15:27:14 2012 -0400 - - Minor - - TODO | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 7e7d245b332306949a19c628bacd920717434769 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 8 15:23:48 2012 -0400 - - Make default_language threadsafe - - src/hb-common.cc | 15 +++++---------- - 1 files changed, 5 insertions(+), 10 deletions(-) - -commit 06b192c458010c847362d809673209c87ea29949 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 8 15:23:45 2012 -0400 - - Minor - - src/hb-common.h | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 37191ede7583fdb864db32a8f4d90956657926c7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 8 14:59:09 2012 -0400 - - Minor - - src/hb-common.h | 4 ++-- - src/hb-icu.h | 1 - - 2 files changed, 2 insertions(+), 3 deletions(-) - -commit 6d9a329a8a0f11f4b175e407de59c55924de1ef6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 8 14:48:41 2012 -0400 - - Adjust a couple source checks - - src/check-internal-symbols.sh | 4 ++-- - src/check-static-inits.sh | 10 ++++++++-- - 2 files changed, 10 insertions(+), 4 deletions(-) - -commit 9c929abdcfef44c0193a2917b20981df37ade21c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 8 14:33:37 2012 -0400 - - Minor renaming - - src/Makefile.am | 4 +- - src/hb-ot-shape-fallback-private.hh | 39 ++++ - src/hb-ot-shape-fallback.cc | 276 - ++++++++++++++++++++++++++ - src/hb-ot-shape-position-fallback-private.hh | 39 ---- - src/hb-ot-shape-position-fallback.cc | 276 - -------------------------- - src/hb-ot-shape.cc | 4 +- - 6 files changed, 319 insertions(+), 319 deletions(-) - -commit 801298b590effd768607bb532dc83c73ba65d16b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 8 14:26:36 2012 -0400 - - Fix cast - - https://bugs.freedesktop.org/show_bug.cgi?id=53233 - - src/hb-buffer-private.hh | 10 ++++++---- - src/hb-shape-plan.cc | 4 ++-- - 2 files changed, 8 insertions(+), 6 deletions(-) - -commit 21756934a15e31dc243e2b6d80adec5752477652 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 8 01:20:45 2012 -0400 - - [OT] Implement fallback positioning - - Implemented for Arabic, Hebrew, and generic marks. - Activated if no GPOS table present. - - src/hb-font.h | 3 +- - src/hb-ft.cc | 3 +- - src/hb-old.cc | 2 +- - src/hb-ot-shape-position-fallback.cc | 237 - +++++++++++++++++++++++++++++++++- - src/hb-unicode-private.hh | 81 ++++++++++++ - src/hb-unicode.cc | 107 ++++++---------- - 6 files changed, 356 insertions(+), 77 deletions(-) - -commit fb56e7628362a73e20f7f0b49fe31e802dc01f4f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 7 23:44:47 2012 -0400 - - [hb-old] Fix warnings - - src/hb-old/harfbuzz-shaper.cpp | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit affaf8a0e5aa38e5820455f789eebf916e02eb7b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 7 22:41:38 2012 -0400 - - [OT] Start adding fallback positioning - - Used when there is no GPOS. - - src/Makefile.am | 2 + - src/hb-ot-shape-position-fallback-private.hh | 39 +++++++++++++++++++++ - src/hb-ot-shape-position-fallback.cc | 47 - ++++++++++++++++++++++++++ - src/hb-ot-shape.cc | 23 +++---------- - 4 files changed, 93 insertions(+), 18 deletions(-) - -commit 7e4920fd1577987bf6804f67765e22a84983e057 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 7 22:32:23 2012 -0400 - - Minor - - src/hb-ot-shape.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 472f229a63f0d1bb21b02179ef430b7698df8f12 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 7 22:25:24 2012 -0400 - - [GSUB] Generalize would_apply() - - Fixes logic also, where before we were always matching if - glyphs_len==1 - and a ligature started with the glyph. - - src/hb-ot-layout-gsub-table.hh | 26 +++++++++++++++++++---- - src/hb-ot-layout-gsubgpos-private.hh | 37 - ++++++++++++++++----------------- - src/hb-ot-layout.cc | 3 +- - 3 files changed, 40 insertions(+), 26 deletions(-) - -commit 6f3a300138f659020c21c3e08b7981c78df5f332 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 7 22:13:25 2012 -0400 - - Add hb_font_glyph_from/to_string - - src/hb-font-private.hh | 43 - ++++++++++++++++++++++++++++++++++++++++++ - src/hb-font.cc | 24 +++++++++++++++++++--- - src/hb-font.h | 11 ++++++++++ - src/hb-private.hh | 16 +++++++++++++++ - src/test-would-substitute.cc | 11 +++++++++- - util/options.cc | 2 +- - 6 files changed, 101 insertions(+), 6 deletions(-) - -commit eb56f6ae96260c5b4bcd4e1dfb7ab733a230f3a8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 7 21:44:25 2012 -0400 - - Minor - - src/hb-mutex-private.hh | 1 + - src/hb-uniscribe.cc | 1 + - src/hb-uniscribe.h | 2 ++ - 3 files changed, 4 insertions(+), 0 deletions(-) - -commit f4e48adcdd4315ce09e755f87a0f801d88194f42 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 7 21:12:49 2012 -0400 - - [OT] Apply 'rclt' feature in horizontal mode - - 'rclt' is "Required Contextual Forms" being proposed by Microsoft. - It's like 'calt', but supposedly always on. We apply 'calt' anyway, - and now apply this too. - - src/hb-ot-shape.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit b1914b8bd08ecdea79930dda7e3bb2ae9e6134a1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 7 16:57:48 2012 -0400 - - Fix warnings - - src/hb-icu.cc | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 0f8881d6bbf6cd59938315eeff9b71cfc736aa4e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 7 16:57:02 2012 -0400 - - More refactoring - - src/hb-ot-shape-normalize.cc | 161 - ++++++++++++++++++++++++++++++++++++++++- - src/hb-unicode-private.hh | 164 - +----------------------------------------- - 2 files changed, 162 insertions(+), 163 deletions(-) - -commit 428dfcab6634ff264570a0a5d715efb8048c3db5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 7 16:51:48 2012 -0400 - - Minor refactoring - - src/hb-ot-shape-normalize.cc | 27 +++++++++++++++++++++++---- - 1 files changed, 23 insertions(+), 4 deletions(-) - -commit 61f41849af6ff9edf8b55cf9610066d1bfb4a8df -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 7 16:45:27 2012 -0400 - - Add Hebrew presentation forms shaping - - Lifted from https://bugzilla.mozilla.org/show_bug.cgi?id=728866 - - src/hb-unicode-private.hh | 121 - ++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 120 insertions(+), 1 deletions(-) - -commit 32d71dc13317b322e2c5de00d767b2cb15fddd8b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 7 14:11:16 2012 -0400 - - [Graphite] Minor - - src/hb-graphite2.cc | 60 - +++++++++++++++++++++++--------------------------- - 1 files changed, 28 insertions(+), 32 deletions(-) - -commit 030ac5022e8a43b9329c26e72527bafc582ef44b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 7 13:01:12 2012 -0400 - - Remove enum trailing comma - - ...again. - - src/hb-ot-shape-normalize-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 368b4e7649f9bc8c6bebf7c7ff03c9b9ec425a25 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 6 23:06:04 2012 -0400 - - Minor - - src/hb-font.cc | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit ade7459ea7c75b4f33f7cfa43dd5bdfa0c18d6d5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 6 19:42:47 2012 -0700 - - [util] Fix leaks - - src/hb-graphite2.cc | 18 ++++++++++++++---- - util/options.cc | 2 +- - util/options.hh | 2 +- - 3 files changed, 16 insertions(+), 6 deletions(-) - -commit 2fef993460dcfd94c92ab35413bdde18ad2b0ceb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 6 19:35:04 2012 -0700 - - [Graphite] Fix graphite2 backend with RTL text - - Patch from Martin Hosken. - - src/hb-graphite2.cc | 33 ++++++++++++++++++--------------- - 1 files changed, 18 insertions(+), 15 deletions(-) - -commit e4992e13e19877a73ea05fc1d31005a262c685ad -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 6 19:25:39 2012 -0700 - - [Graphite] Port graphite2 backend to new shaper infrastructure - - src/hb-graphite2.cc | 234 - ++++++++++++++++++++++-------------------------- - src/hb-graphite2.h | 2 +- - src/hb-shaper-list.hh | 2 +- - 3 files changed, 109 insertions(+), 129 deletions(-) - -commit 66591ececfba9791de06c814f5f30131e95e5fd2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 6 17:07:19 2012 -0700 - - Remove unnecessary lifecycle bits - - We already set recount to INVALID when destroying. - This block was not necessary. - - src/hb-font.cc | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit e3320ecc1b5a7eaccc7c9370b2d1b76850f054be -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 6 11:44:10 2012 -0700 - - Fix compiler warnings - - configure.ac | 12 +++++++++--- - 1 files changed, 9 insertions(+), 3 deletions(-) - -commit 167b625d988b74572d6b2f646c285b666b650d49 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 5 21:16:26 2012 -0700 - - [Indic] Minor, move 'blwf' after 'half' - - We don't apply them together anyway. Should not make any difference - right now. - - src/hb-ot-shape-complex-indic.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 048e3b596fb7fccd3fb5f48de98b6b67788f774a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 4 18:04:57 2012 -0700 - - Speed up hb_set_digest_lowest_bits_t calcs - - src/hb-set-private.hh | 10 +++++++--- - 1 files changed, 7 insertions(+), 3 deletions(-) - -commit 3d1b66a35e1ab3be19335705f310b278d76d66d2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 4 17:42:28 2012 -0700 - - Speed up hb_set_digest_common_bits_t calcs - - src/hb-set-private.hh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit bdc48a879a1900138d8caaa8d90fb9fe1e768d1d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 4 17:08:38 2012 -0700 - - Enlarge glyph_name buffer - - Lohit Devanagari has a glyph named: - u0924_u094D.half_u0930_u094D.blwf.vatu - - util/options.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 25326c2359b0a3e25222b94acd142bc36eff78a4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 4 16:43:18 2012 -0700 - - Rewrite ARRAY_LENGTH as a template function - - Such it wouldn't apply to pointers accidentally. - - src/hb-ot-shape-complex-arabic-table.hh | 4 ++-- - src/hb-private.hh | 9 ++++++--- - 2 files changed, 8 insertions(+), 5 deletions(-) - -commit 8ba8042821e4581fe4e87419e58c823520441205 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 3 18:54:54 2012 -0700 - - [Indic] Fix consonant position font lookup logic - - Oops. I broken this badly and the test suite did not notice. That - worries me. Have to investigate. - - src/hb-ot-shape-complex-indic.cc | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit abd0c05f1f7f0546593bb2f1c4d59db12cb32e46 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 3 18:45:05 2012 -0700 - - Minor - - src/test-would-substitute.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 46ee108ef80f5d4675899862698a8c34d8fcfab5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 3 18:21:13 2012 -0700 - - Fix leak - - src/hb-shape-plan.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 71baea0062da4d7f143d62da38492a0813814e49 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 3 17:40:07 2012 -0700 - - [OT] Use general-category, not GDEF class, to decide to zero mark - advances - - At this point, the GDEF glyph synthesis looks pointless. Not that I - have many fonts without GDEF lying around. - - As for mark advance zeroing when GPOS not available, that also - is being - replaced by proper fallback mark positioning soon. - - src/hb-ot-shape.cc | 7 ++----- - 1 files changed, 2 insertions(+), 5 deletions(-) - -commit 3a7e137a68ec8f723dc3afa89c918ca2df7ff6bf -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 3 17:23:40 2012 -0700 - - Dn't use gint - - src/hb-glib.cc | 4 ++-- - src/hb-icu.cc | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit 11b0e20ba42bf0b17133c3e1087732802bb4f230 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 2 14:21:40 2012 -0400 - - [Indic] Add per-script configuration tables - - This concludes the Indic shape_plan work. May do for Arabic also... - - src/hb-ot-shape-complex-indic-private.hh | 16 +- - src/hb-ot-shape-complex-indic.cc | 309 - +++++++++++++++--------------- - 2 files changed, 159 insertions(+), 166 deletions(-) - -commit 85fc6c483f6d734febbe39270e84701a651f01f1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 2 12:21:44 2012 -0400 - - [Indic] Move more stuff to the shape_plan - - Almost done. Need to add per-script static tables. - - src/hb-ot-shape-complex-indic-machine.rl | 4 +- - src/hb-ot-shape-complex-indic.cc | 216 - ++++++++++++++++-------------- - 2 files changed, 116 insertions(+), 104 deletions(-) - -commit 914ffaa40fcca020f65bacdd709421e9047afd83 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 2 11:03:39 2012 -0400 - - [Indic] Move more repeated work into shape_plan - - src/hb-ot-shape-complex-indic.cc | 63 - +++++++++++++++++++++++++------------ - 1 files changed, 42 insertions(+), 21 deletions(-) - -commit a8c6da90f4c6e8d27a3a1b758a55476776d9f750 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 2 10:46:34 2012 -0400 - - [OT] Add per-complex-shaper shape_plan data - - Hookup some Indic data to it. More to come. - - src/hb-ot-shape-complex-arabic.cc | 2 + - src/hb-ot-shape-complex-indic.cc | 128 - +++++++++++++++++++++--------------- - src/hb-ot-shape-complex-misc.cc | 4 + - src/hb-ot-shape-complex-private.hh | 16 ++++- - src/hb-ot-shape-private.hh | 1 + - src/hb-ot-shape.cc | 23 +++++-- - 6 files changed, 113 insertions(+), 61 deletions(-) - -commit 8bb5deba9630d35878eb6edb4643ecfabf99f15f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 2 10:07:58 2012 -0400 - - [OT] Pipe shape_plan down to pause_callbacks - - src/hb-ot-map-private.hh | 8 ++-- - src/hb-ot-map.cc | 11 +++--- - src/hb-ot-shape-complex-indic-machine.rl | 4 +- - src/hb-ot-shape-complex-indic.cc | 50 - ++++++++++++++--------------- - src/hb-ot-shape-private.hh | 6 +++ - src/hb-ot-shape.cc | 28 +++++++++------- - 6 files changed, 57 insertions(+), 50 deletions(-) - -commit 3e38c0f2886c38d2f0a9d80a97a36edf2479d2c7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 2 09:44:18 2012 -0400 - - More massaging - - src/hb-ot-map-private.hh | 20 ++++++++------------ - src/hb-ot-map.cc | 17 ++++++++--------- - src/hb-ot-shape-complex-arabic.cc | 8 ++++---- - src/hb-ot-shape-complex-indic.cc | 18 +++++++----------- - 4 files changed, 27 insertions(+), 36 deletions(-) - -commit 16c6a27b4bffc19026944c7bea9cf0a3a8ff1d8f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 2 09:38:28 2012 -0400 - - [OT] Port complex_shaper to planner/plan - - src/hb-ot-shape-complex-arabic.cc | 17 ++++++++--------- - src/hb-ot-shape-complex-indic.cc | 19 ++++++++----------- - src/hb-ot-shape-complex-misc.cc | 20 ++++++++------------ - src/hb-ot-shape-complex-private.hh | 32 - +++++++++++--------------------- - src/hb-ot-shape-private.hh | 14 +++++++++++--- - src/hb-ot-shape.cc | 9 +++++---- - 6 files changed, 51 insertions(+), 60 deletions(-) - -commit 5393e3a62ba09fd7bcf3767b36225c8f49badb9d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 2 09:24:35 2012 -0400 - - [OT] Minor refactoring - - src/hb-ot-map.cc | 4 ---- - src/hb-ot-shape-private.hh | 26 ++++++++++++++++++++++++++ - src/hb-ot-shape.cc | 26 ++------------------------ - src/hb-shape-plan.cc | 2 ++ - src/hb-shape.cc | 2 -- - 5 files changed, 30 insertions(+), 30 deletions(-) - -commit 24eacf17c801c66a2d466e8ae02b73f501a26b25 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 2 08:42:11 2012 -0400 - - [Indic] Move consonant-position-setting into initial_reordering() - - src/hb-ot-shape-complex-indic.cc | 65 - ++++++++++++++++++++----------------- - 1 files changed, 35 insertions(+), 30 deletions(-) - -commit afbcc24be01a64bdb5c05c63880269145fa1d3c8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 2 08:36:40 2012 -0400 - - [GSUB] Wire the font, not just the face, down to substitute() - - We need the font for glyph lookup during GSUB pauses in Indic shaper. - Could perhaps be avoided, but at this point, we don't mean to support - separate substitute()/position() entry points (anymore), so there is - no point in not providing the font to GSUB. - - src/hb-ot-layout-gsub-table.hh | 13 +++++-------- - src/hb-ot-layout-gsubgpos-private.hh | 7 ++----- - src/hb-ot-layout-private.hh | 6 +++--- - src/hb-ot-layout.cc | 18 +++++++++--------- - src/hb-ot-map-private.hh | 15 ++++++--------- - src/hb-ot-map.cc | 8 ++++---- - src/hb-ot-shape-complex-indic.cc | 8 ++++---- - src/hb-ot-shape.cc | 6 +++--- - 8 files changed, 36 insertions(+), 45 deletions(-) - -commit b0e6a26a10ccca70ebc88a9e158a89ccfab0add5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 2 08:11:14 2012 -0400 - - [OT] Hide some API - - It was impossible to meaningfully use them from the outside these - days. - - src/hb-ot-layout-private.hh | 40 - ++++++++++++++++++++++++++++++++-------- - src/hb-ot-layout.cc | 20 -------------------- - src/hb-ot-layout.h | 34 ---------------------------------- - src/hb-ot-map.cc | 8 ++++---- - 4 files changed, 36 insertions(+), 66 deletions(-) - -commit 305246744ed178f116e01498b7f9d1af6950ca30 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 2 08:08:04 2012 -0400 - - Minor - - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8ef3d53255ae9fbb0e46c22909e50009d1e7eeb0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 2 07:53:18 2012 -0400 - - [Indic] More refactoring of consonant position peeking in the font - - To be moved to initial_reordering next... - - src/hb-ot-shape-complex-indic.cc | 59 - ++++++++++++++++++++++++++----------- - 1 files changed, 41 insertions(+), 18 deletions(-) - -commit 3eb6f81fd3f1e56679eec10d08f5e2303121753f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 2 07:37:46 2012 -0400 - - [Indic] Refactor - - Move all the logic that needs to eventually move into the indic table - into hb-ot-shape-complex-indic-private.hh. - - src/hb-ot-shape-complex-indic-private.hh | 210 - +++++++++++++++++++++++++++ - src/hb-ot-shape-complex-indic.cc | 227 - +---------------------------- - 2 files changed, 218 insertions(+), 219 deletions(-) - -commit 3614ba242fc7d338761acdda365a134706035b6d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 2 07:13:55 2012 -0400 - - [Indic] Rename - - src/hb-ot-shape-complex-indic.cc | 40 - +++++++++++++++++++------------------ - 1 files changed, 21 insertions(+), 19 deletions(-) - -commit 610e5e8f713bb2a68939b72cb2b801a7aaede4f9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 2 05:27:46 2012 -0400 - - [Indic] Streamline feature would_apply() - - Comes with some 10% speedup for Devanagari even! - - src/hb-ot-map-private.hh | 85 - +++++++++++++++++++++++-------------- - src/hb-ot-map.cc | 18 ++++---- - src/hb-ot-shape-complex-indic.cc | 85 - +++++++++++++++++++++---------------- - 3 files changed, 110 insertions(+), 78 deletions(-) - -commit 1d002048d5afcd45abbb09fdf0419f13b2e2265c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 2 05:01:11 2012 -0400 - - [Indic] Minor - - src/hb-ot-shape-complex-indic-private.hh | 16 ------- - src/hb-ot-shape-complex-indic.cc | 64 - ++++++++++++++++++++---------- - 2 files changed, 43 insertions(+), 37 deletions(-) - -commit 6f7611375521c6d285a9aa763f2ea5cb44cd0d39 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 2 04:00:31 2012 -0400 - - [GSUB/GPOS] Check array size before accessing digests - - src/hb-ot-layout-private.hh | 3 +++ - src/hb-ot-layout.cc | 32 ++++++++++++++++---------------- - 2 files changed, 19 insertions(+), 16 deletions(-) - -commit 22148b8c4af3ed296d96e969cdd47bac97b32307 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 2 03:51:51 2012 -0400 - - Use Coverage digests in would_apply - - src/hb-ot-layout-gsub-table.hh | 1 + - src/hb-ot-layout-gsubgpos-private.hh | 6 +++++- - src/hb-ot-layout.cc | 4 ++-- - 3 files changed, 8 insertions(+), 3 deletions(-) - -commit 6c459c8fef85bc44f45d7b58c28a34abfb2c33fc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 2 03:45:53 2012 -0400 - - Minor - - src/hb-ot-layout-gpos-table.hh | 2 +- - src/hb-ot-layout-gsub-table.hh | 4 ++-- - src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) - -commit e2b8d75fa6e847ecf5c040f4e1e16a565c5d8aaf -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 1 22:17:48 2012 -0400 - - Use wider set digests on 64-bit archs - - src/hb-set-private.hh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 0120ce9679aab3ac936aeb18f6709529eef000a4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 1 21:56:35 2012 -0400 - - [GSUB/GPOS] Remove unused get_coverage() methods - - src/hb-ot-layout-gpos-table.hh | 11 ----------- - src/hb-ot-layout-gsub-table.hh | 11 ----------- - 2 files changed, 0 insertions(+), 22 deletions(-) - -commit 1336ecdf8e4e9879b96b26ecfbf5c9ba6c49e2b9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 1 21:46:36 2012 -0400 - - [GSUB/GPOS] Use Coverage digests as gatekeeper - - Gives me a good 10% speedup for the Devanagari test case. Less so - for less lookup-intensive tests. - - For the Devanagari test case, the false positive rate of the GSUB - digest - is 4%. - - src/hb-ot-layout-gpos-table.hh | 30 ++++++++-------------------- - src/hb-ot-layout-gsub-table.hh | 35 - +++++++++++---------------------- - src/hb-ot-layout-gsubgpos-private.hh | 8 +++++- - src/hb-ot-layout-private.hh | 4 +++ - src/hb-ot-layout.cc | 29 ++++++++++++++++++++++++--- - 5 files changed, 56 insertions(+), 50 deletions(-) - -commit a878c58a8fc1500986d713b2bcedfeb90a0087b0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 1 21:18:54 2012 -0400 - - [GSUB/GPOS] Add add_coverage() - - src/hb-ot-layout-gpos-table.hh | 18 ++++++++++++++++++ - src/hb-ot-layout-gsub-table.hh | 18 ++++++++++++++++++ - 2 files changed, 36 insertions(+), 0 deletions(-) - -commit 60a3035ac5ec8227e4cc0e6708732bb139c9e0b8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 1 21:06:27 2012 -0400 - - Add hb_set_digest_t - - Implement two set digests, and one that combines the two. - - src/hb-set-private.hh | 95 - +++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 95 insertions(+), 0 deletions(-) - -commit c8accf1dd2d92cc4f714393eb0ea46f69bb182a6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 1 21:05:57 2012 -0400 - - [OT] Templatize Coverage::add_coverage() - - src/hb-ot-layout-common-private.hh | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) - -commit 8fbfda920e0b3bb4ab7afb732826026964b79be9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 1 19:03:46 2012 -0400 - - Inline font getters - - src/hb-fallback-shape.cc | 21 ++-- - src/hb-font-private.hh | 204 - +++++++++++++++++++++++++++++++++++++ - src/hb-font.cc | 129 ++++-------------------- - src/hb-graphite2.cc | 6 +- - src/hb-old.cc | 10 +- - src/hb-ot-layout-gdef-table.hh | 2 +- - src/hb-ot-layout-gpos-table.hh | 2 +- - src/hb-ot-shape-complex-arabic.cc | 4 +- - src/hb-ot-shape-complex-indic.cc | 6 +- - src/hb-ot-shape-normalize.cc | 12 +- - src/hb-ot-shape.cc | 47 ++++----- - 11 files changed, 277 insertions(+), 166 deletions(-) - -commit 6adf417bc15d4524e280b284e3accd1ae647662e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 1 18:07:42 2012 -0400 - - Use a lookup table for modified_combining_class - - src/hb-unicode-private.hh | 10 ++- - src/hb-unicode.cc | 213 - +++++++++++++++++++++++++++++++-------------- - src/hb-unicode.h | 4 + - 3 files changed, 157 insertions(+), 70 deletions(-) - -commit 208f70f0553d73d2908b21b9552298029482a8b9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 1 17:13:10 2012 -0400 - - Inline Unicode callbacks internally - - src/hb-buffer.cc | 2 +- - src/hb-fallback-shape.cc | 2 +- - src/hb-old.cc | 2 +- - src/hb-ot-shape-complex-misc.cc | 2 +- - src/hb-ot-shape-normalize.cc | 13 ++--- - src/hb-ot-shape-private.hh | 6 +- - src/hb-ot-shape.cc | 4 +- - src/hb-unicode-private.hh | 112 - +++++++++++++++++++------------------- - src/hb-unicode.cc | 5 +- - 9 files changed, 73 insertions(+), 75 deletions(-) - -commit 7470315a3e782aa6192bbe64f7a3944266fb1521 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 1 17:01:59 2012 -0400 - - Move unicode accessors around - - src/hb-unicode-private.hh | 73 - ++++++++++++++++++++++++++++++++++++++++++++- - src/hb-unicode.cc | 65 ++++------------------------------------ - 2 files changed, 78 insertions(+), 60 deletions(-) - -commit 21fdcee00125b6e1c09f0bed3064d16ccd3a7a5d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 1 16:23:44 2012 -0400 - - Add hb_unicode_combining_class_t - - src/hb-common.h | 38 +------------- - src/hb-glib.cc | 4 +- - src/hb-icu.cc | 4 +- - src/hb-unicode-private.hh | 2 +- - src/hb-unicode.cc | 11 ++-- - src/hb-unicode.h | 124 - ++++++++++++++++++++++++++++++++++++++++++++- - 6 files changed, 134 insertions(+), 49 deletions(-) - -commit 84186a64004e5dcd2ce98b564d0e0a09aa5d68b2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 1 13:32:39 2012 -0400 - - Add commentary on the compatibility decomposition in the normalizer - - src/hb-ot-shape-normalize.cc | 18 +++++++++++++++--- - 1 files changed, 15 insertions(+), 3 deletions(-) - -commit 0834d952017a04c6f4599e574cb75ecf3ca27d3b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 1 00:21:09 2012 -0400 - - [hb-old] Adjust mark positioning parameters - - Fallback mark positioning works now... With hb-ft and hb-view / - hb-shape at least. - - src/hb-old.cc | 10 +++++----- - src/hb-old/harfbuzz-shaper.cpp | 1 + - 2 files changed, 6 insertions(+), 5 deletions(-) - -commit 4ca743dfb8e09f9fa525061c7f1144d55f72effb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 1 00:03:41 2012 -0400 - - [old] Implement fontMetrics - - src/hb-old.cc | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) - -commit 1e7d860613032e40a3f90e2caa2ee5ac44ab8c8c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 31 23:41:06 2012 -0400 - - [GPOS] Adjust mark advance-width zeroing logic - - If there is no GPOS, zero mark advances. - - If there *is* GPOS and the shaper requests so, zero mark advances for - attached marks. - - Fixes regression with Tibetan, where the font has GPOS, and marks a - glyph as mark where it shouldn't get zero advance. - - src/hb-ot-layout-gpos-table.hh | 14 ++++++++------ - src/hb-ot-layout.cc | 4 ++-- - src/hb-ot-layout.h | 3 ++- - src/hb-ot-shape-complex-arabic.cc | 2 +- - src/hb-ot-shape-complex-indic.cc | 2 +- - src/hb-ot-shape-complex-misc.cc | 4 ++-- - src/hb-ot-shape-complex-private.hh | 2 +- - src/hb-ot-shape.cc | 6 ++---- - 8 files changed, 19 insertions(+), 18 deletions(-) - -commit a8842e4a448efb30f3f2f3c628d6dc4824829726 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 31 23:10:11 2012 -0400 - - Remove some TODO items - - TODO | 27 --------------------------- - src/hb-shape.cc | 2 ++ - 2 files changed, 2 insertions(+), 27 deletions(-) - -commit 2bc3b9a616cedbc56ff4a915f9e3439ff3a6bf13 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 31 23:08:25 2012 -0400 - - [OT] Zero mark advances if the shaper desires so - - Enabled for all shapers except for Indic. - - src/hb-ot-shape-complex-arabic.cc | 1 + - src/hb-ot-shape-complex-indic.cc | 1 + - src/hb-ot-shape-complex-misc.cc | 2 ++ - src/hb-ot-shape-complex-private.hh | 2 ++ - src/hb-ot-shape.cc | 15 +++++++++++++++ - 5 files changed, 21 insertions(+), 0 deletions(-) - -commit 5fecd8b0355894ceda14b3d3c654f20c3d5e77f4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 31 22:48:38 2012 -0400 - - [OT] Synthesize glyph classes - - TODO | 2 -- - src/hb-ot-shape.cc | 20 ++++++++++++++++++-- - 2 files changed, 18 insertions(+), 4 deletions(-) - -commit 03b09214c073ce37eeb8af5218942c85b2d393df -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 31 22:43:58 2012 -0400 - - [GSUB] Minor - - src/hb-ot-layout-gsub-table.hh | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit f0fc1df8fc949739b68d55948741016081b69c3a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 31 22:43:32 2012 -0400 - - [hb-old] Implement getGlyphMetrics() - - Still working on it. - - src/hb-old.cc | 13 ++++++++++++- - 1 files changed, 12 insertions(+), 1 deletions(-) - -commit 378d279bbf692195c4654e312dae854ab3be04cf -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 31 21:36:16 2012 -0400 - - Implement Unicode compatibility decompositions - - Based on patch from Philip Withnall. - https://bugs.freedesktop.org/show_bug.cgi?id=41095 - - src/hb-glib.cc | 30 +++++++++++++++++++++++ - src/hb-icu.cc | 36 +++++++++++++++++++++++++++- - src/hb-ot-shape-normalize.cc | 53 - +++++++++++++++++++++++++++-------------- - src/hb-unicode-private.hh | 1 + - src/hb-unicode.cc | 27 ++++++++++++++++++++- - src/hb-unicode.h | 37 ++++++++++++++++++++++++++++- - test/api/hb-test.h | 1 + - test/api/test-unicode.c | 50 - +++++++++++++++++++++++++++++++++++++++ - 8 files changed, 214 insertions(+), 21 deletions(-) - -commit 321ec29cc270e7e66a529696b70b2caac553c95f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 31 21:10:16 2012 -0400 - - Remove unused function - - src/hb-ot-shape-complex-indic.cc | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) - -commit 69cc492dc120847ed00cae65ec958593ebf550c5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 31 14:51:36 2012 -0400 - - [buffer] Minor - - src/hb-buffer-private.hh | 3 ++- - src/hb-buffer.cc | 24 ++++++++++++------------ - 2 files changed, 14 insertions(+), 13 deletions(-) - -commit 693918ef8541014a5ef7dfb91c6ea0ae36d9c368 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 21:08:51 2012 -0400 - - [OT] Streamline complex shaper enumeration - - Add a shaper class struct. - - src/hb-ot-shape-complex-arabic.cc | 37 +++---- - src/hb-ot-shape-complex-indic.cc | 47 ++++++--- - src/hb-ot-shape-complex-misc.cc | 67 ++++++-------- - src/hb-ot-shape-complex-private.hh | 179 - ++++++++++------------------------ - src/hb-ot-shape-normalize-private.hh | 4 +- - src/hb-ot-shape-private.hh | 2 +- - src/hb-ot-shape.cc | 16 ++- - 7 files changed, 143 insertions(+), 209 deletions(-) - -commit c2e42c3db691515f3a458eb4c71fe1e6439d5620 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 19:54:50 2012 -0400 - - Minor - - src/hb-ot-layout-gpos-table.hh | 2 +- - src/hb-ot-layout-gsub-table.hh | 4 ++-- - src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- - src/hb-ot-layout-private.hh | 4 ++-- - 4 files changed, 9 insertions(+), 9 deletions(-) - -commit 03f67bc012f42131b36083a23efc78e1b04b828c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 19:47:53 2012 -0400 - - More refactoring glyph class access - - src/hb-ot-layout-gpos-table.hh | 2 +- - src/hb-ot-layout-gsub-table.hh | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 154 - ++++++++++++++++------------------ - 3 files changed, 76 insertions(+), 82 deletions(-) - -commit 300c7307eb7943ba7416b672345506be1e27c6ba -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 19:37:44 2012 -0400 - - [OT] Don't crash if no GDEF available - - src/hb-ot-layout-gsubgpos-private.hh | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit 3dcbdc2125c04c173f29f04922fc031929893f4e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 19:31:17 2012 -0400 - - Minor - - src/hb-ot-layout.cc | 15 +++++---------- - 1 files changed, 5 insertions(+), 10 deletions(-) - -commit 05bd1b63426e07d1df7a1b40bf845dc94ab995a8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 19:30:01 2012 -0400 - - [GSUB/GPOS] Move glyph props matching around - - src/hb-ot-layout-gpos-table.hh | 11 ++-- - src/hb-ot-layout-gsub-table.hh | 18 ++++-- - src/hb-ot-layout-gsubgpos-private.hh | 99 - ++++++++++++++++++++++++++++---- - src/hb-ot-layout-private.hh | 12 ---- - src/hb-ot-layout.cc | 104 - +++------------------------------- - src/hb-ot-layout.h | 12 +++- - src/hb-ot-shape.cc | 10 ++-- - 7 files changed, 127 insertions(+), 139 deletions(-) - -commit 2fca1426ca06cabbe8f027f2dc9dee9c27560c76 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 18:46:41 2012 -0400 - - [GSUB] Don't erase glyph classes if GDEF does not have glyph classes - - src/hb-ot-layout-gsubgpos-private.hh | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit fd42257f8c45ff8e036e1c3eb1a788a101be7ead -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 18:40:27 2012 -0400 - - Minor - - src/hb-ot-layout.cc | 29 +++++------------------------ - 1 files changed, 5 insertions(+), 24 deletions(-) - -commit 7fbbf86efe675e4c038dfc5985c24bbc544620cd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 18:36:42 2012 -0400 - - [GSUB] Minor - - src/hb-ot-layout-gsub-table.hh | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 6 ++++++ - 2 files changed, 7 insertions(+), 1 deletions(-) - -commit 713914d3203109a8e9213f5a1d3b384730703ce9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 17:54:38 2012 -0400 - - [Uniscribe] Clean up a bit - - src/hb-uniscribe.cc | 17 +++++------------ - 1 files changed, 5 insertions(+), 12 deletions(-) - -commit 301168dae77a63ee25adfb26ce2b54a708f83791 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 17:48:04 2012 -0400 - - [CoreText] Port to shape_plan infrastructure - - src/hb-coretext.cc | 161 - ++++++++++++++++++++++++++-------------------------- - 1 files changed, 80 insertions(+), 81 deletions(-) - -commit 6cdfd14bb19d60ac3d6b20ff611408432254f273 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 17:22:17 2012 -0400 - - Fix build on Mac - - src/hb-ot-layout-gsub-table.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 7e34601dededd521bcef15111e39293df3d0d13d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 14:53:41 2012 -0400 - - Unbreak Hangul jamo composition - - When we removed the separate Hangul shaper, the specific normalization - preference of Hangul was lost. Fix that. Also, the Thai shaper was - copied from Hangul, so had the fully-composed normalization behavior, - which was unnecessary. So, fix that too. - - src/hb-ot-shape-complex-arabic.cc | 2 +- - src/hb-ot-shape-complex-indic.cc | 4 +--- - src/hb-ot-shape-complex-misc.cc | 12 +++++++++--- - src/hb-ot-shape-complex-private.hh | 9 ++++----- - src/hb-ot-shape.cc | 4 +++- - 5 files changed, 18 insertions(+), 13 deletions(-) - -commit 7afb14407e59dfeaa79c33aca1ffa60e7982e349 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 13:54:46 2012 -0400 - - [Indic] Recategorize Telugu length marks - - Fixes 8 more Telugu tests. Failures at 15 (0.00154548%). - - src/hb-unicode.cc | 8 ++++++++ - src/indic.cc | 11 ++++++++--- - 2 files changed, 16 insertions(+), 3 deletions(-) - -commit 70b3dc327232b20051b36397aa2b196ab8c62397 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 12:40:18 2012 -0400 - - Add Hebrew test - - .../script-hebrew/misc/diacritics.txt | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit f2377155e35c15919af4d7db21b6edc6783146b6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 10:50:57 2012 -0400 - - [hb-old] Fix misc leaks - - Backport (forward-port?!) from upstream: - - commit 3ab7b37bdebf0f8773493a1fee910b151c4de30f - Author: Behdad Esfahbod <behdad@behdad.org> - Date: Mon Jul 30 10:50:22 2012 -0400 - - Fix misc leaks - - https://bugs.freedesktop.org/show_bug.cgi?id=31992 - https://bugs.freedesktop.org/show_bug.cgi?id=31993 - https://bugs.freedesktop.org/show_bug.cgi?id=31994 - https://bugs.freedesktop.org/show_bug.cgi?id=31995 - - src/hb-old/harfbuzz-arabic.c | 12 +++++++++--- - src/hb-old/harfbuzz-gpos.c | 6 +++--- - src/hb-old/harfbuzz-gsub.c | 6 +++--- - src/hb-old/harfbuzz-tibetan.c | 1 + - 4 files changed, 16 insertions(+), 9 deletions(-) - -commit 3f4764bb56bb7e42ba8859f1905810bd2f998838 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 10:06:42 2012 -0400 - - Don't lock user_data set during destruction if empty - - src/hb-private.hh | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 4ba647eecf0f70917ac4229af1f2dd3c62fcb7d5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 09:53:06 2012 -0400 - - Fix leak - - src/hb-ot-shape.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit f860366456d9e59b139a940da6d89c3c4fb9e96e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 02:38:39 2012 -0400 - - [OT] Gain back some lost speed - - src/hb-ot-layout-private.hh | 27 +++++++++++++++- - src/hb-ot-layout.cc | 63 - ++++++++++++++++++++++++++++++++--- - src/hb-ot-map-private.hh | 26 +++------------ - src/hb-ot-map.cc | 35 ++++++++++++++------ - src/hb-ot-shape-complex-indic.cc | 2 +- - src/hb-ot-shape-complex-private.hh | 5 --- - 6 files changed, 114 insertions(+), 44 deletions(-) - -commit 11f4c87d01924cac43bf40044f67838440e19e42 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 02:36:46 2012 -0400 - - [OT] Remove hb_ot_layout_ensure() - - I didn't like it from the beginning. - - src/hb-ot-layout.cc | 9 +++++---- - src/hb-ot-layout.h | 5 ----- - 2 files changed, 5 insertions(+), 9 deletions(-) - -commit 578e42182b9b9cf15b4c5426fae36e224160cbd7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 02:35:07 2012 -0400 - - Minor - - src/hb-ot-layout-private.hh | 2 -- - src/hb-ot-layout.cc | 1 - - 2 files changed, 0 insertions(+), 3 deletions(-) - -commit a973b5ce86051e8ef0d20df362db1a50488842ab -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 01:46:34 2012 -0400 - - [GSUB] Further adjustments to mark-attachment vs ligation interaction - - The d1d69ec52e75a78575b620a1c456d528b6078170 change broke Kannada - badly, - since it was ligating consonants, pushing matra out, and then ligating - with the matra. Adjust for that. See comments. - - src/hb-ot-layout-gsub-table.hh | 11 ++++++++--- - .../indic/script-kannada/misc/misc.txt | 1 + - 2 files changed, 9 insertions(+), 3 deletions(-) - -commit 0aef425e25e2c58445157057f17ef18f695c5240 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 00:55:15 2012 -0400 - - [GSUB] Minor - - src/hb-ot-layout-gpos-table.hh | 15 ++++++--------- - 1 files changed, 6 insertions(+), 9 deletions(-) - -commit d1d69ec52e75a78575b620a1c456d528b6078170 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 00:51:47 2012 -0400 - - [GSUB] Don't ligate glyphs attached to different components of - ligatures - - This concludes the mark-attachment vs ligating interaction fixes - (for now). - - src/hb-ot-layout-gsub-table.hh | 24 ++++++++++++++++++++++++ - 1 files changed, 24 insertions(+), 0 deletions(-) - -commit 4751dec8be05883483fd5f6b474ebd22583ae566 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 00:42:07 2012 -0400 - - Minor - - src/hb-ot-layout-private.hh | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) - -commit f24bcfbed1f3b4f4f6311246bd870f73ad6ba750 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 00:39:00 2012 -0400 - - Minor - - src/hb-ot-layout-gsub-table.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit fe20c0f84f5ff518dc471bf22ac5a83ef079eb69 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 30 00:00:59 2012 -0400 - - [GSUB] Fix mark component stuff when ligatures form ligatures! - - See comments. - - Fixes https://bugzilla.gnome.org/show_bug.cgi?id=437633 - - src/hb-ot-layout-gsub-table.hh | 117 - ++++++++++++++++++++++------------ - src/hb-ot-layout-gsubgpos-private.hh | 8 -- - src/hb-ot-layout-private.hh | 8 +-- - 3 files changed, 79 insertions(+), 54 deletions(-) - -commit 2ec3ba46a3c24469096e901750e38f6ee555479a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 29 22:02:24 2012 -0400 - - [GSUB/GPOS] Minor - - Start squeezing more out of lig_id/lig_comp. - - src/hb-ot-layout-gsub-table.hh | 6 +++--- - src/hb-ot-layout-private.hh | 35 +++++++++++++++++++++++++++++++---- - 2 files changed, 34 insertions(+), 7 deletions(-) - -commit ef6e9cec3399e4f63f4b662abd77cf6d4683e8a3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 29 21:35:22 2012 -0400 - - Fixup bb0e4ba3e9c5a407fc5d73c914e429d24d336380 - - src/hb-shape-plan.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit cb3d34063154bf164c61eeba41c6166b0bd304fb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 29 20:37:38 2012 -0400 - - [GSUB] Don't set new lig_id on mark ligatures - - If two marks form a ligature, retain their previous lig_id, such that - the mark ligature can attach to ligature components... - - Fixes https://bugzilla.gnome.org/show_bug.cgi?id=676343 - - In fact, I noticed that we should not let ligatures form between - glyphs - coming from different components of a previous ligature. For example, - if the sequence is: LAM,SHADDA,LAM,FATHA,HEH, the LAM,LAM,HEH form a - ligature, putting SHADDA and FATHA next to eachother. However, - it would - be wrong to ligate them. Uniscribe has this bug also. - - src/hb-ot-layout-gsub-table.hh | 18 ++++++++++++++---- - 1 files changed, 14 insertions(+), 4 deletions(-) - -commit 97a201becf936f62046914b568e5763e27ee936e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 29 20:31:36 2012 -0400 - - Add Arabic tests for mark ligature component attachments - - .../script-arabic/misc/diacritics/MANIFEST | 1 + - .../misc/diacritics/ligature-components.txt | 18 - ++++++++++++++++++ - 2 files changed, 19 insertions(+), 0 deletions(-) - -commit a15b70a81a609f024083cb04f9819483f4d5cab7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 29 20:09:22 2012 -0400 - - [hb-old] Fix cluster formation in RTL - - Unlike Uniscribe, hb-old returns glyphs in logical order, so the logic - does not need to duplicated for RTL. - - src/hb-old.cc | 12 +++--------- - 1 files changed, 3 insertions(+), 9 deletions(-) - -commit 8a7e70ef65952fc16b8c1d5f1126c94d9d81e755 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 29 19:56:54 2012 -0400 - - [Minor] - - src/test.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bb0e4ba3e9c5a407fc5d73c914e429d24d336380 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 29 17:34:14 2012 -0400 - - Minor - - src/hb-shape-plan.cc | 2 +- - src/test-would-substitute.cc | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit a00ad60bc0fe74bf0e11d73da563239f3392f351 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 28 21:16:08 2012 -0400 - - [Uniscribe] Remove hb_uniscribe_font_ensure() - - Wasn't a huge fan of putting the burden on the user. Just remove - it and - do what we've got to do transparently. - - src/hb-uniscribe.cc | 6 +++++- - src/hb-uniscribe.h | 4 ---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -commit 5d874d566fe5d2cc4cfaf02c79b663d8a626ca1e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 28 21:05:25 2012 -0400 - - [GPOS] Fix mark-to-mark positioning when one of the marks is - a ligature - - This commit: a3313e54008167e415b72c780ca7b9cda958d07e broke - MarkMarkPos - when one of the marks itself is a ligature. That regressed 26 Tibetan - tests (up from zero!). Fix that. Tibetan back to zero. - - src/hb-ot-layout-gpos-table.hh | 27 - ++++++++++++++----- - src/hb-ot-layout-private.hh | 5 ++- - test/shaping/texts/in-tree/shaper-indic/MANIFEST | 1 + - .../indic/script-sinhala/misc/MANIFEST | 1 + - .../in-tree/shaper-indic/south-asian/MANIFEST | 1 + - .../south-asian/script-tibetan/MANIFEST | 1 + - .../south-asian/script-tibetan/misc/MANIFEST | 1 + - .../south-asian/script-tibetan/misc/misc.txt | 1 + - 8 files changed, 29 insertions(+), 9 deletions(-) - -commit 338fe662b50f9309bf0050dd99becb644874195b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 28 18:53:01 2012 -0400 - - [GSUB] Minor - - src/hb-ot-layout-gsub-table.hh | 33 ++++++++++++++++----------------- - 1 files changed, 16 insertions(+), 17 deletions(-) - -commit e6f7479fe34fb4a7cada61d84c2ed70d1fd565c8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 28 18:34:58 2012 -0400 - - [GSUB] Simplify would-apply - - src/hb-ot-layout-gsub-table.hh | 71 - +++------------------------------- - src/hb-ot-layout-gsubgpos-private.hh | 24 ++--------- - 2 files changed, 11 insertions(+), 84 deletions(-) - -commit dadede012e4841f9fcb70d514fdc752f3ea4663d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 28 18:03:20 2012 -0400 - - Minor - - src/hb-ot-layout-common-private.hh | 7 +++---- - src/hb-ot-layout-gpos-table.hh | 2 +- - src/hb-ot-layout-gsub-table.hh | 2 +- - 3 files changed, 5 insertions(+), 6 deletions(-) - -commit 0b99429ead05ae32b3c210cb499af401b02770a9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 28 17:31:01 2012 -0400 - - [GSUB/GPOS] Add get_coverage() and use it to speed up main loop - - And use it to speed up the hotspot by checking coverage directly in - the main loop, not 10 functions deep in. - - Gives me a solid 20% boost with Indic test suite. Less so for less - lookup-intensive scenarios. - - Remove the "fast_path" hack from before. - - src/hb-ot-layout-gpos-table.hh | 179 - +++++++++++++++++++++++++++++---- - src/hb-ot-layout-gsub-table.hh | 166 - ++++++++++++++++++++++++++------ - src/hb-ot-layout-gsubgpos-private.hh | 26 +++++ - 3 files changed, 321 insertions(+), 50 deletions(-) - -commit 30ec9002d84e8b49290e782e6192069821ffa942 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 28 17:25:20 2012 -0400 - - Reject lookups with no subTable - - src/hb-ot-layout-common-private.hh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 0981068b75710397f08e0d2d776a0a2ea68d7117 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 28 17:01:59 2012 -0400 - - [GSUB/GPOS] Reject Context/ChainContext lookups with zero input - - src/hb-ot-layout-gsubgpos-private.hh | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 2f87cebe1062c7007021ebd05c1664e60da80825 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 27 04:02:38 2012 -0400 - - Implement shape_plan caching - - Should give us some performance boost. - - TODO | 4 ++ - src/hb-buffer-private.hh | 30 ++++++++++++++ - src/hb-font-private.hh | 6 +++ - src/hb-font.cc | 15 ++++++- - src/hb-shape-plan.cc | 100 - ++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-shape-plan.h | 7 +++ - src/hb-shape.cc | 2 +- - 7 files changed, 162 insertions(+), 2 deletions(-) - -commit e9eb9503e97044222f843daacfa47e26e51312b7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 27 03:16:22 2012 -0400 - - Add default_shaper_list to shape_plan - - src/hb-shape-plan-private.hh | 1 + - src/hb-shape-plan.cc | 2 ++ - 2 files changed, 3 insertions(+), 0 deletions(-) - -commit 3b7c4e270694ed962e2a2839e44f2a59c26b326c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 27 03:12:23 2012 -0400 - - Don't fail choosing shaper on planning failure - - Shapers have a chance to reject a font in face shaper_data creation. - No need to allow failing during planning. - - src/hb-shape-plan.cc | 17 ++++++----------- - 1 files changed, 6 insertions(+), 11 deletions(-) - -commit cfe9882610489e1b917e09a74dfbf6bbba2e4a57 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 27 03:06:30 2012 -0400 - - Add hb_ot_layout_ensure() and hb_uniscribe_font_ensure() - - src/hb-ot-layout.cc | 7 +++++++ - src/hb-ot-layout.h | 6 ++++++ - src/hb-shape-plan.cc | 22 ++-------------------- - src/hb-shaper-private.hh | 18 ++++++++++++++++++ - src/hb-uniscribe.cc | 11 +++++++++++ - src/hb-uniscribe.h | 4 ++++ - 6 files changed, 48 insertions(+), 20 deletions(-) - -commit c5b668fb9239c912d2448280a7176e331ebc9181 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 27 02:49:39 2012 -0400 - - Choose one shaper per plan - - src/hb-shape-plan-private.hh | 2 +- - src/hb-shape-plan.cc | 19 +++++++++---------- - 2 files changed, 10 insertions(+), 11 deletions(-) - -commit e82061e8db922f0ddbefd5a184ee2f9f967b9a05 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 27 02:29:32 2012 -0400 - - Move ot shaper completely to shape_plan - - src/hb-ot-shape-private.hh | 6 -- - src/hb-ot-shape.cc | 181 - ++++++++++++++++++++------------------------ - src/hb-uniscribe.cc | 2 +- - 3 files changed, 84 insertions(+), 105 deletions(-) - -commit ea278d3895fe0c92801d692cd71d8d9f1de7c048 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 27 02:12:28 2012 -0400 - - Partially switch ot shaper to shape_plan - - src/hb-buffer-private.hh | 1 + - src/hb-buffer.cc | 1 - - src/hb-font-private.hh | 2 -- - src/hb-font.cc | 22 ++++++++++++++-------- - src/hb-ot-layout-gpos-table.hh | 2 +- - src/hb-ot-layout-gsub-table.hh | 4 ++-- - src/hb-ot-layout-private.hh | 1 + - src/hb-ot-layout.cc | 9 ++++++--- - src/hb-ot-shape.cc | 3 ++- - src/hb-shape-plan.cc | 11 +++++++++++ - src/hb-shaper-private.hh | 3 ++- - 11 files changed, 40 insertions(+), 19 deletions(-) - -commit b6b7ba1313bf686e6ed567183466104c90504a67 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 27 01:26:11 2012 -0400 - - Switch old and uniscribe backends to shape_plan - - src/hb-old.cc | 80 ++----------------------- - src/hb-shape.cc | 5 ++ - src/hb-shaper-impl-private.hh | 3 +- - src/hb-shaper-private.hh | 4 - - src/hb-uniscribe.cc | 130 - ++++++++++++----------------------------- - 5 files changed, 48 insertions(+), 174 deletions(-) - -commit c32c096a429da3e64896cf42ff5ab8c775d3c2ec -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 27 01:13:53 2012 -0400 - - Switch to shape_plan - - Not optimized yet. Eats babies. And no shaper uses the shape_plan. - - src/hb-shape-plan.cc | 37 +++++++++++++++++++++++++++++++++++-- - src/hb-shape-plan.h | 8 ++++++++ - src/hb-shape.cc | 27 ++++----------------------- - 3 files changed, 47 insertions(+), 25 deletions(-) - -commit 5b95c148cc485f79fd7018bc4520b4cb5f728a18 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 26 23:46:53 2012 -0400 - - Start implementing shape_plan - - src/hb-fallback-shape.cc | 4 ++- - src/hb-font-private.hh | 4 ++ - src/hb-old.cc | 4 ++- - src/hb-ot-shape.cc | 4 ++- - src/hb-shape-plan-private.hh | 7 ++++ - src/hb-shape-plan.cc | 76 - ++++++++++++++++++++++++++++++++++++++++- - src/hb-shape.cc | 4 ++ - src/hb-shaper-private.hh | 4 +- - src/hb-uniscribe.cc | 4 ++- - 9 files changed, 103 insertions(+), 8 deletions(-) - -commit bd26b4d21f59312805d294f46f15182adbcc47da -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 26 22:05:39 2012 -0400 - - Minor - - src/Makefile.am | 1 + - src/hb-fallback-shape.cc | 3 +- - src/hb-old.cc | 3 +- - src/hb-ot-shape.cc | 3 +- - src/hb-shape-plan-private.hh | 2 +- - src/hb-shape-plan.cc | 2 + - src/hb-shape.cc | 98 - ++++---------------------------------- - src/hb-shaper-private.hh | 16 +++++- - src/hb-shaper.cc | 109 - ++++++++++++++++++++++++++++++++++++++++++ - src/hb-uniscribe.cc | 3 +- - 10 files changed, 145 insertions(+), 95 deletions(-) - -commit 027857d0412477fb4427dcb8a8c45287c272e143 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 26 17:34:25 2012 -0400 - - Start adding a unified shaper access infrastructure - - Add global shape_plan. Unused so far. - - src/Makefile.am | 15 ++- - src/hb-coretext-private.hh | 42 --------- - src/hb-coretext.cc | 6 +- - src/hb-fallback-shape-private.hh | 41 --------- - src/hb-fallback-shape.cc | 62 ++++++++++++- - src/hb-font-private.hh | 12 +++ - src/hb-font.cc | 15 +++- - src/hb-graphite2-private.hh | 42 --------- - src/hb-old-private.hh | 40 -------- - src/hb-old.cc | 109 +++++++++++++++++----- - src/hb-ot-shape-private.hh | 8 -- - src/hb-ot-shape.cc | 60 ++++++++++++- - src/hb-shape-plan-private.hh | 52 +++++++++++ - src/hb-shape-plan.cc | 85 +++++++++++++++++ - src/hb-shape-plan.h | 60 ++++++++++++ - src/hb-shape.cc | 48 +--------- - src/hb-shaper-impl-private.hh | 44 +++++++++ - src/hb-shaper-list.hh | 50 ++++++++++ - src/hb-shaper-private.hh | 81 +++++++++++++++++ - src/hb-uniscribe-private.hh | 42 --------- - src/hb-uniscribe.cc | 186 - ++++++++++++++++++++++++-------------- - 21 files changed, 735 insertions(+), 365 deletions(-) - -commit fa2dfcd560444d8c54b6349ee106134d3536f79b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 26 16:06:16 2012 -0400 - - Fix visibility warnings with MinGW32 - - src/hb-old/harfbuzz-global.h | 17 +++++++++++------ - src/hb-old/harfbuzz-impl.h | 6 +++++- - 2 files changed, 16 insertions(+), 7 deletions(-) - -commit ac2085d4b391b0a72473ecac3dd6c22efe66833f -Author: Jonathan Kew <jfkthame@gmail.com> -Date: Thu Jul 26 15:58:45 2012 -0400 - - [CoreText] Ensure cluster indices in output buffer are non-decreasing. - - Does not provide Uniscribe-compatible results, but should at least - avoid - breaking hb-view due to out-of-order cluster values. - - For RTL runs, ensure cluster values are non-increasing (instead of - non-decreasing). - - src/hb-coretext.cc | 37 +++++++++++++++++++++++++++++++++++++ - 1 files changed, 37 insertions(+), 0 deletions(-) - -commit 441d3bb7de311d54b9f0a5210344f9a96e97e153 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 26 12:01:12 2012 -0400 - - Minor - - src/hb-coretext.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 2e7f223054d310695bdb3498b2b2b5d17b6cce78 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 25 19:30:15 2012 -0400 - - [hb-old] Fix Arabic cursive positioning - - Backporting from upstream: - - commit b847f24ce855d24f6822bcd9c0006905e81b94d8 - Author: Behdad Esfahbod <behdad@behdad.org> - Date: Wed Jul 25 19:29:16 2012 -0400 - - [arabic] Fix Arabic cursive positioning - - This was clearly broken in testing. Who knows... Fixes for me. - Test with a Nastaleeq font, or with Arabic Typesetting. - - Backporting from Chromium. - - src/hb-old/harfbuzz-shaper.cpp | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9550a8c4e8b4e28be60d38c27d59253846ff9569 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 25 19:22:57 2012 -0400 - - [hb-old] Fixup not-enough-space handling - - src/hb-old.cc | 15 ++++++++------- - 1 files changed, 8 insertions(+), 7 deletions(-) - -commit 91e721ea8693205f4f738bca97a5055ee75cf463 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 25 19:20:34 2012 -0400 - - [hb-old] Fix clusters - - Unlike its "documentation", hb-old's log_clusters are, well, indeed - logical, not visual. Fixup. Adapted / copied from hb-uniscribe. - - src/hb-old.cc | 51 - ++++++++++++++++++++++++++++++++--------- - src/hb-old/harfbuzz-shaper.h | 1 + - src/hb-uniscribe.cc | 5 ++- - 3 files changed, 44 insertions(+), 13 deletions(-) - -commit a3313e54008167e415b72c780ca7b9cda958d07e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 25 18:37:51 2012 -0400 - - [GPOS] Fix MarkMarkPos applied to results of MultipleSubst - - This was broken as a result of - 7b84c536c10ab90ed96a033d88e9ad232d46c5b8. - As Khaled reported, MarkMark positioning was broken with glyphs - resulting from a MultipleSubst. Fixed. Test with the ALLAH character - in Amiri. - - src/hb-ot-layout-gpos-table.hh | 10 +++++----- - src/hb-ot-layout-private.hh | 23 +++++++++++++++++++++-- - 2 files changed, 26 insertions(+), 7 deletions(-) - -commit 35bdab3cf1f0836807160e3ce93766c321b32e8c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 25 11:59:52 2012 -0400 - - Minor - - src/hb-unicode-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8fe4c7405b922cf0f936a46a9baedf4885b05254 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 21:05:12 2012 -0400 - - [hb-old] Add HarfBuzz.old shaper - - Choose using shaper name "old". - - configure.ac | 8 + - src/Makefile.am | 14 +- - src/hb-old-private.hh | 40 +++ - src/hb-old.cc | 369 +++++++++++++++++++++++ - src/hb-old/.gitignore | 7 - - src/hb-old/Makefile.am | 2 + - src/hb-old/Makefile.in | 762 - ------------------------------------------------ - src/hb-shape.cc | 8 +- - 8 files changed, 436 insertions(+), 774 deletions(-) - -commit 5e1987005eb1b9af7a4d3d9f90c5768d8cc80015 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 19:53:55 2012 -0400 - - [hb-old] Define Unicode funcs in terms of new HarfBuzz - - src/hb-old/Makefile.am | 4 + - src/hb-old/Makefile.in | 182 - +++++++++++++++++++++++++++++++++++----- - src/hb-old/harfbuzz-external.h | 100 +++++++++++++--------- - 3 files changed, 224 insertions(+), 62 deletions(-) - -commit 4a31166b2853c1ec052844140e114158f47c2355 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 19:49:48 2012 -0400 - - [hb-old] Shovel out the line-breaking / word-segmentation stuff - - src/hb-old/Makefile.am | 10 +- - src/hb-old/Makefile.in | 13 +- - src/hb-old/harfbuzz-external.h | 66 ------ - src/hb-old/harfbuzz-indic.cpp | 26 --- - src/hb-old/harfbuzz-khmer.c | 25 -- - src/hb-old/harfbuzz-myanmar.c | 28 --- - src/hb-old/harfbuzz-shaper-private.h | 12 - - src/hb-old/harfbuzz-shaper.cpp | 403 - +++------------------------------- - src/hb-old/harfbuzz-shaper.h | 31 --- - src/hb-old/harfbuzz-thai.c | 111 ---------- - src/hb-old/harfbuzz-tibetan.c | 26 --- - src/hb-old/harfbuzz.c | 32 --- - 12 files changed, 33 insertions(+), 750 deletions(-) - -commit 0bcbe88cf313117f739b98a11dbe698b75784e9d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 19:38:24 2012 -0400 - - [hb-old] Add visibility attributes - - src/hb-old/harfbuzz-global.h | 10 ++++++---- - src/hb-old/harfbuzz-impl.h | 2 +- - 2 files changed, 7 insertions(+), 5 deletions(-) - -commit 6a9d43c3178c920672a84382ca3797e3c478b2b0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 19:21:22 2012 -0400 - - [hb-old] Remove unused header file - - src/hb-old/harfbuzz-shape.h | 199 - ------------------------------------------- - 1 files changed, 0 insertions(+), 199 deletions(-) - -commit fb47209c5b3aa992faf18d1a3f78b9d7682cf62f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 19:20:19 2012 -0400 - - [hb-old] Rename hb_buffer_* to HB_Buffer_* - - src/hb-old/harfbuzz-buffer.c | 22 +++++++++++----------- - src/hb-old/harfbuzz-buffer.h | 8 ++++---- - src/hb-old/harfbuzz-shaper.cpp | 8 ++++---- - 3 files changed, 19 insertions(+), 19 deletions(-) - -commit 1512a7357513b72e2a07dda706a176bb23d694e9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 19:16:56 2012 -0400 - - [hb-old] Start adding HarfBuzz-old as a new backend - - configure.ac | 1 + - src/Makefile.am | 5 + - src/hb-old/.gitignore | 7 + - src/hb-old/COPYING | 24 + - src/hb-old/Makefile.am | 56 + - src/hb-old/Makefile.in | 631 ++++ - src/hb-old/README | 7 + - src/hb-old/harfbuzz-arabic.c | 1144 +++++++ - src/hb-old/harfbuzz-buffer-private.h | 107 + - src/hb-old/harfbuzz-buffer.c | 383 +++ - src/hb-old/harfbuzz-buffer.h | 102 + - src/hb-old/harfbuzz-external.h | 151 + - src/hb-old/harfbuzz-gdef-private.h | 135 + - src/hb-old/harfbuzz-gdef.c | 1163 +++++++ - src/hb-old/harfbuzz-gdef.h | 140 + - src/hb-old/harfbuzz-global.h | 118 + - src/hb-old/harfbuzz-gpos-private.h | 729 ++++ - src/hb-old/harfbuzz-gpos.c | 6094 - ++++++++++++++++++++++++++++++++++ - src/hb-old/harfbuzz-gpos.h | 155 + - src/hb-old/harfbuzz-greek.c | 447 +++ - src/hb-old/harfbuzz-gsub-private.h | 483 +++ - src/hb-old/harfbuzz-gsub.c | 4329 ++++++++++++++++++++++++ - src/hb-old/harfbuzz-gsub.h | 148 + - src/hb-old/harfbuzz-hangul.c | 268 ++ - src/hb-old/harfbuzz-hebrew.c | 187 ++ - src/hb-old/harfbuzz-impl.c | 84 + - src/hb-old/harfbuzz-impl.h | 131 + - src/hb-old/harfbuzz-indic.cpp | 1894 +++++++++++ - src/hb-old/harfbuzz-khmer.c | 667 ++++ - src/hb-old/harfbuzz-myanmar.c | 539 +++ - src/hb-old/harfbuzz-open-private.h | 102 + - src/hb-old/harfbuzz-open.c | 1433 ++++++++ - src/hb-old/harfbuzz-open.h | 288 ++ - src/hb-old/harfbuzz-shape.h | 199 ++ - src/hb-old/harfbuzz-shaper-all.cpp | 37 + - src/hb-old/harfbuzz-shaper-private.h | 171 + - src/hb-old/harfbuzz-shaper.cpp | 1338 ++++++++ - src/hb-old/harfbuzz-shaper.h | 294 ++ - src/hb-old/harfbuzz-stream-private.h | 81 + - src/hb-old/harfbuzz-stream.c | 114 + - src/hb-old/harfbuzz-stream.h | 51 + - src/hb-old/harfbuzz-thai.c | 111 + - src/hb-old/harfbuzz-tibetan.c | 274 ++ - src/hb-old/harfbuzz.c | 32 + - src/hb-old/harfbuzz.h | 38 + - 45 files changed, 24892 insertions(+), 0 deletions(-) - -commit 478fd0529b868b22905a9dedf331ac7cc9721723 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 17:09:01 2012 -0400 - - Minor - - src/hb-unicode-private.hh | 27 ++++++++++++++------------- - 1 files changed, 14 insertions(+), 13 deletions(-) - -commit 8979a7f6f2b44ade4c0198a31ae08561b35ce009 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 17:03:55 2012 -0400 - - [Mongolian] Remove Mongolian Vowel Separator at the end of shaping - - Results match Uniscribe now. - - src/hb-unicode-private.hh | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit aa6d849838d5231465ae1a25a4dd5ea1e9380ff9 -Author: Jonathan Kew <jfkthame@gmail.com> -Date: Tue Jul 24 15:52:32 2012 -0400 - - [CoreText] Add basic Core Text backend for comparison with our - native shaping - - Does not attempt to handle clusters in a Uniscribe- or - HarfBuzz-compatible way; - just returns the original string indexes that CT maintains. These - may even be - out-of-order in the case of reordrant glyphs. - - configure.ac | 12 ++ - src/Makefile.am | 7 + - src/hb-coretext-private.hh | 42 ++++++ - src/hb-coretext.cc | 323 - ++++++++++++++++++++++++++++++++++++++++++++ - src/hb-coretext.h | 43 ++++++ - src/hb-shape.cc | 6 + - 6 files changed, 433 insertions(+), 0 deletions(-) - -commit ec8d2494694275dfbbac2dd0d33ca2894b0463d6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 15:40:37 2012 -0400 - - Make data members of various OpenType structs protected instead - of private - - Should fix warnings generated when building with - -Wunused-private-field. - Based on patch from Jonathan Kew. - - src/hb-open-file-private.hh | 8 +++--- - src/hb-ot-head-table.hh | 2 +- - src/hb-ot-hhea-table.hh | 2 +- - src/hb-ot-hmtx-table.hh | 2 +- - src/hb-ot-layout-common-private.hh | 14 +++++---- - src/hb-ot-layout-gdef-table.hh | 20 +++++++------- - src/hb-ot-layout-gpos-table.hh | 48 - +++++++++++++++++----------------- - src/hb-ot-layout-gsub-table.hh | 30 ++++++++++---------- - src/hb-ot-layout-gsubgpos-private.hh | 32 +++++++++++----------- - src/hb-ot-maxp-table.hh | 2 +- - src/hb-ot-name-table.hh | 2 +- - 11 files changed, 82 insertions(+), 80 deletions(-) - -commit 97aa0b738a33b73a3f9763dd2950f2dd39f596ed -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 15:02:34 2012 -0400 - - Minor const correctness shuffling - - src/hb-shape.cc | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 6411e74caf23af7b0545f1fe54d19a1c8da895e8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 13:48:49 2012 -0400 - - [Indic] Reposition Gurmukhi top matras to after post - - The font is forming a post-base consonant in some samples, and - Uniscribe - positions top matra on the post-base. Do the same. - - Gurmukhi failures down from 59 to 41 (0.0674242%). - - src/hb-ot-shape-complex-indic.cc | 2 +- - .../indic/script-gurmukhi/misc/misc.txt | 1 + - 2 files changed, 2 insertions(+), 1 deletions(-) - -commit c3f769ba09df319fa69d04f68c57444f95eceee6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 13:26:32 2012 -0400 - - [Indic] Ignore Uniscribe output containing two zero-width space glyphs - - Uniscribe is buggy and sometimes /eats/ a mark next to a non-joiner. - Most of Malayalam failures where actually hitting this bug. - - Ignore test output with two zero-width space glyphs. This is a hack - until we build up the test suite infrastructure better. - - Bengali went down by 9, Devanagari by 2, Kannada by 130, Malayalm down - from 1197 to 307, Sinhala down by 16, Telugu down by 26. New stats: - - BENGALI: 353996 out of 354285 tests passed. 289 failed (0.0815727%) - DEVANAGARI: 693573 out of 693628 tests passed. 55 failed (0.00792932%) - GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) - GURMUKHI: 60750 out of 60809 tests passed. 59 failed (0.0970251%) - KANNADA: 951086 out of 951913 tests passed. 827 failed (0.0868777%) - KHMER: 299094 out of 299124 tests passed. 30 failed (0.0100293%) - MALAYALAM: 1048109 out of 1048416 tests passed. 307 failed - (0.0292823%) - ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) - SINHALA: 271715 out of 271847 tests passed. 132 failed (0.0485567%) - TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) - TELUGU: 970550 out of 970573 tests passed. 23 failed (0.00236973%) - - test/shaping/hb_test_tools.py | 1 + - .../indic/script-malayalam/misc/misc.txt | 2 ++ - 2 files changed, 3 insertions(+), 0 deletions(-) - -commit 65c43accdc4d2082282d5cedba8514b8df0c18a2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 03:36:47 2012 -0400 - - [Indic] Better position left-matra in Malayalam - - Just put it before base, which is what's expected. - - Malayalam failures down from 1559 to 1197 (0.114172%). - - BENGALI: 353988 out of 354285 tests passed. 297 failed (0.0838308%) - DEVANAGARI: 693571 out of 693628 tests passed. 57 failed (0.00821766%) - GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) - GURMUKHI: 60750 out of 60809 tests passed. 59 failed (0.0970251%) - KANNADA: 950956 out of 951913 tests passed. 957 failed (0.100534%) - KHMER: 299094 out of 299124 tests passed. 30 failed (0.0100293%) - MALAYALAM: 1047219 out of 1048416 tests passed. 1197 failed - (0.114172%) - ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) - SINHALA: 271699 out of 271847 tests passed. 148 failed (0.0544424%) - TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) - TELUGU: 970524 out of 970573 tests passed. 49 failed (0.00504856%) - - src/hb-ot-shape-complex-indic.cc | 41 - +++++++++++++------ - .../indic/script-malayalam/misc/misc.txt | 1 + - 2 files changed, 29 insertions(+), 13 deletions(-) - -commit 88f413b56f2858d149e2fc067685aeecaea779ca -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 03:04:36 2012 -0400 - - [Indic] Implement Reph+Ya-Phalaa interaction - - The sequence Ra,H,Ya in Bengali is ambigious and Unicode encoded - that to - get Ya-Phalaa, one would place ZWJ before Halant. Ie. a ZWJ,H - sequence - requests subjoining, while a H,ZWJ requests Half form. Implement - that. - - Bengali failures go down from 377 to 297 (0.0838308%). - Gujarati is down by 4 to 17 (0.0046384%). - Kannada is down by 226 to 957 (0.100534%). - - Current status: - - BENGALI: 353988 out of 354285 tests passed. 297 failed (0.0838308%) - DEVANAGARI: 693571 out of 693628 tests passed. 57 failed (0.00821766%) - GUJARATI: 366489 out of 366506 tests passed. 17 failed (0.0046384%) - GURMUKHI: 60750 out of 60809 tests passed. 59 failed (0.0970251%) - KANNADA: 950956 out of 951913 tests passed. 957 failed (0.100534%) - KHMER: 299094 out of 299124 tests passed. 30 failed (0.0100293%) - MALAYALAM: 1046857 out of 1048416 tests passed. 1559 failed - (0.148701%) - ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) - SINHALA: 271699 out of 271847 tests passed. 148 failed (0.0544424%) - TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) - TELUGU: 970524 out of 970573 tests passed. 49 failed (0.00504856%) - - src/hb-ot-shape-complex-indic.cc | 10 ++++++++-- - .../indic/script-bengali/misc/reph.txt | 4 ++++ - 2 files changed, 12 insertions(+), 2 deletions(-) - -commit dff0ece11d61978c04e839501f179a5c3077f340 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 02:30:38 2012 -0400 - - [Indic] Limit matras to 4 per syllable - - Also limit joiners. - - This limits our syllable length to a constant, and is - closer to what Uniscribe does anyway. - - Two Devanagari tests regressed, but who cares about tests with 20 - joiners in a row?! Devanagari at 57 (0.00821766%) now. - - src/hb-ot-shape-complex-indic-machine.rl | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 330b329c8905a37ca88c556dea82c70d74c77458 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 02:25:26 2012 -0400 - - [Indic] Unmark U+17D1 KHMER SIGN VIRIAM to NOT be a Virama - - Fixes another 1 Khmer failure. Down to 30 (0.0100293%) now. - - src/hb-ot-shape-complex-indic.cc | 2 ++ - .../south-east-asian/script-khmer/misc/misc.txt | 1 + - 2 files changed, 3 insertions(+), 0 deletions(-) - -commit 6824a7194e01b77eddb95bd95a9b32e219140912 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 02:22:18 2012 -0400 - - [Indic] Recategorize Khmer various signs as top matras - - Khmer failures down from 39 to 31 (0.0103636%). - - src/hb-ot-shape-complex-indic.cc | 23 ++++++++++------------- - 1 files changed, 10 insertions(+), 13 deletions(-) - -commit d90b8e841e0068a601c96ab184d18b0f48eec9d1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 02:10:20 2012 -0400 - - [Indic] Reposition Khmer prebase-reordering Ra around split matras - - In Khmer coeng model, a V,Ra can go *after* matras. If it goes - after a - split matra, it should be reordered to *before* the left part of - such matra. - - Khmer failures down from 136 to 39 (0.0130381%). - - src/hb-ot-shape-complex-indic.cc | 13 +++++++++++++ - .../south-east-asian/script-khmer/misc/misc.txt | 4 ++++ - 2 files changed, 17 insertions(+), 0 deletions(-) - -commit 0afb84c12567ac35adac657bf8be29999b8c5a50 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 01:44:47 2012 -0400 - - [Indic] Fix minor bug in pre-base Ra positioning - - src/hb-ot-shape-complex-indic.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 7573799126e812a047daa5f64121ec959866b3c8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 01:32:07 2012 -0400 - - [Indic] Position Khmer U+17CE - - Fixes another 6 Khmer failures. Now at 136 (0.0454661%). - - src/hb-ot-shape-complex-indic.cc | 6 ++++++ - .../south-east-asian/script-khmer/misc/misc.txt | 1 + - 2 files changed, 7 insertions(+), 0 deletions(-) - -commit 8d00e8d0e7d10f823e6975fecaffb9d557b1a99a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 01:04:18 2012 -0400 - - [Indic] Don't reposition Khmer Bindu - - Khmer Bindu doesn't like to move to syllable end. Leave it where it - was. - - Brings down Khmer failures from 510 to 142 (0.047572%). - - src/hb-ot-shape-complex-indic.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 2278eefcdb3dd0d492b9d07176fbecc1f0516bb7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 00:26:43 2012 -0400 - - [Indic] In Sinhala, form forced Reph even if no other consonant found - - Fixes another 10 Sinhala failures. Down to 148 (0.0544424%). - - src/hb-ot-shape-complex-indic.cc | 10 +++++----- - .../indic/script-sinhala/misc/misc.txt | 1 + - 2 files changed, 6 insertions(+), 5 deletions(-) - -commit 71fd5e80ad06c8e85a1112cc89e129d6cd03f82c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 00:21:16 2012 -0400 - - [Indic] Further adjust base algorithm for Sinhala - - Apparently if there is C,V,ZWJ,C, the first C will be base, but if - it's C,ZWJ,V,C, the second one will be. - - Note that Uniscribe implements this differently, by breaking - syllable in - the case of C,ZWJ,V,C and putting the first consonant in one syllable - and the rest in the next syllable. - - Sinhala failures down from 208 to 158 (0.0581209%). No changes to - Khmer. - - src/hb-ot-shape-complex-indic.cc | 11 +++++++---- - .../indic/script-sinhala/misc/misc.txt | 3 +++ - 2 files changed, 10 insertions(+), 4 deletions(-) - -commit 73d71cc527d28fd5519c5d965c272ea1fb149a0e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 24 00:09:12 2012 -0400 - - [Indic] End Vowel-based syllable at ZWJ - - One Devanagari test regressed, plus 10 Malayalam (at 1545 now). - - Fixed 120 Sinhala failures. Now at 208 (0.0765136%). - - src/hb-ot-shape-complex-indic-machine.rl | 2 +- - .../indic/script-sinhala/misc/misc.txt | 1 + - 2 files changed, 2 insertions(+), 1 deletions(-) - -commit 34c215036f5fcdc7599b1ab0591b56dbb3811902 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 23 23:51:29 2012 -0400 - - [Indic] Improve Sinhala base algorithm and reph positioning - - Sinhala does not have half forms. And most (all?) consonants can be - base, except when preceded by ZWJ, which would request a subjoined - form. - Hence switch the base algorithm to categorize with Khmer, start search - at start, and stop at a ZWJ. - - Also, mark all pos=base consonants after base to be subjoined. Mark - base itself to have pos=base. - - Finally, adjust Sinhala's reph position to after-main. - - Brings down Sinhala failures from 455 to 328 (0.120656%). - - src/hb-ot-shape-complex-indic.cc | 18 - +++++++++++++++++- - .../indic/script-sinhala/misc/misc.txt | 1 + - 2 files changed, 18 insertions(+), 1 deletions(-) - -commit 2ec934c6c25423e7af20d909a9c698a149808ea9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 23 23:49:04 2012 -0400 - - [Indic] Change "unknown" position to end of syllable - - src/hb-ot-shape-complex-indic-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b70021f7c81a0ed08475b14b07291f662cd9f905 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 23 20:18:17 2012 -0400 - - When removing zero-width marks, don't remove ligatures - - If a mark ligated, it probably should NOT be removed. - - src/hb-ot-shape.cc | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 49c5ec51444f27f33e1eb6aa1959c61b08fa89c0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 23 20:14:13 2012 -0400 - - Minor refactoring - - src/hb-ot-layout-gsubgpos-private.hh | 32 - ------------------------------- - src/hb-ot-layout-private.hh | 35 - ++++++++++++++++++++++++++++++++++ - src/hb-ot-shape-complex-indic.cc | 2 +- - 3 files changed, 36 insertions(+), 33 deletions(-) - -commit c3e6fdc3791168cf2b4c9412e751f187d58faa42 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 23 20:11:42 2012 -0400 - - [Indic] Improve check on ligatures - - Only skip actual ligatures, not marks in-between ligature components. - - src/hb-ot-layout-gsubgpos-private.hh | 5 +++++ - src/hb-ot-shape-complex-indic.cc | 2 +- - 2 files changed, 6 insertions(+), 1 deletions(-) - -commit 771a8f50289e8fa458cfc3cd84f73a380ce98077 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 23 20:07:50 2012 -0400 - - [Indic] exclude ligatures when matching on Indic category - - If, say, a H,ZWJ,C ligature was formed, we don't want the code - to detec - that as a Halant. So, ignore ligatures when matching category in - final_reordering. - - Sinhala failures down from 514 to 455 (0.167374%). - - src/hb-ot-shape-complex-indic.cc | 41 - ++++++++++--------- - .../indic/script-sinhala/misc/misc.txt | 1 + - 2 files changed, 23 insertions(+), 19 deletions(-) - -commit d1af9e82e5309158ed334ab8e21f3a3b64b9540f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 23 19:55:35 2012 -0400 - - [GSUB/GPOS] Const correctness - - src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit baacd090df97610e3f6d1b2a110dc67b6c6f9f5c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 23 19:51:48 2012 -0400 - - [Indic] Minor refactoring - - src/hb-ot-shape-complex-indic.cc | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit c7c4de2fb9bba216e37875d79815eef55c0acc01 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 23 18:25:02 2012 -0400 - - [Indic] Remove syllable length check before sorting - - We now limit syllable lengths in the machine. No need to match here. - - src/hb-ot-shape-complex-indic.cc | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 9fa052733eb93a3ce1205f63ff8f74cb295cbe99 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 23 18:19:17 2012 -0400 - - [Indic] Limit syllables to at most five consonants - - Seems to be about what Uniscribe does. Not exactly. But close - enough. - More consonants will start a new cluster. - - A few scripts went way down in failures. In particular: - - - Devanagari failures went down from 490 to 56. - - Telugu went down from 113 to 49. - - Other scripts went down slightly or didn't change. New numbers: - - BENGALI: 353908 out of 354285 tests passed. 377 failed (0.106412%) - DEVANAGARI: 693572 out of 693628 tests passed. 56 failed (0.00807349%) - GUJARATI: 366485 out of 366506 tests passed. 21 failed (0.00572978%) - GURMUKHI: 60750 out of 60809 tests passed. 59 failed (0.0970251%) - KANNADA: 950730 out of 951913 tests passed. 1183 failed (0.124276%) - KHMER: 298613 out of 299124 tests passed. 511 failed (0.170832%) - MALAYALAM: 1046881 out of 1048416 tests passed. 1535 failed - (0.146411%) - ORIYA: 42320 out of 42329 tests passed. 9 failed (0.021262%) - SINHALA: 271333 out of 271847 tests passed. 514 failed (0.189077%) - TAMIL: 1091837 out of 1091837 tests passed. 0 failed (0%) - TELUGU: 970524 out of 970573 tests passed. 49 failed (0.00504856%) - - Some of the remaining Telugu and Devanagari issues seem to be - Uniscribe - eating Anusvara when placed before a non-joiner. Ouch! - - src/hb-ot-shape-complex-indic-machine.rl | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 093cd583263a5d427e3377b31585043fb55d2557 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 23 14:04:42 2012 -0400 - - [Thai] Fix SARA AM handling - - Oops, thinko. - - src/hb-ot-shape-complex-misc.cc | 6 +++--- - src/hb-private.hh | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -commit 42848453bf260b456b46a07f066e31b8c3aac2f1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 23 13:52:07 2012 -0400 - - [Thai] Reorder U+0E3A THAI VOWEL SIGN PHINTHU - - Uniscribe reorders U+0E3A to be after U+0E38 and U+0E39. We do - that by - modifying the ccc for U+0E3A. - - Fixes the two remaining Thai failures (see previous commit). - - src/hb-ot-shape-complex-misc.cc | 7 +++++++ - src/hb-unicode.cc | 6 ++++++ - .../in-tree/shaper-thai/script-thai/misc/MANIFEST | 1 + - .../shaper-thai/script-thai/misc/phinthu.txt | 16 - ++++++++++++++++ - 4 files changed, 30 insertions(+), 0 deletions(-) - -commit 4a7f4f3e56f8f7640ae7337aa1b3324f31e0d4ab -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 23 13:15:33 2012 -0400 - - [Thai] Adjust SARA AM reordering to match Uniscribe - - Adjust the list of marks before SARA AM that get the reordering - treatment. Also adjust cluster formation to match Uniscribe. - - With Wikipedia test data, now I see: - - - For Thai, with the Angsana New font from Win7, I see 54 - failures out - of over 4M tests (0.00129107%). Of the 54, two are legitimate - reordering issues (fix coming soon), and the other 52 are simply - Uniscribe using a zero-width space char instead of an unknown - character for missing glyphs. No idea why. The missing-glyph - sequences include one that is a Thai character followed by - an Arabic - Sokun. Someone confused it with Nikhahit I assume! - - - For Lao, with the Dokchampa font from Win7, 33 tests fail out of - 54k (0.0615167%). All seem to be insignificant mark positioning - with two marks on a base. Have to investigate. - - src/hb-ot-shape-complex-misc.cc | 42 - ++++++++++++------- - src/hb-private.hh | 6 +++ - test/shaping/texts/in-tree/shaper-thai/MANIFEST | 1 + - .../texts/in-tree/shaper-thai/script-lao/MANIFEST | 1 + - .../in-tree/shaper-thai/script-lao/misc/MANIFEST | 1 + - .../shaper-thai/script-lao/misc/sara-am.txt | 20 +++++++++ - .../shaper-thai/script-thai/misc/sara-am.txt | 18 ++++++++- - 7 files changed, 72 insertions(+), 17 deletions(-) - -commit 2cc933aff97916e5d0fe42883f40f0879f848e25 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 23 08:22:55 2012 -0400 - - [Indic] Fix cluster formation with left-matras and conjunct forms - - Test case was: <U+0D15,U+0D4D,U+0D15,U+0D4A>. - - src/hb-ot-shape-complex-indic.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit e6b01a878cd2e63cb675e7e0c6ac4d83a8c10f37 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 23 00:11:26 2012 -0400 - - [Indic] Further streamline cluster formation - - This should address all possible cluster misformations that I had in - mind. - - src/hb-ot-shape-complex-indic.cc | 21 ++++++++++----------- - 1 files changed, 10 insertions(+), 11 deletions(-) - -commit 7b2a7dadd6c616bbfe1d8358700cab9cee88e584 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 22 23:58:55 2012 -0400 - - [Indic] Merge clusters before sorting - - This should fix any instabilities in cluster formation that we were - speculating may happen with surrounding syllables. Or most of it - perhaps. - - src/hb-ot-shape-complex-indic.cc | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit abb3239ef92cc5dccb4638806d7ae9868b9ac9b3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 22 23:55:19 2012 -0400 - - [Indic] Update clusters for left-matra even if matra didn't move - - Fixes crashes reported with left matra under - non-uniscribe-bug-compatibilty mode. - - src/hb-ot-shape-complex-indic.cc | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -commit 60554f14d8dca208721f0da8b69d84b92819c54f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 22 23:23:56 2012 -0400 - - [Indic] Merge in Malayalam tests - - From: - http://silpa.org.in/pub/tests/hb/ml/ml-harfbuzz-testdata.txt - - .../indic/script-malayalam/misc/misc.txt | 94 - ++++++++++---------- - 1 files changed, 46 insertions(+), 48 deletions(-) - -commit 5c7081770c7a611bbe79b451b7b86dec4fa6395d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 22 23:20:27 2012 -0400 - - [Indic] Add extensive Sinhala tests - - Generated by: - http://git.savannah.gnu.org/cgit/sinhala.git/plain/utils/gen-unicode-sinhala.py - - .../indic/script-sinhala/misc/extensive.txt | 4390 - ++++++++++++++++++++ - 1 files changed, 4390 insertions(+), 0 deletions(-) - -commit 2efe4707b1b449962f6e161716477d9775456c46 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 22 23:17:59 2012 -0400 - - [Indic] Add Sinhala tests - - Merge tests from: - http://git.savannah.gnu.org/cgit/sinhala.git/plain/patches/icu-sinhala-rendering.txt - - .../indic/script-sinhala/misc/misc.txt | 26 - ++++++++++++++++++- - 1 files changed, 24 insertions(+), 2 deletions(-) - -commit 3d4c111b7a13700b2f7a0b087eb3992283295f21 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 19:34:39 2012 -0400 - - Add a test case - - .../indic/script-bengali/misc/misc.txt | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 92a1ad7bef9efb456ab87bd63818cfbed7da3f6f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 18:38:27 2012 -0400 - - [Indic] Stop searching for base if a post form is found before - below form - - Improves Bengali and Gurmukhi. Malayalam regressed a bit. We will - deal - with that later. - - src/hb-ot-shape-complex-indic.cc | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 4c450c703f8e4618c587bcd7ef46dcc1f2c7947b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 18:13:04 2012 -0400 - - [Indic] Recompose Bengali Ya,Nukta - - This is a bunch of hacks for now. - - Improves Bengali a bit. - - src/hb-ot-shape-complex-indic.cc | 4 ++-- - src/hb-unicode.cc | 8 ++++++++ - 2 files changed, 10 insertions(+), 2 deletions(-) - -commit e9c0f152a38cb2e76650a3e43f7fdcda266af696 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 17:05:46 2012 -0400 - - [Uniscribe] Fix script fallback - - Gurmukhi failures half now. Others changed slightly. - - src/hb-uniscribe.cc | 34 ++++++++++++++-------------------- - 1 files changed, 14 insertions(+), 20 deletions(-) - -commit 5791f329159c9863317e2b507514c29321be31a7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 16:26:55 2012 -0400 - - [Indic] Allow a ZWNJ after SM's - - Malayalam failures go way down. Other scripts benefitted slightly - too. - Sinhala had one or two test regressions, but... - - src/hb-ot-shape-complex-indic-machine.rl | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 34ae336f3fae93ef9372881d545c817bce383041 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 16:17:28 2012 -0400 - - [Indic] Improve Reph AfterMain positioning - - Fixes 20 out of 48 failing Oriya tests. Failure rate down to - 0.066% now. - - src/hb-ot-shape-complex-indic.cc | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit bdd080431a40bc941ece3230f338b94a46bd12a2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 16:03:09 2012 -0400 - - [Indic] Reposition Oriya Candrabindu - - Oriya failures down from 0.65% to 0.20%. - - src/hb-ot-shape-complex-indic.cc | 1 + - .../shaper-indic/indic/script-oriya/misc/MANIFEST | 1 + - .../shaper-indic/indic/script-oriya/misc/bindu.txt | 2 ++ - 3 files changed, 4 insertions(+), 0 deletions(-) - -commit 5f0eaaad129ff04d56b8756bebf19fbc242718c9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 15:47:24 2012 -0400 - - [Indic] Fix base search in final_reordering - - Fixes most Malayalam failures. Down from 1.6% to 0.38% now. Fixes a - few more in other scripts too. - - src/hb-ot-shape-complex-indic.cc | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) - -commit 81202bd860e4034c18d9f80c5a4f33d9f48463a3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 15:10:02 2012 -0400 - - [Indic] Don't attach SM/VD to other characters - - src/hb-ot-shape-complex-indic-private.hh | 3 ++ - src/hb-ot-shape-complex-indic.cc | 38 - ++++++++++++++++------------- - 2 files changed, 24 insertions(+), 17 deletions(-) - -commit efb4ad735691837a52447bedc1a66a87d0d9af51 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 14:27:38 2012 -0400 - - Fix compiler warnings - - If x is not constant, we cannot ASSERT_STATIC on it. - - src/hb-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f31d97e44eeb6fb141f3de928e27e033fc7b1f47 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 14:13:35 2012 -0400 - - [Indic] Form Telugu Reph out of Ra,Virama,ZWJ - - Apparently this was approved in Feb 2012. No font yet. - - src/hb-ot-shape-complex-indic-private.hh | 2 +- - src/hb-ot-shape-complex-indic.cc | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit 2e193b240ec85cab0d4e2f8a375c5a7f0ef99985 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 14:02:35 2012 -0400 - - [Indic] Don't split U+0AC9 - - Althought IndicMatraCategory.txt classifies it as Top_And_Right matra, - it does not have Unicode decomposition, and Uniscribe does not do - anything special about it either. - - Gujarati failures down from 0.672% to 0.0130966%. - - src/hb-unicode.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 30c3d5e9fc61b49c2c6ad4e744300edd6f3e0261 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 13:56:32 2012 -0400 - - [Indic] Simplify Uniscribe cluster emulation - - Now that we break syllables on Halant,ZWNJ, this code can be - simplified. - - src/hb-ot-shape-complex-indic.cc | 11 ++--------- - 1 files changed, 2 insertions(+), 9 deletions(-) - -commit decf6ffca475fe01ff3151b7641f629f031137d2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 13:51:31 2012 -0400 - - [Indic] Minor! - - src/hb-ot-shape-complex-indic.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9e4f94a72cea6d65a6a7ba5a47db92e00dbfbb91 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 13:48:03 2012 -0400 - - [Indic] Break syllables at Halant,ZWNJ - - That's really what Uniscribe does, and explains a lot of pecularities - of - Halant,ZWNJ before the base. - - Sent Telugu from 1% failures to 0.03%. Improved Kannada and Malayalam - slightly. Fixed half of Bengali, and did NOT break anything! - - src/hb-ot-shape-complex-indic-machine.rl | 5 +++-- - src/hb-ot-shape-complex-indic.cc | 5 ++--- - 2 files changed, 5 insertions(+), 5 deletions(-) - -commit 2c372b80f6befad69e216e3f218b38640b8cc044 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 13:37:48 2012 -0400 - - [Indic] Better check for applying 'init' - - Specifically, don't apply 'init' if previous char is a joiner. - - Fixes some more of Bengali. - - src/hb-ot-shape-complex-indic.cc | 9 +-------- - src/hb-private.hh | 3 ++- - 2 files changed, 3 insertions(+), 9 deletions(-) - -commit 34a7440b7c6c6e53394ddbdbedaad57b23f85105 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 12:32:59 2012 -0400 - - [GPOS] Don't zero mark advances - - Fixes more of Telugu, Kannada, and Oriya. - - May break things (outside Indic...), but we cannot think of any - font relying - on this immediately. - - src/hb-ot-layout-gpos-table.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 8ed248de77e5d2ed978e55c0ce1a11727bc9e34c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 11:42:24 2012 -0400 - - [Indic] Minor - - src/hb-ot-shape-complex-indic.cc | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit d0e68dbd0b9fc9a42c4280d01c8ffd9c5015d550 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 11:25:41 2012 -0400 - - [Indic] Implement reph positioning step 5 - - Not tuned, just copied from step 2. Fixes another 0.5% of Kannada - failures. 1% to go. - - src/hb-ot-shape-complex-indic.cc | 12 +++++++++++- - 1 files changed, 11 insertions(+), 1 deletions(-) - -commit a9e45c32e4a0d6da33c52f8427aa694e57f52eb9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 11:04:15 2012 -0400 - - [Indic] Don't let ZWNJ at the end of syllable affect base search - - Fixes a few Devanagari, half of remaining Kannada failures, - quarter for - Telugu, and others slightly improved or unchanged. - - src/hb-ot-shape-complex-indic.cc | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit 20b68e699f73e6ce046c0ec143d40b3d6d48e06b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 10:47:46 2012 -0400 - - [Indic] Apply 'cjct' globally - - Fixes 5 Devanagari failures, and no regressions. - - src/hb-ot-shape-complex-indic.cc | 15 +++++++++------ - 1 files changed, 9 insertions(+), 6 deletions(-) - -commit 51e764de441072e7c9f67de23e8ed717b9b8957d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 10:30:24 2012 -0400 - - [Indic] Unbreak old scriptures - - Brings down failures with Lohit-Telugu from 57% to 1.40%. - - src/hb-ot-shape-complex-indic.cc | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 900cf3d449bf36d4f8b1474590cae925fef48fc8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 20 10:18:23 2012 -0400 - - Minor - - src/hb-ot-shape-complex-indic.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 87cd63266e73af316b250573ef57388a0bcc9133 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 19 21:17:48 2012 -0400 - - [Indic] Recategorize some Kannada right matras - - Kannada failures down from 3.5% to 2.93%. - - src/hb-ot-shape-complex-indic.cc | 2 +- - .../indic/script-kannada/misc/MANIFEST | 1 + - .../indic/script-kannada/misc/right-matras.txt | 7 +++++++ - 3 files changed, 9 insertions(+), 1 deletions(-) - -commit 3604d64ced909ade91998d294a7b4b2ee14d47aa -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 19 21:13:04 2012 -0400 - - [Indic] Recategorize GURMUKHI ADDAK - - It's not in IndicSyllabicCategory.txt. Fixes most of Gurmukhi - failures. - Failures down from 7.7% to 0.222%! - - src/hb-ot-shape-complex-indic.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 89328581236a53ec16508b95db54c7e5315b178f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 19 21:02:38 2012 -0400 - - Minor - - src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 47ef931f13778b894090139a64238a5ab9ac1154 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 19 20:52:44 2012 -0400 - - [buffer] Make sure out_info = info during GPOS - - src/hb-buffer.cc | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -commit ae63cf206291befe3920adfe015e6cd0961580e5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 19 20:45:41 2012 -0400 - - Print line number during return when tracing - - src/hb-private.hh | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 5249f3aee108b0f41770d137e63a625f594418e7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 19 20:30:22 2012 -0400 - - [Indic] Unbreak Khmer - - For Khmer, all consonants are subjoining. No need to look in - the font. - We were looking in the wrong order anyway. - - src/hb-ot-shape-complex-indic.cc | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit e0475345d5d7db8dbc8b554beedfa2435c5d7fd1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 19 20:24:14 2012 -0400 - - [Indic] Apply 'akhn' globally - - Fixes 1.5% more failures for Telugu, 2% for Kannada. - Breaks one test in Devanagari. - - src/hb-ot-shape-complex-indic.cc | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit c87bcddb10752b407c0471ee5ac4de6f1b00b711 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 19 20:03:25 2012 -0400 - - [Indic] Add failing test for Kannada - - .../indic/script-kannada/misc/misc.txt | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit fa247ebe524f92fa95d344ba912f704262879c13 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 19 19:52:19 2012 -0400 - - [Indic] Better position U+0CD5 - - Fixes another 5% of Kannada failures. - - src/hb-ot-shape-complex-indic.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit f055442716ec7543ed156d4789955b19c11a5255 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 19 16:20:21 2012 -0400 - - [Indic] Lookup consonant position in the font - - Fixes most failures of Oriya, and improves others a bit. - - src/hb-ot-map-private.hh | 13 +++- - src/hb-ot-shape-complex-indic-private.hh | 105 - ------------------------------ - src/hb-ot-shape-complex-indic.cc | 63 +++++++++++++----- - 3 files changed, 54 insertions(+), 127 deletions(-) - -commit 74d1d88781e91866a52e27f391e34df03b313442 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 19 16:14:23 2012 -0400 - - [GSUB] Fix would_apply() for LigatureSubst - - src/hb-ot-layout-gsub-table.hh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 787f7d1e9ba9ad038f24e5a1063d12c7d169ad37 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 19 15:29:13 2012 -0400 - - [TODO] Minor - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit be73a5f9368136ecbdb211b96516ad0c554c8201 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 19 14:59:15 2012 -0400 - - Add src/test-would-substitute tool - - src/Makefile.am | 6 ++- - src/test-would-substitute.cc | 94 ++++++++++++++++++++++++++++++ - src/test.cc | 132 - ++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 231 insertions(+), 1 deletions(-) - -commit e72b360ac6381b549249b8836fa3e70b909d3437 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 19 14:35:23 2012 -0400 - - Refactor / finish would_apply() operation - - Untested. - - src/hb-ot-layout-gpos-table.hh | 6 +- - src/hb-ot-layout-gsub-table.hh | 126 ++++++++---------- - src/hb-ot-layout-gsubgpos-private.hh | 233 - +++++++++++++++++++++++++++++++++- - src/hb-ot-layout.cc | 11 ++ - src/hb-ot-layout.h | 7 + - 5 files changed, 308 insertions(+), 75 deletions(-) - -commit 8c973ebf0f59abb5ee920edd5d64e23d8e47ad75 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 19 13:25:08 2012 -0400 - - [Indic] Implement per-script matra positioning - - Following what the spec says. - - Brings down Telugu failures from 40% to 3.75%, and Kannada failures - from - 44% to 10%. Does NOT affect other scripts' test results. - - src/hb-ot-shape-complex-indic-private.hh | 2 +- - src/hb-ot-shape-complex-indic.cc | 40 - +++++++++++++++++++++++++++-- - src/hb-unicode.cc | 2 +- - 3 files changed, 39 insertions(+), 5 deletions(-) - -commit 8bb32458f95f13f66688e0811cc91f1bfffb867d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 19 12:59:06 2012 -0400 - - [Indic] More refactoring - - src/hb-ot-shape-complex-indic-private.hh | 9 ++-- - src/hb-ot-shape-complex-indic.cc | 65 - +++++++++++++++++++++++------- - 2 files changed, 54 insertions(+), 20 deletions(-) - -commit 9ccc6382ba43760167c134c18c1c4ada4b8c3f22 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 19 12:32:16 2012 -0400 - - [Indic] Minor refactoring - - src/hb-ot-shape-complex-indic.cc | 127 - +++++++++++++++++++++----------------- - 1 files changed, 71 insertions(+), 56 deletions(-) - -commit f83aaa3133de5d807be267a100d6a200e8db9017 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 19 12:23:23 2012 -0400 - - [Indic] Minor - - src/hb-ot-shape-complex-indic-private.hh | 42 - ++++++++++++++++++----------- - 1 files changed, 26 insertions(+), 16 deletions(-) - -commit be8b9f5f715f6fb36b98bd33c3303f79cc068f8a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 19 12:11:12 2012 -0400 - - [Indic] Start refactoring different matra positions per script - - src/hb-ot-shape-complex-indic-private.hh | 36 - ++++++++++++++++++----------- - src/hb-ot-shape-complex-indic.cc | 4 +- - 2 files changed, 24 insertions(+), 16 deletions(-) - -commit deeb540a74f8d394db273145b17bf385d14d01bb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 19 11:30:48 2012 -0400 - - [test] Ignore tests with DOTTED CIRCLE in the output - - test/shaping/hb_test_tools.py | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit b01d9b3d90e892341ee4463f2eda4600850b97d8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 19 11:25:49 2012 -0400 - - [Indic] Disallow decomposition of a couple characters - - This is a hack for now. Will be fixed when we do - complex-shaper-driven - normalization properly. - - The results with or without decomposition are the same, but Uniscribe - does not normalize, so this matches better. - - src/hb-unicode.cc | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 422ecd2d3c198a36d07d409341cb82ea57c7ad6b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 18 23:25:58 2012 -0400 - - [Indic] Accept a forced Rakar sequence at the end of syllable - - In Sinhala, Rakar is formed by Al-Lakuna,ZWJ,Ra. If you put that - at the - end of a Consonant,Matra syllable, you get a dotted-circle from - Uniscribe. Apparently adding a ZWJ before the Al-Lakuna "fixes" that. - And people have been encoding that sequence... So, allow a forced - "ZWJ,Virama,ZWJ,Ra" sequence at the of syllables. - - Fixes some 100 or more of Sinhala failures. Now at 622 only (0.23%). - - src/hb-ot-shape-complex-indic-machine.rl | 3 ++- - .../indic/script-sinhala/misc/misc.txt | 2 ++ - 2 files changed, 4 insertions(+), 1 deletions(-) - -commit 6fc1732003d71cf90d37247482772c3da884687f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 18 17:49:19 2012 -0400 - - [Indic] Allow joiners on both sides of Halant at the same time - - The sequence <ZWJ,Al-Lakuna,ZWJ> is used in Sinhala to explicitly ask - for Rakar. Fixes two-thousand Sinhala tests. Not many left. - - src/hb-ot-shape-complex-indic-machine.rl | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 10cdc94eee2225f14c198c015256a5a0063eecad -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 18 17:42:34 2012 -0400 - - [Indic] In final reordering, find base, even if it disappeared - - POS_BASE can disappear if base ligated backward. Define base as last - with position not after base. - - Fixes a few hundred of Sinhala failures with Iskoola Pota. - - src/hb-ot-shape-complex-indic.cc | 7 ++----- - .../indic/script-sinhala/misc/misc.txt | 1 + - 2 files changed, 3 insertions(+), 5 deletions(-) - -commit 9c4d24a3a677a58ec59c7fb0f8b70b8aad30a032 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 18 17:29:10 2012 -0400 - - [Indic] Minor - - src/hb-ot-shape-complex-indic.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 3285e107c9a83aeb552e67f9460680ff6d167d88 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 18 17:22:14 2012 -0400 - - [Indic] Implement Sinhala "Al Lakuna" Reph behavior - - In Sinhala, Reph is formed only explicitly, by the presence of a ZWJ. - - src/hb-ot-shape-complex-indic-private.hh | 2 ++ - src/hb-ot-shape-complex-indic.cc | 7 ++++++- - .../indic/script-sinhala/misc/MANIFEST | 1 + - .../indic/script-sinhala/misc/reph.txt | 3 +++ - 4 files changed, 12 insertions(+), 1 deletions(-) - -commit 91cade755534c42bb826a6aefcbca8a543d94387 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 18 16:50:41 2012 -0400 - - [Indic/Unicode] Decompose Sinhala split matras the way Uniscribe likes - - Makes no visual difference. - - Fixes most of the failures. Down from 15% to 1.3%! - - src/hb-unicode.cc | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit d8942dcbb4e3249a2d78a6455c119294ed4390bc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 18 16:34:10 2012 -0400 - - Apply Tibetan (global) features. - - Fixes all Tibetan failures. All 180k of them! - - Merges back Hangul into the default shaper. - - src/hb-ot-shape-complex-misc.cc | 82 - ++++++++++++++++-------------------- - src/hb-ot-shape-complex-private.hh | 7 --- - 2 files changed, 37 insertions(+), 52 deletions(-) - -commit 552d19b7a11f7dff888587fce4d56d9f8e47e819 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 18 16:00:49 2012 -0400 - - [Indic] Treat Register Shifters like Nukta - - Really this time. - - Fixes another 18 Khmer tests. - - src/hb-ot-shape-complex-indic-machine.rl | 2 +- - src/hb-ot-shape-complex-indic.cc | 2 -- - .../south-east-asian/script-khmer/misc/misc.txt | 1 + - 3 files changed, 2 insertions(+), 3 deletions(-) - -commit e8cd81f76d159f3ecf808952dab24bc07782497a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 18 16:00:20 2012 -0400 - - [Indic] Minor - - src/hb-ot-shape-complex-indic.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 69f26bf39c824d6bf5b1c0d410380cc5462ad5ca -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 18 15:45:43 2012 -0400 - - [Indic] Fix Matra reordering when base is at end of syllable - - For example: U+915,U+200c,U+93f - - Fixes last Tamil failure! - - src/hb-ot-shape-complex-indic.cc | 2 +- - .../indic/script-devanagari/misc/misc.txt | 1 + - 2 files changed, 2 insertions(+), 1 deletions(-) - -commit d16ccc4ae7aa8be460881042413fa2637929fede -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 18 15:43:55 2012 -0400 - - Leave one extra item at the end of buffer allocation - - Just in case, for the times we do out-of-bounds access. - - jk - - src/hb-buffer-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 075d671f1093d2e3c58f7f45568696030f1b3efd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 18 15:41:53 2012 -0400 - - [Indic] Fix out-of-bounds array access - - src/hb-ot-shape-complex-indic.cc | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit dcb527242b1eca4db1e190a7802f9cd132aaf46e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 18 15:28:25 2012 -0400 - - [Indic] Allow joiners before matras - - Fixes 1 more Devanagari test! - - src/hb-ot-shape-complex-indic-machine.rl | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 391cc0331749e263bdfe83a8f5f6d76f2360ee7a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 18 15:10:05 2012 -0400 - - [Indic] Allow halant group in Vowel and placeholder syllables - - Fixes 2 out of 560 Devanagari failures. AND: - Fixes 1 out of 2 Tamil failures. - - src/hb-ot-shape-complex-indic-machine.rl | 7 ++++--- - .../indic/script-devanagari/misc/misc.txt | 1 + - 2 files changed, 5 insertions(+), 3 deletions(-) - -commit ca4e3d3eab7b738c2b8e2a81696a28bca1b81495 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 18 15:05:40 2012 -0400 - - [Indic] Streamline halant/joiner in grammar - - src/hb-ot-shape-complex-indic-machine.rl | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 418d00dffddd95a1f27e9be15752d494c627d45e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 18 14:57:28 2012 -0400 - - [Indic] Minor - - src/hb-ot-shape-complex-indic-machine.rl | 3 ++- - .../indic/script-devanagari/misc/misc.txt | 3 +++ - 2 files changed, 5 insertions(+), 1 deletions(-) - -commit 4c3691d2a32ca7e54a54f7c08098fd96fa7af39e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 18 14:23:55 2012 -0400 - - [Indic] Hopefully minor! - - Refactoring Indic machin. No semantic change. - - src/hb-ot-shape-complex-indic-machine.rl | 12 +++++++----- - 1 files changed, 7 insertions(+), 5 deletions(-) - -commit e092c556fb1cf38be3cea1f4b75a0d879372dfa2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 18 14:09:25 2012 -0400 - - [Indic] Minor - - src/hb-ot-shape-complex-indic-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 14dbdd9e39d3a869fd1521000c889c347433d22b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 18 13:13:03 2012 -0400 - - [Indic] Unbreak Tamil - - Tamil has only about 150 failures now! - - src/hb-ot-shape-complex-indic.cc | 18 +++++++++++++++++- - 1 files changed, 17 insertions(+), 1 deletions(-) - -commit db8981f1e0e8625714568c6d0f11f0b317b11d0a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 17 18:17:30 2012 -0400 - - [Indic] Position Khmer Robat - - It's a visual Repha. - - Still not positioning logical Repha as occurs in Malayalam. - - Another 200 Khmer failures fixed. 547 to go. That's better than - Devanagari! - - src/hb-ot-shape-complex-indic-machine.rl | 36 - +++++++++++++++-------------- - src/hb-ot-shape-complex-indic-private.hh | 7 +++-- - src/hb-ot-shape-complex-indic.cc | 13 ++++++++++ - 3 files changed, 36 insertions(+), 20 deletions(-) - -commit 25bc489498ef7d0beb8fe9ab663e3f0b2f52c9c2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 17 17:53:03 2012 -0400 - - [Indic] Better categorize Register Shifters and Khmer Various signs - - Down another 500 or so Khmer failures! - - src/hb-ot-shape-complex-indic-machine.rl | 14 +++++++------- - src/hb-ot-shape-complex-indic-private.hh | 2 +- - src/hb-ot-shape-complex-indic.cc | 8 ++++---- - .../south-east-asian/script-khmer/misc/MANIFEST | 2 ++ - .../script-khmer/misc/other-marks-invalid.txt | 4 ++++ - .../script-khmer/misc/other-marks.txt | 6 ++++++ - 6 files changed, 24 insertions(+), 12 deletions(-) - -commit 39b17837b4064d59c18cebb49c1c0b5b8cc0c117 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 17 17:09:29 2012 -0400 - - Add hb_buffer_normalize_glyphs() and hb-shape --normalize-glyphs - - This reorders glyphs within the cluster to a nominal order. - This should - have no visible effect on the output, but helps with testing, for - getting the same hb-shape output for visually-equal glyphs for each - cluster. - - src/hb-buffer.cc | 76 - +++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-buffer.h | 13 +++++++++ - src/hb-private.hh | 29 +++++++++++++++----- - util/options.cc | 1 + - util/options.hh | 7 ++++- - 5 files changed, 118 insertions(+), 8 deletions(-) - -commit 25e302da9a712e6f1d63b0d243a8df0d326ddba3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 17 14:25:14 2012 -0400 - - [Indic] Minor - - src/hb-ot-shape-complex-indic.cc | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 5d32690a3428fa86eb26fe5fcec943a10aa95881 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 17 14:23:28 2012 -0400 - - [Indic] For scripts without Half forms, always choose first consonant - as base - - In such scripts (ie. Khmer), a ZWJ/ZWNJ shouldn't stop the search for - base. So, instead just choose the first consonant as base directly. - - Test sequence: - U+1798,200c,U+17C9,U+17D2,U+179B,U+17C1,U+17C7 - - src/hb-ot-shape-complex-indic.cc | 59 - ++++++++++++++++++++++--------------- - 1 files changed, 35 insertions(+), 24 deletions(-) - -commit 34b57149065d96f7528aaccaa7654e956ce27e93 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 17 14:09:32 2012 -0400 - - [Indic] Treat Khmer Register Shifters more like Nuktas - - Except that there may be a ZWNJ before a Register Shifter. - - src/hb-ot-shape-complex-indic-machine.rl | 2 +- - .../south-east-asian/script-khmer/misc/misc.txt | 2 ++ - 2 files changed, 3 insertions(+), 1 deletions(-) - -commit 11e2a601b19861b05dbb2051d2d078c3cfd75b29 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 17 14:02:28 2012 -0400 - - [Indic] Minor - - src/hb-ot-shape-complex-indic-machine.rl | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 0201e0a4649ad5b607e50bcb9605e7a5b7143812 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 17 13:55:10 2012 -0400 - - [Indic] Apply 'cfar' for Khmer - - Mark stuff after a pre-base reordering Ro 'cfar'. Used in Khmer. - This allows distinguishing the following cases with MS Khmer fonts: - - U+1784,U+17D2,U+179A,U+17D2,U+1782 - U+1784,U+17D2,U+1782,U+17D2,U+179A - - src/hb-ot-shape-complex-indic.cc | 16 - ++++++++++++++-- - .../south-east-asian/script-khmer/misc/misc.txt | 2 ++ - 2 files changed, 16 insertions(+), 2 deletions(-) - -commit 55f70ebfb95083f515d9b0044a2a65ab11484bb5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 17 12:50:13 2012 -0400 - - [Indic] Position final subjoined consonants (and vowels) after matras - - In Khmer, a final subjoined consonant or independent vowel can occur - after matras. This final subjoined thing should NOT be reordered to - before the matra even though it's subjoined. - - Fixes another 1k of the Khmer failures. Not much left really. - - src/hb-ot-shape-complex-indic-private.hh | 1 + - src/hb-ot-shape-complex-indic.cc | 13 +++++++++++++ - .../south-east-asian/script-khmer/misc/misc.txt | 2 ++ - 3 files changed, 16 insertions(+), 0 deletions(-) - -commit c50ed71e9a3df1844f564de66d54b46a696c1356 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 17 11:54:28 2012 -0400 - - [Indic] Recategorize Khmer coeng sign as a separate category OT_Coeng - - Amend the syllable structure to allow a final subscripted consonant - (Coeng+C) and a final subscripted independent vowel (Coeng+V). - Fixes another 2k of Khmer failures. - - src/hb-ot-shape-complex-indic-machine.rl | 7 ++++--- - src/hb-ot-shape-complex-indic.cc | 6 +++++- - .../south-east-asian/script-khmer/misc/misc.txt | 1 + - 3 files changed, 10 insertions(+), 4 deletions(-) - -commit deb521dee4fdca8c2124cfb39a205e6269d4a70d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 17 11:37:32 2012 -0400 - - [Indic] Add a separate Coeng class - - No characters recategorized yet. No semantic change. - - src/hb-ot-shape-complex-indic-machine.rl | 1 + - src/hb-ot-shape-complex-indic-private.hh | 3 ++- - src/hb-ot-shape-complex-indic.cc | 26 - ++++++++++++++++---------- - 3 files changed, 19 insertions(+), 11 deletions(-) - -commit 74ccc6a1322f8c48c5f2a05f04821783c4b87a14 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 17 11:16:19 2012 -0400 - - [Indic] Move Halant with after-base consonants - - Normally, we attach the Halant to the previous character and move it - with it. For after-base consonants however, the Halant "belongs" - to the - consonant after, so attach it so. - - This fixes Bengali sequences involving post-base consonant Ya, which - should ligate with the Halant to form Ya Phala, but previously a - reordered matras was blocking the ligation. - - src/hb-ot-shape-complex-indic.cc | 11 +++++++++++ - .../indic/script-bengali/misc/misc.txt | 1 + - 2 files changed, 12 insertions(+), 0 deletions(-) - -commit d5c4edcdd6df32f2f23aca44f14838b4baab4d7a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 17 10:40:59 2012 -0400 - - [Indic] Apply presentation-forms features all at once - - Seems like this is what Uniscribe is doing, and does not break - any fonts - we tested (with Devanagari, Malayalam, Khmer, and Bengali), while - fixing - some Ra Phala sequences for Bengali with Vrinda. Fixes another 2% of - Bengali failures (a couple more to go). - - src/hb-ot-shape-complex-indic.cc | 6 +++--- - .../indic/script-bengali/misc/misc.txt | 1 + - 2 files changed, 4 insertions(+), 3 deletions(-) - -commit 559f70667891a3ceeffb36f40de38a4f85868945 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 22:43:17 2012 -0400 - - Fix MarkAttachmentType matching - - Fixes issue reported by Khaled Hosny with his Hussaini Nastaleeq font - and sequences like those added in the previous commit. - - src/hb-ot-layout.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6de103547e4a7fb34c833861713ea373cd912261 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 22:46:06 2012 -0400 - - [test/arabic] Add Arabic tests for mark skipping - - Expose a bug with Khaled's Hussaini Nastaleeq font. - - .../script-arabic/misc/diacritics/MANIFEST | 1 + - .../misc/diacritics/mark-skipping.txt | 10 ++++++++++ - 2 files changed, 11 insertions(+), 0 deletions(-) - -commit ad4494759fa8bfd2497800c24fa414075ed1aa61 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 22:40:21 2012 -0400 - - Minor - - src/hb-ot-layout.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit af92b4cc90e4184d5bdd8037c551ed482700114f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 20:31:24 2012 -0400 - - [Indic] Disable 'kern' in Uniscribe bug compatibility mode - - Uniscribe does not apply 'kern' in the Indic module. Some of - the Khmer - fonts they ship have small adjustments in the 'kern' table. Disable - 'kern' in the Indic module under Uniscribe bug compatibility mode. - - Fixes some 10% of the Khmer failures. Remains under 3% (excluding - dotted-circle ones). - - src/hb-ot-shape-complex-indic.cc | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit d96838ef951ce6170eb2dc576ebcba2262cf7008 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 20:26:57 2012 -0400 - - Allow complex shapers overriding common features - - In a new callback... Currently unused by all complex shapers. - - src/hb-ot-shape-complex-arabic.cc | 6 ++++++ - src/hb-ot-shape-complex-indic.cc | 6 ++++++ - src/hb-ot-shape-complex-misc.cc | 18 ++++++++++++++++++ - src/hb-ot-shape-complex-private.hh | 30 ++++++++++++++++++++++++++++++ - src/hb-ot-shape.cc | 2 ++ - 5 files changed, 62 insertions(+), 0 deletions(-) - -commit df50b8474094f0563ccfdae12c4425a51b72add6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 19:56:29 2012 -0400 - - [Indic] Categorize other Khmer marks - - Mark them the same as the Register Shifters for now. Need to rename - that category to something more sensible after all is settled. - - Fixes another percent of Khmer failures. Down to under 3%! - - src/hb-ot-shape-complex-indic.cc | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 8e7b5882fb4c1921c9d030d354a9b998115cdb8c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 17:04:46 2012 -0400 - - [Indic] Recognize pre-base reordering Ra anywhere in the syllable - - We were doing that only immediately after base. - - Fixes another percent in the Khmer failures. About three more - to go... - - src/hb-ot-shape-complex-indic.cc | 84 - +++++++++++++++++++++----------------- - 1 files changed, 46 insertions(+), 38 deletions(-) - -commit 7d09c98a1fff97127e48eae48d380dc9fcff288e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 16:45:22 2012 -0400 - - [Indic] Recognizer Register Shifter marks - - Fixes another 6% of the Khmer failures. - - src/hb-ot-shape-complex-indic-machine.rl | 3 ++- - src/hb-ot-shape-complex-indic-private.hh | 5 +++-- - src/hb-ot-shape-complex-indic.cc | 2 ++ - 3 files changed, 7 insertions(+), 3 deletions(-) - -commit 60da763dfac96a7931d6e6bdef8b9973bd5209ab -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 16:13:32 2012 -0400 - - [GSUB/GDEF] Guess glyph classes after substitution only if no GDEF - - Brings down Khmer failures with Daun Penh font from 36% to 20%. - - src/hb-ot-layout-gsubgpos-private.hh | 20 +++++++++++++------- - 1 files changed, 13 insertions(+), 7 deletions(-) - -commit fcdc5f1c8849a7f38d9f34f64d60c6d95d7501f7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 15:52:54 2012 -0400 - - [Indic] Categorize Khmer Ro - - Khmer failures down from 58% to 36%. - - src/hb-ot-shape-complex-indic-private.hh | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 78818124b17691ec2c647142fdb9ae743aa03dee -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 15:49:08 2012 -0400 - - [Indic] Reoder pre-base reordering Ra - - Brings down Malayalam failures from 14% down to 3%. - - src/hb-ot-shape-complex-indic.cc | 42 - ++++++++++++++++++++++++++----------- - 1 files changed, 29 insertions(+), 13 deletions(-) - -commit 1a1dbe9a2787f226f3e43063da8eb6633438b0a0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 15:40:33 2012 -0400 - - [Indic] Rename - - src/hb-ot-shape-complex-indic.cc | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 46e645ec4b59f0a278347be11f40c7df700d5bb6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 15:30:05 2012 -0400 - - [Indic] Start implementing pre-base reordering - - src/hb-ot-shape-complex-indic.cc | 33 ++++++++++++++++++--------------- - 1 files changed, 18 insertions(+), 15 deletions(-) - -commit 921ce5b17daf06af8e17989a3e335b9f5df20483 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 15:26:56 2012 -0400 - - [Indic] Rename - - No semantic change. - - src/hb-ot-shape-complex-indic.cc | 26 +++++++++++++------------- - 1 files changed, 13 insertions(+), 13 deletions(-) - -commit b504e060f008e95b1ba36c06600c9fea4f5d4808 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 15:21:12 2012 -0400 - - [Indic] Implement After-Main Reph positioning - - Almost... - - src/hb-ot-shape-complex-indic.cc | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit 17d7de91d76406d3e92db37d9eef2fc615f06e68 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 15:20:15 2012 -0400 - - [Indic] Apply 'pref' to pre-base reodering Ra - - No reordering yet. - - src/hb-ot-shape-complex-indic.cc | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit 362d3db8d3527d0fef260a17d2466e92a4a25425 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 15:15:28 2012 -0400 - - [Indic] Minor - - Should not be any semantic change. In preparation for implementing - pre-base reordering Ra. - - src/hb-ot-shape-complex-indic.cc | 8 +------- - 1 files changed, 1 insertions(+), 7 deletions(-) - -commit 70fe77bb9a25922bd34f206826d8731d901fb451 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 14:52:18 2012 -0400 - - Minor - - src/hb-ot-shape-complex-indic.cc | 44 - +++++++++++++++++++------------------- - 1 files changed, 22 insertions(+), 22 deletions(-) - -commit 2f903215c5da2330a37abe489a3f45f7c3fd5a09 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 13:54:43 2012 -0400 - - Minor - - src/hb-ot-shape-complex-indic.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a3e04bee2c2fa648759a87e460db6b4f1b685586 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 13:47:19 2012 -0400 - - [Indic] Reorder virama only for old Indic spec - - src/hb-ot-shape-complex-indic.cc | 15 +++++++++++++-- - 1 files changed, 13 insertions(+), 2 deletions(-) - -commit 0de771b72da6b342b015e3556190821547a4011d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 13:39:36 2012 -0400 - - [Indic] Categorize Khmer consonants - - src/hb-ot-shape-complex-indic.cc | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit d487fff266258eb1af056e9704cfb09d04251ddc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 13:25:17 2012 -0400 - - Split matras without a Unicode decomposition - - This is a hack for now, to get us going with Khmer. This will be - refactored properly later to move the complex logic into complex - shapers. - - src/hb-unicode.cc | 22 ++++++++++++++++++++++ - 1 files changed, 22 insertions(+), 0 deletions(-) - -commit 8aa801a6fd1a737fa20b851edf7528bdd6635b8b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 13:24:26 2012 -0400 - - [Indic] Adjust position for split matras - - We are going to split matras without a Unicode decompositions in a way - that the second half takes the codepoint of the whole matra. So, - position them where the second half is supposed to end up. - - src/hb-ot-shape-complex-indic-private.hh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 1feb8345a5fd92297eb6796e6dce633bafa0c76e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 13:23:40 2012 -0400 - - [GSUB] Allow 1-to-1 ligature substitutions! - - Apparently Uniscribe allows these, and they are used in some Khmer - fonts - shipped with Windows, namely, Daun Penh. - - src/hb-ot-layout-gsub-table.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 29f106d7fba25e1464debd3a4831a7380d75c4c9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 16 12:05:35 2012 -0400 - - [Indic] Apply Above Forms - - src/hb-ot-shape-complex-indic.cc | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit fa2bd9fb63d83b657373764d4b657084d8327fc9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 14 12:15:54 2012 -0400 - - Further simplify atomic ops on Visual Studio - - src/hb-atomic-private.hh | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -commit 0a492357016bc9a614d2a726f2006c10af68ca58 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 13 13:20:49 2012 -0400 - - Minor - - src/hb-warning.cc | 29 +++++------------------------ - 1 files changed, 5 insertions(+), 24 deletions(-) - -commit 11c4ad439ef2b39a840f397a693b1ba643f52c21 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 13 11:29:31 2012 -0400 - - Add -Wcast-align - - configure.ac | 3 +++ - src/Makefile.am | 2 +- - 2 files changed, 4 insertions(+), 1 deletions(-) - -commit a98d0ab18624501ee60551304f2715361ac643da -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 13 10:19:10 2012 -0400 - - Make sure HB_BEGIN_DECLS / HB_END_DECLS is only used in public headers - - So we can use them to switch default visibility to internal if - desired, - and use these to make only declared symbols public. - - src/check-c-linkage-decls.sh | 10 +++++++++- - src/hb-fallback-shape-private.hh | 6 ------ - src/hb-ot-shape-complex-indic-machine.rl | 4 ---- - 3 files changed, 9 insertions(+), 11 deletions(-) - -commit 5c5bc96216c9ad58243eb3ed27b253e237f08ebe -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 13 10:15:37 2012 -0400 - - Allow overriding HB_BEGIN_DECLS / HB_END_DECLS - - src/hb-common.h | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit ec5f5f0f8a1d5b3ff98452175bb4450a59897620 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 13 10:00:42 2012 -0400 - - Don't export inline methods - - configure.ac | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 50a4e78b530563917eb606ff3b96dcc9eed5b3ee -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 13 09:48:39 2012 -0400 - - Check for exported weak symbols - - Ouch, all our C++ inline functions are being exported (weakly) - already. - Fix coming. - - src/check-internal-symbols.sh | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit b5aeb95afeb13a66177caada9f5d5ad4cddbd35f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 13 09:45:54 2012 -0400 - - Make hb_in_range() static - - src/hb-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 271c8f89075607c689938b4f5e60323d9a1acd70 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 13 09:32:30 2012 -0400 - - Minor - - src/hb-ft.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 391f1ff5d894b60bfe0f606be436ffe7e43f7455 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 13 09:04:07 2012 -0400 - - Fix _InterlockedCompareExchangePointer on x86 - - src/hb-atomic-private.hh | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 2023e2b54d91924dddfd228ffdbb46021135b068 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 11 19:00:30 2012 -0400 - - [ft] Disable ppem setting - - The calculations were wrong. - - FreeType makes it really hard to set size and ppem independently. - For now, disable it. Need to come up with a fix later. - - src/hb-ft.cc | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit cdf7444505a7ae49d20f9ba6776dea92c1fde2a6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 11 18:52:39 2012 -0400 - - [ft] Use unfitted kerning if x_ppem is zero - - src/hb-ft.cc | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 6d08c7f1b3601095f9a12630045331dd0fe75380 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 11 18:01:27 2012 -0400 - - Revert "Towards templatizing common Lookup types" - - This reverts commit 727135f3a9938c1ebd5b9f5015a46c7ccc8573c5. - - This is work-in-progress. Didn't mean to push it out just yet. - - src/hb-ot-layout-gpos-table.hh | 16 ++++++---------- - src/hb-ot-layout-gsub-table.hh | 24 ++++++++++-------------- - src/hb-ot-layout-gsubgpos-private.hh | 33 - ++------------------------------- - 3 files changed, 18 insertions(+), 55 deletions(-) - -commit 552bf3a9f9651311084b7979805dbdc18c0335ca -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 11 16:44:51 2012 -0400 - - Bump WINNT version requested from 500 to 600 - - Since we use the OpenType versions of Uniscribe functions, we are - relying on that version of the WINNT API. Otherwise, usp10.h - will hide - those symbols. - - src/hb-uniscribe.cc | 2 +- - src/hb-uniscribe.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 9a5b421a64db1bb23d5c6ebbc3bf3f3a5513dc36 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 11 16:35:04 2012 -0400 - - Fix build with no Unicode funcs implementations provided - - src/hb-unicode-private.hh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 6efe1eca660135096f05987ac0ef9b635de6cdfd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 11 15:30:08 2012 -0400 - - Update git.mk to upstream - - git.mk | 58 ++++++++++++++++++++++++++++++++++++++-------------------- - 1 files changed, 38 insertions(+), 20 deletions(-) - -commit 727135f3a9938c1ebd5b9f5015a46c7ccc8573c5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 3 22:15:35 2012 -0400 - - Towards templatizing common Lookup types - - src/hb-ot-layout-gpos-table.hh | 16 ++++++++++------ - src/hb-ot-layout-gsub-table.hh | 24 ++++++++++++++---------- - src/hb-ot-layout-gsubgpos-private.hh | 33 - +++++++++++++++++++++++++++++++-- - 3 files changed, 55 insertions(+), 18 deletions(-) - -commit 1167c7bfc9e61f145e11da4881968293a4d3c0a9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 3 11:38:46 2012 -0400 - - Minor - - test/shaping/texts/in-tree/shaper-thai/MANIFEST | 2 +- - .../texts/in-tree/shaper-thai/misc/MANIFEST | 1 - - .../texts/in-tree/shaper-thai/misc/misc.txt | 6 ------ - .../texts/in-tree/shaper-thai/script-thai/MANIFEST | 1 + - .../in-tree/shaper-thai/script-thai/misc/MANIFEST | 1 + - .../shaper-thai/script-thai/misc/sara-am.txt | 4 ++++ - 6 files changed, 7 insertions(+), 8 deletions(-) - -commit aa116582e69d18777448e7993078e5d6335ddfed -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 29 10:50:12 2012 -0400 - - Minor - - .../indic/script-malayalam/misc/misc.txt | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 1f13c7185f02ea18d4fadd2ea8ad444bea863c39 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jun 27 10:07:27 2012 -0400 - - Add TODO item - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 12f5c0a222a2f0aebe63c0d367937a0ff985474a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 26 11:16:13 2012 -0400 - - Fix check for Intel atomic ops - - configure.ac | 9 +++++---- - src/hb-atomic-private.hh | 2 +- - 2 files changed, 6 insertions(+), 5 deletions(-) - -commit 6932a41fb61ffc2901c260587b1e98ed9c2a7ea1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 26 10:46:31 2012 -0400 - - Use octal-escaped UTF-8 characters instead of plain text - - https://bugs.freedesktop.org/show_bug.cgi?id=50970 - - src/hb-private.hh | 17 ++++++++++++----- - 1 files changed, 12 insertions(+), 5 deletions(-) - -commit 8c0ea7bcb4409aaf8c96ad641f2db30003228ad0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jun 24 13:20:56 2012 -0400 - - Disable introspection again - - Until I figure out the build issues. Sigh... - - configure.ac | 2 +- - src/Makefile.am | 42 +++++++++++++++++++++--------------------- - 2 files changed, 22 insertions(+), 22 deletions(-) - -commit 8c5f5e6f5ec2b6a219fbdfc955f6299325a0adde -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jun 17 14:58:59 2012 -0400 - - Minor - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 49f8e0cd9a5493ae26857c43bac0711cdf47c80d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 16 15:40:03 2012 -0400 - - GStaticMutex is deprecated - - src/hb-mutex-private.hh | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 5e113a4b7921ced6af2d53460a7a2f1d0185c02a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 16 15:26:13 2012 -0400 - - g_thread_init() is deprecated - - test/api/hb-test.h | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 1bc1cb3603167f5da309336f7018c8b0608ac104 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 16 15:21:55 2012 -0400 - - Make source more digestable for gobject-introspection - - src/hb-blob.cc | 2 +- - src/hb-blob.h | 2 +- - src/hb-buffer-private.hh | 4 ++-- - src/hb-buffer.h | 6 +++--- - src/hb-common.cc | 2 +- - src/hb-common.h | 4 ++-- - src/hb-font-private.hh | 6 +++--- - src/hb-font.cc | 2 +- - src/hb-font.h | 8 ++++---- - src/hb-set-private.hh | 2 +- - src/hb-set.h | 2 +- - src/hb-shape.h | 2 +- - src/hb-unicode-private.hh | 2 +- - src/hb-unicode.h | 2 +- - 14 files changed, 23 insertions(+), 23 deletions(-) - -commit 84d781e54cc75c81a06ba43fd7b1a74b8c7d9591 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 16 15:21:41 2012 -0400 - - Flesh out gobject-introspection stuff a bit - - configure.ac | 1 + - src/Makefile.am | 23 +++++++++++++++++++++-- - 2 files changed, 22 insertions(+), 2 deletions(-) - -commit 49ee12ccd00870d4976339dc546c74eaf08a8fc0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 16 14:53:51 2012 -0400 - - Add TODO item - - TODO | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit d3c8115d1ad09404b8970b98e6b5ab74510a35f6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 12 09:52:57 2012 -0400 - - Minor - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 2cf301968cb8c1150cead0ab909457cdd3ee2d01 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 9 14:58:01 2012 -0400 - - Add hb_object_lock/unlock() - - src/hb-object-private.hh | 32 ++++++++++++++++++++++++++------ - 1 files changed, 26 insertions(+), 6 deletions(-) - -commit 6a5661f1e69c937083e8d976cb12429b99180d54 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 9 03:26:16 2012 -0400 - - Ugh - - util/shape-consumer.hh | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit f211d5c291b4c947cfd732e873627567173057e4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 9 03:11:22 2012 -0400 - - More Oops! Fix fast-path with sub-type==0 - - src/hb-ot-layout-gpos-table.hh | 2 +- - src/hb-ot-layout-gsub-table.hh | 2 +- - util/shape-consumer.hh | 2 ++ - 3 files changed, 4 insertions(+), 2 deletions(-) - -commit b1de6aa1f33b228afe231c8209aef90a5fa1ee5d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 9 03:07:59 2012 -0400 - - Oops! - - src/hb-ot-layout-gpos-table.hh | 2 +- - src/hb-ot-layout-gsub-table.hh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit b12e2549cbcd4f1ef46e66c75533686ee560f59b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 9 03:05:20 2012 -0400 - - Minor - - src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit faf0f20253d954cc4cfa4c967ece7573a5ddae3b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 9 03:02:36 2012 -0400 - - Add sanitize() logic for fast-paths - - src/hb-ot-layout-gpos-table.hh | 15 ++++++++++++--- - src/hb-ot-layout-gsub-table.hh | 20 ++++++++++++++------ - 2 files changed, 26 insertions(+), 9 deletions(-) - -commit 4e766ff28d1fb831ded20666799787478129c07c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 9 02:53:57 2012 -0400 - - Add fast-path for GPOS too - - Shaves another 3% for DejaVu Sans long Latin strings. - - src/hb-ot-layout-gpos-table.hh | 16 ++++++++++++++-- - 1 files changed, 14 insertions(+), 2 deletions(-) - -commit 993c51915f503f74ee00eee646b67bf2e3f73596 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 9 02:48:16 2012 -0400 - - Add fast-path to GSUB to check coverage - - Shaves a good 10% off DejaVu Sans with simple Latin text for me. - Now, DejaVu is very ChainContext-intensive, but it's also a very - popular font! - - src/hb-ot-layout-gsub-table.hh | 18 ++++++++++++++++-- - 1 files changed, 16 insertions(+), 2 deletions(-) - -commit f19e0b0099ec73b8fedccacff4902403f5eabc42 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 9 02:26:57 2012 -0400 - - Match input before backtrack - - Makes more sense, optimization-wise. - - src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 67bb9e8cea49a44be6996515e1c7d8cdc95a77e6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 9 02:02:46 2012 -0400 - - Add set add_coverage() to Coverage() - - src/hb-ot-layout-common-private.hh | 24 ++++++++++++++++++++++++ - src/hb-set-private.hh | 5 +++++ - 2 files changed, 29 insertions(+), 0 deletions(-) - -commit 4952f0aa5b2f4368d9e3418252e0a1b9294cd5ee -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 9 01:39:11 2012 -0400 - - Minor - - src/hb-ot-layout-gsub-table.hh | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit ad6a6f22401d6256e34521d0f52e91348c5ed4c9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 9 01:21:02 2012 -0400 - - Minor - - src/hb-ot-layout.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 46617a42133fbab151de4111a74dcbdc4e769c74 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 9 01:18:58 2012 -0400 - - Fix cache implementation - - src/hb-cache-private.hh | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit ce47613889aa3ff9b0067d3e51ba63cfdb139adb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 9 01:10:26 2012 -0400 - - Micro-optimize - - I know... - - src/hb-ot-layout-gsubgpos-private.hh | 3 +- - src/hb-ot-layout.cc | 46 - ++++++++++++++++++++------------- - 2 files changed, 30 insertions(+), 19 deletions(-) - -commit 70416de298b811ab6be53a1c67f0d2531d99cd46 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 9 00:56:41 2012 -0400 - - Minor - - src/hb-open-type-private.hh | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 99159e52a3c9d5ae6c0fbdec64e7ed684fa70b61 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 9 00:50:40 2012 -0400 - - Use linear search for small counts - - I see about 8% speedup with long strings with DejaVu Sans. - - src/hb-open-type-private.hh | 19 ++++++++++++++----- - 1 files changed, 14 insertions(+), 5 deletions(-) - -commit caf0412690542e58e23246dccc4b2fb83bd652ec -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 9 00:26:32 2012 -0400 - - Minor - - src/hb-ot-layout-common-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0f8fea71a66b1e01ee4398967db464393f478d42 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 9 00:24:38 2012 -0400 - - Minor. Hide _hb_ot_layout_get_glyph_property() - - src/hb-ot-layout-private.hh | 4 ---- - src/hb-ot-layout.cc | 2 +- - 2 files changed, 1 insertions(+), 5 deletions(-) - -commit 44b8ee0c90d7b1dd91e5848114141e3186534a0f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 9 00:23:24 2012 -0400 - - Minor - - src/hb-ot-layout-gpos-table.hh | 3 ++- - src/hb-ot-layout.cc | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -commit 7b84c536c10ab90ed96a033d88e9ad232d46c5b8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 22:04:23 2012 -0400 - - In MarkBase attachment, only attach to first of a MultipleSubst - sequence - - This is apparently what Uniscribe does. Test case is: - - SEEN FATHA TEH ALEF - - with Arabic Typesetting. Originally reported by Khaled Hosny. - - src/hb-ot-layout-gpos-table.hh | 7 ++++++- - src/hb-ot-layout-gsubgpos-private.hh | 8 ++++++++ - 2 files changed, 14 insertions(+), 1 deletions(-) - -commit ec57e0c5655ced5109c4638bf802772d336448fd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 21:47:23 2012 -0400 - - Set lig_comp for MultipleSubst components - - To be used for correct mark attachment to first component of a - MultipleSubst output. That's what Uniscribe does. - - src/hb-ot-layout-gsub-table.hh | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit e085fcf7ca302eb7802a032197c022819e7e7074 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 21:45:00 2012 -0400 - - Remove unused buffer->replace_glyphs_be16 - - src/hb-buffer-private.hh | 3 --- - src/hb-buffer.cc | 23 ----------------------- - src/hb-ot-layout-gsubgpos-private.hh | 8 -------- - 3 files changed, 0 insertions(+), 34 deletions(-) - -commit 3ec77d6ae0510dc2c0ec64382c4948bc6e109844 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 21:44:06 2012 -0400 - - Don't use replace_glyphs_be for MultipleSubst - - src/hb-ot-layout-gsub-table.hh | 5 ++++- - src/hb-ot-layout-gsubgpos-private.hh | 7 ++++++- - 2 files changed, 10 insertions(+), 2 deletions(-) - -commit 4b7192125ffd295091d6b3a0bdfca7011947c2ca -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 21:41:46 2012 -0400 - - Minor - - src/hb-ot-layout-gsub-table.hh | 3 ++- - src/hb-ot-layout-gsubgpos-private.hh | 8 ++++++++ - 2 files changed, 10 insertions(+), 1 deletions(-) - -commit 4508789f4b5e0ece5620d35598aeeb7ecbe3e3aa -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 21:32:43 2012 -0400 - - Add test for static initializers and other C++ stuff - - src/Makefile.am | 3 ++- - src/check-static-inits.sh | 33 +++++++++++++++++++++++++++++++++ - 2 files changed, 35 insertions(+), 1 deletions(-) - -commit 56bd259b9ac22dd98913c8ca2e2cf7b30b632373 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 21:29:18 2012 -0400 - - Minor - - src/check-internal-symbols.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4538b47bf08e73e7f5cce6337df5fe154233c168 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 21:01:45 2012 -0400 - - Remove done TODO items - - TODO | 7 +------ - 1 files changed, 1 insertions(+), 6 deletions(-) - -commit bc8357ea7b4c0d7c715aae353176434fb9460205 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 21:01:20 2012 -0400 - - Merge clusters during normalization - - src/hb-ot-shape-normalize.cc | 11 +++++++---- - 1 files changed, 7 insertions(+), 4 deletions(-) - -commit fe3dabc08df7501010564f8844bd4d11771cc6a4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 20:56:05 2012 -0400 - - Minor - - src/hb-buffer.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit e88e14421a33ca5bdfd76bc0b2f801fcb6e78911 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 20:55:21 2012 -0400 - - Use merge_clusters instead of open-coding - - src/hb-buffer.cc | 16 ++++------------ - 1 files changed, 4 insertions(+), 12 deletions(-) - -commit 330a2af3ff0e12c01b3b451357b8bdc83b2e9b47 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 20:40:02 2012 -0400 - - Use merge_clusters when forming Unicode clusters - - src/hb-ot-shape.cc | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit bd300df9adf955c1e69b3783c1c061876940fb8b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 20:35:18 2012 -0400 - - Minor - - src/hb-object-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e51d2b6ed1c794ac28c5610bfd01dbc9fb383633 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 20:33:27 2012 -0400 - - Extend into main buffer if extension hit end of out-buffer merging - clusters - - src/hb-buffer.cc | 5 +++++ - src/hb-ot-shape-complex-misc.cc | 9 --------- - 2 files changed, 5 insertions(+), 9 deletions(-) - -commit 5ced012d9f58c51d557a835593c3277e35fe3b35 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 20:31:32 2012 -0400 - - Extend end when merging clusters in out-buffer - - src/hb-buffer.cc | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 72c0a1878313e7232d554bc226f4c6dc01418a95 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 20:30:03 2012 -0400 - - Extend clusters backward in out-buffer - - src/hb-buffer.cc | 8 ++++++++ - src/hb-ot-shape-complex-misc.cc | 2 -- - 2 files changed, 8 insertions(+), 2 deletions(-) - -commit cd5891493df06fdb92e1ae526d29dee8df250235 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 20:27:53 2012 -0400 - - Extend clusters backwards, into the out-buffer too - - src/hb-buffer.cc | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 77471e037122548bfc08cacea6fbb472831c34f3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 20:21:02 2012 -0400 - - Clear output buffer before calling GSUB pause functions - - src/hb-ot-map.cc | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit cafa6f372721fd6b0a7c0da68b9421d3e94931bc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 20:17:10 2012 -0400 - - When merging clusters, extend the end - - src/hb-buffer.cc | 20 ++++++++++++++------ - 1 files changed, 14 insertions(+), 6 deletions(-) - -commit 28ce5fa454b54f728044ee12a9dbe7d016783d4a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 20:13:56 2012 -0400 - - Merge clusters when ligating - - src/hb-ot-layout-gsub-table.hh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 2bb1761ccb7d300744ced6427165f4ea75ddf96c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 19:29:44 2012 -0400 - - Minor, use next_glyph() - - src/hb-ot-layout-gsub-table.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 5f68f8675e5ccaee91f5a90d86bc3b022b9a54e4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 19:23:43 2012 -0400 - - Minor - - src/hb-ot-shape.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 872969126756456a69bf958f3df6e56a26e57b0a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 14:18:30 2012 -0400 - - Increase Uniscribe MAX_ITEMS - - src/hb-uniscribe.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit dbffa4c83d29c689ee4cd8a1c53e84521028c711 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 14:08:32 2012 -0400 - - Fix Uniscribe charset matching - - Previously was failing to match fonts that didn't support - CHARSET_ANSI. - - There still remains a problem with the Uniscribe backend, in that if a - font with the same family name is installed, and is newer, the native - one is preferred over the font we provide. Fixing it requires - rewriting - the name table with a unique family name... - - src/hb-uniscribe.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 82e8bd8628aeb37835fb019a71b6bdac87824b97 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 11:48:29 2012 -0400 - - Remove unused code - - src/hb-uniscribe.cc | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit 6da9dbff21b47fb10794b8d6cb747393c9eab7dd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 10:53:35 2012 -0400 - - Remove zero-width chars in the fallback shaper too - - src/hb-fallback-shape.cc | 16 ++++++++++++---- - 1 files changed, 12 insertions(+), 4 deletions(-) - -commit 68b76121f83fc9b87dc84f03e8bef38d4332734d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 10:43:49 2012 -0400 - - Fix regressions introduced by sed. Ouch! - - Introduced in 99c2695759a6af855d565f4994bbdf220570bb48. - Broken mark-mark and mark-ligature stuff. - - src/hb-ot-layout-gpos-table.hh | 6 +++--- - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit 0dd86f9f6849d82d60a99e66b6928795cfb2a3c7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 10:23:03 2012 -0400 - - Whitespace - - src/hb-uniscribe.cc | 144 - +++++++++++++++++++++++++------------------------- - 1 files changed, 72 insertions(+), 72 deletions(-) - -commit 8e7beba7c3b3dea3cb3b7e280c5aab4f13b92d31 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 10:22:06 2012 -0400 - - Fix Uniscribe clusters with direction-overriden Arabic - - src/hb-uniscribe.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit b069c3c31bfbbf160eb897c7474be9ea90ed4fc1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 10:10:29 2012 -0400 - - Really fix override-direction in Uniscribe - - src/hb-uniscribe.cc | 10 +++++++--- - 1 files changed, 7 insertions(+), 3 deletions(-) - -commit fcd6f5326166e993b8f5222efbaffe916da98f0a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 09:59:43 2012 -0400 - - Unbreak Uniscribe - - Oops. hb_tag_t and OPENTYPE_TAG have different endianness. Perhaps - something to add API for in hb-uniscribe.h - - src/hb-private.hh | 12 +++++++++++- - src/hb-uniscribe.cc | 8 ++++---- - 2 files changed, 15 insertions(+), 5 deletions(-) - -commit 29eac8f591fdb86f1c4fdc0a6ab63910ff286b84 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 09:26:17 2012 -0400 - - Override direction in Uniscribe backend - - Matches OT backend now. - - src/hb-uniscribe.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1c1233e57686d77d89fe3ac1dc53de9ee60798c1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 8 09:20:53 2012 -0400 - - Make Uniscribe backend respect selected script - - src/hb-uniscribe.cc | 15 +++++++++++++-- - 1 files changed, 13 insertions(+), 2 deletions(-) - -commit 0bb0f5d41976ae27c5c7a51cbb82144b48315a4b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jun 7 17:42:48 2012 -0400 - - Add note re _NullPool - - src/hb-open-type-private.hh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 2a3d911fe0ff5d6442659d3381d5b08c30ee2896 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jun 7 17:31:46 2012 -0400 - - Fix alignment-requirement missmatch - - Detected by clang and lots of cmdline options. - - src/hb-buffer-private.hh | 2 +- - src/hb-buffer.cc | 5 +++-- - src/hb-ot-layout-gsub-table.hh | 4 ++-- - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - 4 files changed, 7 insertions(+), 6 deletions(-) - -commit 6095de1635441af16340c7b2c5a6b4c531ec242f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jun 7 15:48:18 2012 -0400 - - Fix clang warning with NO_MT path - - src/hb-shape.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a18280a8ce9128fc9d75f8a367ae8ce0886a9599 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jun 7 15:44:12 2012 -0400 - - Fix warnings produced by clang analyzer - - src/hb-icu.cc | 6 ++++-- - test/api/test-blob.c | 2 +- - test/api/test-buffer.c | 4 ++-- - util/helper-cairo.cc | 2 +- - 4 files changed, 8 insertions(+), 6 deletions(-) - -commit 7ec83051c05777c0e6e2eea6ef6c71effede9527 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jun 7 13:32:57 2012 -0400 - - Fix warnings - - util/ansi-print.cc | 30 +++++++++++++----------------- - 1 files changed, 13 insertions(+), 17 deletions(-) - -commit 73cb02de2dd28b09d4aa76230132248215cfe83d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jun 6 11:29:25 2012 -0400 - - Minor - - src/hb-private.hh | 26 +++++++++++++------------- - 1 files changed, 13 insertions(+), 13 deletions(-) - -commit 79e2b4791fe95ede9a1e6b1c71ccc6e36c4fc0e5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jun 6 11:27:17 2012 -0400 - - Fix ASSERT_POD on clang - - As reported by bashi. Not tested. - - src/hb-private.hh | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 4282d2f3771d6510c27b62e54cc1254d6f2389b3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jun 6 03:42:36 2012 -0400 - - Enabled ICU again - - configure.ac | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 6220e5fc0dad728e67a92e838d3ac275d032f2c7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jun 6 03:30:09 2012 -0400 - - Add ASSERT_POD for most objects - - src/hb-blob.cc | 1 + - src/hb-buffer-private.hh | 2 ++ - src/hb-font-private.hh | 3 +++ - src/hb-object-private.hh | 2 ++ - src/hb-private.hh | 2 +- - src/hb-set-private.hh | 4 +++- - src/hb-unicode-private.hh | 1 + - 7 files changed, 13 insertions(+), 2 deletions(-) - -commit a00a63b5ef503fafa87e26b517732b2214e01719 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jun 6 03:07:01 2012 -0400 - - Add macros to check that types are POD - - configure.ac | 1 + - src/hb-open-type-private.hh | 32 ++++++++++++++++++++------------ - src/hb-private.hh | 24 ++++++++++++++++++++++++ - 3 files changed, 45 insertions(+), 12 deletions(-) - -commit 61eb60c129e865e92f6a5767a88c44a391f4d413 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 5 21:14:04 2012 -0400 - - Don't link to libstdc++ - - New try. - - src/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 81a4b9fd4eb8995c5930db1df3669db93661eb52 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 5 20:49:51 2012 -0400 - - Remove unused hb_static_mutex_t - - src/hb-mutex-private.hh | 11 ----------- - 1 files changed, 0 insertions(+), 11 deletions(-) - -commit 4a3a9897b3698dd09c3e880b3ddd4db24c6fb460 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 5 20:39:07 2012 -0400 - - Disable Intel atomic ops on mingw32 - - Apparently the configure test is not enough... - - src/hb-atomic-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0594a2448440208efa0acac9a5d8d52d43108289 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 5 20:35:40 2012 -0400 - - Cleanup TRUE/FALSE vs true/false - - src/hb-atomic-private.hh | 4 +- - src/hb-blob.cc | 28 ++++++++-------- - src/hb-buffer-private.hh | 2 +- - src/hb-buffer.cc | 38 ++++++++++++------------ - src/hb-buffer.h | 4 +- - src/hb-fallback-shape.cc | 2 +- - src/hb-font.cc | 22 +++++++------- - src/hb-ft.cc | 22 +++++++------- - src/hb-glib.cc | 16 +++++----- - src/hb-graphite2.cc | 8 ++-- - src/hb-icu.cc | 30 +++++++++--------- - src/hb-ot-layout.cc | 28 ++++++++-------- - src/hb-ot-shape-complex-private.hh | 2 +- - src/hb-ot-shape-normalize.cc | 16 +++++----- - src/hb-ot-shape.cc | 4 +- - src/hb-private.hh | 18 ++++------- - src/hb-set.cc | 2 +- - src/hb-set.h | 2 +- - src/hb-shape.cc | 6 ++-- - src/hb-tt-font.cc | 12 ++++---- - src/hb-unicode.cc | 8 ++-- - src/hb-uniscribe.cc | 18 +++++----- - src/main.cc | 2 +- - util/hb-shape.cc | 2 +- - util/helper-cairo.cc | 16 +++++----- - util/main-font-text.hh | 2 +- - util/options.cc | 58 - ++++++++++++++++++------------------ - util/options.hh | 2 +- - util/view-cairo.hh | 2 +- - 29 files changed, 185 insertions(+), 191 deletions(-) - -commit e1ac38f8dd04c29d2d4140f5a492cdaf25d72901 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 5 20:31:49 2012 -0400 - - Fix inert buffer set_length() with zero - - Oops! - - src/hb-buffer.cc | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 04bc1eebe7a304c0e6f86ab6814c65889f152602 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 5 20:16:56 2012 -0400 - - Add configure tests for Intel atomic intrinsics - - configure.ac | 17 +++++++++++++++++ - src/hb-atomic-private.hh | 12 ++++++------ - src/hb-mutex-private.hh | 2 +- - 3 files changed, 24 insertions(+), 7 deletions(-) - -commit 68c75b46977beb57e35082db26be712b3cd65678 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 5 19:55:46 2012 -0400 - - Shuffle - - configure.ac | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - -commit f64b2ebf82c5f355cd95806478cd30c00b1a2731 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 5 19:23:29 2012 -0400 - - Remove last static initializer - - We're free! Lazy or immediate... - - src/hb-ft.cc | 2 + - src/hb-shape.cc | 150 - +++++++++++++++++++++++++++++++++++++++--------------- - 2 files changed, 110 insertions(+), 42 deletions(-) - -commit 4a8a529068fc380298bb05b9d878bede3e9f4da1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 5 19:17:02 2012 -0400 - - Make hb-view err if all shapers failed - - util/view-cairo.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 04aed572f112b96a6033cd6c3df7bdba5e29e93c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 5 18:30:19 2012 -0400 - - Make hb-ft static-initializer free - - src/hb-common.cc | 5 ++--- - src/hb-ft.cc | 38 +++++++++++++++++++++++++++----------- - 2 files changed, 29 insertions(+), 14 deletions(-) - -commit be4560a3b5e8599cbe2b29a01a60c21c9e2b194f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 5 18:14:03 2012 -0400 - - Undo default unicode-funcs to avoid static initializer again - - src/hb-buffer.cc | 2 +- - src/hb-glib.cc | 23 ++++++++++++----------- - src/hb-icu.cc | 24 +++++++++++++----------- - src/hb-unicode-private.hh | 10 +++++----- - src/hb-unicode.cc | 26 ++++++++++++++------------ - 5 files changed, 45 insertions(+), 40 deletions(-) - -commit 093171cceca63e48e735bbf05a2c11b1b7e95ef1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 5 18:00:45 2012 -0400 - - Implement lock-free hb_language_t - - Another static-initialization down. One more to go. - - src/hb-common.cc | 66 - ++++++++++++++++++++++++++++++++++++++++++++--------- - 1 files changed, 54 insertions(+), 12 deletions(-) - -commit 6843ce01be0df501ef3149a2c1c54cdfb693195d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 5 17:27:20 2012 -0400 - - Add atomic-pointer functions - - Gonig to use these for lock-free linked-lists, to be used for - hb_language_t among other things. - - src/hb-atomic-private.hh | 21 +++++++++++++++++++++ - 1 files changed, 21 insertions(+), 0 deletions(-) - -commit cdafe3a7d8483ac586e2c16487e2a09164e0f65c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 5 16:34:49 2012 -0400 - - Add gcc intrinsics implementations for atomic and mutex - - configure.ac | 4 +- - src/hb-atomic-private.hh | 11 ++++++++- - src/hb-mutex-private.hh | 51 - +++++++++++++++++++++++++++++++++++++++------ - src/hb-object-private.hh | 4 ++- - src/hb-warning.cc | 14 ++++++------ - 5 files changed, 65 insertions(+), 19 deletions(-) - -commit d970d2899b36a2fbd002b224b8bd37b0906fdd5f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 5 16:06:28 2012 -0400 - - Add gcc implementation for atomic ops - - src/hb-atomic-private.hh | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -commit 0e253e97af71e2a7ead153589f61fd579a247502 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 5 15:37:19 2012 -0400 - - Add a mutex to object header - - Removes one more static-initialization. A few more to go. - - src/hb-common.cc | 24 +++++++++--------------- - src/hb-mutex-private.hh | 19 +++++++------------ - src/hb-object-private.hh | 36 ++++++++++++++++++++++-------------- - src/hb-private.hh | 11 +++++------ - 4 files changed, 43 insertions(+), 47 deletions(-) - -commit a2b471df821b32625d127f83b2f90e6d6a967e7e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 5 15:17:44 2012 -0400 - - Remove static initializers from indic - - src/hb-ot-shape-complex-indic.cc | 50 - +++++++++++++++++++++++++++++-------- - 1 files changed, 39 insertions(+), 11 deletions(-) - -commit f06ab8a4262c759b4723614fd28f55ee77aa8466 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 5 12:31:51 2012 -0400 - - Better hide nil objects and make them const - - src/hb-blob.cc | 34 +++++++++++----------- - src/hb-buffer.cc | 39 ++++++++++++------------- - src/hb-font.cc | 70 - ++++++++++++++++++++++----------------------- - src/hb-ft.cc | 49 ++++++++++++++----------------- - src/hb-glib.cc | 25 ++++++++-------- - src/hb-icu.cc | 25 ++++++++-------- - src/hb-set.cc | 16 +++++----- - src/hb-unicode-private.hh | 11 +++---- - src/hb-unicode.cc | 34 +++++++++++----------- - 9 files changed, 146 insertions(+), 157 deletions(-) - -commit bf93b636c4963cbc32d5fba7ace1053db6719192 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 5 14:17:32 2012 -0400 - - Remove constructor from hb_prealloced_array_t - - This was causing all object types to be non-POD and have static - initializers. We don't need that! - - Now, most nil objects just moved from .bss to .data. Fixing for that - coming soon. - - src/hb-object-private.hh | 3 +++ - src/hb-private.hh | 4 +++- - src/hb-set-private.hh | 1 + - 3 files changed, 7 insertions(+), 1 deletions(-) - -commit 7037291aacb858f8090fd7d9028c196cc1a21703 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 5 13:30:11 2012 -0400 - - Check for atexit() - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f1971a217424bd6db5c7072ba5cf197f318d4e47 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 5 13:04:20 2012 -0400 - - Fix warnings - - src/indic.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b0a6e58bb3dda72dcce37d54d987591630a3db6c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jun 4 10:21:22 2012 -0400 - - s/script-punjabi/script-gurmukhi/ - - .../texts/in-tree/shaper-indic/indic/MANIFEST | 2 +- - .../shaper-indic/indic/script-gurmukhi/MANIFEST | 2 + - .../indic/script-gurmukhi/misc/MANIFEST | 1 + - .../indic/script-gurmukhi/misc/misc.txt | 1 + - .../indic/script-gurmukhi/utrrs/LICENSE | 19 +++ - .../indic/script-gurmukhi/utrrs/MANIFEST | 3 + - .../indic/script-gurmukhi/utrrs/README | 13 ++ - .../indic/script-gurmukhi/utrrs/SOURCES | 2 + - .../IndicFontFeatureCodepoint-Consonants.txt | 38 +++++ - .../IndicFontFeatureCodepoint-DependentVowels.txt | 9 ++ - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 ++ - .../IndicFontFeatureCodepoint-GurmukhiSpecific.txt | 6 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 10 ++ - .../IndicFontFeatureCodepoint-Reserved.txt | 2 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 + - .../indic/script-gurmukhi/utrrs/codepoint/MANIFEST | 7 + - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 22 +++ - .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 2 + - .../indic/script-gurmukhi/utrrs/gpos/MANIFEST | 2 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 152 - ++++++++++++++++++++ - .../indic/script-gurmukhi/utrrs/gsub/MANIFEST | 1 + - .../shaper-indic/indic/script-punjabi/MANIFEST | 2 - - .../indic/script-punjabi/misc/MANIFEST | 1 - - .../indic/script-punjabi/misc/misc.txt | 1 - - .../indic/script-punjabi/utrrs/LICENSE | 19 --- - .../indic/script-punjabi/utrrs/MANIFEST | 3 - - .../shaper-indic/indic/script-punjabi/utrrs/README | 13 -- - .../indic/script-punjabi/utrrs/SOURCES | 2 - - .../IndicFontFeatureCodepoint-Consonants.txt | 38 ----- - .../IndicFontFeatureCodepoint-DependentVowels.txt | 9 -- - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 -- - .../IndicFontFeatureCodepoint-GurmukhiSpecific.txt | 6 - - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 10 -- - .../IndicFontFeatureCodepoint-Reserved.txt | 2 - - .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 - - .../indic/script-punjabi/utrrs/codepoint/MANIFEST | 7 - - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 22 --- - .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 2 - - .../indic/script-punjabi/utrrs/gpos/MANIFEST | 2 - - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 152 - -------------------- - .../indic/script-punjabi/utrrs/gsub/MANIFEST | 1 - - 41 files changed, 309 insertions(+), 309 deletions(-) - -commit c1885483120d4b686b2fe95b217dce7248e040b1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jun 4 08:56:00 2012 -0400 - - Add --verbose to hb-shape - - Just turns all --show-* options on. - - util/options.cc | 11 +++++++++++ - util/options.hh | 1 - - 2 files changed, 11 insertions(+), 1 deletions(-) - -commit 9fc7a11469113d31d8095757c4fc038c3427d44a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jun 4 08:28:19 2012 -0400 - - Remove comma at the end of enum - - As reported by Jonathan Kew on the list. - - src/hb-ot-shape-complex-indic.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3b8fd9c48f4bde368bf2d465c148b9743a9216ee -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jun 3 15:54:19 2012 -0400 - - Remove const from ref_count.ref_count - - According to Tom Hacohen this was breaking build with some compilers. - - In file included from hb-buffer-private.hh:35:0, - from hb-ot-map-private.hh:32, - from hb-ot-shape-private.hh:32, - from hb-ot-shape.cc:29: - hb-object-private.hh: In constructor - '_hb_object_header_t::_hb_object_header_t()': - hb-object-private.hh:97:8: error: uninitialized const member in - 'struct hb_reference_count_t' - hb-object-private.hh:51:25: note: 'hb_reference_count_t::ref_count' - should be initialized - In file included from hb-ot-shape.cc:33:0: - hb-set-private.hh: In constructor '_hb_set_t::_hb_set_t()': - hb-set-private.hh:37:8: note: synthesized method - '_hb_object_header_t::_hb_object_header_t()' first required here - hb-ot-shape.cc: In function 'void - hb_ot_shape_glyphs_closure(hb_font_t*, hb_buffer_t*, const - hb_feature_t*, unsigned int, hb_set_t*)': - hb-ot-shape.cc:521:12: note: synthesized method - '_hb_set_t::_hb_set_t()' first required here - - src/hb-object-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 70600dbf626808a30fb0fd8b7ae860e64d9ffe87 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jun 3 15:52:51 2012 -0400 - - Minor - - src/hb-object-private.hh | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit ae62166519291057316a9d15cea3f1570fcb5eaf -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 2 12:21:19 2012 -0400 - - [util] Minor - - util/options.cc | 4 +--- - util/options.hh | 26 ++++++++++++++------------ - util/shape-consumer.hh | 4 +++- - 3 files changed, 18 insertions(+), 16 deletions(-) - -commit 5db0683a822f70c914468430cda6487cee740ae3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jun 2 12:13:08 2012 -0400 - - [util] Make hb-shape continue shaping other lines if shapers failed - - util/hb-ot-shape-closure.cc | 3 ++ - util/hb-shape.cc | 36 ++++++++++++++++++++++++----- - util/main-font-text.hh | 2 +- - util/options.cc | 34 +++++++++++++++++++++------ - util/options.hh | 33 ++++++++++++++------------- - util/shape-consumer.hh | 17 +++++++++++-- - util/view-cairo.cc | 47 ++++++-------------------------------- - util/view-cairo.hh | 52 - +++++++++++++++++++++++++++++++++++++----- - 8 files changed, 143 insertions(+), 81 deletions(-) - -commit 96a9ef0c9fca8d58d8dc6baf6b262d96587abee0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 1 13:46:26 2012 -0400 - - Remove tab character like other "zero-width" characters - - Uniscribe does that, this make comparing results to Uniscribe - easier. - - src/hb-unicode-private.hh | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit cd6a5493411fea30a04466128e1a37b4d89c6a72 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 1 13:45:25 2012 -0400 - - Remove unused variable - - util/hb-ot-shape-closure.cc | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 0558d55bac7fb9279aac859b465e7c0e3ad97492 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 28 10:46:47 2012 -0400 - - Remove hb_atomic_int_set/get() - - We never use them in fact... - - I'm just adjusting these as I better understand the requirements of - the code and the guarantees of each operation. - - src/hb-atomic-private.hh | 8 -------- - src/hb-object-private.hh | 12 +++++------- - 2 files changed, 5 insertions(+), 15 deletions(-) - -commit 4efdffec095e19ceeb4b319d60201e84ece30fd9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 27 22:39:48 2012 -0400 - - Minor Malayalam test case - - From https://bugs.freedesktop.org/show_bug.cgi?id=45166 - - .../indic/script-malayalam/misc/misc.txt | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit dfff5b3021016d3a472c100272fd8e2f52307860 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 27 22:07:04 2012 -0400 - - Add Myanmar test case - - .../in-tree/shaper-indic/south-east-asian/MANIFEST | 1 + - .../south-east-asian/script-myanmar/MANIFEST | 1 + - .../south-east-asian/script-myanmar/misc/MANIFEST | 1 + - .../south-east-asian/script-myanmar/misc/misc.txt | 1 + - 4 files changed, 4 insertions(+), 0 deletions(-) - -commit bce095524b3e69a47f8e88a2fb02d6ab537f9b0a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 27 11:29:21 2012 -0400 - - Add hb_font_get_glyph_name() and hb_font_get_glyph_from_name() - - TODO | 1 + - src/hb-font-private.hh | 2 + - src/hb-font.cc | 80 - +++++++++++++++++++++++++++++++++---------- - src/hb-font.h | 28 +++++++++++++++ - src/hb-ft.cc | 52 +++++++++++++++++++++++----- - util/hb-ot-shape-closure.cc | 9 ++--- - util/options.cc | 10 ++---- - 7 files changed, 142 insertions(+), 40 deletions(-) - -commit bc145658bdaeaeea0cdbd719e2756f09a2dbfb48 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 27 10:45:57 2012 -0400 - - Warn if no Unicode functions implementation is found - - src/hb-unicode-private.hh | 1 + - src/hb-warning.cc | 13 +++++++++++++ - 2 files changed, 14 insertions(+), 0 deletions(-) - -commit a3547330fa88e30a138f6f17e60d9c7d1e316622 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 27 10:20:47 2012 -0400 - - Cleanup atomic ops on OS X - - src/hb-atomic-private.hh | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit e4b6d503c5575ddbf49249e3fef693d75ae75170 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 27 10:11:13 2012 -0400 - - Don't use atomic ops in hb_cache_t - - We don't care about linearizability, so unprotected int read/write - are enough, no need for expensive memory barriers. It's a cache, - that's all. - - src/hb-cache-private.hh | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 819faa05307aa192015f4b43d8103a35e87d6cc7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 27 10:09:18 2012 -0400 - - Minor - - src/hb-atomic-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 303d5850ec0516e198db241456b0cfc4899ef9c0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 27 10:01:13 2012 -0400 - - Fix Windows atomic get/set - - According to: - http://msdn.microsoft.com/en-us/library/65tt87y8.aspx - - MemoryBarrier() is the right macro to protect these, not - _ReadBarrier() - and/or _WriteBarrier(). - - src/hb-atomic-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 8f8956a55fff95e5ad529d2f124c9528d1f4f81d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 25 14:30:24 2012 -0400 - - [util] Add hidden --shaper that is equivalent of --shapers - - util/helper-cairo.cc | 2 +- - util/options.cc | 6 +++++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -commit 29ce446d3161b7ea5874352e5f8eb33cd59338c3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 25 14:17:54 2012 -0400 - - Add set iterator - - src/hb-set-private.hh | 26 +++++++++++++++++++++++--- - src/hb-set.cc | 7 +++++++ - src/hb-set.h | 11 +++++++++-- - util/hb-ot-shape-closure.cc | 8 +++++--- - 4 files changed, 44 insertions(+), 8 deletions(-) - -commit 62c3e111fce0ad34960871134c2eb6da572df303 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 25 13:48:00 2012 -0400 - - Add set symmetric difference - - src/hb-set-private.hh | 5 +++++ - src/hb-set.cc | 7 +++++++ - src/hb-set.h | 6 ++++++ - 3 files changed, 18 insertions(+), 0 deletions(-) - -commit 27aba594c90b4444c35273a38f5fedc8e09d9a88 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 24 15:00:01 2012 -0400 - - Minor - - src/hb-ot-shape-complex-indic-machine.rl | 2 +- - src/hb-ot-shape-complex-indic.cc | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit cde1c0114ba66a45d907e81a49bf625e0dc946b0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 24 10:46:39 2012 -0400 - - Fix hb_atomic_int_set() implementation for HB_NO_MT - - As pointed out by Jonathan Kew. - - src/hb-atomic-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3b9b7133bea787f787170beea073f185e36d2327 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 23 22:00:25 2012 -0400 - - Update TODO - - TODO | 18 ++++++++++++++++-- - 1 files changed, 16 insertions(+), 2 deletions(-) - -commit ff3524c21aabf5d0d6014d1ce1b3e12ca5f0990f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 23 21:50:43 2012 -0400 - - Add Arabic diacritics tests - - .../shaper-arabic/script-arabic/misc/MANIFEST | 2 +- - .../script-arabic/misc/diacritics/MANIFEST | 5 + - .../script-arabic/misc/diacritics/lam-alef.txt | 28 + - .../misc/diacritics/language-arabic.txt | 695 - ++++++++++++++++++++ - .../misc/diacritics/language-persian.txt | 48 ++ - .../misc/diacritics/language-urdu.txt | 188 ++++++ - .../misc/diacritics/ligature-diacritics.txt | 1 + - .../script-arabic/misc/ligature-diacritics.txt | 1 - - 8 files changed, 966 insertions(+), 2 deletions(-) - -commit ed2f1363a391add41f10cff18792003583a10257 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 22 22:12:22 2012 -0400 - - Fix substitution glyph class propagation - - The old code was doing nothing. - - Still got to find an example font+string that makes this matter, but - need this for fixing synthetic GDEF anyway. - - src/hb-ot-layout-gsub-table.hh | 10 ++++------ - src/hb-ot-layout-gsubgpos-private.hh | 23 ++++++----------------- - 2 files changed, 10 insertions(+), 23 deletions(-) - -commit a6de53664df9549a5dc93752647ea1d3bb336f7b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 18 15:04:35 2012 -0400 - - Add CJK Compatibility Ideographs tests - - From: - http://people.mozilla.org/~jdaggett/tests/cjkcompat.html - - test/shaping/texts/in-tree/shaper-default/MANIFEST | 3 +- - .../in-tree/shaper-default/script-han/MANIFEST | 1 + - .../shaper-default/script-han/misc/MANIFEST | 1 + - .../shaper-default/script-han/misc/cjk-compat.txt | 3 + - .../shaper-default/script-hiragana/MANIFEST | 1 + - .../shaper-default/script-hiragana/misc/MANIFEST | 2 + - .../script-hiragana/misc/kazuraki-liga-lines.txt | 8 +++ - .../script-hiragana/misc/kazuraki-liga.txt | 53 - ++++++++++++++++++++ - .../shaper-default/script-japanese/MANIFEST | 1 - - .../shaper-default/script-japanese/misc/MANIFEST | 2 - - .../script-japanese/misc/kazuraki-liga-lines.txt | 8 --- - .../script-japanese/misc/kazuraki-liga.txt | 53 - -------------------- - 12 files changed, 71 insertions(+), 65 deletions(-) - -commit 20fdb0f41d81b226e076a4830d4b0d03da31fc19 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 17 22:04:45 2012 -0400 - - Add a lock-free cache type for int->int functions - - To be used for cmap and advance caching if desired. - - TODO | 2 + - src/Makefile.am | 1 + - src/hb-cache-private.hh | 72 - +++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-font.cc | 2 + - 4 files changed, 77 insertions(+), 0 deletions(-) - -commit bd908b4f102b5ae18a3ad4a8b137994cf74b86ce -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 17 22:02:08 2012 -0400 - - Implement hb_atomic_int_set() for OS X - - src/hb-atomic-private.hh | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 022a05ae90f30bcddff413022e0cd801809b5390 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 17 21:53:24 2012 -0400 - - Minor - - src/hb-atomic-private.hh | 4 +++- - src/hb-mutex-private.hh | 4 +++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -commit 22afd66a30d01b6771405e76777306f600807bea -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 17 21:23:49 2012 -0400 - - Add hb_atomic_int_set() again - - src/hb-atomic-private.hh | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit 4aa7258cb16176a89e1547fee8f86571fdd98307 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 17 21:01:04 2012 -0400 - - Fix type conflicts on Windows without glib - - src/hb-tt-font.cc | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit f039e79d5438a8fc4a3ec11a387bbfc0f6b83024 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 17 20:55:12 2012 -0400 - - Don't use min/max as function names - - They can be macros on some systems. Eg. mingw32. - - src/hb-set-private.hh | 4 ++-- - src/hb-set.cc | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit 34961e3198e27fa37fd4cfdad12ef86a2e9e51c2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 17 20:50:38 2012 -0400 - - Prefer native atomic/mutex ops to glib's - - src/hb-atomic-private.hh | 29 ++++++++++++++++------------- - src/hb-mutex-private.hh | 24 ++++++++++++++---------- - 2 files changed, 30 insertions(+), 23 deletions(-) - -commit ec3ba4b96fc4f262db1ff9f906628c32f26c9b7d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 17 20:30:46 2012 -0400 - - Move atomic ops into their own header - - src/Makefile.am | 1 + - src/hb-atomic-private.hh | 78 - ++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-mutex-private.hh | 1 - - src/hb-object-private.hh | 52 +----------------------------- - src/hb-warning.cc | 2 +- - 5 files changed, 82 insertions(+), 52 deletions(-) - -commit de0878395be5c72d7058faac8f64715bdd42eb3b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 17 20:15:49 2012 -0400 - - Update TODO - - TODO | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) - -commit c87b317f0eb118e67134e8e419a6d65e0fa40d30 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 15 23:53:18 2012 -0400 - - [util] Add hb-ot-shape-closure tool - - Computes all the glyphs that may be generated given a font and - set of Unicode characters. - - The order of the Unicode characters is irrelevant. - - Sample output: - - behdad:util 0$ ./hb-ot-shape-closure Doulos\ SIL\ Regular.ttf f - f f_f - - behdad:util 0$ ./hb-ot-shape-closure Doulos\ SIL\ Regular.ttf i - i - - behdad:util 0$ ./hb-ot-shape-closure Doulos\ SIL\ Regular.ttf fi - f f_i f_f_i f_f i - - behdad:util 0$ ./hb-ot-shape-closure DroidNaskh-Regular.ttf ب - uni0628 uni0628.init uni0628.medi uni0628.fina - - behdad:util 0$ ./hb-ot-shape-closure DroidNaskh-Regular.ttf ا - uni0627 uni0627.fina - - behdad:util 0$ ./hb-ot-shape-closure DroidNaskh-Regular.ttf با - uni0627 uni0627.fina uni0628 uni0628.init uni0628.medi uni0628.fina - - behdad:util 0$ ./hb-ot-shape-closure DroidNaskh-Regular.ttf با - --no-glyph-names - 5 6 133 134 135 136 - - configure.ac | 2 +- - util/Makefile.am | 22 ++++++--- - util/hb-ot-shape-closure.cc | 112 - +++++++++++++++++++++++++++++++++++++++++++ - util/options.hh | 12 +++++ - 4 files changed, 140 insertions(+), 8 deletions(-) - -commit 45675e589e6ef9f81b2a4199cf33e3e7778433a8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 15 23:10:39 2012 -0400 - - [util] Refactor to accommodate for upcoming new tool - - util/Makefile.am | 10 +++-- - util/hb-shape.cc | 70 ++++++++++++++++++----------------------- - util/hb-view.cc | 8 +++-- - util/hb-view.hh | 80 - ------------------------------------------------ - util/main-font-text.hh | 80 - ++++++++++++++++++++++++++++++++++++++++++++++++ - util/shape-consumer.hh | 69 +++++++++++++++++++++++++++++++++++++++++ - 6 files changed, 191 insertions(+), 126 deletions(-) - -commit 1d6846db9ebf84561bb30a4e48c6c43184914099 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 13 18:09:29 2012 +0200 - - [Indic] Apply vatu feature after cjct - - Testing with old Deva spec this reduces failures. - Test sequence: U+0915,U+094D,U+0930. - - src/hb-ot-shape-complex-indic.cc | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 8caf5dcd66550351c6038b9ae7ecc5254eed64ff -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 13 17:10:18 2012 +0200 - - Minor - - util/ansi-print.cc | 67 - +++++++++++++++++++++++++-------------------------- - 1 files changed, 33 insertions(+), 34 deletions(-) - -commit 617f4ac46f1084859d2034c08760e31e52d3bec3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 13 16:48:03 2012 +0200 - - Refactor - - src/hb-ot-shape-complex-indic.cc | 44 - +++++++++++++++++++------------------ - 1 files changed, 23 insertions(+), 21 deletions(-) - -commit 5e4e21fce4b548b0b8a5951bc8f35a9f27428192 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 13 16:46:08 2012 +0200 - - Revert "[Indic] Refactoring" - - This reverts commit 0831061efb78983b9c6e1e72574c977e56383c08. - - src/hb-ot-shape-complex-indic.cc | 28 ++++++++-------------------- - 1 files changed, 8 insertions(+), 20 deletions(-) - -commit 3f18236a03880c0960f5990dc90685f6146951a6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 13 16:20:10 2012 +0200 - - Fix more warnings - - src/hb-ot-layout-common-private.hh | 2 +- - src/hb-ot-layout-gsub-table.hh | 2 +- - src/hb-ot-shape-complex-indic.cc | 8 ++++---- - 3 files changed, 6 insertions(+), 6 deletions(-) - -commit 9f377ed3210fe7d9f15e0c4f82020556f9a8f6f0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 13 16:13:44 2012 +0200 - - Fix more unused-var warnings - - src/hb-ot-shape-complex-arabic.cc | 7 +++++-- - src/hb-ot-shape-complex-indic.cc | 25 ++++++++++++++++++------- - src/hb-ot-shape-complex-misc.cc | 21 +++++++++++++++------ - src/hb-ot-shape-normalize.cc | 13 ++++++------- - src/hb-set.cc | 2 +- - 5 files changed, 45 insertions(+), 23 deletions(-) - -commit d993e72331c6c4c783b803e01e4d4a02c8e3eb77 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 13 16:04:36 2012 +0200 - - Fix hb_face_set_index() - - src/hb-font.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 93345edcbea49bdf0e22f26b5b74a23e601dfab4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 13 16:01:08 2012 +0200 - - Fix warnings - - src/hb-fallback-shape.cc | 4 +- - src/hb-private.hh | 54 - +++++++++++++++++++++++----------------------- - 2 files changed, 29 insertions(+), 29 deletions(-) - -commit eace47b173807d94b29a6490d0bc3c9f8f6168d1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 13 15:54:43 2012 +0200 - - Minor - - src/hb-ot-shape-complex-indic.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 99c2695759a6af855d565f4994bbdf220570bb48 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 13 15:45:18 2012 +0200 - - Add accessort to buffer for current info, current pos, and prev info - - src/hb-buffer-private.hh | 9 +++++++ - src/hb-ot-layout-gpos-table.hh | 44 - +++++++++++++++++----------------- - src/hb-ot-layout-gsub-table.hh | 28 ++++++++++---------- - src/hb-ot-layout-gsubgpos-private.hh | 28 ++++++++++---------- - src/hb-ot-shape-complex-arabic.cc | 4 +- - src/hb-ot-shape-complex-misc.cc | 5 ++- - src/hb-ot-shape-normalize.cc | 16 ++++++------ - src/hb-ot-shape.cc | 8 +++--- - 8 files changed, 76 insertions(+), 66 deletions(-) - -commit 6736f3c5b09af6a71935afc04248b033e171a9b2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 13 15:21:06 2012 +0200 - - Minor - - src/hb-ot-layout-gsubgpos-private.hh | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit 5df809b655bb1318115651fd87d4555cdd9b41cb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 13 15:17:51 2012 +0200 - - [GSUB/GPOS] Remove context_length - - The spec doesn't say contextual matching should be done this way, - and AOTS doesn't do it either. It was inherited from old HarfBuzz. - Remove it. - - src/hb-ot-layout-common-private.hh | 1 - - src/hb-ot-layout-gpos-table.hh | 3 --- - src/hb-ot-layout-gsub-table.hh | 6 ++---- - src/hb-ot-layout-gsubgpos-private.hh | 32 - +++++++++++--------------------- - 4 files changed, 13 insertions(+), 29 deletions(-) - -commit 28b9d502bb69a8045818d5f6113ded9c59a56bd7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 13 15:04:00 2012 +0200 - - Minor - - src/hb-ot-layout-gsubgpos-private.hh | 11 +++++------ - 1 files changed, 5 insertions(+), 6 deletions(-) - -commit 50f630c17ced1bd59b4da4f27728dcfbb876400a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 13 13:03:44 2012 +0200 - - Remove ioctl checks - - Ended up not using terminal size after all. - - configure.ac | 2 +- - util/ansi-print.cc | 11 ----------- - 2 files changed, 1 insertions(+), 12 deletions(-) - -commit db0de7cd616e1e9d6fde6659e52a541477fb0148 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 13 13:02:38 2012 +0200 - - [util] Set ansi color only on color change - - util/ansi-print.cc | 28 +++++++++++++++++++++++----- - 1 files changed, 23 insertions(+), 5 deletions(-) - -commit 912c5ff80a255edb8145b9db69e2ed828f8eab5c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 13 12:51:02 2012 +0200 - - Reduce default margin - - util/options.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 52e7b1424a3613122e9ca30879298df42733acda -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 13 02:02:58 2012 +0200 - - [util] Make hb-view print out Unicode art if stdout is a terminal - - configure.ac | 4 +- - util/Makefile.am | 4 + - util/ansi-print.cc | 411 - +++++++++++++++++++++++++++++++++++++++++++++ - util/ansi-print.hh | 39 +++++ - util/helper-cairo-ansi.cc | 102 +++++++++++ - util/helper-cairo-ansi.hh | 39 +++++ - util/helper-cairo.cc | 70 ++++++++- - util/options.hh | 3 + - 8 files changed, 668 insertions(+), 4 deletions(-) - -commit 8b2753ce2bea8a21ea757186d86dc4a55d8c8b0c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 13 00:54:07 2012 +0200 - - Minor - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 30874b4819a99cc84fa39e794266685e1b8735d2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat May 12 15:54:27 2012 +0200 - - [util] Make tools default to stdin if no text is provided - - One less argument to type in typical testing workflow! - - util/hb-view.hh | 4 +++- - util/options.cc | 12 +++++------- - util/options.hh | 2 +- - 3 files changed, 9 insertions(+), 9 deletions(-) - -commit 2097951110e33fe091ed9515ae77e2683c46c889 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat May 12 15:41:48 2012 +0200 - - [util] Change default font size of hb-view to 256 - - Most common usecase of hb-view is to test rendering of short words for - testing / inspection. Not having to type "--font-size 150" each time - isn't such a bad idea... - - util/options.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 737dded2e08fcc19935db51c05201a987184d337 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat May 12 15:40:11 2012 +0200 - - Fix compiler warnings - - src/hb-ot-shape-complex-indic.cc | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -commit f538fcb538f1decb4100ba89457eb83f2350d64b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat May 12 15:34:40 2012 +0200 - - [test] Make tool usage easier by not requiring "--stdin" - - Just default to it. Added "--help" instead to get usage. - - test/shaping/hb_test_tools.py | 9 ++++----- - 1 files changed, 4 insertions(+), 5 deletions(-) - -commit a3273e30bb7ffd727ffc18af5716dfef705d3d94 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat May 12 13:34:18 2012 +0200 - - [Indic] Add more Malayalam tests - - .../indic/script-malayalam/misc/misc.txt | 38 - ++++++++++++++++++++ - 1 files changed, 38 insertions(+), 0 deletions(-) - -commit 7f852b644b8143492a02edfc853114aaa23446bd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 23:10:31 2012 +0200 - - Fix compiler warnings - - src/hb-ot-shape-complex-indic.cc | 2 +- - src/hb-ot-shape-complex-private.hh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit f7e8dcfd4fc377e3d786b097beb656284240456d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 22:00:06 2012 +0200 - - [Indic] Unbreak Devanagari - - And this, concludes the HarfBuzz Massala Hackfest. - - I like to specially thank Jonathan Kew for doing all the decription - and - letting me get commit points. - - configure.ac | 2 +- - src/hb-ot-shape-complex-indic-private.hh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 6a091df9b403b147ef78f3974610dedf4ce1e08a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 21:42:27 2012 +0200 - - [Indic] Disambiguate sub vs post vs above matras - - Bengali is at *just* above 5% now. - - src/hb-ot-shape-complex-indic-private.hh | 31 - ++++++++++++++--------------- - src/hb-ot-shape-complex-indic.cc | 12 +++++----- - 2 files changed, 21 insertions(+), 22 deletions(-) - -commit 9d0d319a4a7e85d922e58fade0f40caae1c9f109 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 21:36:32 2012 +0200 - - [Indic] Position Bengali Reph before matras - - src/hb-ot-shape-complex-indic.cc | 62 - ++++++++++++++++++++++---------------- - 1 files changed, 36 insertions(+), 26 deletions(-) - -commit f89367251109af235f4f0446c13c261a5a4a6f72 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 21:10:03 2012 +0200 - - [Indic] Start categorizing Reph per script - - src/hb-ot-shape-complex-indic.cc | 41 - ++++++++++++++++++++++++++++++++----- - 1 files changed, 35 insertions(+), 6 deletions(-) - -commit a913b024d84973556094fd64ce5f0b7106fcc3b5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 20:59:26 2012 +0200 - - [Indic] Apply 'init' feature for Bengali - - Error down from 20% to 7%. - - src/hb-ot-shape-complex-indic.cc | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) - -commit eed903b1644e087178438959664a6a57bebc398b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 20:50:53 2012 +0200 - - [Indic] Refactor for the arrival of 'init' feature - - Yep, on Bengali now! - - src/hb-ot-shape-complex-indic.cc | 52 - ++++++++++++++++++++++++++----------- - 1 files changed, 36 insertions(+), 16 deletions(-) - -commit 18c06e189bd078affbb84c3bb5bb80687a227c5e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 20:02:14 2012 +0200 - - [Indic] Add Uniscribe bug feature for dotted circle - - For dotted-circle independent clusters, Uniscribe does no Reph shaping - for the exact sequence Ra+Halant+25CC. Which also is the only - possible - sequence with 25CC at the end. - - src/hb-ot-shape-complex-indic-machine.rl | 4 +++- - src/hb-ot-shape-complex-indic-private.hh | 3 ++- - src/hb-ot-shape-complex-indic.cc | 20 ++++++++++++++++---- - 3 files changed, 21 insertions(+), 6 deletions(-) - -commit 5b16de97bcc4b24da4c77ca6c1a42e814d8cdbd1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 19:55:42 2012 +0200 - - [Indic] Add tests for dottedcircle - - .../indic/script-devanagari/misc/MANIFEST | 1 + - .../indic/script-devanagari/misc/dottedcircle.txt | 7 +++++++ - 2 files changed, 8 insertions(+), 0 deletions(-) - -commit 0831061efb78983b9c6e1e72574c977e56383c08 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 19:07:58 2012 +0200 - - [Indic] Refactoring - - src/hb-ot-shape-complex-indic.cc | 26 ++++++++++++++++++-------- - 1 files changed, 18 insertions(+), 8 deletions(-) - -commit 7ea58db311bfb0d8f804d1e9f4a1f004bd45075a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 18:58:57 2012 +0200 - - Minor - - src/hb-ot-shape-complex-indic.cc | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 9c09928989316e2befe00d52ed66e055637ccd36 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 18:46:35 2012 +0200 - - [Indic] Allow multiple Consonants in Vowel/NBSP syllables - - Uniscribe allows multiple Halant+Consonant after a Vowel. - Tests: - ↦ * U+0905,U+094D,U+092B,U+094D,930,94d,930 - - src/hb-ot-shape-complex-indic-machine.rl | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 8c0aa486f31e9b6cbb31ce295573b53b0a214124 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 18:13:42 2012 +0200 - - [Indic] Allow two Nuktas per consonant - - Uniscribe allows up to two nuktas per consonant and one per matra. It - does so - indepent of whether the consonant already has a nukta in it. Tests: - - * U+0916,U+093C,U+0941 - * U+0959,U+093C,U+0941 - * U+0916,U+093C,U+093C,U+0941 - * U+0959,U+093C,U+093C,U+0941 - * U+0916,U+093C,U+093C,U+093C,U+0941 - * U+0959,U+093C,U+093C,U+093C,U+0941 - * 915,93c,93c,,94d,U+0916,U+093C,U+093C,U+093e,93c,93c - - src/hb-ot-shape-complex-indic-machine.rl | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 3399a06e7033651ee926448737bdb18e553c1796 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 17:54:26 2012 +0200 - - [Indic] Fix U+0952 and similar classification to match Uniscribe - - See comments. - - src/hb-ot-shape-complex-indic-machine.rl | 1 + - src/hb-ot-shape-complex-indic.cc | 16 +++++++++++----- - 2 files changed, 12 insertions(+), 5 deletions(-) - -commit 11aa3ef18dbc6ac9561bd119f5ca2c1aa1209c3a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 17:30:48 2012 +0200 - - [Indic] Treat U+0951..U+0954 all similar to U+0952 - - src/hb-ot-shape-complex-indic.cc | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 5f131d3226131df440d7f36655e57f6effcae204 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 17:29:40 2012 +0200 - - [GSUB/GPOS/Indic] Apply GSUB/GPOS within syllables only - - This does not apply to the context matchings. - - This regresses tests right now. And we are not sure whether this is - the right thing to do for GPOS. But we'll figure out. - - src/hb-ot-layout-gsubgpos-private.hh | 18 ++++++++++++------ - 1 files changed, 12 insertions(+), 6 deletions(-) - -commit 8fd83aaf6e50c2c25002c51fee26d82847a61769 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 17:18:37 2012 +0200 - - [GSUB/GPOS] Fix wrong buffer access in backward skippy mask matching - - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ff24d1081af08a887895975285d7e38f5d07bc37 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 17:07:08 2012 +0200 - - [Indic] Don't use syllable serial value 0 - - src/hb-ot-shape-complex-indic-machine.rl | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 892eb7878238d810a2a70f9dadbf958207bfeaa1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 16:54:40 2012 +0200 - - [Indic] Implement Uniscribe Reph+Matra+Halant bug feature - - src/hb-ot-shape-complex-indic.cc | 14 +++++++++----- - 1 files changed, 9 insertions(+), 5 deletions(-) - -commit 67ea29af49bb08ee679914076808327992cf6676 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 16:51:23 2012 +0200 - - [Indic] Add example of different Uniscribe behavior - - src/hb-ot-shape-complex-indic.cc | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit ebe29733d44fe0fa9fb30f946ab0dd7a40336a24 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 16:43:12 2012 +0200 - - [Indic] Add runtime Uniscribe bug compatibility mode! - - Enable by setting envvar: - - HB_OT_INDIC_OPTIONS=uniscribe-bug-compatible - - Plus, LeftMatra+Halant "feature". - - src/hb-ot-shape-complex-indic.cc | 44 - ++++++++++++++++++++++++++++--------- - 1 files changed, 33 insertions(+), 11 deletions(-) - -commit 616e692e2950d326b6c46aba5b5bead3cc29d315 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 16:25:02 2012 +0200 - - [Indic] Add #define UNISCRIBE_BUG_COMPATIBLE 1 - - src/hb-ot-shape-complex-indic.cc | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 6782bdae3be0357da1dadc7b806a43ceefa67a90 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 16:23:43 2012 +0200 - - [Indic] Fix Left Matra + Halant reordering - - As can be seen in: U+092B,U+093F,U+094D - - src/hb-ot-shape-complex-indic.cc | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 3c2ea9481b1028e927e615a5434ebf8edcb5f891 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 16:23:38 2012 +0200 - - Minor - - src/hb-ot-shape-complex-indic.cc | 73 - +++++++++++++++++++------------------ - 1 files changed, 37 insertions(+), 36 deletions(-) - -commit c071b99f150a9344a2056dfeba8c613f8a5602db -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 16:22:46 2012 +0200 - - [Indic] Add test for Left Matra with Halant - - Uniscribe doesn't move the Halant, we do. And do a broken job of - it now. - - .../script-devanagari/misc/tricky-reordering.txt | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 203d71069c45048b6dd8fa22b61fd8f2c844b4f6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 16:01:44 2012 +0200 - - [GSUB/GPOS] Check all glyph masks when matching input - - src/hb-ot-layout-gsubgpos-private.hh | 18 ++++++++++++------ - 1 files changed, 12 insertions(+), 6 deletions(-) - -commit 668c6046c1b3af3bd316bda0cc8636f2a5e8df42 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 15:34:13 2012 +0200 - - [Indic] Apply Reph mask to all POS_REPH glyphs - - Needed for upcoming changes to GSUB/GPOS mask matching. - - src/hb-ot-shape-complex-indic.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 4be46bade26faf13f7b4d447e9cc608e183955dc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 14:39:01 2012 +0200 - - [Indic] Fix state machine to backtrack - - src/hb-ot-shape-complex-indic-machine.rl | 42 - +++++++++++++---------------- - src/hb-private.hh | 2 + - 2 files changed, 21 insertions(+), 23 deletions(-) - -commit cee7187447b76b22e1bb6136d137b35ac49c3a5d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 11:41:39 2012 +0200 - - [Indic] Move syllable tracking from Indic to generic layer - - This is to incorporate it into GSUB/GPOS processing. - - src/hb-ot-layout-gpos-table.hh | 1 + - src/hb-ot-layout-gsub-table.hh | 3 ++- - src/hb-ot-layout-gsubgpos-private.hh | 3 --- - src/hb-ot-layout-private.hh | 4 +--- - src/hb-ot-shape-complex-indic-machine.rl | 2 +- - src/hb-ot-shape-complex-indic-private.hh | 1 - - src/hb-ot-shape-complex-indic.cc | 8 +++----- - src/hb-ot-shape-complex-private.hh | 13 ++++++++----- - 8 files changed, 16 insertions(+), 19 deletions(-) - -commit 3bf27a9f0e92aa31b464bd3b9fdea5933c9ae8b1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 11:17:23 2012 +0200 - - [Indic] Disable conjuncts when a ZWJ happens - - Not that the code makes any difference since the presence of ZWJ - itself - causes the ligature to fail to match anyway. - - src/hb-ot-shape-complex-indic.cc | 7 +------ - 1 files changed, 1 insertions(+), 6 deletions(-) - -commit c6d904d67db589dd6209928e56504f04f6a07756 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 11:07:40 2012 +0200 - - [Indic] Fix bitops typo! - - Another 1000 down! - - src/hb-ot-shape-complex-indic.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 55fe2cf79b11d9a63ea33b3ee76bd0ebca345157 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 03:45:28 2012 +0200 - - Make APPLY debug output print current index and codepoint - - Yay! - - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 7bd2b04fea5649d77d796d58b7f4918fe0378ee5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 03:40:58 2012 +0200 - - Minor - - src/hb-object-private.hh | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit cf26510dbbd8d38486e6ba423800db6427ade332 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 03:35:08 2012 +0200 - - Some more... - - Done. I promise. - - src/hb-object-private.hh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 9659523ca32b0e254d0e5fe387d817208d9cb6bf -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 03:33:36 2012 +0200 - - More beauty in debug output! - - src/hb-private.hh | 12 +++++++----- - 1 files changed, 7 insertions(+), 5 deletions(-) - -commit cf26e88a5ab477295479f5b9450c2019b6430eaa -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 03:16:57 2012 +0200 - - Finish off debug output beautification - - src/hb-open-type-private.hh | 58 - +++++++++++++++++++----------------------- - 1 files changed, 26 insertions(+), 32 deletions(-) - -commit d7bba01a353efc7432c474dd8755a02db4abd2ae -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 02:46:26 2012 +0200 - - Only print class name in debug output if there's one available - - src/hb-private.hh | 12 +++++++----- - 1 files changed, 7 insertions(+), 5 deletions(-) - -commit 85f73fa8da1fbb864aef0f3a592b1d65e24d593d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 02:40:42 2012 +0200 - - Only printout class name in tracing, if one is available - - Makes debug output much more pleasant. - - src/hb-private.hh | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 98619ce4fa650c593b030d06d2f89fec83a10015 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 02:34:06 2012 +0200 - - Minor - - src/hb-ot-layout-gsubgpos-private.hh | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit acea183e986dd378c6f95120fe0feb0586a8ef36 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 02:33:11 2012 +0200 - - Add return annotation for APPLY - - src/hb-ot-layout-gpos-table.hh | 163 - ++++++++++++++-------------------- - src/hb-ot-layout-gsub-table.hh | 114 ++++++++++-------------- - src/hb-ot-layout-gsubgpos-private.hh | 83 +++++++---------- - 3 files changed, 151 insertions(+), 209 deletions(-) - -commit 5ccfe8e2154ad0b58dabcc236bbe9478c17b02ab -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 02:19:41 2012 +0200 - - /Minor/ - - src/hb-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0ab8c8621712d33e1e91dfdb4ad0b335e3d2a3fb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 01:25:34 2012 +0200 - - Annotate SANITIZE return values - - More to come, for APPLY, CLOSURE, etc. - - src/hb-open-file-private.hh | 23 +++-- - src/hb-open-type-private.hh | 49 +++++----- - src/hb-ot-head-table.hh | 4 +- - src/hb-ot-hhea-table.hh | 4 +- - src/hb-ot-hmtx-table.hh | 4 +- - src/hb-ot-layout-common-private.hh | 51 ++++------ - src/hb-ot-layout-gdef-table.hh | 48 +++++----- - src/hb-ot-layout-gpos-table.hh | 180 - +++++++++++++++------------------- - src/hb-ot-layout-gsub-table.hh | 101 +++++++++---------- - src/hb-ot-layout-gsubgpos-private.hh | 88 ++++++++--------- - src/hb-ot-maxp-table.hh | 7 +- - src/hb-ot-name-table.hh | 17 ++-- - src/hb-private.hh | 39 ++++++-- - 13 files changed, 299 insertions(+), 316 deletions(-) - -commit 829e814ff358c5e700ba4df54932696801aa9f65 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 00:52:16 2012 +0200 - - Minor - - src/hb-private.hh | 32 ++++++++++---------------------- - 1 files changed, 10 insertions(+), 22 deletions(-) - -commit 6eec6f406d2cc13dbca422e88492d3d498af02bf -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 00:50:38 2012 +0200 - - Code reshuffling - - src/hb-private.hh | 36 +++++++++++++++++++++++++----------- - 1 files changed, 25 insertions(+), 11 deletions(-) - -commit 1e08830b4fac3a60ae52349cab6e101d389d30cd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 11 00:16:40 2012 +0200 - - Beautify debug output - - src/hb-open-type-private.hh | 20 ++++++------ - src/hb-private.hh | 74 - ++++++++++++++++++++++++++----------------- - 2 files changed, 55 insertions(+), 39 deletions(-) - -commit 6f4553801729a06e506ffdde7b27c72780d4bb80 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 23:24:43 2012 +0200 - - More massaging trace messaging - - src/hb-open-type-private.hh | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- - src/hb-private.hh | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) - -commit b5fa37cb694b01a7df3a656710391c40dd3fcc04 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 23:09:48 2012 +0200 - - Minor - - src/hb-set-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 208109703c929428c684ddcf9310b8ba780c4c31 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 23:06:58 2012 +0200 - - Better trace message support infrastructure - - We have varargs in the trace interface now. To be used soon... - - src/hb-open-type-private.hh | 17 ++++----- - src/hb-ot-layout-gsubgpos-private.hh | 4 +- - src/hb-private.hh | 64 - +++++++++++++++++++++++++--------- - 3 files changed, 56 insertions(+), 29 deletions(-) - -commit 02b2922fbf098c8282eb23dc2c54d5829cf67024 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 21:44:50 2012 +0200 - - [Indic] Towards better Reph positioning - - Fixed for Deva cases with two full-form consonants. Failures **way** - down. - Not much left to go :-). - - src/hb-ot-shape-complex-indic.cc | 111 - +++++++++++++++++++++++++++----------- - 1 files changed, 80 insertions(+), 31 deletions(-) - -commit 74e54cf446bb979e488685e8c09eeed6b9d03c24 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 21:20:37 2012 +0200 - - [Indic] Add Ra back for scripts without Reph - - We now check that the 'rphp' table exists before forming Reph, so - we don't need to comment out Ra for those scripts. - - src/hb-ot-shape-complex-indic-private.hh | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 2b70df5cc008617453b12bafeaac50e6d61b3224 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 18:38:22 2012 +0200 - - [Indic] Add note re Uniscribe clusters - - src/hb-ot-shape-complex-indic.cc | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 21d2803133c2c424ed37a9f3d17c7fc4963e5a60 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 18:34:34 2012 +0200 - - [Indic] Do clustering like Uniscribe does - - Hindi Wikipedia failures down to 6639 (0.938381%)! - - src/hb-ot-shape-complex-indic.cc | 24 ++++++++++++++++++++---- - 1 files changed, 20 insertions(+), 4 deletions(-) - -commit b20c9ebaf5176101fdfcffbe4714a2e619dd94b6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 18:31:17 2012 +0200 - - [Indic] Add test for matra group - - The spec says: "[{M}+[N]+[H]]", and that's what Uniscribe implements. - We instead do: "{M+[N]+[H]}", which means we allow Nukta and Halant - after all Matras, not just the last one. It makes more sense. - - .../indic/script-devanagari/misc/MANIFEST | 1 + - .../script-devanagari/misc/spec-deviations.txt | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit 8df5636968389ac7bf8620ccd091fd4872b0bbee -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 15:41:04 2012 +0200 - - [Indic] Reorder Reph to before the Halant after Matras - - Uniscribe doesn't do it, but we want to do as it gives the Reph the - opportunity to interact with the Matras. Test with mangal for - example. - Sequence: <0930,094d,0915,094b,094d> - In test suite already. - - src/hb-ot-shape-complex-indic.cc | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -commit daf3234bdc82c669302599a76d2b14f5e69989db -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 15:28:27 2012 +0200 - - [Indic] Don't clear the mask for Reph - - This was removing the mandatory global 1 bit in the mask and hence - disabling GPOS for Reph! - - src/hb-ot-shape-complex-indic.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 7708ee23cbcc8c8edce13e73b6e549b77bd8c2d0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 14:48:25 2012 +0200 - - [Indic] Improve Left Matra repositioning - - Move its dependents too. - - src/hb-ot-shape-complex-indic.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 61a58e26a5bda16851669404fc8206896e124740 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 14:43:53 2012 +0200 - - [Indic] Add tricky reordering test cases - - In the case of Consonant,LeftMatra,Halant, Uniscribe leaves the Halant - where it is, but we want to move it with the Matra as that makes more - logical sense. - - .../indic/script-devanagari/misc/MANIFEST | 1 + - .../script-devanagari/misc/tricky-reordering.txt | 4 ++++ - 2 files changed, 5 insertions(+), 0 deletions(-) - -commit dbb105883c6e9b83e78dc8b10766cd56b98cd7e1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 13:45:52 2012 +0200 - - [Indic] Do Reph repositioning in final reordering like the spec says - - This introduced a failure, which we tracked down to a test case - like this: - - U+092E,U+094B,U+094D,U+0930 - - The final character is a Ra that should be put in a syllable of it's - own. And we do. But it will interact with the Halant before it. So - now we finally are convinced that we have to limit features to - syllable - boundaries. That's coming after lunch! - - src/hb-ot-shape-complex-indic-private.hh | 2 - - src/hb-ot-shape-complex-indic.cc | 103 - ++++++++++++++++++----------- - 2 files changed, 64 insertions(+), 41 deletions(-) - -commit 4705a7026900e51f6430f03a73c87f2df035df92 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 13:09:08 2012 +0200 - - Minor - - src/hb-ot-shape-complex-indic.cc | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 4ac9e98d9d2ea973dd612dc4063cf78496c643a0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 12:53:53 2012 +0200 - - [Indic] Reorder left matras to be closer to base - - src/hb-ot-shape-complex-indic-private.hh | 4 -- - src/hb-ot-shape-complex-indic.cc | 50 - +++++++++++++++++++++++++++-- - 2 files changed, 46 insertions(+), 8 deletions(-) - -commit 1a1fa8c655a082fc1439608457ba717306cc83ca -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 12:20:21 2012 +0200 - - [Indic] Treat the standalone cluster case reusing the consonant logic - - src/hb-ot-shape-complex-indic.cc | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit 190eb31a16178269aecaf5d2ecc9012f956749f4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 12:17:16 2012 +0200 - - [Indic] Minor - - src/hb-ot-shape-complex-indic.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c5306b6861cfaa50af40e8ceb058791fa06d7981 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 12:07:33 2012 +0200 - - [Indic] Handle Vowel syllables - - Reusing the consonant logic! - - src/hb-ot-shape-complex-indic-private.hh | 3 +-- - src/hb-ot-shape-complex-indic.cc | 11 ++++++----- - 2 files changed, 7 insertions(+), 7 deletions(-) - -commit 6d8e0cb74c02f6bc09cd4abe9e4bc82062e1b517 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 11:41:51 2012 +0200 - - [Indic] Simplify Reph logic - - src/hb-ot-shape-complex-indic.cc | 24 +++++------------------- - 1 files changed, 5 insertions(+), 19 deletions(-) - -commit 3d25079f8d6be81b9b4b91d3a97016b8a572f571 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 11:37:42 2012 +0200 - - [Indic] Don't form Reph is Ra is the only consonant in the syllable - - src/hb-ot-shape-complex-indic-private.hh | 2 +- - src/hb-ot-shape-complex-indic.cc | 10 ++++++++++ - 2 files changed, 11 insertions(+), 1 deletions(-) - -commit b99d63ae114fb58f129562b293a8a66543d499ad -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 11:32:52 2012 +0200 - - [Indic] Increase max syllable length - - 20 was way too low, one could hit a syllable with 7ish consonants - with it. - - src/hb-ot-shape-complex-indic.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a391ff50b9a7b6ac3e58d199ea726b20ee6839bb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 11:31:20 2012 +0200 - - [Indic] Adjust base after sorting - - src/hb-ot-shape-complex-indic.cc | 11 ++++++++++- - 1 files changed, 10 insertions(+), 1 deletions(-) - -commit d3637edb248162970e202e9d0671540274192844 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 10 10:51:38 2012 +0200 - - [Indic] Don't return for long syllables. Just not sort. - - src/hb-ot-shape-complex-indic.cc | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit dfa0cade7fce3791e47eaa7edcd23da76c7a0ed0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 19:10:07 2012 +0200 - - Fix Uniscribe clusters with multiple items - - src/hb-uniscribe.cc | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 86e5dd386a7989701da476db89be268e4ac1e219 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 18:57:37 2012 +0200 - - [Indic] Don't give up syllable parsing upon junk - - src/hb-ot-shape-complex-indic-machine.rl | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit ef24cc8c8e2478a6352c340f4611a617646de4cc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 17:56:03 2012 +0200 - - [Indic] Towards multi-cluster syllables and final reordering - - src/hb-ot-shape-complex-arabic.cc | 2 +- - src/hb-ot-shape-complex-indic-machine.rl | 21 +++++++++---- - src/hb-ot-shape-complex-indic-private.hh | 1 + - src/hb-ot-shape-complex-indic.cc | 45 - ++++++++++++++++++++++-------- - src/hb-ot-shape-complex-private.hh | 5 +-- - 5 files changed, 51 insertions(+), 23 deletions(-) - -commit a9844d41c6cb30d8a2d733130a0e72f51b6c81c1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 17:53:13 2012 +0200 - - Combine lig_id and lig_comp into one byte, to free up one for Indic - - src/hb-ot-layout-gpos-table.hh | 14 ++++++++------ - src/hb-ot-layout-gsub-table.hh | 11 ++++------- - src/hb-ot-layout-gsubgpos-private.hh | 26 ++++++++++++++++++++++---- - 3 files changed, 34 insertions(+), 17 deletions(-) - -commit 92332e5116271a5d96e532005fe750e7552a6cbb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 17:40:00 2012 +0200 - - Minor - - src/hb-ot-shape-complex-indic.cc | 41 - +++++++++++++++++++------------------ - 1 files changed, 21 insertions(+), 20 deletions(-) - -commit dbccf87eef0d26838fa4bb3ae26410f6c4818836 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 17:24:39 2012 +0200 - - [Indic] Make room for more reordering positions - - src/hb-ot-shape-complex-indic-private.hh | 213 - +++++++++++++++--------------- - src/hb-ot-shape-complex-indic.cc | 12 +- - 2 files changed, 115 insertions(+), 110 deletions(-) - -commit d4480ace7fdbe48aeaf77278c032b8b2ef2ebe8e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 15:56:35 2012 +0200 - - [Indic] Improve matra vs consonant ordering - - Another 1.5% down. - - src/hb-ot-shape-complex-indic-private.hh | 32 - ++++++++++++++++++----------- - src/hb-ot-shape-complex-indic.cc | 6 ++-- - src/indic.cc | 2 +- - 3 files changed, 24 insertions(+), 16 deletions(-) - -commit 33c92e769563ec2a6c1249b57d8cac742eea6f88 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 15:41:51 2012 +0200 - - [Indic] Categorize Anudatta - - src/hb-ot-shape-complex-indic.cc | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) - -commit 3943293a9942201d8fc8d59212fcc8cca5132e3d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 15:27:56 2012 +0200 - - [Indic] Add joiner test cases for Devanagari - - .../indic/script-devanagari/misc/MANIFEST | 1 + - .../indic/script-devanagari/misc/joiners.txt | 19 - +++++++++++++++++++ - 2 files changed, 20 insertions(+), 0 deletions(-) - -commit 19d984edaa4f86c842345a9d4150597e045e1887 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 15:21:13 2012 +0200 - - [Indic] Make sure Reph jumps over all matras to the right - - Another 12 thousand failures gone! (78 to go) - - src/hb-ot-shape-complex-indic.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9034641333d7bfb41a0784cce72e43591faea083 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 15:04:58 2012 +0200 - - [Indic] Keep Vedic signs at the right too - - src/hb-ot-shape-complex-indic.cc | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit d1deaa2f5bd028e8076265cba92cffa4fa2834ac -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 15:04:13 2012 +0200 - - Replace zerowidth invisible chars with a zero-advance space glyph - - Like Uniscribe does. - - src/hb-ot-shape-complex-arabic.cc | 3 +- - src/hb-ot-shape-complex-indic.cc | 20 ----------------- - src/hb-ot-shape-complex-private.hh | 4 +- - src/hb-ot-shape-normalize.cc | 25 ++++++++-------------- - src/hb-ot-shape-private.hh | 27 +++++++++++++++++++++++ - src/hb-ot-shape.cc | 41 - +++++++++++++++++++++++------------ - src/hb-unicode-private.hh | 38 - +++++++++++++++++++++++++++++++++ - 7 files changed, 105 insertions(+), 53 deletions(-) - -commit 49e5da1591b8d28f01e7ff9caac9d9ac53668bba -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 13:23:27 2012 +0200 - - [indic] Keep the syllable modifier marks to the right - - Shaping failures on Hindi Wikipedia go down from 25% to 14%! - - src/hb-ot-shape-complex-indic.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 5b1260909350bffa3e3d06da346f9f86ce651dbb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 12:37:27 2012 +0200 - - Minor - - src/hb-ot-shape-complex-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9ce939232bbce8f51e235195e3854d1e8bb961f8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 12:03:09 2012 +0200 - - Minor - - src/hb-ot-shape-complex-indic-private.hh | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit 76b3409de6887c1cdd5c679939497b1b56f4554b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 11:43:43 2012 +0200 - - [indic] Better Reph matching - - src/hb-ot-shape-complex-indic.cc | 21 +++++++++++++++------ - 1 files changed, 15 insertions(+), 6 deletions(-) - -commit df6d45c693c417bf311e6fa49f18a8558542e525 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 11:38:31 2012 +0200 - - Minor - - src/hb-ot-shape-complex-indic.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 412b91889d9a1ae477e8b6907d0b9a76e78a6c91 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 11:07:18 2012 +0200 - - [indic] Apply Indic features in order - - src/hb-ot-shape-complex-indic.cc | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 1ac075b227090a9ad930dcc1670236c176b27067 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 11:06:47 2012 +0200 - - [indic] Apply rakaar forms - - Fixes 10% of the failures against all of Hindi Wikipedia! - - src/hb-ot-shape-complex-indic.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 2214a03900d32710573a1b05c7665195b3129761 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 09:54:54 2012 +0200 - - Add hb-diff-ngrams - - test/shaping/Makefile.am | 1 + - test/shaping/hb-diff-ngrams | 5 +++ - test/shaping/hb_test_tools.py | 71 - ++++++++++++++++++++++++++++++++++++++--- - 3 files changed, 72 insertions(+), 5 deletions(-) - -commit 178e6dce01ad28c8708bad62ce0fb79c46e836dc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 08:57:29 2012 +0200 - - Add N-gram generator - - test/shaping/hb_test_tools.py | 72 - +++++++++++++++++++++++++++++++++++++++- - 1 files changed, 70 insertions(+), 2 deletions(-) - -commit 98669ceb77657d60435f2cb2e3fc18272c0a2c6a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 08:16:15 2012 +0200 - - Use groupby() - - test/shaping/hb_test_tools.py | 26 ++++++++------------------ - 1 files changed, 8 insertions(+), 18 deletions(-) - -commit c438a14b62433db488b5c90854a4a3934adf3305 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 07:45:17 2012 +0200 - - Add hb-diff-stat - - test/shaping/Makefile.am | 1 + - test/shaping/hb-diff-stat | 5 +++++ - test/shaping/hb_test_tools.py | 22 ++++++++++++++++++++-- - 3 files changed, 26 insertions(+), 2 deletions(-) - -commit 1058d031e2046eb80331b0950eaff75c2bf608dc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 9 07:30:07 2012 +0200 - - Make hb-diff-filter-failtures retain all test info for failed tests - - test/shaping/hb_test_tools.py | 33 ++++++++++++++++++++++++++------- - 1 files changed, 26 insertions(+), 7 deletions(-) - -commit f1eb008cc727370e1bd0dc32fdf301f62d9ff981 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 8 23:41:41 2012 +0200 - - Add hb-diff-colorize - - Accepts --format=html now. - - test/shaping/Makefile.am | 1 + - test/shaping/hb-diff | 4 +- - test/shaping/hb-diff-colorize | 7 ++ - test/shaping/hb_test_tools.py | 158 - +++++++++++++++++++++++++---------------- - 4 files changed, 106 insertions(+), 64 deletions(-) - -commit 9155e4ffe00c96a2c14e14a300004b1038ca3a9c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 8 22:44:21 2012 +0200 - - Cleanup diff - - Doesn't do --color anymore. That will go into a new hb-diff-colorize - tool. - - test/shaping/hb-diff | 10 +++------- - test/shaping/hb_test_tools.py | 32 ++++++++++++++++++-------------- - 2 files changed, 21 insertions(+), 21 deletions(-) - -commit 7d22135b4c3f8fb70552302bf8239df9976dddda -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 8 19:38:49 2012 +0200 - - Make hb-diff faster - - test/shaping/hb_test_tools.py | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit a93e238e05a2f70a6e664e5d04ba25bbd54493dc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 8 18:55:29 2012 +0200 - - More tests - - .../shaper-arabic/script-mongolian/misc/MANIFEST | 1 + - .../shaper-arabic/script-mongolian/misc/poem.txt | 4 ++++ - .../indic/script-bengali/misc/MANIFEST | 1 + - .../indic/script-bengali/misc/reph.txt | 10 ++++++++++ - 4 files changed, 16 insertions(+), 0 deletions(-) - -commit 1a2a4a0078dda834443edd421037a4bcbad18c5e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat May 5 22:38:20 2012 +0200 - - Fix warning and build issues - - As reported by Jonathan Kew on the list. - - src/hb-set-private.hh | 2 +- - src/main.cc | 9 +++++---- - 2 files changed, 6 insertions(+), 5 deletions(-) - -commit a5e39fed85e069ba1afbf90408349ad99ceb0e1d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 25 00:14:46 2012 -0400 - - Minor - - src/hb-set-private.hh | 2 ++ - src/hb-set.cc | 2 ++ - 2 files changed, 4 insertions(+), 0 deletions(-) - -commit 1827dc208c867e433a95237d1ed3fc7a73d1d9a7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 24 16:56:37 2012 -0400 - - Add hb_ot_shape_glyphs_closure() - - Experimental API for now. - - src/hb-ot-map-private.hh | 7 ++++--- - src/hb-ot-shape.cc | 35 +++++++++++++++++++++++++++++++++++ - src/hb-ot.h | 8 ++++++++ - src/hb-set-private.hh | 3 +++ - 4 files changed, 50 insertions(+), 3 deletions(-) - -commit bb09f0ec10216b11189b5e8584856adf0f14d1fc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 24 16:02:12 2012 -0400 - - Minor - - src/hb-unicode.cc | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 29a7e306e30e894f7a38daf73eca9fc772c58158 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 24 16:01:30 2012 -0400 - - Minor - - src/hb-ot-shape-normalize.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 585b107cdee7305920dacc83c9ee1f8eeff7afd1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 24 16:00:50 2012 -0400 - - Add test caes for a minority language using Bengali - - U+0985 BENGALI LETTER A followed by U+09D7 BENGALI AU LENGTH MARK. - According to Bobby de Vos on the mailing list, this results in - a dotted - circle with most shaping engines, but is a legitimate sequence in this - minority language. - - We reached the consensus on the list to NOT implement dotted-circle - in HarfBuzz. - - .../indic/script-bengali/misc/misc.txt | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 6c6ccaf575392f6e6bb9a15534026e4ea462705b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 24 14:21:15 2012 -0400 - - Add a few more set operations - - TODO: Tests for hb_set_t. - - src/hb-set-private.hh | 54 - +++++++++++++++++++++++++++++++++++++++++++++++- - src/hb-set.cc | 55 - +++++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-set.h | 34 +++++++++++++++++++++++++++-- - 3 files changed, 139 insertions(+), 4 deletions(-) - -commit 5caece67ab9eee322bdcdf6f4b607eadde297e56 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 23 23:03:12 2012 -0400 - - Make closure() return void - - src/hb-ot-layout-gsub-table.hh | 142 ++++++++++++----------------- - src/hb-ot-layout-gsubgpos-private.hh | 165 - +++++++++++++++++----------------- - src/hb-ot-layout.cc | 10 +- - src/hb-ot-layout.h | 8 +- - src/hb-set-private.hh | 20 ++--- - 5 files changed, 157 insertions(+), 188 deletions(-) - -commit 0b08adb3539f2ec29682456b89c69e89ff5e9c03 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 23 22:41:09 2012 -0400 - - Add hb_set_t - - TODO | 2 + - src/Makefile.am | 3 + - src/hb-ot-layout-common-private.hh | 1 + - src/hb-ot-layout-private.hh | 47 -------------- - src/hb-ot-layout.h | 2 - - src/hb-set-private.hh | 95 ++++++++++++++++++++++++++++ - src/hb-set.cc | 120 - ++++++++++++++++++++++++++++++++++++ - src/hb-set.h | 91 +++++++++++++++++++++++++++ - src/hb.h | 1 + - 9 files changed, 313 insertions(+), 49 deletions(-) - -commit 5b93e8d94fb4c2474816304ae3f52e1c704882de -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 23 22:26:13 2012 -0400 - - Update copyright headers - - src/hb-ot-layout-common-private.hh | 2 +- - src/hb-ot-layout-gpos-table.hh | 2 +- - src/hb-ot-layout-gsub-table.hh | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -commit 6a9be5bd3524dc3eb1e88d1063bde2e4d8b57011 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 23 22:23:17 2012 -0400 - - Rename hb_glyph_map_t to hb_set_t - - src/hb-ot-layout-common-private.hh | 16 ++++++++-------- - src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++------ - src/hb-ot-layout-private.hh | 2 +- - src/hb-ot-layout.cc | 2 +- - src/hb-ot-layout.h | 4 ++-- - src/hb-ot-map-private.hh | 2 +- - src/hb-ot-map.cc | 2 +- - 7 files changed, 20 insertions(+), 20 deletions(-) - -commit a4385f0b0a6949e2ce49e6a147ad4beaa724f6c3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 23 22:20:14 2012 -0400 - - Improve clustering - - src/hb-ot-shape.cc | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 8e3715f8a16b315c1c7dd4b256e7f68a36c53e7c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 23 22:18:54 2012 -0400 - - Minor - - src/hb-buffer-private.hh | 2 +- - src/hb-buffer.cc | 2 +- - src/hb-graphite2.cc | 5 ++--- - src/hb-ot-shape-complex-arabic.cc | 4 ++-- - src/hb-ot-shape-complex-misc.cc | 4 ++-- - 5 files changed, 8 insertions(+), 9 deletions(-) - -commit d2984a241e4819474d827b1dd5d4b6d76596b3a5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 23 17:21:14 2012 -0400 - - Add map->substitute_closure() - - src/hb-ot-map-private.hh | 3 +++ - src/hb-ot-map.cc | 15 +++++++++++++++ - 2 files changed, 18 insertions(+), 0 deletions(-) - -commit 31081f7390e5130df72f89acc609ccab5dc77a48 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 23 16:54:58 2012 -0400 - - Implement closure() for Context and ChainContext lookups - - src/hb-ot-layout-common-private.hh | 54 ++++++ - src/hb-ot-layout-gsubgpos-private.hh | 347 - +++++++++++++++++++++++++++------- - src/hb-ot-layout-private.hh | 23 ++- - 3 files changed, 351 insertions(+), 73 deletions(-) - -commit c64ddab3c34897cd520d4d73a054866e649e8793 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 23 15:28:35 2012 -0400 - - Flesh out closure() for GSUB - - The GSUBGPOS part still missing. - - src/hb-ot-layout-common-private.hh | 61 ++++++++++++++------ - src/hb-ot-layout-gsub-table.hh | 112 - ++++++++++++++++++++++++++++-------- - src/hb-ot-layout-private.hh | 34 +++++++++++ - src/hb-ot-layout.h | 2 +- - 4 files changed, 165 insertions(+), 44 deletions(-) - -commit 0da132bde4d576a03095d6738507954f7f85103d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 23 14:21:33 2012 -0400 - - Fix Coverage iters - - src/hb-ot-layout-common-private.hh | 30 +++++++++++++++++++++--------- - 1 files changed, 21 insertions(+), 9 deletions(-) - -commit 3e32cd9570fd8b09901fb790b80365ae425f681a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 23 13:20:52 2012 -0400 - - Minor - - src/hb-ot-layout-gsubgpos-private.hh | 1 - - src/hb-ot-layout.cc | 6 +++--- - src/hb-ot-layout.h | 8 ++++++++ - src/hb-private.hh | 4 +++- - 4 files changed, 14 insertions(+), 5 deletions(-) - -commit 650ac00da3d2f988197393f34d40f0ba1a0fa093 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 23 13:17:09 2012 -0400 - - Minor refactoring - - src/hb-ot-layout-gpos-table.hh | 27 ++++++++++------------- - src/hb-ot-layout-gsub-table.hh | 39 - +++++++++++++++------------------ - src/hb-ot-layout-gsubgpos-private.hh | 8 +----- - src/hb-ot-layout.cc | 6 +++- - 4 files changed, 36 insertions(+), 44 deletions(-) - -commit f94b0aa64609654497ced9c00312c9643eb69053 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 23 13:04:38 2012 -0400 - - Add "closure" operation stubs to GSUB - - Filling in. - - src/hb-ot-layout-gsub-table.hh | 179 - ++++++++++++++++++++++++++++++++++ - src/hb-ot-layout-gsubgpos-private.hh | 110 ++++++++++++++++++++- - src/hb-ot-layout.cc | 8 ++ - 3 files changed, 293 insertions(+), 4 deletions(-) - -commit 7d50d502635d7c95e6bd091e7d4cc993f0853f76 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 23 13:02:14 2012 -0400 - - Add Coverage iterators - - src/hb-ot-layout-common-private.hh | 59 - ++++++++++++++++++++++++++++++++++++ - 1 files changed, 59 insertions(+), 0 deletions(-) - -commit 3ed4634ec349fa9e943ad23718c04be4dd4bba62 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 19 22:34:06 2012 -0400 - - Add Indic inspection tool - - src/Makefile.am | 7 +- - src/hb-ot-shape-complex-indic-private.hh | 264 - ++++++++++++++++++++++++++++++ - src/hb-ot-shape-complex-indic.cc | 229 - +-------------------------- - src/indic.cc | 46 +++++ - 4 files changed, 317 insertions(+), 229 deletions(-) - -commit a06411ecf93c7e5256e363eef3ef69554896dd55 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 19 22:28:25 2012 -0400 - - Minor matra renumbering - - Should have no visible effect. - - src/hb-ot-shape-complex-indic.cc | 30 +++++++++++++++++------------- - 1 files changed, 17 insertions(+), 13 deletions(-) - -commit 36608941f3cc530fea57282fa175e4cc3b4c66c6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 19 22:21:38 2012 -0400 - - Add GSUB "would_apply" API - - To be used in the Indic shaper later. Unused for now. - - src/hb-ot-layout-gsub-table.hh | 140 - +++++++++++++++++++++++++++++++++++++++- - 1 files changed, 138 insertions(+), 2 deletions(-) - -commit a0d4caeb91fa5e5f2090db4efc35c64ff9a64789 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 17 13:42:30 2012 -0400 - - Minor - - TODO | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit a5e40542ab9508f0ba6f822f1262d93fccb71f45 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 17 12:37:19 2012 -0400 - - Make font immutable in hb_shape() - - src/hb-shape.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 3cde23664fbbe9cd2ac1b8fd5eb2ea288309cc9c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 17 11:44:49 2012 -0400 - - Minor note re Graphite - - src/hb-graphite2.cc | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 4dc2449d92308f8dd366142831c0b85bd30ea5a9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 17 11:39:48 2012 -0400 - - Fix leak in graphite - - src/hb-graphite2.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 0290bbf8611aa881daed907f22256a431250c90a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 17 10:28:21 2012 -0400 - - Add another Thai test - - .../texts/in-tree/shaper-thai/misc/misc.txt | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 9ceca3aeb14cc096f5f87660cf7351bc35073084 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 16 21:05:51 2012 -0400 - - Fix ragel regexp in vowel-based syllable - - As reported by datao zhang on the mailing list. - - src/hb-ot-shape-complex-indic-machine.rl | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b870afcd1b436614af95db6dc297e54c8f03f0cd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 16 21:05:11 2012 -0400 - - Rewrite ragel expression to better match the one on MS spec - - https://www.microsoft.com/typography/otfntdev/devanot/shaping.aspx - - src/hb-ot-shape-complex-indic-machine.rl | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 95cefdf96efe43a44133aa8a186155cf4e63e2b7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 16 18:08:20 2012 -0400 - - Add --utf8-clusters - - Also fix cairo cluster generation. - - util/hb-shape.cc | 8 +++++--- - util/hb-view.hh | 2 +- - util/helper-cairo.cc | 22 +++++++++++++++++----- - util/helper-cairo.hh | 3 ++- - util/options.cc | 19 ++++++++++++++----- - util/options.hh | 26 ++++++++++++++++---------- - util/view-cairo.cc | 5 +++-- - util/view-cairo.hh | 3 ++- - 8 files changed, 60 insertions(+), 28 deletions(-) - -commit effb42e5c520128bdc2e29398ed801730c5c0f52 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 16 16:04:07 2012 -0400 - - Always use cairo_show_text_glyphs() - - Better catches cluster errors. - - util/view-cairo.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 799cfdd15ab369580b2283200c3aca6866214b59 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 16 16:00:36 2012 -0400 - - Make page progression be right to left for vertical text - - util/view-cairo.cc | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit a5f1834f57ea3fb254f5c7d372747de316fcc8f1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 16 15:55:13 2012 -0400 - - Apply 'liga' for vertical writing mode too - - Apparently that's what Kazuraki uses to form vertical ligatures, - which suggests that it's what Adobe does. - - src/hb-ot-shape.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4d85252bda25cddd1fbdd744687e449888f0b5fa -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 16 15:54:26 2012 -0400 - - Add Japanese test data from Adobe's Kazuraki font ligatures - - test/shaping/texts/in-tree/shaper-default/MANIFEST | 1 + - .../shaper-default/script-japanese/MANIFEST | 1 + - .../shaper-default/script-japanese/misc/MANIFEST | 2 + - .../script-japanese/misc/kazuraki-liga-lines.txt | 8 +++ - .../script-japanese/misc/kazuraki-liga.txt | 53 - ++++++++++++++++++++ - 5 files changed, 65 insertions(+), 0 deletions(-) - -commit e74616b8898b5f18d9bf82b9e81aefad056c1e36 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Apr 15 14:12:13 2012 -0400 - - Add comment - - src/hb-private.hh | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit 683b503f30bba29d57a93d7e8ac7138c2e7f49f1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Apr 14 20:47:14 2012 -0400 - - Minor - - src/hb-ot-shape-normalize.cc | 11 +++++++++-- - src/hb-ot-shape-private.hh | 9 --------- - src/hb-ot-shape.cc | 9 ++++++++- - 3 files changed, 17 insertions(+), 12 deletions(-) - -commit b9f199c8e38cc5ed0d73845568630f3bcbdd4374 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Apr 14 20:23:58 2012 -0400 - - Move code around - - src/hb-ot-shape-private.hh | 40 --------------------------------------- - src/hb-ot-shape.cc | 45 - ++++++++++++++++++++++++++++++++++++++++--- - 2 files changed, 41 insertions(+), 44 deletions(-) - -commit 38a83019e6a7f4aa47662fd557344f62ae001abe -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Apr 14 19:40:18 2012 -0400 - - Minor - - src/hb-common.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d4adade217a61007dd2da5cd9eccf889f79a019a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Apr 14 19:23:17 2012 -0400 - - Add assert - - src/hb-ot-shape.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit fe28b997fbbeb2cfeab62ac453993ccffe3e6719 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Apr 14 19:19:26 2012 -0400 - - Add HB_DIRECTION_IS_VALID - - src/hb-common.h | 1 + - test/api/test-common.c | 7 +++++++ - 2 files changed, 8 insertions(+), 0 deletions(-) - -commit 5e88aa66822ba64324b4428c9ffbe06a43b4f310 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Apr 14 18:51:50 2012 -0400 - - Remove public enum names again - - As was reported to me, glib-mkenum does not understand named enums, - so remove for now. - - src/hb-blob.h | 2 +- - src/hb-common.h | 6 +++--- - src/hb-ot-layout-private.hh | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -commit 08569c0eaab026c7122c0dc29922cf44011c4d10 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Apr 14 18:47:07 2012 -0400 - - Minor - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 4bf90f648313e35d21b427a956aa1fe762bae757 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 12 17:38:23 2012 -0400 - - Make HB_DIRECTION_INVALID be zero - - This changes all the HB_DIRECTION_* enum member values, but is - nicer, in preparation for making hb_segment_properties_t public. - - src/hb-common.cc | 7 ++++--- - src/hb-common.h | 20 ++++++++++---------- - test/api/test-common.c | 9 +++++++-- - 3 files changed, 21 insertions(+), 15 deletions(-) - -commit d01402da9c756f90a84bfb1f964fd56caf2b35c3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 12 17:38:02 2012 -0400 - - Minor - - TODO | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit 69b84a8f6c789726815261c2e86692de7a65d6e8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 12 15:50:40 2012 -0400 - - Fix hb-view surface size calc for vertical text - - For some reason it doesn't quite work with IranianNastaliq, but - that looks like a font issue. - - util/helper-cairo.hh | 5 +++-- - util/options.hh | 7 +++++++ - util/view-cairo.cc | 31 +++++++++++++++++++++---------- - util/view-cairo.hh | 1 + - 4 files changed, 32 insertions(+), 12 deletions(-) - -commit 6bd9b479b8b2befbb0847282e93beade197c8038 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 12 14:53:53 2012 -0400 - - Hide backend-specific shape functions - - Also remove shaper_options argument to hb_shape_full(). That was - unused and for "future". Let it go. - - More shaper API coming in preparation for plan/planned API. - - configure.ac | 6 ++-- - src/Makefile.am | 11 ++++---- - src/hb-fallback-shape-private.hh | 9 +++---- - src/hb-fallback-shape.cc | 9 +++---- - src/hb-graphite2-private.hh | 42 +++++++++++++++++++++++++++++++++ - src/hb-graphite2.cc | 5 +-- - src/hb-graphite2.h | 7 ----- - src/hb-ot-shape-private.hh | 8 ++++- - src/hb-ot-shape.cc | 11 +++----- - src/hb-ot-shape.h | 48 - -------------------------------------- - src/hb-ot.h | 1 - - src/hb-shape.cc | 24 +++++++------------ - src/hb-shape.h | 1 - - src/hb-uniscribe-private.hh | 42 +++++++++++++++++++++++++++++++++ - src/hb-uniscribe.cc | 9 +++---- - src/hb-uniscribe.h | 7 ----- - util/options.hh | 2 +- - 17 files changed, 126 insertions(+), 116 deletions(-) - -commit c6035cf802c60f0526f421f39a55886061df94ee -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 12 13:23:59 2012 -0400 - - Add names to enums - - gdb was showing <anonymous enum> instead of useful stuff, so name - all our enums. - - src/hb-blob.h | 2 +- - src/hb-common.h | 6 +++--- - src/hb-ot-layout-common-private.hh | 2 +- - src/hb-ot-layout-gdef-table.hh | 2 +- - src/hb-ot-layout-gpos-table.hh | 5 ++--- - src/hb-ot-layout-gsub-table.hh | 2 +- - src/hb-ot-layout-private.hh | 2 +- - 7 files changed, 10 insertions(+), 11 deletions(-) - -commit d1c9eb458c843215da8df84b596bfae51fee135b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 12 13:17:44 2012 -0400 - - Make it an error to include non-top-level headers - - Users should #include <hb.h> (or hb-ft.h, hb-glib.h, etc), but - never things like hb-shape.h directly. This makes it easier to - refactor headers later on without breaking compatibility. - - src/hb-blob.h | 4 ++++ - src/hb-buffer.h | 4 ++++ - src/hb-common.h | 4 ++++ - src/hb-font.h | 4 ++++ - src/hb-ft.h | 2 -- - src/hb-glib.h | 1 + - src/hb-gobject.h | 1 + - src/hb-graphite2.h | 5 +++-- - src/hb-icu.h | 1 + - src/hb-ot-layout.h | 8 +++++--- - src/hb-ot-shape.h | 9 +++++---- - src/hb-ot-tag.h | 6 +++++- - src/hb-ot.h | 2 ++ - src/hb-private.hh | 5 ++++- - src/hb-shape.h | 4 ++++ - src/hb-unicode.h | 4 ++++ - src/hb-uniscribe.h | 3 +-- - src/hb-version.h.in | 4 ++++ - src/hb.h | 2 ++ - 19 files changed, 58 insertions(+), 15 deletions(-) - -commit 323190c27b80cddc9b3c42d19f1f243e2acb2411 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 12 12:29:10 2012 -0400 - - Minor - - src/hb-ft.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 0e3361464b00b76aa7375515163e0710a691db0c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 12 10:06:52 2012 -0400 - - Fix bug with not setting Unicode props of the first character - - Fixes Mongolian shaping issue: - https://bugs.freedesktop.org/show_bug.cgi?id=45695 - - src/hb-ot-shape.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f9746b600a6e14dbe48aabfc17df8f12a5b46b11 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 12 09:59:26 2012 -0400 - - Minor - - .../shaper-arabic/script-mongolian/misc/misc.txt | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 7470b0ff805e4ff59d23d7a1808888fafdf550eb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 12 09:44:27 2012 -0400 - - Add Mongolian test case - - test/shaping/texts/in-tree/MANIFEST | 1 + - .../shaper-arabic/script-mongolian/misc/MANIFEST | 1 + - .../shaper-arabic/script-mongolian/misc/misc.txt | 4 ++++ - test/shaping/texts/in-tree/shaper-thai/MANIFEST | 1 + - .../texts/in-tree/shaper-thai/misc/MANIFEST | 1 + - 5 files changed, 8 insertions(+), 0 deletions(-) - -commit c65662b71e6160f5adfb6226d97589ca457d98b9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 12 09:31:55 2012 -0400 - - Fix left-matra positioning in Indic - - Fixes 200 failures out of previous 4290 cases in the OO.o Indic - dictionary (of ~16000 entries). - - src/hb-ot-shape-complex-indic.cc | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit 6d16403bfaa4d710d80c93298eca7211ecaa419f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 11 22:04:42 2012 -0400 - - Adjust TODO - - TODO | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 029a82d81d8ffa1b6771d19018d592fec1dbc934 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 11 22:00:46 2012 -0400 - - [hangul] Apply *jmo features to all Hangul chars - - This is what old HB does. Morever, fixes rendering with Win8 malgun - font. The Win7 version doesn't compose with either Uniscribe nor HB, - but Win8 version works as expected, like Uniscribe, with this change. - - Lets call Hangul done for now. - - src/hb-ot-shape-complex-misc.cc | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 3baae2440de69577d330209edb708e7d2bb2231d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 11 21:54:37 2012 -0400 - - Update TODO - - TODO | 28 +++++++++++++++------------- - 1 files changed, 15 insertions(+), 13 deletions(-) - -commit a4976447cd1a1feffdecd0d501a2690716b1cf4b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 11 17:48:40 2012 -0400 - - Add Hangul test - - .../shaper-hangul/script-hangul/misc/misc.txt | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit e95d912b3b0af027c4384553f95236db822e5acc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 11 17:33:02 2012 -0400 - - Fix diff tool - - test/shaping/hb_test_tools.py | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 41ae674f6871f43d0a6e4ca67a747074d63ae576 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 11 17:11:05 2012 -0400 - - Don't create hb_apply_context_t per glyph! - - I couldn't measure significant performance gains out of this; maybe - about 5% (with one million Malayalam strings). Still, not bad. - But reminds me that optimizing this codebase without profiling first - is simply not going to work. Oh well... - - src/hb-ot-layout-gpos-table.hh | 24 ++++++------------------ - src/hb-ot-layout-gsub-table.hh | 26 +++++++------------------- - src/hb-ot-layout-gsubgpos-private.hh | 22 ++++++++++++++++++++++ - 3 files changed, 35 insertions(+), 37 deletions(-) - -commit 4a1e02ef7979d58fe0c726ee7c665b2420c42ddd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 11 14:37:53 2012 -0400 - - Fix shape to presentation forms font check - - As reported by Jonathan Kew on the list. - - src/hb-ot-shape-complex-arabic.cc | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit 6062f5f01436b4044be729890ed00b9b62737824 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 11 14:19:55 2012 -0400 - - Fix build with some compilers - - As reported by Jonathan Kew on the list. - - src/hb-ot-shape-complex-misc.cc | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit acd88e659fdb2fa1cbf7171f0a1c7fbc81b9f298 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 10 18:02:20 2012 -0400 - - In Arabic fallback shaping, check that the font has glyph for new char - - src/hb-ot-shape-complex-arabic.cc | 12 +++++++----- - src/hb-ot-shape-complex-indic.cc | 2 +- - src/hb-ot-shape-complex-misc.cc | 6 +++--- - src/hb-ot-shape-complex-private.hh | 7 ++++--- - src/hb-ot-shape.cc | 2 +- - 5 files changed, 16 insertions(+), 13 deletions(-) - -commit 7752aa73e72301a46c64c533c1e423ff5987cc05 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 10 17:22:14 2012 -0400 - - Minor - - src/hb-ot-shape-private.hh | 1 - - src/hb-ot-shape.cc | 10 ---------- - 2 files changed, 0 insertions(+), 11 deletions(-) - -commit 939c010211b063f78874a3b72b032c1ed9a13b87 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 10 17:20:05 2012 -0400 - - Implement Arabic fallback shaping mandatory ligatures - - src/gen-arabic-table.py | 32 - +++++++++++++++++++++--------- - src/hb-ot-shape-complex-arabic-table.hh | 28 ++++++++++++++++++-------- - src/hb-ot-shape-complex-arabic.cc | 31 - ++++++++++++++++++++++++++++++ - src/hb-ot-shape-complex-misc.cc | 4 +- - 4 files changed, 74 insertions(+), 21 deletions(-) - -commit b7d04eb606800100faa11100d2adf559e297a4ee -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 10 16:44:38 2012 -0400 - - Do Arabic fallback shaping - - src/hb-ot-shape-complex-arabic.cc | 38 - ++++++++++++++++++++++++++++++++---- - 1 files changed, 33 insertions(+), 5 deletions(-) - -commit ae4a2b9365051c23c9a299cf76f3ab7e661999b1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 10 16:25:08 2012 -0400 - - Generate fallback Arabic shaping table - - Not hooked up yet. - - src/Makefile.am | 6 +- - src/gen-arabic-table.py | 220 - ++++++++++++++++++++++--------- - src/gen-indic-table.py | 4 +- - src/hb-ot-shape-complex-arabic-table.hh | 205 - ++++++++++++++++++++++++++++- - 4 files changed, 367 insertions(+), 68 deletions(-) - -commit 3b26f96ebe859570d14c6902afc23462bca40712 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 10 10:52:07 2012 -0400 - - Add Thai shaper that does SARA AM decomposition / reordering - - That's not in the OpenType spec, but it's what MS and Adobe do. - - src/hb-buffer.cc | 1 + - src/hb-ot-shape-complex-misc.cc | 104 - +++++++++++++++++++++++++++++++++++- - src/hb-ot-shape-complex-private.hh | 8 +++ - 3 files changed, 112 insertions(+), 1 deletions(-) - -commit 0b6d2ac6a1d04877ae4542fc2a3b920185547053 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 10 10:52:03 2012 -0400 - - Minor - - TODO | 10 ++++------ - 1 files changed, 4 insertions(+), 6 deletions(-) - -commit e099dd6592b4ea887696330f4718efb572494d93 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 10 10:47:33 2012 -0400 - - Add Thai test case for SARA AM decomposition - - test/shaping/texts/in-tree/shaper-hangul/MANIFEST | 1 + - .../texts/in-tree/shaper-thai/misc/misc.txt | 5 +++++ - 2 files changed, 6 insertions(+), 0 deletions(-) - -commit 4450dc9354b18cd68980b0891b24ea8efa4f38b6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Apr 7 22:07:23 2012 -0400 - - Move around - - test/shaping/texts/in-tree/MANIFEST | 1 + - test/shaping/texts/in-tree/shaper-default/MANIFEST | 1 - - .../in-tree/shaper-default/script-hangul/MANIFEST | 1 - - .../shaper-default/script-hangul/misc/MANIFEST | 1 - - .../shaper-default/script-hangul/misc/misc.txt | 2 -- - .../in-tree/shaper-hangul/script-hangul/MANIFEST | 1 + - .../shaper-hangul/script-hangul/misc/MANIFEST | 1 + - .../shaper-hangul/script-hangul/misc/misc.txt | 2 ++ - 8 files changed, 5 insertions(+), 5 deletions(-) - -commit d4cc44716c1e098f8abbc0e495404598026ef242 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Apr 7 21:52:28 2012 -0400 - - Move code around, in prep for Thai/Lao shaper - - src/hb-buffer-private.hh | 5 +++++ - src/hb-buffer.cc | 23 +++++++++++++++++++++++ - src/hb-ot-shape-complex-indic-machine.rl | 14 +------------- - 3 files changed, 29 insertions(+), 13 deletions(-) - -commit c9a841f4452921c5361b8f5697bbff7736ce60cd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Apr 7 15:06:55 2012 -0400 - - Add simple Hangul shaper that recomposes Jamo when feasible - - Previously, we were NOT actually recomposing Hangul Jamo. We do now. - The two lines in: - - test/shaping/texts/in-tree/shaper-default/script-hangul/misc/misc.txt - - Now render the same with the UnDotum.ttf font. Previously the second - linle was rendering boxes. - - We can also start applying OpenType Jamo features later. At this - time, - I have no idea how the 'ljmo', 'vjmo', 'tjmo' features are supposed to - work. Maybe someone can explain them to me? - - src/hb-ot-shape-complex-misc.cc | 16 ++++++++++++++++ - src/hb-ot-shape-complex-private.hh | 15 +++++++++++++-- - 2 files changed, 29 insertions(+), 2 deletions(-) - -commit 968318455304804dc53045e8ba0cd4d76800c02d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Apr 7 14:57:21 2012 -0400 - - Implement normalization mode - HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_FULL - - In this mode we try composing CCC=0 with CCC=0 characters. Useful for - Hangul. - - src/hb-ot-shape-normalize.cc | 21 +++++++++++++-------- - 1 files changed, 13 insertions(+), 8 deletions(-) - -commit bec2ac4fde1ba0dd6dba02adbb836ce569a5cf6f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Apr 7 14:51:17 2012 -0400 - - Bring normalization algorithm closer to the spec - - No logical difference so far. - - src/hb-ot-shape-normalize.cc | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit e02d9257863b49e33ab5942971266349d3c548f6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Apr 7 14:49:13 2012 -0400 - - Flip logic around - - src/hb-ot-shape-normalize.cc | 38 - +++++++++++++------------------------- - 1 files changed, 13 insertions(+), 25 deletions(-) - -commit aaa25d5f458127f53f4b5ecdeb986ae91fabbad3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 5 17:27:23 2012 -0400 - - Add Hangul test case - - Composed, and decomposed, of the same text. - - test/shaping/texts/in-tree/shaper-default/MANIFEST | 1 + - .../in-tree/shaper-default/script-hangul/MANIFEST | 1 + - .../shaper-default/script-hangul/misc/MANIFEST | 1 + - .../shaper-default/script-hangul/misc/misc.txt | 2 ++ - 4 files changed, 5 insertions(+), 0 deletions(-) - -commit 11138ccff71f442da1fcf64faa0e1d22e083e775 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 5 17:25:19 2012 -0400 - - Add normalize mode - - In preparation for Hangul shaper. - - src/Makefile.am | 1 + - src/hb-ot-layout-common-private.hh | 1 - - src/hb-ot-shape-complex-arabic.cc | 6 +- - src/hb-ot-shape-complex-indic.cc | 6 +- - src/hb-ot-shape-complex-misc.cc | 8 ++-- - src/hb-ot-shape-complex-private.hh | 13 +++--- - src/hb-ot-shape-normalize-private.hh | 46 +++++++++++++++++++++ - src/hb-ot-shape-normalize.cc | 73 - ++++++++++++++++----------------- - src/hb-ot-shape-private.hh | 7 +-- - src/hb-ot-shape.cc | 2 +- - 10 files changed, 102 insertions(+), 61 deletions(-) - -commit 6769f21d579a354e32577ec57348e97d2cb1b438 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 5 16:46:46 2012 -0400 - - More moving code around - - src/hb-ot-shape-normalize.cc | 2 +- - src/hb-ot-shape-private.hh | 8 -------- - src/hb-ot-shape.cc | 2 +- - src/hb-unicode-private.hh | 8 ++++++++ - 4 files changed, 10 insertions(+), 10 deletions(-) - -commit 2db2a566826ed4763ce69629194ec656bd48b0bd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 5 16:40:37 2012 -0400 - - Move code around - - src/hb-ot-shape-private.hh | 53 - ------------------------------------------ - src/hb-unicode-private.hh | 3 ++ - src/hb-unicode.cc | 55 - ++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 58 insertions(+), 53 deletions(-) - -commit cad3821f3d5b68d490b0728bd37bd57428ec809c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Mar 7 17:13:25 2012 -0500 - - More sorting by Unicode version - - This is the most convenient way to browse scripts. - - src/hb-common.cc | 2 +- - src/hb-common.h | 2 +- - src/hb-ot-shape-complex-private.hh | 94 - ++++++++++++++++++++++++++--------- - 3 files changed, 72 insertions(+), 26 deletions(-) - -commit 317b9504d7a4faa70dcf21e5c2aff4792dbd201a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Mar 7 16:51:29 2012 -0500 - - Minor - - src/hb-ot-shape-complex-private.hh | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit fa2673c1ee954ddbbfbfca7cced7b839d7776fc0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Mar 7 15:52:02 2012 -0500 - - More Unicode script age annotation, and a couple more RTL scripts - - Cross-checked with Mark Davis's spreadsheet at http://goo.gl/x9ilM - - src/hb-common.cc | 8 ++++++++ - src/hb-common.h | 52 - +++++++++++++++++++++++++++++----------------------- - 2 files changed, 37 insertions(+), 23 deletions(-) - -commit 6d4016f1ba48d409800dc3281b93e5cd58c99d9f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Mar 7 15:33:14 2012 -0500 - - Make src tests pass again - - src/gen-arabic-table.py | 11 ++++++----- - src/gen-indic-table.py | 9 +++++---- - src/hb-ot-shape-complex-arabic-table.hh | 6 ++++++ - src/hb-ot-shape-complex-indic-table.hh | 4 ++++ - 4 files changed, 21 insertions(+), 9 deletions(-) - -commit 7da435f08cc406080a5ee9b1ab5351db6a93acae -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Mar 7 15:20:20 2012 -0500 - - Separate Unicode 3.1 and Unicode 3.2 additions - - src/hb-common.h | 14 +++++++++----- - 1 files changed, 9 insertions(+), 5 deletions(-) - -commit f91136cb528e298651c4a8a8a1d6dc54136e09ce -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Mar 7 12:56:22 2012 -0500 - - Route three Unicode 6.1 scripts through Indic shaper - - src/hb-ot-shape-complex-private.hh | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit f32c0012ad794cd2df669dfc7b0438fafbe38b2d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Mar 7 12:53:34 2012 -0500 - - Add Unicode 6.1.0 scripts - - src/hb-common.h | 9 +++++++++ - src/hb-glib.cc | 11 ++++++++++- - 2 files changed, 19 insertions(+), 1 deletions(-) - -commit 50e810cd0e55c25fddb0a2fd0861c51fbf65700e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Mar 7 12:49:08 2012 -0500 - - Lydian and Kharoshthi are right-to-left - - src/hb-common.cc | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit a52835635e4a2a12715aff2febb561515a10cd5a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Mar 7 12:38:39 2012 -0500 - - Whitespace - - src/hb-common.h | 194 - +++++++++++++++++++++++++++--------------------------- - 1 files changed, 97 insertions(+), 97 deletions(-) - -commit 183224684a45d7dcd7d28510d4383a7a7cb3dff3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Mar 7 12:21:28 2012 -0500 - - Use generic shaper for Buhid - - As requested by Jonathan Kew. - - We need to devise a better mechanism to choose which scripts to - pass through the Indic shaper. Moreover, currently we are storing - data for some scripts in the Indic shaper that are not even going - through that shaper. Need to find a better way... - - src/hb-ot-shape-complex-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit cdc8b491a8e7cec5082ca2ad0346c1f41fdd5c92 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Mar 7 12:08:33 2012 -0500 - - Update Indic table to Unicode 6.1 data - - src/Makefile.am | 15 +++ - src/gen-indic-table.py | 20 ++-- - src/hb-ot-shape-complex-arabic-table.hh | 35 ------ - src/hb-ot-shape-complex-indic-table.hh | 178 - +++++++++++++++++++------------ - 4 files changed, 134 insertions(+), 114 deletions(-) - -commit e3b2e077f549b04779c08a9fedb1f35b9f11075c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Mar 7 10:21:24 2012 -0500 - - Typo - - src/hb-ot-shape-normalize.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c346671b6b9b05fa51b95c16212eb29ac69510fa -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Mar 6 20:47:50 2012 -0500 - - Minor doc fixes - - src/hb-ot-shape-normalize.cc | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit 406044986a68676f3050f9350ccc448c615fc685 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Mar 6 20:24:31 2012 -0500 - - Add Hebrew diacritics test cases - - From: - https://bugzilla.mozilla.org/show_bug.cgi?id=662055 - - test/shaping/texts/in-tree/shaper-default/MANIFEST | 1 + - .../in-tree/shaper-default/script-hebrew/MANIFEST | 1 + - .../shaper-default/script-hebrew/misc/MANIFEST | 1 + - .../script-hebrew/misc/diacritics.txt | 15 +++++++++++++++ - 4 files changed, 18 insertions(+), 0 deletions(-) - -commit 461b9b6347e4f58589f5be82c40a2df61da2c715 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Mar 1 18:11:19 2012 -0800 - - Fix cluster formation in Indic - - Makes number of failures against Uniscribe with hi_IN dictionary from - OO.o to go down from 6334 to 4290. Not bad for a one-line change! - - Mozilla Bug 729626 - ASAN: heap-buffer-overflow HTML - - src/hb-ot-shape-complex-indic-machine.rl | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bc71ad4973842f25216b48842a46d6c9cbce6aa3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Mar 1 17:30:29 2012 -0800 - - Fix atomic-int op on Apple - - The OSAtomicAdd32Barrier operator returns the new value, we want the - old value. - - src/hb-blob.cc | 2 +- - src/hb-object-private.hh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit a1970d9afc15b2c6b7513b923019bb223bd95154 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Feb 24 13:51:09 2012 -0500 - - Add support for atomic int and mutex on Apple systems - - So, apparently there's no atomic int 'get' method on Apple. - You have to - add(0) to get. And that's not const-friendly. So switch inert-object - checking to a non-atomic get. This, however, is safe, and a - negligible - performance boost too. - - src/hb-mutex-private.hh | 14 +++++++++----- - src/hb-object-private.hh | 15 ++++++++++----- - 2 files changed, 19 insertions(+), 10 deletions(-) - -commit 8004429102d7d3a8c42e1cbfe231835de4d3d782 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Feb 23 18:47:17 2012 -0500 - - Remove unused hb_atomic_int_set() - - Apparently it can't be implemented on OS X. We weren't using - it anyway. - - src/hb-object-private.hh | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit 45227c10e416894ba7f84fdf72d849cecdb9b898 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Feb 23 19:47:43 2012 -0500 - - Add hb-warning.cc. Oops! - - src/hb-warning.cc | 53 - +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 53 insertions(+), 0 deletions(-) - -commit bd7ff1dec5b92ee59fa060e793f88499adcd8c11 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Feb 23 15:06:16 2012 -0500 - - Allow disabling multi-threaded support - - By defining HB_NO_MT. - - Also, only warn once per missing MT feature support. - - Mozilla Bug 666661 - gfx/harfbuzz/src/hb-prive.h - compiler warnings - on mac - - src/Makefile.am | 1 + - src/hb-mutex-private.hh | 6 +++--- - src/hb-object-private.hh | 11 +++-------- - 3 files changed, 7 insertions(+), 11 deletions(-) - -commit 634c9e3423a9c23793400d1f56e98070e00b6056 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Feb 22 16:43:21 2012 -0500 - - Minor - - src/hb-ot-shape-private.hh | 69 - +++++++++++++++++++++++++------------------- - 1 files changed, 39 insertions(+), 30 deletions(-) - -commit 514b6f88668da4eab85103c536dabe24b7bc457b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Feb 22 16:34:37 2012 -0500 - - Followup: Reorder Hebrew combining classes for better rendering - - Patch from Jonathan Kew. - - Bug 662055 - advanced Hebrew diacritics are shown correctly only in - particular order. - - src/hb-ot-shape-private.hh | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) - -commit 6e78607ea71e3e5306f88f227ddba76133d16ed0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Feb 22 16:31:15 2012 -0500 - - Reorder Hebrew combining classes for better rendering - - Patch from Jonathan Kew. - - Bug 662055 - advanced Hebrew diacritics are shown correctly only in - particular order - - src/hb-ot-shape-private.hh | 28 ++++++++++++++++++++++++++++ - 1 files changed, 28 insertions(+), 0 deletions(-) - -commit 7a70ca78e06c676befe1ae17199fff1f000f8188 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Feb 21 11:31:47 2012 -0500 - - Add test case from https://bugzilla.mozilla.org/show_bug.cgi?id=714067 - - .../shaper-arabic/script-arabic/misc/MANIFEST | 1 + - .../script-arabic/misc/ligature-diacritics.txt | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit f51e167436a51b890ffe3f7f7920498fa287acd9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jan 30 09:48:33 2012 -0500 - - Minor error handling - - util/options.cc | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit bee74efbdebc4e46ce57daa8a88bcf06b13411fe -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 27 02:14:08 2012 -0500 - - Update git.mk to new upstream - - git.mk | 44 +++++++++++++++++++++++++++++++++----------- - 1 files changed, 33 insertions(+), 11 deletions(-) - -commit 134aa7bc7e3f9b9de76c9de2ed4b7344a7b323f9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 27 02:09:40 2012 -0500 - - Make checks more OS X friendly - - src/check-internal-symbols.sh | 21 +++++++++++++-------- - src/check-libstdc++.sh | 21 +++++++++++++-------- - 2 files changed, 26 insertions(+), 16 deletions(-) - -commit 6152199368399bf98368ea3c794fa760b49756ba -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 27 01:57:59 2012 -0500 - - Fix check-header-guards on OS X - - src/check-header-guards.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c62e41b6aad1fc56225d0e53d6d4abd0f005fe3b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 27 02:20:58 2012 -0500 - - Minor - - configure.ac | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 1a5a91dc0d8bf4b72a2f22dc6300b06ad7000b79 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jan 22 19:57:00 2012 -0500 - - Add a few more tests - - .../indic/script-devanagari/misc/misc.txt | 3 +++ - .../south-east-asian/script-thai/misc/misc.txt | 9 +++++++++ - 2 files changed, 12 insertions(+), 0 deletions(-) - -commit 1795f3a222a85cdf80c78a0e9181d23dd1673876 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jan 22 19:29:45 2012 -0500 - - Add a couple Thai test cases from Thep - - .../in-tree/shaper-indic/south-east-asian/MANIFEST | 1 + - .../south-east-asian/script-thai/MANIFEST | 1 + - .../south-east-asian/script-thai/misc/MANIFEST | 1 + - .../south-east-asian/script-thai/misc/misc.txt | 2 ++ - 4 files changed, 5 insertions(+), 0 deletions(-) - -commit ec3f506682fc6e2d7d7455e49d6c82ac9dd0c660 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jan 22 19:10:55 2012 -0500 - - Add Devanagari test from Tom Hacohen - - .../indic/script-devanagari/misc/misc.txt | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 71be4ca3dd5eaaca31957e34fef11f6aeb4aebdf -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jan 22 16:26:49 2012 -0500 - - Also ignore "ChangeLog" in manifests - - test/shaping/hb_test_tools.py | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3c9a39ecd65990f2c7b29bb741c6a538fa425531 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jan 22 16:21:19 2012 -0500 - - Remove newline - - test/shaping/hb_test_tools.py | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit e4ccbfe276db5ed098ddcf78a7bb8f2da4263128 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jan 22 16:07:32 2012 -0500 - - Allow --color=html in hb-diff - - Not that useful right now as we don't escape < and >. Perhaps - another tool can be added to convert the ANSI output to HTML. - - test/shaping/hb-diff | 2 +- - test/shaping/hb_test_tools.py | 22 +++++++++++++++++----- - 2 files changed, 18 insertions(+), 6 deletions(-) - -commit 71632c96daa4ba15e13f4d9e7f2c121d0162614e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jan 22 15:31:44 2012 -0500 - - Fallback to Latin script if the font has no other usable scripts - - Patch and description from Jonathan Kew: - - It turns out that some legacy Thai fonts provide OpenType substitution - features to implement mark positioning, but (incorrectly) put those - features/lookups under the 'latn' script tag instead of using 'thai' - (or - possibly 'DFLT'). See - https://bugzilla.mozilla.org/show_bug.cgi?id=719366 for an example and - more detailed description. - - Although this is really a font bug, I suggest that we could improve - the - rendering of such fonts by looking for the 'latn' as a fallback if - neither the requested script nor "default" is found in - hb_ot_layout_table_choose_script. Suggested patch against harfbuzz - master is attached. - - This does _not_ affect the other kind of legacy Thai font, where - custom - code to support vendor-specific PUA codepoints would be needed. I'm - not - keen to go down that path; IMO, such fonts should be ruthlessly - stamped - out in favour of standards-based solutions. :) - - JK - - src/hb-ot-layout.cc | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 8f80f93491be73f05eba908591c856339acda51e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jan 21 20:03:25 2012 -0500 - - More shoveling around - - test/shaping/hb-diff-filter-failures | 2 +- - test/shaping/hb-manifest-read | 2 +- - test/shaping/hb_test_tools.py | 27 ++++++++++++++++----------- - 3 files changed, 18 insertions(+), 13 deletions(-) - -commit c78c6e9844a23144ce7fa29afbf57b74587bfcd0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jan 21 19:55:16 2012 -0500 - - Cleanup - - test/shaping/hb-manifest-read | 2 +- - test/shaping/hb_test_tools.py | 13 ++++++++----- - 2 files changed, 9 insertions(+), 6 deletions(-) - -commit ab94a9c542f7ec9143335b73493ccb75d4586a3a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jan 21 19:43:58 2012 -0500 - - Distribute testing tools - - test/shaping/Makefile.am | 24 ++++++++++++++++++++++++ - 1 files changed, 24 insertions(+), 0 deletions(-) - -commit 3e86feb54c94e46b60168fd2a4773183eb1354b4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jan 21 19:40:30 2012 -0500 - - Speed up colorless diff - - test/shaping/hb_test_tools.py | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 1e58df603457cb4b57da78b5d4a8df66aa7d7be4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jan 21 19:37:31 2012 -0500 - - Cleanup manifest code - - test/shaping/hb_test_tools.py | 18 ++++++++++++------ - 1 files changed, 12 insertions(+), 6 deletions(-) - -commit 956d552e108eeb50bb3ad21588830af7a2f3862a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jan 21 19:31:51 2012 -0500 - - Port hb-manifest-update to Python - - test/shaping/hb-manifest-update | 23 +++-------------------- - test/shaping/hb_test_tools.py | 38 - ++++++++++++++++++++++++++++++-------- - 2 files changed, 33 insertions(+), 28 deletions(-) - -commit 3a34e9e351ed0ee3eb27f9c0f154bc227f1226bf -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jan 21 19:15:41 2012 -0500 - - Ignore Broken Pipe errors - - test/shaping/hb_test_tools.py | 76 - ++++++++++++++++++++++++++--------------- - 1 files changed, 48 insertions(+), 28 deletions(-) - -commit d5300241680844f5625f32792f7dd7181ed05f9b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jan 21 19:07:22 2012 -0500 - - [util] Make clusters work with char offset instead of UTF-8 offset - - This means the --features indices also refer to char position - instead of byte position now. Same for cluster values reported - by hb-shape. - - Will add an option for byte indices later. - - util/options.cc | 7 +++++-- - util/options.hh | 12 ++++++++++++ - 2 files changed, 17 insertions(+), 2 deletions(-) - -commit 0f68f4a0b5ee78cbdb2a89a9a1a9125afe72ed2f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jan 21 18:59:48 2012 -0500 - - Correctly print out Unicode strings - - util/options.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f22089ac24f43ff048c2a0f1c1f604ae3a96be8b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 21:21:47 2012 -0500 - - Misc fixes - - test/shaping/hb-diff | 8 ++++---- - test/shaping/hb_test_tools.py | 4 ++-- - 2 files changed, 6 insertions(+), 6 deletions(-) - -commit 96968bfae5ce61a0a098bf0e6acd2210a309a499 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 21:16:34 2012 -0500 - - Port hb-manifest-read to Python - - test/shaping/hb-diff-filter-failures | 2 +- - test/shaping/hb-manifest-read | 37 ++----------------------- - test/shaping/hb_test_tools.py | 49 - ++++++++++++++++++++++++++++++--- - 3 files changed, 48 insertions(+), 40 deletions(-) - -commit a59ed46fa4f7b76605f8ce6e75783ead406468f5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 20:56:32 2012 -0500 - - Add final residues from test-shape-complex - - .../in-tree/shaper-arabic/script-nko/misc/MANIFEST | 1 + - .../in-tree/shaper-arabic/script-nko/misc/misc.txt | 5 +++++ - test/shaping/texts/in-tree/shaper-default/MANIFEST | 1 + - .../shaper-default/script-linear-b/MANIFEST | 1 + - .../shaper-default/script-linear-b/misc/MANIFEST | 1 + - .../shaper-default/script-linear-b/misc/misc.txt | 1 + - test/shaping/texts/in-tree/shaper-indic/MANIFEST | 1 + - .../in-tree/shaper-indic/south-east-asian/MANIFEST | 1 + - .../south-east-asian/script-khmer/MANIFEST | 1 + - .../south-east-asian/script-khmer/misc/MANIFEST | 1 + - .../south-east-asian/script-khmer/misc/misc.txt | 9 +++++++++ - 11 files changed, 23 insertions(+), 0 deletions(-) - -commit 820e0ed318d9b187a131baa9491d5d390ec33ef4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 20:51:52 2012 -0500 - - Add Punjabi tests from test-shape-complex also - - .../indic/script-punjabi/misc/MANIFEST | 1 + - .../indic/script-punjabi/misc/misc.txt | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit a7d71c105772fb612871b4cae59bdae47bbc8751 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 20:50:09 2012 -0500 - - Add Tamil test data from Muguntharaj Subramanian - - .../shaper-indic/indic/script-tamil/misc/MANIFEST | 1 + - .../shaper-indic/indic/script-tamil/misc/misc.txt | 43 - ++++++++++++++++++++ - 2 files changed, 44 insertions(+), 0 deletions(-) - -commit 5992a9941e7f19181df1e34e79e514ccedc3d284 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 20:48:14 2012 -0500 - - Import test data from late test-shape-complex - - .../in-tree/shaper-arabic/script-arabic/MANIFEST | 1 + - .../in-tree/shaper-arabic/script-mandaic/MANIFEST | 1 + - .../shaper-arabic/script-mongolian/MANIFEST | 1 + - .../in-tree/shaper-arabic/script-nko/MANIFEST | 1 + - .../in-tree/shaper-arabic/script-syriac/MANIFEST | 1 + - .../shaper-indic/indic/script-assamese/MANIFEST | 1 + - .../shaper-indic/indic/script-bengali/MANIFEST | 1 + - .../indic/script-bengali/misc/MANIFEST | 1 + - .../indic/script-bengali/misc/misc.txt | 48 - ++++++++++++++++++++ - .../shaper-indic/indic/script-devanagari/MANIFEST | 1 + - .../indic/script-devanagari/misc/MANIFEST | 1 + - .../indic/script-devanagari/misc/misc.txt | 23 +++++++++ - .../shaper-indic/indic/script-gujarati/MANIFEST | 1 + - .../shaper-indic/indic/script-kannada/MANIFEST | 1 + - .../indic/script-kannada/misc/MANIFEST | 1 + - .../indic/script-kannada/misc/misc.txt | 17 +++++++ - .../shaper-indic/indic/script-malayalam/MANIFEST | 1 + - .../indic/script-malayalam/misc/MANIFEST | 1 + - .../indic/script-malayalam/misc/misc.txt | 22 +++++++++ - .../shaper-indic/indic/script-oriya/MANIFEST | 1 + - .../shaper-indic/indic/script-oriya/misc/MANIFEST | 1 + - .../shaper-indic/indic/script-oriya/misc/misc.txt | 28 +++++++++++ - .../shaper-indic/indic/script-punjabi/MANIFEST | 1 + - .../shaper-indic/indic/script-sinhala/MANIFEST | 1 + - .../indic/script-sinhala/misc/MANIFEST | 1 + - .../indic/script-sinhala/misc/misc.txt | 6 +++ - .../shaper-indic/indic/script-tamil/MANIFEST | 1 + - .../shaper-indic/indic/script-telugu/MANIFEST | 1 + - .../shaper-indic/indic/script-telugu/misc/MANIFEST | 1 + - .../shaper-indic/indic/script-telugu/misc/misc.txt | 11 +++++ - 30 files changed, 178 insertions(+), 0 deletions(-) - -commit 46ac45647760984c6220f04ba4521038e628b169 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 19:32:17 2012 -0500 - - Fix Unicode encoding issue - - test/shaping/hb_test_tools.py | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit ad34e39a4a320310b1edd9fc4d7e740373510c69 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 18:39:27 2012 -0500 - - Make test tools interactive - - By bypassing readlines() buffering. - - test/shaping/hb_test_tools.py | 33 +++++++++++++++++++++++++++------ - 1 files changed, 27 insertions(+), 6 deletions(-) - -commit 91540a7d97051a3d6e97fdcd1e98af23e0780cdd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 18:27:52 2012 -0500 - - Move most testing logic into hb_test_tools.py - - The actual utils are one-liners now. - - test/shaping/hb-diff | 77 ++------------- - test/shaping/hb-diff-filter-failures | 27 +----- - test/shaping/hb-unicode-decode | 18 +--- - test/shaping/hb-unicode-encode | 21 +---- - test/shaping/hb-unicode-prettyname | 53 +---------- - test/shaping/hb_test_tools.py | 180 - ++++++++++++++++++++++++++++++++++ - 6 files changed, 197 insertions(+), 179 deletions(-) - -commit 66aa080033dcff07b8bb5e7b1f0e3511f067d6c1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 17:36:10 2012 -0500 - - Remove test-shape-complex - - New shaping testsuite and framework coming. - - test/api/Makefile.am | 6 - - test/api/test-shape-complex.c | 1237 - ------------------------------------ - test/shaping/hb-unicode-prettyname | 1 + - 3 files changed, 1 insertions(+), 1243 deletions(-) - -commit ed459bfb63c58b59fc0dbe25021c396e8ef8683c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 17:24:05 2012 -0500 - - Add hb-unicode-encode - - test/shaping/hb-unicode-encode | 22 ++++++++++++++++++++++ - 1 files changed, 22 insertions(+), 0 deletions(-) - -commit d8134bc017ca3383e0978ddee57070eb3aab8964 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 17:18:59 2012 -0500 - - [hb-shape] Add parantheses around --show-text output - - util/options.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit b12c4d43614199f8910a06507603f6c431d9df67 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 17:17:44 2012 -0500 - - Add hb-diff-filter-failures - - test/shaping/hb-diff-filter-failures | 28 ++++++++++++++++++++++++++++ - 1 files changed, 28 insertions(+), 0 deletions(-) - -commit d4bffbc55bf4c23ab5c7f46af613aeecc79ac515 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 17:16:35 2012 -0500 - - Move - - test/shaping/texts/MANIFEST | 4 +- - test/shaping/texts/in-tree/MANIFEST | 3 + - test/shaping/texts/in-tree/shaper-arabic/MANIFEST | 5 + - test/shaping/texts/in-tree/shaper-indic/MANIFEST | 1 + - .../texts/in-tree/shaper-indic/indic/MANIFEST | 11 + - .../shaper-indic/indic/script-assamese/MANIFEST | 1 + - .../indic/script-assamese/utrrs/LICENSE | 19 + - .../indic/script-assamese/utrrs/MANIFEST | 3 + - .../indic/script-assamese/utrrs/README | 13 + - .../indic/script-assamese/utrrs/SOURCES | 2 + - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 4 + - .../IndicFontFeatureCodepoint-Consonants.txt | 40 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 10 + - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 11 + - .../IndicFontFeatureCodepoint-Reserved.txt | 2 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 + - .../indic/script-assamese/utrrs/codepoint/MANIFEST | 7 + - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 59 + - .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 131 ++ - .../indic/script-assamese/utrrs/gpos/MANIFEST | 2 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 139 ++ - .../indic/script-assamese/utrrs/gsub/MANIFEST | 1 + - .../shaper-indic/indic/script-bengali/MANIFEST | 1 + - .../indic/script-bengali/utrrs/LICENSE | 19 + - .../indic/script-bengali/utrrs/MANIFEST | 3 + - .../shaper-indic/indic/script-bengali/utrrs/README | 13 + - .../indic/script-bengali/utrrs/SOURCES | 2 + - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 1 + - .../IndicFontFeatureCodepoint-Consonants.txt | 36 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 10 + - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 12 + - .../IndicFontFeatureCodepoint-Reserved.txt | 2 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 + - .../indic/script-bengali/utrrs/codepoint/MANIFEST | 7 + - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 58 + - .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 119 ++ - .../indic/script-bengali/utrrs/gpos/MANIFEST | 2 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 215 +++ - .../indic/script-bengali/utrrs/gsub/MANIFEST | 1 + - .../shaper-indic/indic/script-devanagari/MANIFEST | 1 + - .../indic/script-devanagari/utrrs/LICENSE | 19 + - .../indic/script-devanagari/utrrs/MANIFEST | 3 + - .../indic/script-devanagari/utrrs/README | 13 + - .../indic/script-devanagari/utrrs/SOURCES | 2 + - ...icFontFeatureCodepoint-AdditionalConsonants.txt | 8 + - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 4 + - .../IndicFontFeatureCodepoint-Consonants.txt | 45 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 14 + - ...tFeatureCodepoint-DevnagariSpecificAddition.txt | 1 + - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + - ...ndicFontFeatureCodepoint-GenericPunctuation.txt | 2 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 16 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 10 + - .../script-devanagari/utrrs/codepoint/MANIFEST | 9 + - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 185 +++ - .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 185 +++ - .../indic/script-devanagari/utrrs/gpos/MANIFEST | 2 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 1367 - ++++++++++++++++++++ - .../indic/script-devanagari/utrrs/gsub/MANIFEST | 1 + - .../shaper-indic/indic/script-gujarati/MANIFEST | 1 + - .../indic/script-gujarati/utrrs/LICENSE | 19 + - .../indic/script-gujarati/utrrs/MANIFEST | 3 + - .../indic/script-gujarati/utrrs/README | 13 + - .../indic/script-gujarati/utrrs/SOURCES | 2 + - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 1 + - .../IndicFontFeatureCodepoint-Consonants.txt | 34 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 12 + - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 13 + - .../IndicFontFeatureCodepoint-Reserved.txt | 2 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 7 + - .../indic/script-gujarati/utrrs/codepoint/MANIFEST | 7 + - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 170 +++ - .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 170 +++ - .../indic/script-gujarati/utrrs/gpos/MANIFEST | 2 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 1156 - +++++++++++++++++ - .../indic/script-gujarati/utrrs/gsub/MANIFEST | 1 + - .../shaper-indic/indic/script-kannada/MANIFEST | 1 + - .../indic/script-kannada/utrrs/LICENSE | 19 + - .../indic/script-kannada/utrrs/MANIFEST | 3 + - .../shaper-indic/indic/script-kannada/utrrs/README | 13 + - .../indic/script-kannada/utrrs/SOURCES | 2 + - ...icFontFeatureCodepoint-AdditionalConsonants.txt | 1 + - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 4 + - .../IndicFontFeatureCodepoint-Consonants.txt | 40 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 13 + - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 14 + - .../IndicFontFeatureCodepoint-Reserved.txt | 2 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 9 + - .../indic/script-kannada/utrrs/codepoint/MANIFEST | 8 + - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 188 +++ - .../indic/script-kannada/utrrs/gpos/MANIFEST | 1 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 306 +++++ - .../indic/script-kannada/utrrs/gsub/MANIFEST | 1 + - .../shaper-indic/indic/script-malayalam/MANIFEST | 1 + - .../indic/script-malayalam/utrrs/LICENSE | 19 + - .../indic/script-malayalam/utrrs/MANIFEST | 2 + - .../indic/script-malayalam/utrrs/README | 13 + - .../indic/script-malayalam/utrrs/SOURCES | 2 + - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 2 + - .../IndicFontFeatureCodepoint-Consonants.txt | 36 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 12 + - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 14 + - .../IndicFontFeatureCodepoint-Reserved.txt | 2 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 4 + - .../script-malayalam/utrrs/codepoint/MANIFEST | 7 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 254 ++++ - .../indic/script-malayalam/utrrs/gsub/MANIFEST | 1 + - .../shaper-indic/indic/script-oriya/MANIFEST | 1 + - .../shaper-indic/indic/script-oriya/utrrs/LICENSE | 19 + - .../shaper-indic/indic/script-oriya/utrrs/MANIFEST | 2 + - .../shaper-indic/indic/script-oriya/utrrs/README | 13 + - .../shaper-indic/indic/script-oriya/utrrs/SOURCES | 2 + - ...icFontFeatureCodepoint-AdditionalConsonants.txt | 3 + - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 2 + - .../IndicFontFeatureCodepoint-Consonants.txt | 34 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 12 + - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 12 + - .../IndicFontFeatureCodepoint-OriyaSpecific.txt | 2 + - .../IndicFontFeatureCodepoint-Reserved.txt | 2 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 8 + - .../indic/script-oriya/utrrs/codepoint/MANIFEST | 9 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 170 +++ - .../indic/script-oriya/utrrs/gsub/MANIFEST | 1 + - .../shaper-indic/indic/script-punjabi/MANIFEST | 1 + - .../indic/script-punjabi/utrrs/LICENSE | 19 + - .../indic/script-punjabi/utrrs/MANIFEST | 3 + - .../shaper-indic/indic/script-punjabi/utrrs/README | 13 + - .../indic/script-punjabi/utrrs/SOURCES | 2 + - .../IndicFontFeatureCodepoint-Consonants.txt | 38 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 9 + - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + - .../IndicFontFeatureCodepoint-GurmukhiSpecific.txt | 6 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 10 + - .../IndicFontFeatureCodepoint-Reserved.txt | 2 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 + - .../indic/script-punjabi/utrrs/codepoint/MANIFEST | 7 + - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 22 + - .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 2 + - .../indic/script-punjabi/utrrs/gpos/MANIFEST | 2 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 152 +++ - .../indic/script-punjabi/utrrs/gsub/MANIFEST | 1 + - .../shaper-indic/indic/script-sinhala/MANIFEST | 1 + - .../indic/script-sinhala/utrrs/LICENSE | 19 + - .../indic/script-sinhala/utrrs/MANIFEST | 3 + - .../shaper-indic/indic/script-sinhala/utrrs/README | 13 + - .../indic/script-sinhala/utrrs/SOURCES | 2 + - .../IndicFontFeatureCodepoint-Consonants.txt | 41 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 17 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 18 + - .../IndicFontFeatureCodepoint-Punctuation.txt | 1 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 3 + - .../indic/script-sinhala/utrrs/codepoint/MANIFEST | 5 + - .../utrrs/gpos/IndicFontFeatureGPOS.txt | 162 +++ - .../indic/script-sinhala/utrrs/gpos/MANIFEST | 1 + - .../utrrs/gsub/IndicFontFeatureGSUB-Conjunct.txt | 1 + - .../gsub/IndicFontFeatureGSUB-Rakaaraansaya.txt | 41 + - .../utrrs/gsub/IndicFontFeatureGSUB-Repaya.txt | 42 + - .../gsub/IndicFontFeatureGSUB-Special-Cases.txt | 2 + - .../gsub/IndicFontFeatureGSUB-TouchingLetters.txt | 1 + - .../utrrs/gsub/IndicFontFeatureGSUB-Yansaya.txt | 41 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 1 + - .../indic/script-sinhala/utrrs/gsub/MANIFEST | 7 + - .../shaper-indic/indic/script-tamil/MANIFEST | 1 + - .../shaper-indic/indic/script-tamil/utrrs/LICENSE | 19 + - .../shaper-indic/indic/script-tamil/utrrs/MANIFEST | 3 + - .../shaper-indic/indic/script-tamil/utrrs/README | 13 + - .../shaper-indic/indic/script-tamil/utrrs/SOURCES | 2 + - .../IndicFontFeatureCodepoint-Consonants.txt | 23 + - .../IndicFontFeatureCodepoint-CurrencySymbols.txt | 1 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 11 + - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 12 + - .../IndicFontFeatureCodepoint-Numerics.txt | 3 + - .../IndicFontFeatureCodepoint-Reserved.txt | 2 + - .../IndicFontFeatureCodepoint-Symbols.txt | 6 + - .../IndicFontFeatureCodepoint-TamilSymbol.txt | 1 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 4 + - .../indic/script-tamil/utrrs/codepoint/MANIFEST | 10 + - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 64 + - .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 44 + - .../indic/script-tamil/utrrs/gpos/MANIFEST | 2 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 4 + - .../indic/script-tamil/utrrs/gsub/MANIFEST | 1 + - .../shaper-indic/indic/script-telugu/MANIFEST | 1 + - .../shaper-indic/indic/script-telugu/utrrs/LICENSE | 19 + - .../indic/script-telugu/utrrs/MANIFEST | 3 + - .../shaper-indic/indic/script-telugu/utrrs/README | 13 + - .../shaper-indic/indic/script-telugu/utrrs/SOURCES | 2 + - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 2 + - .../IndicFontFeatureCodepoint-Consonants.txt | 38 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 13 + - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 14 + - .../IndicFontFeatureCodepoint-Reserved.txt | 2 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 + - .../indic/script-telugu/utrrs/codepoint/MANIFEST | 7 + - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 385 ++++++ - .../indic/script-telugu/utrrs/gpos/MANIFEST | 1 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 287 ++++ - .../indic/script-telugu/utrrs/gsub/MANIFEST | 1 + - test/shaping/texts/shaper-arabic/MANIFEST | 5 - - test/shaping/texts/shaper-indic/MANIFEST | 1 - - test/shaping/texts/shaper-indic/indic/MANIFEST | 11 - - .../shaper-indic/indic/script-assamese/MANIFEST | 1 - - .../indic/script-assamese/utrrs/LICENSE | 19 - - .../indic/script-assamese/utrrs/MANIFEST | 3 - - .../indic/script-assamese/utrrs/README | 13 - - .../indic/script-assamese/utrrs/SOURCES | 2 - - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 4 - - .../IndicFontFeatureCodepoint-Consonants.txt | 40 - - .../IndicFontFeatureCodepoint-DependentVowels.txt | 10 - - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 - - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 11 - - .../IndicFontFeatureCodepoint-Reserved.txt | 2 - - .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 - - .../indic/script-assamese/utrrs/codepoint/MANIFEST | 7 - - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 59 - - .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 131 -- - .../indic/script-assamese/utrrs/gpos/MANIFEST | 2 - - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 139 -- - .../indic/script-assamese/utrrs/gsub/MANIFEST | 1 - - .../shaper-indic/indic/script-bengali/MANIFEST | 1 - - .../indic/script-bengali/utrrs/LICENSE | 19 - - .../indic/script-bengali/utrrs/MANIFEST | 3 - - .../shaper-indic/indic/script-bengali/utrrs/README | 13 - - .../indic/script-bengali/utrrs/SOURCES | 2 - - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 1 - - .../IndicFontFeatureCodepoint-Consonants.txt | 36 - - .../IndicFontFeatureCodepoint-DependentVowels.txt | 10 - - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 - - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 12 - - .../IndicFontFeatureCodepoint-Reserved.txt | 2 - - .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 - - .../indic/script-bengali/utrrs/codepoint/MANIFEST | 7 - - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 58 - - .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 119 -- - .../indic/script-bengali/utrrs/gpos/MANIFEST | 2 - - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 215 --- - .../indic/script-bengali/utrrs/gsub/MANIFEST | 1 - - .../shaper-indic/indic/script-devanagari/MANIFEST | 1 - - .../indic/script-devanagari/utrrs/LICENSE | 19 - - .../indic/script-devanagari/utrrs/MANIFEST | 3 - - .../indic/script-devanagari/utrrs/README | 13 - - .../indic/script-devanagari/utrrs/SOURCES | 2 - - ...icFontFeatureCodepoint-AdditionalConsonants.txt | 8 - - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 4 - - .../IndicFontFeatureCodepoint-Consonants.txt | 45 - - .../IndicFontFeatureCodepoint-DependentVowels.txt | 14 - - ...tFeatureCodepoint-DevnagariSpecificAddition.txt | 1 - - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 - - ...ndicFontFeatureCodepoint-GenericPunctuation.txt | 2 - - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 16 - - .../IndicFontFeatureCodepoint-VariousSigns.txt | 10 - - .../script-devanagari/utrrs/codepoint/MANIFEST | 9 - - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 185 --- - .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 185 --- - .../indic/script-devanagari/utrrs/gpos/MANIFEST | 2 - - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 1367 - -------------------- - .../indic/script-devanagari/utrrs/gsub/MANIFEST | 1 - - .../shaper-indic/indic/script-gujarati/MANIFEST | 1 - - .../indic/script-gujarati/utrrs/LICENSE | 19 - - .../indic/script-gujarati/utrrs/MANIFEST | 3 - - .../indic/script-gujarati/utrrs/README | 13 - - .../indic/script-gujarati/utrrs/SOURCES | 2 - - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 1 - - .../IndicFontFeatureCodepoint-Consonants.txt | 34 - - .../IndicFontFeatureCodepoint-DependentVowels.txt | 12 - - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 - - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 13 - - .../IndicFontFeatureCodepoint-Reserved.txt | 2 - - .../IndicFontFeatureCodepoint-VariousSigns.txt | 7 - - .../indic/script-gujarati/utrrs/codepoint/MANIFEST | 7 - - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 170 --- - .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 170 --- - .../indic/script-gujarati/utrrs/gpos/MANIFEST | 2 - - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 1156 - ----------------- - .../indic/script-gujarati/utrrs/gsub/MANIFEST | 1 - - .../shaper-indic/indic/script-kannada/MANIFEST | 1 - - .../indic/script-kannada/utrrs/LICENSE | 19 - - .../indic/script-kannada/utrrs/MANIFEST | 3 - - .../shaper-indic/indic/script-kannada/utrrs/README | 13 - - .../indic/script-kannada/utrrs/SOURCES | 2 - - ...icFontFeatureCodepoint-AdditionalConsonants.txt | 1 - - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 4 - - .../IndicFontFeatureCodepoint-Consonants.txt | 40 - - .../IndicFontFeatureCodepoint-DependentVowels.txt | 13 - - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 - - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 14 - - .../IndicFontFeatureCodepoint-Reserved.txt | 2 - - .../IndicFontFeatureCodepoint-VariousSigns.txt | 9 - - .../indic/script-kannada/utrrs/codepoint/MANIFEST | 8 - - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 188 --- - .../indic/script-kannada/utrrs/gpos/MANIFEST | 1 - - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 306 ----- - .../indic/script-kannada/utrrs/gsub/MANIFEST | 1 - - .../shaper-indic/indic/script-malayalam/MANIFEST | 1 - - .../indic/script-malayalam/utrrs/LICENSE | 19 - - .../indic/script-malayalam/utrrs/MANIFEST | 2 - - .../indic/script-malayalam/utrrs/README | 13 - - .../indic/script-malayalam/utrrs/SOURCES | 2 - - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 2 - - .../IndicFontFeatureCodepoint-Consonants.txt | 36 - - .../IndicFontFeatureCodepoint-DependentVowels.txt | 12 - - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 - - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 14 - - .../IndicFontFeatureCodepoint-Reserved.txt | 2 - - .../IndicFontFeatureCodepoint-VariousSigns.txt | 4 - - .../script-malayalam/utrrs/codepoint/MANIFEST | 7 - - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 254 ---- - .../indic/script-malayalam/utrrs/gsub/MANIFEST | 1 - - .../texts/shaper-indic/indic/script-oriya/MANIFEST | 1 - - .../shaper-indic/indic/script-oriya/utrrs/LICENSE | 19 - - .../shaper-indic/indic/script-oriya/utrrs/MANIFEST | 2 - - .../shaper-indic/indic/script-oriya/utrrs/README | 13 - - .../shaper-indic/indic/script-oriya/utrrs/SOURCES | 2 - - ...icFontFeatureCodepoint-AdditionalConsonants.txt | 3 - - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 2 - - .../IndicFontFeatureCodepoint-Consonants.txt | 34 - - .../IndicFontFeatureCodepoint-DependentVowels.txt | 12 - - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 - - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 12 - - .../IndicFontFeatureCodepoint-OriyaSpecific.txt | 2 - - .../IndicFontFeatureCodepoint-Reserved.txt | 2 - - .../IndicFontFeatureCodepoint-VariousSigns.txt | 8 - - .../indic/script-oriya/utrrs/codepoint/MANIFEST | 9 - - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 170 --- - .../indic/script-oriya/utrrs/gsub/MANIFEST | 1 - - .../shaper-indic/indic/script-punjabi/MANIFEST | 1 - - .../indic/script-punjabi/utrrs/LICENSE | 19 - - .../indic/script-punjabi/utrrs/MANIFEST | 3 - - .../shaper-indic/indic/script-punjabi/utrrs/README | 13 - - .../indic/script-punjabi/utrrs/SOURCES | 2 - - .../IndicFontFeatureCodepoint-Consonants.txt | 38 - - .../IndicFontFeatureCodepoint-DependentVowels.txt | 9 - - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 - - .../IndicFontFeatureCodepoint-GurmukhiSpecific.txt | 6 - - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 10 - - .../IndicFontFeatureCodepoint-Reserved.txt | 2 - - .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 - - .../indic/script-punjabi/utrrs/codepoint/MANIFEST | 7 - - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 22 - - .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 2 - - .../indic/script-punjabi/utrrs/gpos/MANIFEST | 2 - - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 152 --- - .../indic/script-punjabi/utrrs/gsub/MANIFEST | 1 - - .../shaper-indic/indic/script-sinhala/MANIFEST | 1 - - .../indic/script-sinhala/utrrs/LICENSE | 19 - - .../indic/script-sinhala/utrrs/MANIFEST | 3 - - .../shaper-indic/indic/script-sinhala/utrrs/README | 13 - - .../indic/script-sinhala/utrrs/SOURCES | 2 - - .../IndicFontFeatureCodepoint-Consonants.txt | 41 - - .../IndicFontFeatureCodepoint-DependentVowels.txt | 17 - - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 18 - - .../IndicFontFeatureCodepoint-Punctuation.txt | 1 - - .../IndicFontFeatureCodepoint-VariousSigns.txt | 3 - - .../indic/script-sinhala/utrrs/codepoint/MANIFEST | 5 - - .../utrrs/gpos/IndicFontFeatureGPOS.txt | 162 --- - .../indic/script-sinhala/utrrs/gpos/MANIFEST | 1 - - .../utrrs/gsub/IndicFontFeatureGSUB-Conjunct.txt | 1 - - .../gsub/IndicFontFeatureGSUB-Rakaaraansaya.txt | 41 - - .../utrrs/gsub/IndicFontFeatureGSUB-Repaya.txt | 42 - - .../gsub/IndicFontFeatureGSUB-Special-Cases.txt | 2 - - .../gsub/IndicFontFeatureGSUB-TouchingLetters.txt | 1 - - .../utrrs/gsub/IndicFontFeatureGSUB-Yansaya.txt | 41 - - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 1 - - .../indic/script-sinhala/utrrs/gsub/MANIFEST | 7 - - .../texts/shaper-indic/indic/script-tamil/MANIFEST | 1 - - .../shaper-indic/indic/script-tamil/utrrs/LICENSE | 19 - - .../shaper-indic/indic/script-tamil/utrrs/MANIFEST | 3 - - .../shaper-indic/indic/script-tamil/utrrs/README | 13 - - .../shaper-indic/indic/script-tamil/utrrs/SOURCES | 2 - - .../IndicFontFeatureCodepoint-Consonants.txt | 23 - - .../IndicFontFeatureCodepoint-CurrencySymbols.txt | 1 - - .../IndicFontFeatureCodepoint-DependentVowels.txt | 11 - - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 - - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 12 - - .../IndicFontFeatureCodepoint-Numerics.txt | 3 - - .../IndicFontFeatureCodepoint-Reserved.txt | 2 - - .../IndicFontFeatureCodepoint-Symbols.txt | 6 - - .../IndicFontFeatureCodepoint-TamilSymbol.txt | 1 - - .../IndicFontFeatureCodepoint-VariousSigns.txt | 4 - - .../indic/script-tamil/utrrs/codepoint/MANIFEST | 10 - - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 64 - - .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 44 - - .../indic/script-tamil/utrrs/gpos/MANIFEST | 2 - - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 4 - - .../indic/script-tamil/utrrs/gsub/MANIFEST | 1 - - .../shaper-indic/indic/script-telugu/MANIFEST | 1 - - .../shaper-indic/indic/script-telugu/utrrs/LICENSE | 19 - - .../indic/script-telugu/utrrs/MANIFEST | 3 - - .../shaper-indic/indic/script-telugu/utrrs/README | 13 - - .../shaper-indic/indic/script-telugu/utrrs/SOURCES | 2 - - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 2 - - .../IndicFontFeatureCodepoint-Consonants.txt | 38 - - .../IndicFontFeatureCodepoint-DependentVowels.txt | 13 - - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 - - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 14 - - .../IndicFontFeatureCodepoint-Reserved.txt | 2 - - .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 - - .../indic/script-telugu/utrrs/codepoint/MANIFEST | 7 - - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 385 ------ - .../indic/script-telugu/utrrs/gpos/MANIFEST | 1 - - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 287 ---- - .../indic/script-telugu/utrrs/gsub/MANIFEST | 1 - - 410 files changed, 7601 insertions(+), 7600 deletions(-) - -commit 45f640c98d752161e51eda63061d70fad9ab9f68 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 14:24:21 2012 -0500 - - Minor - - test/shaping/hb-diff | 35 ++++++++++++++++++++--------------- - 1 files changed, 20 insertions(+), 15 deletions(-) - -commit 47ca766a9cbdfb304f60e23a4dee0a155075a277 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 14:21:53 2012 -0500 - - Minor - - test/shaping/hb-unicode-decode | 2 +- - test/shaping/hb-unicode-prettyname | 5 ++--- - 2 files changed, 3 insertions(+), 4 deletions(-) - -commit 8f1db07894674b02c36ca9352e666b4618ee8832 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 13:57:57 2012 -0500 - - [test/shaping] Add some Indic test data for the new test suite - - Imported from UTRRS. - - test/shaping/texts/shaper-indic/indic/MANIFEST | 2 +- - .../shaper-indic/indic/script-assamese/MANIFEST | 1 + - .../indic/script-assamese/utrrs/LICENSE | 19 + - .../indic/script-assamese/utrrs/MANIFEST | 3 + - .../indic/script-assamese/utrrs/README | 13 + - .../indic/script-assamese/utrrs/SOURCES | 2 + - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 4 + - .../IndicFontFeatureCodepoint-Consonants.txt | 40 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 10 + - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 11 + - .../IndicFontFeatureCodepoint-Reserved.txt | 2 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 + - .../indic/script-assamese/utrrs/codepoint/MANIFEST | 7 + - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 59 + - .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 131 ++ - .../indic/script-assamese/utrrs/gpos/MANIFEST | 2 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 139 ++ - .../indic/script-assamese/utrrs/gsub/MANIFEST | 1 + - .../shaper-indic/indic/script-bengali/MANIFEST | 1 + - .../indic/script-bengali/utrrs/LICENSE | 19 + - .../indic/script-bengali/utrrs/MANIFEST | 3 + - .../shaper-indic/indic/script-bengali/utrrs/README | 13 + - .../indic/script-bengali/utrrs/SOURCES | 2 + - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 1 + - .../IndicFontFeatureCodepoint-Consonants.txt | 36 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 10 + - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 12 + - .../IndicFontFeatureCodepoint-Reserved.txt | 2 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 + - .../indic/script-bengali/utrrs/codepoint/MANIFEST | 7 + - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 58 + - .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 119 ++ - .../indic/script-bengali/utrrs/gpos/MANIFEST | 2 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 215 +++ - .../indic/script-bengali/utrrs/gsub/MANIFEST | 1 + - .../shaper-indic/indic/script-devanagari/MANIFEST | 1 + - .../indic/script-devanagari/utrrs/LICENSE | 19 + - .../indic/script-devanagari/utrrs/MANIFEST | 3 + - .../indic/script-devanagari/utrrs/README | 13 + - .../indic/script-devanagari/utrrs/SOURCES | 2 + - ...icFontFeatureCodepoint-AdditionalConsonants.txt | 8 + - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 4 + - .../IndicFontFeatureCodepoint-Consonants.txt | 45 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 14 + - ...tFeatureCodepoint-DevnagariSpecificAddition.txt | 1 + - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + - ...ndicFontFeatureCodepoint-GenericPunctuation.txt | 2 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 16 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 10 + - .../script-devanagari/utrrs/codepoint/MANIFEST | 9 + - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 185 +++ - .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 185 +++ - .../indic/script-devanagari/utrrs/gpos/MANIFEST | 2 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 1367 - ++++++++++++++++++++ - .../indic/script-devanagari/utrrs/gsub/MANIFEST | 1 + - .../shaper-indic/indic/script-gujarati/MANIFEST | 1 + - .../indic/script-gujarati/utrrs/LICENSE | 19 + - .../indic/script-gujarati/utrrs/MANIFEST | 3 + - .../indic/script-gujarati/utrrs/README | 13 + - .../indic/script-gujarati/utrrs/SOURCES | 2 + - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 1 + - .../IndicFontFeatureCodepoint-Consonants.txt | 34 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 12 + - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 13 + - .../IndicFontFeatureCodepoint-Reserved.txt | 2 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 7 + - .../indic/script-gujarati/utrrs/codepoint/MANIFEST | 7 + - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 170 +++ - .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 170 +++ - .../indic/script-gujarati/utrrs/gpos/MANIFEST | 2 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 1156 - +++++++++++++++++ - .../indic/script-gujarati/utrrs/gsub/MANIFEST | 1 + - .../shaper-indic/indic/script-kannada/MANIFEST | 1 + - .../indic/script-kannada/utrrs/LICENSE | 19 + - .../indic/script-kannada/utrrs/MANIFEST | 3 + - .../shaper-indic/indic/script-kannada/utrrs/README | 13 + - .../indic/script-kannada/utrrs/SOURCES | 2 + - ...icFontFeatureCodepoint-AdditionalConsonants.txt | 1 + - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 4 + - .../IndicFontFeatureCodepoint-Consonants.txt | 40 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 13 + - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 14 + - .../IndicFontFeatureCodepoint-Reserved.txt | 2 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 9 + - .../indic/script-kannada/utrrs/codepoint/MANIFEST | 8 + - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 188 +++ - .../indic/script-kannada/utrrs/gpos/MANIFEST | 1 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 306 +++++ - .../indic/script-kannada/utrrs/gsub/MANIFEST | 1 + - .../shaper-indic/indic/script-malayalam/MANIFEST | 1 + - .../indic/script-malayalam/utrrs/LICENSE | 19 + - .../indic/script-malayalam/utrrs/MANIFEST | 2 + - .../indic/script-malayalam/utrrs/README | 13 + - .../indic/script-malayalam/utrrs/SOURCES | 2 + - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 2 + - .../IndicFontFeatureCodepoint-Consonants.txt | 36 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 12 + - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 14 + - .../IndicFontFeatureCodepoint-Reserved.txt | 2 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 4 + - .../script-malayalam/utrrs/codepoint/MANIFEST | 7 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 254 ++++ - .../indic/script-malayalam/utrrs/gsub/MANIFEST | 1 + - .../texts/shaper-indic/indic/script-oriya/MANIFEST | 1 + - .../shaper-indic/indic/script-oriya/utrrs/LICENSE | 19 + - .../shaper-indic/indic/script-oriya/utrrs/MANIFEST | 2 + - .../shaper-indic/indic/script-oriya/utrrs/README | 13 + - .../shaper-indic/indic/script-oriya/utrrs/SOURCES | 2 + - ...icFontFeatureCodepoint-AdditionalConsonants.txt | 3 + - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 2 + - .../IndicFontFeatureCodepoint-Consonants.txt | 34 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 12 + - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 12 + - .../IndicFontFeatureCodepoint-OriyaSpecific.txt | 2 + - .../IndicFontFeatureCodepoint-Reserved.txt | 2 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 8 + - .../indic/script-oriya/utrrs/codepoint/MANIFEST | 9 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 170 +++ - .../indic/script-oriya/utrrs/gsub/MANIFEST | 1 + - .../shaper-indic/indic/script-punjabi/MANIFEST | 1 + - .../indic/script-punjabi/utrrs/LICENSE | 19 + - .../indic/script-punjabi/utrrs/MANIFEST | 3 + - .../shaper-indic/indic/script-punjabi/utrrs/README | 13 + - .../indic/script-punjabi/utrrs/SOURCES | 2 + - .../IndicFontFeatureCodepoint-Consonants.txt | 38 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 9 + - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + - .../IndicFontFeatureCodepoint-GurmukhiSpecific.txt | 6 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 10 + - .../IndicFontFeatureCodepoint-Reserved.txt | 2 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 + - .../indic/script-punjabi/utrrs/codepoint/MANIFEST | 7 + - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 22 + - .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 2 + - .../indic/script-punjabi/utrrs/gpos/MANIFEST | 2 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 152 +++ - .../indic/script-punjabi/utrrs/gsub/MANIFEST | 1 + - .../shaper-indic/indic/script-sinhala/MANIFEST | 1 + - .../indic/script-sinhala/utrrs/LICENSE | 19 + - .../indic/script-sinhala/utrrs/MANIFEST | 3 + - .../shaper-indic/indic/script-sinhala/utrrs/README | 13 + - .../indic/script-sinhala/utrrs/SOURCES | 2 + - .../IndicFontFeatureCodepoint-Consonants.txt | 41 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 17 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 18 + - .../IndicFontFeatureCodepoint-Punctuation.txt | 1 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 3 + - .../indic/script-sinhala/utrrs/codepoint/MANIFEST | 5 + - .../utrrs/gpos/IndicFontFeatureGPOS.txt | 162 +++ - .../indic/script-sinhala/utrrs/gpos/MANIFEST | 1 + - .../utrrs/gsub/IndicFontFeatureGSUB-Conjunct.txt | 1 + - .../gsub/IndicFontFeatureGSUB-Rakaaraansaya.txt | 41 + - .../utrrs/gsub/IndicFontFeatureGSUB-Repaya.txt | 42 + - .../gsub/IndicFontFeatureGSUB-Special-Cases.txt | 2 + - .../gsub/IndicFontFeatureGSUB-TouchingLetters.txt | 1 + - .../utrrs/gsub/IndicFontFeatureGSUB-Yansaya.txt | 41 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 1 + - .../indic/script-sinhala/utrrs/gsub/MANIFEST | 7 + - .../texts/shaper-indic/indic/script-tamil/MANIFEST | 1 + - .../shaper-indic/indic/script-tamil/utrrs/LICENSE | 19 + - .../shaper-indic/indic/script-tamil/utrrs/MANIFEST | 3 + - .../shaper-indic/indic/script-tamil/utrrs/README | 13 + - .../shaper-indic/indic/script-tamil/utrrs/SOURCES | 2 + - .../IndicFontFeatureCodepoint-Consonants.txt | 23 + - .../IndicFontFeatureCodepoint-CurrencySymbols.txt | 1 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 11 + - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 12 + - .../IndicFontFeatureCodepoint-Numerics.txt | 3 + - .../IndicFontFeatureCodepoint-Reserved.txt | 2 + - .../IndicFontFeatureCodepoint-Symbols.txt | 6 + - .../IndicFontFeatureCodepoint-TamilSymbol.txt | 1 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 4 + - .../indic/script-tamil/utrrs/codepoint/MANIFEST | 10 + - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 64 + - .../utrrs/gpos/IndicFontFeatureGPOS-BelowBase.txt | 44 + - .../indic/script-tamil/utrrs/gpos/MANIFEST | 2 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 4 + - .../indic/script-tamil/utrrs/gsub/MANIFEST | 1 + - .../shaper-indic/indic/script-telugu/MANIFEST | 1 + - .../shaper-indic/indic/script-telugu/utrrs/LICENSE | 19 + - .../indic/script-telugu/utrrs/MANIFEST | 3 + - .../shaper-indic/indic/script-telugu/utrrs/README | 13 + - .../shaper-indic/indic/script-telugu/utrrs/SOURCES | 2 + - .../IndicFontFeatureCodepoint-AdditionalVowels.txt | 2 + - .../IndicFontFeatureCodepoint-Consonants.txt | 38 + - .../IndicFontFeatureCodepoint-DependentVowels.txt | 13 + - .../codepoint/IndicFontFeatureCodepoint-Digits.txt | 10 + - ...IndicFontFeatureCodepoint-IndependentVowels.txt | 14 + - .../IndicFontFeatureCodepoint-Reserved.txt | 2 + - .../IndicFontFeatureCodepoint-VariousSigns.txt | 6 + - .../indic/script-telugu/utrrs/codepoint/MANIFEST | 7 + - .../utrrs/gpos/IndicFontFeatureGPOS-AboveBase.txt | 385 ++++++ - .../indic/script-telugu/utrrs/gpos/MANIFEST | 1 + - .../utrrs/gsub/IndicFontFeatureGSUB.txt | 287 ++++ - .../indic/script-telugu/utrrs/gsub/MANIFEST | 1 + - 202 files changed, 7581 insertions(+), 1 deletions(-) - -commit 11267aef364b1cc5683ce65aaf544b7f2a127fb3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 13:57:14 2012 -0500 - - Fix - - test/shaping/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4e84ce48d5d41cf1bad2fb8774e5c66745b0e75e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 13:50:55 2012 -0500 - - Move hb-diff to test/shaping/ - - test/shaping/hb-diff | 70 - ++++++++++++++++++++++++++++++++++++++++++++++++++ - util/Makefile.am | 2 - - util/hb-diff | 70 - -------------------------------------------------- - 3 files changed, 70 insertions(+), 72 deletions(-) - -commit f868e1b84d2f73688d4d6558d44610b1ac75ec13 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 13:50:05 2012 -0500 - - Add hb-unicode-decode - - test/shaping/hb-manifest-read | 36 - ++++++++++++++++++++++++++++++++++++ - test/shaping/hb-manifest-update | 22 ++++++++++++++++++++++ - test/shaping/hb-read-manifest | 36 - ------------------------------------ - test/shaping/hb-unicode-decode | 19 +++++++++++++++++++ - test/shaping/hb-update-manifests | 22 ---------------------- - 5 files changed, 77 insertions(+), 58 deletions(-) - -commit 9ab23ef4749b51e60464b9ef2a92739cdc2b36ba -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 13:49:56 2012 -0500 - - Minor - - test/shaping/hb-unicode-prettyname | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit c8d81db03335192f20f08ab8fabe9869fd7350a2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 13:39:27 2012 -0500 - - Recognize more characters - - test/shaping/hb-unicode-prettyname | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit 0016d4662d486fa32c2191df801a2792f44b273c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jan 20 13:31:59 2012 -0500 - - [test] Make hb-unicode-prettyname take a --stdin option - - test/shaping/hb-unicode-prettyname | 15 +++++++++------ - 1 files changed, 9 insertions(+), 6 deletions(-) - -commit ad8c6446f2e0d21d065203924467f6a2c418401e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 19 20:28:31 2012 -0500 - - [test/shaping] Add hb-unicode-prettyname - - test/shaping/hb-unicode-prettyname | 38 - ++++++++++++++++++++++++++++++++++++ - 1 files changed, 38 insertions(+), 0 deletions(-) - -commit e900869b0f373d25b72d966338beb6cbc53e6446 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 19 20:28:15 2012 -0500 - - [test/shaping] Add hb-read-manifest - - test/shaping/hb-read-manifest | 36 ++++++++++++++++++++++++++++++++++++ - 1 files changed, 36 insertions(+), 0 deletions(-) - -commit a211cd3ffce3aa100e92d837384bbaa9decf6b09 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 19 20:27:53 2012 -0500 - - Ignore AUTHORS also - - test/shaping/hb-update-manifests | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c91c4fa47140c0d6191241a832fc534b1c1514ce -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 19 17:51:57 2012 -0500 - - [hb-shape] Change glyphstring brackets from </> to [/] - - Sorry for the disruption but I need this to differentiate from the - Unicode string. - - util/options.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 36fe87d1b4bf8317074a597501d1ee52c0bec38d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 19 16:55:26 2012 -0500 - - More Indic tests from Pravin - - test/api/test-shape-complex.c | 48 - +++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 48 insertions(+), 0 deletions(-) - -commit a33e46cf7d9862856fd7ecb04e047cc58a9785c8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 19 15:43:48 2012 -0500 - - [test/shaping] Add hb-update-manifests - - test/shaping/Makefile.am | 6 ++---- - test/shaping/hb-update-manifests | 22 - ++++++++++++++++++++++ - test/shaping/texts/shaper-indic/indic/MANIFEST | 1 + - 3 files changed, 25 insertions(+), 4 deletions(-) - -commit d4de562adf691425b15e3e9c0eec035feaa60413 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 19 15:21:04 2012 -0500 - - Start adding new shaping test suite together - - configure.ac | 1 + - test/Makefile.am | 2 +- - test/shaping/Makefile.am | 10 ++++++++++ - test/shaping/texts/MANIFEST | 3 +++ - test/shaping/texts/shaper-arabic/MANIFEST | 5 +++++ - test/shaping/texts/shaper-indic/MANIFEST | 1 + - test/shaping/texts/shaper-indic/indic/MANIFEST | 10 ++++++++++ - 7 files changed, 31 insertions(+), 1 deletions(-) - -commit 7a4a848db27d1605195f677c9c8632cde558aa05 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 19 15:15:21 2012 -0500 - - Minor - - src/hb-ot-shape-complex-private.hh | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 4d6dafd47f4271549e528d2e8047d50562aef399 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 19 14:52:02 2012 -0500 - - Rename test/ to test/api/ - - configure.ac | 1 + - test/Makefile.am | 128 +----- - test/api/Makefile.am | 131 +++++ - test/api/hb-test.h | 265 +++++++++ - test/api/test-blob.c | 301 +++++++++++ - test/api/test-buffer.c | 783 +++++++++++++++++++++++++++ - test/api/test-c.c | 58 ++ - test/api/test-common.c | 213 ++++++++ - test/api/test-cplusplus.cc | 30 + - test/api/test-font.c | 502 +++++++++++++++++ - test/api/test-object.c | 367 +++++++++++++ - test/api/test-ot-tag.c | 241 +++++++++ - test/api/test-shape-complex.c | 1189 - +++++++++++++++++++++++++++++++++++++++++ - test/api/test-shape.c | 165 ++++++ - test/api/test-unicode.c | 887 ++++++++++++++++++++++++++++++ - test/api/test-version.c | 80 +++ - test/hb-test.h | 265 --------- - test/test-blob.c | 301 ----------- - test/test-buffer.c | 783 --------------------------- - test/test-c.c | 58 -- - test/test-common.c | 213 -------- - test/test-cplusplus.cc | 30 - - test/test-font.c | 502 ----------------- - test/test-object.c | 367 ------------- - test/test-ot-tag.c | 241 --------- - test/test-shape-complex.c | 1189 - ----------------------------------------- - test/test-shape.c | 165 ------ - test/test-unicode.c | 887 ------------------------------ - test/test-version.c | 80 --- - 29 files changed, 5214 insertions(+), 5208 deletions(-) - -commit 3b5c22c39b87155f315853fb0c40edcf14e99b54 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 19 14:28:11 2012 -0500 - - Remove src/test.cc - - Not really useful. - - src/Makefile.am | 6 +-- - src/test.cc | 132 - ------------------------------------------------------- - 2 files changed, 1 insertions(+), 137 deletions(-) - -commit 4983feebbbb25e79201bf34035e4d58e61218758 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 19 13:54:52 2012 -0500 - - [hb-diff] Clean up - - util/hb-diff | 41 ++++++++++++++++++++++++++--------------- - 1 files changed, 26 insertions(+), 15 deletions(-) - -commit cdc673d97c5ffedb386865a81f54a5cedcbad27c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 19 12:46:18 2012 -0500 - - [hb-shape] Add --show-line-num - - Ok, much more useful as a test suite driver now. - - util/hb-shape.cc | 24 +++++------------------- - util/options.cc | 34 ++++++++++++++++++++++++++++++++++ - util/options.hh | 25 ++++++++++++++++++++----- - 3 files changed, 59 insertions(+), 24 deletions(-) - -commit cc4d9810d6318ca2e4de3b8d62f03b51cc21ee05 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 19 12:32:20 2012 -0500 - - [hb-shape] Add --show-text and --show-unicode options - - util/hb-shape.cc | 19 ++++++++++++++++++- - util/options.cc | 26 +++++++++++++++++++++++--- - util/options.hh | 12 +++++++++--- - 3 files changed, 50 insertions(+), 7 deletions(-) - -commit 27c36af411c7c4d75dd25d79fc76dd92c6bb9643 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 19 12:30:43 2012 -0500 - - Fix OOB in hb-shape - - util/options.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8d2781d69274672303e30522e222bd01c6b5e781 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 19 11:36:39 2012 -0500 - - [test] Add two Indic test cases from Bernard Massot - - test/test-shape-complex.c | 16 ++++++++++++++++ - 1 files changed, 16 insertions(+), 0 deletions(-) - -commit 8750abaf8410005facbea8c886c592bead7f959b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jan 18 22:47:44 2012 -0500 - - [util] Add --help-features - - Patch from Khaled Hosny. - - util/options.cc | 42 +++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 41 insertions(+), 1 deletions(-) - -commit 889caa52fa1bef61013ec1d127f84d7d5907ef1e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jan 18 22:32:52 2012 -0500 - - [icu] Use U_FAILURE - - src/hb-icu.cc | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 36a4f4a482456ee816dcb59befa0b0538ba487df -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jan 18 22:16:49 2012 -0500 - - Replace u_strlen() with u_countChar32() - - The latter is what I meant. - - src/hb-icu.cc | 8 +++----- - 1 files changed, 3 insertions(+), 5 deletions(-) - -commit 055fb24d03ae518fa0aa6c2860a03f3cb6a5ef0d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jan 18 21:58:34 2012 -0500 - - Add test for bug in ICU decompose - - As reported by Kenichi Ishibashi on 2011-10-28. - - test/test-unicode.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c521e793bd6c1dafacb94253a45b9c70ab38525e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jan 18 21:51:05 2012 -0500 - - Fix OOB in replace_glyph() - - Patch from Kenichi Ishibashi. - - src/hb-buffer.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 03408ce73d003ed4e58e3f8472f9445e72b86bee -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jan 18 21:28:34 2012 -0500 - - Fix more possible buffer overruns - - I have this function, but can't clean up it to my satisfaction. - - src/hb-ot-layout-gsubgpos-private.hh | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 7d479900cd11bc88148cd601ee43bc5492ce5843 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jan 18 21:19:32 2012 -0500 - - Refactor the two remaining uses of _hb_ot_layout_skip_mark() - - src/hb-ot-layout-gsub-table.hh | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 7 +++++-- - 2 files changed, 6 insertions(+), 3 deletions(-) - -commit 506ffeb8e77a668fa305139582d215c32e46bb03 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jan 18 16:07:53 2012 -0500 - - Further mark skippy fixes from Jonathan Kew - - We should be in good shape now. - - src/hb-ot-layout-gsubgpos-private.hh | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit a4a48fe6d4f884a37e720430347d10dbe3562a79 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jan 17 18:08:41 2012 -0500 - - Fix mark skipping regression - - Ouch! - - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4ab97311541225906f6b737a2b47de252224cc09 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jan 16 22:05:08 2012 -0500 - - Refactor mark skipping - - src/hb-ot-layout-gpos-table.hh | 95 ++++++++++---------------- - src/hb-ot-layout-gsub-table.hh | 21 +++--- - src/hb-ot-layout-gsubgpos-private.hh | 125 - ++++++++++++++++++++++++++-------- - 3 files changed, 143 insertions(+), 98 deletions(-) - -commit 370f03e9c69d98d735eafb7e72b13b17f42cbaa9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jan 16 17:03:55 2012 -0500 - - Minor - - src/hb-ot-layout-gsub-table.hh | 5 ++--- - src/hb-ot-layout-gsubgpos-private.hh | 6 ++---- - 2 files changed, 4 insertions(+), 7 deletions(-) - -commit 4d3aeb8cb2bc1ca7cdd03ba28ba8c334f12d4c03 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jan 16 16:43:26 2012 -0500 - - [GSUB/GPOS] Fix mark skip indexing issues - - Mozilla bug 701637 and 714067 combined. - - Patch from Jonathan Kew. - - src/hb-ot-layout-gpos-table.hh | 42 - ++++++++++++++++---------------- - src/hb-ot-layout-gsub-table.hh | 21 ++++++++------- - src/hb-ot-layout-gsubgpos-private.hh | 45 - ++++++++++++++++----------------- - 3 files changed, 54 insertions(+), 54 deletions(-) - -commit e8eedf2687f05372bf5476e84139d01ba67c9f73 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jan 16 16:39:40 2012 -0500 - - Avoid enum trailing commas - - Based on patch from Jonathan Kew. - - src/hb-ot-shape-complex-indic.cc | 4 ++-- - src/hb-ot-shape-complex-private.hh | 2 ++ - 2 files changed, 4 insertions(+), 2 deletions(-) - -commit 3d0ddd12801689b4093ffca97da4dd9ca669b64a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jan 15 15:55:52 2012 -0500 - - Require glib >= 2.16 for the gobject option - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 95ab82a992ab916046c2e6205db7cadeec88d206 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jan 15 14:56:56 2012 -0500 - - Disable gtk-doc macro - - We don't have any docs yet. - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 299ae0c3a367c84a835eadbd1276ca284d2720c0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jan 14 21:29:45 2012 -0500 - - [icu] Remove glib-ism - - src/hb-icu.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit a097043f9a81e6c20caf69a5dabdf9e00438d79b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jan 14 17:55:51 2012 -0500 - - Allow space in one more place when parsing features - - util/options.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit af92135424b994062648f4fb7e26af0bd970a4b1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Oct 21 09:18:43 2011 -0700 - - Minor - - src/hb-object-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 89d89646e8163b6c0874b9a3c14d4da974ea8219 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Oct 17 11:50:54 2011 -0700 - - Fix intrin.h b0rkage with older MSVC - - Reported by Jonathan Kew. - - src/hb-object-private.hh | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit af913c5788e600e36d29f44fe4e77db84cf8c442 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Oct 17 11:39:28 2011 -0700 - - Fix infinite loop in normalization code with variation selectors - - Reported by Jonathan Kew. - - src/hb-ot-shape-normalize.cc | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit fd528c17b7b5ac912f1ac980e1d9981f561c3b46 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 12 15:03:58 2011 -0400 - - [util] Add --list-shapers to hb-view and hb-shape - - util/options.cc | 17 ++++++++++++++++- - 1 files changed, 16 insertions(+), 1 deletions(-) - -commit a17554bfd51dc8a37b1674d1ede63e616618e0a6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Sep 28 16:57:34 2011 -0400 - - Make test-c.c actually use hb - - This will make sure we test that C code can actually link to the - library. - - test/test-c.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 55deff7595ef357d000fef83559c74c9f8acad00 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Sep 28 16:20:09 2011 -0400 - - Add comments - - src/hb-ot-shape-normalize.cc | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit a240d5a0a3ccc71902e7a341b6d531995319999d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 27 13:50:45 2011 -0400 - - Add TODO item - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 52ebdff49d13f239efc886de935d47be9860f6e5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 27 12:38:16 2011 -0400 - - Fix GSUB lookuptype 1 subtype 1 delta wrapping - - src/hb-ot-layout-gsub-table.hh | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 5857720cd35078d1c3906c8b2db3190b5166b66f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 27 12:36:26 2011 -0400 - - [util] s/%d/%u/ when printing glyph ids and clusters - - util/options.cc | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit b95324cdd217f44c40c5fd44898e659500f19511 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Sep 21 16:50:39 2011 -0400 - - Minor - - src/hb-blob.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0cd33592ab4bb486ffc438ba0efdac2fa7a1bb7f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Sep 21 16:49:33 2011 -0400 - - Fix possible leaks - - src/hb-font.cc | 16 +++++++++++++--- - 1 files changed, 13 insertions(+), 3 deletions(-) - -commit d3f3690b485e1d240fec4f204aef54e07853a244 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Sep 21 16:41:43 2011 -0400 - - hb-shape: In --no-glyph-names, output glyph number directly - - Ie. write "86" instead of "gid86". - - util/options.cc | 11 +++++++---- - 1 files changed, 7 insertions(+), 4 deletions(-) - -commit 088c1e27c0fc0cdef999cf1f567e4d5eb2cfb2e4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 20 14:43:55 2011 -0400 - - [util] Fix option parsing - - Wow, who knew bool is one byte and I was using it as a 4byte int?! - - C++ auto casts fails you in mysterious ways... - - util/helper-cairo.cc | 2 +- - util/options.cc | 3 ++- - util/options.hh | 14 +++++++------- - 3 files changed, 10 insertions(+), 9 deletions(-) - -commit d606daa4cca323c8977b2e52e6863dc0f1b72fa9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 20 14:34:06 2011 -0400 - - Whitespace - - src/gen-arabic-table.py | 2 +- - src/gen-indic-table.py | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit e700bce1189465a159a7c3c179f231be224f31cc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 20 11:20:53 2011 -0400 - - [util] Add hb-diff - - A diff program written in Python that is more suitable for comparing - hb-shape output from different backends. Main differences with stock - diff: - - 1. It outputs one line's comparison at a time, as opposed to batching - '+' lines and '-' lines. - - 2. It colors the part of the line that changed, taking word boundaries - into consideration. - - You can pipe the colored output to 'less -r'. - - util/Makefile.am | 2 + - util/hb-diff | 59 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 61 insertions(+), 0 deletions(-) - -commit 880c1f0e4ede65890592d28dfb38bb06f5b57500 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 19 23:10:22 2011 -0400 - - Rewrite ICU detection code with in-house macros - - At least works for cross-compiling now... - - configure.ac | 26 +++++++++++++++----------- - 1 files changed, 15 insertions(+), 11 deletions(-) - -commit f83f0f4836691b04306c2ef80979f2e1d76a2f28 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 19 18:51:48 2011 -0400 - - [graphite] Add note about graphite shaker brokenness - - src/hb-graphite2.cc | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit 422558142aabb996d8ad1848df7ea4d5a8ade98a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 19 17:57:02 2011 -0400 - - [util] Account for line-space in surface size - - util/options.cc | 2 +- - util/options.hh | 1 - - util/view-cairo.cc | 2 +- - 3 files changed, 2 insertions(+), 3 deletions(-) - -commit b5afd8f78e6b372f1bbed469329c1554adb20eea -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 19 16:56:21 2011 -0400 - - [util] Rename --output to --output_file, and --format to - --output-format - - util/options.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 0a965eee880428a43ad7f9d1317c344666247dd7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 19 16:53:47 2011 -0400 - - Minor - - src/hb-ot-shape-complex-indic.cc | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 466393c2f04fb5b3dcb3e81ea9609905fa8c9648 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 19 16:50:18 2011 -0400 - - Really fix build this time - - util/hb-view.hh | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit fe1605db4f28ed75d5debe0db45a19aa77f0585f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 19 16:49:03 2011 -0400 - - Fix dist - - util/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 8b8b19056decaf09e4e0ccd9412ee1aeb30f4de7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 19 16:41:17 2011 -0400 - - [util] Add hb-shape utility - - Like hb-view, but prints out buffer contents. - - The output format is kinda cryptic. Suggestions welcome. - - configure.ac | 6 - - util/Makefile.am | 44 ++++-- - util/common.cc | 43 ------ - util/common.hh | 57 -------- - util/hb-shape.cc | 78 ++++++++++ - util/hb-view.cc | 44 +------ - util/hb-view.hh | 79 +++++++++++ - util/helper-cairo.cc | 375 - +++++++++++++++++++++++++++++++++++++++++++++++++ - util/helper-cairo.hh | 79 +++++++++++ - util/options.cc | 79 +++++++++++ - util/options.hh | 53 +++++++- - util/view-cairo.cc | 381 - ++------------------------------------------------ - util/view-cairo.hh | 8 +- - 13 files changed, 785 insertions(+), 541 deletions(-) - -commit eb2d8be7a8ede0c0f5e346cf06516792f83f36f7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 19 16:15:22 2011 -0400 - - Minor - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit f6496663c2f6849a944e41afcf9511f378477532 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 19 15:45:52 2011 -0400 - - [util] If no text is provided, simply call cairo_show_glyphs() - - util/view-cairo.cc | 92 - +++++++++++++++++++++++++++++----------------------- - 1 files changed, 51 insertions(+), 41 deletions(-) - -commit 5c299343118d1eaff32ffb2a5dac077cfff67dee -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 19 14:53:26 2011 -0400 - - [uniscribe] Various improvements - - src/hb-uniscribe.cc | 30 +++++++++++++++++++----------- - 1 files changed, 19 insertions(+), 11 deletions(-) - -commit 11e51993ab562d4c7460eb7c43d0e97404e628e7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 19 09:58:55 2011 -0400 - - [util] Move font-size into view-options - - util/options.cc | 2 +- - util/options.hh | 7 +++---- - util/view-cairo.cc | 4 ++-- - 3 files changed, 6 insertions(+), 7 deletions(-) - -commit 0fe296019746689551d224a5f6fb7e0ebe1b91dc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Sep 17 09:59:58 2011 -0400 - - Fix Linux build when io.h is available - - Bug 40953 - fail compile git: make[2]: *** [hb_view-options.o] Error 1 - - configure.ac | 2 +- - util/options.cc | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -commit d2b3ab9ecebbf46cb9dac1f09c17379c50ea4575 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Sep 16 16:59:17 2011 -0400 - - Fix "[util] Fix hb-view crash with bogus font." - - util/view-cairo.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit da4a2a1426ee3aa9d9678ec12c9ba4dfcba0bcf8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Sep 16 16:56:34 2011 -0400 - - Cosmetic - - util/view-cairo.cc | 31 +++++++++++++++++++++++-------- - 1 files changed, 23 insertions(+), 8 deletions(-) - -commit 4274ed7ab6fb03fbf8eaaa43ab06647dc0beed79 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Sep 16 16:52:26 2011 -0400 - - [util] Fix hb-view crash with bogus font - - util/view-cairo.cc | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit 5ddd9cc499f2470eca239ae357a5c8a3626c0809 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Sep 16 16:40:44 2011 -0400 - - Minor - - src/hb-private.hh | 2 +- - src/hb-unicode-private.hh | 4 ++-- - src/test.cc | 4 ++-- - util/common.hh | 2 +- - util/options.cc | 8 ++++---- - 5 files changed, 10 insertions(+), 10 deletions(-) - -commit 652d64aa8d32d914bf3ee2f2c451de103fea8fa9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Sep 16 16:34:39 2011 -0400 - - TODO items - - TODO | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 947c9a778c0d4b428b58806f98c34ede59b7439c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Sep 16 16:33:18 2011 -0400 - - Minor - - src/hb-ot-shape-normalize.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit d5476a30a10da5e54783c8dbf04340225a9a00d7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Sep 16 12:30:50 2011 -0400 - - Minor - - src/hb-object-private.hh | 26 +++++++++++++++----------- - 1 files changed, 15 insertions(+), 11 deletions(-) - -commit 55aeb0490454cc1ba93a42f307ed1230f59dee4b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Sep 16 02:08:36 2011 -0400 - - Fix reading text from stdin - - util/options.cc | 76 - ++++++++++++++++++++++++++++++++++------------------ - util/options.hh | 16 +++++++---- - util/view-cairo.cc | 6 +++- - 3 files changed, 64 insertions(+), 34 deletions(-) - -commit a75c1b125159f6cfb6b652a9ec40803f7c7e3f71 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Sep 16 01:16:41 2011 -0400 - - Move code around - - util/options.cc | 27 +++++++++++++++++++++++++-- - util/options.hh | 20 +------------------- - 2 files changed, 26 insertions(+), 21 deletions(-) - -commit 7bf6ecd3bfb1ccf5d9ac6fe274efa74b46885fea -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Sep 16 01:11:30 2011 -0400 - - Always shape at size=upem - - Fixes bug with uniscribe not handling GIGANTIC sizes. - - util/options.cc | 2 +- - util/view-cairo.cc | 8 ++++---- - util/view-cairo.hh | 2 +- - 3 files changed, 6 insertions(+), 6 deletions(-) - -commit 674ee58d9bc9f825d769220d77f58513edae4558 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Sep 16 00:54:05 2011 -0400 - - Minor - - util/options.cc | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit 4451168e5d1ea26560899e9a9733b3a3f1853050 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Sep 16 00:38:19 2011 -0400 - - Fix binary stdin/stdout io in Windows - - Make --font-file accept "-" to mean stdin, and have it work - in Windows too! - - configure.ac | 2 +- - util/common.hh | 5 ++++ - util/options.cc | 64 - +++++++++++++++++++++++++++++++++++++++++++++--------- - util/options.hh | 10 +++++++- - 4 files changed, 67 insertions(+), 14 deletions(-) - -commit 639b5957d9c7b6d8bef6784e3467ccc055ddeea4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Sep 15 18:09:49 2011 -0400 - - Minor - - util/options.cc | 5 +++-- - util/options.hh | 4 ++-- - 2 files changed, 5 insertions(+), 4 deletions(-) - -commit f7e2ef74f856ee13d6fd6cf3f1e04bc162203bc2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Sep 15 17:52:00 2011 -0400 - - [hb-view] Make print to stdout work in Windows - - Apparently there's no equivalent to "/dev/stdout", so write using - stdio to be able to output to stdout. - - util/common.hh | 1 + - util/options.hh | 31 ++++++++++++++++---- - util/view-cairo.cc | 79 - +++++++++++++++++++++++++++++++++++----------------- - 3 files changed, 78 insertions(+), 33 deletions(-) - -commit 36b10f58cc70ce9570d17b30616f9cb27423e03b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Sep 15 16:29:51 2011 -0400 - - Minor - - src/hb-ot-shape-normalize.cc | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit c4611cb66f8e3a133ec00e3ace62ef19d9b95b28 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 13 13:33:11 2011 -0400 - - Fix test - - src/hb-graphite2.h | 1 + - src/hb-ot-shape.h | 1 + - src/hb-uniscribe.h | 1 + - 3 files changed, 3 insertions(+), 0 deletions(-) - -commit b9b10ad78b1f977494a3a42b58f8040fe16505a3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 13 13:30:39 2011 -0400 - - [util] Refactor hb-view completely - - Now we can use the same code to do other utils... - - configure.ac | 2 + - util/Makefile.am | 2 + - util/common.cc | 7 +- - util/common.hh | 2 +- - util/hb-view.cc | 244 ++++------------------------- - util/options.cc | 321 +++++++++++++++++++++++++++----------- - util/options.hh | 179 +++++++++++++++++++--- - util/view-cairo.cc | 440 - ++++++++++++++++++++++++++++++++++++++++++++++++++++ - util/view-cairo.hh | 63 ++++++++ - 9 files changed, 927 insertions(+), 333 deletions(-) - -commit bc4b07b05ea9e39eb9f966eb2c3e1c737efa77ff -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Sep 8 17:08:32 2011 -0400 - - More reshuffling - - util/hb-view.cc | 4 +- - util/options.cc | 64 - +++++++++++++++++++++++++++++------------------------- - util/options.hh | 13 ++++++----- - 3 files changed, 43 insertions(+), 38 deletions(-) - -commit 516857eb51bbb79ff4adf44e3fefbf460f9ee8f8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Sep 8 16:50:24 2011 -0400 - - [util] Simplify more - - util/options.hh | 9 +++------ - 1 files changed, 3 insertions(+), 6 deletions(-) - -commit 4f4b114a5592c2f5d128ee795f159b438ad97829 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Sep 8 16:49:02 2011 -0400 - - [util] Move code around - - util/hb-view.cc | 8 +------- - util/options.hh | 14 ++++++++++++++ - 2 files changed, 15 insertions(+), 7 deletions(-) - -commit 46d86a73a103b061144018c3fe947b57548fc58f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Sep 8 16:43:15 2011 -0400 - - Minor - - We now support using -1 for NUL-terminated strings. - - util/hb-view.cc | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 90e312cb85df7a6dc350cb62138ab950790e3d15 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Sep 8 16:42:37 2011 -0400 - - [util] Move code around - - util/hb-view.cc | 5 ----- - util/options.hh | 4 ++++ - 2 files changed, 4 insertions(+), 5 deletions(-) - -commit 109cb382898f491eed733dba4ef5ba12de94aaf6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Sep 8 16:00:04 2011 -0400 - - [util] Further refactor option parsing - - util/options.cc | 80 - ++++++++++++++++++++++++++++++++++++++++++++++--------- - util/options.hh | 20 +++++++++++--- - 2 files changed, 83 insertions(+), 17 deletions(-) - -commit bc187e5ac7433f5561b0e97e8c62172c73883f3f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Sep 8 13:35:17 2011 -0400 - - Refine Indic scripts, following Martin Hosken's recommendation - - src/hb-ot-shape-complex-private.hh | 56 - ++++++++++++++++++++++-------------- - 1 files changed, 34 insertions(+), 22 deletions(-) - -commit 738d096a06822e63b3894bd817ecb90e5fb94f73 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Sep 2 13:31:19 2011 -0400 - - Pass through unknown ISO 639-3 language tags to OpenType engine - - In hb_ot_tag_from_language(), if first component of an unknown - language is three letters long, use it directly as OpenType language - tag (after case conversion and padding). - - src/hb-ot-tag.cc | 8 ++++++++ - test/test-ot-tag.c | 5 +++++ - 2 files changed, 13 insertions(+), 0 deletions(-) - -commit ea02cbf03c084b3ead6e9e4c9af07b3b47608d5b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Sep 2 12:39:20 2011 -0400 - - [graphite] Don't preload glyphs - - Doesn't seem to be slower. - - src/hb-graphite2.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 210a06f3d7bd2df55ebd1743da74f327c5a7a967 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 26 13:39:49 2011 +0200 - - Minor - - src/hb-graphite2.h | 12 ++++++------ - src/hb-ot-shape.h | 1 - - src/hb-uniscribe.h | 1 - - 3 files changed, 6 insertions(+), 8 deletions(-) - -commit 4a8d2e379a34b19bccc72bc3e2d9ace3fdd27733 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 26 09:40:54 2011 +0200 - - [graphite2] Chop a few more lines - - src/hb-graphite2.cc | 13 ++++--------- - 1 files changed, 4 insertions(+), 9 deletions(-) - -commit 81ec289da799bd2f50da9382507c606d2c779ab9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 26 09:33:06 2011 +0200 - - Minor - - src/hb-graphite2.cc | 24 ++++++++++++------------ - 1 files changed, 12 insertions(+), 12 deletions(-) - -commit 3380de5abbaff535e1cf57ea7e5c2a7c4fdcfe66 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 26 09:30:49 2011 +0200 - - [graphite] Use buffer->replace_glyphs() - - src/hb-graphite2.cc | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 9ebe8c0286856d46430ae184ba7303bd34485883 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 26 09:29:42 2011 +0200 - - Add buffer->replace_glyphs() - - src/hb-buffer-private.hh | 3 +++ - src/hb-buffer.cc | 26 ++++++++++++++++++++++++++ - 2 files changed, 29 insertions(+), 0 deletions(-) - -commit a5edb1031c204464da4f852ba3d90e8cc20cd20e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 26 09:27:13 2011 +0200 - - Minor - - src/hb-graphite2.cc | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit 290e3ee51727df75d136ccfff79831b94d1583b6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 26 09:25:04 2011 +0200 - - [graphite] Only pass the first part language tag to graphite - - Still not sure about: - - 1) Case. We pass lowercase for now. Would be nice if graphite was - uppercase 3letter like OpenType, - - 2) Padding. IMO, tag padding is always with spaces, but Martin was - talking about NUL bytes. - - src/hb-graphite2.cc | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 4c9fe88d30036340fe592bcbc375049b84602b8b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 26 09:18:53 2011 +0200 - - [API] Make all _from_string() functions take a len parameter - - Can be -1 for NUL-terminated string. This is useful for passing parts - of a larger string to a function without having to copy or modify the - string first. - - Affected functions: - - hb_tag_t hb_tag_from_string() - hb_direction_from_string() - hb_language_from_string() - hb_script_from_string() - - src/hb-common.cc | 29 ++++++++++++------ - src/hb-common.h | 12 +++++-- - src/hb-graphite2.cc | 2 +- - src/hb-icu.cc | 2 +- - src/hb-ot-tag.cc | 8 ++-- - test/test-buffer.c | 4 +- - test/test-common.c | 79 - +++++++++++++++++++++++++++++--------------------- - test/test-ot-tag.c | 22 +++++++------- - util/hb-view.cc | 6 ++-- - util/options.cc | 5 +-- - 10 files changed, 96 insertions(+), 73 deletions(-) - -commit a499bdea5cc5097dec62eeafdef58d08ba534be0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 25 22:46:21 2011 +0200 - - [graphite2] Bail if grface is NULL - - src/hb-graphite2.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 3007ffa9e53e6100a761c2363f50a2b19a0764fc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 25 09:08:53 2011 +0200 - - Reorder combining-class to better suit Arabic shadda mark-mark - positioning - - As reported by Khaled on the list: - - "After the introduction of canonical reordering of combining marks - (commit 34c22f8), I'm no longer able to do mark/mark substitution or - positioning for mark sequences that involve shadda as a first mark (or - most interesting sequences at least). - - "After some digging, it turned out that shadda have a ccc=33 - while most - Arabic marks that combine with it have a lower ccc value, which - results - in the shadda being reordered after the other mark which, - unsurprisingly, breaks my contextual substitution and mkmk anchors." - - See: - - http://unicode.org/faq/normalization.html#8 - http://unicode.org/faq/normalization.html#9 - - src/hb-ot-shape-private.hh | 18 +++++++++++++++++- - 1 files changed, 17 insertions(+), 1 deletions(-) - -commit 74ef81a0b0f9adddfb42c3cb87f08f8156054519 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 24 19:16:13 2011 +0200 - - Fix make distcheck - - src/Makefile.am | 15 ++++++++------- - src/hb-gobject-enums.cc.tmpl | 2 +- - 2 files changed, 9 insertions(+), 8 deletions(-) - -commit 24bcdbcc0639ca9e9c0fde1a71cbbf1c3d2ef98d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 24 19:13:15 2011 +0200 - - Add hb-ot-hmtx-table.hh - - Oops! - - src/hb-ot-hmtx-table.hh | 86 - +++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 86 insertions(+), 0 deletions(-) - -commit a3bd8a0e1862212a2d4141b973039bd000a3054f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 24 03:22:49 2011 +0200 - - [graphite] Rewrite properly - - src/hb-graphite2.cc | 633 - ++++++++++++++++++++++----------------------------- - src/hb-uniscribe.cc | 2 + - 2 files changed, 273 insertions(+), 362 deletions(-) - -commit 5072934c35bddc23d6bcb07a41010da51eb1b090 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 24 02:24:27 2011 +0200 - - Minor - - src/hb-uniscribe.cc | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit 46377396accf6b43792ffba553dcd9847608aa86 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 24 02:12:05 2011 +0200 - - [configure] Fix graphite bits - - configure.ac | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit 71388b3ee71c7d3b79f842db7588bd683691797c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 24 02:09:04 2011 +0200 - - [uniscribe] Minor - - src/hb-uniscribe.cc | 19 +++++++++---------- - 1 files changed, 9 insertions(+), 10 deletions(-) - -commit cd2b901027bd154e31aa509c0cb2d86633e36398 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 24 01:47:25 2011 +0200 - - [graphite] Minor - - src/hb-graphite2.cc | 10 ++++------ - src/hb-shape.cc | 1 - - 2 files changed, 4 insertions(+), 7 deletions(-) - -commit 834af3b48a1aca3e53811d1eb4ca09b582b8e598 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 24 01:45:47 2011 +0200 - - [graphite] Remove hb_graphite2_feature_check() - - I don't see how this function can be useful. - - src/hb-graphite2.cc | 10 ---------- - src/hb-graphite2.h | 2 -- - 2 files changed, 0 insertions(+), 12 deletions(-) - -commit 1f49cf32c96cb45a4d8ba2c210aeb7a8076b4762 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 24 01:29:25 2011 +0200 - - Add graphite2 integration from Martin Hosken - - To be modified, a lot. - - configure.ac | 9 +- - contrib/python/lib/harfbuzz.pyx | 20 +- - contrib/python/runpy | 2 - - contrib/python/scripts/hbtestfont | 4 +- - contrib/python/setup.py | 18 ++- - src/Makefile.am | 7 + - src/hb-graphite2.cc | 446 - +++++++++++++++++++++++++++++++++++++ - src/hb-graphite2.h | 47 ++++ - src/hb-shape.cc | 7 + - 9 files changed, 542 insertions(+), 18 deletions(-) - -commit 0e6d36d8a3f9f533cb6eb04408af62bfd1ad83da -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 24 01:31:29 2011 +0200 - - Minor - - src/Makefile.am | 2 +- - src/hb-uniscribe-shape.cc | 454 - --------------------------------------------- - src/hb-uniscribe.cc | 454 - +++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 455 insertions(+), 455 deletions(-) - -commit efde8113258b117ec0a7fbffe6d681442d045c41 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 23 00:04:57 2011 +0200 - - Add a constructor for hb_prealloced_array_t - - Fixes build with MSVC. - - src/hb-private.hh | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit d75333f166d21e9b9f2341c3bc8a9ef8a886f4b3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 19 19:59:24 2011 +0200 - - Add gobject enum support, but disabled for now - - need to figure out the naming. The generated code doesn't have the - right name. - - configure.ac | 2 + - src/Makefile.am | 13 ++++++-- - src/hb-gobject-enums.cc.tmpl | 74 - ++++++++++++++++++++++++++++++++++++++++++ - src/hb-gobject-structs.cc | 63 +++++++++++++++++++++++++++++++++++ - src/hb-gobject.cc | 63 ----------------------------------- - 5 files changed, 149 insertions(+), 66 deletions(-) - -commit 7d235d272f4c9213f54c9c807fb8fba5068c45b0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 17 23:55:29 2011 +0200 - - Flesh out tt funcs a bit - - src/hb-tt-font.cc | 36 +++++++++++++++++++++++++++++++++++- - 1 files changed, 35 insertions(+), 1 deletions(-) - -commit b9415e76d7b41da203b9ae85e38b6dc777481184 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 17 19:21:44 2011 +0200 - - [API] Add hb_font_set_funcs_data() - - src/hb-font.cc | 15 +++++++++++++++ - src/hb-font.h | 6 ++++++ - 2 files changed, 21 insertions(+), 0 deletions(-) - -commit e6c09cdf43201ff1b7f38e411ae1f9977e4f9271 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 17 19:07:59 2011 +0200 - - Remove the pre_allocate argument from hb_buffer_create() - - For two reasons: - - 1. User can always call hb_buffer_pre_allocate() themselves, and - - 2. Now we do a pre_alloc in add_utfX anyway, so the total number of - reallocs is limited to a small number (~3) anyway. This just - makes the - API cleaner. - - src/hb-buffer.cc | 7 +------ - src/hb-buffer.h | 2 +- - src/test.cc | 2 +- - test/test-buffer.c | 9 ++++----- - test/test-object.c | 4 ++-- - test/test-shape-complex.c | 2 +- - test/test-shape.c | 2 +- - util/hb-view.cc | 2 +- - 8 files changed, 12 insertions(+), 18 deletions(-) - -commit 187bdeaa6c82fcb95fdd546da9c78b843e1dea0e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 17 19:03:06 2011 +0200 - - Do (nothing for) hmtx sanitize - - src/hb-ot-hhea-table.hh | 1 - - src/hb-tt-font.cc | 1 + - 2 files changed, 1 insertions(+), 1 deletions(-) - -commit d6016e49108be183ab2dc9c226447d1db3a09b90 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 17 14:47:41 2011 +0200 - - Fix name-table sanitize - - src/hb-ot-name-table.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit ae9877dea6a1aed3566d9b87a75ede84259deaca -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 17 14:43:45 2011 +0200 - - Add hhea-table support - - src/Makefile.am | 1 + - src/hb-open-type-private.hh | 6 + - src/hb-ot-head-table.hh | 2 +- - src/hb-ot-hhea-table.hh | 93 ++++++++++++++++++ - src/hb-ot-layout-gdef-table.hh | 2 +- - src/hb-ot-layout-gpos-table.hh | 2 +- - src/hb-ot-layout-gsub-table.hh | 2 +- - src/hb-ot-maxp-table.hh | 2 +- - src/hb-ot-name-table.hh | 3 +- - src/hb-tt-font.cc | 207 - ++++++++++++++++++++++++++++++++++++++++ - 10 files changed, 314 insertions(+), 6 deletions(-) - -commit 7a750ac33ec482e2c4856c19ea607f3563741c24 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 17 14:19:59 2011 +0200 - - Rename table files from eg maxp-private.hh to maxp-table.hh - - src/Makefile.am | 12 +- - src/hb-font.cc | 2 +- - src/hb-ot-head-private.hh | 143 --- - src/hb-ot-head-table.hh | 143 +++ - src/hb-ot-layout-gdef-private.hh | 427 --------- - src/hb-ot-layout-gdef-table.hh | 427 +++++++++ - src/hb-ot-layout-gpos-private.hh | 1633 - ---------------------------------- - src/hb-ot-layout-gpos-table.hh | 1633 - ++++++++++++++++++++++++++++++++++ - src/hb-ot-layout-gsub-private.hh | 943 -------------------- - src/hb-ot-layout-gsub-table.hh | 943 ++++++++++++++++++++ - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - src/hb-ot-layout.cc | 8 +- - src/hb-ot-maxp-private.hh | 66 -- - src/hb-ot-maxp-table.hh | 66 ++ - src/hb-ot-name-private.hh | 128 --- - src/hb-ot-name-table.hh | 128 +++ - src/hb-uniscribe-shape.cc | 2 +- - src/main.cc | 2 +- - 18 files changed, 3354 insertions(+), 3354 deletions(-) - -commit 0b7e4d9f20b3ed947d0c441ca59b43c4097cdb0e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 15 20:41:59 2011 +0200 - - [ft] FT_Get_Advance() for advance-width callbacks - - Using graphite2's comparerenderer suggests that this makes hb-ft 15 - times faster. No caching layer needed anymore. - - configure.ac | 2 +- - src/hb-ft.cc | 19 +++++++++++++------ - util/common.hh | 4 +++- - 3 files changed, 17 insertions(+), 8 deletions(-) - -commit 97796453aab56873809a15b5e316cba8acea7449 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 15 19:03:43 2011 +0200 - - Fix falloffs of the GOption conversion - - util/options.cc | 8 ++++---- - util/options.hh | 4 ++-- - 2 files changed, 6 insertions(+), 6 deletions(-) - -commit 4e9ff1dd6ee3ea63fd91a76a91d9725a10a294a0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 15 16:21:22 2011 +0200 - - Pre-allocate buffers when adding string - - We do a conservative estimate of the number of characters, but still, - this limits the number of buffer reallocs to a small constant. - - src/hb-buffer.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 553bc3de82cfda8d83db26a93205e0d39440cbd1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 15 16:21:06 2011 +0200 - - Minor - - src/hb-ft.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 254142bb67a5c520a304142301479eb5292592d1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 15 16:15:44 2011 +0200 - - [ft] FT_Select_Charmap() when we create face - - src/hb-ft.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit a4cbd03dd17990783d8fd4c6be0c9c0d3d9cae5b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 15 09:52:05 2011 +0200 - - Apply 'locl' with 'ccmp' in Arabic shaper - - According to Peter Constable this is indeed what Uniscribe has been - doing for years. - - Mozilla Bug 667166 - wrong shape of letter when it comes at the end of - word in the arabic version of Firefox 5.0 - - src/hb-ot-shape-complex-arabic.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit c214cff55ce539d004d069a484dac3988953cb11 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 14 15:17:16 2011 +0200 - - Start adding gobject-introspection support - - configure.ac | 13 +++++++++- - src/Makefile.am | 43 ++++++++++++++------------------ - src/hb-common.h | 1 + - src/hb-glib.cc | 3 -- - src/hb-gobject.cc | 63 - +++++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-gobject.h | 68 - +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 6 files changed, 163 insertions(+), 28 deletions(-) - -commit 9527fb200ffbbd839334e99b51d9671752d393db -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 13 19:03:48 2011 +0200 - - Fix missing return - - src/hb-ft.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 77a328769545f6b2970d8491fe77fe98781961cf -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 13 17:16:45 2011 +0200 - - Minor - - src/hb-common.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3bb300ee78a40f9ded21ab19283863b733aeb677 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 11 11:54:31 2011 +0200 - - Refactor hb-view code - - util/Makefile.am | 26 ++++- - util/common.cc | 40 ++++++ - util/common.hh | 49 +++++++ - util/hb-view.cc | 387 - ++++-------------------------------------------------- - util/options.cc | 318 ++++++++++++++++++++++++++++++++++++++++++++ - util/options.hh | 86 ++++++++++++ - 6 files changed, 541 insertions(+), 365 deletions(-) - -commit d6660356dd81358033743f72d8a5fbf2fc70eaf7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 10 22:08:36 2011 +0200 - - Add uniscribe font getters - - src/hb-uniscribe-shape.cc | 24 +++++++++++++++++++++--- - src/hb-uniscribe.h | 8 ++++++++ - 2 files changed, 29 insertions(+), 3 deletions(-) - -commit 01ec13a1d9ae380305b593e1c52cebb0e8327cb6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 10 22:00:35 2011 +0200 - - Implement hb_ft_font_get_face - - src/hb-ft.cc | 15 ++++++++++++++- - src/hb-ft.h | 2 ++ - 2 files changed, 16 insertions(+), 1 deletions(-) - -commit 36a4fe037df201f85b7a544eb30d75dc3585a1b6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 10 21:54:22 2011 +0200 - - Fix charset conversion - - util/hb-view.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 25c4830593064f023e296aa795b72ddcaa1c9322 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 10 16:28:38 2011 +0200 - - [util] Add hb-shape --shapers - - If the specified shapers fail, hb-shape will fail immediately - - util/hb-view.cc | 57 - +++++++++++++++++++++++++++++++----------------------- - 1 files changed, 33 insertions(+), 24 deletions(-) - -commit 0501573deda3a8dcdfcea491392f554f21ed0154 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 10 16:25:56 2011 +0200 - - Fix const correctness in the API - - src/hb-fallback-shape-private.hh | 2 +- - src/hb-fallback-shape.cc | 2 +- - src/hb-ot-shape.cc | 2 +- - src/hb-ot-shape.h | 2 +- - src/hb-shape.cc | 14 +++++++------- - src/hb-shape.h | 12 ++++++------ - src/hb-uniscribe-shape.cc | 2 +- - src/hb-uniscribe.h | 2 +- - 8 files changed, 19 insertions(+), 19 deletions(-) - -commit a21add6c0da067173d51792d716d6e38379f138f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 10 16:07:49 2011 +0200 - - Reformat - - util/hb-view.cc | 49 ++++++++++++++++++------------------------------- - 1 files changed, 18 insertions(+), 31 deletions(-) - -commit 8df90c81187db58eee6b90426cd16c32feef6be3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 10 15:26:41 2011 +0200 - - [util] Port hb-view to GOption - - util/hb-view.cc | 267 - ++++++++++++++++++++++++++++++++----------------------- - 1 files changed, 156 insertions(+), 111 deletions(-) - -commit 511a136f0c092880b19250a5df53bcf9f4b043ca -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 9 15:03:00 2011 +0200 - - Move hb-view into util/ - - Makefile.am | 3 +- - configure.ac | 1 + - src/Makefile.am | 13 -- - src/hb-view.cc | 568 - ------------------------------------------------------ - util/Makefile.am | 24 +++ - util/hb-view.cc | 568 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 6 files changed, 594 insertions(+), 583 deletions(-) - -commit d753ac78da5619a0a545cdaf7a8e65787e996570 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 9 14:03:12 2011 +0200 - - [uniscribe] Remove zerowidth glyphs from output - - src/hb-uniscribe-shape.cc | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit 217cc81cd9c3de30b2ef226983ec43c0f78b5c7d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 9 14:00:44 2011 +0200 - - [test/shape-complex] Print cluster and position info in --verbose - - test/test-shape-complex.c | 20 +++++++++++++++++--- - 1 files changed, 17 insertions(+), 3 deletions(-) - -commit 708403e7f3e4a5cf9b0d2bd764fb74b148af7adb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 9 13:52:36 2011 +0200 - - Fix warnings with old glib - - test/hb-test.h | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit ddd247b0c528cdb8bdf5f8063180abe884afa305 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 9 11:44:42 2011 +0200 - - Minor - - src/test.cc | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 1b8196c98638ba05ae0ebcb8ba7aa99ed9c08e0a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 9 11:37:46 2011 +0200 - - Add fallback shaper - - src/hb-fallback-shape.cc | 23 +++++++++++++++++++++-- - 1 files changed, 21 insertions(+), 2 deletions(-) - -commit 13a601fe99f237b08b7166448e386eaea0b77294 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 9 11:36:54 2011 +0200 - - [FT] Don't make font immutable - - src/hb-ft.cc | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 38b2118724600521c6ad1e49df0667dcdf863634 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 9 10:51:24 2011 +0200 - - [API] Add hb_ft_font_set_funcs(), remove hb_ft_get_font_funcs() - - Remove hb_ft_get_font_funcs() as it cannot be used by the user anyway. - - Add hb_ft_font_set_funcs(). Which will make the font internally use - FreeType. That is, no need for the font to have created using the - hb-ft API. Just create using hb_face_create()/hb_font_create() and - then call this on the font (after having set font scale). This - internally creates an FT_Face and attached to the font. - - src/Makefile.am | 4 +- - src/hb-ft.cc | 76 - +++++++++++++++++++++++++++++++++++++++++++++++++-- - src/hb-ft.h | 10 +++++-- - src/test.cc | 7 +++++ - test/Makefile.am | 8 ----- - test/test-object.c | 9 ------ - 6 files changed, 89 insertions(+), 25 deletions(-) - -commit 255f176fdcd42ab94f9c3c54e2bffb55d0b1a8f5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 9 08:35:07 2011 +0200 - - Minor - - src/hb-uniscribe-shape.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a9057eb3f38018faa1ece53c4aaeeba798b41fd1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 9 00:47:55 2011 +0200 - - [uniscribe] Unbreak - - src/hb-uniscribe-shape.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit c0975e12315b7167b92411584d2f00a751bbc204 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 9 00:46:18 2011 +0200 - - Fix build again - - test/Makefile.am | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 33ccc77902660ed4b49184e5ec99f4fd0ef63175 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 9 00:43:24 2011 +0200 - - [API] Make set_user_data() functions take a replace parameter - - We need this to set data on objects safely without worrying that some - other thread unsets it by setting it at the same time. - - src/hb-blob.cc | 5 +++-- - src/hb-blob.h | 3 ++- - src/hb-buffer.cc | 5 +++-- - src/hb-buffer.h | 3 ++- - src/hb-common.cc | 13 ++++++++----- - src/hb-font.cc | 15 +++++++++------ - src/hb-font.h | 9 ++++++--- - src/hb-object-private.hh | 13 ++++++++----- - src/hb-private.hh | 16 +++++++++++----- - src/hb-shape.cc | 2 +- - src/hb-unicode.cc | 5 +++-- - src/hb-unicode.h | 3 ++- - src/hb-uniscribe-shape.cc | 18 ++++++++++++++---- - test/test-object.c | 33 +++++++++++++++++---------------- - 14 files changed, 89 insertions(+), 54 deletions(-) - -commit 944b2ba1ce076385f985212bbdf2df96a8a995f0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 9 00:23:58 2011 +0200 - - [buffer] Make API take signed int length - - Since we already switched to accepting -1 as 'zero-terminated'. - - src/hb-buffer.cc | 12 ++++++------ - src/hb-buffer.h | 12 ++++++------ - src/hb-ot-layout.cc | 2 -- - src/main.cc | 1 - - 4 files changed, 12 insertions(+), 15 deletions(-) - -commit de1e1cf9bccfd116d495804e230dc2e12b733a2d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 9 00:19:38 2011 +0200 - - [FT] Adapt to new face API - - src/hb-ft.cc | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 458c89a85695220d43b69dbae36fc93e3fe78d89 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 9 00:19:19 2011 +0200 - - Minor - - test/test-c.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit bf3eef540f81fdeba1c36263d7d5b2ec4c5f07b1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 9 00:13:24 2011 +0200 - - [uniscribe] Cleanup backend - - TODO | 2 + - src/hb-uniscribe-shape.cc | 161 - ++++++++++++++++++++++++++++++++++----------- - 2 files changed, 123 insertions(+), 40 deletions(-) - -commit f1f848e2e46ac54ff08aca7cd83390af31c7c9ef -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 8 23:41:06 2011 +0200 - - Fix build - - test/Makefile.am | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 3897335c7620c37e9a0224b0c42ade0dfdce4053 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 8 23:37:41 2011 +0200 - - [API] Sort out get_blob API - - hb_face_get_blob() renamed to hb_face_reference_blob(), returns a - reference now. - - hb_face_[sg]et_index() added. - - hb_face_set_upem() added. - - src/hb-font-private.hh | 3 +- - src/hb-font.cc | 67 - ++++++++++++++++++++++++++++++++++--------- - src/hb-font.h | 17 +++++++++-- - src/hb-ft.cc | 3 +- - src/hb-ot-layout-private.hh | 9 ------ - src/hb-ot-layout.cc | 21 ------------- - src/hb-uniscribe-shape.cc | 3 +- - 7 files changed, 72 insertions(+), 51 deletions(-) - -commit e715784be35f0846c0e084b7c53c7556ce933a45 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 8 21:42:02 2011 +0200 - - Rename get_table to reference_table in all API - - src/hb-font-private.hh | 6 +++--- - src/hb-font.cc | 20 ++++++++++---------- - src/hb-font.h | 8 ++++---- - src/hb-ft.cc | 4 ++-- - 4 files changed, 19 insertions(+), 19 deletions(-) - -commit 670c873499f7f03fdfc07b8a0567b041628c6ab0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 8 21:36:24 2011 +0200 - - Fix shaper ordering logic - - src/hb-shape.cc | 80 - +++++++++++++++++++++++------------------------------- - 1 files changed, 34 insertions(+), 46 deletions(-) - -commit cc797e0d5368b2f5732d77eb3e3882283bd87cf7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 8 03:49:30 2011 +0200 - - Minor - - TODO | 2 -- - src/hb-shape.cc | 2 ++ - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 826e22732dd8697600a1392f48af21b7b3ce6271 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 7 03:53:42 2011 -0400 - - [uniscribe] Fix blob lifecycles - - src/hb-uniscribe-shape.cc | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit ff199ba356f0eb5bc6252203eea18a1d1fd28934 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 7 03:43:46 2011 -0400 - - Fix shaper_list manipulation, aaaaaaaaaaaaargh - - src/hb-shape.cc | 16 +++++++++------- - 1 files changed, 9 insertions(+), 7 deletions(-) - -commit 206e32934592b915b1f3052aecf014c6ced729e1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 7 01:10:55 2011 -0400 - - [test] test-object is not FreeType-specific, move it to the right - place - - test/Makefile.am | 8 +++----- - 1 files changed, 3 insertions(+), 5 deletions(-) - -commit 577326b86af80cc137eea81f4cc1e30adf9232b1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 7 01:04:40 2011 -0400 - - [uniscribe] Fix cluster calculation - - src/hb-uniscribe-shape.cc | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit f6d83b2dcf120f9d6f0a28c6f5de2da7addf9089 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 7 00:59:58 2011 -0400 - - Minor - - src/test.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 2eb474afb4a09f4da8f14b444bd6066769010224 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 7 00:59:38 2011 -0400 - - [uniscribe] Fix shaper - - It's kinda working finally! - - src/hb-uniscribe-shape.cc | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit f22e661147691ebc9d531aa28a850988e6503f9b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 7 00:59:12 2011 -0400 - - [glib] Protect against invalid characters - - src/hb-glib.cc | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 144cd49a0eb3ccc749325d0ee14b3ebf4367c971 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 7 00:51:50 2011 -0400 - - [buffer] Accept -1 for text_length and item_length - - A -1 text_length means: zero-terminated string. - A -1 item_length means: to the end of string. - - src/hb-buffer.cc | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit e9c71fab30fd1d5b163c8a072f9e2d3eb8ba3a92 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 7 00:00:27 2011 -0400 - - Fix name-table lookup - - Oops! - - src/hb-ot-name-private.hh | 2 +- - src/hb-uniscribe-shape.cc | 2 ++ - 2 files changed, 3 insertions(+), 1 deletions(-) - -commit 3fd2b5bece28c81e3e379352f09eee39d19ac372 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 6 22:59:54 2011 -0400 - - [uniscribe] Use font size directly - - src/hb-uniscribe-shape.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 892eb2e462b40451b8f73879eab66310d884386a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 6 22:06:52 2011 -0400 - - [uniscribe] Make font selection work - - Not tested yet. - - src/hb-ot-name-private.hh | 37 +++++++++++++++++++++++++++++++++++++ - src/hb-uniscribe-shape.cc | 30 +++++++++++++++++++++++------- - src/test.cc | 1 - - 3 files changed, 60 insertions(+), 8 deletions(-) - -commit b492299eb3c398701557e452f6c2c9bd370fbbf3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 5 20:34:50 2011 -0400 - - Start implementing the 'name' table - - src/Makefile.am | 3 +- - src/hb-ot-name-private.hh | 91 - +++++++++++++++++++++++++++++++++++++++++++++ - src/hb-uniscribe-shape.cc | 12 +++-- - 3 files changed, 100 insertions(+), 6 deletions(-) - -commit 4538efacca84329a60ff69851de70027d9b4f567 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 5 20:11:06 2011 -0400 - - Skip tests by returning 77 - - automake test runner understands this. - - src/check-internal-symbols.sh | 3 ++- - src/check-libstdc++.sh | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -commit 54eb65538da0a6ab0389d09944c90e12a913157d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 5 20:09:25 2011 -0400 - - Fix check on OS X sh - - src/check-header-guards.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9da554504e30a326fc57b28cdb0e57108bfa9555 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 5 19:48:49 2011 -0400 - - Add hb_shape_list_shapers() - - src/hb-shape.cc | 22 ++++++++++++++++++---- - src/hb-shape.h | 3 +++ - test/Makefile.am | 2 ++ - test/test-c.c | 8 ++++++++ - test/test-shape.c | 15 +++++++++++++++ - 5 files changed, 46 insertions(+), 4 deletions(-) - -commit d7bf473ef222ab420456ff155ffaa09bacb3a394 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 5 18:18:21 2011 -0400 - - Minor - - src/check-header-guards.sh | 1 - - src/hb-open-type-private.hh | 10 +++++----- - 2 files changed, 5 insertions(+), 6 deletions(-) - -commit c62a8f10f3b9a4ac3ac6b686464ac734ebfa2f7f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 5 18:02:30 2011 -0400 - - Free all static memory upon exit - - src/hb-common.cc | 8 +++++--- - src/hb-shape.cc | 4 ++-- - 2 files changed, 7 insertions(+), 5 deletions(-) - -commit c4d63ef744f79701458ab7af2055afb87ffe8de3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 5 17:54:25 2011 -0400 - - Fix env parsing code - - Also changed the separator to comma instead of colon. - - src/hb-shape.cc | 34 +++++++++++++++++++++++++--------- - 1 files changed, 25 insertions(+), 9 deletions(-) - -commit 3931837bebd79c5eb1bd5b24ff12e2c8e7d3f24c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 5 17:22:19 2011 -0400 - - Change hb_shape() API back to what it was, add hb_shape_full() - - I disliked changing hb_shape() API, and disliked the fact that it was - returning a bool now. So, reverted. Added new API for the extra - functionality. - - src/hb-view.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3ca6c4ecc299295b6682fa2b6b9f83b213223bad -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 5 17:22:19 2011 -0400 - - Change hb_shape() API back to what it was, add hb_shape_full() - - I disliked changing hb_shape() API, and disliked the fact that it was - returning a bool now. So, reverted. Added new API for the extra - functionality. - - src/hb-shape.cc | 21 +++++++++++++++------ - src/hb-shape.h | 14 ++++++++++---- - src/test.cc | 2 +- - test/test-shape.c | 2 +- - 4 files changed, 27 insertions(+), 12 deletions(-) - -commit 02aeca985b570763342c35e99af90025bfa088d5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 4 22:31:05 2011 -0400 - - [API] Changes to main shape API - - hb_shape() now accepts a shaper_options and a shaper_list argument. - Both can be set to NULL to emulate previous API. And in most - situations - they are expected to be set to NULL. - - hb_shape() also returns a boolean for now. If shaper_list is - NULL, the - return value can be ignored. - - shaper_options is ignored for now, but otherwise it should be a - NULL-terminated list of strings. - - shaper_list is a NULL-terminated list of strings. Currently - recognized - strings are "ot" for native OpenType Layout implementation, - "uniscribe" - for the Uniscribe backend, and "fallback" for the non-complex backend - (that will be implemented shortly). The fallback backend never fails. - - The env var HB_SHAPER_LIST is also parsed and honored. It's a - colon-separated list of shaper names. The fallback shaper is - invoked if - none of the env-listed shapers succeed. - - New API hb_buffer_guess_properties() added. - - TODO | 2 - - configure.ac | 9 +++ - src/Makefile.am | 14 +++-- - src/hb-buffer-private.hh | 1 + - src/hb-buffer.cc | 35 ++++++++++ - src/hb-buffer.h | 3 + - src/hb-fallback-shape-private.hh | 48 +++++++++++++ - src/hb-fallback-shape.cc | 43 ++++++++++++ - src/hb-ot-shape.cc | 9 ++- - src/hb-ot-shape.h | 5 +- - src/hb-shape.cc | 135 - +++++++++++++++++++++++--------------- - src/hb-shape.h | 13 ++-- - src/hb-uniscribe-shape.cc | 52 ++++++--------- - src/hb-uniscribe.h | 5 +- - src/hb-view.cc | 2 +- - src/test.cc | 3 +- - test/test-shape.c | 2 +- - 17 files changed, 274 insertions(+), 107 deletions(-) - -commit 57692adf1294a6db4627d0de7c671e4aa01d2a8f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 4 20:49:16 2011 -0400 - - Make test.cc do something more useful - - Hardcoded to the uniscribe backend for now. Will fix soon. - - src/test.cc | 38 ++++++++++++++++++++++++++++++++++---- - 1 files changed, 34 insertions(+), 4 deletions(-) - -commit c605bbbb6d4b2a98b1f40ca818760088d991f7d1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 4 20:00:53 2011 -0400 - - Remove C++ guards from source files - - Where causing issues for people with MSVC. - - src/check-c-linkage-decls.sh | 3 +-- - src/hb-blob.cc | 2 -- - src/hb-buffer-private.hh | 2 -- - src/hb-buffer.cc | 2 -- - src/hb-common.cc | 2 -- - src/hb-font-private.hh | 2 -- - src/hb-font.cc | 2 -- - src/hb-ft.cc | 2 -- - src/hb-glib.cc | 2 -- - src/hb-icu.cc | 2 -- - src/hb-mutex-private.hh | 2 -- - src/hb-object-private.hh | 4 ---- - src/hb-open-file-private.hh | 2 -- - src/hb-open-type-private.hh | 4 ---- - src/hb-ot-head-private.hh | 2 -- - src/hb-ot-layout-common-private.hh | 4 ---- - src/hb-ot-layout-gdef-private.hh | 2 -- - src/hb-ot-layout-gpos-private.hh | 4 ---- - src/hb-ot-layout-gsub-private.hh | 4 ---- - src/hb-ot-layout-gsubgpos-private.hh | 6 ------ - src/hb-ot-layout-private.hh | 2 -- - src/hb-ot-layout.cc | 2 -- - src/hb-ot-map-private.hh | 2 -- - src/hb-ot-map.cc | 2 -- - src/hb-ot-maxp-private.hh | 2 -- - src/hb-ot-shape-complex-arabic-table.hh | 2 -- - src/hb-ot-shape-complex-arabic.cc | 2 -- - src/hb-ot-shape-complex-indic-table.hh | 2 -- - src/hb-ot-shape-complex-indic.cc | 2 -- - src/hb-ot-shape-complex-misc.cc | 2 -- - src/hb-ot-shape-complex-private.hh | 2 -- - src/hb-ot-shape-normalize.cc | 2 -- - src/hb-ot-shape-private.hh | 2 -- - src/hb-ot-shape.cc | 2 -- - src/hb-ot-tag.cc | 2 -- - src/hb-private.hh | 8 -------- - src/hb-shape.cc | 2 -- - src/hb-unicode-private.hh | 2 -- - src/hb-unicode.cc | 2 -- - src/hb-uniscribe-shape.cc | 2 -- - src/hb-view.cc | 2 -- - src/main.cc | 2 -- - src/test.cc | 2 -- - 43 files changed, 1 insertions(+), 106 deletions(-) - -commit 8336186a52813b53e90b4399dc462d55750e2d37 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 4 19:49:05 2011 -0400 - - Zero map objects - - src/hb-ot-map-private.hh | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit ecd3b6e4ad253cf9d0dae1ed2da8ba6caed16b85 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 4 01:57:40 2011 -0400 - - More build fixes - - configure.ac | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit c747f509bcc4e6a34ced04e9e79ed414a44437b1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 4 01:51:30 2011 -0400 - - More out-of-tree build fixes - - src/check-c-linkage-decls.sh | 3 +-- - src/check-header-guards.sh | 8 ++++---- - 2 files changed, 5 insertions(+), 6 deletions(-) - -commit 0530ca9a180edc330ab801c535907cefa4a0c298 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 4 01:42:59 2011 -0400 - - Fix out-of-tree build - - test/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ddbf4edc5d09a645351b1bd1722b068aba6a6dec -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 4 01:38:37 2011 -0400 - - Minor - - configure.ac | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 20dde6101662fd9ebe5f613631ea468f4c0a995f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 4 01:07:33 2011 -0400 - - Minor - - src/hb-uniscribe.h | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 44b4f50d05fd51d8056a78e359fbb00fbcac43a0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 4 00:52:20 2011 -0400 - - Fix typo - - src/hb-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0fbb2dc83132a89201ad8b56c6909610437d2da0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 3 19:55:04 2011 -0400 - - Add draft experimental Uniscribe backend - - Not complete yet, font selection doesn't work. But hey it shapes! - - This is not supposed to be a production backend, more like a testing - backend. - - configure.ac | 9 ++ - src/Makefile.am | 11 ++ - src/hb-private.hh | 4 +- - src/hb-uniscribe-shape.cc | 325 - +++++++++++++++++++++++++++++++++++++++++++++ - src/hb-uniscribe.h | 46 +++++++ - 5 files changed, 394 insertions(+), 1 deletions(-) - -commit 0d7d4824b2edc7aeeb995077655a9a89b5c360a9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 3 17:39:24 2011 -0400 - - Minor - - configure.ac | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit e62df43649e31b7815c272f01808b3f726c7d07d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 3 17:38:54 2011 -0400 - - Add internal hb_buffer_t::get_scratch_buffer() - - src/hb-buffer-private.hh | 2 ++ - src/hb-buffer.cc | 10 ++++++++++ - 2 files changed, 12 insertions(+), 0 deletions(-) - -commit 71e7936fcadfd375a8bdc47987ef8b1b2b542df5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 3 17:38:34 2011 -0400 - - Minor - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit bf8c57ba745c02370c38198adfdcd8075ba38b13 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 3 17:38:04 2011 -0400 - - [API] Add hb_face_get_blob() - - Need to think more about it. - - src/hb-font.cc | 10 ++++++++++ - src/hb-font.h | 3 +++ - 2 files changed, 13 insertions(+), 0 deletions(-) - -commit 2118fdb9f584e6735e904638e48bae48314372fa -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 2 14:06:51 2011 -0400 - - Fix fallback shaping - - Broke it a few commits ago. - - src/hb-ot-shape.cc | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit 199abbd0f15bd295c3a56845c71b38dd20af1332 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 2 13:59:47 2011 -0400 - - Minor - - test/test-unicode.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 4f052b93c0b17d92b9f0adddf64ef77518bf2ac4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 2 13:44:24 2011 -0400 - - Fix build with glib but not freetype - - test/Makefile.am | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) - -commit c21be799daa85d5edb2d831ac985d3e43c8755ec -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 2 12:05:49 2011 -0400 - - Minor - - test/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit e9c2341b1384c161bbab9871411af0bc9f6c3cf4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 2 11:40:44 2011 -0400 - - Don't use icu-config when cross-compiling - - configure.ac | 17 ++++++++++------- - 1 files changed, 10 insertions(+), 7 deletions(-) - -commit 390dab49b6cf34f263b67d20a13f0752ada57bcc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 2 11:29:55 2011 -0400 - - Unbreak icu-config results a bit - - configure.ac | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit b301478a69d961c724a4875b839a81fb458d1153 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 2 11:25:13 2011 -0400 - - Bug 39763 - autogen.sh should check pkg-config availability - - (and revert change have_icu change I mistakenly pushed out) - - autogen.sh | 10 ++++++++-- - configure.ac | 1 - - 2 files changed, 8 insertions(+), 3 deletions(-) - -commit f60271c0c2b0101e7b2725f9a9ad950c277a616c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 2 09:56:30 2011 -0400 - - Add mingw32 support - - With these changes, on Ubuntu I can do: - - ./configure --host=i586-mingw32msvc && make - - configure.ac | 1 + - src/hb-mutex-private.hh | 4 ++-- - src/hb-open-type-private.hh | 5 +++++ - src/hb-private.hh | 6 +++++- - src/main.cc | 1 + - 5 files changed, 14 insertions(+), 3 deletions(-) - -commit 1264b23e4a4ae1c9831a3009e1c7ab8e65a5b434 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 1 16:39:32 2011 -0400 - - Bug 39702 - configure check for ragel - - autogen.sh | 18 +++++++++++++----- - 1 files changed, 13 insertions(+), 5 deletions(-) - -commit f5414cf0a220d6e6f3d4b6e8221cd583b4684187 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 1 16:34:16 2011 -0400 - - Use missing script for calling ragel - - src/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit a91c58bf98258a34e5f7c1ad39a38db58fadc4b9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 1 16:30:11 2011 -0400 - - [Indic] Disable CJCT-disabling logic - - Read comment. - - src/hb-ot-shape-complex-indic.cc | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit 5e72071062c015237b79fbd0521341a63166a204 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 31 17:51:50 2011 -0400 - - [Indic] Stop looking for base upon seeing joiners - - Not sure where this is documented, but I remember this being the - desired - behavior. - - test-shape-complex failures are down from 48 to 46. Meh. - - src/hb-ot-shape-complex-indic.cc | 11 +++++++++-- - 1 files changed, 9 insertions(+), 2 deletions(-) - -commit 281683995a46ed37aeeb84061249758c59822457 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 31 16:00:35 2011 -0400 - - Cosmetic - - src/hb-ot-shape-complex-indic.cc | 23 +++++++++++++++-------- - 1 files changed, 15 insertions(+), 8 deletions(-) - -commit 6b37bc80843e38ca7b62500f95fd70c08af68d62 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 31 15:57:00 2011 -0400 - - [Indic] Fix ZWJ/ZWNJ application - - Not quite working just yet. False alarm re 10 failures. It was - crashing. Ouch! Back to 48 failures. - - src/hb-ot-shape-complex-indic.cc | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit e7be05702447ae270d797398132c1930cd3a9b86 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 31 15:18:57 2011 -0400 - - [Indic] Add Final Reordering rules into comments - - Not applied yet. - - src/hb-ot-shape-complex-indic.cc | 86 - ++++++++++++++++++++++++++++++++++++- - 1 files changed, 83 insertions(+), 3 deletions(-) - -commit cfd4382ec1af91640129551697de36fd42c0849a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 31 15:07:11 2011 -0400 - - [Indic] Handle Reph when determining base consonant - - src/hb-ot-shape-complex-indic.cc | 24 +++++++++++++++--------- - 1 files changed, 15 insertions(+), 9 deletions(-) - -commit 97158392a5899ddb739afaac925128f33f699bd7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 31 15:01:28 2011 -0400 - - [Indic] Ra is a consonant too - - src/hb-ot-shape-complex-indic.cc | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 0d8f8a177c4bfd4dc642a353bab8d03674e839ac -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 31 14:57:59 2011 -0400 - - [Indic] Fix reph inhibition logic - - src/hb-ot-shape-complex-indic.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 9da0487cd452d780673e24329ce03e174a4ef83b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 31 13:46:44 2011 -0400 - - [Indic] Support ZWJ/ZWNJ - - Brings test-shape-complex failures down from 52 to 10! - - I hereby declare harfbuzz-ng supporting Indic! - - src/hb-ot-shape-complex-indic.cc | 57 - ++++++++++++++++++++++++++++++++------ - 1 files changed, 48 insertions(+), 9 deletions(-) - -commit 9ee27a928a989c71923cef82a9e9828f8e9ca051 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 31 11:10:14 2011 -0400 - - [Indic] Suppress reph formation upon joiners - - src/hb-ot-shape-complex-indic.cc | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit 8354e004e553856d7d743e0f0b4de4668484026a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jul 31 02:24:51 2011 -0400 - - Un-Ra U+09F1. According to the test suite this is correct. - - But I'm not sure... Down from 54 failures to 52. - - src/hb-ot-shape-complex-indic.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 07cedd81f48907b2e372cd2e963716bbded9ce29 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 30 21:16:51 2011 -0400 - - Minor - - test/test-shape-complex.c | 21 +++++++++++---------- - 1 files changed, 11 insertions(+), 10 deletions(-) - -commit ba7e85c104e68b4685c1b3b5c9a260fe0f6879df -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 30 21:11:53 2011 -0400 - - Cosmetic - - src/hb-ot-shape-complex-indic.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit f5bc2725cb892264ba223e0a49f7fd2c622a0730 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 30 21:08:10 2011 -0400 - - [Indic] For old-style Indic tables, move Halant around - - In old-style Indic OT standards, the post-base Halants are moved after - their base. Emulate that by moving first post-base Halant to - post-last-consonant. - - Brings test-shape-complex failures down from 88 to 54. Getting there! - - src/hb-ot-map-private.hh | 3 +++ - src/hb-ot-shape-complex-indic.cc | 20 ++++++++++++++++++++ - 2 files changed, 23 insertions(+), 0 deletions(-) - -commit c47a31fb4793b825f4be57e9cb1b10db352b9512 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 30 20:57:01 2011 -0400 - - [OT] Save chosen script tag - - src/hb-ot-layout.cc | 20 ++++++++++++++++---- - src/hb-ot-layout.h | 3 ++- - src/hb-ot-map-private.hh | 1 + - src/hb-ot-map.cc | 2 +- - 4 files changed, 20 insertions(+), 6 deletions(-) - -commit 3a9b14dfdfc278b432890e1537672a4ca141a3b0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 30 20:23:55 2011 -0400 - - Minor - - test/test-shape-complex.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 8613193bbf28fe8951c900b68c4418a6fb929626 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 30 20:21:40 2011 -0400 - - [test] Fix problem with N'ko test direction - - Old HarfBuzz test suite always shaped as left-to-right and hence - had wrong - 0x14db, direction expected glyphstring for N'ko. Doh! - - Failures down from 92 to 88. - - test/test-shape-complex.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit fd06bf56110e73826b3d5c73ac964e2609450d46 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 30 20:14:44 2011 -0400 - - [Indic] Handle initial Ra+Halant in scripts that support Reph - - Brings test-shape-complex failures down from 104 to 92. Way to go! - - src/hb-ot-shape-complex-indic.cc | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit ee58f3bc75d2d071a71b94063bf12205a5871acb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 30 19:15:53 2011 -0400 - - Minor - - src/hb-ot-shape-complex-indic.cc | 23 ++++++++++++----------- - 1 files changed, 12 insertions(+), 11 deletions(-) - -commit 352372ae5ea0998e40cf9fe43c22b6b610a5764e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 30 19:04:02 2011 -0400 - - [Indic] Categorize Ra in scripts that have Reph - - Is the categorization correct? I don't know. - - src/hb-ot-shape-complex-indic.cc | 31 ++++++++++++++++++++++++++++++- - 1 files changed, 30 insertions(+), 1 deletions(-) - -commit 45d6f29f15f1d2323bcaa2498aed23ff0c8a1567 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 30 14:44:30 2011 -0400 - - [Indic] Reorder matras - - Number of failing shape-complex tests goes from 125 down to 94. - - Next: Add Ra handling and it's fair to say we kinda support Indic :). - - src/hb-ot-shape-complex-indic.cc | 29 +++++++++++++++++++++++++++-- - src/hb-ot-shape-normalize.cc | 26 ++++++++++---------------- - src/hb-private.hh | 36 - ++++++++++++++++++++++++++++++------ - 3 files changed, 67 insertions(+), 24 deletions(-) - -commit 911bf32acad7f1cd161f666cb659990ade0925ad -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 30 11:16:00 2011 -0400 - - Bug 39686 - Add '-no-undefined' to libharfbuzz LDFLAGS - - src/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8f0b64fb6988f9502d2c5e39768a9af133d9a83f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 29 17:02:48 2011 -0400 - - Minor - - src/hb-ot-shape-complex-arabic.cc | 6 +++--- - src/hb-private.hh | 8 ++++++-- - 2 files changed, 9 insertions(+), 5 deletions(-) - -commit 743807a3ce1b2229e5307a8aea074a7544623d8d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 29 16:37:02 2011 -0400 - - [Indic] Apply Indic features - - Find the base consonant and apply basic Indic features accordingly. - Nothing complete, but does something for now. Specifically: - no Ra handling right now, and no ZWJ/ZWNJ. - - Number of failing shape-complex tests goes from 174 down to 125. - - Next: reorder matras. - - src/hb-ot-shape-complex-indic-machine.rl | 35 ++++-- - src/hb-ot-shape-complex-indic.cc | 209 - +++++++++++++++++++++++++++--- - 2 files changed, 212 insertions(+), 32 deletions(-) - -commit 1a1b5013159369b343d0c32df02c9c419277aead -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 29 16:36:46 2011 -0400 - - Minor - - test/test-shape-complex.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit dd5546de15e63c0320b7db2bf42b0f15271f7915 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 29 16:27:31 2011 -0400 - - Minor - - test/test-shape-complex.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9f9bcceca6321d5a5812f878de1de39901349a78 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 28 17:06:46 2011 -0400 - - Register buffer vars in Indic shaper - - src/hb-ot-shape-complex-indic.cc | 6 ++++++ - src/hb-ot-shape.cc | 2 ++ - 2 files changed, 8 insertions(+), 0 deletions(-) - -commit be09bf6b799cafc2ff54a28915b307ffe99661b6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 28 17:03:43 2011 -0400 - - Oops. This should have gone into the previous commit - - src/hb-ot-layout-gsub-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b65c06025d2b54a44f716e030d4b10072c65bea8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 28 16:48:43 2011 -0400 - - Formalize buffer var allocations - - src/hb-buffer-private.hh | 25 +++++--------- - src/hb-buffer.cc | 15 +++++---- - src/hb-ot-layout-gpos-private.hh | 14 +++++--- - src/hb-ot-layout-gsub-private.hh | 5 ++- - src/hb-ot-shape-complex-arabic.cc | 6 +++- - src/hb-ot-shape-complex-indic.cc | 4 +- - src/hb-ot-shape-complex-private.hh | 10 +++++- - src/hb-ot-shape.cc | 60 - +++++++++++++++++++++-------------- - src/hb-private.hh | 1 + - 9 files changed, 83 insertions(+), 57 deletions(-) - -commit a9ad3d3460ba863a8d8f3766ccbeab288c3c6822 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 28 15:42:18 2011 -0400 - - Move more code around - - Buffer var allocation coming into shape - - src/hb-buffer-private.hh | 1 + - src/hb-buffer.cc | 35 - +++++++++++++++++++++++++++++++++++ - src/hb-ot-layout-gpos-private.hh | 7 +++++++ - src/hb-ot-layout-gsub-private.hh | 18 ++++++++++++++++++ - src/hb-ot-layout.cc | 8 +++----- - 5 files changed, 64 insertions(+), 5 deletions(-) - -commit cc06c243d8be3ebb1190281653d2dba504c16c0f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 25 20:25:44 2011 -0400 - - Streamline debugging infrastructure even more - - src/hb-blob.cc | 26 ++++---- - src/hb-object-private.hh | 8 +- - src/hb-open-type-private.hh | 64 ++++++-------------- - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - src/hb-private.hh | 109 - ++++++++++++++++++++++++++++++--- - 5 files changed, 136 insertions(+), 73 deletions(-) - -commit 43ff203d8ea3e1b09e316e3aae1a4e5ec15bfdd2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 25 17:35:24 2011 -0400 - - Use variadic macros for debugging - - Looks *so* much nicer! - - src/hb-blob.cc | 26 +++++++------- - src/hb-object-private.hh | 8 ++-- - src/hb-open-type-private.hh | 75 - +++++++++++++++++++----------------------- - src/hb-private.hh | 7 +++- - 4 files changed, 56 insertions(+), 60 deletions(-) - -commit decd4e3e16424dc311e9fb5b663170414a11556a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 25 16:47:02 2011 -0400 - - Add sugar syntax for debug messages - - Buffer debugging coming soon. - - src/hb-blob.cc | 35 ++++++++++++--------------------- - src/hb-object-private.hh | 9 +++---- - src/hb-open-type-private.hh | 44 - +++++++++++++++++++++--------------------- - src/hb-private.hh | 7 ++++- - 4 files changed, 44 insertions(+), 51 deletions(-) - -commit 3a81b1db89beba91fb91791918b9fdd9f8fc9fa0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 25 16:30:32 2011 -0400 - - Minor, fix leak from my previous refactorings - - src/hb-buffer.cc | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit f4a579bc42fb811ff5c391a0e97b7d8656ef59b1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 25 16:20:16 2011 -0400 - - Add internal API for buffer var allocation - - src/hb-buffer-private.hh | 25 +++++++++++++++++++++++-- - src/hb-buffer.cc | 22 ++++++++++++++++++++++ - 2 files changed, 45 insertions(+), 2 deletions(-) - -commit 651e8dd79ec8eaca5ab75a61e8ce961ff7bd26eb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 25 14:54:08 2011 -0400 - - Start cleaning up buffer var allocation - - I've messed up a lot of stuff recently, different parts of the - shaping process are stumbling on eachother's toes because - manually tracking what's in which buffer var is hard. I'm - going to add some internal API to track those such that mistakes - are discovered as soon as they are introduced. - - src/hb-ot-layout-gsubgpos-private.hh | 1 - - src/hb-ot-layout.cc | 1 + - src/hb-ot-shape.cc | 10 ---------- - 3 files changed, 1 insertions(+), 11 deletions(-) - -commit c86f932015bdf5803572b0904d343d3bc033e009 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 25 00:44:50 2011 -0400 - - Move code around - - src/hb-ot-shape.cc | 85 - +++++++++++++++++++++++++-------------------------- - 1 files changed, 42 insertions(+), 43 deletions(-) - -commit 18c42850c9327ab4479ff150660a76d4ff6f3e9c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 25 00:36:58 2011 -0400 - - Shrink space used for ligature ids - - This frees 16bits in the glyph_info struct during the ot_layout - process. - We can use the freed space in the shapers now. - - src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit d8787493c9aa420544096cef07c29a591a0c1a99 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 25 00:36:01 2011 -0400 - - Minor - - src/hb-ot-layout-gsub-private.hh | 6 ------ - src/hb-ot-layout-gsubgpos-private.hh | 7 +++++++ - 2 files changed, 7 insertions(+), 6 deletions(-) - -commit c311d852080b50ffc85e80168de62abb05a6be59 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 23 23:43:54 2011 -0400 - - Keep Unicode props updated as we go so we avoid a scan later - - src/hb-ot-shape-normalize.cc | 54 - ++++++++++++++++++++--------------------- - 1 files changed, 26 insertions(+), 28 deletions(-) - -commit 5389ff4dbc46c76c9483e3c95f22524b60e21166 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 22 20:22:49 2011 -0400 - - Implement the Unicode Canonical Composition algorithm - - Fallback normalization is complete and working now! - - src/hb-ot-shape-normalize.cc | 49 - +++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 46 insertions(+), 3 deletions(-) - -commit dcdc51cdc0ba9d9fb75f84dd5fa7a49aa0b24ea0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 22 17:14:46 2011 -0400 - - Handle singleton decompositions - - src/hb-ot-shape-normalize.cc | 12 +++++++----- - 1 files changed, 7 insertions(+), 5 deletions(-) - -commit 34c22f816808d061a980cffca12de03beb437fa0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 22 17:04:20 2011 -0400 - - Implement Unicode Canonical Reordering Algorithm - - src/hb-ot-shape-normalize.cc | 80 - +++++++++++++++++++++++++++++++++++------ - src/hb-ot-shape-private.hh | 2 + - src/hb-ot-shape.cc | 6 ++-- - 3 files changed, 73 insertions(+), 15 deletions(-) - -commit 4ff0d2d9dfc4f7e4880a4e964ca9872624508ea0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 22 16:15:32 2011 -0400 - - Decomposition works now! - - src/hb-ot-shape-normalize.cc | 109 - ++++++++++++++++++++++++++---------------- - src/hb-ot-shape.cc | 3 +- - 2 files changed, 70 insertions(+), 42 deletions(-) - -commit 468e9cb25c9bc14781b7013e447d763f93bf76a3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 22 11:28:07 2011 -0400 - - Move buffer methods into the object - - src/hb-buffer-private.hh | 110 +++---- - src/hb-buffer.cc | 605 - +++++++++++++++++----------------- - src/hb-ot-layout-gpos-private.hh | 88 +++--- - src/hb-ot-layout-gsub-private.hh | 58 ++-- - src/hb-ot-layout-gsubgpos-private.hh | 50 ++-- - src/hb-ot-shape-normalize.cc | 16 +- - src/hb-ot-shape.cc | 14 +- - 7 files changed, 456 insertions(+), 485 deletions(-) - -commit 45412523dc295cb5ee12e096bfacb282cc925843 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 22 11:07:05 2011 -0400 - - More normalization kick - - src/hb-ot-shape-normalize.cc | 54 - ++++++++++++++++++++++++++++-------------- - src/hb-ot-shape-private.hh | 8 +++++- - src/hb-ot-shape.cc | 13 ++------- - 3 files changed, 46 insertions(+), 29 deletions(-) - -commit 63c0ef4a0763e579c9c80887bbfbd2651de05067 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 21 20:58:42 2011 -0400 - - Fix decompose() implementations to work with non-starter - non-composables - - Add tests. - - src/hb-glib.cc | 10 +++++----- - src/hb-icu.cc | 20 +++++++++++++------- - test/test-unicode.c | 11 ++++++++--- - 3 files changed, 26 insertions(+), 15 deletions(-) - -commit 5d90a342e319068716429bf7af76c3896b61a0e5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 21 15:25:01 2011 -0400 - - Document normalization design - - src/hb-ot-shape-normalize.cc | 78 - +++++++++++++++++++++++++++++++++-------- - src/hb-ot-shape-private.hh | 2 +- - src/hb-ot-shape.cc | 6 ++- - 3 files changed, 67 insertions(+), 19 deletions(-) - -commit 02cdf743c2ec345a44d4fcf865594b6ac13fccd0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 21 12:23:12 2011 -0400 - - Add prefer_decomposed() complex-shaper callback - - This allows the Indic shaper to request decomposed characters. - This will - handle split matra for free. Other shapers prefer precomposed - characters. - - src/hb-ot-shape-complex-arabic.cc | 6 ++++++ - src/hb-ot-shape-complex-indic.cc | 7 +++++++ - src/hb-ot-shape-complex-misc.cc | 6 ++++++ - src/hb-ot-shape-complex-private.hh | 31 +++++++++++++++++++++++++++++-- - 4 files changed, 48 insertions(+), 2 deletions(-) - -commit d6b9c6d20041b4f4fa11befc179aee757c41904d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 21 12:16:45 2011 -0400 - - More kicking - - src/hb-ot-shape-normalize.cc | 17 ++++++++++++++--- - 1 files changed, 14 insertions(+), 3 deletions(-) - -commit 192445aef2e50087049243ce54ce7059ec441ffa -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 21 12:13:04 2011 -0400 - - Remove intermittent_glyph() - - Lets not worry about performance for now... - - src/hb-ot-shape-normalize.cc | 3 ++- - src/hb-ot-shape-private.hh | 2 -- - 2 files changed, 2 insertions(+), 3 deletions(-) - -commit d63adfc7d09b26764d9166da97372b21257e7611 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 21 11:48:57 2011 -0400 - - No need to handle variation-selectors seperately, they are GC=Mn - - src/hb-ot-shape.cc | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit aa7264123a088936f2043b45d4d41ca7413fabe5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 21 11:34:59 2011 -0400 - - Only form clusters if we are reversing - - This produces more accurate cluster mappings. Cluster mappings are - minimal now. Combining marks get their own cluster value most of - the time. - - src/hb-ot-shape.cc | 45 ++++++++++++++++++++++----------------------- - 1 files changed, 22 insertions(+), 23 deletions(-) - -commit 5c6f5982d78e2d7fadc2fbb8b4f3a4be9420c59a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 21 11:31:08 2011 -0400 - - Towards normalization - - src/hb-ot-shape-normalize.cc | 33 ++++++++++++++++++++++----------- - src/hb-ot-shape-private.hh | 3 ++- - src/hb-ot-shape.cc | 4 +++- - 3 files changed, 27 insertions(+), 13 deletions(-) - -commit ad903e66b1cc4ec1b8160f93b3ab2b5e636f8d62 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 21 10:17:22 2011 -0400 - - s/COMBINING_MARK/SPACING_MARK/ here too. Oops! - - test/test-unicode.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit cf7f43ec3382cac2af11f5637c840500daabf889 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 21 01:12:26 2011 -0400 - - Remove stale comment - - src/hb-ot-shape.cc | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 54d1a0d2b2c4ffe15494967122c6422ecb1fc80b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 21 01:11:09 2011 -0400 - - Form clusters before ensuring native direciton - - This is essential as ensure_native_direction uses cluster info that - is set by form_clusters(). - - src/hb-ot-shape.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 9111b21ef99d5e53348176f683261b0101eb427f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 21 00:58:29 2011 -0400 - - Add _hb_buffer_output_glyph() and _hb_buffer_skip_glyph() - - src/hb-buffer-private.hh | 10 ++++++++++ - src/hb-buffer.cc | 19 ++++++++++++++++--- - src/hb-ot-shape.cc | 2 +- - 3 files changed, 27 insertions(+), 4 deletions(-) - -commit 655586fe5e1fadf2a2ef7826e61ee9a445ffa37a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 21 00:51:18 2011 -0400 - - Towards normalization - - src/Makefile.am | 1 + - src/hb-ot-shape-normalize.cc | 71 - ++++++++++++++++++++++++++++++++++++++++++ - src/hb-ot-shape-private.hh | 12 +++++++ - src/hb-ot-shape.cc | 10 +----- - 4 files changed, 86 insertions(+), 8 deletions(-) - -commit 49741c86334d12fa08a5bfa2110ff3b9adcba1c7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 21 00:35:37 2011 -0400 - - Include variation-selectors in cluster calculation - - src/hb-ot-shape.cc | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit dd89d958c139d85efb776fffaf314eead3952c78 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 21 00:28:57 2011 -0400 - - Fix cluster calculation for non-LTR text - - TODO | 6 ------ - src/hb-buffer.cc | 5 +++++ - 2 files changed, 5 insertions(+), 6 deletions(-) - -commit 4a68684654e645882095c1189477146287ce9437 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 21 00:14:01 2011 -0400 - - When forming clusters, participate all mark types - - src/hb-ot-shape.cc | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 5157e12a55f943b7fc5be7dce0b2ee1bcacca6ec -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 21 00:12:33 2011 -0400 - - Rename HB_UNICODE_GENERAL_CATEGORY_COMBINING_MARK to - HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK - - Spacing_Mark is the current Unicode long-name for this property value. - The previous name was wrongly carried from glib. - - src/hb-common.h | 2 +- - src/hb-icu.cc | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 7b08b0a7f2057937dfc3ab2ec191656bf2386463 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 20 23:59:07 2011 -0400 - - Minor - - src/hb-ot-shape-complex-arabic.cc | 8 ++++---- - src/hb-private.hh | 19 +++++++++++++++++++ - 2 files changed, 23 insertions(+), 4 deletions(-) - -commit 498e1a9be673bb02c00aac3f12bb4c6993a85910 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 20 23:19:49 2011 -0400 - - [icu] Implement compose()/decompose() - - src/hb-icu.cc | 87 - +++++++++++++++++++++++++++++++++++++++++++++++++- - test/test-unicode.c | 1 + - 2 files changed, 86 insertions(+), 2 deletions(-) - -commit ffd4a436f7baccb68a0c3602f94ea0246e32844f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 20 22:30:29 2011 -0400 - - Add tests for compose()/decompose() - - Adjust glib fallback implementation. - - The tests are not hooked up for ICU yet. - - src/hb-glib.cc | 17 +++++++++++- - src/hb-unicode.cc | 2 +- - test/test-unicode.c | 66 - +++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 82 insertions(+), 3 deletions(-) - -commit fca0923b04aeff9369849da97d247a647611f346 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 20 22:16:13 2011 -0400 - - Minor - - src/hb-icu.cc | 62 - ++++++++++++++++++++++++++++++++++---------------------- - 1 files changed, 38 insertions(+), 24 deletions(-) - -commit 26b6024962b254b624d4f22088b6c87745074743 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 20 21:58:14 2011 -0400 - - [glib] Use g_unicode_script_to/from_iso15924() if available - - src/hb-glib.cc | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit 22fdc66712464bdb02e45eed49e4be57e79b442f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 20 21:51:37 2011 -0400 - - [glib] Add compose() and decompose() implementations with fallback - - src/hb-glib.cc | 126 - +++++++++++++++++++++++++++++++++++++++++++---------- - src/hb-unicode.cc | 6 ++- - 2 files changed, 106 insertions(+), 26 deletions(-) - -commit a54a5505a35eef5315a8e2e7a79502901e3eff5f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 20 16:42:10 2011 -0400 - - Minor - - src/hb-ot-shape-complex-indic.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 23db8d5c92c96a34c716b68e1aa6819c5a20477a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 12 12:02:26 2011 -0400 - - [test] Work around glib <= 2.30 API - - test/hb-test.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 22989c5ffc8cce1ea05d729cdf33661c35a52334 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 12 11:54:58 2011 -0400 - - Distribute hb-ot-shape-complex-indic-machine.rl - - src/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit f6fd3780e12b23ff7ed3743497c8996e71dcb064 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 8 00:22:40 2011 -0400 - - Let shapers decide when to apply ccmp and locl - - Instead of always applying those two features before the complex - shaper, - let the complex shaper decide whether they should be applied first. - - Also add stub for Indic's final_reordering(). - - src/hb-ot-shape-complex-arabic.cc | 2 ++ - src/hb-ot-shape-complex-indic.cc | 16 ++++++++++++++++ - src/hb-ot-shape.cc | 7 +------ - 3 files changed, 19 insertions(+), 6 deletions(-) - -commit c4641723fbf6532b2e80a662e15573b31276bc73 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 7 23:47:19 2011 -0400 - - [API] Add compose() and decompose() unicode funcs, rename other ones - - Add compose() and decompose() unicode funcs. These implement - pair-wise canonical composition/decomposition. - - The glib/icu implementations are lacking for now. We are adding - API for this to glib, but I cannot find any useful API in ICU. - May end of implementing these in-house. - - Changed all unicode_funcs callback names to remove the "_get" part. - Eg, hb_unicode_get_script_func_t is now hb_unicode_script_func_t, - and hb_unicode_get_script() is hb_unicode_script() now. - - TODO | 4 ++- - src/hb-glib.cc | 6 +++- - src/hb-icu.cc | 6 +++- - src/hb-ot-shape.cc | 6 ++-- - src/hb-shape.cc | 2 +- - src/hb-unicode-private.hh | 8 +++-- - src/hb-unicode.cc | 85 - ++++++++++++++++++++++++++++++++------------ - src/hb-unicode.h | 70 ++++++++++++++++++++++++++---------- - test/test-unicode.c | 21 ++++++----- - 9 files changed, 146 insertions(+), 62 deletions(-) - -commit d05dded1676924e8894c90f7a7c3527b492bcdff -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 7 23:42:40 2011 -0400 - - More code generation through preprocessor - - src/hb-ot-shape-complex-private.hh | 46 - ++++++++++++++++++++++------------- - 1 files changed, 29 insertions(+), 17 deletions(-) - -commit 891c4755baae6cd59fad59d27fd8933e5f548a74 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 7 23:19:27 2011 -0400 - - Humm, undo some shuffling - - In preparation for adding more advanced unicode funcs. - - src/hb-ot-shape.cc | 6 ++-- - src/hb-shape.cc | 2 +- - src/hb-unicode-private.hh | 36 ++++++++++++------------ - src/hb-unicode.cc | 65 - +++++++++++++++++++++++++++++++++------------ - 4 files changed, 70 insertions(+), 39 deletions(-) - -commit 4b6317c4f426cfaf21e509dbf6ee6d4e0422cdac -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 7 23:14:42 2011 -0400 - - More code shuffling - - src/hb-font-private.hh | 16 +++--- - src/hb-font.cc | 3 +- - src/hb-unicode-private.hh | 42 +++++++------- - src/hb-unicode.cc | 140 - +++++++++++++++++---------------------------- - 4 files changed, 82 insertions(+), 119 deletions(-) - -commit 3361c9a323575309d9fd55fe076697a3e22073c0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 7 22:35:17 2011 -0400 - - Minor - - src/Makefile.am | 1 + - src/hb-ot-shape-complex-misc.cc | 51 - ++++++++++++++++++++++++++++++++++++ - src/hb-ot-shape-complex-private.hh | 12 +++++--- - 3 files changed, 60 insertions(+), 4 deletions(-) - -commit 76f76812ac7cca8ac6935952a2360d5e151480fa -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 7 22:25:25 2011 -0400 - - Shuffle code around, remove shape_plan from complex shapers - - src/hb-ot-shape-complex-arabic.cc | 36 ++++++++++++------------ - src/hb-ot-shape-complex-indic-machine.rl | 12 ++++---- - src/hb-ot-shape-complex-indic.cc | 25 ++++++++--------- - src/hb-ot-shape-complex-private.hh | 44 - +++++++++++++++++++---------- - src/hb-ot-shape-private.hh | 13 +------- - src/hb-ot-shape.cc | 4 +- - 6 files changed, 69 insertions(+), 65 deletions(-) - -commit e88bff9b4d77dc86c04832163081effbff752216 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 7 22:03:02 2011 -0400 - - Minor, use function typedefs - - src/hb-ot-shape-complex-private.hh | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit 359dcaa0d33271025ca42a5f54ecbac7ae3b56d3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 7 21:55:05 2011 -0400 - - Update copyright headers - - src/hb-ot-map-private.hh | 2 +- - src/hb-ot-map.cc | 2 +- - src/hb-ot-shape-complex-private.hh | 2 +- - src/hb-ot-shape.cc | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -commit d8d0c480c85246a74d47dd5297019c7e39391ab0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 7 21:22:08 2011 -0400 - - Refactor some code common to GSUB and GPOS - - src/hb-ot-map-private.hh | 29 +++++++++++++++++------- - src/hb-ot-map.cc | 54 - ++++++++------------------------------------- - 2 files changed, 30 insertions(+), 53 deletions(-) - -commit b70c96dbe41d6512b80fe3d966a1942e1ef64a4b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 7 21:07:41 2011 -0400 - - Enable applying GSUB/GPOS features in multiple segments - - Fixes https://bugzilla.mozilla.org/show_bug.cgi?id=644184 - among others. - - Shapers now can request segmented feature application by calling - add_gsub_pause() or add_gpos_pause(). They can also provide a - callback to be called at the pause. Currently the Arabic shaper - uses pauses to enforce certain feature application. The Indic - shaper can use the same facility to pause and do reordering in the - callback. - - src/hb-ot-map-private.hh | 50 +++++++++++--- - src/hb-ot-map.cc | 132 - ++++++++++++++++++++++++++++++++----- - src/hb-ot-shape-complex-arabic.cc | 24 ++++++- - src/hb-private.hh | 5 ++ - 4 files changed, 181 insertions(+), 30 deletions(-) - -commit f6d7a9bb4c19e605f1f16d9ca40adefba138c37e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 7 16:20:35 2011 -0400 - - Shuffle code around - - src/hb-ot-map-private.hh | 68 - +++++++++++++++++++++++----------------------- - 1 files changed, 34 insertions(+), 34 deletions(-) - -commit fc551edbf236d71a522ae7c2c9461aa71c5f7d66 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 7 16:09:38 2011 -0400 - - Add todo - - I'm too lazy to fix the tests now. - - test/test-shape.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 2e18c6dbdfbbfdec0490260bb7cb5213551b2188 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 6 16:05:45 2011 -0400 - - Fix reverse_range() position loop - - Mozilla Bug 669175 - Slow rendering of text sometimes in this case, - using direction: rtl - - src/hb-buffer.cc | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit fa2befa46f215d8c33a54dfc57889928a628164c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 4 17:18:57 2011 -0400 - - Minor - - src/hb-view.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d69d5ceaa0ad30e8d4b9783507c59c6d4221de4f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jul 4 12:56:38 2011 -0400 - - [Indic] Well, at least finding syllables works now :) - - Still not much there. - - src/hb-ot-shape-complex-indic-machine.rl | 4 +++- - src/hb-ot-shape-complex-indic.cc | 9 ++++++++- - 2 files changed, 11 insertions(+), 2 deletions(-) - -commit 253a57fb5ab211f67140e6139d183e49483a9074 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 28 17:26:03 2011 -0400 - - [test-shape-complex] Remove the greek tests - - They are outdated with respect to the DejaVu Sans I'm using. - We need to add font version checking to the tests. - - test/test-shape-complex.c | 17 ----------------- - 1 files changed, 0 insertions(+), 17 deletions(-) - -commit afa74bf90405fb121d3132982b87762c1686d80c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 28 17:25:17 2011 -0400 - - [test-shape-complex] Print out expected and actual glyphstrings - upon failure - - One has to run the test with --verbose to see that right now. - - test/test-shape-complex.c | 25 ++++++++++++++++++++++--- - 1 files changed, 22 insertions(+), 3 deletions(-) - -commit 42d453b0236f67239342df2003b7abce6e2c51ea -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 28 16:59:16 2011 -0400 - - [test] Name tests after their input string - - test/Makefile.am | 2 +- - test/test-shape-complex.c | 150 - +++++++++++++++++++++++++++++--------------- - 2 files changed, 100 insertions(+), 52 deletions(-) - -commit 27413169782fdf79e278dd6552c8e194b3bc4eaa -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 28 16:21:31 2011 -0400 - - Minor - - Towards a better test runner. - - test/test-shape-complex.c | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) - -commit cc674cbf7fb9972975dc0499974e5e7fb4ae3c81 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 28 16:17:16 2011 -0400 - - Minor - - test/test-shape-complex.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 20d8a3982ae320035edd6a04b402cefc9a5e5779 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 28 16:16:21 2011 -0400 - - [test] Remove disabled code - - We'd add normalization and decomposition tests later. - - test/test-shape-complex.c | 92 - --------------------------------------------- - 1 files changed, 0 insertions(+), 92 deletions(-) - -commit 9704f0ca6c2defed52640da77506c80bc67b4f56 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 28 16:15:46 2011 -0400 - - [test] Restructure shape test data a bit - - test/test-shape-complex.c | 75 - +++++++++++++++++++++++++------------------- - 1 files changed, 43 insertions(+), 32 deletions(-) - -commit 4ec30aec3014be6effc09cbbc88dcd075f3826df -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 28 14:13:38 2011 -0400 - - [Indic] Optimize Indic table storage - - src/hb-ot-shape-complex-indic.cc | 8 +++++--- - src/hb-private.hh | 1 + - 2 files changed, 6 insertions(+), 3 deletions(-) - -commit c4a59de6d8c1e581b5c155319232be9e805e5cba -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 28 14:03:29 2011 -0400 - - [Indic] Generate a single data table instead of multiple ones - - src/gen-indic-table.py | 30 +++++++++------ - src/hb-ot-shape-complex-indic-table.hh | 62 - +++++++++++++++---------------- - 2 files changed, 48 insertions(+), 44 deletions(-) - -commit a346e923a99f920bbebc25b335db51fdfb1429ea -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 28 12:49:18 2011 -0400 - - [test] Add Indic tests from harfbuzz.old - - Needs fonts to be put in test/fonts. Tests are skipped otherwise. - Run with --verbose for details. Working on improving the test runner - to make it easier to make sense of what's going on. - - test/Makefile.am | 11 +- - test/hb-test.h | 21 + - test/test-shape-complex.c | 1179 - +++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 1209 insertions(+), 2 deletions(-) - -commit 8fdba506f0f1c66b50f8f4b114d624cb956d03b7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 24 20:45:55 2011 -0400 - - [Indic] Define indic_position_t - - src/hb-ot-shape-complex-indic.cc | 239 - +++++++++++++++++++------------------- - 1 files changed, 122 insertions(+), 117 deletions(-) - -commit 65988a145b4a52c37fd53c1473034f9e701f61d9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 24 19:05:52 2011 -0400 - - [Indic] Add a table of consonant positions - - Copied form HarfBuzz.old Indic data. These are below and post - consonants. This is temporary. Read the comment in the patch. - - src/hb-ot-shape-complex-indic.cc | 106 - ++++++++++++++++++++++++++++++++++++++ - 1 files changed, 106 insertions(+), 0 deletions(-) - -commit c7fe56a1d5d3e969b6ec51cd9ecd471706a19568 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 24 19:05:34 2011 -0400 - - [Indic] Some of the basic features are global; Mark them so - - src/hb-ot-shape-complex-indic-machine.rl | 1 + - src/hb-ot-shape-complex-indic.cc | 48 - +++++++++++++++++++++--------- - 2 files changed, 35 insertions(+), 14 deletions(-) - -commit 867361c3ad39629a8d5b7dc48d558a1c19e37d43 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 17 18:35:46 2011 -0400 - - [indic] Add syllable recognition state machine - - Using an incredible tool called Ragel. - - src/Makefile.am | 5 ++ - src/hb-ot-shape-complex-indic-machine.rl | 105 - ++++++++++++++++++++++++++++++ - src/hb-ot-shape-complex-indic.cc | 21 ++++-- - 3 files changed, 125 insertions(+), 6 deletions(-) - -commit 422e08dbb8e2c0c5664f1bdc7e159a673cfea8c5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jun 15 17:22:48 2011 -0400 - - Better categorize Indic character classes - - Matches OT types now. - - src/hb-ot-shape-complex-indic.cc | 51 - +++++++++++++++++++++++-------------- - 1 files changed, 32 insertions(+), 19 deletions(-) - -commit 31f18abecb149f8888a72510f2660328dd6de16d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jun 15 09:49:58 2011 -0400 - - Minor compiler warning fixes - - src/hb-buffer-private.hh | 8 ++++---- - src/hb-object-private.hh | 4 ++-- - src/hb-open-type-private.hh | 6 +++--- - src/hb-ot-layout-common-private.hh | 8 ++++---- - src/hb-ot-map.cc | 28 +++++++++++++++------------- - src/hb-ot-shape-complex-arabic.cc | 3 +-- - src/hb-view.cc | 11 ++++++----- - test/test-object.c | 22 +++++++++++----------- - test/test-unicode.c | 4 ++-- - 9 files changed, 48 insertions(+), 46 deletions(-) - -commit e3693b72f0651985d4f619cde668611639dca885 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jun 15 09:33:52 2011 -0400 - - Change a couple strstr() to strchr() - - src/hb-ot-tag.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit b9452bfc1696457e156e79037c863903da5454fc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 14 14:47:07 2011 -0400 - - Fix compiler warnings with -pedantic - - src/hb-blob.cc | 18 +++++++++--------- - src/hb-glib.cc | 20 ++++++++++---------- - src/hb-icu.cc | 20 ++++++++++---------- - src/hb-object-private.hh | 2 +- - src/hb-open-type-private.hh | 14 +++++++------- - src/hb-ot-layout-gdef-private.hh | 2 +- - src/hb-ot-layout.cc | 2 +- - src/hb-ot-map-private.hh | 2 +- - src/hb-ot-shape-complex-indic.cc | 8 ++++---- - src/hb-ot-shape-private.hh | 2 +- - src/hb-ot-shape.cc | 2 +- - 11 files changed, 46 insertions(+), 46 deletions(-) - -commit 970e092dc23cbeb7897d4c7bb58c042209f518fb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 14 14:35:44 2011 -0400 - - Remove extra semicolon - - src/hb-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 81426808020e2b88f008480bd63519aa68c579a7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jun 13 16:02:18 2011 -0400 - - Cosmetic - - src/gen-indic-table.py | 9 +- - src/hb-ot-shape-complex-indic-table.hh | 1038 - ++++++++++++++++---------------- - 2 files changed, 524 insertions(+), 523 deletions(-) - -commit 902ab866f2d2edc3a71c1203065e6ddf49e5b431 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jun 10 23:08:54 2011 -0400 - - GNOME Bug 652227 - Unconditional use of stdint.h - - src/hb-common.h | 33 ++++++++++++++++++++++----------- - 1 files changed, 22 insertions(+), 11 deletions(-) - -commit 20503ccd578c9983162857954e3236413469ed35 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 7 17:02:48 2011 -0400 - - More Indic data shuffling - - src/hb-ot-shape-complex-indic.cc | 74 - +++++++++++++++++++++++++------------ - 1 files changed, 50 insertions(+), 24 deletions(-) - -commit 63b177e45c2405272da3fa6c26fe11ae37950bd0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 7 15:51:40 2011 -0400 - - Minor - - src/hb-ot-shape.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit b9ddbd55930228422e82b34a141ad1b6093f5376 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jun 2 17:43:12 2011 -0400 - - [Indic] Start an Indic shaper - - Nothing functional in there yet. - - So far, we're parsing IndicSyllabicCategory.txt and - IndicMatraCategory.txt - fils from Unicode Character Database and store them in an array to - be used - by the shaper. Also hooked up the shaper, but it does not do anything - right now. - - src/Makefile.am | 3 + - src/gen-indic-table.py | 201 ++++++++ - src/hb-ot-shape-complex-arabic.cc | 4 +- - src/hb-ot-shape-complex-indic-table.hh | 834 - ++++++++++++++++++++++++++++++++ - src/hb-ot-shape-complex-indic.cc | 141 ++++++ - src/hb-ot-shape-complex-private.hh | 58 ++- - src/hb-ot-shape-private.hh | 3 +- - 7 files changed, 1237 insertions(+), 7 deletions(-) - -commit 697a65c5f5cda53bc68720886a253a019e8212a8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jun 1 20:52:00 2011 -0400 - - Minor - - src/gen-arabic-table.py | 21 +++++++++++++-------- - src/hb-ot-shape-complex-arabic-table.hh | 9 ++++----- - 2 files changed, 17 insertions(+), 13 deletions(-) - -commit 9de1481f2bbbf2a174280b849628612f36a2f701 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jun 1 20:45:14 2011 -0400 - - Update to ArabicShaping-6.1.0d2.txt - - src/hb-ot-shape-complex-arabic-table.hh | 307 - ++++++++++++++++++++----------- - 1 files changed, 197 insertions(+), 110 deletions(-) - -commit 9d49433efba2217852f4e44f056465b451961c49 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jun 1 18:10:10 2011 -0400 - - Minor rename - - src/Makefile.am | 2 +- - src/gen-arabic-joining-table.py | 83 - ------------------------------- - src/gen-arabic-table.py | 83 - +++++++++++++++++++++++++++++++ - src/hb-ot-shape-complex-arabic-table.hh | 2 +- - 4 files changed, 85 insertions(+), 85 deletions(-) - -commit 0eafce56eed4c5166ee5b97b121a452ffd292a7a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jun 1 12:44:30 2011 -0400 - - [TODO] New items - - TODO | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 89a2bc9ba674e7e57fec1fd8ce7648a44f3aab63 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 31 15:18:13 2011 -0400 - - [Vertical] Apply vertical features - - We apply all of vert, vrt2, vkrn, valt, and vpal. - - TODO | 7 ------- - src/hb-ot-shape.cc | 50 - +++++++++++++++++++++++++++++++++++++++++--------- - 2 files changed, 41 insertions(+), 16 deletions(-) - -commit 0c6a9767c812c00f2a6a02d9f43f4694e1f43815 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 31 12:59:17 2011 -0400 - - [hb-view] Add --face-index to choose a face in a TrueType Collection - - src/hb-view.cc | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit 4f28fbdd804fabeec57a98fe267d892ab58b3a6d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 31 12:33:11 2011 -0400 - - Fix TTC header handling - - Also change the Version type to avoid similar bugs in the future. - - Reported by Grigori Goronzy. - - src/hb-open-file-private.hh | 6 +++--- - src/hb-open-type-private.hh | 2 +- - src/hb-ot-layout-gdef-private.hh | 6 +++--- - 3 files changed, 7 insertions(+), 7 deletions(-) - -commit 21deab2bdc58d8e9f1a3ba1f9c61c30a79e288a1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 30 11:08:40 2011 -0400 - - Fixed inifinite loop introduced in 7403e055cd1463f - - k is the index, not j. - - Reported by Tom Hacohen. - - src/hb-ot-layout-gpos-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 51881a61ca96c3328e2d92927a5a61e60997a429 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 27 18:15:56 2011 -0400 - - Shrink code size - - src/hb-ot-map-private.hh | 11 +---------- - src/hb-ot-map.cc | 11 +++++++++++ - 2 files changed, 12 insertions(+), 10 deletions(-) - -commit 90645fb24bcbb78183576d3641a99560d87e49f2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 27 18:13:31 2011 -0400 - - [OT] Separate map_builder from the actual map - - Respectively, separate planner from the actual plan. - - src/hb-ot-map-private.hh | 121 - +++++++++++++++++++---------------- - src/hb-ot-map.cc | 33 +++++----- - src/hb-ot-shape-complex-arabic.cc | 6 +- - src/hb-ot-shape-complex-private.hh | 8 +- - src/hb-ot-shape-private.hh | 22 +++++++ - src/hb-ot-shape.cc | 28 +++++---- - 6 files changed, 127 insertions(+), 91 deletions(-) - -commit 5560a19e2b3901437d8ee2e5905b4ac77073bfbe -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 27 17:49:16 2011 -0400 - - Minor - - src/hb-view.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1587c26fe94087040b4a5d682ec196f568e4a1a2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 27 16:05:01 2011 -0400 - - [TODO] Add item - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 5c9f14932d59e306fbc72f7daecb384a16da73d9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 27 15:59:33 2011 -0400 - - Minor - - Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 5bc18195d55570ef01e4b24dd248f222f081b0a2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 27 15:58:54 2011 -0400 - - Add check-includes.sh - - src/Makefile.am | 7 ++++++ - src/check-c-linkage-decls.sh | 6 ++++- - src/check-header-guards.sh | 8 ++++++- - src/check-includes.sh | 42 - +++++++++++++++++++++++++++++++++++++++++ - src/check-internal-symbols.sh | 8 +++--- - src/check-libstdc++.sh | 7 +++-- - src/hb-ot-shape.h | 1 + - 7 files changed, 70 insertions(+), 9 deletions(-) - -commit 3f12c434e20261f6d5c600e56575b7dfdd5b1470 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 27 04:58:11 2011 -0400 - - [configure] Generate sha256sum and GPG-sign it - - Makefile.am | 29 ++++++++++++++++++++++++++++- - 1 files changed, 28 insertions(+), 1 deletions(-) - -commit 75ba4073ca6f72c135927d9314197a605281b789 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 27 03:58:17 2011 -0400 - - [test] Rename valgrind-log to log-vaglring.txt - - test/Makefile.am | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit e3b0ba8e292e6a90666cfbbab6faf11ae11f9ddb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 27 03:56:37 2011 -0400 - - Minor - - harfbuzz.doap | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 595dc63eee926a0e0fee26f8225b5fbe00610fcb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 27 04:14:12 2011 -0400 - - Bump version to 0.7.0 to open up for development - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f24557604281356131618546332d7ee3a0c8abef -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 25 16:08:06 2011 -0400 - - Release 0.6.0. First official tarball release! - - There are no API guarantees just yet, but I *expect* that no - incompatible API changes to happen before 1.0.0. - - Update NEWS. - - NEWS | 262 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - configure.ac | 2 +- - 2 files changed, 263 insertions(+), 1 deletions(-) - -commit 654f88fbc9bcb54f9bd2d5586236234e03424044 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 27 03:38:46 2011 -0400 - - [test-common] Test hb_direction_to_string() - - Caught by "make check-symbols". - - test/test-common.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 18bced134fc3379c9124ba029e22ff3f6434ca0f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 27 03:38:30 2011 -0400 - - [test] Rename test-symbols to check-symbols - - Shows undocumented symbols. - - test/Makefile.am | 37 +++++++++++++++++++++---------------- - 1 files changed, 21 insertions(+), 16 deletions(-) - -commit 376dafa6ed414e368e9dc1d5a2e0bfc8e55f410d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 27 03:35:58 2011 -0400 - - Hide internal symbols - - src/hb-ot-shape.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 0e482ec6ba30b613f2d7ee97c61be458c5aebcd6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 27 02:46:28 2011 -0400 - - [test/unicode] Fix double-free - - Caught by "make check-valgrind". - - test/Makefile.am | 2 +- - test/test-unicode.c | 2 -- - 2 files changed, 1 insertions(+), 3 deletions(-) - -commit 28b1bac5415774cf892c9cc0afcac1324c2093f5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 27 02:44:29 2011 -0400 - - [test] Switch to automake-based test-runner - - Adds check-valgrind among other modes. We do not run under gtester by - default anymore. - - Makefile.am | 2 + - test/Makefile.am | 48 ++++++++++++++++++++++++++-- - test/Makefile.decl | 90 - ---------------------------------------------------- - 3 files changed, 47 insertions(+), 93 deletions(-) - -commit adbc97ddde27cf609d95d3249f3ea8060a6e1d20 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 27 01:33:18 2011 -0400 - - [test] Add test-symbols that checks API symbol text coverage - - We're not at 100% coverage yet, so do not enable the test by default. - - test/Makefile.am | 21 +++++++++++++++++++++ - 1 files changed, 21 insertions(+), 0 deletions(-) - -commit 9313b9aa66a82fd3fa60d8417c22a5350e5a8791 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 27 01:00:55 2011 -0400 - - [test/version] Test hb-version.h - - test/Makefile.am | 1 + - test/test-version.c | 80 - +++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 81 insertions(+), 0 deletions(-) - -commit 329c15714be90d3fc2d9054f80cb14fa325dc959 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 25 16:07:07 2011 -0400 - - Add libtool versioning - - The versioning is automatic. For now, soname-major is 0. With - the 1.0.0 release it will jump to 1 and stay there forever. - - configure.ac | 26 +++++++++++++++++++++----- - src/Makefile.am | 1 + - 2 files changed, 22 insertions(+), 5 deletions(-) - -commit 5b21eff8c4a00962d4315a47a65a143abe323299 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 25 14:49:35 2011 -0400 - - Update README, etc - - COPYING | 1 + - README | 8 +++----- - configure.ac | 2 +- - 3 files changed, 5 insertions(+), 6 deletions(-) - -commit 5bf56ea056b30fba8e07e82ec818c430cab8cafd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 25 14:43:10 2011 -0400 - - [TODO] Add item - - TODO | 2 ++ - test/test-shape.c | 2 ++ - 2 files changed, 4 insertions(+), 0 deletions(-) - -commit 2d8ebcb9d089c2cfbefac71ca6350e2703ab13e3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 25 11:27:33 2011 -0400 - - [API] One last font-funcs API change - - Now that vertical text works correctly, I'm doing a last round - modification of the font-funcs API to simplify. Expect no more - changes around here. - - src/hb-font.cc | 107 - +++++++++++++++++----------------------------------- - src/hb-font.h | 50 +++++++++++-------------- - src/hb-ft.cc | 26 +++++------- - test/test-font.c | 27 ++++++------- - test/test-shape.c | 21 +++++----- - 5 files changed, 91 insertions(+), 140 deletions(-) - -commit d31691296f7d3051fcd345bf1325d17835484b50 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 25 11:01:32 2011 -0400 - - [test] Update to API changes - - test/test-font.c | 72 - ++++++++++++++++++++-------------------------------- - test/test-shape.c | 35 +++++++++++-------------- - 2 files changed, 44 insertions(+), 63 deletions(-) - -commit 7403e055cd1463f38215ad9faedd61c3e1b66ac5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 24 21:04:15 2011 -0400 - - [Vertical] fix vertical gpos - - Wow, it took me a few days to find the right fix! - - We now set the advance for attached marks to zero, but we - do this in the _finish() state of gpos, so it shouldn't - regress with fonts like DejaVuSansMono that explicitly - decrease the mark advance width to set it to zero. - - src/hb-ot-layout-gpos-private.hh | 167 - ++++++++++++++++++++++---------------- - src/hb-ot-shape.cc | 9 ++- - 2 files changed, 103 insertions(+), 73 deletions(-) - -commit ff7cbd0219a7c260612c53b3bed343747d79ec4e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 25 09:56:06 2011 -0400 - - [TODO] Update - - TODO | 14 ++++++++++++-- - 1 files changed, 12 insertions(+), 2 deletions(-) - -commit 3b0bb855e011099f1a4c77ffc5214c658e280b2d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 20 15:59:59 2011 -0400 - - [Vertical] GPOS x/y advance adjustments only apply in hori/vert - respectively - - src/hb-ot-layout-gpos-private.hh | 31 +++++++++++++++++++++---------- - 1 files changed, 21 insertions(+), 10 deletions(-) - -commit cc2086d67ce559878a5ce2b41d89a37eabac90b8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 19 19:19:50 2011 -0400 - - [Vertical] Fix GPOS y-advance direction - - src/hb-ot-layout-gpos-private.hh | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 67d51ff96154c8909734046601e439dd8f6a86df -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 19 19:08:57 2011 -0400 - - [Vertical] Do fallback origin calculation - - src/hb-font.cc | 32 +++++++++++++++++++++++++++----- - 1 files changed, 27 insertions(+), 5 deletions(-) - -commit 60fbb36096e344e9af79409ce8cfe3f1f7b0d321 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 19 18:46:15 2011 -0400 - - [Vertical] GPOS is always done with horizontal origin - - src/hb-font-private.hh | 4 +- - src/hb-font.cc | 187 - ++++++++++++++++++-------------------- - src/hb-font.h | 53 +++++------ - src/hb-ft.cc | 47 ++++------ - src/hb-ot-layout-gdef-private.hh | 18 ++-- - src/hb-ot-layout-gpos-private.hh | 23 ++--- - src/hb-ot-layout.h | 2 +- - src/hb-ot-shape.cc | 15 +++ - 8 files changed, 166 insertions(+), 183 deletions(-) - -commit 8b38faeede41e64eb0f6ac2e12ce51dd7138d50a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 19 13:08:00 2011 -0400 - - More vertical - - Starting to get there, but not without yet another round of changes. - - I think I know wheere to go now. - - src/hb-font.cc | 44 ++++++++++++++++++++++++++++++++------------ - src/hb-font.h | 10 ++++++++++ - src/hb-ft.cc | 14 ++++++++++++-- - src/hb-ot-shape.cc | 4 ++++ - 4 files changed, 58 insertions(+), 14 deletions(-) - -commit e609aeb1e24da6b7c812396cddb93ee3c95ef87a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 18 10:17:02 2011 -0400 - - [hb-view] Add --annotate - - Currently it only marks glyph origins. - - src/hb-view.cc | 20 +++++++++++++++++++- - 1 files changed, 19 insertions(+), 1 deletions(-) - -commit b8d76dd74e50d295918cc015e9d2a55e2bf6a461 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 17 23:31:00 2011 -0400 - - Vertical: Adjust origin in glyph_extents() and glyph_contour_point() - - The base for vertical is almost ready now. - - src/hb-font.cc | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) - -commit 190981851fe2bb6479b5c72451279f66fe4f6e23 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 17 23:27:22 2011 -0400 - - Cosmetic - - src/hb-font.cc | 114 - ++++++++++++++++++++++++++++---------------------------- - src/hb-ft.cc | 36 ++++++++--------- - 2 files changed, 74 insertions(+), 76 deletions(-) - -commit 2c3f51a11c176aa3fc12a9522325efaef2c79d35 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 17 23:23:27 2011 -0400 - - Minor - - src/hb-font.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 7e2c85de305be59e1a6afa7d2061e4b7dd00acf7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 17 17:55:03 2011 -0400 - - [API] Vertical support, take 2 - - I like this API *much* better. Implementation still incomplete, but - horizontal works. - - src/hb-font-private.hh | 7 +- - src/hb-font.cc | 185 - ++++++++++++++++++++++--------------- - src/hb-font.h | 109 ++++++++++++---------- - src/hb-ft.cc | 66 ++++++++------ - src/hb-ot-layout-gdef-private.hh | 2 +- - src/hb-ot-layout-gpos-private.hh | 2 +- - src/hb-ot-shape.cc | 8 +- - 7 files changed, 218 insertions(+), 161 deletions(-) - -commit 744970af4d884cc87ffa645804578fec8df674a9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 16 18:15:37 2011 -0400 - - [API] Add support for vertical text - - Design not final yet, and in fact I'm going to change it immediately, - but this is an standalone change for itself. - - src/hb-font-private.hh | 35 ++-- - src/hb-font.cc | 387 - +++++++++++++++++++++++++--------- - src/hb-font.h | 164 +++++++++++---- - src/hb-ft.cc | 227 +++++++++++++------- - src/hb-ot-layout-gdef-private.hh | 2 +- - src/hb-ot-layout-gpos-private.hh | 35 ++-- - src/hb-ot-layout-gsub-private.hh | 1 + - src/hb-ot-layout-gsubgpos-private.hh | 1 + - src/hb-ot-shape.cc | 14 +- - src/hb-ot-tag.cc | 2 +- - test/test-font.c | 61 +++--- - test/test-shape.c | 17 +- - 12 files changed, 650 insertions(+), 296 deletions(-) - -commit 80dce8b7c8202766d52cc7666355446bbf5b0565 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 17 17:08:36 2011 -0400 - - Minor - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 5be7d047f6bf54cc577e311b5426c463d2b9b131 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 17 15:05:34 2011 -0400 - - Check for mmap() - - Apparently there exist systems with mprotect(), but not mmap()? - - configure.ac | 2 +- - test/test-blob.c | 6 ++++-- - 2 files changed, 5 insertions(+), 3 deletions(-) - -commit 4053f3f788353448b41e541ee617aafbe1cac366 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 16 16:20:48 2011 -0400 - - Cosmetic - - src/hb-font.h | 8 ++++---- - test/test-shape.c | 6 +++--- - 2 files changed, 7 insertions(+), 7 deletions(-) - -commit 56d12e0356bee5a95b870dfbc2100b8caeb5d593 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 16 16:01:58 2011 -0400 - - Remove unnecessary TODO item - - src/hb-ft.cc | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 1883af3796459cafe2d194064403b6b1152c584d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 16 15:18:16 2011 -0400 - - [hb-view] Start work on vertical support - - src/hb-view.cc | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit 9aa6f96af5e5940ba5c9596c6ae377fea23c0ec0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 16 15:08:31 2011 -0400 - - [hb-view] No need to allocate an extra glyph item at the end - - src/hb-view.cc | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit a0359485c9997e3a211f7c00d40c09074d906c4f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 16 15:07:48 2011 -0400 - - Minor - - test/test-shape.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 92de53ea450eaee077eb1730e6d7a487b20ac721 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 16 12:24:56 2011 -0400 - - [test/buffer] Add more tests for nil buffer - - test/test-buffer.c | 38 ++++++++++++++++++++++++++++++++++++++ - 1 files changed, 38 insertions(+), 0 deletions(-) - -commit 065fb38c9a338ddb095f2ec9e034fcc5a02167bd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 13 23:04:46 2011 -0400 - - [test/ot-tag] More tests - - test/test-ot-tag.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 1a64f6e19a4b483e278c85e4941107be2f71b0a4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 13 22:55:32 2011 -0400 - - [API] Add HB_LANGUAGE_INVALID - - src/hb-common.cc | 5 +++-- - src/hb-common.h | 2 ++ - src/hb-ot-tag.cc | 2 +- - src/hb-shape.cc | 2 +- - test/test-common.c | 9 ++++++--- - 5 files changed, 13 insertions(+), 7 deletions(-) - -commit 40b5c2e86c633441040196d158e965ad95d6ad37 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 13 22:46:36 2011 -0400 - - [test/test-ot-tag] Test hb-ot-tag.h, fix many bugs - - I'm in awe with how many bugs this test revealed. All fixed. - - src/hb-ot-tag.cc | 153 +++++++++++++++++++++-------------- - test/Makefile.am | 3 + - test/test-ot-tag.c | 227 - ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 320 insertions(+), 63 deletions(-) - -commit 1368018b475c2a6dd5f625af99695ae2fcba1f05 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 13 20:25:38 2011 -0400 - - [TODO] Add items - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 7fc5a30cb4fbe9a4633ab842b0a8cbbcc6f6bd1b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 12 17:48:20 2011 -0400 - - [API] Add hb_face_make/is_immutable() - - src/hb-font-private.hh | 2 ++ - src/hb-font.cc | 18 ++++++++++++++++++ - src/hb-font.h | 6 ++++++ - test/test-font.c | 2 ++ - test/test-object.c | 2 +- - 5 files changed, 29 insertions(+), 1 deletions(-) - -commit 20c8b908ddf50a9814dfdd9fca595f258273cd4f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 12 15:19:33 2011 -0400 - - Finish off previous change - - src/hb-font.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 0fd8c2f1be693616f19f2f1526369874763d6cf6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 12 15:14:13 2011 -0400 - - [API] Make get_glyph() callback return a boolean - - We need to know whether the glyph exists, so we can fallback to - composing / decomposing. Assuming that glyph==0 means "doesn't exist" - wouldn't work for applications like Pango that want to use different - "doesn't exist" glyph codes for different characters. An explicit - return value fixes that. - - src/hb-font.cc | 15 +++++++++------ - src/hb-font.h | 12 +++++++----- - src/hb-ft.cc | 12 +++++++----- - src/hb-ot-shape.cc | 13 +++++++++---- - test/test-font.c | 5 ++++- - test/test-shape.c | 12 +++++++----- - 6 files changed, 43 insertions(+), 26 deletions(-) - -commit 8e07f93ab4a3ef9adc7942727ef21f2f9a141d10 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 12 14:27:44 2011 -0400 - - [test/shape] Check shape output - - test/test-shape.c | 23 +++++++++++++++++++---- - 1 files changed, 19 insertions(+), 4 deletions(-) - -commit 805af72405a2f653f08de392d7172291ffe8e902 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 12 12:39:40 2011 -0400 - - Rename get_kernings() arguments from first/second_glyph to - left/right_glyph - - Makes it clear that kerning is in visual order. - - src/hb-font.cc | 10 +++++----- - src/hb-font.h | 4 ++-- - src/hb-ft.cc | 6 +++--- - 3 files changed, 10 insertions(+), 10 deletions(-) - -commit 23d2432219a91c6328efa9e041b1ecf137752ac3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 12 10:53:57 2011 -0400 - - [test] Add test-shape.c. Oops - - test/test-shape.c | 125 - +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 125 insertions(+), 0 deletions(-) - -commit c098c3acc8c48b4b6883c50c9a87e81dbe98ba24 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 12 10:49:30 2011 -0400 - - [test/blob] Use MAP_ANON instead of MAP_ANONYMOUS - - More portable. - - test/test-blob.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8329eb7c6ca39e162228733a2210e643b1a1019d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 12 01:39:17 2011 -0400 - - [test/shape] Add simplest test for hb_shape() - - test/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit df077fadd7828b609bdfe4dbcad52ef2448525c7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 12 01:19:39 2011 -0400 - - [object] Make object inert during destruction - - Such that user_data and other finalizers cannot resurrect object - - src/hb-object-private.hh | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit ee8dd83bb4e0b1c2ca5928391e35e8bd1fca6121 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 12 01:02:03 2011 -0400 - - [TODO] Update - - TODO | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit 52df150efeff4cf003cee65f8c91618f1a980bc8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 12 00:46:57 2011 -0400 - - Fix font subclass chainup - - Test passing now. - - src/hb-font.cc | 6 +----- - 1 files changed, 1 insertions(+), 5 deletions(-) - -commit f2c1dd4f746c36a44cf33d0257a3cd800107c286 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 12 00:35:12 2011 -0400 - - [test/font] Test font_funcs subclassing - - test/test-font.c | 158 - ++++++++++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 155 insertions(+), 3 deletions(-) - -commit 14f1e81b77971204e9325e2a8b6f8b690fac20a7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 12 00:18:28 2011 -0400 - - [test/font] Test empty funcs - - test/test-font.c | 75 - ++++++++++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 73 insertions(+), 2 deletions(-) - -commit 2ca0b5ae1e65d3f43df3a4a2144a1451d8b485c4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 23:57:36 2011 -0400 - - [test/font] Test more - - test/test-font.c | 63 - ++++++++++++++++++++++++++++++++++++++++++++++------- - 1 files changed, 54 insertions(+), 9 deletions(-) - -commit 7033518f756490e9cf00b96387fee6f2f7fae785 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 23:31:15 2011 -0400 - - [API] Pass face to get_table() - - src/hb-font.cc | 4 ++-- - src/hb-font.h | 2 +- - src/hb-ft.cc | 2 +- - test/test-font.c | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -commit b46782780690e26a8221e2d63dd224159aebe413 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 23:25:28 2011 -0400 - - [API] Remove const from font user_data - - src/hb-font.cc | 20 ++++++++++---------- - src/hb-font.h | 20 ++++++++++---------- - src/hb-ft.cc | 20 ++++++++++---------- - 3 files changed, 30 insertions(+), 30 deletions(-) - -commit ea93e7b27ca04a1655d62bd1d18a32805994af44 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 23:22:55 2011 -0400 - - [test/font] More tests - - test/test-font.c | 36 +++++++++++++++++++++++++++++++++--- - 1 files changed, 33 insertions(+), 3 deletions(-) - -commit cdb153175f8a1521cde112c65b173f548ca6ee5c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 23:12:58 2011 -0400 - - [test/font] More tests - - test/test-font.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 44 insertions(+), 0 deletions(-) - -commit 74d9fa3d9ac226ed72702884e721ef94ecc48e22 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 23:07:47 2011 -0400 - - [test/font] More get_empty() tests - - test/test-font.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit db9f4eb4e004fadae9d540522d1d21c3bbe659b0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 23:06:02 2011 -0400 - - [test/font] Test get_face() / get_parent() - - test/test-font.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 606923bb4304d5b9cf164745d657cba58949a80a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 23:05:02 2011 -0400 - - [test/font] Add test_font_properties() - - test/test-font.c | 85 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 85 insertions(+), 0 deletions(-) - -commit da603e80386b41b360acb070a862b6ed87da57b8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 22:52:35 2011 -0400 - - [test/font] Start adding tests for hb-font.h - - test/Makefile.am | 1 + - test/test-buffer.c | 2 +- - test/test-font.c | 69 - +++++++++++++++++++++++++++++++++++++++++++++++++++ - test/test-unicode.c | 1 + - 4 files changed, 72 insertions(+), 1 deletions(-) - -commit 9a14688e40e926b9453fcb75891f27bff1e45c49 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 22:49:29 2011 -0400 - - [API] Rename hb_face_create_for_data() to hb_face_create() - - src/hb-font.cc | 4 ++-- - src/hb-font.h | 4 ++-- - src/hb-ft.cc | 2 +- - src/test.cc | 2 +- - test/test-object.c | 4 ++-- - 5 files changed, 8 insertions(+), 8 deletions(-) - -commit 46d6a21cc8613519e6ce27b1925e29285cccb71d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 22:33:13 2011 -0400 - - [API] Add hb_ot_layout_substitute_start/finish() - - src/hb-ot-layout.cc | 13 +++++++++++++ - src/hb-ot-layout.h | 8 ++++++++ - 2 files changed, 21 insertions(+), 0 deletions(-) - -commit c84d15f52e1183164502d45b476b54f8fe812e0f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 22:23:15 2011 -0400 - - Remove unused hb_set_t - - src/hb-private.hh | 48 ------------------------------------------------ - 1 files changed, 0 insertions(+), 48 deletions(-) - -commit 389a7c9e67549b1a9f7c538965e4647077f8e6ec -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 22:21:38 2011 -0400 - - Remove hb_static_threadsafe_set_t - - src/hb-common.cc | 5 +++-- - src/hb-mutex-private.hh | 42 ------------------------------------------ - 2 files changed, 3 insertions(+), 44 deletions(-) - -commit e06d4eda7bbdb3a1be1f1ce8d98b059a0730f14d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 22:18:31 2011 -0400 - - Use constructor/destructor for hb_ot_shape_plan_t - - src/hb-ot-shape-private.hh | 6 +++++- - src/hb-ot-shape.cc | 4 +--- - 2 files changed, 6 insertions(+), 4 deletions(-) - -commit a5e4e109460ea23fa5e64926a1676c6a02ab6ba2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 22:00:56 2011 -0400 - - Minor - - TODO | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit daa446f184fa27c9764ff7f8a2444d47cf34d986 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 21:31:25 2011 -0400 - - Fix compile with no mutex available - - src/hb-mutex-private.hh | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 1e56c476c10577fe319fe553c5ced000bd740940 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 21:28:01 2011 -0400 - - Free static mutex'es - - src/hb-mutex-private.hh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 831886a9b4073cfe27f7e1db0e957cbd5913fd31 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 21:27:52 2011 -0400 - - Streamline mutex stuff - - src/hb-mutex-private.hh | 61 - +++++++++++++++++++++++++++++----------------- - src/hb-private.hh | 8 ++++++ - 2 files changed, 46 insertions(+), 23 deletions(-) - -commit 438c4eee353ddf0de66171d84c6ef9b21cbdf8f6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 21:14:34 2011 -0400 - - Remove unused hb_mutex_trylock() - - src/hb-mutex-private.hh | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit b8477e1da2785708f3232f8f2577f602a5d320d1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 21:12:44 2011 -0400 - - [test] Add tests for _get_empty() funcs - - test/test-blob.c | 1 + - test/test-buffer.c | 7 +++++++ - test/test-unicode.c | 10 ++++++++++ - 3 files changed, 18 insertions(+), 0 deletions(-) - -commit 3994be3ded40e5a3da0e187ad421b19a78865e02 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 21:08:31 2011 -0400 - - [TODO] Update - - TODO | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 80a6833b032bc63b4e8c3da6489d3767af1168f3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 18:14:44 2011 -0400 - - [API] Add hb_*_get_empty() for all objects - - src/hb-buffer.cc | 6 ++++++ - src/hb-buffer.h | 3 +++ - src/hb-font.cc | 18 ++++++++++++++++++ - src/hb-font.h | 9 +++++++++ - src/hb-unicode.cc | 6 ++++++ - src/hb-unicode.h | 3 +++ - test/test-object.c | 36 +++++++++++++++++++++++++++++++++--- - 7 files changed, 78 insertions(+), 3 deletions(-) - -commit d3b30be378c1dec0259a626d9a408bb9ca1b71ac -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 18:06:12 2011 -0400 - - [API] Add HB_UNTAG() - - Useful in C API only. - - src/hb-common.h | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 3cc6e9dcb42551761c3a1a9d3c25b1f1bcdc2419 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 18:02:48 2011 -0400 - - Minor - - src/test.cc | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit 4101ca7dbbdf1438fa116fb8cad935501ac7cca8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 14:30:56 2011 -0400 - - Plug more leaks - - All good now. - - src/hb-blob.cc | 2 +- - src/hb-open-type-private.hh | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -commit 6a7ac79e26e85f6781186cf708a12825c0857324 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 14:19:18 2011 -0400 - - Plug leaks - - src/hb-ot-map-private.hh | 7 +++++++ - src/hb-ot-shape-private.hh | 2 ++ - src/hb-ot-shape.cc | 2 ++ - src/hb-private.hh | 10 +++++++++- - 4 files changed, 20 insertions(+), 1 deletions(-) - -commit 7aa12ebdff11a4ffbd04bf9b164586eb0c172e37 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 11:55:11 2011 -0400 - - [unicode] Simplify method setting - - src/hb-unicode.cc | 6 +----- - test/test-unicode.c | 6 +++++- - 2 files changed, 6 insertions(+), 6 deletions(-) - -commit d5bfd0272130a315d3b5e6cdcf9b7e6395879204 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 11:48:28 2011 -0400 - - Minor - - src/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6a4e7e1372ef9fde81b84ecc9c4d1f23d97396c1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 10:31:33 2011 -0400 - - Add maxp table - - Not used for anything right now. Will use to get num_glyphs in - the future. - - src/Makefile.am | 1 + - src/hb-ot-head-private.hh | 1 - - src/hb-ot-layout.cc | 1 + - src/hb-ot-maxp-private.hh | 68 - +++++++++++++++++++++++++++++++++++++++++++++ - 4 files changed, 70 insertions(+), 1 deletions(-) - -commit e0b0710ae52bcc8c6fbd87dfae83818faa5d5f5f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 08:58:21 2011 -0400 - - Minor - - TODO | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit a513dbcf73ab1cc39a7c9653034904d0c6cd9fe9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 00:24:34 2011 -0400 - - [API] Change signature of get_contour_point and get_kerning ffuncs - - get_contour_point now takes glyph id before point_index. - - get_kerning now takes a vector to fill-in. - - src/hb-font.cc | 56 - ++++++++++++++++++++----------------- - src/hb-font.h | 16 ++++++----- - src/hb-ft.cc | 11 +++++--- - src/hb-ot-layout-gdef-private.hh | 2 +- - src/hb-ot-layout-gpos-private.hh | 2 +- - src/hb-ot-shape.cc | 15 +++++++--- - 6 files changed, 59 insertions(+), 43 deletions(-) - -commit 63d646fb2933c2765ce526d321a498d0f7fae2f5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 00:15:37 2011 -0400 - - [font] Do user-space conversion when chaining up to parent font - - src/hb-font-private.hh | 28 ++++++++++++++++++++++++++++ - src/hb-font.cc | 23 +++++++++++++++++------ - 2 files changed, 45 insertions(+), 6 deletions(-) - -commit b6f902a1a9c8b72b5d6a241a14a7bacfaea3a56a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 00:04:15 2011 -0400 - - Minor - - src/hb-font-private.hh | 6 +++--- - src/hb-ot-layout-gdef-private.hh | 6 +++--- - src/hb-ot-layout-gpos-private.hh | 20 ++++++++++---------- - 3 files changed, 16 insertions(+), 16 deletions(-) - -commit abcfe9b59b4475eb02dd679aac4bc59616713b28 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 11 00:02:02 2011 -0400 - - Remove hb_ot_layout_context_t, simplify code - - src/hb-font-private.hh | 12 +++- - src/hb-font.cc | 6 ++- - src/hb-ot-layout-common-private.hh | 8 +- - src/hb-ot-layout-gdef-private.hh | 34 +++++----- - src/hb-ot-layout-gpos-private.hh | 121 - +++++++++++++++++----------------- - src/hb-ot-layout-gsub-private.hh | 24 ++++---- - src/hb-ot-layout-gsubgpos-private.hh | 11 ++-- - src/hb-ot-layout-private.hh | 13 ---- - src/hb-ot-layout.cc | 15 +---- - 9 files changed, 118 insertions(+), 126 deletions(-) - -commit 1ded6d8bbf93b7dabf2b1f620c07bd3236e7a60f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 10 20:49:02 2011 -0400 - - Make default font-funcs chain-up to the parent - - src/hb-font.cc | 44 +++++++++++++++++++++++++++++++++++++++----- - src/hb-font.h | 41 +++++++++++++++++++++-------------------- - 2 files changed, 60 insertions(+), 25 deletions(-) - -commit b9d975b931d6310f25fab5ac280f523cdc27bf94 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 10 20:41:13 2011 -0400 - - [API] Pass down closure user_data to font funcs - - src/hb-font-private.hh | 30 ++++++-- - src/hb-font.cc | 184 - ++++++++++++++++++++++++------------------------ - src/hb-font.h | 42 +++++++---- - src/hb-ft.cc | 103 ++++++++++++++------------- - 4 files changed, 198 insertions(+), 161 deletions(-) - -commit 446df9cdb1fddb51819b731436fca54146d0bb23 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 10 20:14:44 2011 -0400 - - Whitespace - - src/hb-unicode.h | 30 +++++++++++++++--------------- - 1 files changed, 15 insertions(+), 15 deletions(-) - -commit 686c2d165dfb284b74b78f6b902d04b585dcaef3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 10 20:04:26 2011 -0400 - - [API] Remove font_funcs func getter functions - - src/hb-font.cc | 32 -------------------------------- - src/hb-font.h | 18 ------------------ - 2 files changed, 0 insertions(+), 50 deletions(-) - -commit defc45be6d75aba4a67fa7814b91b73bad953fe6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 10 20:02:49 2011 -0400 - - [API] Add hb_font_create_sub_font() and hb_font_get_parent() - - Not quite useful just yet. - - src/hb-font-private.hh | 1 + - src/hb-font.cc | 41 ++++++++++++++++++++++++++++++++++++++--- - src/hb-font.h | 5 +++++ - src/hb-unicode.h | 2 +- - 4 files changed, 45 insertions(+), 4 deletions(-) - -commit 11bb8fe7b3925bc9b019ad0c0218a231e581f152 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 10 19:57:00 2011 -0400 - - [font] Fix internal sign of x/y_scale - - Should have been done as part of - da975419884a535281745f30f4b32fee0bc8a7a1 - - src/hb-font-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 85e6218e3306165d69ef44277459511d5b54b9ff -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 10 19:40:44 2011 -0400 - - [API] Remove broken-by-design hb_font_unset_funcs() - - src/hb-font.cc | 22 ---------------------- - src/hb-font.h | 16 ---------------- - 2 files changed, 0 insertions(+), 38 deletions(-) - -commit 74f1d896f2479500d65649cf3ec86dd201f0663a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 10 19:39:32 2011 -0400 - - Add hb_font_make/is_immutable() - - src/hb-font-private.hh | 2 ++ - src/hb-font.cc | 26 +++++++++++++++++++++++--- - src/hb-font.h | 6 ++++++ - test/test-object.c | 2 +- - 4 files changed, 32 insertions(+), 4 deletions(-) - -commit 8c7a100a4d0f3a257fb7563cb08ed4356c3af669 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 10 19:21:07 2011 -0400 - - Fix build without mutex - - src/hb-mutex-private.hh | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit 19d3035c40e73923bcad709dc5eefe31cb34d681 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 10 19:18:12 2011 -0400 - - Remove duplicate atomic_int implementation - - src/hb-mutex-private.hh | 17 ----------------- - 1 files changed, 0 insertions(+), 17 deletions(-) - -commit 45bfa99034512e886d75b1d45a5a649647f4711f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 10 19:12:49 2011 -0400 - - Fix set implementation to be truly threadsafe even with destroy() - callbacks - - The test/object test is passing again, instead of deadlocking. - - src/hb-common.cc | 26 ++++------ - src/hb-mutex-private.hh | 47 +++++++------------ - src/hb-object-private.hh | 6 ++- - src/hb-private.hh | 117 - +++++++++++++++++++++++++++++++++++++-------- - 4 files changed, 128 insertions(+), 68 deletions(-) - -commit 0c2ec1d78bfa0166ffd4afc204c2668d4f456ed9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 10 19:11:27 2011 -0400 - - [test] Always initialize gthread such that our mutex() stuff is tested - - Now the test/object test deadlocks as expected. Fix coming. - - configure.ac | 1 + - test/Makefile.am | 4 ++-- - test/hb-test.h | 1 + - 3 files changed, 4 insertions(+), 2 deletions(-) - -commit 6a9093cc486c1899197cd7cc9a3eb907c2e756f7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 10 19:00:07 2011 -0400 - - [test/object] Test user_data with destroy() callback that calls - user_data - - Exposes the non-atomicity of user_data opertaions at this time because - we call finish() while still locked and modifying the object. - In fact, - I'm surprised that it doesn't deadlock. It should. - - test/test-object.c | 22 ++++++++++++++++++++++ - 1 files changed, 22 insertions(+), 0 deletions(-) - -commit abe636b8761e47ea60b193c7e72a044de224d172 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 10 17:55:40 2011 -0400 - - Add DOAP file - - Makefile.am | 6 +++++- - harfbuzz.doap | 24 ++++++++++++++++++++++++ - 2 files changed, 29 insertions(+), 1 deletions(-) - -commit f82c18630471216a04e4e3ad42396da4e6d74cba -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 10 17:48:34 2011 -0400 - - [test/blob] Fix bug in test - - test/test-blob.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 785d23acd0ce72d399f9c5021bebc854872648af -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 10 17:41:44 2011 -0400 - - [test/blob] Add create_sub_blob() - - test/test-blob.c | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -commit 0617b1558234673d3924f37541be01b04d36f05a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 10 17:37:08 2011 -0400 - - [test] Test blob API - - test/Makefile.am | 1 + - test/test-blob.c | 280 - ++++++++++++++++++++++++++++++++++++++++++++++++++++ - test/test-buffer.c | 149 +++++++++++++++------------- - 3 files changed, 359 insertions(+), 71 deletions(-) - -commit 1c9f8717eb12c37c219333cbb0d123e1d2da4896 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 6 22:28:26 2011 -0400 - - [API] Simplify blob API, remove lock - - TODO | 2 - - src/hb-blob.cc | 206 - ++++++++++++++++++------------------------- - src/hb-blob.h | 19 ++-- - src/hb-font.cc | 2 - - src/hb-open-type-private.hh | 32 +++++-- - src/hb-ot-layout.cc | 7 +-- - test/test-object.c | 2 +- - 7 files changed, 118 insertions(+), 152 deletions(-) - -commit 71cef14ac3de07e4fed0a2903b1f0f639406ec6c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 6 19:30:59 2011 -0400 - - Add -Bsymbolic-functions to linker flags - - configure.ac | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit ab428aeab724ca40341318b66640f992cd72d2fc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 6 19:30:46 2011 -0400 - - [TODO] Update - - TODO | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a0f337a1cce1788dbf3147b459e7f615acbfe81b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 6 19:20:52 2011 -0400 - - Remove unused hb_blob_try_writable_inplace() - - src/hb-blob.cc | 20 -------------------- - src/hb-blob.h | 3 --- - 2 files changed, 0 insertions(+), 23 deletions(-) - -commit 08611d5194144bbf5d96a1110aeb812db06e0901 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 6 16:28:10 2011 -0400 - - Add note re deadlocks - - src/hb-common.cc | 1 + - src/hb-mutex-private.hh | 4 ++++ - 2 files changed, 5 insertions(+), 0 deletions(-) - -commit 34fb5521a5fbb6b95ceff4bbac42a62628bc9f31 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 6 00:04:28 2011 -0400 - - [API] Add hb_language_get_default() - - It uses locale information to detect default language. It's used by - hb_shape() whenever language is not set on the buffer. - - Not sure how to properly test it in the test suite. Tested by - observing - that with DejaVu Sans we select the proper local glyph version - for U+431 - under Serbian locale. See http://www.pango.org/ScriptGallery - - src/hb-common.cc | 21 +++++++++++++++++++++ - src/hb-common.h | 3 +++ - src/hb-shape.cc | 2 +- - test/test-common.c | 5 +++++ - 4 files changed, 30 insertions(+), 1 deletions(-) - -commit c78f4485587cc1dee07e772c164a13fde9d2859f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 5 21:31:04 2011 -0400 - - [API] Add version macros and functions - - Step version up to 0.5.0. - - Also, fix to pass "make distcheck" - - configure.ac | 24 ++++++++++++---- - src/Makefile.am | 9 ++++++ - src/check-c-linkage-decls.sh | 2 +- - src/hb-common.cc | 29 +++++++++++++++++++ - src/hb-version.h.in | 62 - ++++++++++++++++++++++++++++++++++++++++++ - src/hb.h | 1 + - test/Makefile.am | 2 + - 7 files changed, 122 insertions(+), 7 deletions(-) - -commit 9ff819f6571fd0d570f271162d7a30d97ee64148 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 5 19:47:59 2011 -0400 - - Add disable-static libtool flag - - No one who builds harfbuzz static uses the autotools build system - to do it. - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 7ca7571ef91754274f6c84bbf988962d74a74098 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 5 19:47:12 2011 -0400 - - Remove win32-dll libtool flag - - Since we're not win32-dll clean the way libtool docs define it. - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 174e3fe89b72729c9c34c647544a2dc1bf63cd84 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 5 19:37:53 2011 -0400 - - Add AC_CANONICAL_HOST - - configure.ac | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit e6a5b88c01420366a70e0c9ae1775fb3c930cb8b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 5 16:24:42 2011 -0400 - - Fix build with older glib - - configure.ac | 2 +- - test/hb-test.h | 55 - +++++++++++++++++++++++++++++++++---------------------- - 2 files changed, 34 insertions(+), 23 deletions(-) - -commit 3935af1c0d0f53a5fd6054e1ee219f3adda42dca -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 5 16:09:45 2011 -0400 - - [buffer] Remove wrong optimization - - While the cluster fields of the glyph string are usually sorted, they - wouldn't be in special cases (for example for non-native direction). - Blindly using bsearch is plain wrong. If we want to reintroduce this - optimization we have to make sure we know the buffer clusters are - monotonic and in which direction. Not sure it's worth it though. - - src/hb-buffer.cc | 16 +++------------- - 1 files changed, 3 insertions(+), 13 deletions(-) - -commit 46df6828513d56cd60467e36cbe45aa06648f488 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 5 15:33:19 2011 -0400 - - Make user_data access threadsafe - - For now, by taking a global user_data mutex. - - src/hb-common.cc | 25 +++++++++++++++++++++++-- - src/hb-object-private.hh | 2 -- - 2 files changed, 23 insertions(+), 4 deletions(-) - -commit 218e67b9eefa26e2e4fe43f99a84d082b185b1b0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 5 15:28:37 2011 -0400 - - Shrink code - - src/hb-common.cc | 26 ++++++++++++++++++++++++++ - src/hb-object-private.hh | 21 ++++----------------- - 2 files changed, 30 insertions(+), 17 deletions(-) - -commit b8d6183ebc4697a434776cf2aec7857d63a7d881 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 5 15:14:04 2011 -0400 - - Use threadsafe set implementation for hb_language lookups - - Note that the static variable has to be a global static, as gcc - implements local statics differently and that would require linking - to libstdc++, which we don't want. - - src/hb-common.cc | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit d37486d87b65c5abaaa2998fa5c9e48eedde0933 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 5 15:07:54 2011 -0400 - - Add hb_threadsafe_set_t - - src/hb-mutex-private.hh | 54 - +++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-private.hh | 3 +- - 2 files changed, 55 insertions(+), 2 deletions(-) - -commit b45f32ee4e599c515ce93e44315283d236b073bb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 5 15:00:43 2011 -0400 - - Use hb_array_t for hb_language_t mapping - - src/hb-common.cc | 48 - +++++++++++++++++++++------------------------ - src/hb-object-private.hh | 4 +- - src/hb-private.hh | 19 ++++++++++++++--- - 3 files changed, 39 insertions(+), 32 deletions(-) - -commit 21d2c92fdf7307c7117f8948021f0dd7d5a5d2a3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 5 14:47:53 2011 -0400 - - Move code around - - src/hb-object-private.hh | 28 ++++++++++++++-------------- - 1 files changed, 14 insertions(+), 14 deletions(-) - -commit 448ea9bf63104d39f87fff66219034222fa632b8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 5 14:39:24 2011 -0400 - - [TODO] Remove done items - - TODO | 9 --------- - 1 files changed, 0 insertions(+), 9 deletions(-) - -commit 265ac614ea6d26041c7d64739098b76a82bbc4f4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 5 14:38:16 2011 -0400 - - Replace fixed-size lookup_maps array with hb_array_t - - src/hb-ot-map-private.hh | 13 ++++------- - src/hb-ot-map.cc | 47 - ++++++++++++++++++++++++--------------------- - src/hb-private.hh | 6 +--- - 3 files changed, 32 insertions(+), 34 deletions(-) - -commit 6843569d2c70c1771ce964e3d1a4cf91e14e7687 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 5 14:12:37 2011 -0400 - - Replace fixed-size feature_maps array with hb_array_t - - src/hb-ot-map-private.hh | 10 +++------- - src/hb-ot-map.cc | 12 ++++++------ - src/hb-ot-shape.cc | 2 +- - src/hb-private.hh | 42 - +++++++++++++++++++++++++++++------------- - 4 files changed, 39 insertions(+), 27 deletions(-) - -commit 44b0a4d2fc62689fc56ef57f412b4bb1e439a614 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 5 13:42:19 2011 -0400 - - Replace fixed-size feature_infos array with hb_array_t - - src/hb-ot-map-private.hh | 9 +++++---- - src/hb-ot-map.cc | 9 +++++---- - src/hb-private.hh | 12 ++++++++++++ - 3 files changed, 22 insertions(+), 8 deletions(-) - -commit b214ec3ac0ce6568e9226fd09661d52de11dca96 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 5 13:24:07 2011 -0400 - - Minor - - src/hb-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 811482bd650fb5652a9835471ae8ecf0fb185611 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 5 13:21:04 2011 -0400 - - Replace hb_map_t with hb_set_t which is more intuitive and flexible - - src/hb-object-private.hh | 24 ++++++++++++++---------- - src/hb-private.hh | 44 - +++++++++++++++++--------------------------- - test/test-object.c | 4 ++++ - 3 files changed, 35 insertions(+), 37 deletions(-) - -commit 478a42536ff7ab777a7774fbfdb9c5e51334a14e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 5 12:39:51 2011 -0400 - - Make array/map implementation more generic - - src/hb-object-private.hh | 2 ++ - src/hb-private.hh | 13 +++++++------ - 2 files changed, 9 insertions(+), 6 deletions(-) - -commit b81bd42951e1ce1569b29168015d3c5a2dacf773 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 5 00:21:16 2011 -0400 - - Make hb_mutex_*() macros take a pointer - - More intuitive. - - src/hb-blob.cc | 28 ++++++++++++++-------------- - src/hb-mutex-private.hh | 32 ++++++++++++++++---------------- - 2 files changed, 30 insertions(+), 30 deletions(-) - -commit a4b1900913c91aa9db74c4fdfa7c691a5cdf02a8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 5 00:17:43 2011 -0400 - - Add hb_static_mutex_t - - src/hb-mutex-private.hh | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit 56eb5ad6f94c32189ad219438db9a18683ca6846 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 4 19:27:37 2011 -0400 - - Move code around - - Mutex (and Windows.h by extension) are fairly isolated now. - - src/Makefile.am | 8 ++-- - src/hb-blob-private.hh | 60 -------------------------- - src/hb-blob.cc | 24 ++++++++++- - src/hb-font-private.hh | 3 - - src/hb-font.cc | 12 +++-- - src/hb-mutex-private.hh | 105 - ++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-object-private.hh | 33 +------------- - src/hb-unicode.cc | 1 - - 8 files changed, 141 insertions(+), 105 deletions(-) - -commit d292885893395dcb345dce1010e5c8628a715ef4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 3 01:03:53 2011 -0400 - - [ft] Fix font->face handling - - Don't use _cached() - - src/hb-ft.cc | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit 2000179487b49e0d504ec127450dc6fcb5568cec -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 3 00:49:06 2011 -0400 - - Move Win32 thread-safety stuff to hb-object-private.h - - The Win32 definitions for LONG, ULONG, etc conflicts with - hb-open-type.h. Avoid that by making sure hb-object-private.h - and hb-open-type.h are not included in the same compilation unit. - - src/hb-common.cc | 54 ------------------------------------- - src/hb-object-private.hh | 66 - ++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-private.hh | 66 - ---------------------------------------------- - 3 files changed, 66 insertions(+), 120 deletions(-) - -commit 266b34418c9bbe23ccaf29cb354b58c465fa3b22 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 3 00:35:53 2011 -0400 - - Refactor to keep hb-object-private.h and hb-open-type.h separate - - Needed to be able to include <Windows.h> from hb-object-private.h. - - src/hb-font.cc | 19 +++---------- - src/hb-ot-layout-private.hh | 60 - ++++++++++++++++++++++++------------------ - src/hb-ot-layout.cc | 28 +++++++++++++++++--- - 3 files changed, 63 insertions(+), 44 deletions(-) - -commit d4141a44b97377a65e6d2a3e03b3709307af38c1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 3 00:19:18 2011 -0400 - - [blob] Implement sub_blob() in terms of create() - - Fixes problem with uninitialized sub_blob->mutex among other things. - - Reported by Bradley Grainger. - - src/hb-blob.cc | 12 +++++------- - 1 files changed, 5 insertions(+), 7 deletions(-) - -commit fc52e9e44c2fe84d63f18dc0098720830f0b467d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 3 00:09:16 2011 -0400 - - Implement win32 thread-safety stuff - - Patch from Bradley Grainger. - - src/hb-common.cc | 54 - +++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-private.hh | 30 ++++++++++++++++++++++++---- - 2 files changed, 79 insertions(+), 5 deletions(-) - -commit f55272ecde857c116f97a3195f3abd1df3be4b86 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 20:57:28 2011 -0400 - - Add hb_mutex_free() and use it - - Based on patch by Bradley Grainger. - - src/hb-blob.cc | 1 + - src/hb-private.hh | 16 +++++++++------- - 2 files changed, 10 insertions(+), 7 deletions(-) - -commit 8d5186484b28b5f629b523e067d7d5166eec557a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 20:52:21 2011 -0400 - - Cosmetic - - src/hb-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 72657e4ce757dcb055a8db7291b68f96f0d34bfb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 20:46:32 2011 -0400 - - [API] Make hb_font_create() take a face and reference it - - src/hb-font-private.hh | 2 + - src/hb-font.cc | 42 - +++++++++++++++++++++++-------------- - src/hb-font.h | 26 +++++++++++++---------- - src/hb-ft.cc | 7 +----- - src/hb-ot-layout-gdef-private.hh | 2 +- - src/hb-ot-layout-gpos-private.hh | 2 +- - src/hb-ot-layout.cc | 10 +++----- - src/hb-ot-layout.h | 2 - - src/hb-ot-map-private.hh | 2 +- - src/hb-ot-shape.cc | 23 ++++++++++---------- - src/hb-ot-shape.h | 1 - - src/hb-shape.cc | 18 +-------------- - src/hb-shape.h | 1 - - src/hb-view.cc | 4 +-- - test/test-object.c | 7 ++++- - 15 files changed, 70 insertions(+), 79 deletions(-) - -commit cec6611c5ce84d69d910bf7e9ec1fdd594398f9f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 20:18:58 2011 -0400 - - Protect NULL in a couple places - - src/hb-font.cc | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 5a5030366e40baa8d96ca67b47a52ad5af143157 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 19:54:29 2011 -0400 - - Fix bug in array growth implementation - - With this, test/object is now passing. Yay! - - src/hb-private.hh | 24 +++++++++++------------- - 1 files changed, 11 insertions(+), 13 deletions(-) - -commit 16123e10700436df18d14e37371bb621b31ea5d1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 19:54:17 2011 -0400 - - Fix bug in map implementation - - src/hb-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1cd5969f253528b1fc05a06c7a9f222baa29f68d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 19:53:39 2011 -0400 - - [object] Fix bug in get_user_data() implementation - - src/hb-object-private.hh | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit db99589529a22a2113bcef1680ab6d9b934f382e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 19:52:47 2011 -0400 - - [test/object] Add test for object lifecycle stuff - - Revealed many bugs in the (untested and known buggy) user_data - support. - - test/Makefile.am | 4 + - test/test-object.c | 316 - ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 320 insertions(+), 0 deletions(-) - -commit f74d6c81f14f117b3cecfb65f0d5df22849c9a07 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 19:52:32 2011 -0400 - - Cosmetic - - test/test-unicode.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 4911062d5be0d937ee8f1a70cc93e05d162f45b3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 19:36:39 2011 -0400 - - [API] Rename hb_blob_create_empty() to hb_blob_get_empty() - - src/hb-blob.cc | 2 +- - src/hb-blob.h | 2 +- - src/hb-font.cc | 2 +- - src/hb-open-type-private.hh | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -commit 1ab1d3e38cdf8e7331efdbc4ef0c02ee9d5c8c04 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 19:35:53 2011 -0400 - - [face] Return nil face if blob is inert - - src/hb-font.cc | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit e87867cb88280e3f3a38d829e359cb686168b2cb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 19:35:05 2011 -0400 - - [buffer] Fail in _create() if we cannot pre-allocate the requested - size - - src/hb-buffer.cc | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit cd361ec9a1b2bfc271e5490dbfc0a870fd5c439a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 16:54:05 2011 -0400 - - Cosmetic - - test/test-unicode.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c784c67a28f5b92d396eaa9529d57ef91a5cb9ac -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 15:59:57 2011 -0400 - - [unicode] Make _get_parent() return _nil object instead of NULL - - src/hb-unicode.cc | 29 ++++++++++++----------------- - test/test-unicode.c | 2 +- - 2 files changed, 13 insertions(+), 18 deletions(-) - -commit 07e22779abd089d5921bf2d19d4a3bf1bd0173c6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 14:58:04 2011 -0400 - - [test/unicode] Add script roundtrip tests for glib and ICU - - test/test-unicode.c | 70 - ++++++++++++++++++++++++++++++++++++++++++++++---- - 1 files changed, 64 insertions(+), 6 deletions(-) - -commit 7cda65935c73c277550f6ac12f6730e96d4852a7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 14:33:53 2011 -0400 - - [test/unicode] Better test chainup - - test/test-unicode.c | 54 - ++++++++++++++++++++++++++++++++++++++++++++++---- - 1 files changed, 49 insertions(+), 5 deletions(-) - -commit 250c59225ead28449deb11522dee3819480a19b4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 14:21:30 2011 -0400 - - [test/unicode] Port the _custom test to test all property setters - - test/test-unicode.c | 186 - ++++++++++++++++++++++++++++---------------------- - 1 files changed, 104 insertions(+), 82 deletions(-) - -commit e74b5b339ab0af53d893ec84a0955d5aa508fed3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 14:03:55 2011 -0400 - - [test/unicode] Test Unicode 5.2+ but don't fail - - test/test-unicode.c | 21 +++++++++++++++++++-- - 1 files changed, 19 insertions(+), 2 deletions(-) - -commit c763aa42b46eaee95359806cab56fa632ff3ad58 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 13:52:17 2011 -0400 - - [test/buffer] Clean up testing - - Getting the hang of how to cleanly use gtest. - - test/test-buffer.c | 154 - +++++++++++++++++++++++++++++----------------------- - 1 files changed, 85 insertions(+), 69 deletions(-) - -commit 819e9d9e5310e67e8dcce9fa885f8a086a9b9ee8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 12:38:54 2011 -0400 - - Minor - - test/test-unicode.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 03034acb8a9fdd33135bc3775a1f932da9ebdd42 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 12:37:45 2011 -0400 - - [icu] Make sure we return script UNKNOWN instead of INVALID - - src/hb-icu.cc | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit d02985ec5a24c659a0a133cc6bc103f1d76bcb29 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 12:35:14 2011 -0400 - - ISO 15924 fixes - - Update to http://unicode.org/iso15924 - - Fixes some of the test failures in test-unicode with ICU. Still - one more to fix before the test passes. - - src/hb-common.cc | 10 ++++++++-- - src/hb-common.h | 5 +++-- - src/hb-ot-tag.cc | 2 -- - 3 files changed, 11 insertions(+), 6 deletions(-) - -commit e8e29c725a72c2e991cd1c4422a020457e1684e9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 2 12:06:18 2011 -0400 - - [test/unicode] Add log messages - - Use with --verbose to see what's failing - - test/test-unicode.c | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit 208c2c31501f6eb2b81b6bf80fcf39f4646eb38b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 1 20:04:01 2011 -0400 - - Minor - - test/test-unicode.c | 478 - ++++++++++++++++++++++++++------------------------- - 1 files changed, 243 insertions(+), 235 deletions(-) - -commit 60833efaf1310c3f18e150b61daaeb0074ae3d91 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 29 16:49:57 2011 -0400 - - [test/unicode] Add testing of all unicode properties - - ICU fails for now. - - test/hb-test.h | 4 +- - test/test-unicode.c | 432 - ++++++++++++++++++++++++++++++++++++++++++++++++--- - 2 files changed, 416 insertions(+), 20 deletions(-) - -commit da96ee072fa3544c3d36cf0b82ada11806789d70 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 29 12:17:09 2011 -0400 - - [test/unicode] Test is/make_immutable() - - test/test-unicode.c | 46 ++++++++++++++++++++++++++++++---------------- - 1 files changed, 30 insertions(+), 16 deletions(-) - -commit 6af9cff5e17e82100b435c8d21aed0765296d58d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 29 12:00:38 2011 -0400 - - [test/unicode] Use text fixture instead of static variables - - src/hb-unicode-private.hh | 2 +- - src/hb-unicode.h | 2 +- - test/test-buffer.c | 2 +- - test/test-c.c | 1 + - test/test-common.c | 3 +- - test/test-cplusplus.cc | 1 + - test/test-unicode.c | 112 - +++++++++++++++++++++++++++------------------ - 7 files changed, 74 insertions(+), 49 deletions(-) - -commit 13db3d40bfc09c68f9761a71435b1840b9d34099 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 28 19:44:45 2011 -0400 - - [test/buffer] Add UTF-16 tests - - test/test-buffer.c | 48 - ++++++++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 46 insertions(+), 2 deletions(-) - -commit 243673d601588a6f704ceafbff5dd5cdf66c47b7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 28 19:37:51 2011 -0400 - - [test/buffer] Add more extensive UTF-8 test data from glib - - src/hb-buffer.cc | 2 +- - test/test-buffer.c | 317 - +++++++++++++++++++++++++++++++++++++++++++++++++--- - 2 files changed, 303 insertions(+), 16 deletions(-) - -commit dfec67f958482e5c3bb01e06b08694cd4ded6f66 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 28 18:34:42 2011 -0400 - - [test/buffer] Add initial utf-8 tests - - test/hb-test.h | 25 ++++++++++++++++++++++++- - test/test-buffer.c | 46 +++++++++++++++++++++++++++++++++++++++++++++- - 2 files changed, 69 insertions(+), 2 deletions(-) - -commit aafe395ab550d3ba2fabc69155662e87d45e74a8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 28 17:10:44 2011 -0400 - - Add test suite infrastructure - - Wraps around glib for convenience and ease of use. - - test/Makefile.am | 1 + - test/hb-test.h | 132 - +++++++++++++++++++++++++++++++++++++++++++++++---- - test/test-buffer.c | 29 +++++------ - test/test-common.c | 14 +++--- - test/test-unicode.c | 32 ++++++------ - 5 files changed, 160 insertions(+), 48 deletions(-) - -commit c7ffe2ad5f6e97e26d14e2cc0d4098af8f5f36d0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 28 16:03:29 2011 -0400 - - [API Remove hb_font_funcs_copy() - - Will be adding font_funcs subclassing instead. - - src/hb-font.cc | 13 ------------- - src/hb-font.h | 3 --- - 2 files changed, 0 insertions(+), 16 deletions(-) - -commit 30f34d08d445722320db711c3ddf41e66225752c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 28 16:02:40 2011 -0400 - - [TODO] Remove finished items - - TODO | 2 -- - src/hb-font.h | 10 ---------- - 2 files changed, 0 insertions(+), 12 deletions(-) - -commit 080a0eb7d82d7195be72c16ece6e0a3ffed636b6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 28 16:01:01 2011 -0400 - - Add _hb_unsigned_int_mul_overflows - - src/hb-buffer.cc | 7 ++----- - src/hb-open-type-private.hh | 2 +- - src/hb-ot-layout-gsub-private.hh | 2 +- - src/hb-private.hh | 9 ++++++++- - 4 files changed, 12 insertions(+), 8 deletions(-) - -commit 1d39d6e42b3d7628512d675a84a831a0f58624eb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 28 15:54:16 2011 -0400 - - Desable possibly lethal test on 64-bit machines - - test/test-buffer.c | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit 3264042873fd639f3ef8ff0acfad777a0a9f3355 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 28 14:24:16 2011 -0400 - - [test/buffer] Test pre_allocate() and allocation_successful() - - src/hb-buffer.cc | 3 ++- - test/test-buffer.c | 26 +++++++++++++++++++++++++- - 2 files changed, 27 insertions(+), 2 deletions(-) - -commit 123aa04f7b3241d6e43de2d472c4a1cbdb250ac7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 28 12:58:28 2011 -0400 - - Fix possible but improbable overflow in hb_array_t - - src/hb-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e0db4b868f9fdd8e680890f87dd4e13a1c27b7a1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 28 12:56:49 2011 -0400 - - [buffer] More error handling - - Should be all set now. - - src/hb-buffer-private.hh | 2 +- - src/hb-buffer.cc | 60 - ++++++++++++++++++++++++++++++++------------- - 2 files changed, 43 insertions(+), 19 deletions(-) - -commit 15c57e04bf05026ef424f8ae912d2f379301bf93 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 28 12:28:54 2011 -0400 - - [test/buffer] Add test pre_alloc(); hangs in the buffer code right now - - Because the following loop overflows: - - while (size > new_allocated) - new_allocated += (new_allocated >> 1) + 32; - - test/test-buffer.c | 33 ++++++++++++++++++++++++++------- - 1 files changed, 26 insertions(+), 7 deletions(-) - -commit 1e5527e2d60ed3b4a5adf62b258415ec3aef41fb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 28 12:15:24 2011 -0400 - - [test/buffer] Test reset(), set_length(), and set/get_unicode_data() - - test/test-buffer.c | 66 - ++++++++++++++++++++++++++++++++++++++++++++++----- - 1 files changed, 59 insertions(+), 7 deletions(-) - -commit db126b5448ec802285cf2b6f0e7da412d02dfb28 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 28 11:56:29 2011 -0400 - - [test/buffer] Test reverse() and reverse_clusters() - - test/test-buffer.c | 61 - ++++++++++++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 57 insertions(+), 4 deletions(-) - -commit 5fa849b77d49da2212825ebb1bea9145713b8449 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 27 21:46:01 2011 -0400 - - [API] Add _set/get_user_data() for all objects - - src/hb-blob.cc | 17 +++++++++++++++++ - src/hb-blob.h | 12 ++++++++++++ - src/hb-buffer.cc | 16 ++++++++++++++++ - src/hb-buffer.h | 10 ++++++++++ - src/hb-font.cc | 51 - +++++++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-font.h | 36 ++++++++++++++++++++++++++++++++++++ - src/hb-unicode.cc | 17 +++++++++++++++++ - src/hb-unicode.h | 12 ++++++++++++ - 8 files changed, 171 insertions(+), 0 deletions(-) - -commit 852e08ec8fbfbce1d50e571d0bb0b52ef4d4cc58 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 27 21:45:51 2011 -0400 - - Move code around - - src/hb-object-private.hh | 153 - ++++++++++------------------------------------ - src/hb-private.hh | 136 +++++++++++++++++++++++++++++++++++++---- - 2 files changed, 157 insertions(+), 132 deletions(-) - -commit 29c67d3f70b081766a6c01353980f457f38aeb12 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 27 21:22:32 2011 -0400 - - Add initial implementation of user_data to objects - - src/hb-common.h | 11 ++- - src/hb-object-private.hh | 186 - +++++++++++++++++++++++++++++++++++++++++++++- - 2 files changed, 193 insertions(+), 4 deletions(-) - -commit 47e71d9661946a4ffb96026bf1d697d788414ab5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 27 16:38:03 2011 -0400 - - [object] Remove unnecessary use of macros - - TODO | 2 -- - src/hb-blob.cc | 18 +++++++++--------- - src/hb-buffer.cc | 6 +++--- - src/hb-font.cc | 30 +++++++++++++++--------------- - src/hb-object-private.hh | 9 --------- - src/hb-unicode.cc | 8 ++++---- - 6 files changed, 31 insertions(+), 42 deletions(-) - -commit 8be1420f8fd0e5c53282245d6830efbee5c7409d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 27 16:14:04 2011 -0400 - - [blob] Use HB_FUNC instead of __FUNCTION__ - - src/hb-blob.cc | 24 ++++++++++++------------ - 1 files changed, 12 insertions(+), 12 deletions(-) - -commit ae008b90cfc2028e878100f78b21d70f923a6044 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 27 16:12:12 2011 -0400 - - [object] Add tracing support back in - - src/hb-object-private.hh | 38 ++++++++++++++++++++++++++------------ - 1 files changed, 26 insertions(+), 12 deletions(-) - -commit 5b7f38979fa90117861fe327477de1707f117a8c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 27 15:10:12 2011 -0400 - - GNOME Bug 612402 - (hb-arm) HarfBuzz compilation fix for arm - - With gcc on arm, request 8-bit structure alignment. - - configure.ac | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) - -commit 39a840ae65327b173e6eb1bb291e235a8305d7a1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 27 14:48:19 2011 -0400 - - [API] Add hb_direction_from/to_string() - - And hb-view --direction argument. - - TODO | 1 - - src/hb-common.cc | 36 ++++++++++++++++++++++++++++++++++++ - src/hb-common.h | 6 ++++++ - src/hb-view.cc | 13 ++++++++++--- - test/test-common.c | 21 ++++++++++++++++++++- - 5 files changed, 72 insertions(+), 5 deletions(-) - -commit f1425a549fef360c3750532de23604cd318999d8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 27 12:15:06 2011 -0400 - - Rename hb-view.c and test.c to .cc files - - src/Makefile.am | 4 +- - src/hb-view.c | 540 - ------------------------------------------------------- - src/hb-view.cc | 540 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/test.c | 94 ---------- - src/test.cc | 97 ++++++++++ - 5 files changed, 639 insertions(+), 636 deletions(-) - -commit eb5796f58897ecfb9d76fd99915bf1a30669a0fa -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 27 12:14:53 2011 -0400 - - [TODO] Add hb-view items - - TODO | 10 ++++++++++ - 1 files changed, 10 insertions(+), 0 deletions(-) - -commit 65e0063eae2f3adb25315b8bd7b0e7757aa960f3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 27 09:33:58 2011 -0400 - - Make buffer size growth start from 32 instead of 8 - - src/hb-buffer.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit d4bee9f813bb299b1c4aab7c33d588be2a7d354b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 27 09:24:37 2011 -0400 - - [API] Add hb_unicode_funcs_get_default() - - src/hb-buffer.cc | 4 ++-- - src/hb-glib.cc | 5 +++-- - src/hb-icu.cc | 5 +++-- - src/hb-unicode-private.hh | 11 +++++++++++ - src/hb-unicode.cc | 7 +++++++ - src/hb-unicode.h | 8 ++++++++ - src/hb-view.c | 13 ++++++------- - test/test-unicode.c | 11 ++++++++++- - 8 files changed, 50 insertions(+), 14 deletions(-) - -commit 153142dac8dd9abaf164bb88af07c600c17fc3a1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 27 01:49:03 2011 -0400 - - Replace simple macros with inline functions for better type safety - - Now that we use C++ for all source code, lets benefit from it! - - The hb_be_int16/32_get/put/eq() macros grow code size if replaced with - inline functions, so leave them as is. - - src/hb-open-type-private.hh | 4 ++-- - src/hb-private.hh | 30 +++++++++++++++++++++--------- - 2 files changed, 23 insertions(+), 11 deletions(-) - -commit 40a9b8154f929947f4693bf90c64301afa407c3f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 27 01:48:56 2011 -0400 - - Add TODO item - - src/hb-object-private.hh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit ebdc83467c31574daa118fc18cd2ef2dc819b503 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 27 01:41:24 2011 -0400 - - Don't return in void function - - Would have been nice if gcc had warned... - - src/hb-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ec6f9c2fd03a49d1e91cbaefa5bdbbfb35dff92e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 21 18:35:58 2011 -0400 - - Further simplify object handling - - src/hb-object-private.hh | 53 - +++++++++++++++++++++++---------------------- - 1 files changed, 27 insertions(+), 26 deletions(-) - -commit fca368c4682624346a0aaee690e1ad6ed4c0b337 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 21 18:24:02 2011 -0400 - - Add hb_object_header_t which is the common part of all objects - - Makes way for adding arbitrary user_data support. - - src/hb-blob-private.hh | 3 +- - src/hb-blob.cc | 2 +- - src/hb-buffer-private.hh | 9 ++-- - src/hb-buffer.cc | 2 +- - src/hb-font-private.hh | 7 ++- - src/hb-font.cc | 7 ++- - src/hb-ft.cc | 3 +- - src/hb-glib.cc | 3 +- - src/hb-icu.cc | 3 +- - src/hb-object-private.hh | 95 - ++++++++++++++++++++++++-------------------- - src/hb-private.hh | 5 +-- - src/hb-unicode-private.hh | 6 ++- - src/hb-unicode.cc | 3 +- - 13 files changed, 82 insertions(+), 66 deletions(-) - -commit a9f24c802956d57180d71b83e96a0fb81197df4a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 21 17:18:22 2011 -0400 - - Move hb_reference_count_t to hb-private.h - - src/hb-object-private.hh | 17 ----------------- - src/hb-private.hh | 20 ++++++++++++++++++++ - 2 files changed, 20 insertions(+), 17 deletions(-) - -commit 2409d5f8d7dd8b535ce5ea29e933f7db27d33793 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 21 17:14:28 2011 -0400 - - Update Copyright headers - - COPYING | 15 ++++++++------- - src/hb-blob-private.hh | 2 +- - src/hb-blob.cc | 2 +- - src/hb-blob.h | 2 +- - src/hb-buffer-private.hh | 4 ++-- - src/hb-buffer.cc | 6 +++--- - src/hb-buffer.h | 6 +++--- - src/hb-common.cc | 4 +++- - src/hb-common.h | 4 +++- - src/hb-font-private.hh | 4 +++- - src/hb-font.cc | 2 +- - src/hb-font.h | 2 +- - src/hb-ft.cc | 4 ++-- - src/hb-ft.h | 2 +- - src/hb-glib.cc | 4 +++- - src/hb-glib.h | 4 +++- - src/hb-icu.cc | 6 ++++-- - src/hb-icu.h | 4 +++- - src/hb-object-private.hh | 6 ++++-- - src/hb-open-file-private.hh | 2 +- - src/hb-open-type-private.hh | 2 +- - src/hb-ot-head-private.hh | 2 +- - src/hb-ot-layout-common-private.hh | 4 ++-- - src/hb-ot-layout-gdef-private.hh | 4 ++-- - src/hb-ot-layout-gpos-private.hh | 4 ++-- - src/hb-ot-layout-gsub-private.hh | 4 ++-- - src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- - src/hb-ot-layout-private.hh | 2 +- - src/hb-ot-layout.cc | 6 +++--- - src/hb-ot-layout.h | 2 +- - src/hb-ot-map-private.hh | 4 ++-- - src/hb-ot-map.cc | 4 ++-- - src/hb-ot-shape-complex-arabic-table.hh | 2 +- - src/hb-ot-shape-complex-arabic.cc | 2 +- - src/hb-ot-shape-complex-private.hh | 2 +- - src/hb-ot-shape-private.hh | 2 +- - src/hb-ot-shape.cc | 4 ++-- - src/hb-ot-shape.h | 2 +- - src/hb-ot-tag.cc | 4 +++- - src/hb-ot-tag.h | 2 +- - src/hb-ot.h | 2 +- - src/hb-private.hh | 4 +++- - src/hb-shape.cc | 2 +- - src/hb-shape.h | 2 +- - src/hb-unicode-private.hh | 4 ++-- - src/hb-unicode.cc | 4 ++-- - src/hb-unicode.h | 4 +++- - src/hb-view.c | 4 ++-- - src/hb.h | 2 +- - src/main.cc | 2 +- - src/test.c | 2 +- - test/hb-test.h | 17 ++++++++++++++++- - test/test-buffer.c | 2 +- - test/test-c.c | 2 +- - test/test-common.c | 2 +- - test/test-cplusplus.cc | 2 +- - test/test-unicode.c | 2 +- - 57 files changed, 122 insertions(+), 84 deletions(-) - -commit 08da7a3841ca7dfcb627314cae1c3a668b9c7236 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 21 16:59:10 2011 -0400 - - [hb-view] Accept numbers in feature tag name - - Reported by Adam Twardoch. - - src/hb-view.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 24229eb13268a422efffbcb28a094b726824c7f0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 21 16:55:17 2011 -0400 - - Remove obsolete comment - - Talking to Ryan Lortie, he thinks my comment doesn't make sense. - - So I'm making the getter const. Note that g_atomic_int_get() - casts that away itself, so we don't need to worry about that - (which kinda makes me uncomfortable actually). - - src/hb-object-private.hh | 16 ++-------------- - 1 files changed, 2 insertions(+), 14 deletions(-) - -commit dcb7026f33cbcdf60e9b7fcdd44c64cc08702c74 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 21 16:34:22 2011 -0400 - - Add ASSERT_STATIC_EXPR macro - - Unused right now. - - src/hb-private.hh | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 3e8bdbf9414291da5cf61213d5f4275c1ae23ae5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 21 16:16:21 2011 -0400 - - Cleanup hb_refrence_count_t - - src/hb-object-private.hh | 23 ++++++++++++++++++----- - src/hb-private.hh | 6 +++--- - 2 files changed, 21 insertions(+), 8 deletions(-) - -commit 783a7d69696bf0b1502ec9c1495e482e491c78e0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 21 16:03:59 2011 -0400 - - [TODO] Remove finished items - - TODO | 6 +----- - src/hb-ft.cc | 1 - - 2 files changed, 1 insertions(+), 6 deletions(-) - -commit da975419884a535281745f30f4b32fee0bc8a7a1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 21 15:08:01 2011 -0400 - - [API] Allow negative font x_scale/y_scale - - I was reconsidering whether y should grow down, since all three/four - times I've used this API I was tricked and got that wrong in my use. - So I was very inclined to make y grow down instead of up. However, - considering that the font space has y up and it would be very - confusing - for callbacks to work against that, I decided that what I really want - is for the user to be able to set y_scale to a negative number - to imply - that user-space y grows down. - - Changing x_scale/y_scale from unsigned int to int allows that, - and I've - made pango to use that instead of negating glyph y_offset later. - hb-ft - however still has y group up. I *guess* that's how FreeType works? - I'm not sure, FreeType docs don't make this clear... - - I'm happy with the resolution :-). - - src/hb-font.cc | 8 ++++---- - src/hb-font.h | 8 ++++---- - src/hb-ot-layout-common-private.hh | 6 +----- - src/hb-ot-layout-private.hh | 2 +- - 4 files changed, 10 insertions(+), 14 deletions(-) - -commit 4d559cddbb3b3a5c12c5167eba69598618a9f283 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 21 14:58:23 2011 -0400 - - [icu] Remove big script switch(), rely on reverse-lookup - - src/hb-icu.cc | 137 - ++++----------------------------------------------------- - 1 files changed, 9 insertions(+), 128 deletions(-) - -commit d18431b4cd8c1b14523733cd60a62b862f5b471f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 20 18:59:10 2011 -0400 - - Move hb_reference_count_t from macros to inline methods - - src/hb-object-private.hh | 25 +++++++++++-------------- - 1 files changed, 11 insertions(+), 14 deletions(-) - -commit c57d454accff66e5f2c58006e8fb40bc020b6182 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 20 18:50:27 2011 -0400 - - Rename all private sources and headers to C++ files - - So we can liberally use the simple features of C++ that parts of the - codebase is already using. - - src/Makefile.am | 17 +- - src/hb-blob-private.h | 59 --- - src/hb-blob-private.hh | 59 +++ - src/hb-blob.cc | 4 +- - src/hb-buffer-private.hh | 2 +- - src/hb-common.c | 222 ---------- - src/hb-common.cc | 222 ++++++++++ - src/hb-font-private.h | 97 ----- - src/hb-font-private.hh | 97 +++++ - src/hb-font.cc | 6 +- - src/hb-ft.c | 262 ------------ - src/hb-ft.cc | 262 ++++++++++++ - src/hb-glib.cc | 2 +- - src/hb-icu.cc | 2 +- - src/hb-object-private.h | 134 ------ - src/hb-object-private.hh | 132 ++++++ - src/hb-open-type-private.hh | 2 +- - src/hb-ot-layout-gdef-private.hh | 2 +- - src/hb-ot-layout-private.hh | 4 +- - src/hb-ot-shape-complex-arabic-table.h | 674 - ------------------------------ - src/hb-ot-shape-complex-arabic-table.hh | 674 - ++++++++++++++++++++++++++++++ - src/hb-ot-shape-complex-arabic.cc | 2 +- - src/hb-ot-shape-complex-private.hh | 2 +- - src/hb-ot-shape-private.hh | 2 +- - src/hb-ot-tag.c | 677 - ------------------------------- - src/hb-ot-tag.cc | 677 - +++++++++++++++++++++++++++++++ - src/hb-private.h | 301 -------------- - src/hb-private.hh | 301 ++++++++++++++ - src/hb-shape.cc | 2 +- - src/hb-unicode-private.hh | 2 +- - src/hb-unicode.cc | 2 +- - src/hb-view.c | 6 + - 32 files changed, 2457 insertions(+), 2452 deletions(-) - -commit f19f4f9b0965ad7473a0f3a1ffcdbf16930e35d4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 20 18:25:56 2011 -0400 - - Rename hb-blob.c to hb-blob.cc in preparation of more changes - - src/Makefile.am | 2 +- - src/hb-blob.c | 356 - ------------------------------------------------------- - src/hb-blob.cc | 356 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 357 insertions(+), 357 deletions(-) - -commit 04744e73bad22d679986173b5f0d84dbbf49dd57 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 20 17:24:03 2011 -0400 - - [TODO] Remove done items - - TODO | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -commit 9417c1c0d2b005eadf0c087ca695121a6200d0f7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 20 17:21:23 2011 -0400 - - [API] Make hb_face_reference_table() return empty blob instead of NULL - - The idea here is that: - - - Like pretty much all other API in harfbuzz, user does not have to - check for NULL. - - - In any caller code, the case of missing table should be handled - exactly the same way that a too-short table is handled. Turning - a non-existent talbe into a table of size 0 makes the user code - safer. - - src/hb-font.cc | 2 ++ - src/hb-open-type-private.hh | 3 --- - 2 files changed, 2 insertions(+), 3 deletions(-) - -commit c035812feb0d385a9e8c334631738e4915912c71 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 20 17:03:00 2011 -0400 - - [API] Rename hb_face_get_table() to hb_face_reference_table() - - That correctly reflects the reference ownership transfer happening. - - src/hb-font.cc | 4 ++-- - src/hb-font.h | 7 ++----- - src/hb-ot-layout.cc | 6 +++--- - src/hb-shape.cc | 2 +- - 4 files changed, 8 insertions(+), 11 deletions(-) - -commit 2d7b61a4b0ed212ca414b3281c2eae3e3db19c13 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 20 16:40:56 2011 -0400 - - [TODO] Remove done items - - TODO | 10 ++-------- - src/hb-ft.h | 2 +- - 2 files changed, 3 insertions(+), 9 deletions(-) - -commit af02933739e03a156b9f7761fd7a63e2a02d0df1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 20 15:49:31 2011 -0400 - - [API] Remove hb_*_get_reference_count() - - This was a bizzare piece of API that I inherited from cairo. It has - been wrong adding them to cairo in the first place. Remove them - before - someone uses them! - - src/hb-blob.c | 6 ------ - src/hb-blob.h | 3 --- - src/hb-buffer.cc | 6 ------ - src/hb-buffer.h | 3 --- - src/hb-font.cc | 18 ------------------ - src/hb-font.h | 9 --------- - src/hb-object-private.h | 7 ------- - src/hb-unicode.cc | 6 ------ - src/hb-unicode.h | 3 --- - test/test-unicode.c | 24 ------------------------ - 10 files changed, 0 insertions(+), 85 deletions(-) - -commit 440a76b630a36a7336c93e8b05d988c6407b085e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 20 14:20:00 2011 -0400 - - [OT] Fix script to ot-script-tag conversion - - src/hb-ot-tag.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit a3036a3e97b14c8eb1df208aed944207f9b6cc0b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 20 14:13:23 2011 -0400 - - Minor - - src/hb-view.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit fb6291d9c9224bedf207bf0077ad9f0a2690f867 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 20 03:15:31 2011 -0400 - - [test] Add test for headers included from C and C++ - - test/Makefile.am | 17 ++++++++++++++++ - test/test-c.c | 49 - ++++++++++++++++++++++++++++++++++++++++++++++++ - test/test-cplusplus.cc | 29 ++++++++++++++++++++++++++++ - 3 files changed, 95 insertions(+), 0 deletions(-) - -commit 107a50581ccab7df7c390d5b927fdab1bbe8e713 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 20 03:04:56 2011 -0400 - - [test] Add todo items - - test/test-unicode.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 5668189c12c264e8d2caf0d12dac918363ef6f80 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 20 03:03:32 2011 -0400 - - [API] font: move user_data before destroy() - - This is the common convention for language binding tools. - - src/hb-font-private.h | 4 ++-- - src/hb-font.cc | 30 +++++++++++++++--------------- - src/hb-font.h | 12 ++++++------ - src/hb-ft.c | 8 ++++---- - 4 files changed, 27 insertions(+), 27 deletions(-) - -commit e5847f75fb7bd25c5db6061d8e20d61fa469f9fe -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 20 02:59:28 2011 -0400 - - [API] blob: move user_data before destroy() - - This is the common convention for language binding tools. - - src/hb-blob-private.h | 2 +- - src/hb-blob.c | 16 ++++++++-------- - src/hb-blob.h | 4 ++-- - 3 files changed, 11 insertions(+), 11 deletions(-) - -commit 1fd73b594d611624ccb73f614c61298debf48994 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 20 02:56:39 2011 -0400 - - [test] Rename test-types to test-common - - test/Makefile.am | 2 +- - test/test-common.c | 166 - ++++++++++++++++++++++++++++++++++++++++++++++++++++ - test/test-types.c | 166 - ---------------------------------------------------- - 3 files changed, 167 insertions(+), 167 deletions(-) - -commit f144a8ea840c6452c1fece2fd988b42a8ea7c5a6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 20 02:54:42 2011 -0400 - - [icu] Add two-way script conversion functions - - Also optimizes the common-direction script lookup. - - src/hb-common.c | 5 +- - src/hb-icu.cc | 205 - ++++++++++++++++++++++++++++------------------------ - src/hb-icu.h | 9 +++ - test/test-types.c | 2 +- - 4 files changed, 124 insertions(+), 97 deletions(-) - -commit 0809aadd4bbd5d0f256407def7cc10b79772a824 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 20 02:44:29 2011 -0400 - - [glib] Add two-way script conversion functions - - Also optimizes the common-direction script lookup to be an array - lookup. - - src/hb-glib.cc | 270 - +++++++++++++++++++++++++++++--------------------------- - src/hb-glib.h | 8 ++ - 2 files changed, 148 insertions(+), 130 deletions(-) - -commit 5c8c1b680c4fa23c8574b9aebd21113e276f57a3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 20 02:29:22 2011 -0400 - - Remove verbose comments - - src/hb-glib.cc | 194 ++++++++++++++++++++-------------------- - src/hb-icu.cc | 266 - ++++++++++++++++++++++++++++---------------------------- - 2 files changed, 230 insertions(+), 230 deletions(-) - -commit fb194b8794898f51eb596fa4092c26606889d376 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 20 02:00:47 2011 -0400 - - unicode: Cleanup implementation - - src/Makefile.am | 8 +- - src/hb-buffer-private.hh | 2 +- - src/hb-glib.c | 230 ------------------------------------ - src/hb-glib.cc | 231 ++++++++++++++++++++++++++++++++++++ - src/hb-icu.c | 285 - --------------------------------------------- - src/hb-icu.cc | 285 - +++++++++++++++++++++++++++++++++++++++++++++ - src/hb-ot-shape.cc | 14 +-- - src/hb-shape.cc | 4 +- - src/hb-unicode-private.h | 77 ------------ - src/hb-unicode-private.hh | 96 +++++++++++++++ - src/hb-unicode.c | 256 ---------------------------------------- - src/hb-unicode.cc | 223 +++++++++++++++++++++++++++++++++++ - src/hb-unicode.h | 57 +++++----- - test/test-unicode.c | 23 +++- - 14 files changed, 892 insertions(+), 899 deletions(-) - -commit ecfb773829a5d98a4f5456a992f3e5ecd6731435 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 20 01:34:51 2011 -0400 - - Cosmetic - - src/hb-unicode.h | 22 +++++++++------------- - 1 files changed, 9 insertions(+), 13 deletions(-) - -commit 2fd0c577e322ccbf762927bc4600b3ea31db4c80 -Author: Ryan Lortie <desrt@desrt.ca> -Date: Wed Apr 20 00:19:20 2011 -0400 - - [API] unicode: rework virtual functions for subclassing - - Unicode data providers can now be subclassed, including support for - chain-up. The interface should now be nicely bindable, as well. - - Also fix glib unicode funcs that where broken after hb_script_t - changes. Nicely caught by the test-unicode.c added in this commit. - - src/hb-glib.c | 186 +++++++++++++++++++++++++++++++++++-- - src/hb-icu.c | 45 +++++++-- - src/hb-ot-shape.cc | 9 +- - src/hb-shape.cc | 2 +- - src/hb-unicode-private.h | 17 ++++ - src/hb-unicode.c | 231 - +++++++++++++++++++++++++--------------------- - src/hb-unicode.h | 68 +++++++------- - test/Makefile.am | 1 + - test/test-unicode.c | 215 - ++++++++++++++++++++++++++++++++++++++++++ - 9 files changed, 610 insertions(+), 164 deletions(-) - -commit f85faee9b3cb841ea977403945e2c877ab32b97a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 19 00:38:01 2011 -0400 - - [API] Rename hb_buffer_add_glyph() to hb_buffer_add() - - src/hb-buffer.cc | 10 +++++----- - src/hb-buffer.h | 8 ++++---- - test/test-buffer.c | 2 +- - 3 files changed, 10 insertions(+), 10 deletions(-) - -commit aab0de50e23727b69fa8c3d4e05c50c114c62835 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 19 00:32:19 2011 -0400 - - [API] Add hb_buffer_allocation_successful() - - Returns the error status of the buffer. - - src/hb-buffer.cc | 6 ++++++ - src/hb-buffer.h | 6 ++++++ - test/test-buffer.c | 2 +- - 3 files changed, 13 insertions(+), 1 deletions(-) - -commit 02a534b23f2d1e7475109563b9f61221ed020e8b -Author: Ryan Lortie <desrt@desrt.ca> -Date: Fri Apr 15 18:34:45 2011 -0400 - - [API] Rename hb_buffer_ensure() to hb_buffer_pre_allocate() - - The new name is self-documenting. - - src/hb-buffer.cc | 4 ++-- - src/hb-buffer.h | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit 70566befc59cfa8b9c43ac682749c40ea783b1dd -Author: Ryan Lortie <desrt@desrt.ca> -Date: Fri Apr 15 18:32:36 2011 -0400 - - [API} hb_buffer_get_glyph_{infos,positions}: Add length out parameter - - Return the length, whenever we return an array. Makes it easier - on the - language bindings. - - src/hb-buffer.cc | 12 ++++++++++-- - src/hb-buffer.h | 6 ++++-- - src/hb-ot-layout-gpos-private.hh | 4 ++-- - src/hb-view.c | 4 ++-- - test/test-buffer.c | 7 ++----- - 5 files changed, 20 insertions(+), 13 deletions(-) - -commit 62879eebd9965179af8602ba29ac0a64a739b757 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 18 23:40:21 2011 -0400 - - [API] Use ISO 15924 tags for hb_script_t - - This simplifies the code, reduces static data, and makes the design - more extensible to future additions of new scripts. - - src/hb-common.c | 411 - ++++-------------------------------- - src/hb-common.h | 199 +++++++++--------- - src/hb-ot-map.cc | 4 +- - src/hb-ot-shape-complex-private.hh | 3 +- - src/hb-ot-tag.c | 228 +++++++++----------- - src/hb-ot-tag.h | 6 +- - src/hb-shape.cc | 4 +- - test/test-types.c | 2 +- - 8 files changed, 252 insertions(+), 605 deletions(-) - -commit c0af193c8e25c4f11d23b8893e9ce1c2d2615bb2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 15 19:26:24 2011 -0400 - - Change buffer default properties to invalid - - This includes HB_DIRECTION_INVALID and HB_SCRIPT_INVALID. - - The INVALID will cause a "guess whatever from the text" in hb_shape(). - While it's not ideal, it works better than the previous defaults at - least (HB_DIRECTION_LTR and HB_SCRIPT_COMMON). - - src/hb-buffer-private.hh | 9 +++------ - src/hb-buffer.cc | 24 ++++++++++++++++-------- - src/hb-view.c | 6 ++---- - test/test-buffer.c | 4 ++-- - 4 files changed, 23 insertions(+), 20 deletions(-) - -commit 00bec2c969555e76c3f84650a1d3c45308e585ad -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 15 19:16:54 2011 -0400 - - Move enum types to hb-common.h - - src/hb-common.c | 406 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-common.h | 170 +++++++++++++++++++++++ - src/hb-unicode.c | 406 - ------------------------------------------------------ - src/hb-unicode.h | 166 ---------------------- - 4 files changed, 576 insertions(+), 572 deletions(-) - -commit 5dd4609f4da5674966a0169d9fa533ac5bc9f464 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 15 19:16:34 2011 -0400 - - [TODO] Add new item - - TODO | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit b54cd07b2623b68171e00179a9dc3ecbea7aa6a1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 15 19:12:01 2011 -0400 - - Mark internal buffer variables private - - src/hb-buffer.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 0e8d35c0932ddc20ebf430f2fd82c087da698954 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 15 19:07:10 2011 -0400 - - Add hb_script_from_string() - - src/hb-unicode.c | 6 ++++++ - src/hb-unicode.h | 4 ++++ - src/hb-view.c | 2 +- - 3 files changed, 11 insertions(+), 1 deletions(-) - -commit 8f0d7e0c3fd4b05c43ac449be4f374dc2dc56127 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 15 18:59:56 2011 -0400 - - Remove hb_buffer_clear_positions(), add hb_ot_layout_position_start() - - src/hb-buffer-private.hh | 6 +++++- - src/hb-buffer.cc | 24 ++++++++++++------------ - src/hb-buffer.h | 5 +---- - src/hb-ot-layout.cc | 6 ++++++ - src/hb-ot-layout.h | 4 ++++ - src/hb-ot-shape.cc | 2 +- - 6 files changed, 29 insertions(+), 18 deletions(-) - -commit 2fc56edff6d64f190271454ccb1b5fd347d4f172 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 15 18:35:08 2011 -0400 - - [API] Remove hb_buffer_clear() - - One should use hb_buffer_reset() really. - - src/hb-buffer.cc | 16 +++++----------- - src/hb-buffer.h | 4 ---- - test/test-buffer.c | 4 ---- - 3 files changed, 5 insertions(+), 19 deletions(-) - -commit 7f5bdc80541cdc90aa1acafba5e9e0bd2df53ff4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 15 18:34:55 2011 -0400 - - [TODO] Remove done items - - TODO | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit 5814dfa3f5aa41bc3df06b78980d57d7bea0ba58 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 15 14:41:04 2011 -0400 - - Cosmetic - - src/hb-ot-shape.cc | 14 +++++++------- - src/hb-ot-shape.h | 4 ++-- - src/hb-shape.cc | 20 ++++++++++---------- - src/hb-shape.h | 10 +++++----- - 4 files changed, 24 insertions(+), 24 deletions(-) - -commit cfbfeb88a6ec059ea97a6624e63cfacc642b685a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 15 12:40:40 2011 -0400 - - [TODO] Remove done items - - TODO | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit 3cbdf70e0a92f1c24e16c0d4dcfbec4ac59a77a3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 15 12:32:06 2011 -0400 - - Make hb_language_t typesafe - - src/hb-common.c | 18 +++++++++++------- - src/hb-common.h | 2 +- - 2 files changed, 12 insertions(+), 8 deletions(-) - -commit 2f2f448af35c232d18888c0e57cb21c9796ba7a8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 15 11:45:14 2011 -0400 - - [test] Add more TODO items - - test/test-buffer.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit c910bec863215f918c659f58debbc7fe5264d7b6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 13 15:49:06 2011 -0400 - - Add hb_buffer_reset() and hb_buffer_set_length() - - src/hb-buffer.cc | 31 +++++++++++++++++++++++++++++++ - src/hb-buffer.h | 15 ++++++++++++++- - 2 files changed, 45 insertions(+), 1 deletions(-) - -commit 69ea23cb5d47dd1cfd3129f68375021ef79bf63b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 13 15:02:40 2011 -0400 - - Minor - - src/hb-buffer.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 7dea908cd582c8c25555015940065c69c1e7e65b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 13 01:35:58 2011 -0400 - - [test] Add todo items - - test/test-buffer.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 07cbaac07d7f43437b171e9275430b5fb3097716 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 13 01:11:19 2011 -0400 - - [TODO] Add item re script iso15924 functions - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit d0f53fdbead15d9003b521b8ed47d02fd29a4c64 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 13 01:09:09 2011 -0400 - - [test] Test hb-buffer.h - - test/Makefile.am | 8 ++- - test/test-buffer.c | 195 - ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 202 insertions(+), 1 deletions(-) - -commit 72d89404c2837d578f5305456c817130b6a15c73 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 13 01:07:42 2011 -0400 - - [TODO] Add item re hb_buffer_reset() - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 5015c12dfb4de8525325178ae6def9e80fd83669 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 13 01:06:02 2011 -0400 - - [TODO] Add item re hb_buffer_resize() - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 9329ec92078d0e2d7bb04f683e0c6a582aab92f7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 13 00:06:23 2011 -0400 - - [TODO] Add API item - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 4744379efc6063d94e15ff99381a7ab8b88ee567 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 11 19:47:33 2011 -0400 - - Minor - - test/test-types.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 9385caa8a693df0f06a511a71de9aa407637097c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 11 19:43:51 2011 -0400 - - [test] Actually hook up hb_script_t tests - - I really shall find a way to automate the test enumeration. Otherwise - it's too easy to add a test and wrongly hook it up. Did it twice - today. - - test/test-types.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 8e4bb3cacc269ed32187aaaeaa166c64f41a0418 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 11 17:55:58 2011 -0400 - - Fold hb-language.[ch] into hb-common.[ch] - - src/Makefile.am | 2 - - src/hb-buffer.h | 1 - - src/hb-common.c | 92 ++++++++++++++++++++++++++++++++++++++++- - src/hb-common.h | 42 +++++++++++++------ - src/hb-language.c | 120 - ----------------------------------------------------- - src/hb-language.h | 46 -------------------- - src/hb-ot-tag.h | 1 - - src/hb.h | 1 - - 8 files changed, 120 insertions(+), 185 deletions(-) - -commit 09125576ca745b3393f3dc49071df891400bbdc9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 11 17:49:33 2011 -0400 - - [test] Test hb_language_t - - test/test-types.c | 26 +++++++++++++++++++++++++- - 1 files changed, 25 insertions(+), 1 deletions(-) - -commit 316b7a1afb84a5dfeaed886a585669b4d549c9b7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 11 17:49:10 2011 -0400 - - Make hb_language_from_string("") return NULL language - - src/hb-language.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit db60c96f20426111ffa71e9802ef6e248f8b28d0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 11 16:17:02 2011 -0400 - - [teset] Test hb_script_t - - test/hb-test.h | 8 ++++++++ - test/test-types.c | 35 ++++++++++++++++++++++++++++++++++- - 2 files changed, 42 insertions(+), 1 deletions(-) - -commit 99b74760a4cddc798ab44b5ca897486bbb9c76d6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 11 15:47:40 2011 -0400 - - Rename hb_category_t to hb_unicode_general_category_t - - src/hb-glib.c | 2 +- - src/hb-icu.c | 64 - ++++++++++++++++++------------------ - src/hb-ot-shape-complex-arabic.cc | 8 ++-- - src/hb-ot-shape-private.hh | 2 +- - src/hb-ot-shape.cc | 2 +- - src/hb-unicode.c | 4 +- - src/hb-unicode.h | 66 - ++++++++++++++++++------------------ - 7 files changed, 74 insertions(+), 74 deletions(-) - -commit 4188096a7722f09ffa9319986c0286071da10a27 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 11 14:58:28 2011 -0400 - - Make HB_TAG_CHAR4 private - - It's just sugar. - - src/hb-common.h | 5 +---- - src/hb-private.h | 7 ++++++- - test/test-types.c | 2 -- - 3 files changed, 7 insertions(+), 7 deletions(-) - -commit 7ff7401c9237cda661869c1cb196d685706ac4e9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 11 13:27:30 2011 -0400 - - Make hb_tag_from_string(NULL) return HB_TAG_NONE - - src/hb-common.c | 3 +++ - test/test-types.c | 3 +++ - 2 files changed, 6 insertions(+), 0 deletions(-) - -commit 02f6e62d6cabc7808c188daef26a1fe7ac626b1f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 11 13:27:21 2011 -0400 - - Build fix - - test/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit db5227c40e5c35fe2ffb750f32b639cb44424a1d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 11 13:16:08 2011 -0400 - - Move macros around - - src/hb-ot-tag.c | 6 ++---- - src/hb-private.h | 7 +++++++ - 2 files changed, 9 insertions(+), 4 deletions(-) - -commit 07233581c9d953708d3c020907c42b8b89472b89 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 11 13:12:37 2011 -0400 - - Rename HB_TAG_STR() to HB_TAG_CHAR4() - - The problem with HB_TAG_STR() was that it expected a string of size 4 - exactly, and unlike hb_tag_from_string() it doesn't pad the tag with - space characters. So, the new name is more appropriate. - - src/hb-common.c | 2 +- - src/hb-common.h | 8 ++++---- - src/hb-ot-tag.c | 2 +- - test/test-types.c | 2 +- - 4 files changed, 7 insertions(+), 7 deletions(-) - -commit 9faa980067f802f712c2adf8263152ed40c98088 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 11 12:46:49 2011 -0400 - - Add an in-tree test suite - - Uses the glib testing framework. Wrote unit tests for hb-common.h - types. - - Makefile.am | 2 +- - test/Makefile.am | 18 +++++++++ - test/Makefile.decl | 90 +++++++++++++++++++++++++++++++++++++++++++ - test/hb-test.h | 67 ++++++++++++++++++++++++++++++++ - test/test-types.c | 108 - ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 284 insertions(+), 1 deletions(-) - -commit d77b76200efbaa0611691920f9f2018b1e8be340 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 11 12:29:52 2011 -0400 - - Add few more paratheses to the HB_TAG macro - - Never hurts. - - src/hb-common.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b13640de6992de9ee9d07e3581c33b8181b70ff9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 11 12:29:31 2011 -0400 - - A few more ASSERTs - - src/hb-private.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit ae9eeaff9300f3bb7bed588c5478e8e5461b3df0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 11 11:49:08 2011 -0400 - - Remove warning message from public header file - - Since we now assert thos in hb-private.h, the int types cannot - be wrong. - (Except for when someone else includes hb-common.h in a very broken - configuration, but that's not our problem!) - - Plus, we don't use inline in the public headers, so remove that too. - - src/hb-common.h | 7 ------- - src/hb-private.h | 4 ++++ - 2 files changed, 4 insertions(+), 7 deletions(-) - -commit 6fd5364bdc3a2b459175377e9e16c86cff054232 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 11 11:47:14 2011 -0400 - - Assert int types - - src/hb-private.h | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -commit bbdeff59646e5502b9fc53ab1761b3f014ee276c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 7 16:05:07 2011 -0400 - - Add test directory - - configure.ac | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 4accc92afc702177ea53280d977cec839af3c12c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 7 15:53:26 2011 -0400 - - Update TODO items - - TODO | 31 ++++++++++++++++++++----------- - 1 files changed, 20 insertions(+), 11 deletions(-) - -commit a71b9c8579d73aea4549f12524bbc2e89f43b5c5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 6 14:04:56 2011 -0400 - - Disable 'cswh' by default except for Arabic shaper - - That better matches OpenType spec. Note that we enable it for all - Arabic-shaper scripts. Ie. we enable it by default for Syriac too, - but the SyriacOT spec does not require it. I think this is a more - useful compromise than special-casing for Arabic script alone. - - src/hb-ot-shape-complex-arabic.cc | 3 +++ - src/hb-ot-shape.cc | 1 - - 2 files changed, 3 insertions(+), 1 deletions(-) - -commit cab6f65bba560ac1651d9152f1ecf12eb88eca74 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 4 15:36:51 2011 -0400 - - [hb-view] setlocale (LC_ALL, "") - - For now we don't use anything from the locale, but we should default - to using $LANG, etc, if --language is not specified. Right? - - src/hb-view.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit fb9ca1bfabde7da0c274e7a1bd12bffaf7949c18 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 4 14:50:09 2011 -0400 - - [hb-view] Rewrite --features parsing, with range support - - The --features parsing handles errors now. More importantly, it - allos limiting individual features to specific byte ranges. The - format is Python-esque. Here is how it all works: - - Syntax: Value: Start: End: - - Setting value: - "kern" 1 0 ∞ # Turn feature on - "+kern" 1 0 ∞ # Turn feature off - "-kern" 0 0 ∞ # Turn feature off - "kern=0" 0 0 ∞ # Turn feature off - "kern=1" 1 0 ∞ # Turn feature on - "kern=2" 2 0 ∞ # Choose 2nd alternate - - Setting index: - "kern[]" 1 0 ∞ # Turn feature on - "kern[:]" 1 0 ∞ # Turn feature on - "kern[5:]" 1 5 ∞ # Turn feature on, partial - "kern[:5]" 1 0 5 # Turn feature on, partial - "kern[3:5]" 1 3 5 # Turn feature on, range - "kern[3]" 1 3 3+1 # Turn feature on, single char - - Mixing it all: - - "kern[3:5]=0" 1 3 5 # Turn feature off - for range - - src/hb-view.c | 169 - ++++++++++++++++++++++++++++++++++++++++++++------------- - 1 files changed, 132 insertions(+), 37 deletions(-) - -commit ccc6745afaa68ce7497a6cd02ce85986d3c863d0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 4 14:49:50 2011 -0400 - - [hb-view] Use cached hb-ft face creation - - Avoids recreating the face the second time we call draw(). - - src/hb-view.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1b4a2cc095d165dc573e0235f00fbbf2a5d3c2c5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 4 14:45:28 2011 -0400 - - [hb-view] Add --debug - - Frees all allocated memory before exiting. Useful for valgrind run. - - src/hb-view.c | 17 +++++++++++++++++ - 1 files changed, 17 insertions(+), 0 deletions(-) - -commit b2da26d1e32a012f7feaad7c7cced61e4fb269f1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 1 15:48:43 2011 -0400 - - [hb-view] Support --features - - Accepts values like: - - --features="-mkmk,aalt=2,calt=1,+cswh" - - A minus sign means "=0", a plus sign means "=1". Default is "=1". - A minus sign overrides an explicit value. - - src/hb-view.c | 70 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 68 insertions(+), 2 deletions(-) - -commit f48ff19b629070d13cee3c0eeeb06c98992f93c6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 1 14:19:10 2011 -0400 - - Sort options for clarity - - src/hb-view.c | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit 5d91c3d547f78163b36aa7436d4388a836cca94a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Mar 16 17:36:32 2011 -0300 - - Add script to/from ISO 15924 tag support - - Also adds --script support to hb-view. - - If a script tag is not known to us, we pass the ISO 15924 tag around. - Right now, the OT layer ignores that, but we can fix it to blindly - convert that to an OT script tag. - - src/hb-ot-tag.c | 4 + - src/hb-unicode.c | 273 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-unicode.h | 8 ++- - src/hb-view.c | 10 ++- - 4 files changed, 293 insertions(+), 2 deletions(-) - -commit 3286fc0e9adc3f2874c9409e7fdb09e4d2b7dda1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Mar 16 14:53:32 2011 -0300 - - Let hb_shape() guess script and direction... - - - Rename HB_SCRIPT_INVALID_CODE to HB_SCRIPT_INVALID - - - Add HB_DIRECTION_INVALID - - - Make hb_script_get_horizontal_direction() public - - - Make hb_shape() guess script from buffer text (first non-common - non-inherit script) if buffer script is set to HB_SCRIPT_INVALID - (this - is NOT the default.) - - - Make hb_shape() guess direction from buffer script if buffer - direction - is set to HB_DIRECTION_INVALID (this is NOT the default.) - - - Make hb-view.c set INVALID script and direction on the buffer. - - The above changes are meant to make hb-view fairly useful for - uni-script - uni-direction text. The guessing behavior however is NOT the - default of - hb_shape() and must be asked for explicitly. This is intended, - because - the guess is not a suitable substitute to full-fledged bidi and script - segmentation. It's just a testing tool. - - src/hb-common.h | 3 +- - src/hb-icu.c | 2 +- - src/hb-ot-shape.cc | 3 +- - src/hb-shape.cc | 52 - ++++++++++++++++++++++++++++++++++++++++----- - src/hb-unicode-private.h | 4 --- - src/hb-unicode.c | 2 +- - src/hb-unicode.h | 8 ++++++- - src/hb-view.c | 4 +- - 8 files changed, 61 insertions(+), 17 deletions(-) - -commit b7b29684df67af7280b74ca4cf18f02ad6521bdc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Mar 2 01:01:03 2011 -0500 - - [hb-view] Handle write_to_png errors - - src/hb-view.c | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) - -commit c2cb98c8185c5560cfd04de7ee7c64c9496b986c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Mar 1 23:18:09 2011 -0500 - - [hb-view] Link with -lm - - src/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b5dd44e24669cd35affcd92788d39ff56cac94db -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Feb 28 10:13:52 2011 -0800 - - Fix possible overflow - - src/hb-buffer.cc | 12 ++++++++++-- - 1 files changed, 10 insertions(+), 2 deletions(-) - -commit a4b781e93a0bee0549611e129b3564d9804d9090 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Feb 23 12:47:56 2011 -0500 - - Default background color shall either be white or transparent - - Definitely not black! - - src/hb-view.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 5353bf439c150492708ef9337078cfd73b83627b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Feb 22 18:06:19 2011 -0500 - - Add initial hb-view tool - - Currently doesn't handle script or direction. - - configure.ac | 18 +++ - src/Makefile.am | 14 +++ - src/hb-view.c | 342 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 374 insertions(+), 0 deletions(-) - -commit 82438c6ad5f60b6afc75c48cef72e18bef532468 -Author: Bradley Grainger <bgrainger@logos.com> -Date: Tue Feb 15 18:37:29 2011 -0500 - - Fix #pragma message for MSVC. - - __LOC__ was renamed to _HB__LOC__ in cd7555 but the corresponding - change wasn't made in hb-private.h. - - src/hb-private.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ba9ab8d6d9c863662c4b44ace4a4d89e29e592f2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jan 10 07:45:41 2011 -0500 - - Fix language extension matching - - src/hb-ot-tag.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a07874300a669ec0ea09a67df2a3ee8b0612d6b9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jan 10 02:27:49 2011 -0500 - - Don't use the m4/ dir - - We just require people to have libtool, pkg-config, etc installed - when running autogen.sh - - Makefile.am | 2 -- - configure.ac | 1 - - 2 files changed, 0 insertions(+), 3 deletions(-) - -commit 7bbe14bed8a886ea5b293c927c4bf937cbfc6f51 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jan 9 22:29:14 2011 -0500 - - Fix 'make distcheck' - - src/Makefile.am | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 2abe1264a580858bf7803af1701117a462375fb4 -Author: Javier Jardón <jjardon@gnome.org> -Date: Sun Jan 9 22:18:53 2011 -0500 - - Bug 31174 - Update autotools configuration - - Makefile.am | 2 + - autogen.sh | 188 - ++++------------------------------------------------------ - configure.ac | 22 +++++-- - 3 files changed, 29 insertions(+), 183 deletions(-) - -commit cc1a8a938b4c13e76b58825a9e1951c4134e634a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 6 14:58:52 2011 -0500 - - Fix ChanContext backtrack matching with GPOS - - Reported on mailing list by Keith Stribley and Khaled Hosny. - - src/hb-buffer-private.hh | 5 +++-- - src/hb-buffer.cc | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 6 +++--- - 3 files changed, 7 insertions(+), 6 deletions(-) - -commit 1c3183027fe823cd673866ba29d169b69f8efba1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 6 14:44:14 2011 -0500 - - Remove unused realloc - - We always allocate and grow str and pos together. - - src/hb-buffer.cc | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -commit 76691f0240d6de230e9b42280b54e91639464635 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 6 14:16:59 2011 -0500 - - Fix ICU detection - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 756f794a1fce701092345a3f9afae039583fb55b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Dec 26 20:52:40 2010 -0500 - - Remove Graphite backend - - It was unmaintained and the code has to be replaced to use the new - grphite-ng code base. - - configure.ac | 6 - - src/Makefile.am | 14 --- - src/hb-graphite.cc | 310 - ---------------------------------------------------- - src/hb-graphite.h | 47 -------- - 4 files changed, 0 insertions(+), 377 deletions(-) - -commit f3d9d9879364609502d9d3a3a9f4647adb167d78 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Dec 22 01:39:29 2010 -0500 - - Docs - - src/hb-unicode.h | 60 - +++++++++++++++++++++++++++--------------------------- - 1 files changed, 30 insertions(+), 30 deletions(-) - -commit d86a5b3c5752abcc791724035ba4115958e6b5e2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Dec 21 18:36:25 2010 -0500 - - Bug 32274 - classic mongolian shaper - - Add support for classic Mongolian script to the Arabic shaper. - - Still work to be done around U+180E MONGOLIAN VOWEL SEPARATOR as it - should not be included in the final glyph stream the same way that - ZWNJ, etc should not appear in the final glyph stream. - - But the joining part should be done. - - There remains the question of how should the U+18A9 MONGOLIAN - LETTER ALI - GALI DAGALGA be handled as it has General Category NSM but a letter - nonetheless. For now, our generic logic makes this a joining - T instead - of joining D as other Mongolian letters are. - - src/hb-ot-shape-complex-arabic.cc | 8 ++++++++ - src/hb-ot-shape-complex-private.hh | 1 + - 2 files changed, 9 insertions(+), 0 deletions(-) - -commit b0e7378fa9a4fc6fc74d9b3c27d927602eaacc5b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Dec 21 14:19:32 2010 -0500 - - Reroute Mandaic shaping through the Arabic shaper - - We added Mandaic joining data to the Arabic shaper a while ago, but - were not actually using the Arabic shaper for Mandaic. Fixed. - - src/hb-ot-shape-complex-private.hh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 88e7f37488e4e8590619d815b975232a0c9d2ea0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Dec 21 14:18:24 2010 -0500 - - Annotate the Arabic joining table with block information - - src/gen-arabic-joining-table.py | 93 - ++++++++++++++++++++------------ - src/hb-ot-shape-complex-arabic-table.h | 24 +++++++- - 2 files changed, 80 insertions(+), 37 deletions(-) - -commit 1482a39e56cd4151874e5c073540274349240a87 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Dec 17 20:15:05 2010 -0500 - - Rename remaining metrics uses to extents - - src/hb-font.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 22c537657cee1f47a4056a21e2cddfcbe6ab1c01 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Dec 14 23:51:29 2010 -0500 - - Rename TableDirectory to TableRecord as per OpenType 1.6 - - src/hb-open-file-private.hh | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) - -commit 33e8b86197239e667a887709104357bdc6566b7c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Dec 13 15:54:56 2010 -0500 - - Update 'head' table to OpenType 1.6 - - src/hb-ot-head-private.hh | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) - -commit b7683335146bfe3a74d9419db92cd7a8019a9c10 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Dec 13 14:22:35 2010 -0500 - - Disallow ligature substitutions replacing one glyph - - src/hb-ot-layout-gsub-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 7eb875118dc31e9fb0e23c45985396a8bfe977e3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Dec 13 14:13:35 2010 -0500 - - Mozilla Bug 618592 - freeze on typekit - - Fix apply_lookup() for zero-input broken fonts. - - src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit bbbbe80ec9bc45c5b685bc09c8f993e98496555c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Dec 7 16:22:02 2010 -0500 - - Rename original_direction to target_direction - - src/hb-ot-shape-private.hh | 2 +- - src/hb-ot-shape.cc | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit ee8aaf976a6eb42be49b63b4c51c7a0a338e0298 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Dec 7 16:20:42 2010 -0500 - - Fix arabic shaping of LTR text - - We should ensure-direction before doing any complex work. The only - exception is mirroring that needs to see the original / final - direction, - not the native. Handle that. - - src/hb-ot-shape.cc | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit d1f1707adc03317760b0f75e04d0f3dd425e547f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 30 00:57:15 2010 -0500 - - Bug 31965 - some GNU/Linux distributions lack icu.pc but have - icu-config - - Patch from suzuki toshiya. - - configure.ac | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) - -commit 3c48982be6b2286088541ee55cac78b0f2b6e771 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Nov 28 19:39:47 2010 -0500 - - Adjust pyx files to reflect change from int to hb_var_int_t - - Patch from Thomas Hunger. - - contrib/python/lib/harfbuzz.pyx | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit 4f9e4a40bc248aeb1364ed6f4aa7f392aa364497 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 22 11:30:32 2010 -0500 - - Fix failing checks - - src/hb-ot-shape-complex-arabic-table.h | 37 - ++++++++++++++++++++++++++++++++ - 1 files changed, 37 insertions(+), 0 deletions(-) - -commit 9da26d6669e7f3b91ba37e71f6f8a6e2ea806688 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 22 11:03:18 2010 -0500 - - Remove email address from Copyright headers - - COPYING | 2 +- - src/hb-ft.c | 2 +- - src/hb-icu.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -commit a45f00019242734fca742adeb2ed507305baeda6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 18 13:58:32 2010 -0500 - - Clarify copyright notice - - COPYING | 12 ++++++++++++ - README | 4 ++-- - src/hb-graphite.cc | 4 ++-- - src/hb-object-private.h | 2 +- - 4 files changed, 17 insertions(+), 5 deletions(-) - -commit 0884a8d9cd576f116400b3f7c8815e747c315d5e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 17 16:58:21 2010 -0500 - - Move generated table to its own file - - src/Makefile.am | 1 + - src/hb-ot-shape-complex-arabic-table.h | 619 - +++++++++++++++++++++++++++++++ - src/hb-ot-shape-complex-arabic.cc | 621 - +------------------------------- - 3 files changed, 621 insertions(+), 620 deletions(-) - -commit 14d784116b08685425e4ddcb1c1f813dbe2b2986 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 17 16:52:58 2010 -0500 - - Update Arabic joining table to include Mandaic - - Mandaic was added to Unicode 6.0, but the joining data was not - updated. - Draft ArabicShaping.txt from 6.1 includes the joining data for - Mandaic. - Use that. - - src/gen-arabic-joining-table.py | 45 ++++++++++---- - src/hb-ot-shape-complex-arabic.cc | 123 - +++++++++++++++++++++++++++++++------ - 2 files changed, 137 insertions(+), 31 deletions(-) - -commit 43bf2f7f1ec427c431e2ee2fd1a9345e7d5c9718 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 17 14:49:40 2010 -0500 - - Add OpenType script tags for Unicode 5.2 and Unicode 6.0 scripts - - Based on tags proposed by Microsoft for inclusion in OpenType. - - src/hb-ot-tag.c | 34 +++++++++++++++++----------------- - 1 files changed, 17 insertions(+), 17 deletions(-) - -commit afab01cf7caca79cf6dfabe6827d1703be1a74f7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 17 14:35:34 2010 -0500 - - Add Unicode 6.0 scripts - - src/hb-icu.c | 6 ++++++ - src/hb-ot-tag.c | 7 ++++++- - src/hb-unicode.c | 7 ++++++- - src/hb-unicode.h | 7 ++++++- - 4 files changed, 24 insertions(+), 3 deletions(-) - -commit f234b68d18d956f7e4eb4bf58d6dc408d9e5146e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 17 14:25:44 2010 -0500 - - Change HB_SCRIPT_MEITEI_MAYEK to HB_SCRIPT_MEETEI_MAYEK - - The new name matches the Unicode name. Reported by Jonathan Kew. - - src/hb-icu.c | 2 +- - src/hb-ot-tag.c | 2 +- - src/hb-unicode.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -commit 3ca9a6d1cffe950b325e1d522b20d4a645ae448e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 17 13:08:47 2010 -0500 - - Add TODO item - - TODO | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 300cb41417d40473268e3b4089bed24e9e77a753 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 17 12:57:23 2010 -0500 - - Add XXX marks - - src/hb-ot-layout-gsubgpos-private.hh | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit ea00aee9f94ae8c6cf03d620254817d5e1f51d64 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 5 10:51:37 2010 -0400 - - Add TODO item - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 3a852ae7fe6edfaadd75625d27515a3689503395 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 3 16:37:24 2010 -0400 - - Save general category and combining class in the buffer for reuse - - src/hb-ot-layout-private.hh | 3 ++- - src/hb-ot-shape-complex-arabic.cc | 16 ++++++++++------ - src/hb-ot-shape-private.hh | 6 ++++++ - src/hb-ot-shape.cc | 26 +++++++++++++++++++++----- - 4 files changed, 39 insertions(+), 12 deletions(-) - -commit a5ab682b9ba8224fc132624f93e6fef9973a68ca -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 3 15:50:36 2010 -0400 - - More "unreached code" warning fixes - - Ugly :(. - - src/hb-blob.c | 48 ++++++++++++++++++++++++------------------------ - 1 files changed, 24 insertions(+), 24 deletions(-) - -commit 4e22c7e94102c9f00c32b8cb6aaa832f83909149 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 3 15:47:12 2010 -0400 - - Add comment - - src/hb-ot-layout-common-private.hh | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 0342034d1cb577d34b42f7204da7fb930c12a464 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 3 15:40:07 2010 -0400 - - Pedantic - - src/hb-ot-layout-gpos-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4a2d844c2f12dc1b858ab4ddd737ded7c0852221 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 3 15:28:56 2010 -0400 - - Minor code shuffling - - src/hb-ot-layout-private.hh | 21 ++------------ - src/hb-ot-layout.cc | 61 - +++++++++++++++++++++++++++++++----------- - 2 files changed, 48 insertions(+), 34 deletions(-) - -commit 11e3ec444a85fc72541823c2e98cc92c4ceb19af -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 3 15:11:04 2010 -0400 - - Fix a few more "unreachable code" warnings - - src/hb-blob.c | 2 +- - src/hb-object-private.h | 12 ++-- - src/hb-open-type-private.hh | 84 - ++++++++++++++++------------------ - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - src/hb-private.h | 3 +- - 5 files changed, 49 insertions(+), 54 deletions(-) - -commit 2304856340782c72cb30873f7907191dc359e921 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 3 12:46:58 2010 -0400 - - Remove another couple lines of dead code - - src/hb-ot-layout-gsubgpos-private.hh | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit b8783c85ac5dd9ea8f5a66eacb92dfcfbf649a6d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 3 11:50:21 2010 -0400 - - Fix unreachable-code warning - - src/hb-ot-layout-gpos-private.hh | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit c2709119c8c610a0d4d71884a7d4fdba7cb65b72 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 23:18:51 2010 -0400 - - Move things around some more - - src/hb-ot-layout-gpos-private.hh | 8 ++++---- - src/hb-ot-layout-gsub-private.hh | 4 ++-- - src/hb-ot-layout-gsubgpos-private.hh | 9 +++++++-- - src/hb-ot-layout-private.hh | 7 +++---- - src/hb-ot-layout.cc | 6 +++--- - 5 files changed, 19 insertions(+), 15 deletions(-) - -commit 194d4566ec054db03fa31d369a9f1c6cf4941e74 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 23:09:10 2010 -0400 - - Move buffer var allocation local - - src/hb-ot-layout-gpos-private.hh | 19 ++++++++++++++----- - src/hb-ot-layout-private.hh | 2 -- - 2 files changed, 14 insertions(+), 7 deletions(-) - -commit 1e7c1fcbc33599faefc32d4a28e5d8506d2c56fa -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 22:48:31 2010 -0400 - - Move code around - - src/hb-ot-layout-gpos-private.hh | 59 - ++++++++++++++++++++++++++++++++++++++ - src/hb-ot-layout.cc | 59 - +------------------------------------ - src/hb-ot-layout.h | 4 +-- - src/hb-ot-shape.cc | 2 +- - 4 files changed, 63 insertions(+), 61 deletions(-) - -commit bf94b3ad22b2fe4730d4e64d673c63154fc5b5fe -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 22:37:59 2010 -0400 - - Move some more code around - - src/hb-ot-layout-gdef-private.hh | 21 ++++++++++++++ - src/hb-ot-layout-private.hh | 27 +++++++++++++++--- - src/hb-ot-layout.cc | 56 - +++++-------------------------------- - 3 files changed, 52 insertions(+), 52 deletions(-) - -commit 6334658fe79d6acfb46a2a147721b78f92510ebb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 22:11:32 2010 -0400 - - Simplify mark skipping logic - - src/hb-ot-layout.cc | 17 +++-------------- - 1 files changed, 3 insertions(+), 14 deletions(-) - -commit 8c69e65abed961002d90024c92e18538c6516262 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 22:07:49 2010 -0400 - - Rename lookup_flags to lookup_props since it's more than just flags - - src/hb-ot-layout-common-private.hh | 6 ++++- - src/hb-ot-layout-gpos-private.hh | 14 ++++++------ - src/hb-ot-layout-gsub-private.hh | 8 +++--- - src/hb-ot-layout-gsubgpos-private.hh | 10 ++++---- - src/hb-ot-layout-private.hh | 4 +- - src/hb-ot-layout.cc | 36 - +++++++++++++++++----------------- - src/main.cc | 4 +- - 7 files changed, 43 insertions(+), 39 deletions(-) - -commit 98370e89d1bff248737b482d129c2a4deb8bfd95 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 17:39:01 2010 -0400 - - WIP removing external synthesized GDEF support and implementing - it internally - - TODO | 2 - - src/hb-buffer-private.hh | 4 - - src/hb-buffer.cc | 3 - - src/hb-ot-layout-common-private.hh | 8 +- - src/hb-ot-layout-gdef-private.hh | 6 +- - src/hb-ot-layout-gpos-private.hh | 4 +- - src/hb-ot-layout-gsub-private.hh | 66 ++++++----------- - src/hb-ot-layout-gsubgpos-private.hh | 29 +++++++- - src/hb-ot-layout-private.hh | 29 ++----- - src/hb-ot-layout.cc | 138 - +++++----------------------------- - src/hb-ot-layout.h | 26 ------- - src/hb-ot-shape.cc | 10 +++ - 12 files changed, 98 insertions(+), 227 deletions(-) - -commit 870e2d6eac01d004c72a925ea93e6823251d5fa2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 17:37:20 2010 -0400 - - Remove unused function - - src/hb-buffer-private.hh | 10 ---------- - src/hb-buffer.cc | 27 --------------------------- - 2 files changed, 0 insertions(+), 37 deletions(-) - -commit 1115890b90709fa5329a55d22f543020f3df9f6f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 17:07:04 2010 -0400 - - More cleanup - - src/hb-buffer-private.hh | 5 +---- - src/hb-ot-layout-private.hh | 6 ++++++ - 2 files changed, 7 insertions(+), 4 deletions(-) - -commit dbf56b1d94910f04823e53e39ace1e5145bddc04 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 17:06:12 2010 -0400 - - More lig-id cleanup - - src/hb-buffer-private.hh | 4 ++-- - src/hb-buffer.cc | 2 +- - src/hb-ot-layout-gsub-private.hh | 8 +++++++- - 3 files changed, 10 insertions(+), 4 deletions(-) - -commit f6a23a0b9171958f76c1d0473b09fc08d2b3a0d0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 17:01:03 2010 -0400 - - More removal of lig-id code from buffer - - src/hb-buffer.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit dd2ffd282c059194fd87fb1664e2e0cdb56a87a0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 16:57:01 2010 -0400 - - Minor renaming - - src/hb-buffer-private.hh | 41 - ++++++++++++++++++------------------- - src/hb-buffer.cc | 20 +++++++++--------- - src/hb-ot-layout-gsub-private.hh | 8 +++--- - src/hb-ot-shape.cc | 6 ++-- - 4 files changed, 37 insertions(+), 38 deletions(-) - -commit fe263272a2b26204bc39829a94d90ab537517f3f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 16:51:02 2010 -0400 - - Move setting lig_id/component out of buffer and to the gsub code - - src/hb-buffer-private.hh | 30 ++++++--------------- - src/hb-buffer.cc | 52 - ++++++------------------------------- - src/hb-ot-layout-gsub-private.hh | 27 +++++++++++-------- - 3 files changed, 34 insertions(+), 75 deletions(-) - -commit 2e2b2480c01c788ea702d78ca830c2bb659654a8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 16:25:28 2010 -0400 - - Always allocate new ligature id - - No practical point in reusing ligature ids. - - src/hb-ot-layout-gsub-private.hh | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -commit bf07d5a29c61baf6fd683289c7764f487ad7e413 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 16:19:13 2010 -0400 - - Set component=0 for ligature glyph - - src/hb-ot-layout-gsub-private.hh | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 37ab877149582c7ce7416425bb402340e3f948a2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 15:38:06 2010 -0400 - - Remove comment - - src/hb-buffer.cc | 20 -------------------- - 1 files changed, 0 insertions(+), 20 deletions(-) - -commit 88474c6fdaf35c56368694a5b164f4988a004d49 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 14:42:15 2010 -0400 - - Get rid of the OpenType-specific internal buffer representation - - Add variant integers to buffer item types. More cleanup coming. - - TODO | 2 - - src/hb-buffer-private.hh | 35 +++++--------------- - src/hb-buffer.cc | 62 - ++++++++++++++++++------------------ - src/hb-buffer.h | 2 +- - src/hb-ot-layout-gpos-private.hh | 24 +++++++------- - src/hb-ot-layout-gsub-private.hh | 2 +- - src/hb-ot-layout-private.hh | 4 +- - src/hb-ot-layout.cc | 39 +++++++++++------------ - src/hb-ot-shape-complex-arabic.cc | 8 ++-- - 9 files changed, 79 insertions(+), 99 deletions(-) - -commit 6cb8c3493019e1497921666fc268cb81943f9f1f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 14:27:03 2010 -0400 - - Add hb_var_int_t - - src/hb-buffer.h | 6 +++--- - src/hb-common.h | 10 ++++++++++ - 2 files changed, 13 insertions(+), 3 deletions(-) - -commit f22802431a983bd4bc60a7653b1103973c3475cb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 2 19:12:37 2010 -0400 - - Remove trailing comma - - src/hb-ot-shape-complex-arabic.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 13528d0c78cadb1f67267c9a692558caef9fdaa6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 14:09:27 2010 -0400 - - Supposedly implement vertical support in GPOS - - Not tested at all. - - src/hb-ot-layout-gpos-private.hh | 27 +++++++++++++++++++------ - src/hb-ot-layout.cc | 39 - +++++++++++++++++++++++-------------- - 2 files changed, 44 insertions(+), 22 deletions(-) - -commit 9624de5b496846cd89ee4f7b07d38029aca70ce1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 13:44:59 2010 -0400 - - Clarify cursive_chain (and change its sign) - - src/hb-ot-layout-gpos-private.hh | 4 ++-- - src/hb-ot-layout.cc | 13 +++++++------ - 2 files changed, 9 insertions(+), 8 deletions(-) - -commit d6c9eadb88240c40b3cb9a33f067e575cbc2f729 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 12:34:50 2010 -0400 - - Remove more pointless LONGTERMTODO items - - src/hb-ot-layout-common-private.hh | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit e204674fe340a57c48a9fe7e1ed02a9a08f4aca4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 12:32:02 2010 -0400 - - Rename hb_ot_layout_get_lig_carets() to - hb_ot_layout_get_ligature_carets() - - src/hb-ot-layout.cc | 14 +++++++------- - src/hb-ot-layout.h | 14 +++++++------- - 2 files changed, 14 insertions(+), 14 deletions(-) - -commit 3357d145f81cb7b746c910018fe3a0dfab00972c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 12:30:46 2010 -0400 - - Implement vertical support in get_lig_carets() - - src/hb-ot-layout-gdef-private.hh | 34 - ++++++++++++++++++---------------- - src/hb-ot-layout.cc | 3 ++- - src/hb-ot-layout.h | 1 + - 3 files changed, 21 insertions(+), 17 deletions(-) - -commit 8eeed7eddc789151cbffe62ed6bfd77612266bf1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 12:07:49 2010 -0400 - - Remove LONGTERMTODO item that I'll never fix - - src/hb-ot-layout-gsubgpos-private.hh | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -commit 184a5279c64f37bc2ceefbe2191bb64ca87f88d8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 12:00:49 2010 -0400 - - Remove unused macro - - src/hb-ot-layout-gpos-private.hh | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit af5d02a269d55331300df1e382241893928d64e0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 11:54:26 2010 -0400 - - Rewrite Cursive joining to act more like other pair lookups - - Look forward for next character instead of joining to the last - character. - - src/hb-ot-layout-gpos-private.hh | 71 - ++++++++++++++++--------------------- - src/hb-ot-layout-private.hh | 10 ----- - 2 files changed, 31 insertions(+), 50 deletions(-) - -commit ea22c749c7371cf66ca44f0bfe7030aef1926edd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 11:09:48 2010 -0400 - - Fix Cursive positioning - - Test case: "مرا" rendered using IranNastaliq. - - src/hb-ot-layout-gpos-private.hh | 124 - +------------------------------------- - 1 files changed, 3 insertions(+), 121 deletions(-) - -commit aefdb64689aab19df76590a36c4a04052a8bffdb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 10:40:39 2010 -0400 - - Fix segfault with Arabic combining marks - - src/hb-ot-shape-complex-arabic.cc | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 12b2d09a87adc1e1aac089cd2e09a68fb7129829 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 01:28:28 2010 -0400 - - Remove obsolete TODO item - - We don't cache any metrics internally, so the correct way to add more - glyph metrics items is to add new callbacks for them. We already have - separeate callbacks for advance vs extents. - - TODO | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 248e3c2ba47889c247959e44166644872aed59ba -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 01:23:14 2010 -0400 - - Oops, remove extra mask setting that broke complex shaping - - src/hb-ot-shape.cc | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 502f4cba3e0bcd625d31f8fd295b8b18e2d02a5a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 27 01:13:56 2010 -0400 - - Divide get_metrics into get_advance and get_extents - - Graphite module not updated. - Bump version to 0.3. - - configure.ac | 2 +- - src/hb-font-private.h | 3 +- - src/hb-font.cc | 96 - +++++++++++++++++++++++++++++++++--------------- - src/hb-font.h | 61 +++++++++++++++++++------------ - src/hb-ft.c | 72 ++++++++++++++++++++++-------------- - src/hb-ot-shape.cc | 7 ++-- - 6 files changed, 154 insertions(+), 87 deletions(-) - -commit ec6c0e54d322d58cbc835feb58dcec7ede6ab744 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 26 11:28:14 2010 -0400 - - Fix blob leak - - src/hb-font.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bd7378b2ef9793de4e7f57b920f29f48ac9d0c25 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 13 18:33:16 2010 -0400 - - Massage mask setting a bit more - - Still finding the exact correct way the masks should be set. - - src/hb-buffer-private.hh | 19 ++++++++++++++++--- - src/hb-buffer.cc | 9 +++++++++ - src/hb-ot-shape.cc | 6 ++++-- - 3 files changed, 29 insertions(+), 5 deletions(-) - -commit 961f9baa7bc3556f1e4e7135859cebe1351f73a4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 13 17:17:00 2010 -0400 - - Oops, actually set global mask - - src/hb-buffer.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 39dede9ffffe732f78cbd092ccb3b48d77ddd66d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 13 15:54:06 2010 -0400 - - Make sure boolean features always use value=1 - - Previously boolean features turned on the entire feature mask. - This is - wrong if feature is Alternate and user has provided values bigger - than one. - Though, I don't think other engines support such corner cases. - - src/hb-ot-map-private.hh | 10 ++++++++-- - src/hb-ot-map.cc | 3 ++- - src/hb-ot-shape-complex-arabic.cc | 2 +- - src/hb-ot-shape.cc | 2 +- - 4 files changed, 12 insertions(+), 5 deletions(-) - -commit 3506b2e78db27e7835bd2c09c053a9807c9cac40 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 13 15:38:52 2010 -0400 - - Return early if mask is 0 - - src/hb-buffer.cc | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 5c1c8c9c50ddbe66ea595afb245a208b7775b27c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 13 15:36:38 2010 -0400 - - Make sure feature values don't leak out of their mask - - src/hb-buffer.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 852912fc2db06b6183a2dc87c45ec1b563063572 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 13 15:34:50 2010 -0400 - - Fix applying default-value for features - - Previously if a default global feature was overrided by a non-global - user feature, we were not setting any default mask for the feature, - essentially disabling the feature by default. Fix that. - - TODO | 2 -- - src/hb-ot-map-private.hh | 10 ++++++---- - src/hb-ot-map.cc | 13 +++++++------ - 3 files changed, 13 insertions(+), 12 deletions(-) - -commit 2989be4919242670c94825bded96db20a7b2035b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 13 15:18:29 2010 -0400 - - Set user masks after complex masks - - src/hb-ot-shape.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit a7820b7b15a809b4a1a4077147ceed7bea528483 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 13 14:20:48 2010 -0400 - - Add TODO item - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 04a3023a66203d94b77f2d7a8d6bcdedf067e155 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 13 10:57:27 2010 -0400 - - Cleanup TODO - - Looks like a roadmap now. - - TODO | 72 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++----------- - 1 files changed, 59 insertions(+), 13 deletions(-) - -commit 3111b8a0d5b38da57c0f6285aec2b92eb690188f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 13 10:41:53 2010 -0400 - - Fix stupid bug, oops - - src/hb-font.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3703f88b74707113e782eb6ca9a77603561760d0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 12 18:34:20 2010 -0400 - - Step the version up to 0.2 now that Arabic shaper is in - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 758f68b860b44b5a04eb3dde5cb40b1b04cf634a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 12 17:37:44 2010 -0400 - - Fix Arabic shaper - - It's tested now. It works! - - src/hb-ot-shape-complex-arabic.cc | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 13403bc67a01e0d4908fb964093fd02ddd11c580 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 12 17:23:54 2010 -0400 - - Hookup Arabic shaper! - - Not tested yet. - - src/hb-ot-shape-complex-arabic.cc | 6 ++-- - src/hb-ot-shape-complex-private.hh | 37 - +++++++++++++++++++++-------------- - src/hb-ot-shape-private.hh | 14 ++++++++++++- - src/hb-ot-shape.cc | 3 +- - 4 files changed, 40 insertions(+), 20 deletions(-) - -commit 57ac0ecb7843533b2e6e6d6c8a12b2a44437cc1c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 12 17:07:02 2010 -0400 - - Merge clearing masks and setting global masks - - src/hb-buffer-private.hh | 11 ++++++----- - src/hb-buffer.cc | 5 +++-- - src/hb-ot-map.cc | 2 +- - src/hb-ot-shape.cc | 7 ++----- - 4 files changed, 12 insertions(+), 13 deletions(-) - -commit fc96596b7c1c4e62491e951a3c256fb00dcde550 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 12 17:00:25 2010 -0400 - - Form clusters before setting masks - - src/hb-ot-shape.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 1e80782244cdb1dedae9d1e61079d0508e57ca72 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 12 17:00:07 2010 -0400 - - Clear masks before setting them up, not after! - - src/hb-ot-shape.cc | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit fd3d32d31cb6d74a9994b6850d539fd0b707d941 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 12 16:57:47 2010 -0400 - - Add hb_ot_shape_execute() - - Not public yet. - - src/hb-ot-shape-private.hh | 5 ++--- - src/hb-ot-shape.cc | 19 ++++++++++++++----- - 2 files changed, 16 insertions(+), 8 deletions(-) - -commit 49baa1f69efb0e3c62e45bd59dd88459a84bf390 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 12 16:50:36 2010 -0400 - - Add hb_ot_complex_shaper_t stuff and start hooking Arabic shaper up - - src/Makefile.am | 3 +- - src/hb-ot-map-private.hh | 2 +- - src/hb-ot-map.cc | 2 +- - src/hb-ot-shape-arabic.cc | 706 - ----------------------------------- - src/hb-ot-shape-complex-arabic.cc | 715 - ++++++++++++++++++++++++++++++++++++ - src/hb-ot-shape-complex-private.hh | 88 +++++ - src/hb-ot-shape-private.hh | 12 +- - src/hb-ot-shape.cc | 8 +- - 8 files changed, 813 insertions(+), 723 deletions(-) - -commit 605ed468f380f86d642031f6451447d270cb6de1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 12 16:19:29 2010 -0400 - - Add hb_ot_shape_plan_t - - This is the object that a separate plan/execute shaping API will - use in - between the two stages. - - src/hb-ot-shape-private.hh | 12 ++++++++++-- - src/hb-ot-shape.cc | 38 ++++++++++++++++++-------------------- - 2 files changed, 28 insertions(+), 22 deletions(-) - -commit 895fb5d364e7ae5d9d2e34b9f68b8651804369ef -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 12 16:00:21 2010 -0400 - - Refactor, in a different direction - - src/hb-ot-map-private.hh | 15 ++++++++------- - src/hb-ot-map.cc | 23 ++++++++++++----------- - src/hb-ot-shape-private.hh | 13 +------------ - src/hb-ot-shape.cc | 33 +++++++++++++++++---------------- - 4 files changed, 38 insertions(+), 46 deletions(-) - -commit d2ba016ca1ba7489537768b619980d5159b5870c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 12 15:35:45 2010 -0400 - - More refactoring - - src/hb-ot-map-private.hh | 32 +++++--------------------------- - src/hb-ot-map.cc | 32 +++++++++++++++++++++++++++++--- - src/hb-ot-shape-private.hh | 16 ++++++++++++++-- - src/hb-ot-shape.cc | 43 - ++++++++++++++++++++++++++++--------------- - src/hb-ot-shape.h | 10 +++++----- - 5 files changed, 81 insertions(+), 52 deletions(-) - -commit 66e487dfbfdccd0c4be8cd11661d412ca27c3425 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 12 13:51:19 2010 -0400 - - Update Arabic shaping table to Unicode 6.0.0. - - src/hb-ot-shape-arabic.cc | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit f4792d99eee0e8cd72b7cb01c96a09f16e2a72ce -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 12 12:32:18 2010 -0400 - - Fix infinite loop! - - Untested code is indeed buggy code. - - Mozilla bug #603352. - - src/hb-ot-tag.c | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit 993d1e786a32612b796dae8309ce402a4121bec7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 12 11:17:30 2010 -0400 - - Fix missing negation in unreachable code! - - Mozilla bug #603346 - - src/hb-open-type-private.hh | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 52601275d5e4000dada4f925fb78723eeeee7bd4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Oct 8 20:38:46 2010 -0400 - - More separation - - src/hb-ot-shape.cc | 14 +++++--------- - 1 files changed, 5 insertions(+), 9 deletions(-) - -commit 6b7e6758626268ba1c7c266128e618ec73ae2c0f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Oct 8 20:30:04 2010 -0400 - - Minor - - src/hb-ot-shape.cc | 22 +++++++++++----------- - 1 files changed, 11 insertions(+), 11 deletions(-) - -commit aa9c450bb2d7c3c9e36ea32e3558250391a0582d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Oct 8 20:27:38 2010 -0400 - - Enable 'rtlm' mirroring - - src/hb-ot-map-private.hh | 9 +++++---- - src/hb-ot-shape.cc | 30 +++++++++++++++--------------- - 2 files changed, 20 insertions(+), 19 deletions(-) - -commit 36925f695d349a53d52ecc3a58f18240a6977463 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Oct 8 20:20:32 2010 -0400 - - Rename hb_mask_allocator_t to hb_ot_map_t - - hb_ot_plan_t may be a better name, donno. - - src/hb-ot-map-private.hh | 4 +- - src/hb-ot-map.cc | 2 +- - src/hb-ot-shape-private.hh | 4 +- - src/hb-ot-shape.cc | 49 - +++++++++++++++++++------------------------ - 4 files changed, 27 insertions(+), 32 deletions(-) - -commit f5dd3be46b5c77a2c5b97b82a0b67ac9e851b898 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Oct 8 20:16:23 2010 -0400 - - Improve checks - - src/check-c-linkage-decls.sh | 2 +- - src/check-header-guards.sh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 5a2b0b3878cd9c62121bb4fd6344e102a9ee1825 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Oct 8 20:14:57 2010 -0400 - - Add hb-ot-map.cc - - src/Makefile.am | 1 + - src/hb-ot-map-private.hh | 129 +----------------------------------- - src/hb-ot-map.cc | 165 - ++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 168 insertions(+), 127 deletions(-) - -commit ecc4550ed7bc900a61081edfbcd0ad09cbf29b36 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Oct 8 20:05:29 2010 -0400 - - Fix feature overriding - - src/hb-ot-map-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 8f08c3275040870a645ef034a38d30c05c619f21 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Oct 8 19:43:48 2010 -0400 - - Minor cleanup - - src/hb-open-type-private.hh | 8 +---- - src/hb-ot-map-private.hh | 61 - ++++++++++++------------------------------- - src/hb-ot-tag.c | 11 +++---- - src/hb-private.h | 4 +++ - 4 files changed, 28 insertions(+), 56 deletions(-) - -commit a806762a314e83154793d96ee665e6668d6b56de -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Oct 8 19:18:40 2010 -0400 - - Add hb-ot-shape-private.hh - - src/Makefile.am | 1 + - src/hb-ot-shape-arabic.cc | 2 +- - src/hb-ot-shape-private.hh | 60 - ++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 62 insertions(+), 1 deletions(-) - -commit 4924affe0f0adf75f2a0e2137a71206b0576d63f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Oct 8 19:18:16 2010 -0400 - - Add hb-ot-map-private.hh - - src/Makefile.am | 1 + - src/hb-ot-map-private.hh | 307 - ++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-ot-shape.cc | 274 +---------------------------------------- - 3 files changed, 315 insertions(+), 267 deletions(-) - -commit a7c5046d6b676a32298b97403a49235f7f255161 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Oct 8 18:47:47 2010 -0400 - - Add private hb_segment_properties_t - - src/hb-buffer-private.hh | 14 ++++++++------ - 1 files changed, 8 insertions(+), 6 deletions(-) - -commit b897c607d91d569f4eaa681d1f5b3d9f3d2bb093 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Oct 8 18:41:57 2010 -0400 - - Flip the OT bit-allocation vs gsub/gpos inside-out - - We now build our entire attack plan before jumping in. - - src/hb-ot-shape.cc | 333 - +++++++++++++++++++++++++++------------------------ - 1 files changed, 176 insertions(+), 157 deletions(-) - -commit e89b7d2a61b7f58e6c7cec00d5ce2246dee1e8a1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Oct 8 12:29:59 2010 -0400 - - Logically separate feature collection - - src/hb-ot-shape.cc | 29 ++++++++++++++++++----------- - 1 files changed, 18 insertions(+), 11 deletions(-) - -commit 5b88908f12ad1d828dd6075fb8fc0036c2d6af3a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Oct 8 12:23:01 2010 -0400 - - Minor - - src/hb-ot-shape.cc | 18 ++++++------------ - 1 files changed, 6 insertions(+), 12 deletions(-) - -commit 5360ce0c5c33f921b3f9ad3f42529a19df5ad0fe -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Oct 7 21:21:11 2010 -0400 - - Move some more code around - - src/hb-ot-shape.cc | 27 +++++++++++++-------------- - 1 files changed, 13 insertions(+), 14 deletions(-) - -commit d9c726078828d50db62e05407a3f38f2e7607533 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Oct 7 21:19:54 2010 -0400 - - Minor - - src/hb-ot-shape.cc | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) - -commit efe0d682e860ffd23a1d17c68c8273f17d51c1c9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Oct 7 21:12:46 2010 -0400 - - Simplify compiling lookups - - src/hb-ot-shape.cc | 66 - +++++++++++++++++++++------------------------------ - 1 files changed, 27 insertions(+), 39 deletions(-) - -commit 476c94218b4f5b8e119e82b0e10b641e0c10bf56 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Oct 7 17:47:33 2010 -0400 - - Rename - - src/hb-ot-shape.cc | 18 ++++++++++-------- - 1 files changed, 10 insertions(+), 8 deletions(-) - -commit 34db6f031d7ac009f554386ef990bad44886b9ee -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Oct 7 01:21:19 2010 -0400 - - Add XXX note - - src/hb-buffer.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 98aa3f65446496dc250d9b01d98cacfdf1157e06 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 6 00:23:36 2010 -0400 - - Call hb_ot_shape_setup_lookups_complex() - - src/hb-ot-shape.cc | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) - -commit f1d07885dc358e79c237e824c94b3320c0a9c17d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 6 00:21:37 2010 -0400 - - Rename setup_lookups() - - src/hb-ot-shape.cc | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit affc5abac7bdae51df85856a5478d34d96fda4fe -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Oct 6 00:18:16 2010 -0400 - - Move table_tag to hb_ot_shape_context_t - - src/hb-ot-shape.cc | 31 +++++++++++++++++-------------- - 1 files changed, 17 insertions(+), 14 deletions(-) - -commit 967240dd8b96802345ef273e75427066e91ea8fb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 5 23:00:05 2010 -0400 - - Add internal hb_ot_shape_context_t - - src/hb-ot-shape-arabic.cc | 26 ++---- - src/hb-ot-shape.cc | 237 - +++++++++++++++++++-------------------------- - 2 files changed, 108 insertions(+), 155 deletions(-) - -commit 3eb936f1539475098f39be78654b9c39b86f0799 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 5 18:36:58 2010 -0400 - - Add Arabic/Syriac/N'ko shaping logic - - Not hooked up just yet. - - src/Makefile.am | 9 + - src/gen-arabic-joining-table.py | 39 +++ - src/hb-ot-shape-arabic.cc | 716 - +++++++++++++++++++++++++++++++++++++++ - 3 files changed, 764 insertions(+), 0 deletions(-) - -commit 0109816b50064a314389333ff64aaf22cb4b1e56 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Oct 5 18:36:45 2010 -0400 - - Update build system - - autogen.sh | 3 --- - configure.ac | 1 + - 2 files changed, 1 insertions(+), 3 deletions(-) - -commit e81d7afe6e0e9dd26025f3243a11cf0b408a8046 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Oct 4 18:18:48 2010 -0400 - - Add hb_face_get_upem() - - src/hb-font.cc | 6 ++++++ - src/hb-font.h | 3 +++ - 2 files changed, 9 insertions(+), 0 deletions(-) - -commit d47f79db92fa45d51cd5f7845db8a206f5ec122b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Oct 4 18:13:30 2010 -0400 - - Add TODO item - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit bd361945a89ea31e6c4525aa030e18744ea81fb3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Oct 4 17:22:57 2010 -0400 - - Add API comments - - src/hb-font.h | 17 +++++++++++++++-- - 1 files changed, 15 insertions(+), 2 deletions(-) - -commit 645f6f265b5f6fb85b3c0f59ea874d58c86e3917 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Oct 4 17:01:01 2010 -0400 - - Add is_mutable() functions - - Correspond to the make_mutable() ones. - - src/hb-font.cc | 6 ++++++ - src/hb-font.h | 2 ++ - src/hb-unicode.c | 6 ++++++ - src/hb-unicode.h | 2 ++ - 4 files changed, 16 insertions(+), 0 deletions(-) - -commit 19c0eab8cf96d00e168c4b11ec435019c1ed44f7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Oct 4 16:45:21 2010 -0400 - - Add getters for all setter APIs - - One in particular is not a straight getter: hb_font_unset_funcs() is - special because of the specific needs of the lifecycle management of - the user_data object. - - src/hb-font.cc | 64 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-font.h | 40 +++++++++++++++++++++++++++++++++ - src/hb-unicode.c | 32 +++++++++++++++++++++++++++ - src/hb-unicode.h | 31 +++++++++++++++++++++++++- - 4 files changed, 166 insertions(+), 1 deletions(-) - -commit f0feb084b0fd1510474b25404d1dcc5686ee0538 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Oct 3 19:09:39 2010 -0400 - - Minor - - src/hb-ot-layout-private.hh | 12 +++++++----- - 1 files changed, 7 insertions(+), 5 deletions(-) - -commit ac0c1663fa6e93a5a94c88fc7497bc11ca17f0a1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Oct 1 19:09:23 2010 -0400 - - Avoid div-by-zero, validate upem - - src/hb-ot-head-private.hh | 7 +++++++ - src/hb-ot-layout-private.hh | 6 +++--- - 2 files changed, 10 insertions(+), 3 deletions(-) - -commit 7f97d2cd904ea999c099c73c52187c5d65aeec67 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Oct 1 18:58:50 2010 -0400 - - Pedantic - - src/hb-open-type-private.hh | 12 ++++++------ - src/hb-ot-layout-common-private.hh | 2 +- - src/hb-ot-layout-gdef-private.hh | 10 +++++----- - src/hb-ot-layout-gpos-private.hh | 6 +++--- - 4 files changed, 15 insertions(+), 15 deletions(-) - -commit 2841436926d6a406bd1f4a35c66a0e3c2fdbeca7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Sep 29 12:20:36 2010 -0400 - - Don't zero glyph advances in MarkToBase and similar lookups - - See email thread "Should MarkToBase attachment zero the mark advance?" - started by Jonathan Kew on 23 August 2010 for details. - - src/hb-ot-layout-gpos-private.hh | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 36b3862009c00ad922d68810173a69ac59723365 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Sep 29 12:10:24 2010 -0400 - - One fewer cmp() implementation... - - src/hb-ot-layout-common-private.hh | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 4e573715ae5f5ed486ad66382bb44c47a86591ff -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 28 16:23:58 2010 -0400 - - Improve cmp function parameter namings and casts - - No semantic change. - - src/hb-open-type-private.hh | 6 +++--- - src/hb-ot-layout-common-private.hh | 6 +++--- - src/hb-ot-shape.cc | 8 ++++---- - 3 files changed, 10 insertions(+), 10 deletions(-) - -commit dca8aff24652c83c53efbb9d06e5e1c7ef1c2fa5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 28 16:25:23 2010 -0400 - - Add comment re DejaVu Sans Mono having 'dflt' script - - src/hb-ot-layout.cc | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 9dc45401c07cb40114067cafbe286c63a9598f3b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Sep 28 16:23:28 2010 -0400 - - Fix stupid bug in bsearch cmp function! - - src/hb-ot-layout-common-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6fca4c18c42bdcbc67ee8855499c51c7d6311eb2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Sep 23 10:28:51 2010 -0400 - - Add TODO iteam - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit f2a30bd605a57b99fce4b78e288c2ca62f7191ad -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Sep 23 10:27:08 2010 -0400 - - Remove unimplemented method hb_font_get_funcs() - - Got to add a suitable replacement. - - src/hb-font.h | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit 7b9a38a112aa2421d97187a9b30619360edeabbe -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Sep 22 17:42:59 2010 -0400 - - Add test.c using public API - - src/Makefile.am | 6 +++- - src/test.c | 94 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 99 insertions(+), 1 deletions(-) - -commit 9ea7368fce3fa373d8d2925961ad211f5cf6ce70 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Sep 22 17:38:44 2010 -0400 - - Fix hb_ot_layout leak - - src/hb-ot-layout.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 8e577acae2e605547b6a1b9b3a941cb9e3c56a4c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Sep 22 17:37:02 2010 -0400 - - Fix blob refcounting with insane SFNT table directories - - src/hb-font.cc | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit 75371bea4fbf50b8604d2698b4935c011648a6b6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Sep 22 17:12:10 2010 -0400 - - Add TODO item - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 5bd1e95236320aed60fb29ca1e93b9595d4aeeec -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Sep 22 16:46:18 2010 -0400 - - Speedup Device table delta computation for common cases - - src/hb-ot-layout-common-private.hh | 25 +++++++++++++++++++++---- - 1 files changed, 21 insertions(+), 4 deletions(-) - -commit ed4acbde9c5e3323cc95037b500d1bf2878ed3ee -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 16 14:36:27 2010 -0400 - - Fix NULL dereference - - Reported by Jonathan Kew. Face table handling needs to be redone - anyway, but fix this for now. - - src/hb-ot-layout.cc | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 258305c2a5dd47bd2d83f12eaf9caa5b19ae5efb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 13 14:10:02 2010 -0400 - - [GPOS] Fix div-by-zero - - Patch by Jonathan Kew. Mozilla bug #465728. - - src/hb-ot-layout-gpos-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 2422c4b96d32037a5cdaef4c427ed1d25db5f647 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 13 14:00:34 2010 -0400 - - Add TODO - - src/hb-ot-shape.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 27f0b092a13344e8791c496c77a3c1e5de4f887c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 23 17:35:54 2010 -0400 - - Logically separate feature allocation from application - - src/hb-ot-shape.cc | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 6cf63132dc771e1bcd5627720daf4bd2ea0800a5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 23 17:32:26 2010 -0400 - - Minor - - src/hb-ot-shape.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4e4ef24e46f273ad2bdda2f718223e05b37dd50f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 23 17:22:11 2010 -0400 - - Towards separating bit allocation from shaping - - src/hb-buffer-private.hh | 9 +++++-- - src/hb-buffer.cc | 12 +++++----- - src/hb-ot-layout-gpos-private.hh | 2 +- - src/hb-ot-layout.cc | 2 +- - src/hb-ot-shape.cc | 41 - ++++++++++++++----------------------- - 5 files changed, 30 insertions(+), 36 deletions(-) - -commit da6cff3864d2ef4a061a29e5918359bafcd51f4c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 23 15:40:58 2010 -0400 - - Add TODO items - - TODO | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit acdba3f90b232fc12fcb200dca2584481b339118 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 23 15:11:18 2010 -0400 - - Prefer C linkage - - src/Makefile.am | 1 + - src/check-c-linkage-decls.sh | 18 ++++++++++++++++++ - src/hb-blob-private.h | 2 ++ - src/hb-blob.c | 18 ++++++++++++------ - src/hb-blob.h | 2 ++ - src/hb-buffer-private.hh | 1 + - src/hb-buffer.cc | 7 ++++++- - src/hb-buffer.h | 1 + - src/hb-common.c | 6 ++++++ - src/hb-common.h | 21 +++++++++++++-------- - src/hb-font-private.h | 1 + - src/hb-font.cc | 4 ++++ - src/hb-font.h | 1 + - src/hb-ft.c | 10 ++++++++-- - src/hb-ft.h | 2 ++ - src/hb-glib.c | 6 ++++++ - src/hb-glib.h | 2 ++ - src/hb-graphite.cc | 6 ++++++ - src/hb-graphite.h | 3 ++- - src/hb-icu.c | 6 ++++++ - src/hb-icu.h | 2 ++ - src/hb-language.c | 5 +++++ - src/hb-language.h | 2 ++ - src/hb-object-private.h | 2 ++ - src/hb-open-file-private.hh | 4 ++++ - src/hb-open-type-private.hh | 5 +++++ - src/hb-ot-head-private.hh | 5 +++++ - src/hb-ot-layout-common-private.hh | 6 ++++++ - src/hb-ot-layout-gdef-private.hh | 4 ++++ - src/hb-ot-layout-gpos-private.hh | 6 ++++++ - src/hb-ot-layout-gsub-private.hh | 7 ++++++- - src/hb-ot-layout-gsubgpos-private.hh | 13 +++++++++++++ - src/hb-ot-layout-private.hh | 3 ++- - src/hb-ot-layout.cc | 5 +++++ - src/hb-ot-layout.h | 1 + - src/hb-ot-shape.cc | 6 ++++++ - src/hb-ot-shape.h | 2 ++ - src/hb-ot-tag.c | 5 +++++ - src/hb-ot-tag.h | 2 ++ - src/hb-ot.h | 3 +++ - src/hb-private.h | 5 +++++ - src/hb-shape.cc | 5 +++++ - src/hb-shape.h | 1 + - src/hb-unicode-private.h | 1 + - src/hb-unicode.c | 6 ++++++ - src/hb-unicode.h | 1 + - src/hb.h | 3 +++ - src/main.cc | 6 ++++++ - 48 files changed, 214 insertions(+), 20 deletions(-) - -commit cc6d52279d10a2edcf0d86c3a18a79ff4f6d3858 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 23 15:00:13 2010 -0400 - - De-C++ where possible - - Helps with avoiding many "extern C" declarations in source files. - - src/Makefile.am | 4 +- - src/check-header-guards.sh | 2 +- - src/hb-font-private.h | 95 +++++++++++++++ - src/hb-font-private.hh | 95 --------------- - src/hb-font.cc | 2 +- - src/hb-ft.c | 240 - ++++++++++++++++++++++++++++++++++++++ - src/hb-ft.cc | 240 - -------------------------------------- - src/hb-graphite.cc | 2 +- - src/hb-ot-layout-gdef-private.hh | 2 +- - src/hb-ot-layout-private.hh | 2 +- - 10 files changed, 342 insertions(+), 342 deletions(-) - -commit 0dd200d28f51bf4062d8a377432c8977c80cb210 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 23 14:56:29 2010 -0400 - - Header dep cleanup - - src/hb-font-private.hh | 2 -- - src/hb-ot-layout-private.hh | 1 + - 2 files changed, 1 insertions(+), 2 deletions(-) - -commit fb0d25246267851a1fc200ead28c56359a40047e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 23 14:54:22 2010 -0400 - - dos2unix - - src/hb-ot-head-private.hh | 256 - ++++++++++++++++++++++---------------------- - 1 files changed, 128 insertions(+), 128 deletions(-) - -commit 81408cd51ce575891e79e6483be187130f864c28 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 23 14:46:57 2010 -0400 - - Don't use "operator =" - - Some compilers don't like operator = defined on members of union - members - either. Reported by Ginn Chen for Sun Studio compilers. - - src/hb-open-type-private.hh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 39fe34d4c356516f0a92f42b13a168572829d24e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 22 18:12:38 2010 -0400 - - Add TODO option - - TODO | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 243a96f41482edb83e4798358064bd3329dd278c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 21 17:21:12 2010 -0400 - - Add arm build fix to TODO - - TODO | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit c407f05f99f9225916d3d0ae06eac8fbc8b55b97 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 21 17:20:44 2010 -0400 - - Remove fixed TODO item - - TODO | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 4f801bd6586defdbf70162e0c7f8968d2b476df2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 21 16:37:01 2010 -0400 - - Mozilla bug 580233 - check for zero-length record in hb sanitizer. - - Patch / report by Jonathan Kew. - - src/hb-open-type-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 17e9ff938b638fd1cb80c990ba13bd47562116b8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 15 11:21:34 2010 -0700 - - Fix 64bit issues with debug prints - - src/hb-blob.c | 10 +++++----- - src/hb-open-type-private.hh | 5 +++-- - 2 files changed, 8 insertions(+), 7 deletions(-) - -commit fd56ae49637b978ea3b36fab5b48f1a3cc99e90e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 8 00:53:40 2010 -0400 - - Don't bother sorting, it's a safe font error if the array is not - sorted - - src/hb-open-type-private.hh | 29 ----------------------------- - src/hb-ot-layout-common-private.hh | 7 ------- - 2 files changed, 0 insertions(+), 36 deletions(-) - -commit cc8a4abea68f2dba26feb5785f9e518e6853c744 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 8 00:40:04 2010 -0400 - - Use bsearch where applicable - - src/hb-open-type-private.hh | 49 ++++++++++++ - src/hb-ot-layout-common-private.hh | 145 - +++++++++++++----------------------- - 2 files changed, 100 insertions(+), 94 deletions(-) - -commit 2f418f5709b2b8b3ef2f6056b9d8c13b66f0b74a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 7 22:07:40 2010 -0400 - - Remove useless TODO - - src/hb-open-file-private.hh | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit da8edbb62204dc39f93d500ef85929e234e0bd19 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jun 9 07:15:39 2010 -0400 - - Fix header - - src/hb-buffer-private.hh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit d05d13df02fbe76814694fe49cc01bbb41c3d0e7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jun 9 07:15:03 2010 -0400 - - Add a test for header preprocessor guards - - src/Makefile.am | 4 +++- - src/check-header-guards.sh | 20 ++++++++++++++++++++ - src/check-libstdc++.sh | 1 - - 3 files changed, 23 insertions(+), 2 deletions(-) - -commit 0f0cd9d361f1bb614aa3fd4616160d027062370e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jun 9 06:32:56 2010 -0400 - - Fix header tags - - src/hb-font-private.hh | 6 +++--- - src/hb-object-private.h | 6 +++--- - src/hb-open-type-private.hh | 4 ++-- - src/hb-ot-layout-private.hh | 6 +++--- - src/hb-ot-shape.h | 2 +- - 5 files changed, 12 insertions(+), 12 deletions(-) - -commit f2a1b411b1d48c3dfac0df8e78c848d9aa3bb047 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jun 3 11:37:51 2010 -0400 - - Followup fix for variation-selectors - - Patch from Jonathan Kew - - src/hb-ot-shape.cc | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit a224b4d502d026fa642ee4098bf7bc0b4ba7ce27 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jun 2 22:24:54 2010 -0400 - - Fix skipping variation-selectors - - src/hb-ot-shape.cc | 14 ++++++++------ - 1 files changed, 8 insertions(+), 6 deletions(-) - -commit 81a77b115db401f69e869690f24b9047370bdfde -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jun 1 23:03:54 2010 -0400 - - Make feature sorting stable - - src/hb-ot-shape.cc | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit fdc322a82047c4bda9fa3dab4338a0eac1c1bde7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 28 20:55:52 2010 -0400 - - Minor - - src/hb-ot-shape.cc | 38 +++++++++++++++++++++----------------- - 1 files changed, 21 insertions(+), 17 deletions(-) - -commit f062ec6bb24b1c21d37b12adc7e944a5fe53526a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 28 20:54:43 2010 -0400 - - Further simplify mask allocator - - src/hb-ot-shape.cc | 23 +++++++---------------- - 1 files changed, 7 insertions(+), 16 deletions(-) - -commit 8af45fda475d075c5a285002463a00a0423d3926 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 28 20:41:20 2010 -0400 - - Fix global feature handling - - src/hb-ot-shape.cc | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit e04685ee7be01695ec437fab50f919f1b7423c57 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 28 20:37:06 2010 -0400 - - Simplify mask allocation - - src/hb-ot-shape.cc | 48 - ++++++++++++++++++++---------------------------- - 1 files changed, 20 insertions(+), 28 deletions(-) - -commit 0e235d0fc9bdeeaffa7215c21abc5d40767a10c7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 28 20:21:47 2010 -0400 - - Towards a mask allocator - - src/hb-ot-shape.cc | 291 - +++++++++++++++++++++++++++++++++------------------- - 1 files changed, 186 insertions(+), 105 deletions(-) - -commit 81c5e8724b740c6e42ed3a45e0574c7c5f3ad8e6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 28 18:31:16 2010 -0400 - - Allow disabling default features - - Patch from Jonathan Kew - - src/hb-buffer-private.hh | 18 +++-- - src/hb-buffer.cc | 15 ++-- - src/hb-ot-shape.cc | 196 - +++++++++++++++++++++++++++++++--------------- - 3 files changed, 153 insertions(+), 76 deletions(-) - -commit 2163afbf35044f59dbf449254e65b8c9feb6cdeb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 27 14:04:15 2010 -0400 - - Add note about UTF-8 decoder - - src/hb-buffer.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 226faa58f4e23eb655bebb0eff7206a3024c8d55 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 27 11:42:34 2010 -0400 - - Fix loop - - src/hb-ot-tag.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 56bef5680cc76a67d16ca14ac69f0dda1a691968 -Author: Martin Hosken <martin_hosken@sil.org> -Date: Thu May 27 10:09:04 2010 +0100 - - Fixes to Python and Graphite from Martin - - contrib/python/README | 10 ++++ - contrib/python/lib/fontconfig.pyx | 47 +++++++++++++++++ - contrib/python/lib/harfbuzz.pyx | 104 - ++----------------------------------- - contrib/python/scripts/hbtestfont | 103 - ++++++++++++++++++++++++++++++++---- - contrib/python/setup.py | 3 +- - src/hb-graphite.cc | 8 ++-- - 6 files changed, 159 insertions(+), 116 deletions(-) - -commit b485da0b719cb03cc33da57802c5151301664c2f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 27 11:39:19 2010 -0400 - - Disable Graphite as it crashes all over the place... - - src/hb-shape.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 93ac709b1f6b015371c29bf244a9ece62baedff0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 26 16:22:00 2010 -0400 - - Cypriot is RTL - - src/hb-unicode.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 15c7379c16dbb9ee8ed1c0333ca7492532ce8423 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 26 10:48:10 2010 -0400 - - Revert "Merge remote branch 'martin/master'" - - This reverts commit 80af2812fb3b231ddcb4608ec13c6038a681c818, - reversing - changes made to c442672ec2fb83ed41f3994b3aa4f92a097664ab. - - contrib/python/README | 10 ---- - contrib/python/lib/fontconfig.pyx | 47 ----------------- - contrib/python/lib/harfbuzz.pyx | 104 - +++++++++++++++++++++++++++++++++++-- - contrib/python/scripts/hbtestfont | 98 - ++++------------------------------- - contrib/python/setup.py | 3 +- - src/Makefile.am | 2 +- - src/hb-graphite.cc | 8 ++-- - src/hb-ot-shape.cc | 2 +- - src/hb-ot-tag.c | 1 - - src/hb-ot.h | 2 +- - src/hb-shape.cc | 2 +- - 11 files changed, 119 insertions(+), 160 deletions(-) - -commit 80af2812fb3b231ddcb4608ec13c6038a681c818 -Merge: c442672 3109a86 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 24 18:14:24 2010 +0100 - - Merge remote branch 'martin/master' - -commit c442672ec2fb83ed41f3994b3aa4f92a097664ab -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 24 18:02:32 2010 +0100 - - Fix struct initializers - - src/hb-ft.cc | 12 ++++++------ - src/hb-glib.c | 14 +++++++------- - src/hb-icu.c | 14 +++++++------- - 3 files changed, 20 insertions(+), 20 deletions(-) - -commit f5ac9de259773a5f86809892e58166a485d70a3d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 24 18:01:09 2010 +0100 - - Minor - - src/hb-object-private.h | 24 +++++++++++++----------- - 1 files changed, 13 insertions(+), 11 deletions(-) - -commit f97bf4f81257c97a46dff51be31b2ec214d6c270 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 24 17:50:19 2010 +0100 - - Make sure we initialize all callbacks upon creation - - Also fixes issue with unicode callbacks never being set really. - - src/hb-font.cc | 18 +++++++----------- - src/hb-unicode.c | 9 ++------- - 2 files changed, 9 insertions(+), 18 deletions(-) - -commit bf36a1074ab23abeab0a7a6c47db26770dc1ab0a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 24 17:46:21 2010 +0100 - - Move all callback functions in a vtable structs - - src/hb-font-private.hh | 10 ++++++---- - src/hb-font.cc | 28 +++++++++++++++------------- - src/hb-ot-shape.cc | 4 ++-- - src/hb-unicode-private.h | 12 +++++++----- - src/hb-unicode.c | 32 +++++++++++++++++--------------- - 5 files changed, 47 insertions(+), 39 deletions(-) - -commit 3109a86add936ae4cc77541fc026c4fe2db4e328 -Author: Martin Hosken <martin_hosken@sil.org> -Date: Mon May 24 13:25:37 2010 +0100 - - hb-graphite now no longer has -ve advances within clusters. Fix - infinite loop in tag_to_script(). python fixed to use tag_to_script - and allow hbtestfont to be passed font files, where fontconfig knows - about them. - - contrib/python/lib/harfbuzz.pyx | 4 ++-- - contrib/python/scripts/hbtestfont | 6 +++++- - src/hb-graphite.cc | 4 ++-- - src/hb-ot-tag.c | 1 + - 4 files changed, 10 insertions(+), 5 deletions(-) - -commit e5bed0a37fe1b0576d08435179e455cb28eadcdb -Author: Martin Hosken <martin_hosken@sil.org> -Date: Sat May 22 20:19:00 2010 +0100 - - Tidy up hbtestfont and add README - - contrib/python/README | 10 +++ - contrib/python/scripts/hbtestfont | 134 - ++++++++++++++++++------------------ - 2 files changed, 77 insertions(+), 67 deletions(-) - -commit 70ae332fe66510500d303b6fcc79537833b42f05 -Author: Martin Hosken <martin_hosken@sil.org> -Date: Sat May 22 19:58:00 2010 +0100 - - Add fontconfig to hbtestfont - - contrib/python/lib/fontconfig.pyx | 47 +++++++++++++++++++++++++++ - contrib/python/scripts/hbtestfont | 64 - ++++++++++++++++++++++-------------- - contrib/python/setup.py | 3 +- - 3 files changed, 88 insertions(+), 26 deletions(-) - -commit 72631c9d06b131d82080f212908e7d0b0266b841 -Merge: 1432ab1 1094a29 -Author: Martin Hosken <martin_hosken@sil.org> -Date: Sat May 22 09:38:02 2010 +0100 - - Merge branch 'master' of git://git.freedesktop.org/~behdad/harfbuzz-ng - -commit 1432ab15c163eb0b5be3de66a4cb3df15ad73500 -Author: Martin Hosken <martin_hosken@sil.org> -Date: Sat May 22 00:56:40 2010 +0100 - - Add graphical output to hbtestfont - - contrib/python/lib/harfbuzz.pyx | 100 - +------------------------------------ - contrib/python/scripts/hbtestfont | 62 ++++++++++++++++++++++- - src/Makefile.am | 2 +- - src/hb-ot-shape.cc | 2 +- - src/hb-ot.h | 2 +- - src/hb-shape.cc | 2 +- - 6 files changed, 67 insertions(+), 103 deletions(-) - -commit bbc7a99d01298f9be1ebaaceacbc9bc961e247e5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 18:24:34 2010 +0100 - - Move mirroring around a bit - - src/hb-ot-shape.cc | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit bd0987386b3a4dddf208ccf1a70ebfff6242ba73 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 18:06:35 2010 +0100 - - Add a few more standard features - - src/hb-ot-shape.cc | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit 75f3469ca6d626b08eb411984a2ba7fd48ca5b5f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 17:59:04 2010 +0100 - - Add note - - src/hb-ot-shape.cc | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 1094a294f6a44c47fc75867983f2b135a6442bab -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 17:58:20 2010 +0100 - - Add rtlm - - src/hb-ot-shape.cc | 26 +++++++++++++++++++++----- - 1 files changed, 21 insertions(+), 5 deletions(-) - -commit 074ea787493a37ae8f68d17be7820f13fff57520 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 17:53:10 2010 +0100 - - Add ltra, ltrm, and rtla features - - src/hb-ot-shape.cc | 60 - +++++++++++++++++++++++++++++++++++++++++---------- - 1 files changed, 48 insertions(+), 12 deletions(-) - -commit 1ce7b87c4d8d1ab3ec1d5198351d71b7199f7c64 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 17:31:45 2010 +0100 - - Cleanup bitmask allocation - - src/hb-buffer-private.hh | 16 ++++++++++++ - src/hb-buffer.cc | 36 +++++++++++++++++++++++++++ - src/hb-ot-shape.cc | 60 - ++++++++++++++++++++-------------------------- - 3 files changed, 78 insertions(+), 34 deletions(-) - -commit dd22a8f7bfd424a69286e90f79d2a23af6e89ec1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 16:43:17 2010 +0100 - - Add note - - src/hb-ot-layout-gsub-private.hh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit cbd1d6a63a5d696b7d6a5aba9ee7305ea228416a -Author: Martin Hosken <martin_hosken@sil.org> -Date: Fri May 21 15:16:43 2010 +0100 - - Rename Grxxx to HbGrxxx - - src/hb-graphite.cc | 26 +++++++++++++------------- - 1 files changed, 13 insertions(+), 13 deletions(-) - -commit 0375bdd2027767ee7bebef1ed289b33dc64f430e -Author: Martin Hosken <martin_hosken@sil.org> -Date: Fri May 21 15:01:37 2010 +0100 - - Rename classes from Grxxx to HbGrxxx - - src/hb-graphite.cc | 22 +++++++++++----------- - 1 files changed, 11 insertions(+), 11 deletions(-) - -commit a5a72e004bb7123445c2c3a94352d358fc80d904 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 15:12:52 2010 +0100 - - Add hb-ot-shape.h, oops. - - src/hb-ot-shape.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 44 insertions(+), 0 deletions(-) - -commit aa62a402a72bdecad2a955dbfaf6e24cd2c00e55 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 14:42:11 2010 +0100 - - Fix Makefile to install hb-ot-shape.h - - src/Makefile.am | 2 +- - src/hb-ot.h | 1 + - 2 files changed, 2 insertions(+), 1 deletions(-) - -commit 9722b8f005a10fd16e841df4da3ccd80be66e296 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 14:37:47 2010 +0100 - - Simple renames - - src/hb-ot-shape.cc | 36 ++++++++++++++++++------------------ - 1 files changed, 18 insertions(+), 18 deletions(-) - -commit 02f28550d785671cf92fd4239c5f913f7e71585f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 14:37:28 2010 +0100 - - Graphite also forces us to link to libstdc++ currently - - src/Makefile.am | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit ca663bb23c16f6a1f04efa6e10dad0e3e7c260a3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 14:34:23 2010 +0100 - - Move main shaper code into hb_ot_shape() - - src/hb-ot-shape-private.hh | 53 ---------- - src/hb-ot-shape.cc | 225 - +++++++++++++++++++++++++++++++++++++++++--- - src/hb-shape.cc | 209 - +---------------------------------------- - 3 files changed, 214 insertions(+), 273 deletions(-) - -commit 7acd232d36c2b2ed03823e6aa6bb2b814bf673b3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 14:20:48 2010 +0100 - - Fix test failing - - src/hb-graphite.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit dd47924d88d86b83e7f3ab040de6e7136ac0ca09 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 14:18:08 2010 +0100 - - Fix warnings - - src/hb-graphite.cc | 14 +++++--------- - 1 files changed, 5 insertions(+), 9 deletions(-) - -commit 305ba8671553cd955c20a54db622666c0bb02532 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 14:02:20 2010 +0100 - - Import Graphite shaping backend by Martin Hosken - - configure.ac | 6 + - src/Makefile.am | 11 ++ - src/hb-graphite.cc | 308 - ++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-graphite.h | 46 ++++++++ - src/hb-shape.cc | 15 +++ - 5 files changed, 386 insertions(+), 0 deletions(-) - -commit 3ba6818ba9be950e46902f0239f2451ec0e65d44 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 13:51:29 2010 +0100 - - Update the Python module - - contrib/python/lib/harfbuzz.pyx | 40 - ++++++++++++++++++++------------------ - 1 files changed, 21 insertions(+), 19 deletions(-) - -commit 83f34677bcbc6bb194940407b0fcb23575650e3d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 13:43:49 2010 +0100 - - Add hb_tag_from_string() - - src/Makefile.am | 1 + - src/hb-common.c | 41 +++++++++++++++++++++++++++++++++++++++++ - src/hb-common.h | 3 +++ - 3 files changed, 45 insertions(+), 0 deletions(-) - -commit 4a9a5c0b06e8aa5d15327242609a7c766d3e0e94 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 13:33:46 2010 +0100 - - Don't allocate bits for features not available - - src/hb-ot-shape.cc | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit e53d77142ac4ecbe38ab3235491fa93cb7ff16ab -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 13:32:38 2010 +0100 - - Speed up feature mask setting - - Patch from Jonathan Kew. - - src/hb-ot-shape.cc | 31 +++++++++++++++++++++++++------ - 1 files changed, 25 insertions(+), 6 deletions(-) - -commit 4fa67f34ecc65056ce60a572213fbdae66e0423b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 13:29:12 2010 +0100 - - Add Unicode 5.2 scripts - - src/hb-icu.c | 29 ++++++++++++++++++++++++++++- - src/hb-ot-tag.c | 21 +++++++++++++++++++-- - src/hb-unicode.c | 19 ++++++++++++++++++- - src/hb-unicode.h | 19 ++++++++++++++++++- - 4 files changed, 83 insertions(+), 5 deletions(-) - -commit ee1b322100a6bd575b999904592abbd9fed5587f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 12:55:57 2010 +0100 - - Fix feature mask setting - - src/hb-ot-shape.cc | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit b490fa343322f1b5abaf880abc073287c1f34132 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 11:15:07 2010 +0100 - - Add hb_ot_tag_to_script() - - src/hb-ot-tag.c | 14 ++++++++++++++ - src/hb-ot-tag.h | 3 +++ - 2 files changed, 17 insertions(+), 0 deletions(-) - -commit 50355309047765558ef8f5d60aefed42a7f954cc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 21 10:33:23 2010 +0100 - - Add Python wrapper from Martin Hosken - - contrib/python/lib/harfbuzz.pyx | 306 - +++++++++++++++++++++++++++++++++++++ - contrib/python/runpy | 2 + - contrib/python/scripts/hbtestfont | 35 +++++ - contrib/python/setup.py | 24 +++ - 4 files changed, 367 insertions(+), 0 deletions(-) - -commit 280af1bddb958ff97cf7ce12fe7ec2b6352e61d0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 20 18:33:35 2010 +0100 - - Let hb_face_get_table() return NULL if table not found - - src/hb-font.cc | 2 +- - src/hb-font.h | 1 + - src/hb-open-type-private.hh | 3 +++ - 3 files changed, 5 insertions(+), 1 deletions(-) - -commit 1cdbfd944eecb58587461f57f037e47a44f39990 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 20 17:47:28 2010 +0100 - - Fix alternate, again - - src/hb-ot-layout-gsub-private.hh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit fdca3d51603bd6bef6a4b0ee4a560f7dcd2f1d37 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 20 17:46:20 2010 +0100 - - Fix alternate off-by-one - - src/hb-ot-layout-gsub-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b634beb39e0a4fef7167a8af646f6b2d8cafe69b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 20 17:44:52 2010 +0100 - - Fix delta scale, again... - - src/hb-ot-layout-common-private.hh | 8 ++++++++ - src/hb-ot-layout-gdef-private.hh | 3 +-- - src/hb-ot-layout-gpos-private.hh | 12 ++++++------ - src/hb-ot-layout-private.hh | 2 +- - 4 files changed, 16 insertions(+), 9 deletions(-) - -commit 40335d4533ac2b08121c9dc6003f3ebc5b44a67b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 20 17:35:14 2010 +0100 - - Remove unused operator - - src/hb-ot-layout-common-private.hh | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit f7acd8df5146155b51d6f50aeb04f54f3030c1c3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 20 17:26:35 2010 +0100 - - Do alternate glyph selection! - - Kinda hand-wavy right now. Not tested. - - src/hb-ot-layout-gpos-private.hh | 12 +++++++----- - src/hb-ot-layout-gsub-private.hh | 20 +++++++++----------- - src/hb-ot-layout-gsubgpos-private.hh | 1 + - src/hb-private.h | 19 ++++++++++++++++++- - 4 files changed, 35 insertions(+), 17 deletions(-) - -commit 750a2294553d252e28875b605fe61fd9d6696e0f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 20 16:23:27 2010 +0100 - - get_table() is allowed to return NULL. Use that to simplify code - - src/hb-font.cc | 2 +- - src/hb-ft.cc | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit 99d9ef785f108df76f80a307eaa2784685ea86ba -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 20 15:47:49 2010 +0100 - - Write hb_face_create_for_data() in terms of - hb_face_create_for_tables() - - Fixes lack of head_table initialization in create_for_tables() also. - - src/hb-font.cc | 35 ++++++++++++----------------------- - 1 files changed, 12 insertions(+), 23 deletions(-) - -commit 6774463883978b00b4d8c719ed75edfc4537c77f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 20 15:40:12 2010 +0100 - - Apply user features to ranges! - - src/hb-ot-shape.cc | 23 ++++++++++++++++++++++- - 1 files changed, 22 insertions(+), 1 deletions(-) - -commit 9b6023338530a2dbb8214eb4391ef3e8372f3892 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 20 15:31:12 2010 +0100 - - Add _hb_bit_storage() - - src/hb-private.h | 35 ++++++++++++++++++++++------------- - 1 files changed, 22 insertions(+), 13 deletions(-) - -commit 6b1b957f6d2955cbe4fa97e2659e033b3eaaf4d2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 20 15:14:44 2010 +0100 - - Add lookup_map - - src/hb-ot-shape.cc | 48 - +++++++++++++++++++++++++++++++++--------------- - 1 files changed, 33 insertions(+), 15 deletions(-) - -commit 60010a0c4d8efae5c61a0c9cf10cfe2c1860f41e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 20 14:05:02 2010 +0100 - - Update always-apply mask from 0xFFFF to 1 - - We plan to use the first bit to be always on. - - src/hb-ot-shape.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 009aad567863c05ee2ec4a3ee76fe0ee79c767bb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 20 14:00:57 2010 +0100 - - Invert the mask logic - - Before, the mask in the buffer was inverted. That is, a 0 bit meant - feature should be applied and 1 meant not applied, whereas in the - lookups, the logic was positive. - - Now both are in sync. When calling hb_buffer_add_glyph() manually, - the mask should be 1 instead of 0. - - src/hb-buffer.cc | 2 +- - src/hb-ot-layout-gpos-private.hh | 2 +- - src/hb-ot-layout-gsub-private.hh | 4 ++-- - 3 files changed, 4 insertions(+), 4 deletions(-) - -commit 7f411dbfd9f8d5360c948531ff9f6c3998d1d897 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 20 13:40:18 2010 +0100 - - Apply user features - - No ranges yet - - src/hb-ot-shape.cc | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit 0db299ccad346d9ea5573ea8408b78d9997bd379 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 20 13:30:09 2010 +0100 - - Change hb_feature_t to keep tag/int instead of string - - src/hb-shape.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 0a4399ca228d244e646abdb3487da0f13b228889 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 19 15:45:06 2010 -0400 - - Fix scale issues - - hb_font_set_scale() now sets the value to be used to represent a unit - pixel. For example, if rendering a 10px font with a 26.6 - representation, - you would set scale to (10 << 6). For 10px in 16.16 you would set - it to - (10 << 16). This space should be the same space that the - get_glyph_metrics - and get_kerning callbacks work in. - - src/hb-common.h | 1 - - src/hb-font-private.hh | 8 +++----- - src/hb-font.cc | 12 ++++++------ - src/hb-font.h | 12 +++--------- - src/hb-ft.cc | 4 ++-- - src/hb-ot-layout-gdef-private.hh | 6 +++--- - src/hb-ot-layout-gpos-private.hh | 37 - +++++++++++++++++-------------------- - src/hb-ot-layout-gsub-private.hh | 2 +- - src/hb-ot-layout-private.hh | 20 +++++++++++--------- - src/hb-ot-layout.cc | 31 +++++++++++++++---------------- - src/hb-private.h | 4 ---- - 11 files changed, 61 insertions(+), 76 deletions(-) - -commit cf5585cfa6cac6fdf627a99941299e76af5ae0f7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 19 12:03:35 2010 -0400 - - Add 'head' table - - src/Makefile.am | 1 + - src/hb-font-private.hh | 5 ++ - src/hb-font.cc | 9 +++ - src/hb-open-type-private.hh | 2 +- - src/hb-ot-head-private.hh | 128 - +++++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 144 insertions(+), 1 deletions(-) - -commit e29caf3f943b2b6f4997f469f7274252c82f465e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 19 11:47:17 2010 -0400 - - Add LONGDATETIME - - src/hb-open-type-private.hh | 15 +++++++++++++++ - 1 files changed, 15 insertions(+), 0 deletions(-) - -commit f415755fdf011d3fa3b9aad04c38f2255dd7acf8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 17 15:14:14 2010 -0400 - - Minor - - src/hb-ot-layout.cc | 52 - ++++++++++++++++++++++++++------------------------ - 1 files changed, 27 insertions(+), 25 deletions(-) - -commit 73af7756dc6d3961f176854246e5722baff101fb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 23:38:08 2010 -0400 - - Indent - - src/hb-ot-layout-gsub-private.hh | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit 3567b87cce541dfb0af7caf024ec67c9d3c09214 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 23:28:44 2010 -0400 - - Add an inline version of hb_buffer_ensure() - - src/hb-buffer.cc | 117 - +++++++++++++++++++++++++++++------------------------- - 1 files changed, 63 insertions(+), 54 deletions(-) - -commit a6a79df5fe2ed2cd307e7a991346faee164e70d9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 23:20:16 2010 -0400 - - Handle malloc failture in the buffer - - src/hb-buffer-private.hh | 5 ++- - src/hb-buffer.cc | 71 - ++++++++++++++++++++++++++++------------------ - src/hb-buffer.h | 2 +- - 3 files changed, 47 insertions(+), 31 deletions(-) - -commit ca54a12658510f9aa0b2db82f20a8fac230d6bb6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 22:25:42 2010 -0400 - - Minor - - src/hb-shape.cc | 60 - +++++++++++++++++++++++------------------------------- - 1 files changed, 26 insertions(+), 34 deletions(-) - -commit 910a33fe8457a8e13f7eb77fc92fa59c31f5e8fd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 22:13:38 2010 -0400 - - Update buffer docs - - src/hb-buffer-private.hh | 13 +++++++------ - src/hb-buffer.cc | 16 ++++++++-------- - 2 files changed, 15 insertions(+), 14 deletions(-) - -commit 36b73c80df91e96492357c6da945e081e9046a93 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 22:10:39 2010 -0400 - - Shortening buffer accessors: rename buffer->in_pos to buffer->i - - src/hb-buffer-private.hh | 2 +- - src/hb-buffer.cc | 52 +++++++++--------- - src/hb-ot-layout-gpos-private.hh | 94 - +++++++++++++++++----------------- - src/hb-ot-layout-gsub-private.hh | 48 +++++++++--------- - src/hb-ot-layout-gsubgpos-private.hh | 46 ++++++++-------- - src/hb-shape.cc | 40 +++++++------- - 6 files changed, 141 insertions(+), 141 deletions(-) - -commit 29427c5c51ac70aca53ed523fa5ddb3de4355fb0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 22:08:22 2010 -0400 - - Shortening buffer accessors: rename buffer->out_length to - buffer->out_len - - src/hb-buffer-private.hh | 2 +- - src/hb-buffer.cc | 52 - +++++++++++++++++----------------- - src/hb-ot-layout-gsub-private.hh | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 6 ++-- - 4 files changed, 31 insertions(+), 31 deletions(-) - -commit 6960350be97f24e97140391025b56369c393a3df -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 22:07:46 2010 -0400 - - Shortening buffer accessors: rename buffer->in_length to buffer->len - - src/hb-buffer-private.hh | 2 +- - src/hb-buffer.cc | 26 +++++++++++++------------- - src/hb-ot-layout-gpos-private.hh | 8 ++++---- - src/hb-ot-layout-gsub-private.hh | 8 ++++---- - src/hb-ot-layout-gsubgpos-private.hh | 8 ++++---- - src/hb-shape.cc | 12 ++++++------ - 6 files changed, 32 insertions(+), 32 deletions(-) - -commit 1b621823f3e31b48c80cc8b0691dfa873ba086cd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 22:05:53 2010 -0400 - - Shortening buffer accessors: rename buffer->positions to buffer->pos - - src/hb-buffer-private.hh | 4 ++-- - src/hb-buffer.cc | 32 ++++++++++++++++---------------- - src/hb-ot-layout-gpos-private.hh | 26 +++++++++++++------------- - src/hb-shape.cc | 10 +++++----- - 4 files changed, 36 insertions(+), 36 deletions(-) - -commit 9d5e26df0877aa5b187764ba09bd7bf221e92968 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 22:03:11 2010 -0400 - - Shortening buffer accessors: rename buffer->out_string to - buffer->out_info - - src/hb-buffer-private.hh | 2 +- - src/hb-buffer.cc | 56 - +++++++++++++++++----------------- - src/hb-ot-layout-gsubgpos-private.hh | 4 +- - 3 files changed, 31 insertions(+), 31 deletions(-) - -commit 7e7007a1c9bf2c07a8369752126ece8fa6164248 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 22:02:37 2010 -0400 - - Shortening buffer accessors: rename buffer->in_string to buffer->info - - src/hb-buffer-private.hh | 2 +- - src/hb-buffer.cc | 82 - +++++++++++++++++----------------- - src/hb-ot-layout-gpos-private.hh | 58 ++++++++++++------------ - src/hb-ot-layout-gsub-private.hh | 30 ++++++------ - src/hb-ot-layout-gsubgpos-private.hh | 26 +++++----- - src/hb-shape.cc | 18 ++++---- - 6 files changed, 108 insertions(+), 108 deletions(-) - -commit 8e6b6bb2932946ebc7b01c3abf575b654c741e20 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 21:58:22 2010 -0400 - - Merge buffer->out_pos and buffer->out_length - - src/hb-buffer-private.hh | 1 - - src/hb-buffer.cc | 48 - ++++++++++++++------------------- - src/hb-ot-layout-gsub-private.hh | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 6 ++-- - 4 files changed, 24 insertions(+), 33 deletions(-) - -commit 22f668eb9ad5f62d9fcd2e0c826ea78977687e5c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 21:41:04 2010 -0400 - - Remove the unused BUFFER macro - - src/hb-buffer-private.hh | 6 ------ - src/hb-ot-layout-gpos-private.hh | 6 ------ - src/hb-ot-layout-gsub-private.hh | 6 ------ - src/hb-ot-layout-gsubgpos-private.hh | 5 ----- - 4 files changed, 0 insertions(+), 23 deletions(-) - -commit 7e53ebe478597778c25c197ff9f0cb379f1d0043 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 21:38:13 2010 -0400 - - Remove the IN_CURGLYPH() macro - - src/hb-buffer-private.hh | 3 --- - src/hb-ot-layout-gpos-private.hh | 24 ++++++++++++------------ - src/hb-ot-layout-gsub-private.hh | 16 ++++++++-------- - src/hb-ot-layout-gsubgpos-private.hh | 16 ++++++++-------- - src/hb-shape.cc | 14 +++++++------- - 5 files changed, 35 insertions(+), 38 deletions(-) - -commit d784da1923ff2ca093f8b0210449731d376b7513 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 21:37:18 2010 -0400 - - Remove the IN_CURINFO() macro - - src/hb-buffer-private.hh | 1 - - src/hb-ot-layout-gpos-private.hh | 2 +- - src/hb-ot-layout-gsub-private.hh | 4 ++-- - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - 4 files changed, 4 insertions(+), 5 deletions(-) - -commit 281f59b4fb16f7c73767eb042a91f70f4c109b3a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 21:34:22 2010 -0400 - - Remove IN_INFO() and IN_NEXTGLYPH() macros - - src/hb-buffer-private.hh | 2 -- - src/hb-ot-layout-gpos-private.hh | 10 +++++----- - src/hb-ot-layout-gsub-private.hh | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- - src/hb-shape.cc | 4 ++-- - 5 files changed, 10 insertions(+), 12 deletions(-) - -commit 6e489cdf7623ac627d06d59a80ecea03ca97dc1b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 21:07:35 2010 -0400 - - Remove the IN_GLYPH() macro - - src/hb-buffer-private.hh | 1 - - src/hb-ot-layout-gpos-private.hh | 12 ++++++------ - src/hb-ot-layout-gsub-private.hh | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- - src/hb-shape.cc | 2 +- - 5 files changed, 10 insertions(+), 11 deletions(-) - -commit 01feb74c78a3a302fa3472a0be7b2a1d52fd1ba3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 21:00:08 2010 -0400 - - Remove the IN_CLUSTER() macro - - src/hb-buffer-private.hh | 1 - - src/hb-shape.cc | 2 +- - 2 files changed, 1 insertions(+), 2 deletions(-) - -commit d63a1e089acad9ab9f80addd936d36b6d38fb46a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 20:30:07 2010 -0400 - - Remove the IN_MASK() macro - - src/hb-buffer-private.hh | 1 - - src/hb-ot-layout-gpos-private.hh | 2 +- - src/hb-ot-layout-gsub-private.hh | 4 ++-- - 3 files changed, 3 insertions(+), 4 deletions(-) - -commit 89e2834dabd2d17f2823c51fe3a7fcadeaba7a59 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 20:25:55 2010 -0400 - - Remove the IN_LIGID() macro - - src/hb-buffer-private.hh | 1 - - src/hb-ot-layout-gpos-private.hh | 4 ++-- - src/hb-ot-layout-gsub-private.hh | 2 +- - 3 files changed, 3 insertions(+), 4 deletions(-) - -commit 4a871041f4718834afa312ed17cdd157603468b7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 20:25:04 2010 -0400 - - Remove IN_COMPONENT() macro - - src/hb-buffer-private.hh | 1 - - src/hb-ot-layout-gpos-private.hh | 8 ++++---- - src/hb-ot-layout-gsub-private.hh | 2 +- - 3 files changed, 5 insertions(+), 6 deletions(-) - -commit 27da6dd89a359f7ef340c646c4cb79373782261d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 20:17:50 2010 -0400 - - Remove OUT_GLYPH() and OUT_INFO() macros - - src/hb-buffer-private.hh | 2 -- - src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- - 2 files changed, 2 insertions(+), 4 deletions(-) - -commit cc6ae7ff91eeb93bef153f331ed02b500062f90e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 20:09:48 2010 -0400 - - Fix lookahead matching. Oops! - - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3109375b849f340b4807724218010c53dea58082 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 14 19:55:27 2010 -0400 - - Remove POSITION() and CURPOSITION() macros - - src/hb-buffer-private.hh | 2 - - src/hb-ot-layout-gpos-private.hh | 54 - +++++++++++++++++++------------------- - src/hb-shape.cc | 10 +++--- - 3 files changed, 32 insertions(+), 34 deletions(-) - -commit d7cfb3b2d1dd2e9fdae2b3e540bbe313660895e8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 13 14:18:49 2010 -0400 - - s/\<context\>/c/g - - src/hb-open-file-private.hh | 28 +- - src/hb-open-type-private.hh | 100 ++++---- - src/hb-ot-layout-common-private.hh | 84 +++--- - src/hb-ot-layout-gdef-private.hh | 98 ++++---- - src/hb-ot-layout-gpos-private.hh | 460 - +++++++++++++++++----------------- - src/hb-ot-layout-gsub-private.hh | 306 +++++++++++----------- - src/hb-ot-layout-gsubgpos-private.hh | 258 ++++++++++---------- - src/hb-ot-layout.cc | 24 +- - 8 files changed, 679 insertions(+), 679 deletions(-) - -commit f679635893eebc13402c5ee51a6f106eed0c76be -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 13 13:34:17 2010 -0400 - - Don't use variable-length-arrays - - src/hb-open-type-private.hh | 11 +++++++++-- - 1 files changed, 9 insertions(+), 2 deletions(-) - -commit 72071a8afaba2952fe42be093024ae9dbd37f233 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 13 13:22:24 2010 -0400 - - Add a few more buffer convenience methods - - src/hb-buffer-private.hh | 12 ++++++++++++ - src/hb-ot-layout-gsub-private.hh | 20 ++++++++++---------- - 2 files changed, 22 insertions(+), 10 deletions(-) - -commit 11a81612e51c598e857507c268312206423cbfca -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 13 00:01:40 2010 -0400 - - Minor - - src/hb-unicode.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3f93518a634cb1852bf050877db23b9b9203ad03 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 12 23:48:40 2010 -0400 - - Improve check for internal symbols - - src/check-internal-symbols.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 357d0f29c431b842179ee4b56c21bcc402178ce7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 12 23:46:16 2010 -0400 - - Make HB_PRIVATE more useful - - So we can apply it to class methods also. Not sure if that works! - - src/hb-blob-private.h | 2 +- - src/hb-font-private.hh | 4 ++-- - src/hb-private.h | 2 +- - src/hb-unicode-private.h | 3 +-- - 4 files changed, 5 insertions(+), 6 deletions(-) - -commit 1d5e78013696b10751d8a35027619e81978e1312 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 12 23:43:00 2010 -0400 - - Add a few other buffer methods - - src/hb-buffer-private.hh | 11 +++++++---- - src/hb-buffer.cc | 7 ------- - src/hb-ot-layout-gsub-private.hh | 10 +++++----- - src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- - 4 files changed, 14 insertions(+), 18 deletions(-) - -commit d0316a81f59a4e814b0af78797d915d7ce04d119 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 12 23:34:52 2010 -0400 - - Add buffer->swap() - - src/hb-buffer-private.hh | 68 - ++++++++++++++++++++----------------- - src/hb-ot-layout-gsub-private.hh | 2 +- - 2 files changed, 38 insertions(+), 32 deletions(-) - -commit 3b649a38b5772dd7aba7f07ff7698a7f427f421f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 12 23:28:38 2010 -0400 - - Add check for internal symbols - - src/Makefile.am | 3 ++- - src/check-internal-symbols.sh | 28 ++++++++++++++++++++++++++++ - 2 files changed, 30 insertions(+), 1 deletions(-) - -commit eee8598d75d3af692d9ececf7e8ac458e892ba9e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 12 23:22:55 2010 -0400 - - Hide internal symbols - - src/hb-ot-layout-private.hh | 4 ++-- - src/hb-private.h | 8 ++++---- - 2 files changed, 6 insertions(+), 6 deletions(-) - -commit 8951fc2c82f2db4865da6d9e303fce419b6363bb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 12 23:13:39 2010 -0400 - - Add buffer->allocate_lig_id() - - src/hb-buffer-private.hh | 5 ++--- - src/hb-buffer.cc | 6 ------ - src/hb-ot-layout-gsub-private.hh | 4 ++-- - 3 files changed, 4 insertions(+), 11 deletions(-) - -commit 1ce4dc95dbb28842085342aea4f9d12cbe9671a9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 12 18:29:25 2010 -0400 - - Use bit tricks for HB_DIRECTION_IS_* - - We already depend on the exact values of the direction enum - in HB_DIRECTION_REVERSE(), so we may as well use that. - - src/hb-common.h | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 22da7fd94d6318c52df69d70470a85464ffc533d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 12 18:23:21 2010 -0400 - - Rename a few files to be C++ sources - - In anticipation for buffer revamp coming. - - src/Makefile.am | 16 +- - src/hb-buffer-private.h | 155 -------- - src/hb-buffer-private.hh | 155 ++++++++ - src/hb-buffer.c | 650 - ---------------------------------- - src/hb-buffer.cc | 650 - ++++++++++++++++++++++++++++++++++ - src/hb-common.h | 1 + - src/hb-font-private.h | 92 ----- - src/hb-font-private.hh | 92 +++++ - src/hb-font.cc | 4 +- - src/hb-ft.c | 240 ------------- - src/hb-ft.cc | 240 +++++++++++++ - src/hb-ot-layout-common-private.hh | 2 +- - src/hb-ot-layout-gdef-private.hh | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - src/hb-ot-layout-private.h | 121 ------- - src/hb-ot-layout-private.hh | 121 +++++++ - src/hb-ot-layout.cc | 2 +- - src/hb-ot-shape-private.h | 53 --- - src/hb-ot-shape-private.hh | 53 +++ - src/hb-ot-shape.c | 164 --------- - src/hb-ot-shape.cc | 164 +++++++++ - src/hb-shape.c | 258 -------------- - src/hb-shape.cc | 258 ++++++++++++++ - 23 files changed, 1748 insertions(+), 1747 deletions(-) - -commit c3df649f258b334e93c7626a43cd8ebfbd5a610e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 11 13:54:12 2010 -0400 - - Fix comment - - src/hb-buffer-private.h | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 281f08954a1d96d7807153c25073b8eb7630703b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 11 11:37:58 2010 -0400 - - Remove obsolete friend - - src/hb-ot-layout-gpos-private.hh | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 70c9bfd5646a4a55a7f43c0cf0b5ac5993615d5b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 11 00:23:50 2010 -0400 - - Simplify PairSet - - src/hb-ot-layout-gpos-private.hh | 101 - ++++++++++++++++++++------------------ - 1 files changed, 54 insertions(+), 47 deletions(-) - -commit 97e7f8f305c47caf2968a9da3b8407825547286d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 11 00:11:36 2010 -0400 - - Add CONST_FUNC annotation - - src/hb-private.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 494d28ad988e505c1c45cc35a7ec6b880cfec5fc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 23:50:07 2010 -0400 - - Simplify likely() implementation - - Shrinks .text by 1%! - - src/hb-private.h | 10 +--------- - 1 files changed, 1 insertions(+), 9 deletions(-) - -commit 75651b20871047d3ec17f4221794b8ef5d60e14b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 23:44:51 2010 -0400 - - Fix warnings - - src/hb-open-type-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4c20d8c057738b66150a88472714690e137884f8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 23:27:54 2010 -0400 - - Sprinkle a few strategic likely()'s - - Shrinks the code size by some 2% even. - - src/hb-open-file-private.hh | 4 ++-- - src/hb-open-type-private.hh | 20 ++++++++++---------- - 2 files changed, 12 insertions(+), 12 deletions(-) - -commit 69cb28bc13d236a01acf40da62e345c7e83ccba7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 23:13:08 2010 -0400 - - Remove a few likely()'s - - src/hb-ot-layout-common-private.hh | 2 +- - src/hb-ot-layout-gpos-private.hh | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -commit 24552ecf92982fe561dc47d5102fcf1a7b337c70 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 23:08:41 2010 -0400 - - Remove excess sub_format sanitize - - src/hb-ot-layout-gpos-private.hh | 1 - - src/hb-ot-layout-gsub-private.hh | 1 - - 2 files changed, 0 insertions(+), 2 deletions(-) - -commit f7adc5e9be352ac31ad3ab847abb6fceb239aa12 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 22:41:50 2010 -0400 - - Shrink NullPool now that we have accurate size tracking - - src/hb-open-type-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3d44fb6f15177dc6518166e435597936b044acc1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 22:22:54 2010 -0400 - - Fix warning - - src/hb-ot-layout-common-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b5db4f1e4eefa266a71a28b5496f47ff9d1a81e8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 22:22:22 2010 -0400 - - Clean up NO_INDEX - - src/hb-open-file-private.hh | 2 +- - src/hb-open-type-private.hh | 10 ++++++---- - src/hb-ot-layout-common-private.hh | 17 ++++------------- - src/hb-ot-layout.cc | 8 ++++---- - src/main.cc | 2 +- - 5 files changed, 16 insertions(+), 23 deletions(-) - -commit fe9bc070e1d545b0df2ea548eebf5a1fc4c92ddc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 21:39:24 2010 -0400 - - Fix awful confusion between lookup format and subtable format - - As reported by John Daggett. - - src/hb-ot-layout-gpos-private.hh | 14 +++++++------- - src/hb-ot-layout-gsub-private.hh | 14 +++++++------- - 2 files changed, 14 insertions(+), 14 deletions(-) - -commit 458ecbb60bb7e8e32aca62a562586d921d5396aa -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 21:11:35 2010 -0400 - - Fix tracing order - - src/hb-open-type-private.hh | 14 +++++--------- - src/hb-ot-layout-gsubgpos-private.hh | 3 +-- - 2 files changed, 6 insertions(+), 11 deletions(-) - -commit 48146e5612f6d272d6962f6829c6d64a31edef89 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 20:07:56 2010 -0400 - - Don't fail sanitize on NULL data - - src/hb-open-type-private.hh | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit d2c2ca8faf62fc380d4717d286556139a62d2356 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 19:58:25 2010 -0400 - - Fix comment - - src/hb-open-type-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b435ab7e29c388e3b100f729957319931625a3a8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 19:51:57 2010 -0400 - - Fix accessing tables from NULL pointer - - src/hb-font.cc | 2 +- - src/hb-open-type-private.hh | 5 +++++ - src/hb-ot-layout.cc | 6 +++--- - 3 files changed, 9 insertions(+), 4 deletions(-) - -commit dacebcadae36b35531d635d81df2afb937677b7a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 19:45:41 2010 -0400 - - Simplify unions - - src/hb-open-file-private.hh | 24 ++++--- - src/hb-ot-layout-common-private.hh | 24 ++++---- - src/hb-ot-layout-gdef-private.hh | 24 ++++---- - src/hb-ot-layout-gpos-private.hh | 120 - +++++++++++++++++----------------- - src/hb-ot-layout-gsub-private.hh | 88 ++++++++++++------------ - src/hb-ot-layout-gsubgpos-private.hh | 44 ++++++------ - 6 files changed, 163 insertions(+), 161 deletions(-) - -commit fd671e02433bcbc1fd07901fa2d6065020f41ba8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 19:02:32 2010 -0400 - - Remove unused macro - - src/hb-open-type-private.hh | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 0eb9fc6e37935707dba2bf4b3705de2161a08cb7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 19:01:17 2010 -0400 - - Change DEFINE_SIZE_VAR to DEFINE_SIZE_ARRAY - - src/hb-open-file-private.hh | 4 ++-- - src/hb-open-type-private.hh | 10 +++++----- - src/hb-ot-layout-common-private.hh | 27 +++++++++++++++------------ - src/hb-ot-layout-gdef-private.hh | 10 +++++----- - src/hb-ot-layout-gpos-private.hh | 25 ++++++++++++------------- - src/hb-ot-layout-gsub-private.hh | 14 +++++++------- - src/hb-ot-layout-gsubgpos-private.hh | 16 ++++++++-------- - 7 files changed, 54 insertions(+), 52 deletions(-) - -commit 596e471aa5053d955fb5d5b5923088c8814469b1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 18:47:48 2010 -0400 - - Cleanup DEFINE_SIZE_VAR2 - - src/hb-open-type-private.hh | 18 +++++++++++------- - src/hb-ot-layout-common-private.hh | 6 +++--- - src/hb-ot-layout-gdef-private.hh | 4 ++-- - src/hb-ot-layout-gpos-private.hh | 4 ++-- - src/hb-ot-layout-gsub-private.hh | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- - 6 files changed, 21 insertions(+), 17 deletions(-) - -commit 33afa4e2dc352f08cc094703e3f01d3ecd83b354 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 18:35:02 2010 -0400 - - Minor - - src/hb-open-type-private.hh | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit b961518b9611471ff7060e97686e5625974847eb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 18:20:54 2010 -0400 - - Simplify array access - - src/hb-open-type-private.hh | 29 ++++++++++------------------- - src/hb-ot-layout-common-private.hh | 8 ++++---- - src/hb-ot-layout-gsub-private.hh | 6 +++--- - src/hb-ot-layout-gsubgpos-private.hh | 16 ++++++++-------- - 4 files changed, 25 insertions(+), 34 deletions(-) - -commit 54842374c2b291ef208c51ae1d853ec0403ccf84 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 18:13:32 2010 -0400 - - Fix check_struct to check min_size instead of sizeof - - src/hb-open-type-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ed07422c33bbb52ff4d79e65986171e3f07697d8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 18:08:46 2010 -0400 - - Further cleanup of sizeof - - src/hb-open-type-private.hh | 7 +++++-- - src/hb-ot-layout-common-private.hh | 4 ++++ - src/hb-ot-layout-gdef-private.hh | 4 ++++ - src/hb-ot-layout-gpos-private.hh | 10 +++++++--- - src/hb-ot-layout-gsub-private.hh | 4 +++- - src/hb-ot-layout-gsubgpos-private.hh | 2 ++ - 6 files changed, 25 insertions(+), 6 deletions(-) - -commit a82ef7a893b773a17f7548375de9f588dfc83aba -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 17:55:03 2010 -0400 - - Remove CastP completely - - src/hb-open-type-private.hh | 39 - +++++++++++++++++---------------------- - 1 files changed, 17 insertions(+), 22 deletions(-) - -commit 40cbefe858192531ed64dd51d402f7ca7b8153a3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 17:47:22 2010 -0400 - - Remove unnecessary casts - - src/hb-open-type-private.hh | 12 ++++++------ - src/hb-ot-layout-common-private.hh | 2 +- - src/hb-ot-layout-gpos-private.hh | 34 - +++++++++++++++++----------------- - src/hb-ot-layout-gsub-private.hh | 4 ++-- - src/hb-ot-layout-gsubgpos-private.hh | 34 - +++++++++++++++++----------------- - 5 files changed, 43 insertions(+), 43 deletions(-) - -commit 09766b1ec5ec55a61edbcd7a89ed3613cc92d4cb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 17:36:03 2010 -0400 - - Make StructAtOffset take a pointer - - Is safer. - - src/hb-open-type-private.hh | 26 +++++++++++++------------- - src/hb-ot-layout-gpos-private.hh | 6 +++--- - src/hb-ot-layout-gsub-private.hh | 4 ++-- - 3 files changed, 18 insertions(+), 18 deletions(-) - -commit bea34c7cbb583cf7660776e95cab3171590b8427 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 17:28:16 2010 -0400 - - Further cleanup of DEFINE_SIZE - - src/hb-open-file-private.hh | 2 +- - src/hb-open-type-private.hh | 10 +++++----- - src/hb-ot-layout-common-private.hh | 16 ++++++++-------- - src/hb-ot-layout-gdef-private.hh | 8 ++++---- - src/hb-ot-layout-gpos-private.hh | 16 +++++----------- - src/hb-ot-layout-gsub-private.hh | 14 +++++++------- - src/hb-ot-layout-gsubgpos-private.hh | 14 +++++++------- - 7 files changed, 37 insertions(+), 43 deletions(-) - -commit 0abcc3b48cfd51a22695c9e988938b2f45cb19d8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 17:04:20 2010 -0400 - - Cleanup - - src/hb-open-type-private.hh | 18 ++++++++++-------- - 1 files changed, 10 insertions(+), 8 deletions(-) - -commit b3651231bf80bb7009214547a75ed90e21815c68 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 16:57:29 2010 -0400 - - Remove ASSERT_SIZE in favor of the safer DEFINE_SIZE_STATIC - - src/hb-open-file-private.hh | 3 +- - src/hb-open-type-private.hh | 20 +++++++++++++-- - src/hb-ot-layout-common-private.hh | 24 ++++++++++------- - src/hb-ot-layout-gdef-private.hh | 22 ++++++++++------ - src/hb-ot-layout-gpos-private.hh | 44 - ++++++++++++++++++--------------- - src/hb-ot-layout-gsub-private.hh | 32 +++++++++++++++--------- - src/hb-ot-layout-gsubgpos-private.hh | 27 ++++++++++++++------- - src/hb-private.h | 2 - - 8 files changed, 109 insertions(+), 65 deletions(-) - -commit 569da92bc6956f42d9b2d65c784e184fb6380efe -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 10 16:38:32 2010 -0400 - - Cleanup ASSERT_SIZE_VAR - - src/hb-open-file-private.hh | 9 ++++++--- - src/hb-open-type-private.hh | 6 ++++-- - src/hb-ot-layout-common-private.hh | 22 ++++++++++++---------- - src/hb-ot-layout-gdef-private.hh | 3 ++- - src/hb-ot-layout-gpos-private.hh | 30 - +++++++++++++++++++----------- - src/hb-ot-layout-gsubgpos-private.hh | 10 ++++++---- - src/hb-private.h | 8 -------- - 7 files changed, 49 insertions(+), 39 deletions(-) - -commit 99bf03459ff2f00cf3fb7fa3c8b8336ec9fcca56 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 6 19:37:32 2010 -0400 - - Whitespace - - src/hb-ot-layout-gpos-private.hh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 65f46b00333e20ab8a52a4b350747507541ec1db -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 6 19:35:19 2010 -0400 - - Simplify DEFINE_NULL_DATA - - Using ::min_size. - - src/hb-open-type-private.hh | 6 +++--- - src/hb-ot-layout-common-private.hh | 9 +++++---- - 2 files changed, 8 insertions(+), 7 deletions(-) - -commit e45d3f86f9a5f3d29ca35a282de7f98e702878f9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 6 19:33:31 2010 -0400 - - Start cleaning up get_size() - - So we know when the size is static and when dynamic. - - src/hb-open-file-private.hh | 7 ++--- - src/hb-open-type-private.hh | 42 - ++++++++++++++++++++++++--------- - src/hb-ot-layout-common-private.hh | 14 +++++------ - src/hb-ot-layout-gpos-private.hh | 17 +++++-------- - src/hb-ot-layout-gsubgpos-private.hh | 19 +++++++-------- - 5 files changed, 55 insertions(+), 44 deletions(-) - -commit b157617644d1e38f680163889d1dc2e2f64d9ba3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 6 14:48:27 2010 -0400 - - Remove the last of SANITIZE macros: SANITIZE_SELF - - src/hb-open-file-private.hh | 4 ++-- - src/hb-open-type-private.hh | 21 ++++++++++++--------- - src/hb-ot-layout-common-private.hh | 16 ++++++++-------- - src/hb-ot-layout-gdef-private.hh | 6 +++--- - src/hb-ot-layout-gpos-private.hh | 26 +++++++++++++------------- - src/hb-ot-layout-gsubgpos-private.hh | 6 +++--- - 6 files changed, 41 insertions(+), 38 deletions(-) - -commit 4f252fedc7136c66a9d7fbcb2978581986da6227 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 6 13:30:23 2010 -0400 - - Remove SANITIZE macro - - src/hb-open-file-private.hh | 4 ++-- - src/hb-open-type-private.hh | 6 ++---- - src/hb-ot-layout-common-private.hh | 18 +++++++++--------- - src/hb-ot-layout-gdef-private.hh | 6 +++--- - src/hb-ot-layout-gpos-private.hh | 18 +++++++++--------- - src/hb-ot-layout-gsub-private.hh | 26 +++++++++++++------------- - src/hb-ot-layout-gsubgpos-private.hh | 22 +++++++++++----------- - 7 files changed, 49 insertions(+), 51 deletions(-) - -commit c2ddfd2d268385257c77c09a9abeacf4230d5377 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 6 13:06:15 2010 -0400 - - Cleanup Value casts - - src/hb-ot-layout-gpos-private.hh | 34 - +++++++++++++++++++++------------- - 1 files changed, 21 insertions(+), 13 deletions(-) - -commit 41a93d2c1ff175ef06328a99983577459c2d34b0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 6 12:55:14 2010 -0400 - - Remove SANITIZE_WITH_BASE - - src/hb-open-file-private.hh | 2 +- - src/hb-open-type-private.hh | 2 - - src/hb-ot-layout-common-private.hh | 6 +- - src/hb-ot-layout-gdef-private.hh | 24 +++++----- - src/hb-ot-layout-gpos-private.hh | 90 - +++++++++++++++++----------------- - src/hb-ot-layout-gsub-private.hh | 31 ++++++------ - src/hb-ot-layout-gsubgpos-private.hh | 44 ++++++++-------- - 7 files changed, 98 insertions(+), 101 deletions(-) - -commit f5fab0c71837371cce32dc3e9edca1ccb8d44e29 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 6 10:26:52 2010 -0400 - - Remove SANITIZE_MEM - - src/hb-open-type-private.hh | 4 +--- - src/hb-ot-layout-common-private.hh | 2 +- - src/hb-ot-layout-gpos-private.hh | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 6 +++--- - 4 files changed, 6 insertions(+), 8 deletions(-) - -commit 4ad2cc5dec6b0639da2b1846282bdd99d06d5ff1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 6 09:24:24 2010 -0400 - - Rename check to check_range - - src/hb-open-type-private.hh | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 1cd1e117d060d38e314618b627d7663cb01ed584 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 5 20:15:14 2010 -0400 - - Remove SANITIZE_ARRAY - - src/hb-open-file-private.hh | 2 +- - src/hb-open-type-private.hh | 16 +++++++--------- - src/hb-ot-layout-gpos-private.hh | 8 ++++---- - src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- - 4 files changed, 14 insertions(+), 16 deletions(-) - -commit 583d7f9586ce69754f1354aa3895e6d732a0c2ce -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 5 01:49:22 2010 -0400 - - Cosmetic - - src/hb-open-file-private.hh | 3 ++- - src/hb-open-type-private.hh | 6 ++++-- - src/hb-ot-layout-common-private.hh | 15 ++++++++++----- - src/hb-ot-layout-gpos-private.hh | 5 ++--- - src/hb-ot-layout-gsub-private.hh | 3 ++- - src/hb-ot-layout-gsubgpos-private.hh | 9 +++++---- - 6 files changed, 25 insertions(+), 16 deletions(-) - -commit 705e215268aa95c2bc6af8af9b48b72b690ec1f7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 5 01:40:25 2010 -0400 - - Minor - - src/hb-open-type-private.hh | 4 ++-- - src/hb-ot-layout-gpos-private.hh | 2 +- - src/hb-ot-layout-gsub-private.hh | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -commit b18eafd0f62f854d15276c78f99843aecd47acad -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 5 01:39:26 2010 -0400 - - Minor - - src/hb-open-type-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4169710911450e0f9bc045fe279bfc8ba9e8457c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 5 01:37:58 2010 -0400 - - Simplify chaining - - src/hb-ot-layout-gsubgpos-private.hh | 61 - ++++++++++++++-------------------- - 1 files changed, 25 insertions(+), 36 deletions(-) - -commit 1911b9d21b2b7b6b8219ce6c888540e3a60aa9c3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 5 01:32:04 2010 -0400 - - Remove APPLY_ARG_DEF and APPLY_ARG - - src/hb-ot-layout-gpos-private.hh | 92 - +++++++++++++++++----------------- - src/hb-ot-layout-gsub-private.hh | 88 - ++++++++++++++++---------------- - src/hb-ot-layout-gsubgpos-private.hh | 89 - +++++++++++++++----------------- - 3 files changed, 132 insertions(+), 137 deletions(-) - -commit 6c42cddfe53a1c664081862bb9a3e1c38d05a823 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 5 01:30:48 2010 -0400 - - Port apply to use hb_trace_t - - src/hb-ot-layout-gpos-private.hh | 9 ++++----- - src/hb-ot-layout-gsub-private.hh | 11 +++++------ - src/hb-ot-layout-gsubgpos-private.hh | 13 +++++-------- - 3 files changed, 14 insertions(+), 19 deletions(-) - -commit 969c9705ae0c64577c3f69f5300fec975f952e1f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 5 01:23:44 2010 -0400 - - Move context_length into apply_context - - src/hb-ot-layout-gpos-private.hh | 9 ++-- - src/hb-ot-layout-gsub-private.hh | 9 ++-- - src/hb-ot-layout-gsubgpos-private.hh | 70 - +++++++++++++++++++-------------- - 3 files changed, 50 insertions(+), 38 deletions(-) - -commit 94a23aaeca39c662614037ef887412249bdc8d49 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 5 01:13:09 2010 -0400 - - Move buffer into apply_context - - src/hb-buffer-private.h | 30 +++++++++------- - src/hb-ot-layout-gpos-private.hh | 64 - +++++++++++++++++++--------------- - src/hb-ot-layout-gsub-private.hh | 45 ++++++++++++++---------- - src/hb-ot-layout-gsubgpos-private.hh | 49 ++++++++++++++------------ - 4 files changed, 106 insertions(+), 82 deletions(-) - -commit 63493f956dca519df49da0a6badc3cb0a1b92779 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 5 01:01:05 2010 -0400 - - Move layout_context into apply_context - - src/hb-ot-layout-gpos-private.hh | 105 - +++++++++++++++++----------------- - src/hb-ot-layout-gsub-private.hh | 47 ++++++++------- - src/hb-ot-layout-gsubgpos-private.hh | 11 ++-- - 3 files changed, 82 insertions(+), 81 deletions(-) - -commit fff9aa263d1daf7c5117cf383fafa5043d5eb5af -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 5 00:32:21 2010 -0400 - - Minor - - src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit 27e302dc8e794ff6bf878bc76e17d336d510849e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 5 00:26:16 2010 -0400 - - I keep changing my mind about this - - src/hb-open-type-private.hh | 30 ++++++++++-------------------- - 1 files changed, 10 insertions(+), 20 deletions(-) - -commit 39840474afd2cda9ff576c08aff9c87095496c27 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 5 00:23:19 2010 -0400 - - Remove SANITIZE_ARG_DEF and SANITIZE_ARG - - src/hb-open-file-private.hh | 16 ++-- - src/hb-open-type-private.hh | 59 +++++++-------- - src/hb-ot-layout-common-private.hh | 42 +++++----- - src/hb-ot-layout-gdef-private.hh | 28 ++++---- - src/hb-ot-layout-gpos-private.hh | 136 - +++++++++++++++++----------------- - src/hb-ot-layout-gsub-private.hh | 72 +++++++++--------- - src/hb-ot-layout-gsubgpos-private.hh | 46 ++++++------ - 7 files changed, 197 insertions(+), 202 deletions(-) - -commit b261e2ad5c5a065599ce1dbc4ba437caa2cee1e9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 5 00:20:16 2010 -0400 - - Remove trace from sanitize_shallow() - - src/hb-open-type-private.hh | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit dfc8cbe85479dde1ffdc6b2e73f4907331d77a19 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 5 00:19:46 2010 -0400 - - Add hb_trace_t - - src/hb-open-type-private.hh | 33 +++++++++++++++++++-------------- - 1 files changed, 19 insertions(+), 14 deletions(-) - -commit 20e3dd5d292b65f70d2eae63b8d8713a1c889d47 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 4 23:21:57 2010 -0400 - - Make sanitize_depth variable automatic and not passed through - function args - - src/hb-open-type-private.hh | 72 - +++++++++++++++++++++++++----------------- - 1 files changed, 43 insertions(+), 29 deletions(-) - -commit 4a446ac35136eff23d55f47bdd7b40095ad707ab -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 4 22:46:21 2010 -0400 - - Use function template for pass-thru argument - - src/hb-open-type-private.hh | 26 ++++++-------------------- - src/hb-ot-layout-gpos-private.hh | 6 +++--- - 2 files changed, 9 insertions(+), 23 deletions(-) - -commit 98daaf183d6dbf2b68959da608cd9876ba55d7aa -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 4 22:42:49 2010 -0400 - - Make _hb_sanitize_*() methods of the context object - - src/hb-open-type-private.hh | 190 - ++++++++++++++++++++++--------------------- - 1 files changed, 98 insertions(+), 92 deletions(-) - -commit bb029af943faa9905e652d58856998687e60c31d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 4 15:28:52 2010 -0400 - - Remove SANITIZE_THIS - - src/hb-open-file-private.hh | 2 +- - src/hb-open-type-private.hh | 3 +- - src/hb-ot-layout-common-private.hh | 4 +- - src/hb-ot-layout-gdef-private.hh | 25 ++++++++------- - src/hb-ot-layout-gpos-private.hh | 55 - ++++++++++++++++++--------------- - src/hb-ot-layout-gsub-private.hh | 29 ++++++++++-------- - src/hb-ot-layout-gsubgpos-private.hh | 42 +++++++++++++------------- - 7 files changed, 85 insertions(+), 75 deletions(-) - -commit 2226fc93d1427b8830bfb892fe1b25b488ea36dc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 4 15:12:17 2010 -0400 - - Rename SANITIZE_BASE to SANITIZE_WITH_BASE - - src/hb-open-type-private.hh | 11 +++++++---- - src/hb-ot-layout-common-private.hh | 3 ++- - src/hb-ot-layout-gpos-private.hh | 15 ++++++++------- - 3 files changed, 17 insertions(+), 12 deletions(-) - -commit 89da1346ec3a8dec8a368df46d61ca75356e22fa -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 4 15:01:45 2010 -0400 - - Remove SANITIZE_OBJ - - src/hb-open-type-private.hh | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 4d4cce96266b777a01cec03e8766dc8c0b159351 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 4 14:57:55 2010 -0400 - - Remove SANITIZE_THIS2 - - src/hb-open-type-private.hh | 2 -- - src/hb-ot-layout-common-private.hh | 3 ++- - src/hb-ot-layout-gdef-private.hh | 10 ++++++---- - src/hb-ot-layout-gpos-private.hh | 9 ++++++--- - src/hb-ot-layout-gsub-private.hh | 11 +++++++---- - src/hb-ot-layout-gsubgpos-private.hh | 14 +++++++++----- - 6 files changed, 30 insertions(+), 19 deletions(-) - -commit 26bfcb64e473c40e439d6efbe974781dada28eca -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 4 14:49:45 2010 -0400 - - Cosmetic - - src/hb-ot-layout-gdef-private.hh | 5 ++--- - src/hb-ot-layout-gsubgpos-private.hh | 7 +++---- - 2 files changed, 5 insertions(+), 7 deletions(-) - -commit be74284673a1944e0f1884e861c3fe8f9855172c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 4 14:47:05 2010 -0400 - - Remove SANITIZE_THIS3 - - src/hb-open-type-private.hh | 1 - - src/hb-ot-layout-gpos-private.hh | 21 +++++++++++++++------ - src/hb-ot-layout-gsubgpos-private.hh | 8 ++++++-- - 3 files changed, 21 insertions(+), 9 deletions(-) - -commit fbab9f9bd8ba59e7e5811f33c1dda198f95cf05a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 4 14:42:10 2010 -0400 - - Remove SANITIZE_BASE2 - - src/hb-open-type-private.hh | 1 - - src/hb-ot-layout-gpos-private.hh | 3 ++- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 73c7dbf7f5433c0cdd467ef32402f52867e9798e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 4 14:40:55 2010 -0400 - - Remove SANITIZE2 - - src/hb-open-type-private.hh | 1 - - src/hb-ot-layout-gsub-private.hh | 2 +- - 2 files changed, 1 insertions(+), 2 deletions(-) - -commit c9f14687a30866181feb57ee2736a147ec9f25a1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 4 14:38:08 2010 -0400 - - Remove the NEUTER macro, move code to a method - - src/hb-open-type-private.hh | 21 +++++++++++++-------- - 1 files changed, 13 insertions(+), 8 deletions(-) - -commit 30fa2821c277df99a14089749313dfe2b541e2d0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 4 14:28:18 2010 -0400 - - Make internal method private - - src/hb-open-type-private.hh | 12 +++++++----- - 1 files changed, 7 insertions(+), 5 deletions(-) - -commit ce5694c79671bf75990923c1da17bb611e4e7d15 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 4 14:10:18 2010 -0400 - - [main] Recognize Apple SFNTs - - src/hb-open-file-private.hh | 4 ++-- - src/main.cc | 6 ++++++ - 2 files changed, 8 insertions(+), 2 deletions(-) - -commit 710500a93ecc2a0c595045602aa367073485ff91 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 3 23:11:16 2010 -0400 - - Comment new SFNT tags - - src/hb-open-file-private.hh | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 64d3fc8d0dada673245cc8c0b1c12cd849b30997 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 3 22:51:19 2010 -0400 - - Cosmetic: Rename HB_LIKELY/HB_UNLIKELY to likely/unlikely - - src/hb-buffer.c | 14 ++++---- - src/hb-font.cc | 6 ++-- - src/hb-ft.c | 14 ++++---- - src/hb-language.c | 2 +- - src/hb-object-private.h | 10 +++--- - src/hb-open-file-private.hh | 2 +- - src/hb-open-type-private.hh | 38 ++++++++++---------- - src/hb-ot-layout-common-private.hh | 16 ++++---- - src/hb-ot-layout-gdef-private.hh | 2 +- - src/hb-ot-layout-gpos-private.hh | 64 - +++++++++++++++++----------------- - src/hb-ot-layout-gsub-private.hh | 52 ++++++++++++++-------------- - src/hb-ot-layout-gsubgpos-private.hh | 40 ++++++++++---------- - src/hb-ot-layout.cc | 12 +++--- - src/hb-ot-tag.c | 2 +- - src/hb-private.h | 8 ++-- - src/hb-shape.c | 10 +++--- - src/hb-unicode.c | 2 +- - 17 files changed, 147 insertions(+), 147 deletions(-) - -commit fa3b3d58443a7c22eca3f86243993ba2d4bd9f4a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 3 22:47:22 2010 -0400 - - Mark a couple functions as inline - - src/hb-open-type-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 6b84198f9d471defb6f55d44d4f5423df70b2a10 -Merge: 631d10b eaf29ed -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 3 22:46:52 2010 -0400 - - Merge remote branch 'jrmuizel/master' - -commit eaf29edb8fa49390e5f48b78105dfd173aff445b -Author: Jeff Muizelaar <jmuizelaar@mozilla.com> -Date: Mon May 3 22:27:56 2010 -0400 - - HB_UNUSED is unneeded on static inline functions - - src/hb-object-private.h | 2 +- - src/hb-open-type-private.hh | 6 +++--- - src/hb-private.h | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -commit 4ce578ed369f1526c91deedcf9e72537b3e4328f -Author: Jeff Muizelaar <jmuizelaar@mozilla.com> -Date: Mon May 3 15:03:53 2010 -0400 - - Include the tags from the Apple specification for TrueType fonts - - src/hb-open-file-private.hh | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit 631d10b728d9e1a02c7dddf505d4fae5e244c6e8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 2 21:14:21 2010 -0400 - - Remove unused method - - src/hb-open-file-private.hh | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) - -commit f0abcd69408a3af65207cdf8847575ade4579bd4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 2 18:14:25 2010 -0400 - - Whitespace - - src/hb-open-type-private.hh | 9 ++++----- - 1 files changed, 4 insertions(+), 5 deletions(-) - -commit a8d960bd26883ee937b04ca2a3c16a3644870356 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 29 14:31:56 2010 -0400 - - [GPOS] Speedup apply_value() - - src/hb-ot-layout-gpos-private.hh | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit 2cd1ea4411d0808559a942ff3fa4e637f9c9a9c8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 29 14:15:32 2010 -0400 - - [ft] Disallow getting the entire font data with tag=0 - - src/hb-ft.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 33d13fdda99acaeffa9600737e8870278d053ebe -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 29 13:56:44 2010 -0400 - - Rename HB_GNUC_UNUSED -> HB_UNUSED - - src/hb-buffer.c | 6 ++-- - src/hb-font.cc | 44 - +++++++++++++++++----------------- - src/hb-ft.c | 16 ++++++------ - src/hb-object-private.h | 2 +- - src/hb-open-type-private.hh | 18 +++++++------- - src/hb-ot-layout-gdef-private.hh | 4 +- - src/hb-ot-layout-gpos-private.hh | 4 +- - src/hb-ot-layout-gsubgpos-private.hh | 6 ++-- - src/hb-ot-layout.cc | 4 +- - src/hb-ot-shape.c | 2 +- - src/hb-private.h | 16 ++++++------ - src/hb-shape.c | 32 ++++++++++++------------ - src/hb-unicode.c | 8 +++--- - 13 files changed, 81 insertions(+), 81 deletions(-) - -commit 7d3a126334f8e6f6441561c1bb592bd3fa7a2c5c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 29 13:54:01 2010 -0400 - - Define HB_FUNC for portability to non-gcc - - src/hb-open-type-private.hh | 12 ++++++------ - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - src/hb-private.h | 9 +++++++++ - 3 files changed, 16 insertions(+), 7 deletions(-) - -commit fa030175ca998b00cc42cbced6e98de323ec01ec -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 29 13:48:26 2010 -0400 - - [sanitize] Make debug code always available to the compiler - - Such that we don't break debug build all the time. - - src/hb-open-type-private.hh | 71 - +++++++++++++++++++------------------------ - 1 files changed, 31 insertions(+), 40 deletions(-) - -commit fde6f5bd682f5ad0cc5e2ec69fc831b0192bf90b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 29 04:41:41 2010 -0400 - - Convert to uppercase in hb_ot_tag_from_language() - - src/hb-ot-tag.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 6f729b45b04243c42ad7201b67cda9d5e5c363f1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 29 03:59:06 2010 -0400 - - More contour point use - - src/hb-font.cc | 1 + - src/hb-ot-layout-gdef-private.hh | 8 +++++--- - src/hb-ot-layout-gpos-private.hh | 13 +++++++++---- - 3 files changed, 15 insertions(+), 7 deletions(-) - -commit 3840b6b50503ba2c9a99f774284e0077baffa8a0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 29 03:48:27 2010 -0400 - - [gdef] Fix delta scale - - src/hb-ot-layout-gdef-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4ac6cc284b2c1eb670c2a3659ec385ed729acac4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 29 03:48:11 2010 -0400 - - [gdef] Fix rounding - - src/hb-ot-layout-gdef-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit b52fbb1bab608bda76efb936f08344afaec600a1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 29 03:47:00 2010 -0400 - - [gdef] Implement getting contour point - - src/hb-ot-layout-gdef-private.hh | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 4c5fbae011a33b9efef5aedd61c357fc0ded1113 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 29 03:39:39 2010 -0400 - - Make sure mirroring is done in original direction - - Reported by Jonathan Kew. - - src/hb-shape.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit ce23c9234b87513d6460fb89bad178fb8537e161 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 29 03:31:03 2010 -0400 - - Use BCP47 private-use tags for OpenType tag language string mapping - - src/hb-ot-tag.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - -commit eaf1d9a46c4a320f3b0026c0a610f95a620d566f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 29 03:11:32 2010 -0400 - - Minor - - src/hb-ot-tag.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 3a4784fe88a0f14147ccdd3633952c9c0f3ae8f3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 29 02:58:38 2010 -0400 - - Fix bug in hb_language_from_string() - - Reported by Jonathan Kew. - - src/hb-language.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 602e4f8d5512cdf48c696ad64ad62ff97f6dbdcc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 29 02:28:54 2010 -0400 - - Use const_cast - - src/hb-open-type-private.hh | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit abff3580a5b229641086e0da097efee11d22ff81 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 29 02:27:20 2010 -0400 - - Add const - - src/hb-object-private.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6617eada95928457a25e29f793f1a93c6b3edaec -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 29 02:25:30 2010 -0400 - - Rename apply_context -> context - - src/hb-ot-layout-gpos-private.hh | 22 +++++++++++----------- - src/hb-ot-layout-gsub-private.hh | 26 +++++++++++++------------- - src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++------ - 3 files changed, 30 insertions(+), 30 deletions(-) - -commit b4c7fab762935b9c182b3e2ac3415f29fc6a5558 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 29 02:24:25 2010 -0400 - - Rename - - src/hb-ot-layout-gpos-private.hh | 98 - +++++++++++++++++----------------- - src/hb-ot-layout-gsub-private.hh | 46 ++++++++-------- - src/hb-ot-layout-gsubgpos-private.hh | 12 ++-- - 3 files changed, 78 insertions(+), 78 deletions(-) - -commit 1376fb7bf9ef07970f0ba13dc64d6a8ab8252762 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 29 02:19:21 2010 -0400 - - [apply] Use a context object to reduce number of parameters passed - around - - src/hb-open-type-private.hh | 5 +-- - src/hb-ot-layout-gpos-private.hh | 26 +++++++++++++---------- - src/hb-ot-layout-gsub-private.hh | 37 - ++++++++++++++++++--------------- - src/hb-ot-layout-gsubgpos-private.hh | 29 ++++++++++++++------------ - 4 files changed, 53 insertions(+), 44 deletions(-) - -commit 173fde7087c0db3e99409f1119530477c14072f5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 29 01:47:30 2010 -0400 - - Further simplify tracing - - src/hb-open-type-private.hh | 31 - +++++++++++++++---------------- - src/hb-ot-layout-gpos-private.hh | 9 +++++---- - src/hb-ot-layout-gsub-private.hh | 11 ++++++----- - src/hb-ot-layout-gsubgpos-private.hh | 8 -------- - 4 files changed, 26 insertions(+), 33 deletions(-) - -commit bc200457430c083914a64bf4b056153506749610 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 29 01:40:26 2010 -0400 - - Simplify trace code - - src/hb-open-type-private.hh | 41 ++++++++--------------------- - src/hb-ot-layout-gsubgpos-private.hh | 25 ++++------------- - src/hb-private.h | 48 - ++++++++++++++++++++++++---------- - 3 files changed, 51 insertions(+), 63 deletions(-) - -commit 807c5b03a2251a3c29a520852639421783101b55 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 28 20:25:22 2010 -0400 - - [sanitize] Make debug code always available to the compiler - - Such that we don't break debug build all the time. - - src/hb-open-type-private.hh | 31 - ++++++++++++++++++++----------- - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - 2 files changed, 21 insertions(+), 12 deletions(-) - -commit 74e313c016704e1d9157c2763691c4151f049dfc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 28 15:15:09 2010 -0400 - - [gsubgpos] Make debug code always available to the compiler - - Such that we don't break debug build all the time. - - src/hb-ot-layout-gsubgpos-private.hh | 52 - +++++++++++++++++----------------- - 1 files changed, 26 insertions(+), 26 deletions(-) - -commit 41011a6ed7c4891b20c0eddbb6d4ad9c820cfddb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 28 13:33:09 2010 -0400 - - Fix compiler warning about value unused - - src/hb-object-private.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 863df68e894b7644dcd12da88aa22f73edf829dc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 28 13:29:55 2010 -0400 - - [object] Make debug code always available to the compiler - - Such that we don't break debug build all the time. - - src/hb-object-private.h | 42 +++++++++++++++++++++++++++--------------- - 1 files changed, 27 insertions(+), 15 deletions(-) - -commit 1d52151a19ed8ec776276aac5cc6ce3769e0d947 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 28 13:18:41 2010 -0400 - - Minor - - src/hb-private.h | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit 444fffb1ab378cb3022e2a8e9f90d20a00c82f6a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 28 13:16:38 2010 -0400 - - [blob] Make debug code always available to the compiler - - Such that we don't break debug build all the time. - - src/hb-blob.c | 78 - +++++++++++++++++++++++--------------------------------- - 1 files changed, 32 insertions(+), 46 deletions(-) - -commit ba51b25c7ba568aeced17f016eceba987569c5d9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 28 13:10:36 2010 -0400 - - Fix build. Ouch! - - src/hb-object-private.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit a92f0fda7fee9d60b399b8865541bf73e6e30141 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 28 13:09:40 2010 -0400 - - Fix debug build - - src/hb-open-type-private.hh | 4 ++-- - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit c165f25410f817d248ad5d07e1827d33efd1b0a0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 27 23:28:10 2010 -0400 - - [object] Actually handle malloc() failure - - Caught by John Daggett. - - src/hb-object-private.h | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit caff7db93d205e32a535d49e51a3cad70f91dfdd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 26 10:07:35 2010 -0400 - - Fix Device::get_size() calculation - - src/hb-ot-layout-common-private.hh | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 66d6eb30eb0b8d61e00f86ea0c7829abaddb52fa -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Apr 25 23:01:45 2010 -0400 - - Rename Var to Obj - - src/hb-open-type-private.hh | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 690b9194619589c32ffc0c092e45262ae7776e79 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Apr 25 22:51:05 2010 -0400 - - Remove use of flexible arrays - - Also remove wrong ASSERT_SIZE that would trigger only when not using - flexible arrays (which was the case on win32, but not with gcc). - - configure.ac | 2 -- - src/hb-open-file-private.hh | 1 - - src/hb-private.h | 4 ---- - 3 files changed, 0 insertions(+), 7 deletions(-) - -commit 1cebfbb0636b13dc5dc6a4b8b7acbb7da28129d2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 23 20:49:18 2010 -0400 - - Cleanup hb_face_create_for_data() - - src/Makefile.am | 1 + - src/hb-blob-private.h | 57 ++++++++++++++++++++++++++++++ - src/hb-blob.c | 20 +--------- - src/hb-font-private.h | 3 -- - src/hb-font.cc | 92 - +++++++++++++++++++++++++++++++++--------------- - 5 files changed, 123 insertions(+), 50 deletions(-) - -commit d6b3c83a90f60bedb4049750ffb351161710980d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 23 19:59:53 2010 -0400 - - Allow get_table() to return NULL - - src/hb-font.cc | 6 +++++- - src/hb-ft.c | 2 +- - 2 files changed, 6 insertions(+), 2 deletions(-) - -commit ad3653751b1e4a03f7058200cb83f64db46722d5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 23 19:43:40 2010 -0400 - - Typo - - src/hb-open-type-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 990443e5f282ad61de00dcf1ebff9cf1d5bc2d70 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 23 17:53:32 2010 -0400 - - Remove lock_instance() - - src/hb-font.cc | 2 +- - src/hb-open-type-private.hh | 4 ---- - src/hb-ot-layout.cc | 6 +++--- - 3 files changed, 4 insertions(+), 8 deletions(-) - -commit 187454c595559ce48d072fee6bccb51f3de283d4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 23 16:35:01 2010 -0400 - - Add different casts from pointer and ref to avoid bugs - - src/hb-open-type-private.hh | 22 +++++++++++++++------- - src/hb-ot-layout-gpos-private.hh | 8 ++++---- - src/hb-ot-layout-gsub-private.hh | 12 ++++++------ - src/main.cc | 6 +++--- - 4 files changed, 28 insertions(+), 20 deletions(-) - -commit efb324a46ff64adb4ec8612b4089e8daff1e6d8e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 23 16:22:54 2010 -0400 - - Remove GET_FOR_DATA macros - - The major-version check is now handled by sanitize. If major - doesn't match, we reject and fall back to the Null object. - - src/hb-open-file-private.hh | 4 ---- - src/hb-open-type-private.hh | 23 ++--------------------- - src/hb-ot-layout-gdef-private.hh | 2 -- - src/hb-ot-layout-gpos-private.hh | 3 --- - src/hb-ot-layout-gsub-private.hh | 3 --- - src/hb-ot-layout-gsubgpos-private.hh | 2 -- - src/main.cc | 6 +++--- - 7 files changed, 5 insertions(+), 38 deletions(-) - -commit f1aaa2a43654c28405ffd393de2cb127437c99a5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 23 15:19:50 2010 -0400 - - Add TODO - - src/hb-ft.c | 2 -- - src/hb-ft.h | 1 + - src/hb-open-file-private.hh | 2 +- - src/hb-open-type-private.hh | 2 ++ - src/hb-ot-layout-common-private.hh | 12 ++++++------ - 5 files changed, 10 insertions(+), 9 deletions(-) - -commit 33d4d4325e15e332105ea8f361bab79ee542f0f8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 23 14:56:55 2010 -0400 - - Zero glyph metrics before calling user callback - - src/hb-font.cc | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 4206e9511a222c0c50cc9b4fe72ec421983bba2c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 23 14:44:55 2010 -0400 - - More warning fixes - - src/hb-ot-layout.cc | 4 ++-- - src/hb-ot-shape.c | 9 ++++----- - src/hb-shape.c | 32 ++++++++++++++++---------------- - 3 files changed, 22 insertions(+), 23 deletions(-) - -commit ef66ebeabc6c234004bd9e9bb67eb5c9711f4a1e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 23 14:40:36 2010 -0400 - - Remove unused parameter - - src/hb-open-file-private.hh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 1d720192b193f48b44be0385eda3c2c5d5cd28ad -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 23 14:39:10 2010 -0400 - - Fix compile warnings (HB_GNUC_UNUSED) - - src/hb-buffer.c | 6 +++--- - src/hb-font.cc | 31 ++++++++++++++++++++++--------- - src/hb-ft.c | 29 +++++++++++++++++++++-------- - src/hb-open-type-private.hh | 2 +- - src/hb-unicode.c | 8 ++++---- - 5 files changed, 51 insertions(+), 25 deletions(-) - -commit 8dfdca599c0a3ba5255131002910bca3b381acac -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 23 14:07:34 2010 -0400 - - No need to keep blob in sanitize context - - src/hb-open-type-private.hh | 13 +++++-------- - 1 files changed, 5 insertions(+), 8 deletions(-) - -commit 254933c397f1ce9796f59689a25f9fc2e58df4ea -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 23 13:57:10 2010 -0400 - - When sanitizing, delay making writable - - Before, as soon as we needed to make an edit, we tried to make - the blob - writable inplace. That grows code unnecessarily though. We can - simply - fail, make writable, then start again. That's indeed what the - fallback - was doing anyway. - - src/hb-open-type-private.hh | 11 +++++++---- - 1 files changed, 7 insertions(+), 4 deletions(-) - -commit 71e735e915c85536ee4d3035576f7426e8cd19dd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 23 13:48:06 2010 -0400 - - [blob] Fallback to copying if mprotect() fails - - src/hb-blob.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 1aa4666b914da7747fc58a8f6f2d913c94e3b8da -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 23 13:32:03 2010 -0400 - - Cleanup OpenTypeFontFile - - src/hb-open-file-private.hh | 44 - +++++++++++++++++++++++++----------------- - src/main.cc | 2 +- - 2 files changed, 27 insertions(+), 19 deletions(-) - -commit ae4190cafe927649f8ff8be6a0082478d1298fda -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 23 12:33:02 2010 -0400 - - Properly define separate structs for TTCHeader and TTCHeaderVersion1 - - src/hb-open-file-private.hh | 71 - +++++++++++++++++++++++++++++++++---------- - 1 files changed, 55 insertions(+), 16 deletions(-) - -commit a065f471b3bc23d33ef75217308efeaed4ffd033 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 20:15:11 2010 -0400 - - Cleanup Extension lookups - - Two things: - - 1. Allow nested Extension lookups. The offset is always positive, so - it can't loop circularly. - - 2. Move the check for all Extension subtables having the same lookup - type to the correct place. Before it wasn't really working. - - src/hb-ot-layout-gpos-private.hh | 29 +------------------ - src/hb-ot-layout-gsub-private.hh | 57 - +++++++++++++++++++++---------------- - 2 files changed, 33 insertions(+), 53 deletions(-) - -commit a0bb49c5830f8a7f25d573ec57b79df2620ddba7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 18:47:03 2010 -0400 - - Add comment re bsearch effect on sanitize - - src/hb-open-file-private.hh | 2 +- - src/hb-ot-layout-common-private.hh | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -commit d632ec4000b3079150e6424e88a3ab7509f7445c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 18:33:12 2010 -0400 - - Cosmetic - - src/hb-open-type-private.hh | 6 +++--- - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit a3263aa773ad7a914496792466c69047048b093c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 18:29:09 2010 -0400 - - Convert the last set of cast macros to templates - - src/hb-open-file-private.hh | 4 +- - src/hb-open-type-private.hh | 53 - +++++++++++++++++++++------------ - src/hb-ot-layout-gpos-private.hh | 16 +++++----- - src/hb-ot-layout-gsub-private.hh | 14 ++++---- - src/hb-ot-layout-gsubgpos-private.hh | 12 ++++---- - 5 files changed, 57 insertions(+), 42 deletions(-) - -commit c38188a1912f72d9ef90ae1bcbdbba7ecce63371 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 16:52:09 2010 -0400 - - Remove unused macro - - src/hb-open-type-private.hh | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 3b2c2df41b90f2a1d9e33b3dc15a92cff58a689a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 16:51:42 2010 -0400 - - Cleanup Extension sanitize() - - src/hb-ot-layout-common-private.hh | 20 +++----------------- - src/hb-ot-layout-gpos-private.hh | 20 +++++++++++++------- - src/hb-ot-layout-gsub-private.hh | 20 +++++++++++++------- - src/hb-ot-layout-gsubgpos-private.hh | 13 ++++--------- - 4 files changed, 33 insertions(+), 40 deletions(-) - -commit 1856184b93760a1a54fb1a3c54281bb252df7ce6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 14:15:11 2010 -0400 - - Fail sanitize on major version mismatch - - We handle major-version differences via get_for_data(), so sanitize - should never see a major version mismatch. - - src/hb-open-file-private.hh | 4 ++-- - src/hb-ot-layout-gdef-private.hh | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - 3 files changed, 4 insertions(+), 4 deletions(-) - -commit df3f505dcfeefc8cd395900b116767d22549f756 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 14:11:33 2010 -0400 - - More sanitize cleanup - - src/hb-open-file-private.hh | 24 ++---------------------- - src/main.cc | 4 ++-- - 2 files changed, 4 insertions(+), 24 deletions(-) - -commit 278a91f0cd802ac817c2603429bae1fa4a350ea0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 13:59:39 2010 -0400 - - Minor cleanup of sanitize - - Done with an audit of all sanitize() - - src/hb-ot-layout-gpos-private.hh | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) - -commit 9ac7dc73bc24b6dafb94df5de9cbf8fa0c82d5bc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 13:50:22 2010 -0400 - - Check for (impossible) overflow - - src/hb-ot-layout-gpos-private.hh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 9fc8684fd85ef6ec82b3b54323761bbdd4c3d891 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 13:37:58 2010 -0400 - - Cleanup ContextFormat3 sanitize - - src/hb-ot-layout-gsubgpos-private.hh | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit e77302c61f1f1620d1f438a997575fa6ee5c172e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 13:34:00 2010 -0400 - - Add comment - - src/hb-ot-layout-common-private.hh | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 7c469c3ca4ed4e45c50eff70df59b1a4780bae5b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 13:26:21 2010 -0400 - - Minor - - src/hb-ot-layout-common-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit dc228048a813e43356373505168d3822deea5d72 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 13:22:41 2010 -0400 - - Remove integrity check in Tag sanitize - - Serves no useful purpose. - - src/hb-open-type-private.hh | 9 --------- - src/hb-ot-layout-common-private.hh | 2 +- - 2 files changed, 1 insertions(+), 10 deletions(-) - -commit 8015a8c762dc7be36998d529b7a3af59e3d14d87 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 11:06:30 2010 -0400 - - Don't sanitize raw table data - - That part is performed by individual table sanitize. - - src/hb-open-file-private.hh | 15 +++++++++------ - 1 files changed, 9 insertions(+), 6 deletions(-) - -commit c293581e962b7982622e7d607fa3909b40da718e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 11:15:46 2010 -0400 - - Add coment - - src/hb-open-type-private.hh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 1faa76c6e848c6b0e360d9ddcf567533b87f8f31 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 10:54:26 2010 -0400 - - Remove unnecessary casts - - src/hb-open-type-private.hh | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 079dc40112d3908ff7b7028ea3019bfe82bf606d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 10:47:12 2010 -0400 - - Avoid overflow in TableDirectory sanitize - - src/hb-open-file-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit fb5904ec935d925a423401bc975ffaa22022ce1b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 10:43:30 2010 -0400 - - Make casts more explicit - - src/hb-ot-layout-gpos-private.hh | 4 ++-- - src/hb-ot-layout-gsub-private.hh | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit 565c80bd2960366ace2d10dd71beaaf2a80213c8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 10:26:35 2010 -0400 - - Make sure semicolon is expected after DEFINE_NULL_DATA() - - src/hb-open-type-private.hh | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit bb1e16335e537231246f44740f73cc23c0707364 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 01:01:35 2010 -0400 - - Improve Subst/Pos SubTable access and sanitize - - src/hb-ot-layout-gpos-private.hh | 4 ++-- - src/hb-ot-layout-gsub-private.hh | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit 81f2af40f9afd5bb9695018e6baddcd4aa3361c1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 00:58:49 2010 -0400 - - Simplify Extension offset now that our int types have no alignment - - src/hb-ot-layout-gsubgpos-private.hh | 9 +++------ - 1 files changed, 3 insertions(+), 6 deletions(-) - -commit 19828ad42d8117563412aae3c70887aa117805a9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 00:49:16 2010 -0400 - - Sanitize shallow in Lookup since the generic SubLookup has no methods - - src/hb-ot-layout-common-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e5546a4352c54311ac4a9ef138b187378155ebe1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 00:45:42 2010 -0400 - - Watch for overflow in Array sanitize - - src/hb-open-type-private.hh | 21 +++++++++++++++------ - src/hb-ot-layout-common-private.hh | 2 +- - 2 files changed, 16 insertions(+), 7 deletions(-) - -commit 4f5f1c34dda1e0629bfa6d7b0ffa2e1ce003b7c7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 00:27:39 2010 -0400 - - Rename const_sub_array to sub_array since all consts are implicit now - - src/hb-open-type-private.hh | 2 +- - src/hb-ot-layout-common-private.hh | 4 ++-- - src/hb-ot-layout-gdef-private.hh | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) - -commit 0795b784dd1009976c185482a376df250167e73b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 00:23:14 2010 -0400 - - Cosmetic - - src/hb-ot-layout-common-private.hh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 2d98d3bbaa0ddadcb08b5a8f437b18c211c50768 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 00:19:30 2010 -0400 - - Simplify Lookup sanitize - - src/hb-ot-layout-common-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c755cb3e3ac55156d0d2ec05adea7a650b97cc41 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 22 00:11:43 2010 -0400 - - Change header comment - - README | 2 +- - src/hb-blob.c | 2 +- - src/hb-blob.h | 2 +- - src/hb-buffer-private.h | 2 +- - src/hb-buffer.c | 2 +- - src/hb-buffer.h | 2 +- - src/hb-common.h | 2 +- - src/hb-font-private.h | 2 +- - src/hb-font.cc | 2 +- - src/hb-font.h | 2 +- - src/hb-ft.c | 2 +- - src/hb-ft.h | 2 +- - src/hb-glib.c | 2 +- - src/hb-glib.h | 2 +- - src/hb-icu.c | 2 +- - src/hb-icu.h | 2 +- - src/hb-language.c | 2 +- - src/hb-language.h | 2 +- - src/hb-object-private.h | 2 +- - src/hb-open-file-private.hh | 2 +- - src/hb-open-type-private.hh | 2 +- - src/hb-ot-layout-common-private.hh | 2 +- - src/hb-ot-layout-gdef-private.hh | 2 +- - src/hb-ot-layout-gpos-private.hh | 2 +- - src/hb-ot-layout-gsub-private.hh | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - src/hb-ot-layout-private.h | 2 +- - src/hb-ot-layout.cc | 2 +- - src/hb-ot-layout.h | 2 +- - src/hb-ot-shape-private.h | 2 +- - src/hb-ot-shape.c | 2 +- - src/hb-ot-tag.c | 2 +- - src/hb-ot-tag.h | 2 +- - src/hb-ot.h | 2 +- - src/hb-private.h | 2 +- - src/hb-shape.c | 2 +- - src/hb-shape.h | 2 +- - src/hb-unicode-private.h | 2 +- - src/hb-unicode.c | 2 +- - src/hb-unicode.h | 2 +- - src/hb.h | 2 +- - src/main.cc | 2 +- - 42 files changed, 42 insertions(+), 42 deletions(-) - -commit 243d20e011e251462a07947275e0e98cc19c7e9b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 23:57:01 2010 -0400 - - More cast simplification - - src/hb-open-type-private.hh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 0dfcc13a4668cdd2c2ebdd5f4a7540a51222cf2f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 23:41:26 2010 -0400 - - Rename ConstCharP to CharP (overloaded now) - - src/hb-open-file-private.hh | 10 +++++----- - src/hb-open-type-private.hh | 24 ++++++++++++------------ - src/hb-ot-layout-gpos-private.hh | 12 ++++++------ - src/hb-ot-layout-gsub-private.hh | 4 ++-- - src/hb-ot-layout-gsubgpos-private.hh | 14 +++++++------- - 5 files changed, 32 insertions(+), 32 deletions(-) - -commit 62c0fd75737a69721dbf29e773405a4c529f8b6d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 23:30:48 2010 -0400 - - Cleanup de-const-casting during sanitize - - src/hb-open-file-private.hh | 2 +- - src/hb-open-type-private.hh | 29 ++++++++++++++--------------- - src/hb-ot-layout-common-private.hh | 4 ++-- - src/hb-ot-layout-gpos-private.hh | 12 ++++++------ - 4 files changed, 23 insertions(+), 24 deletions(-) - -commit dd155870567cfb9647b2e71593ace8b2705d7cff -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 23:13:33 2010 -0400 - - Add more comments - - src/hb-open-type-private.hh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit c85c3620675f38ffdca59134aeec2641485f40ca -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 23:12:54 2010 -0400 - - Add comment - - src/hb-open-type-private.hh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 2467c669c2aee4de2a6621a9d06cba0262376d41 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 23:11:45 2010 -0400 - - Add comment - - src/hb-open-type-private.hh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 29c3f5e1b6212c775a7b911becd44ba093b7b0eb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 23:01:00 2010 -0400 - - Improve comment - - src/hb-open-type-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 01c01618e98283611628cd54d5ba4bf122f24cd9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 22:49:56 2010 -0400 - - Further simplify IntType struct defs - - src/hb-open-type-private.hh | 21 ++++++++++++--------- - 1 files changed, 12 insertions(+), 9 deletions(-) - -commit 2cb08458f674301cde9d962c13911035a251f7c5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 22:37:31 2010 -0400 - - Rename const_array() to array() (overloaded) - - src/hb-open-type-private.hh | 12 ++++++------ - src/hb-ot-layout-common-private.hh | 4 ++-- - src/hb-ot-layout-gsub-private.hh | 6 +++--- - src/hb-ot-layout-gsubgpos-private.hh | 16 ++++++++-------- - 4 files changed, 19 insertions(+), 19 deletions(-) - -commit 2e2f43edf2f49f4047e28b1ce2ea95938536de9c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 22:30:36 2010 -0400 - - Remove ArrayAfter, use StructAfter in place - - src/hb-open-type-private.hh | 21 ++++++--------------- - 1 files changed, 6 insertions(+), 15 deletions(-) - -commit e961c86c579fd98ee604342a9c70c4e7f8d4f220 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 15:56:11 2010 -0400 - - Convert NEXT() and ARRAY_AFTER() macros to templates - - src/hb-open-type-private.hh | 40 - ++++++++++++++++++++++++--------- - src/hb-ot-layout-common-private.hh | 4 +- - src/hb-ot-layout-gsub-private.hh | 8 +++--- - src/hb-ot-layout-gsubgpos-private.hh | 24 ++++++++++---------- - 4 files changed, 47 insertions(+), 29 deletions(-) - -commit 198facdc55756cb48cdfb8ba7fa50916fac54ec3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 13:35:36 2010 -0400 - - Use templates for const char * casts - - src/hb-open-file-private.hh | 12 ++++---- - src/hb-open-type-private.hh | 48 - +++++++++++++++++----------------- - src/hb-ot-layout-common-private.hh | 2 +- - src/hb-ot-layout-gpos-private.hh | 32 +++++++++++----------- - src/hb-ot-layout-gsub-private.hh | 4 +- - src/hb-ot-layout-gsubgpos-private.hh | 14 +++++----- - 6 files changed, 56 insertions(+), 56 deletions(-) - -commit 1922ffe7013c46014803a9f18c42e193a25b1968 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 04:19:51 2010 -0400 - - Const correctness - - src/hb-ot-layout-gsub-private.hh | 4 ++-- - src/hb-ot-layout-gsubgpos-private.hh | 30 - +++++++++++++++--------------- - 2 files changed, 17 insertions(+), 17 deletions(-) - -commit e032ed9f75d4a0f365649a25706871bbb5ae6651 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 03:11:46 2010 -0400 - - Use templates for defining int typess - - src/hb-open-type-private.hh | 66 - ++++++++++++++++++++++++++++-------------- - src/hb-private.h | 10 +----- - 2 files changed, 46 insertions(+), 30 deletions(-) - -commit 2c9fd2adce5a6a9dcd62c874bd64613ea68d8d9b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 02:15:39 2010 -0400 - - Remove unused macro - - src/hb-open-type-private.hh | 15 --------------- - 1 files changed, 0 insertions(+), 15 deletions(-) - -commit 7a52f281178867379adb6e6c6fb0022102f75d17 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 02:14:44 2010 -0400 - - Rename macros - - src/hb-open-type-private.hh | 6 +++--- - src/hb-private.h | 30 +++++++++++++++--------------- - 2 files changed, 18 insertions(+), 18 deletions(-) - -commit ffff7dc44cb2a35a60f92831165e9d3c3a61ce19 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 02:13:55 2010 -0400 - - Minor - - src/hb-private.h | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit f60f2166c48d07f556ff83f04e95181946eb03df -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 02:12:45 2010 -0400 - - Move macros around - - src/hb-private.h | 122 - +++++++++++++++++++++++++++-------------------------- - 1 files changed, 62 insertions(+), 60 deletions(-) - -commit 649a4344ca363da3d44cdd908350449ec40ed0f9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 02:11:59 2010 -0400 - - Remove unused macros - - src/hb-private.h | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) - -commit eba8b4f644701cc6b78b0fcb4e932dce15561598 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Mar 29 00:04:12 2010 -0400 - - GNOME Bug 613015 - [HB] Does not sanitize Device tables referenced - from ValueRecords - - src/hb-ot-layout-gpos-private.hh | 47 - +++++++++++++++++++++++++++++--------- - 1 files changed, 36 insertions(+), 11 deletions(-) - -commit 673a4efcbc72a62105a24d9b0b54047417160f7d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 02:02:57 2010 -0400 - - WIP - - src/hb-ot-layout-gpos-private.hh | 102 - ++++++++++++++++++++++++++++++-------- - 1 files changed, 81 insertions(+), 21 deletions(-) - -commit 40d73bc68dd828cf68f90fde0f9499a6ce9fbb19 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 00:49:40 2010 -0400 - - Improve comments - - src/hb-open-type-private.hh | 22 ++++++++++++++-------- - 1 files changed, 14 insertions(+), 8 deletions(-) - -commit 394bad41a76f90e441e327cef76efb99997e9ae0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 00:40:50 2010 -0400 - - Remove stale TODO item - - src/hb-open-type-private.hh | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 9d3677899f90abdc7fb3e3d854db654a8707a84b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 00:32:47 2010 -0400 - - Use a function template instead of struct template for Null - - src/hb-open-type-private.hh | 24 ++++++++++-------------- - 1 files changed, 10 insertions(+), 14 deletions(-) - -commit ffd321afd91429c5de7ab03d71ef1030044f53cb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 21 00:14:12 2010 -0400 - - Simplify Tag struct - - src/hb-open-file-private.hh | 3 ++- - src/hb-open-type-private.hh | 6 +----- - src/hb-ot-layout-common-private.hh | 3 ++- - 3 files changed, 5 insertions(+), 7 deletions(-) - -commit 00e23fcc6fd0eee5c582251bf3de6a2703fbbd3e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 20 23:50:45 2010 -0400 - - Cosmetic - - src/hb-open-type-private.hh | 8 ++++---- - src/hb-ot-layout-common-private.hh | 6 +++--- - 2 files changed, 7 insertions(+), 7 deletions(-) - -commit a87072db5d41e25b2e31191545298bca4838c65c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 20 15:52:47 2010 -0400 - - Fix Class operator return type - - src/hb-ot-layout-common-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f9b37727985191c9b4aedb0e9835736027e59260 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 20 15:51:53 2010 -0400 - - Add couple consts to operators - - src/hb-open-type-private.hh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 53d237ec6352d7c6fab3b2805b48154a25506beb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Apr 20 15:25:27 2010 -0400 - - Remove ASSERT_SIZE_DATA - - src/hb-open-type-private.hh | 4 ---- - src/hb-ot-layout-common-private.hh | 9 ++++++--- - 2 files changed, 6 insertions(+), 7 deletions(-) - -commit 06558d2a745b8f3af11a8d6dce956ae52187a7e5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 19 02:34:10 2010 -0400 - - Round instead of trunc - - src/hb-ot-layout-gpos-private.hh | 20 ++++++++++---------- - src/hb-private.h | 2 +- - 2 files changed, 11 insertions(+), 11 deletions(-) - -commit 0e206de98621ed8a55824b42e9e6bf320f4c6cc8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 19 02:29:04 2010 -0400 - - Fix warnings - - src/hb-open-type-private.hh | 2 +- - src/hb-ot-layout-gdef-private.hh | 2 +- - src/hb-ot-layout-gpos-private.hh | 4 ++-- - src/hb-ot-layout-gsubgpos-private.hh | 6 +++--- - 4 files changed, 7 insertions(+), 7 deletions(-) - -commit d5943407a4251cb947fbfc130c0facb2f6216bd6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Apr 19 02:27:56 2010 -0400 - - Fix debug build - - src/hb-open-type-private.hh | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 12b27ed91de0192deee4e9feffcaf4aca4c78113 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Mar 27 17:00:19 2010 -0400 - - Fix leak when duplicating blob - - src/hb-blob.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit 4b8487d83e0c10076a6c573cb3487790ce366607 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Mar 16 03:46:17 2010 -0400 - - Fix the mystery bug! - - A couple bugs joined forces to exhibit the mystery behavior of - crashes / infinite loops on OS X / wrong kerning / invalid memory - access. Pooh! - - The bugs were involved: - - - Wrong pointer math with ValueRecord in PairPosFormat1 - - - Fallout from avoiding flex arrays, code not correctly updated - to remove sizeof() usage. - - We strictly never use sizeof() directly now. And the PairPos code - is cleaned up. Should fix them all. Bugs are: - - Bug 605655 - Pango 1.26.2 introduces kerning bug - Bug 611229 - Pango reads from uninitialized memory - Bug 593240 - (pangoosx) Crash / infinite loop with Mac OS X - - We were also doing wrong math converting Device adjustments to - hb_position_t. Fallout from FreeType days. Should shift 16, not - 6. Fixed that too. - - There's still another bug: we don't sanitize Device records - referenced from value records. Fixing that also. - - src/hb-open-file-private.hh | 4 ++- - src/hb-open-type-private.hh | 11 +++++---- - src/hb-ot-layout-common-private.hh | 10 +++++++- - src/hb-ot-layout-gpos-private.hh | 37 - +++++++++++++++++++-------------- - src/hb-ot-layout-gsubgpos-private.hh | 15 +++++++------ - 5 files changed, 46 insertions(+), 31 deletions(-) - -commit 9b39755d104603d1163738f77637cc1923d4055b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 15 14:00:25 2010 -0400 - - Typo - - src/hb-open-type-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit f85ec1c7da36d2c2c9b1c94a988563697dcc79c9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Mar 10 04:14:40 2010 -0500 - - Cosmetic - - src/hb-open-type-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e48ed72230a83499dabbd02af2ac63340220a353 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Mar 1 22:33:45 2010 -0500 - - [ft] Check stream->read instead of stream->base - - The former is more robust. See discussion on freetype-devel. - - src/hb-ft.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 917c227500305aee543981ad24a39f868c5ca0b7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Feb 23 16:47:51 2010 -0500 - - Make blob unlocking 64bit-safe - - GNOME Bug 604128 - Applications crash when displaying Hebrew - characters - - src/hb-blob.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit ecd2e996d2137fef30011a41dd57ea45f9a796de -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Feb 23 02:42:00 2010 -0500 - - Improve the alignment for NullPool - - src/hb-open-type-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bc7830e4259755ce7549025c6f5bf750e78c2ff1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Feb 17 15:14:57 2010 -0500 - - Use __attribute__((unused)) only with gcc 4 and later - - See discussion at: - https://bugzilla.gnome.org/show_bug.cgi?id=610183 - - src/hb-private.h | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -commit 555d11273ee4c30e84eda3a78ffadb3ee7da65d0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jan 26 12:58:59 2010 -0500 - - [GDEF] Fix bug in building synthetic GDEF - - src/hb-ot-layout.cc | 5 +++-- - src/hb-ot-layout.h | 1 - - 2 files changed, 3 insertions(+), 3 deletions(-) - -commit 70834d89c30a56fcd78825fbc28fc9c6bec31124 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jan 26 12:17:37 2010 -0500 - - [TODO] Add kern/GPOS interaction - - TODO | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit cd11a98fa1426e9dbc4b61e702913b23a4794ae2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Dec 20 23:05:02 2009 +0100 - - Fix compile with older FreeType - - configure.ac | 7 +++++++ - src/hb-ft.c | 2 ++ - 2 files changed, 9 insertions(+), 0 deletions(-) - -commit 7f7448a354c43650348b4e91b4e40ecf18718d66 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Dec 20 21:42:14 2009 +0100 - - Indent - - src/hb-ot-layout-gpos-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit e70f45eb522bcb41388cc218b79bbd6aaecf8050 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Dec 20 21:26:24 2009 +0100 - - Revert "Fallback to 'kern' if no GPOS applied" - - This reverts commit d740c8f78bcbe80a8bcd8a9468830a406da37cc0. - - The change is wrong. If there is a GPOS table, we should not use - 'kern'. - - src/hb-ot-shape.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit d740c8f78bcbe80a8bcd8a9468830a406da37cc0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Dec 20 21:23:56 2009 +0100 - - Fallback to 'kern' if no GPOS applied - - src/hb-ot-shape.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 2f78c17197892b2bdc2f64caeb1c1c806ef44545 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Dec 20 21:03:11 2009 +0100 - - Remove glibism! - - src/hb-ot-shape-private.h | 4 ++-- - src/hb-ot-shape.c | 4 ++-- - src/hb-shape.c | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -commit 907e67da13b5ed719362702138703fe2f90e790d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Dec 20 20:59:51 2009 +0100 - - Oops, add file. - - src/hb-ot-shape-private.h | 53 - +++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 53 insertions(+), 0 deletions(-) - -commit 2014b8d110231b13e524008282ece7451f1ae9e7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Dec 20 20:58:26 2009 +0100 - - Hook OpenType shaping up - - Default features only for now. - - src/Makefile.am | 2 + - src/hb-ot-layout.cc | 28 +++++++++ - src/hb-ot-layout.h | 7 ++ - src/hb-ot-shape.c | 165 - +++++++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-shape.c | 8 +- - 5 files changed, 206 insertions(+), 4 deletions(-) - -commit 196610ba4c7071c2b802d0fc921a63cbc0753114 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Dec 20 19:01:14 2009 +0100 - - Pass features down - - src/hb-shape.c | 49 +++++++++++++++++++++++++++++++++---------------- - 1 files changed, 33 insertions(+), 16 deletions(-) - -commit 51f141a7f38a73f671b23f58cadf97a72c43b625 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Dec 20 18:22:28 2009 +0100 - - Avoid overflow - - src/hb-shape.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 26d7a75752631b2596a5bcb7e645b34cc3d139ab -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Dec 20 17:58:25 2009 +0100 - - Refactor hb_shape a bit - - src/hb-shape.c | 87 - +++++++++++++++++++++++++++++++++++++++++++++++-------- - 1 files changed, 74 insertions(+), 13 deletions(-) - -commit 001fc2d2aa22f14302739fe4ca45f7535855e0fb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Dec 20 17:24:05 2009 +0100 - - Add TrueType kern support - - src/hb-shape.c | 74 - ++++++++++++++++++++++++++++++++++++------------------- - 1 files changed, 48 insertions(+), 26 deletions(-) - -commit 2c1b85cf66e5ecb7521b6018b76f0e161fb68967 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Dec 20 16:29:17 2009 +0100 - - Direct unicode->get_mirroring directly - - src/hb-shape.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 6a2ef5aa5459def232708af30ef8a484906b868b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Dec 20 16:28:01 2009 +0100 - - Do mirroring - - src/hb-shape.c | 18 +++++++++++++++++- - 1 files changed, 17 insertions(+), 1 deletions(-) - -commit 0465e69832393cc1ed36508ec5d597fbab64877a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Dec 20 16:25:18 2009 +0100 - - Protect against NULL funcs - - src/hb-buffer.c | 3 +++ - src/hb-font.cc | 3 +++ - 2 files changed, 6 insertions(+), 0 deletions(-) - -commit 5ceefa1d8dbd310570ea8d1c47107fe8d3dc96d9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Dec 20 15:29:16 2009 +0100 - - Add hb_unicode_get_*() functions - - src/hb-unicode.c | 37 +++++++++++++++++++++++++++++++++++++ - src/hb-unicode.h | 21 +++++++++++++++++++++ - 2 files changed, 58 insertions(+), 0 deletions(-) - -commit b8a53e44ce05911ce98b7cff34dee165e19d87ba -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Dec 20 14:56:25 2009 +0100 - - We'll have to link to libstdc++ if linking to ICU, so disable test - for now - - We have to get rid of the ICU in main lib. Still thinking about - best way - to do it. - - src/Makefile.am | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit 314905d7548d5be58354546d660754b807b6efb2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Dec 20 14:50:42 2009 +0100 - - Explicitly track whether the buffer has positions - - src/hb-buffer-private.h | 3 ++- - src/hb-buffer.c | 27 ++++++++++++++------------- - 2 files changed, 16 insertions(+), 14 deletions(-) - -commit 314b460d8a02ed4b2789ff527cf6c9bc19769114 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Dec 20 13:58:50 2009 +0100 - - Add HB_DIRECTION_IS_FORWARD/BACKWARD - - src/hb-common.h | 2 ++ - src/hb-shape.c | 3 +-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -commit bdd0ff5290bae4db65c3fdf95c5728031f13ca84 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Dec 15 04:07:40 2009 -0500 - - Make main.cc compile without glib - - src/main.cc | 18 ++++++++++++++++-- - 1 files changed, 16 insertions(+), 2 deletions(-) - -commit 8a7d16808200f4fa02d6d12a8b8492bdedeb2c24 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Dec 15 03:53:45 2009 -0500 - - Distribute autogen.sh - - Makefile.am | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 807b8aa486753474e05e09f4fcca8ac94021b97c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 19 20:28:03 2009 -0500 - - Another C++ strictness fix - - Pango Bug 602408 - Invalid C++ code breaks compile with Sun C++ - Compiler - (Error: A union member cannot have a user-defined assignment operator) - - According to the bug: - - C++ Programming Language by Bjarne Stroustrup: Chapter 10.4.12 forbids - explicitly using of union members with constructors, destructors - or assignment - operations. - - So we use a set() method instead of the assignment operator. Ugly, - but hey, - that's life. - - src/hb-open-type-private.hh | 8 ++++---- - src/hb-ot-layout-common-private.hh | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -commit 8b9b866d3e495c186f0530fcf4e00ffcdc170d3f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 19 20:27:57 2009 -0500 - - Fix warning - - src/hb-ot-layout-gdef-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c65b26acf28bd1a5b346fd8f6f28bec1f7d17a2a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 18 11:27:33 2009 -0500 - - Use autoconf FLEXIBLE_ARRAY_MEMBER when available - - configure.ac | 2 ++ - src/hb-ot-layout-gpos-private.hh | 4 ++-- - src/hb-private.h | 13 ++++++++++--- - 3 files changed, 14 insertions(+), 5 deletions(-) - -commit d33f674cb793af40f1612df3660b138383f2de95 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 18 09:47:44 2009 -0500 - - Add Mongolian variation selectors - - src/hb-shape.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit d6387757de2c27867d6f57c4ee7c4ef436b3a74f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 11 17:15:03 2009 -0500 - - Fix sanitize - - src/hb-ot-layout-common-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 636f017e387d46d4083c9f9ee57647a94dc5dc6d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 10 12:56:35 2009 -0500 - - Remove obsolete TODO item - - src/hb-open-file-private.hh | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit bf2b25dd8591e92f3944c763641b613a70c379a7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 6 19:52:47 2009 -0500 - - Remove done item - - src/hb-shape.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 4a8605315901e0ff1e6e09437a92dd5ac39164cc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 6 19:52:01 2009 -0500 - - Reverse buffer at the end if RTL - - src/hb-shape.c | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) - -commit ff44f88df2c46920f3ec2384ef321a4c7bb0f6ef -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 6 19:48:16 2009 -0500 - - Handle shaping in non-native direction - - src/hb-buffer-private.h | 1 + - src/hb-buffer.c | 42 +++++++++++++++++-- - src/hb-buffer.h | 10 +--- - src/hb-common.h | 11 +++++ - src/hb-shape.c | 38 ++++++++++++++++- - src/hb-unicode-private.h | 5 ++ - src/hb-unicode.c | 103 - ++++++++++++++++++++++++++++++++++++++++++++++ - 7 files changed, 196 insertions(+), 14 deletions(-) - -commit b4b4272c8d19ba3e0cb8f12b3b7d1590349e3d14 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 6 17:46:33 2009 -0500 - - Oops, wrong change - - src/hb-ot-layout.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 52ea47767c7c35650ebddfba6ddc8203a3e33d3a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 6 17:45:38 2009 -0500 - - Change order of font and face for API consistency - - src/hb-ot-layout.cc | 14 +++++++------- - src/hb-ot-layout.h | 14 +++++++------- - 2 files changed, 14 insertions(+), 14 deletions(-) - -commit f4f1fc970b3e37d9903cbf5e05bbd38be4df3047 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 6 17:42:38 2009 -0500 - - Remove debug info that crept in - - src/hb-ot-layout.cc | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit aa196d6026b496ec70be3d3588cc8cd2b8ccdb36 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 6 17:23:31 2009 -0500 - - [GSUB] More ligature/component fixing - - We can only reuse the ligid if it belongs to a previous ligature, - not a - component! - - src/hb-ot-layout-gsub-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 25e7ef704633447f109b148620336c42d6fb310e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 6 17:21:01 2009 -0500 - - Add _hb_buffer_add_output_glyphs() that takes codepoint_t* - - src/hb-buffer-private.h | 10 +++++++- - src/hb-buffer.c | 45 - ++++++++++++++++++++++++++++++++++++- - src/hb-ot-layout-gsub-private.hh | 16 ++++++------ - 3 files changed, 60 insertions(+), 11 deletions(-) - -commit 9db8ad75317d589807e7725455f49cafece58d5d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 6 16:47:31 2009 -0500 - - Add hb_ot_layout_position_finish() - - We expect buffer to be setup with default positions before GPOS. - - src/hb-buffer-private.h | 6 +--- - src/hb-buffer.h | 11 +------- - src/hb-ot-layout-gpos-private.hh | 8 +++--- - src/hb-ot-layout.cc | 52 - ++++++++++++++++++++++++++++++++++++++ - src/hb-ot-layout.h | 16 ++++++++--- - 5 files changed, 69 insertions(+), 24 deletions(-) - -commit edb54e9aeca25f4120a69ed3d5562cbb68fdb348 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 6 15:19:22 2009 -0500 - - Fix FT_Face finalizer call - - src/hb-ft.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 3d14528b8b2e7da425a9df7057fc9fb326d8298c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 6 15:13:17 2009 -0500 - - Rename hb_buffer_get_len() to hb_buffer_get_length() - - src/hb-buffer.c | 2 +- - src/hb-buffer.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -commit 1ff7775051559a8ca442be3938450c7ed3817806 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Nov 6 13:52:57 2009 -0500 - - Minor. - - src/hb-shape.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit 3648bdf5b221adfe01ad99714de420b49964921e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 5 20:17:53 2009 -0500 - - Fix FT_Face generic finalizer - - src/hb-ft.c | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit 5a11c875d8c95d480e6f32b57e969ee34ca1940d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 5 20:08:17 2009 -0500 - - Cosmetic - - src/hb-blob.c | 10 ++++++---- - 1 files changed, 6 insertions(+), 4 deletions(-) - -commit 44533e773f75b9a1171d884fcbe91a2f3879e2d8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 5 19:58:02 2009 -0500 - - Fix warning - - src/hb-object-private.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit bcc0406a525ca3fe597aec5f2a97e5c50965d49c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 5 19:54:23 2009 -0500 - - include errno.h - - src/hb-blob.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 799b3c375ad0e1293fd37a0e3a0d422a3166dcd8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 5 19:37:58 2009 -0500 - - Add debugging to object lifecycle - - src/hb-object-private.h | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) - -commit 25edb940ab050545f47a06648e73c192fa213548 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 5 19:20:06 2009 -0500 - - Cosmetic - - src/hb-ft.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 850dc5bb551409bb9bf6113ec2199bb3fb905e43 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 5 18:26:52 2009 -0500 - - Return 0 from get_glyph_nil - - src/hb-font.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 85555a953376ee68a8fcc64485e74d44a353577b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 5 18:25:56 2009 -0500 - - Initialize font->klass - - src/hb-font.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit bcd26bd7b1c96057bf154d7d50a61018d40f0d29 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 5 18:03:26 2009 -0500 - - Add TODO item - - src/hb-ft.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit f4281e0a92a40746fa630fb15b877adaf3ff15b1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 5 17:58:41 2009 -0500 - - Fix ref counting - - src/hb-ft.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) - -commit 6358ff45ae8cfc0b58b4976619319e3dde43add2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 5 17:39:16 2009 -0500 - - Add hb_ft_face_create_cached - - src/hb-ft.c | 16 ++++++++++++++++ - src/hb-ft.h | 3 +++ - 2 files changed, 19 insertions(+), 0 deletions(-) - -commit 2027f74b286cabe3c60c275170c4f4b437a30f55 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 5 16:34:47 2009 -0500 - - Add default positioning to hb-shape - - src/hb-shape.c | 28 ++++++++++++++++++++++++---- - 1 files changed, 24 insertions(+), 4 deletions(-) - -commit c3f9f7e59d865f8664862b7ca99d9a3a9221e456 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 5 16:16:14 2009 -0500 - - Fix MarkMark issue with ligid and components - - src/hb-ot-layout-gpos-private.hh | 11 ++++++----- - src/hb-ot-layout-gsub-private.hh | 6 +----- - 2 files changed, 7 insertions(+), 10 deletions(-) - -commit d0351314cd29fbdf0efb5c7f89a569648f7a7fc7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 5 16:16:06 2009 -0500 - - Include stdio.h if debugging - - src/hb-blob.c | 4 ++++ - src/hb-open-type-private.hh | 1 + - src/hb-ot-layout-gsubgpos-private.hh | 1 + - 3 files changed, 6 insertions(+), 0 deletions(-) - -commit 2e336692913405976392bf505028481a5caa53b4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 5 13:55:41 2009 -0500 - - Add hb_font_get_* - - src/hb-font.cc | 35 +++++++++++++++++++++++++++++++++++ - src/hb-font.h | 18 ++++++++++++++++++ - src/hb-shape.c | 2 +- - 3 files changed, 54 insertions(+), 1 deletions(-) - -commit 9bef3611f07b45ba8199a4a339c72f49d266216a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 5 12:20:11 2009 -0500 - - Rename [xy]_pos to [xy]_offset since we don't accumulate positions - - src/hb-buffer-private.h | 4 +- - src/hb-buffer.h | 4 +- - src/hb-font.h | 4 +- - src/hb-ft.c | 10 ++++---- - src/hb-ot-layout-gpos-private.hh | 40 - +++++++++++-------------------------- - src/hb-shape.c | 14 ++++++------ - src/hb-shape.h | 4 +- - 7 files changed, 32 insertions(+), 48 deletions(-) - -commit 2daa47e9cdbfb027f76765301b3a78950e92eb09 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Nov 5 12:08:34 2009 -0500 - - Cosmetic - - src/hb-shape.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 2f50d873680ce0a43b6ec79df1ac946b91f31e63 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 4 21:07:03 2009 -0500 - - Start filling hb_shape() in - - src/hb-buffer-private.h | 1 + - src/hb-shape.c | 40 +++++++++++++++++++++++++++++++++++++++- - 2 files changed, 40 insertions(+), 1 deletions(-) - -commit ae070b7d39d03bd8bc1244f687b24db505f4af3f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 4 20:29:54 2009 -0500 - - Add script and language to buffer - - TODO | 1 - - src/hb-buffer-private.h | 6 +++--- - src/hb-buffer.c | 26 ++++++++++++++++++++++++++ - src/hb-buffer.h | 15 ++++++++++++++- - 4 files changed, 43 insertions(+), 5 deletions(-) - -commit 8a3511ac6c795226699c2b36e03401ecdf88f5f8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 4 19:45:39 2009 -0500 - - Add hb_language_t as well as language/script conversion to OT tags - - src/Makefile.am | 4 + - src/hb-language.c | 113 +++++++++ - src/hb-language.h | 44 ++++ - src/hb-ot-layout.cc | 6 +- - src/hb-ot-layout.h | 4 +- - src/hb-ot-tag.c | 662 - +++++++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-ot-tag.h | 49 ++++ - src/hb-ot.h | 1 + - src/hb-private.h | 3 + - src/hb.h | 1 + - 10 files changed, 882 insertions(+), 5 deletions(-) - -commit 4591753ad4b5ec0224e3f1befdfe4fc5f6075562 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 4 18:15:59 2009 -0500 - - Define ARRAY_LENGTH - - src/hb-private.h | 15 ++++++++------- - 1 files changed, 8 insertions(+), 7 deletions(-) - -commit 214ac7c1ff51b397d227832526f882e824cb9ea3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 4 18:12:32 2009 -0500 - - Another one - - src/hb-unicode.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 1e91434569a9e9535ef021ca52b60b2e2af75d19 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 4 18:12:09 2009 -0500 - - Minor - - src/hb-open-type-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 48de3730cdf91b9f6473509e22260a902ccec992 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 4 16:59:50 2009 -0500 - - Fix previous commit, ouch! - - src/hb-open-type-private.hh | 12 ++++++++++++ - src/hb-ot-layout-common-private.hh | 12 ++++-------- - src/hb-ot-layout-gdef-private.hh | 12 ++++-------- - 3 files changed, 20 insertions(+), 16 deletions(-) - -commit e21899bc3593aa0d3adf64cee21c5de2ea219783 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 4 16:36:14 2009 -0500 - - Fix array query API - - The array query APIs now all do: - - - Return the total number of items - - Take a start_offset, such that individual items can be fetched - - The _count IN/OUT variable always has number of items written - into the array upon return of the function - - TODO | 1 - - src/hb-ot-layout-common-private.hh | 59 ++++++++++++++---------- - src/hb-ot-layout-gdef-private.hh | 84 - ++++++++++++++++++++-------------- - src/hb-ot-layout-gsubgpos-private.hh | 14 +++-- - src/hb-ot-layout.cc | 40 ++++++++++------ - src/hb-ot-layout.h | 24 ++++++--- - 6 files changed, 131 insertions(+), 91 deletions(-) - -commit 3b59306b858d31d97be0ea8c64461de1d0d03572 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Nov 4 15:48:32 2009 -0500 - - Finish FT glue. Rough and untested - - src/hb-font.cc | 2 +- - src/hb-font.h | 2 +- - src/hb-ft.c | 114 - ++++++++++++++++++++++++++++++-------------------------- - 3 files changed, 63 insertions(+), 55 deletions(-) - -commit f8be443aecd54b479470e6559b1dfbc8f33c5f55 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 3 20:28:27 2009 -0500 - - Add TODO item - - TODO | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 7951279b4a52b48f13631e7838dbc180c7249ea4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 3 20:27:05 2009 -0500 - - Implement nil font functions - - TODO | 1 + - src/hb-font-private.h | 8 ++-- - src/hb-font.cc | 72 - +++++++++++++++++++++++++++++++++++-- - src/hb-font.h | 9 ++--- - src/hb-ot-layout-gpos-private.hh | 7 ++-- - src/hb-ot-layout-gsub-private.hh | 2 +- - src/hb-private.h | 18 +++++----- - 7 files changed, 91 insertions(+), 26 deletions(-) - -commit 8fb3d1aa4e613cdf965a83bd650c668884c58ad8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 3 18:34:20 2009 -0500 - - Start ft glue - - TODO | 3 - - src/Makefile.am | 16 ++++- - src/hb-font-private.h | 4 +- - src/hb-font.cc | 17 ++++- - src/hb-font.h | 6 +- - src/hb-ft.c | 192 - +++++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-ft.h | 52 +++++++++++++ - src/hb-glib.h | 2 - - src/hb-icu.h | 2 - - src/hb.h | 4 +- - 10 files changed, 281 insertions(+), 17 deletions(-) - -commit d94647e2cd187bf4a4c8fb1c0c15c3d23c1293ac -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 3 16:35:10 2009 -0500 - - Add ICU glue - - configure.ac | 8 ++- - src/Makefile.am | 23 +++++- - src/hb-icu.c | 221 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-icu.h | 41 ++++++++++ - 4 files changed, 288 insertions(+), 5 deletions(-) - -commit b7dd4b945b4ec384526439b365a25739bf9cd2df -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 3 15:21:15 2009 -0500 - - Fix hb_be_uint16() - - src/hb-private.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit cd7555eef27cb18857c0c06d2afdaf3a354a3c15 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 3 15:16:10 2009 -0500 - - Namespace MSVC defines in public header - - src/hb-common.h | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 5ebabecef382c3e8b0a2a5657b2c01f7ff37d796 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 3 15:15:07 2009 -0500 - - Move unicode_funcs to buffer - - TODO | 1 - - src/hb-buffer-private.h | 12 +++++++++++- - src/hb-buffer.c | 47 - ++++++++++++++++++++++++++++++++++++++--------- - src/hb-buffer.h | 10 ++++++++++ - src/hb-font-private.h | 3 --- - src/hb-font.cc | 17 ----------------- - src/hb-font.h | 9 ++++----- - 7 files changed, 63 insertions(+), 36 deletions(-) - -commit d5a8e46099e363d928b54de104126b1b34ba401c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 3 15:14:40 2009 -0500 - - [Makefile] Install hb-unicode.h - - Separate OT headers also. - - src/Makefile.am | 27 ++++++++++++++++----------- - 1 files changed, 16 insertions(+), 11 deletions(-) - -commit 63d7a41dd0704a7e89bd2872ad096f470f51866a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 3 15:14:08 2009 -0500 - - [TODO] Add item for fixing buffer error handling - - TODO | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 21d0fce3d5364c91e5582bd530210f03e054d1a4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 3 14:28:32 2009 -0500 - - Add check for not linking to libstdc++ - - TODO | 3 +-- - src/Makefile.am | 4 ++++ - src/check-libstdc++.sh | 28 ++++++++++++++++++++++++++++ - 3 files changed, 33 insertions(+), 2 deletions(-) - -commit ca95ce460adf2ca6901595d4a6107fd000d90151 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 3 14:18:33 2009 -0500 - - Use the C linker, not C++ linker - - Such that we don't link to libstdc++. - - src/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit eb4ebda2d10637b966f42a4ed5cfaec46082a050 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 3 14:09:32 2009 -0500 - - [configure] Fix check for FreeType - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit cb0e99a5a76136c128faba1c27d7e7eac2f219ee -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 3 14:09:10 2009 -0500 - - [TODO] Remove obsolete item - - TODO | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 3a59ec37c5576b711c7c36dcfa2a63f6c00a3f5c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 3 11:36:06 2009 -0500 - - Add bunch of TODO items - - TODO | 15 ++++++++++++--- - 1 files changed, 12 insertions(+), 3 deletions(-) - -commit ffbe0a853d5e7defa85d0eef53814c22d1ecb412 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 3 10:52:45 2009 -0500 - - More MSVC fixes from Jonathan Kew - - src/hb-common.h | 7 ++++++- - src/hb-private.h | 5 +++++ - 2 files changed, 11 insertions(+), 1 deletions(-) - -commit d3480ba37fbb5d4be75b094060f5b2f1ce98fb53 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Nov 3 10:47:29 2009 -0500 - - Don't use zero-sized arrays - - It's not part of the standard and MSVC doesn't like it. It makes - the code - a lot less elegant than it used to be, but I think it should work now. - - src/hb-open-file-private.hh | 4 +- - src/hb-open-type-private.hh | 36 ++++++++++------ - src/hb-ot-layout-common-private.hh | 33 ++++++++------- - src/hb-ot-layout-gdef-private.hh | 14 +++---- - src/hb-ot-layout-gpos-private.hh | 76 - +++++++++++++-------------------- - src/hb-ot-layout-gsub-private.hh | 44 ++++++++------------ - src/hb-ot-layout-gsubgpos-private.hh | 47 ++++++++++----------- - src/hb-private.h | 5 ++ - 8 files changed, 122 insertions(+), 137 deletions(-) - -commit 6bec81aa3a58b8be255568b2ea63b7854e1b0ea7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 2 19:17:36 2009 -0500 - - Cosmetic - - src/hb-ot-layout-common-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f94cf6b969281cf8a7f701ff26ea4f134ff9746e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 2 18:55:19 2009 -0500 - - Another try at build without glib - - configure.ac | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -commit 2f3e69f3cb7e571cc62b0840d0b3f2072b29345a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 2 18:53:15 2009 -0500 - - Fix build without glib, again - - src/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit d03f81865914b40e941bf680557c0d8f98e30ad5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 2 18:52:21 2009 -0500 - - Disable configure cache - - autogen.sh | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit a6451aa626fa5850d7c3b716bd52126995154e27 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 2 18:35:12 2009 -0500 - - We don't really use gthread directly - - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 63a792a811e0ad69d05e8805d4f347bd533db4c3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 2 18:33:52 2009 -0500 - - Update Makefile to build without glib - - src/Makefile.am | 12 +++++++++--- - src/hb-glib.c | 2 ++ - 2 files changed, 11 insertions(+), 3 deletions(-) - -commit 68a2c771e2b923461a552bf3673e9e8245e1bfea -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 2 18:31:53 2009 -0500 - - Build without glib - - Thready-safety disabled in that case, until we add support for - pthread, etc. - Fun... - - src/hb-private.h | 19 +++++++++++++++++-- - 1 files changed, 17 insertions(+), 2 deletions(-) - -commit cc4c096a7e08ae96b3030fe27f871ce5b797f370 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 2 18:13:17 2009 -0500 - - MSVC has no stdint.h - - src/hb-common.h | 13 +++++++++++++ - 1 files changed, 13 insertions(+), 0 deletions(-) - -commit 9a204c7ab57ca0a866c72e1431c54a8883b15605 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 2 18:11:55 2009 -0500 - - Remove use of GINT16_FROM_BE - - src/hb-private.h | 10 ++-------- - 1 files changed, 2 insertions(+), 8 deletions(-) - -commit 1f0ceeb8cf2fad0a0dfd338ce1472470a81789d4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 2 16:28:39 2009 -0500 - - Install library - - autogen.sh | 2 +- - src/Makefile.am | 5 ++--- - 2 files changed, 3 insertions(+), 4 deletions(-) - -commit 5932f8f7c3b73ade3752020351fa8b6a9a3bf500 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 2 16:38:41 2009 -0500 - - Generate ChangeLog - - Makefile.am | 39 +++++++++++++++++++++++++++++++++++++++ - 1 files changed, 39 insertions(+), 0 deletions(-) - -commit 29aa40018301a4f138cd5e73463079c7704bf3ac -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 2 16:28:39 2009 -0500 - - Add build system - - COPYING | 17 +++++ - Makefile.am | 3 + - README | 9 +++ - TODO | 6 ++ - autogen.sh | 189 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - configure.ac | 40 ++++++++++++ - git.mk | 184 - +++++++++++++++++++++++++++++++++++++++++++++++++++++ - harfbuzz.pc.in | 11 +++ - src/.gitignore | 1 - - src/COPYING | 17 ----- - src/Makefile.ng | 11 --- - src/README | 9 --- - src/TODO | 6 -- - 13 files changed, 459 insertions(+), 44 deletions(-) - -commit c09ed9801ead002d6f8e507ce664b83707b202e9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Oct 29 03:08:42 2009 -0400 - - [HB] Add glyph_metrics typedef - - src/hb-font.h | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) - -commit 91b1e03e0312be2a7a165308239b40449e3ab360 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Oct 29 03:05:18 2009 -0400 - - [HB] Add point_index to get_contour_point() - - Pointed out by Keith Stribley on HarfBuzz list. - - src/hb-font.h | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit aa87d951739f6beacb66daa235cd033fdcfcadd7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Oct 29 03:00:44 2009 -0400 - - [HB] Fix lookup_flag ignoring - - Reported by Keith Stribley on HarfBuzz list. - - src/hb-ot-layout-common-private.hh | 1 + - src/hb-ot-layout.cc | 2 +- - 2 files changed, 2 insertions(+), 1 deletions(-) - -commit 52e9a71d578c5171bbb0f4bfc1b70841c3270328 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 21 13:58:56 2009 -0400 - - [HB] Add comment - - src/hb-ot-layout-gsubgpos-private.hh | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit f9c0a2dad09cd168fb28cdee09b4303f307ea56d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 21 13:43:54 2009 -0400 - - [HB] Fix apply_lookup() loop - - Part of Bug 595539 - Regressions in rendering certain Thai sequences - with - OpenType font - - src/hb-ot-layout-gsubgpos-private.hh | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit c0ab43c05833e8fc06d770a89370bec58a627e74 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Sep 21 13:40:38 2009 -0400 - - [HB] Fix bug in chain_context_lookup() invocations - - Part of Bug 595539 - Regressions in rendering certain Thai sequences - with - OpenType font - - src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit e6bd4e93bd5722249ab977dfa98bdc8eb765318c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 30 21:02:28 2009 -0400 - - [HB] Add TODO item - - src/TODO | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 3e2401f6c53d2b047954d75c37aef5e5e7cdc51a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 28 17:17:11 2009 -0400 - - [HB] Rename DEBUG to TRACE where appropriate - - src/hb-open-file-private.hh | 8 ++-- - src/hb-open-type-private.hh | 50 +++++++++--------- - src/hb-ot-layout-common-private.hh | 32 ++++++------ - src/hb-ot-layout-gdef-private.hh | 20 ++++---- - src/hb-ot-layout-gpos-private.hh | 92 - +++++++++++++++++----------------- - src/hb-ot-layout-gsub-private.hh | 72 +++++++++++++------------- - src/hb-ot-layout-gsubgpos-private.hh | 78 ++++++++++++++-------------- - 7 files changed, 176 insertions(+), 176 deletions(-) - -commit 0535b50f436f3dac85e6df1761957f86c2bd7213 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 28 17:14:33 2009 -0400 - - [HB] Add GSUB/GPOS tracing - - src/hb-ot-layout-gpos-private.hh | 29 ++++++++++++++++++-- - src/hb-ot-layout-gsub-private.hh | 28 +++++++++++++++++-- - src/hb-ot-layout-gsubgpos-private.hh | 49 - ++++++++++++++++++++++++++++++++- - 3 files changed, 98 insertions(+), 8 deletions(-) - -commit 95e202403ffa543c817f45cca21fbc116eb8e807 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 28 16:31:20 2009 -0400 - - [HB] Allow enabling different debug facilities individually - - src/hb-blob.c | 28 ++++++++++++++++------------ - src/hb-open-type-private.hh | 32 ++++++++++++++++++-------------- - 2 files changed, 34 insertions(+), 26 deletions(-) - -commit 37006bd1bd107ac1a1c1b131579e9c494ba3a20f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 28 09:46:14 2009 -0400 - - Fix stupid array growing bug - - src/hb-ot-layout.cc | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 9897749113f76dc26a83bfae8de62e55d384fcad -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 27 01:32:17 2009 -0400 - - [HB] Simplify counting - - src/hb-ot-layout.cc | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit 81a5c4df94e7c6066314d5fe75bbaf24483bc022 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 27 00:21:04 2009 -0400 - - [HB] Indent - - src/hb-blob.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit c91facd83b5dc3b9aed75617c7c35585ff18889f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 26 18:53:43 2009 -0400 - - [HB] Bug 593231 - < c99 compiler dislikes ValueRecord - - src/hb-ot-layout-gpos-private.hh | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit f0c7540c4e217a7354072365a7301453d1e25b80 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 20 14:01:37 2009 -0400 - - Bug 592484 - invalid write in HB - - Fix off-by-one. - - src/hb-ot-layout.cc | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit b614b004723ead60849dd37e7ba2faee67cebd93 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 20 13:07:50 2009 -0400 - - [HB][glib] Make glib unicode funcs static - - src/hb-glib.c | 36 +++++++++++++++++------------------- - 1 files changed, 17 insertions(+), 19 deletions(-) - -commit 8b5346130425c7c101f6ff2432874ba2fd372edc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 19 18:16:50 2009 -0400 - - [HB] Fix more casts - - src/hb-open-type-private.hh | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 9d2e02db74deb3b3b92beab96f112cc387c8bd88 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 19 18:07:36 2009 -0400 - - [HB] Rename CAIRO_ in macro prefix to HB_ - - Hiss! - - src/hb-private.h | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 388ad037ff399c23c5e24bbcede27e0e35bed07e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 19 16:45:41 2009 -0400 - - [HB] Remove HB_MEMORY_MODE_READONLY_NEVER_DUPLICATE - - Unlike the rest of the memory-mode enum, this one didn't only - describe the access mode of the input memory region. Remove it. - - If someone wants to inhibit duplicating, they can lock the blob - and throw away the key. - - Based on mailing list discussion with Carl Worth. - - src/hb-blob.c | 51 +++++++++++++++++++++++++-------------------------- - src/hb-blob.h | 1 - - 2 files changed, 25 insertions(+), 27 deletions(-) - -commit 977eeb714454630bd045bb11f58ff6397f10b143 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 19 16:17:24 2009 -0400 - - [HB] s/writeable/writable/g - - src/hb-blob.c | 38 +++++++++++++++++++------------------- - src/hb-blob.h | 10 +++++----- - src/hb-open-type-private.hh | 6 +++--- - 3 files changed, 27 insertions(+), 27 deletions(-) - -commit 2f5931e404cb56e31d24b2eb7ff0a849fb077b55 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 19 16:07:40 2009 -0400 - - [HB] Hide lig_id and component members of hb_glyph_info_t - - src/hb-buffer.h | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) - -commit 6b600dd6199104cff01b3fa43d2abb52ae4319ea -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 19 14:45:24 2009 -0400 - - [HB] Fix typo - - src/hb-font.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 32c65a5ca3bde673bf2aa8fca911dd32914d3122 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 18 18:37:36 2009 -0400 - - [HB] Add font funcs prototypes - - src/hb-font-private.h | 2 -- - src/hb-font.cc | 14 ++++++-------- - src/hb-font.h | 23 ++++++++++++++++------- - 3 files changed, 22 insertions(+), 17 deletions(-) - -commit 8f034d5849627ee95a5889fa34c9ba294fff13ca -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 18 16:41:59 2009 -0400 - - Fix a few other pedantic warnings - - src/hb-ot-layout-common-private.hh | 2 +- - src/hb-ot-layout-gdef-private.hh | 2 +- - src/hb-ot-layout-gpos-private.hh | 4 ++-- - src/hb-ot-layout-gsub-private.hh | 2 +- - 4 files changed, 5 insertions(+), 5 deletions(-) - -commit 864e2560b627f1e73be3b0635e02f00844cb67c3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 18 16:38:48 2009 -0400 - - [HB] Fix pedantic warnings - - src/hb-blob.h | 2 +- - src/hb-buffer-private.h | 18 +++++++++--------- - src/hb-buffer.h | 6 +++--- - 3 files changed, 13 insertions(+), 13 deletions(-) - -commit 3e09722214d9bbcc9014409342072c79d0c4447f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 18 16:32:31 2009 -0400 - - [HB] Fix more wrong method signatures - - src/hb-ot-layout-common-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 822e99fe9ae920df41a0bd3f1125495c2ea96b45 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 18 16:27:48 2009 -0400 - - [HB] Fix wrong method signature - - src/hb-ot-layout-common-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 4ff2a58952f010c6252f06e5f404d6840d257250 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 18 15:49:23 2009 -0400 - - Bug 592194 - Fix missing _SC_PAGE_SIZE macro - - Autoconfiscate a simple call to mprotect() even more. - - src/hb-blob.c | 94 - ++++++++++++++++++++++++++++++++++++-------------------- - 1 files changed, 60 insertions(+), 34 deletions(-) - -commit 3c69bd46e27069fac0bfdefdecf5492c17eb01df -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 17 16:48:13 2009 -0400 - - [HB] Avoid int overflow in GPOS - - Bug 592036 - integer overflow bug causes misrendering of Nepali - characters - - src/hb-ot-layout-gpos-private.hh | 20 ++++++++++---------- - src/hb-private.h | 3 +++ - 2 files changed, 13 insertions(+), 10 deletions(-) - -commit b2b18ef43c5bac6a5bb8412da7c9a37f815d4deb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 14 19:37:18 2009 -0400 - - [HB] Simplify loop - - src/hb-ot-layout-gpos-private.hh | 31 ++++++++++++++----------------- - 1 files changed, 14 insertions(+), 17 deletions(-) - -commit b41f210d12d8df48e645823463343f7e14b0ddd0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 14 19:33:24 2009 -0400 - - [HB] Merge mark positionin code between three types of lookups - - src/hb-ot-layout-gpos-private.hh | 95 - ++++++++++++-------------------------- - 1 files changed, 29 insertions(+), 66 deletions(-) - -commit cd33cb9ed84308da72bd7c64b9355dc2410c63ec -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 14 18:42:42 2009 -0400 - - [HB] More minor shuffling - - src/hb-open-type-private.hh | 3 --- - src/hb-ot-layout-common-private.hh | 5 +++++ - 2 files changed, 5 insertions(+), 3 deletions(-) - -commit 80e2aa2e1bfa2c8ecedcfa4cce8cadeb15792ac3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 14 18:40:56 2009 -0400 - - [HB] Move code around - - src/hb-open-type-private.hh | 21 +++++++++++++++++++++ - src/hb-ot-layout-common-private.hh | 19 ------------------- - 2 files changed, 21 insertions(+), 19 deletions(-) - -commit 3564ee5216004d45d30b0ded61184cf8dde5dd89 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 14 18:32:56 2009 -0400 - - [HB] Correctly sanitize LigatureAttach - - src/hb-open-type-private.hh | 14 ++++++++++---- - src/hb-ot-layout-common-private.hh | 4 ++++ - src/hb-ot-layout-gdef-private.hh | 4 ++-- - src/hb-ot-layout-gpos-private.hh | 6 +++--- - 4 files changed, 19 insertions(+), 9 deletions(-) - -commit cb71a2fb76c6ddee050f775eb299ee44230c3ac9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 14 18:14:03 2009 -0400 - - [HB] Simplify MarkBase and MarkLig too - - src/hb-ot-layout-gpos-private.hh | 127 - ++++++++++++++----------------------- - 1 files changed, 48 insertions(+), 79 deletions(-) - -commit dfa54f4440960c39d37ef02fff4c0d9eb315d4b4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 14 17:53:31 2009 -0400 - - [HB] Simplify MarkMark - - src/hb-ot-layout-gpos-private.hh | 29 ++++++++++++++++------------- - 1 files changed, 16 insertions(+), 13 deletions(-) - -commit 815a73e4202ca17677f12e862b70ca8724cf2f57 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 14 17:31:16 2009 -0400 - - [HB] Fix possible int overflows during sanitize - - src/TODO | 1 - - src/hb-open-type-private.hh | 22 ++++++++++++++++++++++ - src/hb-ot-layout-gpos-private.hh | 15 ++++++++------- - 3 files changed, 30 insertions(+), 8 deletions(-) - -commit ae728e51e94d18d731b7c8dc524da1a4f427d63b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 14 16:41:00 2009 -0400 - - [HB] Debug output for SANITIZE_MEM() - - src/hb-open-type-private.hh | 34 +++++++++++++++++++++++----------- - 1 files changed, 23 insertions(+), 11 deletions(-) - -commit 41895506cb6a41b1a833866f8822261ea449ea0b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 14 16:25:33 2009 -0400 - - [HB] Use inline function for SANITIZE_MEM() - - src/hb-open-type-private.hh | 33 ++++++++++++++++++++------------- - 1 files changed, 20 insertions(+), 13 deletions(-) - -commit 95528131b5ab9fc9e265ace715832135ebd457a4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 14 16:17:32 2009 -0400 - - [HB] Use SANITIZE_THIS() when applicable - - src/hb-open-type-private.hh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 5769538abfe153c503da4801649493e57a9854c2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 14 16:12:22 2009 -0400 - - [HB] Add note about auditing sanitize code for overflows - - src/TODO | 1 + - src/hb-ot-layout-gpos-private.hh | 2 +- - 2 files changed, 2 insertions(+), 1 deletions(-) - -commit 15232e26f4a89dab1b6de35ad9d3d16e75bf93d0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 13 17:13:25 2009 -0400 - - [HB] Add empty hb_shape() API - - src/Makefile.am | 2 ++ - src/hb-shape.c | 40 ++++++++++++++++++++++++++++++++++++++++ - src/hb-shape.h | 53 - +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 95 insertions(+), 0 deletions(-) - -commit 2866d2974b6768e93cc7d473d14c5a8abae5f7fd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 13 11:47:08 2009 -0400 - - [HB] Bitfield packing *is* very delicate - - Fix the second instance. - - src/hb-buffer.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit ec90ee23b29aab187c3fa209970aa97434c84b1b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 13 05:25:23 2009 -0400 - - Bug 591511 – hh-blob.c does not compile using mingw on windows - - Check for sys/mman.h, not mprotect(). - - src/hb-blob.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 12eae6d55d468ff2fbe2bc12bec188d313c671f9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 13 05:20:46 2009 -0400 - - [HB] Fix buffer sizing issue with mingw gcc - - Bit field packing is a delicate field. Issue reported in comment - 3 here: - http://bugzilla.gnome.org/show_bug.cgi?id=591511 - - src/hb-buffer-private.h | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit 6936706cd77f96961a1239d0c9dc8ede64d7f06d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 12 19:45:50 2009 -0400 - - Bug 591413 – needs to link with libstdc++ - - Enforce -fno-exceptions better. - - src/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c486ea9c3582710474c1085c21c1dc5e2700adc3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 12 19:36:29 2009 -0400 - - Bug 591511 – hb-blob.c does not compile using mingw on windows - - Only call mprotect() when available. For optimal performance, a win32 - way to make memory writeable needs to be added. - - src/hb-blob.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit a579584594f1ca4781f1c5b92ad78513c0b37480 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 12 19:23:16 2009 -0400 - - [HB] Add comment - - src/hb-buffer-private.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b6e66ee102eb5b64d945e5a73ab63fe8cac5edcb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 12 16:50:28 2009 -0400 - - [HB] Always clear positions if dirty, before returning to user - - src/hb-buffer.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit e4679d9fae43f3219c476c5b9e411d1f5d0d5bae -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 12 16:47:27 2009 -0400 - - [HB] Fix _hb_buffer_next() when positioning - - We were copying glyphs to output. This should not happen when in - GPOS. Back then it was fine, then some optimizations broke then - assumption. - - src/hb-buffer-private.h | 1 + - src/hb-buffer.c | 12 ++++++++++++ - 2 files changed, 13 insertions(+), 0 deletions(-) - -commit 5ccf1ba339d6ffb4469f1c4f20d8d8d00012c857 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 12 15:55:23 2009 -0400 - - [HB] Fixed signedness warnings - - src/hb-open-type-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit f71329147bd3087588cfeafd6feff45f29d1ca7a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 12 15:48:44 2009 -0400 - - [HB] Ouch. Fix compilation. - - src/hb-ot-layout-gpos-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 0532ed160c678b5404b20594fd2ca9a640bf6a0a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 12 15:40:04 2009 -0400 - - [HB] Fix invalid access / overflow on x86-64 - - Bug 591557 – [HB] crash scrolling the evolution message list - Bug 591576 – crashed with SIGSEGV at pango - - src/hb-ot-layout-gpos-private.hh | 21 ++++++++++++--------- - src/hb-ot-layout-gsub-private.hh | 2 -- - 2 files changed, 12 insertions(+), 11 deletions(-) - -commit 8d70312c7b899131c3aafa7a43527ef3ced33bfe -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 10 23:50:51 2009 -0400 - - [HB] Add hb_font_funcs_make_immutable() - - src/hb-font-private.h | 4 ++++ - src/hb-font.cc | 17 +++++++++++++++-- - src/hb-font.h | 3 +++ - 3 files changed, 22 insertions(+), 2 deletions(-) - -commit 3284d05da27c338d94f0da99df66d924cd9d6717 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 10 23:45:57 2009 -0400 - - [HB] Add missing initializer - - src/hb-font.cc | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 081819ea8b98c0a4b4dffe8d4aca3512f9798719 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 10 23:40:28 2009 -0400 - - [OT] Hookup glib unicode funcs - - src/hb-buffer.c | 14 +++++++------- - src/hb-glib.c | 4 +++- - src/hb-glib.h | 4 ++-- - src/hb-ot-layout.cc | 10 +++++----- - src/hb-private.h | 2 +- - 5 files changed, 18 insertions(+), 16 deletions(-) - -commit 49f261df2aa753e8b09e97f7835e6a827f92970a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 10 23:35:05 2009 -0400 - - [HB] Add hb-glib - - src/Makefile.am | 4 ++- - src/hb-glib.c | 56 - ++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-glib.h | 41 +++++++++++++++++++++++++++++++++ - src/hb-unicode-private.h | 2 +- - src/hb-unicode.c | 10 ++++---- - src/hb-unicode.h | 6 ++-- - 6 files changed, 109 insertions(+), 10 deletions(-) - -commit eb27ec0cef0d92740875ab5035b53acc639e5fae -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 10 23:25:28 2009 -0400 - - [HB] Add hb_unicode_funcs_make_immutable() - - src/hb-unicode-private.h | 2 ++ - src/hb-unicode.c | 22 +++++++++++++++++----- - src/hb-unicode.h | 2 ++ - 3 files changed, 21 insertions(+), 5 deletions(-) - -commit af9e104028b7cdc1fbba0eb1d86cfa4d5258657f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 10 23:21:33 2009 -0400 - - [HB] Use nil unicode funcs in nil face - - src/hb-font.cc | 7 ++++--- - src/hb-unicode-private.h | 3 +++ - src/hb-unicode.c | 2 +- - 3 files changed, 8 insertions(+), 4 deletions(-) - -commit 48910f8f0034c54b4e11cef3d08aa40e52c06b28 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 10 23:05:05 2009 -0400 - - [HB] Initialize unicode funcs to nil getters - - src/hb-unicode.c | 29 +++++++++++++++++++---------- - 1 files changed, 19 insertions(+), 10 deletions(-) - -commit 04cc0a29ee1472c318c36efcd19b9c1a6657d9ea -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 10 22:58:56 2009 -0400 - - [HB] Flesh out Unicode funcs - - src/hb-object-private.h | 2 +- - src/hb-unicode-private.h | 12 +++----- - src/hb-unicode.c | 67 - ++++++++++++++++++++++++++++++++++++++++----- - src/hb-unicode.h | 3 -- - 4 files changed, 65 insertions(+), 19 deletions(-) - -commit 299f08961ffcea27e8def4f0743d0c86ef8dadf1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 10 22:47:57 2009 -0400 - - [HB] Implement buffer UTF-X input - - src/hb-buffer.c | 110 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-buffer.h | 12 +++--- - 2 files changed, 116 insertions(+), 6 deletions(-) - -commit 1b7b97f28ac192006ca5b6d1cc9fbc80fa2bdb55 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 10 21:10:37 2009 -0400 - - [HB] Add buffer UTF-X API - - src/hb-buffer.h | 21 +++++++++++++++++++++ - 1 files changed, 21 insertions(+), 0 deletions(-) - -commit fbaf8ffa098bd2b6fb4f4bc2d04b360a319c4af5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 10 20:59:25 2009 -0400 - - [HB] Add hb_buffer_reverse() - - src/hb-buffer.c | 32 +++++++++++++++++++++++++++++--- - src/hb-buffer.h | 7 +++++++ - 2 files changed, 36 insertions(+), 3 deletions(-) - -commit cbe5a4e08e6c2ccfdf98e630d48ec9da69374516 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 10 20:24:49 2009 -0400 - - [HB] Reuse the positions array as alt string array - - src/hb-buffer-private.h | 1 - - src/hb-buffer.c | 28 +++++++++------------------- - 2 files changed, 9 insertions(+), 20 deletions(-) - -commit 5c44188455ca1b696aa24b20c3a83877dfae2fb2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 10 20:05:16 2009 -0400 - - [HB] Start adding Unicode funcs - - src/Makefile.am | 3 + - src/hb-font-private.h | 29 ++----- - src/hb-font.cc | 163 +++++++++------------------------- - src/hb-font.h | 140 ++++++++++------------------- - src/hb-unicode-private.h | 54 +++++++++++ - src/hb-unicode.c | 89 +++++++++++++++++++ - src/hb-unicode.h | 220 - ++++++++++++++++++++++++++++++++++++++++++++++ - 7 files changed, 463 insertions(+), 235 deletions(-) - -commit 20b035dad41247076815a2bbb0346d63058b322f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 10 19:00:36 2009 -0400 - - [HB] Put C++ inline's back - - Apparetly in C++, inline means a totally different thing. - - src/hb-open-file-private.hh | 14 +++++++------- - src/hb-open-type-private.hh | 16 ++++++++-------- - src/hb-ot-layout-common-private.hh | 12 ++++++------ - src/hb-ot-layout-gdef-private.hh | 4 ++-- - src/hb-ot-layout-gpos-private.hh | 12 ++++++------ - src/hb-ot-layout-gsub-private.hh | 12 ++++++------ - src/hb-ot-layout-gsubgpos-private.hh | 12 ++++++------ - 7 files changed, 41 insertions(+), 41 deletions(-) - -commit a62f776d8e7e3e57d28ee71b34abab0a5b8471eb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 10 13:57:02 2009 -0400 - - [HB] Don't override CXX compiler - - Just add couple of options to it (still assuming gcc) - - src/Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 6bdab706ecb41c1305e85d041a586e86c54d0ab7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 10 09:35:11 2009 -0400 - - [HB] Indent - - src/hb-ot-layout.h | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 797724904a3ab294f8390d4ff80c299d8213a5c6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 9 22:25:17 2009 -0400 - - [HB] Remove unused code - - src/hb-ot-layout-gdef-private.hh | 10 ---------- - 1 files changed, 0 insertions(+), 10 deletions(-) - -commit 284899ccbe79fda7405ab09d3092fc25fd89e810 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 9 22:10:39 2009 -0400 - - [HB] Add a NEXT() macro - - src/hb-open-type-private.hh | 2 ++ - src/hb-ot-layout-common-private.hh | 4 ++-- - src/hb-ot-layout-gsub-private.hh | 8 ++++---- - src/hb-ot-layout-gsubgpos-private.hh | 24 ++++++++++++------------ - 4 files changed, 20 insertions(+), 18 deletions(-) - -commit 918572fc870dfd7596155ce700247a5bb024fb1a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 9 18:31:47 2009 -0400 - - [HB] Remove done TODO item - - src/TODO | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 67cb8111f209de26b3afa46e9fb7e4d01c9ecad4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 9 13:05:08 2009 -0400 - - [HB] Print mark sets in main.cc - - src/main.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 17878255fa88e76cd503461fc1ade2ed365cebd2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 8 16:57:27 2009 -0400 - - [HB] Remove hb_ot_layout_table_find_feature() - - That function doesn't make much sense as multiple features in the - table may - have the same tag. - - src/hb-ot-layout.cc | 16 ---------------- - src/hb-ot-layout.h | 6 ------ - 2 files changed, 0 insertions(+), 22 deletions(-) - -commit 468769b8f5332940278244e744ec2bd5a5dc5ee9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 8 16:53:23 2009 -0400 - - [HB] Rename hb_ot_layout_feature_mask_t to hb_mask_t - - src/TODO | 1 - - src/hb-buffer-private.h | 4 ++-- - src/hb-buffer.c | 12 ++++++------ - src/hb-buffer.h | 4 ++-- - src/hb-common.h | 1 + - src/hb-ot-layout-gpos-private.hh | 12 ++++++------ - src/hb-ot-layout-gsub-private.hh | 14 +++++++------- - src/hb-ot-layout.cc | 18 +++++++++--------- - src/hb-ot-layout.h | 34 - +++++++++------------------------- - 9 files changed, 42 insertions(+), 58 deletions(-) - -commit 7f96b39a9d5a81ba77e0c3dea8fe2cdb9957c4c7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 8 16:37:22 2009 -0400 - - [HB] Fix bug introduced recently - - src/hb-open-type-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit bff3c0fde5da04a70d1f7aeeb9fa2a75fe5c07f6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Aug 7 19:46:30 2009 -0400 - - [HB] Remove clumsy macros and improve API - - src/TODO | 2 - - src/hb-open-file-private.hh | 41 ++++++++-- - src/hb-open-type-private.hh | 104 +----------------------- - src/hb-ot-layout-common-private.hh | 103 ++++++++++++++++++------ - src/hb-ot-layout-gsubgpos-private.hh | 35 +++++++-- - src/hb-ot-layout.cc | 146 - ++++++++++++---------------------- - src/hb-ot-layout.h | 101 ++++++++++-------------- - 7 files changed, 240 insertions(+), 292 deletions(-) - -commit d0b657379bbe63602953412d6bc944b2a0f430eb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 6 18:34:47 2009 -0400 - - [HB] Fix various XXX issues - - src/hb-open-type-private.hh | 13 ++++++++++--- - src/hb-ot-layout-gdef-private.hh | 5 ++--- - 2 files changed, 12 insertions(+), 6 deletions(-) - -commit 82199868fb036b63799af761762225d45d36f575 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 6 18:28:45 2009 -0400 - - [HB] Remove unused var - - src/hb-ot-layout-private.h | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 07e69226cbd4167741fd868a3125487bbabb99dc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 6 18:28:00 2009 -0400 - - [HB] Remove another stale XXX - - src/hb-ot-layout.cc | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit e605c367c5627e7ab05af9cb59247a89290e598a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 6 18:27:28 2009 -0400 - - [HB] Rebrand XXX as TODO - - src/hb-open-file-private.hh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit c5a13048e21fcfcfd3b74f800e8d521e6245b451 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 6 18:26:38 2009 -0400 - - [HB] Remove stale XXX - - src/hb-blob.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 9e826ea2832f0444bcef9075b445d481a58a09c2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 6 18:24:55 2009 -0400 - - [HB] Fix unaligned access - - src/hb-open-type-private.hh | 20 +++++++++++++++++--- - src/hb-private.h | 22 ++++++++++++++++++++++ - 2 files changed, 39 insertions(+), 3 deletions(-) - -commit 71a8344a5eeaa34e31d53138cf3bbe30b819f83c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 6 14:28:18 2009 -0400 - - [HB] Remove a few 'inline's, though the compiler mostly ignores them - - src/hb-open-file-private.hh | 1 - - src/hb-open-type-private.hh | 16 ++++++++-------- - src/hb-ot-layout-gsubgpos-private.hh | 6 +++--- - 3 files changed, 11 insertions(+), 12 deletions(-) - -commit 7f3d5c8166e5205e9d9bf8b4b2f31d44387a8006 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 6 13:33:51 2009 -0400 - - [HB] Fix blob to use a actual mutex - - src/hb-blob.c | 125 - ++++++++++++++++++++++++++++++++++------------- - src/hb-object-private.h | 4 +- - src/hb-private.h | 20 +++++--- - 3 files changed, 106 insertions(+), 43 deletions(-) - -commit a794ebf4be9896393f4badf02905a4007981a588 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 6 12:32:35 2009 -0400 - - [HB] Use glib again - - src/Makefile.am | 5 +++-- - src/hb-blob.c | 4 ++-- - src/hb-object-private.h | 19 ++++++------------- - src/hb-private.h | 45 - ++++++++++++++++++++++++++------------------- - 4 files changed, 37 insertions(+), 36 deletions(-) - -commit 9b76a290a94f2603f3cb9498ae976125347cf54b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 6 10:27:38 2009 -0400 - - [HB] Improve debug output - - src/hb-open-type-private.hh | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -commit 9faee63034d3965735bd6362c0beeca1613bd771 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Aug 6 10:24:49 2009 -0400 - - [HB] Minor - - src/hb-private.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f72059ee6946d9b4812b794f662ee83c7e25fe53 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 5 15:35:02 2009 -0400 - - [HB] Add a few TODO items - - src/TODO | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -commit 0d77ab8a73f57c9fca4c6f9301dae394d79526e3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 5 15:27:42 2009 -0400 - - [HB] Improve debug output - - src/hb-open-type-private.hh | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -commit 268cac4c9ef8cb592cfb8507273332165b8d3ad3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 5 15:21:48 2009 -0400 - - [HB] Fix blob unlock - - src/hb-blob.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 7acb389569cf99c6bae9db31a8ed7c7007fbb566 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 5 15:20:34 2009 -0400 - - [HB] Improve debug output and fix mprotect bug - - src/hb-blob.c | 57 - +++++++++++++++++++++++++++++++++++++------ - src/hb-open-type-private.hh | 30 ++++++++++------------ - src/hb-private.h | 3 +- - 3 files changed, 65 insertions(+), 25 deletions(-) - -commit ec9f8db0d3cad146801b7dc5c59e517de3b6fa34 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 5 14:52:03 2009 -0400 - - [HB] Minor - - src/hb-private.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit d341881d9a0f835f691b121480046081ad162918 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Aug 5 14:49:25 2009 -0400 - - [HB] Fix build of main.cc - - src/Makefile.am | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 8f3be25e7ec88ea451ee8097bf32e5f729f4fef9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 23:43:40 2009 -0400 - - [HB] turn debugging off - - src/hb-private.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 62ed5850d9e0e0d0231889470d58e815420c21e5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 23:30:32 2009 -0400 - - [HB] Fix another sanitize() bug; hopefully it's the last one - - src/hb-ot-layout-common-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 90482b68178b687c0f0a3f82cd6a36b2c0bb9384 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 23:24:35 2009 -0400 - - [HB] Fix a couple other sanitize() bugs - - src/hb-ot-layout-gpos-private.hh | 4 ++-- - src/hb-ot-layout-gsub-private.hh | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit 4f3ad9115a4161fc23fa559c26082440196217ec -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 23:01:23 2009 -0400 - - [HB] More debugging output - - src/hb-open-type-private.hh | 45 - ++++++++++++++++++++++++++++++++++++++---- - 1 files changed, 40 insertions(+), 5 deletions(-) - -commit 8cd6fa28d1b77100491519b8dedb2e113508bf59 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 22:55:44 2009 -0400 - - [HB] Fix fatal Sanitizer bug - - src/hb-open-type-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 2870ac5e5d5d87646a4b273a9805fb3fcf280f97 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 22:43:47 2009 -0400 - - [HB] Add missing sanitize - - src/hb-open-file-private.hh | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit b28815c1f6e46d38471cacbc31248ca6fda8c4d1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 22:35:36 2009 -0400 - - [HB] Add sanitize debugging facilities - - src/hb-open-file-private.hh | 4 +++ - src/hb-open-type-private.hh | 43 - ++++++++++++++++++++++++++++++---- - src/hb-ot-layout-common-private.hh | 17 +++++++++++++ - src/hb-ot-layout-gdef-private.hh | 10 ++++++++ - src/hb-ot-layout-gpos-private.hh | 28 ++++++++++++++++++++++ - src/hb-ot-layout-gsub-private.hh | 18 ++++++++++++++ - src/hb-ot-layout-gsubgpos-private.hh | 16 ++++++++++++ - src/hb-private.h | 6 ++++- - 8 files changed, 136 insertions(+), 6 deletions(-) - -commit 7edb430f9182723b7b720708c56088cec1200a70 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 22:06:57 2009 -0400 - - [HB] Rename open-types to open-type; beauty - - src/Makefile.am | 2 +- - src/hb-open-file-private.hh | 2 +- - src/hb-open-type-private.hh | 565 - ++++++++++++++++++++++++++++++++++++ - src/hb-open-types-private.hh | 565 - ------------------------------------ - src/hb-ot-layout-common-private.hh | 2 +- - 5 files changed, 568 insertions(+), 568 deletions(-) - -commit f4b58d3fc2956a9d1b6178588d809c781f7a5c0c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 21:47:29 2009 -0400 - - [HB] Save edit even if not writeable - - src/hb-open-types-private.hh | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) - -commit 9bd629ccd064e739789e504c41ad875eed93abba -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 21:42:23 2009 -0400 - - [HB] Fix warnings - - src/hb-open-file-private.hh | 1 + - src/hb-open-types-private.hh | 5 +++++ - src/hb-ot-layout-gsub-private.hh | 3 +-- - 3 files changed, 7 insertions(+), 2 deletions(-) - -commit 5ff4e13143c227fa57854c987b5a98e610f89361 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 21:35:32 2009 -0400 - - [HB] Avoid infinite recusion in Extension sanitize() - - src/hb-ot-layout-gpos-private.hh | 1 + - src/hb-ot-layout-gsub-private.hh | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit d60bb8ca2ae6edf29b2227b56c57f0d16879370b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 21:32:57 2009 -0400 - - [HB] Hook Sanitizer up. Hell's breaking loose right now - - src/hb-font.cc | 7 ++----- - src/hb-open-types-private.hh | 2 +- - src/hb-ot-layout.cc | 12 ++++++------ - 3 files changed, 9 insertions(+), 12 deletions(-) - -commit 679f41fe61242aa8d7f45b64bdb66395aa530fe2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 21:32:06 2009 -0400 - - [HB] Fix leak - - src/hb-ot-layout.cc | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 4e8a0602bb0b3cbf7f26cc38790e37cdec7b0b37 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 20:52:47 2009 -0400 - - [HB] Add Sanitizer - - src/hb-open-types-private.hh | 58 - ++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 53 insertions(+), 5 deletions(-) - -commit 2765d333e523a13dbd932fa33f3b39a5cf83f0f7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 20:50:18 2009 -0400 - - [HB] Add XXX - - src/hb-open-file-private.hh | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit a328d66e6a8122f7d4d71941449d4d0136203e08 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 20:27:05 2009 -0400 - - [HB] Minor cleanup - - src/hb-ot-layout-gdef-private.hh | 2 +- - src/hb-ot-layout-gpos-private.hh | 2 +- - src/hb-ot-layout-gsub-private.hh | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 4 ++-- - 4 files changed, 5 insertions(+), 5 deletions(-) - -commit 577c1116493d785d3455626612f97dabb383abf0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 19:31:02 2009 -0400 - - [HB] Shuffle code around - - src/hb-open-types-private.hh | 127 - +++++++++++++++++++++-------------------- - 1 files changed, 65 insertions(+), 62 deletions(-) - -commit b1e187fc6365f5355c652a61494a5e9f6acf51b4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 15:28:49 2009 -0400 - - [HB] More sanitize infrastructure - - src/hb-open-types-private.hh | 29 ++++++++++++++++++++++++++++- - 1 files changed, 28 insertions(+), 1 deletions(-) - -commit b508e5ccd528f3f0f49f545bd5f30a525d5abd5a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 15:07:24 2009 -0400 - - [HB] open-file sanitize() - - src/hb-open-file-private.hh | 46 - ++++++++++++++++++++++++++++++++++++++--- - src/hb-open-types-private.hh | 13 +++++++++++ - 2 files changed, 55 insertions(+), 4 deletions(-) - -commit 738c54d9caa3affc4b434e56bfb810ff6dc9b0b3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 14:42:46 2009 -0400 - - [HB] Tag sanitize() - - src/hb-open-types-private.hh | 8 ++++++++ - src/hb-ot-layout-common-private.hh | 6 +----- - 2 files changed, 9 insertions(+), 5 deletions(-) - -commit e49a84c9e37c08808880e74e94c8160731ababa1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 14:33:23 2009 -0400 - - [HB] GDEF sanitize() - - src/hb-ot-layout-gdef-private.hh | 54 - ++++++++++++++++++++++++++++++++++ - src/hb-ot-layout-gpos-private.hh | 2 +- - src/hb-ot-layout-gsub-private.hh | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - 4 files changed, 57 insertions(+), 3 deletions(-) - -commit 18939487d04dba86880b0af8e89cf2cc44a431f5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 14:27:56 2009 -0400 - - [HB] Fix Extension sanitize() - - src/hb-ot-layout-gpos-private.hh | 3 ++- - src/hb-ot-layout-gsub-private.hh | 3 ++- - src/hb-ot-layout-gsubgpos-private.hh | 2 +- - 3 files changed, 5 insertions(+), 3 deletions(-) - -commit f2be750981be58a723831e69b1670275851d4be9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 14:12:46 2009 -0400 - - [HB] Remove stale TODO - - src/hb-ot-layout.cc | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit ac26e2a838d1266bb5f39c43245eb2a52c5e072d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 14:10:39 2009 -0400 - - [HB] Hookup NEUTER() - - src/hb-open-types-private.hh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 15164d9258a74122a4db748d35532bd72c47cec2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 13:57:41 2009 -0400 - - [HB] Fix mix warnings - - src/Makefile.am | 2 +- - src/hb-font.cc | 15 +++------------ - src/hb-open-types-private.hh | 2 +- - src/hb-ot-layout-common-private.hh | 6 +++--- - src/hb-ot-layout-gdef-private.hh | 2 +- - src/hb-ot-layout-gpos-private.hh | 9 ++++----- - src/hb-ot-layout.cc | 2 +- - src/main.cc | 4 +--- - 8 files changed, 15 insertions(+), 27 deletions(-) - -commit 42b778f89e0818fe06910ce04e2203485823da09 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 13:30:49 2009 -0400 - - [HB] GPOS sanitize() - - src/hb-open-types-private.hh | 22 ++++- - src/hb-ot-layout-gpos-private.hh | 195 - +++++++++++++++++++++++++++++++++++++- - src/hb-ot-layout-gsub-private.hh | 2 - - 3 files changed, 213 insertions(+), 6 deletions(-) - -commit dc9c4d93cd0f3ac991f32df08c1c17fc389054c0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 12:26:26 2009 -0400 - - [HB] Sanitize DeviceTable - - src/hb-open-types-private.hh | 8 ++++---- - src/hb-ot-layout-common-private.hh | 17 ++++++++++++++--- - src/hb-ot-layout-gsub-private.hh | 2 +- - 3 files changed, 19 insertions(+), 8 deletions(-) - -commit ad3a3cd4955661c591b20af1f2c493432f0bebf0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 12:13:52 2009 -0400 - - [HB] More casts - - src/hb-ot-layout-gsub-private.hh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 95639fccc1ef18eadeb737e8b611d1d1f1315fc2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 12:05:24 2009 -0400 - - [HB] Fix couple of bugs - - src/hb-open-types-private.hh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 2b5a59c277f4c5bf7aac9a9005054763e322e02d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 11:38:50 2009 -0400 - - [HB] More cast cleanup - - src/hb-open-types-private.hh | 23 +++++++----- - src/hb-ot-layout-common-private.hh | 7 ++-- - src/hb-ot-layout-gsub-private.hh | 27 +++++--------- - src/hb-ot-layout-gsubgpos-private.hh | 64 - ++++++++++++--------------------- - 4 files changed, 50 insertions(+), 71 deletions(-) - -commit 196598bbccff08415ff5192314cba044df258cad -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 11:04:32 2009 -0400 - - [Hb] Use reinterpret casts instead of direct casts to char * - - src/hb-open-file-private.hh | 4 +- - src/hb-open-types-private.hh | 19 ++++++++++---- - src/hb-ot-layout-common-private.hh | 8 +++--- - src/hb-ot-layout-gpos-private.hh | 12 ++++---- - src/hb-ot-layout-gsub-private.hh | 20 +++++++------- - src/hb-ot-layout-gsubgpos-private.hh | 44 - +++++++++++++++++----------------- - 6 files changed, 57 insertions(+), 50 deletions(-) - -commit 92b5dd8e71e1bdeaa6e86a53f167683a3f5f4289 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 10:41:32 2009 -0400 - - [HB] Merge more templates - - src/hb-open-types-private.hh | 167 - ++++++++++++++---------------------------- - 1 files changed, 55 insertions(+), 112 deletions(-) - -commit e6ab2c59ba2d37942ac5fcbfe61d38b7e359ac8c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 10:23:01 2009 -0400 - - [HB] Simplify indirect sanitize() - - src/hb-open-types-private.hh | 52 - +++++++++++++++++------------------ - src/hb-ot-layout-common-private.hh | 11 +------- - 2 files changed, 26 insertions(+), 37 deletions(-) - -commit 29d8644a315ebe6976f15db2fe96069376d9b8cd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 02:27:37 2009 -0400 - - [HB] Finish GSUB sanitize() - - src/hb-ot-layout-gsub-private.hh | 21 ++++++++++++++++++++- - 1 files changed, 20 insertions(+), 1 deletions(-) - -commit cf086adca1b7b5a361a248808f9a847e513d3630 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 02:14:24 2009 -0400 - - [HB] Add comment - - src/hb-ot-layout-common-private.hh | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit a97ce570ab693190350886e4e80942851c4d5727 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 02:10:48 2009 -0400 - - [HB] Optimize sanitize() - - src/hb-open-types-private.hh | 7 ++++++- - 1 files changed, 6 insertions(+), 1 deletions(-) - -commit cd3827ee567612c5500206b62840702fc956e0f5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 02:09:34 2009 -0400 - - [HB] More sanitize() - - src/hb-open-file-private.hh | 2 +- - src/hb-open-types-private.hh | 12 ++++-- - src/hb-ot-layout-common-private.hh | 64 - +++++++++++++++++++++++++++++---- - src/hb-ot-layout-gdef-private.hh | 2 +- - src/hb-ot-layout-gsubgpos-private.hh | 15 +++++++- - 5 files changed, 79 insertions(+), 16 deletions(-) - -commit 70de50c11ed7037b20eb6814ff60f6e32a9944e4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Aug 4 00:58:28 2009 -0400 - - [HB] Start sanitize() - - src/hb-open-types-private.hh | 105 +++++++++++++++++++++++++++- - src/hb-ot-layout-common-private.hh | 48 ++++++++++++- - src/hb-ot-layout-gsub-private.hh | 125 - +++++++++++++++++++++++++++++++++- - src/hb-ot-layout-gsubgpos-private.hh | 104 ++++++++++++++++++++++++++++ - 4 files changed, 376 insertions(+), 6 deletions(-) - -commit 5fc22e647c8a2bf6d3cb59185e351ac625e7e322 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 3 22:43:02 2009 -0400 - - [HB] Remove use of typeof() - - src/hb-blob.c | 4 ++-- - src/hb-buffer.c | 2 +- - src/hb-font.cc | 14 +++++++------- - src/hb-object-private.h | 4 ++-- - 4 files changed, 12 insertions(+), 12 deletions(-) - -commit 70e0f2a75ec1559f2f70ada837ce4bc4baca49e3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 3 22:01:47 2009 -0400 - - [HB] Make it all work again - - src/hb-font.cc | 23 +++++++++++-------- - src/hb-ot-layout-private.h | 9 +++++-- - src/hb-ot-layout.cc | 51 - +++++++++++++++++++++---------------------- - 3 files changed, 44 insertions(+), 39 deletions(-) - -commit 23c86aa0009324433e78fcd0c47f2c0ff14b1949 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 3 21:40:20 2009 -0400 - - [HB] Use face_t directly instead of ot_layout_t - - src/TODO | 1 + - src/hb-font-private.h | 4 + - src/hb-font.cc | 74 +++++++++--- - src/hb-font.h | 3 + - src/hb-object-private.h | 36 ++++-- - src/hb-ot-layout-gdef-private.hh | 2 + - src/hb-ot-layout-gpos-private.hh | 14 +- - src/hb-ot-layout-gsub-private.hh | 32 +++--- - src/hb-ot-layout-gsubgpos-private.hh | 8 +- - src/hb-ot-layout-private.h | 40 ++++--- - src/hb-ot-layout.cc | 220 - +++++++++++++++------------------- - 11 files changed, 237 insertions(+), 197 deletions(-) - -commit fc6c94002dd5478cf9fbdaff12d8374a786c85e1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 3 21:27:08 2009 -0400 - - [HB] Simplify sub-blob support - - src/hb-blob.c | 172 - +++++++++++++++++++++----------------------------------- - src/hb-blob.h | 14 +++-- - 2 files changed, 74 insertions(+), 112 deletions(-) - -commit a26442437ae9f11674e0d68cd5cbf395ade7695d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Aug 3 17:53:29 2009 -0400 - - [HB] Add sub-blobs - - src/hb-blob.c | 162 - ++++++++++++++++++++++++++++++++++++++++++++++++--------- - src/hb-blob.h | 12 ++++- - 2 files changed, 147 insertions(+), 27 deletions(-) - -commit b28e21b90c4105a0c2e17009b748777294614664 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 2 20:06:48 2009 -0400 - - [HB] Rename hb-font.c to hb-font.cc - - src/Makefile.am | 2 +- - src/hb-font.c | 349 - ------------------------------------------------------- - src/hb-font.cc | 349 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 350 insertions(+), 350 deletions(-) - -commit 5f5b24f99f52bbc922e238b65c06061ba07c8548 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 2 20:03:12 2009 -0400 - - [OT] Rename C++ header files from *.h to *.hh - - src/Makefile.am | 14 +- - src/hb-open-file-private.h | 145 ---- - src/hb-open-file-private.hh | 145 ++++ - src/hb-open-types-private.h | 386 ---------- - src/hb-open-types-private.hh | 386 ++++++++++ - src/hb-ot-layout-common-private.h | 447 ----------- - src/hb-ot-layout-common-private.hh | 447 +++++++++++ - src/hb-ot-layout-gdef-private.h | 320 -------- - src/hb-ot-layout-gdef-private.hh | 320 ++++++++ - src/hb-ot-layout-gpos-private.h | 1355 - ---------------------------------- - src/hb-ot-layout-gpos-private.hh | 1355 - ++++++++++++++++++++++++++++++++++ - src/hb-ot-layout-gsub-private.h | 751 ------------------- - src/hb-ot-layout-gsub-private.hh | 751 +++++++++++++++++++ - src/hb-ot-layout-gsubgpos-private.h | 773 ------------------- - src/hb-ot-layout-gsubgpos-private.hh | 773 +++++++++++++++++++ - src/hb-ot-layout.cc | 8 +- - src/main.cc | 6 +- - 17 files changed, 4191 insertions(+), 4191 deletions(-) - -commit 2098a021a826e76ee27d5db74e32738d7d1c3d30 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 2 19:57:00 2009 -0400 - - [HB] Move OT file handling out of ot-layout - - src/Makefile.am | 3 +- - src/hb-open-file-private.h | 145 +++++++++++ - src/hb-open-types-private.h | 386 +++++++++++++++++++++++++++++ - src/hb-ot-layout-common-private.h | 4 +- - src/hb-ot-layout-open-private.h | 495 - ------------------------------------- - src/hb-ot-layout.cc | 2 +- - src/main.cc | 4 +- - 7 files changed, 539 insertions(+), 500 deletions(-) - -commit 0ead481a5a8623103565fd7d924666e7342278dd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 2 17:41:36 2009 -0400 - - [HB] Port ot-layout to new public API - - src/TODO | 1 + - src/hb-common.h | 1 + - src/hb-font.c | 9 + - src/hb-font.h | 3 + - src/hb-ot-layout-gdef-private.h | 32 ++-- - src/hb-ot-layout-gpos-private.h | 106 ++++++------ - src/hb-ot-layout-gsub-private.h | 50 +++--- - src/hb-ot-layout-gsubgpos-private.h | 12 +- - src/hb-ot-layout-private.h | 36 +++- - src/hb-ot-layout.cc | 334 - +++++++++++++++++++---------------- - src/hb-ot-layout.h | 207 ++++++++++------------ - 11 files changed, 415 insertions(+), 376 deletions(-) - -commit 678bed433371d90536976a2d57195c1e1867f766 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 2 15:35:31 2009 -0400 - - [HB] Add top-level header files - - src/Makefile.am | 2 ++ - src/hb-ot.h | 34 ++++++++++++++++++++++++++++++++++ - src/hb.h | 35 +++++++++++++++++++++++++++++++++++ - 3 files changed, 71 insertions(+), 0 deletions(-) - -commit 2c80296aa5991ad67483889147f5c84fefe54af2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Aug 2 15:20:22 2009 -0400 - - [HB] Add XXX marks - - src/hb-ot-layout-private.h | 2 ++ - src/hb-ot-layout.cc | 7 ++----- - 2 files changed, 4 insertions(+), 5 deletions(-) - -commit c46f8efd6ddd981b5724b2600ac98a80193385be -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 1 23:06:27 2009 -0400 - - [HB] Rename _duplicate to _copy - - To be in line with cairo - - src/hb-font.c | 4 ++-- - src/hb-font.h | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit f1ebe44985e2192844cf1747a4e36ed81e715ce6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 1 22:55:11 2009 -0400 - - [HB] Cleanup TODO - - src/TODO | 10 +--------- - 1 files changed, 1 insertions(+), 9 deletions(-) - -commit f1322e52d557726baa010be8d35a594748e8fa1a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 1 22:53:04 2009 -0400 - - [HB] Cleanup public buffer structs - - src/hb-buffer-private.h | 46 - ++++++++++++++++++++++++++++++------ - src/hb-buffer.c | 49 - ++++++++++++++++++++------------------- - src/hb-buffer.h | 35 +++++++++++++-------------- - src/hb-ot-layout-gpos-private.h | 8 +++--- - src/hb-ot-layout-private.h | 5 ++- - src/hb-ot-layout.cc | 20 ++++++++-------- - 6 files changed, 97 insertions(+), 66 deletions(-) - -commit 6d5bb18e93d2a53350b342869a3ec8f25f0396c2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 1 22:25:04 2009 -0400 - - [OT] Match struct with HB's - - src/hb-buffer.c | 6 +++--- - src/hb-buffer.h | 2 +- - src/hb-ot-layout.cc | 12 ++++++------ - 3 files changed, 10 insertions(+), 10 deletions(-) - -commit 11fbb5487d9900a019440ef8235f35c9f525decb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 1 22:19:06 2009 -0400 - - [HB] Port buffert to new object API - - src/hb-buffer-private.h | 24 +++++++++++++++-- - src/hb-buffer.c | 65 - ++++++++++++++++++++++++++++++++++++----------- - src/hb-buffer.h | 53 ++++++++++++++++++++++++-------------- - 3 files changed, 104 insertions(+), 38 deletions(-) - -commit 0cc7bc59ea6e8f38bf1e196c558cca9862ac3302 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 1 21:38:39 2009 -0400 - - [HB] Move typedef's around - - src/hb-blob.h | 2 ++ - src/hb-common.h | 9 --------- - src/hb-font.h | 10 ++++++++++ - 3 files changed, 12 insertions(+), 9 deletions(-) - -commit a12dd324a3859496a95602d426aee34ce6c5c8a6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 1 21:36:15 2009 -0400 - - [HB] Add get_reference_count() - - src/hb-blob.c | 6 ++++++ - src/hb-blob.h | 3 +++ - src/hb-font.c | 24 ++++++++++++++++++++++++ - src/hb-font.h | 12 ++++++++++++ - src/hb-object-private.h | 7 +++++++ - 5 files changed, 52 insertions(+), 0 deletions(-) - -commit baec684fde2303edb16341bfcf1022cd72acf129 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 1 21:06:11 2009 -0400 - - [HB] Remove glib dependency - - src/Makefile.am | 7 ++----- - src/hb-buffer.c | 2 +- - src/hb-private.h | 30 ++++++++++++++++++------------ - src/main.cc | 1 + - 4 files changed, 22 insertions(+), 18 deletions(-) - -commit df66028781a7609a515980e64396e6f1044d764a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 1 20:46:02 2009 -0400 - - [HB] Assorted compiler macros - - src/hb-ot-layout-open-private.h | 4 +- - src/hb-private.h | 88 - ++++++++++++++++++++++++++++++--------- - 2 files changed, 70 insertions(+), 22 deletions(-) - -commit ba8d94ce3360bfaf2c530d01f2af69237018a531 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 1 20:29:22 2009 -0400 - - [HB] Simplify object creation - - src/Makefile.am | 2 +- - src/hb-blob.c | 6 +-- - src/hb-font-private.h | 1 - - src/hb-font.c | 37 +++++------------ - src/hb-object-private.h | 97 - +++++++++++++++++++++++++++++++++++++++++++++ - src/hb-private.h | 2 + - src/hb-refcount-private.h | 87 ---------------------------------------- - 7 files changed, 112 insertions(+), 120 deletions(-) - -commit c62b503770325819f249885dfc9d4683a69c9efd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 1 19:54:49 2009 -0400 - - [HB] Add abstract font and face API - - Not used yet. - - src/Makefile.am | 3 + - src/hb-blob.c | 6 +- - src/hb-font-private.h | 108 +++++++++++++++ - src/hb-font.c | 331 - +++++++++++++++++++++++++++++++++++++++++++++ - src/hb-font.h | 182 +++++++++++++++++++++++++ - src/hb-refcount-private.h | 14 ++- - 6 files changed, 636 insertions(+), 8 deletions(-) - -commit 35a7383c6138fd705560f0d4bb30659cbd1ab64c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 1 19:30:31 2009 -0400 - - [HB] Simplify refcounting functions - - src/hb-blob.c | 32 ++++++++++---------------------- - src/hb-common.h | 2 ++ - src/hb-private.h | 2 ++ - src/hb-refcount-private.h | 31 ++++++++++++++++++++++++++++++- - 4 files changed, 44 insertions(+), 23 deletions(-) - -commit 23af767a4475fecc1fe9fe9108f12c05c89bc8c9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 1 19:10:41 2009 -0400 - - [HB] Fix for dfont's with multiple faces - - src/hb-ot-layout-open-private.h | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit e97a95f2ea2770689bbf076d3c3ac404f273271e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Aug 1 19:05:44 2009 -0400 - - [HB] Use calloc instead of malloc where feasible - - src/hb-blob.c | 8 +++++--- - src/hb-buffer.c | 4 ++-- - 2 files changed, 7 insertions(+), 5 deletions(-) - -commit 0090dc0f67b553d2f6eaaedc289c0956ade09ef6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 30 16:28:45 2009 -0400 - - [HB] Remove hinting setting and use ppem==0 to mean "no hinting" - - src/hb-blob.h | 3 --- - src/hb-common.h | 9 +++++++++ - src/hb-ot-layout-gpos-private.h | 36 - ++++++++++++++++++++++++------------ - src/hb-ot-layout-private.h | 2 -- - src/hb-ot-layout.cc | 7 ------- - src/hb-ot-layout.h | 4 ---- - 6 files changed, 33 insertions(+), 28 deletions(-) - -commit f0954d1e08ae288eda9904e17108fc73f48c0b98 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 30 15:33:57 2009 -0400 - - [HB] Add a "blob" manager - - src/Makefile.am | 5 +- - src/hb-blob.c | 181 - +++++++++++++++++++++++++++++++++++++++++++++ - src/hb-blob.h | 74 ++++++++++++++++++ - src/hb-private.h | 2 + - src/hb-refcount-private.h | 54 +++++++++++++ - 5 files changed, 315 insertions(+), 1 deletions(-) - -commit 02a370697d25b986dbf1d5c38f46a89a4833b495 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 29 18:41:25 2009 -0400 - - [HB] Move direction to buffer - - src/hb-buffer.c | 9 +++++++++ - src/hb-buffer.h | 14 ++++++++++++++ - src/hb-ot-layout-gpos-private.h | 2 +- - src/hb-ot-layout-private.h | 1 - - src/hb-ot-layout.cc | 7 ------- - src/hb-ot-layout.h | 5 ----- - 6 files changed, 24 insertions(+), 14 deletions(-) - -commit 7cda6fa24c26887c5543d0657b07aad466452cb3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jul 29 18:37:57 2009 -0400 - - [HB] Rename internal vars - - src/hb-ot-layout-gsubgpos-private.h | 56 - +++++++++++++++++----------------- - 1 files changed, 28 insertions(+), 28 deletions(-) - -commit b196e6f2743d631ef181f1116370be3055063d36 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 28 15:50:42 2009 -0400 - - [HB] Fix buffer enlargement. Ouch - - src/hb-buffer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f9cd1014f8f4d0394b5e0e9eefc1e2af13c59cab -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Jul 28 15:43:34 2009 -0400 - - Apply patch from Jonathan Kew - - src/hb-buffer.c | 75 - ++++++++++++++++++++++++++------------------------ - src/hb-buffer.h | 6 +++- - src/hb-ot-layout.cc | 31 +++++++++++++++++++++ - src/hb-ot-layout.h | 15 ++++++++++ - src/hb-private.h | 2 +- - 5 files changed, 91 insertions(+), 38 deletions(-) - -commit 2ebb89d63dd27e800f2b6cbf624924601105f48a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Jul 25 19:09:01 2009 -0400 - - Revert "XX" - - This reverts commit c939f6aff405ca7b10b1f1538f46148bff719fcb. - - src/Makefile.am | 2 - - src/hb-buffer.c | 9 --- - src/hb-buffer.h | 14 ----- - src/hb-common.h | 3 - - src/hb-ot-layout-gdef-private.h | 32 +++++----- - src/hb-ot-layout-gpos-private.h | 108 - +++++++++++++++++----------------- - src/hb-ot-layout-gsub-private.h | 46 +++++++------- - src/hb-ot-layout-gsubgpos-private.h | 68 +++++++++++----------- - src/hb-ot-layout-private.h | 28 ++++----- - src/hb-ot-layout.cc | 30 ++++++++++ - src/hb-ot-layout.h | 5 ++ - src/hb-private.h | 16 ----- - 12 files changed, 174 insertions(+), 187 deletions(-) - -commit 55520d2af172f5f6617b909e80cbd7d898f2bc15 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jun 10 23:26:51 2009 -0400 - - XX - - src/Makefile.am | 2 + - src/hb-buffer.c | 9 +++ - src/hb-buffer.h | 14 +++++ - src/hb-common.h | 3 + - src/hb-ot-layout-gdef-private.h | 32 +++++----- - src/hb-ot-layout-gpos-private.h | 108 - +++++++++++++++++----------------- - src/hb-ot-layout-gsub-private.h | 46 +++++++------- - src/hb-ot-layout-gsubgpos-private.h | 68 +++++++++++----------- - src/hb-ot-layout-private.h | 28 +++++---- - src/hb-ot-layout.cc | 30 ---------- - src/hb-ot-layout.h | 5 -- - src/hb-private.h | 16 +++++ - 12 files changed, 187 insertions(+), 174 deletions(-) - -commit f53d434b9151c4ec43c148734b49bb165e522cc9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat May 30 22:17:32 2009 -0400 - - [GPOS] Advance buffer cursor in SinglePos lookups. Ouch! - - src/hb-ot-layout-gpos-private.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit e35bbd570a5d914f86f1ea83941ee4328f268059 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat May 30 12:02:46 2009 -0400 - - [HB] Improve buffer. Don't dup out buffer unless out is longer - than in - - That is, we work in-place even for ligatures now. - - src/hb-buffer.c | 156 - ++++++++++++++++++++++++------------------------------- - src/hb-buffer.h | 7 +-- - 2 files changed, 71 insertions(+), 92 deletions(-) - -commit 6734ed4b6b2ce382917bf644aaf1acfa993f00ad -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 27 18:16:55 2009 -0400 - - [GPOS] Fix property checking - - src/hb-ot-layout-gpos-private.h | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit cc83ae12484108586fba6586bd9008971338b322 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 27 00:17:37 2009 -0400 - - [GPOS] Add vertical TODO - - src/hb-ot-layout-gpos-private.h | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit b69d38e7eaea544ba6c1876cdc6ddac61a698dd3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 26 22:29:02 2009 -0400 - - [HB] Remove useless include - - src/hb-ot-layout-private.h | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -commit 6c8108cb583292a679b05844ab613b7f4587adc6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 26 22:26:08 2009 -0400 - - [GPOS] Remove unused variables - - src/hb-ot-layout-gpos-private.h | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 09c292e3b688a67fbae67b645d1e6ffcf8d8eb6e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 26 19:48:16 2009 -0400 - - [HB] Fix glyph properties - - src/hb-ot-layout-common-private.h | 6 +++--- - src/hb-ot-layout-open-private.h | 2 +- - src/hb-ot-layout.cc | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -commit 64e33f008ff9cc807fdfdc4553ad3fe01bb0615f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 26 18:57:56 2009 -0400 - - [GPOS] Fix PairPos signedness - - src/hb-ot-layout-gpos-private.h | 11 ++++------- - 1 files changed, 4 insertions(+), 7 deletions(-) - -commit 80ea5bd10e72561a7627a5196621a6d7eccd91b7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 26 17:58:37 2009 -0400 - - [GPOS] Fix mark matching - - src/hb-ot-layout-gpos-private.h | 44 - +++++++++++++++++--------------------- - 1 files changed, 20 insertions(+), 24 deletions(-) - -commit 4189b92aaa41e4a1756c561cc6e08b0ed024afda -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 26 17:31:56 2009 -0400 - - [HB] When looking back/forward, skip marks only - - src/TODO | 1 - - src/hb-ot-layout-gpos-private.h | 13 +------ - src/hb-ot-layout-gsub-private.h | 38 ++++++++----------- - src/hb-ot-layout-gsubgpos-private.h | 14 ++++---- - src/hb-ot-layout-private.h | 6 +++ - src/hb-ot-layout.cc | 69 - +++++++++++++++++++++++------------ - 6 files changed, 76 insertions(+), 65 deletions(-) - -commit 1246e41021ab1d782b4c97e5d81c4917a57e3ed4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 26 15:58:34 2009 -0400 - - [GDEF] Support MarkFilteringSets - - src/hb-ot-layout.cc | 59 - ++++++++++++++++++-------------------------------- - 1 files changed, 21 insertions(+), 38 deletions(-) - -commit 5130c35e93528bcf3095fee5baf3847589167a58 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 26 15:45:41 2009 -0400 - - [HB] Simplify MarkAttachmentType handling - - src/hb-ot-layout-gpos-private.h | 6 +++--- - src/hb-ot-layout-gsub-private.h | 6 ++---- - src/hb-ot-layout.cc | 18 ++++++++---------- - 3 files changed, 13 insertions(+), 17 deletions(-) - -commit e4b92b85a7750bd4271ad607b3c41f0184e89feb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 26 15:38:53 2009 -0400 - - [HB] Support parsing MarkFilteringSets introduced in OpenType 1.6 - - src/hb-ot-layout-gdef-private.h | 55 - +++++++++++++++++++++++++++++++++----- - src/hb-ot-layout-gpos-private.h | 1 + - src/hb-ot-layout.cc | 6 ++-- - 3 files changed, 51 insertions(+), 11 deletions(-) - -commit 515ce4ceb2ab0151d8dfc03ff0bfc7d110dd93b5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 26 13:08:00 2009 -0400 - - [HB] More de-C++'ization - - src/hb-ot-layout-gsubgpos-private.h | 24 ++++++++++++------------ - 1 files changed, 12 insertions(+), 12 deletions(-) - -commit d7df42d7ee586219475878d160f85ae5a188bd59 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 26 13:04:59 2009 -0400 - - [HB] Start MarkFilteringSet support - - src/hb-ot-layout-common-private.h | 24 +++++++++++++++++++----- - 1 files changed, 19 insertions(+), 5 deletions(-) - -commit 62964afcecd96038cfaa8bc2bc931f43ee83be7e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 26 12:40:10 2009 -0400 - - [HB] Implement get_lig_carets() - - src/hb-ot-layout-gdef-private.h | 57 - ++++++++++++++++++++++++++++++-------- - src/hb-ot-layout.cc | 17 +++++++++--- - src/hb-ot-layout.h | 8 +++++- - src/main.cc | 9 +----- - 4 files changed, 66 insertions(+), 25 deletions(-) - -commit 79420ad9caf2d5fc94c3693e8292edfa27060b2d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 26 12:24:16 2009 -0400 - - [HB] Add get_attach_points() - - src/Makefile.am | 2 +- - src/hb-ot-layout-gdef-private.h | 35 - +++++++++++++++++++++++++---------- - src/hb-ot-layout-gpos-private.h | 28 +++++++--------------------- - src/hb-ot-layout-gsub-private.h | 28 +++++++--------------------- - src/hb-ot-layout-open-private.h | 12 +++--------- - src/hb-ot-layout.cc | 9 +++++++++ - src/hb-ot-layout.h | 6 ++++++ - src/main.cc | 8 ++++---- - 8 files changed, 62 insertions(+), 66 deletions(-) - -commit 855720ca47bf5a7a44eb5b84dce9f7da6e7156bd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 26 12:00:28 2009 -0400 - - [HB] Remove more macros - - src/hb-ot-layout-gdef-private.h | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) - -commit c968fc2dc87cf85b53f60a40db59d5ee7b992edf -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 25 04:04:24 2009 -0400 - - [HB] More buffer cleanup - - src/hb-buffer-private.h | 39 +++-------- - src/hb-buffer.c | 136 - +++++++++++++++++----------------- - src/hb-buffer.h | 22 +++--- - src/hb-ot-layout-gpos-private.h | 29 ++++---- - src/hb-ot-layout-gsub-private.h | 10 ++-- - src/hb-ot-layout-gsubgpos-private.h | 8 +- - src/hb-ot-layout-private.h | 13 +--- - src/hb-ot-layout.cc | 16 ++-- - src/hb-private.h | 29 -------- - 9 files changed, 125 insertions(+), 177 deletions(-) - -commit 88a5f5a49b6809d88560791f9cf6b8f78f22a4ad -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 25 03:39:11 2009 -0400 - - [HB] Cleanup buffer - - src/hb-buffer-private.h | 2 +- - src/hb-buffer.c | 26 +++++++----- - src/hb-ot-layout-gsub-private.h | 26 ++++--------- - src/hb-ot-layout-gsubgpos-private.h | 2 +- - src/hb-ot-layout.cc | 71 - ----------------------------------- - 5 files changed, 25 insertions(+), 102 deletions(-) - -commit 347f0b8621d3adfec157e5634ff3defc818ea37f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 25 03:30:31 2009 -0400 - - [HB] Clean more - - src/hb-ot-layout-private.h | 10 ++++------ - src/hb-ot-layout.cc | 8 ++++---- - 2 files changed, 8 insertions(+), 10 deletions(-) - -commit d9d2a07f4a8696666a12f5a206aa9cfb56dc2b35 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 25 03:24:19 2009 -0400 - - [HB] Remove one XXX, add another - - src/hb-buffer.h | 2 ++ - src/hb-ot-layout-private.h | 3 +-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -commit 6c78683c042250a7b5a6fc6ebae4717b03fadf9e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 25 03:22:19 2009 -0400 - - [HB] Update copyright years - - src/hb-buffer-private.h | 2 +- - src/hb-buffer.h | 2 +- - src/hb-common.h | 2 +- - src/hb-ot-layout-private.h | 2 +- - src/hb-ot-layout.h | 2 +- - src/hb-private.h | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -commit 4497af0069a94c69fc1518b1db2c1282721b732a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 25 03:20:18 2009 -0400 - - [HB] Would have helped if I actually knew C++ before using it... - - src/hb-ot-layout-gsubgpos-private.h | 4 ++-- - src/hb-ot-layout-open-private.h | 24 ++++++++++++------------ - 2 files changed, 14 insertions(+), 14 deletions(-) - -commit cc6c644ff2af5f6669b6ec100ff13e904872b21c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 25 03:10:06 2009 -0400 - - [HB] More cleanup - - src/hb-ot-layout-common-private.h | 4 ++-- - src/hb-ot-layout-open-private.h | 9 +++++---- - 2 files changed, 7 insertions(+), 6 deletions(-) - -commit 20cc86b3592db33731de671f008d7d222776be49 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 25 02:41:49 2009 -0400 - - [HB] Simplify Tag - - src/hb-ot-layout-open-private.h | 46 - +++++++++++++++----------------------- - 1 files changed, 18 insertions(+), 28 deletions(-) - -commit 3ec0092c5e2d48e8c4fc1618d3bee427adddb1e7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 25 02:34:25 2009 -0400 - - [HB] Simplify more - - src/hb-ot-layout-open-private.h | 31 ++++++++++--------------------- - 1 files changed, 10 insertions(+), 21 deletions(-) - -commit 6ad8d5f3c7028147b371137ae4bca6aae66b3489 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 25 02:27:29 2009 -0400 - - [HB] Simplify some basic things - - src/hb-ot-layout-open-private.h | 90 - +++++++++++++++++++++++++------------- - src/main.cc | 8 ++- - 2 files changed, 64 insertions(+), 34 deletions(-) - -commit f96ffd43bce0ac6d9c897933c9be0e51d543e570 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 24 15:01:16 2009 -0400 - - [HB] simplify macros - - src/hb-buffer-private.h | 4 ++-- - src/hb-buffer.h | 4 ++-- - src/hb-common.h | 8 ++++---- - src/hb-ot-layout-private.h | 4 ++-- - src/hb-ot-layout.h | 4 ++-- - 5 files changed, 12 insertions(+), 12 deletions(-) - -commit 8e7b30782a12f3997b9a5a18e6b9d01f6bff8b46 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 24 14:27:24 2009 -0400 - - [HB] Update text files - - src/COPYING | 7 ------- - src/README | 13 ++----------- - 2 files changed, 2 insertions(+), 18 deletions(-) - -commit fa7d47249496fe00ea1ab6943b385c8dd80e5ce6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 24 14:24:35 2009 -0400 - - [HB] Remove stale makefile.msc too - - src/makefile.msc | 19 ------------------- - 1 files changed, 0 insertions(+), 19 deletions(-) - -commit da2c52abcd75d46929b34cad55c4fb2c8892bc08 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 24 14:22:22 2009 -0400 - - [HB] Remove old code! - - Goodbye 16 thousand lines of ten-year old code! - - src/harfbuzz-dump-main.c | 97 - - src/harfbuzz-dump.c | 768 ------ - src/harfbuzz-dump.h | 41 - - src/harfbuzz-gdef-private.h | 124 - - src/harfbuzz-gdef.c | 1160 -------- - src/harfbuzz-gdef.h | 135 - - src/harfbuzz-global.h | 84 - - src/harfbuzz-gpos-private.h | 712 ----- - src/harfbuzz-gpos.c | 6071 - ----------------------------------------- - src/harfbuzz-gpos.h | 174 -- - src/harfbuzz-gsub-private.h | 476 ---- - src/harfbuzz-gsub.c | 4304 ----------------------------- - src/harfbuzz-gsub.h | 140 - - src/harfbuzz-impl.c | 84 - - src/harfbuzz-impl.h | 126 - - src/harfbuzz-open-private.h | 102 - - src/harfbuzz-open.c | 1405 ---------- - src/harfbuzz-open.h | 282 -- - src/harfbuzz-stream-private.h | 83 - - src/harfbuzz-stream.c | 257 -- - src/harfbuzz.c | 31 - - src/harfbuzz.h | 35 - - 22 files changed, 0 insertions(+), 16691 deletions(-) - -commit e5372f1621602dcee4e14a4b22dc182c21502a50 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 24 14:21:27 2009 -0400 - - [HB] Remove stale TODO mark - - src/hb-ot-layout-open-private.h | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 96908b898476ca5d7da5f386b15be76f9e83d76e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 24 12:30:40 2009 -0400 - - [HB] Add FixedVersion cast to int - - src/hb-ot-layout-open-private.h | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 957740dd253475020a94a62ec5dfcd03e3358176 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 24 12:29:55 2009 -0400 - - [HB] Simplify tag - - src/hb-ot-layout-open-private.h | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -commit 87fcdcbe3644da10154688765db2d62eb9ac079a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 24 01:03:24 2009 -0400 - - [HB] Remove unused data types - - src/hb-ot-layout-gdef-private.h | 2 +- - src/hb-ot-layout-gsubgpos-private.h | 2 +- - src/hb-ot-layout-open-private.h | 54 - +++------------------------------- - 3 files changed, 7 insertions(+), 51 deletions(-) - -commit 5876bf1b73fcb56cc41b4d348248a4817f9688cb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 24 00:53:28 2009 -0400 - - [HB] Simplify version check in GSUB/GPOS - - src/hb-ot-layout-gpos-private.h | 5 ++++- - src/hb-ot-layout-gsub-private.h | 5 ++++- - 2 files changed, 8 insertions(+), 2 deletions(-) - -commit 212aba6189d7aaac0bab169b77ae6bdab16800a5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 24 00:50:27 2009 -0400 - - [HB] Check for GDEF/GSUB/GPOS versions - - src/hb-ot-layout-gdef-private.h | 3 +-- - src/hb-ot-layout-gpos-private.h | 3 +-- - src/hb-ot-layout-gsub-private.h | 3 +-- - src/hb-ot-layout-gsubgpos-private.h | 5 ++--- - src/hb-ot-layout-open-private.h | 11 ++++++++++- - 5 files changed, 15 insertions(+), 10 deletions(-) - -commit a21b5062cc32c04eeee3c4b20d26c7e2b34133e9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat May 23 22:39:42 2009 -0400 - - [HB] Minor - - src/hb-ot-layout-gdef-private.h | 6 +++--- - src/hb-ot-layout-open-private.h | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -commit a080b1cc2f66d6e109d431a1e09519d7cf53bb9a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat May 23 18:50:44 2009 -0400 - - [HB] Add TODO items - - src/TODO | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) - -commit e4efdd80a8fa4edbcdec9cd84f35f5f4521943c2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 22 18:54:24 2009 -0400 - - [GDEF] Add some get_carret_value() code - - src/hb-ot-layout-gdef-private.h | 36 - ++++++++++++++++++------------------ - 1 files changed, 18 insertions(+), 18 deletions(-) - -commit 9b006bc0322723d065271e4b0ea4f137f81101e1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 22 18:29:45 2009 -0400 - - [GPOS] MarkLigPosFormat1 - - GPOS is complete now! Yay! - - src/hb-ot-layout-gpos-private.h | 128 - ++++++++++++++++++++++++++++----------- - 1 files changed, 92 insertions(+), 36 deletions(-) - -commit 923923feb248250626c637c11a886804011197b0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 22 17:58:09 2009 -0400 - - [HB] Remove apply_subtables() again - - src/hb-ot-layout-gpos-private.h | 31 +++++++++++-------------------- - src/hb-ot-layout-gsub-private.h | 33 ++++++++++++--------------------- - 2 files changed, 23 insertions(+), 41 deletions(-) - -commit d468f9af5b9fdc2713b0b86f28129e4190ee5053 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 21 22:31:33 2009 -0400 - - [HB] Share Extension lookup code between GSUB and GPOS - - src/hb-ot-layout-gpos-private.h | 64 +++++---------------------- - src/hb-ot-layout-gsub-private.h | 83 - ++++++----------------------------- - src/hb-ot-layout-gsubgpos-private.h | 52 ++++++++++++++++++++++ - 3 files changed, 77 insertions(+), 122 deletions(-) - -commit 498f1909e0f7a32484b2058622c4a018cbfc1334 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 21 15:51:04 2009 -0400 - - [GPOS] Remove printf. MarkMarkPos1 is working - - The "bug" was in the font. - - src/hb-ot-layout-gpos-private.h | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit c7d457aa3ae7138630f52ca7263f663a3ea284c0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 21 12:46:29 2009 -0400 - - [HB] Ouch. Add files. - - src/hb-common.h | 13 ++++----- - src/hb-private.h | 74 - ++++++++++++++++++++++++++++++++++++++++++++++++++++- - 2 files changed, 78 insertions(+), 9 deletions(-) - -commit fe550f4dd815285e9de8c3cbff810b0a1c7b377f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 21 08:27:07 2009 -0400 - - [GPOS] MarkMarkPosFormat1 - - Still not quite working. - - src/TODO | 4 +- - src/hb-ot-layout-gpos-private.h | 105 - ++++++++++++++++++++++++++++----------- - 2 files changed, 79 insertions(+), 30 deletions(-) - -commit 357ccde36bba01a405d59b7da061fc5048cdc7b4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 21 06:32:01 2009 -0400 - - [GPOS] MarkBasePosFormat1 - - src/TODO | 1 + - src/hb-ot-layout-gpos-private.h | 62 - +++++++++++++++++++++++++++++++++++--- - 2 files changed, 58 insertions(+), 5 deletions(-) - -commit 377bfc5860ae018f54e4a2dd737b4b000383ab54 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 21 04:58:24 2009 -0400 - - [GPOS] Implement MarkArray interface - - src/hb-ot-layout-gpos-private.h | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit c18ec2b1d7b8c7abe6ebf4b53c9ec75d5c9bb255 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 21 04:54:01 2009 -0400 - - [GPOS] Implement Device support in AnchorFormat3 - - src/hb-ot-layout-gpos-private.h | 11 ++++++++--- - 1 files changed, 8 insertions(+), 3 deletions(-) - -commit fca6a0d158b847181dcf67a13f34499177df899b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 21 04:49:04 2009 -0400 - - [GPOS] Remove apply_value() return value - - src/hb-ot-layout-gpos-private.h | 75 - +++++++++++++++++--------------------- - 1 files changed, 34 insertions(+), 41 deletions(-) - -commit fb3b5ccfefc4c38c9184d432703e81f73e1f5bc7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 21 04:47:05 2009 -0400 - - [GPOS] Start MarkBasePosFormat1 - - src/TODO | 1 + - src/hb-ot-layout-gpos-private.h | 38 - +++++++++++++++++--------------------- - 2 files changed, 18 insertions(+), 21 deletions(-) - -commit ee8776d9e009a7fb8e1f3c1f9cf3ad42d9746a16 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 20 15:46:12 2009 -0400 - - [HB] Add TODO item - - src/hb-ot-layout-gpos-private.h | 1 + - src/hb-ot-layout-gsub-private.h | 1 + - 2 files changed, 2 insertions(+), 0 deletions(-) - -commit c6456ca5cfc35095378dcf29f8edc33ece9c3ea1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 20 06:15:23 2009 -0400 - - [HB] Add TODO item - - src/TODO | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 3015c4175179a1816aad2a4950da9a3b8baf2578 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 20 06:01:16 2009 -0400 - - [HB] Remove last dependence on the old code base! - - src/hb-buffer-private.h | 88 - +++++++++++++++++++------------------- - src/hb-buffer.c | 47 ++++++++++----------- - src/hb-ot-layout-gpos-private.h | 11 ++--- - src/hb-ot-layout-gsub-private.h | 12 +++--- - src/hb-ot-layout.cc | 16 ++++---- - 5 files changed, 85 insertions(+), 89 deletions(-) - -commit 5c0adce1ccc739415c4b26ff13ffd2d77ea4bc6c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 20 05:42:12 2009 -0400 - - [HB] Rename harfbuzz-buffer to hb-buffer - - src/Makefile.am | 5 +- - src/harfbuzz-buffer-private.h | 106 ----------- - src/harfbuzz-buffer.c | 349 - ----------------------------------- - src/harfbuzz-buffer.h | 94 ---------- - src/hb-buffer-private.h | 106 +++++++++++ - src/hb-buffer.c | 347 - ++++++++++++++++++++++++++++++++++ - src/hb-buffer.h | 94 ++++++++++ - src/hb-ot-layout-gsubgpos-private.h | 2 +- - src/hb-ot-layout-private.h | 2 +- - src/hb-ot-layout.cc | 5 +- - src/hb-ot-layout.h | 2 +- - 11 files changed, 556 insertions(+), 556 deletions(-) - -commit b857b49c82782d29d6d189f1a9f4a84d39cd84ea -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 20 05:35:14 2009 -0400 - - [HB] Remove all references to the old code! - - src/Makefile.am | 76 +++++++--------------- - src/harfbuzz-buffer.c | 154 - ++++++++++++++++++-------------------------- - src/harfbuzz-buffer.h | 80 +++++++++++----------- - src/hb-ot-layout-private.h | 6 +- - src/hb-ot-layout.cc | 17 ++--- - src/hb-ot-layout.h | 1 + - 6 files changed, 137 insertions(+), 197 deletions(-) - -commit e1593a6e620ee6a8184487185d1c95e0d1820ba5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 20 04:51:30 2009 -0400 - - [GPOS] Finally it's working, up to Cursive - - Wow, IranNastaliq renders perfectly again! - - src/hb-ot-layout.cc | 24 ++++++++++++++++++++++++ - src/hb-ot-layout.h | 12 ++++++++++++ - 2 files changed, 36 insertions(+), 0 deletions(-) - -commit 0f7e6b2cead0c7d527ef68ededb27e0afd71d819 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 20 04:16:35 2009 -0400 - - [GPOS] Fix more brokenness - - src/Makefile.am | 2 +- - src/hb-ot-layout-gpos-private.h | 37 - ++++++++++++++++++++----------------- - src/hb-ot-layout.cc | 7 +++++++ - src/hb-ot-layout.h | 5 +++++ - 4 files changed, 33 insertions(+), 18 deletions(-) - -commit ff05d257dd43221b7c8ebead188e78495daa8eda -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 20 03:53:00 2009 -0400 - - [HB] Move lookup types enum into subtable class - - src/hb-ot-layout-gpos-private.h | 66 - +++++++++++++++++++------------------- - src/hb-ot-layout-gsub-private.h | 44 +++++++++++++------------- - 2 files changed, 55 insertions(+), 55 deletions(-) - -commit 263bbef7670b59aa88ef9ba910579dfa51226524 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 20 00:00:09 2009 -0400 - - [GDEF] Simplify Device access - - src/hb-ot-layout-gdef-private.h | 12 +++--------- - 1 files changed, 3 insertions(+), 9 deletions(-) - -commit 60d77cf05fddc5304b4b1fc19cdedba15cbee1e9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 19 23:58:54 2009 -0400 - - [HB] Indentation - - src/hb-ot-layout-common-private.h | 170 - +++++++++++++++++------------------ - src/hb-ot-layout-gdef-private.h | 65 +++++++------ - src/hb-ot-layout-gsubgpos-private.h | 150 - +++++++++++++++++-------------- - src/hb-ot-layout-open-private.h | 159 - +++++++++++++++++---------------- - src/hb-ot-layout-private.h | 9 ++- - 5 files changed, 288 insertions(+), 265 deletions(-) - -commit 90de3dfff9e82dae20b7517642511aebaf736b74 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 19 23:43:04 2009 -0400 - - [HB] Remove unused methods - - src/hb-ot-layout-common-private.h | 6 ------ - 1 files changed, 0 insertions(+), 6 deletions(-) - -commit 4c44d830d79431fcb143df2b5a29cdc8e8fccef3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 19 23:42:30 2009 -0400 - - [HB] Indentation - - src/hb-ot-layout-gpos-private.h | 253 - +++++++++++++++++++++----------------- - src/hb-ot-layout-gsub-private.h | 262 - +++++++++++++++++++++------------------ - 2 files changed, 284 insertions(+), 231 deletions(-) - -commit d18fd8e3f7185f531fa4c4988d3f5d5c5282b8eb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 19 23:25:41 2009 -0400 - - [GPOS] CursivePosFormat1 - - src/hb-ot-layout-gpos-private.h | 174 - +++++++++++++++++++++++++++++++++++++-- - src/hb-ot-layout-private.h | 2 +- - 2 files changed, 169 insertions(+), 7 deletions(-) - -commit 70632add333e4ab38f8f485bb87b25116128cf92 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 19 22:30:09 2009 -0400 - - [GSUB] PairPosFormat2 - - src/hb-ot-layout-gpos-private.h | 43 - ++++++++++++++++++++++++++++++++++---- - 1 files changed, 38 insertions(+), 5 deletions(-) - -commit b24ecbadf44d56fd3286d1d3ff6928151ccec9bd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 19 22:16:04 2009 -0400 - - [GPOS] PairPosFormat1 - - src/hb-ot-layout-gpos-private.h | 91 - +++++++++++++++++++++++++++++++-------- - 1 files changed, 73 insertions(+), 18 deletions(-) - -commit 056c7ec1aea1eca60a3b20b583b8a8072be9d758 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 19:47:52 2009 -0400 - - [GPOS] Start filling apply() functions in - - src/harfbuzz-buffer-private.h | 1 + - src/harfbuzz-buffer.c | 3 - - src/hb-ot-layout-common-private.h | 35 ++++++---- - src/hb-ot-layout-gpos-private.h | 127 - +++++++++++++++++++++++++++---------- - 4 files changed, 116 insertions(+), 50 deletions(-) - -commit 4fa77d3c4305a76b956de8c1a9b83a961d035a80 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 18:44:54 2009 -0400 - - [HB] Use enums - - src/hb-ot-layout-common-private.h | 14 ++++++++------ - src/hb-ot-layout-gdef-private.h | 22 +++++++++++++--------- - 2 files changed, 21 insertions(+), 15 deletions(-) - -commit 6b54c5d0446b514fbb6521e7e9e614d153435f0e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 18:30:25 2009 -0400 - - [HB] More reference cast simplification - - src/hb-ot-layout-gsub-private.h | 8 ++++---- - src/hb-ot-layout-gsubgpos-private.h | 28 ++++++++++++++-------------- - src/hb-ot-layout-open-private.h | 2 +- - 3 files changed, 19 insertions(+), 19 deletions(-) - -commit eb0dfc830e09405492f494c85380e133ac5d0ea3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 18:22:44 2009 -0400 - - [HB] Rename LOOKUP_ARGS to APPLY_ARGS - - src/hb-ot-layout-gpos-private.h | 88 - +++++++++++++++++----------------- - src/hb-ot-layout-gsub-private.h | 84 - ++++++++++++++++---------------- - src/hb-ot-layout-gsubgpos-private.h | 90 - +++++++++++++++++----------------- - 3 files changed, 131 insertions(+), 131 deletions(-) - -commit 2a8e6accdf798a78ff180dcb593140592d62b872 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 18:21:44 2009 -0400 - - [HB] Internally rename position() and substitute() to apply() - - src/hb-ot-layout-gpos-private.h | 110 - +++++++++++++++++++------------------- - src/hb-ot-layout-gsub-private.h | 104 - ++++++++++++++++++------------------ - 2 files changed, 107 insertions(+), 107 deletions(-) - -commit f6c8a6eacf27fd1c509d07c85985f0367c5e475f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 18:01:19 2009 -0400 - - [HB] Simplify casts - - src/hb-ot-layout-gdef-private.h | 2 +- - src/hb-ot-layout-gpos-private.h | 6 +++--- - src/hb-ot-layout-gsub-private.h | 6 +++--- - src/hb-ot-layout-open-private.h | 10 +++++----- - 4 files changed, 12 insertions(+), 12 deletions(-) - -commit 9c42f05a5ccbb48a9367b80ecdf3679e88088fcf -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 17:43:49 2009 -0400 - - Switch Pango to new, defunt, GPOS - - src/hb-ot-layout-gpos-private.h | 22 +++++++++++++++------- - src/hb-ot-layout.cc | 13 +++++++++++++ - src/hb-ot-layout.h | 5 +++++ - 3 files changed, 33 insertions(+), 7 deletions(-) - -commit 5e5eb0573f7ea2ce2cf037fef0df70a4351e82c0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 17:09:33 2009 -0400 - - [HB] Start GPOS! - - src/hb-ot-layout-gpos-private.h | 915 - +++++++++++++++++++++++++++++++++++++++ - src/hb-ot-layout-gsub-private.h | 2 - - src/hb-ot-layout-private.h | 15 +- - src/hb-ot-layout.cc | 5 +- - src/hb-ot-layout.h | 8 +- - 5 files changed, 936 insertions(+), 9 deletions(-) - -commit 64e67f7599deeec98b104f8b70d0d321cf96799d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 15:32:40 2009 -0400 - - [GSUB] Minor - - src/hb-ot-layout-gsub-private.h | 16 ++++++---------- - 1 files changed, 6 insertions(+), 10 deletions(-) - -commit d79cae0b4eef8c2694ada791bb8e427c1202875e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 13:50:15 2009 -0400 - - [HB] Minor - - src/hb-ot-layout-gsub-private.h | 22 +++++++++++----------- - 1 files changed, 11 insertions(+), 11 deletions(-) - -commit 8533bb985e6af2b656d7c45620d8f11f36330b85 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 06:00:12 2009 -0400 - - [GSUB] Protect against mismatching Extension subtable types - - src/hb-ot-layout-gsub-private.h | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -commit 969afd706e9b52adc79f6210c0088b2c6bbae9bc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 05:47:47 2009 -0400 - - [GSUB] Implement ReverseChainSingleSubst - - GSUB is done! - - src/hb-ot-layout-gsub-private.h | 55 - ++++++++++++++++++++++++++--------- - src/hb-ot-layout-gsubgpos-private.h | 43 ++++++++------------------- - 2 files changed, 54 insertions(+), 44 deletions(-) - -commit 4acaffd786a11b5bd7d41b39fc65625fd8cd5077 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 05:29:29 2009 -0400 - - [HB] Don't use G_LIKELY! - - src/hb-ot-layout-gsub-private.h | 12 ++++++------ - src/hb-ot-layout-gsubgpos-private.h | 12 ++++++------ - src/hb-ot-layout-open-private.h | 4 ++-- - src/hb-ot-layout.cc | 6 +++--- - 4 files changed, 17 insertions(+), 17 deletions(-) - -commit 3dcb12f171ebbf44461e6ce6439d286c9520dd88 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 05:22:32 2009 -0400 - - [GSUB] Oops, fix Extension check - - src/hb-ot-layout-gsub-private.h | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -commit 2e8fb6c38dbc01cb77b384c0ae0212514dfbb588 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 04:37:37 2009 -0400 - - [HB] Tweak some constants and fix Coverage - - src/hb-ot-layout-common-private.h | 11 ++++++----- - src/hb-ot-layout-gsubgpos-private.h | 2 ++ - src/hb-ot-layout-open-private.h | 6 +++--- - 3 files changed, 11 insertions(+), 8 deletions(-) - -commit d6aae5f5cad54fc5dac8b0ff10a3921ebda533d4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 04:25:22 2009 -0400 - - [HB] Cleanup TODOs - - src/hb-ot-layout-gsub-private.h | 12 ++++++------ - src/hb-ot-layout-open-private.h | 2 +- - src/hb-ot-layout.cc | 4 ++-- - 3 files changed, 9 insertions(+), 9 deletions(-) - -commit 122f21fb9a3a0b914575929a3be11884f1ae00c0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 04:21:53 2009 -0400 - - [GSUB] Fix context_length handling in Ligature too - - src/hb-ot-layout-gsub-private.h | 9 ++++----- - src/hb-ot-layout-gsubgpos-private.h | 5 +++-- - 2 files changed, 7 insertions(+), 7 deletions(-) - -commit 47958dea214fd55725bf04aa13d233870255fb03 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 04:17:47 2009 -0400 - - [HB] Minor cleanup - - src/hb-ot-layout-gsubgpos-private.h | 10 ++++------ - 1 files changed, 4 insertions(+), 6 deletions(-) - -commit e73a0c2a903112ce9a35b95e14e10ab8ea2dc337 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 04:15:25 2009 -0400 - - [HB] Correctly skip glyphs when applying (Chain)Context lookups - - src/hb-ot-layout-gsubgpos-private.h | 14 +++++++++++--- - 1 files changed, 11 insertions(+), 3 deletions(-) - -commit 7cff75babd64cd49dd2b3faaa15193d12c098f42 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 04:09:05 2009 -0400 - - [HB] Fix context_length checking - - src/hb-ot-layout-gsubgpos-private.h | 23 +++++++++++++---------- - src/hb-ot-layout-open-private.h | 2 +- - 2 files changed, 14 insertions(+), 11 deletions(-) - -commit d0ba0557007798db2c60ddd0b7a5a0624cd1698d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 03:56:39 2009 -0400 - - [HB] ChainContext complete - - IranNastaliq renders perfectly again! - - src/hb-ot-layout-gsubgpos-private.h | 63 - +++++++++++++++++++++++++--------- - 1 files changed, 46 insertions(+), 17 deletions(-) - -commit e072c24e79f0e7c1e078a87c782ab5dd8f21dcda -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 03:47:31 2009 -0400 - - [HB] Implement backtrack matching - - src/hb-ot-layout-gsubgpos-private.h | 61 - +++++++++++++++++++++++++--------- - 1 files changed, 45 insertions(+), 16 deletions(-) - -commit 02e1e5c63fa4f896053fa3c21e495239e1e9caa2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 02:47:57 2009 -0400 - - [HB] One more step to go, for fully working GSUB and ChainContext - - src/hb-ot-layout-gsubgpos-private.h | 107 - ++++++++++++++++++++--------------- - 1 files changed, 61 insertions(+), 46 deletions(-) - -commit f14c2b7acfba75b8a6880f41ceec758f9a56abce -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 02:36:18 2009 -0400 - - [HB] Further modularize Context matching - - src/hb-ot-layout-gsubgpos-private.h | 92 - ++++++++++++++++++++++++----------- - 1 files changed, 63 insertions(+), 29 deletions(-) - -commit 13ed4405c558e445b052360f1ed8ee27ecf48e6e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 02:14:37 2009 -0400 - - [HB] A step closer to working ChainContext - - src/hb-ot-layout-gsubgpos-private.h | 36 - +++++++++++++++++++++++++--------- - 1 files changed, 26 insertions(+), 10 deletions(-) - -commit e8cbaaf6d538036ff9b880b018db402e0895ed01 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 02:03:58 2009 -0400 - - [HB] Add HeadlessArrayTo<> - - src/hb-ot-layout-gsub-private.h | 10 ++++------ - src/hb-ot-layout-gsubgpos-private.h | 5 ++--- - src/hb-ot-layout-open-private.h | 19 +++++++++++++++++++ - 3 files changed, 25 insertions(+), 9 deletions(-) - -commit dcb6b60254951a2831c03f3196962d229f7e556c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 18 01:49:57 2009 -0400 - - [HB] More template goodness - - src/hb-ot-layout-gsubgpos-private.h | 37 - ++++++++++++++-------------------- - 1 files changed, 15 insertions(+), 22 deletions(-) - -commit aa3d7adca5c821c91a2a1b5380fd6b3d19656ab1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 23:17:56 2009 -0400 - - [HB] More churning towards ChainContext lookups - - src/hb-ot-layout-common-private.h | 6 +- - src/hb-ot-layout-gsub-private.h | 15 +++- - src/hb-ot-layout-gsubgpos-private.h | 174 - +++++++++++++++++++++------------- - 3 files changed, 125 insertions(+), 70 deletions(-) - -commit 48f16ed96ac7041b511d9e0864623d2aa09c6da3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 22:11:30 2009 -0400 - - [HB] Towards sharing Context and ChainContext code - - src/hb-ot-layout-gsubgpos-private.h | 220 - ++++++++++++++++------------------- - 1 files changed, 99 insertions(+), 121 deletions(-) - -commit 6cf2a52593cb4b23e3efe5e16228e3172bdcdd05 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 21:11:49 2009 -0400 - - [HB] Add check to avoid infinite recursion - - src/hb-ot-layout-gsub-private.h | 12 ++++++++---- - 1 files changed, 8 insertions(+), 4 deletions(-) - -commit 887c4b44165eeb8ac7fb09bc4474d11720b94a9e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 21:06:08 2009 -0400 - - [HB] Cosmetic - - src/hb-ot-layout-gsub-private.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit ca5290f4994e1b2db4dac03f7a22b7071441ba06 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 20:48:27 2009 -0400 - - [HB] Start ChainContext and ReverseChainSingleSubst lookups - - src/hb-ot-layout-gsub-private.h | 269 - ++++++++--------------------------- - src/hb-ot-layout-gsubgpos-private.h | 214 +++++++++++++++++++++++++++- - 2 files changed, 268 insertions(+), 215 deletions(-) - -commit 433f4aea741e39df079126769441b79ab64fd236 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 20:30:05 2009 -0400 - - [HB] Remove stale TODO - - src/hb-ot-layout-private.h | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 6f20f72e9c58ba23db2e31afa5d331acfea3d77e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 20:28:01 2009 -0400 - - [HB] Split Layout-common tables into new files - - src/hb-ot-layout-common-private.h | 429 - +++++++++++++++++++++++++++++++++++ - src/hb-ot-layout-gdef-private.h | 3 +- - src/hb-ot-layout-gsub-private.h | 1 + - src/hb-ot-layout-gsubgpos-private.h | 2 + - src/hb-ot-layout-open-private.h | 408 - --------------------------------- - 5 files changed, 434 insertions(+), 409 deletions(-) - -commit f45107fe0904414f1266648a6c42849c494fe611 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 20:13:02 2009 -0400 - - [HB] More shuffling - - src/hb-ot-layout-gsub-private.h | 71 - ++++++++++++++++++++--------------- - src/hb-ot-layout-gsubgpos-private.h | 30 +++++++++++++++ - src/hb-ot-layout-open-private.h | 41 -------------------- - 3 files changed, 71 insertions(+), 71 deletions(-) - -commit f8dc67b3c24dfc805da756a73cb217b36e16b4b8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 19:47:54 2009 -0400 - - [HB] Cleanup format unions - - src/hb-ot-layout-gdef-private.h | 18 ++++---- - src/hb-ot-layout-gsub-private.h | 87 - ++++++++++++++++++----------------- - src/hb-ot-layout-gsubgpos-private.h | 16 +++--- - src/hb-ot-layout-open-private.h | 41 ++++++---------- - 4 files changed, 77 insertions(+), 85 deletions(-) - -commit da1097bc3b1995776c205707fd2b17603b804646 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 19:31:18 2009 -0400 - - [HB] Use four bytes for Null Tag, not 5 - - src/hb-ot-layout-open-private.h | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 19fc24f268b985d30971307ac2055622d11cb21f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 09:45:32 2009 -0400 - - [HB] Couple size checks - - src/hb-ot-layout-gsub-private.h | 7 +++++-- - src/hb-ot-layout-gsubgpos-private.h | 4 ++-- - src/hb-ot-layout-open-private.h | 4 ++-- - 3 files changed, 9 insertions(+), 6 deletions(-) - -commit ecf17e849db19599bbb816d0018380ebf979576b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 09:34:41 2009 -0400 - - [HB] Propagate property of first glyph - - This slightly grows code size. - - src/hb-ot-layout-gsub-private.h | 100 - ++++++++++++++++++----------------- - src/hb-ot-layout-gsubgpos-private.h | 7 ++- - 2 files changed, 56 insertions(+), 51 deletions(-) - -commit eca8e33710cfce51454e64d974ff0c28b0eefa14 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 09:07:27 2009 -0400 - - [GSUB] Further optimize the main switch - - src/hb-ot-layout-gsub-private.h | 31 +++++++++++++++++-------------- - 1 files changed, 17 insertions(+), 14 deletions(-) - -commit 13068232e7054748ae5ba0d961ee5a95b959e92e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 08:59:01 2009 -0400 - - [HB] Unify first glyph property checking - - src/hb-ot-layout-gsub-private.h | 81 - +++++++++++++++-------------------- - src/hb-ot-layout-gsubgpos-private.h | 12 ----- - 2 files changed, 35 insertions(+), 58 deletions(-) - -commit 66bf7ce4e3135535c110a917178b84c4a2b1d11f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 08:28:42 2009 -0400 - - [HB] Move Context matching logic out of GSUB - - src/hb-ot-layout-gdef-private.h | 2 - - src/hb-ot-layout-gsub-private.h | 331 - +-------------------------------- - src/hb-ot-layout-gsubgpos-private.h | 347 - +++++++++++++++++++++++++++++++++++ - 3 files changed, 352 insertions(+), 328 deletions(-) - -commit a1625528cd5ed94bc8f18903da3300e823ee5b54 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 07:52:11 2009 -0400 - - [GSUB] Unify ContextSubst matching - - src/hb-ot-layout-gsub-private.h | 378 - ++++++++++++++++----------------------- - 1 files changed, 154 insertions(+), 224 deletions(-) - -commit c36238bea40e9e2b589028eb6de0710455b31585 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 07:39:34 2009 -0400 - - [HB] Renames - - src/hb-ot-layout-gsub-private.h | 122 - +++++++++++++++++++------------------- - 1 files changed, 61 insertions(+), 61 deletions(-) - -commit 15c3e75b39797a153b6bc0598f87b27c4a487228 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 06:03:42 2009 -0400 - - [HB] Simplify buffer - - src/harfbuzz-buffer-private.h | 14 ++++++-------- - src/harfbuzz-buffer.c | 35 - ++++++++++++++++------------------- - src/harfbuzz-gsub.c | 6 +++--- - src/hb-ot-layout-gsub-private.h | 12 ++++++------ - 4 files changed, 31 insertions(+), 36 deletions(-) - -commit 36f78446cef8a7cbae000d5e742c9d13e1cc7f83 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 05:52:32 2009 -0400 - - [HB] Add TODO item - - src/TODO | 1 + - src/harfbuzz-buffer.c | 2 +- - 2 files changed, 2 insertions(+), 1 deletions(-) - -commit ee58aaebd296ea8237516754fd4e825d524b11b7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 05:14:33 2009 -0400 - - [HB] Update copyright years - - src/hb-ot-layout-gdef-private.h | 2 +- - src/hb-ot-layout-open-private.h | 2 +- - src/hb-ot-layout.cc | 2 +- - src/main.cc | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -commit f4c9514935cf97a58dcb3b1962ac3f3b5ba61264 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 04:59:56 2009 -0400 - - [HB] Simplify more arrays - - src/hb-ot-layout-open-private.h | 241 - ++++++++++++++++----------------------- - src/hb-ot-layout.cc | 8 +- - 2 files changed, 100 insertions(+), 149 deletions(-) - -commit c9a7cbe9cb52264af9954e5ce9ac7a45d7e310cd -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 01:22:51 2009 -0400 - - [HB] Use ArrayOf<> in GSUB - - src/hb-ot-layout-gdef-private.h | 3 +- - src/hb-ot-layout-gsub-private.h | 157 - +++++++++++++-------------------------- - src/hb-ot-layout-open-private.h | 5 - - 3 files changed, 53 insertions(+), 112 deletions(-) - -commit 5f810363acc3ad3cba631a68620e3d37e54c95c4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 00:54:25 2009 -0400 - - [HB] Add ArrayOf<> - - src/hb-ot-layout-gdef-private.h | 62 +++++++------------------------ - src/hb-ot-layout-open-private.h | 77 - +++++++++++++++++++++++++++++---------- - 2 files changed, 71 insertions(+), 68 deletions(-) - -commit 238c855fcd4f0ef97a94a8662d2a2f2bb5c21ecb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 00:22:37 2009 -0400 - - [HB] Use OffsetTo<> for Coverage - - src/hb-ot-layout-gdef-private.h | 1 + - src/hb-ot-layout-gsub-private.h | 55 - +++++++++++++++------------------------ - src/hb-ot-layout-open-private.h | 10 +------ - 3 files changed, 23 insertions(+), 43 deletions(-) - -commit 3d54bd1293069fc3d3bdeeea8ad45036f3ee65f3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 00:15:51 2009 -0400 - - [HB] Use OffsetTo<> in more places - - src/hb-ot-layout-gdef-private.h | 12 +++++------- - src/hb-ot-layout-open-private.h | 4 ++++ - 2 files changed, 9 insertions(+), 7 deletions(-) - -commit 9e4d9d7b2721859172bc9c59c1aea27b01eb9c07 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun May 17 00:09:20 2009 -0400 - - [HB] Add OffsetTo template. - - src/hb-ot-layout-gdef-private.h | 26 ++++++++++++++------------ - src/hb-ot-layout-gsub-private.h | 6 +++--- - src/hb-ot-layout-open-private.h | 27 ++++++++++++++++++--------- - 3 files changed, 35 insertions(+), 24 deletions(-) - -commit e07f89295b9b38d233dfd4acec1f6b4a3416f267 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat May 16 23:20:48 2009 -0400 - - [HB] Automate int-type size assertion - - src/hb-ot-layout-open-private.h | 13 +++---------- - 1 files changed, 3 insertions(+), 10 deletions(-) - -commit 8b8358033184198ff638ee1379093717596e162d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat May 16 22:48:14 2009 -0400 - - [HB] Use templates for Null objects - - Also use a common pool for all nul-content ones. - - src/hb-ot-layout-gdef-private.h | 12 ++-- - src/hb-ot-layout-gsub-private.h | 28 ++++---- - src/hb-ot-layout-open-private.h | 142 - ++++++++++++++++++++++---------------- - src/hb-ot-layout.cc | 8 +- - 4 files changed, 105 insertions(+), 85 deletions(-) - -commit 6e13d4140158aff736647fc53d8c0ae3a02c2afc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat May 16 20:15:16 2009 -0400 - - [HB] Remove obsolete comment - - src/hb-ot-layout-gdef-private.h | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 9f721cf380954d67415dbfd0404a983cdd75b7df -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat May 16 19:59:15 2009 -0400 - - [GSUB] Start ChainContextSubst - - src/hb-ot-layout-gsub-private.h | 50 - ++++++++++++++++++++++++++++++-------- - 1 files changed, 39 insertions(+), 11 deletions(-) - -commit 7fca9e5245d2d283e8b5354eb1ddf553a7ffc033 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat May 16 19:44:24 2009 -0400 - - [GSUB] Implement ContextSubstFormat3 - - src/hb-ot-layout-gsub-private.h | 62 - ++++++++++++++++++++++++++++++++++++++- - 1 files changed, 61 insertions(+), 1 deletions(-) - -commit 1ff926a5681b5d4bfce65351062cda9dc1ffeba2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 15 20:25:37 2009 -0400 - - [GSUB] Implement ContextSubstFormat2 - - src/hb-ot-layout-gsub-private.h | 105 - ++++++++++++++++++++++++++++++++++++--- - 1 files changed, 97 insertions(+), 8 deletions(-) - -commit fc36d9453ed7edb0a570abc44d7caa87aafb0fcf -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 15 20:11:10 2009 -0400 - - [GSUB] Add GSUB::substitute_lookup() - - src/hb-ot-layout-gsub-private.h | 7 +++++++ - src/hb-ot-layout.cc | 5 +---- - 2 files changed, 8 insertions(+), 4 deletions(-) - -commit c43562b2a7587fa3f9ef4c1c4338e4eda77368b5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 15 18:54:53 2009 -0400 - - [GSUB] Finish ContextSubstFormat1 - - src/hb-ot-layout-gsub-private.h | 77 - ++++++++++++++++++++++++++++++--------- - src/hb-ot-layout-private.h | 14 +++++++ - src/hb-ot-layout.cc | 13 ------- - 3 files changed, 74 insertions(+), 30 deletions(-) - -commit 5ee21896224e3a9835a9695037a94ccf1c35a217 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 15 13:28:56 2009 -0400 - - [HB] Fix typo - - src/hb-ot-layout-open-private.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6b59c9b445b6d2454008c83a2c7d6a995ea5995e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 15 01:00:36 2009 -0400 - - [HB] Add TODO item - - src/TODO | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit c5419b6cf28822e07f1ef9b0394825e9cb01a445 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 8 21:17:56 2009 -0400 - - [HB] Remove DEFINE_NON_INSTANTIABLE - - src/hb-ot-layout-gdef-private.h | 2 -- - src/hb-ot-layout-gsub-private.h | 3 --- - src/hb-ot-layout-open-private.h | 18 +----------------- - 3 files changed, 1 insertions(+), 22 deletions(-) - -commit 0dff25f0368c5f14ebb0a4af35f3bb6658740d57 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 8 21:12:18 2009 -0400 - - [HB] Remove get_size() - - src/hb-ot-layout-gdef-private.h | 9 ----- - src/hb-ot-layout-gsub-private.h | 63 - --------------------------------------- - src/hb-ot-layout-open-private.h | 42 ++------------------------ - 3 files changed, 3 insertions(+), 111 deletions(-) - -commit 25c6c9a3f6c062ec639d9202a8b9844be64d6fc0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 8 19:09:17 2009 -0400 - - [GSUB] ContextSubst format 1 - - src/hb-ot-layout-gsub-private.h | 52 - +++++++++++++++++++++++++++++++++----- - 1 files changed, 45 insertions(+), 7 deletions(-) - -commit f70229510303109bd0f71423cdf13aa200066d17 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri May 8 18:45:53 2009 -0400 - - [GSUB] Shuffle - - src/hb-ot-layout-gsub-private.h | 170 - ++++++++++++++++++++------------------- - 1 files changed, 86 insertions(+), 84 deletions(-) - -commit a83e08f8728439ef75e3dfab2191ac913d8f907b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu May 7 12:53:02 2009 -0400 - - [HarfBuzz] Start a TODO file - - src/TODO | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit eed05b04ebc2cbb3fa699c99200db12a0081cefb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 6 00:25:59 2009 -0400 - - [GSUB] minor - - src/hb-ot-layout-open-private.h | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit cdb317bc4e188421cad997b448abb19223d39e96 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed May 6 00:12:29 2009 -0400 - - [GSUB] Towards Context subtitutes - - src/hb-ot-layout-gsub-private.h | 137 - ++++++++++++++++++++++++++++++-------- - 1 files changed, 108 insertions(+), 29 deletions(-) - -commit c9c6a78aec2b16ac06dfca8cbfaf28a77a10bae2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 5 16:22:02 2009 -0400 - - [GSUB] Minor refactoring - - src/hb-ot-layout-gsub-private.h | 42 - +++++++++++++++++++++----------------- - 1 files changed, 23 insertions(+), 19 deletions(-) - -commit bb3899a579b00134b24df8891b69bf1621a8190f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue May 5 13:25:13 2009 -0400 - - [GSUB] Implement ligature substitutions - - src/Makefile.am | 2 + - src/hb-ot-layout-gsub-private.h | 113 - +++++++++++++++++++++++++++++++-------- - 2 files changed, 93 insertions(+), 22 deletions(-) - -commit 38b011a293181856463dd08d43e2106e5bf1d56e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon May 4 20:21:57 2009 -0400 - - [GSUB] Hook new GSUB up in Pango - - src/hb-ot-layout-gsub-private.h | 15 ++++++++++----- - 1 files changed, 10 insertions(+), 5 deletions(-) - -commit a84e71ad11a72feff47ead16772a8c4bcf4f69d5 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 16 16:53:40 2009 -0400 - - [GSUB] Start Ligature subtable support - - src/hb-ot-layout-gsub-private.h | 132 - ++++++++++++++++++++++++++++----------- - src/hb-ot-layout.h | 2 +- - 2 files changed, 96 insertions(+), 38 deletions(-) - -commit 52886ca56b24a8335614b1df16a33dd4e2d7ae56 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 16 14:19:42 2009 -0400 - - [GSUB] Implement Alternate subtables - - src/hb-ot-layout-gsub-private.h | 104 - ++++++++++++++++++++++++++++++++++++--- - src/hb-ot-layout-open-private.h | 2 +- - 2 files changed, 97 insertions(+), 9 deletions(-) - -commit 4f27ce7e0213ac5ba356f0fd2ec0a175ffd002e6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 16 13:40:13 2009 -0400 - - [GSUB] Implement Extension subtables - - src/hb-ot-layout-gsub-private.h | 169 - +++++++++++++++++++++++++-------------- - 1 files changed, 108 insertions(+), 61 deletions(-) - -commit 83e61ff4702121d3418fe82a8fe7ef6bb63bb5d2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 16 12:30:51 2009 -0400 - - [GSUB] Fix reverse lookup loop like we did in the old code before - - src/hb-ot-layout-gsub-private.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 5a0b791184cf6ef39eae0570e14aca21abc32845 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 16 04:45:30 2009 -0400 - - [harfbuzz/GSUB] towards a partially working GSUB - - src/harfbuzz-buffer.c | 2 +- - src/harfbuzz-impl.h | 2 +- - src/harfbuzz.c | 1 - - src/hb-ot-layout-gdef-private.h | 4 +- - src/hb-ot-layout-gsub-private.h | 383 - +++++++++++++++++++++++++++++---------- - src/hb-ot-layout-open-private.h | 31 +++- - src/hb-ot-layout-private.h | 6 +- - src/hb-ot-layout.cc | 94 +++++++--- - src/hb-ot-layout.h | 2 - - 9 files changed, 381 insertions(+), 144 deletions(-) - -commit 30bd763fa2fa4aceee51433ec9fc8dc28480b5d7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 15 22:56:15 2009 -0400 - - Implement the first substitute() - - src/harfbuzz-buffer-private.h | 8 ++-- - src/harfbuzz-buffer.c | 4 +- - src/harfbuzz-buffer.h | 2 +- - src/harfbuzz-gdef-private.h | 4 +- - src/harfbuzz-gdef.c | 6 +- - src/harfbuzz-gdef.h | 2 +- - src/harfbuzz-gpos.c | 8 ++-- - src/harfbuzz-gpos.h | 2 +- - src/harfbuzz-gsub.h | 2 +- - src/hb-ot-layout-gsub-private.h | 88 - +++++++++++++++++++++++++++++++++++---- - src/hb-ot-layout-open-private.h | 2 +- - src/hb-ot-layout-private.h | 23 ++++++---- - src/hb-ot-layout.cc | 54 ++++++++++++++++------- - src/hb-ot-layout.h | 2 +- - 14 files changed, 151 insertions(+), 56 deletions(-) - -commit ce48f03946bef895912019046bdbe62bb1301d0b -Merge: 0e13bee 2d15e72 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Nov 2 14:35:51 2009 -0500 - - Merge harfbuzz-ng - -commit 0e13beeb93077750183a8242780158b88df81e26 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Apr 17 17:03:39 2009 -0400 - - Use git.mk - - src/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 2d15e72c75931398db5e027e660f1320bb979117 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Apr 15 19:50:16 2009 -0400 - - Give it a start at GSUB - - src/hb-common.h | 5 +- - src/hb-ot-layout-gdef-private.h | 24 ++++---- - src/hb-ot-layout-gsub-private.h | 120 - ++++++++++++++++++++++++++++++++++++++- - src/hb-ot-layout-open-private.h | 51 ++++++++++------- - src/hb-ot-layout-private.h | 2 +- - src/hb-ot-layout.cc | 63 +++++++++++++++++++- - src/hb-ot-layout.h | 29 ++++++++- - src/main.cc | 4 +- - 8 files changed, 253 insertions(+), 45 deletions(-) - -commit 9d870f2a558f4e463e3ff953312202a8d144158b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Apr 9 13:30:26 2009 -0400 - - Bug 577952 – Error loading {GDEF,GSUB,GPOS} table 0x6EAD - - Detect TrueType Collections by checking the font data header instead - of checking for "face->num_faces >1". - - src/harfbuzz-stream.c | 11 +++++++++-- - 1 files changed, 9 insertions(+), 2 deletions(-) - -commit d49caf1f77743550d83fc7feced1293ba34a4e99 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Mar 2 15:16:11 2009 +0330 - - [opentype] Protect against illegal access for arrays of length zero - - src/harfbuzz-gpos.c | 22 ++++++++++++++++++---- - src/harfbuzz-gsub.c | 6 ++++++ - 2 files changed, 24 insertions(+), 4 deletions(-) - -commit 66871797af194f9d2161faf8bfbc9684f09e207e -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Mar 2 14:20:20 2009 +0330 - - [opentype] Use size_t instead of uint for malloc wrappers - - src/harfbuzz-impl.c | 4 ++-- - src/harfbuzz-impl.h | 6 ++++-- - 2 files changed, 6 insertions(+), 4 deletions(-) - -commit 3664e59c52ed56486a3e38126c0c3abb78f42233 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Mar 2 11:09:29 2009 +0330 - - Fix Bug 572529 – Poor -I ordering can break build - - src/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit aca4d11388eedd532a73bd34747abb65c0ea9291 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Mon Feb 2 00:13:07 2009 +0000 - - Allocate all array rows in a single ALLOC call. Saves over 100 - alloc calls - - 2009-01-31 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/harfbuzz-gpos.c (Load_Mark2Array), - (Free_Mark2Array): - Allocate all array rows in a single ALLOC call. Saves over - 100 - alloc calls when loading DejaVu Sans, - - src/harfbuzz-gpos.c | 59 - ++++++++++++++------------------------------------ - 1 files changed, 17 insertions(+), 42 deletions(-) - -commit c561d69c721105b78bb06d1e3c5f21ca314d924a -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Jan 29 09:20:08 2009 +0000 - - Remove ClassDef->Defined field. This is the comment accompanying it: - - 2009-01-29 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/harfbuzz-open.h: - * pango/opentype/harfbuzz-gdef.c (Make_ClassRange), - (HB_GDEF_Build_ClassDefinition): - * pango/opentype/harfbuzz-gpos.c (Load_PosClassRule), - (Load_ChainPosClassRule): - * pango/opentype/harfbuzz-gsub.c (Load_SubClassRule), - (Load_ChainSubClassRule): - * pango/opentype/harfbuzz-open.c (Load_ClassDef1), - (Load_ClassDef2), (_HB_OPEN_Load_ClassDefinition), - (_HB_OPEN_Load_EmptyClassDefinition), - (_HB_OPEN_Free_ClassDefinition): - Remove ClassDef->Defined field. This is the comment - accompanying it: - - The `Defined' field is not defined in the OpenType - specification - but apparently needed for processing fonts like trado.ttf: - This - font refers to a class which contains not a single element. - We - map such classes to class 0. - - The comment is correct that trado.ttf (MS Traditional - Arabic) uses - such classes. However, in my testing I couldn't identify any - problems with the font if the special handling is removed. - I also - processed as many fonts as I could get my hand on and - trado.ttf was - the only not-totally-broken font hitting the special-case - code. - DejaVu fonts hit it too, but I'm sure they do not require the - special-handling code. Most probably, that code introduces - bugs - in them. - - The special-casing was consuming lots of memory. - EIGHT MEGABYTES - for loading DejaVu Sans! While this could be complete - fixed, I - decided to remove the special-handling code altogether. - I don't - think it will make any real difference, and if it does, - we'll fix - fonts. Such hacks will not be in harfbuzz-ng anyway. - - Bug originally reported by nsf. - - src/harfbuzz-gdef.c | 8 -------- - src/harfbuzz-gpos.c | 32 -------------------------------- - src/harfbuzz-gsub.c | 31 ------------------------------- - src/harfbuzz-open.c | 30 +++--------------------------- - src/harfbuzz-open.h | 8 -------- - 5 files changed, 3 insertions(+), 106 deletions(-) - -commit 9372edd6f020c92609853609dcb504c72551c9c3 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Jan 29 09:19:56 2009 +0000 - - Use calloc(), instead of malloc()ing and memset()ing. - - 2009-01-29 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/harfbuzz-impl.c (_hb_alloc): Use calloc(), - instead of malloc()ing and memset()ing. - - src/harfbuzz-impl.c | 4 +--- - 1 files changed, 1 insertions(+), 3 deletions(-) - -commit 94c21d26ba878b3168a21f2e76f02bc52e8fe6fd -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Jan 29 09:19:43 2009 +0000 - - Remove old cruft. - - 2009-01-29 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/harfbuzz-dump-main.c (main): Remove old - cruft. - - src/harfbuzz-dump-main.c | 144 - +--------------------------------------------- - 1 files changed, 1 insertions(+), 143 deletions(-) - -commit 0a47c4f78e8a9e81cd305f24ec92ea61ead7dd8d -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Jan 29 09:19:20 2009 +0000 - - Allocate all array rows in a single ALLOC call. Saves over 2000 alloc - - 2009-01-29 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/harfbuzz-gpos.c (Load_BaseArray), - (Free_BaseArray): - Allocate all array rows in a single ALLOC call. Saves over - 2000 - alloc calls when loading DejaVu Sans! - - src/harfbuzz-gpos.c | 57 - +++++++++++++++----------------------------------- - 1 files changed, 17 insertions(+), 40 deletions(-) - -commit 549be924bccd187f53791dfa27647981ac909545 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Fri Dec 26 02:31:47 2008 +0000 - - Bug 469049 – Fix all compiler warnings - - 2008-12-25 Behdad Esfahbod <behdad@gnome.org> - - Bug 469049 – Fix all compiler warnings - - * pango-view/viewer-pangocairo.c (render_callback): - * pango/fonts.c (append_field), - (pango_font_description_to_string): - * pango/opentype/harfbuzz-dump.c: - * pango/pango-bidi-type.c - (pango_log2vis_get_embedding_levels): - * pango/pango-coverage.c (pango_coverage_set): - * pango/pango-markup.c (span_parse_func): - * pango/pango-renderer.c - (pango_renderer_default_draw_error_underline): - * pango/pango-utils.c (pango_scan_string): - * pango/pangocairo-render.c - (pango_cairo_renderer_draw_trapezoid), - (draw_error_underline), (pango_cairo_renderer_class_init): - Fix all the remaining warnings. - - src/harfbuzz-dump.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 719f9eaa755396ff377da10c5eeced01d3456b1b -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Fri Dec 26 02:31:35 2008 +0000 - - Fix more warnings. - - 2008-12-25 Behdad Esfahbod <behdad@gnome.org> - - * pango/modules.c (pango_module_load), (script_info_free): - * pango/opentype/harfbuzz-gpos.c (HB_Load_GPOS_Table): - * pango/pango-bidi-type.c: - * pango/pango-coverage.c (pango_coverage_ref), - (pango_coverage_unref): - * pango/pango-engine.c (pango_engine_shape_real_covers), - (fallback_engine_shape), (fallback_engine_covers): - * pango/pango-fontmap.c (pango_font_map_init): - * pango/pango-ot-ruleset.c (pango_ot_ruleset_finalize), - (pango_ot_ruleset_new): - * pango/pangofc-decoder.c (pango_fc_decoder_init), - (pango_fc_decoder_class_init): - * pango/pangofc-font.c (pango_fc_font_find_shaper), - (pango_fc_font_get_coverage): - * pango/pangofc-fontmap.c (pango_fc_font_map_list_families), - (pango_fc_make_pattern), (pango_fc_font_map_get_patterns), - (get_first_font), (_pango_fc_font_map_get_coverage), - (cleanup_font), (pango_fc_font_description_from_pattern), - (pango_fc_face_list_sizes), (pango_fc_family_list_faces): - * pango/pangoft2-fontmap.c - (pango_ft2_font_map_get_resolution): - * pango/pangoft2-render.c (pango_ft2_renderer_init), - (pango_ft2_renderer_draw_trapezoid): - * pango/pangoft2.c (pango_ft2_font_get_face), - (pango_ft2_font_real_unlock_face), - (pango_ft2_free_glyph_info_callback): - Fix more warnings. - - src/harfbuzz-gpos.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 21f7d507f4b50e2743ab47954270f4c72d5a722a -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Wed Oct 15 03:45:29 2008 +0000 - - Bug 528272 – "Error loading GPOS table 5503" when using katakana - - 2008-10-14 Behdad Esfahbod <behdad@gnome.org> - - Bug 528272 – "Error loading GPOS table 5503" when using - katakana - characters - - * pango/opentype/harfbuzz-gpos.c (Load_Mark2Array): Skip - parsing - null anchor tables. - - src/harfbuzz-gpos.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) - -commit a26c6ae70502b4d60c52a0648662b1619c688b9a -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Mon Sep 29 22:28:47 2008 +0000 - - Fix left-to-right positioning. Reported by Peter Hunter. - - 2008-09-29 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/harfbuzz-gpos.c (Position_CursiveChain): - Fix left-to-right positioning. Reported by Peter Hunter. - - src/harfbuzz-gpos.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b6c06c56a33f1e1ec15e3b525ecafe8fadc679db -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Sun Jun 29 18:30:14 2008 +0000 - - Bug 540592 – Crash in HB_GSUB_Apply_String with Linux-Libertine font - - 2008-06-29 Behdad Esfahbod <behdad@gnome.org> - - Bug 540592 – Crash in HB_GSUB_Apply_String with - Linux-Libertine font - - * pango/opentype/harfbuzz-gsub.c (GSUB_Do_String_Lookup): - Fix reverse - loops for type 8 lookups. - - src/harfbuzz-gsub.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit c44733596c6648e209c12349e18e35424edf3d59 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Feb 18 21:14:23 2008 -0500 - - [hb-ot-layout] Add proper namespace to accessors - - src/hb-ot-layout.cc | 165 - +++++++++++++++++++++++++++++++++++++------------- - src/hb-ot-layout.h | 115 +++++++++++++++++++++++------------ - 2 files changed, 198 insertions(+), 82 deletions(-) - -commit 57225672098ebdafb0c06ae091a1b55635daca29 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Feb 18 20:58:39 2008 -0500 - - Fix typo, add TODOs - - src/hb-ot-layout-open-private.h | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) - -commit 4a26ea408c87f0bb59deca9ff44008d138471aa3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jan 28 07:40:10 2008 -0500 - - Finish script, language, and feature public API - - src/hb-ot-layout-open-private.h | 22 ++++++--- - src/hb-ot-layout.cc | 107 - +++++++++++++++++++++++++++++++-------- - src/hb-ot-layout.h | 34 ++++++++++++- - 3 files changed, 132 insertions(+), 31 deletions(-) - -commit 706ab25a4cb043d46e6088aa0a7184ee200276c9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jan 28 05:58:50 2008 -0500 - - Add script and language public getter API - - src/hb-ot-layout-open-private.h | 40 ++++++++----- - src/hb-ot-layout.cc | 127 - ++++++++++++++++++++++++++++++++++++++- - src/hb-ot-layout.h | 56 +++++++++++++++++ - src/main.cc | 2 +- - 4 files changed, 207 insertions(+), 18 deletions(-) - -commit 40a81314fa3eb7c701aea47b43f81bfad985f717 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jan 28 02:30:48 2008 -0500 - - Make main.cc compile again, which means finished getter API - - src/hb-ot-layout-open-private.h | 117 - ++++++++++++++++++++++++++++---------- - src/main.cc | 99 +++++++++++++++++++++++---------- - 2 files changed, 155 insertions(+), 61 deletions(-) - -commit e50c3978d37b2c0d6ddd4ced6a6196f6857cd596 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jan 28 00:16:49 2008 -0500 - - Rename HB_OT_Layout to hb_ot_layout_t - - src/hb-ot-layout-private.h | 8 ++++---- - src/hb-ot-layout.cc | 34 +++++++++++++++++----------------- - src/hb-ot-layout.h | 33 +++++++++++++++------------------ - 3 files changed, 36 insertions(+), 39 deletions(-) - -commit dfa811965133bc4d1696fa5a0166e17ed4142c98 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Jan 28 00:12:21 2008 -0500 - - Rename hb_ot_layout_create() to hb_ot_layout_create_for_data() - - src/hb-ot-layout.cc | 4 ++-- - src/hb-ot-layout.h | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit 54e5aac5e2947d4e2864c6f2987e4d275da73100 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sun Jan 27 21:19:51 2008 -0500 - - GDEF completely working now - - src/hb-ot-layout-open-private.h | 11 ++++++++--- - src/hb-ot-layout-private.h | 16 +++++++++------- - src/hb-ot-layout.cc | 19 +++++++++---------- - src/hb-private.h | 7 +++++++ - src/main.cc | 12 ++++++------ - 5 files changed, 39 insertions(+), 26 deletions(-) - -commit 6f425b11799aa20dab553085f05744191b7318e2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 24 19:38:56 2008 -0500 - - [GDEF] Finish internal API - - src/hb-ot-layout-private.h | 15 ++++++- - src/hb-ot-layout.cc | 95 - +++++++++++++++++++++----------------------- - src/hb-ot-layout.h | 16 ++++---- - 3 files changed, 66 insertions(+), 60 deletions(-) - -commit 590d55cbb9e21ef74dfd88eee51fd0a763958cd2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 24 19:13:50 2008 -0500 - - [GDEF] Finish public API - - src/hb-common.h | 11 ++++ - src/hb-ot-layout-gdef-private.h | 28 ++++----- - src/hb-ot-layout-open-private.h | 25 +++++--- - src/hb-ot-layout-private.h | 23 ++------ - src/hb-ot-layout.cc | 123 - ++++++++++++++++++++++++++++++++++++--- - src/hb-ot-layout.h | 29 +++++---- - 6 files changed, 176 insertions(+), 63 deletions(-) - -commit aff831ed6787abe8e24a977e34d97ff2e0b7dc21 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 24 06:03:45 2008 -0500 - - Implement glyph properties - - src/hb-ot-layout-gdef-private.h | 10 ++++- - src/hb-ot-layout-private.h | 16 ++++++- - src/hb-ot-layout.cc | 84 - +++++++++++++++++++++++++++++++++++--- - src/hb-ot-layout.h | 25 ++++++++--- - 4 files changed, 117 insertions(+), 18 deletions(-) - -commit ead428d7a0bf4dc84340a99f3959e5cc58123e99 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 24 03:54:09 2008 -0500 - - More public api - - src/hb-ot-layout-open-private.h | 32 +++++++++++++++++++------------- - src/hb-ot-layout-private.h | 9 ++++++--- - src/hb-ot-layout.cc | 21 ++++++++++++++------- - src/hb-ot-layout.h | 2 -- - 4 files changed, 39 insertions(+), 25 deletions(-) - -commit fd92a3dde32fd10df30c9eeb97641bc3c15b1e9b -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jan 24 03:11:09 2008 -0500 - - Starting public interface - - src/Makefile | 11 ----- - src/Makefile.ng | 11 +++++ - src/hb-ot-layout-gdef-private.h | 17 +++---- - src/hb-ot-layout-gsub-private.h | 3 +- - src/hb-ot-layout-open-private.h | 92 - ++++++++++++++++++++++++++++----------- - src/hb-ot-layout-private.h | 51 +++++++++++++++++++++ - src/hb-ot-layout.cc | 67 ++++++++++++++++++++++++++++ - src/hb-ot-layout.h | 35 +++++++++++++- - src/main.cc | 1 + - 9 files changed, 236 insertions(+), 52 deletions(-) - -commit 7d6b95b000ec6cd8ca93113b2d81a049ad2f9bbe -Author: Behdad Esfahbod <behdad@src.gnome.org> -Date: Thu Jan 24 04:42:24 2008 +0000 - - Remove unused macro - - src/harfbuzz-impl.h | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 7586089c6fa8185cad8387869d3703c637e5cbb1 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jan 23 18:02:28 2008 -0500 - - Minor - - src/hb-ot-layout-gdef-private.h | 37 +++++++++++++++++++++++----- - src/hb-ot-layout-gsub-private.h | 13 ++++++++++ - src/hb-ot-layout-open-private.h | 49 - ++++++++++++++++++++++++++++++++------ - src/hb-private.h | 2 + - 4 files changed, 86 insertions(+), 15 deletions(-) - -commit aefaafe5bc4fc6d37a412c135b1079c287be7045 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jan 23 17:25:29 2008 -0500 - - Minor renaming - - src/hb-ot-layout-gdef-private.h | 10 +++++----- - src/hb-ot-layout-open-private.h | 16 +++++++--------- - src/main.cc | 4 ++-- - 3 files changed, 14 insertions(+), 16 deletions(-) - -commit a16ecbf0564a6e2576da22c12827f3c0719da549 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jan 23 17:01:55 2008 -0500 - - Initial gsub stub - - src/hb-ot-layout-gdef-private.h | 4 + - src/hb-ot-layout-gsub-private.h | 453 - +++++++++++++++++++++++++++++++++++++++ - src/hb-ot-layout-open-private.h | 3 + - src/main.cc | 1 + - 4 files changed, 461 insertions(+), 0 deletions(-) - -commit 64aef3a54999496fd1de4f5aa5b019e4c03b3836 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jan 23 16:14:38 2008 -0500 - - Add copyright notices. - - src/hb-common.h | 26 ++++++++++++++++++++++++++ - src/hb-ot-layout-gdef-private.h | 26 ++++++++++++++++++++++++++ - src/hb-ot-layout-open-private.h | 26 ++++++++++++++++++++++++++ - src/hb-ot-layout.h | 26 ++++++++++++++++++++++++++ - src/hb-private.h | 26 ++++++++++++++++++++++++++ - src/main.cc | 26 ++++++++++++++++++++++++++ - 6 files changed, 156 insertions(+), 0 deletions(-) - -commit 12360f7c159826ae72271b34486dee59d96aa8ca -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jan 23 15:50:38 2008 -0500 - - Minor cleanup, add LIKELY and UNLIKELY annotations - - src/hb-ot-layout-gdef-private.h | 63 - ++++++++++++++++++++++---------------- - src/hb-ot-layout-open-private.h | 36 +++++++--------------- - src/hb-private.h | 15 +++++++++ - 3 files changed, 63 insertions(+), 51 deletions(-) - -commit 8dd1c8b8d6797d899d0f5b0a8015886bf6520ca2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jan 23 05:00:30 2008 -0500 - - Clean up file names, add namespace - - src/harfbuzz-common.h | 14 - - src/harfbuzz-gdef-private.h | 213 ----------- - src/harfbuzz-gdef.h | 11 - - src/harfbuzz-open-private.h | 804 - --------------------------------------- - src/harfbuzz-open.h | 17 - - src/harfbuzz-private.h | 12 - - src/hb-common.h | 14 + - src/hb-ot-layout-gdef-private.h | 213 +++++++++++ - src/hb-ot-layout-open-private.h | 804 - +++++++++++++++++++++++++++++++++++++++ - src/hb-ot-layout.h | 17 + - src/hb-private.h | 12 + - src/main.cc | 4 +- - 12 files changed, 1062 insertions(+), 1073 deletions(-) - -commit 1f437e6f47fb6c15761021bd2078f31778f2179c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jan 23 04:36:40 2008 -0500 - - Make all code NULL-free and assert-free - - src/harfbuzz-gdef-private.h | 125 +++++++++---------- - src/harfbuzz-open-private.h | 285 - ++++++++++++++++++++++-------------------- - src/main.cc | 8 +- - 3 files changed, 214 insertions(+), 204 deletions(-) - -commit 600e5eb80f553ea8eb862e6784133574c74ca513 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jan 23 02:01:37 2008 -0500 - - Define get_for_data() factories - - src/harfbuzz-gdef-private.h | 3 +++ - src/harfbuzz-open-private.h | 42 - +++++++++++++++++++++++++++++------------- - src/main.cc | 10 ++++------ - 3 files changed, 36 insertions(+), 19 deletions(-) - -commit b9d7688fb3d45894901484b74095c4f11cab6196 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jan 23 01:38:10 2008 -0500 - - Finish and test GDEF - - src/harfbuzz-gdef-private.h | 72 - ++++++++++++++++++++++++++++++------------ - src/harfbuzz-open-private.h | 23 +++++++------ - src/harfbuzz-open.h | 4 ++ - src/main.cc | 10 ++++++ - 4 files changed, 77 insertions(+), 32 deletions(-) - -commit 303fe62824d4e99df554b6bfaacba05d068522fb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Jan 23 00:20:48 2008 -0500 - - Misc cleanup - - src/Makefile | 10 +++- - src/harfbuzz-gdef-private.h | 65 +++++++++++++++++++++------ - src/harfbuzz-open-private.h | 102 - +++++++++++++++++++++++++++++++++++++++---- - src/harfbuzz-private.h | 6 +++ - src/main.cc | 12 +++--- - 5 files changed, 163 insertions(+), 32 deletions(-) - -commit 17843245fde4cc8cddc7da8ef30357d3d8778187 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Wed Jan 16 20:39:29 2008 +0000 - - Remove COPYING.GPL and COPYING.FTL that are no longer there. - - 2008-01-16 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/Makefile.am: Remove COPYING.GPL and - COPYING.FTL that - are no longer there. - - src/Makefile.am | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit a2a9a023f6472ba262f89e5327318996b8258d25 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Tue Jan 15 22:46:32 2008 +0000 - - HarfBuzz was relicensed to a more generous and simpler - license. Adapt. See - - 2008-01-15 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/*: - HarfBuzz was relicensed to a more generous and simpler - license. - Adapt. See pango/opentype/COPYING for the new license - which is - LGPL-compatible. - - src/COPYING | 39 +++-- - src/COPYING.FTL | 174 --------------------- - src/COPYING.GPL | 340 - ----------------------------------------- - src/harfbuzz-buffer-private.h | 32 +++- - src/harfbuzz-buffer.c | 27 +++- - src/harfbuzz-buffer.h | 32 +++- - src/harfbuzz-dump-main.c | 34 +++-- - src/harfbuzz-dump.c | 34 +++-- - src/harfbuzz-dump.h | 35 +++-- - src/harfbuzz-gdef-private.h | 29 +++- - src/harfbuzz-gdef.c | 29 +++- - src/harfbuzz-gdef.h | 29 +++- - src/harfbuzz-global.h | 29 +++- - src/harfbuzz-gpos-private.h | 29 +++- - src/harfbuzz-gpos.c | 31 +++- - src/harfbuzz-gpos.h | 29 +++- - src/harfbuzz-gsub-private.h | 29 +++- - src/harfbuzz-gsub.c | 31 +++- - src/harfbuzz-gsub.h | 29 +++- - src/harfbuzz-impl.c | 31 +++- - src/harfbuzz-impl.h | 29 +++- - src/harfbuzz-open-private.h | 29 +++- - src/harfbuzz-open.c | 29 +++- - src/harfbuzz-open.h | 29 +++- - src/harfbuzz-stream-private.h | 29 +++- - src/harfbuzz-stream.c | 31 +++- - src/harfbuzz.c | 28 +++- - src/harfbuzz.h | 29 +++- - 28 files changed, 564 insertions(+), 741 deletions(-) - -commit 4ccedd22eaa6e47bd8bbf255627a8b55fbb44736 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Wed Dec 5 03:41:29 2007 +0000 - - Bug 501575 – Compile errors Patch from Jens Granseuer - - 2007-12-04 Behdad Esfahbod <behdad@gnome.org> - - Bug 501575 – Compile errors - Patch from Jens Granseuer - - * pango/opentype/harfbuzz-stream.c (_hb_font_goto_table): - * pango/pango-utils.c (handle_alias_line): - Fix C99ism. - - src/harfbuzz-stream.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit cd55cfa2b0a1fe35d5a4ad1c8feaa399d7fb7ab3 -Author: Behdad Esfahbod <behdad@src.gnome.org> -Date: Fri Nov 30 04:31:29 2007 +0000 - - Undo accidental change. - - src/harfbuzz-impl.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 3f05da638c8d7b13e7f860aeda1a6321e5ebd92e -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Fri Nov 30 04:29:58 2007 +0000 - - Bug 485536 – underline_position can be zero - - 2007-11-29 Behdad Esfahbod <behdad@gnome.org> - - Bug 485536 – underline_position can be zero - - * pango/pango-utils.c (pango_cairo_quantize_line_geometry): - Document that returned position may be zero. - - * pango/pangocairo-win32font.c - (pango_cairo_win32_font_create_metrics_for_context): - * pango/pangofc-font.c (get_face_metrics): - Handle case of underline_position==0 after rounding. - - src/harfbuzz-impl.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit e58278fedb67cbaac4bf4d6dfc33209cb22eec08 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Sat Nov 24 01:40:13 2007 +0000 - - Remove unused macro. - - 2007-11-23 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/harfbuzz-impl.c: Remove unused macro. - - src/harfbuzz-impl.c | 18 ------------------ - 1 files changed, 0 insertions(+), 18 deletions(-) - -commit 3b047380aec4ccc707c4579327d54172c19820fd -Author: Behdad Esfahbod <behdad@src.gnome.org> -Date: Sun Nov 18 22:34:08 2007 +0000 - - Minor - - src/harfbuzz-dump-main.c | 4 +- - src/harfbuzz-stream.c | 89 - ++++++++++++++++++++++----------------------- - 2 files changed, 46 insertions(+), 47 deletions(-) - -commit 10d6a25a26bdbab4ece4edf0e34ffd3d22410ebe -Author: Behdad Esfahbod <behdad@src.gnome.org> -Date: Wed Nov 7 10:04:11 2007 +0000 - - Remove dead code. - - src/harfbuzz-gdef.c | 88 - --------------------------------------------------- - src/harfbuzz-gpos.h | 4 +-- - 2 files changed, 1 insertions(+), 91 deletions(-) - -commit 47d2c33e3d099fae79e199367de5011bc5c12273 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Wed Nov 7 09:59:18 2007 +0000 - - And some more. - - 2007-11-07 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/*: And some more. - - src/harfbuzz-buffer.h | 8 ++-- - src/harfbuzz-dump-main.c | 22 +++++----- - src/harfbuzz-gdef.c | 14 +++--- - src/harfbuzz-gdef.h | 4 +- - src/harfbuzz-global.h | 21 +++++----- - src/harfbuzz-gpos.c | 82 - ++++++++++++++++++++--------------------- - src/harfbuzz-gpos.h | 12 +++--- - src/harfbuzz-gsub.c | 4 +- - src/harfbuzz-gsub.h | 4 +- - src/harfbuzz-stream-private.h | 4 +- - src/harfbuzz-stream.c | 16 ++++---- - 11 files changed, 95 insertions(+), 96 deletions(-) - -commit 78ef65ba08967fe1b5f97bcb27074bd635f4b898 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Wed Nov 7 08:06:01 2007 +0000 - - Some more cleanup and merging. - - 2007-11-07 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/*: Some more cleanup and merging. - - src/Makefile.am | 6 +- - src/harfbuzz-buffer-private.h | 33 ++++++ - src/harfbuzz-buffer.c | 4 +- - src/harfbuzz-dump-main.c | 3 +- - src/harfbuzz-gdef-private.h | 9 ++- - src/harfbuzz-gdef.c | 39 +++++++ - src/harfbuzz-global.h | 2 + - src/harfbuzz-gpos-private.h | 1 + - src/harfbuzz-gpos.c | 32 +----- - src/harfbuzz-gsub-private.h | 1 + - src/harfbuzz-gsub.c | 33 +----- - src/harfbuzz-impl.c | 216 - ++------------------------------------ - src/harfbuzz-impl.h | 100 +----------------- - src/harfbuzz-open-private.h | 4 +- - src/harfbuzz-stream-private.h | 70 ++++++++++++ - src/harfbuzz-stream.c | 234 - +++++++++++++++++++++++++++++++++++++++++ - src/harfbuzz.c | 1 + - src/harfbuzz.h | 3 +- - 18 files changed, 419 insertions(+), 372 deletions(-) - -commit 5c9bd379950d914982bdb91d0f82b8036908db37 -Author: Behdad Esfahbod <behdad@src.gnome.org> -Date: Mon Oct 29 23:51:48 2007 +0000 - - Fix typo. - - src/Makefile.am | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit ef1f481752fa6e478f649e826c96927c98f21981 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Oct 25 23:37:11 2007 +0000 - - Even more cleanup and more type renames. - - 2007-10-25 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/*: Even more cleanup and more type renames. - - src/harfbuzz-buffer.h | 3 +-- - src/harfbuzz-global.h | 6 ++++++ - src/harfbuzz-impl.c | 16 ++++++++-------- - src/harfbuzz-impl.h | 22 +++++++++++----------- - src/harfbuzz-open.h | 3 --- - 5 files changed, 26 insertions(+), 24 deletions(-) - -commit 282c60a0eea0db784b0a094958bec35b5f3dc399 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Oct 25 23:22:17 2007 +0000 - - More cleanup, remove redundant error types. - - 2007-10-25 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/*: More cleanup, remove redundant error - types. - - src/harfbuzz-dump-main.c | 4 +- - src/harfbuzz-dump.c | 14 +++--- - src/harfbuzz-gdef.c | 25 +++++----- - src/harfbuzz-gdef.h | 3 - - src/harfbuzz-global.h | 31 ++++++----- - src/harfbuzz-gpos.c | 124 - +++++++++++++++++++++++----------------------- - src/harfbuzz-gpos.h | 3 - - src/harfbuzz-gsub.c | 86 ++++++++++++++++---------------- - src/harfbuzz-gsub.h | 3 - - src/harfbuzz-impl.c | 18 +++--- - src/harfbuzz-impl.h | 2 + - src/harfbuzz-open.c | 24 +++++----- - src/harfbuzz-open.h | 6 +- - 13 files changed, 170 insertions(+), 173 deletions(-) - -commit 4280ec4df45ae86c10c3cd24ddb9c05e47223d39 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Oct 25 00:23:46 2007 +0000 - - Rename ftglue.c to harfbuzz-impl.c and more type renames and - moving code - - 2007-10-24 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/*: Rename ftglue.c to harfbuzz-impl.c - and more - type renames and moving code around. - - src/Makefile.am | 3 +- - src/ftglue.c | 287 - ------------------------------------------- - src/ftglue.h | 151 ----------------------- - src/harfbuzz-dump-main.c | 48 +------- - src/harfbuzz-dump.c | 30 +++--- - src/harfbuzz-gdef.c | 18 ++-- - src/harfbuzz-global.h | 18 +++ - src/harfbuzz-gpos-private.h | 2 +- - src/harfbuzz-gpos.c | 90 +++++++------- - src/harfbuzz-gsub-private.h | 2 +- - src/harfbuzz-gsub.c | 64 +++++----- - src/harfbuzz-impl.c | 283 - ++++++++++++++++++++++++++++++++++++++++++ - src/harfbuzz-impl.h | 114 ++++++++++++++++- - src/harfbuzz-open-private.h | 14 +- - src/harfbuzz-open.c | 32 +++--- - src/harfbuzz-open.h | 16 --- - src/harfbuzz.c | 4 +- - 17 files changed, 542 insertions(+), 634 deletions(-) - -commit 5716ae278a82d318ddbfeba01d0785d4efbe1454 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Wed Oct 24 22:44:47 2007 +0000 - - New header file harfbuzz-global.h. Rename FT_* int types to HB_* - types. - - 2007-10-24 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/*: New header file harfbuzz-global.h. Rename - FT_* int types to HB_* types. - - src/Makefile.am | 1 + - src/ftglue.c | 30 ++-- - src/ftglue.h | 26 +- - src/harfbuzz-buffer-private.h | 26 +- - src/harfbuzz-buffer.c | 40 ++-- - src/harfbuzz-buffer.h | 42 ++-- - src/harfbuzz-dump-main.c | 24 +- - src/harfbuzz-dump.c | 14 +- - src/harfbuzz-dump.h | 4 +- - src/harfbuzz-gdef-private.h | 30 ++-- - src/harfbuzz-gdef.c | 104 ++++---- - src/harfbuzz-gdef.h | 32 ++-- - src/harfbuzz-global.h | 34 +++ - src/harfbuzz-gpos-private.h | 182 +++++++------- - src/harfbuzz-gpos.c | 540 - ++++++++++++++++++++-------------------- - src/harfbuzz-gpos.h | 52 ++-- - src/harfbuzz-gsub-private.h | 142 ++++++------ - src/harfbuzz-gsub.c | 432 ++++++++++++++++---------------- - src/harfbuzz-gsub.h | 50 ++-- - src/harfbuzz-impl.h | 6 +- - src/harfbuzz-open-private.h | 26 +- - src/harfbuzz-open.c | 146 ++++++------ - src/harfbuzz-open.h | 88 ++++---- - src/harfbuzz.h | 1 + - 24 files changed, 1056 insertions(+), 1016 deletions(-) - -commit 2130d852c76cccb94350a4aea222359640ffa8a4 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Wed Oct 24 21:35:03 2007 +0000 - - Add commented-out dummy struct for Extension lookups. - - 2007-10-24 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/harfbuzz-gpos-private.h: - * pango/opentype/harfbuzz-gsub-private.h: - Add commented-out dummy struct for Extension lookups. - - src/harfbuzz-gpos-private.h | 13 +++++++++++++ - src/harfbuzz-gsub-private.h | 13 +++++++++++++ - 2 files changed, 26 insertions(+), 0 deletions(-) - -commit 13b2b963848ada169c2fe3d3669fbc1c337f7fe7 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Sun Oct 21 18:17:02 2007 +0000 - - Bug 488840 – harfbuzz: protect against ligid overflow - - 2007-10-21 Behdad Esfahbod <behdad@gnome.org> - - Bug 488840 – harfbuzz: protect against ligid overflow - - * pango/opentype/harfbuzz-buffer.c - (_hb_buffer_allocate_ligid): - Never return zero, even in case of overflow. - - * pango/opentype/harfbuzz-impl.h: Define dummy HB_LIKELY() and - HB_UNLIKELY(), to be filled later. - - src/harfbuzz-buffer.c | 6 +++++- - src/harfbuzz-impl.h | 3 +++ - 2 files changed, 8 insertions(+), 1 deletions(-) - -commit 6b347138b597c41af24453f630336ba2fc033dc5 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Oct 11 08:30:50 2007 +0000 - - Mark internal symbols as HB_INTERNAL and define that to static in - - 2007-10-11 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/*: Mark internal symbols as HB_INTERNAL and - define that to static in harfbuzz.c. - - * pango/opentype/harfbuzz-buffer-internal.h: New file. - - src/Makefile.am | 1 + - src/ftglue.c | 18 +++--- - src/ftglue.h | 20 ++++--- - src/harfbuzz-buffer-private.h | 60 ++++++++++++++++++++++ - src/harfbuzz-buffer.c | 108 - +++++++++++++++++++++------------------- - src/harfbuzz-buffer.h | 38 +-------------- - src/harfbuzz-gdef-private.h | 17 ++++--- - src/harfbuzz-gdef.c | 20 ++++--- - src/harfbuzz-gpos-private.h | 13 +++-- - src/harfbuzz-gpos.c | 16 +++--- - src/harfbuzz-gsub-private.h | 14 +++-- - src/harfbuzz-gsub.c | 20 ++++--- - src/harfbuzz-impl.h | 12 +++-- - src/harfbuzz-open-private.h | 81 +++++++++++++++++------------- - src/harfbuzz-open.c | 111 - +++++++++++++++++++++++----------------- - src/harfbuzz.c | 1 + - 16 files changed, 315 insertions(+), 235 deletions(-) - -commit 7cdfb61deefd8f43edb5eb79d45d38dbbbef9051 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Oct 11 07:46:33 2007 +0000 - - Remove FTGLUE_API/APIDEF cruft. - - 2007-10-11 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/ftglue.[ch]: Remove FTGLUE_API/APIDEF cruft. - - src/ftglue.c | 16 ++++++++-------- - src/ftglue.h | 24 ++++++++---------------- - 2 files changed, 16 insertions(+), 24 deletions(-) - -commit 61ddbafaaad31ccacde54cad7e60a84abffc0a9f -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Oct 11 07:45:26 2007 +0000 - - Build harfbuzz.c instead of individual source files, to let - compiler go - - 2007-10-11 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/Makefile.am: Build harfbuzz.c instead - of individual - source files, to let compiler go wild with optimizations! - - src/Makefile.am | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) - -commit a219b3d003d6727c79dc51282d21e9ac48c44458 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Oct 11 07:34:08 2007 +0000 - - Same here. - - 2007-10-11 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/harfbuzz.c: Same here. - - src/harfbuzz.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 6567e16e3b14c08659342bbcc9f2735e71f9114e -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Oct 11 07:33:19 2007 +0000 - - Don't include harfbuzz-dump.[ch] in libharfbuzz.a. Those are just - used by - - 2007-10-11 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/Makefile.am: Don't include harfbuzz-dump.[ch] - in - libharfbuzz.a. Those are just used by the harfbuzz-dump tool. - - src/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 0b032549ba7581c879a0fc4e794b0e9a4723ae85 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Oct 11 07:24:47 2007 +0000 - - Some more cleanup. - - 2007-10-11 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/harfbuzz-buffer.c: Some more cleanup. - - src/harfbuzz-buffer.c | 11 ++--------- - 1 files changed, 2 insertions(+), 9 deletions(-) - -commit 7a26864308bd1ca8d5f47d798411cac7239b7d38 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Oct 11 07:21:31 2007 +0000 - - Move some code around. - - 2007-10-11 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/harfbuzz-buffer.c: Move some code around. - - src/harfbuzz-buffer.c | 91 - ++++++++++++++++++++++++++----------------------- - 1 files changed, 48 insertions(+), 43 deletions(-) - -commit 7a5405c8261573a0f29d28fb533e800d698f6129 -Author: Behdad Esfahbod <behdad@src.gnome.org> -Date: Thu Oct 11 07:15:16 2007 +0000 - - Minor. - - src/harfbuzz-buffer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 986f4fd96892ebda550793941bb1daed862c4a34 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Oct 11 07:12:49 2007 +0000 - - Rename buffer->inplace to buffer->separate_out with the inverted - meaning, - - 2007-10-11 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/harfbuzz-buffer.[ch]: Rename buffer->inplace - to - buffer->separate_out with the inverted meaning, such that - buffer - is initialization is memset(0). - - src/harfbuzz-buffer.c | 34 +++++++++++++++++----------------- - src/harfbuzz-buffer.h | 2 +- - 2 files changed, 18 insertions(+), 18 deletions(-) - -commit 06003908ccf2473366816935dd1b144cde587be9 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Oct 11 07:05:09 2007 +0000 - - Allocate buffer->positions lazily. - - 2007-10-11 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/*: Allocate buffer->positions lazily. - - src/harfbuzz-buffer.c | 25 +++++++++++++++++++++++-- - src/harfbuzz-buffer.h | 3 +++ - src/harfbuzz-gpos.c | 13 ++++++++----- - src/harfbuzz-gsub.c | 5 +++-- - 4 files changed, 37 insertions(+), 9 deletions(-) - -commit fc3d6f575826704a0ae9ee9018323f6a3c422f4b -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Oct 11 06:52:07 2007 +0000 - - Bug 485621 – Get rid of freetype memory allocator in harfbuzz - - 2007-10-11 Behdad Esfahbod <behdad@gnome.org> - - Bug 485621 – Get rid of freetype memory allocator in - harfbuzz - - * pango/opentype/*: Remove all occurences of FT_Memory. Use - malloc/realloc/free directly. - - * pango/pango-ot*: Update to above. - - src/ftglue.c | 52 ++---- - src/ftglue.h | 28 ++-- - src/harfbuzz-buffer.c | 16 +- - src/harfbuzz-buffer.h | 4 +- - src/harfbuzz-gdef.c | 106 ++++------- - src/harfbuzz-gdef.h | 6 +- - src/harfbuzz-gpos-private.h | 1 - - src/harfbuzz-gpos.c | 462 - +++++++++++++++++-------------------------- - src/harfbuzz-gpos.h | 2 - - src/harfbuzz-gsub-private.h | 1 - - src/harfbuzz-gsub.c | 312 +++++++++++------------------- - src/harfbuzz-gsub.h | 2 - - src/harfbuzz-open-private.h | 25 +-- - src/harfbuzz-open.c | 127 ++++++------- - 14 files changed, 441 insertions(+), 703 deletions(-) - -commit a8abb8b994c3cd89808e8f7128a0c04b23eb3ede -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Oct 11 00:07:58 2007 +0000 - - Bug 485559 – Boston Summit HarfBuzz optimizations - - 2007-10-10 Behdad Esfahbod <behdad@gnome.org> - - Bug 485559 – Boston Summit HarfBuzz optimizations - - * pango/opentype/*: HarfBuzz hacking to: - - - Rename last remaining FT_Err stuff to HB_Err. - - - Fix a couple invalid table paths to be permissive so - fonts work better. Particularly GDEF table for Nafees - Nastaliq is loaded and works great now. - - - Optimize harfbuzz buffer to not copy/swap for simple - one-to-one and "copy" GSUB operations. - - * pango/pango-ot*: Update to FT_Err to HB_Err renaming. - - src/ftglue.c | 51 ++- - src/ftglue.h | 21 +- - src/harfbuzz-buffer.c | 190 +++++++-- - src/harfbuzz-buffer.h | 26 +- - src/harfbuzz-dump-main.c | 14 +- - src/harfbuzz-dump.c | 15 +- - src/harfbuzz-gdef-private.h | 4 +- - src/harfbuzz-gdef.c | 149 ++++---- - src/harfbuzz-gdef.h | 10 +- - src/harfbuzz-gpos-private.h | 2 +- - src/harfbuzz-gpos.c | 810 +++++++++++++++++--------------------- - src/harfbuzz-gpos.h | 30 +- - src/harfbuzz-gsub-private.h | 2 +- - src/harfbuzz-gsub.c | 919 - ++++++++++++++++++------------------------- - src/harfbuzz-gsub.h | 24 +- - src/harfbuzz-impl.h | 22 +- - src/harfbuzz-open-private.h | 20 +- - src/harfbuzz-open.c | 238 ++++++------ - src/harfbuzz-open.h | 13 +- - 19 files changed, 1253 insertions(+), 1307 deletions(-) - -commit dd810b76bc554278d3a226cf89901d16992cf56d -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Wed Aug 29 08:46:50 2007 +0000 - - Bug 302952 – The placement of a diacritic marks for an arabic - ligature - - 2007-08-29 Behdad Esfahbod <behdad@gnome.org> - - Bug 302952 – The placement of a diacritic marks for an - arabic ligature - is not correct - - * pango/opentype/harfbuzz-buffer.c (hb_buffer_allocate_ligid): - Don't - use zero as allocated ligature id. Zero means no ligature id. - - src/harfbuzz-buffer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit e90d19919434b90d79e67aaf199bddd991f8e5d8 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Tue Aug 21 08:03:26 2007 +0000 - - Bug 463430 – Gets stuck while "formatting message" - - 2007-08-21 Behdad Esfahbod <behdad@gnome.org> - - Bug 463430 – Gets stuck while "formatting message" - - * pango/opentype/harfbuzz-gpos.c (Lookup_PairPos1), - (Lookup_PairPos2), (Lookup_PairPos), (Do_ContextPos): - * pango/opentype/harfbuzz-gsub.c (Do_ContextSubst): - Change type of intermediate index variable from FT_UShort to - FT_ULong as it was overlowing with more than 65536 glyphs. - - src/harfbuzz-gpos.c | 15 ++++++++++----- - src/harfbuzz-gsub.c | 2 +- - 2 files changed, 11 insertions(+), 6 deletions(-) - -commit 13b86ee398905f96f57df001309312f6dfdfea9a -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Tue Aug 21 01:38:07 2007 +0000 - - Don't ignore error return value of - hb_buffer_copy_output_glyph(). Patch - - 2007-08-20 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/harfbuzz-gsub.c (GSUB_Do_String_Lookup): - Don't - ignore error return value of hb_buffer_copy_output_glyph(). - Patch - sent to harfbuzz-list. - - src/harfbuzz-gsub.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 4c2556cb4c38a56c3a5087deb54aa6262ab3aff9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 6 11:29:21 2007 -0400 - - [gdef] Initial implementation - - src/harfbuzz-gdef-private.h | 144 - ++++++++++++++++++++++++++++++++++++++++++- - 1 files changed, 142 insertions(+), 2 deletions(-) - -commit 5b2e947fd2b7c5ea49b2bef1e0190d99a525058c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Jul 6 02:03:26 2007 -0400 - - [open] small fixes, including not using unions for main structs - - src/harfbuzz-open-private.h | 54 - +++++++++++++++++++++++-------------------- - 1 files changed, 29 insertions(+), 25 deletions(-) - -commit 151df44346990728b5dd249db5740a9543ae33b9 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Jul 5 17:22:07 2007 -0400 - - Improve stupid Makefile - - src/Makefile | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit 6c49bebc70a0118a803a5bc979f4436a82b48240 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Tue May 1 02:32:12 2007 +0000 - - Link freetype to harfbuzz-dump, for those systems that don't track - - 2007-04-30 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/Makefile.am: Link freetype to harfbuzz-dump, - for - those systems that don't track dependencies automatically. - - src/Makefile.am | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 7341a116916c8470f1211f0cb3c65b189b42ec9e -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Tue Apr 3 22:45:29 2007 +0000 - - Copy fixes from harfbuzz stable branch. Includes a leak fix, a kerning - - 2007-04-03 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/harfbuzz-gdef.c (_HB_GDEF_Check_Property): - * pango/opentype/harfbuzz-gpos.c (HB_Done_GPOS_Table), - (Lookup_PairPos): - * pango/opentype/harfbuzz-open.c (Get_Class1): - Copy fixes from harfbuzz stable branch. Includes a leak fix, - a kerning fix, and an array out-of-bound access fix. - - src/harfbuzz-gdef.c | 2 ++ - src/harfbuzz-gpos.c | 8 ++++++++ - src/harfbuzz-open.c | 2 +- - 3 files changed, 11 insertions(+), 1 deletions(-) - -commit 999a6f05758c10a902354457ecbf6c943bfed514 -Author: Hans Breuer <hans@breuer.org> -Date: Sat Jan 13 21:31:41 2007 +0000 - - updated - - 2007-01-13 Hans Breuer <hans@breuer.org> - - * pango/makefile.msc pango/opentype/makefile.msc : updated - - src/makefile.msc | 16 ++++++---------- - 1 files changed, 6 insertions(+), 10 deletions(-) - -commit 3c038d40da4bfe5037cc4e9de22bad08fa408465 -Author: Behdad Esfahbod <behdad@src.gnome.org> -Date: Tue Jan 9 03:32:12 2007 +0000 - - Remove .cvsignore files (moved to svn:ignore prop) - - src/.cvsignore | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) - -commit 5b3f7702a64fe0513d08a67bdb72704e46fd7cd4 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Dec 28 06:42:37 2006 -0500 - - Add stub GDEF files - - src/harfbuzz-gdef-private.h | 8 ++++++++ - src/harfbuzz-gdef.h | 11 +++++++++++ - src/harfbuzz-open-private.h | 3 +-- - src/harfbuzz-private.h | 6 ++++++ - src/main.cc | 1 + - 5 files changed, 27 insertions(+), 2 deletions(-) - -commit b3395a7aa36ff1ba5a17f494fbf359ec317a7e69 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Dec 28 06:31:18 2006 -0500 - - Don't shift down the mark attachment type - - src/harfbuzz-open-private.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 193b66d52ae2cb5ced7969e15b7f56dc1978ca8a -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Dec 28 06:12:18 2006 -0500 - - Remove stale comment - - src/harfbuzz-open-private.h | 10 ---------- - 1 files changed, 0 insertions(+), 10 deletions(-) - -commit 12c4568c680ea2b9b98a16a8b7402ca185c90ef6 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Dec 28 06:10:59 2006 -0500 - - Break and rename, in the layout of old HarfBuzz codebase - - src/.gitignore | 1 + - src/Makefile | 2 +- - src/harfbuzz-common.h | 14 + - src/harfbuzz-ng.cc | 802 - ------------------------------------------- - src/harfbuzz-open-private.h | 697 +++++++++++++++++++++++++++++++++++++ - src/harfbuzz-open.h | 13 + - src/main.cc | 98 ++++++ - 7 files changed, 824 insertions(+), 803 deletions(-) - -commit 3158d84b0dfe5032e7c56c03f2da97b8ab549d94 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Dec 27 20:08:07 2006 -0500 - - Oops. s/OpenTypeFontFaceFile/OpenTypeFontFile/g - - src/harfbuzz-ng.cc | 22 +++++++++++----------- - 1 files changed, 11 insertions(+), 11 deletions(-) - -commit bf0f9dd61375c5afce8e6b1664d0df5f6c8b2494 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Dec 27 20:06:42 2006 -0500 - - Use union for ClassDef - - src/harfbuzz-ng.cc | 12 +++++++----- - 1 files changed, 7 insertions(+), 5 deletions(-) - -commit c46196d09c4ea879bf45182e8a0d649d4c750c39 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Dec 27 20:05:16 2006 -0500 - - Use union for Coverage - - src/harfbuzz-ng.cc | 21 +++++++++++---------- - 1 files changed, 11 insertions(+), 10 deletions(-) - -commit 86f450243dbaa82f187cf2d36364e9a59c0e64c7 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Dec 27 19:59:07 2006 -0500 - - Add GPOS stub - - src/harfbuzz-ng.cc | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit 133466177e104ddcd2501a88735670540252167c -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Dec 27 19:58:32 2006 -0500 - - s/OpenTypeFont/OpenTypeFontFace/g - - src/harfbuzz-ng.cc | 44 +++++++++++++++++++++++--------------------- - 1 files changed, 23 insertions(+), 21 deletions(-) - -commit 71d62baab0429cdf56ba4019fd2a205f08188503 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Dec 27 01:29:24 2006 -0500 - - GSUBGPOSHeader - - src/harfbuzz-ng.cc | 103 - +++++++++++++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 98 insertions(+), 5 deletions(-) - -commit eebabd8b2ec5296deba6b09d7755933da0a7d9dc -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Wed Dec 27 00:21:31 2006 -0500 - - Finished OpenType Common Table Formats - - src/harfbuzz-ng.cc | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 2b7374519766825971f9f4ff5b1cb49b74cfcaf8 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Dec 26 20:55:37 2006 -0500 - - Device tables. - - src/harfbuzz-ng.cc | 49 - +++++++++++++++++++++++++++++++++++++++++++++---- - 1 files changed, 45 insertions(+), 4 deletions(-) - -commit eb32e374f4d6de8d428d36144f6eef93514820d2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Dec 26 20:00:33 2006 -0500 - - ClassDef - - src/harfbuzz-ng.cc | 121 - +++++++++++++++++++++++++++++++++++++++++---------- - 1 files changed, 97 insertions(+), 24 deletions(-) - -commit 53502c6723dbf9cd3b6ba91b733678b3c7871715 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Dec 26 19:29:08 2006 -0500 - - Rename CoverageFormat to Coverage - - src/harfbuzz-ng.cc | 18 +++++++++++++----- - 1 files changed, 13 insertions(+), 5 deletions(-) - -commit 0d6db2abcbe98456569ccf7934ba0a8b37c7f6f3 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Dec 26 18:53:55 2006 -0500 - - Define more structs using DEFINE_INT_TYPE. - - src/harfbuzz-ng.cc | 39 +++++++++++++++++++-------------------- - 1 files changed, 19 insertions(+), 20 deletions(-) - -commit 915931b74a30e8652fac5fec153d499485513f63 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Dec 26 15:30:14 2006 -0500 - - s/DEFINE_NOT_INSTANTIABLE/DEFINE_NON_INSTANTIABLE/ - - src/harfbuzz-ng.cc | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 0c0d55330ef4090f3e4864538e83a4344caaf3ba -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Tue Dec 26 15:29:38 2006 -0500 - - Coverage. - - src/harfbuzz-ng.cc | 91 - +++++++++++++++++++++++++++++++++++++++++++++------- - 1 files changed, 79 insertions(+), 12 deletions(-) - -commit 882e52f59196535495af8ca8069df32308ad52cf -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Dec 25 10:28:31 2006 -0500 - - Rename to harfbuzz-ng.cc - - src/Makefile | 2 +- - src/harfbuzz-ng.cc | 513 - +++++++++++++++++++++++++++++++++++++++++++++++ - src/hb-types-private.cc | 513 - ----------------------------------------------- - 3 files changed, 514 insertions(+), 514 deletions(-) - -commit f8ba99f6f322800a915428ffc3b5eaf1be2e6c21 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Dec 25 09:58:02 2006 -0500 - - LookupFlags - - src/hb-types-private.cc | 52 - ++++++++++++++++++++++++++++++++++++++++++---- - 1 files changed, 47 insertions(+), 5 deletions(-) - -commit 25ad92c8a68bf72464601a644ed57b9213126a78 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Dec 25 09:35:06 2006 -0500 - - Implement Feature - - src/hb-types-private.cc | 46 - ++++++++++++++++++++++++++++++++++++++++++---- - 1 files changed, 42 insertions(+), 4 deletions(-) - -commit befc022affd2386b3f46cd7d11e4262f6c8bce9f -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Dec 25 09:14:52 2006 -0500 - - LangSys - - src/hb-types-private.cc | 51 - ++++++++++++++++++++++++++++++++++++++++------ - 1 files changed, 44 insertions(+), 7 deletions(-) - -commit c81efca149b08832d5d96a944fb5f303f3d0ca42 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Dec 25 06:22:08 2006 -0500 - - Use CamelCaseTags. - - src/hb-types-private.cc | 29 ++++++++++++++--------------- - 1 files changed, 14 insertions(+), 15 deletions(-) - -commit 808dbe283c1ad66091f2cb67380888b7cf265c01 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Dec 25 06:18:52 2006 -0500 - - Make types not instantiable - - src/hb-types-private.cc | 104 - ++++++++++++++++++++++++++--------------------- - 1 files changed, 57 insertions(+), 47 deletions(-) - -commit b739c05ca4b7acfa45bd4b0812ecbb3747f726f0 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Mon Dec 25 05:39:20 2006 -0500 - - Add OpenTypeFontFile. - - src/Makefile | 2 +- - src/hb-types-private.cc | 113 - ++++++++++++++++++++++++++++++++++++++++++++--- - 2 files changed, 107 insertions(+), 8 deletions(-) - -commit 8596944b7421f982960e825019fc0263442520cb -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Sat Dec 23 17:49:25 2006 -0500 - - Add Makefile - - src/Makefile | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -commit b6e62bc5db76ae342177b2b646c37f45eccad975 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Fri Dec 22 02:21:55 2006 -0500 - - After DEFINE_SCRIPT_ARRAY - - src/hb-types-private.cc | 215 - ++++++++++++++++++++++++++++++---------------- - 1 files changed, 140 insertions(+), 75 deletions(-) - -commit 01e4fcb032be601f272e62228881e2aabfb9d925 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Dec 21 22:31:31 2006 -0500 - - Remove the annoying HB_ prefix. - - src/hb-types-private.cc | 107 - +++++++++++++++++++++++------------------------ - 1 files changed, 52 insertions(+), 55 deletions(-) - -commit 6b4ce01da121e12e1c78ad7eaedf469f35f3568d -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Dec 21 22:31:10 2006 -0500 - - Second version. Complete redesign, based on C++ classes to ensure - endian - correctness. - - src/hb-types-private.cc | 300 - ++++++++++++++++++++++++++++++++--------------- - 1 files changed, 205 insertions(+), 95 deletions(-) - -commit f78e70c301311ffcfb007c7fc4125d71cbcff1e2 -Author: Behdad Esfahbod <behdad@behdad.org> -Date: Thu Dec 21 22:30:38 2006 -0500 - - First version. - - src/hb-types-private.cc | 116 - +++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 116 insertions(+), 0 deletions(-) - -commit f726b20e56e8b1106dfde0bf8d575c73e83957c4 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Tue Jul 25 01:02:27 2006 +0000 - - Bug 347073 – Allow empty GPOS table - - 2006-07-24 Behdad Esfahbod <behdad@gnome.org> - - Bug 347073 – Allow empty GPOS table - - * pango/opentype/harfbuzz-open.c (_HB_OPEN_Load_ScriptList): - Don't - err on empty GPOS/GSUB tables. - - src/harfbuzz-open.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -commit 52481a5c55d466f41654dcdc67245d0ca8cefbcf -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Jun 22 18:09:04 2006 +0000 - - Bug 345600 – cvs build error in pango/opentype/Makefile - - 2006-06-22 Behdad Esfahbod <behdad@gnome.org> - - Bug 345600 – cvs build error in pango/opentype/Makefile - - * pango/opentype/Makefile.am: Rename variable SOURCES to - MAINSOURCES. - Some automake versions seem to use it or something. - - src/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit ffb2d5c1e7af33644d0a4058befa4b8358c9a7bf -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Wed May 31 07:42:55 2006 +0000 - - Bug 341138 – Using TTC font, Gtk2 programs begin to eating big - memory - - 2006-05-31 Behdad Esfahbod <behdad@gnome.org> - - Bug 341138 – Using TTC font, Gtk2 programs begin to eating - big memory - and have many cpu usage. - Patch from Yong Li. - - * pango/opentype/ftglue.c (_hb_ftglue_face_goto_table): - TrueType table - offsets are absolute, not relative. - - src/ftglue.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit f8f7bd2451eeafb57f5c80c7b4e88a1e50b97c4f -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Wed May 31 07:23:02 2006 +0000 - - Bug 336153 – Mark to mark positioning (Lookup Type 6) isn't - correct when - - 2006-05-31 Behdad Esfahbod <behdad@gnome.org> - - Bug 336153 – Mark to mark positioning (Lookup Type 6) - isn't correct - when using MarkAttchmentType - Patch from Tin Myo Htet. - - * pango/opentype/harfbuzz-gpos.c (Lookup_MarkMarkPos): - Ignore marks - of non-matchin attachment type. - - src/harfbuzz-gpos.c | 37 ++++++++++++++++++++++--------------- - 1 files changed, 22 insertions(+), 15 deletions(-) - -commit d2a613187c1257371d62153b55c89336965e0754 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Wed Apr 12 18:47:50 2006 +0000 - - Fix loop variables. (coverity found bug.) - - 2006-04-12 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/harfbuzz-gpos.c: Fix loop - variables. (coverity - found bug.) - - src/harfbuzz-gpos.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 14022e826f63c48b689f9037645c9a3a3302d9b6 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Tue Apr 11 08:31:44 2006 +0000 - - Bug 337924 – cleanups for issues reported by various compilers Patch - - 2006-04-11 Behdad Esfahbod <behdad@gnome.org> - - Bug 337924 – cleanups for issues reported by various - compilers - Patch from Kjartan Maraas. - - * examples/viewer-x.c (update): - * modules/arabic/arabic-fc.c (fallback_shape), - (arabic_engine_shape): - * modules/basic/basic-fc.c (fallback_shape), - (basic_engine_shape): - * modules/basic/basic-x.c: - * modules/hangul/hangul-fc.c: - * modules/hebrew/hebrew-fc.c (hebrew_engine_shape): - * modules/indic/indic-fc.c: - * modules/khmer/khmer-fc.c: - * modules/syriac/syriac-fc.c: - * modules/thai/thai-fc.c: - * modules/tibetan/tibetan-fc.c: - * pango/break.c: - * pango/modules.c: - * pango/opentype/ftglue.c (_hb_ftglue_face_goto_table): - * pango/pango-attributes.c (pango_attr_list_filter): - * pango/pango-engine.c: - * pango/pango-fontset.c: - * pango/pango-layout.c (pango_layout_set_text), - (pango_layout_xy_to_index), (pango_layout_get_cursor_pos): - * pango/pango-markup.c (text_handler): - * pango/pango-utils.c (read_alias_file): - * pango/pangocairo-fcfont.c (G_DEFINE_TYPE_WITH_CODE): - * pango/pangocairo-fcfontmap.c (G_DEFINE_TYPE_WITH_CODE): - * pango/pangocairo-font.c - (_pango_cairo_font_get_hex_box_info): - * pango/pangox-fontmap.c (pango_x_make_matching_xlfd): - * tests/dump-boundaries.c (fail): - Remove unused variables. Remove excess semicolon after - DEFINE_TYPE - macros. - - src/ftglue.c | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 59aafd07806a2f0d4f399eff13aec74557f60522 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Mon Apr 10 10:33:17 2006 +0000 - - Fix minor bugs reported by the Coverity scan report. - - 2006-04-10 Behdad Esfahbod <behdad@gnome.org> - - Fix minor bugs reported by the Coverity scan report. - - * pango/opentype/harfbuzz-gdef.c - (HB_GDEF_Build_ClassDefinition): - * pango/opentype/harfbuzz-gpos.c (HB_GPOS_Query_Scripts), - (HB_GPOS_Query_Languages), (HB_GPOS_Query_Features): Do - not access - structs before we check them for nullity. - - * pango/pango-layout.c (pango_layout_index_to_line), - (pango_layout_index_to_line_and_extents), - (pango_layout_index_to_pos): Check for invalid iterators - outside the - loop, so we don't crash. - - * pango/pango-layout.c (pango_layout_line_x_to_index): Set - char_trailing instead of trailing in one of too many paths. - Should - have been a typo. - - * pango/pangox.c (get_font_metrics_from_subfonts): Check - for nullity - somewhere. - - src/harfbuzz-gdef.c | 3 ++- - src/harfbuzz-gpos.c | 9 ++++++--- - 2 files changed, 8 insertions(+), 4 deletions(-) - -commit b31d6def96ff99e89ba42e09661992498bda460d -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Apr 6 18:23:49 2006 +0000 - - Update from HarfBuzz. Lars Knoll fixed all the warnings. - - 2006-04-06 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype: Update from HarfBuzz. Lars Knoll fixed - all the - warnings. - - src/harfbuzz-dump.c | 94 +++++++++++++++++++++++++++--------------- - src/harfbuzz-gpos.c | 80 ++++++++++++++++++++++------------- - src/harfbuzz-gsub.c | 114 - ++++++++++++++++++++++++++++---------------------- - src/harfbuzz-impl.h | 4 ++ - 4 files changed, 179 insertions(+), 113 deletions(-) - -commit ca57250bc9d9f92c88a2ea516e251b9cbfdebda0 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Mon Apr 3 20:13:17 2006 +0000 - - Make sure TTAG_GDEF and frineds are defined, needed for FreeType - <= 2.1.7 - - 2006-04-03 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/harfbuzz-impl.h: Make sure TTAG_GDEF and - frineds are - defined, needed for FreeType <= 2.1.7 (pointed by Tim Janik). - - src/harfbuzz-gdef.c | 3 --- - src/harfbuzz-gpos.c | 3 --- - src/harfbuzz-gsub.c | 3 --- - src/harfbuzz-impl.h | 11 +++++++++++ - 4 files changed, 11 insertions(+), 9 deletions(-) - -commit f618288e00914b6606ec977d506c18e4abdd3ce4 -Author: Behdad Esfahbod <behdad@src.gnome.org> -Date: Fri Mar 31 13:19:29 2006 +0000 - - . - - src/.cvsignore | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -commit 5f1f943b9e6d753722ceadba7eb7ce1f14526ea5 -Author: Behdad Esfahbod <behdad@src.gnome.org> -Date: Fri Mar 31 13:18:23 2006 +0000 - - . - - src/.cvsignore | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit bce3e0b0d4ee521767d80c5c21704337bf5ac716 -Author: Behdad Esfahbod <behdad@src.gnome.org> -Date: Fri Mar 31 12:45:40 2006 +0000 - - Define NULL. - - src/harfbuzz-impl.h | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) - -commit 9f8da38cd108590514b71756b752d98952a9221f -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Fri Mar 31 12:28:09 2006 +0000 - - Convert pango/opentype to the new project called HarfBuzz. - - 2006-03-31 Behdad Esfahbod <behdad@gnome.org> - - Convert pango/opentype to the new project called HarfBuzz. - - * pango/opentype/*: Restructured. - - * pango/pango-ot-*: Updated to use HarfBuzz symbol names. - - src/COPYING | 15 + - src/COPYING.FTL | 174 ++ - src/COPYING.GPL | 340 +++ - src/FT-license.txt | 28 - - src/FTL.TXT | 174 -- - src/Makefile.am | 89 +- - src/README | 44 +- - src/disasm.c | 720 ----- - src/disasm.h | 26 - - src/ftglue.c | 88 +- - src/ftglue.h | 68 +- - src/ftxgdef.c | 1225 --------- - src/ftxgdef.h | 224 -- - src/ftxgpos.c | 6199 - ------------------------------------------ - src/ftxgpos.h | 838 ------ - src/ftxgsub.c | 4533 ------------------------------- - src/ftxgsub.h | 594 ---- - src/ftxopen.c | 1552 ----------- - src/ftxopen.h | 317 --- - src/ftxopenf.h | 166 -- - src/harfbuzz-buffer.c | 227 ++ - src/harfbuzz-buffer.h | 106 + - src/harfbuzz-dump-main.c | 272 ++ - src/harfbuzz-dump.c | 720 +++++ - src/harfbuzz-dump.h | 34 + - src/harfbuzz-gdef-private.h | 101 + - src/harfbuzz-gdef.c | 1228 +++++++++ - src/harfbuzz-gdef.h | 127 + - src/harfbuzz-gpos-private.h | 683 +++++ - src/harfbuzz-gpos.c | 6269 - +++++++++++++++++++++++++++++++++++++++++++ - src/harfbuzz-gpos.h | 168 ++ - src/harfbuzz-gsub-private.h | 448 +++ - src/harfbuzz-gsub.c | 4581 +++++++++++++++++++++++++++++++ - src/harfbuzz-gsub.h | 132 + - src/harfbuzz-impl.h | 64 + - src/harfbuzz-open-private.h | 81 + - src/harfbuzz-open.c | 1426 ++++++++++ - src/harfbuzz-open.h | 285 ++ - src/harfbuzz.c | 19 + - src/harfbuzz.h | 23 + - src/otlbuffer.c | 238 -- - src/otlbuffer.h | 103 - - src/ottest.c | 274 -- - 43 files changed, 17635 insertions(+), 17388 deletions(-) - -commit dd2a8d4d490df1d310e7553ba6c7c8de661f28a1 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Sat Mar 25 23:52:30 2006 +0000 - - Don't err on Table_Missing. - - 2006-03-25 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/ottest.c: Don't err on Table_Missing. - - src/ottest.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 434833b1b7b01d85a143f9ad4b04e7044dd72567 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Mon Mar 13 05:06:05 2006 +0000 - - === Released 1.12.0 === - - 2006-03-13 Behdad Esfahbod <behdad@gnome.org> - - * === Released 1.12.0 === - - * configure.in: Version 1.12.0 - - * NEWS, README: Updated. - - src/README | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 8228828e1e4c8dd6f9435fb718ad4394bba95655 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Mon Jan 30 22:37:48 2006 +0000 - - Handle GSUB Lookup type 8, and ReverseChainContextualSubst table. (bug - - 2006-01-30 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/ftxgsub.c: Handle GSUB Lookup type 8, - and ReverseChainContextualSubst table. (bug #149696, - patch from Aamir Wali) - - src/ftxgsub.c | 545 - +++++++++++++++++++++++++++++++++++++++++++++----------- - src/ftxgsub.h | 47 ++++-- - src/ftxopen.c | 7 + - src/ftxopenf.h | 5 +- - 4 files changed, 487 insertions(+), 117 deletions(-) - -commit e040f681963d51eaadcd53a456100fde1a7addb6 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Sat Jan 28 20:29:18 2006 +0000 - - Removed. - - 2006-01-28 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/pango-ot-*: Removed. - - * pango/pango-ot-*: Added. - - * pango/Makefile.am, pango/opentype/Makefile.am: Adjusted. - - src/Makefile.am | 30 +-- - src/pango-ot-buffer.c | 339 ------------------------ - src/pango-ot-info.c | 681 - ------------------------------------------------ - src/pango-ot-private.h | 105 -------- - src/pango-ot-ruleset.c | 225 ---------------- - 5 files changed, 13 insertions(+), 1367 deletions(-) - -commit f45689bc655eb723f11a2eb65a41303221b80397 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Wed Jan 25 19:33:58 2006 +0000 - - If major.minor of required and available glib versions are the - same, add - - 2006-01-25 Behdad Esfahbod <behdad@gnome.org> - - * configure.in: If major.minor of required and available - glib versions - are the same, add -DG_DISABLE_DEPRECATED to GLIB_CFLAGS. (bug - #328617) - - * */Makefile.am: Remove hardcoded -DG_DISABLE_DEPRECATED. - - src/Makefile.am | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit 6cc6c9a57c674787f278ea5b60705384fd72b4ad -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Sat Jan 14 07:00:13 2006 +0000 - - Make sure #include <config.h> is the first include in the file. (bug - - 2006-01-14 Behdad Esfahbod <behdad@gnome.org> - - * */*.c, */*/*.c: Make sure #include <config.h> is the - first include - in the file. (bug #158870, based on patch by Luis Menina) - - src/disasm.c | 2 ++ - src/ftglue.c | 1 + - src/ftxgdef.c | 1 + - src/ftxgpos.c | 2 ++ - src/ftxgsub.c | 2 ++ - src/ftxopen.c | 2 ++ - src/otlbuffer.c | 3 +++ - src/ottest.c | 1 + - src/pango-ot-buffer.c | 2 ++ - src/pango-ot-info.c | 2 ++ - src/pango-ot-ruleset.c | 2 ++ - 11 files changed, 20 insertions(+), 0 deletions(-) - -commit ca07fcf6ef61c09825e67ca7e2574a90e4f5a9a0 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Jan 5 16:14:49 2006 +0000 - - pango/Makefile.am, pango/fonts.c, pango/glyphstring.c, - - 2006-01-05 Behdad Esfahbod <behdad@gnome.org> - - * pango/Makefile.am, - * pango/fonts.c, - * pango/glyphstring.c, - * pango/pango-attributes.c, - * pango/pango-color.c, - * pango/pango-impl-utils.h, - * pango/pango-item.c, - * pango/pango-layout.c, - * pango/pango-tabs.c, - * pango/pango-utils.c, - * pango/pango-utils.h, - * pango/pangoatsui-fontmap.c, - * pango/pangocairo-font.c, - * pango/pangocairo-fontmap.c, - * pango/pangofc-fontmap.c, - * pango/pangowin32-fontmap.c, - * pango/pangox-fontmap.c, - * pango/pangox.c, - * pango/opentype/pango-ot-info.c, - * pango/opentype/pango-ot-ruleset.c: Intern strings to avoid - unnecessary strdups in the type system. (bug #325832, - Matthias Clasen) - - src/pango-ot-info.c | 3 ++- - src/pango-ot-ruleset.c | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -commit 71524f1bc891bb4450507f769e5cc8f6f6cffa0c -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Tue Dec 27 09:55:48 2005 +0000 - - Use g_slice for PangoOTBuffer allocation. (bug #325026, Matthias - Clasen) - - 2005-12-27 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/pango-ot-buffer.c: Use g_slice for - PangoOTBuffer - allocation. (bug #325026, Matthias Clasen) - - src/pango-ot-buffer.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit b5baa43d3a972ebd3ef82ede14b54c185b723a71 -Author: Behdad Esfahbod <behdad@src.gnome.org> -Date: Fri Nov 25 09:22:02 2005 +0000 - - Tiny doc improvement. - - src/pango-ot-info.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 6f64314f7a031a5a5d6b7663c08b70c452961c89 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Wed Nov 23 19:48:10 2005 +0000 - - Fix typo in docs. - - 2005-11-23 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentyp/pango-ot-buffer.c: Fix typo in docs. - - src/pango-ot-buffer.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit f2bcf72296b57c8cd7d5a08228c3aef6c8f97d2d -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Wed Nov 23 17:54:55 2005 +0000 - - Added "Since:" tags to all interfaces added after Pango 1.0. (#319116, - - 2005-11-23 Behdad Esfahbod <behdad@gnome.org> - - * pango/fonts.c pango/pango-attributes.c pango/pango-context.c - pango/pango-glyph-item.c pango/pango-layout.c - pango/pango-script.c pango/pango-utils.c pango/pangofc-font.c - pango/pangoft2-fontmap.c pango/opentype/pango-ot-buffer.c - pango/opentype/pango-ot-ruleset.c: Added "Since:" tags to all - interfaces added after Pango 1.0. (#319116, Brian Cameron) - - src/pango-ot-buffer.c | 49 - ++++++++++++++++++++++++++++++++++++++++++++++++ - src/pango-ot-ruleset.c | 14 +++++++++++++ - 2 files changed, 63 insertions(+), 0 deletions(-) - -commit 682db81c23d2116072d8550657c914afb7c26d2b -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Wed Nov 23 15:19:48 2005 +0000 - - Protect against possible division by zeros (#316468, Steve Grubb) - - 2005-11-23 Behdad Esfahbod <behdad@gnome.org> - - Protect against possible division by zeros (#316468, - Steve Grubb) - - * pango/pango-context.c (update_metrics_from_items), - pango/pango-fontset.c (pango_fontset_real_get_metrics): - If count is - zero, do not alter approximate_{char,digit}_width. - - * pango/opentype/disasm.c: Err on invalid DeltaFormat. - - src/disasm.c | 28 ++++++++++++++++++---------- - 1 files changed, 18 insertions(+), 10 deletions(-) - -commit e6e15352d154e1350340f8045759e5f7b0d86dc7 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Wed Nov 23 11:53:03 2005 +0000 - - Reworked basic shaper with OpenType support. (#101079, based on - patch from - - 2005-11-23 Behdad Esfahbod <behdad@gnome.org> - - * modules/basic/basic-fc.c: Reworked basic shaper with - OpenType - support. (#101079, based on patch from Denis Jacquerye and - Noah Levitt) - - * modules/basic/basic-fc.c (basic_scripts): Added Unicode - 4.1 addition - script PANGO_SCRIPT_GLAGOLITIC that is a "simple" script. - - * modules/arabic/arabic-fc.c, modules/syriac/syriac-fc.c: - Replace - g_utf8_to_ucs4_fast() with g_utf8_strlen()! - - * pango/opentype/pango-ot-ruleset.c - (pango_ot_ruleset_add_feature): - Remove reference in docs to pango_ot_ruleset_shape() that was - removed long ago. - - src/pango-ot-ruleset.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) - -commit 612b6cf60928b356f4bbb59bc9d64886574322c3 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Nov 17 06:28:11 2005 +0000 - - Part of #101079: - - 2005-11-17 Behdad Esfahbod <behdad@gnome.org> - - Part of #101079: - - * pango/opentype/ftxopen.c (Load_Lookup): In extension - subtables, - offset is relative to the extension subtable, not the original - table. (Greg Aumann) - - * pango/opentype/ftxgpos.c (Load_BaseArray): When reading - BaseAnchor, - skip offsets that are zero. Works around bug in Doulos - SIL Regular. - - src/ftxgpos.c | 6 ++++++ - src/ftxopen.c | 6 ++++-- - 2 files changed, 10 insertions(+), 2 deletions(-) - -commit 1b2c314b804da97b1d5e7adab64bdd4177702579 -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Wed Nov 9 23:30:00 2005 +0000 - - Remove debug line that got in accidentally. - - 2005-11-09 Behdad Esfahbod <behdad@gnome.org> - - * pango/opentype/ftxgpos.c, pango/opentype/ftxopen.c: - Remove debug - line that got in accidentally. - - src/ftxgpos.c | 1 - - src/ftxopen.c | 1 - - 2 files changed, 0 insertions(+), 2 deletions(-) - -commit 9717127a5be037e26afe52332a8b07f13474557a -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Fri Nov 4 23:55:38 2005 +0000 - - Turn various gcc warnings off. Adding const, adding static, fully - - 2005-11-04 Behdad Esfahbod <behdad@gnome.org> - - * configure.in, examples/argcontext.c examples/cairoview.c, - examples/renderdemo.c, examples/renderdemo.h - examples/xftview.c, - modules/basic/basic-x.c, modules/hangul/hangul-fc.c, - modules/hebrew/hebrew-shaper.c, - modules/hebrew/hebrew-shaper.h, - modules/indic/indic-fc.c, modules/indic/mprefixups.c, - modules/syriac/syriac-fc.c, pango/break.c pango/fonts.c, - pango/modules.c, pango/pango-coverage.c pango/pango-engine.c, - pango/pango-engine.h, pango/pango-fontmap.c, - pango/pango-fontset.c, pango/pango-impl-utils.h, - pango/pango-layout.c, pango/pango-layout.h, - pango/pango-renderer.c, pango/pango-script.c, - pango/pango-utils.c, pango/pangocairo-fc.h, - pango/pangocairo-font.c, pango/pangocairo-fontmap.c, - pango/pangocairo-private.h, pango/pangofc-decoder.c, - pango/pangofc-font.c, pango/pangofc-fontmap.c - pango/pangoft2.c, - pango/pangox-fontcache.c, pango/pangox-fontmap.c - pango/pangox.c, - pango/pangoxft-font.c, pango/querymodules.c, - pango/opentype/ftglue.c, pango/opentype/ftxgpos.c, - pango/opentype/ftxopen.c, pango/opentype/pango-ot-buffer.c, - pango/opentype/pango-ot-info.c, - pango/opentype/pango-ot-ruleset.c, tests/dump-boundaries.c, - tests/testboundaries.c, tests/testcolor.c tests/testiter.c, - tests/testscript.c: Turn various gcc warnings off. Adding - const, - adding static, fully initializing structs, match signedness in - comparisons. (#317804) - - * tests/testscript.c, tools/gen-script-for-lang.c: - (scripts_for_file): Pass error->message instead of error - to fail(), - which was wrong. - (compare_lang): Fix typo comparing a and a instead of a and b. - - src/ftglue.c | 2 +- - src/ftxgpos.c | 4 ++++ - src/ftxopen.c | 1 + - src/pango-ot-buffer.c | 4 ++-- - src/pango-ot-info.c | 5 +++-- - src/pango-ot-ruleset.c | 5 +++-- - 6 files changed, 14 insertions(+), 7 deletions(-) - -commit c0505f3bb28feeba95b201e6464fb2fdac90194a -Author: Behdad Esfahbod <behdad@gnome.org> -Date: Thu Nov 3 20:13:40 2005 +0000 - - Patches from #170414. Reviewed by Matthias Clasen. - - 2005-11-03 Behdad Esfahbod <behdad@gnome.org> - - Patches from #170414. Reviewed by Matthias Clasen. - - * pango/opentype/ftxgpos.c, pango/opentype/ftxgsub.c: Use - call table - to dispatch different lookup types. - - * pango/opentype/pango-ot-buffer.c, - pango/opentype/pango-ot-ruleset.c: - Small cleanup. - - src/ftxgpos.c | 143 - +++++++++++++++++++++++------------------------- - src/ftxgsub.c | 115 +++++++++++++++++++++----------------- - src/pango-ot-buffer.c | 3 +- - src/pango-ot-ruleset.c | 75 ++++++++----------------- - 4 files changed, 159 insertions(+), 177 deletions(-) - -commit c6b22b9119ef54ea8d0d2f08b74fdeb024289d73 -Author: Behdad Esfahbod <pango@behdad.org> -Date: Mon Aug 29 10:06:40 2005 +0000 - - Generate valid XML output. Dump LookupFlag too. - - 2005-08-29 Behdad Esfahbod <pango@behdad.org> - - * pango/opentype/ottest.c, pango/opentype/disasm.c: - Generate valid - XML output. Dump LookupFlag too. - - src/disasm.c | 58 - ++++++++++++++++++++++++++++++---------------------------- - src/ottest.c | 23 ++++++++++++++--------- - 2 files changed, 44 insertions(+), 37 deletions(-) - -commit 1e3747ca5d1a6f607f8e56fb94e3daaf6ad623cb -Author: Behdad Esfahbod <pango@behdad.org> -Date: Mon Aug 15 04:16:04 2005 +0000 - - Replace perror with perror_. Remove FT_BEGIN_STMNT and FT_END_STMNT. - - 2005-08-15 Behdad Esfahbod <pango@behdad.org> - - * pango/opentype/ftglue.h: Replace perror with perror_. - Remove FT_BEGIN_STMNT and FT_END_STMNT. (#313477) - - src/ftglue.h | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 3c60250875fa9d04ca96dea35eba23fc70690ff5 -Author: Owen Taylor <otaylor@redhat.com> -Date: Tue Jul 26 18:33:27 2005 +0000 - - Skip lookups with lookup index out of range. (Patch from Behdad - Esfahbod, - - 2005-07-26 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgsub.c, pango/opentype/ftxgpos.c: - Skip lookups - with lookup index out of range. (Patch from Behdad Esfahbod, - #171170) - - src/ftxgpos.c | 30 ++++++++++++++++++++++++------ - src/ftxgsub.c | 30 ++++++++++++++++++++++++------ - 2 files changed, 48 insertions(+), 12 deletions(-) - -commit 91a3fa2e4bcdde8ae022d1264c783f133cd7e00d -Author: Owen Taylor <otaylor@redhat.com> -Date: Fri Jul 22 18:03:58 2005 +0000 - - Remove an unecessary set of block2. - - 2005-07-22 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftglue.c (ftglue_realloc): Remove - an unecessary set of block2. - - src/ftglue.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit ff7034787d79dcd1bec58a4e02602039313da00e -Author: Owen Taylor <otaylor@redhat.com> -Date: Fri Jul 22 17:56:37 2005 +0000 - - Patch from David Turner. Review and testing by Behdad Esfahbod - - 2005-07-22 Owen Taylor <otaylor@redhat.com> - - Patch from David Turner. Review and testing by Behdad Esfahbod - - * pango/opentype/ftglue.[ch] Makefile.am: Glue layer that - provides - implementation of the internal functions that the opentype - code - expects in terms of publically exported FreeType API. - - * pango/opentype/ftxgdef.c pango/opentype/ftxgpos.c - pango/opentype/ftxgsub.c pango/opentype/ftxopen.c - pango/opentype/otlbuffer.c pango/opentype/pango-ot-info.c - pango/opentype/pango-ot-ruleset.c: Remove includes of - internal headers. Small changes to work with ftglue.[ch] - - * pango/opentype/fterrcompat.h: Remove: no longer needed. - - * pango/opentype/ftxgpos.c: Use FT_IS_SFNT(face) rather - than poking at FT_MODULE_CLASS (face->driver)->module_name. - - * pango/opentype/ftxopen.c (Free_FeatureList): Free - fl->ApplyOrder. (Found by Behdad) - - src/Makefile.am | 3 +- - src/fterrcompat.h | 95 ------------- - src/ftglue.c | 350 - ++++++++++++++++++++++++++++++++++++++++++++++++ - src/ftglue.h | 156 +++++++++++++++++++++ - src/ftxgdef.c | 9 +- - src/ftxgpos.c | 9 +- - src/ftxgsub.c | 10 +- - src/ftxopen.c | 8 +- - src/otlbuffer.c | 4 +- - src/pango-ot-info.c | 6 +- - src/pango-ot-ruleset.c | 2 - - 11 files changed, 520 insertions(+), 132 deletions(-) - -commit 43dbec6f3a345ba0e4a43766610ed59622bbe4a0 -Author: Owen Taylor <otaylor@redhat.com> -Date: Thu Jul 21 18:15:45 2005 +0000 - - Fix up places where there is missing or incomplete Copyright and - License - - 2005-07-21 Owen Taylor <otaylor@redhat.com> - - Fix up places where there is missing or incomplete - Copyright and License information (Reported by William N. Ray) - - * pango/opentype/fterrcompat.h: Mark as FreeType/GPL licensed. - - * pango/opentype/FT-license.txt: Make this the dual-licensing - description that covers the FreeType code (FreeType's - LICENSE.TXT) rather than the FTL. - - * pango/opentype/FTL.TXT: Move the FTL (referenced from - FT-license.txt) to here. - - * modules/basic/basic-common.h modules/hebrew/hebrew-shaper.h - modules/thai/thai-charprop.c modules/thai/thai-shaper.h - tools/gen-script-for-lang.c tests/testcolor.c: - Add LGPL header and copyright information. - - * modules/indic/indic-ot.[ch] - modules/indic/indic-ot-class-tables.c - modules/thai/thai-ot.[ch]: Add LGPL header. - - * modules/thai/thai-shaper.c modules/thai/thai-charprop.h: - Minor fixes to copyright information. - - * modules/arabic/arabic-ot.c: Add Freetype license - boilerplate. - - src/FT-license.txt | 179 - ++++++--------------------------------------------- - src/FTL.TXT | 174 - ++++++++++++++++++++++++++++++++++++++++++++++++++ - src/fterrcompat.h | 10 +++- - 3 files changed, 204 insertions(+), 159 deletions(-) - -commit c55850d36d208c7aae8f6ed5c9e1e7927b988d6c -Author: Owen Taylor <otaylor@redhat.com> -Date: Tue Jun 14 19:54:19 2005 +0000 - - Chain up from finalize. (#307547, Paolo Borelli) - - 2005-06-14 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/pango-ot-info.c (pango_ot_info_finalize) - pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_finalize): - Chain up from finalize. (#307547, Paolo Borelli) - - * pango/opentype/pango-ot-info.c (pango_ot_info_finalizer): - make accidentally public function static. - - src/pango-ot-info.c | 4 +++- - src/pango-ot-ruleset.c | 2 ++ - 2 files changed, 5 insertions(+), 1 deletions(-) - -commit 44ff46a364fb7981804eb45329c4999b415711f9 -Author: Tor Lillqvist <tml@novell.com> -Date: Tue Apr 12 01:27:21 2005 +0000 - - Rename LDADDS to libpango_ot_la_LIBADD to actually make libpango-ot.la - - 2005-04-12 Tor Lillqvist <tml@novell.com> - - * pango/opentype/Makefile.am: Rename LDADDS to - libpango_ot_la_LIBADD to actually make libpango-ot.la link with - it. - - * pango/pangowin32.def: Rename get_scale_factor to - get_metrics_factor here, too. (#300222, Ivan Wong) - - src/Makefile.am | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) - -commit 0c349a032e5a52a9d0dcc8204f761b7cb28bfa6b -Author: Owen Taylor <otaylor@redhat.com> -Date: Thu Mar 3 19:38:02 2005 +0000 - - For all binary searches, handle the case where the number of items - is 0. - - 2005-03-03 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxopen.c (Coverage_Index1, Coverage_Index2, - Get_Class2): For all binary searches, handle the case where - the number of items is 0. (#162977, Nick Lamb) - - * pango/opentype/ftxgdef.c (TT_GDEF_Build_ClassDefinition): - Handle the case where glyph_count == 0 properly. Fix a problem - with cleanups on memory allocation failure. - (Get_New_Count, Add_Glyph_Property): Avoid reading off the - end of the ClassRangeRecord array. - - src/ftxgdef.c | 60 - ++++++++++++++++++++++++++++++++++---------------------- - src/ftxopen.c | 15 ++++++++++++++ - 2 files changed, 51 insertions(+), 24 deletions(-) - -commit 03838daaa9d485bffcb7bc46453a9a4c32a1f32f -Author: Owen Taylor <otaylor@redhat.com> -Date: Mon Nov 22 23:37:19 2004 +0000 - - Set G_LOG_DOMAIN. - - Mon Nov 22 18:30:14 2004 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/Makefile.am pango/Makefile.am - modules/*/Makefile.am: Set G_LOG_DOMAIN. - - src/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 346d3b3cac253d2db41205151c185bf2fd9dda16 -Author: Owen Taylor <otaylor@redhat.com> -Date: Wed Sep 22 18:14:55 2004 +0000 - - Cleanups from 'sparse', #149922, Kjartan Maraas - - Wed Sep 22 14:07:47 2004 Owen Taylor <otaylor@redhat.com> - - Cleanups from 'sparse', #149922, Kjartan Maraas - - * pango/pango-utils.c (read_config): () => (void) in - definition. - - * pango/pangofc-fontmap.c (pango_fc_font_map_list_families): - Initialize *n_families, not n_families. - - * pango/pangofc-fontmap.c pango/pangoft2.c opentype/ftxgdef.c - opentype/ftxgpos.c opentype/ftxgsub.c: : Fix various 0/NULL - confusion. - - src/ftxgdef.c | 2 +- - src/ftxgpos.c | 6 +++--- - src/ftxgsub.c | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -commit 8b654dfb5ad6137ee9c5a48f5abe04bf7d28d8cd -Author: Owen Taylor <otaylor@redhat.com> -Date: Tue Sep 14 13:45:41 2004 +0000 - - === Released 1.6.0 === - - Mon Sep 13 17:38:58 2004 Owen Taylor <otaylor@redhat.com> - - * === Released 1.6.0 === - - * configure.in: Update versions for 1.6.0 - - * NEWS: Update. - - * README: Minor tweak. - - * pango/fonts.c pango/pango-context.c pango/pango-types.h - pango/pango-utils.c pango/pangoft2.c pango/pango-layout.c - pango/opentype/pango-ot-buffer.c: Add a bunch of missing - Since: 1.6. - - src/pango-ot-buffer.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit d41089a5b691967fdd622f47c8397a80af104396 -Author: Owen Taylor <otaylor@redhat.com> -Date: Fri Jul 30 21:23:04 2004 +0000 - - Finish extending properties flags from FT_UShort => - FT_UInt. (OTLBuffer - - Fri Jul 30 17:17:05 2004 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgpos.[ch] pango/opentype/ftxgsub.[ch] - pango/opentype/ftxopen.[ch]: Finish extending properties - flags from FT_UShort => FT_UInt. (OTLBuffer was already - using an FT_UInt) - - src/ftxgpos.c | 8 ++++---- - src/ftxgpos.h | 2 +- - src/ftxgsub.c | 8 ++++---- - src/ftxgsub.h | 2 +- - src/ftxopen.c | 2 +- - src/ftxopen.h | 2 +- - 6 files changed, 12 insertions(+), 12 deletions(-) - -commit f42d5eca291dcdfb27d7fbf88391d6d381b8e9c4 -Author: Owen Taylor <otaylor@redhat.com> -Date: Tue Jul 27 17:20:01 2004 +0000 - - Save the order in which features were added and use that when applying - - Tue Jul 27 12:38:05 2004 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxopen.[ch] pango/opentype/ftxgsub.c - pango/opentype/ftxpos.c: Save the order in which - features were added and use that when applying features. - (Patch from Soheil Hassas Yeganeh, #122330) - - src/ftxgpos.c | 41 ++++++++++++++++++++++++----------------- - src/ftxgsub.c | 34 +++++++++++++++++++++------------- - src/ftxopen.c | 14 +++++++++++--- - src/ftxopen.h | 2 ++ - 4 files changed, 58 insertions(+), 33 deletions(-) - -commit ae2daa972d74c5ecfe1d2f0057ce12682ad30b00 -Author: Behdad Esfahbod <behdad@src.gnome.org> -Date: Tue Jul 27 13:12:19 2004 +0000 - - Remove the unused parameter from the IN_CURITEM() and IN_CURGLYPH - macros. - - - * pango/opentype/ftxgpos.c: Remove the unused parameter - from the IN_CURITEM() and IN_CURGLYPH macros. - - src/ftxgpos.c | 68 - ++++++++++++++++++++++++++++---------------------------- - src/ftxgsub.c | 2 +- - 2 files changed, 35 insertions(+), 35 deletions(-) - -commit 7d5435ea8cb345c79029b8a12d1bddbed28b1997 -Author: Behdad Esfahbod <behdad@src.gnome.org> -Date: Tue Jul 27 10:43:58 2004 +0000 - - Fix bug to copy glyph from in_string, not out_string. - - - * pango/opentype/otlbuffer.c (otl_buffer_copy_output_glyph): - Fix bug to copy glyph from in_string, not out_string. - - src/otlbuffer.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 2ea2a55bdf7ef1caebcd0c5922b0f542ed8bb5bf -Author: Owen Taylor <otaylor@redhat.com> -Date: Mon Jul 26 23:14:53 2004 +0000 - - Fix allocation and indexing in NewGlyphClasses array. (#130661, - Masatake - - Mon Jul 26 19:11:46 2004 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgdef.c: Fix allocation and indexing - in NewGlyphClasses array. (#130661, Masatake YAMATO) - - src/ftxgdef.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit 5d42695e5ed89f73fbc665792ebec82c29ae04ae -Author: Owen Taylor <otaylor@redhat.com> -Date: Mon Jul 26 19:25:45 2004 +0000 - - Remove the unused parameter from the IN_CURITEM() and IN_CURGLYPH - macros. - - Mon Jul 26 15:24:11 2004 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgsub.c (ADD_Glyph): Remove the - unused parameter from the IN_CURITEM() and IN_CURGLYPH - macros. - - src/ftxgsub.c | 56 - ++++++++++++++++++++++++++++---------------------------- - 1 files changed, 28 insertions(+), 28 deletions(-) - -commit a00c4ea5626526980139b122977e367b8434d24a -Author: Owen Taylor <otaylor@redhat.com> -Date: Mon Jul 26 19:23:06 2004 +0000 - - Add missing macro to make the last change actually compile. - - Mon Jul 26 15:21:23 2004 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgsub.c: Add missing macro to make the - last change actually compile. - - src/ftxgsub.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -commit ed3e1f278d3ebfd224f0b57388502d4bb9fb1441 -Author: Owen Taylor <otaylor@redhat.com> -Date: Mon Jul 26 19:20:27 2004 +0000 - - Match backtrack context against the output glyphs not the input glyphs - - Mon Jul 26 15:16:07 2004 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgsub.c (Lookup_ChainContextSubst[123]): - Match backtrack context against the output glyphs not - the input glyphs (#145174, Aamir Wali) - - src/ftxgsub.c | 24 ++++++++++++------------ - 1 files changed, 12 insertions(+), 12 deletions(-) - -commit 78282cda004a88b2aadb2786dd3897884e22ed0b -Author: Owen Taylor <otaylor@redhat.com> -Date: Mon Jul 26 18:59:02 2004 +0000 - - Make Check_Property() take a OTL_GlyphItem, add a gproperties field to - - Mon Jul 26 14:49:22 2004 Owen Taylor <otaylor@redhat.com> - - * ftxgdef.[ch] otlbuffer.[ch]: Make Check_Property() take a - OTL_GlyphItem, add a gproperties field to OTLGlyphItem, - and use that to cache the properties for a glyph. - - * ftxgsub.c ftxgdef.c: Adapt to Check_Property() changes. - - * otlbuffer.[ch] ftxgsub.c: Add otl_buffer_copy_output_glyph() - to use when we are copying an unmodified glyph from input - to output that preserves the cached properties. - - src/ftxgdef.c | 16 ++++++++++------ - src/ftxgpos.c | 52 - +++++++++++++++++++++++++++------------------------- - src/ftxgsub.c | 54 - ++++++++++++++++++++++++++++-------------------------- - src/ftxopenf.h | 2 +- - src/otlbuffer.c | 21 +++++++++++++++++++-- - src/otlbuffer.h | 6 ++++++ - 6 files changed, 91 insertions(+), 60 deletions(-) - -commit 81b62af42313fb60db523374cd8c6901829f5c4e -Author: Owen Taylor <otaylor@redhat.com> -Date: Mon Jul 19 21:13:23 2004 +0000 - - Add support for ChainContextSubstFormat3. - - Mon Jul 19 17:09:11 2004 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/disasm.c: Add support for - ChainContextSubstFormat3. - - src/disasm.c | 16 +++++++++++++++- - 1 files changed, 15 insertions(+), 1 deletions(-) - -commit d4f773ef92fdbaa7e61e6577db5e9b2846a100a4 -Author: Owen Taylor <otaylor@redhat.com> -Date: Mon Jul 19 20:37:22 2004 +0000 - - Fix pervasive buffer overruns when skipping glyphs when matching - contexts. - - Mon Jul 19 16:29:45 2004 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgsub.c pango/opentype/ftxgpos.c: - Fix pervasive buffer overruns when skipping glyphs - when matching contexts. (#118592, Kailash C. Chowksey) - - src/ftxgpos.c | 259 +++++++++++++++++---------------------- - src/ftxgsub.c | 376 - ++++++++++++++++++++++++++------------------------------- - 2 files changed, 284 insertions(+), 351 deletions(-) - -commit 99848cfafee8e598ef533f254cdb99fbae4c9364 -Author: Owen Taylor <otaylor@redhat.com> -Date: Wed Jun 23 20:33:35 2004 +0000 - - #143693, Sayamindu Dasgupta - - Wed Jun 23 16:13:53 2004 Owen Taylor <otaylor@redhat.com> - - #143693, Sayamindu Dasgupta - - * pango/opentype/pango-ot-buffer.c - (pango_ot_buffer_set_zero_width_marks) - pango/opentype/pango-ot-private.h: - Allow setting for whether marks should be given zero width, - defaulting to FALSE. - - * modules/arabic/arabic-fc.c (arabic_engine_shape): Turn - on zero-width-marks setting. - - src/pango-ot-buffer.c | 22 +++++++++++++++++++++- - src/pango-ot-private.h | 5 +++-- - 2 files changed, 24 insertions(+), 3 deletions(-) - -commit 68d4cedb8726fa239f56d62060d8fee7e09cb8be -Author: Owen Taylor <otaylor@redhat.com> -Date: Mon Jun 21 18:04:02 2004 +0000 - - Use the gcc-3.3 strict-aliasing compatible macros from fterrcompat.h - - Mon Jun 21 13:55:17 2004 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/otlbuffer.c: Use the gcc-3.3 - strict-aliasing compatible macros from fterrcompat.h - (#140495, reported by Stanislav Brabec) - - src/otlbuffer.c | 22 ++++++++++++++-------- - 1 files changed, 14 insertions(+), 8 deletions(-) - -commit b327765176dff81047f942ac56a1d206344e6039 -Author: Theppitak Karoonboonyanan <tkaroonb@src.gnome.org> -Date: Fri May 28 16:41:36 2004 +0000 - - Negate y offset according to different conventions between - - * pango/opentype/pango-ot-buffer.c (apply_gpos_ltr): Negate - y offset - according to different conventions between PangoGlyphString - and OTL - (#142544) - - src/pango-ot-buffer.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 068763b547d791e28b892bcaee810f3d60a83018 -Author: Owen Taylor <otaylor@redhat.com> -Date: Thu May 27 21:55:50 2004 +0000 - - Revert error return changes from last commit. - - Thu May 27 17:54:24 2004 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/otlbuffer.c: Revert error return changes - from last commit. - - src/otlbuffer.c | 16 ++++++---------- - 1 files changed, 6 insertions(+), 10 deletions(-) - -commit ef07481025c5bbb9769b9f908d9dc78f44161bbb -Author: Owen Taylor <otaylor@redhat.com> -Date: Thu May 27 21:03:42 2004 +0000 - - Free buffer->positions, clean up error returns that were returning - - Thu May 27 16:57:30 2004 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/otlbuffer.c: Free buffer->positions, - clean up error returns that were returning uninitialized - values. (#139239, Behdad Esfahbod) - - src/otlbuffer.c | 21 +++++++++++++-------- - 1 files changed, 13 insertions(+), 8 deletions(-) - -commit de568e7e6200c7a49bae1f78ac63858b8df01173 -Author: Owen Taylor <otaylor@redhat.com> -Date: Tue Mar 16 19:23:43 2004 +0000 - - === Released 1.4.0 === - - Tue Mar 16 11:24:46 2004 Owen Taylor <otaylor@redhat.com> - - * === Released 1.4.0 === - - * configure.in: Version 1.4.0, interface ago 0. Require - glib-2.4.0. - - * NEWS: Updates. - - * README: Some updates; include details about the FreeType - license of the OpenType code. - - src/FT-license.txt | 77 - ++++++++++++++++++++++++++++----------------------- - 1 files changed, 42 insertions(+), 35 deletions(-) - -commit 8b3554b3afe7c125b1a53171b01ac87de9c486fe -Author: Hans Breuer <hans@breuer.org> -Date: Wed Mar 3 22:35:19 2004 +0000 - - if PANGO_MODULE_PREFIX is defined include the basic backend shaper - (should - - 2004-03-03 Hans Breuer <hans@breuer.org> - - * pango/module-defs-win32.c.win32 : if PANGO_MODULE_PREFIX is - defined include the basic backend shaper (should have been - commited at 2003-12-12, too) - - * pango/makefile.msc : generate correct type for PangoFontMask - (bug #135892, John Ehresman) - * pango/opentype/makefile.msc : updated - - * pango/pango.def pango/pangoft2.def : more updatd externals - - src/makefile.msc | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) - -commit a7e096c5de3ec5319bf9333c9ace0732d97c52c3 -Author: Owen Taylor <otaylor@redhat.com> -Date: Sun Feb 29 15:44:50 2004 +0000 - - Rework opentype interfaces and other changes to make GPOS work - for Arabic. - - Sun Feb 29 09:25:13 2004 Owen Taylor <otaylor@redhat.com> - - Rework opentype interfaces and other changes to make GPOS - work for Arabic. (Most of #117282, #121060) - - * pango/opentype/otlbuffer.[ch]: OTL_Buffer that - acts as a replacement for the separate GSUB and - GPOS string structures and hides many of the internal - details. - - * pango/opentype/ftxgsub.[ch] pango/opentype/ftxgpos.[ch]: - Adapt to OTL_Buffer. - - * pango/opentype/ftxgpos.c: Redo handling of cursive - chains so that it actually works. - - * pango/pango-ot.h pango/opentype/pango-ot-buffer.c: - Pango wrapper around OTL_Buffer. - - * pango/pango-ot.h pango/pango-ot-ruleset.c - pango/pango-ot-buffer.c: - Split pango_ot_ruleset_shape() into - pango_ot_ruleset_substitute(), - pango_ot_ruleset_position(), make them act on - PangoOTBuffer, add a separate pango_ot_buffer_output() - which does the default positioning and writes to a - PangoGlyphString. - - * modules/arabic/arabic-fc.c modules/indic/indic-fc.c - modules/indic/mprefixups.[ch]: Adapt to new OpenType - interfaces; add GPOS features for Arabic. - - * pango/opentype/pango-ot-info.c: Don't derive class - information - from Unicode properties for Arabic presentation forms, - let the shaping process derive the properties. - - src/Makefile.am | 3 + - src/ftxgdef.c | 4 +- - src/ftxgpos.c | 573 +++++++++++++++----------------------- - src/ftxgpos.h | 23 +-- - src/ftxgsub.c | 719 - +++++++++++------------------------------------- - src/ftxgsub.h | 40 +--- - src/ftxopen.h | 1 + - src/otlbuffer.c | 213 ++++++++++++++ - src/otlbuffer.h | 97 +++++++ - src/ottest.c | 2 + - src/pango-ot-buffer.c | 265 ++++++++++++++++++ - src/pango-ot-info.c | 27 ++- - src/pango-ot-private.h | 8 + - src/pango-ot-ruleset.c | 148 +++-------- - 14 files changed, 1039 insertions(+), 1084 deletions(-) - -commit d670ddf99192dd4999775a9215a818ae63fa3416 -Author: Owen Taylor <otaylor@redhat.com> -Date: Sat Feb 21 14:53:12 2004 +0000 - - Sign convention for y offsets is opposite between PangoGlyphString - and FT - - Sat Feb 21 09:49:23 2004 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_shape): - Sign convention for y offsets is opposite between - PangoGlyphString and FT code. (#132591) - - src/pango-ot-ruleset.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit b9b3c131c2b57c12a77124a52512fb19a1255f8e -Author: Owen Taylor <otaylor@redhat.com> -Date: Fri Feb 13 16:11:40 2004 +0000 - - Memory leak fixes from Masatake YAMATO, #130652 - - Fri Feb 13 10:54:18 2004 Owen Taylor <otaylor@redhat.com> - - Memory leak fixes from Masatake YAMATO, #130652 - - * pango/opentype/ftxgdef.c (TT_Done_GDEF_Table): - Free the gdef table as well as the contained data. - - * pango/opentype/ftxgdef.c (TT_GDEF_Build_ClassDefinition): - Set gcd->loaded, so that the contents get freed later. - - src/ftxgdef.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -commit 926b8f322989298e43c8bac85f23e3525470a669 -Author: Owen Taylor <otaylor@redhat.com> -Date: Mon Jan 26 19:23:35 2004 +0000 - - Suport CFF fonts as well. (#131202, Manjunath Sripadarao) - - Mon Jan 26 14:20:34 2004 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/pango-ot-info.c (is_truetype): Suport - CFF fonts as well. (#131202, Manjunath Sripadarao) - - src/pango-ot-info.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) - -commit 945e479a3a35769e5e7c792fdcf306892523a5f9 -Author: Hans Breuer <hans@breuer.org> -Date: Sat Dec 13 14:31:50 2003 +0000 - - moved pango_fc_* to the latter where they live on *nix too. - - 2003-12-13 Hans Breuer <hans@breuer.org> - - * pango/pango.def pangoft2.def : moved pango_fc_* - to the latter where they live on *nix too. - - * pango/makefile.msc : make it build again (including - the Ft2 backend) - - * pango/module-defs-fc.c.win32 : if PANGO_MODULE_PREFIX is defined - include the basic backend shaper - - * pango/pangowin32.c (pango_win32_render_layout) : - initialize iter before first usage to avoid immediate crashing - - * pango/opentype/makefile.msc - pango/modules/makefile.msc : finally build with mscv, too. - [completely untested cause I'm not able to type, write or read - any of these languages] - - * modules/modules.def : follow module function renaming/changes - - * modules/basic/basic-win32.c : register the right engine, i.e. - make it compile - - src/makefile.msc | 21 +++++++++++++++++++++ - 1 files changed, 21 insertions(+), 0 deletions(-) - -commit ba0ccd5cfcb514cdc45373158343138b7b190f9d -Author: Owen Taylor <otaylor@redhat.com> -Date: Sat Nov 1 15:02:17 2003 +0000 - - Switch over to recommended Freetype system of include ft2build.h then - - Sat Nov 1 09:32:15 2003 Owen Taylor <otaylor@redhat.com> - - * pango/pango-ot.h pango/pangofc-font.h - modules/indic/indic-ot.h - pango/pangoft2.c pango/opentype/pango-ot-info.c - pango/opentype/pango-ot-ruleset.c pango/opentype/ottest.c - pango/opentype/ftxopen.[ch] pango/opentype/ftxgdef.c - pango/opentype/ftxgsub.c pango/opentype/ftxgpos.c: - Switch over to recommended Freetype system of - include ft2build.h then #include FT_FREETYPE_H. - Fixes ftmodule.h problem with current Freetype CVS. - (#125548) - - src/ftxgdef.c | 14 +++++++------- - src/ftxgpos.c | 17 ++++++++--------- - src/ftxgsub.c | 13 ++++++------- - src/ftxopen.c | 10 +++++----- - src/ftxopen.h | 3 ++- - src/ottest.c | 1 - - src/pango-ot-info.c | 4 ++-- - src/pango-ot-private.h | 2 -- - src/pango-ot-ruleset.c | 4 ++-- - 9 files changed, 32 insertions(+), 36 deletions(-) - -commit 558171a7a3666999c679719ad0bfbdf7c6a52289 -Author: Owen Taylor <otaylor@redhat.com> -Date: Mon Sep 15 22:04:55 2003 +0000 - - Fix gcc-3.3 versions of macros to have the right return value. - - Mon Sep 15 17:16:59 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/fterrcompat.h: Fix gcc-3.3 versions of - macros to have the right return value. - - src/fterrcompat.h | 44 ++++++++++++++++++++++++++------------------ - 1 files changed, 26 insertions(+), 18 deletions(-) - -commit c99259bf7e08ccdc4130d4983e8d186021ea8e1a -Author: Owen Taylor <otaylor@redhat.com> -Date: Mon Aug 25 14:30:12 2003 +0000 - - pango/opentype/ftxgsub.c (Lookup_ChainContextSubst3) Fix problems - where - - Mon Aug 25 10:17:21 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgsub.c (Lookup_ChainContextSubst3) - * pango/opentype/ftxgpos.c (Lookup_ChainContextPos3): - Fix problems where the coverage wasn't being checked - for the first input glyph. (#118639, Kailash C. Chowksey) - - src/ftxgpos.c | 7 +++---- - src/ftxgsub.c | 7 +++---- - 2 files changed, 6 insertions(+), 8 deletions(-) - -commit bcf81bcc80c6235dfbc7eeaa34ed21ea329c7a3d -Author: Owen Taylor <otaylor@redhat.com> -Date: Fri Aug 22 22:52:08 2003 +0000 - - Add some macro definitions for gcc-3.3 that suppress the bogus - - Fri Aug 22 18:09:52 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/fterrcompat.h: Add some macro definitions - for gcc-3.3 that suppress the bogus strict-aliasing - warnings. - - * pango/pango-utils.c (read_config_file): Use - g_hash_table_new_full() to simplify code and fix - gcc-3.3 warnings. - - * pango/pangox-fontmap.c (pango_x_real_get_coverage_win) - * pango/querymodules.c (query_module): Suppress gcc-3.3 - warnings. - - * pango/modules.c (pango_find_map): Fix warning from - missing declaration of pango_module_get_type(). - - * pango/pango-context.c/pango-engine.c: Fix name confusion - for pango_get_fallback_shaper(). - - src/fterrcompat.h | 36 ++++++++++++++++++++++++++++++++++-- - 1 files changed, 34 insertions(+), 2 deletions(-) - -commit 46d379596d7292a3b2e51f35fc8044b366d413a3 -Author: Owen Taylor <otaylor@redhat.com> -Date: Tue Jul 29 14:21:54 2003 +0000 - - Rewrite handling of IGNORE_SPECIAL_MARKS to be properly "ignore - marks of - - Tue Jul 29 09:58:13 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgdef.c (Check_Property): Rewrite - handling of IGNORE_SPECIAL_MARKS to be properly - "ignore marks of attachment type different than - specified. (#118456, Kailash C. Chowksey) - - src/ftxgdef.c | 37 ++++++++++++++++++++++++++++--------- - 1 files changed, 28 insertions(+), 9 deletions(-) - -commit 8247acad79c1a4154e9337aed453eb3e4d23063d -Author: Owen Taylor <otaylor@redhat.com> -Date: Mon Jul 28 22:28:37 2003 +0000 - - Revert back out the FreeType patch preventing ligatures of - not-originally - - Sat Jul 26 09:41:22 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgsub.c (Lookup_LigatureSubst): - Revert back out the FreeType patch preventing - ligatures of not-originally adjacent glyphs; - it doesn't work for all scripts. (#118472, - Kailash C. Chowksey) - - src/ftxgsub.c | 31 +++---------------------------- - 1 files changed, 3 insertions(+), 28 deletions(-) - -commit 825e6d7e86cac310161648601b09291fa05d5ba5 -Author: Owen Taylor <otaylor@redhat.com> -Date: Sun Jul 27 02:40:31 2003 +0000 - - Check for lookahead glyphs in the right place. (Patch from #116860) - - Sat Jul 26 22:30:59 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgsub.c (Lookup_ChainContextSubst{1,2,3}): - Check for lookahead glyphs in the right place. (Patch - from #116860) - - * pango/opentype/ftxgpos.c (Lookup_ChainContextPos{1,2,3}): - Same fix here. - - src/ftxgpos.c | 6 +++--- - src/ftxgsub.c | 6 +++--- - 2 files changed, 6 insertions(+), 6 deletions(-) - -commit 03a0fe09c711b81c7eb4065fd4700b8cfd2c977a -Author: Owen Taylor <otaylor@redhat.com> -Date: Sun Jul 27 02:19:52 2003 +0000 - - Fix return value to only contain TTO_Err_Not_Covered if *no* lookups - - Sat Jul 26 22:12:46 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgsub.c (Do_String_Lookup, - TT_GSUB_Apply_String): Fix return value to only - contain TTO_Err_Not_Covered if *no* lookups - matched. Fix memory leaks on error in Apply_String(). - - src/ftxgsub.c | 120 - +++++++++++++++++++++++++++++++++++--------------------- - 1 files changed, 75 insertions(+), 45 deletions(-) - -commit e10ea2afd9a5868d4ec1ff3a2b99bcd64ce45816 -Author: Owen Taylor <otaylor@redhat.com> -Date: Sun Jul 27 01:10:15 2003 +0000 - - Fix confusion between boolean and FT_Error return. (GSUB equivalent - of fix - - Sat Jul 26 21:06:26 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgsub.c (Load_EmptyOrClassDefinition): - Fix confusion between boolean and FT_Error return. - (GSUB equivalent of fix for #108358) - - src/ftxgsub.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit a7305ab2624cbc08160dc11587ba3dc4e17781c2 -Author: Owen Taylor <otaylor@redhat.com> -Date: Sat Jul 26 15:02:13 2003 +0000 - - Move allocation afer initial checks, fixing memory leak. - - Sat Jul 26 10:52:20 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgpos.c (Lookup_ContextPos2): - * pango/opentype/ftxgsub.c (Lookup_ContextSubst2): Move - allocation afer initial checks, fixing memory leak. - - * pango/opentype/ftxgsub.c (Lookup_ChainContextSubst2): - Fix some more error return memory leaks that weren't - fixed in the Qt changes. - - src/ftxgpos.c | 8 ++++---- - src/ftxgsub.c | 12 ++++++------ - 2 files changed, 10 insertions(+), 10 deletions(-) - -commit f40b7c15e0bc4b71e706602c4e062f72d8f0fcdd -Author: Owen Taylor <otaylor@redhat.com> -Date: Sat Jul 26 14:50:23 2003 +0000 - - Fix various memory leaks from error returns that should have been - jumps to - - Sat Jul 26 10:43:20 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgsub.c pango/opentype/ftxgpos.c: - Fix various memory leaks from error returns that should - have been jumps to cleanup blocks. (From Qt, Lars Knoll) - - src/ftxgpos.c | 8 ++++---- - src/ftxgsub.c | 4 ++-- - 2 files changed, 6 insertions(+), 6 deletions(-) - -commit 256d21970733483833b9cf31d5e0fa7ae853e944 -Author: Owen Taylor <otaylor@redhat.com> -Date: Sat Jul 26 14:35:29 2003 +0000 - - Fix additional places where TTO_Err_Not_Covered wasn't considered a - - Sat Jul 26 10:30:24 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgpos.c: Fix additional places where - TTO_Err_Not_Covered wasn't considered a successful return - from Get_Class. (From Qt, Lars Knoll) - - src/ftxgpos.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -commit 374960681e2e36d0e4032623d8cb92a7910baf71 -Author: Owen Taylor <otaylor@redhat.com> -Date: Sat Jul 26 13:50:23 2003 +0000 - - If applying a ligature lookup makes adjacent two glyphs that were not - - Sat Jul 26 09:41:22 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgsub.c (Lookup_LigatureSubst): - If applying a ligature lookup makes adjacent two glyphs - that were not originally adjacent, avoid making - subsequent ligatures between those glyphs. - (From FreeType, Werner Lemberg, 2001-08-22, 2001-08-23) - - src/ftxgsub.c | 31 ++++++++++++++++++++++++++++--- - 1 files changed, 28 insertions(+), 3 deletions(-) - -commit b682482df77608d67eca8a050db5b36f44953c13 -Author: Owen Taylor <otaylor@redhat.com> -Date: Sat Jul 26 13:20:52 2003 +0000 - - Fix some FreeType1 variable declarations that snuck in from the last - - Sat Jul 26 09:16:57 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgpos.c pango/opentype/ftxopen.c: - Fix some FreeType1 variable declarations that snuck - in from the last commits (Christophe Fergeau, - 118363) - - src/ftxgpos.c | 6 +++--- - src/ftxopen.c | 2 +- - 2 files changed, 4 insertions(+), 4 deletions(-) - -commit 06c12109de061c357f46dcec82c4bee7160afede -Author: Owen Taylor <otaylor@redhat.com> -Date: Sat Jul 26 03:45:44 2003 +0000 - - OpenType-1.4 update: backtrack information is stored with the - item closest - - Fri Jul 25 23:38:07 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgpos.c pango/opentype/ftxgsub.c: - OpenType-1.4 update: backtrack information is stored with the - item closest to the input first (From FreeType, - Werner Lemberg, 2002-09-26) - - src/ftxgpos.c | 26 ++++++++++++++++++-------- - src/ftxgsub.c | 24 +++++++++++++++++------- - 2 files changed, 35 insertions(+), 15 deletions(-) - -commit 15a69e4a12739e7392f2a38d6f7bfdd96c0dc3ba -Author: Owen Taylor <otaylor@redhat.com> -Date: Sat Jul 26 03:14:23 2003 +0000 - - Update of GPOS and GSUB support to OpenType 1.3 (From FreeType, Werner - - Fri Jul 25 23:07:06 2003 Owen Taylor <otaylor@redhat.com> - - Update of GPOS and GSUB support to OpenType 1.3 - (From FreeType, Werner Lemberg, 2001-08-08) - - * pango/opentype/ftxopen.h: Add RIGHT_TO_LEFT LookupFlag - - * pango/opentype/ftxgpos.c (GPOS_Instance): Add 'first' - member to mark the beginning of a chain of cursive - connections. - - * pango/opentype/ftxgpos.c (Do_String_Lookup): If the - RIGHT_TO_FLAG flag is set, shift cursive chain up so - last glyph is on the baseline. - - src/ftxgpos.c | 25 ++++++++++++++++++++++++- - src/ftxopen.h | 8 ++++++-- - 2 files changed, 30 insertions(+), 3 deletions(-) - -commit 6f74f18b77402f3adf5bfbae26e8f44de6543b4e -Author: Owen Taylor <otaylor@redhat.com> -Date: Sat Jul 26 03:03:40 2003 +0000 - - Add GPOS_LOOKUP_EXTENSION, GSUB_LOOKUP_EXTENSION, which allow lookup - - Fri Jul 25 22:59:13 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftx{gpos,gsub}.h pango/opentype/ftxgdef.c: - Add GPOS_LOOKUP_EXTENSION, GSUB_LOOKUP_EXTENSION, which - allow lookup information to be stored at 32-bit offets - via a double indirection. (From FreeType, Werner Lemberg, - 2001-08-08) - - src/ftxgpos.h | 17 +++++++++-------- - src/ftxgsub.h | 1 + - src/ftxopen.c | 19 +++++++++++++++++++ - 3 files changed, 29 insertions(+), 8 deletions(-) - -commit 375781c4546b5cfc453b99551ddf715bb162ffb9 -Author: Owen Taylor <otaylor@redhat.com> -Date: Sat Jul 26 02:44:19 2003 +0000 - - Fix a couple of places where TTO_Err_Not_Covered wasn't considered a - - Fri Jul 25 22:25:48 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgsub.c (Lookup_ContextSubst2, - Lookup_ChainContextSubst2): Fix a couple of - places where TTO_Err_Not_Covered wasn't considered - a successful return from Get_Class -- it means - use class index 0. (From FreeType, Werner Lemberg, - 2001-08-06) - - src/ftxgsub.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 378e1889cd294cb77313ba7fdab3e52959bf2c40 -Author: Owen Taylor <otaylor@redhat.com> -Date: Sat Jul 26 02:10:42 2003 +0000 - - Improvements to OpenType-dumping code, based on changes in Qt by Lars - - Fri Jul 25 20:12:00 2003 Owen Taylor <otaylor@redhat.com> - - Improvements to OpenType-dumping code, based on - changes in Qt by Lars Knoll. - - * pango/opentype/ottest.c: Tweak the debugging output, - suppress some warnings. - - * pango/opentype/disasm.c: Add support for - GSUB Context/Chain GPOS MarkBase lookups, improve - output in various ways. - - src/disasm.c | 242 - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- - src/ottest.c | 12 ++- - 2 files changed, 241 insertions(+), 13 deletions(-) - -commit 07bad0e77c42b5f2535e3b018bf9074d2f4ecc7c -Author: Owen Taylor <otaylor@redhat.com> -Date: Thu Jul 24 21:05:29 2003 +0000 - - Fix uses of g_assert() around statements with side effects. (#115498, - - Thu Jul 24 17:04:21 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/pango-ot-ruleset.c (pango_ot_ruleset_shape): - Fix uses of g_assert() around statements with side effects. - (#115498, patch from David Cuthbert) - - src/pango-ot-ruleset.c | 14 +++++++++----- - 1 files changed, 9 insertions(+), 5 deletions(-) - -commit f91deef2c9473da5c3cb5e120f2d4fbf0d638166 -Author: Owen Taylor <otaylor@redhat.com> -Date: Wed Apr 16 21:48:29 2003 +0000 - - More careful handling of face->charmap; if is NULL, try to set - a unicode - - Wed Apr 16 03:46:42 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/pango-ot-info.c (synthesize_class_def): - More careful handling of face->charmap; if is NULL, - try to set a unicode charmap, if that doesn't succeed, - return. (Hopefully fixes #106550) - - src/pango-ot-info.c | 26 ++++++++++++++++++++++++-- - 1 files changed, 24 insertions(+), 2 deletions(-) - -commit 587b3940f3ce71e8e1c9950086923d4eb78d62db -Author: Owen Taylor <otaylor@redhat.com> -Date: Wed Apr 16 03:58:17 2003 +0000 - - When loading in Load_Chain{Sub,Pos}ClassRule, the limit we have only - - Tue Apr 15 11:49:39 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxg{sub/pos}.c: When loading - in Load_Chain{Sub,Pos}ClassRule, the limit we - have only applies to the input ClassDef table. - Fixes problem with Arial Unicode. Much help from - Noah Levitt in tracing this down. - - src/ftxgpos.c | 7 ++++--- - src/ftxgsub.c | 7 ++++--- - 2 files changed, 8 insertions(+), 6 deletions(-) - -commit 0d7567f8eaa1f8d0ec9cb89218ce3a1475d258ac -Author: Owen Taylor <otaylor@redhat.com> -Date: Tue Apr 15 23:01:19 2003 +0000 - - Fix mispelled constant from last commit. - - Tue Apr 15 06:57:02 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgpos.c: Fix mispelled constant - from last commit. - - src/ftxgpos.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -commit 73cd600798a9a7225b2ac8241ea371d48cf7baf3 -Author: Owen Taylor <otaylor@redhat.com> -Date: Tue Apr 15 22:15:41 2003 +0000 - - Fix confusion between boolean and FT_Error return. (#108358, - Noah Levitt) - - Tue Apr 15 06:03:39 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgpos.c: Fix confusion between - boolean and FT_Error return. (#108358, Noah Levitt) - - * pango/opentype/ftxopen.c (Get_Class1): index is - allowed to be NULL. (#108358, Noah Levitt) - - src/ftxgpos.c | 5 +++-- - src/ftxopen.c | 3 ++- - 2 files changed, 5 insertions(+), 3 deletions(-) - -commit 462bd0be608c3d14e5b4c01099b02b3948a52369 -Author: Owen Taylor <otaylor@redhat.com> -Date: Tue Apr 15 21:05:53 2003 +0000 - - Fix infinite loop in the case where the charmap contains a character > - - Tue Apr 15 05:00:39 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/pango-ot-info.c (synthesize_class_def): - Fix infinite loop in the case where the charmap contains - a character > 65535. (#106550, Morten Welinder.) - - src/pango-ot-info.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) - -commit 312e1c1cf9f2c1e2137b9aaa5181a541447923cb -Author: James Henstridge <james@daa.com.au> -Date: Tue Mar 11 12:31:16 2003 +0000 - - make similar changes to the ones on glib head (call gtk-docize, etc). - - 2003-03-11 James Henstridge <james@daa.com.au> - - * autogen.sh: make similar changes to the ones on glib head (call - gtk-docize, etc). - - * configure.in: move some calculations into M4 macros, rather than - calculating them when configure runs. - Use AC_HELP_STRING where appropriate. - Replace gtk-doc checks with a call to GTK_DOC_CHECK. - Replace AC_OUTPUT_COMMANDS() call with a number of calls to - AC_CONFIG_COMMANDS (once per created file). - Get rid of the "chmod +x pango-config" bit, because there is no - pango-config anymore. - - * Makefile.am: get rid of custom distcheck rule, and set - DISTCHECK_CONFIGURE_FLAGS, which is equivalent. - Use += to select which .pc files to install. - - * pango/Makefile.am: Add rules to rebuild module-defs* files, and - remove them on clean. - Reorder so that rules related to each individual library are next - to each other. - Use BUILT_SOURCES for built sources. - - * pango/opentype/Makefile.am: don't use STRIP_BEGIN/STRIP_END. - - * modules/*/Makefile.am: simplify module makefiles through use of - +=, and regularise them a bit (fixed a few bugs in the process). - - * docs/Makefile.am: remove common rules, and instead include - gtk-doc.make. - - * examples/Makefile.am: add pango.modules to CLEANFILES. - - * tests/Makefile.am: remove temporary files on clean. - - src/Makefile.am | 11 +++++------ - 1 files changed, 5 insertions(+), 6 deletions(-) - -commit 1aad15fd0c007c9075f2f7f4c4cacf576d726eea -Author: Owen Taylor <otaylor@redhat.com> -Date: Mon Feb 17 22:04:29 2003 +0000 - - Add an --enable-debug configure argument defaulting to 'yes' - for unstable - - Mon Feb 17 13:06:39 2003 Owen Taylor <otaylor@redhat.com> - - * configure.in **/Makefile.am: Add an --enable-debug - configure argument defaulting to 'yes' for unstable - releases and 'minimum' for stable releases. - For minimum, -DG_DISABLE_CAST_CHECKS. - - * pango/pangofc-fontmap.cI pango/pangoft2-fontmap.c - pango/pangoxft-fontmap.c: Add caching of fontsets - (#104495, initial patch and review by Soeren Sandmann) - - * pango/pangofc-fontmap.cI pango/pangoft2-fontmap.c - pango/pangoxft-fontmap.c pango/pangoft2-private.h - pango/pangoxft-private.h: Remove cache of recently freed - fonts; not necessary now that we cache fontsets. - - * pango/pangofc-fontmap.cI (pango_fc_pattern_set_free): - Rename from pango_fc_font_set_free to reflect - what it actually does. - - * pango/pangofc-fontmap.cI pango/pangoft-fontmap.c - pango/pangoxft-fontmap.c: Combine clear-the-cache - functions; we didn't need separate clear-the-font-cache - and clear-the-pattern-cache functions. - - src/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 5febce1ffc956ea44526d50be7cf14c69c66cb34 -Author: Owen Taylor <otaylor@redhat.com> -Date: Wed Feb 12 22:12:55 2003 +0000 - - Up the FreeType version requirement to 2.0.9. (2.2.1 had a compilation - - Wed Feb 12 16:59:23 2003 Owen Taylor <otaylor@redhat.com> - - * configure.in pango/opentype/fterrcompat.h README: - Up the FreeType version requirement to 2.0.9. - (2.2.1 had a compilation failure with older versions, - this catches it more cleanly, and removes some unneeded - checks. #105302, problem reported by Will Partain.) - - src/fterrcompat.h | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -commit 54e85cc0cf3700d2c4af5396d79bd0e40df8f0da -Author: Owen Taylor <otaylor@redhat.com> -Date: Sat Jan 11 00:16:26 2003 +0000 - - Export TT_New_GDEF_Table to create an empty GDEF table. - - Fri Jan 10 18:56:36 2003 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgdef.c: Export TT_New_GDEF_Table - to create an empty GDEF table. - - * pango/opentype/pango-ot-info.c: If the font doesn't - have a class definition table, synthesize one using - the charmap and the unicode properties of characters - in the charmap. (Needed to make things work with various - old Arabic fonts, such as the KACST fonts) - - src/ftxgdef.c | 46 +++++++++++++++------- - src/ftxgdef.h | 4 ++ - src/pango-ot-info.c | 108 - +++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 144 insertions(+), 14 deletions(-) - -commit db6bb4b034d4d8d546fc9bdc4ad28b16bb7f1bb7 -Author: Matthias Clasen <matthiasc@src.gnome.org> -Date: Thu Nov 28 23:53:18 2002 +0000 - - Add docs. - - * docs/tmpl/xft-fonts.sgml: - * docs/tmpl/freetype-fonts.sgml: Add docs. - - * pango/pangoxft-fontmap.c (pango_xft_substitute_changed): - * pango/pangoft2-fontmap.c - (pango_ft2_font_map_set_default_substitute): - Fix doc typos. - - src/pango-ot-info.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) - -commit 226d9b67db852eb29ad37ec8121b79f3ea6f0b73 -Author: Sebastian Wilhelmi <wilhelmi@ira.uka.de> -Date: Tue Nov 26 13:37:10 2002 +0000 - - Do not add GLIB_CFLAGS to CFLAGS. - - - 2002-11-26 Sebastian Wilhelmi <wilhelmi@ira.uka.de> - - * configure.in: Do not add GLIB_CFLAGS to CFLAGS. - - * docs/Makefile.am, examples/Makefile.am, - modules/arabic/Makefile.am, modules/basic/Makefile.am, - modules/hangul/Makefile.am, modules/hebrew/Makefile.am, - modules/indic/Makefile.am, modules/tamil/Makefile.am, - modules/thai/Makefile.am, pango/Makefile.am, - pango/mini-fribidi/Makefile.am, pango/opentype/Makefile.am: - Instead add $(GLIB_CFLAGS) directly to INCLUDES (GTKDOC_CFLAGS for - docs/Makefile.am). Also some cosmetic line wrapping and - reindentation. - - src/Makefile.am | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) - -commit 80634a30b9abdf575320bc6fdacdba4e1ea3903d -Author: Manish Singh <yosh@gimp.org> -Date: Mon Oct 14 22:50:48 2002 +0000 - - Get rid of unnecessary casts for g_object_{ref,unref} - - Mon Oct 14 15:39:41 2002 Manish Singh <yosh@gimp.org> - - * pango/pango-context.c pango/pango-layout.c pango/pangoft2.c - pango/pangowin32-fontmap.c pango/pangowin32.c - pango/pangox-fontmap.c - pango/pangox.c pango/pangoxft-font.c pango/pangoxft-fontmap.c - pango/testfonts.c pango/opentype/pango-ot-ruleset.c: - Get rid of unnecessary casts for g_object_{ref,unref} - - src/pango-ot-ruleset.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -commit 741993e0b15b4df86d76fa8df5055bd764c42c71 -Author: Owen Taylor <otaylor@redhat.com> -Date: Sun Sep 29 19:06:58 2002 +0000 - - ligatures can be also used in MarkBasePos lookups. (2001-03-17 Werner - - Sun Sep 29 14:55:36 2002 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgpos.c: ligatures can be also used in - MarkBasePos lookups. (2001-03-17 Werner Lemberg) - - src/ftxgpos.c | 13 ++++++++++--- - 1 files changed, 10 insertions(+), 3 deletions(-) - -commit a35dc445e86ab433fe9f3937c95f2c1f18f58110 -Author: Owen Taylor <otaylor@redhat.com> -Date: Sun Sep 29 19:05:01 2002 +0000 - - Start of merges from freetype1 of OpenType fixes. - - Sun Sep 29 14:51:25 2002 Owen Taylor <otaylor@redhat.com> - - Start of merges from freetype1 of OpenType fixes. - - (2001-03-17 Werner Lemberg) - - * pango/opentype/ftxgdef.c pango/opentype/ftxgpos.c - pango/opentype/ftxg\sub.c: - More fixes for special marks. - - src/ftxgdef.c | 13 ++++++++----- - src/ftxgpos.c | 6 +++--- - src/ftxgsub.c | 4 ++-- - 3 files changed, 13 insertions(+), 10 deletions(-) - -commit 5c53f14f371b349da65dfa3a848b17ab89ce3ba8 -Author: Tor Lillqvist <tml@iki.fi> -Date: Mon Sep 23 21:45:31 2002 +0000 - - Remove. Not used. (A static library is built here. Exported entries - are in - - 2002-09-24 Tor Lillqvist <tml@iki.fi> - - * pango/opentype/pango-ot.def: Remove. Not used. (A static library - is built here. Exported entries are in ../pangoft2.def.) - - * pango/opentype/Makefile.am (EXTRA_DIST): Remove from here, too. - - src/Makefile.am | 3 +-- - src/pango-ot.def | 50 - -------------------------------------------------- - 2 files changed, 1 insertions(+), 52 deletions(-) - -commit 35e4593ccd9ea5ed78f1e6f32f04b3a13cee0145 -Author: Tor Lillqvist <tml@iki.fi> -Date: Mon Sep 23 21:19:30 2002 +0000 - - pango/makefile.mingw.in pango/mini-fribidi/makefile.mingw Remove. Not - - 2002-09-23 Tor Lillqvist <tml@iki.fi> - - * pango/makefile.mingw.in - * pango/mini-fribidi/makefile.mingw - * pango/opentype/makefile.mingw.in: Remove. Not maintained. - - * pango/Makefile.am (EXTRA_DIST) - * pango/mini-fribidi/Makefile.am (EXTRA_DIST) - * pango/opentype/Makefile.am (EXTRA_DIST): Remove - makefile.mingw(.in) from here, too. - - * configure.in (AC_OUTPUT): Don't try to output above removed - files. - - src/Makefile.am | 3 +-- - src/makefile.mingw.in | 43 ------------------------------------------- - 2 files changed, 1 insertions(+), 45 deletions(-) - -commit fb279cb0bf676bb1d225e6a296282523d839074d -Author: Eric Mader <emader@src.gnome.org> -Date: Mon Sep 9 18:11:55 2002 +0000 - - Correctly handle back, new_advance. - - src/pango-ot-ruleset.c | 25 ++++++++++++++++--------- - 1 files changed, 16 insertions(+), 9 deletions(-) - -commit c880e814a50100577811a8a51bc06b4275c55a7e -Author: Eric Mader <emader@src.gnome.org> -Date: Fri Sep 6 22:45:23 2002 +0000 - - Don't fail when reading an empty script. - - src/ftxopen.c | 36 +++++++++++++++++++++++++----------- - src/ftxopen.h | 1 + - 2 files changed, 26 insertions(+), 11 deletions(-) - -commit 441e7d0292bf1a06396daac80fcbad23976a824d -Author: Owen Taylor <otaylor@redhat.com> -Date: Wed Aug 7 17:01:52 2002 +0000 - - Offset to MarkAttachClassDef is offset to table, not offset to - offset to - - Wed Aug 7 12:32:39 2002 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgsub.c (TT_Load_GSUB_Table): - Offset to MarkAttachClassDef is offset to table, - not offset to offset to table. - - * pango/opentype/ftxopen.c (Get_Device): Handle - NULL device tables which we represent with - d->DeltaValue == NULL. - - src/ftxgsub.c | 13 ------------- - src/ftxopen.c | 2 +- - 2 files changed, 1 insertions(+), 14 deletions(-) - -commit 48a16fa8090b67b046b2bb686ff4f6f038a2b8e8 -Author: Owen Taylor <otaylor@src.gnome.org> -Date: Tue Jun 4 00:20:51 2002 +0000 - - on Jun 3 18:56:09 2002 Owen Taylor <otaylor@redhat.com> - - Xft2 and fontconfig conversion, based largely on a patch - from Keith Packard. - - * configure.in acconfig.h: Add checks for fontconfig, switch - Xft checks to switch for Xft2 using pkg-config. - - * pangoxft.pc.in pangoxft.pc.in - modules/{arabic,basic,hebrew,indic,tamil}/Makefile.am - pango/Makefile.am: Reflect new Xft/fontconfig dependencies. - - * pango/pangoxft-private.h pango/pangoxft-fontmap.c - modules/arabic/arabic-xft.c modules/indic/indic-xft.c: - Switch over to using Xft2 and fontconfig. - - * pango/pangoft2.c pango/pangoft2-fontmap.c - pango/pangoft2-private.h - pango/pango/Makefile.am: Remove usage of mini-xft in - favor of fontconfig. - - * pango/pango-ot.h pango/opentype/pango-ot-info.c - pango/pangoxft.h - modules/arabic/arabic-{xft,ft2}.c modules/indic/indic-xft.c: - Attach OpenType information directly to the FT_Face - structure using FT_Generic. - - * modules/tamil/Makefile.am modules/tamil/tamil-xft.c - configure.in: Remove this module, no longer needed. - - * pango/pangoxft-font.c (pango_xft_real_render): Coalesce - calls to Xft rendering functions. - - src/pango-ot-info.c | 29 +++++++++++++++++++++++------ - 1 files changed, 23 insertions(+), 6 deletions(-) - -commit 9df9af0b3615dc6a52d784233a3410a9080d9369 -Author: Owen Taylor <otaylor@redhat.com> -Date: Fri May 10 18:44:47 2002 +0000 - - Fix acess outside of a loaded frame and some memory leaks on failure. - - Fri May 10 14:41:27 2002 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgdef.c (TT_Load_GDEF_Table): Fix acess - outside of a loaded frame and some memory leaks - on failure. - - src/ftxgdef.c | 12 ++++++++++-- - 1 files changed, 10 insertions(+), 2 deletions(-) - -commit a63dbbbeeb91ebf4ded2fc788f5810a3bd1e14fe -Author: Eric Mader <mader@jtcsv.com> -Date: Tue May 7 20:39:14 2002 +0000 - - Add modules modules/indic/indic-xft.c, indic-ot.c, indic-ot.h, - - Mon May 06 15:07:39 2002 Eric Mader <mader@jtcsv.com> - * Add modules modules/indic/indic-xft.c, indic-ot.c, indic-ot.h, - indic-ot-class-tables.c - - * pango/opentype/ftxgdef.c: Compute full offset for mark - attachment class table - - * pango/opentype/ftxgpos.c: Only return TTO_Err_Not_Covered if - nothing matches - - * pango/opentype/pango-ot-ruleset.c: enable GPOS processing - - src/ftxgdef.c | 10 ++++++++-- - src/ftxgpos.c | 33 ++++++++++++++------------------- - src/pango-ot-ruleset.c | 35 ++++++++++++++++++++++++++++++++++- - 3 files changed, 56 insertions(+), 22 deletions(-) - -commit cf00f8217c9dfcf50febbb06fad245d489a0abe6 -Author: Owen Taylor <otaylor@redhat.com> -Date: Tue Apr 23 20:20:29 2002 +0000 - - Add compatibility defines for changes in FreeType 2.1.0. - - Tue Apr 23 16:15:07 2002 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/fterrcompat.h: Add compatibility - defines for changes in FreeType 2.1.0. - - src/fterrcompat.h | 39 +++++++++++++++++++++++++++++++++++++-- - 1 files changed, 37 insertions(+), 2 deletions(-) - -commit 6b1b04e3736fdca774052ac3cfbe9f027548c29d -Author: Owen Taylor <otaylor@redhat.com> -Date: Fri Mar 15 06:46:05 2002 +0000 - - In Load_ChainContextSubst2, handle the case where an empty class - - Fri Mar 15 01:35:56 2002 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgsub.c pango/opentype/ftxopen.c - pango/opentype/ftxopenf.h: In Load_ChainContextSubst2, - handle the case where an empty class definition - is represented by an offset of 0. - - * pango/opentype/ftxgpos.c: Same for Load_ChainContextPos2. - - * pango/opentype/{ftxopen.c,ftxgpos.c,ftxgsub.c,ftgdef.c}: - Fix pervasive bug where on cleanups on failure of loading - an array element, all array elements were freed, not - just the ones that had been succesfully loaded. - - src/ftxgdef.c | 24 +++--- - src/ftxgpos.c | 259 - +++++++++++++++++++++++++++++++++++--------------------- - src/ftxgsub.c | 159 ++++++++++++++++++++--------------- - src/ftxopen.c | 53 ++++++++--- - src/ftxopenf.h | 2 + - 5 files changed, 306 insertions(+), 191 deletions(-) - -commit 6050933f336f43453e35246525cfec362bd23acb -Author: Owen Taylor <otaylor@redhat.com> -Date: Fri Mar 15 04:22:14 2002 +0000 - - Uncomment GPOS parts. - - Thu Mar 14 23:05:18 2002 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxopen.c: Uncomment GPOS parts. - - * pango/opentype/disasm.c: Start adding some GPOS - dumping. - - src/disasm.c | 146 - +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/ftxopen.c | 20 +++----- - 2 files changed, 154 insertions(+), 12 deletions(-) - -commit 973bd60a2526666f68138255b8536d1eaee3c2c2 -Author: Sebastian Wilhelmi <wilhelmi@src.gnome.org> -Date: Thu Dec 13 17:44:46 2001 +0000 - - Resuming aborted commit - - - Resuming aborted commit - - src/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 6926ca94255e5d52d99d0d64d126165fc725432d -Author: Matthias Clasen <matthiasc@src.gnome.org> -Date: Tue Oct 30 22:09:20 2001 +0000 - - Remove declarations of unimplemented functions - - * docs/pango-sections.txt, pango/pango-ot.h: Remove - declarations - of unimplemented functions pango_ot_ruleset_set_glyph_loader - and - pango_ot_ruleset_set_alternate_func and the related typedefs - PangoOTGlyphLoader and PangoOTAlternateFunc. - - * pango/opentype/pango-ot-info.c, - pango/opentype/pango-ot-ruleset.c: Documentation updates. - - src/pango-ot-info.c | 76 - ++++++++++++++++++++++++++++++++++++++++++++++++ - src/pango-ot-ruleset.c | 27 +++++++++++++++++ - 2 files changed, 103 insertions(+), 0 deletions(-) - -commit 87a475c09f6b9b391bca37de47a303a62a397b83 -Author: Havoc Pennington <hp@redhat.com> -Date: Wed Sep 19 21:20:36 2001 +0000 - - header to abstract the difference between FreeType 2.0.3 and 2.0.4 - error - - 2001-09-19 Havoc Pennington <hp@redhat.com> - - * pango/opentype/fterrcompat.h: header to abstract the difference - between FreeType 2.0.3 and 2.0.4 error codes, based on the - configure check. - - * configure.in: check for the tterrors.h header in FreeType 2.0.3, - and define HAVE_FREETYPE_2_0_3 if we have it - - src/Makefile.am | 1 + - src/fterrcompat.h | 16 ++++++++++++++++ - src/ftxgdef.c | 3 ++- - src/ftxgpos.c | 3 ++- - src/ftxgsub.c | 3 ++- - src/ftxopen.c | 3 ++- - src/pango-ot-info.c | 2 +- - 7 files changed, 26 insertions(+), 5 deletions(-) - -commit 9c37226efe2489b4cf9618ec98f581c998aaf9e4 -Author: Owen Taylor <otaylor@redhat.com> -Date: Tue Sep 18 20:05:20 2001 +0000 - - Up to 0.19. - - Tue Sep 18 15:47:08 2001 Owen Taylor <otaylor@redhat.com> - - * configure.in (PANGO_MINOR_VERSION): Up to 0.19. - - * pango/pango-font.h pango/pango-fontmap.[ch] pango/fonts.c - pango/pangoxft-fontmap.c pango/pangoft-fontmap.c - pango/pango-context.[ch] - pango/pangox-fontmap.c: Add new PangoFontFace and PangoFontFamily - object types, and change the font listing API to list faces and - families, instead of face names and font descriptions. - - * pango/pango-font.h pango/fonts.c: Make PangoFontDescription - an opaque heap-allocated structure, add accessors and - convenience functions. - - * pango/pango-font.h pango/pango-private.h: Make PangoFontMetrics - heap allocated, protect the structure definition with - #ifdef PANGO_ENABLE_BACKEND, and add getters for the fields. - - * pango/pango-attributes.[ch] ( pango_attr_iterator_get_font): - instead of providing a base font description and one to fill - in, provide a single font description to modify based on - the attributes. - - * pango/pango-attributes.[ch]: Fix PangoAttrFontDesc to have - a PangoFontDescription by reference, not by value. - - * pango/pango-utils.[ch]: make pango_parse_style() and friends - take pointers to individual enumerations instead of to a - PangoFontDescription structure. - - * pango/*.c: Fix for the PangoFontDescription and PangoFontMetrics - changes. - - * pango/pango-{break,engine,indic,ot,xft}.h pango/Makefile.am - pango/opentype/Makefile.am: Protect portions with - PANGO_ENABLE_ENGINE to shrink the public API. - - * modules/*/Makefile.am: -DPANGO_ENABLE_ENGINE. - - * pango/{pangox.h,pangox-private.h} modules/basic/basic-x.c: Move - pango_x_font_get_unknown_glyph() into public header since it is - used from modules. - - * pango/pango-{context,font,fontmap,modules.utils}.h - pango/Makefile.am: - Protect portions with PANGO_ENABLE_BACKEND to shrink the - public API. - - * pango/*.h: Use G_BEGIN/END_DECLS - - * examples/viewer-qt.[cc,h]: Fix for changes to font listing API, - PangoFontDescription. - - * pango/pango-indic.h modules/indic/*: Since we install this - header fix it up to Pango conventions, namespece - ZERO_WIDTH_JOINER, ZERO_WIDTH_NON_JOINER. - - * docs/pango-sections.txt: Updated. - - src/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -commit 7dd0838863f65a8ff2e27d12679c9a289a76aec1 -Author: Darin Adler <darin@src.gnome.org> -Date: Thu Jul 12 16:34:40 2001 +0000 - - Remove stray semicolon. - - * modules/arabic/arabic-x.c: (arabic_engine_shape): Remove stray - semicolon. - - * modules/arabic/arconv.h: - * modules/arabic/arconv.c: (shape), (doublelig), (arabic_reshape): - Use long* instead of int* for parameter to match what's passed in. - - * modules/indic/bengali-x.c: Add missing <string.h> include. - (pango_indic_make_ligs): Use local variable that was added but not - ever used. - (pango_indic_engine_shape): Remove unused locals. - - * modules/indic/devanagari-x.c: Add missing <string.h> include. - (pango_indic_engine_shape): Remove unused local. - - * modules/indic/gujarati-x.c: Add missing <string.h> include. - (pango_indic_engine_shape): Remove unused local - - * modules/tamil/tamil-x.c: (tamil_engine_shape): Initialize a - variable to quiet the compiler's unused warning. - - * pango/.cvsignore: Ignore more generated files. - - * pango/opentype/ftxgpos.c: (Get_Anchor): Add code to set up the - ap variable. The old code would just use the uninitialized value. - - * pango/opentype/ftxopen.c: (Load_Coverage): Remove unused local. - - * pango/opentype/pango-ot-ruleset.c: (pango_ot_ruleset_shape): - Remove unused local. - - * pango/pango-attributes.c: (pango_attr_list_get_type), - (pango_color_get_type): Add needed function type casts (just - warnings under gcc, but could be errors in other compilers). - - * pango/pangoxft-font.c: (pango_xft_font_get_metrics), - (pango_xft_font_get_coverage), (pango_xft_get_shaper_map), - (pango_xft_font_find_shaper): Switch from lang char* to - PangoLanguage*. The code was still compiling, but would not have - worked. - - src/ftxgpos.c | 2 ++ - src/ftxopen.c | 1 - - src/pango-ot-ruleset.c | 1 - - 3 files changed, 2 insertions(+), 2 deletions(-) - -commit 68f8a64307441bd3b3d45971ac4dc93f63dedfe8 -Author: Owen Taylor <otaylor@redhat.com> -Date: Fri May 18 16:04:40 2001 +0000 - - Use ISO C99 varargs when available. - - Fri May 18 11:30:57 2001 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/disasm.c: Use ISO C99 varargs when - available. - - Thu May 17 11:16:23 2001 Owen Taylor <otaylor@redhat.com> - - * pango/mapping.c: Fixup docs, remove some FIXMEs that are - no longer applicable. - - * pango/pango-layout.c: Move by graphemes, not characters. - - * pango/pango-layout.c (pango_layout_line_x_to_index): - Position at the closest grapheme boundary, not at character - boundaries. - - * pango/pango-layout.c (pango_layout_line_index_to_x): - Return positions of grapheme boundaries, not character - boundaries. - - src/Makefile.am | 2 ++ - src/disasm.c | 5 +++++ - 2 files changed, 7 insertions(+), 0 deletions(-) - -commit 89eb36ebc6591025c063cb98f0e1b3badde73e9e -Author: Owen Taylor <otaylor@redhat.com> -Date: Tue Apr 24 15:47:22 2001 +0000 - - Remove excess call to DONE_Stream left over from conversion from FT1. - - Tue Apr 24 11:45:55 2001 Owen Taylor <otaylor@redhat.com> - - * pango/opentype/ftxgdef.c (TT_Load_GDEF_Table): Remove - excess call to DONE_Stream left over from conversion - from FT1. (reported by Michael Jansson) - - src/ftxgdef.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) - -commit c61a730aaebec751831f8423894de5f4b539d0ec -Author: Owen Taylor <otaylor@redhat.com> -Date: Tue Apr 3 19:07:36 2001 +0000 - - Release 0.14 - - Tue Apr 3 15:05:19 2001 Owen Taylor <otaylor@redhat.com> - - * Release 0.14 - - * NEWS: updated. - - * pango/pango/opentype/Makefile.am: make dist fixes. - - * configure.in (PANGO_MINOR_VERSION): Up to 0.14 - - src/Makefile.am | 10 ++++++++-- - 1 files changed, 8 insertions(+), 2 deletions(-) - -commit 405b878923ed219617c6f643a9aec06175223d16 -Author: Tor Lillqvist <tml@iki.fi> -Date: Thu Dec 21 19:55:23 2000 +0000 - - Only a script engine here. - - 2000-12-21 Tor Lillqvist <tml@iki.fi> - - * modules/basic/basic-win32.c (script_engine_load): Only a script - engine here. - - * pango/makefile.mingw.in: Add the built pango-enum-types.[ch]. - - * pango/pango.def - * pango/pangoft2.def: Update. - - * pango/opentype/pango-ot.def - * pango/opentype/makefile.mingw.in: New files. - - * pango/opentype/Makefile.am (EXTRA_DIST): Add them. - - * configure.in (included_modules): Generate - pango/opentype/makefile.mingw. - - src/Makefile.am | 4 ++- - src/makefile.mingw.in | 43 ++++++++++++++++++++++++++++++++++++++++++ - src/pango-ot.def | 50 - +++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 96 insertions(+), 1 deletions(-) - -commit 80a15829135065e16ce5b129c715d10d14b829ba -Author: Owen Taylor <otaylor@redhat.com> -Date: Wed Dec 20 04:41:36 2000 +0000 - - Since Xft may only be available statically without shlib deps, - check for - - Tue Dec 19 22:47:16 2000 Owen Taylor <otaylor@redhat.com> - - * configure.in pango-config.in pangoxft.pc.in - modules/basic/Makefile.am: Since Xft may only be available - statically without shlib deps, check for FreeType libs explicitly - and include them when linking, otherwise things won't work. Also, - define FREETYPE_CFLAGS from freetype-config --cflags. - - * modules/basic/basic-xft.c pango/pangoxft-font{,map}.c: Fool - Xft into not converting glyph indices by loading the - face unencoded then calling FT_Set_Charmap ourselves. - - * pango/Makefile.am pango/pango-ot.h pango/opentype/* :Add start - of opentype handling - most of the actually meat of the code here - is the OpenType layout code from FreeType 1 ported to freetype2 - and adapted slighlty for our purposes. Also, includes a - incomplete OpenType-table-dumping code useful for figuring - out what is going on. - - * pango/pangoxft.h pango/pangoxft-font.h: Add calls for - getting FT_Face and PangoOTInfo from PangoXftFont. - - * modules/arabic/{Makefile.am,arabic-ot.[ch],arabic-xft.c}: - Initial support for rendering Arabic with OpenType fonts. - - src/.cvsignore | 8 + - src/FT-license.txt | 158 ++ - src/Makefile.am | 39 + - src/README | 36 + - src/disasm.c | 317 +++ - src/disasm.h | 26 + - src/ftxgdef.c | 1155 +++++++++ - src/ftxgdef.h | 220 ++ - src/ftxgpos.c | 6222 - ++++++++++++++++++++++++++++++++++++++++++++++++ - src/ftxgpos.h | 858 +++++++ - src/ftxgsub.c | 4531 +++++++++++++++++++++++++++++++++++ - src/ftxgsub.h | 612 +++++ - src/ftxopen.c | 1467 ++++++++++++ - src/ftxopen.h | 308 +++ - src/ftxopenf.h | 161 ++ - src/ottest.c | 265 ++ - src/pango-ot-info.c | 438 ++++ - src/pango-ot-private.h | 98 + - src/pango-ot-ruleset.c | 232 ++ - 19 files changed, 17151 insertions(+), 0 deletions(-) diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/Makefile.am b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/Makefile.am deleted file mode 100644 index 19c209579a4..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/Makefile.am +++ /dev/null @@ -1,72 +0,0 @@ -# Process this file with automake to produce Makefile.in - -NULL = - -ACLOCAL_AMFLAGS = -I m4 - -SUBDIRS = src util test - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = harfbuzz.pc - -EXTRA_DIST = \ - autogen.sh \ - harfbuzz.doap \ - Android.mk \ - $(NULL) - -MAINTAINERCLEANFILES = \ - $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \ - $(GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL) \ - $(GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN) \ - $(srcdir)/INSTALL \ - $(srcdir)/ChangeLog \ - $(NULL) - - -# -# ChangeLog generation -# -CHANGELOG_RANGE = -ChangeLog: - $(AM_V_GEN) if test -d "$(top_srcdir)/.git"; then \ - (GIT_DIR=$(top_srcdir)/.git $(top_srcdir)/missing --run \ - git log $(CHANGELOG_RANGE) --stat) | fmt --split-only > $@.tmp \ - && mv -f $@.tmp "$(srcdir)/ChangeLog" \ - || ($(RM) $@.tmp; \ - echo Failed to generate ChangeLog, your ChangeLog may be outdated >&2; \ - (test -f $@ || echo git-log is required to generate this file >> "$(srcdir)/$@")); \ - else \ - test -f $@ || \ - (echo A git checkout and git-log is required to generate ChangeLog >&2 && \ - echo A git checkout and git-log is required to generate this file >> "$(srcdir)/$@"); \ - fi -.PHONY: $(srcdir)/ChangeLog - - -# -# Release engineering -# - -# TODO: Copy infrastructure from cairo - -TAR_OPTIONS = --owner=0 --group=0 -dist-hook: dist-clear-sticky-bits -# Clean up any sticky bits we may inherit from parent dir -dist-clear-sticky-bits: - chmod -R a-s $(distdir) - - -tar_file = $(PACKAGE_TARNAME)-$(VERSION).tar.bz2 -sha256_file = $(tar_file).sha256 -gpg_file = $(sha256_file).asc -$(sha256_file): $(tar_file) - sha256sum $^ > $@ -$(gpg_file): $(sha256_file) - @echo "Please enter your GPG password to sign the checksum." - gpg --armor --sign $^ - -release-files: $(tar_file) $(sha256_file) $(gpg_file) - - --include $(top_srcdir)/git.mk diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/NEWS b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/NEWS deleted file mode 100644 index 9e5918db7ad..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/NEWS +++ /dev/null @@ -1,691 +0,0 @@ -Overview of changes leading to 0.9.15 -Thursday, April 05, 2013 -===================================== - -- Build fixes. -- Fix crasher in graphite2 shaper. -- Fix Arabic mark width zeroing regression. -- Don't compose Hangul jamo into Unicode syllables. - - -Overview of changes leading to 0.9.14 -Thursday, March 21, 2013 -===================================== - -- Build fixes. -- Fix time-consuming sanitize with malicious fonts. -- Implement hb_buffer_deserialize_glyphs() for both json and text. -- Do not ignore Hangul filler characters. -- Indic fixes: - * Fix Malayalam pre-base reordering interaction with post-forms. - * Further adjust ZWJ handling. Should fix known regressions from - 0.9.13. - - -Overview of changes leading to 0.9.13 -Thursday, February 25, 2013 -===================================== - -- Build fixes. -- Ngapi HarfBuzz Hackfest in London (February 2013): - * Fixed all known Indic bugs, - * New Win8-style Myanmar shaper, - * New South-East Asian shaper for Tai Tham, Cham, and New Tai Lue, - * Smartly ignore Default_Ignorable characters (joiners, etc) wheb - matching GSUB/GPOS lookups, - * Fix 'Phags-Pa U+A872 shaping, - * Fix partial disabling of default-on features, - * Allow disabling of TrueType kerning. -- Fix possible crasher with broken fonts with overlapping tables. -- Removed generated files from git again. So, one needs ragel to - bootstrap from the git tree. - -API changes: -- hb_shape() and related APIs now abort if buffer direction is - HB_DIRECTION_INVALID. Previously, hb_shape() was calling - hb_buffer_guess_segment_properties() on the buffer before - shaping. The heuristics in that function are fragile. If the - user really wants the old behvaior, they can call that function - right before calling hb_shape() to get the old behavior. -- hb_blob_create_sub_blob() always creates sub-blob with - HB_MEMORY_MODE_READONLY. See comments for the reason. - - -Overview of changes leading to 0.9.12 -Thursday, January 18, 2013 -===================================== - -- Build fixes for Sun compiler. -- Minor bug fix. - -Overview of changes leading to 0.9.11 -Thursday, January 10, 2013 -===================================== - -- Build fixes. -- Fix GPOS mark attachment with null Anchor offsets. -- [Indic] Fix old-spec reordering of viramas if sequence ends in one. -- Fix multi-threaded shaper data creation crash. -- Add atomic ops for Solaris. - -API changes: -- Rename hb_buffer_clear() to hb_buffer_clear_contents(). - - -Overview of changes leading to 0.9.10 -Thursday, January 3, 2013 -===================================== - -- [Indic] Fixed rendering of Malayalam dot-reph -- Updated OT language tags. -- Updated graphite2 backend. -- Improved hb_ot_layout_get_size_params() logic. -- Improve hb-shape/hb-view help output. -- Fixed hb-set.h implementation to not crash. -- Fixed various issues with hb_ot_layout_collect_lookups(). -- Various build fixes. - -New API: - -hb_graphite2_face_get_gr_face() -hb_graphite2_font_get_gr_font() -hb_coretext_face_get_cg_font() - -Modified API: - -hb_ot_layout_get_size_params() - - -Overview of changes leading to 0.9.9 -Wednesday, December 5, 2012 -==================================== - -- Fix build on Windows. -- Minor improvements. - - -Overview of changes leading to 0.9.8 -Tuesday, December 4, 2012 -==================================== - - -- Actually implement hb_shape_plan_get_shaper (). -- Make UCDB data tables const. -- Lots of internal refactoring in OTLayout tables. -- Flesh out hb_ot_layout_lookup_collect_glyphs(). - -New API: - -hb_ot_layout_collect_lookups() -hb_ot_layout_get_size_params() - - -Overview of changes leading to 0.9.7 -Sunday, November 21, 2012 -==================================== - - -HarfBuzz "All-You-Can-Eat-Sushi" (aka Vancouver) Hackfest and follow-on fixes. - -- Fix Arabic contextual joining using pre-context text. -- Fix Sinhala "split matra" mess. -- Fix Khmer shaping with broken fonts. -- Implement Thai "PUA" shaping for old fonts. -- Do NOT route Kharoshthi script through the Indic shaper. -- Disable fallback positioning for Indic and Thai shapers. -- Misc fixes. - - -hb-shape / hb-view changes: - -- Add --text-before and --text-after -- Add --bot / --eot / --preserve-default-ignorables -- hb-shape --output-format=json - - -New API: - -hb_buffer_clear() - -hb_buffer_flags_t - -HB_BUFFER_FLAGS_DEFAULT -HB_BUFFER_FLAG_BOT -HB_BUFFER_FLAG_EOT -HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES - -hb_buffer_set_flags() -hb_buffer_get_flags() - -HB_BUFFER_SERIALIZE_FLAGS -hb_buffer_serialize_glyphs() -hb_buffer_deserialize_glyphs() -hb_buffer_serialize_list_formats() - -hb_set_add_range() -hb_set_del_range() -hb_set_get_population() -hb_set_next_range() - -hb_face_[sg]et_glyph_count() - -hb_segment_properties_t -HB_SEGMENT_PROPERTIES_DEFAULT -hb_segment_properties_equal() -hb_segment_properties_hash() - -hb_buffer_set_segment_properties() -hb_buffer_get_segment_properties() - -hb_ot_layout_glyph_class_t -hb_ot_layout_get_glyph_class() -hb_ot_layout_get_glyphs_in_class() - -hb_shape_plan_t -hb_shape_plan_create() -hb_shape_plan_create_cached() -hb_shape_plan_get_empty() -hb_shape_plan_reference() -hb_shape_plan_destroy() -hb_shape_plan_set_user_data() -hb_shape_plan_get_user_data() -hb_shape_plan_execute() -hb_shape_plan_get_shaper() - -hb_ot_shape_plan_collect_lookups() - - -API changes: - -- Remove "mask" parameter from hb_buffer_add(). -- Rename hb_ot_layout_would_substitute_lookup() and hb_ot_layout_substitute_closure_lookup(). -- hb-set.h API const correction. -- Renamed hb_set_min/max() to hb_set_get_min/max(). -- Rename hb_ot_layout_feature_get_lookup_indexes() to hb_ot_layout_feature_get_lookups(). -- Rename hb_buffer_guess_properties() to hb_buffer_guess_segment_properties(). - - - -Overview of changes leading to 0.9.6 -Sunday, November 13, 2012 -==================================== - -- Don't clear pre-context text if no new context is provided. -- Fix ReverseChainingSubstLookup, which was totally borked. -- Adjust output format of hb-shape a bit. -- Include config.h.in in-tree. Makes it easier for alternate build systems. -- Fix hb_buffer_set_length(buffer, 0) invalid memory allocation. -- Use ICU LayoutEngine's C API instead of C++. Avoids much headache. -- Drop glyphs for all of Unicode Default_Ignorable characters. -- Misc build fixes. - -Arabic shaper: -- Enable 'dlig' and 'mset' features in Arabic shaper. -- Implement 'Phags-pa shaping, improve Mongolian. - -Indic shaper: -- Decompose Sinhala split matras the way old HarfBuzz / Pango did. -- Initial support for Consonant Medials. -- Start adding new-style Myanmar shaping. -- Make reph and 'pref' logic introspect the font. -- Route Meetei-Mayek through the Indic shaper. -- Don't apply 'liga' in Indic shaper. -- Improve Malayalam pre-base reordering Ra interaction with Chillus. - - - -Overview of changes leading to 0.9.5 -Sunday, October 14, 2012 -==================================== - -- Synthetic-GSUB Arabic fallback shaping. - -- Misc Indic improvements. - -- Add build system support for pthread. - -- Imported UCDN for in-tree Unicode callbacks implementation. - -- Context-aware Arabic joining. - -- Misc other fixes. - -- New API: - - hb_feature_to/from-string() - hb_buffer_[sg]et_content_type() - - - -Overview of changes leading to 0.9.4 -Tuesday, Sep 03, 2012 -==================================== - -- Indic improvements with old-spec Malayalam. - -- Better fallback glyph positioning, specially with Thai / Lao marks. - -- Implement dotted-circle insertion. - -- Better Arabic fallback shaping / ligation. - -- Added ICU LayoutEngine backend for testing. Call it by the 'icu_le' name. - -- Misc fixes. - - - -Overview of changes leading to 0.9.3 -Friday, Aug 18, 2012 -==================================== - -- Fixed fallback mark positioning for left-to-right text. - -- Improve mark positioning for the remaining combining classes. - -- Unbreak Thai and fallback Arabic shaping. - -- Port Arabic shaper to shape-plan caching. - -- Use new ICU normalizer functions. - - - -Overview of changes leading to 0.9.2 -Friday, Aug 10, 2012 -==================================== - -- Over a thousand commits! This is the first major release of HarfBuzz. - -- HarfBuzz is feature-complete now! It should be in par, or better, than - both Pango's shapers and old HarfBuzz / Qt shapers. - -- New Indic shaper, supporting main Indic scripts, Sinhala, and Khmer. - -- Improved Arabic shaper, with fallback Arabic shaping, supporting Arabic, - Sinhala, N'ko, Mongolian, and Mandaic. - -- New Thai / Lao shaper. - -- Tibetan / Hangul support in the generic shaper. - -- Synthetic GDEF support for fonts without a GDEF table. - -- Fallback mark positioning for fonts without a GPOS table. - -- Unicode normalization shaping heuristic during glyph mapping. - -- New experimental Graphite2 backend. - -- New Uniscribe backend (primarily for testing). - -- New CoreText backend (primarily for testing). - -- Major optimization and speedup. - -- Test suites and testing infrastructure (work in progress). - -- Greatly improved hb-view cmdline tool. - -- hb-shape cmdline tool. - -- Unicode 6.1 support. - -Summary of API changes: - -o Changed API: - - - Users are expected to only include main header files now (ie. hb.h, - hb-glib.h, hb-ft.h, ...) - - - All struct tag names had their initial underscore removed. - Ie. "struct _hb_buffer_t" is "struct hb_buffer_t" now. - - - All set_user_data() functions now take a "replace" boolean parameter. - - - hb_buffer_create() takes zero arguments now. - Use hb_buffer_pre_allocate() to pre-allocate. - - - hb_buffer_add_utf*() now accept -1 for length parameteres, - meaning "nul-terminated". - - - hb_direction_t enum values changed. - - - All *_from_string() APIs now take a length parameter to allow for - non-nul-terminated strings. A -1 length means "nul-terminated". - - - Typedef for hb_language_t changed. - - - hb_get_table_func_t renamed to hb_reference_table_func_t. - - - hb_ot_layout_table_choose_script() - - - Various renames in hb-unicode.h. - -o New API: - - - hb_buffer_guess_properties() - Automatically called by hb_shape(). - - - hb_buffer_normalize_glyphs() - - - hb_tag_from_string() - - - hb-coretext.h - - - hb-uniscribe.h - - - hb_face_reference_blob() - - hb_face_[sg]et_index() - - hb_face_set_upem() - - - hb_font_get_glyph_name_func_t - hb_font_get_glyph_from_name_func_t - hb_font_funcs_set_glyph_name_func() - hb_font_funcs_set_glyph_from_name_func() - hb_font_get_glyph_name() - hb_font_get_glyph_from_name() - hb_font_glyph_to_string() - hb_font_glyph_from_string() - - - hb_font_set_funcs_data() - - - hb_ft_font_set_funcs() - - hb_ft_font_get_face() - - - hb-gobject.h (work in progress) - - - hb_ot_shape_glyphs_closure() - hb_ot_layout_substitute_closure_lookup() - - - hb-set.h - - - hb_shape_full() - - - hb_unicode_combining_class_t - - - hb_unicode_compose_func_t - hb_unicode_decompose_func_t - hb_unicode_decompose_compatibility_func_t - hb_unicode_funcs_set_compose_func() - hb_unicode_funcs_set_decompose_func() - hb_unicode_funcs_set_decompose_compatibility_func() - hb_unicode_compose() - hb_unicode_decompose() - hb_unicode_decompose_compatibility() - -o Removed API: - - - hb_ft_get_font_funcs() - - - hb_ot_layout_substitute_start() - hb_ot_layout_substitute_lookup() - hb_ot_layout_substitute_finish() - hb_ot_layout_position_start() - hb_ot_layout_position_lookup() - hb_ot_layout_position_finish() - - - -Overview of changes leading to 0.6.0 -Friday, May 27, 2011 -==================================== - -- Vertical text support in GPOS -- Almost all API entries have unit tests now, under test/ -- All thread-safety issues are fixed - -Summary of API changes follows. - - -* Simple Types API: - - o New API: - HB_LANGUAGE_INVALID - hb_language_get_default() - hb_direction_to_string() - hb_direction_from_string() - hb_script_get_horizontal_direction() - HB_UNTAG() - - o Renamed API: - hb_category_t renamed to hb_unicode_general_category_t - - o Changed API: - hb_language_t is a typed pointers now - - o Removed API: - HB_TAG_STR() - - -* Use ISO 15924 tags for hb_script_t: - - o New API: - hb_script_from_iso15924_tag() - hb_script_to_iso15924_tag() - hb_script_from_string() - - o Changed API: - HB_SCRIPT_* enum members changed value. - - -* Buffer API streamlined: - - o New API: - hb_buffer_reset() - hb_buffer_set_length() - hb_buffer_allocation_successful() - - o Renamed API: - hb_buffer_ensure() renamed to hb_buffer_pre_allocate() - hb_buffer_add_glyph() renamed to hb_buffer_add() - - o Removed API: - hb_buffer_clear() - hb_buffer_clear_positions() - - o Changed API: - hb_buffer_get_glyph_infos() takes an out length parameter now - hb_buffer_get_glyph_positions() takes an out length parameter now - - -* Blob API streamlined: - - o New API: - hb_blob_get_data() - hb_blob_get_data_writable() - - o Renamed API: - hb_blob_create_empty() renamed to hb_blob_get_empty() - - o Removed API: - hb_blob_lock() - hb_blob_unlock() - hb_blob_is_writable() - hb_blob_try_writable() - - o Changed API: - hb_blob_create() takes user_data before destroy now - - -* Unicode functions API: - - o Unicode function vectors can subclass other unicode function vectors now. - Unimplemented callbacks in the subclass automatically chainup to the parent. - - o All hb_unicode_funcs_t callbacks take a user_data now. Their setters - take a user_data and its respective destroy callback. - - o New API: - hb_unicode_funcs_get_empty() - hb_unicode_funcs_get_default() - hb_unicode_funcs_get_parent() - - o Changed API: - hb_unicode_funcs_create() now takes a parent_funcs. - - o Removed func getter functions: - hb_unicode_funcs_get_mirroring_func() - hb_unicode_funcs_get_general_category_func() - hb_unicode_funcs_get_script_func() - hb_unicode_funcs_get_combining_class_func() - hb_unicode_funcs_get_eastasian_width_func() - - -* Face API: - - o Renamed API: - hb_face_get_table() renamed to hb_face_reference_table() - hb_face_create_for_data() renamed to hb_face_create() - - o Changed API: - hb_face_create_for_tables() takes user_data before destroy now - hb_face_reference_table() returns empty blob instead of NULL - hb_get_table_func_t accepts the face as first parameter now - -* Font API: - - o Fonts can subclass other fonts now. Unimplemented callbacks in the - subclass automatically chainup to the parent. When chaining up, - scale is adjusted if the parent font has a different scale. - - o All hb_font_funcs_t callbacks take a user_data now. Their setters - take a user_data and its respective destroy callback. - - o New API: - hb_font_get_parent() - hb_font_funcs_get_empty() - hb_font_create_sub_font() - - o Removed API: - hb_font_funcs_copy() - hb_font_unset_funcs() - - o Removed func getter functions: - hb_font_funcs_get_glyph_func() - hb_font_funcs_get_glyph_advance_func() - hb_font_funcs_get_glyph_extents_func() - hb_font_funcs_get_contour_point_func() - hb_font_funcs_get_kerning_func() - - o Changed API: - hb_font_create() takes a face and references it now - hb_font_set_funcs() takes user_data before destroy now - hb_font_set_scale() accepts signed integers now - hb_font_get_contour_point_func_t now takes glyph first, then point_index - hb_font_get_glyph_func_t returns a success boolean now - - -* Changed object model: - - o All object types have a _get_empty() now: - hb_blob_get_empty() - hb_buffer_get_empty() - hb_face_get_empty() - hb_font_get_empty() - hb_font_funcs_get_empty() - hb_unicode_funcs_get_empty() - - o Added _set_user_data() and _get_user_data() for all object types: - hb_blob_get_user_data() - hb_blob_set_user_data() - hb_buffer_get_user_data() - hb_buffer_set_user_data() - hb_face_get_user_data() - hb_face_set_user_data() - hb_font_funcs_get_user_data() - hb_font_funcs_set_user_data() - hb_font_get_user_data() - hb_font_set_user_data() - hb_unicode_funcs_get_user_data() - hb_unicode_funcs_set_user_data() - - o Removed the _get_reference_count() from all object types: - hb_blob_get_reference_count() - hb_buffer_get_reference_count() - hb_face_get_reference_count() - hb_font_funcs_get_reference_count() - hb_font_get_reference_count() - hb_unicode_funcs_get_reference_count() - - o Added _make_immutable() and _is_immutable() for all object types except for buffer: - hb_blob_make_immutable() - hb_blob_is_immutable() - hb_face_make_immutable() - hb_face_is_immutable() - - -* Changed API for vertical text support - - o The following callbacks where removed: - hb_font_get_glyph_advance_func_t - hb_font_get_kerning_func_t - - o The following new callbacks added instead: - hb_font_get_glyph_h_advance_func_t - hb_font_get_glyph_v_advance_func_t - hb_font_get_glyph_h_origin_func_t - hb_font_get_glyph_v_origin_func_t - hb_font_get_glyph_h_kerning_func_t - hb_font_get_glyph_v_kerning_func_t - - o The following API removed as such: - hb_font_funcs_set_glyph_advance_func() - hb_font_funcs_set_kerning_func() - hb_font_get_glyph_advance() - hb_font_get_kerning() - - o New API added instead: - hb_font_funcs_set_glyph_h_advance_func() - hb_font_funcs_set_glyph_v_advance_func() - hb_font_funcs_set_glyph_h_origin_func() - hb_font_funcs_set_glyph_v_origin_func() - hb_font_funcs_set_glyph_h_kerning_func() - hb_font_funcs_set_glyph_v_kerning_func() - hb_font_get_glyph_h_advance() - hb_font_get_glyph_v_advance() - hb_font_get_glyph_h_origin() - hb_font_get_glyph_v_origin() - hb_font_get_glyph_h_kerning() - hb_font_get_glyph_v_kerning() - - o The following higher-leve API added for convenience: - hb_font_get_glyph_advance_for_direction() - hb_font_get_glyph_origin_for_direction() - hb_font_add_glyph_origin_for_direction() - hb_font_subtract_glyph_origin_for_direction() - hb_font_get_glyph_kerning_for_direction() - hb_font_get_glyph_extents_for_origin() - hb_font_get_glyph_contour_point_for_origin() - - -* OpenType Layout API: - - o New API: - hb_ot_layout_position_start() - hb_ot_layout_substitute_start() - hb_ot_layout_substitute_finish() - - -* Glue code: - - o New API: - hb_glib_script_to_script() - hb_glib_script_from_script() - hb_icu_script_to_script() - hb_icu_script_from_script() - - -* Version API added: - - o New API: - HB_VERSION_MAJOR - HB_VERSION_MINOR - HB_VERSION_MICRO - HB_VERSION_STRING - HB_VERSION_CHECK() - hb_version() - hb_version_string() - hb_version_check() - - diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/README b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/README deleted file mode 100644 index 74e739da52a..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/README +++ /dev/null @@ -1,7 +0,0 @@ -This is HarfBuzz, a text shaping library. - -For bug reports, mailing list, and other information please visit: - - http://harfbuzz.org/ - -For license information, see the file COPYING. diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/THANKS b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/THANKS deleted file mode 100644 index 940cfde5c39..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/THANKS +++ /dev/null @@ -1,7 +0,0 @@ -Bradley Grainger -Khaled Hosny -Kenichi Ishibashi -Ryan Lortie -Jeff Muizelaar -suzuki toshiya -Philip Withnall diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/TODO b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/TODO deleted file mode 100644 index 31b44b84234..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/TODO +++ /dev/null @@ -1,87 +0,0 @@ -General fixes: -============= - -- AAT 'morx' implementation. - -- Return "safe-to-break" bit from shaping. - -- Disable 'vert' if 'vrt2' is available (eg. Motoya fonts with arrow chars). - -- Implement 'rand' feature. - -- mask propagation? (when ligation, "or" the masks). - -- Warn at compile time (and runtime with HB_DEBUG?) if no Unicode / font - funcs found / set. - -- Do proper rounding when scaling from font space? May be a non-issue. - -- Misc features: - * init/medi/fina/isol for non-cursive scripts - - -API issues to fix before 1.0: -============================ - -- API to accept a list of languages. - -- Add default font_funcs / Unicode funcs API and to utils. - -- Add init_func to font_funcs. Adjust ft. - -- Add pkg-config files for glue codes (harfbuzz-glib, etc) - -- Figure out how many .so objects, how to link, etc - -- 'const' for getter APIs? (use mutable internally) - -- blob_from_file? - - -API additions -============= - -- Language to/from script. - -- Buffer (de)serialize API ala hb-shape? - -- Add hb-cairo glue - -- Add sanitize API (and a cached version, that saves result on blob user-data) - -- Add glib GBoxedType stuff and introspection - -- BCP 47 language handling / API (language_matches?) - -- Add hb_font_create_linear()? - -- Add query API for aalt-like features? - -- SFNT api? get_num_faces? get_table_tags? (there's something in stash) - -- Add segmentation API - -- Add hb-fribidi glue? - - -hb-view / hb-shape enhancements: -=============================== - -- Add --width, --height, --auto-size, --align, etc? - - -Tests to write: -============== - -- ot-layout enumeration API (needs font) - -- Finish test-shape.c, grep for TODO - -- Finish test-unicode.c, grep for TODO - -- GObject, FreeType, etc - -- hb_cache_t and relatives - -- hb_feature_to/from_string -- hb_buffer_[sg]et_contents diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/autogen.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/autogen.sh deleted file mode 100755 index 833a6219c86..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/autogen.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. - -test -n "$srcdir" || srcdir=`dirname "$0"` -test -n "$srcdir" || srcdir=. - -olddir=`pwd` -cd $srcdir - -echo -n "checking for ragel... " -which ragel || { - echo "You need to install ragel... See http://www.complang.org/ragel/" - exit 1 -} - -echo -n "checking for pkg-config... " -which pkg-config || { - echo "*** No pkg-config found, please install it ***" - exit 1 -} - -echo -n "checking for autoreconf... " -which autoreconf || { - echo "*** No autoreconf found, please install it ***" - exit 1 -} - -echo "running autoreconf --force --install --verbose" -autoreconf --force --install --verbose || exit $? - -cd $olddir -echo "running configure $@" -test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/config.h.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/config.h.in deleted file mode 100644 index f76fa067752..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/config.h.in +++ /dev/null @@ -1,144 +0,0 @@ -/* config.h.in. Generated from configure.ac by autoheader. */ - -/* Define to 1 if you have the `atexit' function. */ -#undef HAVE_ATEXIT - -/* Have cairo graphics library */ -#undef HAVE_CAIRO - -/* Have cairo-ft support in cairo graphics library */ -#undef HAVE_CAIRO_FT - -/* Have Core Text backend */ -#undef HAVE_CORETEXT - -/* Define to 1 if you have the <dlfcn.h> header file. */ -#undef HAVE_DLFCN_H - -/* Have FreeType 2 library */ -#undef HAVE_FREETYPE - -/* Define to 1 if you have the `FT_Face_GetCharVariantIndex' function. */ -#undef HAVE_FT_FACE_GETCHARVARIANTINDEX - -/* Define to 1 if you have the `getpagesize' function. */ -#undef HAVE_GETPAGESIZE - -/* Have glib2 library */ -#undef HAVE_GLIB - -/* Have gobject2 library */ -#undef HAVE_GOBJECT - -/* Have Graphite library */ -#undef HAVE_GRAPHITE2 - -/* Have Old HarfBuzz backend */ -#undef HAVE_HB_OLD - -/* Have ICU library */ -#undef HAVE_ICU - -/* Have ICU Layout Engine library */ -#undef HAVE_ICU_LE - -/* Have Intel __sync_* atomic primitives */ -#undef HAVE_INTEL_ATOMIC_PRIMITIVES - -/* Define to 1 if you have the <inttypes.h> header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the `isatty' function. */ -#undef HAVE_ISATTY - -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the `mmap' function. */ -#undef HAVE_MMAP - -/* Define to 1 if you have the `mprotect' function. */ -#undef HAVE_MPROTECT - -/* Have native OpenType Layout backend */ -#undef HAVE_OT - -/* Have POSIX threads */ -#undef HAVE_PTHREAD - -/* Have PTHREAD_PRIO_INHERIT. */ -#undef HAVE_PTHREAD_PRIO_INHERIT - -/* Define to 1 if you have the <sched.h> header file. */ -#undef HAVE_SCHED_H - -/* Have sched_yield */ -#undef HAVE_SCHED_YIELD - -/* Have Solaris __machine_*_barrier and atomic_* operations */ -#undef HAVE_SOLARIS_ATOMIC_OPS - -/* Define to 1 if you have the <stdint.h> header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the <stdlib.h> header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the <strings.h> header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the <string.h> header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the `sysconf' function. */ -#undef HAVE_SYSCONF - -/* Define to 1 if you have the <sys/mman.h> header file. */ -#undef HAVE_SYS_MMAN_H - -/* Define to 1 if you have the <sys/stat.h> header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the <sys/types.h> header file. */ -#undef HAVE_SYS_TYPES_H - -/* Have UCDN Unicode functions */ -#undef HAVE_UCDN - -/* Have Uniscribe backend */ -#undef HAVE_UNISCRIBE - -/* Define to 1 if you have the <unistd.h> header file. */ -#undef HAVE_UNISTD_H - -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ -#undef LT_OBJDIR - -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the home page for this package. */ -#undef PACKAGE_URL - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define to necessary symbol if this constant uses a non-standard name on - your system. */ -#undef PTHREAD_CREATE_JOINABLE - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/configure.ac b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/configure.ac deleted file mode 100644 index fcae6a292a3..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/configure.ac +++ /dev/null @@ -1,360 +0,0 @@ -AC_PREREQ([2.64]) -AC_INIT([HarfBuzz], - [0.9.15], - [http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz], - [harfbuzz], - [http://harfbuzz.org/]) - -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_SRCDIR([harfbuzz.pc.in]) -AC_CONFIG_HEADERS([config.h]) - -AM_INIT_AUTOMAKE([1.11.1 gnits dist-bzip2 no-dist-gzip -Wall no-define color-tests]) -AM_SILENT_RULES([yes]) - -# Initialize libtool -AM_PROG_AR -LT_PREREQ([2.2]) -LT_INIT([disable-static]) - -# Check for programs -AC_PROG_CC -AM_PROG_CC_C_O -AC_PROG_CXX -PKG_PROG_PKG_CONFIG([0.20]) - -# Version -m4_define(hb_version_triplet,m4_split(AC_PACKAGE_VERSION,[[.]])) -m4_define(hb_version_major,m4_argn(1,hb_version_triplet)) -m4_define(hb_version_minor,m4_argn(2,hb_version_triplet)) -m4_define(hb_version_micro,m4_argn(3,hb_version_triplet)) -HB_VERSION_MAJOR=hb_version_major -HB_VERSION_MINOR=hb_version_minor -HB_VERSION_MICRO=hb_version_micro -HB_VERSION=AC_PACKAGE_VERSION -AC_SUBST(HB_VERSION_MAJOR) -AC_SUBST(HB_VERSION_MINOR) -AC_SUBST(HB_VERSION_MICRO) -AC_SUBST(HB_VERSION) - -# Libtool version -m4_define([hb_version_int], - m4_eval(hb_version_major*10000 + hb_version_minor*100 + hb_version_micro)) -m4_if(m4_eval(hb_version_minor % 2), [1], - dnl for unstable releases - [m4_define([hb_libtool_revision], 0)], - dnl for stable releases - [m4_define([hb_libtool_revision], hb_version_micro)]) -m4_define([hb_libtool_age], - m4_eval(hb_version_int - hb_libtool_revision)) -m4_define([hb_libtool_current], - m4_eval(hb_version_major + hb_libtool_age)) -HB_LIBTOOL_VERSION_INFO=hb_libtool_current:hb_libtool_revision:hb_libtool_age -AC_SUBST(HB_LIBTOOL_VERSION_INFO) - -dnl GOBJECT_INTROSPECTION_CHECK([0.9.0]) -dnl GTK_DOC_CHECK([1.15],[--flavour no-tmpl]) - -# Functions and headers -AC_CHECK_FUNCS(atexit mprotect sysconf getpagesize mmap isatty) -AC_CHECK_HEADERS(unistd.h sys/mman.h) - -# Compiler flags -AC_CANONICAL_HOST -if test "x$GCC" = "xyes"; then - - # Make symbols link locally - LDFLAGS="$LDFLAGS -Bsymbolic-functions" - - # Make sure we don't link to libstdc++ - CXXFLAGS="$CXXFLAGS -fno-rtti -fno-exceptions" - - # Assorted warnings - CXXFLAGS="$CXXFLAGS -Wcast-align" - - case "$host" in - *-*-mingw*) - ;; - *) - # Hide inline methods - CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden" - ;; - esac - - case "$host" in - arm-*-*) - # Request byte alignment on arm - CXXFLAGS="$CXXFLAGS -mstructure-size-boundary=8" - ;; - esac -fi - -AM_CONDITIONAL(HAVE_GCC, test "x$GCC" = "xyes") - -hb_os_win32=no -AC_MSG_CHECKING([for native Win32]) -case "$host" in - *-*-mingw*) - hb_os_win32=yes - ;; -esac -AC_MSG_RESULT([$hb_os_win32]) -AM_CONDITIONAL(OS_WIN32, test "$hb_os_win32" = "yes") - -have_pthread=false -if test "$hb_os_win32" = no; then - AX_PTHREAD([have_pthread=true]) -fi -if $have_pthread; then - AC_DEFINE(HAVE_PTHREAD, 1, [Have POSIX threads]) -fi -AM_CONDITIONAL(HAVE_PTHREAD, $have_pthread) - -dnl ========================================================================== - -have_ot=true -if $have_ot; then - AC_DEFINE(HAVE_OT, 1, [Have native OpenType Layout backend]) -fi -AM_CONDITIONAL(HAVE_OT, $have_ot) - -dnl =========================================================================== - -have_hb_old=true -if $have_hb_old; then - AC_DEFINE(HAVE_HB_OLD, 1, [Have Old HarfBuzz backend]) -fi -AM_CONDITIONAL(HAVE_HB_OLD, $have_hb_old) - -dnl =========================================================================== - -have_ucdn=true -if $have_ucdn; then - AC_DEFINE(HAVE_UCDN, 1, [Have UCDN Unicode functions]) -fi -AM_CONDITIONAL(HAVE_UCDN, $have_ucdn) - -dnl =========================================================================== - -PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16, have_glib=true, have_glib=false) -if $have_glib; then - AC_DEFINE(HAVE_GLIB, 1, [Have glib2 library]) -fi -AM_CONDITIONAL(HAVE_GLIB, $have_glib) - -PKG_CHECK_MODULES(GOBJECT, gobject-2.0 glib-2.0 >= 2.16, have_gobject=true, have_gobject=false) -if $have_gobject; then - AC_DEFINE(HAVE_GOBJECT, 1, [Have gobject2 library]) - GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` - AC_SUBST(GLIB_MKENUMS) -fi -AM_CONDITIONAL(HAVE_GOBJECT, $have_gobject) - -dnl ========================================================================== - -PKG_CHECK_MODULES(CAIRO, cairo >= 1.8.0, have_cairo=true, have_cairo=false) -if $have_cairo; then - AC_DEFINE(HAVE_CAIRO, 1, [Have cairo graphics library]) -fi -AM_CONDITIONAL(HAVE_CAIRO, $have_cairo) - -PKG_CHECK_MODULES(CAIRO_FT, cairo-ft, have_cairo_ft=true, have_cairo_ft=false) -if $have_cairo_ft; then - AC_DEFINE(HAVE_CAIRO_FT, 1, [Have cairo-ft support in cairo graphics library]) -fi -AM_CONDITIONAL(HAVE_CAIRO_FT, $have_cairo_ft) - -dnl ========================================================================== - -PKG_CHECK_MODULES(ICU, icu-uc, have_icu=true, have_icu=false) -dnl Fallback to icu-config if ICU pkg-config files could not be found -if test "$have_icu" != "true"; then - AC_CHECK_TOOL(ICU_CONFIG, icu-config, no) - AC_MSG_CHECKING([for ICU by using icu-config fallback]) - if test "$ICU_CONFIG" != "no" && "$ICU_CONFIG" --version >/dev/null; then - have_icu=true - # We don't use --cflags as this gives us a lot of things that we don't - # necessarily want, like debugging and optimization flags - # See man (1) icu-config for more info. - ICU_CFLAGS=`$ICU_CONFIG --cppflags` - ICU_LIBS=`$ICU_CONFIG --ldflags-libsonly` - AC_SUBST(ICU_CFLAGS) - AC_SUBST(ICU_LIBS) - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi -fi - -if $have_icu; then - CXXFLAGS="$CXXFLAGS `$PKG_CONFIG --variable=CXXFLAGS icu-uc`" - AC_DEFINE(HAVE_ICU, 1, [Have ICU library]) -fi -AM_CONDITIONAL(HAVE_ICU, $have_icu) - -dnl ========================================================================== - -PKG_CHECK_MODULES(ICU_LE, icu-le icu-uc, have_icu_le=true, have_icu_le=false) -dnl Fallback to icu-config if ICU pkg-config files could not be found -if test "$have_icu_le" != "true"; then - AC_CHECK_TOOL(ICU_CONFIG, icu-config, no) - AC_MSG_CHECKING([for ICU_LE by using icu-config fallback]) - if test "$ICU_CONFIG" != "no" && "$ICU_CONFIG" --version >/dev/null; then - have_icu_le=true - # We don't use --cflags as this gives us a lot of things that we don't - # necessarily want, like debugging and optimization flags - # See man (1) icu-config for more info. - ICU_LE_CFLAGS=`$ICU_CONFIG --cppflags` - ICU_LE_LIBS=`$ICU_CONFIG --ldflags-libsonly --ldflags-layout` - AC_SUBST(ICU_LE_CFLAGS) - AC_SUBST(ICU_LE_LIBS) - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - fi -fi -if $have_icu_le; then - AC_DEFINE(HAVE_ICU_LE, 1, [Have ICU Layout Engine library]) -fi -AM_CONDITIONAL(HAVE_ICU_LE, $have_icu_le) - -dnl ========================================================================== - -PKG_CHECK_MODULES(GRAPHITE2, graphite2, have_graphite=true, have_graphite=false) -if $have_graphite; then - AC_DEFINE(HAVE_GRAPHITE2, 1, [Have Graphite library]) -fi -AM_CONDITIONAL(HAVE_GRAPHITE2, $have_graphite) - -dnl ========================================================================== - -PKG_CHECK_MODULES(FREETYPE, freetype2 >= 2.3.8, have_freetype=true, have_freetype=false) -if $have_freetype; then - AC_DEFINE(HAVE_FREETYPE, 1, [Have FreeType 2 library]) - _save_libs="$LIBS" - _save_cflags="$CFLAGS" - LIBS="$LIBS $FREETYPE_LIBS" - CFLAGS="$CFLAGS $FREETYPE_CFLAGS" - AC_CHECK_FUNCS(FT_Face_GetCharVariantIndex) - LIBS="$_save_libs" - CFLAGS="$_save_cflags" -fi -AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype) - -dnl =========================================================================== - -AC_MSG_CHECKING([for ScriptShapeOpenType in usp10]) -saved_LIBS=$LIBS -LIBS="$LIBS -lusp10 -lgdi32" -AC_LINK_IFELSE([AC_LANG_PROGRAM( - [[ - #define _WIN32_WINNT 0x0600 - #include <windows.h> - #include <usp10.h> - ]], - ScriptShapeOpenType)], - [have_uniscribe=true; AC_MSG_RESULT(yes)], - [have_uniscribe=false;AC_MSG_RESULT(no)]) -LIBS=$saved_LIBS -if $have_uniscribe; then - UNISCRIBE_CFLAGS= - UNISCRIBE_LIBS="-lusp10 -lgdi32" - AC_SUBST(UNISCRIBE_CFLAGS) - AC_SUBST(UNISCRIBE_LIBS) - AC_DEFINE(HAVE_UNISCRIBE, 1, [Have Uniscribe backend]) -fi -AM_CONDITIONAL(HAVE_UNISCRIBE, $have_uniscribe) - -dnl =========================================================================== - -AC_CHECK_TYPE(CTFontRef, have_coretext=true, have_coretext=false, [#include <ApplicationServices/ApplicationServices.h>]) -if $have_coretext; then - CORETEXT_CFLAGS= - CORETEXT_LIBS="-framework ApplicationServices" - AC_SUBST(CORETEXT_CFLAGS) - AC_SUBST(CORETEXT_LIBS) - AC_DEFINE(HAVE_CORETEXT, 1, [Have Core Text backend]) -fi -AM_CONDITIONAL(HAVE_CORETEXT, $have_coretext) - -dnl =========================================================================== - -AC_CACHE_CHECK([for Intel atomic primitives], hb_cv_have_intel_atomic_primitives, [ - hb_cv_have_intel_atomic_primitives=false - AC_TRY_LINK([ - void memory_barrier (void) { __sync_synchronize (); } - int atomic_add (int *i) { return __sync_fetch_and_add (i, 1); } - int mutex_trylock (int *m) { return __sync_lock_test_and_set (m, 1); } - void mutex_unlock (int *m) { __sync_lock_release (m); } - ], [], hb_cv_have_intel_atomic_primitives=true - ) -]) -if $hb_cv_have_intel_atomic_primitives; then - AC_DEFINE(HAVE_INTEL_ATOMIC_PRIMITIVES, 1, [Have Intel __sync_* atomic primitives]) -fi - -dnl =========================================================================== - -AC_CACHE_CHECK([for Solaris atomic operations], hb_cv_have_solaris_atomic_ops, [ - hb_cv_have_solaris_atomic_ops=false - AC_TRY_LINK([ - #include <atomic.h> - /* This requires Solaris Studio 12.2 or newer: */ - #include <mbarrier.h> - void memory_barrier (void) { __machine_rw_barrier (); } - int atomic_add (volatile unsigned *i) { return atomic_add_int_nv (i, 1); } - void *atomic_ptr_cmpxchg (volatile void **target, void *cmp, void *newval) { return atomic_cas_ptr (target, cmp, newval); } - ], [], hb_cv_have_solaris_atomic_ops=true - ) -]) -if $hb_cv_have_solaris_atomic_ops; then - AC_DEFINE(HAVE_SOLARIS_ATOMIC_OPS, 1, [Have Solaris __machine_*_barrier and atomic_* operations]) -fi - -if test "$os_win32" = no && ! $have_pthread; then - AC_CHECK_HEADERS(sched.h) - AC_SEARCH_LIBS(sched_yield,rt,AC_DEFINE(HAVE_SCHED_YIELD, 1, [Have sched_yield])) -fi - -dnl =========================================================================== - -AC_CONFIG_FILES([ -Makefile -harfbuzz.pc -src/Makefile -src/hb-version.h -src/hb-icu-le/Makefile -src/hb-old/Makefile -src/hb-ucdn/Makefile -util/Makefile -test/Makefile -test/api/Makefile -test/shaping/Makefile -]) - -AC_OUTPUT - -AC_MSG_NOTICE([ - -Build configuration: - -Unicode callbacks (you want at least one): - Glib: ${have_glib} - ICU: ${have_icu} - UCDN: ${have_ucdn} - -Font callbacks (the more the better): - FreeType: ${have_freetype} - -Tools used for command-line utilities: - Cairo: ${have_cairo} - -Additional shapers (the more the better): - Graphite2: ${have_graphite} - -Test / platform shapers (not normally needed): - CoreText: ${have_coretext} - ICU Layout Engine: ${have_icu_le} - Old HarfBuzz: ${have_hb_old} - Uniscribe: ${have_uniscribe} -]) diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/harfbuzz.doap b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/harfbuzz.doap deleted file mode 100644 index d2896ebefa8..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/harfbuzz.doap +++ /dev/null @@ -1,24 +0,0 @@ -<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#" - xmlns:foaf="http://xmlns.com/foaf/0.1/" - xmlns="http://usefulinc.com/ns/doap#"> - - <name xml:lang="en">harfbuzz</name> - <shortdesc xml:lang="en">Text shaping library</shortdesc> - - <homepage - rdf:resource="http://harfbuzz.org/" /> - <mailing-list - rdf:resource="http://lists.freedesktop.org/mailman/listinfo/harfbuzz" /> - <!--download-page - rdf:resource=""/--> - <bug-database - rdf:resource="http://bugs.freedesktop.org/enter_bug.cgi?product=harfbuzz"/> - - <maintainer> - <foaf:Person> - <foaf:name>Behdad Esfahbod</foaf:name> - <foaf:mbox rdf:resource="mailto:harfbuzz@behdad.org" /> - </foaf:Person> - </maintainer> -</Project> diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/harfbuzz.pc.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/harfbuzz.pc.in deleted file mode 100644 index e92319e156c..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/harfbuzz.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -Name: harfbuzz -Description: Text shaping library -Version: @VERSION@ - -Libs: -L${libdir} -lharfbuzz -Cflags: -I${includedir}/harfbuzz diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/Makefile.am b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/Makefile.am deleted file mode 100644 index 342a3fb388c..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/Makefile.am +++ /dev/null @@ -1,356 +0,0 @@ -# Process this file with automake to produce Makefile.in - -NULL = -SUBDIRS = -DIST_SUBDIRS = -BUILT_SOURCES = -EXTRA_DIST = -CLEANFILES = -DISTCLEANFILES = -MAINTAINERCLEANFILES = -DISTCHECK_CONFIGURE_FLAGS = --enable-introspection - -# The following warning options are useful for debugging: -Wpadded -#AM_CXXFLAGS = - -lib_LTLIBRARIES = libharfbuzz.la - -HBCFLAGS = -HBLIBS = -HBSOURCES = \ - hb-atomic-private.hh \ - hb-blob.cc \ - hb-buffer-deserialize-json.hh \ - hb-buffer-deserialize-text.hh \ - hb-buffer-private.hh \ - hb-buffer-serialize.cc \ - hb-buffer.cc \ - hb-cache-private.hh \ - hb-common.cc \ - hb-fallback-shape.cc \ - hb-font-private.hh \ - hb-font.cc \ - hb-mutex-private.hh \ - hb-object-private.hh \ - hb-open-file-private.hh \ - hb-open-type-private.hh \ - hb-ot-head-table.hh \ - hb-ot-hhea-table.hh \ - hb-ot-hmtx-table.hh \ - hb-ot-maxp-table.hh \ - hb-ot-name-table.hh \ - hb-ot-tag.cc \ - hb-private.hh \ - hb-set-private.hh \ - hb-set.cc \ - hb-shape.cc \ - hb-shape-plan-private.hh \ - hb-shape-plan.cc \ - hb-shaper-list.hh \ - hb-shaper-impl-private.hh \ - hb-shaper-private.hh \ - hb-shaper.cc \ - hb-tt-font.cc \ - hb-unicode-private.hh \ - hb-unicode.cc \ - hb-utf-private.hh \ - hb-warning.cc \ - $(NULL) -HBHEADERS = \ - hb.h \ - hb-blob.h \ - hb-buffer.h \ - hb-common.h \ - hb-font.h \ - hb-set.h \ - hb-shape.h \ - hb-shape-plan.h \ - hb-unicode.h \ - $(NULL) -HBNODISTHEADERS = \ - hb-version.h \ - $(NULL) - -if HAVE_OT -HBSOURCES += \ - hb-ot-layout.cc \ - hb-ot-layout-common-private.hh \ - hb-ot-layout-gdef-table.hh \ - hb-ot-layout-gpos-table.hh \ - hb-ot-layout-gsubgpos-private.hh \ - hb-ot-layout-gsub-table.hh \ - hb-ot-layout-private.hh \ - hb-ot-map.cc \ - hb-ot-map-private.hh \ - hb-ot-shape.cc \ - hb-ot-shape-complex-arabic.cc \ - hb-ot-shape-complex-arabic-fallback.hh \ - hb-ot-shape-complex-arabic-table.hh \ - hb-ot-shape-complex-default.cc \ - hb-ot-shape-complex-indic.cc \ - hb-ot-shape-complex-indic-machine.hh \ - hb-ot-shape-complex-indic-private.hh \ - hb-ot-shape-complex-indic-table.cc \ - hb-ot-shape-complex-myanmar.cc \ - hb-ot-shape-complex-myanmar-machine.hh \ - hb-ot-shape-complex-sea.cc \ - hb-ot-shape-complex-sea-machine.hh \ - hb-ot-shape-complex-thai.cc \ - hb-ot-shape-complex-private.hh \ - hb-ot-shape-normalize-private.hh \ - hb-ot-shape-normalize.cc \ - hb-ot-shape-fallback-private.hh \ - hb-ot-shape-fallback.cc \ - hb-ot-shape-private.hh \ - $(NULL) -HBHEADERS += \ - hb-ot.h \ - hb-ot-layout.h \ - hb-ot-tag.h \ - $(NULL) -endif - -if HAVE_PTHREAD -HBCFLAGS += $(PTHREAD_CFLAGS) -HBLIBS += $(PTHREAD_LIBS) -endif - -if HAVE_GLIB -HBCFLAGS += $(GLIB_CFLAGS) -HBLIBS += $(GLIB_LIBS) -HBSOURCES += hb-glib.cc -HBHEADERS += hb-glib.h -endif - -if HAVE_GOBJECT -HBCFLAGS += $(GOBJECT_CFLAGS) -HBLIBS += $(GOBJECT_LIBS) -HBSOURCES += hb-gobject-structs.cc -nodist_HBSOURCES = hb-gobject-enums.cc -HBHEADERS += hb-gobject.h -BUILT_SOURCES += hb-gobject-enums.cc -EXTRA_DIST += hb-gobject-enums.cc.tmpl -DISTCLEANFILES += hb-gobject-enums.cc - -hb-gobject-enums.cc: hb-gobject-enums.cc.tmpl $(HBHEADERS) - $(AM_V_GEN) $(GLIB_MKENUMS) --template $^ > "$@.tmp" && \ - mv "$@.tmp" "$@" || ( $(RM) "@.tmp" && false ) -endif - -if HAVE_ICU -HBCFLAGS += $(ICU_CFLAGS) -HBLIBS += $(ICU_LIBS) -HBSOURCES += hb-icu.cc -HBHEADERS += hb-icu.h -endif - -if HAVE_FREETYPE -HBCFLAGS += $(FREETYPE_CFLAGS) -HBLIBS += $(FREETYPE_LIBS) -HBSOURCES += hb-ft.cc -HBHEADERS += hb-ft.h -endif - -if HAVE_GRAPHITE2 -HBCFLAGS += $(GRAPHITE2_CFLAGS) -HBLIBS += $(GRAPHITE2_LIBS) -HBSOURCES += hb-graphite2.cc -HBHEADERS += hb-graphite2.h -endif - -if HAVE_UNISCRIBE -HBCFLAGS += $(UNISCRIBE_CFLAGS) -HBLIBS += $(UNISCRIBE_LIBS) -HBSOURCES += hb-uniscribe.cc -HBHEADERS += hb-uniscribe.h -endif - -if HAVE_CORETEXT -HBCFLAGS += $(CORETEXT_CFLAGS) -HBLIBS += $(CORETEXT_LIBS) -HBSOURCES += hb-coretext.cc -HBHEADERS += hb-coretext.h -endif - -if HAVE_HB_OLD -SUBDIRS += hb-old -HBCFLAGS += -I$(srcdir)/hb-old -HBLIBS += hb-old/libhb-old.la -HBSOURCES += hb-old.cc -endif -DIST_SUBDIRS += hb-old - -if HAVE_ICU_LE -SUBDIRS += hb-icu-le -HBCFLAGS += -I$(srcdir)/hb-icu-le -HBLIBS += hb-icu-le/libhb-icu-le.la -HBSOURCES += hb-icu-le.cc -endif -DIST_SUBDIRS += hb-icu-le - -if HAVE_UCDN -SUBDIRS += hb-ucdn -HBCFLAGS += -I$(srcdir)/hb-ucdn -HBLIBS += hb-ucdn/libhb-ucdn.la -HBSOURCES += hb-ucdn.cc -endif -DIST_SUBDIRS += hb-ucdn - - -# Put the library together - -if OS_WIN32 -export_symbols = -export-symbols harfbuzz.def -harfbuzz_def_dependency = harfbuzz.def -libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS) -else -if HAVE_ICU -libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS) -else -# Use a C linker for GCC, not C++; Don't link to libstdc++ -if HAVE_GCC -libharfbuzz_la_LINK = $(LINK) $(libharfbuzz_la_LDFLAGS) -else -libharfbuzz_la_LINK = $(CXXLINK) $(libharfbuzz_la_LDFLAGS) -endif -endif -endif - -libharfbuzz_la_SOURCES = $(HBSOURCES) $(HBHEADERS) $(HBNODISTHEADERS) -nodist_libharfbuzz_la_SOURCES = $(nodist_HBSOURCES) -libharfbuzz_la_CPPFLAGS = $(HBCFLAGS) -libharfbuzz_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(HB_LIBTOOL_VERSION_INFO) $(export_symbols) -no-undefined -libharfbuzz_la_LIBADD = $(HBLIBS) -EXTRA_libharfbuzz_la_DEPENDENCIES = $(harfbuzz_def_dependency) -pkginclude_HEADERS = $(HBHEADERS) -nodist_pkginclude_HEADERS = $(HBNODISTHEADERS) - -CLEANFILES += harfbuzz.def -harfbuzz.def: $(HBHEADERS) $(HBNODISTHEADERS) - $(AM_V_GEN) (echo EXPORTS; \ - (cat $^ || echo 'hb_ERROR ()' ) | \ - $(EGREP) '^hb_.* \(' | \ - sed -e 's/ (.*//' | \ - LANG=C sort; \ - echo LIBRARY libharfbuzz-$(HB_VERSION_MAJOR).dll; \ - ) >"$@.tmp" - @ ! grep -q hb_ERROR "$@.tmp" && mv "$@.tmp" "$@" || ($(RM) "$@"; false) - - -GENERATORS = \ - gen-arabic-table.py \ - gen-indic-table.py \ - $(NULL) - -EXTRA_DIST += $(GENERATORS) - -unicode-tables: arabic-table indic-table - -indic-table: gen-indic-table.py IndicSyllabicCategory.txt IndicMatraCategory.txt Blocks.txt - $(AM_V_GEN) $(builddir)/$^ > hb-ot-shape-complex-indic-table.cc.tmp && \ - mv hb-ot-shape-complex-indic-table.cc.tmp $(srcdir)/hb-ot-shape-complex-indic-table.cc || \ - ($(RM) hb-ot-shape-complex-indic-table.cc.tmp; false) - -arabic-table: gen-arabic-table.py ArabicShaping.txt UnicodeData.txt - $(AM_V_GEN) $(builddir)/$^ > hb-ot-shape-complex-arabic-table.hh.tmp && \ - mv hb-ot-shape-complex-arabic-table.hh.tmp $(srcdir)/hb-ot-shape-complex-arabic-table.hh || \ - ($(RM) hb-ot-shape-complex-arabic-table.hh.tmp; false) - - -.PHONY: unicode-tables arabic-table indic-table - -BUILT_SOURCES += \ - hb-buffer-deserialize-json.hh \ - hb-buffer-deserialize-text.hh \ - hb-ot-shape-complex-indic-machine.hh \ - hb-ot-shape-complex-myanmar-machine.hh \ - hb-ot-shape-complex-sea-machine.hh \ - $(NULL) -EXTRA_DIST += \ - hb-buffer-deserialize-json.rl \ - hb-buffer-deserialize-text.rl \ - hb-ot-shape-complex-indic-machine.rl \ - hb-ot-shape-complex-myanmar-machine.rl \ - hb-ot-shape-complex-sea-machine.rl \ - $(NULL) -%.hh: %.rl - $(AM_V_GEN)$(top_srcdir)/missing --run ragel -e -F1 -o "$@.tmp" "$<" && \ - mv "$@.tmp" "$@" || ( $(RM) "$@.tmp" && false ) - -noinst_PROGRAMS = \ - main \ - test \ - test-buffer-serialize \ - test-size-params \ - test-would-substitute \ - $(NULL) -bin_PROGRAMS = - -main_SOURCES = main.cc -main_CPPFLAGS = $(HBCFLAGS) -main_LDADD = libharfbuzz.la $(HBLIBS) - -test_SOURCES = test.cc -test_CPPFLAGS = $(HBCFLAGS) $(FREETYPE_CFLAGS) -test_LDADD = libharfbuzz.la $(HBLIBS) $(FREETYPE_LIBS) - -test_would_substitute_SOURCES = test-would-substitute.cc -test_would_substitute_CPPFLAGS = $(HBCFLAGS) $(FREETYPE_CFLAGS) -test_would_substitute_LDADD = libharfbuzz.la $(HBLIBS) $(FREETYPE_LIBS) - -test_size_params_SOURCES = test-size-params.cc -test_size_params_CPPFLAGS = $(HBCFLAGS) -test_size_params_LDADD = libharfbuzz.la $(HBLIBS) - -test_buffer_serialize_SOURCES = test-buffer-serialize.cc -test_buffer_serialize_CPPFLAGS = $(HBCFLAGS) -test_buffer_serialize_LDADD = libharfbuzz.la $(HBLIBS) - -dist_check_SCRIPTS = \ - check-c-linkage-decls.sh \ - check-header-guards.sh \ - check-includes.sh \ - check-symbols.sh \ - $(NULL) - -if HAVE_ICU -else -dist_check_SCRIPTS += check-libstdc++.sh -endif - -if HAVE_ICU_LE -else -dist_check_SCRIPTS += check-static-inits.sh -endif - -TESTS = $(dist_check_SCRIPTS) -TESTS_ENVIRONMENT = \ - srcdir="$(srcdir)" \ - MAKE="$(MAKE) $(AM_MAKEFLAGS)" \ - HBSOURCES="$(HBSOURCES)" \ - HBHEADERS="$(HBHEADERS) $(HBNODISTHEADERS)" \ - $(NULL) - -#-include $(INTROSPECTION_MAKEFILE) -#INTROSPECTION_GIRS = hb-1.0.gir -#INTROSPECTION_SCANNER_ARGS = -I$(srcdir) -n hb --identifier-prefix=hb_ -#INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) -# -#if HAVE_INTROSPECTION -# -#hb-1.0.gir: libharfbuzz.la -#hb_1_0_gir_INCLUDES = GObject-2.0 -#hb_1_0_gir_CFLAGS = $(INCLUDES) $(HBCFLAGS) -DHB_H -DHB_H_IN -DHB_OT_H -DHB_OT_H_IN -#hb_1_0_gir_LIBS = libharfbuzz.la -#hb_1_0_gir_FILES = $(HBHEADERS) $(HBNODISTHEADERS) -# -#girdir = $(datadir)/gir-1.0 -#gir_DATA = $(INTROSPECTION_GIRS) -# -#typelibdir = $(libdir)/girepository-1.0 -#typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) -# -#CLEANFILES += $(gir_DATA) $(typelib_DATA) -#endif - --include $(top_srcdir)/git.mk diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/check-c-linkage-decls.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/check-c-linkage-decls.sh deleted file mode 100755 index 44cdfa0f23c..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/check-c-linkage-decls.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh - -LC_ALL=C -export LC_ALL - -test -z "$srcdir" && srcdir=. -stat=0 - -test "x$HBHEADERS" = x && HBHEADERS=`find . -maxdepth 1 -name 'hb*.h'` -test "x$HBSOURCES" = x && HBSOURCES=`find . -maxdepth 1 -name 'hb*.h'` - - -for x in $HBHEADERS; do - test -f $srcdir/$x && x=$srcdir/$x - if ! grep -q HB_BEGIN_DECLS "$x" || ! grep -q HB_END_DECLS "$x"; then - echo "Ouch, file $x does not have HB_BEGIN_DECLS / HB_END_DECLS, but it should" - stat=1 - fi -done -for x in $HBSOURCES; do - test -f $srcdir/$x && x=$srcdir/$x - if grep -q HB_BEGIN_DECLS "$x" || grep -q HB_END_DECLS "$x"; then - echo "Ouch, file $x has HB_BEGIN_DECLS / HB_END_DECLS, but it shouldn't" - stat=1 - fi -done - -exit $stat diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/check-header-guards.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/check-header-guards.sh deleted file mode 100755 index af9fa7fc24e..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/check-header-guards.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -LC_ALL=C -export LC_ALL - -test -z "$srcdir" && srcdir=. -stat=0 - -test "x$HBHEADERS" = x && HBHEADERS=`find . -maxdepth 1 -name 'hb*.h'` -test "x$HBSOURCES" = x && HBSOURCES=`find . -maxdepth 1 -name 'hb-*.cc' -or -name 'hb-*.hh'` - - -for x in $HBHEADERS $HBSOURCES; do - test -f "$srcdir/$x" && x="$srcdir/$x" - echo "$x" | grep '[^h]$' -q && continue; - xx=`echo "$x" | sed 's@.*/@@'` - tag=`echo "$xx" | tr 'a-z.-' 'A-Z_'` - lines=`grep "\<$tag\>" "$x" | wc -l | sed 's/[ ]*//g'` - if test "x$lines" != x3; then - echo "Ouch, header file $x does not have correct preprocessor guards" - stat=1 - fi -done - -exit $stat diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/check-includes.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/check-includes.sh deleted file mode 100755 index 79323a74fb2..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/check-includes.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh - -LC_ALL=C -export LC_ALL - -test -z "$srcdir" && srcdir=. -stat=0 - -test "x$HBHEADERS" = x && HBHEADERS=`find . -maxdepth 1 -name 'hb*.h'` -test "x$HBSOURCES" = x && HBSOURCES=`find . -maxdepth 1 -name 'hb-*.cc' -or -name 'hb-*.hh'` - - -cd "$srcdir" - - -echo 'Checking that public header files #include "hb-common.h" or "hb.h" first (or none)' - -for x in $HBHEADERS; do - grep '#.*\<include\>' "$x" /dev/null | head -n 1 -done | -grep -v '"hb-common[.]h"' | -grep -v '"hb[.]h"' | -grep -v 'hb-common[.]h:' | -grep -v 'hb[.]h:' | -grep . >&2 && stat=1 - - -echo 'Checking that source files #include "hb-*private.hh" first (or none)' - -for x in $HBSOURCES; do - grep '#.*\<include\>' "$x" /dev/null | head -n 1 -done | -grep -v '"hb-.*private[.]hh"' | -grep -v 'hb-private[.]hh:' | -grep . >&2 && stat=1 - - -echo 'Checking that there is no #include <hb.*.h>' -grep '#.*\<include\>.*<.*hb' $HBHEADERS $HBSOURCES >&2 && stat=1 - - -exit $stat diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/check-libstdc++.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/check-libstdc++.sh deleted file mode 100755 index e7e0e295e1a..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/check-libstdc++.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -LC_ALL=C -export LC_ALL - -test -z "$srcdir" && srcdir=. -stat=0 - - -if which ldd 2>/dev/null >/dev/null; then - : -else - echo "check-libstdc++.sh: 'ldd' not found; skipping test" - exit 77 -fi - -tested=false -for suffix in so dylib; do - so=.libs/libharfbuzz.$suffix - if test -f "$so"; then - echo "Checking that we are not linking to libstdc++" - if ldd $so | grep 'libstdc[+][+]'; then - echo "Ouch, linked to libstdc++" - stat=1 - fi - tested=true - fi -done -if ! $tested; then - echo "check-libstdc++.sh: libharfbuzz shared library not found; skipping test" - exit 77 -fi - -exit $stat diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/check-static-inits.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/check-static-inits.sh deleted file mode 100755 index bb0a7ff630d..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/check-static-inits.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -LC_ALL=C -export LC_ALL - -test -z "$srcdir" && srcdir=. -stat=0 - - -if which objdump 2>/dev/null >/dev/null; then - : -else - echo "check-static-inits.sh: 'objdump' not found; skipping test" - exit 77 -fi - -OBJS=.libs/*.o -if test "x`echo $OBJS`" = "x$OBJS" 2>/dev/null >/dev/null; then - echo "check-static-inits.sh: object files not found; skipping test" - exit 77 -fi - -echo "Checking that no object file has static initializers" -for obj in $OBJS; do - if objdump -t "$obj" | grep '[.]ctors'; then - echo "Ouch, $obj has static initializers" - stat=1 - fi -done - -echo "Checking that no object file has lazy static C++ constructors/destructors or other such stuff" -for obj in $OBJS; do - if objdump -t "$obj" | grep '__c'; then - echo "Ouch, $obj has lazy static C++ constructors/destructors or other such stuff" - stat=1 - fi -done - -exit $stat diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/check-symbols.sh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/check-symbols.sh deleted file mode 100755 index 73bfc9e9bfc..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/check-symbols.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh - -LC_ALL=C -export LC_ALL - -test -z "$srcdir" && srcdir=. -test -z "$MAKE" && MAKE=make -stat=0 - -if which nm 2>/dev/null >/dev/null; then - : -else - echo "check-symbols.sh: 'nm' not found; skipping test" - exit 77 -fi - -defs="harfbuzz.def" -$MAKE $defs > /dev/null -tested=false -for def in $defs; do - lib=`echo "$def" | sed 's/[.]def$//;s@.*/@@'` - so=.libs/lib${lib}.so - - EXPORTED_SYMBOLS="`nm "$so" | grep ' [BCDGINRSTVW] ' | grep -v ' _fini\>\| _init\>\| _fdata\>\| _ftext\>\| __bss_start\>\| __bss_start__\>\| __bss_end__\>\| _edata\>\| _end\>\| _bss_end__\>\| __end__\>' | cut -d' ' -f3`" - - if test -f "$so"; then - - echo "Checking that $so has the same symbol list as $def" - { - echo EXPORTS - echo "$EXPORTED_SYMBOLS" - # cheat: copy the last line from the def file! - tail -n1 "$def" - } | diff "$def" - >&2 || stat=1 - - echo "Checking that we are not exposing internal symbols" - if echo "$EXPORTED_SYMBOLS" | grep -v 'hb_'; then - echo "Ouch, internal symbols exposed" - stat=1 - fi - - tested=true - fi -done -if ! $tested; then - echo "check-exported-symbols.sh: libharfbuzz shared library not found; skipping test" - exit 77 -fi - -exit $stat diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/gen-arabic-table.py b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/gen-arabic-table.py deleted file mode 100755 index da5a4fcbf5c..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/gen-arabic-table.py +++ /dev/null @@ -1,197 +0,0 @@ -#!/usr/bin/python - -import sys -import os.path - -if len (sys.argv) != 3: - print >>sys.stderr, "usage: ./gen-arabic-table.py ArabicShaping.txt UnicodeData.txt" - sys.exit (1) - -files = [file (x) for x in sys.argv[1:]] - -headers = [[files[0].readline (), files[0].readline ()]] -headers.append (["UnicodeData.txt does not have a header."]) -while files[0].readline ().find ('##################') < 0: - pass - - -def print_joining_table(f): - - print - print "static const uint8_t joining_table[] =" - print "{" - - min_u = 0x110000 - max_u = 0 - num = 0 - last = -1 - block = '' - for line in f: - - if line[0] == '#': - if line.find (" characters"): - block = line[2:].strip () - continue - - fields = [x.strip () for x in line.split (';')] - if len (fields) == 1: - continue - - u = int (fields[0], 16) - if u == 0x200C or u == 0x200D: - continue - if u < last: - raise Exception ("Input data character not sorted", u) - min_u = min (min_u, u) - max_u = max (max_u, u) - num += 1 - - if block: - print "\n /* %s */\n" % block - block = '' - - if last != -1: - last += 1 - while last < u: - print " JOINING_TYPE_X, /* %04X */" % last - last += 1 - else: - last = u - - if fields[3] in ["ALAPH", "DALATH RISH"]: - value = "JOINING_GROUP_" + fields[3].replace(' ', '_') - else: - value = "JOINING_TYPE_" + fields[2] - print " %s, /* %s */" % (value, '; '.join(fields)) - - print - print "};" - print - print "#define JOINING_TABLE_FIRST 0x%04X" % min_u - print "#define JOINING_TABLE_LAST 0x%04X" % max_u - print - - occupancy = num * 100 / (max_u - min_u + 1) - # Maintain at least 40% occupancy in the table */ - if occupancy < 40: - raise Exception ("Table too sparse, please investigate: ", occupancy) - -def print_shaping_table(f): - - shapes = {} - ligatures = {} - names = {} - for line in f: - - fields = [x.strip () for x in line.split (';')] - if fields[5][0:1] != '<': - continue - - items = fields[5].split (' ') - shape, items = items[0][1:-1], tuple (int (x, 16) for x in items[1:]) - - if not shape in ['initial', 'medial', 'isolated', 'final']: - continue - - c = int (fields[0], 16) - if len (items) != 1: - # We only care about lam-alef ligatures - if len (items) != 2 or items[0] != 0x0644 or items[1] not in [0x0622, 0x0623, 0x0625, 0x0627]: - continue - - # Save ligature - names[c] = fields[1] - if items not in ligatures: - ligatures[items] = {} - ligatures[items][shape] = c - pass - else: - # Save shape - if items[0] not in names: - names[items[0]] = fields[1] - else: - names[items[0]] = os.path.commonprefix ([names[items[0]], fields[1]]).strip () - if items[0] not in shapes: - shapes[items[0]] = {} - shapes[items[0]][shape] = c - - print - print "static const uint16_t shaping_table[][4] =" - print "{" - - keys = shapes.keys () - min_u, max_u = min (keys), max (keys) - for u in range (min_u, max_u + 1): - s = [shapes[u][shape] if u in shapes and shape in shapes[u] else 0 - for shape in ['initial', 'medial', 'final', 'isolated']] - value = ', '.join ("0x%04X" % c for c in s) - print " {%s}, /* U+%04X %s */" % (value, u, names[u] if u in names else "") - - print "};" - print - print "#define SHAPING_TABLE_FIRST 0x%04X" % min_u - print "#define SHAPING_TABLE_LAST 0x%04X" % max_u - print - - ligas = {} - for pair in ligatures.keys (): - for shape in ligatures[pair]: - c = ligatures[pair][shape] - if shape == 'isolated': - liga = (shapes[pair[0]]['initial'], shapes[pair[1]]['final']) - elif shape == 'final': - liga = (shapes[pair[0]]['medial'], shapes[pair[1]]['final']) - else: - raise Exception ("Unexpected shape", shape) - if liga[0] not in ligas: - ligas[liga[0]] = [] - ligas[liga[0]].append ((liga[1], c)) - max_i = max (len (ligas[l]) for l in ligas) - print - print "static const struct ligature_set_t {" - print " uint16_t first;" - print " struct ligature_pairs_t {" - print " uint16_t second;" - print " uint16_t ligature;" - print " } ligatures[%d];" % max_i - print "} ligature_table[] =" - print "{" - keys = ligas.keys () - keys.sort () - for first in keys: - - print " { 0x%04X, {" % (first) - for liga in ligas[first]: - print " { 0x%04X, 0x%04X }, /* %s */" % (liga[0], liga[1], names[liga[1]]) - print " }}," - - print "};" - print - - - -print "/* == Start of generated table == */" -print "/*" -print " * The following table is generated by running:" -print " *" -print " * ./gen-arabic-table.py ArabicShaping.txt UnicodeData.txt" -print " *" -print " * on files with these headers:" -print " *" -for h in headers: - for l in h: - print " * %s" % (l.strip()) -print " */" -print -print "#ifndef HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_HH" -print "#define HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_HH" -print - -print_joining_table (files[0]) -print_shaping_table (files[1]) - -print -print "#endif /* HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_HH */" -print -print "/* == End of generated table == */" - diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/gen-indic-table.py b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/gen-indic-table.py deleted file mode 100755 index 9ed3fd6d34d..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/gen-indic-table.py +++ /dev/null @@ -1,208 +0,0 @@ -#!/usr/bin/python - -import sys - -if len (sys.argv) != 4: - print >>sys.stderr, "usage: ./gen-indic-table.py IndicSyllabicCategory.txt IndicMatraCategory.txt Blocks.txt" - sys.exit (1) - -files = [file (x) for x in sys.argv[1:]] - -headers = [[f.readline () for i in range (2)] for f in files] - -blocks = {} -data = [{} for f in files] -values = [{} for f in files] -for i, f in enumerate (files): - for line in f: - - j = line.find ('#') - if j >= 0: - line = line[:j] - - fields = [x.strip () for x in line.split (';')] - if len (fields) == 1: - continue - - uu = fields[0].split ('..') - start = int (uu[0], 16) - if len (uu) == 1: - end = start - else: - end = int (uu[1], 16) - - t = fields[1] - - for u in range (start, end + 1): - data[i][u] = t - values[i][t] = values[i].get (t, 0) + 1 - - if i == 2: - blocks[t] = (start, end) - -# Merge data into one dict: -defaults = ('Other', 'Not_Applicable', 'No_Block') -for i,v in enumerate (defaults): - values[i][v] = values[i].get (v, 0) + 1 -combined = {} -for i,d in enumerate (data): - for u,v in d.items (): - if i == 2 and not u in combined: - continue - if not u in combined: - combined[u] = list (defaults) - combined[u][i] = v -data = combined -del combined -num = len (data) - -# Move the outliers NO-BREAK SPACE and DOTTED CIRCLE out -singles = {} -for u in [0x00A0, 0x25CC]: - singles[u] = data[u] - del data[u] - -print "/* == Start of generated table == */" -print "/*" -print " * The following table is generated by running:" -print " *" -print " * ./gen-indic-table.py IndicSyllabicCategory.txt IndicMatraCategory.txt Blocks.txt" -print " *" -print " * on files with these headers:" -print " *" -for h in headers: - for l in h: - print " * %s" % (l.strip()) -print " */" -print -print '#include "hb-ot-shape-complex-indic-private.hh"' -print - -# Shorten values -short = [{ - "Bindu": 'Bi', - "Visarga": 'Vs', - "Vowel": 'Vo', - "Vowel_Dependent": 'M', - "Other": 'x', -},{ - "Not_Applicable": 'x', -}] -all_shorts = [[],[]] - -# Add some of the values, to make them more readable, and to avoid duplicates - - -for i in range (2): - for v,s in short[i].items (): - all_shorts[i].append (s) - -what = ["INDIC_SYLLABIC_CATEGORY", "INDIC_MATRA_CATEGORY"] -what_short = ["ISC", "IMC"] -for i in range (2): - print - vv = values[i].keys () - vv.sort () - for v in vv: - v_no_and = v.replace ('_And_', '_') - if v in short[i]: - s = short[i][v] - else: - s = ''.join ([c for c in v_no_and if ord ('A') <= ord (c) <= ord ('Z')]) - if s in all_shorts[i]: - raise Exception ("Duplicate short value alias", v, s) - all_shorts[i].append (s) - short[i][v] = s - print "#define %s_%s %s_%s %s/* %3d chars; %s */" % \ - (what_short[i], s, what[i], v.upper (), \ - ' '* ((48-1 - len (what[i]) - 1 - len (v)) / 8), \ - values[i][v], v) -print -print "#define _(S,M) INDIC_COMBINE_CATEGORIES (ISC_##S, IMC_##M)" -print -print - -total = 0 -used = 0 -def print_block (block, start, end, data): - print - print - print " /* %s (%04X..%04X) */" % (block, start, end) - num = 0 - for u in range (start, end+1): - if u % 8 == 0: - print - print " /* %04X */" % u, - if u in data: - num += 1 - d = data.get (u, defaults) - sys.stdout.write ("%9s" % ("_(%s,%s)," % (short[0][d[0]], short[1][d[1]]))) - - global total, used - total += end - start + 1 - used += num - -uu = data.keys () -uu.sort () - -last = -1 -num = 0 -offset = 0 -starts = [] -ends = [] -print "static const INDIC_TABLE_ELEMENT_TYPE indic_table[] = {" -for u in uu: - if u <= last: - continue - block = data[u][2] - (start, end) = blocks[block] - - if start != last + 1: - if start - last <= 33: - print_block ("FILLER", last+1, start-1, data) - last = start-1 - else: - if last >= 0: - ends.append (last + 1) - offset += ends[-1] - starts[-1] - print - print - print "#define indic_offset_0x%04x %d" % (start, offset) - starts.append (start) - - print_block (block, start, end, data) - last = end -ends.append (last + 1) -offset += ends[-1] - starts[-1] -print -print -print "#define indic_offset_total %d" % offset -print -occupancy = used * 100. / total -print "}; /* Table occupancy: %d%% */" % occupancy -print -print "INDIC_TABLE_ELEMENT_TYPE" -print "hb_indic_get_categories (hb_codepoint_t u)" -print "{" -for (start,end) in zip (starts, ends): - offset = "indic_offset_0x%04x" % start - print " if (0x%04X <= u && u <= 0x%04X) return indic_table[u - 0x%04X + %s];" % (start, end, start, offset) -for u,d in singles.items (): - print " if (unlikely (u == 0x%04X)) return _(%s,%s);" % (u, short[0][d[0]], short[1][d[1]]) -print " return _(x,x);" -print "}" -print -print "#undef _" -for i in range (2): - print - vv = values[i].keys () - vv.sort () - for v in vv: - print "#undef %s_%s" % \ - (what_short[i], short[i][v]) -print -print "/* == End of generated table == */" - -# Maintain at least 30% occupancy in the table */ -if occupancy < 30: - raise Exception ("Table too sparse, please investigate: ", occupancy) diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-atomic-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-atomic-private.hh deleted file mode 100644 index 9cc3bc5587c..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-atomic-private.hh +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright © 2007 Chris Wilson - * Copyright © 2009,2010 Red Hat, Inc. - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Contributor(s): - * Chris Wilson <chris@chris-wilson.co.uk> - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_ATOMIC_PRIVATE_HH -#define HB_ATOMIC_PRIVATE_HH - -#include "hb-private.hh" - - -/* atomic_int */ - -/* We need external help for these */ - -#if 0 - - -#elif !defined(HB_NO_MT) && (defined(_WIN32) || defined(__CYGWIN__)) - -#define WIN32_LEAN_AND_MEAN -#include <windows.h> - -#if defined(__MINGW32__) && !defined(MemoryBarrier) -static inline void _HBMemoryBarrier (void) { - long dummy = 0; - InterlockedExchange (&dummy, 1); -} -# define MemoryBarrier _HBMemoryBarrier -#endif - -typedef LONG hb_atomic_int_t; -#define hb_atomic_int_add(AI, V) InterlockedExchangeAdd (&(AI), (V)) - -#define hb_atomic_ptr_get(P) (MemoryBarrier (), (void *) *(P)) -#define hb_atomic_ptr_cmpexch(P,O,N) (InterlockedCompareExchangePointer ((void **) (P), (void *) (N), (void *) (O)) == (void *) (O)) - - -#elif !defined(HB_NO_MT) && defined(__APPLE__) - -#include <libkern/OSAtomic.h> -#ifdef __MAC_OS_X_MIN_REQUIRED -#include <AvailabilityMacros.h> -#elif defined(__IPHONE_OS_MIN_REQUIRED) -#include <Availability.h> -#endif - -typedef int32_t hb_atomic_int_t; -#define hb_atomic_int_add(AI, V) (OSAtomicAdd32Barrier ((V), &(AI)) - (V)) - -#define hb_atomic_ptr_get(P) (OSMemoryBarrier (), (void *) *(P)) -#if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || __IPHONE_VERSION_MIN_REQUIRED >= 20100) -#define hb_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwapPtrBarrier ((void *) (O), (void *) (N), (void **) (P)) -#else -#if __ppc64__ || __x86_64__ -#define hb_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwap64Barrier ((int64_t) (O), (int64_t) (N), (int64_t*) (P)) -#else -#define hb_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwap32Barrier ((int32_t) (O), (int32_t) (N), (int32_t*) (P)) -#endif -#endif - - -#elif !defined(HB_NO_MT) && defined(HAVE_INTEL_ATOMIC_PRIMITIVES) - -typedef int hb_atomic_int_t; -#define hb_atomic_int_add(AI, V) __sync_fetch_and_add (&(AI), (V)) - -#define hb_atomic_ptr_get(P) (void *) (__sync_synchronize (), *(P)) -#define hb_atomic_ptr_cmpexch(P,O,N) __sync_bool_compare_and_swap ((P), (O), (N)) - - -#elif !defined(HB_NO_MT) && defined(HAVE_SOLARIS_ATOMIC_OPS) - -#include <atomic.h> -#include <mbarrier.h> - -typedef unsigned int hb_atomic_int_t; -#define hb_atomic_int_add(AI, V) ( ({__machine_rw_barrier ();}), atomic_add_int_nv (&(AI), (V)) - (V)) - -#define hb_atomic_ptr_get(P) ( ({__machine_rw_barrier ();}), (void *) *(P)) -#define hb_atomic_ptr_cmpexch(P,O,N) ( ({__machine_rw_barrier ();}), atomic_cas_ptr ((void **) (P), (void *) (O), (void *) (N)) == (void *) (O) ? true : false) - - -#elif !defined(HB_NO_MT) - -#define HB_ATOMIC_INT_NIL 1 /* Warn that fallback implementation is in use. */ -typedef volatile int hb_atomic_int_t; -#define hb_atomic_int_add(AI, V) (((AI) += (V)) - (V)) - -#define hb_atomic_ptr_get(P) ((void *) *(P)) -#define hb_atomic_ptr_cmpexch(P,O,N) (* (void * volatile *) (P) == (void *) (O) ? (* (void * volatile *) (P) = (void *) (N), true) : false) - - -#else /* HB_NO_MT */ - -typedef int hb_atomic_int_t; -#define hb_atomic_int_add(AI, V) (((AI) += (V)) - (V)) - -#define hb_atomic_ptr_get(P) ((void *) *(P)) -#define hb_atomic_ptr_cmpexch(P,O,N) (* (void **) (P) == (void *) (O) ? (* (void **) (P) = (void *) (N), true) : false) - -#endif - -/* TODO Add tracing. */ - -#endif /* HB_ATOMIC_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-blob.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-blob.cc deleted file mode 100644 index dfd134b7762..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-blob.cc +++ /dev/null @@ -1,328 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - */ - -/* http://www.oracle.com/technetwork/articles/servers-storage-dev/standardheaderfiles-453865.html */ -#define _POSIX_C_SOURCE 199309L - -#include "hb-private.hh" - -#include "hb-blob.h" -#include "hb-object-private.hh" - -#ifdef HAVE_SYS_MMAN_H -#ifdef HAVE_UNISTD_H -#include <unistd.h> -#endif /* HAVE_UNISTD_H */ -#include <sys/mman.h> -#endif /* HAVE_SYS_MMAN_H */ - -#include <stdio.h> -#include <errno.h> - - - -#ifndef HB_DEBUG_BLOB -#define HB_DEBUG_BLOB (HB_DEBUG+0) -#endif - - -struct hb_blob_t { - hb_object_header_t header; - ASSERT_POD (); - - bool immutable; - - const char *data; - unsigned int length; - hb_memory_mode_t mode; - - void *user_data; - hb_destroy_func_t destroy; -}; - - -static bool _try_writable (hb_blob_t *blob); - -static void -_hb_blob_destroy_user_data (hb_blob_t *blob) -{ - if (blob->destroy) { - blob->destroy (blob->user_data); - blob->user_data = NULL; - blob->destroy = NULL; - } -} - -hb_blob_t * -hb_blob_create (const char *data, - unsigned int length, - hb_memory_mode_t mode, - void *user_data, - hb_destroy_func_t destroy) -{ - hb_blob_t *blob; - - if (!length || !(blob = hb_object_create<hb_blob_t> ())) { - if (destroy) - destroy (user_data); - return hb_blob_get_empty (); - } - - blob->data = data; - blob->length = length; - blob->mode = mode; - - blob->user_data = user_data; - blob->destroy = destroy; - - if (blob->mode == HB_MEMORY_MODE_DUPLICATE) { - blob->mode = HB_MEMORY_MODE_READONLY; - if (!_try_writable (blob)) { - hb_blob_destroy (blob); - return hb_blob_get_empty (); - } - } - - return blob; -} - -hb_blob_t * -hb_blob_create_sub_blob (hb_blob_t *parent, - unsigned int offset, - unsigned int length) -{ - hb_blob_t *blob; - - if (!length || offset >= parent->length) - return hb_blob_get_empty (); - - hb_blob_make_immutable (parent); - - blob = hb_blob_create (parent->data + offset, - MIN (length, parent->length - offset), - HB_MEMORY_MODE_READONLY, - hb_blob_reference (parent), - (hb_destroy_func_t) hb_blob_destroy); - - return blob; -} - -hb_blob_t * -hb_blob_get_empty (void) -{ - static const hb_blob_t _hb_blob_nil = { - HB_OBJECT_HEADER_STATIC, - - true, /* immutable */ - - NULL, /* data */ - 0, /* length */ - HB_MEMORY_MODE_READONLY, /* mode */ - - NULL, /* user_data */ - NULL /* destroy */ - }; - - return const_cast<hb_blob_t *> (&_hb_blob_nil); -} - -hb_blob_t * -hb_blob_reference (hb_blob_t *blob) -{ - return hb_object_reference (blob); -} - -void -hb_blob_destroy (hb_blob_t *blob) -{ - if (!hb_object_destroy (blob)) return; - - _hb_blob_destroy_user_data (blob); - - free (blob); -} - -hb_bool_t -hb_blob_set_user_data (hb_blob_t *blob, - hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy, - hb_bool_t replace) -{ - return hb_object_set_user_data (blob, key, data, destroy, replace); -} - -void * -hb_blob_get_user_data (hb_blob_t *blob, - hb_user_data_key_t *key) -{ - return hb_object_get_user_data (blob, key); -} - - -void -hb_blob_make_immutable (hb_blob_t *blob) -{ - if (hb_object_is_inert (blob)) - return; - - blob->immutable = true; -} - -hb_bool_t -hb_blob_is_immutable (hb_blob_t *blob) -{ - return blob->immutable; -} - - -unsigned int -hb_blob_get_length (hb_blob_t *blob) -{ - return blob->length; -} - -const char * -hb_blob_get_data (hb_blob_t *blob, unsigned int *length) -{ - if (length) - *length = blob->length; - - return blob->data; -} - -char * -hb_blob_get_data_writable (hb_blob_t *blob, unsigned int *length) -{ - if (!_try_writable (blob)) { - if (length) - *length = 0; - - return NULL; - } - - if (length) - *length = blob->length; - - return const_cast<char *> (blob->data); -} - - -static hb_bool_t -_try_make_writable_inplace_unix (hb_blob_t *blob) -{ -#if defined(HAVE_SYS_MMAN_H) && defined(HAVE_MPROTECT) - uintptr_t pagesize = -1, mask, length; - const char *addr; - -#if defined(HAVE_SYSCONF) && defined(_SC_PAGE_SIZE) - pagesize = (uintptr_t) sysconf (_SC_PAGE_SIZE); -#elif defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE) - pagesize = (uintptr_t) sysconf (_SC_PAGESIZE); -#elif defined(HAVE_GETPAGESIZE) - pagesize = (uintptr_t) getpagesize (); -#endif - - if ((uintptr_t) -1L == pagesize) { - DEBUG_MSG_FUNC (BLOB, blob, "failed to get pagesize: %s", strerror (errno)); - return false; - } - DEBUG_MSG_FUNC (BLOB, blob, "pagesize is %lu", (unsigned long) pagesize); - - mask = ~(pagesize-1); - addr = (const char *) (((uintptr_t) blob->data) & mask); - length = (const char *) (((uintptr_t) blob->data + blob->length + pagesize-1) & mask) - addr; - DEBUG_MSG_FUNC (BLOB, blob, - "calling mprotect on [%p..%p] (%lu bytes)", - addr, addr+length, (unsigned long) length); - if (-1 == mprotect ((void *) addr, length, PROT_READ | PROT_WRITE)) { - DEBUG_MSG_FUNC (BLOB, blob, "mprotect failed: %s", strerror (errno)); - return false; - } - - blob->mode = HB_MEMORY_MODE_WRITABLE; - - DEBUG_MSG_FUNC (BLOB, blob, - "successfully made [%p..%p] (%lu bytes) writable\n", - addr, addr+length, (unsigned long) length); - return true; -#else - return false; -#endif -} - -static bool -_try_writable_inplace (hb_blob_t *blob) -{ - DEBUG_MSG_FUNC (BLOB, blob, "making writable inplace\n"); - - if (_try_make_writable_inplace_unix (blob)) - return true; - - DEBUG_MSG_FUNC (BLOB, blob, "making writable -> FAILED\n"); - - /* Failed to make writable inplace, mark that */ - blob->mode = HB_MEMORY_MODE_READONLY; - return false; -} - -static bool -_try_writable (hb_blob_t *blob) -{ - if (blob->immutable) - return false; - - if (blob->mode == HB_MEMORY_MODE_WRITABLE) - return true; - - if (blob->mode == HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE && _try_writable_inplace (blob)) - return true; - - if (blob->mode == HB_MEMORY_MODE_WRITABLE) - return true; - - - DEBUG_MSG_FUNC (BLOB, blob, "current data is -> %p\n", blob->data); - - char *new_data; - - new_data = (char *) malloc (blob->length); - if (unlikely (!new_data)) - return false; - - DEBUG_MSG_FUNC (BLOB, blob, "dupped successfully -> %p\n", blob->data); - - memcpy (new_data, blob->data, blob->length); - _hb_blob_destroy_user_data (blob); - blob->mode = HB_MEMORY_MODE_WRITABLE; - blob->data = new_data; - blob->user_data = new_data; - blob->destroy = free; - - return true; -} - - diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-blob.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-blob.h deleted file mode 100644 index d3d0f41b11c..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-blob.h +++ /dev/null @@ -1,127 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - */ - -#ifndef HB_H_IN -#error "Include <hb.h> instead." -#endif - -#ifndef HB_BLOB_H -#define HB_BLOB_H - -#include "hb-common.h" - -HB_BEGIN_DECLS - - -/* - * Note re various memory-modes: - * - * - In no case shall the HarfBuzz client modify memory - * that is passed to HarfBuzz in a blob. If there is - * any such possibility, MODE_DUPLICATE should be used - * such that HarfBuzz makes a copy immediately, - * - * - Use MODE_READONLY otherse, unless you really really - * really know what you are doing, - * - * - MODE_WRITABLE is appropriate if you relaly made a - * copy of data solely for the purpose of passing to - * HarfBuzz and doing that just once (no reuse!), - * - * - If the font is mmap()ed, it's ok to use - * READONLY_MAY_MAKE_WRITABLE, however, there were - * design problems with that mode, so HarfBuzz do not - * really use it anymore. If not sure, use MODE_READONLY. - */ -typedef enum { - HB_MEMORY_MODE_DUPLICATE, - HB_MEMORY_MODE_READONLY, - HB_MEMORY_MODE_WRITABLE, - HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE -} hb_memory_mode_t; - -typedef struct hb_blob_t hb_blob_t; - -hb_blob_t * -hb_blob_create (const char *data, - unsigned int length, - hb_memory_mode_t mode, - void *user_data, - hb_destroy_func_t destroy); - -/* Always creates with MEMORY_MODE_READONLY. - * Even if the parent blob is writable, we don't - * want the user of the sub-blob to be able to - * modify the parent data as that data may be - * shared among multiple sub-blobs. - */ -hb_blob_t * -hb_blob_create_sub_blob (hb_blob_t *parent, - unsigned int offset, - unsigned int length); - -hb_blob_t * -hb_blob_get_empty (void); - -hb_blob_t * -hb_blob_reference (hb_blob_t *blob); - -void -hb_blob_destroy (hb_blob_t *blob); - -hb_bool_t -hb_blob_set_user_data (hb_blob_t *blob, - hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy, - hb_bool_t replace); - - -void * -hb_blob_get_user_data (hb_blob_t *blob, - hb_user_data_key_t *key); - - -void -hb_blob_make_immutable (hb_blob_t *blob); - -hb_bool_t -hb_blob_is_immutable (hb_blob_t *blob); - - -unsigned int -hb_blob_get_length (hb_blob_t *blob); - -const char * -hb_blob_get_data (hb_blob_t *blob, unsigned int *length); - -char * -hb_blob_get_data_writable (hb_blob_t *blob, unsigned int *length); - - -HB_END_DECLS - -#endif /* HB_BLOB_H */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer-deserialize-json.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer-deserialize-json.hh deleted file mode 100644 index dead700db82..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer-deserialize-json.hh +++ /dev/null @@ -1,643 +0,0 @@ - -#line 1 "../../src/hb-buffer-deserialize-json.rl" -/* - * Copyright © 2013 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_BUFFER_DESERIALIZE_JSON_HH -#define HB_BUFFER_DESERIALIZE_JSON_HH - -#include "hb-private.hh" - - -#line 36 "hb-buffer-deserialize-json.hh.tmp" -static const unsigned char _deserialize_json_trans_keys[] = { - 0u, 0u, 9u, 123u, 9u, 34u, 97u, 103u, 120u, 121u, 34u, 34u, 9u, 58u, 9u, 57u, - 48u, 57u, 9u, 125u, 9u, 125u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u, 48u, 57u, - 9u, 125u, 9u, 125u, 108u, 108u, 34u, 34u, 9u, 58u, 9u, 57u, 9u, 125u, 9u, 125u, - 120u, 121u, 34u, 34u, 9u, 58u, 9u, 57u, 48u, 57u, 9u, 125u, 9u, 125u, 34u, 34u, - 9u, 58u, 9u, 57u, 48u, 57u, 9u, 125u, 9u, 125u, 34u, 34u, 9u, 58u, 9u, 57u, - 65u, 122u, 34u, 122u, 9u, 125u, 9u, 125u, 9u, 93u, 9u, 123u, 0u, 0u, 0 -}; - -static const char _deserialize_json_key_spans[] = { - 0, 115, 26, 7, 2, 1, 50, 49, - 10, 117, 117, 117, 1, 50, 49, 10, - 117, 117, 1, 1, 50, 49, 117, 117, - 2, 1, 50, 49, 10, 117, 117, 1, - 50, 49, 10, 117, 117, 1, 50, 49, - 58, 89, 117, 117, 85, 115, 0 -}; - -static const short _deserialize_json_index_offsets[] = { - 0, 0, 116, 143, 151, 154, 156, 207, - 257, 268, 386, 504, 622, 624, 675, 725, - 736, 854, 972, 974, 976, 1027, 1077, 1195, - 1313, 1316, 1318, 1369, 1419, 1430, 1548, 1666, - 1668, 1719, 1769, 1780, 1898, 2016, 2018, 2069, - 2119, 2178, 2268, 2386, 2504, 2590, 2706 -}; - -static const char _deserialize_json_indicies[] = { - 0, 0, 0, 0, 0, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 0, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 2, 1, 3, 3, 3, - 3, 3, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 3, 1, 4, 1, - 5, 1, 6, 7, 1, 1, 8, 1, - 9, 10, 1, 11, 1, 11, 11, 11, - 11, 11, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 11, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 12, 1, - 12, 12, 12, 12, 12, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 12, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 13, 1, 1, 14, - 15, 15, 15, 15, 15, 15, 15, 15, - 15, 1, 16, 17, 17, 17, 17, 17, - 17, 17, 17, 17, 1, 18, 18, 18, - 18, 18, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 18, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 19, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 20, 1, 21, 21, 21, 21, 21, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 21, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 3, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 22, - 1, 18, 18, 18, 18, 18, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 18, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 19, 1, 1, 1, - 17, 17, 17, 17, 17, 17, 17, 17, - 17, 17, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 20, 1, 23, - 1, 23, 23, 23, 23, 23, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 23, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 24, 1, 24, 24, 24, 24, - 24, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 24, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 25, 1, 1, 26, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 1, 28, 29, - 29, 29, 29, 29, 29, 29, 29, 29, - 1, 30, 30, 30, 30, 30, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 30, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 31, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 32, 1, 30, - 30, 30, 30, 30, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 30, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 31, 1, 1, 1, 29, 29, - 29, 29, 29, 29, 29, 29, 29, 29, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 32, 1, 33, 1, 34, - 1, 34, 34, 34, 34, 34, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 34, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 35, 1, 35, 35, 35, 35, - 35, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 35, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 36, 37, 37, 37, 37, - 37, 37, 37, 37, 37, 1, 38, 38, - 38, 38, 38, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 38, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 39, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 40, 1, 38, 38, 38, 38, - 38, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 38, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 39, - 1, 1, 1, 41, 41, 41, 41, 41, - 41, 41, 41, 41, 41, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 40, 1, 42, 43, 1, 44, 1, 44, - 44, 44, 44, 44, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 44, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 45, 1, 45, 45, 45, 45, 45, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 45, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 46, 1, - 1, 47, 48, 48, 48, 48, 48, 48, - 48, 48, 48, 1, 49, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 1, 51, - 51, 51, 51, 51, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 51, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 52, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 53, 1, 51, 51, 51, - 51, 51, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 51, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 52, 1, 1, 1, 50, 50, 50, 50, - 50, 50, 50, 50, 50, 50, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 53, 1, 54, 1, 54, 54, 54, - 54, 54, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 54, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 55, 1, - 55, 55, 55, 55, 55, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 55, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 56, 1, 1, 57, - 58, 58, 58, 58, 58, 58, 58, 58, - 58, 1, 59, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 1, 61, 61, 61, - 61, 61, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 61, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 62, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 63, 1, 61, 61, 61, 61, 61, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 61, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 62, 1, - 1, 1, 60, 60, 60, 60, 60, 60, - 60, 60, 60, 60, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 63, - 1, 64, 1, 64, 64, 64, 64, 64, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 64, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 65, 1, 65, 65, - 65, 65, 65, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 65, 1, 66, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 67, 68, 68, - 68, 68, 68, 68, 68, 68, 68, 1, - 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 1, 1, 1, 1, 1, 1, - 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 69, 69, 69, 69, 69, 69, - 69, 69, 1, 70, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 71, 71, - 1, 71, 71, 71, 71, 71, 71, 71, - 71, 71, 71, 1, 1, 1, 1, 1, - 1, 1, 71, 71, 71, 71, 71, 71, - 71, 71, 71, 71, 71, 71, 71, 71, - 71, 71, 71, 71, 71, 71, 71, 71, - 71, 71, 71, 71, 1, 1, 1, 1, - 71, 1, 71, 71, 71, 71, 71, 71, - 71, 71, 71, 71, 71, 71, 71, 71, - 71, 71, 71, 71, 71, 71, 71, 71, - 71, 71, 71, 71, 1, 72, 72, 72, - 72, 72, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 72, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 73, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 74, 1, 72, 72, 72, 72, 72, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 72, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 73, 1, - 1, 1, 75, 75, 75, 75, 75, 75, - 75, 75, 75, 75, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 74, - 1, 76, 76, 76, 76, 76, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 76, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 77, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 78, 1, 0, - 0, 0, 0, 0, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 0, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 2, 1, 1, 0 -}; - -static const char _deserialize_json_trans_targs[] = { - 1, 0, 2, 2, 3, 4, 18, 24, - 37, 5, 12, 6, 7, 8, 9, 11, - 9, 11, 10, 2, 44, 10, 44, 13, - 14, 15, 16, 17, 16, 17, 10, 2, - 44, 19, 20, 21, 22, 23, 10, 2, - 44, 23, 25, 31, 26, 27, 28, 29, - 30, 29, 30, 10, 2, 44, 32, 33, - 34, 35, 36, 35, 36, 10, 2, 44, - 38, 39, 40, 42, 43, 41, 10, 41, - 10, 2, 44, 43, 44, 45, 46 -}; - -static const char _deserialize_json_trans_actions[] = { - 0, 0, 1, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 2, 2, 2, - 0, 0, 3, 3, 4, 0, 5, 0, - 0, 2, 2, 2, 0, 0, 6, 6, - 7, 0, 0, 0, 2, 2, 8, 8, - 9, 0, 0, 0, 0, 0, 2, 2, - 2, 0, 0, 10, 10, 11, 0, 0, - 2, 2, 2, 0, 0, 12, 12, 13, - 0, 0, 0, 2, 2, 2, 14, 0, - 15, 15, 16, 0, 0, 0, 0 -}; - -static const int deserialize_json_start = 1; -static const int deserialize_json_first_final = 44; -static const int deserialize_json_error = 0; - -static const int deserialize_json_en_main = 1; - - -#line 97 "../../src/hb-buffer-deserialize-json.rl" - - -static hb_bool_t -_hb_buffer_deserialize_glyphs_json (hb_buffer_t *buffer, - const char *buf, - unsigned int buf_len, - const char **end_ptr, - hb_font_t *font) -{ - const char *p = buf, *pe = buf + buf_len; - - /* Ensure we have positions. */ - (void) hb_buffer_get_glyph_positions (buffer, NULL); - - while (p < pe && ISSPACE (*p)) - p++; - if (p < pe && *p == (buffer->len ? ',' : '[')) - { - *end_ptr = ++p; - } - - const char *tok = NULL; - int cs; - hb_glyph_info_t info; - hb_glyph_position_t pos; - -#line 466 "hb-buffer-deserialize-json.hh.tmp" - { - cs = deserialize_json_start; - } - -#line 471 "hb-buffer-deserialize-json.hh.tmp" - { - int _slen; - int _trans; - const unsigned char *_keys; - const char *_inds; - if ( p == pe ) - goto _test_eof; - if ( cs == 0 ) - goto _out; -_resume: - _keys = _deserialize_json_trans_keys + (cs<<1); - _inds = _deserialize_json_indicies + _deserialize_json_index_offsets[cs]; - - _slen = _deserialize_json_key_spans[cs]; - _trans = _inds[ _slen > 0 && _keys[0] <=(*p) && - (*p) <= _keys[1] ? - (*p) - _keys[0] : _slen ]; - - cs = _deserialize_json_trans_targs[_trans]; - - if ( _deserialize_json_trans_actions[_trans] == 0 ) - goto _again; - - switch ( _deserialize_json_trans_actions[_trans] ) { - case 1: -#line 38 "../../src/hb-buffer-deserialize-json.rl" - { - memset (&info, 0, sizeof (info)); - memset (&pos , 0, sizeof (pos )); -} - break; - case 5: -#line 43 "../../src/hb-buffer-deserialize-json.rl" - { - buffer->add_info (info); - if (buffer->in_error) - return false; - buffer->pos[buffer->len - 1] = pos; - *end_ptr = p; -} - break; - case 2: -#line 51 "../../src/hb-buffer-deserialize-json.rl" - { - tok = p; -} - break; - case 14: -#line 55 "../../src/hb-buffer-deserialize-json.rl" - { - if (!hb_font_glyph_from_string (font, - tok, p - tok, - &info.codepoint)) - return false; -} - break; - case 15: -#line 62 "../../src/hb-buffer-deserialize-json.rl" - { if (!parse_uint (tok, p, &info.codepoint)) return false; } - break; - case 8: -#line 63 "../../src/hb-buffer-deserialize-json.rl" - { if (!parse_uint (tok, p, &info.cluster )) return false; } - break; - case 10: -#line 64 "../../src/hb-buffer-deserialize-json.rl" - { if (!parse_int (tok, p, &pos.x_offset )) return false; } - break; - case 12: -#line 65 "../../src/hb-buffer-deserialize-json.rl" - { if (!parse_int (tok, p, &pos.y_offset )) return false; } - break; - case 3: -#line 66 "../../src/hb-buffer-deserialize-json.rl" - { if (!parse_int (tok, p, &pos.x_advance)) return false; } - break; - case 6: -#line 67 "../../src/hb-buffer-deserialize-json.rl" - { if (!parse_int (tok, p, &pos.y_advance)) return false; } - break; - case 16: -#line 62 "../../src/hb-buffer-deserialize-json.rl" - { if (!parse_uint (tok, p, &info.codepoint)) return false; } -#line 43 "../../src/hb-buffer-deserialize-json.rl" - { - buffer->add_info (info); - if (buffer->in_error) - return false; - buffer->pos[buffer->len - 1] = pos; - *end_ptr = p; -} - break; - case 9: -#line 63 "../../src/hb-buffer-deserialize-json.rl" - { if (!parse_uint (tok, p, &info.cluster )) return false; } -#line 43 "../../src/hb-buffer-deserialize-json.rl" - { - buffer->add_info (info); - if (buffer->in_error) - return false; - buffer->pos[buffer->len - 1] = pos; - *end_ptr = p; -} - break; - case 11: -#line 64 "../../src/hb-buffer-deserialize-json.rl" - { if (!parse_int (tok, p, &pos.x_offset )) return false; } -#line 43 "../../src/hb-buffer-deserialize-json.rl" - { - buffer->add_info (info); - if (buffer->in_error) - return false; - buffer->pos[buffer->len - 1] = pos; - *end_ptr = p; -} - break; - case 13: -#line 65 "../../src/hb-buffer-deserialize-json.rl" - { if (!parse_int (tok, p, &pos.y_offset )) return false; } -#line 43 "../../src/hb-buffer-deserialize-json.rl" - { - buffer->add_info (info); - if (buffer->in_error) - return false; - buffer->pos[buffer->len - 1] = pos; - *end_ptr = p; -} - break; - case 4: -#line 66 "../../src/hb-buffer-deserialize-json.rl" - { if (!parse_int (tok, p, &pos.x_advance)) return false; } -#line 43 "../../src/hb-buffer-deserialize-json.rl" - { - buffer->add_info (info); - if (buffer->in_error) - return false; - buffer->pos[buffer->len - 1] = pos; - *end_ptr = p; -} - break; - case 7: -#line 67 "../../src/hb-buffer-deserialize-json.rl" - { if (!parse_int (tok, p, &pos.y_advance)) return false; } -#line 43 "../../src/hb-buffer-deserialize-json.rl" - { - buffer->add_info (info); - if (buffer->in_error) - return false; - buffer->pos[buffer->len - 1] = pos; - *end_ptr = p; -} - break; -#line 624 "hb-buffer-deserialize-json.hh.tmp" - } - -_again: - if ( cs == 0 ) - goto _out; - if ( ++p != pe ) - goto _resume; - _test_eof: {} - _out: {} - } - -#line 125 "../../src/hb-buffer-deserialize-json.rl" - - - *end_ptr = p; - - return p == pe && *(p-1) != ']'; -} - -#endif /* HB_BUFFER_DESERIALIZE_JSON_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer-deserialize-json.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer-deserialize-json.rl deleted file mode 100644 index 7351b2ab47c..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer-deserialize-json.rl +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright © 2013 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_BUFFER_DESERIALIZE_JSON_HH -#define HB_BUFFER_DESERIALIZE_JSON_HH - -#include "hb-private.hh" - -%%{ - -machine deserialize_json; -alphtype unsigned char; -write data; - -action clear_item { - memset (&info, 0, sizeof (info)); - memset (&pos , 0, sizeof (pos )); -} - -action add_item { - buffer->add_info (info); - if (buffer->in_error) - return false; - buffer->pos[buffer->len - 1] = pos; - *end_ptr = p; -} - -action tok { - tok = p; -} - -action parse_glyph { - if (!hb_font_glyph_from_string (font, - tok, p - tok, - &info.codepoint)) - return false; -} - -action parse_gid { if (!parse_uint (tok, p, &info.codepoint)) return false; } -action parse_cluster { if (!parse_uint (tok, p, &info.cluster )) return false; } -action parse_x_offset { if (!parse_int (tok, p, &pos.x_offset )) return false; } -action parse_y_offset { if (!parse_int (tok, p, &pos.y_offset )) return false; } -action parse_x_advance { if (!parse_int (tok, p, &pos.x_advance)) return false; } -action parse_y_advance { if (!parse_int (tok, p, &pos.y_advance)) return false; } - -unum = '0' | [1-9] digit*; -num = '-'? unum; - -comma = space* ',' space*; -colon = space* ':' space*; - -glyph_id = unum; -glyph_name = alpha (alnum|'_'|'.'|'-')*; - -glyph_string = '"' (glyph_name >tok %parse_glyph) '"'; -glyph_number = (glyph_id >tok %parse_gid); - -glyph = "\"g\"" colon (glyph_string | glyph_number); -cluster = "\"cl\"" colon (unum >tok %parse_cluster); -xoffset = "\"dx\"" colon (num >tok %parse_x_offset); -yoffset = "\"dy\"" colon (num >tok %parse_y_offset); -xadvance= "\"ax\"" colon (num >tok %parse_x_advance); -yadvance= "\"ay\"" colon (num >tok %parse_y_advance); - -element = glyph | cluster | xoffset | yoffset | xadvance | yadvance; -item = - ( '{' space* element (comma element)* space* '}') - >clear_item - @add_item - ; - -main := space* item (comma item)* space* (','|']')?; - -}%% - -static hb_bool_t -_hb_buffer_deserialize_glyphs_json (hb_buffer_t *buffer, - const char *buf, - unsigned int buf_len, - const char **end_ptr, - hb_font_t *font) -{ - const char *p = buf, *pe = buf + buf_len; - - /* Ensure we have positions. */ - (void) hb_buffer_get_glyph_positions (buffer, NULL); - - while (p < pe && ISSPACE (*p)) - p++; - if (p < pe && *p == (buffer->len ? ',' : '[')) - { - *end_ptr = ++p; - } - - const char *tok = NULL; - int cs; - hb_glyph_info_t info; - hb_glyph_position_t pos; - %%{ - write init; - write exec; - }%% - - *end_ptr = p; - - return p == pe && *(p-1) != ']'; -} - -#endif /* HB_BUFFER_DESERIALIZE_JSON_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer-deserialize-text.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer-deserialize-text.hh deleted file mode 100644 index a38efe3a415..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer-deserialize-text.hh +++ /dev/null @@ -1,571 +0,0 @@ - -#line 1 "../../src/hb-buffer-deserialize-text.rl" -/* - * Copyright © 2013 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_BUFFER_DESERIALIZE_TEXT_HH -#define HB_BUFFER_DESERIALIZE_TEXT_HH - -#include "hb-private.hh" - - -#line 36 "hb-buffer-deserialize-text.hh.tmp" -static const unsigned char _deserialize_text_trans_keys[] = { - 0u, 0u, 9u, 122u, 45u, 57u, 48u, 57u, 45u, 57u, 48u, 57u, 48u, 57u, 45u, 57u, - 48u, 57u, 44u, 44u, 45u, 57u, 48u, 57u, 44u, 57u, 9u, 124u, 9u, 124u, 0u, 0u, - 9u, 122u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, 9u, 124u, - 9u, 124u, 9u, 124u, 9u, 124u, 0 -}; - -static const char _deserialize_text_key_spans[] = { - 0, 114, 13, 10, 13, 10, 10, 13, - 10, 1, 13, 10, 14, 116, 116, 0, - 114, 116, 116, 116, 116, 116, 116, 116, - 116, 116, 116 -}; - -static const short _deserialize_text_index_offsets[] = { - 0, 0, 115, 129, 140, 154, 165, 176, - 190, 201, 203, 217, 228, 243, 360, 477, - 478, 593, 710, 827, 944, 1061, 1178, 1295, - 1412, 1529, 1646 -}; - -static const char _deserialize_text_indicies[] = { - 0, 0, 0, 0, 0, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 0, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 2, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 1, 1, 1, 1, 1, 1, - 1, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 1, 1, 1, 1, 1, - 1, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 1, 5, 1, 1, 6, - 7, 7, 7, 7, 7, 7, 7, 7, - 7, 1, 8, 9, 9, 9, 9, 9, - 9, 9, 9, 9, 1, 10, 1, 1, - 11, 12, 12, 12, 12, 12, 12, 12, - 12, 12, 1, 13, 14, 14, 14, 14, - 14, 14, 14, 14, 14, 1, 15, 16, - 16, 16, 16, 16, 16, 16, 16, 16, - 1, 17, 1, 1, 18, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 1, 20, - 21, 21, 21, 21, 21, 21, 21, 21, - 21, 1, 22, 1, 23, 1, 1, 24, - 25, 25, 25, 25, 25, 25, 25, 25, - 25, 1, 26, 27, 27, 27, 27, 27, - 27, 27, 27, 27, 1, 22, 1, 1, - 1, 21, 21, 21, 21, 21, 21, 21, - 21, 21, 21, 1, 28, 28, 28, 28, - 28, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 28, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 29, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 30, 1, 1, 31, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 32, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 33, - 1, 34, 34, 34, 34, 34, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 34, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 35, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 36, 1, 1, 0, - 0, 0, 0, 0, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 0, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 2, 3, - 3, 3, 3, 3, 3, 3, 3, 3, - 1, 1, 1, 1, 1, 1, 1, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - 4, 1, 1, 1, 1, 1, 1, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - 4, 4, 4, 4, 4, 4, 4, 4, - 4, 1, 28, 28, 28, 28, 28, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 28, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 29, 1, 1, 1, - 1, 37, 37, 37, 37, 37, 37, 37, - 37, 37, 37, 1, 1, 1, 30, 1, - 1, 31, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 32, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 33, 1, 38, - 38, 38, 38, 38, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 38, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 39, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 40, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 41, 1, 42, 42, 42, 42, - 42, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 42, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 43, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 44, - 1, 42, 42, 42, 42, 42, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 42, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 14, 14, 14, 14, 14, 14, 14, 14, - 14, 14, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 43, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 44, 1, 38, 38, - 38, 38, 38, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 38, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 39, 1, 1, 1, 9, 9, 9, - 9, 9, 9, 9, 9, 9, 9, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 40, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 41, 1, 45, 45, 45, 45, 45, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 45, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 46, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 47, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 48, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 49, 1, - 50, 50, 50, 50, 50, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 50, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 51, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 52, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 53, 1, 50, 50, 50, - 50, 50, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 50, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 51, - 1, 1, 1, 1, 27, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 52, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 53, 1, 45, 45, 45, 45, 45, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 45, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 46, 1, 1, 1, - 1, 54, 54, 54, 54, 54, 54, 54, - 54, 54, 54, 1, 1, 1, 1, 1, - 1, 47, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 48, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 49, 1, 28, - 28, 28, 28, 28, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 28, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 29, 1, 55, 55, 1, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, - 1, 1, 1, 30, 1, 1, 31, 55, - 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, - 55, 1, 1, 32, 1, 55, 1, 55, - 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, - 55, 55, 55, 55, 55, 55, 55, 55, - 55, 1, 33, 1, 0 -}; - -static const char _deserialize_text_trans_targs[] = { - 1, 0, 13, 17, 26, 3, 18, 21, - 18, 21, 5, 19, 20, 19, 20, 22, - 25, 8, 9, 12, 9, 12, 10, 11, - 23, 24, 23, 24, 14, 2, 6, 7, - 15, 16, 14, 15, 16, 17, 14, 4, - 15, 16, 14, 15, 16, 14, 2, 7, - 15, 16, 14, 2, 15, 16, 25, 26 -}; - -static const char _deserialize_text_trans_actions[] = { - 0, 0, 1, 1, 1, 2, 2, 2, - 0, 0, 2, 2, 2, 0, 0, 2, - 2, 2, 2, 2, 0, 0, 3, 2, - 2, 2, 0, 0, 4, 5, 5, 5, - 4, 4, 0, 0, 0, 0, 6, 7, - 6, 6, 8, 8, 8, 9, 10, 10, - 9, 9, 11, 12, 11, 11, 0, 0 -}; - -static const char _deserialize_text_eof_actions[] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 4, 0, 0, - 0, 4, 6, 8, 8, 6, 9, 11, - 11, 9, 4 -}; - -static const int deserialize_text_start = 1; -static const int deserialize_text_first_final = 13; -static const int deserialize_text_error = 0; - -static const int deserialize_text_en_main = 1; - - -#line 91 "../../src/hb-buffer-deserialize-text.rl" - - -static hb_bool_t -_hb_buffer_deserialize_glyphs_text (hb_buffer_t *buffer, - const char *buf, - unsigned int buf_len, - const char **end_ptr, - hb_font_t *font) -{ - const char *p = buf, *pe = buf + buf_len; - - /* Ensure we have positions. */ - (void) hb_buffer_get_glyph_positions (buffer, NULL); - - while (p < pe && ISSPACE (*p)) - p++; - if (p < pe && *p == (buffer->len ? '|' : '[')) - { - *end_ptr = ++p; - } - - const char *eof = pe, *tok = NULL; - int cs; - hb_glyph_info_t info; - hb_glyph_position_t pos; - -#line 343 "hb-buffer-deserialize-text.hh.tmp" - { - cs = deserialize_text_start; - } - -#line 348 "hb-buffer-deserialize-text.hh.tmp" - { - int _slen; - int _trans; - const unsigned char *_keys; - const char *_inds; - if ( p == pe ) - goto _test_eof; - if ( cs == 0 ) - goto _out; -_resume: - _keys = _deserialize_text_trans_keys + (cs<<1); - _inds = _deserialize_text_indicies + _deserialize_text_index_offsets[cs]; - - _slen = _deserialize_text_key_spans[cs]; - _trans = _inds[ _slen > 0 && _keys[0] <=(*p) && - (*p) <= _keys[1] ? - (*p) - _keys[0] : _slen ]; - - cs = _deserialize_text_trans_targs[_trans]; - - if ( _deserialize_text_trans_actions[_trans] == 0 ) - goto _again; - - switch ( _deserialize_text_trans_actions[_trans] ) { - case 2: -#line 51 "../../src/hb-buffer-deserialize-text.rl" - { - tok = p; -} - break; - case 5: -#line 55 "../../src/hb-buffer-deserialize-text.rl" - { - if (!hb_font_glyph_from_string (font, - tok, p - tok, - &info.codepoint)) - return false; -} - break; - case 10: -#line 62 "../../src/hb-buffer-deserialize-text.rl" - { if (!parse_uint (tok, p, &info.cluster )) return false; } - break; - case 3: -#line 63 "../../src/hb-buffer-deserialize-text.rl" - { if (!parse_int (tok, p, &pos.x_offset )) return false; } - break; - case 12: -#line 64 "../../src/hb-buffer-deserialize-text.rl" - { if (!parse_int (tok, p, &pos.y_offset )) return false; } - break; - case 7: -#line 65 "../../src/hb-buffer-deserialize-text.rl" - { if (!parse_int (tok, p, &pos.x_advance)) return false; } - break; - case 1: -#line 38 "../../src/hb-buffer-deserialize-text.rl" - { - memset (&info, 0, sizeof (info)); - memset (&pos , 0, sizeof (pos )); -} -#line 51 "../../src/hb-buffer-deserialize-text.rl" - { - tok = p; -} - break; - case 4: -#line 55 "../../src/hb-buffer-deserialize-text.rl" - { - if (!hb_font_glyph_from_string (font, - tok, p - tok, - &info.codepoint)) - return false; -} -#line 43 "../../src/hb-buffer-deserialize-text.rl" - { - buffer->add_info (info); - if (buffer->in_error) - return false; - buffer->pos[buffer->len - 1] = pos; - *end_ptr = p; -} - break; - case 9: -#line 62 "../../src/hb-buffer-deserialize-text.rl" - { if (!parse_uint (tok, p, &info.cluster )) return false; } -#line 43 "../../src/hb-buffer-deserialize-text.rl" - { - buffer->add_info (info); - if (buffer->in_error) - return false; - buffer->pos[buffer->len - 1] = pos; - *end_ptr = p; -} - break; - case 11: -#line 64 "../../src/hb-buffer-deserialize-text.rl" - { if (!parse_int (tok, p, &pos.y_offset )) return false; } -#line 43 "../../src/hb-buffer-deserialize-text.rl" - { - buffer->add_info (info); - if (buffer->in_error) - return false; - buffer->pos[buffer->len - 1] = pos; - *end_ptr = p; -} - break; - case 6: -#line 65 "../../src/hb-buffer-deserialize-text.rl" - { if (!parse_int (tok, p, &pos.x_advance)) return false; } -#line 43 "../../src/hb-buffer-deserialize-text.rl" - { - buffer->add_info (info); - if (buffer->in_error) - return false; - buffer->pos[buffer->len - 1] = pos; - *end_ptr = p; -} - break; - case 8: -#line 66 "../../src/hb-buffer-deserialize-text.rl" - { if (!parse_int (tok, p, &pos.y_advance)) return false; } -#line 43 "../../src/hb-buffer-deserialize-text.rl" - { - buffer->add_info (info); - if (buffer->in_error) - return false; - buffer->pos[buffer->len - 1] = pos; - *end_ptr = p; -} - break; -#line 480 "hb-buffer-deserialize-text.hh.tmp" - } - -_again: - if ( cs == 0 ) - goto _out; - if ( ++p != pe ) - goto _resume; - _test_eof: {} - if ( p == eof ) - { - switch ( _deserialize_text_eof_actions[cs] ) { - case 4: -#line 55 "../../src/hb-buffer-deserialize-text.rl" - { - if (!hb_font_glyph_from_string (font, - tok, p - tok, - &info.codepoint)) - return false; -} -#line 43 "../../src/hb-buffer-deserialize-text.rl" - { - buffer->add_info (info); - if (buffer->in_error) - return false; - buffer->pos[buffer->len - 1] = pos; - *end_ptr = p; -} - break; - case 9: -#line 62 "../../src/hb-buffer-deserialize-text.rl" - { if (!parse_uint (tok, p, &info.cluster )) return false; } -#line 43 "../../src/hb-buffer-deserialize-text.rl" - { - buffer->add_info (info); - if (buffer->in_error) - return false; - buffer->pos[buffer->len - 1] = pos; - *end_ptr = p; -} - break; - case 11: -#line 64 "../../src/hb-buffer-deserialize-text.rl" - { if (!parse_int (tok, p, &pos.y_offset )) return false; } -#line 43 "../../src/hb-buffer-deserialize-text.rl" - { - buffer->add_info (info); - if (buffer->in_error) - return false; - buffer->pos[buffer->len - 1] = pos; - *end_ptr = p; -} - break; - case 6: -#line 65 "../../src/hb-buffer-deserialize-text.rl" - { if (!parse_int (tok, p, &pos.x_advance)) return false; } -#line 43 "../../src/hb-buffer-deserialize-text.rl" - { - buffer->add_info (info); - if (buffer->in_error) - return false; - buffer->pos[buffer->len - 1] = pos; - *end_ptr = p; -} - break; - case 8: -#line 66 "../../src/hb-buffer-deserialize-text.rl" - { if (!parse_int (tok, p, &pos.y_advance)) return false; } -#line 43 "../../src/hb-buffer-deserialize-text.rl" - { - buffer->add_info (info); - if (buffer->in_error) - return false; - buffer->pos[buffer->len - 1] = pos; - *end_ptr = p; -} - break; -#line 557 "hb-buffer-deserialize-text.hh.tmp" - } - } - - _out: {} - } - -#line 119 "../../src/hb-buffer-deserialize-text.rl" - - - *end_ptr = p; - - return p == pe && *(p-1) != ']'; -} - -#endif /* HB_BUFFER_DESERIALIZE_TEXT_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer-deserialize-text.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer-deserialize-text.rl deleted file mode 100644 index 8856580fbe3..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer-deserialize-text.rl +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright © 2013 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_BUFFER_DESERIALIZE_TEXT_HH -#define HB_BUFFER_DESERIALIZE_TEXT_HH - -#include "hb-private.hh" - -%%{ - -machine deserialize_text; -alphtype unsigned char; -write data; - -action clear_item { - memset (&info, 0, sizeof (info)); - memset (&pos , 0, sizeof (pos )); -} - -action add_item { - buffer->add_info (info); - if (buffer->in_error) - return false; - buffer->pos[buffer->len - 1] = pos; - *end_ptr = p; -} - -action tok { - tok = p; -} - -action parse_glyph { - if (!hb_font_glyph_from_string (font, - tok, p - tok, - &info.codepoint)) - return false; -} - -action parse_cluster { if (!parse_uint (tok, p, &info.cluster )) return false; } -action parse_x_offset { if (!parse_int (tok, p, &pos.x_offset )) return false; } -action parse_y_offset { if (!parse_int (tok, p, &pos.y_offset )) return false; } -action parse_x_advance { if (!parse_int (tok, p, &pos.x_advance)) return false; } -action parse_y_advance { if (!parse_int (tok, p, &pos.y_advance)) return false; } - -unum = '0' | [1-9] digit*; -num = '-'? unum; - -glyph_id = unum; -glyph_name = alpha (alnum|'_'|'.'|'-')*; - -glyph = (glyph_id | glyph_name) >tok %parse_glyph; -cluster = '=' (unum >tok %parse_cluster); -offsets = '@' (num >tok %parse_x_offset) ',' (num >tok %parse_y_offset ); -advances= '+' (num >tok %parse_x_advance) (',' (num >tok %parse_y_advance))?; -item = - ( - glyph - cluster? - offsets? - advances? - ) - >clear_item - %add_item - ; - -main := space* item (space* '|' space* item)* space* ('|'|']')?; - -}%% - -static hb_bool_t -_hb_buffer_deserialize_glyphs_text (hb_buffer_t *buffer, - const char *buf, - unsigned int buf_len, - const char **end_ptr, - hb_font_t *font) -{ - const char *p = buf, *pe = buf + buf_len; - - /* Ensure we have positions. */ - (void) hb_buffer_get_glyph_positions (buffer, NULL); - - while (p < pe && ISSPACE (*p)) - p++; - if (p < pe && *p == (buffer->len ? '|' : '[')) - { - *end_ptr = ++p; - } - - const char *eof = pe, *tok = NULL; - int cs; - hb_glyph_info_t info; - hb_glyph_position_t pos; - %%{ - write init; - write exec; - }%% - - *end_ptr = p; - - return p == pe && *(p-1) != ']'; -} - -#endif /* HB_BUFFER_DESERIALIZE_TEXT_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer-private.hh deleted file mode 100644 index 387ebd9a84c..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer-private.hh +++ /dev/null @@ -1,200 +0,0 @@ -/* - * Copyright © 1998-2004 David Turner and Werner Lemberg - * Copyright © 2004,2007,2009,2010 Red Hat, Inc. - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Owen Taylor, Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_BUFFER_PRIVATE_HH -#define HB_BUFFER_PRIVATE_HH - -#include "hb-private.hh" -#include "hb-buffer.h" -#include "hb-object-private.hh" -#include "hb-unicode-private.hh" - - -ASSERT_STATIC (sizeof (hb_glyph_info_t) == 20); -ASSERT_STATIC (sizeof (hb_glyph_info_t) == sizeof (hb_glyph_position_t)); - - -/* - * hb_buffer_t - */ - -struct hb_buffer_t { - hb_object_header_t header; - ASSERT_POD (); - - /* Information about how the text in the buffer should be treated */ - - hb_unicode_funcs_t *unicode; /* Unicode functions */ - hb_segment_properties_t props; /* Script, language, direction */ - hb_buffer_flags_t flags; /* BOT / EOT / etc. */ - - /* Buffer contents */ - - hb_buffer_content_type_t content_type; - - bool in_error; /* Allocation failed */ - bool have_output; /* Whether we have an output buffer going on */ - bool have_positions; /* Whether we have positions */ - - unsigned int idx; /* Cursor into ->info and ->pos arrays */ - unsigned int len; /* Length of ->info and ->pos arrays */ - unsigned int out_len; /* Length of ->out array if have_output */ - - unsigned int allocated; /* Length of allocated arrays */ - hb_glyph_info_t *info; - hb_glyph_info_t *out_info; - hb_glyph_position_t *pos; - - inline hb_glyph_info_t &cur (unsigned int i = 0) { return info[idx + i]; } - inline hb_glyph_info_t cur (unsigned int i = 0) const { return info[idx + i]; } - - inline hb_glyph_position_t &cur_pos (unsigned int i = 0) { return pos[idx + i]; } - inline hb_glyph_position_t cur_pos (unsigned int i = 0) const { return pos[idx + i]; } - - inline hb_glyph_info_t &prev (void) { return out_info[out_len - 1]; } - inline hb_glyph_info_t prev (void) const { return info[out_len - 1]; } - - unsigned int serial; - - /* These reflect current allocations of the bytes in glyph_info_t's var1 and var2. */ - uint8_t allocated_var_bytes[8]; - const char *allocated_var_owner[8]; - - /* Text before / after the main buffer contents. - * Always in Unicode, and ordered outward. - * Index 0 is for "pre-context", 1 for "post-context". */ - static const unsigned int CONTEXT_LENGTH = 5; - hb_codepoint_t context[2][CONTEXT_LENGTH]; - unsigned int context_len[2]; - - - /* Methods */ - - HB_INTERNAL void reset (void); - HB_INTERNAL void clear (void); - - inline unsigned int backtrack_len (void) const - { return have_output? out_len : idx; } - inline unsigned int next_serial (void) { return serial++; } - - HB_INTERNAL void allocate_var (unsigned int byte_i, unsigned int count, const char *owner); - HB_INTERNAL void deallocate_var (unsigned int byte_i, unsigned int count, const char *owner); - HB_INTERNAL void assert_var (unsigned int byte_i, unsigned int count, const char *owner); - HB_INTERNAL void deallocate_var_all (void); - - HB_INTERNAL void add (hb_codepoint_t codepoint, - unsigned int cluster); - HB_INTERNAL void add_info (const hb_glyph_info_t &glyph_info); - - HB_INTERNAL void reverse_range (unsigned int start, unsigned int end); - HB_INTERNAL void reverse (void); - HB_INTERNAL void reverse_clusters (void); - HB_INTERNAL void guess_segment_properties (void); - - HB_INTERNAL void swap_buffers (void); - HB_INTERNAL void remove_output (void); - HB_INTERNAL void clear_output (void); - HB_INTERNAL void clear_positions (void); - - HB_INTERNAL void replace_glyphs (unsigned int num_in, - unsigned int num_out, - const hb_codepoint_t *glyph_data); - - HB_INTERNAL void replace_glyph (hb_codepoint_t glyph_index); - /* Makes a copy of the glyph at idx to output and replace glyph_index */ - HB_INTERNAL void output_glyph (hb_codepoint_t glyph_index); - HB_INTERNAL void output_info (const hb_glyph_info_t &glyph_info); - /* Copies glyph at idx to output but doesn't advance idx */ - HB_INTERNAL void copy_glyph (void); - /* Copies glyph at idx to output and advance idx. - * If there's no output, just advance idx. */ - inline void - next_glyph (void) - { - if (have_output) - { - if (unlikely (out_info != info || out_len != idx)) { - if (unlikely (!make_room_for (1, 1))) return; - out_info[out_len] = info[idx]; - } - out_len++; - } - - idx++; - } - - /* Advance idx without copying to output. */ - inline void skip_glyph (void) { idx++; } - - inline void reset_masks (hb_mask_t mask) - { - for (unsigned int j = 0; j < len; j++) - info[j].mask = mask; - } - inline void add_masks (hb_mask_t mask) - { - for (unsigned int j = 0; j < len; j++) - info[j].mask |= mask; - } - HB_INTERNAL void set_masks (hb_mask_t value, - hb_mask_t mask, - unsigned int cluster_start, - unsigned int cluster_end); - - HB_INTERNAL void merge_clusters (unsigned int start, - unsigned int end); - HB_INTERNAL void merge_out_clusters (unsigned int start, - unsigned int end); - - /* Internal methods */ - HB_INTERNAL bool enlarge (unsigned int size); - - inline bool ensure (unsigned int size) - { return likely (size < allocated) ? true : enlarge (size); } - - HB_INTERNAL bool make_room_for (unsigned int num_in, unsigned int num_out); - - HB_INTERNAL void *get_scratch_buffer (unsigned int *size); - - inline void clear_context (unsigned int side) { context_len[side] = 0; } -}; - - -#define HB_BUFFER_XALLOCATE_VAR(b, func, var, owner) \ - b->func (offsetof (hb_glyph_info_t, var) - offsetof(hb_glyph_info_t, var1), \ - sizeof (b->info[0].var), owner) -#define HB_BUFFER_ALLOCATE_VAR(b, var) \ - HB_BUFFER_XALLOCATE_VAR (b, allocate_var, var (), #var) -#define HB_BUFFER_DEALLOCATE_VAR(b, var) \ - HB_BUFFER_XALLOCATE_VAR (b, deallocate_var, var (), #var) -#define HB_BUFFER_ASSERT_VAR(b, var) \ - HB_BUFFER_XALLOCATE_VAR (b, assert_var, var (), #var) - - -#endif /* HB_BUFFER_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer-serialize.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer-serialize.cc deleted file mode 100644 index dc47ba73e08..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer-serialize.cc +++ /dev/null @@ -1,336 +0,0 @@ -/* - * Copyright © 2012,2013 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-buffer-private.hh" - - -static const char *serialize_formats[] = { - "text", - "json", - NULL -}; - -const char ** -hb_buffer_serialize_list_formats (void) -{ - return serialize_formats; -} - -hb_buffer_serialize_format_t -hb_buffer_serialize_format_from_string (const char *str, int len) -{ - /* Upper-case it. */ - return (hb_buffer_serialize_format_t) (hb_tag_from_string (str, len) & ~0x20202020); -} - -const char * -hb_buffer_serialize_format_to_string (hb_buffer_serialize_format_t format) -{ - switch (format) - { - case HB_BUFFER_SERIALIZE_FORMAT_TEXT: return serialize_formats[0]; - case HB_BUFFER_SERIALIZE_FORMAT_JSON: return serialize_formats[1]; - default: - case HB_BUFFER_SERIALIZE_FORMAT_INVALID: return NULL; - } -} - -static unsigned int -_hb_buffer_serialize_glyphs_json (hb_buffer_t *buffer, - unsigned int start, - unsigned int end, - char *buf, - unsigned int buf_size, - unsigned int *buf_consumed, - hb_font_t *font, - hb_buffer_serialize_flags_t flags) -{ - hb_glyph_info_t *info = hb_buffer_get_glyph_infos (buffer, NULL); - hb_glyph_position_t *pos = hb_buffer_get_glyph_positions (buffer, NULL); - - *buf_consumed = 0; - for (unsigned int i = start; i < end; i++) - { - char b[1024]; - char *p = b; - - /* In the following code, we know b is large enough that no overflow can happen. */ - -#define APPEND(s) HB_STMT_START { strcpy (p, s); p += strlen (s); } HB_STMT_END - - if (i) - *p++ = ','; - - *p++ = '{'; - - APPEND ("\"g\":"); - if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES)) - { - char g[128]; - hb_font_glyph_to_string (font, info[i].codepoint, g, sizeof (g)); - *p++ = '"'; - for (char *q = g; *q; q++) { - if (*q == '"') - *p++ = '\\'; - *p++ = *q; - } - *p++ = '"'; - } - else - p += snprintf (p, ARRAY_LENGTH (b) - (p - b), "%u", info[i].codepoint); - - if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS)) { - p += snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"cl\":%u", info[i].cluster); - } - - if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS)) - { - p += snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"dx\":%d,\"dy\":%d", - pos[i].x_offset, pos[i].y_offset); - p += snprintf (p, ARRAY_LENGTH (b) - (p - b), ",\"ax\":%d,\"ay\":%d", - pos[i].x_advance, pos[i].y_advance); - } - - *p++ = '}'; - - if (buf_size > (p - b)) - { - unsigned int l = p - b; - memcpy (buf, b, l); - buf += l; - buf_size -= l; - *buf_consumed += l; - *buf = '\0'; - } else - return i - start; - } - - return end - start; -} - -static unsigned int -_hb_buffer_serialize_glyphs_text (hb_buffer_t *buffer, - unsigned int start, - unsigned int end, - char *buf, - unsigned int buf_size, - unsigned int *buf_consumed, - hb_font_t *font, - hb_buffer_serialize_flags_t flags) -{ - hb_glyph_info_t *info = hb_buffer_get_glyph_infos (buffer, NULL); - hb_glyph_position_t *pos = hb_buffer_get_glyph_positions (buffer, NULL); - - *buf_consumed = 0; - for (unsigned int i = start; i < end; i++) - { - char b[1024]; - char *p = b; - - /* In the following code, we know b is large enough that no overflow can happen. */ - - if (i) - *p++ = '|'; - - if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES)) - { - hb_font_glyph_to_string (font, info[i].codepoint, p, 128); - p += strlen (p); - } - else - p += snprintf (p, ARRAY_LENGTH (b) - (p - b), "%u", info[i].codepoint); - - if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS)) { - p += snprintf (p, ARRAY_LENGTH (b) - (p - b), "=%u", info[i].cluster); - } - - if (!(flags & HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS)) - { - if (pos[i].x_offset || pos[i].y_offset) - p += snprintf (p, ARRAY_LENGTH (b) - (p - b), "@%d,%d", pos[i].x_offset, pos[i].y_offset); - - *p++ = '+'; - p += snprintf (p, ARRAY_LENGTH (b) - (p - b), "%d", pos[i].x_advance); - if (pos->y_advance) - p += snprintf (p, ARRAY_LENGTH (b) - (p - b), ",%d", pos[i].y_advance); - } - - if (buf_size > (p - b)) - { - unsigned int l = p - b; - memcpy (buf, b, l); - buf += l; - buf_size -= l; - *buf_consumed += l; - *buf = '\0'; - } else - return i - start; - } - - return end - start; -} - -/* Returns number of items, starting at start, that were serialized. */ -unsigned int -hb_buffer_serialize_glyphs (hb_buffer_t *buffer, - unsigned int start, - unsigned int end, - char *buf, - unsigned int buf_size, - unsigned int *buf_consumed, /* May be NULL */ - hb_font_t *font, /* May be NULL */ - hb_buffer_serialize_format_t format, - hb_buffer_serialize_flags_t flags) -{ - assert (start <= end && end <= buffer->len); - - unsigned int sconsumed; - if (!buf_consumed) - buf_consumed = &sconsumed; - *buf_consumed = 0; - - assert ((!buffer->len && buffer->content_type == HB_BUFFER_CONTENT_TYPE_INVALID) || - buffer->content_type == HB_BUFFER_CONTENT_TYPE_GLYPHS); - - if (unlikely (start == end)) - return 0; - - if (!font) - font = hb_font_get_empty (); - - switch (format) - { - case HB_BUFFER_SERIALIZE_FORMAT_TEXT: - return _hb_buffer_serialize_glyphs_text (buffer, start, end, - buf, buf_size, buf_consumed, - font, flags); - - case HB_BUFFER_SERIALIZE_FORMAT_JSON: - return _hb_buffer_serialize_glyphs_json (buffer, start, end, - buf, buf_size, buf_consumed, - font, flags); - - default: - case HB_BUFFER_SERIALIZE_FORMAT_INVALID: - return 0; - - } -} - - -static hb_bool_t -parse_uint (const char *pp, const char *end, uint32_t *pv) -{ - char buf[32]; - unsigned int len = MIN (ARRAY_LENGTH (buf) - 1, (unsigned int) (end - pp)); - strncpy (buf, pp, len); - buf[len] = '\0'; - - char *p = buf; - char *pend = p; - uint32_t v; - - errno = 0; - v = strtol (p, &pend, 10); - if (errno || p == pend || pend - p != end - pp) - return false; - - *pv = v; - return true; -} - -static hb_bool_t -parse_int (const char *pp, const char *end, int32_t *pv) -{ - char buf[32]; - unsigned int len = MIN (ARRAY_LENGTH (buf) - 1, (unsigned int) (end - pp)); - strncpy (buf, pp, len); - buf[len] = '\0'; - - char *p = buf; - char *pend = p; - int32_t v; - - errno = 0; - v = strtol (p, &pend, 10); - if (errno || p == pend || pend - p != end - pp) - return false; - - *pv = v; - return true; -} - -#include "hb-buffer-deserialize-json.hh" -#include "hb-buffer-deserialize-text.hh" - -hb_bool_t -hb_buffer_deserialize_glyphs (hb_buffer_t *buffer, - const char *buf, - int buf_len, /* -1 means nul-terminated */ - const char **end_ptr, /* May be NULL */ - hb_font_t *font, /* May be NULL */ - hb_buffer_serialize_format_t format) -{ - const char *end; - if (!end_ptr) - end_ptr = &end; - *end_ptr = buf; - - assert ((!buffer->len && buffer->content_type == HB_BUFFER_CONTENT_TYPE_INVALID) || - buffer->content_type == HB_BUFFER_CONTENT_TYPE_GLYPHS); - - if (buf_len == -1) - buf_len = strlen (buf); - - if (!buf_len) - { - *end_ptr = buf; - return false; - } - - hb_buffer_set_content_type (buffer, HB_BUFFER_CONTENT_TYPE_GLYPHS); - - if (!font) - font = hb_font_get_empty (); - - switch (format) - { - case HB_BUFFER_SERIALIZE_FORMAT_TEXT: - return _hb_buffer_deserialize_glyphs_text (buffer, - buf, buf_len, end_ptr, - font); - - case HB_BUFFER_SERIALIZE_FORMAT_JSON: - return _hb_buffer_deserialize_glyphs_json (buffer, - buf, buf_len, end_ptr, - font); - - default: - case HB_BUFFER_SERIALIZE_FORMAT_INVALID: - return false; - - } -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer.cc deleted file mode 100644 index 4e26250c963..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer.cc +++ /dev/null @@ -1,1077 +0,0 @@ -/* - * Copyright © 1998-2004 David Turner and Werner Lemberg - * Copyright © 2004,2007,2009,2010 Red Hat, Inc. - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Owen Taylor, Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-buffer-private.hh" -#include "hb-utf-private.hh" - - -#ifndef HB_DEBUG_BUFFER -#define HB_DEBUG_BUFFER (HB_DEBUG+0) -#endif - - -hb_bool_t -hb_segment_properties_equal (const hb_segment_properties_t *a, - const hb_segment_properties_t *b) -{ - return a->direction == b->direction && - a->script == b->script && - a->language == b->language && - a->reserved1 == b->reserved1 && - a->reserved2 == b->reserved2; - -} - -unsigned int -hb_segment_properties_hash (const hb_segment_properties_t *p) -{ - return (unsigned int) p->direction ^ - (unsigned int) p->script ^ - (intptr_t) (p->language); -} - - - -/* Here is how the buffer works internally: - * - * There are two info pointers: info and out_info. They always have - * the same allocated size, but different lengths. - * - * As an optimization, both info and out_info may point to the - * same piece of memory, which is owned by info. This remains the - * case as long as out_len doesn't exceed i at any time. - * In that case, swap_buffers() is no-op and the glyph operations operate - * mostly in-place. - * - * As soon as out_info gets longer than info, out_info is moved over - * to an alternate buffer (which we reuse the pos buffer for!), and its - * current contents (out_len entries) are copied to the new place. - * This should all remain transparent to the user. swap_buffers() then - * switches info and out_info. - */ - - - -/* Internal API */ - -bool -hb_buffer_t::enlarge (unsigned int size) -{ - if (unlikely (in_error)) - return false; - - unsigned int new_allocated = allocated; - hb_glyph_position_t *new_pos = NULL; - hb_glyph_info_t *new_info = NULL; - bool separate_out = out_info != info; - - if (unlikely (_hb_unsigned_int_mul_overflows (size, sizeof (info[0])))) - goto done; - - while (size >= new_allocated) - new_allocated += (new_allocated >> 1) + 32; - - ASSERT_STATIC (sizeof (info[0]) == sizeof (pos[0])); - if (unlikely (_hb_unsigned_int_mul_overflows (new_allocated, sizeof (info[0])))) - goto done; - - new_pos = (hb_glyph_position_t *) realloc (pos, new_allocated * sizeof (pos[0])); - new_info = (hb_glyph_info_t *) realloc (info, new_allocated * sizeof (info[0])); - -done: - if (unlikely (!new_pos || !new_info)) - in_error = true; - - if (likely (new_pos)) - pos = new_pos; - - if (likely (new_info)) - info = new_info; - - out_info = separate_out ? (hb_glyph_info_t *) pos : info; - if (likely (!in_error)) - allocated = new_allocated; - - return likely (!in_error); -} - -bool -hb_buffer_t::make_room_for (unsigned int num_in, - unsigned int num_out) -{ - if (unlikely (!ensure (out_len + num_out))) return false; - - if (out_info == info && - out_len + num_out > idx + num_in) - { - assert (have_output); - - out_info = (hb_glyph_info_t *) pos; - memcpy (out_info, info, out_len * sizeof (out_info[0])); - } - - return true; -} - -void * -hb_buffer_t::get_scratch_buffer (unsigned int *size) -{ - have_output = false; - have_positions = false; - - out_len = 0; - out_info = info; - - *size = allocated * sizeof (pos[0]); - return pos; -} - - - -/* HarfBuzz-Internal API */ - -void -hb_buffer_t::reset (void) -{ - if (unlikely (hb_object_is_inert (this))) - return; - - hb_unicode_funcs_destroy (unicode); - unicode = hb_unicode_funcs_get_default (); - - clear (); -} - -void -hb_buffer_t::clear (void) -{ - if (unlikely (hb_object_is_inert (this))) - return; - - hb_segment_properties_t default_props = HB_SEGMENT_PROPERTIES_DEFAULT; - props = default_props; - flags = HB_BUFFER_FLAGS_DEFAULT; - - content_type = HB_BUFFER_CONTENT_TYPE_INVALID; - in_error = false; - have_output = false; - have_positions = false; - - idx = 0; - len = 0; - out_len = 0; - out_info = info; - - serial = 0; - memset (allocated_var_bytes, 0, sizeof allocated_var_bytes); - memset (allocated_var_owner, 0, sizeof allocated_var_owner); - - memset (context, 0, sizeof context); - memset (context_len, 0, sizeof context_len); -} - -void -hb_buffer_t::add (hb_codepoint_t codepoint, - unsigned int cluster) -{ - hb_glyph_info_t *glyph; - - if (unlikely (!ensure (len + 1))) return; - - glyph = &info[len]; - - memset (glyph, 0, sizeof (*glyph)); - glyph->codepoint = codepoint; - glyph->mask = 1; - glyph->cluster = cluster; - - len++; -} - -void -hb_buffer_t::add_info (const hb_glyph_info_t &glyph_info) -{ - if (unlikely (!ensure (len + 1))) return; - - info[len] = glyph_info; - - len++; -} - - -void -hb_buffer_t::remove_output (void) -{ - if (unlikely (hb_object_is_inert (this))) - return; - - have_output = false; - have_positions = false; - - out_len = 0; - out_info = info; -} - -void -hb_buffer_t::clear_output (void) -{ - if (unlikely (hb_object_is_inert (this))) - return; - - have_output = true; - have_positions = false; - - out_len = 0; - out_info = info; -} - -void -hb_buffer_t::clear_positions (void) -{ - if (unlikely (hb_object_is_inert (this))) - return; - - have_output = false; - have_positions = true; - - out_len = 0; - out_info = info; - - memset (pos, 0, sizeof (pos[0]) * len); -} - -void -hb_buffer_t::swap_buffers (void) -{ - if (unlikely (in_error)) return; - - assert (have_output); - have_output = false; - - if (out_info != info) - { - hb_glyph_info_t *tmp_string; - tmp_string = info; - info = out_info; - out_info = tmp_string; - pos = (hb_glyph_position_t *) out_info; - } - - unsigned int tmp; - tmp = len; - len = out_len; - out_len = tmp; - - idx = 0; -} - - -void -hb_buffer_t::replace_glyphs (unsigned int num_in, - unsigned int num_out, - const uint32_t *glyph_data) -{ - if (unlikely (!make_room_for (num_in, num_out))) return; - - merge_clusters (idx, idx + num_in); - - hb_glyph_info_t orig_info = info[idx]; - hb_glyph_info_t *pinfo = &out_info[out_len]; - for (unsigned int i = 0; i < num_out; i++) - { - *pinfo = orig_info; - pinfo->codepoint = glyph_data[i]; - pinfo++; - } - - idx += num_in; - out_len += num_out; -} - -void -hb_buffer_t::output_glyph (hb_codepoint_t glyph_index) -{ - if (unlikely (!make_room_for (0, 1))) return; - - out_info[out_len] = info[idx]; - out_info[out_len].codepoint = glyph_index; - - out_len++; -} - -void -hb_buffer_t::output_info (const hb_glyph_info_t &glyph_info) -{ - if (unlikely (!make_room_for (0, 1))) return; - - out_info[out_len] = glyph_info; - - out_len++; -} - -void -hb_buffer_t::copy_glyph (void) -{ - if (unlikely (!make_room_for (0, 1))) return; - - out_info[out_len] = info[idx]; - - out_len++; -} - -void -hb_buffer_t::replace_glyph (hb_codepoint_t glyph_index) -{ - if (unlikely (out_info != info || out_len != idx)) { - if (unlikely (!make_room_for (1, 1))) return; - out_info[out_len] = info[idx]; - } - out_info[out_len].codepoint = glyph_index; - - idx++; - out_len++; -} - - -void -hb_buffer_t::set_masks (hb_mask_t value, - hb_mask_t mask, - unsigned int cluster_start, - unsigned int cluster_end) -{ - hb_mask_t not_mask = ~mask; - value &= mask; - - if (!mask) - return; - - if (cluster_start == 0 && cluster_end == (unsigned int)-1) { - unsigned int count = len; - for (unsigned int i = 0; i < count; i++) - info[i].mask = (info[i].mask & not_mask) | value; - return; - } - - unsigned int count = len; - for (unsigned int i = 0; i < count; i++) - if (cluster_start <= info[i].cluster && info[i].cluster < cluster_end) - info[i].mask = (info[i].mask & not_mask) | value; -} - -void -hb_buffer_t::reverse_range (unsigned int start, - unsigned int end) -{ - unsigned int i, j; - - if (start == end - 1) - return; - - for (i = start, j = end - 1; i < j; i++, j--) { - hb_glyph_info_t t; - - t = info[i]; - info[i] = info[j]; - info[j] = t; - } - - if (pos) { - for (i = start, j = end - 1; i < j; i++, j--) { - hb_glyph_position_t t; - - t = pos[i]; - pos[i] = pos[j]; - pos[j] = t; - } - } -} - -void -hb_buffer_t::reverse (void) -{ - if (unlikely (!len)) - return; - - reverse_range (0, len); -} - -void -hb_buffer_t::reverse_clusters (void) -{ - unsigned int i, start, count, last_cluster; - - if (unlikely (!len)) - return; - - reverse (); - - count = len; - start = 0; - last_cluster = info[0].cluster; - for (i = 1; i < count; i++) { - if (last_cluster != info[i].cluster) { - reverse_range (start, i); - start = i; - last_cluster = info[i].cluster; - } - } - reverse_range (start, i); -} - -void -hb_buffer_t::merge_clusters (unsigned int start, - unsigned int end) -{ - if (unlikely (end - start < 2)) - return; - - unsigned int cluster = info[start].cluster; - - for (unsigned int i = start + 1; i < end; i++) - cluster = MIN (cluster, info[i].cluster); - - /* Extend end */ - while (end < len && info[end - 1].cluster == info[end].cluster) - end++; - - /* Extend start */ - while (idx < start && info[start - 1].cluster == info[start].cluster) - start--; - - /* If we hit the start of buffer, continue in out-buffer. */ - if (idx == start) - for (unsigned i = out_len; i && out_info[i - 1].cluster == info[start].cluster; i--) - out_info[i - 1].cluster = cluster; - - for (unsigned int i = start; i < end; i++) - info[i].cluster = cluster; -} -void -hb_buffer_t::merge_out_clusters (unsigned int start, - unsigned int end) -{ - if (unlikely (end - start < 2)) - return; - - unsigned int cluster = out_info[start].cluster; - - for (unsigned int i = start + 1; i < end; i++) - cluster = MIN (cluster, out_info[i].cluster); - - /* Extend start */ - while (start && out_info[start - 1].cluster == out_info[start].cluster) - start--; - - /* Extend end */ - while (end < out_len && out_info[end - 1].cluster == out_info[end].cluster) - end++; - - /* If we hit the end of out-buffer, continue in buffer. */ - if (end == out_len) - for (unsigned i = idx; i < len && info[i].cluster == out_info[end - 1].cluster; i++) - info[i].cluster = cluster; - - for (unsigned int i = start; i < end; i++) - out_info[i].cluster = cluster; -} - -void -hb_buffer_t::guess_segment_properties (void) -{ - assert (content_type == HB_BUFFER_CONTENT_TYPE_UNICODE || - (!len && content_type == HB_BUFFER_CONTENT_TYPE_INVALID)); - - /* If script is set to INVALID, guess from buffer contents */ - if (props.script == HB_SCRIPT_INVALID) { - for (unsigned int i = 0; i < len; i++) { - hb_script_t script = unicode->script (info[i].codepoint); - if (likely (script != HB_SCRIPT_COMMON && - script != HB_SCRIPT_INHERITED && - script != HB_SCRIPT_UNKNOWN)) { - props.script = script; - break; - } - } - } - - /* If direction is set to INVALID, guess from script */ - if (props.direction == HB_DIRECTION_INVALID) { - props.direction = hb_script_get_horizontal_direction (props.script); - } - - /* If language is not set, use default language from locale */ - if (props.language == HB_LANGUAGE_INVALID) { - /* TODO get_default_for_script? using $LANGUAGE */ - props.language = hb_language_get_default (); - } -} - - -static inline void -dump_var_allocation (const hb_buffer_t *buffer) -{ - char buf[80]; - for (unsigned int i = 0; i < 8; i++) - buf[i] = '0' + buffer->allocated_var_bytes[7 - i]; - buf[8] = '\0'; - DEBUG_MSG (BUFFER, buffer, - "Current var allocation: %s", - buf); -} - -void hb_buffer_t::allocate_var (unsigned int byte_i, unsigned int count, const char *owner) -{ - assert (byte_i < 8 && byte_i + count <= 8); - - if (DEBUG (BUFFER)) - dump_var_allocation (this); - DEBUG_MSG (BUFFER, this, - "Allocating var bytes %d..%d for %s", - byte_i, byte_i + count - 1, owner); - - for (unsigned int i = byte_i; i < byte_i + count; i++) { - assert (!allocated_var_bytes[i]); - allocated_var_bytes[i]++; - allocated_var_owner[i] = owner; - } -} - -void hb_buffer_t::deallocate_var (unsigned int byte_i, unsigned int count, const char *owner) -{ - if (DEBUG (BUFFER)) - dump_var_allocation (this); - - DEBUG_MSG (BUFFER, this, - "Deallocating var bytes %d..%d for %s", - byte_i, byte_i + count - 1, owner); - - assert (byte_i < 8 && byte_i + count <= 8); - for (unsigned int i = byte_i; i < byte_i + count; i++) { - assert (allocated_var_bytes[i]); - assert (0 == strcmp (allocated_var_owner[i], owner)); - allocated_var_bytes[i]--; - } -} - -void hb_buffer_t::assert_var (unsigned int byte_i, unsigned int count, const char *owner) -{ - if (DEBUG (BUFFER)) - dump_var_allocation (this); - - DEBUG_MSG (BUFFER, this, - "Asserting var bytes %d..%d for %s", - byte_i, byte_i + count - 1, owner); - - assert (byte_i < 8 && byte_i + count <= 8); - for (unsigned int i = byte_i; i < byte_i + count; i++) { - assert (allocated_var_bytes[i]); - assert (0 == strcmp (allocated_var_owner[i], owner)); - } -} - -void hb_buffer_t::deallocate_var_all (void) -{ - memset (allocated_var_bytes, 0, sizeof (allocated_var_bytes)); - memset (allocated_var_owner, 0, sizeof (allocated_var_owner)); -} - -/* Public API */ - -hb_buffer_t * -hb_buffer_create (void) -{ - hb_buffer_t *buffer; - - if (!(buffer = hb_object_create<hb_buffer_t> ())) - return hb_buffer_get_empty (); - - buffer->reset (); - - return buffer; -} - -hb_buffer_t * -hb_buffer_get_empty (void) -{ - static const hb_buffer_t _hb_buffer_nil = { - HB_OBJECT_HEADER_STATIC, - - const_cast<hb_unicode_funcs_t *> (&_hb_unicode_funcs_nil), - HB_SEGMENT_PROPERTIES_DEFAULT, - HB_BUFFER_FLAGS_DEFAULT, - - HB_BUFFER_CONTENT_TYPE_INVALID, - true, /* in_error */ - true, /* have_output */ - true /* have_positions */ - - /* Zero is good enough for everything else. */ - }; - - return const_cast<hb_buffer_t *> (&_hb_buffer_nil); -} - -hb_buffer_t * -hb_buffer_reference (hb_buffer_t *buffer) -{ - return hb_object_reference (buffer); -} - -void -hb_buffer_destroy (hb_buffer_t *buffer) -{ - if (!hb_object_destroy (buffer)) return; - - hb_unicode_funcs_destroy (buffer->unicode); - - free (buffer->info); - free (buffer->pos); - - free (buffer); -} - -hb_bool_t -hb_buffer_set_user_data (hb_buffer_t *buffer, - hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy, - hb_bool_t replace) -{ - return hb_object_set_user_data (buffer, key, data, destroy, replace); -} - -void * -hb_buffer_get_user_data (hb_buffer_t *buffer, - hb_user_data_key_t *key) -{ - return hb_object_get_user_data (buffer, key); -} - - -void -hb_buffer_set_content_type (hb_buffer_t *buffer, - hb_buffer_content_type_t content_type) -{ - buffer->content_type = content_type; -} - -hb_buffer_content_type_t -hb_buffer_get_content_type (hb_buffer_t *buffer) -{ - return buffer->content_type; -} - - -void -hb_buffer_set_unicode_funcs (hb_buffer_t *buffer, - hb_unicode_funcs_t *unicode) -{ - if (unlikely (hb_object_is_inert (buffer))) - return; - - if (!unicode) - unicode = hb_unicode_funcs_get_default (); - - - hb_unicode_funcs_reference (unicode); - hb_unicode_funcs_destroy (buffer->unicode); - buffer->unicode = unicode; -} - -hb_unicode_funcs_t * -hb_buffer_get_unicode_funcs (hb_buffer_t *buffer) -{ - return buffer->unicode; -} - -void -hb_buffer_set_direction (hb_buffer_t *buffer, - hb_direction_t direction) - -{ - if (unlikely (hb_object_is_inert (buffer))) - return; - - buffer->props.direction = direction; -} - -hb_direction_t -hb_buffer_get_direction (hb_buffer_t *buffer) -{ - return buffer->props.direction; -} - -void -hb_buffer_set_script (hb_buffer_t *buffer, - hb_script_t script) -{ - if (unlikely (hb_object_is_inert (buffer))) - return; - - buffer->props.script = script; -} - -hb_script_t -hb_buffer_get_script (hb_buffer_t *buffer) -{ - return buffer->props.script; -} - -void -hb_buffer_set_language (hb_buffer_t *buffer, - hb_language_t language) -{ - if (unlikely (hb_object_is_inert (buffer))) - return; - - buffer->props.language = language; -} - -hb_language_t -hb_buffer_get_language (hb_buffer_t *buffer) -{ - return buffer->props.language; -} - -void -hb_buffer_set_segment_properties (hb_buffer_t *buffer, - const hb_segment_properties_t *props) -{ - if (unlikely (hb_object_is_inert (buffer))) - return; - - buffer->props = *props; -} - -void -hb_buffer_get_segment_properties (hb_buffer_t *buffer, - hb_segment_properties_t *props) -{ - *props = buffer->props; -} - - -void -hb_buffer_set_flags (hb_buffer_t *buffer, - hb_buffer_flags_t flags) -{ - if (unlikely (hb_object_is_inert (buffer))) - return; - - buffer->flags = flags; -} - -hb_buffer_flags_t -hb_buffer_get_flags (hb_buffer_t *buffer) -{ - return buffer->flags; -} - - -void -hb_buffer_reset (hb_buffer_t *buffer) -{ - buffer->reset (); -} - -void -hb_buffer_clear_contents (hb_buffer_t *buffer) -{ - buffer->clear (); -} - -hb_bool_t -hb_buffer_pre_allocate (hb_buffer_t *buffer, unsigned int size) -{ - return buffer->ensure (size); -} - -hb_bool_t -hb_buffer_allocation_successful (hb_buffer_t *buffer) -{ - return !buffer->in_error; -} - -void -hb_buffer_add (hb_buffer_t *buffer, - hb_codepoint_t codepoint, - unsigned int cluster) -{ - buffer->add (codepoint, cluster); - buffer->clear_context (1); -} - -hb_bool_t -hb_buffer_set_length (hb_buffer_t *buffer, - unsigned int length) -{ - if (unlikely (hb_object_is_inert (buffer))) - return length == 0; - - if (!buffer->ensure (length)) - return false; - - /* Wipe the new space */ - if (length > buffer->len) { - memset (buffer->info + buffer->len, 0, sizeof (buffer->info[0]) * (length - buffer->len)); - if (buffer->have_positions) - memset (buffer->pos + buffer->len, 0, sizeof (buffer->pos[0]) * (length - buffer->len)); - } - - buffer->len = length; - - if (!length) - buffer->clear_context (0); - buffer->clear_context (1); - - return true; -} - -unsigned int -hb_buffer_get_length (hb_buffer_t *buffer) -{ - return buffer->len; -} - -/* Return value valid as long as buffer not modified */ -hb_glyph_info_t * -hb_buffer_get_glyph_infos (hb_buffer_t *buffer, - unsigned int *length) -{ - if (length) - *length = buffer->len; - - return (hb_glyph_info_t *) buffer->info; -} - -/* Return value valid as long as buffer not modified */ -hb_glyph_position_t * -hb_buffer_get_glyph_positions (hb_buffer_t *buffer, - unsigned int *length) -{ - if (!buffer->have_positions) - buffer->clear_positions (); - - if (length) - *length = buffer->len; - - return (hb_glyph_position_t *) buffer->pos; -} - -void -hb_buffer_reverse (hb_buffer_t *buffer) -{ - buffer->reverse (); -} - -void -hb_buffer_reverse_clusters (hb_buffer_t *buffer) -{ - buffer->reverse_clusters (); -} - -void -hb_buffer_guess_segment_properties (hb_buffer_t *buffer) -{ - buffer->guess_segment_properties (); -} - -template <typename T> -static inline void -hb_buffer_add_utf (hb_buffer_t *buffer, - const T *text, - int text_length, - unsigned int item_offset, - int item_length) -{ - assert (buffer->content_type == HB_BUFFER_CONTENT_TYPE_UNICODE || - (!buffer->len && buffer->content_type == HB_BUFFER_CONTENT_TYPE_INVALID)); - - if (unlikely (hb_object_is_inert (buffer))) - return; - - if (text_length == -1) - text_length = hb_utf_strlen (text); - - if (item_length == -1) - item_length = text_length - item_offset; - - buffer->ensure (buffer->len + item_length * sizeof (T) / 4); - - /* If buffer is empty and pre-context provided, install it. - * This check is written this way, to make sure people can - * provide pre-context in one add_utf() call, then provide - * text in a follow-up call. See: - * - * https://bugzilla.mozilla.org/show_bug.cgi?id=801410#c13 - */ - if (!buffer->len && item_offset > 0) - { - /* Add pre-context */ - buffer->clear_context (0); - const T *prev = text + item_offset; - const T *start = text; - while (start < prev && buffer->context_len[0] < buffer->CONTEXT_LENGTH) - { - hb_codepoint_t u; - prev = hb_utf_prev (prev, start, &u); - buffer->context[0][buffer->context_len[0]++] = u; - } - } - - const T *next = text + item_offset; - const T *end = next + item_length; - while (next < end) - { - hb_codepoint_t u; - const T *old_next = next; - next = hb_utf_next (next, end, &u); - buffer->add (u, old_next - (const T *) text); - } - - /* Add post-context */ - buffer->clear_context (1); - end = text + text_length; - while (next < end && buffer->context_len[1] < buffer->CONTEXT_LENGTH) - { - hb_codepoint_t u; - next = hb_utf_next (next, end, &u); - buffer->context[1][buffer->context_len[1]++] = u; - } - - buffer->content_type = HB_BUFFER_CONTENT_TYPE_UNICODE; -} - -void -hb_buffer_add_utf8 (hb_buffer_t *buffer, - const char *text, - int text_length, - unsigned int item_offset, - int item_length) -{ - hb_buffer_add_utf (buffer, (const uint8_t *) text, text_length, item_offset, item_length); -} - -void -hb_buffer_add_utf16 (hb_buffer_t *buffer, - const uint16_t *text, - int text_length, - unsigned int item_offset, - int item_length) -{ - hb_buffer_add_utf (buffer, text, text_length, item_offset, item_length); -} - -void -hb_buffer_add_utf32 (hb_buffer_t *buffer, - const uint32_t *text, - int text_length, - unsigned int item_offset, - int item_length) -{ - hb_buffer_add_utf (buffer, text, text_length, item_offset, item_length); -} - - -static int -compare_info_codepoint (const hb_glyph_info_t *pa, - const hb_glyph_info_t *pb) -{ - return (int) pb->codepoint - (int) pa->codepoint; -} - -static inline void -normalize_glyphs_cluster (hb_buffer_t *buffer, - unsigned int start, - unsigned int end, - bool backward) -{ - hb_glyph_position_t *pos = buffer->pos; - - /* Total cluster advance */ - hb_position_t total_x_advance = 0, total_y_advance = 0; - for (unsigned int i = start; i < end; i++) - { - total_x_advance += pos[i].x_advance; - total_y_advance += pos[i].y_advance; - } - - hb_position_t x_advance = 0, y_advance = 0; - for (unsigned int i = start; i < end; i++) - { - pos[i].x_offset += x_advance; - pos[i].y_offset += y_advance; - - x_advance += pos[i].x_advance; - y_advance += pos[i].y_advance; - - pos[i].x_advance = 0; - pos[i].y_advance = 0; - } - - if (backward) - { - /* Transfer all cluster advance to the last glyph. */ - pos[end - 1].x_advance = total_x_advance; - pos[end - 1].y_advance = total_y_advance; - - hb_bubble_sort (buffer->info + start, end - start - 1, compare_info_codepoint, buffer->pos + start); - } else { - /* Transfer all cluster advance to the first glyph. */ - pos[start].x_advance += total_x_advance; - pos[start].y_advance += total_y_advance; - for (unsigned int i = start + 1; i < end; i++) { - pos[i].x_offset -= total_x_advance; - pos[i].y_offset -= total_y_advance; - } - hb_bubble_sort (buffer->info + start + 1, end - start - 1, compare_info_codepoint, buffer->pos + start + 1); - } -} - -void -hb_buffer_normalize_glyphs (hb_buffer_t *buffer) -{ - assert (buffer->have_positions); - assert (buffer->content_type == HB_BUFFER_CONTENT_TYPE_GLYPHS); - - bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction); - - unsigned int count = buffer->len; - if (unlikely (!count)) return; - hb_glyph_info_t *info = buffer->info; - - unsigned int start = 0; - unsigned int end; - for (end = start + 1; end < count; end++) - if (info[start].cluster != info[end].cluster) { - normalize_glyphs_cluster (buffer, start, end, backward); - start = end; - } - normalize_glyphs_cluster (buffer, start, end, backward); -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer.h deleted file mode 100644 index 55a40457193..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-buffer.h +++ /dev/null @@ -1,323 +0,0 @@ -/* - * Copyright © 1998-2004 David Turner and Werner Lemberg - * Copyright © 2004,2007,2009 Red Hat, Inc. - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Owen Taylor, Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_H_IN -#error "Include <hb.h> instead." -#endif - -#ifndef HB_BUFFER_H -#define HB_BUFFER_H - -#include "hb-common.h" -#include "hb-unicode.h" -#include "hb-font.h" - -HB_BEGIN_DECLS - - -typedef struct hb_glyph_info_t { - hb_codepoint_t codepoint; - hb_mask_t mask; - uint32_t cluster; - - /*< private >*/ - hb_var_int_t var1; - hb_var_int_t var2; -} hb_glyph_info_t; - -typedef struct hb_glyph_position_t { - hb_position_t x_advance; - hb_position_t y_advance; - hb_position_t x_offset; - hb_position_t y_offset; - - /*< private >*/ - hb_var_int_t var; -} hb_glyph_position_t; - - -typedef struct hb_segment_properties_t { - hb_direction_t direction; - hb_script_t script; - hb_language_t language; - /*< private >*/ - void *reserved1; - void *reserved2; -} hb_segment_properties_t; - -#define HB_SEGMENT_PROPERTIES_DEFAULT {HB_DIRECTION_INVALID, \ - HB_SCRIPT_INVALID, \ - HB_LANGUAGE_INVALID, \ - NULL, \ - NULL} - -hb_bool_t -hb_segment_properties_equal (const hb_segment_properties_t *a, - const hb_segment_properties_t *b); - -unsigned int -hb_segment_properties_hash (const hb_segment_properties_t *p); - - - -/* - * hb_buffer_t - */ - -typedef struct hb_buffer_t hb_buffer_t; - -hb_buffer_t * -hb_buffer_create (void); - -hb_buffer_t * -hb_buffer_get_empty (void); - -hb_buffer_t * -hb_buffer_reference (hb_buffer_t *buffer); - -void -hb_buffer_destroy (hb_buffer_t *buffer); - -hb_bool_t -hb_buffer_set_user_data (hb_buffer_t *buffer, - hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy, - hb_bool_t replace); - -void * -hb_buffer_get_user_data (hb_buffer_t *buffer, - hb_user_data_key_t *key); - - -typedef enum { - HB_BUFFER_CONTENT_TYPE_INVALID = 0, - HB_BUFFER_CONTENT_TYPE_UNICODE, - HB_BUFFER_CONTENT_TYPE_GLYPHS -} hb_buffer_content_type_t; - -void -hb_buffer_set_content_type (hb_buffer_t *buffer, - hb_buffer_content_type_t content_type); - -hb_buffer_content_type_t -hb_buffer_get_content_type (hb_buffer_t *buffer); - - -void -hb_buffer_set_unicode_funcs (hb_buffer_t *buffer, - hb_unicode_funcs_t *unicode_funcs); - -hb_unicode_funcs_t * -hb_buffer_get_unicode_funcs (hb_buffer_t *buffer); - -void -hb_buffer_set_direction (hb_buffer_t *buffer, - hb_direction_t direction); - -hb_direction_t -hb_buffer_get_direction (hb_buffer_t *buffer); - -void -hb_buffer_set_script (hb_buffer_t *buffer, - hb_script_t script); - -hb_script_t -hb_buffer_get_script (hb_buffer_t *buffer); - -void -hb_buffer_set_language (hb_buffer_t *buffer, - hb_language_t language); - - -hb_language_t -hb_buffer_get_language (hb_buffer_t *buffer); - -void -hb_buffer_set_segment_properties (hb_buffer_t *buffer, - const hb_segment_properties_t *props); - -void -hb_buffer_get_segment_properties (hb_buffer_t *buffer, - hb_segment_properties_t *props); - -void -hb_buffer_guess_segment_properties (hb_buffer_t *buffer); - - -typedef enum { - HB_BUFFER_FLAGS_DEFAULT = 0x00000000, - HB_BUFFER_FLAG_BOT = 0x00000001, /* Beginning-of-text */ - HB_BUFFER_FLAG_EOT = 0x00000002, /* End-of-text */ - HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES = 0x00000004 -} hb_buffer_flags_t; - -void -hb_buffer_set_flags (hb_buffer_t *buffer, - hb_buffer_flags_t flags); - -hb_buffer_flags_t -hb_buffer_get_flags (hb_buffer_t *buffer); - - -/* Resets the buffer. Afterwards it's as if it was just created, - * except that it has a larger buffer allocated perhaps... */ -void -hb_buffer_reset (hb_buffer_t *buffer); - -/* Like reset, but does NOT clear unicode_funcs. */ -void -hb_buffer_clear_contents (hb_buffer_t *buffer); - -/* Returns false if allocation failed */ -hb_bool_t -hb_buffer_pre_allocate (hb_buffer_t *buffer, - unsigned int size); - - -/* Returns false if allocation has failed before */ -hb_bool_t -hb_buffer_allocation_successful (hb_buffer_t *buffer); - -void -hb_buffer_reverse (hb_buffer_t *buffer); - -void -hb_buffer_reverse_clusters (hb_buffer_t *buffer); - - -/* Filling the buffer in */ - -void -hb_buffer_add (hb_buffer_t *buffer, - hb_codepoint_t codepoint, - unsigned int cluster); - -void -hb_buffer_add_utf8 (hb_buffer_t *buffer, - const char *text, - int text_length, - unsigned int item_offset, - int item_length); - -void -hb_buffer_add_utf16 (hb_buffer_t *buffer, - const uint16_t *text, - int text_length, - unsigned int item_offset, - int item_length); - -void -hb_buffer_add_utf32 (hb_buffer_t *buffer, - const uint32_t *text, - int text_length, - unsigned int item_offset, - int item_length); - - -/* Clears any new items added at the end */ -hb_bool_t -hb_buffer_set_length (hb_buffer_t *buffer, - unsigned int length); - -/* Return value valid as long as buffer not modified */ -unsigned int -hb_buffer_get_length (hb_buffer_t *buffer); - -/* Getting glyphs out of the buffer */ - -/* Return value valid as long as buffer not modified */ -hb_glyph_info_t * -hb_buffer_get_glyph_infos (hb_buffer_t *buffer, - unsigned int *length); - -/* Return value valid as long as buffer not modified */ -hb_glyph_position_t * -hb_buffer_get_glyph_positions (hb_buffer_t *buffer, - unsigned int *length); - - -/* Reorders a glyph buffer to have canonical in-cluster glyph order / position. - * The resulting clusters should behave identical to pre-reordering clusters. - * NOTE: This has nothing to do with Unicode normalization. */ -void -hb_buffer_normalize_glyphs (hb_buffer_t *buffer); - - -/* - * Serialize - */ - -typedef enum { - HB_BUFFER_SERIALIZE_FLAGS_DEFAULT = 0x00000000, - HB_BUFFER_SERIALIZE_FLAG_NO_CLUSTERS = 0x00000001, - HB_BUFFER_SERIALIZE_FLAG_NO_POSITIONS = 0x00000002, - HB_BUFFER_SERIALIZE_FLAG_NO_GLYPH_NAMES = 0x00000004 -} hb_buffer_serialize_flags_t; - -typedef enum { - HB_BUFFER_SERIALIZE_FORMAT_TEXT = HB_TAG('T','E','X','T'), - HB_BUFFER_SERIALIZE_FORMAT_JSON = HB_TAG('J','S','O','N'), - HB_BUFFER_SERIALIZE_FORMAT_INVALID = HB_TAG_NONE -} hb_buffer_serialize_format_t; - -/* len=-1 means str is NUL-terminated. */ -hb_buffer_serialize_format_t -hb_buffer_serialize_format_from_string (const char *str, int len); - -const char * -hb_buffer_serialize_format_to_string (hb_buffer_serialize_format_t format); - -const char ** -hb_buffer_serialize_list_formats (void); - -/* Returns number of items, starting at start, that were serialized. */ -unsigned int -hb_buffer_serialize_glyphs (hb_buffer_t *buffer, - unsigned int start, - unsigned int end, - char *buf, - unsigned int buf_size, - unsigned int *buf_consumed, /* May be NULL */ - hb_font_t *font, /* May be NULL */ - hb_buffer_serialize_format_t format, - hb_buffer_serialize_flags_t flags); - -hb_bool_t -hb_buffer_deserialize_glyphs (hb_buffer_t *buffer, - const char *buf, - int buf_len, /* -1 means nul-terminated */ - const char **end_ptr, /* May be NULL */ - hb_font_t *font, /* May be NULL */ - hb_buffer_serialize_format_t format); - - -HB_END_DECLS - -#endif /* HB_BUFFER_H */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-cache-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-cache-private.hh deleted file mode 100644 index 19b70b7e395..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-cache-private.hh +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_CACHE_PRIVATE_HH -#define HB_CACHE_PRIVATE_HH - -#include "hb-private.hh" - - -/* Implements a lock-free cache for int->int functions. */ - -template <unsigned int key_bits, unsigned int value_bits, unsigned int cache_bits> -struct hb_cache_t -{ - ASSERT_STATIC (key_bits >= cache_bits); - ASSERT_STATIC (key_bits + value_bits - cache_bits < 8 * sizeof (unsigned int)); - - inline void clear (void) - { - memset (values, 255, sizeof (values)); - } - - inline bool get (unsigned int key, unsigned int *value) - { - unsigned int k = key & ((1<<cache_bits)-1); - unsigned int v = values[k]; - if ((v >> value_bits) != (key >> cache_bits)) - return false; - *value = v & ((1<<value_bits)-1); - return true; - } - - inline bool set (unsigned int key, unsigned int value) - { - if (unlikely ((key >> key_bits) || (value >> value_bits))) - return false; /* Overflows */ - unsigned int k = key & ((1<<cache_bits)-1); - unsigned int v = ((key>>cache_bits)<<value_bits) | value; - values[k] = v; - return true; - } - - private: - unsigned int values[1<<cache_bits]; -}; - -typedef hb_cache_t<21, 16, 8> hb_cmap_cache_t; -typedef hb_cache_t<16, 24, 8> hb_advance_cache_t; - - -#endif /* HB_CACHE_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-common.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-common.cc deleted file mode 100644 index 540d252cd73..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-common.cc +++ /dev/null @@ -1,434 +0,0 @@ -/* - * Copyright © 2009,2010 Red Hat, Inc. - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-private.hh" - -#include "hb-version.h" - -#include "hb-mutex-private.hh" -#include "hb-object-private.hh" - -#include <locale.h> - - -/* hb_options_t */ - -hb_options_union_t _hb_options; - -void -_hb_options_init (void) -{ - hb_options_union_t u; - u.i = 0; - u.opts.initialized = 1; - - char *c = getenv ("HB_OPTIONS"); - u.opts.uniscribe_bug_compatible = c && strstr (c, "uniscribe-bug-compatible"); - - /* This is idempotent and threadsafe. */ - _hb_options = u; -} - - -/* hb_tag_t */ - -hb_tag_t -hb_tag_from_string (const char *s, int len) -{ - char tag[4]; - unsigned int i; - - if (!s || !len || !*s) - return HB_TAG_NONE; - - if (len < 0 || len > 4) - len = 4; - for (i = 0; i < (unsigned) len && s[i]; i++) - tag[i] = s[i]; - for (; i < 4; i++) - tag[i] = ' '; - - return HB_TAG_CHAR4 (tag); -} - -void -hb_tag_to_string (hb_tag_t tag, char *buf) -{ - buf[0] = (char) (uint8_t) (tag >> 24); - buf[1] = (char) (uint8_t) (tag >> 16); - buf[2] = (char) (uint8_t) (tag >> 8); - buf[3] = (char) (uint8_t) (tag >> 0); -} - - -/* hb_direction_t */ - -const char direction_strings[][4] = { - "ltr", - "rtl", - "ttb", - "btt" -}; - -hb_direction_t -hb_direction_from_string (const char *str, int len) -{ - if (unlikely (!str || !len || !*str)) - return HB_DIRECTION_INVALID; - - /* Lets match loosely: just match the first letter, such that - * all of "ltr", "left-to-right", etc work! - */ - char c = TOLOWER (str[0]); - for (unsigned int i = 0; i < ARRAY_LENGTH (direction_strings); i++) - if (c == direction_strings[i][0]) - return (hb_direction_t) (HB_DIRECTION_LTR + i); - - return HB_DIRECTION_INVALID; -} - -const char * -hb_direction_to_string (hb_direction_t direction) -{ - if (likely ((unsigned int) (direction - HB_DIRECTION_LTR) - < ARRAY_LENGTH (direction_strings))) - return direction_strings[direction - HB_DIRECTION_LTR]; - - return "invalid"; -} - - -/* hb_language_t */ - -struct hb_language_impl_t { - const char s[1]; -}; - -static const char canon_map[256] = { - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, '-', 0, 0, - '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 0, 0, 0, 0, 0, 0, - '-', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', - 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 0, 0, 0, 0, '-', - 0, 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', - 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 0, 0, 0, 0, 0 -}; - -static hb_bool_t -lang_equal (hb_language_t v1, - const void *v2) -{ - const unsigned char *p1 = (const unsigned char *) v1; - const unsigned char *p2 = (const unsigned char *) v2; - - while (*p1 && *p1 == canon_map[*p2]) - p1++, p2++; - - return *p1 == canon_map[*p2]; -} - -#if 0 -static unsigned int -lang_hash (const void *key) -{ - const unsigned char *p = key; - unsigned int h = 0; - while (canon_map[*p]) - { - h = (h << 5) - h + canon_map[*p]; - p++; - } - - return h; -} -#endif - - -struct hb_language_item_t { - - struct hb_language_item_t *next; - hb_language_t lang; - - inline bool operator == (const char *s) const { - return lang_equal (lang, s); - } - - inline hb_language_item_t & operator = (const char *s) { - lang = (hb_language_t) strdup (s); - for (unsigned char *p = (unsigned char *) lang; *p; p++) - *p = canon_map[*p]; - - return *this; - } - - void finish (void) { free (lang); } -}; - - -/* Thread-safe lock-free language list */ - -static hb_language_item_t *langs; - -static inline -void free_langs (void) -{ - while (langs) { - hb_language_item_t *next = langs->next; - langs->finish (); - free (langs); - langs = next; - } -} - -static hb_language_item_t * -lang_find_or_insert (const char *key) -{ -retry: - hb_language_item_t *first_lang = (hb_language_item_t *) hb_atomic_ptr_get (&langs); - - for (hb_language_item_t *lang = first_lang; lang; lang = lang->next) - if (*lang == key) - return lang; - - /* Not found; allocate one. */ - hb_language_item_t *lang = (hb_language_item_t *) calloc (1, sizeof (hb_language_item_t)); - if (unlikely (!lang)) - return NULL; - lang->next = first_lang; - *lang = key; - - if (!hb_atomic_ptr_cmpexch (&langs, first_lang, lang)) { - free (lang); - goto retry; - } - -#ifdef HAVE_ATEXIT - if (!first_lang) - atexit (free_langs); /* First person registers atexit() callback. */ -#endif - - return lang; -} - - -hb_language_t -hb_language_from_string (const char *str, int len) -{ - if (!str || !len || !*str) - return HB_LANGUAGE_INVALID; - - char strbuf[32]; - if (len >= 0) { - len = MIN (len, (int) sizeof (strbuf) - 1); - str = (char *) memcpy (strbuf, str, len); - strbuf[len] = '\0'; - } - - hb_language_item_t *item = lang_find_or_insert (str); - - return likely (item) ? item->lang : HB_LANGUAGE_INVALID; -} - -const char * -hb_language_to_string (hb_language_t language) -{ - /* This is actually NULL-safe! */ - return language->s; -} - -hb_language_t -hb_language_get_default (void) -{ - static hb_language_t default_language = HB_LANGUAGE_INVALID; - - hb_language_t language = (hb_language_t) hb_atomic_ptr_get (&default_language); - if (unlikely (language == HB_LANGUAGE_INVALID)) { - language = hb_language_from_string (setlocale (LC_CTYPE, NULL), -1); - hb_atomic_ptr_cmpexch (&default_language, HB_LANGUAGE_INVALID, language); - } - - return default_language; -} - - -/* hb_script_t */ - -hb_script_t -hb_script_from_iso15924_tag (hb_tag_t tag) -{ - if (unlikely (tag == HB_TAG_NONE)) - return HB_SCRIPT_INVALID; - - /* Be lenient, adjust case (one capital letter followed by three small letters) */ - tag = (tag & 0xDFDFDFDF) | 0x00202020; - - switch (tag) { - - /* These graduated from the 'Q' private-area codes, but - * the old code is still aliased by Unicode, and the Qaai - * one in use by ICU. */ - case HB_TAG('Q','a','a','i'): return HB_SCRIPT_INHERITED; - case HB_TAG('Q','a','a','c'): return HB_SCRIPT_COPTIC; - - /* Script variants from http://unicode.org/iso15924/ */ - case HB_TAG('C','y','r','s'): return HB_SCRIPT_CYRILLIC; - case HB_TAG('L','a','t','f'): return HB_SCRIPT_LATIN; - case HB_TAG('L','a','t','g'): return HB_SCRIPT_LATIN; - case HB_TAG('S','y','r','e'): return HB_SCRIPT_SYRIAC; - case HB_TAG('S','y','r','j'): return HB_SCRIPT_SYRIAC; - case HB_TAG('S','y','r','n'): return HB_SCRIPT_SYRIAC; - } - - /* If it looks right, just use the tag as a script */ - if (((uint32_t) tag & 0xE0E0E0E0) == 0x40606060) - return (hb_script_t) tag; - - /* Otherwise, return unknown */ - return HB_SCRIPT_UNKNOWN; -} - -hb_script_t -hb_script_from_string (const char *s, int len) -{ - return hb_script_from_iso15924_tag (hb_tag_from_string (s, len)); -} - -hb_tag_t -hb_script_to_iso15924_tag (hb_script_t script) -{ - return (hb_tag_t) script; -} - -hb_direction_t -hb_script_get_horizontal_direction (hb_script_t script) -{ - /* http://goo.gl/x9ilM */ - switch ((hb_tag_t) script) - { - /* Unicode-1.1 additions */ - case HB_SCRIPT_ARABIC: - case HB_SCRIPT_HEBREW: - - /* Unicode-3.0 additions */ - case HB_SCRIPT_SYRIAC: - case HB_SCRIPT_THAANA: - - /* Unicode-4.0 additions */ - case HB_SCRIPT_CYPRIOT: - - /* Unicode-4.1 additions */ - case HB_SCRIPT_KHAROSHTHI: - - /* Unicode-5.0 additions */ - case HB_SCRIPT_PHOENICIAN: - case HB_SCRIPT_NKO: - - /* Unicode-5.1 additions */ - case HB_SCRIPT_LYDIAN: - - /* Unicode-5.2 additions */ - case HB_SCRIPT_AVESTAN: - case HB_SCRIPT_IMPERIAL_ARAMAIC: - case HB_SCRIPT_INSCRIPTIONAL_PAHLAVI: - case HB_SCRIPT_INSCRIPTIONAL_PARTHIAN: - case HB_SCRIPT_OLD_SOUTH_ARABIAN: - case HB_SCRIPT_OLD_TURKIC: - case HB_SCRIPT_SAMARITAN: - - /* Unicode-6.0 additions */ - case HB_SCRIPT_MANDAIC: - - /* Unicode-6.1 additions */ - case HB_SCRIPT_MEROITIC_CURSIVE: - case HB_SCRIPT_MEROITIC_HIEROGLYPHS: - - return HB_DIRECTION_RTL; - } - - return HB_DIRECTION_LTR; -} - - -/* hb_user_data_array_t */ - -bool -hb_user_data_array_t::set (hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy, - hb_bool_t replace) -{ - if (!key) - return false; - - if (replace) { - if (!data && !destroy) { - items.remove (key, lock); - return true; - } - } - hb_user_data_item_t item = {key, data, destroy}; - bool ret = !!items.replace_or_insert (item, lock, replace); - - return ret; -} - -void * -hb_user_data_array_t::get (hb_user_data_key_t *key) -{ - hb_user_data_item_t item = {NULL }; - - return items.find (key, &item, lock) ? item.data : NULL; -} - - -/* hb_version */ - -void -hb_version (unsigned int *major, - unsigned int *minor, - unsigned int *micro) -{ - *major = HB_VERSION_MAJOR; - *minor = HB_VERSION_MINOR; - *micro = HB_VERSION_MICRO; -} - -const char * -hb_version_string (void) -{ - return HB_VERSION_STRING; -} - -hb_bool_t -hb_version_check (unsigned int major, - unsigned int minor, - unsigned int micro) -{ - return HB_VERSION_CHECK (major, minor, micro); -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-common.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-common.h deleted file mode 100644 index cc221d33be9..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-common.h +++ /dev/null @@ -1,317 +0,0 @@ -/* - * Copyright © 2007,2008,2009 Red Hat, Inc. - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_H_IN -#error "Include <hb.h> instead." -#endif - -#ifndef HB_COMMON_H -#define HB_COMMON_H - -#ifndef HB_BEGIN_DECLS -# ifdef __cplusplus -# define HB_BEGIN_DECLS extern "C" { -# define HB_END_DECLS } -# else /* !__cplusplus */ -# define HB_BEGIN_DECLS -# define HB_END_DECLS -# endif /* !__cplusplus */ -#endif - -#if !defined (HB_DONT_DEFINE_STDINT) - -#if defined (_SVR4) || defined (SVR4) || defined (__OpenBSD__) || \ - defined (_sgi) || defined (__sun) || defined (sun) || \ - defined (__digital__) || defined (__HP_cc) -# include <inttypes.h> -#elif defined (_AIX) -# include <sys/inttypes.h> -/* VS 2010 (_MSC_VER 1600) has stdint.h */ -#elif defined (_MSC_VER) && _MSC_VER < 1600 -typedef __int8 int8_t; -typedef unsigned __int8 uint8_t; -typedef __int16 int16_t; -typedef unsigned __int16 uint16_t; -typedef __int32 int32_t; -typedef unsigned __int32 uint32_t; -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; -#else -# include <stdint.h> -#endif - -#endif - -HB_BEGIN_DECLS - - -typedef int hb_bool_t; - -typedef uint32_t hb_codepoint_t; -typedef int32_t hb_position_t; -typedef uint32_t hb_mask_t; - -typedef union _hb_var_int_t { - uint32_t u32; - int32_t i32; - uint16_t u16[2]; - int16_t i16[2]; - uint8_t u8[4]; - int8_t i8[4]; -} hb_var_int_t; - - -/* hb_tag_t */ - -typedef uint32_t hb_tag_t; - -#define HB_TAG(a,b,c,d) ((hb_tag_t)((((uint8_t)(a))<<24)|(((uint8_t)(b))<<16)|(((uint8_t)(c))<<8)|((uint8_t)(d)))) -#define HB_UNTAG(tag) ((uint8_t)((tag)>>24)), ((uint8_t)((tag)>>16)), ((uint8_t)((tag)>>8)), ((uint8_t)(tag)) - -#define HB_TAG_NONE HB_TAG(0,0,0,0) - -/* len=-1 means str is NUL-terminated. */ -hb_tag_t -hb_tag_from_string (const char *str, int len); - -/* buf should have 4 bytes. */ -void -hb_tag_to_string (hb_tag_t tag, char *buf); - - -/* hb_direction_t */ - -typedef enum { - HB_DIRECTION_INVALID = 0, - HB_DIRECTION_LTR = 4, - HB_DIRECTION_RTL, - HB_DIRECTION_TTB, - HB_DIRECTION_BTT -} hb_direction_t; - -/* len=-1 means str is NUL-terminated */ -hb_direction_t -hb_direction_from_string (const char *str, int len); - -const char * -hb_direction_to_string (hb_direction_t direction); - -#define HB_DIRECTION_IS_HORIZONTAL(dir) ((((unsigned int) (dir)) & ~1U) == 4) -#define HB_DIRECTION_IS_VERTICAL(dir) ((((unsigned int) (dir)) & ~1U) == 6) -#define HB_DIRECTION_IS_FORWARD(dir) ((((unsigned int) (dir)) & ~2U) == 4) -#define HB_DIRECTION_IS_BACKWARD(dir) ((((unsigned int) (dir)) & ~2U) == 5) -#define HB_DIRECTION_IS_VALID(dir) ((((unsigned int) (dir)) & ~3U) == 4) -#define HB_DIRECTION_REVERSE(dir) ((hb_direction_t) (((unsigned int) (dir)) ^ 1)) /* Direction must be valid */ - - -/* hb_language_t */ - -typedef struct hb_language_impl_t *hb_language_t; - -/* len=-1 means str is NUL-terminated */ -hb_language_t -hb_language_from_string (const char *str, int len); - -const char * -hb_language_to_string (hb_language_t language); - -#define HB_LANGUAGE_INVALID ((hb_language_t) NULL) - -hb_language_t -hb_language_get_default (void); - - -/* hb_script_t */ - -/* http://unicode.org/iso15924/ */ -/* http://goo.gl/x9ilM */ -/* Unicode Character Database property: Script (sc) */ -typedef enum -{ - /* Unicode-1.1 additions */ - HB_SCRIPT_COMMON = HB_TAG ('Z','y','y','y'), - HB_SCRIPT_ARABIC = HB_TAG ('A','r','a','b'), - HB_SCRIPT_ARMENIAN = HB_TAG ('A','r','m','n'), - HB_SCRIPT_BENGALI = HB_TAG ('B','e','n','g'), - HB_SCRIPT_BOPOMOFO = HB_TAG ('B','o','p','o'), - HB_SCRIPT_CANADIAN_ABORIGINAL = HB_TAG ('C','a','n','s'), - HB_SCRIPT_CHEROKEE = HB_TAG ('C','h','e','r'), - HB_SCRIPT_COPTIC = HB_TAG ('C','o','p','t'), - HB_SCRIPT_CYRILLIC = HB_TAG ('C','y','r','l'), - HB_SCRIPT_DEVANAGARI = HB_TAG ('D','e','v','a'), - HB_SCRIPT_GEORGIAN = HB_TAG ('G','e','o','r'), - HB_SCRIPT_GREEK = HB_TAG ('G','r','e','k'), - HB_SCRIPT_GUJARATI = HB_TAG ('G','u','j','r'), - HB_SCRIPT_GURMUKHI = HB_TAG ('G','u','r','u'), - HB_SCRIPT_HANGUL = HB_TAG ('H','a','n','g'), - HB_SCRIPT_HAN = HB_TAG ('H','a','n','i'), - HB_SCRIPT_HEBREW = HB_TAG ('H','e','b','r'), - HB_SCRIPT_HIRAGANA = HB_TAG ('H','i','r','a'), - HB_SCRIPT_INHERITED = HB_TAG ('Z','i','n','h'), - HB_SCRIPT_KANNADA = HB_TAG ('K','n','d','a'), - HB_SCRIPT_KATAKANA = HB_TAG ('K','a','n','a'), - HB_SCRIPT_LAO = HB_TAG ('L','a','o','o'), - HB_SCRIPT_LATIN = HB_TAG ('L','a','t','n'), - HB_SCRIPT_MALAYALAM = HB_TAG ('M','l','y','m'), - HB_SCRIPT_MONGOLIAN = HB_TAG ('M','o','n','g'), - HB_SCRIPT_OGHAM = HB_TAG ('O','g','a','m'), - HB_SCRIPT_ORIYA = HB_TAG ('O','r','y','a'), - HB_SCRIPT_RUNIC = HB_TAG ('R','u','n','r'), - HB_SCRIPT_SYRIAC = HB_TAG ('S','y','r','c'), - HB_SCRIPT_TAMIL = HB_TAG ('T','a','m','l'), - HB_SCRIPT_TELUGU = HB_TAG ('T','e','l','u'), - HB_SCRIPT_THAI = HB_TAG ('T','h','a','i'), - HB_SCRIPT_YI = HB_TAG ('Y','i','i','i'), - - /* Unicode-2.0 additions */ - HB_SCRIPT_TIBETAN = HB_TAG ('T','i','b','t'), - - /* Unicode-3.0 additions */ - HB_SCRIPT_ETHIOPIC = HB_TAG ('E','t','h','i'), - HB_SCRIPT_KHMER = HB_TAG ('K','h','m','r'), - HB_SCRIPT_MYANMAR = HB_TAG ('M','y','m','r'), - HB_SCRIPT_SINHALA = HB_TAG ('S','i','n','h'), - HB_SCRIPT_THAANA = HB_TAG ('T','h','a','a'), - - /* Unicode-3.1 additions */ - HB_SCRIPT_DESERET = HB_TAG ('D','s','r','t'), - HB_SCRIPT_GOTHIC = HB_TAG ('G','o','t','h'), - HB_SCRIPT_OLD_ITALIC = HB_TAG ('I','t','a','l'), - - /* Unicode-3.2 additions */ - HB_SCRIPT_BUHID = HB_TAG ('B','u','h','d'), - HB_SCRIPT_HANUNOO = HB_TAG ('H','a','n','o'), - HB_SCRIPT_TAGALOG = HB_TAG ('T','g','l','g'), - HB_SCRIPT_TAGBANWA = HB_TAG ('T','a','g','b'), - - /* Unicode-4.0 additions */ - HB_SCRIPT_BRAILLE = HB_TAG ('B','r','a','i'), - HB_SCRIPT_CYPRIOT = HB_TAG ('C','p','r','t'), - HB_SCRIPT_LIMBU = HB_TAG ('L','i','m','b'), - HB_SCRIPT_LINEAR_B = HB_TAG ('L','i','n','b'), - HB_SCRIPT_OSMANYA = HB_TAG ('O','s','m','a'), - HB_SCRIPT_SHAVIAN = HB_TAG ('S','h','a','w'), - HB_SCRIPT_TAI_LE = HB_TAG ('T','a','l','e'), - HB_SCRIPT_UGARITIC = HB_TAG ('U','g','a','r'), - - /* Unicode-4.1 additions */ - HB_SCRIPT_BUGINESE = HB_TAG ('B','u','g','i'), - HB_SCRIPT_GLAGOLITIC = HB_TAG ('G','l','a','g'), - HB_SCRIPT_KHAROSHTHI = HB_TAG ('K','h','a','r'), - HB_SCRIPT_NEW_TAI_LUE = HB_TAG ('T','a','l','u'), - HB_SCRIPT_OLD_PERSIAN = HB_TAG ('X','p','e','o'), - HB_SCRIPT_SYLOTI_NAGRI = HB_TAG ('S','y','l','o'), - HB_SCRIPT_TIFINAGH = HB_TAG ('T','f','n','g'), - - /* Unicode-5.0 additions */ - HB_SCRIPT_BALINESE = HB_TAG ('B','a','l','i'), - HB_SCRIPT_CUNEIFORM = HB_TAG ('X','s','u','x'), - HB_SCRIPT_NKO = HB_TAG ('N','k','o','o'), - HB_SCRIPT_PHAGS_PA = HB_TAG ('P','h','a','g'), - HB_SCRIPT_PHOENICIAN = HB_TAG ('P','h','n','x'), - HB_SCRIPT_UNKNOWN = HB_TAG ('Z','z','z','z'), - - /* Unicode-5.1 additions */ - HB_SCRIPT_CARIAN = HB_TAG ('C','a','r','i'), - HB_SCRIPT_CHAM = HB_TAG ('C','h','a','m'), - HB_SCRIPT_KAYAH_LI = HB_TAG ('K','a','l','i'), - HB_SCRIPT_LEPCHA = HB_TAG ('L','e','p','c'), - HB_SCRIPT_LYCIAN = HB_TAG ('L','y','c','i'), - HB_SCRIPT_LYDIAN = HB_TAG ('L','y','d','i'), - HB_SCRIPT_OL_CHIKI = HB_TAG ('O','l','c','k'), - HB_SCRIPT_REJANG = HB_TAG ('R','j','n','g'), - HB_SCRIPT_SAURASHTRA = HB_TAG ('S','a','u','r'), - HB_SCRIPT_SUNDANESE = HB_TAG ('S','u','n','d'), - HB_SCRIPT_VAI = HB_TAG ('V','a','i','i'), - - /* Unicode-5.2 additions */ - HB_SCRIPT_AVESTAN = HB_TAG ('A','v','s','t'), - HB_SCRIPT_BAMUM = HB_TAG ('B','a','m','u'), - HB_SCRIPT_EGYPTIAN_HIEROGLYPHS = HB_TAG ('E','g','y','p'), - HB_SCRIPT_IMPERIAL_ARAMAIC = HB_TAG ('A','r','m','i'), - HB_SCRIPT_INSCRIPTIONAL_PAHLAVI = HB_TAG ('P','h','l','i'), - HB_SCRIPT_INSCRIPTIONAL_PARTHIAN = HB_TAG ('P','r','t','i'), - HB_SCRIPT_JAVANESE = HB_TAG ('J','a','v','a'), - HB_SCRIPT_KAITHI = HB_TAG ('K','t','h','i'), - HB_SCRIPT_LISU = HB_TAG ('L','i','s','u'), - HB_SCRIPT_MEETEI_MAYEK = HB_TAG ('M','t','e','i'), - HB_SCRIPT_OLD_SOUTH_ARABIAN = HB_TAG ('S','a','r','b'), - HB_SCRIPT_OLD_TURKIC = HB_TAG ('O','r','k','h'), - HB_SCRIPT_SAMARITAN = HB_TAG ('S','a','m','r'), - HB_SCRIPT_TAI_THAM = HB_TAG ('L','a','n','a'), - HB_SCRIPT_TAI_VIET = HB_TAG ('T','a','v','t'), - - /* Unicode-6.0 additions */ - HB_SCRIPT_BATAK = HB_TAG ('B','a','t','k'), - HB_SCRIPT_BRAHMI = HB_TAG ('B','r','a','h'), - HB_SCRIPT_MANDAIC = HB_TAG ('M','a','n','d'), - - /* Unicode-6.1 additions */ - HB_SCRIPT_CHAKMA = HB_TAG ('C','a','k','m'), - HB_SCRIPT_MEROITIC_CURSIVE = HB_TAG ('M','e','r','c'), - HB_SCRIPT_MEROITIC_HIEROGLYPHS = HB_TAG ('M','e','r','o'), - HB_SCRIPT_MIAO = HB_TAG ('P','l','r','d'), - HB_SCRIPT_SHARADA = HB_TAG ('S','h','r','d'), - HB_SCRIPT_SORA_SOMPENG = HB_TAG ('S','o','r','a'), - HB_SCRIPT_TAKRI = HB_TAG ('T','a','k','r'), - - /* No script set */ - HB_SCRIPT_INVALID = HB_TAG_NONE -} hb_script_t; - - -/* Script functions */ - -hb_script_t -hb_script_from_iso15924_tag (hb_tag_t tag); - -/* suger for tag_from_string() then script_from_iso15924_tag */ -/* len=-1 means s is NUL-terminated */ -hb_script_t -hb_script_from_string (const char *s, int len); - -hb_tag_t -hb_script_to_iso15924_tag (hb_script_t script); - -hb_direction_t -hb_script_get_horizontal_direction (hb_script_t script); - - -/* User data */ - -typedef struct hb_user_data_key_t { - /*< private >*/ - char unused; -} hb_user_data_key_t; - -typedef void (*hb_destroy_func_t) (void *user_data); - - -HB_END_DECLS - -#endif /* HB_COMMON_H */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-coretext.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-coretext.cc deleted file mode 100644 index 8f94795928c..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-coretext.cc +++ /dev/null @@ -1,355 +0,0 @@ -/* - * Copyright © 2012 Mozilla Foundation. - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Mozilla Author(s): Jonathan Kew - * Google Author(s): Behdad Esfahbod - */ - -#define HB_SHAPER coretext -#include "hb-shaper-impl-private.hh" - -#include "hb-coretext.h" - - -#ifndef HB_DEBUG_CORETEXT -#define HB_DEBUG_CORETEXT (HB_DEBUG+0) -#endif - - -HB_SHAPER_DATA_ENSURE_DECLARE(coretext, face) -HB_SHAPER_DATA_ENSURE_DECLARE(coretext, font) - - -/* - * shaper face data - */ - -struct hb_coretext_shaper_face_data_t { - CGFontRef cg_font; -}; - -static void -release_data (void *info, const void *data, size_t size) -{ - assert (hb_blob_get_length ((hb_blob_t *) info) == size && - hb_blob_get_data ((hb_blob_t *) info, NULL) == data); - - hb_blob_destroy ((hb_blob_t *) info); -} - -hb_coretext_shaper_face_data_t * -_hb_coretext_shaper_face_data_create (hb_face_t *face) -{ - hb_coretext_shaper_face_data_t *data = (hb_coretext_shaper_face_data_t *) calloc (1, sizeof (hb_coretext_shaper_face_data_t)); - if (unlikely (!data)) - return NULL; - - hb_blob_t *blob = hb_face_reference_blob (face); - unsigned int blob_length; - const char *blob_data = hb_blob_get_data (blob, &blob_length); - if (unlikely (!blob_length)) - DEBUG_MSG (CORETEXT, face, "Face has empty blob"); - - CGDataProviderRef provider = CGDataProviderCreateWithData (blob, blob_data, blob_length, &release_data); - data->cg_font = CGFontCreateWithDataProvider (provider); - CGDataProviderRelease (provider); - - if (unlikely (!data->cg_font)) { - DEBUG_MSG (CORETEXT, face, "Face CGFontCreateWithDataProvider() failed"); - free (data); - return NULL; - } - - return data; -} - -void -_hb_coretext_shaper_face_data_destroy (hb_coretext_shaper_face_data_t *data) -{ - CFRelease (data->cg_font); - free (data); -} - -CGFontRef -hb_coretext_face_get_cg_font (hb_face_t *face) -{ - if (unlikely (!hb_coretext_shaper_face_data_ensure (face))) return NULL; - hb_coretext_shaper_face_data_t *face_data = HB_SHAPER_DATA_GET (face); - return face_data->cg_font; -} - - -/* - * shaper font data - */ - -struct hb_coretext_shaper_font_data_t { - CTFontRef ct_font; -}; - -hb_coretext_shaper_font_data_t * -_hb_coretext_shaper_font_data_create (hb_font_t *font) -{ - if (unlikely (!hb_coretext_shaper_face_data_ensure (font->face))) return NULL; - - hb_coretext_shaper_font_data_t *data = (hb_coretext_shaper_font_data_t *) calloc (1, sizeof (hb_coretext_shaper_font_data_t)); - if (unlikely (!data)) - return NULL; - - hb_face_t *face = font->face; - hb_coretext_shaper_face_data_t *face_data = HB_SHAPER_DATA_GET (face); - - data->ct_font = CTFontCreateWithGraphicsFont (face_data->cg_font, font->y_scale, NULL, NULL); - if (unlikely (!data->ct_font)) { - DEBUG_MSG (CORETEXT, font, "Font CTFontCreateWithGraphicsFont() failed"); - free (data); - return NULL; - } - - return data; -} - -void -_hb_coretext_shaper_font_data_destroy (hb_coretext_shaper_font_data_t *data) -{ - CFRelease (data->ct_font); - free (data); -} - - -/* - * shaper shape_plan data - */ - -struct hb_coretext_shaper_shape_plan_data_t {}; - -hb_coretext_shaper_shape_plan_data_t * -_hb_coretext_shaper_shape_plan_data_create (hb_shape_plan_t *shape_plan HB_UNUSED, - const hb_feature_t *user_features HB_UNUSED, - unsigned int num_user_features HB_UNUSED) -{ - return (hb_coretext_shaper_shape_plan_data_t *) HB_SHAPER_DATA_SUCCEEDED; -} - -void -_hb_coretext_shaper_shape_plan_data_destroy (hb_coretext_shaper_shape_plan_data_t *data HB_UNUSED) -{ -} - -CTFontRef -hb_coretext_font_get_ct_font (hb_font_t *font) -{ - if (unlikely (!hb_coretext_shaper_font_data_ensure (font))) return NULL; - hb_coretext_shaper_font_data_t *font_data = HB_SHAPER_DATA_GET (font); - return font_data->ct_font; -} - - -/* - * shaper - */ - -hb_bool_t -_hb_coretext_shape (hb_shape_plan_t *shape_plan, - hb_font_t *font, - hb_buffer_t *buffer, - const hb_feature_t *features, - unsigned int num_features) -{ - hb_face_t *face = font->face; - hb_coretext_shaper_face_data_t *face_data = HB_SHAPER_DATA_GET (face); - hb_coretext_shaper_font_data_t *font_data = HB_SHAPER_DATA_GET (font); - -#define FAIL(...) \ - HB_STMT_START { \ - DEBUG_MSG (CORETEXT, NULL, __VA_ARGS__); \ - return false; \ - } HB_STMT_END; - - unsigned int scratch_size; - char *scratch = (char *) buffer->get_scratch_buffer (&scratch_size); - -#define utf16_index() var1.u32 - - UniChar *pchars = (UniChar *) scratch; - unsigned int chars_len = 0; - for (unsigned int i = 0; i < buffer->len; i++) { - hb_codepoint_t c = buffer->info[i].codepoint; - buffer->info[i].utf16_index() = chars_len; - if (likely (c < 0x10000)) - pchars[chars_len++] = c; - else if (unlikely (c >= 0x110000)) - pchars[chars_len++] = 0xFFFD; - else { - pchars[chars_len++] = 0xD800 + ((c - 0x10000) >> 10); - pchars[chars_len++] = 0xDC00 + ((c - 0x10000) & ((1 << 10) - 1)); - } - } - -#undef utf16_index - - CFStringRef string_ref = CFStringCreateWithCharactersNoCopy (kCFAllocatorDefault, - pchars, chars_len, - kCFAllocatorNull); - - CFDictionaryRef attrs = CFDictionaryCreate (kCFAllocatorDefault, - (const void**) &kCTFontAttributeName, - (const void**) &font_data->ct_font, - 1, /* count of attributes */ - &kCFTypeDictionaryKeyCallBacks, - &kCFTypeDictionaryValueCallBacks); - - /* TODO: support features */ - - CFAttributedStringRef attr_string = CFAttributedStringCreate (kCFAllocatorDefault, string_ref, attrs); - CFRelease (string_ref); - CFRelease (attrs); - - CTLineRef line = CTLineCreateWithAttributedString (attr_string); - CFRelease (attr_string); - - CFArrayRef glyph_runs = CTLineGetGlyphRuns (line); - unsigned int num_runs = CFArrayGetCount (glyph_runs); - - bool success = true; - buffer->len = 0; - - const CFRange range_all = CFRangeMake (0, 0); - - for (unsigned int i = 0; i < num_runs; i++) { - CTRunRef run = (CTRunRef) CFArrayGetValueAtIndex (glyph_runs, i); - - unsigned int num_glyphs = CTRunGetGlyphCount (run); - if (num_glyphs == 0) - continue; - - buffer->ensure (buffer->len + num_glyphs); - - /* Testing indicates that CTRunGetGlyphsPtr (almost?) always succeeds, - * and so copying data to our own buffer with CTRunGetGlyphs will be - * extremely rare. */ - - unsigned int scratch_size; - char *scratch = (char *) buffer->get_scratch_buffer (&scratch_size); - -#define ALLOCATE_ARRAY(Type, name, len) \ - Type *name = (Type *) scratch; \ - scratch += (len) * sizeof ((name)[0]); \ - scratch_size -= (len) * sizeof ((name)[0]); - - const CGGlyph* glyphs = CTRunGetGlyphsPtr (run); - if (!glyphs) { - ALLOCATE_ARRAY (CGGlyph, glyph_buf, num_glyphs); - CTRunGetGlyphs (run, range_all, glyph_buf); - glyphs = glyph_buf; - } - - const CGPoint* positions = CTRunGetPositionsPtr (run); - if (!positions) { - ALLOCATE_ARRAY (CGPoint, position_buf, num_glyphs); - CTRunGetPositions (run, range_all, position_buf); - positions = position_buf; - } - - const CFIndex* string_indices = CTRunGetStringIndicesPtr (run); - if (!string_indices) { - ALLOCATE_ARRAY (CFIndex, index_buf, num_glyphs); - CTRunGetStringIndices (run, range_all, index_buf); - string_indices = index_buf; - } - -#undef ALLOCATE_ARRAY - - double run_width = CTRunGetTypographicBounds (run, range_all, NULL, NULL, NULL); - - for (unsigned int j = 0; j < num_glyphs; j++) { - double advance = (j + 1 < num_glyphs ? positions[j + 1].x : positions[0].x + run_width) - positions[j].x; - - hb_glyph_info_t *info = &buffer->info[buffer->len]; - hb_glyph_position_t *pos = &buffer->pos[buffer->len]; - - info->codepoint = glyphs[j]; - info->cluster = string_indices[j]; - - /* Currently, we do all x-positioning by setting the advance, we never use x-offset. */ - info->mask = advance; - info->var1.u32 = 0; - info->var2.u32 = positions[j].y; - - buffer->len++; - } - } - - buffer->clear_positions (); - - unsigned int count = buffer->len; - for (unsigned int i = 0; i < count; ++i) { - hb_glyph_info_t *info = &buffer->info[i]; - hb_glyph_position_t *pos = &buffer->pos[i]; - - /* TODO vertical */ - pos->x_advance = info->mask; - pos->x_offset = info->var1.u32; - pos->y_offset = info->var2.u32; - } - - /* Fix up clusters so that we never return out-of-order indices; - * if core text has reordered glyphs, we'll merge them to the - * beginning of the reordered cluster. - * - * This does *not* mean we'll form the same clusters as Uniscribe - * or the native OT backend, only that the cluster indices will be - * monotonic in the output buffer. */ - if (HB_DIRECTION_IS_FORWARD (buffer->props.direction)) { - unsigned int prev_cluster = 0; - for (unsigned int i = 0; i < count; i++) { - unsigned int curr_cluster = buffer->info[i].cluster; - if (curr_cluster < prev_cluster) { - for (unsigned int j = i; j > 0; j--) { - if (buffer->info[j - 1].cluster > curr_cluster) - buffer->info[j - 1].cluster = curr_cluster; - else - break; - } - } - prev_cluster = curr_cluster; - } - } else { - unsigned int prev_cluster = (unsigned int)-1; - for (unsigned int i = 0; i < count; i++) { - unsigned int curr_cluster = buffer->info[i].cluster; - if (curr_cluster > prev_cluster) { - for (unsigned int j = i; j > 0; j--) { - if (buffer->info[j - 1].cluster < curr_cluster) - buffer->info[j - 1].cluster = curr_cluster; - else - break; - } - } - prev_cluster = curr_cluster; - } - } - - return true; -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-coretext.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-coretext.h deleted file mode 100644 index c4954fa1b2c..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-coretext.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright © 2012 Mozilla Foundation. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Mozilla Author(s): Jonathan Kew - */ - -#ifndef HB_CORETEXT_H -#define HB_CORETEXT_H - -#include "hb.h" - -#include <ApplicationServices/ApplicationServices.h> - -HB_BEGIN_DECLS - - -CGFontRef -hb_coretext_face_get_cg_font (hb_face_t *face); - -CTFontRef -hb_coretext_font_get_ct_font (hb_font_t *font); - - -HB_END_DECLS - -#endif /* HB_CORETEXT_H */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-fallback-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-fallback-shape.cc deleted file mode 100644 index 1a1fcfbda1e..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-fallback-shape.cc +++ /dev/null @@ -1,128 +0,0 @@ -/* - * Copyright © 2011 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#define HB_SHAPER fallback -#include "hb-shaper-impl-private.hh" - - -/* - * shaper face data - */ - -struct hb_fallback_shaper_face_data_t {}; - -hb_fallback_shaper_face_data_t * -_hb_fallback_shaper_face_data_create (hb_face_t *face HB_UNUSED) -{ - return (hb_fallback_shaper_face_data_t *) HB_SHAPER_DATA_SUCCEEDED; -} - -void -_hb_fallback_shaper_face_data_destroy (hb_fallback_shaper_face_data_t *data HB_UNUSED) -{ -} - - -/* - * shaper font data - */ - -struct hb_fallback_shaper_font_data_t {}; - -hb_fallback_shaper_font_data_t * -_hb_fallback_shaper_font_data_create (hb_font_t *font HB_UNUSED) -{ - return (hb_fallback_shaper_font_data_t *) HB_SHAPER_DATA_SUCCEEDED; -} - -void -_hb_fallback_shaper_font_data_destroy (hb_fallback_shaper_font_data_t *data HB_UNUSED) -{ -} - - -/* - * shaper shape_plan data - */ - -struct hb_fallback_shaper_shape_plan_data_t {}; - -hb_fallback_shaper_shape_plan_data_t * -_hb_fallback_shaper_shape_plan_data_create (hb_shape_plan_t *shape_plan HB_UNUSED, - const hb_feature_t *user_features HB_UNUSED, - unsigned int num_user_features HB_UNUSED) -{ - return (hb_fallback_shaper_shape_plan_data_t *) HB_SHAPER_DATA_SUCCEEDED; -} - -void -_hb_fallback_shaper_shape_plan_data_destroy (hb_fallback_shaper_shape_plan_data_t *data HB_UNUSED) -{ -} - - -/* - * shaper - */ - -hb_bool_t -_hb_fallback_shape (hb_shape_plan_t *shape_plan HB_UNUSED, - hb_font_t *font, - hb_buffer_t *buffer, - const hb_feature_t *features HB_UNUSED, - unsigned int num_features HB_UNUSED) -{ - hb_codepoint_t space; - font->get_glyph (' ', 0, &space); - - buffer->clear_positions (); - - unsigned int count = buffer->len; - - for (unsigned int i = 0; i < count; i++) - { - if (buffer->unicode->is_default_ignorable (buffer->info[i].codepoint)) { - buffer->info[i].codepoint = space; - buffer->pos[i].x_advance = 0; - buffer->pos[i].y_advance = 0; - continue; - } - font->get_glyph (buffer->info[i].codepoint, 0, &buffer->info[i].codepoint); - font->get_glyph_advance_for_direction (buffer->info[i].codepoint, - buffer->props.direction, - &buffer->pos[i].x_advance, - &buffer->pos[i].y_advance); - font->subtract_glyph_origin_for_direction (buffer->info[i].codepoint, - buffer->props.direction, - &buffer->pos[i].x_offset, - &buffer->pos[i].y_offset); - } - - if (HB_DIRECTION_IS_BACKWARD (buffer->props.direction)) - hb_buffer_reverse (buffer); - - return true; -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-font-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-font-private.hh deleted file mode 100644 index 48fbb0ee549..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-font-private.hh +++ /dev/null @@ -1,469 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * Copyright © 2011 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_FONT_PRIVATE_HH -#define HB_FONT_PRIVATE_HH - -#include "hb-private.hh" - -#include "hb-font.h" -#include "hb-object-private.hh" -#include "hb-shaper-private.hh" -#include "hb-shape-plan-private.hh" - - - -/* - * hb_font_funcs_t - */ - -#define HB_FONT_FUNCS_IMPLEMENT_CALLBACKS \ - HB_FONT_FUNC_IMPLEMENT (glyph) \ - HB_FONT_FUNC_IMPLEMENT (glyph_h_advance) \ - HB_FONT_FUNC_IMPLEMENT (glyph_v_advance) \ - HB_FONT_FUNC_IMPLEMENT (glyph_h_origin) \ - HB_FONT_FUNC_IMPLEMENT (glyph_v_origin) \ - HB_FONT_FUNC_IMPLEMENT (glyph_h_kerning) \ - HB_FONT_FUNC_IMPLEMENT (glyph_v_kerning) \ - HB_FONT_FUNC_IMPLEMENT (glyph_extents) \ - HB_FONT_FUNC_IMPLEMENT (glyph_contour_point) \ - HB_FONT_FUNC_IMPLEMENT (glyph_name) \ - HB_FONT_FUNC_IMPLEMENT (glyph_from_name) \ - /* ^--- Add new callbacks here */ - -struct hb_font_funcs_t { - hb_object_header_t header; - ASSERT_POD (); - - hb_bool_t immutable; - - /* Don't access these directly. Call hb_font_get_*() instead. */ - - struct { -#define HB_FONT_FUNC_IMPLEMENT(name) hb_font_get_##name##_func_t name; - HB_FONT_FUNCS_IMPLEMENT_CALLBACKS -#undef HB_FONT_FUNC_IMPLEMENT - } get; - - struct { -#define HB_FONT_FUNC_IMPLEMENT(name) void *name; - HB_FONT_FUNCS_IMPLEMENT_CALLBACKS -#undef HB_FONT_FUNC_IMPLEMENT - } user_data; - - struct { -#define HB_FONT_FUNC_IMPLEMENT(name) hb_destroy_func_t name; - HB_FONT_FUNCS_IMPLEMENT_CALLBACKS -#undef HB_FONT_FUNC_IMPLEMENT - } destroy; -}; - - -/* - * hb_face_t - */ - -struct hb_face_t { - hb_object_header_t header; - ASSERT_POD (); - - hb_bool_t immutable; - - hb_reference_table_func_t reference_table_func; - void *user_data; - hb_destroy_func_t destroy; - - unsigned int index; - mutable unsigned int upem; - mutable unsigned int num_glyphs; - - struct hb_shaper_data_t shaper_data; - - struct plan_node_t { - hb_shape_plan_t *shape_plan; - plan_node_t *next; - } *shape_plans; - - - inline hb_blob_t *reference_table (hb_tag_t tag) const - { - hb_blob_t *blob; - - if (unlikely (!this || !reference_table_func)) - return hb_blob_get_empty (); - - blob = reference_table_func (/*XXX*/const_cast<hb_face_t *> (this), tag, user_data); - if (unlikely (!blob)) - return hb_blob_get_empty (); - - return blob; - } - - inline unsigned int get_upem (void) const - { - if (unlikely (!upem)) - load_upem (); - return upem; - } - - inline unsigned int get_num_glyphs (void) const - { - if (unlikely (num_glyphs == (unsigned int) -1)) - load_num_glyphs (); - return num_glyphs; - } - - private: - HB_INTERNAL void load_upem (void) const; - HB_INTERNAL void load_num_glyphs (void) const; -}; - -#define HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS -#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_PROTOTYPE(shaper, face); -#include "hb-shaper-list.hh" -#undef HB_SHAPER_IMPLEMENT -#undef HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS - - -/* - * hb_font_t - */ - -struct hb_font_t { - hb_object_header_t header; - ASSERT_POD (); - - hb_bool_t immutable; - - hb_font_t *parent; - hb_face_t *face; - - int x_scale; - int y_scale; - - unsigned int x_ppem; - unsigned int y_ppem; - - hb_font_funcs_t *klass; - void *user_data; - hb_destroy_func_t destroy; - - struct hb_shaper_data_t shaper_data; - - - /* Convert from font-space to user-space */ - inline hb_position_t em_scale_x (int16_t v) { return em_scale (v, this->x_scale); } - inline hb_position_t em_scale_y (int16_t v) { return em_scale (v, this->y_scale); } - - /* Convert from parent-font user-space to our user-space */ - inline hb_position_t parent_scale_x_distance (hb_position_t v) { - if (unlikely (parent && parent->x_scale != x_scale)) - return v * (int64_t) this->x_scale / this->parent->x_scale; - return v; - } - inline hb_position_t parent_scale_y_distance (hb_position_t v) { - if (unlikely (parent && parent->y_scale != y_scale)) - return v * (int64_t) this->y_scale / this->parent->y_scale; - return v; - } - inline hb_position_t parent_scale_x_position (hb_position_t v) { - return parent_scale_x_distance (v); - } - inline hb_position_t parent_scale_y_position (hb_position_t v) { - return parent_scale_y_distance (v); - } - - inline void parent_scale_distance (hb_position_t *x, hb_position_t *y) { - *x = parent_scale_x_distance (*x); - *y = parent_scale_y_distance (*y); - } - inline void parent_scale_position (hb_position_t *x, hb_position_t *y) { - *x = parent_scale_x_position (*x); - *y = parent_scale_y_position (*y); - } - - - /* Public getters */ - - inline hb_bool_t get_glyph (hb_codepoint_t unicode, hb_codepoint_t variation_selector, - hb_codepoint_t *glyph) - { - *glyph = 0; - return klass->get.glyph (this, user_data, - unicode, variation_selector, glyph, - klass->user_data.glyph); - } - - inline hb_position_t get_glyph_h_advance (hb_codepoint_t glyph) - { - return klass->get.glyph_h_advance (this, user_data, - glyph, - klass->user_data.glyph_h_advance); - } - - inline hb_position_t get_glyph_v_advance (hb_codepoint_t glyph) - { - return klass->get.glyph_v_advance (this, user_data, - glyph, - klass->user_data.glyph_v_advance); - } - - inline hb_bool_t get_glyph_h_origin (hb_codepoint_t glyph, - hb_position_t *x, hb_position_t *y) - { - *x = *y = 0; - return klass->get.glyph_h_origin (this, user_data, - glyph, x, y, - klass->user_data.glyph_h_origin); - } - - inline hb_bool_t get_glyph_v_origin (hb_codepoint_t glyph, - hb_position_t *x, hb_position_t *y) - { - *x = *y = 0; - return klass->get.glyph_v_origin (this, user_data, - glyph, x, y, - klass->user_data.glyph_v_origin); - } - - inline hb_position_t get_glyph_h_kerning (hb_codepoint_t left_glyph, hb_codepoint_t right_glyph) - { - return klass->get.glyph_h_kerning (this, user_data, - left_glyph, right_glyph, - klass->user_data.glyph_h_kerning); - } - - inline hb_position_t get_glyph_v_kerning (hb_codepoint_t left_glyph, hb_codepoint_t right_glyph) - { - return klass->get.glyph_v_kerning (this, user_data, - left_glyph, right_glyph, - klass->user_data.glyph_v_kerning); - } - - inline hb_bool_t get_glyph_extents (hb_codepoint_t glyph, - hb_glyph_extents_t *extents) - { - memset (extents, 0, sizeof (*extents)); - return klass->get.glyph_extents (this, user_data, - glyph, - extents, - klass->user_data.glyph_extents); - } - - inline hb_bool_t get_glyph_contour_point (hb_codepoint_t glyph, unsigned int point_index, - hb_position_t *x, hb_position_t *y) - { - *x = *y = 0; - return klass->get.glyph_contour_point (this, user_data, - glyph, point_index, - x, y, - klass->user_data.glyph_contour_point); - } - - inline hb_bool_t get_glyph_name (hb_codepoint_t glyph, - char *name, unsigned int size) - { - if (size) *name = '\0'; - return klass->get.glyph_name (this, user_data, - glyph, - name, size, - klass->user_data.glyph_name); - } - - inline hb_bool_t get_glyph_from_name (const char *name, int len, /* -1 means nul-terminated */ - hb_codepoint_t *glyph) - { - *glyph = 0; - if (len == -1) len = strlen (name); - return klass->get.glyph_from_name (this, user_data, - name, len, - glyph, - klass->user_data.glyph_from_name); - } - - - /* A bit higher-level, and with fallback */ - - inline void get_glyph_advance_for_direction (hb_codepoint_t glyph, - hb_direction_t direction, - hb_position_t *x, hb_position_t *y) - { - if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) { - *x = get_glyph_h_advance (glyph); - *y = 0; - } else { - *x = 0; - *y = get_glyph_v_advance (glyph); - } - } - - /* Internal only */ - inline void guess_v_origin_minus_h_origin (hb_codepoint_t glyph, - hb_position_t *x, hb_position_t *y) - { - *x = get_glyph_h_advance (glyph) / 2; - - /* TODO use font_metics.ascent */ - *y = y_scale; - } - - inline void get_glyph_origin_for_direction (hb_codepoint_t glyph, - hb_direction_t direction, - hb_position_t *x, hb_position_t *y) - { - if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) { - hb_bool_t ret = get_glyph_h_origin (glyph, x, y); - if (!ret && (ret = get_glyph_v_origin (glyph, x, y))) { - hb_position_t dx, dy; - guess_v_origin_minus_h_origin (glyph, &dx, &dy); - *x -= dx; *y -= dy; - } - } else { - hb_bool_t ret = get_glyph_v_origin (glyph, x, y); - if (!ret && (ret = get_glyph_h_origin (glyph, x, y))) { - hb_position_t dx, dy; - guess_v_origin_minus_h_origin (glyph, &dx, &dy); - *x += dx; *y += dy; - } - } - } - - inline void add_glyph_origin_for_direction (hb_codepoint_t glyph, - hb_direction_t direction, - hb_position_t *x, hb_position_t *y) - { - hb_position_t origin_x, origin_y; - - get_glyph_origin_for_direction (glyph, direction, &origin_x, &origin_y); - - *x += origin_x; - *y += origin_y; - } - - inline void subtract_glyph_origin_for_direction (hb_codepoint_t glyph, - hb_direction_t direction, - hb_position_t *x, hb_position_t *y) - { - hb_position_t origin_x, origin_y; - - get_glyph_origin_for_direction (glyph, direction, &origin_x, &origin_y); - - *x -= origin_x; - *y -= origin_y; - } - - inline void get_glyph_kerning_for_direction (hb_codepoint_t first_glyph, hb_codepoint_t second_glyph, - hb_direction_t direction, - hb_position_t *x, hb_position_t *y) - { - if (likely (HB_DIRECTION_IS_HORIZONTAL (direction))) { - *x = get_glyph_h_kerning (first_glyph, second_glyph); - *y = 0; - } else { - *x = 0; - *y = get_glyph_v_kerning (first_glyph, second_glyph); - } - } - - inline hb_bool_t get_glyph_extents_for_origin (hb_codepoint_t glyph, - hb_direction_t direction, - hb_glyph_extents_t *extents) - { - hb_bool_t ret = get_glyph_extents (glyph, extents); - - if (ret) - subtract_glyph_origin_for_direction (glyph, direction, &extents->x_bearing, &extents->y_bearing); - - return ret; - } - - inline hb_bool_t get_glyph_contour_point_for_origin (hb_codepoint_t glyph, unsigned int point_index, - hb_direction_t direction, - hb_position_t *x, hb_position_t *y) - { - hb_bool_t ret = get_glyph_contour_point (glyph, point_index, x, y); - - if (ret) - subtract_glyph_origin_for_direction (glyph, direction, x, y); - - return ret; - } - - /* Generates gidDDD if glyph has no name. */ - inline void - glyph_to_string (hb_codepoint_t glyph, - char *s, unsigned int size) - { - if (get_glyph_name (glyph, s, size)) return; - - snprintf (s, size, "gid%u", glyph); - } - - /* Parses gidDDD and uniUUUU strings automatically. */ - inline hb_bool_t - glyph_from_string (const char *s, int len, /* -1 means nul-terminated */ - hb_codepoint_t *glyph) - { - if (get_glyph_from_name (s, len, glyph)) return true; - - if (len == -1) len = strlen (s); - - /* Straight glyph index. */ - if (hb_codepoint_parse (s, len, 10, glyph)) - return true; - - if (len > 3) - { - /* gidDDD syntax for glyph indices. */ - if (0 == strncmp (s, "gid", 3) && - hb_codepoint_parse (s + 3, len - 3, 10, glyph)) - return true; - - /* uniUUUU and other Unicode character indices. */ - hb_codepoint_t unichar; - if (0 == strncmp (s, "uni", 3) && - hb_codepoint_parse (s + 3, len - 3, 16, &unichar) && - get_glyph (unichar, 0, glyph)) - return true; - } - - return false; - } - - private: - inline hb_position_t em_scale (int16_t v, int scale) { return v * (int64_t) scale / hb_face_get_upem (this->face); } -}; - -#define HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS -#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_PROTOTYPE(shaper, font); -#include "hb-shaper-list.hh" -#undef HB_SHAPER_IMPLEMENT -#undef HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS - - -#endif /* HB_FONT_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-font.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-font.cc deleted file mode 100644 index b59fdebaea7..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-font.cc +++ /dev/null @@ -1,1008 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-private.hh" - -#include "hb-ot-layout-private.hh" - -#include "hb-font-private.hh" -#include "hb-blob.h" -#include "hb-open-file-private.hh" -#include "hb-ot-head-table.hh" -#include "hb-ot-maxp-table.hh" - -#include "hb-cache-private.hh" - -#include <string.h> - - - -/* - * hb_font_funcs_t - */ - -static hb_bool_t -hb_font_get_glyph_nil (hb_font_t *font, - void *font_data HB_UNUSED, - hb_codepoint_t unicode, - hb_codepoint_t variation_selector, - hb_codepoint_t *glyph, - void *user_data HB_UNUSED) -{ - if (font->parent) - return font->parent->get_glyph (unicode, variation_selector, glyph); - - *glyph = 0; - return false; -} - -static hb_position_t -hb_font_get_glyph_h_advance_nil (hb_font_t *font, - void *font_data HB_UNUSED, - hb_codepoint_t glyph, - void *user_data HB_UNUSED) -{ - if (font->parent) - return font->parent_scale_x_distance (font->parent->get_glyph_h_advance (glyph)); - - return font->x_scale; -} - -static hb_position_t -hb_font_get_glyph_v_advance_nil (hb_font_t *font, - void *font_data HB_UNUSED, - hb_codepoint_t glyph, - void *user_data HB_UNUSED) -{ - if (font->parent) - return font->parent_scale_y_distance (font->parent->get_glyph_v_advance (glyph)); - - return font->y_scale; -} - -static hb_bool_t -hb_font_get_glyph_h_origin_nil (hb_font_t *font, - void *font_data HB_UNUSED, - hb_codepoint_t glyph, - hb_position_t *x, - hb_position_t *y, - void *user_data HB_UNUSED) -{ - if (font->parent) { - hb_bool_t ret = font->parent->get_glyph_h_origin (glyph, x, y); - if (ret) - font->parent_scale_position (x, y); - return ret; - } - - *x = *y = 0; - return false; -} - -static hb_bool_t -hb_font_get_glyph_v_origin_nil (hb_font_t *font, - void *font_data HB_UNUSED, - hb_codepoint_t glyph, - hb_position_t *x, - hb_position_t *y, - void *user_data HB_UNUSED) -{ - if (font->parent) { - hb_bool_t ret = font->parent->get_glyph_v_origin (glyph, x, y); - if (ret) - font->parent_scale_position (x, y); - return ret; - } - - *x = *y = 0; - return false; -} - -static hb_position_t -hb_font_get_glyph_h_kerning_nil (hb_font_t *font, - void *font_data HB_UNUSED, - hb_codepoint_t left_glyph, - hb_codepoint_t right_glyph, - void *user_data HB_UNUSED) -{ - if (font->parent) - return font->parent_scale_x_distance (font->parent->get_glyph_h_kerning (left_glyph, right_glyph)); - - return 0; -} - -static hb_position_t -hb_font_get_glyph_v_kerning_nil (hb_font_t *font, - void *font_data HB_UNUSED, - hb_codepoint_t top_glyph, - hb_codepoint_t bottom_glyph, - void *user_data HB_UNUSED) -{ - if (font->parent) - return font->parent_scale_y_distance (font->parent->get_glyph_v_kerning (top_glyph, bottom_glyph)); - - return 0; -} - -static hb_bool_t -hb_font_get_glyph_extents_nil (hb_font_t *font, - void *font_data HB_UNUSED, - hb_codepoint_t glyph, - hb_glyph_extents_t *extents, - void *user_data HB_UNUSED) -{ - if (font->parent) { - hb_bool_t ret = font->parent->get_glyph_extents (glyph, extents); - if (ret) { - font->parent_scale_position (&extents->x_bearing, &extents->y_bearing); - font->parent_scale_distance (&extents->width, &extents->height); - } - return ret; - } - - memset (extents, 0, sizeof (*extents)); - return false; -} - -static hb_bool_t -hb_font_get_glyph_contour_point_nil (hb_font_t *font, - void *font_data HB_UNUSED, - hb_codepoint_t glyph, - unsigned int point_index, - hb_position_t *x, - hb_position_t *y, - void *user_data HB_UNUSED) -{ - if (font->parent) { - hb_bool_t ret = font->parent->get_glyph_contour_point (glyph, point_index, x, y); - if (ret) - font->parent_scale_position (x, y); - return ret; - } - - *x = *y = 0; - return false; -} - -static hb_bool_t -hb_font_get_glyph_name_nil (hb_font_t *font, - void *font_data HB_UNUSED, - hb_codepoint_t glyph, - char *name, unsigned int size, - void *user_data HB_UNUSED) -{ - if (font->parent) - return font->parent->get_glyph_name (glyph, name, size); - - if (size) *name = '\0'; - return false; -} - -static hb_bool_t -hb_font_get_glyph_from_name_nil (hb_font_t *font, - void *font_data HB_UNUSED, - const char *name, int len, /* -1 means nul-terminated */ - hb_codepoint_t *glyph, - void *user_data HB_UNUSED) -{ - if (font->parent) - return font->parent->get_glyph_from_name (name, len, glyph); - - *glyph = 0; - return false; -} - - -static const hb_font_funcs_t _hb_font_funcs_nil = { - HB_OBJECT_HEADER_STATIC, - - true, /* immutable */ - - { -#define HB_FONT_FUNC_IMPLEMENT(name) hb_font_get_##name##_nil, - HB_FONT_FUNCS_IMPLEMENT_CALLBACKS -#undef HB_FONT_FUNC_IMPLEMENT - } -}; - - -hb_font_funcs_t * -hb_font_funcs_create (void) -{ - hb_font_funcs_t *ffuncs; - - if (!(ffuncs = hb_object_create<hb_font_funcs_t> ())) - return hb_font_funcs_get_empty (); - - ffuncs->get = _hb_font_funcs_nil.get; - - return ffuncs; -} - -hb_font_funcs_t * -hb_font_funcs_get_empty (void) -{ - return const_cast<hb_font_funcs_t *> (&_hb_font_funcs_nil); -} - -hb_font_funcs_t * -hb_font_funcs_reference (hb_font_funcs_t *ffuncs) -{ - return hb_object_reference (ffuncs); -} - -void -hb_font_funcs_destroy (hb_font_funcs_t *ffuncs) -{ - if (!hb_object_destroy (ffuncs)) return; - -#define HB_FONT_FUNC_IMPLEMENT(name) if (ffuncs->destroy.name) \ - ffuncs->destroy.name (ffuncs->user_data.name); - HB_FONT_FUNCS_IMPLEMENT_CALLBACKS -#undef HB_FONT_FUNC_IMPLEMENT - - free (ffuncs); -} - -hb_bool_t -hb_font_funcs_set_user_data (hb_font_funcs_t *ffuncs, - hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy, - hb_bool_t replace) -{ - return hb_object_set_user_data (ffuncs, key, data, destroy, replace); -} - -void * -hb_font_funcs_get_user_data (hb_font_funcs_t *ffuncs, - hb_user_data_key_t *key) -{ - return hb_object_get_user_data (ffuncs, key); -} - - -void -hb_font_funcs_make_immutable (hb_font_funcs_t *ffuncs) -{ - if (hb_object_is_inert (ffuncs)) - return; - - ffuncs->immutable = true; -} - -hb_bool_t -hb_font_funcs_is_immutable (hb_font_funcs_t *ffuncs) -{ - return ffuncs->immutable; -} - - -#define HB_FONT_FUNC_IMPLEMENT(name) \ - \ -void \ -hb_font_funcs_set_##name##_func (hb_font_funcs_t *ffuncs, \ - hb_font_get_##name##_func_t func, \ - void *user_data, \ - hb_destroy_func_t destroy) \ -{ \ - if (ffuncs->immutable) { \ - if (destroy) \ - destroy (user_data); \ - return; \ - } \ - \ - if (ffuncs->destroy.name) \ - ffuncs->destroy.name (ffuncs->user_data.name); \ - \ - if (func) { \ - ffuncs->get.name = func; \ - ffuncs->user_data.name = user_data; \ - ffuncs->destroy.name = destroy; \ - } else { \ - ffuncs->get.name = hb_font_get_##name##_nil; \ - ffuncs->user_data.name = NULL; \ - ffuncs->destroy.name = NULL; \ - } \ -} - -HB_FONT_FUNCS_IMPLEMENT_CALLBACKS -#undef HB_FONT_FUNC_IMPLEMENT - - -/* Public getters */ - -hb_bool_t -hb_font_get_glyph (hb_font_t *font, - hb_codepoint_t unicode, hb_codepoint_t variation_selector, - hb_codepoint_t *glyph) -{ - return font->get_glyph (unicode, variation_selector, glyph); -} - -hb_position_t -hb_font_get_glyph_h_advance (hb_font_t *font, - hb_codepoint_t glyph) -{ - return font->get_glyph_h_advance (glyph); -} - -hb_position_t -hb_font_get_glyph_v_advance (hb_font_t *font, - hb_codepoint_t glyph) -{ - return font->get_glyph_v_advance (glyph); -} - -hb_bool_t -hb_font_get_glyph_h_origin (hb_font_t *font, - hb_codepoint_t glyph, - hb_position_t *x, hb_position_t *y) -{ - return font->get_glyph_h_origin (glyph, x, y); -} - -hb_bool_t -hb_font_get_glyph_v_origin (hb_font_t *font, - hb_codepoint_t glyph, - hb_position_t *x, hb_position_t *y) -{ - return font->get_glyph_v_origin (glyph, x, y); -} - -hb_position_t -hb_font_get_glyph_h_kerning (hb_font_t *font, - hb_codepoint_t left_glyph, hb_codepoint_t right_glyph) -{ - return font->get_glyph_h_kerning (left_glyph, right_glyph); -} - -hb_position_t -hb_font_get_glyph_v_kerning (hb_font_t *font, - hb_codepoint_t left_glyph, hb_codepoint_t right_glyph) -{ - return font->get_glyph_v_kerning (left_glyph, right_glyph); -} - -hb_bool_t -hb_font_get_glyph_extents (hb_font_t *font, - hb_codepoint_t glyph, - hb_glyph_extents_t *extents) -{ - return font->get_glyph_extents (glyph, extents); -} - -hb_bool_t -hb_font_get_glyph_contour_point (hb_font_t *font, - hb_codepoint_t glyph, unsigned int point_index, - hb_position_t *x, hb_position_t *y) -{ - return font->get_glyph_contour_point (glyph, point_index, x, y); -} - -hb_bool_t -hb_font_get_glyph_name (hb_font_t *font, - hb_codepoint_t glyph, - char *name, unsigned int size) -{ - return font->get_glyph_name (glyph, name, size); -} - -hb_bool_t -hb_font_get_glyph_from_name (hb_font_t *font, - const char *name, int len, /* -1 means nul-terminated */ - hb_codepoint_t *glyph) -{ - return font->get_glyph_from_name (name, len, glyph); -} - - -/* A bit higher-level, and with fallback */ - -void -hb_font_get_glyph_advance_for_direction (hb_font_t *font, - hb_codepoint_t glyph, - hb_direction_t direction, - hb_position_t *x, hb_position_t *y) -{ - return font->get_glyph_advance_for_direction (glyph, direction, x, y); -} - -void -hb_font_get_glyph_origin_for_direction (hb_font_t *font, - hb_codepoint_t glyph, - hb_direction_t direction, - hb_position_t *x, hb_position_t *y) -{ - return font->get_glyph_origin_for_direction (glyph, direction, x, y); -} - -void -hb_font_add_glyph_origin_for_direction (hb_font_t *font, - hb_codepoint_t glyph, - hb_direction_t direction, - hb_position_t *x, hb_position_t *y) -{ - return font->add_glyph_origin_for_direction (glyph, direction, x, y); -} - -void -hb_font_subtract_glyph_origin_for_direction (hb_font_t *font, - hb_codepoint_t glyph, - hb_direction_t direction, - hb_position_t *x, hb_position_t *y) -{ - return font->subtract_glyph_origin_for_direction (glyph, direction, x, y); -} - -void -hb_font_get_glyph_kerning_for_direction (hb_font_t *font, - hb_codepoint_t first_glyph, hb_codepoint_t second_glyph, - hb_direction_t direction, - hb_position_t *x, hb_position_t *y) -{ - return font->get_glyph_kerning_for_direction (first_glyph, second_glyph, direction, x, y); -} - -hb_bool_t -hb_font_get_glyph_extents_for_origin (hb_font_t *font, - hb_codepoint_t glyph, - hb_direction_t direction, - hb_glyph_extents_t *extents) -{ - return font->get_glyph_extents_for_origin (glyph, direction, extents); -} - -hb_bool_t -hb_font_get_glyph_contour_point_for_origin (hb_font_t *font, - hb_codepoint_t glyph, unsigned int point_index, - hb_direction_t direction, - hb_position_t *x, hb_position_t *y) -{ - return font->get_glyph_contour_point_for_origin (glyph, point_index, direction, x, y); -} - -/* Generates gidDDD if glyph has no name. */ -void -hb_font_glyph_to_string (hb_font_t *font, - hb_codepoint_t glyph, - char *s, unsigned int size) -{ - font->glyph_to_string (glyph, s, size); -} - -/* Parses gidDDD and uniUUUU strings automatically. */ -hb_bool_t -hb_font_glyph_from_string (hb_font_t *font, - const char *s, int len, /* -1 means nul-terminated */ - hb_codepoint_t *glyph) -{ - return font->glyph_from_string (s, len, glyph); -} - - -/* - * hb_face_t - */ - -static const hb_face_t _hb_face_nil = { - HB_OBJECT_HEADER_STATIC, - - true, /* immutable */ - - NULL, /* reference_table_func */ - NULL, /* user_data */ - NULL, /* destroy */ - - 0, /* index */ - 1000, /* upem */ - 0, /* num_glyphs */ - - { -#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_INVALID, -#include "hb-shaper-list.hh" -#undef HB_SHAPER_IMPLEMENT - }, - - NULL, /* shape_plans */ -}; - - -hb_face_t * -hb_face_create_for_tables (hb_reference_table_func_t reference_table_func, - void *user_data, - hb_destroy_func_t destroy) -{ - hb_face_t *face; - - if (!reference_table_func || !(face = hb_object_create<hb_face_t> ())) { - if (destroy) - destroy (user_data); - return hb_face_get_empty (); - } - - face->reference_table_func = reference_table_func; - face->user_data = user_data; - face->destroy = destroy; - - face->upem = 0; - face->num_glyphs = (unsigned int) -1; - - return face; -} - - -typedef struct hb_face_for_data_closure_t { - hb_blob_t *blob; - unsigned int index; -} hb_face_for_data_closure_t; - -static hb_face_for_data_closure_t * -_hb_face_for_data_closure_create (hb_blob_t *blob, unsigned int index) -{ - hb_face_for_data_closure_t *closure; - - closure = (hb_face_for_data_closure_t *) malloc (sizeof (hb_face_for_data_closure_t)); - if (unlikely (!closure)) - return NULL; - - closure->blob = blob; - closure->index = index; - - return closure; -} - -static void -_hb_face_for_data_closure_destroy (hb_face_for_data_closure_t *closure) -{ - hb_blob_destroy (closure->blob); - free (closure); -} - -static hb_blob_t * -_hb_face_for_data_reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data) -{ - hb_face_for_data_closure_t *data = (hb_face_for_data_closure_t *) user_data; - - if (tag == HB_TAG_NONE) - return hb_blob_reference (data->blob); - - const OT::OpenTypeFontFile &ot_file = *OT::Sanitizer<OT::OpenTypeFontFile>::lock_instance (data->blob); - const OT::OpenTypeFontFace &ot_face = ot_file.get_face (data->index); - - const OT::OpenTypeTable &table = ot_face.get_table_by_tag (tag); - - hb_blob_t *blob = hb_blob_create_sub_blob (data->blob, table.offset, table.length); - - return blob; -} - -hb_face_t * -hb_face_create (hb_blob_t *blob, - unsigned int index) -{ - hb_face_t *face; - - if (unlikely (!blob || !hb_blob_get_length (blob))) - return hb_face_get_empty (); - - hb_face_for_data_closure_t *closure = _hb_face_for_data_closure_create (OT::Sanitizer<OT::OpenTypeFontFile>::sanitize (hb_blob_reference (blob)), index); - - if (unlikely (!closure)) - return hb_face_get_empty (); - - face = hb_face_create_for_tables (_hb_face_for_data_reference_table, - closure, - (hb_destroy_func_t) _hb_face_for_data_closure_destroy); - - hb_face_set_index (face, index); - - return face; -} - -hb_face_t * -hb_face_get_empty (void) -{ - return const_cast<hb_face_t *> (&_hb_face_nil); -} - - -hb_face_t * -hb_face_reference (hb_face_t *face) -{ - return hb_object_reference (face); -} - -void -hb_face_destroy (hb_face_t *face) -{ - if (!hb_object_destroy (face)) return; - - for (hb_face_t::plan_node_t *node = face->shape_plans; node; ) - { - hb_face_t::plan_node_t *next = node->next; - hb_shape_plan_destroy (node->shape_plan); - free (node); - node = next; - } - -#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_DESTROY(shaper, face); -#include "hb-shaper-list.hh" -#undef HB_SHAPER_IMPLEMENT - - if (face->destroy) - face->destroy (face->user_data); - - free (face); -} - -hb_bool_t -hb_face_set_user_data (hb_face_t *face, - hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy, - hb_bool_t replace) -{ - return hb_object_set_user_data (face, key, data, destroy, replace); -} - -void * -hb_face_get_user_data (hb_face_t *face, - hb_user_data_key_t *key) -{ - return hb_object_get_user_data (face, key); -} - -void -hb_face_make_immutable (hb_face_t *face) -{ - if (hb_object_is_inert (face)) - return; - - face->immutable = true; -} - -hb_bool_t -hb_face_is_immutable (hb_face_t *face) -{ - return face->immutable; -} - - -hb_blob_t * -hb_face_reference_table (hb_face_t *face, - hb_tag_t tag) -{ - return face->reference_table (tag); -} - -hb_blob_t * -hb_face_reference_blob (hb_face_t *face) -{ - return face->reference_table (HB_TAG_NONE); -} - -void -hb_face_set_index (hb_face_t *face, - unsigned int index) -{ - if (hb_object_is_inert (face)) - return; - - face->index = index; -} - -unsigned int -hb_face_get_index (hb_face_t *face) -{ - return face->index; -} - -void -hb_face_set_upem (hb_face_t *face, - unsigned int upem) -{ - if (hb_object_is_inert (face)) - return; - - face->upem = upem; -} - -unsigned int -hb_face_get_upem (hb_face_t *face) -{ - return face->get_upem (); -} - -void -hb_face_t::load_upem (void) const -{ - hb_blob_t *head_blob = OT::Sanitizer<OT::head>::sanitize (reference_table (HB_OT_TAG_head)); - const OT::head *head_table = OT::Sanitizer<OT::head>::lock_instance (head_blob); - upem = head_table->get_upem (); - hb_blob_destroy (head_blob); -} - -void -hb_face_set_glyph_count (hb_face_t *face, - unsigned int glyph_count) -{ - if (hb_object_is_inert (face)) - return; - - face->num_glyphs = glyph_count; -} - -unsigned int -hb_face_get_glyph_count (hb_face_t *face) -{ - return face->get_num_glyphs (); -} - -void -hb_face_t::load_num_glyphs (void) const -{ - hb_blob_t *maxp_blob = OT::Sanitizer<OT::maxp>::sanitize (reference_table (HB_OT_TAG_maxp)); - const OT::maxp *maxp_table = OT::Sanitizer<OT::maxp>::lock_instance (maxp_blob); - num_glyphs = maxp_table->get_num_glyphs (); - hb_blob_destroy (maxp_blob); -} - - -/* - * hb_font_t - */ - -hb_font_t * -hb_font_create (hb_face_t *face) -{ - hb_font_t *font; - - if (unlikely (!face)) - face = hb_face_get_empty (); - if (unlikely (hb_object_is_inert (face))) - return hb_font_get_empty (); - if (!(font = hb_object_create<hb_font_t> ())) - return hb_font_get_empty (); - - hb_face_make_immutable (face); - font->face = hb_face_reference (face); - font->klass = hb_font_funcs_get_empty (); - - return font; -} - -hb_font_t * -hb_font_create_sub_font (hb_font_t *parent) -{ - if (unlikely (!parent)) - return hb_font_get_empty (); - - hb_font_t *font = hb_font_create (parent->face); - - if (unlikely (hb_object_is_inert (font))) - return font; - - hb_font_make_immutable (parent); - font->parent = hb_font_reference (parent); - - font->x_scale = parent->x_scale; - font->y_scale = parent->y_scale; - font->x_ppem = parent->x_ppem; - font->y_ppem = parent->y_ppem; - - return font; -} - -hb_font_t * -hb_font_get_empty (void) -{ - static const hb_font_t _hb_font_nil = { - HB_OBJECT_HEADER_STATIC, - - true, /* immutable */ - - NULL, /* parent */ - const_cast<hb_face_t *> (&_hb_face_nil), - - 0, /* x_scale */ - 0, /* y_scale */ - - 0, /* x_ppem */ - 0, /* y_ppem */ - - const_cast<hb_font_funcs_t *> (&_hb_font_funcs_nil), /* klass */ - NULL, /* user_data */ - NULL, /* destroy */ - - { -#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_INVALID, -#include "hb-shaper-list.hh" -#undef HB_SHAPER_IMPLEMENT - } - }; - - return const_cast<hb_font_t *> (&_hb_font_nil); -} - -hb_font_t * -hb_font_reference (hb_font_t *font) -{ - return hb_object_reference (font); -} - -void -hb_font_destroy (hb_font_t *font) -{ - if (!hb_object_destroy (font)) return; - -#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_DESTROY(shaper, font); -#include "hb-shaper-list.hh" -#undef HB_SHAPER_IMPLEMENT - - if (font->destroy) - font->destroy (font->user_data); - - hb_font_destroy (font->parent); - hb_face_destroy (font->face); - hb_font_funcs_destroy (font->klass); - - free (font); -} - -hb_bool_t -hb_font_set_user_data (hb_font_t *font, - hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy, - hb_bool_t replace) -{ - return hb_object_set_user_data (font, key, data, destroy, replace); -} - -void * -hb_font_get_user_data (hb_font_t *font, - hb_user_data_key_t *key) -{ - return hb_object_get_user_data (font, key); -} - -void -hb_font_make_immutable (hb_font_t *font) -{ - if (hb_object_is_inert (font)) - return; - - font->immutable = true; -} - -hb_bool_t -hb_font_is_immutable (hb_font_t *font) -{ - return font->immutable; -} - -hb_font_t * -hb_font_get_parent (hb_font_t *font) -{ - return font->parent; -} - -hb_face_t * -hb_font_get_face (hb_font_t *font) -{ - return font->face; -} - - -void -hb_font_set_funcs (hb_font_t *font, - hb_font_funcs_t *klass, - void *user_data, - hb_destroy_func_t destroy) -{ - if (font->immutable) { - if (destroy) - destroy (user_data); - return; - } - - if (font->destroy) - font->destroy (font->user_data); - - if (!klass) - klass = hb_font_funcs_get_empty (); - - hb_font_funcs_reference (klass); - hb_font_funcs_destroy (font->klass); - font->klass = klass; - font->user_data = user_data; - font->destroy = destroy; -} - -void -hb_font_set_funcs_data (hb_font_t *font, - void *user_data, - hb_destroy_func_t destroy) -{ - /* Destroy user_data? */ - if (font->immutable) { - if (destroy) - destroy (user_data); - return; - } - - if (font->destroy) - font->destroy (font->user_data); - - font->user_data = user_data; - font->destroy = destroy; -} - - -void -hb_font_set_scale (hb_font_t *font, - int x_scale, - int y_scale) -{ - if (font->immutable) - return; - - font->x_scale = x_scale; - font->y_scale = y_scale; -} - -void -hb_font_get_scale (hb_font_t *font, - int *x_scale, - int *y_scale) -{ - if (x_scale) *x_scale = font->x_scale; - if (y_scale) *y_scale = font->y_scale; -} - -void -hb_font_set_ppem (hb_font_t *font, - unsigned int x_ppem, - unsigned int y_ppem) -{ - if (font->immutable) - return; - - font->x_ppem = x_ppem; - font->y_ppem = y_ppem; -} - -void -hb_font_get_ppem (hb_font_t *font, - unsigned int *x_ppem, - unsigned int *y_ppem) -{ - if (x_ppem) *x_ppem = font->x_ppem; - if (y_ppem) *y_ppem = font->y_ppem; -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-font.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-font.h deleted file mode 100644 index 88d489551e8..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-font.h +++ /dev/null @@ -1,454 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - */ - -#ifndef HB_H_IN -#error "Include <hb.h> instead." -#endif - -#ifndef HB_FONT_H -#define HB_FONT_H - -#include "hb-common.h" -#include "hb-blob.h" - -HB_BEGIN_DECLS - - -typedef struct hb_face_t hb_face_t; -typedef struct hb_font_t hb_font_t; - -/* - * hb_face_t - */ - -hb_face_t * -hb_face_create (hb_blob_t *blob, - unsigned int index); - -typedef hb_blob_t * (*hb_reference_table_func_t) (hb_face_t *face, hb_tag_t tag, void *user_data); - -/* calls destroy() when not needing user_data anymore */ -hb_face_t * -hb_face_create_for_tables (hb_reference_table_func_t reference_table_func, - void *user_data, - hb_destroy_func_t destroy); - -hb_face_t * -hb_face_get_empty (void); - -hb_face_t * -hb_face_reference (hb_face_t *face); - -void -hb_face_destroy (hb_face_t *face); - -hb_bool_t -hb_face_set_user_data (hb_face_t *face, - hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy, - hb_bool_t replace); - - -void * -hb_face_get_user_data (hb_face_t *face, - hb_user_data_key_t *key); - -void -hb_face_make_immutable (hb_face_t *face); - -hb_bool_t -hb_face_is_immutable (hb_face_t *face); - - -hb_blob_t * -hb_face_reference_table (hb_face_t *face, - hb_tag_t tag); - -hb_blob_t * -hb_face_reference_blob (hb_face_t *face); - -void -hb_face_set_index (hb_face_t *face, - unsigned int index); - -unsigned int -hb_face_get_index (hb_face_t *face); - -void -hb_face_set_upem (hb_face_t *face, - unsigned int upem); - -unsigned int -hb_face_get_upem (hb_face_t *face); - -void -hb_face_set_glyph_count (hb_face_t *face, - unsigned int glyph_count); - -unsigned int -hb_face_get_glyph_count (hb_face_t *face); - - -/* - * hb_font_funcs_t - */ - -typedef struct hb_font_funcs_t hb_font_funcs_t; - -hb_font_funcs_t * -hb_font_funcs_create (void); - -hb_font_funcs_t * -hb_font_funcs_get_empty (void); - -hb_font_funcs_t * -hb_font_funcs_reference (hb_font_funcs_t *ffuncs); - -void -hb_font_funcs_destroy (hb_font_funcs_t *ffuncs); - -hb_bool_t -hb_font_funcs_set_user_data (hb_font_funcs_t *ffuncs, - hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy, - hb_bool_t replace); - - -void * -hb_font_funcs_get_user_data (hb_font_funcs_t *ffuncs, - hb_user_data_key_t *key); - - -void -hb_font_funcs_make_immutable (hb_font_funcs_t *ffuncs); - -hb_bool_t -hb_font_funcs_is_immutable (hb_font_funcs_t *ffuncs); - - -/* glyph extents */ - -typedef struct hb_glyph_extents_t -{ - hb_position_t x_bearing; - hb_position_t y_bearing; - hb_position_t width; - hb_position_t height; -} hb_glyph_extents_t; - - -/* func types */ - -typedef hb_bool_t (*hb_font_get_glyph_func_t) (hb_font_t *font, void *font_data, - hb_codepoint_t unicode, hb_codepoint_t variation_selector, - hb_codepoint_t *glyph, - void *user_data); - - -typedef hb_position_t (*hb_font_get_glyph_advance_func_t) (hb_font_t *font, void *font_data, - hb_codepoint_t glyph, - void *user_data); -typedef hb_font_get_glyph_advance_func_t hb_font_get_glyph_h_advance_func_t; -typedef hb_font_get_glyph_advance_func_t hb_font_get_glyph_v_advance_func_t; - -typedef hb_bool_t (*hb_font_get_glyph_origin_func_t) (hb_font_t *font, void *font_data, - hb_codepoint_t glyph, - hb_position_t *x, hb_position_t *y, - void *user_data); -typedef hb_font_get_glyph_origin_func_t hb_font_get_glyph_h_origin_func_t; -typedef hb_font_get_glyph_origin_func_t hb_font_get_glyph_v_origin_func_t; - -typedef hb_position_t (*hb_font_get_glyph_kerning_func_t) (hb_font_t *font, void *font_data, - hb_codepoint_t first_glyph, hb_codepoint_t second_glyph, - void *user_data); -typedef hb_font_get_glyph_kerning_func_t hb_font_get_glyph_h_kerning_func_t; -typedef hb_font_get_glyph_kerning_func_t hb_font_get_glyph_v_kerning_func_t; - - -typedef hb_bool_t (*hb_font_get_glyph_extents_func_t) (hb_font_t *font, void *font_data, - hb_codepoint_t glyph, - hb_glyph_extents_t *extents, - void *user_data); -typedef hb_bool_t (*hb_font_get_glyph_contour_point_func_t) (hb_font_t *font, void *font_data, - hb_codepoint_t glyph, unsigned int point_index, - hb_position_t *x, hb_position_t *y, - void *user_data); - - -typedef hb_bool_t (*hb_font_get_glyph_name_func_t) (hb_font_t *font, void *font_data, - hb_codepoint_t glyph, - char *name, unsigned int size, - void *user_data); -typedef hb_bool_t (*hb_font_get_glyph_from_name_func_t) (hb_font_t *font, void *font_data, - const char *name, int len, /* -1 means nul-terminated */ - hb_codepoint_t *glyph, - void *user_data); - - -/* func setters */ - -void -hb_font_funcs_set_glyph_func (hb_font_funcs_t *ffuncs, - hb_font_get_glyph_func_t glyph_func, - void *user_data, hb_destroy_func_t destroy); - -void -hb_font_funcs_set_glyph_h_advance_func (hb_font_funcs_t *ffuncs, - hb_font_get_glyph_h_advance_func_t func, - void *user_data, hb_destroy_func_t destroy); -void -hb_font_funcs_set_glyph_v_advance_func (hb_font_funcs_t *ffuncs, - hb_font_get_glyph_v_advance_func_t func, - void *user_data, hb_destroy_func_t destroy); - -void -hb_font_funcs_set_glyph_h_origin_func (hb_font_funcs_t *ffuncs, - hb_font_get_glyph_h_origin_func_t func, - void *user_data, hb_destroy_func_t destroy); -void -hb_font_funcs_set_glyph_v_origin_func (hb_font_funcs_t *ffuncs, - hb_font_get_glyph_v_origin_func_t func, - void *user_data, hb_destroy_func_t destroy); - -void -hb_font_funcs_set_glyph_h_kerning_func (hb_font_funcs_t *ffuncs, - hb_font_get_glyph_h_kerning_func_t func, - void *user_data, hb_destroy_func_t destroy); -void -hb_font_funcs_set_glyph_v_kerning_func (hb_font_funcs_t *ffuncs, - hb_font_get_glyph_v_kerning_func_t func, - void *user_data, hb_destroy_func_t destroy); - -void -hb_font_funcs_set_glyph_extents_func (hb_font_funcs_t *ffuncs, - hb_font_get_glyph_extents_func_t func, - void *user_data, hb_destroy_func_t destroy); -void -hb_font_funcs_set_glyph_contour_point_func (hb_font_funcs_t *ffuncs, - hb_font_get_glyph_contour_point_func_t func, - void *user_data, hb_destroy_func_t destroy); - -void -hb_font_funcs_set_glyph_name_func (hb_font_funcs_t *ffuncs, - hb_font_get_glyph_name_func_t glyph_func, - void *user_data, hb_destroy_func_t destroy); -void -hb_font_funcs_set_glyph_from_name_func (hb_font_funcs_t *ffuncs, - hb_font_get_glyph_from_name_func_t glyph_func, - void *user_data, hb_destroy_func_t destroy); - - -/* func dispatch */ - -hb_bool_t -hb_font_get_glyph (hb_font_t *font, - hb_codepoint_t unicode, hb_codepoint_t variation_selector, - hb_codepoint_t *glyph); - -hb_position_t -hb_font_get_glyph_h_advance (hb_font_t *font, - hb_codepoint_t glyph); -hb_position_t -hb_font_get_glyph_v_advance (hb_font_t *font, - hb_codepoint_t glyph); - -hb_bool_t -hb_font_get_glyph_h_origin (hb_font_t *font, - hb_codepoint_t glyph, - hb_position_t *x, hb_position_t *y); -hb_bool_t -hb_font_get_glyph_v_origin (hb_font_t *font, - hb_codepoint_t glyph, - hb_position_t *x, hb_position_t *y); - -hb_position_t -hb_font_get_glyph_h_kerning (hb_font_t *font, - hb_codepoint_t left_glyph, hb_codepoint_t right_glyph); -hb_position_t -hb_font_get_glyph_v_kerning (hb_font_t *font, - hb_codepoint_t top_glyph, hb_codepoint_t bottom_glyph); - -hb_bool_t -hb_font_get_glyph_extents (hb_font_t *font, - hb_codepoint_t glyph, - hb_glyph_extents_t *extents); - -hb_bool_t -hb_font_get_glyph_contour_point (hb_font_t *font, - hb_codepoint_t glyph, unsigned int point_index, - hb_position_t *x, hb_position_t *y); - -hb_bool_t -hb_font_get_glyph_name (hb_font_t *font, - hb_codepoint_t glyph, - char *name, unsigned int size); -hb_bool_t -hb_font_get_glyph_from_name (hb_font_t *font, - const char *name, int len, /* -1 means nul-terminated */ - hb_codepoint_t *glyph); - - -/* high-level funcs, with fallback */ - -void -hb_font_get_glyph_advance_for_direction (hb_font_t *font, - hb_codepoint_t glyph, - hb_direction_t direction, - hb_position_t *x, hb_position_t *y); -void -hb_font_get_glyph_origin_for_direction (hb_font_t *font, - hb_codepoint_t glyph, - hb_direction_t direction, - hb_position_t *x, hb_position_t *y); -void -hb_font_add_glyph_origin_for_direction (hb_font_t *font, - hb_codepoint_t glyph, - hb_direction_t direction, - hb_position_t *x, hb_position_t *y); -void -hb_font_subtract_glyph_origin_for_direction (hb_font_t *font, - hb_codepoint_t glyph, - hb_direction_t direction, - hb_position_t *x, hb_position_t *y); - -void -hb_font_get_glyph_kerning_for_direction (hb_font_t *font, - hb_codepoint_t first_glyph, hb_codepoint_t second_glyph, - hb_direction_t direction, - hb_position_t *x, hb_position_t *y); - -hb_bool_t -hb_font_get_glyph_extents_for_origin (hb_font_t *font, - hb_codepoint_t glyph, - hb_direction_t direction, - hb_glyph_extents_t *extents); - -hb_bool_t -hb_font_get_glyph_contour_point_for_origin (hb_font_t *font, - hb_codepoint_t glyph, unsigned int point_index, - hb_direction_t direction, - hb_position_t *x, hb_position_t *y); - -/* Generates gidDDD if glyph has no name. */ -void -hb_font_glyph_to_string (hb_font_t *font, - hb_codepoint_t glyph, - char *s, unsigned int size); -/* Parses gidDDD and uniUUUU strings automatically. */ -hb_bool_t -hb_font_glyph_from_string (hb_font_t *font, - const char *s, int len, /* -1 means nul-terminated */ - hb_codepoint_t *glyph); - - -/* - * hb_font_t - */ - -/* Fonts are very light-weight objects */ - -hb_font_t * -hb_font_create (hb_face_t *face); - -hb_font_t * -hb_font_create_sub_font (hb_font_t *parent); - -hb_font_t * -hb_font_get_empty (void); - -hb_font_t * -hb_font_reference (hb_font_t *font); - -void -hb_font_destroy (hb_font_t *font); - -hb_bool_t -hb_font_set_user_data (hb_font_t *font, - hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy, - hb_bool_t replace); - - -void * -hb_font_get_user_data (hb_font_t *font, - hb_user_data_key_t *key); - -void -hb_font_make_immutable (hb_font_t *font); - -hb_bool_t -hb_font_is_immutable (hb_font_t *font); - -hb_font_t * -hb_font_get_parent (hb_font_t *font); - -hb_face_t * -hb_font_get_face (hb_font_t *font); - - -void -hb_font_set_funcs (hb_font_t *font, - hb_font_funcs_t *klass, - void *font_data, - hb_destroy_func_t destroy); - -/* Be *very* careful with this function! */ -void -hb_font_set_funcs_data (hb_font_t *font, - void *font_data, - hb_destroy_func_t destroy); - - -void -hb_font_set_scale (hb_font_t *font, - int x_scale, - int y_scale); - -void -hb_font_get_scale (hb_font_t *font, - int *x_scale, - int *y_scale); - -/* - * A zero value means "no hinting in that direction" - */ -void -hb_font_set_ppem (hb_font_t *font, - unsigned int x_ppem, - unsigned int y_ppem); - -void -hb_font_get_ppem (hb_font_t *font, - unsigned int *x_ppem, - unsigned int *y_ppem); - - -HB_END_DECLS - -#endif /* HB_FONT_H */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ft.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ft.cc deleted file mode 100644 index 978230cd655..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ft.cc +++ /dev/null @@ -1,486 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * Copyright © 2009 Keith Stribley - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - */ - -#include "hb-private.hh" - -#include "hb-ft.h" - -#include "hb-font-private.hh" - -#include FT_ADVANCES_H -#include FT_TRUETYPE_TABLES_H - - - -#ifndef HB_DEBUG_FT -#define HB_DEBUG_FT (HB_DEBUG+0) -#endif - - -/* TODO: - * - * In general, this file does a fine job of what it's supposed to do. - * There are, however, things that need more work: - * - * - We don't handle any load_flags. That definitely has API implications. :( - * I believe hb_ft_font_create() should take load_flags input. - * In particular, FT_Get_Advance() without the NO_HINTING flag seems to be - * buggy. - * - * - We don't handle / allow for emboldening / obliqueing. - * - * - In the future, we should add constructors to create fonts in font space? - * - * - FT_Load_Glyph() is exteremely costly. Do something about it? - */ - - -static hb_bool_t -hb_ft_get_glyph (hb_font_t *font HB_UNUSED, - void *font_data, - hb_codepoint_t unicode, - hb_codepoint_t variation_selector, - hb_codepoint_t *glyph, - void *user_data HB_UNUSED) - -{ - FT_Face ft_face = (FT_Face) font_data; - -#ifdef HAVE_FT_FACE_GETCHARVARIANTINDEX - if (unlikely (variation_selector)) { - *glyph = FT_Face_GetCharVariantIndex (ft_face, unicode, variation_selector); - if (*glyph) - return true; - } -#endif - - *glyph = FT_Get_Char_Index (ft_face, unicode); - return *glyph != 0; -} - -static hb_position_t -hb_ft_get_glyph_h_advance (hb_font_t *font HB_UNUSED, - void *font_data, - hb_codepoint_t glyph, - void *user_data HB_UNUSED) -{ - FT_Face ft_face = (FT_Face) font_data; - int load_flags = FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING; - FT_Fixed v; - - if (unlikely (FT_Get_Advance (ft_face, glyph, load_flags, &v))) - return 0; - - return v >> 10; -} - -static hb_position_t -hb_ft_get_glyph_v_advance (hb_font_t *font HB_UNUSED, - void *font_data, - hb_codepoint_t glyph, - void *user_data HB_UNUSED) -{ - FT_Face ft_face = (FT_Face) font_data; - int load_flags = FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING | FT_LOAD_VERTICAL_LAYOUT; - FT_Fixed v; - - if (unlikely (FT_Get_Advance (ft_face, glyph, load_flags, &v))) - return 0; - - /* Note: FreeType's vertical metrics grows downward while other FreeType coordinates - * have a Y growing upward. Hence the extra negation. */ - return -v >> 10; -} - -static hb_bool_t -hb_ft_get_glyph_h_origin (hb_font_t *font HB_UNUSED, - void *font_data HB_UNUSED, - hb_codepoint_t glyph HB_UNUSED, - hb_position_t *x HB_UNUSED, - hb_position_t *y HB_UNUSED, - void *user_data HB_UNUSED) -{ - /* We always work in the horizontal coordinates. */ - return true; -} - -static hb_bool_t -hb_ft_get_glyph_v_origin (hb_font_t *font HB_UNUSED, - void *font_data, - hb_codepoint_t glyph, - hb_position_t *x, - hb_position_t *y, - void *user_data HB_UNUSED) -{ - FT_Face ft_face = (FT_Face) font_data; - int load_flags = FT_LOAD_DEFAULT; - - if (unlikely (FT_Load_Glyph (ft_face, glyph, load_flags))) - return false; - - /* Note: FreeType's vertical metrics grows downward while other FreeType coordinates - * have a Y growing upward. Hence the extra negation. */ - *x = ft_face->glyph->metrics.horiBearingX - ft_face->glyph->metrics.vertBearingX; - *y = ft_face->glyph->metrics.horiBearingY - (-ft_face->glyph->metrics.vertBearingY); - - return true; -} - -static hb_position_t -hb_ft_get_glyph_h_kerning (hb_font_t *font, - void *font_data, - hb_codepoint_t left_glyph, - hb_codepoint_t right_glyph, - void *user_data HB_UNUSED) -{ - FT_Face ft_face = (FT_Face) font_data; - FT_Vector kerningv; - - FT_Kerning_Mode mode = font->x_ppem ? FT_KERNING_DEFAULT : FT_KERNING_UNFITTED; - if (FT_Get_Kerning (ft_face, left_glyph, right_glyph, mode, &kerningv)) - return 0; - - return kerningv.x; -} - -static hb_position_t -hb_ft_get_glyph_v_kerning (hb_font_t *font HB_UNUSED, - void *font_data HB_UNUSED, - hb_codepoint_t top_glyph HB_UNUSED, - hb_codepoint_t bottom_glyph HB_UNUSED, - void *user_data HB_UNUSED) -{ - /* FreeType API doesn't support vertical kerning */ - return 0; -} - -static hb_bool_t -hb_ft_get_glyph_extents (hb_font_t *font HB_UNUSED, - void *font_data, - hb_codepoint_t glyph, - hb_glyph_extents_t *extents, - void *user_data HB_UNUSED) -{ - FT_Face ft_face = (FT_Face) font_data; - int load_flags = FT_LOAD_DEFAULT; - - if (unlikely (FT_Load_Glyph (ft_face, glyph, load_flags))) - return false; - - extents->x_bearing = ft_face->glyph->metrics.horiBearingX; - extents->y_bearing = ft_face->glyph->metrics.horiBearingY; - extents->width = ft_face->glyph->metrics.width; - extents->height = -ft_face->glyph->metrics.height; - return true; -} - -static hb_bool_t -hb_ft_get_glyph_contour_point (hb_font_t *font HB_UNUSED, - void *font_data, - hb_codepoint_t glyph, - unsigned int point_index, - hb_position_t *x, - hb_position_t *y, - void *user_data HB_UNUSED) -{ - FT_Face ft_face = (FT_Face) font_data; - int load_flags = FT_LOAD_DEFAULT; - - if (unlikely (FT_Load_Glyph (ft_face, glyph, load_flags))) - return false; - - if (unlikely (ft_face->glyph->format != FT_GLYPH_FORMAT_OUTLINE)) - return false; - - if (unlikely (point_index >= (unsigned int) ft_face->glyph->outline.n_points)) - return false; - - *x = ft_face->glyph->outline.points[point_index].x; - *y = ft_face->glyph->outline.points[point_index].y; - - return true; -} - -static hb_bool_t -hb_ft_get_glyph_name (hb_font_t *font HB_UNUSED, - void *font_data, - hb_codepoint_t glyph, - char *name, unsigned int size, - void *user_data HB_UNUSED) -{ - FT_Face ft_face = (FT_Face) font_data; - - hb_bool_t ret = !FT_Get_Glyph_Name (ft_face, glyph, name, size); - if (ret && (size && !*name)) - ret = false; - - return ret; -} - -static hb_bool_t -hb_ft_get_glyph_from_name (hb_font_t *font HB_UNUSED, - void *font_data, - const char *name, int len, /* -1 means nul-terminated */ - hb_codepoint_t *glyph, - void *user_data HB_UNUSED) -{ - FT_Face ft_face = (FT_Face) font_data; - - if (len < 0) - *glyph = FT_Get_Name_Index (ft_face, (FT_String *) name); - else { - /* Make a nul-terminated version. */ - char buf[128]; - len = MIN (len, (int) sizeof (buf) - 1); - strncpy (buf, name, len); - buf[len] = '\0'; - *glyph = FT_Get_Name_Index (ft_face, buf); - } - - return *glyph != 0; -} - - -static hb_font_funcs_t * -_hb_ft_get_font_funcs (void) -{ - static const hb_font_funcs_t ft_ffuncs = { - HB_OBJECT_HEADER_STATIC, - - true, /* immutable */ - - { -#define HB_FONT_FUNC_IMPLEMENT(name) hb_ft_get_##name, - HB_FONT_FUNCS_IMPLEMENT_CALLBACKS -#undef HB_FONT_FUNC_IMPLEMENT - } - }; - - return const_cast<hb_font_funcs_t *> (&ft_ffuncs); -} - - -static hb_blob_t * -reference_table (hb_face_t *face HB_UNUSED, hb_tag_t tag, void *user_data) -{ - FT_Face ft_face = (FT_Face) user_data; - FT_Byte *buffer; - FT_ULong length = 0; - FT_Error error; - - /* Note: FreeType like HarfBuzz uses the NONE tag for fetching the entire blob */ - - error = FT_Load_Sfnt_Table (ft_face, tag, 0, NULL, &length); - if (error) - return NULL; - - buffer = (FT_Byte *) malloc (length); - if (buffer == NULL) - return NULL; - - error = FT_Load_Sfnt_Table (ft_face, tag, 0, buffer, &length); - if (error) - return NULL; - - return hb_blob_create ((const char *) buffer, length, - HB_MEMORY_MODE_WRITABLE, - buffer, free); -} - - -hb_face_t * -hb_ft_face_create (FT_Face ft_face, - hb_destroy_func_t destroy) -{ - hb_face_t *face; - - if (ft_face->stream->read == NULL) { - hb_blob_t *blob; - - blob = hb_blob_create ((const char *) ft_face->stream->base, - (unsigned int) ft_face->stream->size, - /* TODO: We assume that it's mmap()'ed, but FreeType code - * suggests that there are cases we reach here but font is - * not mmapped. For example, when mmap() fails. No idea - * how to deal with it better here. */ - HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE, - ft_face, destroy); - face = hb_face_create (blob, ft_face->face_index); - hb_blob_destroy (blob); - } else { - face = hb_face_create_for_tables (reference_table, ft_face, destroy); - } - - hb_face_set_index (face, ft_face->face_index); - hb_face_set_upem (face, ft_face->units_per_EM); - - return face; -} - -static void -hb_ft_face_finalize (FT_Face ft_face) -{ - hb_face_destroy ((hb_face_t *) ft_face->generic.data); -} - -hb_face_t * -hb_ft_face_create_cached (FT_Face ft_face) -{ - if (unlikely (!ft_face->generic.data || ft_face->generic.finalizer != (FT_Generic_Finalizer) hb_ft_face_finalize)) - { - if (ft_face->generic.finalizer) - ft_face->generic.finalizer (ft_face); - - ft_face->generic.data = hb_ft_face_create (ft_face, NULL); - ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize; - } - - return hb_face_reference ((hb_face_t *) ft_face->generic.data); -} - -static void -_do_nothing (void) -{ -} - - -hb_font_t * -hb_ft_font_create (FT_Face ft_face, - hb_destroy_func_t destroy) -{ - hb_font_t *font; - hb_face_t *face; - - face = hb_ft_face_create (ft_face, destroy); - font = hb_font_create (face); - hb_face_destroy (face); - hb_font_set_funcs (font, - _hb_ft_get_font_funcs (), - ft_face, (hb_destroy_func_t) _do_nothing); - hb_font_set_scale (font, - ((uint64_t) ft_face->size->metrics.x_scale * (uint64_t) ft_face->units_per_EM) >> 16, - ((uint64_t) ft_face->size->metrics.y_scale * (uint64_t) ft_face->units_per_EM) >> 16); - hb_font_set_ppem (font, - ft_face->size->metrics.x_ppem, - ft_face->size->metrics.y_ppem); - - return font; -} - - -/* Thread-safe, lock-free, FT_Library */ - -static FT_Library ft_library; - -static inline -void free_ft_library (void) -{ - FT_Done_FreeType (ft_library); -} - -static FT_Library -get_ft_library (void) -{ -retry: - FT_Library library = (FT_Library) hb_atomic_ptr_get (&ft_library); - - if (unlikely (!library)) - { - /* Not found; allocate one. */ - if (FT_Init_FreeType (&library)) - return NULL; - - if (!hb_atomic_ptr_cmpexch (&ft_library, NULL, library)) { - FT_Done_FreeType (library); - goto retry; - } - -#ifdef HAVE_ATEXIT - atexit (free_ft_library); /* First person registers atexit() callback. */ -#endif - } - - return library; -} - -static void -_release_blob (FT_Face ft_face) -{ - hb_blob_destroy ((hb_blob_t *) ft_face->generic.data); -} - -void -hb_ft_font_set_funcs (hb_font_t *font) -{ - hb_blob_t *blob = hb_face_reference_blob (font->face); - unsigned int blob_length; - const char *blob_data = hb_blob_get_data (blob, &blob_length); - if (unlikely (!blob_length)) - DEBUG_MSG (FT, font, "Font face has empty blob"); - - FT_Face ft_face = NULL; - FT_Error err = FT_New_Memory_Face (get_ft_library (), - (const FT_Byte *) blob_data, - blob_length, - hb_face_get_index (font->face), - &ft_face); - - if (unlikely (err)) { - hb_blob_destroy (blob); - DEBUG_MSG (FT, font, "Font face FT_New_Memory_Face() failed"); - return; - } - - FT_Select_Charmap (ft_face, FT_ENCODING_UNICODE); - - assert (font->y_scale >= 0); - FT_Set_Char_Size (ft_face, - font->x_scale, font->y_scale, - 0, 0); -#if 0 - font->x_ppem * 72 * 64 / font->x_scale, - font->y_ppem * 72 * 64 / font->y_scale); -#endif - - ft_face->generic.data = blob; - ft_face->generic.finalizer = (FT_Generic_Finalizer) _release_blob; - - hb_font_set_funcs (font, - _hb_ft_get_font_funcs (), - ft_face, - (hb_destroy_func_t) FT_Done_Face); -} - -FT_Face -hb_ft_font_get_face (hb_font_t *font) -{ - if (font->destroy == (hb_destroy_func_t) FT_Done_Face || - font->destroy == (hb_destroy_func_t) _do_nothing) - return (FT_Face) font->user_data; - - return NULL; -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ft.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ft.h deleted file mode 100644 index 696251e143f..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ft.h +++ /dev/null @@ -1,62 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - */ - -#ifndef HB_FT_H -#define HB_FT_H - -#include "hb.h" - -#include <ft2build.h> -#include FT_FREETYPE_H - -HB_BEGIN_DECLS - -/* Note: FreeType is not thread-safe. Hence, these functions are not either. */ - -hb_face_t * -hb_ft_face_create (FT_Face ft_face, - hb_destroy_func_t destroy); - -hb_face_t * -hb_ft_face_create_cached (FT_Face ft_face); - -hb_font_t * -hb_ft_font_create (FT_Face ft_face, - hb_destroy_func_t destroy); - - - -/* Makes an hb_font_t use FreeType internally to implement font functions. */ -void -hb_ft_font_set_funcs (hb_font_t *font); - -FT_Face -hb_ft_font_get_face (hb_font_t *font); - - -HB_END_DECLS - -#endif /* HB_FT_H */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-glib.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-glib.cc deleted file mode 100644 index 676e6601628..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-glib.cc +++ /dev/null @@ -1,384 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * Copyright © 2011 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-private.hh" - -#include "hb-glib.h" - -#include "hb-unicode-private.hh" - - -#if !GLIB_CHECK_VERSION(2,29,14) -static const hb_script_t -glib_script_to_script[] = -{ - HB_SCRIPT_COMMON, - HB_SCRIPT_INHERITED, - HB_SCRIPT_ARABIC, - HB_SCRIPT_ARMENIAN, - HB_SCRIPT_BENGALI, - HB_SCRIPT_BOPOMOFO, - HB_SCRIPT_CHEROKEE, - HB_SCRIPT_COPTIC, - HB_SCRIPT_CYRILLIC, - HB_SCRIPT_DESERET, - HB_SCRIPT_DEVANAGARI, - HB_SCRIPT_ETHIOPIC, - HB_SCRIPT_GEORGIAN, - HB_SCRIPT_GOTHIC, - HB_SCRIPT_GREEK, - HB_SCRIPT_GUJARATI, - HB_SCRIPT_GURMUKHI, - HB_SCRIPT_HAN, - HB_SCRIPT_HANGUL, - HB_SCRIPT_HEBREW, - HB_SCRIPT_HIRAGANA, - HB_SCRIPT_KANNADA, - HB_SCRIPT_KATAKANA, - HB_SCRIPT_KHMER, - HB_SCRIPT_LAO, - HB_SCRIPT_LATIN, - HB_SCRIPT_MALAYALAM, - HB_SCRIPT_MONGOLIAN, - HB_SCRIPT_MYANMAR, - HB_SCRIPT_OGHAM, - HB_SCRIPT_OLD_ITALIC, - HB_SCRIPT_ORIYA, - HB_SCRIPT_RUNIC, - HB_SCRIPT_SINHALA, - HB_SCRIPT_SYRIAC, - HB_SCRIPT_TAMIL, - HB_SCRIPT_TELUGU, - HB_SCRIPT_THAANA, - HB_SCRIPT_THAI, - HB_SCRIPT_TIBETAN, - HB_SCRIPT_CANADIAN_ABORIGINAL, - HB_SCRIPT_YI, - HB_SCRIPT_TAGALOG, - HB_SCRIPT_HANUNOO, - HB_SCRIPT_BUHID, - HB_SCRIPT_TAGBANWA, - - /* Unicode-4.0 additions */ - HB_SCRIPT_BRAILLE, - HB_SCRIPT_CYPRIOT, - HB_SCRIPT_LIMBU, - HB_SCRIPT_OSMANYA, - HB_SCRIPT_SHAVIAN, - HB_SCRIPT_LINEAR_B, - HB_SCRIPT_TAI_LE, - HB_SCRIPT_UGARITIC, - - /* Unicode-4.1 additions */ - HB_SCRIPT_NEW_TAI_LUE, - HB_SCRIPT_BUGINESE, - HB_SCRIPT_GLAGOLITIC, - HB_SCRIPT_TIFINAGH, - HB_SCRIPT_SYLOTI_NAGRI, - HB_SCRIPT_OLD_PERSIAN, - HB_SCRIPT_KHAROSHTHI, - - /* Unicode-5.0 additions */ - HB_SCRIPT_UNKNOWN, - HB_SCRIPT_BALINESE, - HB_SCRIPT_CUNEIFORM, - HB_SCRIPT_PHOENICIAN, - HB_SCRIPT_PHAGS_PA, - HB_SCRIPT_NKO, - - /* Unicode-5.1 additions */ - HB_SCRIPT_KAYAH_LI, - HB_SCRIPT_LEPCHA, - HB_SCRIPT_REJANG, - HB_SCRIPT_SUNDANESE, - HB_SCRIPT_SAURASHTRA, - HB_SCRIPT_CHAM, - HB_SCRIPT_OL_CHIKI, - HB_SCRIPT_VAI, - HB_SCRIPT_CARIAN, - HB_SCRIPT_LYCIAN, - HB_SCRIPT_LYDIAN, - - /* Unicode-5.2 additions */ - HB_SCRIPT_AVESTAN, - HB_SCRIPT_BAMUM, - HB_SCRIPT_EGYPTIAN_HIEROGLYPHS, - HB_SCRIPT_IMPERIAL_ARAMAIC, - HB_SCRIPT_INSCRIPTIONAL_PAHLAVI, - HB_SCRIPT_INSCRIPTIONAL_PARTHIAN, - HB_SCRIPT_JAVANESE, - HB_SCRIPT_KAITHI, - HB_SCRIPT_TAI_THAM, - HB_SCRIPT_LISU, - HB_SCRIPT_MEETEI_MAYEK, - HB_SCRIPT_OLD_SOUTH_ARABIAN, - HB_SCRIPT_OLD_TURKIC, - HB_SCRIPT_SAMARITAN, - HB_SCRIPT_TAI_VIET, - - /* Unicode-6.0 additions */ - HB_SCRIPT_BATAK, - HB_SCRIPT_BRAHMI, - HB_SCRIPT_MANDAIC, - - /* Unicode-6.1 additions */ - HB_SCRIPT_CHAKMA, - HB_SCRIPT_MEROITIC_CURSIVE, - HB_SCRIPT_MEROITIC_HIEROGLYPHS, - HB_SCRIPT_MIAO, - HB_SCRIPT_SHARADA, - HB_SCRIPT_SORA_SOMPENG, - HB_SCRIPT_TAKRI -}; -#endif - -hb_script_t -hb_glib_script_to_script (GUnicodeScript script) -{ -#if GLIB_CHECK_VERSION(2,29,14) - return (hb_script_t) g_unicode_script_to_iso15924 (script); -#else - if (likely ((unsigned int) script < ARRAY_LENGTH (glib_script_to_script))) - return glib_script_to_script[script]; - - if (unlikely (script == G_UNICODE_SCRIPT_INVALID_CODE)) - return HB_SCRIPT_INVALID; - - return HB_SCRIPT_UNKNOWN; -#endif -} - -GUnicodeScript -hb_glib_script_from_script (hb_script_t script) -{ -#if GLIB_CHECK_VERSION(2,29,14) - return g_unicode_script_from_iso15924 (script); -#else - unsigned int count = ARRAY_LENGTH (glib_script_to_script); - for (unsigned int i = 0; i < count; i++) - if (glib_script_to_script[i] == script) - return (GUnicodeScript) i; - - if (unlikely (script == HB_SCRIPT_INVALID)) - return G_UNICODE_SCRIPT_INVALID_CODE; - - return G_UNICODE_SCRIPT_UNKNOWN; -#endif -} - - -static hb_unicode_combining_class_t -hb_glib_unicode_combining_class (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t unicode, - void *user_data HB_UNUSED) - -{ - return (hb_unicode_combining_class_t) g_unichar_combining_class (unicode); -} - -static unsigned int -hb_glib_unicode_eastasian_width (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t unicode, - void *user_data HB_UNUSED) -{ - return g_unichar_iswide (unicode) ? 2 : 1; -} - -static hb_unicode_general_category_t -hb_glib_unicode_general_category (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t unicode, - void *user_data HB_UNUSED) - -{ - /* hb_unicode_general_category_t and GUnicodeType are identical */ - return (hb_unicode_general_category_t) g_unichar_type (unicode); -} - -static hb_codepoint_t -hb_glib_unicode_mirroring (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t unicode, - void *user_data HB_UNUSED) -{ - g_unichar_get_mirror_char (unicode, &unicode); - return unicode; -} - -static hb_script_t -hb_glib_unicode_script (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t unicode, - void *user_data HB_UNUSED) -{ - return hb_glib_script_to_script (g_unichar_get_script (unicode)); -} - -static hb_bool_t -hb_glib_unicode_compose (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t a, - hb_codepoint_t b, - hb_codepoint_t *ab, - void *user_data HB_UNUSED) -{ -#if GLIB_CHECK_VERSION(2,29,12) - return g_unichar_compose (a, b, ab); -#endif - - /* We don't ifdef-out the fallback code such that compiler always - * sees it and makes sure it's compilable. */ - - gchar utf8[12]; - gchar *normalized; - int len; - hb_bool_t ret; - - len = g_unichar_to_utf8 (a, utf8); - len += g_unichar_to_utf8 (b, utf8 + len); - normalized = g_utf8_normalize (utf8, len, G_NORMALIZE_NFC); - len = g_utf8_strlen (normalized, -1); - if (unlikely (!len)) - return false; - - if (len == 1) { - *ab = g_utf8_get_char (normalized); - ret = true; - } else { - ret = false; - } - - g_free (normalized); - return ret; -} - -static hb_bool_t -hb_glib_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t ab, - hb_codepoint_t *a, - hb_codepoint_t *b, - void *user_data HB_UNUSED) -{ -#if GLIB_CHECK_VERSION(2,29,12) - return g_unichar_decompose (ab, a, b); -#endif - - /* We don't ifdef-out the fallback code such that compiler always - * sees it and makes sure it's compilable. */ - - gchar utf8[6]; - gchar *normalized; - int len; - hb_bool_t ret; - - len = g_unichar_to_utf8 (ab, utf8); - normalized = g_utf8_normalize (utf8, len, G_NORMALIZE_NFD); - len = g_utf8_strlen (normalized, -1); - if (unlikely (!len)) - return false; - - if (len == 1) { - *a = g_utf8_get_char (normalized); - *b = 0; - ret = *a != ab; - } else if (len == 2) { - *a = g_utf8_get_char (normalized); - *b = g_utf8_get_char (g_utf8_next_char (normalized)); - /* Here's the ugly part: if ab decomposes to a single character and - * that character decomposes again, we have to detect that and undo - * the second part :-(. */ - gchar *recomposed = g_utf8_normalize (normalized, -1, G_NORMALIZE_NFC); - hb_codepoint_t c = g_utf8_get_char (recomposed); - if (c != ab && c != *a) { - *a = c; - *b = 0; - } - g_free (recomposed); - ret = true; - } else { - /* If decomposed to more than two characters, take the last one, - * and recompose the rest to get the first component. */ - gchar *end = g_utf8_offset_to_pointer (normalized, len - 1); - gchar *recomposed; - *b = g_utf8_get_char (end); - recomposed = g_utf8_normalize (normalized, end - normalized, G_NORMALIZE_NFC); - /* We expect that recomposed has exactly one character now. */ - *a = g_utf8_get_char (recomposed); - g_free (recomposed); - ret = true; - } - - g_free (normalized); - return ret; -} - -static unsigned int -hb_glib_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t u, - hb_codepoint_t *decomposed, - void *user_data HB_UNUSED) -{ -#if GLIB_CHECK_VERSION(2,29,12) - return g_unichar_fully_decompose (u, TRUE, decomposed, HB_UNICODE_MAX_DECOMPOSITION_LEN); -#endif - - /* If the user doesn't have GLib >= 2.29.12 we have to perform - * a round trip to UTF-8 and the associated memory management dance. */ - gchar utf8[6]; - gchar *utf8_decomposed, *c; - gsize utf8_len, utf8_decomposed_len, i; - - /* Convert @u to UTF-8 and normalise it in NFKD mode. This performs the compatibility decomposition. */ - utf8_len = g_unichar_to_utf8 (u, utf8); - utf8_decomposed = g_utf8_normalize (utf8, utf8_len, G_NORMALIZE_NFKD); - utf8_decomposed_len = g_utf8_strlen (utf8_decomposed, -1); - - assert (utf8_decomposed_len <= HB_UNICODE_MAX_DECOMPOSITION_LEN); - - for (i = 0, c = utf8_decomposed; i < utf8_decomposed_len; i++, c = g_utf8_next_char (c)) - *decomposed++ = g_utf8_get_char (c); - - g_free (utf8_decomposed); - - return utf8_decomposed_len; -} - -hb_unicode_funcs_t * -hb_glib_get_unicode_funcs (void) -{ - static const hb_unicode_funcs_t _hb_glib_unicode_funcs = { - HB_OBJECT_HEADER_STATIC, - - NULL, /* parent */ - true, /* immutable */ - { -#define HB_UNICODE_FUNC_IMPLEMENT(name) hb_glib_unicode_##name, - HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS -#undef HB_UNICODE_FUNC_IMPLEMENT - } - }; - - return const_cast<hb_unicode_funcs_t *> (&_hb_glib_unicode_funcs); -} - diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-glib.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-glib.h deleted file mode 100644 index 63a9d3366c5..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-glib.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * Copyright © 2011 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_GLIB_H -#define HB_GLIB_H - -#include "hb.h" - -#include <glib.h> - -HB_BEGIN_DECLS - - -hb_script_t -hb_glib_script_to_script (GUnicodeScript script); - -GUnicodeScript -hb_glib_script_from_script (hb_script_t script); - - -hb_unicode_funcs_t * -hb_glib_get_unicode_funcs (void); - - -HB_END_DECLS - -#endif /* HB_GLIB_H */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-gobject-enums.cc.tmpl b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-gobject-enums.cc.tmpl deleted file mode 100644 index 05abd898d4f..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-gobject-enums.cc.tmpl +++ /dev/null @@ -1,74 +0,0 @@ -/*** BEGIN file-header ***/ -/* - * Copyright © 2011 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-private.hh" - -/* g++ didn't like older gtype.h gcc-only code path. */ -#include <glib.h> -#if !GLIB_CHECK_VERSION(2,29,16) -#undef __GNUC__ -#undef __GNUC_MINOR__ -#define __GNUC__ 2 -#define __GNUC_MINOR__ 6 -#endif - -#include "hb-gobject.h" - -/*** END file-header ***/ - -/*** BEGIN file-production ***/ -/* enumerations from "@filename@" */ -/*** END file-production ***/ - -/*** BEGIN value-header ***/ -inline static /* TODO(behdad) disable these for now until we fix them... */ -GType -@enum_name@_get_type (void) -{ - static volatile gsize g_define_type_id__volatile = 0; - - if (g_once_init_enter (&g_define_type_id__volatile)) - { - static const G@Type@Value values[] = { -/*** END value-header ***/ - -/*** BEGIN value-production ***/ - { @VALUENAME@, "@VALUENAME@", "@valuenick@" }, -/*** END value-production ***/ - -/*** BEGIN value-tail ***/ - { 0, NULL, NULL } - }; - GType g_define_type_id = - g_@type@_register_static (g_intern_static_string ("@EnumName@"), values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); - } - - return g_define_type_id__volatile; -} - -/*** END value-tail ***/ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-gobject-structs.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-gobject-structs.cc deleted file mode 100644 index cec48542275..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-gobject-structs.cc +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright © 2011 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-private.hh" - -/* g++ didn't like older gtype.h gcc-only code path. */ -#include <glib.h> -#if !GLIB_CHECK_VERSION(2,29,16) -#undef __GNUC__ -#undef __GNUC_MINOR__ -#define __GNUC__ 2 -#define __GNUC_MINOR__ 6 -#endif - -#include "hb-gobject.h" - -#define _HB_DEFINE_BOXED_TYPE(Name,underscore_name,copy_func,free_func) \ -GType \ -underscore_name##_get_type (void) \ -{ \ - static volatile gsize type = 0; \ - if (g_once_init_enter (&type)) { \ - GType t = g_boxed_type_register_static (g_intern_static_string (#Name), \ - (GBoxedCopyFunc) copy_func, \ - (GBoxedFreeFunc) free_func); \ - g_once_init_leave (&type, t); \ - } \ - return type; \ -} - -#define HB_DEFINE_BOXED_TYPE(name) \ - _HB_DEFINE_BOXED_TYPE (hb_##name, hb_gobject_##name, hb_##name##_reference, hb_##name##_destroy); - -HB_DEFINE_BOXED_TYPE (buffer) -HB_DEFINE_BOXED_TYPE (blob) -HB_DEFINE_BOXED_TYPE (face) -HB_DEFINE_BOXED_TYPE (font) -HB_DEFINE_BOXED_TYPE (font_funcs) -HB_DEFINE_BOXED_TYPE (unicode_funcs) - diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-gobject.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-gobject.h deleted file mode 100644 index 4f23fdd385d..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-gobject.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright © 2011 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_GOBJECT_H -#define HB_GOBJECT_H - -#include "hb.h" - -#include <glib-object.h> - -HB_BEGIN_DECLS - - -/* Objects */ - -#define HB_GOBJECT_TYPE_BLOB hb_gobject_blob_get_type () -GType -hb_gobject_blob_get_type (void); - -#define HB_GOBJECT_TYPE_BUFFER hb_gobject_buffer_get_type () -GType -hb_gobject_buffer_get_type (void); - -#define HB_GOBJECT_TYPE_FACE hb_gobject_face_get_type () -GType -hb_gobject_face_get_type (void); - -#define HB_GOBJECT_TYPE_FONT hb_gobject_font_get_type () -GType -hb_gobject_font_get_type (void); - -#define HB_GOBJECT_TYPE_FONT_FUNCS hb_gobject_font_funcs_get_type () -GType -hb_gobject_font_funcs_get_type (void); - -#define HB_GOBJECT_TYPE_UNICODE_FUNCS hb_gobject_unicode_funcs_get_type () -GType -hb_gobject_unicode_funcs_get_type (void); - - -/* Enums */ - - -HB_END_DECLS - -#endif /* HB_GOBJECT_H */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-graphite2.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-graphite2.cc deleted file mode 100644 index cce860694cc..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-graphite2.cc +++ /dev/null @@ -1,370 +0,0 @@ -/* - * Copyright © 2011 Martin Hosken - * Copyright © 2011 SIL International - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#define HB_SHAPER graphite2 -#define hb_graphite2_shaper_font_data_t gr_font -#include "hb-shaper-impl-private.hh" - -#include <graphite2/Font.h> -#include <graphite2/Segment.h> - -#include "hb-graphite2.h" - -#include "hb-ot-tag.h" - - -HB_SHAPER_DATA_ENSURE_DECLARE(graphite2, face) -HB_SHAPER_DATA_ENSURE_DECLARE(graphite2, font) - - -/* - * shaper face data - */ - -typedef struct hb_graphite2_tablelist_t { - struct hb_graphite2_tablelist_t *next; - hb_blob_t *blob; - unsigned int tag; -} hb_graphite2_tablelist_t; - -struct hb_graphite2_shaper_face_data_t { - hb_face_t *face; - gr_face *grface; - hb_graphite2_tablelist_t *tlist; -}; - -static const void *hb_graphite2_get_table (const void *data, unsigned int tag, size_t *len) -{ - hb_graphite2_shaper_face_data_t *face_data = (hb_graphite2_shaper_face_data_t *) data; - hb_graphite2_tablelist_t *tlist = face_data->tlist; - - hb_blob_t *blob = NULL; - - for (hb_graphite2_tablelist_t *p = tlist; p; p = p->next) - if (p->tag == tag) { - blob = p->blob; - break; - } - - if (unlikely (!blob)) - { - blob = face_data->face->reference_table (tag); - - hb_graphite2_tablelist_t *p = (hb_graphite2_tablelist_t *) calloc (1, sizeof (hb_graphite2_tablelist_t)); - if (unlikely (!p)) { - hb_blob_destroy (blob); - return NULL; - } - p->blob = blob; - p->tag = tag; - - /* TODO Not thread-safe, but fairly harmless. - * We can do the double-chcked pointer cmpexch thing here. */ - p->next = face_data->tlist; - face_data->tlist = p; - } - - unsigned int tlen; - const char *d = hb_blob_get_data (blob, &tlen); - *len = tlen; - return d; -} - -hb_graphite2_shaper_face_data_t * -_hb_graphite2_shaper_face_data_create (hb_face_t *face) -{ - hb_blob_t *silf_blob = face->reference_table (HB_GRAPHITE2_TAG_SILF); - /* Umm, we just reference the table to check whether it exists. - * Maybe add better API for this? */ - if (!hb_blob_get_length (silf_blob)) - { - hb_blob_destroy (silf_blob); - return NULL; - } - hb_blob_destroy (silf_blob); - - hb_graphite2_shaper_face_data_t *data = (hb_graphite2_shaper_face_data_t *) calloc (1, sizeof (hb_graphite2_shaper_face_data_t)); - if (unlikely (!data)) - hb_blob_destroy (silf_blob); - - data->face = face; - data->grface = gr_make_face (data, &hb_graphite2_get_table, gr_face_preloadAll); - - if (unlikely (!data->grface)) { - free (data); - return NULL; - } - - return data; -} - -void -_hb_graphite2_shaper_face_data_destroy (hb_graphite2_shaper_face_data_t *data) -{ - hb_graphite2_tablelist_t *tlist = data->tlist; - - while (tlist) - { - hb_graphite2_tablelist_t *old = tlist; - hb_blob_destroy (tlist->blob); - tlist = tlist->next; - free (old); - } - - gr_face_destroy (data->grface); - - free (data); -} - -gr_face * -hb_graphite2_face_get_gr_face (hb_face_t *face) -{ - if (unlikely (!hb_graphite2_shaper_face_data_ensure (face))) return NULL; - return HB_SHAPER_DATA_GET (face)->grface; -} - - -/* - * shaper font data - */ - -static float hb_graphite2_get_advance (const void *hb_font, unsigned short gid) -{ - return ((hb_font_t *) hb_font)->get_glyph_h_advance (gid); -} - -hb_graphite2_shaper_font_data_t * -_hb_graphite2_shaper_font_data_create (hb_font_t *font) -{ - if (unlikely (!hb_graphite2_shaper_face_data_ensure (font->face))) return NULL; - - hb_face_t *face = font->face; - hb_graphite2_shaper_face_data_t *face_data = HB_SHAPER_DATA_GET (face); - - return gr_make_font_with_advance_fn (font->x_scale, font, &hb_graphite2_get_advance, face_data->grface); -} - -void -_hb_graphite2_shaper_font_data_destroy (hb_graphite2_shaper_font_data_t *data) -{ - gr_font_destroy (data); -} - -gr_font * -hb_graphite2_font_get_gr_font (hb_font_t *font) -{ - if (unlikely (!hb_graphite2_shaper_font_data_ensure (font))) return NULL; - return HB_SHAPER_DATA_GET (font); -} - - -/* - * shaper shape_plan data - */ - -struct hb_graphite2_shaper_shape_plan_data_t {}; - -hb_graphite2_shaper_shape_plan_data_t * -_hb_graphite2_shaper_shape_plan_data_create (hb_shape_plan_t *shape_plan HB_UNUSED, - const hb_feature_t *user_features HB_UNUSED, - unsigned int num_user_features HB_UNUSED) -{ - return (hb_graphite2_shaper_shape_plan_data_t *) HB_SHAPER_DATA_SUCCEEDED; -} - -void -_hb_graphite2_shaper_shape_plan_data_destroy (hb_graphite2_shaper_shape_plan_data_t *data HB_UNUSED) -{ -} - - -/* - * shaper - */ - -struct hb_graphite2_cluster_t { - unsigned int base_char; - unsigned int num_chars; - unsigned int base_glyph; - unsigned int num_glyphs; -}; - -hb_bool_t -_hb_graphite2_shape (hb_shape_plan_t *shape_plan, - hb_font_t *font, - hb_buffer_t *buffer, - const hb_feature_t *features, - unsigned int num_features) -{ - hb_face_t *face = font->face; - gr_face *grface = HB_SHAPER_DATA_GET (face)->grface; - gr_font *grfont = HB_SHAPER_DATA_GET (font); - - const char *lang = hb_language_to_string (hb_buffer_get_language (buffer)); - const char *lang_end = lang ? strchr (lang, '-') : NULL; - int lang_len = lang_end ? lang_end - lang : -1; - gr_feature_val *feats = gr_face_featureval_for_lang (grface, lang ? hb_tag_from_string (lang, lang_len) : 0); - - while (num_features--) - { - const gr_feature_ref *fref = gr_face_find_fref (grface, features->tag); - if (fref) - gr_fref_set_feature_value (fref, features->value, feats); - features++; - } - - gr_segment *seg = NULL; - const gr_slot *is; - unsigned int ci = 0, ic = 0; - float curradvx = 0., curradvy = 0.; - - unsigned int scratch_size; - char *scratch = (char *) buffer->get_scratch_buffer (&scratch_size); - -#define ALLOCATE_ARRAY(Type, name, len) \ - Type *name = (Type *) scratch; \ - scratch += (len) * sizeof ((name)[0]); \ - scratch_size -= (len) * sizeof ((name)[0]); - - ALLOCATE_ARRAY (uint32_t, chars, buffer->len); - - for (unsigned int i = 0; i < buffer->len; ++i) - chars[i] = buffer->info[i].codepoint; - - hb_tag_t script_tag[2]; - hb_ot_tags_from_script (hb_buffer_get_script (buffer), &script_tag[0], &script_tag[1]); - - seg = gr_make_seg (grfont, grface, - script_tag[1] == HB_TAG_NONE ? script_tag[0] : script_tag[1], - feats, - gr_utf32, chars, buffer->len, - 2 | (hb_buffer_get_direction (buffer) == HB_DIRECTION_RTL ? 1 : 0)); - - if (unlikely (!seg)) { - if (feats) gr_featureval_destroy (feats); - return false; - } - - unsigned int glyph_count = gr_seg_n_slots (seg); - if (unlikely (!glyph_count)) { - if (feats) gr_featureval_destroy (feats); - gr_seg_destroy (seg); - return false; - } - - scratch = (char *) buffer->get_scratch_buffer (&scratch_size); - while ((sizeof (hb_graphite2_cluster_t) * buffer->len + - sizeof (hb_codepoint_t) * glyph_count) > scratch_size) - { - buffer->ensure (buffer->allocated * 2); - if (unlikely (buffer->in_error)) { - if (feats) gr_featureval_destroy (feats); - gr_seg_destroy (seg); - return false; - } - scratch = (char *) buffer->get_scratch_buffer (&scratch_size); - } - - ALLOCATE_ARRAY (hb_graphite2_cluster_t, clusters, buffer->len); - ALLOCATE_ARRAY (hb_codepoint_t, gids, glyph_count); - - memset (clusters, 0, sizeof (clusters[0]) * buffer->len); - - hb_codepoint_t *pg = gids; - for (is = gr_seg_first_slot (seg), ic = 0; is; is = gr_slot_next_in_segment (is), ic++) - { - unsigned int before = gr_slot_before (is); - unsigned int after = gr_slot_after (is); - *pg = gr_slot_gid (is); - pg++; - while (clusters[ci].base_char > before && ci) - { - clusters[ci-1].num_chars += clusters[ci].num_chars; - clusters[ci-1].num_glyphs += clusters[ci].num_glyphs; - ci--; - } - - if (gr_slot_can_insert_before (is) && clusters[ci].num_chars && before >= clusters[ci].base_char + clusters[ci].num_chars) - { - hb_graphite2_cluster_t *c = clusters + ci + 1; - c->base_char = clusters[ci].base_char + clusters[ci].num_chars; - c->num_chars = before - c->base_char; - c->base_glyph = ic; - c->num_glyphs = 0; - ci++; - } - clusters[ci].num_glyphs++; - - if (clusters[ci].base_char + clusters[ci].num_chars < after + 1) - clusters[ci].num_chars = after + 1 - clusters[ci].base_char; - } - ci++; - - //buffer->clear_output (); - for (unsigned int i = 0; i < ci; ++i) - { - for (unsigned int j = 0; j < clusters[i].num_glyphs; ++j) - { - hb_glyph_info_t *info = &buffer->info[clusters[i].base_glyph + j]; - info->codepoint = gids[clusters[i].base_glyph + j]; - info->cluster = gr_cinfo_base(gr_seg_cinfo(seg, clusters[i].base_char)); - } - } - buffer->len = glyph_count; - //buffer->swap_buffers (); - - if (HB_DIRECTION_IS_BACKWARD(buffer->props.direction)) - curradvx = gr_seg_advance_X(seg); - - hb_glyph_position_t *pPos; - for (pPos = hb_buffer_get_glyph_positions (buffer, NULL), is = gr_seg_first_slot (seg); - is; pPos++, is = gr_slot_next_in_segment (is)) - { - pPos->x_offset = gr_slot_origin_X (is) - curradvx; - pPos->y_offset = gr_slot_origin_Y (is) - curradvy; - pPos->x_advance = gr_slot_advance_X (is, grface, grfont); - pPos->y_advance = gr_slot_advance_Y (is, grface, grfont); - if (HB_DIRECTION_IS_BACKWARD (buffer->props.direction)) - curradvx -= pPos->x_advance; - pPos->x_offset = gr_slot_origin_X (is) - curradvx; - if (!HB_DIRECTION_IS_BACKWARD (buffer->props.direction)) - curradvx += pPos->x_advance; - pPos->y_offset = gr_slot_origin_Y (is) - curradvy; - curradvy += pPos->y_advance; - } - if (!HB_DIRECTION_IS_BACKWARD (buffer->props.direction)) - pPos[-1].x_advance += gr_seg_advance_X(seg) - curradvx; - - if (HB_DIRECTION_IS_BACKWARD (buffer->props.direction)) - hb_buffer_reverse_clusters (buffer); - - if (feats) gr_featureval_destroy (feats); - gr_seg_destroy (seg); - - return true; -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-graphite2.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-graphite2.h deleted file mode 100644 index bea68f939b4..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-graphite2.h +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) 2011 Martin Hosken - * Copyright (C) 2011 SIL International - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - */ - -#ifndef HB_GRAPHITE2_H -#define HB_GRAPHITE2_H - -#include "hb.h" - -HB_BEGIN_DECLS - - -#define HB_GRAPHITE2_TAG_SILF HB_TAG('S','i','l','f') - - -gr_face * -hb_graphite2_face_get_gr_face (hb_face_t *face); - -gr_font * -hb_graphite2_font_get_gr_font (hb_font_t *font); - - -HB_END_DECLS - -#endif /* HB_GRAPHITE2_H */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-icu-le.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-icu-le.cc deleted file mode 100644 index c05d330b957..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-icu-le.cc +++ /dev/null @@ -1,215 +0,0 @@ -/* - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#define HB_SHAPER icu_le -#define hb_icu_le_shaper_font_data_t PortableFontInstance -#include "hb-shaper-impl-private.hh" - -#include "hb-icu-le/PortableFontInstance.h" - -#include "layout/loengine.h" -#include "unicode/unistr.h" - -#include "hb-icu.h" - - -/* - * shaper face data - */ - -struct hb_icu_le_shaper_face_data_t {}; - -hb_icu_le_shaper_face_data_t * -_hb_icu_le_shaper_face_data_create (hb_face_t *face HB_UNUSED) -{ - return (hb_icu_le_shaper_face_data_t *) HB_SHAPER_DATA_SUCCEEDED; -} - -void -_hb_icu_le_shaper_face_data_destroy (hb_icu_le_shaper_face_data_t *data HB_UNUSED) -{ -} - - -/* - * shaper font data - */ - -hb_icu_le_shaper_font_data_t * -_hb_icu_le_shaper_font_data_create (hb_font_t *font) -{ - LEErrorCode status = LE_NO_ERROR; - hb_icu_le_shaper_font_data_t *data = new PortableFontInstance (font->face, - font->x_scale, - font->y_scale, - status); - if (status != LE_NO_ERROR) { - delete (data); - return NULL; - } - - return data; -} - -void -_hb_icu_le_shaper_font_data_destroy (hb_icu_le_shaper_font_data_t *data) -{ - delete (data); -} - - -/* - * shaper shape_plan data - */ - -struct hb_icu_le_shaper_shape_plan_data_t {}; - -hb_icu_le_shaper_shape_plan_data_t * -_hb_icu_le_shaper_shape_plan_data_create (hb_shape_plan_t *shape_plan HB_UNUSED, - const hb_feature_t *user_features, - unsigned int num_user_features) -{ - return (hb_icu_le_shaper_shape_plan_data_t *) HB_SHAPER_DATA_SUCCEEDED; -} - -void -_hb_icu_le_shaper_shape_plan_data_destroy (hb_icu_le_shaper_shape_plan_data_t *data) -{ -} - - -/* - * shaper - */ - -hb_bool_t -_hb_icu_le_shape (hb_shape_plan_t *shape_plan, - hb_font_t *font, - hb_buffer_t *buffer, - const hb_feature_t *features, - unsigned int num_features) -{ - LEFontInstance *font_instance = HB_SHAPER_DATA_GET (font); - le_int32 script_code = hb_icu_script_from_script (shape_plan->props.script); - le_int32 language_code = -1 /* TODO */; - le_int32 typography_flags = 3; /* Needed for ligatures and kerning */ - LEErrorCode status = LE_NO_ERROR; - le_engine *le = le_create ((const le_font *) font_instance, - script_code, - language_code, - typography_flags, - &status); - if (status != LE_NO_ERROR) - { le_close (le); return false; } - -retry: - - unsigned int scratch_size; - char *scratch = (char *) buffer->get_scratch_buffer (&scratch_size); - -#define ALLOCATE_ARRAY(Type, name, len) \ - Type *name = (Type *) scratch; \ - scratch += (len) * sizeof ((name)[0]); \ - scratch_size -= (len) * sizeof ((name)[0]); - - ALLOCATE_ARRAY (LEUnicode, chars, buffer->len); - ALLOCATE_ARRAY (unsigned int, clusters, buffer->len); - - /* XXX Use UTF-16 decoder! */ - for (unsigned int i = 0; i < buffer->len; i++) { - chars[i] = buffer->info[i].codepoint; - clusters[i] = buffer->info[i].cluster; - } - - unsigned int glyph_count = le_layoutChars (le, - chars, - 0, - buffer->len, - buffer->len, - HB_DIRECTION_IS_BACKWARD (buffer->props.direction), - 0., 0., - &status); - if (status != LE_NO_ERROR) - { le_close (le); return false; } - - unsigned int num_glyphs = scratch_size / (sizeof (LEGlyphID) + - sizeof (le_int32) + - sizeof (float) * 2); - - if (unlikely (glyph_count >= num_glyphs || glyph_count > buffer->allocated)) { - buffer->ensure (buffer->allocated * 2); - if (buffer->in_error) - { le_close (le); return false; } - goto retry; - } - - ALLOCATE_ARRAY (LEGlyphID, glyphs, glyph_count); - ALLOCATE_ARRAY (le_int32, indices, glyph_count); - ALLOCATE_ARRAY (float, positions, glyph_count * 2 + 2); - - le_getGlyphs (le, glyphs, &status); - le_getCharIndices (le, indices, &status); - le_getGlyphPositions (le, positions, &status); - -#undef ALLOCATE_ARRAY - - /* Ok, we've got everything we need, now compose output buffer, - * very, *very*, carefully! */ - - unsigned int j = 0; - hb_glyph_info_t *info = buffer->info; - for (unsigned int i = 0; i < glyph_count; i++) - { - if (glyphs[i] >= 0xFFFE) - continue; - - info[j].codepoint = glyphs[i]; - info[j].cluster = clusters[indices[i]]; - - /* icu-le doesn't seem to have separate advance values. */ - info[j].mask = positions[2 * i + 2] - positions[2 * i]; - info[j].var1.u32 = 0; - info[j].var2.u32 = -positions[2 * i + 1]; - - j++; - } - buffer->len = j; - - buffer->clear_positions (); - - for (unsigned int i = 0; i < buffer->len; i++) { - hb_glyph_info_t *info = &buffer->info[i]; - hb_glyph_position_t *pos = &buffer->pos[i]; - - /* TODO vertical */ - pos->x_advance = info->mask; - pos->x_offset = info->var1.u32; - pos->y_offset = info->var2.u32; - } - - le_close (le); - return true; -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-icu.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-icu.cc deleted file mode 100644 index c177be2c4b2..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-icu.cc +++ /dev/null @@ -1,372 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * Copyright © 2009 Keith Stribley - * Copyright © 2011 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-private.hh" - -#include "hb-icu.h" - -#include "hb-unicode-private.hh" - -#include <unicode/uchar.h> -#include <unicode/unorm.h> -#include <unicode/ustring.h> -#include <unicode/uversion.h> - - -hb_script_t -hb_icu_script_to_script (UScriptCode script) -{ - if (unlikely (script == USCRIPT_INVALID_CODE)) - return HB_SCRIPT_INVALID; - - return hb_script_from_string (uscript_getShortName (script), -1); -} - -UScriptCode -hb_icu_script_from_script (hb_script_t script) -{ - if (unlikely (script == HB_SCRIPT_INVALID)) - return USCRIPT_INVALID_CODE; - - for (unsigned int i = 0; i < USCRIPT_CODE_LIMIT; i++) - if (unlikely (hb_icu_script_to_script ((UScriptCode) i) == script)) - return (UScriptCode) i; - - return USCRIPT_UNKNOWN; -} - - -static hb_unicode_combining_class_t -hb_icu_unicode_combining_class (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t unicode, - void *user_data HB_UNUSED) - -{ - return (hb_unicode_combining_class_t) u_getCombiningClass (unicode); -} - -static unsigned int -hb_icu_unicode_eastasian_width (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t unicode, - void *user_data HB_UNUSED) -{ - switch (u_getIntPropertyValue(unicode, UCHAR_EAST_ASIAN_WIDTH)) - { - case U_EA_WIDE: - case U_EA_FULLWIDTH: - return 2; - case U_EA_NEUTRAL: - case U_EA_AMBIGUOUS: - case U_EA_HALFWIDTH: - case U_EA_NARROW: - return 1; - } - return 1; -} - -static hb_unicode_general_category_t -hb_icu_unicode_general_category (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t unicode, - void *user_data HB_UNUSED) -{ - switch (u_getIntPropertyValue(unicode, UCHAR_GENERAL_CATEGORY)) - { - case U_UNASSIGNED: return HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED; - - case U_UPPERCASE_LETTER: return HB_UNICODE_GENERAL_CATEGORY_UPPERCASE_LETTER; - case U_LOWERCASE_LETTER: return HB_UNICODE_GENERAL_CATEGORY_LOWERCASE_LETTER; - case U_TITLECASE_LETTER: return HB_UNICODE_GENERAL_CATEGORY_TITLECASE_LETTER; - case U_MODIFIER_LETTER: return HB_UNICODE_GENERAL_CATEGORY_MODIFIER_LETTER; - case U_OTHER_LETTER: return HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER; - - case U_NON_SPACING_MARK: return HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK; - case U_ENCLOSING_MARK: return HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK; - case U_COMBINING_SPACING_MARK: return HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK; - - case U_DECIMAL_DIGIT_NUMBER: return HB_UNICODE_GENERAL_CATEGORY_DECIMAL_NUMBER; - case U_LETTER_NUMBER: return HB_UNICODE_GENERAL_CATEGORY_LETTER_NUMBER; - case U_OTHER_NUMBER: return HB_UNICODE_GENERAL_CATEGORY_OTHER_NUMBER; - - case U_SPACE_SEPARATOR: return HB_UNICODE_GENERAL_CATEGORY_SPACE_SEPARATOR; - case U_LINE_SEPARATOR: return HB_UNICODE_GENERAL_CATEGORY_LINE_SEPARATOR; - case U_PARAGRAPH_SEPARATOR: return HB_UNICODE_GENERAL_CATEGORY_PARAGRAPH_SEPARATOR; - - case U_CONTROL_CHAR: return HB_UNICODE_GENERAL_CATEGORY_CONTROL; - case U_FORMAT_CHAR: return HB_UNICODE_GENERAL_CATEGORY_FORMAT; - case U_PRIVATE_USE_CHAR: return HB_UNICODE_GENERAL_CATEGORY_PRIVATE_USE; - case U_SURROGATE: return HB_UNICODE_GENERAL_CATEGORY_SURROGATE; - - - case U_DASH_PUNCTUATION: return HB_UNICODE_GENERAL_CATEGORY_DASH_PUNCTUATION; - case U_START_PUNCTUATION: return HB_UNICODE_GENERAL_CATEGORY_OPEN_PUNCTUATION; - case U_END_PUNCTUATION: return HB_UNICODE_GENERAL_CATEGORY_CLOSE_PUNCTUATION; - case U_CONNECTOR_PUNCTUATION: return HB_UNICODE_GENERAL_CATEGORY_CONNECT_PUNCTUATION; - case U_OTHER_PUNCTUATION: return HB_UNICODE_GENERAL_CATEGORY_OTHER_PUNCTUATION; - - case U_MATH_SYMBOL: return HB_UNICODE_GENERAL_CATEGORY_MATH_SYMBOL; - case U_CURRENCY_SYMBOL: return HB_UNICODE_GENERAL_CATEGORY_CURRENCY_SYMBOL; - case U_MODIFIER_SYMBOL: return HB_UNICODE_GENERAL_CATEGORY_MODIFIER_SYMBOL; - case U_OTHER_SYMBOL: return HB_UNICODE_GENERAL_CATEGORY_OTHER_SYMBOL; - - case U_INITIAL_PUNCTUATION: return HB_UNICODE_GENERAL_CATEGORY_INITIAL_PUNCTUATION; - case U_FINAL_PUNCTUATION: return HB_UNICODE_GENERAL_CATEGORY_FINAL_PUNCTUATION; - } - - return HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED; -} - -static hb_codepoint_t -hb_icu_unicode_mirroring (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t unicode, - void *user_data HB_UNUSED) -{ - return u_charMirror(unicode); -} - -static hb_script_t -hb_icu_unicode_script (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t unicode, - void *user_data HB_UNUSED) -{ - UErrorCode status = U_ZERO_ERROR; - UScriptCode scriptCode = uscript_getScript(unicode, &status); - - if (unlikely (U_FAILURE (status))) - return HB_SCRIPT_UNKNOWN; - - return hb_icu_script_to_script (scriptCode); -} - -#if U_ICU_VERSION_MAJOR_NUM >= 49 -static const UNormalizer2 *normalizer; -#endif - -static hb_bool_t -hb_icu_unicode_compose (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t a, - hb_codepoint_t b, - hb_codepoint_t *ab, - void *user_data HB_UNUSED) -{ -#if U_ICU_VERSION_MAJOR_NUM >= 49 - { - UChar32 ret = unorm2_composePair (normalizer, a, b); - if (ret < 0) return false; - *ab = ret; - return true; - } -#endif - - /* We don't ifdef-out the fallback code such that compiler always - * sees it and makes sure it's compilable. */ - - UChar utf16[4], normalized[5]; - unsigned int len; - hb_bool_t ret, err; - UErrorCode icu_err; - - len = 0; - err = false; - U16_APPEND (utf16, len, ARRAY_LENGTH (utf16), a, err); - if (err) return false; - U16_APPEND (utf16, len, ARRAY_LENGTH (utf16), b, err); - if (err) return false; - - icu_err = U_ZERO_ERROR; - len = unorm_normalize (utf16, len, UNORM_NFC, 0, normalized, ARRAY_LENGTH (normalized), &icu_err); - if (U_FAILURE (icu_err)) - return false; - if (u_countChar32 (normalized, len) == 1) { - U16_GET_UNSAFE (normalized, 0, *ab); - ret = true; - } else { - ret = false; - } - - return ret; -} - -static hb_bool_t -hb_icu_unicode_decompose (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t ab, - hb_codepoint_t *a, - hb_codepoint_t *b, - void *user_data HB_UNUSED) -{ -#if U_ICU_VERSION_MAJOR_NUM >= 49 - { - UChar decomposed[4]; - int len; - UErrorCode icu_err = U_ZERO_ERROR; - len = unorm2_getRawDecomposition (normalizer, ab, decomposed, - ARRAY_LENGTH (decomposed), &icu_err); - if (U_FAILURE (icu_err) || len < 0) return false; - - len = u_countChar32 (decomposed, len); - if (len == 1) { - U16_GET_UNSAFE (decomposed, 0, *a); - *b = 0; - return *a != ab; - } else if (len == 2) { - len =0; - U16_NEXT_UNSAFE (decomposed, len, *a); - U16_NEXT_UNSAFE (decomposed, len, *b); - } - return true; - } -#endif - - /* We don't ifdef-out the fallback code such that compiler always - * sees it and makes sure it's compilable. */ - - UChar utf16[2], normalized[2 * HB_UNICODE_MAX_DECOMPOSITION_LEN + 1]; - unsigned int len; - hb_bool_t ret, err; - UErrorCode icu_err; - - /* This function is a monster! Maybe it wasn't a good idea adding a - * pairwise decompose API... */ - /* Watchout for the dragons. Err, watchout for macros changing len. */ - - len = 0; - err = false; - U16_APPEND (utf16, len, ARRAY_LENGTH (utf16), ab, err); - if (err) return false; - - icu_err = U_ZERO_ERROR; - len = unorm_normalize (utf16, len, UNORM_NFD, 0, normalized, ARRAY_LENGTH (normalized), &icu_err); - if (U_FAILURE (icu_err)) - return false; - - len = u_countChar32 (normalized, len); - - if (len == 1) { - U16_GET_UNSAFE (normalized, 0, *a); - *b = 0; - ret = *a != ab; - } else if (len == 2) { - len =0; - U16_NEXT_UNSAFE (normalized, len, *a); - U16_NEXT_UNSAFE (normalized, len, *b); - - /* Here's the ugly part: if ab decomposes to a single character and - * that character decomposes again, we have to detect that and undo - * the second part :-(. */ - UChar recomposed[20]; - icu_err = U_ZERO_ERROR; - unorm_normalize (normalized, len, UNORM_NFC, 0, recomposed, ARRAY_LENGTH (recomposed), &icu_err); - if (U_FAILURE (icu_err)) - return false; - hb_codepoint_t c; - U16_GET_UNSAFE (recomposed, 0, c); - if (c != *a && c != ab) { - *a = c; - *b = 0; - } - ret = true; - } else { - /* If decomposed to more than two characters, take the last one, - * and recompose the rest to get the first component. */ - U16_PREV_UNSAFE (normalized, len, *b); /* Changes len in-place. */ - UChar recomposed[18 * 2]; - icu_err = U_ZERO_ERROR; - len = unorm_normalize (normalized, len, UNORM_NFC, 0, recomposed, ARRAY_LENGTH (recomposed), &icu_err); - if (U_FAILURE (icu_err)) - return false; - /* We expect that recomposed has exactly one character now. */ - if (unlikely (u_countChar32 (recomposed, len) != 1)) - return false; - U16_GET_UNSAFE (recomposed, 0, *a); - ret = true; - } - - return ret; -} - -static unsigned int -hb_icu_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t u, - hb_codepoint_t *decomposed, - void *user_data HB_UNUSED) -{ - UChar utf16[2], normalized[2 * HB_UNICODE_MAX_DECOMPOSITION_LEN + 1]; - unsigned int len; - int32_t utf32_len; - hb_bool_t err; - UErrorCode icu_err; - - /* Copy @u into a UTF-16 array to be passed to ICU. */ - len = 0; - err = FALSE; - U16_APPEND (utf16, len, ARRAY_LENGTH (utf16), u, err); - if (err) - return 0; - - /* Normalise the codepoint using NFKD mode. */ - icu_err = U_ZERO_ERROR; - len = unorm_normalize (utf16, len, UNORM_NFKD, 0, normalized, ARRAY_LENGTH (normalized), &icu_err); - if (icu_err) - return 0; - - /* Convert the decomposed form from UTF-16 to UTF-32. */ - icu_err = U_ZERO_ERROR; - u_strToUTF32 ((UChar32*) decomposed, HB_UNICODE_MAX_DECOMPOSITION_LEN, &utf32_len, normalized, len, &icu_err); - if (icu_err) - return 0; - - return utf32_len; -} - - -hb_unicode_funcs_t * -hb_icu_get_unicode_funcs (void) -{ - static const hb_unicode_funcs_t _hb_icu_unicode_funcs = { - HB_OBJECT_HEADER_STATIC, - - NULL, /* parent */ - true, /* immutable */ - { -#define HB_UNICODE_FUNC_IMPLEMENT(name) hb_icu_unicode_##name, - HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS -#undef HB_UNICODE_FUNC_IMPLEMENT - } - }; - -#if U_ICU_VERSION_MAJOR_NUM >= 49 - if (!hb_atomic_ptr_get (&normalizer)) { - UErrorCode icu_err = U_ZERO_ERROR; - /* We ignore failure in getNFCInstace(). */ - hb_atomic_ptr_cmpexch (&normalizer, NULL, unorm2_getNFCInstance (&icu_err)); - } -#endif - return const_cast<hb_unicode_funcs_t *> (&_hb_icu_unicode_funcs); -} - - diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-icu.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-icu.h deleted file mode 100644 index f2f35f0f2ce..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-icu.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * Copyright © 2011 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_ICU_H -#define HB_ICU_H - -#include "hb.h" - -#include <unicode/uscript.h> - -HB_BEGIN_DECLS - - -hb_script_t -hb_icu_script_to_script (UScriptCode script); - -UScriptCode -hb_icu_script_from_script (hb_script_t script); - - -hb_unicode_funcs_t * -hb_icu_get_unicode_funcs (void); - - -HB_END_DECLS - -#endif /* HB_ICU_H */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-mutex-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-mutex-private.hh deleted file mode 100644 index 0fb21c2e86e..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-mutex-private.hh +++ /dev/null @@ -1,130 +0,0 @@ -/* - * Copyright © 2007 Chris Wilson - * Copyright © 2009,2010 Red Hat, Inc. - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Contributor(s): - * Chris Wilson <chris@chris-wilson.co.uk> - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_MUTEX_PRIVATE_HH -#define HB_MUTEX_PRIVATE_HH - -#include "hb-private.hh" - - -/* mutex */ - -/* We need external help for these */ - -#if 0 - - -#elif !defined(HB_NO_MT) && (defined(_WIN32) || defined(__CYGWIN__)) - -#define WIN32_LEAN_AND_MEAN -#include <windows.h> -typedef CRITICAL_SECTION hb_mutex_impl_t; -#define HB_MUTEX_IMPL_INIT { NULL, 0, 0, NULL, NULL, 0 } -#define hb_mutex_impl_init(M) InitializeCriticalSection (M) -#define hb_mutex_impl_lock(M) EnterCriticalSection (M) -#define hb_mutex_impl_unlock(M) LeaveCriticalSection (M) -#define hb_mutex_impl_finish(M) DeleteCriticalSection (M) - - -#elif !defined(HB_NO_MT) && (defined(HAVE_PTHREAD) || defined(__APPLE__)) - -#include <pthread.h> -typedef pthread_mutex_t hb_mutex_impl_t; -#define HB_MUTEX_IMPL_INIT PTHREAD_MUTEX_INITIALIZER -#define hb_mutex_impl_init(M) pthread_mutex_init (M, NULL) -#define hb_mutex_impl_lock(M) pthread_mutex_lock (M) -#define hb_mutex_impl_unlock(M) pthread_mutex_unlock (M) -#define hb_mutex_impl_finish(M) pthread_mutex_destroy (M) - - -#elif !defined(HB_NO_MT) && defined(HAVE_INTEL_ATOMIC_PRIMITIVES) - -#if defined(HAVE_SCHED_H) && defined(HAVE_SCHED_YIELD) -# include <sched.h> -# define HB_SCHED_YIELD() sched_yield () -#else -# define HB_SCHED_YIELD() HB_STMT_START {} HB_STMT_END -#endif - -/* This actually is not a totally awful implementation. */ -typedef volatile int hb_mutex_impl_t; -#define HB_MUTEX_IMPL_INIT 0 -#define hb_mutex_impl_init(M) *(M) = 0 -#define hb_mutex_impl_lock(M) HB_STMT_START { while (__sync_lock_test_and_set((M), 1)) HB_SCHED_YIELD (); } HB_STMT_END -#define hb_mutex_impl_unlock(M) __sync_lock_release (M) -#define hb_mutex_impl_finish(M) HB_STMT_START {} HB_STMT_END - - -#elif !defined(HB_NO_MT) - -#if defined(HAVE_SCHED_H) && defined(HAVE_SCHED_YIELD) -# include <sched.h> -# define HB_SCHED_YIELD() sched_yield () -#else -# define HB_SCHED_YIELD() HB_STMT_START {} HB_STMT_END -#endif - -#define HB_MUTEX_INT_NIL 1 /* Warn that fallback implementation is in use. */ -typedef volatile int hb_mutex_impl_t; -#define HB_MUTEX_IMPL_INIT 0 -#define hb_mutex_impl_init(M) *(M) = 0 -#define hb_mutex_impl_lock(M) HB_STMT_START { while (*(M)) HB_SCHED_YIELD (); (*(M))++; } HB_STMT_END -#define hb_mutex_impl_unlock(M) (*(M))--; -#define hb_mutex_impl_finish(M) HB_STMT_START {} HB_STMT_END - - -#else /* HB_NO_MT */ - -typedef int hb_mutex_impl_t; -#define HB_MUTEX_IMPL_INIT 0 -#define hb_mutex_impl_init(M) HB_STMT_START {} HB_STMT_END -#define hb_mutex_impl_lock(M) HB_STMT_START {} HB_STMT_END -#define hb_mutex_impl_unlock(M) HB_STMT_START {} HB_STMT_END -#define hb_mutex_impl_finish(M) HB_STMT_START {} HB_STMT_END - -#endif - - -#define HB_MUTEX_INIT {HB_MUTEX_IMPL_INIT} -struct hb_mutex_t -{ - /* TODO Add tracing. */ - - hb_mutex_impl_t m; - - inline void init (void) { hb_mutex_impl_init (&m); } - inline void lock (void) { hb_mutex_impl_lock (&m); } - inline void unlock (void) { hb_mutex_impl_unlock (&m); } - inline void finish (void) { hb_mutex_impl_finish (&m); } -}; - - -#endif /* HB_MUTEX_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-object-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-object-private.hh deleted file mode 100644 index 8a9ae34dbee..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-object-private.hh +++ /dev/null @@ -1,227 +0,0 @@ -/* - * Copyright © 2007 Chris Wilson - * Copyright © 2009,2010 Red Hat, Inc. - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Contributor(s): - * Chris Wilson <chris@chris-wilson.co.uk> - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OBJECT_PRIVATE_HH -#define HB_OBJECT_PRIVATE_HH - -#include "hb-private.hh" - -#include "hb-atomic-private.hh" -#include "hb-mutex-private.hh" - - -/* Debug */ - -#ifndef HB_DEBUG_OBJECT -#define HB_DEBUG_OBJECT (HB_DEBUG+0) -#endif - - -/* reference_count */ - -#define HB_REFERENCE_COUNT_INVALID_VALUE ((hb_atomic_int_t) -1) -#define HB_REFERENCE_COUNT_INVALID {HB_REFERENCE_COUNT_INVALID_VALUE} -struct hb_reference_count_t -{ - hb_atomic_int_t ref_count; - - inline void init (int v) { ref_count = v; } - inline int inc (void) { return hb_atomic_int_add (const_cast<hb_atomic_int_t &> (ref_count), 1); } - inline int dec (void) { return hb_atomic_int_add (const_cast<hb_atomic_int_t &> (ref_count), -1); } - inline void finish (void) { ref_count = HB_REFERENCE_COUNT_INVALID_VALUE; } - - inline bool is_invalid (void) const { return ref_count == HB_REFERENCE_COUNT_INVALID_VALUE; } - -}; - - -/* user_data */ - -#define HB_USER_DATA_ARRAY_INIT {HB_MUTEX_INIT, HB_LOCKABLE_SET_INIT} -struct hb_user_data_array_t -{ - /* TODO Add tracing. */ - - struct hb_user_data_item_t { - hb_user_data_key_t *key; - void *data; - hb_destroy_func_t destroy; - - inline bool operator == (hb_user_data_key_t *other_key) const { return key == other_key; } - inline bool operator == (hb_user_data_item_t &other) const { return key == other.key; } - - void finish (void) { if (destroy) destroy (data); } - }; - - hb_mutex_t lock; - hb_lockable_set_t<hb_user_data_item_t, hb_mutex_t> items; - - inline void init (void) { lock.init (); items.init (); } - - HB_INTERNAL bool set (hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy, - hb_bool_t replace); - - HB_INTERNAL void *get (hb_user_data_key_t *key); - - inline void finish (void) { items.finish (lock); lock.finish (); } -}; - - -/* object_header */ - -struct hb_object_header_t -{ - hb_reference_count_t ref_count; - hb_user_data_array_t user_data; - -#define HB_OBJECT_HEADER_STATIC {HB_REFERENCE_COUNT_INVALID, HB_USER_DATA_ARRAY_INIT} - - static inline void *create (unsigned int size) { - hb_object_header_t *obj = (hb_object_header_t *) calloc (1, size); - - if (likely (obj)) - obj->init (); - - return obj; - } - - inline void init (void) { - ref_count.init (1); - user_data.init (); - } - - inline bool is_inert (void) const { - return unlikely (ref_count.is_invalid ()); - } - - inline void reference (void) { - if (unlikely (!this || this->is_inert ())) - return; - ref_count.inc (); - } - - inline bool destroy (void) { - if (unlikely (!this || this->is_inert ())) - return false; - if (ref_count.dec () != 1) - return false; - - ref_count.finish (); /* Do this before user_data */ - user_data.finish (); - - return true; - } - - inline bool set_user_data (hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy_func, - hb_bool_t replace) { - if (unlikely (!this || this->is_inert ())) - return false; - - return user_data.set (key, data, destroy_func, replace); - } - - inline void *get_user_data (hb_user_data_key_t *key) { - if (unlikely (!this || this->is_inert ())) - return NULL; - - return user_data.get (key); - } - - inline void trace (const char *function) const { - if (unlikely (!this)) return; - /* TODO We cannot use DEBUG_MSG_FUNC here since that one currently only - * prints the class name and throws away the template info. */ - DEBUG_MSG (OBJECT, (void *) this, - "%s refcount=%d", - function, - this ? ref_count.ref_count : 0); - } - - private: - ASSERT_POD (); -}; - - -/* object */ - -template <typename Type> -static inline void hb_object_trace (const Type *obj, const char *function) -{ - obj->header.trace (function); -} -template <typename Type> -static inline Type *hb_object_create (void) -{ - Type *obj = (Type *) hb_object_header_t::create (sizeof (Type)); - hb_object_trace (obj, HB_FUNC); - return obj; -} -template <typename Type> -static inline bool hb_object_is_inert (const Type *obj) -{ - return unlikely (obj->header.is_inert ()); -} -template <typename Type> -static inline Type *hb_object_reference (Type *obj) -{ - hb_object_trace (obj, HB_FUNC); - obj->header.reference (); - return obj; -} -template <typename Type> -static inline bool hb_object_destroy (Type *obj) -{ - hb_object_trace (obj, HB_FUNC); - return obj->header.destroy (); -} -template <typename Type> -static inline bool hb_object_set_user_data (Type *obj, - hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy, - hb_bool_t replace) -{ - return obj->header.set_user_data (key, data, destroy, replace); -} - -template <typename Type> -static inline void *hb_object_get_user_data (Type *obj, - hb_user_data_key_t *key) -{ - return obj->header.get_user_data (key); -} - - -#endif /* HB_OBJECT_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-old.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-old.cc deleted file mode 100644 index a7ea8ed9bbe..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-old.cc +++ /dev/null @@ -1,410 +0,0 @@ -/* - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#define HB_SHAPER old -#define hb_old_shaper_face_data_t HB_FaceRec_ -#define hb_old_shaper_font_data_t HB_Font_ -#include "hb-shaper-impl-private.hh" - -#include <harfbuzz.h> - - -#ifndef HB_DEBUG_OLD -#define HB_DEBUG_OLD (HB_DEBUG+0) -#endif - - -static HB_Script -hb_old_script_from_script (hb_script_t script) -{ - switch ((hb_tag_t) script) - { - default: - case HB_SCRIPT_COMMON: return HB_Script_Common; - case HB_SCRIPT_GREEK: return HB_Script_Greek; - case HB_SCRIPT_CYRILLIC: return HB_Script_Cyrillic; - case HB_SCRIPT_ARMENIAN: return HB_Script_Armenian; - case HB_SCRIPT_HEBREW: return HB_Script_Hebrew; - case HB_SCRIPT_ARABIC: return HB_Script_Arabic; - case HB_SCRIPT_SYRIAC: return HB_Script_Syriac; - case HB_SCRIPT_THAANA: return HB_Script_Thaana; - case HB_SCRIPT_DEVANAGARI: return HB_Script_Devanagari; - case HB_SCRIPT_BENGALI: return HB_Script_Bengali; - case HB_SCRIPT_GURMUKHI: return HB_Script_Gurmukhi; - case HB_SCRIPT_GUJARATI: return HB_Script_Gujarati; - case HB_SCRIPT_ORIYA: return HB_Script_Oriya; - case HB_SCRIPT_TAMIL: return HB_Script_Tamil; - case HB_SCRIPT_TELUGU: return HB_Script_Telugu; - case HB_SCRIPT_KANNADA: return HB_Script_Kannada; - case HB_SCRIPT_MALAYALAM: return HB_Script_Malayalam; - case HB_SCRIPT_SINHALA: return HB_Script_Sinhala; - case HB_SCRIPT_THAI: return HB_Script_Thai; - case HB_SCRIPT_LAO: return HB_Script_Lao; - case HB_SCRIPT_TIBETAN: return HB_Script_Tibetan; - case HB_SCRIPT_MYANMAR: return HB_Script_Myanmar; - case HB_SCRIPT_GEORGIAN: return HB_Script_Georgian; - case HB_SCRIPT_HANGUL: return HB_Script_Hangul; - case HB_SCRIPT_OGHAM: return HB_Script_Ogham; - case HB_SCRIPT_RUNIC: return HB_Script_Runic; - case HB_SCRIPT_KHMER: return HB_Script_Khmer; - case HB_SCRIPT_NKO: return HB_Script_Nko; - case HB_SCRIPT_INHERITED: return HB_Script_Inherited; - } -} - - -static HB_Bool -hb_old_convertStringToGlyphIndices (HB_Font old_font, - const HB_UChar16 *string, - hb_uint32 length, - HB_Glyph *glyphs, - hb_uint32 *numGlyphs, - HB_Bool rightToLeft) -{ - hb_font_t *font = (hb_font_t *) old_font->userData; - - for (unsigned int i = 0; i < length; i++) - { - hb_codepoint_t u; - - /* XXX Handle UTF-16. Ugh */ - u = string[i]; - - if (rightToLeft) - u = hb_unicode_funcs_get_default ()->mirroring (u); - - font->get_glyph (u, 0, &u); /* TODO Variation selectors */ - - glyphs[i] = u; - } - *numGlyphs = length; /* XXX */ - - return true; -} - -static void -hb_old_getGlyphAdvances (HB_Font old_font, - const HB_Glyph *glyphs, - hb_uint32 numGlyphs, - HB_Fixed *advances, - int flags /*HB_ShaperFlag*/ HB_UNUSED) -{ - hb_font_t *font = (hb_font_t *) old_font->userData; - - for (unsigned int i = 0; i < numGlyphs; i++) - advances[i] = font->get_glyph_h_advance (glyphs[i]); -} - -static HB_Bool -hb_old_canRender (HB_Font old_font, - const HB_UChar16 *string, - hb_uint32 length) -{ - return true; /* TODO */ -} - -static HB_Error -hb_old_getPointInOutline (HB_Font old_font, - HB_Glyph glyph, - int flags /*HB_ShaperFlag*/, - hb_uint32 point, - HB_Fixed *xpos, - HB_Fixed *ypos, - hb_uint32 *nPoints) -{ - return HB_Err_Ok; /* TODO */ -} - -static void -hb_old_getGlyphMetrics (HB_Font old_font, - HB_Glyph glyph, - HB_GlyphMetrics *metrics) -{ - hb_font_t *font = (hb_font_t *) old_font->userData; - - hb_glyph_extents_t extents; - - font->get_glyph_extents (glyph, &extents); - - metrics->x = extents.x_bearing; - metrics->y = extents.y_bearing; - metrics->width = extents.width; - metrics->height = extents.height; - metrics->xOffset = font->get_glyph_h_advance (glyph); - metrics->yOffset = 0; -} - -static HB_Fixed -hb_old_getFontMetric (HB_Font old_font, - HB_FontMetric metric) -{ - hb_font_t *font = (hb_font_t *) old_font->userData; - - switch (metric) - { - case HB_FontAscent: - return font->y_scale; /* XXX We don't have ascent data yet. */ - - default: - return 0; - } -} - -static const HB_FontClass hb_old_font_class = { - hb_old_convertStringToGlyphIndices, - hb_old_getGlyphAdvances, - hb_old_canRender, - hb_old_getPointInOutline, - hb_old_getGlyphMetrics, - hb_old_getFontMetric -}; - - - -static HB_Error -table_func (void *font, HB_Tag tag, HB_Byte *buffer, HB_UInt *length) -{ - hb_face_t *face = (hb_face_t *) font; - hb_blob_t *blob = face->reference_table ((hb_tag_t) tag); - unsigned int capacity = *length; - *length = hb_blob_get_length (blob); - memcpy (buffer, hb_blob_get_data (blob, NULL), MIN (capacity, *length)); - hb_blob_destroy (blob); - return HB_Err_Ok; -} - - -/* - * shaper face data - */ - -hb_old_shaper_face_data_t * -_hb_old_shaper_face_data_create (hb_face_t *face) -{ - return HB_NewFace (face, table_func); -} - -void -_hb_old_shaper_face_data_destroy (hb_old_shaper_face_data_t *data) -{ - HB_FreeFace (data); -} - - -/* - * shaper font data - */ - -hb_old_shaper_font_data_t * -_hb_old_shaper_font_data_create (hb_font_t *font) -{ - HB_FontRec *data = (HB_FontRec *) calloc (1, sizeof (HB_FontRec)); - if (unlikely (!data)) { - DEBUG_MSG (OLD, font, "malloc()ing HB_Font failed"); - return NULL; - } - - data->klass = &hb_old_font_class; - data->x_ppem = font->x_ppem; - data->y_ppem = font->y_ppem; - data->x_scale = font->x_scale; /* XXX */ - data->y_scale = font->y_scale; /* XXX */ - data->userData = font; - - return data; -} - -void -_hb_old_shaper_font_data_destroy (hb_old_shaper_font_data_t *data) -{ - free (data); -} - - -/* - * shaper shape_plan data - */ - -struct hb_old_shaper_shape_plan_data_t {}; - -hb_old_shaper_shape_plan_data_t * -_hb_old_shaper_shape_plan_data_create (hb_shape_plan_t *shape_plan HB_UNUSED, - const hb_feature_t *user_features HB_UNUSED, - unsigned int num_user_features HB_UNUSED) -{ - return (hb_old_shaper_shape_plan_data_t *) HB_SHAPER_DATA_SUCCEEDED; -} - -void -_hb_old_shaper_shape_plan_data_destroy (hb_old_shaper_shape_plan_data_t *data HB_UNUSED) -{ -} - - -/* - * shaper - */ - -hb_bool_t -_hb_old_shape (hb_shape_plan_t *shape_plan HB_UNUSED, - hb_font_t *font, - hb_buffer_t *buffer, - const hb_feature_t *features, - unsigned int num_features) -{ - hb_face_t *face = font->face; - HB_Face old_face = HB_SHAPER_DATA_GET (face); - HB_Font old_font = HB_SHAPER_DATA_GET (font); - - bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction); - -retry: - - unsigned int scratch_size; - char *scratch = (char *) buffer->get_scratch_buffer (&scratch_size); - -#define utf16_index() var1.u32 - HB_UChar16 *pchars = (HB_UChar16 *) scratch; - unsigned int chars_len = 0; - for (unsigned int i = 0; i < buffer->len; i++) { - hb_codepoint_t c = buffer->info[i].codepoint; - buffer->info[i].utf16_index() = chars_len; - if (likely (c < 0x10000)) - pchars[chars_len++] = c; - else if (unlikely (c >= 0x110000)) - pchars[chars_len++] = 0xFFFD; - else { - pchars[chars_len++] = 0xD800 + ((c - 0x10000) >> 10); - pchars[chars_len++] = 0xDC00 + ((c - 0x10000) & ((1 << 10) - 1)); - } - } - - -#define ALLOCATE_ARRAY(Type, name, len) \ - name = (Type *) scratch; \ - scratch += (len) * sizeof ((name)[0]); \ - scratch_size -= (len) * sizeof ((name)[0]); - - - HB_ShaperItem item = {0}; - - ALLOCATE_ARRAY (const HB_UChar16, item.string, chars_len); - ALLOCATE_ARRAY (unsigned short, item.log_clusters, chars_len + 2); - item.stringLength = chars_len; - item.item.pos = 0; - item.item.length = item.stringLength; - item.item.script = hb_old_script_from_script (buffer->props.script); - item.item.bidiLevel = backward ? 1 : 0; - - item.font = old_font; - item.face = old_face; - item.shaperFlags = 0; - - item.glyphIndicesPresent = false; - - /* TODO Alignment. */ - unsigned int num_glyphs = scratch_size / (sizeof (HB_Glyph) + - sizeof (HB_GlyphAttributes) + - sizeof (HB_Fixed) + - sizeof (HB_FixedPoint) + - sizeof (uint32_t)); - - item.num_glyphs = num_glyphs; - ALLOCATE_ARRAY (HB_Glyph, item.glyphs, num_glyphs); - ALLOCATE_ARRAY (HB_GlyphAttributes, item.attributes, num_glyphs); - ALLOCATE_ARRAY (HB_Fixed, item.advances, num_glyphs); - ALLOCATE_ARRAY (HB_FixedPoint, item.offsets, num_glyphs); - /* Apparently in some cases the offsets array will not be fully assigned to. - * Clear it. */ - memset (item.offsets, 0, num_glyphs * sizeof (item.offsets[0])); - uint32_t *vis_clusters; - ALLOCATE_ARRAY (uint32_t, vis_clusters, num_glyphs); - -#undef ALLOCATE_ARRAY - - if (!HB_ShapeItem (&item)) - { - if (unlikely (item.num_glyphs > num_glyphs)) - { - buffer->ensure (buffer->allocated * 2); - if (buffer->in_error) - return false; - goto retry; - } - return false; - } - num_glyphs = item.num_glyphs; - - /* Ok, we've got everything we need, now compose output buffer, - * very, *very*, carefully! */ - - /* Calculate visual-clusters. That's what we ship. */ - for (unsigned int i = 0; i < num_glyphs; i++) - vis_clusters[i] = -1; - for (unsigned int i = 0; i < buffer->len; i++) { - uint32_t *p = &vis_clusters[item.log_clusters[buffer->info[i].utf16_index()]]; - *p = MIN (*p, buffer->info[i].cluster); - } - for (unsigned int i = 1; i < num_glyphs; i++) - if (vis_clusters[i] == (uint32_t) -1) - vis_clusters[i] = vis_clusters[i - 1]; - -#undef utf16_index - - buffer->ensure (num_glyphs); - if (buffer->in_error) - return false; - - - buffer->len = num_glyphs; - hb_glyph_info_t *info = buffer->info; - for (unsigned int i = 0; i < num_glyphs; i++) - { - info[i].codepoint = item.glyphs[i]; - info[i].cluster = vis_clusters[i]; - - info[i].mask = item.advances[i]; - info[i].var1.u32 = item.offsets[i].x; - info[i].var2.u32 = item.offsets[i].y; - } - - buffer->clear_positions (); - - for (unsigned int i = 0; i < num_glyphs; ++i) { - hb_glyph_info_t *info = &buffer->info[i]; - hb_glyph_position_t *pos = &buffer->pos[i]; - - /* TODO vertical */ - pos->x_advance = info->mask; - pos->x_offset = info->var1.u32; - pos->y_offset = info->var2.u32; - } - - if (HB_DIRECTION_IS_BACKWARD (buffer->props.direction)) - buffer->reverse (); - - return true; -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-open-file-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-open-file-private.hh deleted file mode 100644 index 250504ae20b..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-open-file-private.hh +++ /dev/null @@ -1,261 +0,0 @@ -/* - * Copyright © 2007,2008,2009 Red Hat, Inc. - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OPEN_FILE_PRIVATE_HH -#define HB_OPEN_FILE_PRIVATE_HH - -#include "hb-open-type-private.hh" - - -namespace OT { - - -/* - * - * The OpenType Font File - * - */ - - -/* - * Organization of an OpenType Font - */ - -struct OpenTypeFontFile; -struct OffsetTable; -struct TTCHeader; - - -typedef struct TableRecord -{ - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this)); - } - - Tag tag; /* 4-byte identifier. */ - CheckSum checkSum; /* CheckSum for this table. */ - ULONG offset; /* Offset from beginning of TrueType font - * file. */ - ULONG length; /* Length of this table. */ - public: - DEFINE_SIZE_STATIC (16); -} OpenTypeTable; - -typedef struct OffsetTable -{ - friend struct OpenTypeFontFile; - - inline unsigned int get_table_count (void) const - { return numTables; } - inline const TableRecord& get_table (unsigned int i) const - { - if (unlikely (i >= numTables)) return Null(TableRecord); - return tables[i]; - } - inline bool find_table_index (hb_tag_t tag, unsigned int *table_index) const - { - Tag t; - t.set (tag); - unsigned int count = numTables; - for (unsigned int i = 0; i < count; i++) - { - if (t == tables[i].tag) - { - if (table_index) *table_index = i; - return true; - } - } - if (table_index) *table_index = Index::NOT_FOUND_INDEX; - return false; - } - inline const TableRecord& get_table_by_tag (hb_tag_t tag) const - { - unsigned int table_index; - find_table_index (tag, &table_index); - return get_table (table_index); - } - - public: - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this) && c->check_array (tables, TableRecord::static_size, numTables)); - } - - protected: - Tag sfnt_version; /* '\0\001\0\00' if TrueType / 'OTTO' if CFF */ - USHORT numTables; /* Number of tables. */ - USHORT searchRange; /* (Maximum power of 2 <= numTables) x 16 */ - USHORT entrySelector; /* Log2(maximum power of 2 <= numTables). */ - USHORT rangeShift; /* NumTables x 16-searchRange. */ - TableRecord tables[VAR]; /* TableRecord entries. numTables items */ - public: - DEFINE_SIZE_ARRAY (12, tables); -} OpenTypeFontFace; - - -/* - * TrueType Collections - */ - -struct TTCHeaderVersion1 -{ - friend struct TTCHeader; - - inline unsigned int get_face_count (void) const { return table.len; } - inline const OpenTypeFontFace& get_face (unsigned int i) const { return this+table[i]; } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (table.sanitize (c, this)); - } - - protected: - Tag ttcTag; /* TrueType Collection ID string: 'ttcf' */ - FixedVersion version; /* Version of the TTC Header (1.0), - * 0x00010000 */ - LongOffsetLongArrayOf<OffsetTable> - table; /* Array of offsets to the OffsetTable for each font - * from the beginning of the file */ - public: - DEFINE_SIZE_ARRAY (12, table); -}; - -struct TTCHeader -{ - friend struct OpenTypeFontFile; - - private: - - inline unsigned int get_face_count (void) const - { - switch (u.header.version.major) { - case 2: /* version 2 is compatible with version 1 */ - case 1: return u.version1.get_face_count (); - default:return 0; - } - } - inline const OpenTypeFontFace& get_face (unsigned int i) const - { - switch (u.header.version.major) { - case 2: /* version 2 is compatible with version 1 */ - case 1: return u.version1.get_face (i); - default:return Null(OpenTypeFontFace); - } - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (unlikely (!u.header.version.sanitize (c))) return TRACE_RETURN (false); - switch (u.header.version.major) { - case 2: /* version 2 is compatible with version 1 */ - case 1: return TRACE_RETURN (u.version1.sanitize (c)); - default:return TRACE_RETURN (true); - } - } - - protected: - union { - struct { - Tag ttcTag; /* TrueType Collection ID string: 'ttcf' */ - FixedVersion version; /* Version of the TTC Header (1.0 or 2.0), - * 0x00010000 or 0x00020000 */ - } header; - TTCHeaderVersion1 version1; - } u; -}; - - -/* - * OpenType Font File - */ - -struct OpenTypeFontFile -{ - static const hb_tag_t CFFTag = HB_TAG ('O','T','T','O'); /* OpenType with Postscript outlines */ - static const hb_tag_t TrueTypeTag = HB_TAG ( 0 , 1 , 0 , 0 ); /* OpenType with TrueType outlines */ - static const hb_tag_t TTCTag = HB_TAG ('t','t','c','f'); /* TrueType Collection */ - static const hb_tag_t TrueTag = HB_TAG ('t','r','u','e'); /* Obsolete Apple TrueType */ - static const hb_tag_t Typ1Tag = HB_TAG ('t','y','p','1'); /* Obsolete Apple Type1 font in SFNT container */ - - inline hb_tag_t get_tag (void) const { return u.tag; } - - inline unsigned int get_face_count (void) const - { - switch (u.tag) { - case CFFTag: /* All the non-collection tags */ - case TrueTag: - case Typ1Tag: - case TrueTypeTag: return 1; - case TTCTag: return u.ttcHeader.get_face_count (); - default: return 0; - } - } - inline const OpenTypeFontFace& get_face (unsigned int i) const - { - switch (u.tag) { - /* Note: for non-collection SFNT data we ignore index. This is because - * Apple dfont container is a container of SFNT's. So each SFNT is a - * non-TTC, but the index is more than zero. */ - case CFFTag: /* All the non-collection tags */ - case TrueTag: - case Typ1Tag: - case TrueTypeTag: return u.fontFace; - case TTCTag: return u.ttcHeader.get_face (i); - default: return Null(OpenTypeFontFace); - } - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (unlikely (!u.tag.sanitize (c))) return TRACE_RETURN (false); - switch (u.tag) { - case CFFTag: /* All the non-collection tags */ - case TrueTag: - case Typ1Tag: - case TrueTypeTag: return TRACE_RETURN (u.fontFace.sanitize (c)); - case TTCTag: return TRACE_RETURN (u.ttcHeader.sanitize (c)); - default: return TRACE_RETURN (true); - } - } - - protected: - union { - Tag tag; /* 4-byte identifier. */ - OpenTypeFontFace fontFace; - TTCHeader ttcHeader; - } u; - public: - DEFINE_SIZE_UNION (4, tag); -}; - - -} /* namespace OT */ - - -#endif /* HB_OPEN_FILE_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-open-type-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-open-type-private.hh deleted file mode 100644 index cd1163e4f78..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-open-type-private.hh +++ /dev/null @@ -1,974 +0,0 @@ -/* - * Copyright © 2007,2008,2009,2010 Red Hat, Inc. - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OPEN_TYPE_PRIVATE_HH -#define HB_OPEN_TYPE_PRIVATE_HH - -#include "hb-private.hh" - -#include "hb-blob.h" - - -namespace OT { - - - -/* - * Casts - */ - -/* Cast to struct T, reference to reference */ -template<typename Type, typename TObject> -inline const Type& CastR(const TObject &X) -{ return reinterpret_cast<const Type&> (X); } -template<typename Type, typename TObject> -inline Type& CastR(TObject &X) -{ return reinterpret_cast<Type&> (X); } - -/* Cast to struct T, pointer to pointer */ -template<typename Type, typename TObject> -inline const Type* CastP(const TObject *X) -{ return reinterpret_cast<const Type*> (X); } -template<typename Type, typename TObject> -inline Type* CastP(TObject *X) -{ return reinterpret_cast<Type*> (X); } - -/* StructAtOffset<T>(P,Ofs) returns the struct T& that is placed at memory - * location pointed to by P plus Ofs bytes. */ -template<typename Type> -inline const Type& StructAtOffset(const void *P, unsigned int offset) -{ return * reinterpret_cast<const Type*> ((const char *) P + offset); } -template<typename Type> -inline Type& StructAtOffset(void *P, unsigned int offset) -{ return * reinterpret_cast<Type*> ((char *) P + offset); } - -/* StructAfter<T>(X) returns the struct T& that is placed after X. - * Works with X of variable size also. X must implement get_size() */ -template<typename Type, typename TObject> -inline const Type& StructAfter(const TObject &X) -{ return StructAtOffset<Type>(&X, X.get_size()); } -template<typename Type, typename TObject> -inline Type& StructAfter(TObject &X) -{ return StructAtOffset<Type>(&X, X.get_size()); } - - - -/* - * Size checking - */ - -/* Check _assertion in a method environment */ -#define _DEFINE_INSTANCE_ASSERTION1(_line, _assertion) \ - inline void _instance_assertion_on_line_##_line (void) const \ - { \ - ASSERT_STATIC (_assertion); \ - ASSERT_INSTANCE_POD (*this); /* Make sure it's POD. */ \ - } -# define _DEFINE_INSTANCE_ASSERTION0(_line, _assertion) _DEFINE_INSTANCE_ASSERTION1 (_line, _assertion) -# define DEFINE_INSTANCE_ASSERTION(_assertion) _DEFINE_INSTANCE_ASSERTION0 (__LINE__, _assertion) - -/* Check that _code compiles in a method environment */ -#define _DEFINE_COMPILES_ASSERTION1(_line, _code) \ - inline void _compiles_assertion_on_line_##_line (void) const \ - { _code; } -# define _DEFINE_COMPILES_ASSERTION0(_line, _code) _DEFINE_COMPILES_ASSERTION1 (_line, _code) -# define DEFINE_COMPILES_ASSERTION(_code) _DEFINE_COMPILES_ASSERTION0 (__LINE__, _code) - - -#define DEFINE_SIZE_STATIC(size) \ - DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size)); \ - static const unsigned int static_size = (size); \ - static const unsigned int min_size = (size) - -/* Size signifying variable-sized array */ -#define VAR 1 - -#define DEFINE_SIZE_UNION(size, _member) \ - DEFINE_INSTANCE_ASSERTION (this->u._member.static_size == (size)); \ - static const unsigned int min_size = (size) - -#define DEFINE_SIZE_MIN(size) \ - DEFINE_INSTANCE_ASSERTION (sizeof (*this) >= (size)); \ - static const unsigned int min_size = (size) - -#define DEFINE_SIZE_ARRAY(size, array) \ - DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size) + sizeof (array[0])); \ - DEFINE_COMPILES_ASSERTION ((void) array[0].static_size) \ - static const unsigned int min_size = (size) - -#define DEFINE_SIZE_ARRAY2(size, array1, array2) \ - DEFINE_INSTANCE_ASSERTION (sizeof (*this) == (size) + sizeof (this->array1[0]) + sizeof (this->array2[0])); \ - DEFINE_COMPILES_ASSERTION ((void) array1[0].static_size; (void) array2[0].static_size) \ - static const unsigned int min_size = (size) - - - -/* - * Null objects - */ - -/* Global nul-content Null pool. Enlarge as necessary. */ -/* TODO This really should be a extern HB_INTERNAL and defined somewhere... */ -static const void *_NullPool[64 / sizeof (void *)]; - -/* Generic nul-content Null objects. */ -template <typename Type> -static inline const Type& Null (void) { - ASSERT_STATIC (sizeof (Type) <= sizeof (_NullPool)); - return *CastP<Type> (_NullPool); -} - -/* Specializaiton for arbitrary-content arbitrary-sized Null objects. */ -#define DEFINE_NULL_DATA(Type, data) \ -static const char _Null##Type[sizeof (Type) + 1] = data; /* +1 is for nul-termination in data */ \ -template <> \ -inline const Type& Null<Type> (void) { \ - return *CastP<Type> (_Null##Type); \ -} /* The following line really exists such that we end in a place needing semicolon */ \ -ASSERT_STATIC (Type::min_size + 1 <= sizeof (_Null##Type)) - -/* Accessor macro. */ -#define Null(Type) Null<Type>() - - - -/* - * Sanitize - */ - -#ifndef HB_DEBUG_SANITIZE -#define HB_DEBUG_SANITIZE (HB_DEBUG+0) -#endif - - -#define TRACE_SANITIZE(this) \ - hb_auto_trace_t<HB_DEBUG_SANITIZE, bool> trace \ - (&c->debug_depth, c->get_name (), this, HB_FUNC, \ - ""); - -/* This limits sanitizing time on really broken fonts. */ -#ifndef HB_SANITIZE_MAX_EDITS -#define HB_SANITIZE_MAX_EDITS 100 -#endif - -struct hb_sanitize_context_t -{ - inline const char *get_name (void) { return "SANITIZE"; } - static const unsigned int max_debug_depth = HB_DEBUG_SANITIZE; - typedef bool return_t; - template <typename T> - inline return_t dispatch (const T &obj) { return obj.sanitize (this); } - static return_t default_return_value (void) { return true; } - bool stop_sublookup_iteration (const return_t r HB_UNUSED) const { return false; } - - inline void init (hb_blob_t *b) - { - this->blob = hb_blob_reference (b); - this->writable = false; - } - - inline void start_processing (void) - { - this->start = hb_blob_get_data (this->blob, NULL); - this->end = this->start + hb_blob_get_length (this->blob); - this->edit_count = 0; - this->debug_depth = 0; - - DEBUG_MSG_LEVEL (SANITIZE, this->blob, 0, +1, - "start [%p..%p] (%lu bytes)", - this->start, this->end, - (unsigned long) (this->end - this->start)); - } - - inline void end_processing (void) - { - DEBUG_MSG_LEVEL (SANITIZE, this->blob, 0, -1, - "end [%p..%p] %u edit requests", - this->start, this->end, this->edit_count); - - hb_blob_destroy (this->blob); - this->blob = NULL; - this->start = this->end = NULL; - } - - inline bool check_range (const void *base, unsigned int len) const - { - const char *p = (const char *) base; - - hb_auto_trace_t<HB_DEBUG_SANITIZE, bool> trace - (&this->debug_depth, "SANITIZE", this->blob, NULL, - "check_range [%p..%p] (%d bytes) in [%p..%p]", - p, p + len, len, - this->start, this->end); - - return TRACE_RETURN (likely (this->start <= p && p <= this->end && (unsigned int) (this->end - p) >= len)); - } - - inline bool check_array (const void *base, unsigned int record_size, unsigned int len) const - { - const char *p = (const char *) base; - bool overflows = _hb_unsigned_int_mul_overflows (len, record_size); - - hb_auto_trace_t<HB_DEBUG_SANITIZE, bool> trace - (&this->debug_depth, "SANITIZE", this->blob, NULL, - "check_array [%p..%p] (%d*%d=%ld bytes) in [%p..%p]", - p, p + (record_size * len), record_size, len, (unsigned long) record_size * len, - this->start, this->end); - - return TRACE_RETURN (likely (!overflows && this->check_range (base, record_size * len))); - } - - template <typename Type> - inline bool check_struct (const Type *obj) const - { - return likely (this->check_range (obj, obj->min_size)); - } - - inline bool may_edit (const void *base HB_UNUSED, unsigned int len HB_UNUSED) - { - if (this->edit_count >= HB_SANITIZE_MAX_EDITS) - return false; - - const char *p = (const char *) base; - this->edit_count++; - - hb_auto_trace_t<HB_DEBUG_SANITIZE, bool> trace - (&this->debug_depth, "SANITIZE", this->blob, NULL, - "may_edit(%u) [%p..%p] (%d bytes) in [%p..%p] -> %s", - this->edit_count, - p, p + len, len, - this->start, this->end, - this->writable ? "GRANTED" : "DENIED"); - - return TRACE_RETURN (this->writable); - } - - mutable unsigned int debug_depth; - const char *start, *end; - bool writable; - unsigned int edit_count; - hb_blob_t *blob; -}; - - - -/* Template to sanitize an object. */ -template <typename Type> -struct Sanitizer -{ - static hb_blob_t *sanitize (hb_blob_t *blob) { - hb_sanitize_context_t c[1] = {{0}}; - bool sane; - - /* TODO is_sane() stuff */ - - c->init (blob); - - retry: - DEBUG_MSG_FUNC (SANITIZE, blob, "start"); - - c->start_processing (); - - if (unlikely (!c->start)) { - c->end_processing (); - return blob; - } - - Type *t = CastP<Type> (const_cast<char *> (c->start)); - - sane = t->sanitize (c); - if (sane) { - if (c->edit_count) { - DEBUG_MSG_FUNC (SANITIZE, blob, "passed first round with %d edits; going for second round", c->edit_count); - - /* sanitize again to ensure no toe-stepping */ - c->edit_count = 0; - sane = t->sanitize (c); - if (c->edit_count) { - DEBUG_MSG_FUNC (SANITIZE, blob, "requested %d edits in second round; FAILLING", c->edit_count); - sane = false; - } - } - } else { - unsigned int edit_count = c->edit_count; - if (edit_count && !c->writable) { - c->start = hb_blob_get_data_writable (blob, NULL); - c->end = c->start + hb_blob_get_length (blob); - - if (c->start) { - c->writable = true; - /* ok, we made it writable by relocating. try again */ - DEBUG_MSG_FUNC (SANITIZE, blob, "retry"); - goto retry; - } - } - } - - c->end_processing (); - - DEBUG_MSG_FUNC (SANITIZE, blob, sane ? "PASSED" : "FAILED"); - if (sane) - return blob; - else { - hb_blob_destroy (blob); - return hb_blob_get_empty (); - } - } - - static const Type* lock_instance (hb_blob_t *blob) { - hb_blob_make_immutable (blob); - const char *base = hb_blob_get_data (blob, NULL); - return unlikely (!base) ? &Null(Type) : CastP<Type> (base); - } -}; - - - -/* - * Serialize - */ - -#ifndef HB_DEBUG_SERIALIZE -#define HB_DEBUG_SERIALIZE (HB_DEBUG+0) -#endif - - -#define TRACE_SERIALIZE(this) \ - hb_auto_trace_t<HB_DEBUG_SERIALIZE, bool> trace \ - (&c->debug_depth, "SERIALIZE", c, HB_FUNC, \ - ""); - - -struct hb_serialize_context_t -{ - inline hb_serialize_context_t (void *start, unsigned int size) - { - this->start = (char *) start; - this->end = this->start + size; - - this->ran_out_of_room = false; - this->head = this->start; - this->debug_depth = 0; - } - - template <typename Type> - inline Type *start_serialize (void) - { - DEBUG_MSG_LEVEL (SERIALIZE, this->start, 0, +1, - "start [%p..%p] (%lu bytes)", - this->start, this->end, - (unsigned long) (this->end - this->start)); - - return start_embed<Type> (); - } - - inline void end_serialize (void) - { - DEBUG_MSG_LEVEL (SERIALIZE, this->start, 0, -1, - "end [%p..%p] serialized %d bytes; %s", - this->start, this->end, - (int) (this->head - this->start), - this->ran_out_of_room ? "RAN OUT OF ROOM" : "did not ran out of room"); - - } - - template <typename Type> - inline Type *copy (void) - { - assert (!this->ran_out_of_room); - unsigned int len = this->head - this->start; - void *p = malloc (len); - if (p) - memcpy (p, this->start, len); - return reinterpret_cast<Type *> (p); - } - - template <typename Type> - inline Type *allocate_size (unsigned int size) - { - if (unlikely (this->ran_out_of_room || this->end - this->head < ptrdiff_t (size))) { - this->ran_out_of_room = true; - return NULL; - } - memset (this->head, 0, size); - char *ret = this->head; - this->head += size; - return reinterpret_cast<Type *> (ret); - } - - template <typename Type> - inline Type *allocate_min (void) - { - return this->allocate_size<Type> (Type::min_size); - } - - template <typename Type> - inline Type *start_embed (void) - { - Type *ret = reinterpret_cast<Type *> (this->head); - return ret; - } - - template <typename Type> - inline Type *embed (const Type &obj) - { - unsigned int size = obj.get_size (); - Type *ret = this->allocate_size<Type> (size); - if (unlikely (!ret)) return NULL; - memcpy (ret, obj, size); - return ret; - } - - template <typename Type> - inline Type *extend_min (Type &obj) - { - unsigned int size = obj.min_size; - assert (this->start <= (char *) &obj && (char *) &obj <= this->head && (char *) &obj + size >= this->head); - if (unlikely (!this->allocate_size<Type> (((char *) &obj) + size - this->head))) return NULL; - return reinterpret_cast<Type *> (&obj); - } - - template <typename Type> - inline Type *extend (Type &obj) - { - unsigned int size = obj.get_size (); - assert (this->start < (char *) &obj && (char *) &obj <= this->head && (char *) &obj + size >= this->head); - if (unlikely (!this->allocate_size<Type> (((char *) &obj) + size - this->head))) return NULL; - return reinterpret_cast<Type *> (&obj); - } - - inline void truncate (void *head) - { - assert (this->start < head && head <= this->head); - this->head = (char *) head; - } - - unsigned int debug_depth; - char *start, *end, *head; - bool ran_out_of_room; -}; - -template <typename Type> -struct Supplier -{ - inline Supplier (const Type *array, unsigned int len_) - { - head = array; - len = len_; - } - inline const Type operator [] (unsigned int i) const - { - if (unlikely (i >= len)) return Type (); - return head[i]; - } - - inline void advance (unsigned int count) - { - if (unlikely (count > len)) - count = len; - len -= count; - head += count; - } - - private: - inline Supplier (const Supplier<Type> &); /* Disallow copy */ - inline Supplier<Type>& operator= (const Supplier<Type> &); /* Disallow copy */ - - unsigned int len; - const Type *head; -}; - - - - -/* - * - * The OpenType Font File: Data Types - */ - - -/* "The following data types are used in the OpenType font file. - * All OpenType fonts use Motorola-style byte ordering (Big Endian):" */ - -/* - * Int types - */ - - -template <typename Type, int Bytes> struct BEInt; - -template <typename Type> -struct BEInt<Type, 2> -{ - public: - inline void set (Type i) { hb_be_uint16_put (v,i); } - inline operator Type (void) const { return hb_be_uint16_get (v); } - inline bool operator == (const BEInt<Type, 2>& o) const { return hb_be_uint16_eq (v, o.v); } - inline bool operator != (const BEInt<Type, 2>& o) const { return !(*this == o); } - private: uint8_t v[2]; -}; -template <typename Type> -struct BEInt<Type, 4> -{ - public: - inline void set (Type i) { hb_be_uint32_put (v,i); } - inline operator Type (void) const { return hb_be_uint32_get (v); } - inline bool operator == (const BEInt<Type, 4>& o) const { return hb_be_uint32_eq (v, o.v); } - inline bool operator != (const BEInt<Type, 4>& o) const { return !(*this == o); } - private: uint8_t v[4]; -}; -template <typename Type> -struct BEInt<Type, 3> -{ - public: - inline void set (Type i) { hb_be_uint24_put (v,i); } - inline operator Type (void) const { return hb_be_uint24_get (v); } - inline bool operator == (const BEInt<Type, 3>& o) const { return hb_be_uint24_eq (v, o.v); } - inline bool operator != (const BEInt<Type, 3>& o) const { return !(*this == o); } - private: uint8_t v[3]; -}; - -/* Integer types in big-endian order and no alignment requirement */ -template <typename Type, unsigned int Size> -struct IntType -{ - inline void set (Type i) { v.set (i); } - inline operator Type(void) const { return v; } - inline bool operator == (const IntType<Type,Size> &o) const { return v == o.v; } - inline bool operator != (const IntType<Type,Size> &o) const { return v != o.v; } - static inline int cmp (const IntType<Type,Size> *a, const IntType<Type,Size> *b) { return b->cmp (*a); } - inline int cmp (IntType<Type,Size> va) const { Type a = va; Type b = v; return a < b ? -1 : a == b ? 0 : +1; } - inline int cmp (Type a) const { Type b = v; return a < b ? -1 : a == b ? 0 : +1; } - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (likely (c->check_struct (this))); - } - protected: - BEInt<Type, Size> v; - public: - DEFINE_SIZE_STATIC (Size); -}; - -typedef IntType<uint16_t, 2> USHORT; /* 16-bit unsigned integer. */ -typedef IntType<int16_t, 2> SHORT; /* 16-bit signed integer. */ -typedef IntType<uint32_t, 4> ULONG; /* 32-bit unsigned integer. */ -typedef IntType<int32_t, 4> LONG; /* 32-bit signed integer. */ -typedef IntType<uint32_t, 3> UINT24; /* 24-bit unsigned integer. */ - -/* 16-bit signed integer (SHORT) that describes a quantity in FUnits. */ -typedef SHORT FWORD; - -/* 16-bit unsigned integer (USHORT) that describes a quantity in FUnits. */ -typedef USHORT UFWORD; - -/* Date represented in number of seconds since 12:00 midnight, January 1, - * 1904. The value is represented as a signed 64-bit integer. */ -struct LONGDATETIME -{ - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (likely (c->check_struct (this))); - } - private: - LONG major; - ULONG minor; - public: - DEFINE_SIZE_STATIC (8); -}; - -/* Array of four uint8s (length = 32 bits) used to identify a script, language - * system, feature, or baseline */ -struct Tag : ULONG -{ - /* What the char* converters return is NOT nul-terminated. Print using "%.4s" */ - inline operator const char* (void) const { return reinterpret_cast<const char *> (&this->v); } - inline operator char* (void) { return reinterpret_cast<char *> (&this->v); } - public: - DEFINE_SIZE_STATIC (4); -}; -DEFINE_NULL_DATA (Tag, " "); - -/* Glyph index number, same as uint16 (length = 16 bits) */ -typedef USHORT GlyphID; - -/* Script/language-system/feature index */ -struct Index : USHORT { - static const unsigned int NOT_FOUND_INDEX = 0xFFFF; -}; -DEFINE_NULL_DATA (Index, "\xff\xff"); - -/* Offset to a table, same as uint16 (length = 16 bits), Null offset = 0x0000 */ -struct Offset : USHORT -{ - inline bool is_null (void) const { return 0 == *this; } - public: - DEFINE_SIZE_STATIC (2); -}; - -/* LongOffset to a table, same as uint32 (length = 32 bits), Null offset = 0x00000000 */ -struct LongOffset : ULONG -{ - inline bool is_null (void) const { return 0 == *this; } - public: - DEFINE_SIZE_STATIC (4); -}; - - -/* CheckSum */ -struct CheckSum : ULONG -{ - static uint32_t CalcTableChecksum (ULONG *Table, uint32_t Length) - { - uint32_t Sum = 0L; - ULONG *EndPtr = Table+((Length+3) & ~3) / ULONG::static_size; - - while (Table < EndPtr) - Sum += *Table++; - return Sum; - } - public: - DEFINE_SIZE_STATIC (4); -}; - - -/* - * Version Numbers - */ - -struct FixedVersion -{ - inline uint32_t to_int (void) const { return (major << 16) + minor; } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this)); - } - - USHORT major; - USHORT minor; - public: - DEFINE_SIZE_STATIC (4); -}; - - - -/* - * Template subclasses of Offset and LongOffset that do the dereferencing. - * Use: (base+offset) - */ - -template <typename OffsetType, typename Type> -struct GenericOffsetTo : OffsetType -{ - inline const Type& operator () (const void *base) const - { - unsigned int offset = *this; - if (unlikely (!offset)) return Null(Type); - return StructAtOffset<Type> (base, offset); - } - - inline Type& serialize (hb_serialize_context_t *c, void *base) - { - Type *t = c->start_embed<Type> (); - this->set ((char *) t - (char *) base); /* TODO(serialize) Overflow? */ - return *t; - } - - inline bool sanitize (hb_sanitize_context_t *c, void *base) { - TRACE_SANITIZE (this); - if (unlikely (!c->check_struct (this))) return TRACE_RETURN (false); - unsigned int offset = *this; - if (unlikely (!offset)) return TRACE_RETURN (true); - Type &obj = StructAtOffset<Type> (base, offset); - return TRACE_RETURN (likely (obj.sanitize (c)) || neuter (c)); - } - template <typename T> - inline bool sanitize (hb_sanitize_context_t *c, void *base, T user_data) { - TRACE_SANITIZE (this); - if (unlikely (!c->check_struct (this))) return TRACE_RETURN (false); - unsigned int offset = *this; - if (unlikely (!offset)) return TRACE_RETURN (true); - Type &obj = StructAtOffset<Type> (base, offset); - return TRACE_RETURN (likely (obj.sanitize (c, user_data)) || neuter (c)); - } - - inline bool try_set (hb_sanitize_context_t *c, const OffsetType &v) { - if (c->may_edit (this, this->static_size)) { - this->set (v); - return true; - } - return false; - } - /* Set the offset to Null */ - inline bool neuter (hb_sanitize_context_t *c) { - if (c->may_edit (this, this->static_size)) { - this->set (0); /* 0 is Null offset */ - return true; - } - return false; - } -}; -template <typename Base, typename OffsetType, typename Type> -inline const Type& operator + (const Base &base, const GenericOffsetTo<OffsetType, Type> &offset) { return offset (base); } -template <typename Base, typename OffsetType, typename Type> -inline Type& operator + (Base &base, GenericOffsetTo<OffsetType, Type> &offset) { return offset (base); } - -template <typename Type> -struct OffsetTo : GenericOffsetTo<Offset, Type> {}; - -template <typename Type> -struct LongOffsetTo : GenericOffsetTo<LongOffset, Type> {}; - - -/* - * Array Types - */ - -template <typename LenType, typename Type> -struct GenericArrayOf -{ - const Type *sub_array (unsigned int start_offset, unsigned int *pcount /* IN/OUT */) const - { - unsigned int count = len; - if (unlikely (start_offset > count)) - count = 0; - else - count -= start_offset; - count = MIN (count, *pcount); - *pcount = count; - return array + start_offset; - } - - inline const Type& operator [] (unsigned int i) const - { - if (unlikely (i >= len)) return Null(Type); - return array[i]; - } - inline Type& operator [] (unsigned int i) - { - return array[i]; - } - inline unsigned int get_size (void) const - { return len.static_size + len * Type::static_size; } - - inline bool serialize (hb_serialize_context_t *c, - unsigned int items_len) - { - TRACE_SERIALIZE (this); - if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false); - len.set (items_len); /* TODO(serialize) Overflow? */ - if (unlikely (!c->extend (*this))) return TRACE_RETURN (false); - return TRACE_RETURN (true); - } - - inline bool serialize (hb_serialize_context_t *c, - Supplier<Type> &items, - unsigned int items_len) - { - TRACE_SERIALIZE (this); - if (unlikely (!serialize (c, items_len))) return TRACE_RETURN (false); - for (unsigned int i = 0; i < items_len; i++) - array[i] = items[i]; - items.advance (items_len); - return TRACE_RETURN (true); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (unlikely (!sanitize_shallow (c))) return TRACE_RETURN (false); - - /* Note: for structs that do not reference other structs, - * we do not need to call their sanitize() as we already did - * a bound check on the aggregate array size. We just include - * a small unreachable expression to make sure the structs - * pointed to do have a simple sanitize(), ie. they do not - * reference other structs via offsets. - */ - (void) (false && array[0].sanitize (c)); - - return TRACE_RETURN (true); - } - inline bool sanitize (hb_sanitize_context_t *c, void *base) { - TRACE_SANITIZE (this); - if (unlikely (!sanitize_shallow (c))) return TRACE_RETURN (false); - unsigned int count = len; - for (unsigned int i = 0; i < count; i++) - if (unlikely (!array[i].sanitize (c, base))) - return TRACE_RETURN (false); - return TRACE_RETURN (true); - } - template <typename T> - inline bool sanitize (hb_sanitize_context_t *c, void *base, T user_data) { - TRACE_SANITIZE (this); - if (unlikely (!sanitize_shallow (c))) return TRACE_RETURN (false); - unsigned int count = len; - for (unsigned int i = 0; i < count; i++) - if (unlikely (!array[i].sanitize (c, base, user_data))) - return TRACE_RETURN (false); - return TRACE_RETURN (true); - } - - private: - inline bool sanitize_shallow (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this) && c->check_array (this, Type::static_size, len)); - } - - public: - LenType len; - Type array[VAR]; - public: - DEFINE_SIZE_ARRAY (sizeof (LenType), array); -}; - -/* An array with a USHORT number of elements. */ -template <typename Type> -struct ArrayOf : GenericArrayOf<USHORT, Type> {}; - -/* An array with a ULONG number of elements. */ -template <typename Type> -struct LongArrayOf : GenericArrayOf<ULONG, Type> {}; - -/* Array of Offset's */ -template <typename Type> -struct OffsetArrayOf : ArrayOf<OffsetTo<Type> > {}; - -/* Array of LongOffset's */ -template <typename Type> -struct LongOffsetArrayOf : ArrayOf<LongOffsetTo<Type> > {}; - -/* LongArray of LongOffset's */ -template <typename Type> -struct LongOffsetLongArrayOf : LongArrayOf<LongOffsetTo<Type> > {}; - -/* Array of offsets relative to the beginning of the array itself. */ -template <typename Type> -struct OffsetListOf : OffsetArrayOf<Type> -{ - inline const Type& operator [] (unsigned int i) const - { - if (unlikely (i >= this->len)) return Null(Type); - return this+this->array[i]; - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (OffsetArrayOf<Type>::sanitize (c, this)); - } - template <typename T> - inline bool sanitize (hb_sanitize_context_t *c, T user_data) { - TRACE_SANITIZE (this); - return TRACE_RETURN (OffsetArrayOf<Type>::sanitize (c, this, user_data)); - } -}; - - -/* An array with a USHORT number of elements, - * starting at second element. */ -template <typename Type> -struct HeadlessArrayOf -{ - inline const Type& operator [] (unsigned int i) const - { - if (unlikely (i >= len || !i)) return Null(Type); - return array[i-1]; - } - inline unsigned int get_size (void) const - { return len.static_size + (len ? len - 1 : 0) * Type::static_size; } - - inline bool serialize (hb_serialize_context_t *c, - Supplier<Type> &items, - unsigned int items_len) - { - TRACE_SERIALIZE (this); - if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false); - len.set (items_len); /* TODO(serialize) Overflow? */ - if (unlikely (!items_len)) return TRACE_RETURN (true); - if (unlikely (!c->extend (*this))) return TRACE_RETURN (false); - for (unsigned int i = 0; i < items_len - 1; i++) - array[i] = items[i]; - items.advance (items_len - 1); - return TRACE_RETURN (true); - } - - inline bool sanitize_shallow (hb_sanitize_context_t *c) { - return c->check_struct (this) - && c->check_array (this, Type::static_size, len); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (unlikely (!sanitize_shallow (c))) return TRACE_RETURN (false); - - /* Note: for structs that do not reference other structs, - * we do not need to call their sanitize() as we already did - * a bound check on the aggregate array size. We just include - * a small unreachable expression to make sure the structs - * pointed to do have a simple sanitize(), ie. they do not - * reference other structs via offsets. - */ - (void) (false && array[0].sanitize (c)); - - return TRACE_RETURN (true); - } - - USHORT len; - Type array[VAR]; - public: - DEFINE_SIZE_ARRAY (sizeof (USHORT), array); -}; - - -/* An array with sorted elements. Supports binary searching. */ -template <typename Type> -struct SortedArrayOf : ArrayOf<Type> { - - template <typename SearchType> - inline int search (const SearchType &x) const { - unsigned int count = this->len; - /* Linear search is *much* faster for small counts. */ - if (likely (count < 32)) { - for (unsigned int i = 0; i < count; i++) - if (this->array[i].cmp (x) == 0) - return i; - return -1; - } else { - struct Cmp { - static int cmp (const SearchType *a, const Type *b) { return b->cmp (*a); } - }; - const Type *p = (const Type *) bsearch (&x, this->array, this->len, sizeof (this->array[0]), (hb_compare_func_t) Cmp::cmp); - return p ? p - this->array : -1; - } - } -}; - - -} /* namespace OT */ - - -#endif /* HB_OPEN_TYPE_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-head-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-head-table.hh deleted file mode 100644 index 3a9451295de..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-head-table.hh +++ /dev/null @@ -1,149 +0,0 @@ -/* - * Copyright © 2010 Red Hat, Inc. - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_HEAD_TABLE_HH -#define HB_OT_HEAD_TABLE_HH - -#include "hb-open-type-private.hh" - - -namespace OT { - - -/* - * head -- Font Header - */ - -#define HB_OT_TAG_head HB_TAG('h','e','a','d') - -struct head -{ - static const hb_tag_t Tag = HB_OT_TAG_head; - - inline unsigned int get_upem (void) const { - unsigned int upem = unitsPerEm; - /* If no valid head table found, assume 1000, which matches typical Type1 usage. */ - return 16 <= upem && upem <= 16384 ? upem : 1000; - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this) && likely (version.major == 1)); - } - - protected: - FixedVersion version; /* Version of the head table--currently - * 0x00010000 for version 1.0. */ - FixedVersion fontRevision; /* Set by font manufacturer. */ - ULONG checkSumAdjustment; /* To compute: set it to 0, sum the - * entire font as ULONG, then store - * 0xB1B0AFBA - sum. */ - ULONG magicNumber; /* Set to 0x5F0F3CF5. */ - USHORT flags; /* Bit 0: Baseline for font at y=0; - * Bit 1: Left sidebearing point at x=0; - * Bit 2: Instructions may depend on point size; - * Bit 3: Force ppem to integer values for all - * internal scaler math; may use fractional - * ppem sizes if this bit is clear; - * Bit 4: Instructions may alter advance width - * (the advance widths might not scale linearly); - - * Bits 5-10: These should be set according to - * Apple's specification. However, they are not - * implemented in OpenType. - * Bit 5: This bit should be set in fonts that are - * intended to e laid out vertically, and in - * which the glyphs have been drawn such that an - * x-coordinate of 0 corresponds to the desired - * vertical baseline. - * Bit 6: This bit must be set to zero. - * Bit 7: This bit should be set if the font - * requires layout for correct linguistic - * rendering (e.g. Arabic fonts). - * Bit 8: This bit should be set for a GX font - * which has one or more metamorphosis effects - * designated as happening by default. - * Bit 9: This bit should be set if the font - * contains any strong right-to-left glyphs. - * Bit 10: This bit should be set if the font - * contains Indic-style rearrangement effects. - - * Bit 11: Font data is 'lossless,' as a result - * of having been compressed and decompressed - * with the Agfa MicroType Express engine. - * Bit 12: Font converted (produce compatible metrics) - * Bit 13: Font optimized for ClearType™. - * Note, fonts that rely on embedded bitmaps (EBDT) - * for rendering should not be considered optimized - * for ClearType, and therefore should keep this bit - * cleared. - * Bit 14: Last Resort font. If set, indicates that - * the glyphs encoded in the cmap subtables are simply - * generic symbolic representations of code point - * ranges and don’t truly represent support for those - * code points. If unset, indicates that the glyphs - * encoded in the cmap subtables represent proper - * support for those code points. - * Bit 15: Reserved, set to 0. */ - USHORT unitsPerEm; /* Valid range is from 16 to 16384. This value - * should be a power of 2 for fonts that have - * TrueType outlines. */ - LONGDATETIME created; /* Number of seconds since 12:00 midnight, - January 1, 1904. 64-bit integer */ - LONGDATETIME modified; /* Number of seconds since 12:00 midnight, - January 1, 1904. 64-bit integer */ - SHORT xMin; /* For all glyph bounding boxes. */ - SHORT yMin; /* For all glyph bounding boxes. */ - SHORT xMax; /* For all glyph bounding boxes. */ - SHORT yMax; /* For all glyph bounding boxes. */ - USHORT macStyle; /* Bit 0: Bold (if set to 1); - * Bit 1: Italic (if set to 1) - * Bit 2: Underline (if set to 1) - * Bit 3: Outline (if set to 1) - * Bit 4: Shadow (if set to 1) - * Bit 5: Condensed (if set to 1) - * Bit 6: Extended (if set to 1) - * Bits 7-15: Reserved (set to 0). */ - USHORT lowestRecPPEM; /* Smallest readable size in pixels. */ - SHORT fontDirectionHint; /* Deprecated (Set to 2). - * 0: Fully mixed directional glyphs; - * 1: Only strongly left to right; - * 2: Like 1 but also contains neutrals; - * -1: Only strongly right to left; - * -2: Like -1 but also contains neutrals. */ - SHORT indexToLocFormat; /* 0 for short offsets, 1 for long. */ - SHORT glyphDataFormat; /* 0 for current format. */ - public: - DEFINE_SIZE_STATIC (54); -}; - - -} /* namespace OT */ - - -#endif /* HB_OT_HEAD_TABLE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-hhea-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-hhea-table.hh deleted file mode 100644 index 2b89c4e0208..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-hhea-table.hh +++ /dev/null @@ -1,97 +0,0 @@ -/* - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_HHEA_TABLE_HH -#define HB_OT_HHEA_TABLE_HH - -#include "hb-open-type-private.hh" - - -namespace OT { - - -/* - * hhea -- The Horizontal Header Table - */ - -#define HB_OT_TAG_hhea HB_TAG('h','h','e','a') - - -struct hhea -{ - static const hb_tag_t Tag = HB_OT_TAG_hhea; - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this) && likely (version.major == 1)); - } - - protected: - FixedVersion version; /* 0x00010000 for version 1.0. */ - FWORD ascender; /* Typographic ascent. <a - * href="http://developer.apple.com/fonts/TTRefMan/RM06/Chap6hhea.html"> - * (Distance from baseline of highest - * ascender)</a> */ - FWORD descender; /* Typographic descent. <a - * href="http://developer.apple.com/fonts/TTRefMan/RM06/Chap6hhea.html"> - * (Distance from baseline of lowest - * descender)</a> */ - FWORD lineGap; /* Typographic line gap. Negative - * LineGap values are treated as zero - * in Windows 3.1, System 6, and - * System 7. */ - UFWORD advanceWidthMax; /* Maximum advance width value in - * 'hmtx' table. */ - FWORD minLeftSideBearing; /* Minimum left sidebearing value in - * 'hmtx' table. */ - FWORD minRightSideBearing; /* Minimum right sidebearing value; - * calculated as Min(aw - lsb - - * (xMax - xMin)). */ - FWORD xMaxExtent; /* Max(lsb + (xMax - xMin)). */ - SHORT caretSlopeRise; /* Used to calculate the slope of the - * cursor (rise/run); 1 for vertical. */ - SHORT caretSlopeRun; /* 0 for vertical. */ - SHORT caretOffset; /* The amount by which a slanted - * highlight on a glyph needs - * to be shifted to produce the - * best appearance. Set to 0 for - * non--slanted fonts */ - SHORT reserved1; /* set to 0 */ - SHORT reserved2; /* set to 0 */ - SHORT reserved3; /* set to 0 */ - SHORT reserved4; /* set to 0 */ - SHORT metricDataFormat; /* 0 for current format. */ - USHORT numberOfHMetrics; /* Number of hMetric entries in 'hmtx' - * table */ - public: - DEFINE_SIZE_STATIC (36); -}; - - -} /* namespace OT */ - - -#endif /* HB_OT_HHEA_TABLE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-hmtx-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-hmtx-table.hh deleted file mode 100644 index b94337d0be7..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-hmtx-table.hh +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_HMTX_TABLE_HH -#define HB_OT_HMTX_TABLE_HH - -#include "hb-open-type-private.hh" - - -namespace OT { - - -/* - * hmtx -- The Horizontal Metrics Table - */ - -#define HB_OT_TAG_hmtx HB_TAG('h','m','t','x') - - -struct LongHorMetric -{ - USHORT advanceWidth; - SHORT lsb; - public: - DEFINE_SIZE_STATIC (4); -}; - -struct hmtx -{ - static const hb_tag_t Tag = HB_OT_TAG_hmtx; - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - /* We don't check for anything specific here. The users of the - * struct do all the hard work... */ - return TRACE_RETURN (true); - } - - protected: - LongHorMetric longHorMetric[VAR]; /* Paired advance width and left side - * bearing values for each glyph. The - * value numOfHMetrics comes from - * the 'hhea' table. If the font is - * monospaced, only one entry need - * be in the array, but that entry is - * required. The last entry applies to - * all subsequent glyphs. */ - SHORT leftSideBearingX[VAR]; /* Here the advanceWidth is assumed - * to be the same as the advanceWidth - * for the last entry above. The - * number of entries in this array is - * derived from numGlyphs (from 'maxp' - * table) minus numberOfHMetrics. This - * generally is used with a run of - * monospaced glyphs (e.g., Kanji - * fonts or Courier fonts). Only one - * run is allowed and it must be at - * the end. This allows a monospaced - * font to vary the left side bearing - * values for each glyph. */ - public: - DEFINE_SIZE_ARRAY2 (0, longHorMetric, leftSideBearingX); -}; - - -} /* namespace OT */ - - -#endif /* HB_OT_HMTX_TABLE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout-common-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout-common-private.hh deleted file mode 100644 index e6018db1243..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout-common-private.hh +++ /dev/null @@ -1,1142 +0,0 @@ -/* - * Copyright © 2007,2008,2009 Red Hat, Inc. - * Copyright © 2010,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_LAYOUT_COMMON_PRIVATE_HH -#define HB_OT_LAYOUT_COMMON_PRIVATE_HH - -#include "hb-ot-layout-private.hh" -#include "hb-open-type-private.hh" -#include "hb-set-private.hh" - - -namespace OT { - - -#define NOT_COVERED ((unsigned int) -1) -#define MAX_NESTING_LEVEL 8 - - - -/* - * - * OpenType Layout Common Table Formats - * - */ - - -/* - * Script, ScriptList, LangSys, Feature, FeatureList, Lookup, LookupList - */ - -template <typename Type> -struct Record -{ - inline int cmp (hb_tag_t a) const { - return tag.cmp (a); - } - - struct sanitize_closure_t { - hb_tag_t tag; - void *list_base; - }; - inline bool sanitize (hb_sanitize_context_t *c, void *base) { - TRACE_SANITIZE (this); - const sanitize_closure_t closure = {tag, base}; - return TRACE_RETURN (c->check_struct (this) && offset.sanitize (c, base, &closure)); - } - - Tag tag; /* 4-byte Tag identifier */ - OffsetTo<Type> - offset; /* Offset from beginning of object holding - * the Record */ - public: - DEFINE_SIZE_STATIC (6); -}; - -template <typename Type> -struct RecordArrayOf : SortedArrayOf<Record<Type> > { - inline const Tag& get_tag (unsigned int i) const - { - /* We cheat slightly and don't define separate Null objects - * for Record types. Instead, we return the correct Null(Tag) - * here. */ - if (unlikely (i >= this->len)) return Null(Tag); - return (*this)[i].tag; - } - inline unsigned int get_tags (unsigned int start_offset, - unsigned int *record_count /* IN/OUT */, - hb_tag_t *record_tags /* OUT */) const - { - if (record_count) { - const Record<Type> *arr = this->sub_array (start_offset, record_count); - unsigned int count = *record_count; - for (unsigned int i = 0; i < count; i++) - record_tags[i] = arr[i].tag; - } - return this->len; - } - inline bool find_index (hb_tag_t tag, unsigned int *index) const - { - int i = this->search (tag); - if (i != -1) { - if (index) *index = i; - return true; - } else { - if (index) *index = Index::NOT_FOUND_INDEX; - return false; - } - } -}; - -template <typename Type> -struct RecordListOf : RecordArrayOf<Type> -{ - inline const Type& operator [] (unsigned int i) const - { return this+RecordArrayOf<Type>::operator [](i).offset; } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (RecordArrayOf<Type>::sanitize (c, this)); - } -}; - - -struct RangeRecord -{ - inline int cmp (hb_codepoint_t g) const { - hb_codepoint_t a = start, b = end; - return g < a ? -1 : g <= b ? 0 : +1 ; - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this)); - } - - inline bool intersects (const hb_set_t *glyphs) const { - return glyphs->intersects (start, end); - } - - template <typename set_t> - inline void add_coverage (set_t *glyphs) const { - glyphs->add_range (start, end); - } - - GlyphID start; /* First GlyphID in the range */ - GlyphID end; /* Last GlyphID in the range */ - USHORT value; /* Value */ - public: - DEFINE_SIZE_STATIC (6); -}; -DEFINE_NULL_DATA (RangeRecord, "\000\001"); - - -struct IndexArray : ArrayOf<Index> -{ - inline unsigned int get_indexes (unsigned int start_offset, - unsigned int *_count /* IN/OUT */, - unsigned int *_indexes /* OUT */) const - { - if (_count) { - const USHORT *arr = this->sub_array (start_offset, _count); - unsigned int count = *_count; - for (unsigned int i = 0; i < count; i++) - _indexes[i] = arr[i]; - } - return this->len; - } -}; - - -struct Script; -struct LangSys; -struct Feature; - - -struct LangSys -{ - inline unsigned int get_feature_count (void) const - { return featureIndex.len; } - inline hb_tag_t get_feature_index (unsigned int i) const - { return featureIndex[i]; } - inline unsigned int get_feature_indexes (unsigned int start_offset, - unsigned int *feature_count /* IN/OUT */, - unsigned int *feature_indexes /* OUT */) const - { return featureIndex.get_indexes (start_offset, feature_count, feature_indexes); } - - inline bool has_required_feature (void) const { return reqFeatureIndex != 0xffff; } - inline unsigned int get_required_feature_index (void) const - { - if (reqFeatureIndex == 0xffff) - return Index::NOT_FOUND_INDEX; - return reqFeatureIndex;; - } - - inline bool sanitize (hb_sanitize_context_t *c, - const Record<LangSys>::sanitize_closure_t * = NULL) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this) && featureIndex.sanitize (c)); - } - - Offset lookupOrder; /* = Null (reserved for an offset to a - * reordering table) */ - USHORT reqFeatureIndex;/* Index of a feature required for this - * language system--if no required features - * = 0xFFFF */ - IndexArray featureIndex; /* Array of indices into the FeatureList */ - public: - DEFINE_SIZE_ARRAY (6, featureIndex); -}; -DEFINE_NULL_DATA (LangSys, "\0\0\xFF\xFF"); - - -struct Script -{ - inline unsigned int get_lang_sys_count (void) const - { return langSys.len; } - inline const Tag& get_lang_sys_tag (unsigned int i) const - { return langSys.get_tag (i); } - inline unsigned int get_lang_sys_tags (unsigned int start_offset, - unsigned int *lang_sys_count /* IN/OUT */, - hb_tag_t *lang_sys_tags /* OUT */) const - { return langSys.get_tags (start_offset, lang_sys_count, lang_sys_tags); } - inline const LangSys& get_lang_sys (unsigned int i) const - { - if (i == Index::NOT_FOUND_INDEX) return get_default_lang_sys (); - return this+langSys[i].offset; - } - inline bool find_lang_sys_index (hb_tag_t tag, unsigned int *index) const - { return langSys.find_index (tag, index); } - - inline bool has_default_lang_sys (void) const { return defaultLangSys != 0; } - inline const LangSys& get_default_lang_sys (void) const { return this+defaultLangSys; } - - inline bool sanitize (hb_sanitize_context_t *c, - const Record<Script>::sanitize_closure_t * = NULL) { - TRACE_SANITIZE (this); - return TRACE_RETURN (defaultLangSys.sanitize (c, this) && langSys.sanitize (c, this)); - } - - protected: - OffsetTo<LangSys> - defaultLangSys; /* Offset to DefaultLangSys table--from - * beginning of Script table--may be Null */ - RecordArrayOf<LangSys> - langSys; /* Array of LangSysRecords--listed - * alphabetically by LangSysTag */ - public: - DEFINE_SIZE_ARRAY (4, langSys); -}; - -typedef RecordListOf<Script> ScriptList; - - -/* http://www.microsoft.com/typography/otspec/features_pt.htm#size */ -struct FeatureParamsSize -{ - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (unlikely (!c->check_struct (this))) return TRACE_RETURN (false); - - /* This subtable has some "history", if you will. Some earlier versions of - * Adobe tools calculated the offset of the FeatureParams sutable from the - * beginning of the FeatureList table! Now, that is dealt with in the - * Feature implementation. But we still need to be able to tell junk from - * real data. Note: We don't check that the nameID actually exists. - * - * Read Roberts wrote on 9/15/06 on opentype-list@indx.co.uk : - * - * Yes, it is correct that a new version of the AFDKO (version 2.0) will be - * coming out soon, and that the makeotf program will build a font with a - * 'size' feature that is correct by the specification. - * - * The specification for this feature tag is in the "OpenType Layout Tag - * Registry". You can see a copy of this at: - * http://partners.adobe.com/public/developer/opentype/index_tag8.html#size - * - * Here is one set of rules to determine if the 'size' feature is built - * correctly, or as by the older versions of MakeOTF. You may be able to do - * better. - * - * Assume that the offset to the size feature is according to specification, - * and make the following value checks. If it fails, assume the the size - * feature is calculated as versions of MakeOTF before the AFDKO 2.0 built it. - * If this fails, reject the 'size' feature. The older makeOTF's calculated the - * offset from the beginning of the FeatureList table, rather than from the - * beginning of the 'size' Feature table. - * - * If "design size" == 0: - * fails check - * - * Else if ("subfamily identifier" == 0 and - * "range start" == 0 and - * "range end" == 0 and - * "range start" == 0 and - * "menu name ID" == 0) - * passes check: this is the format used when there is a design size - * specified, but there is no recommended size range. - * - * Else if ("design size" < "range start" or - * "design size" > "range end" or - * "range end" <= "range start" or - * "menu name ID" < 256 or - * "menu name ID" > 32767 or - * menu name ID is not a name ID which is actually in the name table) - * fails test - * Else - * passes test. - */ - - if (!designSize) - return TRACE_RETURN (false); - else if (subfamilyID == 0 && - subfamilyNameID == 0 && - rangeStart == 0 && - rangeEnd == 0) - return TRACE_RETURN (true); - else if (designSize < rangeStart || - designSize > rangeEnd || - subfamilyNameID < 256 || - subfamilyNameID > 32767) - return TRACE_RETURN (false); - else - return TRACE_RETURN (true); - } - - USHORT designSize; /* Represents the design size in 720/inch - * units (decipoints). The design size entry - * must be non-zero. When there is a design - * size but no recommended size range, the - * rest of the array will consist of zeros. */ - USHORT subfamilyID; /* Has no independent meaning, but serves - * as an identifier that associates fonts - * in a subfamily. All fonts which share a - * Preferred or Font Family name and which - * differ only by size range shall have the - * same subfamily value, and no fonts which - * differ in weight or style shall have the - * same subfamily value. If this value is - * zero, the remaining fields in the array - * will be ignored. */ - USHORT subfamilyNameID;/* If the preceding value is non-zero, this - * value must be set in the range 256 - 32767 - * (inclusive). It records the value of a - * field in the name table, which must - * contain English-language strings encoded - * in Windows Unicode and Macintosh Roman, - * and may contain additional strings - * localized to other scripts and languages. - * Each of these strings is the name an - * application should use, in combination - * with the family name, to represent the - * subfamily in a menu. Applications will - * choose the appropriate version based on - * their selection criteria. */ - USHORT rangeStart; /* Large end of the recommended usage range - * (inclusive), stored in 720/inch units - * (decipoints). */ - USHORT rangeEnd; /* Small end of the recommended usage range - (exclusive), stored in 720/inch units - * (decipoints). */ - public: - DEFINE_SIZE_STATIC (10); -}; - -/* http://www.microsoft.com/typography/otspec/features_pt.htm#ssxx */ -struct FeatureParamsStylisticSet -{ - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - /* Right now minorVersion is at zero. Which means, any table supports - * the uiNameID field. */ - return TRACE_RETURN (c->check_struct (this)); - } - - USHORT minorVersion; /* (set to 0): This corresponds to a “minor” - * version number. Additional data may be - * added to the end of this Feature Parameters - * table in the future. */ - - USHORT uiNameID; /* The 'name' table name ID that specifies a - * string (or strings, for multiple languages) - * for a user-interface label for this - * feature. The values of uiLabelNameId and - * sampleTextNameId are expected to be in the - * font-specific name ID range (256-32767), - * though that is not a requirement in this - * Feature Parameters specification. The - * user-interface label for the feature can - * be provided in multiple languages. An - * English string should be included as a - * fallback. The string should be kept to a - * minimal length to fit comfortably with - * different application interfaces. */ - public: - DEFINE_SIZE_STATIC (4); -}; - -struct FeatureParamsCharacterVariants -{ - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this) && - characters.sanitize (c)); - } - - USHORT format; /* Format number is set to 0. */ - USHORT featUILableNameID; /* The ‘name’ table name ID that - * specifies a string (or strings, - * for multiple languages) for a - * user-interface label for this - * feature. (May be NULL.) */ - USHORT featUITooltipTextNameID;/* The ‘name’ table name ID that - * specifies a string (or strings, - * for multiple languages) that an - * application can use for tooltip - * text for this feature. (May be - * NULL.) */ - USHORT sampleTextNameID; /* The ‘name’ table name ID that - * specifies sample text that - * illustrates the effect of this - * feature. (May be NULL.) */ - USHORT numNamedParameters; /* Number of named parameters. (May - * be zero.) */ - USHORT firstParamUILabelNameID;/* The first ‘name’ table name ID - * used to specify strings for - * user-interface labels for the - * feature parameters. (Must be zero - * if numParameters is zero.) */ - ArrayOf<UINT24> - characters; /* Array of the Unicode Scalar Value - * of the characters for which this - * feature provides glyph variants. - * (May be zero.) */ - public: - DEFINE_SIZE_ARRAY (14, characters); -}; - -struct FeatureParams -{ - inline bool sanitize (hb_sanitize_context_t *c, hb_tag_t tag) { - TRACE_SANITIZE (this); - if (tag == HB_TAG ('s','i','z','e')) - return TRACE_RETURN (u.size.sanitize (c)); - if ((tag & 0xFFFF0000) == HB_TAG ('s','s','\0','\0')) /* ssXX */ - return TRACE_RETURN (u.stylisticSet.sanitize (c)); - if ((tag & 0xFFFF0000) == HB_TAG ('c','v','\0','\0')) /* cvXX */ - return TRACE_RETURN (u.characterVariants.sanitize (c)); - return TRACE_RETURN (true); - } - - inline const FeatureParamsSize& get_size_params (hb_tag_t tag) const - { - if (tag == HB_TAG ('s','i','z','e')) - return u.size; - return Null(FeatureParamsSize); - } - - private: - union { - FeatureParamsSize size; - FeatureParamsStylisticSet stylisticSet; - FeatureParamsCharacterVariants characterVariants; - } u; - DEFINE_SIZE_STATIC (17); -}; - -struct Feature -{ - inline unsigned int get_lookup_count (void) const - { return lookupIndex.len; } - inline hb_tag_t get_lookup_index (unsigned int i) const - { return lookupIndex[i]; } - inline unsigned int get_lookup_indexes (unsigned int start_index, - unsigned int *lookup_count /* IN/OUT */, - unsigned int *lookup_tags /* OUT */) const - { return lookupIndex.get_indexes (start_index, lookup_count, lookup_tags); } - - inline const FeatureParams &get_feature_params (void) const - { return this+featureParams; } - - inline bool sanitize (hb_sanitize_context_t *c, - const Record<Feature>::sanitize_closure_t *closure) { - TRACE_SANITIZE (this); - if (unlikely (!(c->check_struct (this) && lookupIndex.sanitize (c)))) - return TRACE_RETURN (false); - - /* Some earlier versions of Adobe tools calculated the offset of the - * FeatureParams subtable from the beginning of the FeatureList table! - * - * If sanitizing "failed" for the FeatureParams subtable, try it with the - * alternative location. We would know sanitize "failed" if old value - * of the offset was non-zero, but it's zeroed now. - * - * Only do this for the 'size' feature, since at the time of the faulty - * Adobe tools, only the 'size' feature had FeatureParams defined. - */ - - Offset orig_offset = featureParams; - if (unlikely (!featureParams.sanitize (c, this, closure ? closure->tag : HB_TAG_NONE))) - return TRACE_RETURN (false); - - if (likely (!orig_offset)) - return TRACE_RETURN (true); - - if (featureParams == 0 && closure && - closure->tag == HB_TAG ('s','i','z','e') && - closure->list_base && closure->list_base < this) - { - unsigned int new_offset_int = (unsigned int) orig_offset - - ((char *) this - (char *) closure->list_base); - - Offset new_offset; - /* Check that it did not overflow. */ - new_offset.set (new_offset_int); - if (new_offset == new_offset_int && - featureParams.try_set (c, new_offset) && - !featureParams.sanitize (c, this, closure ? closure->tag : HB_TAG_NONE)) - return TRACE_RETURN (false); - } - - return TRACE_RETURN (true); - } - - OffsetTo<FeatureParams> - featureParams; /* Offset to Feature Parameters table (if one - * has been defined for the feature), relative - * to the beginning of the Feature Table; = Null - * if not required */ - IndexArray lookupIndex; /* Array of LookupList indices */ - public: - DEFINE_SIZE_ARRAY (4, lookupIndex); -}; - -typedef RecordListOf<Feature> FeatureList; - - -struct LookupFlag : USHORT -{ - enum Flags { - RightToLeft = 0x0001u, - IgnoreBaseGlyphs = 0x0002u, - IgnoreLigatures = 0x0004u, - IgnoreMarks = 0x0008u, - IgnoreFlags = 0x000Eu, - UseMarkFilteringSet = 0x0010u, - Reserved = 0x00E0u, - MarkAttachmentType = 0xFF00u - }; - public: - DEFINE_SIZE_STATIC (2); -}; - -struct Lookup -{ - inline unsigned int get_subtable_count (void) const { return subTable.len; } - - inline unsigned int get_type (void) const { return lookupType; } - - /* lookup_props is a 32-bit integer where the lower 16-bit is LookupFlag and - * higher 16-bit is mark-filtering-set if the lookup uses one. - * Not to be confused with glyph_props which is very similar. */ - inline uint32_t get_props (void) const - { - unsigned int flag = lookupFlag; - if (unlikely (flag & LookupFlag::UseMarkFilteringSet)) - { - const USHORT &markFilteringSet = StructAfter<USHORT> (subTable); - flag += (markFilteringSet << 16); - } - return flag; - } - - inline bool serialize (hb_serialize_context_t *c, - unsigned int lookup_type, - uint32_t lookup_props, - unsigned int num_subtables) - { - TRACE_SERIALIZE (this); - if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false); - lookupType.set (lookup_type); - lookupFlag.set (lookup_props & 0xFFFF); - if (unlikely (!subTable.serialize (c, num_subtables))) return TRACE_RETURN (false); - if (lookupFlag & LookupFlag::UseMarkFilteringSet) - { - USHORT &markFilteringSet = StructAfter<USHORT> (subTable); - markFilteringSet.set (lookup_props >> 16); - } - return TRACE_RETURN (true); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - /* Real sanitize of the subtables is done by GSUB/GPOS/... */ - if (!(c->check_struct (this) && subTable.sanitize (c))) return TRACE_RETURN (false); - if (lookupFlag & LookupFlag::UseMarkFilteringSet) - { - USHORT &markFilteringSet = StructAfter<USHORT> (subTable); - if (!markFilteringSet.sanitize (c)) return TRACE_RETURN (false); - } - return TRACE_RETURN (true); - } - - USHORT lookupType; /* Different enumerations for GSUB and GPOS */ - USHORT lookupFlag; /* Lookup qualifiers */ - ArrayOf<Offset> - subTable; /* Array of SubTables */ - USHORT markFilteringSetX[VAR]; /* Index (base 0) into GDEF mark glyph sets - * structure. This field is only present if bit - * UseMarkFilteringSet of lookup flags is set. */ - public: - DEFINE_SIZE_ARRAY2 (6, subTable, markFilteringSetX); -}; - -typedef OffsetListOf<Lookup> LookupList; - - -/* - * Coverage Table - */ - -struct CoverageFormat1 -{ - friend struct Coverage; - - private: - inline unsigned int get_coverage (hb_codepoint_t glyph_id) const - { - int i = glyphArray.search (glyph_id); - ASSERT_STATIC (((unsigned int) -1) == NOT_COVERED); - return i; - } - - inline bool serialize (hb_serialize_context_t *c, - Supplier<GlyphID> &glyphs, - unsigned int num_glyphs) - { - TRACE_SERIALIZE (this); - if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false); - glyphArray.len.set (num_glyphs); - if (unlikely (!c->extend (glyphArray))) return TRACE_RETURN (false); - for (unsigned int i = 0; i < num_glyphs; i++) - glyphArray[i] = glyphs[i]; - glyphs.advance (num_glyphs); - return TRACE_RETURN (true); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (glyphArray.sanitize (c)); - } - - inline bool intersects_coverage (const hb_set_t *glyphs, unsigned int index) const { - return glyphs->has (glyphArray[index]); - } - - template <typename set_t> - inline void add_coverage (set_t *glyphs) const { - unsigned int count = glyphArray.len; - for (unsigned int i = 0; i < count; i++) - glyphs->add (glyphArray[i]); - } - - public: - /* Older compilers need this to be public. */ - struct Iter { - inline void init (const struct CoverageFormat1 &c_) { c = &c_; i = 0; }; - inline bool more (void) { return i < c->glyphArray.len; } - inline void next (void) { i++; } - inline uint16_t get_glyph (void) { return c->glyphArray[i]; } - inline uint16_t get_coverage (void) { return i; } - - private: - const struct CoverageFormat1 *c; - unsigned int i; - }; - private: - - protected: - USHORT coverageFormat; /* Format identifier--format = 1 */ - SortedArrayOf<GlyphID> - glyphArray; /* Array of GlyphIDs--in numerical order */ - public: - DEFINE_SIZE_ARRAY (4, glyphArray); -}; - -struct CoverageFormat2 -{ - friend struct Coverage; - - private: - inline unsigned int get_coverage (hb_codepoint_t glyph_id) const - { - int i = rangeRecord.search (glyph_id); - if (i != -1) { - const RangeRecord &range = rangeRecord[i]; - return (unsigned int) range.value + (glyph_id - range.start); - } - return NOT_COVERED; - } - - inline bool serialize (hb_serialize_context_t *c, - Supplier<GlyphID> &glyphs, - unsigned int num_glyphs) - { - TRACE_SERIALIZE (this); - if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false); - - if (unlikely (!num_glyphs)) return TRACE_RETURN (true); - - unsigned int num_ranges = 1; - for (unsigned int i = 1; i < num_glyphs; i++) - if (glyphs[i - 1] + 1 != glyphs[i]) - num_ranges++; - rangeRecord.len.set (num_ranges); - if (unlikely (!c->extend (rangeRecord))) return TRACE_RETURN (false); - - unsigned int range = 0; - rangeRecord[range].start = glyphs[0]; - rangeRecord[range].value.set (0); - for (unsigned int i = 1; i < num_glyphs; i++) - if (glyphs[i - 1] + 1 != glyphs[i]) { - range++; - rangeRecord[range].start = glyphs[i]; - rangeRecord[range].value.set (i); - rangeRecord[range].end = glyphs[i]; - } else { - rangeRecord[range].end = glyphs[i]; - } - glyphs.advance (num_glyphs); - return TRACE_RETURN (true); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (rangeRecord.sanitize (c)); - } - - inline bool intersects_coverage (const hb_set_t *glyphs, unsigned int index) const { - unsigned int i; - unsigned int count = rangeRecord.len; - for (i = 0; i < count; i++) { - const RangeRecord &range = rangeRecord[i]; - if (range.value <= index && - index < (unsigned int) range.value + (range.end - range.start) && - range.intersects (glyphs)) - return true; - else if (index < range.value) - return false; - } - return false; - } - - template <typename set_t> - inline void add_coverage (set_t *glyphs) const { - unsigned int count = rangeRecord.len; - for (unsigned int i = 0; i < count; i++) - rangeRecord[i].add_coverage (glyphs); - } - - public: - /* Older compilers need this to be public. */ - struct Iter { - inline void init (const CoverageFormat2 &c_) { - c = &c_; - coverage = 0; - i = 0; - j = c->rangeRecord.len ? c_.rangeRecord[0].start : 0; - } - inline bool more (void) { return i < c->rangeRecord.len; } - inline void next (void) { - coverage++; - if (j == c->rangeRecord[i].end) { - i++; - if (more ()) - j = c->rangeRecord[i].start; - return; - } - j++; - } - inline uint16_t get_glyph (void) { return j; } - inline uint16_t get_coverage (void) { return coverage; } - - private: - const struct CoverageFormat2 *c; - unsigned int i, j, coverage; - }; - private: - - protected: - USHORT coverageFormat; /* Format identifier--format = 2 */ - SortedArrayOf<RangeRecord> - rangeRecord; /* Array of glyph ranges--ordered by - * Start GlyphID. rangeCount entries - * long */ - public: - DEFINE_SIZE_ARRAY (4, rangeRecord); -}; - -struct Coverage -{ - inline unsigned int get_coverage (hb_codepoint_t glyph_id) const - { - switch (u.format) { - case 1: return u.format1.get_coverage(glyph_id); - case 2: return u.format2.get_coverage(glyph_id); - default:return NOT_COVERED; - } - } - - inline bool serialize (hb_serialize_context_t *c, - Supplier<GlyphID> &glyphs, - unsigned int num_glyphs) - { - TRACE_SERIALIZE (this); - if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false); - unsigned int num_ranges = 1; - for (unsigned int i = 1; i < num_glyphs; i++) - if (glyphs[i - 1] + 1 != glyphs[i]) - num_ranges++; - u.format.set (num_glyphs * 2 < num_ranges * 3 ? 1 : 2); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.serialize (c, glyphs, num_glyphs)); - case 2: return TRACE_RETURN (u.format2.serialize (c, glyphs, num_glyphs)); - default:return TRACE_RETURN (false); - } - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!u.format.sanitize (c)) return TRACE_RETURN (false); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.sanitize (c)); - case 2: return TRACE_RETURN (u.format2.sanitize (c)); - default:return TRACE_RETURN (true); - } - } - - inline bool intersects (const hb_set_t *glyphs) const { - /* TODO speed this up */ - Coverage::Iter iter; - for (iter.init (*this); iter.more (); iter.next ()) { - if (glyphs->has (iter.get_glyph ())) - return true; - } - return false; - } - - inline bool intersects_coverage (const hb_set_t *glyphs, unsigned int index) const { - switch (u.format) { - case 1: return u.format1.intersects_coverage (glyphs, index); - case 2: return u.format2.intersects_coverage (glyphs, index); - default:return false; - } - } - - template <typename set_t> - inline void add_coverage (set_t *glyphs) const { - switch (u.format) { - case 1: u.format1.add_coverage (glyphs); break; - case 2: u.format2.add_coverage (glyphs); break; - default: break; - } - } - - struct Iter { - Iter (void) : format (0) {}; - inline void init (const Coverage &c_) { - format = c_.u.format; - switch (format) { - case 1: return u.format1.init (c_.u.format1); - case 2: return u.format2.init (c_.u.format2); - default:return; - } - } - inline bool more (void) { - switch (format) { - case 1: return u.format1.more (); - case 2: return u.format2.more (); - default:return true; - } - } - inline void next (void) { - switch (format) { - case 1: u.format1.next (); break; - case 2: u.format2.next (); break; - default: break; - } - } - inline uint16_t get_glyph (void) { - switch (format) { - case 1: return u.format1.get_glyph (); - case 2: return u.format2.get_glyph (); - default:return true; - } - } - inline uint16_t get_coverage (void) { - switch (format) { - case 1: return u.format1.get_coverage (); - case 2: return u.format2.get_coverage (); - default:return true; - } - } - - private: - unsigned int format; - union { - CoverageFormat1::Iter format1; - CoverageFormat2::Iter format2; - } u; - }; - - protected: - union { - USHORT format; /* Format identifier */ - CoverageFormat1 format1; - CoverageFormat2 format2; - } u; - public: - DEFINE_SIZE_UNION (2, format); -}; - - -/* - * Class Definition Table - */ - -struct ClassDefFormat1 -{ - friend struct ClassDef; - - private: - inline unsigned int get_class (hb_codepoint_t glyph_id) const - { - if (unlikely ((unsigned int) (glyph_id - startGlyph) < classValue.len)) - return classValue[glyph_id - startGlyph]; - return 0; - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this) && classValue.sanitize (c)); - } - - template <typename set_t> - inline void add_class (set_t *glyphs, unsigned int klass) const { - unsigned int count = classValue.len; - for (unsigned int i = 0; i < count; i++) - if (classValue[i] == klass) - glyphs->add (startGlyph + i); - } - - inline bool intersects_class (const hb_set_t *glyphs, unsigned int klass) const { - unsigned int count = classValue.len; - for (unsigned int i = 0; i < count; i++) - if (classValue[i] == klass && glyphs->has (startGlyph + i)) - return true; - return false; - } - - protected: - USHORT classFormat; /* Format identifier--format = 1 */ - GlyphID startGlyph; /* First GlyphID of the classValueArray */ - ArrayOf<USHORT> - classValue; /* Array of Class Values--one per GlyphID */ - public: - DEFINE_SIZE_ARRAY (6, classValue); -}; - -struct ClassDefFormat2 -{ - friend struct ClassDef; - - private: - inline unsigned int get_class (hb_codepoint_t glyph_id) const - { - int i = rangeRecord.search (glyph_id); - if (i != -1) - return rangeRecord[i].value; - return 0; - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (rangeRecord.sanitize (c)); - } - - template <typename set_t> - inline void add_class (set_t *glyphs, unsigned int klass) const { - unsigned int count = rangeRecord.len; - for (unsigned int i = 0; i < count; i++) - if (rangeRecord[i].value == klass) - rangeRecord[i].add_coverage (glyphs); - } - - inline bool intersects_class (const hb_set_t *glyphs, unsigned int klass) const { - unsigned int count = rangeRecord.len; - for (unsigned int i = 0; i < count; i++) - if (rangeRecord[i].value == klass && rangeRecord[i].intersects (glyphs)) - return true; - return false; - } - - protected: - USHORT classFormat; /* Format identifier--format = 2 */ - SortedArrayOf<RangeRecord> - rangeRecord; /* Array of glyph ranges--ordered by - * Start GlyphID */ - public: - DEFINE_SIZE_ARRAY (4, rangeRecord); -}; - -struct ClassDef -{ - inline unsigned int get_class (hb_codepoint_t glyph_id) const - { - switch (u.format) { - case 1: return u.format1.get_class(glyph_id); - case 2: return u.format2.get_class(glyph_id); - default:return 0; - } - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!u.format.sanitize (c)) return TRACE_RETURN (false); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.sanitize (c)); - case 2: return TRACE_RETURN (u.format2.sanitize (c)); - default:return TRACE_RETURN (true); - } - } - - inline void add_class (hb_set_t *glyphs, unsigned int klass) const { - switch (u.format) { - case 1: u.format1.add_class (glyphs, klass); return; - case 2: u.format2.add_class (glyphs, klass); return; - default:return; - } - } - - inline bool intersects_class (const hb_set_t *glyphs, unsigned int klass) const { - switch (u.format) { - case 1: return u.format1.intersects_class (glyphs, klass); - case 2: return u.format2.intersects_class (glyphs, klass); - default:return false; - } - } - - protected: - union { - USHORT format; /* Format identifier */ - ClassDefFormat1 format1; - ClassDefFormat2 format2; - } u; - public: - DEFINE_SIZE_UNION (2, format); -}; - - -/* - * Device Tables - */ - -struct Device -{ - - inline hb_position_t get_x_delta (hb_font_t *font) const - { return get_delta (font->x_ppem, font->x_scale); } - - inline hb_position_t get_y_delta (hb_font_t *font) const - { return get_delta (font->y_ppem, font->y_scale); } - - inline int get_delta (unsigned int ppem, int scale) const - { - if (!ppem) return 0; - - int pixels = get_delta_pixels (ppem); - - if (!pixels) return 0; - - return pixels * (int64_t) scale / ppem; - } - - - inline int get_delta_pixels (unsigned int ppem_size) const - { - unsigned int f = deltaFormat; - if (unlikely (f < 1 || f > 3)) - return 0; - - if (ppem_size < startSize || ppem_size > endSize) - return 0; - - unsigned int s = ppem_size - startSize; - - unsigned int byte = deltaValue[s >> (4 - f)]; - unsigned int bits = (byte >> (16 - (((s & ((1 << (4 - f)) - 1)) + 1) << f))); - unsigned int mask = (0xFFFF >> (16 - (1 << f))); - - int delta = bits & mask; - - if ((unsigned int) delta >= ((mask + 1) >> 1)) - delta -= mask + 1; - - return delta; - } - - inline unsigned int get_size (void) const - { - unsigned int f = deltaFormat; - if (unlikely (f < 1 || f > 3 || startSize > endSize)) return 3 * USHORT::static_size; - return USHORT::static_size * (4 + ((endSize - startSize) >> (4 - f))); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this) && c->check_range (this, this->get_size ())); - } - - protected: - USHORT startSize; /* Smallest size to correct--in ppem */ - USHORT endSize; /* Largest size to correct--in ppem */ - USHORT deltaFormat; /* Format of DeltaValue array data: 1, 2, or 3 - * 1 Signed 2-bit value, 8 values per uint16 - * 2 Signed 4-bit value, 4 values per uint16 - * 3 Signed 8-bit value, 2 values per uint16 - */ - USHORT deltaValue[VAR]; /* Array of compressed data */ - public: - DEFINE_SIZE_ARRAY (6, deltaValue); -}; - - -} /* namespace OT */ - - -#endif /* HB_OT_LAYOUT_COMMON_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout-gdef-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout-gdef-table.hh deleted file mode 100644 index ff2d09c51f0..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout-gdef-table.hh +++ /dev/null @@ -1,431 +0,0 @@ -/* - * Copyright © 2007,2008,2009 Red Hat, Inc. - * Copyright © 2010,2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_LAYOUT_GDEF_TABLE_HH -#define HB_OT_LAYOUT_GDEF_TABLE_HH - -#include "hb-ot-layout-common-private.hh" - -#include "hb-font-private.hh" - - -namespace OT { - - -/* - * Attachment List Table - */ - -typedef ArrayOf<USHORT> AttachPoint; /* Array of contour point indices--in - * increasing numerical order */ - -struct AttachList -{ - inline unsigned int get_attach_points (hb_codepoint_t glyph_id, - unsigned int start_offset, - unsigned int *point_count /* IN/OUT */, - unsigned int *point_array /* OUT */) const - { - unsigned int index = (this+coverage).get_coverage (glyph_id); - if (index == NOT_COVERED) - { - if (point_count) - *point_count = 0; - return 0; - } - - const AttachPoint &points = this+attachPoint[index]; - - if (point_count) { - const USHORT *array = points.sub_array (start_offset, point_count); - unsigned int count = *point_count; - for (unsigned int i = 0; i < count; i++) - point_array[i] = array[i]; - } - - return points.len; - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (coverage.sanitize (c, this) && attachPoint.sanitize (c, this)); - } - - protected: - OffsetTo<Coverage> - coverage; /* Offset to Coverage table -- from - * beginning of AttachList table */ - OffsetArrayOf<AttachPoint> - attachPoint; /* Array of AttachPoint tables - * in Coverage Index order */ - public: - DEFINE_SIZE_ARRAY (4, attachPoint); -}; - -/* - * Ligature Caret Table - */ - -struct CaretValueFormat1 -{ - friend struct CaretValue; - - private: - inline hb_position_t get_caret_value (hb_font_t *font, hb_direction_t direction, hb_codepoint_t glyph_id HB_UNUSED) const - { - return HB_DIRECTION_IS_HORIZONTAL (direction) ? font->em_scale_x (coordinate) : font->em_scale_y (coordinate); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this)); - } - - protected: - USHORT caretValueFormat; /* Format identifier--format = 1 */ - SHORT coordinate; /* X or Y value, in design units */ - public: - DEFINE_SIZE_STATIC (4); -}; - -struct CaretValueFormat2 -{ - friend struct CaretValue; - - private: - inline hb_position_t get_caret_value (hb_font_t *font, hb_direction_t direction, hb_codepoint_t glyph_id) const - { - hb_position_t x, y; - if (font->get_glyph_contour_point_for_origin (glyph_id, caretValuePoint, direction, &x, &y)) - return HB_DIRECTION_IS_HORIZONTAL (direction) ? x : y; - else - return 0; - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this)); - } - - protected: - USHORT caretValueFormat; /* Format identifier--format = 2 */ - USHORT caretValuePoint; /* Contour point index on glyph */ - public: - DEFINE_SIZE_STATIC (4); -}; - -struct CaretValueFormat3 -{ - friend struct CaretValue; - - inline hb_position_t get_caret_value (hb_font_t *font, hb_direction_t direction, hb_codepoint_t glyph_id HB_UNUSED) const - { - return HB_DIRECTION_IS_HORIZONTAL (direction) ? - font->em_scale_x (coordinate) + (this+deviceTable).get_x_delta (font) : - font->em_scale_y (coordinate) + (this+deviceTable).get_y_delta (font); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this) && deviceTable.sanitize (c, this)); - } - - protected: - USHORT caretValueFormat; /* Format identifier--format = 3 */ - SHORT coordinate; /* X or Y value, in design units */ - OffsetTo<Device> - deviceTable; /* Offset to Device table for X or Y - * value--from beginning of CaretValue - * table */ - public: - DEFINE_SIZE_STATIC (6); -}; - -struct CaretValue -{ - inline hb_position_t get_caret_value (hb_font_t *font, hb_direction_t direction, hb_codepoint_t glyph_id) const - { - switch (u.format) { - case 1: return u.format1.get_caret_value (font, direction, glyph_id); - case 2: return u.format2.get_caret_value (font, direction, glyph_id); - case 3: return u.format3.get_caret_value (font, direction, glyph_id); - default:return 0; - } - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!u.format.sanitize (c)) return TRACE_RETURN (false); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.sanitize (c)); - case 2: return TRACE_RETURN (u.format2.sanitize (c)); - case 3: return TRACE_RETURN (u.format3.sanitize (c)); - default:return TRACE_RETURN (true); - } - } - - protected: - union { - USHORT format; /* Format identifier */ - CaretValueFormat1 format1; - CaretValueFormat2 format2; - CaretValueFormat3 format3; - } u; - public: - DEFINE_SIZE_UNION (2, format); -}; - -struct LigGlyph -{ - inline unsigned int get_lig_carets (hb_font_t *font, - hb_direction_t direction, - hb_codepoint_t glyph_id, - unsigned int start_offset, - unsigned int *caret_count /* IN/OUT */, - hb_position_t *caret_array /* OUT */) const - { - if (caret_count) { - const OffsetTo<CaretValue> *array = carets.sub_array (start_offset, caret_count); - unsigned int count = *caret_count; - for (unsigned int i = 0; i < count; i++) - caret_array[i] = (this+array[i]).get_caret_value (font, direction, glyph_id); - } - - return carets.len; - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (carets.sanitize (c, this)); - } - - protected: - OffsetArrayOf<CaretValue> - carets; /* Offset array of CaretValue tables - * --from beginning of LigGlyph table - * --in increasing coordinate order */ - public: - DEFINE_SIZE_ARRAY (2, carets); -}; - -struct LigCaretList -{ - inline unsigned int get_lig_carets (hb_font_t *font, - hb_direction_t direction, - hb_codepoint_t glyph_id, - unsigned int start_offset, - unsigned int *caret_count /* IN/OUT */, - hb_position_t *caret_array /* OUT */) const - { - unsigned int index = (this+coverage).get_coverage (glyph_id); - if (index == NOT_COVERED) - { - if (caret_count) - *caret_count = 0; - return 0; - } - const LigGlyph &lig_glyph = this+ligGlyph[index]; - return lig_glyph.get_lig_carets (font, direction, glyph_id, start_offset, caret_count, caret_array); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (coverage.sanitize (c, this) && ligGlyph.sanitize (c, this)); - } - - protected: - OffsetTo<Coverage> - coverage; /* Offset to Coverage table--from - * beginning of LigCaretList table */ - OffsetArrayOf<LigGlyph> - ligGlyph; /* Array of LigGlyph tables - * in Coverage Index order */ - public: - DEFINE_SIZE_ARRAY (4, ligGlyph); -}; - - -struct MarkGlyphSetsFormat1 -{ - inline bool covers (unsigned int set_index, hb_codepoint_t glyph_id) const - { return (this+coverage[set_index]).get_coverage (glyph_id) != NOT_COVERED; } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (coverage.sanitize (c, this)); - } - - protected: - USHORT format; /* Format identifier--format = 1 */ - LongOffsetArrayOf<Coverage> - coverage; /* Array of long offsets to mark set - * coverage tables */ - public: - DEFINE_SIZE_ARRAY (4, coverage); -}; - -struct MarkGlyphSets -{ - inline bool covers (unsigned int set_index, hb_codepoint_t glyph_id) const - { - switch (u.format) { - case 1: return u.format1.covers (set_index, glyph_id); - default:return false; - } - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!u.format.sanitize (c)) return TRACE_RETURN (false); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.sanitize (c)); - default:return TRACE_RETURN (true); - } - } - - protected: - union { - USHORT format; /* Format identifier */ - MarkGlyphSetsFormat1 format1; - } u; - public: - DEFINE_SIZE_UNION (2, format); -}; - - -/* - * GDEF -- The Glyph Definition Table - */ - -struct GDEF -{ - static const hb_tag_t Tag = HB_OT_TAG_GDEF; - - enum GlyphClasses { - UnclassifiedGlyph = 0, - BaseGlyph = 1, - LigatureGlyph = 2, - MarkGlyph = 3, - ComponentGlyph = 4 - }; - - inline bool has_glyph_classes (void) const { return glyphClassDef != 0; } - inline unsigned int get_glyph_class (hb_codepoint_t glyph) const - { return (this+glyphClassDef).get_class (glyph); } - inline void get_glyphs_in_class (unsigned int klass, hb_set_t *glyphs) const - { (this+glyphClassDef).add_class (glyphs, klass); } - - inline bool has_mark_attachment_types (void) const { return markAttachClassDef != 0; } - inline unsigned int get_mark_attachment_type (hb_codepoint_t glyph) const - { return (this+markAttachClassDef).get_class (glyph); } - - inline bool has_attach_points (void) const { return attachList != 0; } - inline unsigned int get_attach_points (hb_codepoint_t glyph_id, - unsigned int start_offset, - unsigned int *point_count /* IN/OUT */, - unsigned int *point_array /* OUT */) const - { return (this+attachList).get_attach_points (glyph_id, start_offset, point_count, point_array); } - - inline bool has_lig_carets (void) const { return ligCaretList != 0; } - inline unsigned int get_lig_carets (hb_font_t *font, - hb_direction_t direction, - hb_codepoint_t glyph_id, - unsigned int start_offset, - unsigned int *caret_count /* IN/OUT */, - hb_position_t *caret_array /* OUT */) const - { return (this+ligCaretList).get_lig_carets (font, direction, glyph_id, start_offset, caret_count, caret_array); } - - inline bool has_mark_sets (void) const { return version.to_int () >= 0x00010002 && markGlyphSetsDef[0] != 0; } - inline bool mark_set_covers (unsigned int set_index, hb_codepoint_t glyph_id) const - { return version.to_int () >= 0x00010002 && (this+markGlyphSetsDef[0]).covers (set_index, glyph_id); } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (version.sanitize (c) && - likely (version.major == 1) && - glyphClassDef.sanitize (c, this) && - attachList.sanitize (c, this) && - ligCaretList.sanitize (c, this) && - markAttachClassDef.sanitize (c, this) && - (version.to_int () < 0x00010002 || markGlyphSetsDef[0].sanitize (c, this))); - } - - - /* glyph_props is a 16-bit integer where the lower 8-bit have bits representing - * glyph class and other bits, and high 8-bit gthe mark attachment type (if any). - * Not to be confused with lookup_props which is very similar. */ - inline unsigned int get_glyph_props (hb_codepoint_t glyph) const - { - unsigned int klass = get_glyph_class (glyph); - - switch (klass) { - default: - case UnclassifiedGlyph: return HB_OT_LAYOUT_GLYPH_PROPS_UNCLASSIFIED; - case BaseGlyph: return HB_OT_LAYOUT_GLYPH_PROPS_BASE_GLYPH; - case LigatureGlyph: return HB_OT_LAYOUT_GLYPH_PROPS_LIGATURE; - case ComponentGlyph: return HB_OT_LAYOUT_GLYPH_PROPS_COMPONENT; - case MarkGlyph: - klass = get_mark_attachment_type (glyph); - return HB_OT_LAYOUT_GLYPH_PROPS_MARK | (klass << 8); - } - } - - - protected: - FixedVersion version; /* Version of the GDEF table--currently - * 0x00010002 */ - OffsetTo<ClassDef> - glyphClassDef; /* Offset to class definition table - * for glyph type--from beginning of - * GDEF header (may be Null) */ - OffsetTo<AttachList> - attachList; /* Offset to list of glyphs with - * attachment points--from beginning - * of GDEF header (may be Null) */ - OffsetTo<LigCaretList> - ligCaretList; /* Offset to list of positioning points - * for ligature carets--from beginning - * of GDEF header (may be Null) */ - OffsetTo<ClassDef> - markAttachClassDef; /* Offset to class definition table for - * mark attachment type--from beginning - * of GDEF header (may be Null) */ - OffsetTo<MarkGlyphSets> - markGlyphSetsDef[VAR]; /* Offset to the table of mark set - * definitions--from beginning of GDEF - * header (may be NULL). Introduced - * in version 00010002. */ - public: - DEFINE_SIZE_ARRAY (12, markGlyphSetsDef); -}; - - -} /* namespace OT */ - - -#endif /* HB_OT_LAYOUT_GDEF_TABLE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout-gpos-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout-gpos-table.hh deleted file mode 100644 index 44139277c68..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout-gpos-table.hh +++ /dev/null @@ -1,1648 +0,0 @@ -/* - * Copyright © 2007,2008,2009,2010 Red Hat, Inc. - * Copyright © 2010,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_LAYOUT_GPOS_TABLE_HH -#define HB_OT_LAYOUT_GPOS_TABLE_HH - -#include "hb-ot-layout-gsubgpos-private.hh" - - -namespace OT { - - -/* buffer **position** var allocations */ -#define attach_lookback() var.u16[0] /* number of glyphs to go back to attach this glyph to its base */ -#define cursive_chain() var.i16[1] /* character to which this connects, may be positive or negative */ - - -/* Shared Tables: ValueRecord, Anchor Table, and MarkArray */ - -typedef USHORT Value; - -typedef Value ValueRecord[VAR]; - -struct ValueFormat : USHORT -{ - enum Flags { - xPlacement = 0x0001, /* Includes horizontal adjustment for placement */ - yPlacement = 0x0002, /* Includes vertical adjustment for placement */ - xAdvance = 0x0004, /* Includes horizontal adjustment for advance */ - yAdvance = 0x0008, /* Includes vertical adjustment for advance */ - xPlaDevice = 0x0010, /* Includes horizontal Device table for placement */ - yPlaDevice = 0x0020, /* Includes vertical Device table for placement */ - xAdvDevice = 0x0040, /* Includes horizontal Device table for advance */ - yAdvDevice = 0x0080, /* Includes vertical Device table for advance */ - ignored = 0x0F00, /* Was used in TrueType Open for MM fonts */ - reserved = 0xF000, /* For future use */ - - devices = 0x00F0 /* Mask for having any Device table */ - }; - -/* All fields are options. Only those available advance the value pointer. */ -#if 0 - SHORT xPlacement; /* Horizontal adjustment for - * placement--in design units */ - SHORT yPlacement; /* Vertical adjustment for - * placement--in design units */ - SHORT xAdvance; /* Horizontal adjustment for - * advance--in design units (only used - * for horizontal writing) */ - SHORT yAdvance; /* Vertical adjustment for advance--in - * design units (only used for vertical - * writing) */ - Offset xPlaDevice; /* Offset to Device table for - * horizontal placement--measured from - * beginning of PosTable (may be NULL) */ - Offset yPlaDevice; /* Offset to Device table for vertical - * placement--measured from beginning - * of PosTable (may be NULL) */ - Offset xAdvDevice; /* Offset to Device table for - * horizontal advance--measured from - * beginning of PosTable (may be NULL) */ - Offset yAdvDevice; /* Offset to Device table for vertical - * advance--measured from beginning of - * PosTable (may be NULL) */ -#endif - - inline unsigned int get_len (void) const - { return _hb_popcount32 ((unsigned int) *this); } - inline unsigned int get_size (void) const - { return get_len () * Value::static_size; } - - void apply_value (hb_font_t *font, - hb_direction_t direction, - const void *base, - const Value *values, - hb_glyph_position_t &glyph_pos) const - { - unsigned int x_ppem, y_ppem; - unsigned int format = *this; - hb_bool_t horizontal = HB_DIRECTION_IS_HORIZONTAL (direction); - - if (!format) return; - - if (format & xPlacement) glyph_pos.x_offset += font->em_scale_x (get_short (values++)); - if (format & yPlacement) glyph_pos.y_offset += font->em_scale_y (get_short (values++)); - if (format & xAdvance) { - if (likely (horizontal)) glyph_pos.x_advance += font->em_scale_x (get_short (values++)); else values++; - } - /* y_advance values grow downward but font-space grows upward, hence negation */ - if (format & yAdvance) { - if (unlikely (!horizontal)) glyph_pos.y_advance -= font->em_scale_y (get_short (values++)); else values++; - } - - if (!has_device ()) return; - - x_ppem = font->x_ppem; - y_ppem = font->y_ppem; - - if (!x_ppem && !y_ppem) return; - - /* pixel -> fractional pixel */ - if (format & xPlaDevice) { - if (x_ppem) glyph_pos.x_offset += (base + get_device (values++)).get_x_delta (font); else values++; - } - if (format & yPlaDevice) { - if (y_ppem) glyph_pos.y_offset += (base + get_device (values++)).get_y_delta (font); else values++; - } - if (format & xAdvDevice) { - if (horizontal && x_ppem) glyph_pos.x_advance += (base + get_device (values++)).get_x_delta (font); else values++; - } - if (format & yAdvDevice) { - /* y_advance values grow downward but font-space grows upward, hence negation */ - if (!horizontal && y_ppem) glyph_pos.y_advance -= (base + get_device (values++)).get_y_delta (font); else values++; - } - } - - private: - inline bool sanitize_value_devices (hb_sanitize_context_t *c, void *base, Value *values) { - unsigned int format = *this; - - if (format & xPlacement) values++; - if (format & yPlacement) values++; - if (format & xAdvance) values++; - if (format & yAdvance) values++; - - if ((format & xPlaDevice) && !get_device (values++).sanitize (c, base)) return false; - if ((format & yPlaDevice) && !get_device (values++).sanitize (c, base)) return false; - if ((format & xAdvDevice) && !get_device (values++).sanitize (c, base)) return false; - if ((format & yAdvDevice) && !get_device (values++).sanitize (c, base)) return false; - - return true; - } - - static inline OffsetTo<Device>& get_device (Value* value) - { return *CastP<OffsetTo<Device> > (value); } - static inline const OffsetTo<Device>& get_device (const Value* value) - { return *CastP<OffsetTo<Device> > (value); } - - static inline const SHORT& get_short (const Value* value) - { return *CastP<SHORT> (value); } - - public: - - inline bool has_device (void) const { - unsigned int format = *this; - return (format & devices) != 0; - } - - inline bool sanitize_value (hb_sanitize_context_t *c, void *base, Value *values) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_range (values, get_size ()) && (!has_device () || sanitize_value_devices (c, base, values))); - } - - inline bool sanitize_values (hb_sanitize_context_t *c, void *base, Value *values, unsigned int count) { - TRACE_SANITIZE (this); - unsigned int len = get_len (); - - if (!c->check_array (values, get_size (), count)) return TRACE_RETURN (false); - - if (!has_device ()) return TRACE_RETURN (true); - - for (unsigned int i = 0; i < count; i++) { - if (!sanitize_value_devices (c, base, values)) - return TRACE_RETURN (false); - values += len; - } - - return TRACE_RETURN (true); - } - - /* Just sanitize referenced Device tables. Doesn't check the values themselves. */ - inline bool sanitize_values_stride_unsafe (hb_sanitize_context_t *c, void *base, Value *values, unsigned int count, unsigned int stride) { - TRACE_SANITIZE (this); - - if (!has_device ()) return TRACE_RETURN (true); - - for (unsigned int i = 0; i < count; i++) { - if (!sanitize_value_devices (c, base, values)) - return TRACE_RETURN (false); - values += stride; - } - - return TRACE_RETURN (true); - } -}; - - -struct AnchorFormat1 -{ - inline void get_anchor (hb_font_t *font, hb_codepoint_t glyph_id HB_UNUSED, - hb_position_t *x, hb_position_t *y) const - { - *x = font->em_scale_x (xCoordinate); - *y = font->em_scale_y (yCoordinate); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this)); - } - - protected: - USHORT format; /* Format identifier--format = 1 */ - SHORT xCoordinate; /* Horizontal value--in design units */ - SHORT yCoordinate; /* Vertical value--in design units */ - public: - DEFINE_SIZE_STATIC (6); -}; - -struct AnchorFormat2 -{ - inline void get_anchor (hb_font_t *font, hb_codepoint_t glyph_id, - hb_position_t *x, hb_position_t *y) const - { - unsigned int x_ppem = font->x_ppem; - unsigned int y_ppem = font->y_ppem; - hb_position_t cx, cy; - hb_bool_t ret = false; - - if (x_ppem || y_ppem) - ret = font->get_glyph_contour_point_for_origin (glyph_id, anchorPoint, HB_DIRECTION_LTR, &cx, &cy); - *x = x_ppem && ret ? cx : font->em_scale_x (xCoordinate); - *y = y_ppem && ret ? cy : font->em_scale_y (yCoordinate); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this)); - } - - protected: - USHORT format; /* Format identifier--format = 2 */ - SHORT xCoordinate; /* Horizontal value--in design units */ - SHORT yCoordinate; /* Vertical value--in design units */ - USHORT anchorPoint; /* Index to glyph contour point */ - public: - DEFINE_SIZE_STATIC (8); -}; - -struct AnchorFormat3 -{ - inline void get_anchor (hb_font_t *font, hb_codepoint_t glyph_id HB_UNUSED, - hb_position_t *x, hb_position_t *y) const - { - *x = font->em_scale_x (xCoordinate); - *y = font->em_scale_y (yCoordinate); - - if (font->x_ppem) - *x += (this+xDeviceTable).get_x_delta (font); - if (font->y_ppem) - *y += (this+yDeviceTable).get_x_delta (font); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this) && xDeviceTable.sanitize (c, this) && yDeviceTable.sanitize (c, this)); - } - - protected: - USHORT format; /* Format identifier--format = 3 */ - SHORT xCoordinate; /* Horizontal value--in design units */ - SHORT yCoordinate; /* Vertical value--in design units */ - OffsetTo<Device> - xDeviceTable; /* Offset to Device table for X - * coordinate-- from beginning of - * Anchor table (may be NULL) */ - OffsetTo<Device> - yDeviceTable; /* Offset to Device table for Y - * coordinate-- from beginning of - * Anchor table (may be NULL) */ - public: - DEFINE_SIZE_STATIC (10); -}; - -struct Anchor -{ - inline void get_anchor (hb_font_t *font, hb_codepoint_t glyph_id, - hb_position_t *x, hb_position_t *y) const - { - *x = *y = 0; - switch (u.format) { - case 1: u.format1.get_anchor (font, glyph_id, x, y); return; - case 2: u.format2.get_anchor (font, glyph_id, x, y); return; - case 3: u.format3.get_anchor (font, glyph_id, x, y); return; - default: return; - } - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!u.format.sanitize (c)) return TRACE_RETURN (false); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.sanitize (c)); - case 2: return TRACE_RETURN (u.format2.sanitize (c)); - case 3: return TRACE_RETURN (u.format3.sanitize (c)); - default:return TRACE_RETURN (true); - } - } - - protected: - union { - USHORT format; /* Format identifier */ - AnchorFormat1 format1; - AnchorFormat2 format2; - AnchorFormat3 format3; - } u; - public: - DEFINE_SIZE_UNION (2, format); -}; - - -struct AnchorMatrix -{ - inline const Anchor& get_anchor (unsigned int row, unsigned int col, unsigned int cols, bool *found) const { - *found = false; - if (unlikely (row >= rows || col >= cols)) return Null(Anchor); - *found = !matrix[row * cols + col].is_null (); - return this+matrix[row * cols + col]; - } - - inline bool sanitize (hb_sanitize_context_t *c, unsigned int cols) { - TRACE_SANITIZE (this); - if (!c->check_struct (this)) return TRACE_RETURN (false); - if (unlikely (rows > 0 && cols >= ((unsigned int) -1) / rows)) return TRACE_RETURN (false); - unsigned int count = rows * cols; - if (!c->check_array (matrix, matrix[0].static_size, count)) return TRACE_RETURN (false); - for (unsigned int i = 0; i < count; i++) - if (!matrix[i].sanitize (c, this)) return TRACE_RETURN (false); - return TRACE_RETURN (true); - } - - USHORT rows; /* Number of rows */ - protected: - OffsetTo<Anchor> - matrix[VAR]; /* Matrix of offsets to Anchor tables-- - * from beginning of AnchorMatrix table */ - public: - DEFINE_SIZE_ARRAY (2, matrix); -}; - - -struct MarkRecord -{ - friend struct MarkArray; - - inline bool sanitize (hb_sanitize_context_t *c, void *base) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this) && markAnchor.sanitize (c, base)); - } - - protected: - USHORT klass; /* Class defined for this mark */ - OffsetTo<Anchor> - markAnchor; /* Offset to Anchor table--from - * beginning of MarkArray table */ - public: - DEFINE_SIZE_STATIC (4); -}; - -struct MarkArray : ArrayOf<MarkRecord> /* Array of MarkRecords--in Coverage order */ -{ - inline bool apply (hb_apply_context_t *c, - unsigned int mark_index, unsigned int glyph_index, - const AnchorMatrix &anchors, unsigned int class_count, - unsigned int glyph_pos) const - { - TRACE_APPLY (this); - const MarkRecord &record = ArrayOf<MarkRecord>::operator[](mark_index); - unsigned int mark_class = record.klass; - - const Anchor& mark_anchor = this + record.markAnchor; - bool found; - const Anchor& glyph_anchor = anchors.get_anchor (glyph_index, mark_class, class_count, &found); - /* If this subtable doesn't have an anchor for this base and this class, - * return false such that the subsequent subtables have a chance at it. */ - if (unlikely (!found)) return TRACE_RETURN (false); - - hb_position_t mark_x, mark_y, base_x, base_y; - - mark_anchor.get_anchor (c->font, c->buffer->cur().codepoint, &mark_x, &mark_y); - glyph_anchor.get_anchor (c->font, c->buffer->info[glyph_pos].codepoint, &base_x, &base_y); - - hb_glyph_position_t &o = c->buffer->cur_pos(); - o.x_offset = base_x - mark_x; - o.y_offset = base_y - mark_y; - o.attach_lookback() = c->buffer->idx - glyph_pos; - - c->buffer->idx++; - return TRACE_RETURN (true); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (ArrayOf<MarkRecord>::sanitize (c, this)); - } -}; - - -/* Lookups */ - -struct SinglePosFormat1 -{ - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - (this+coverage).add_coverage (c->input); - } - - inline const Coverage &get_coverage (void) const - { - return this+coverage; - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint); - if (likely (index == NOT_COVERED)) return TRACE_RETURN (false); - - valueFormat.apply_value (c->font, c->direction, this, - values, c->buffer->cur_pos()); - - c->buffer->idx++; - return TRACE_RETURN (true); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this) && coverage.sanitize (c, this) && valueFormat.sanitize_value (c, this, values)); - } - - protected: - USHORT format; /* Format identifier--format = 1 */ - OffsetTo<Coverage> - coverage; /* Offset to Coverage table--from - * beginning of subtable */ - ValueFormat valueFormat; /* Defines the types of data in the - * ValueRecord */ - ValueRecord values; /* Defines positioning - * value(s)--applied to all glyphs in - * the Coverage table */ - public: - DEFINE_SIZE_ARRAY (6, values); -}; - -struct SinglePosFormat2 -{ - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - (this+coverage).add_coverage (c->input); - } - - inline const Coverage &get_coverage (void) const - { - return this+coverage; - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint); - if (likely (index == NOT_COVERED)) return TRACE_RETURN (false); - - if (likely (index >= valueCount)) return TRACE_RETURN (false); - - valueFormat.apply_value (c->font, c->direction, this, - &values[index * valueFormat.get_len ()], - c->buffer->cur_pos()); - - c->buffer->idx++; - return TRACE_RETURN (true); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this) && coverage.sanitize (c, this) && valueFormat.sanitize_values (c, this, values, valueCount)); - } - - protected: - USHORT format; /* Format identifier--format = 2 */ - OffsetTo<Coverage> - coverage; /* Offset to Coverage table--from - * beginning of subtable */ - ValueFormat valueFormat; /* Defines the types of data in the - * ValueRecord */ - USHORT valueCount; /* Number of ValueRecords */ - ValueRecord values; /* Array of ValueRecords--positioning - * values applied to glyphs */ - public: - DEFINE_SIZE_ARRAY (8, values); -}; - -struct SinglePos -{ - template <typename context_t> - inline typename context_t::return_t dispatch (context_t *c) const - { - TRACE_DISPATCH (this); - switch (u.format) { - case 1: return TRACE_RETURN (c->dispatch (u.format1)); - case 2: return TRACE_RETURN (c->dispatch (u.format2)); - default:return TRACE_RETURN (c->default_return_value ()); - } - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!u.format.sanitize (c)) return TRACE_RETURN (false); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.sanitize (c)); - case 2: return TRACE_RETURN (u.format2.sanitize (c)); - default:return TRACE_RETURN (true); - } - } - - protected: - union { - USHORT format; /* Format identifier */ - SinglePosFormat1 format1; - SinglePosFormat2 format2; - } u; -}; - - -struct PairValueRecord -{ - friend struct PairSet; - - protected: - GlyphID secondGlyph; /* GlyphID of second glyph in the - * pair--first glyph is listed in the - * Coverage table */ - ValueRecord values; /* Positioning data for the first glyph - * followed by for second glyph */ - public: - DEFINE_SIZE_ARRAY (2, values); -}; - -struct PairSet -{ - friend struct PairPosFormat1; - - inline void collect_glyphs (hb_collect_glyphs_context_t *c, - const ValueFormat *valueFormats) const - { - TRACE_COLLECT_GLYPHS (this); - unsigned int len1 = valueFormats[0].get_len (); - unsigned int len2 = valueFormats[1].get_len (); - unsigned int record_size = USHORT::static_size * (1 + len1 + len2); - - const PairValueRecord *record = CastP<PairValueRecord> (array); - unsigned int count = len; - for (unsigned int i = 0; i < count; i++) - { - c->input->add (record->secondGlyph); - record = &StructAtOffset<PairValueRecord> (record, record_size); - } - } - - inline bool apply (hb_apply_context_t *c, - const ValueFormat *valueFormats, - unsigned int pos) const - { - TRACE_APPLY (this); - unsigned int len1 = valueFormats[0].get_len (); - unsigned int len2 = valueFormats[1].get_len (); - unsigned int record_size = USHORT::static_size * (1 + len1 + len2); - - const PairValueRecord *record = CastP<PairValueRecord> (array); - unsigned int count = len; - for (unsigned int i = 0; i < count; i++) - { - /* TODO bsearch */ - if (c->buffer->info[pos].codepoint == record->secondGlyph) - { - valueFormats[0].apply_value (c->font, c->direction, this, - &record->values[0], c->buffer->cur_pos()); - valueFormats[1].apply_value (c->font, c->direction, this, - &record->values[len1], c->buffer->pos[pos]); - if (len2) - pos++; - c->buffer->idx = pos; - return TRACE_RETURN (true); - } - record = &StructAtOffset<PairValueRecord> (record, record_size); - } - - return TRACE_RETURN (false); - } - - struct sanitize_closure_t { - void *base; - ValueFormat *valueFormats; - unsigned int len1; /* valueFormats[0].get_len() */ - unsigned int stride; /* 1 + len1 + len2 */ - }; - - inline bool sanitize (hb_sanitize_context_t *c, const sanitize_closure_t *closure) { - TRACE_SANITIZE (this); - if (!(c->check_struct (this) - && c->check_array (array, USHORT::static_size * closure->stride, len))) return TRACE_RETURN (false); - - unsigned int count = len; - PairValueRecord *record = CastP<PairValueRecord> (array); - return TRACE_RETURN (closure->valueFormats[0].sanitize_values_stride_unsafe (c, closure->base, &record->values[0], count, closure->stride) - && closure->valueFormats[1].sanitize_values_stride_unsafe (c, closure->base, &record->values[closure->len1], count, closure->stride)); - } - - protected: - USHORT len; /* Number of PairValueRecords */ - USHORT array[VAR]; /* Array of PairValueRecords--ordered - * by GlyphID of the second glyph */ - public: - DEFINE_SIZE_ARRAY (2, array); -}; - -struct PairPosFormat1 -{ - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - (this+coverage).add_coverage (c->input); - unsigned int count = pairSet.len; - for (unsigned int i = 0; i < count; i++) - (this+pairSet[i]).collect_glyphs (c, &valueFormat1); - } - - inline const Coverage &get_coverage (void) const - { - return this+coverage; - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - hb_apply_context_t::skipping_forward_iterator_t skippy_iter (c, c->buffer->idx, 1); - if (skippy_iter.has_no_chance ()) return TRACE_RETURN (false); - - unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint); - if (likely (index == NOT_COVERED)) return TRACE_RETURN (false); - - if (!skippy_iter.next ()) return TRACE_RETURN (false); - - return TRACE_RETURN ((this+pairSet[index]).apply (c, &valueFormat1, skippy_iter.idx)); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - - unsigned int len1 = valueFormat1.get_len (); - unsigned int len2 = valueFormat2.get_len (); - PairSet::sanitize_closure_t closure = { - this, - &valueFormat1, - len1, - 1 + len1 + len2 - }; - - return TRACE_RETURN (c->check_struct (this) && coverage.sanitize (c, this) && pairSet.sanitize (c, this, &closure)); - } - - protected: - USHORT format; /* Format identifier--format = 1 */ - OffsetTo<Coverage> - coverage; /* Offset to Coverage table--from - * beginning of subtable */ - ValueFormat valueFormat1; /* Defines the types of data in - * ValueRecord1--for the first glyph - * in the pair--may be zero (0) */ - ValueFormat valueFormat2; /* Defines the types of data in - * ValueRecord2--for the second glyph - * in the pair--may be zero (0) */ - OffsetArrayOf<PairSet> - pairSet; /* Array of PairSet tables - * ordered by Coverage Index */ - public: - DEFINE_SIZE_ARRAY (10, pairSet); -}; - -struct PairPosFormat2 -{ - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - /* (this+coverage).add_coverage (c->input); // Don't need this. */ - - /* TODO only add values for pairs that have nonzero adjustments. */ - - unsigned int count1 = class1Count; - const ClassDef &klass1 = this+classDef1; - for (unsigned int i = 0; i < count1; i++) - klass1.add_class (c->input, i); - - unsigned int count2 = class2Count; - const ClassDef &klass2 = this+classDef2; - for (unsigned int i = 0; i < count2; i++) - klass2.add_class (c->input, i); - } - - inline const Coverage &get_coverage (void) const - { - return this+coverage; - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - hb_apply_context_t::skipping_forward_iterator_t skippy_iter (c, c->buffer->idx, 1); - if (skippy_iter.has_no_chance ()) return TRACE_RETURN (false); - - unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint); - if (likely (index == NOT_COVERED)) return TRACE_RETURN (false); - - if (!skippy_iter.next ()) return TRACE_RETURN (false); - - unsigned int len1 = valueFormat1.get_len (); - unsigned int len2 = valueFormat2.get_len (); - unsigned int record_len = len1 + len2; - - unsigned int klass1 = (this+classDef1).get_class (c->buffer->cur().codepoint); - unsigned int klass2 = (this+classDef2).get_class (c->buffer->info[skippy_iter.idx].codepoint); - if (unlikely (klass1 >= class1Count || klass2 >= class2Count)) return TRACE_RETURN (false); - - const Value *v = &values[record_len * (klass1 * class2Count + klass2)]; - valueFormat1.apply_value (c->font, c->direction, this, - v, c->buffer->cur_pos()); - valueFormat2.apply_value (c->font, c->direction, this, - v + len1, c->buffer->pos[skippy_iter.idx]); - - c->buffer->idx = skippy_iter.idx; - if (len2) - c->buffer->idx++; - - return TRACE_RETURN (true); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!(c->check_struct (this) - && coverage.sanitize (c, this) - && classDef1.sanitize (c, this) - && classDef2.sanitize (c, this))) return TRACE_RETURN (false); - - unsigned int len1 = valueFormat1.get_len (); - unsigned int len2 = valueFormat2.get_len (); - unsigned int stride = len1 + len2; - unsigned int record_size = valueFormat1.get_size () + valueFormat2.get_size (); - unsigned int count = (unsigned int) class1Count * (unsigned int) class2Count; - return TRACE_RETURN (c->check_array (values, record_size, count) && - valueFormat1.sanitize_values_stride_unsafe (c, this, &values[0], count, stride) && - valueFormat2.sanitize_values_stride_unsafe (c, this, &values[len1], count, stride)); - } - - protected: - USHORT format; /* Format identifier--format = 2 */ - OffsetTo<Coverage> - coverage; /* Offset to Coverage table--from - * beginning of subtable */ - ValueFormat valueFormat1; /* ValueRecord definition--for the - * first glyph of the pair--may be zero - * (0) */ - ValueFormat valueFormat2; /* ValueRecord definition--for the - * second glyph of the pair--may be - * zero (0) */ - OffsetTo<ClassDef> - classDef1; /* Offset to ClassDef table--from - * beginning of PairPos subtable--for - * the first glyph of the pair */ - OffsetTo<ClassDef> - classDef2; /* Offset to ClassDef table--from - * beginning of PairPos subtable--for - * the second glyph of the pair */ - USHORT class1Count; /* Number of classes in ClassDef1 - * table--includes Class0 */ - USHORT class2Count; /* Number of classes in ClassDef2 - * table--includes Class0 */ - ValueRecord values; /* Matrix of value pairs: - * class1-major, class2-minor, - * Each entry has value1 and value2 */ - public: - DEFINE_SIZE_ARRAY (16, values); -}; - -struct PairPos -{ - template <typename context_t> - inline typename context_t::return_t dispatch (context_t *c) const - { - TRACE_DISPATCH (this); - switch (u.format) { - case 1: return TRACE_RETURN (c->dispatch (u.format1)); - case 2: return TRACE_RETURN (c->dispatch (u.format2)); - default:return TRACE_RETURN (c->default_return_value ()); - } - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!u.format.sanitize (c)) return TRACE_RETURN (false); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.sanitize (c)); - case 2: return TRACE_RETURN (u.format2.sanitize (c)); - default:return TRACE_RETURN (true); - } - } - - protected: - union { - USHORT format; /* Format identifier */ - PairPosFormat1 format1; - PairPosFormat2 format2; - } u; -}; - - -struct EntryExitRecord -{ - friend struct CursivePosFormat1; - - inline bool sanitize (hb_sanitize_context_t *c, void *base) { - TRACE_SANITIZE (this); - return TRACE_RETURN (entryAnchor.sanitize (c, base) && exitAnchor.sanitize (c, base)); - } - - protected: - OffsetTo<Anchor> - entryAnchor; /* Offset to EntryAnchor table--from - * beginning of CursivePos - * subtable--may be NULL */ - OffsetTo<Anchor> - exitAnchor; /* Offset to ExitAnchor table--from - * beginning of CursivePos - * subtable--may be NULL */ - public: - DEFINE_SIZE_STATIC (4); -}; - -struct CursivePosFormat1 -{ - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - (this+coverage).add_coverage (c->input); - } - - inline const Coverage &get_coverage (void) const - { - return this+coverage; - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - - /* We don't handle mark glyphs here. */ - if (c->buffer->cur().glyph_props() & HB_OT_LAYOUT_GLYPH_PROPS_MARK) return TRACE_RETURN (false); - - hb_apply_context_t::skipping_forward_iterator_t skippy_iter (c, c->buffer->idx, 1); - if (skippy_iter.has_no_chance ()) return TRACE_RETURN (false); - - const EntryExitRecord &this_record = entryExitRecord[(this+coverage).get_coverage (c->buffer->cur().codepoint)]; - if (!this_record.exitAnchor) return TRACE_RETURN (false); - - if (!skippy_iter.next ()) return TRACE_RETURN (false); - - const EntryExitRecord &next_record = entryExitRecord[(this+coverage).get_coverage (c->buffer->info[skippy_iter.idx].codepoint)]; - if (!next_record.entryAnchor) return TRACE_RETURN (false); - - unsigned int i = c->buffer->idx; - unsigned int j = skippy_iter.idx; - - hb_position_t entry_x, entry_y, exit_x, exit_y; - (this+this_record.exitAnchor).get_anchor (c->font, c->buffer->info[i].codepoint, &exit_x, &exit_y); - (this+next_record.entryAnchor).get_anchor (c->font, c->buffer->info[j].codepoint, &entry_x, &entry_y); - - hb_glyph_position_t *pos = c->buffer->pos; - - hb_position_t d; - /* Main-direction adjustment */ - switch (c->direction) { - case HB_DIRECTION_LTR: - pos[i].x_advance = exit_x + pos[i].x_offset; - - d = entry_x + pos[j].x_offset; - pos[j].x_advance -= d; - pos[j].x_offset -= d; - break; - case HB_DIRECTION_RTL: - d = exit_x + pos[i].x_offset; - pos[i].x_advance -= d; - pos[i].x_offset -= d; - - pos[j].x_advance = entry_x + pos[j].x_offset; - break; - case HB_DIRECTION_TTB: - pos[i].y_advance = exit_y + pos[i].y_offset; - - d = entry_y + pos[j].y_offset; - pos[j].y_advance -= d; - pos[j].y_offset -= d; - break; - case HB_DIRECTION_BTT: - d = exit_y + pos[i].y_offset; - pos[i].y_advance -= d; - pos[i].y_offset -= d; - - pos[j].y_advance = entry_y; - break; - case HB_DIRECTION_INVALID: - default: - break; - } - - /* Cross-direction adjustment */ - if (c->lookup_props & LookupFlag::RightToLeft) { - pos[i].cursive_chain() = j - i; - if (likely (HB_DIRECTION_IS_HORIZONTAL (c->direction))) - pos[i].y_offset = entry_y - exit_y; - else - pos[i].x_offset = entry_x - exit_x; - } else { - pos[j].cursive_chain() = i - j; - if (likely (HB_DIRECTION_IS_HORIZONTAL (c->direction))) - pos[j].y_offset = exit_y - entry_y; - else - pos[j].x_offset = exit_x - entry_x; - } - - c->buffer->idx = j; - return TRACE_RETURN (true); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (coverage.sanitize (c, this) && entryExitRecord.sanitize (c, this)); - } - - protected: - USHORT format; /* Format identifier--format = 1 */ - OffsetTo<Coverage> - coverage; /* Offset to Coverage table--from - * beginning of subtable */ - ArrayOf<EntryExitRecord> - entryExitRecord; /* Array of EntryExit records--in - * Coverage Index order */ - public: - DEFINE_SIZE_ARRAY (6, entryExitRecord); -}; - -struct CursivePos -{ - template <typename context_t> - inline typename context_t::return_t dispatch (context_t *c) const - { - TRACE_DISPATCH (this); - switch (u.format) { - case 1: return TRACE_RETURN (c->dispatch (u.format1)); - default:return TRACE_RETURN (c->default_return_value ()); - } - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!u.format.sanitize (c)) return TRACE_RETURN (false); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.sanitize (c)); - default:return TRACE_RETURN (true); - } - } - - protected: - union { - USHORT format; /* Format identifier */ - CursivePosFormat1 format1; - } u; -}; - - -typedef AnchorMatrix BaseArray; /* base-major-- - * in order of BaseCoverage Index--, - * mark-minor-- - * ordered by class--zero-based. */ - -struct MarkBasePosFormat1 -{ - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - (this+markCoverage).add_coverage (c->input); - (this+baseCoverage).add_coverage (c->input); - /* TODO only add combinations that have nonzero adjustment. */ - } - - inline const Coverage &get_coverage (void) const - { - return this+markCoverage; - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - unsigned int mark_index = (this+markCoverage).get_coverage (c->buffer->cur().codepoint); - if (likely (mark_index == NOT_COVERED)) return TRACE_RETURN (false); - - /* now we search backwards for a non-mark glyph */ - hb_apply_context_t::skipping_backward_iterator_t skippy_iter (c, c->buffer->idx, 1); - skippy_iter.set_lookup_props (LookupFlag::IgnoreMarks); - do { - if (!skippy_iter.prev ()) return TRACE_RETURN (false); - /* We only want to attach to the first of a MultipleSubst sequence. Reject others. */ - if (0 == get_lig_comp (c->buffer->info[skippy_iter.idx])) break; - skippy_iter.reject (); - } while (1); - - /* The following assertion is too strong, so we've disabled it. */ - if (!(c->buffer->info[skippy_iter.idx].glyph_props() & HB_OT_LAYOUT_GLYPH_PROPS_BASE_GLYPH)) {/*return TRACE_RETURN (false);*/} - - unsigned int base_index = (this+baseCoverage).get_coverage (c->buffer->info[skippy_iter.idx].codepoint); - if (base_index == NOT_COVERED) return TRACE_RETURN (false); - - return TRACE_RETURN ((this+markArray).apply (c, mark_index, base_index, this+baseArray, classCount, skippy_iter.idx)); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this) && markCoverage.sanitize (c, this) && baseCoverage.sanitize (c, this) && - markArray.sanitize (c, this) && baseArray.sanitize (c, this, (unsigned int) classCount)); - } - - protected: - USHORT format; /* Format identifier--format = 1 */ - OffsetTo<Coverage> - markCoverage; /* Offset to MarkCoverage table--from - * beginning of MarkBasePos subtable */ - OffsetTo<Coverage> - baseCoverage; /* Offset to BaseCoverage table--from - * beginning of MarkBasePos subtable */ - USHORT classCount; /* Number of classes defined for marks */ - OffsetTo<MarkArray> - markArray; /* Offset to MarkArray table--from - * beginning of MarkBasePos subtable */ - OffsetTo<BaseArray> - baseArray; /* Offset to BaseArray table--from - * beginning of MarkBasePos subtable */ - public: - DEFINE_SIZE_STATIC (12); -}; - -struct MarkBasePos -{ - template <typename context_t> - inline typename context_t::return_t dispatch (context_t *c) const - { - TRACE_DISPATCH (this); - switch (u.format) { - case 1: return TRACE_RETURN (c->dispatch (u.format1)); - default:return TRACE_RETURN (c->default_return_value ()); - } - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!u.format.sanitize (c)) return TRACE_RETURN (false); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.sanitize (c)); - default:return TRACE_RETURN (true); - } - } - - protected: - union { - USHORT format; /* Format identifier */ - MarkBasePosFormat1 format1; - } u; -}; - - -typedef AnchorMatrix LigatureAttach; /* component-major-- - * in order of writing direction--, - * mark-minor-- - * ordered by class--zero-based. */ - -typedef OffsetListOf<LigatureAttach> LigatureArray; - /* Array of LigatureAttach - * tables ordered by - * LigatureCoverage Index */ - -struct MarkLigPosFormat1 -{ - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - (this+markCoverage).add_coverage (c->input); - (this+ligatureCoverage).add_coverage (c->input); - /* TODO only add combinations that have nonzero adjustment. */ - } - - inline const Coverage &get_coverage (void) const - { - return this+markCoverage; - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - unsigned int mark_index = (this+markCoverage).get_coverage (c->buffer->cur().codepoint); - if (likely (mark_index == NOT_COVERED)) return TRACE_RETURN (false); - - /* now we search backwards for a non-mark glyph */ - hb_apply_context_t::skipping_backward_iterator_t skippy_iter (c, c->buffer->idx, 1); - skippy_iter.set_lookup_props (LookupFlag::IgnoreMarks); - if (!skippy_iter.prev ()) return TRACE_RETURN (false); - - /* The following assertion is too strong, so we've disabled it. */ - if (!(c->buffer->info[skippy_iter.idx].glyph_props() & HB_OT_LAYOUT_GLYPH_PROPS_LIGATURE)) {/*return TRACE_RETURN (false);*/} - - unsigned int j = skippy_iter.idx; - unsigned int lig_index = (this+ligatureCoverage).get_coverage (c->buffer->info[j].codepoint); - if (lig_index == NOT_COVERED) return TRACE_RETURN (false); - - const LigatureArray& lig_array = this+ligatureArray; - const LigatureAttach& lig_attach = lig_array[lig_index]; - - /* Find component to attach to */ - unsigned int comp_count = lig_attach.rows; - if (unlikely (!comp_count)) return TRACE_RETURN (false); - - /* We must now check whether the ligature ID of the current mark glyph - * is identical to the ligature ID of the found ligature. If yes, we - * can directly use the component index. If not, we attach the mark - * glyph to the last component of the ligature. */ - unsigned int comp_index; - unsigned int lig_id = get_lig_id (c->buffer->info[j]); - unsigned int mark_id = get_lig_id (c->buffer->cur()); - unsigned int mark_comp = get_lig_comp (c->buffer->cur()); - if (lig_id && lig_id == mark_id && mark_comp > 0) - comp_index = MIN (comp_count, get_lig_comp (c->buffer->cur())) - 1; - else - comp_index = comp_count - 1; - - return TRACE_RETURN ((this+markArray).apply (c, mark_index, comp_index, lig_attach, classCount, j)); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this) && markCoverage.sanitize (c, this) && ligatureCoverage.sanitize (c, this) && - markArray.sanitize (c, this) && ligatureArray.sanitize (c, this, (unsigned int) classCount)); - } - - protected: - USHORT format; /* Format identifier--format = 1 */ - OffsetTo<Coverage> - markCoverage; /* Offset to Mark Coverage table--from - * beginning of MarkLigPos subtable */ - OffsetTo<Coverage> - ligatureCoverage; /* Offset to Ligature Coverage - * table--from beginning of MarkLigPos - * subtable */ - USHORT classCount; /* Number of defined mark classes */ - OffsetTo<MarkArray> - markArray; /* Offset to MarkArray table--from - * beginning of MarkLigPos subtable */ - OffsetTo<LigatureArray> - ligatureArray; /* Offset to LigatureArray table--from - * beginning of MarkLigPos subtable */ - public: - DEFINE_SIZE_STATIC (12); -}; - -struct MarkLigPos -{ - template <typename context_t> - inline typename context_t::return_t dispatch (context_t *c) const - { - TRACE_DISPATCH (this); - switch (u.format) { - case 1: return TRACE_RETURN (c->dispatch (u.format1)); - default:return TRACE_RETURN (c->default_return_value ()); - } - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!u.format.sanitize (c)) return TRACE_RETURN (false); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.sanitize (c)); - default:return TRACE_RETURN (true); - } - } - - protected: - union { - USHORT format; /* Format identifier */ - MarkLigPosFormat1 format1; - } u; -}; - - -typedef AnchorMatrix Mark2Array; /* mark2-major-- - * in order of Mark2Coverage Index--, - * mark1-minor-- - * ordered by class--zero-based. */ - -struct MarkMarkPosFormat1 -{ - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - (this+mark1Coverage).add_coverage (c->input); - (this+mark2Coverage).add_coverage (c->input); - /* TODO only add combinations that have nonzero adjustment. */ - } - - inline const Coverage &get_coverage (void) const - { - return this+mark1Coverage; - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - unsigned int mark1_index = (this+mark1Coverage).get_coverage (c->buffer->cur().codepoint); - if (likely (mark1_index == NOT_COVERED)) return TRACE_RETURN (false); - - /* now we search backwards for a suitable mark glyph until a non-mark glyph */ - hb_apply_context_t::skipping_backward_iterator_t skippy_iter (c, c->buffer->idx, 1); - skippy_iter.set_lookup_props (c->lookup_props & ~LookupFlag::IgnoreFlags); - if (!skippy_iter.prev ()) return TRACE_RETURN (false); - - if (!(c->buffer->info[skippy_iter.idx].glyph_props() & HB_OT_LAYOUT_GLYPH_PROPS_MARK)) { return TRACE_RETURN (false); } - - unsigned int j = skippy_iter.idx; - - unsigned int id1 = get_lig_id (c->buffer->cur()); - unsigned int id2 = get_lig_id (c->buffer->info[j]); - unsigned int comp1 = get_lig_comp (c->buffer->cur()); - unsigned int comp2 = get_lig_comp (c->buffer->info[j]); - - if (likely (id1 == id2)) { - if (id1 == 0) /* Marks belonging to the same base. */ - goto good; - else if (comp1 == comp2) /* Marks belonging to the same ligature component. */ - goto good; - } else { - /* If ligature ids don't match, it may be the case that one of the marks - * itself is a ligature. In which case match. */ - if ((id1 > 0 && !comp1) || (id2 > 0 && !comp2)) - goto good; - } - - /* Didn't match. */ - return TRACE_RETURN (false); - - good: - unsigned int mark2_index = (this+mark2Coverage).get_coverage (c->buffer->info[j].codepoint); - if (mark2_index == NOT_COVERED) return TRACE_RETURN (false); - - return TRACE_RETURN ((this+mark1Array).apply (c, mark1_index, mark2_index, this+mark2Array, classCount, j)); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this) && mark1Coverage.sanitize (c, this) && - mark2Coverage.sanitize (c, this) && mark1Array.sanitize (c, this) - && mark2Array.sanitize (c, this, (unsigned int) classCount)); - } - - protected: - USHORT format; /* Format identifier--format = 1 */ - OffsetTo<Coverage> - mark1Coverage; /* Offset to Combining Mark1 Coverage - * table--from beginning of MarkMarkPos - * subtable */ - OffsetTo<Coverage> - mark2Coverage; /* Offset to Combining Mark2 Coverage - * table--from beginning of MarkMarkPos - * subtable */ - USHORT classCount; /* Number of defined mark classes */ - OffsetTo<MarkArray> - mark1Array; /* Offset to Mark1Array table--from - * beginning of MarkMarkPos subtable */ - OffsetTo<Mark2Array> - mark2Array; /* Offset to Mark2Array table--from - * beginning of MarkMarkPos subtable */ - public: - DEFINE_SIZE_STATIC (12); -}; - -struct MarkMarkPos -{ - template <typename context_t> - inline typename context_t::return_t dispatch (context_t *c) const - { - TRACE_DISPATCH (this); - switch (u.format) { - case 1: return TRACE_RETURN (c->dispatch (u.format1)); - default:return TRACE_RETURN (c->default_return_value ()); - } - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!u.format.sanitize (c)) return TRACE_RETURN (false); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.sanitize (c)); - default:return TRACE_RETURN (true); - } - } - - protected: - union { - USHORT format; /* Format identifier */ - MarkMarkPosFormat1 format1; - } u; -}; - - -struct ContextPos : Context {}; - -struct ChainContextPos : ChainContext {}; - -struct ExtensionPos : Extension<ExtensionPos> -{ - typedef struct PosLookupSubTable LookupSubTable; -}; - - - -/* - * PosLookup - */ - - -struct PosLookupSubTable -{ - friend struct PosLookup; - - enum Type { - Single = 1, - Pair = 2, - Cursive = 3, - MarkBase = 4, - MarkLig = 5, - MarkMark = 6, - Context = 7, - ChainContext = 8, - Extension = 9 - }; - - template <typename context_t> - inline typename context_t::return_t dispatch (context_t *c, unsigned int lookup_type) const - { - TRACE_DISPATCH (this); - switch (lookup_type) { - case Single: return TRACE_RETURN (u.single.dispatch (c)); - case Pair: return TRACE_RETURN (u.pair.dispatch (c)); - case Cursive: return TRACE_RETURN (u.cursive.dispatch (c)); - case MarkBase: return TRACE_RETURN (u.markBase.dispatch (c)); - case MarkLig: return TRACE_RETURN (u.markLig.dispatch (c)); - case MarkMark: return TRACE_RETURN (u.markMark.dispatch (c)); - case Context: return TRACE_RETURN (u.context.dispatch (c)); - case ChainContext: return TRACE_RETURN (u.chainContext.dispatch (c)); - case Extension: return TRACE_RETURN (u.extension.dispatch (c)); - default: return TRACE_RETURN (c->default_return_value ()); - } - } - - inline bool sanitize (hb_sanitize_context_t *c, unsigned int lookup_type) { - TRACE_SANITIZE (this); - if (!u.header.sub_format.sanitize (c)) - return TRACE_RETURN (false); - switch (lookup_type) { - case Single: return TRACE_RETURN (u.single.sanitize (c)); - case Pair: return TRACE_RETURN (u.pair.sanitize (c)); - case Cursive: return TRACE_RETURN (u.cursive.sanitize (c)); - case MarkBase: return TRACE_RETURN (u.markBase.sanitize (c)); - case MarkLig: return TRACE_RETURN (u.markLig.sanitize (c)); - case MarkMark: return TRACE_RETURN (u.markMark.sanitize (c)); - case Context: return TRACE_RETURN (u.context.sanitize (c)); - case ChainContext: return TRACE_RETURN (u.chainContext.sanitize (c)); - case Extension: return TRACE_RETURN (u.extension.sanitize (c)); - default: return TRACE_RETURN (true); - } - } - - protected: - union { - struct { - USHORT sub_format; - } header; - SinglePos single; - PairPos pair; - CursivePos cursive; - MarkBasePos markBase; - MarkLigPos markLig; - MarkMarkPos markMark; - ContextPos context; - ChainContextPos chainContext; - ExtensionPos extension; - } u; - public: - DEFINE_SIZE_UNION (2, header.sub_format); -}; - - -struct PosLookup : Lookup -{ - inline const PosLookupSubTable& get_subtable (unsigned int i) const - { return this+CastR<OffsetArrayOf<PosLookupSubTable> > (subTable)[i]; } - - inline hb_collect_glyphs_context_t::return_t collect_glyphs_lookup (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - c->set_recurse_func (NULL); - return TRACE_RETURN (dispatch (c)); - } - - template <typename set_t> - inline void add_coverage (set_t *glyphs) const - { - hb_get_coverage_context_t c; - const Coverage *last = NULL; - unsigned int count = get_subtable_count (); - for (unsigned int i = 0; i < count; i++) { - const Coverage *coverage = &get_subtable (i).dispatch (&c, get_type ()); - if (coverage != last) { - coverage->add_coverage (glyphs); - last = coverage; - } - } - } - - inline bool apply_once (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - if (!c->check_glyph_property (&c->buffer->cur(), c->lookup_props)) - return TRACE_RETURN (false); - return TRACE_RETURN (dispatch (c)); - } - - static bool apply_recurse_func (hb_apply_context_t *c, unsigned int lookup_index); - - inline bool apply_string (hb_apply_context_t *c, const hb_set_digest_t *digest) const - { - bool ret = false; - - if (unlikely (!c->buffer->len || !c->lookup_mask)) - return false; - - c->set_recurse_func (apply_recurse_func); - c->set_lookup (*this); - - c->buffer->idx = 0; - - while (c->buffer->idx < c->buffer->len) - { - if ((c->buffer->cur().mask & c->lookup_mask) && - digest->may_have (c->buffer->cur().codepoint) && - apply_once (c)) - ret = true; - else - c->buffer->idx++; - } - - return ret; - } - - template <typename context_t> - static inline typename context_t::return_t dispatch_recurse_func (context_t *c, unsigned int lookup_index); - - template <typename context_t> - inline typename context_t::return_t dispatch (context_t *c) const - { - TRACE_DISPATCH (this); - unsigned int lookup_type = get_type (); - unsigned int count = get_subtable_count (); - for (unsigned int i = 0; i < count; i++) { - typename context_t::return_t r = get_subtable (i).dispatch (c, lookup_type); - if (c->stop_sublookup_iteration (r)) - return TRACE_RETURN (r); - } - return TRACE_RETURN (c->default_return_value ()); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (unlikely (!Lookup::sanitize (c))) return TRACE_RETURN (false); - OffsetArrayOf<PosLookupSubTable> &list = CastR<OffsetArrayOf<PosLookupSubTable> > (subTable); - return TRACE_RETURN (list.sanitize (c, this, get_type ())); - } -}; - -typedef OffsetListOf<PosLookup> PosLookupList; - -/* - * GPOS -- The Glyph Positioning Table - */ - -struct GPOS : GSUBGPOS -{ - static const hb_tag_t Tag = HB_OT_TAG_GPOS; - - inline const PosLookup& get_lookup (unsigned int i) const - { return CastR<PosLookup> (GSUBGPOS::get_lookup (i)); } - - static inline void position_start (hb_font_t *font, hb_buffer_t *buffer); - static inline void position_finish (hb_font_t *font, hb_buffer_t *buffer); - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (unlikely (!GSUBGPOS::sanitize (c))) return TRACE_RETURN (false); - OffsetTo<PosLookupList> &list = CastR<OffsetTo<PosLookupList> > (lookupList); - return TRACE_RETURN (list.sanitize (c, this)); - } - public: - DEFINE_SIZE_STATIC (10); -}; - - -static void -fix_cursive_minor_offset (hb_glyph_position_t *pos, unsigned int i, hb_direction_t direction) -{ - unsigned int j = pos[i].cursive_chain(); - if (likely (!j)) - return; - - j += i; - - pos[i].cursive_chain() = 0; - - fix_cursive_minor_offset (pos, j, direction); - - if (HB_DIRECTION_IS_HORIZONTAL (direction)) - pos[i].y_offset += pos[j].y_offset; - else - pos[i].x_offset += pos[j].x_offset; -} - -static void -fix_mark_attachment (hb_glyph_position_t *pos, unsigned int i, hb_direction_t direction) -{ - if (likely (!(pos[i].attach_lookback()))) - return; - - unsigned int j = i - pos[i].attach_lookback(); - - pos[i].x_offset += pos[j].x_offset; - pos[i].y_offset += pos[j].y_offset; - - if (HB_DIRECTION_IS_FORWARD (direction)) - for (unsigned int k = j; k < i; k++) { - pos[i].x_offset -= pos[k].x_advance; - pos[i].y_offset -= pos[k].y_advance; - } - else - for (unsigned int k = j + 1; k < i + 1; k++) { - pos[i].x_offset += pos[k].x_advance; - pos[i].y_offset += pos[k].y_advance; - } -} - -void -GPOS::position_start (hb_font_t *font HB_UNUSED, hb_buffer_t *buffer) -{ - buffer->clear_positions (); - - unsigned int count = buffer->len; - for (unsigned int i = 0; i < count; i++) - buffer->pos[i].attach_lookback() = buffer->pos[i].cursive_chain() = 0; -} - -void -GPOS::position_finish (hb_font_t *font HB_UNUSED, hb_buffer_t *buffer) -{ - unsigned int len; - hb_glyph_position_t *pos = hb_buffer_get_glyph_positions (buffer, &len); - hb_direction_t direction = buffer->props.direction; - - /* Handle cursive connections */ - for (unsigned int i = 0; i < len; i++) - fix_cursive_minor_offset (pos, i, direction); - - /* Handle attachments */ - for (unsigned int i = 0; i < len; i++) - fix_mark_attachment (pos, i, direction); - - HB_BUFFER_DEALLOCATE_VAR (buffer, syllable); - HB_BUFFER_DEALLOCATE_VAR (buffer, lig_props); - HB_BUFFER_DEALLOCATE_VAR (buffer, glyph_props); -} - - -/* Out-of-class implementation for methods recursing */ - -template <typename context_t> -inline typename context_t::return_t PosLookup::dispatch_recurse_func (context_t *c, unsigned int lookup_index) -{ - const GPOS &gpos = *(hb_ot_layout_from_face (c->face)->gpos); - const PosLookup &l = gpos.get_lookup (lookup_index); - return l.dispatch (c); -} - -inline bool PosLookup::apply_recurse_func (hb_apply_context_t *c, unsigned int lookup_index) -{ - const GPOS &gpos = *(hb_ot_layout_from_face (c->face)->gpos); - const PosLookup &l = gpos.get_lookup (lookup_index); - unsigned int saved_lookup_props = c->lookup_props; - c->set_lookup (l); - bool ret = l.apply_once (c); - c->lookup_props = saved_lookup_props; - return ret; -} - - -#undef attach_lookback -#undef cursive_chain - - -} /* namespace OT */ - - -#endif /* HB_OT_LAYOUT_GPOS_TABLE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout-gsub-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout-gsub-table.hh deleted file mode 100644 index 35d07298d30..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout-gsub-table.hh +++ /dev/null @@ -1,1412 +0,0 @@ -/* - * Copyright © 2007,2008,2009,2010 Red Hat, Inc. - * Copyright © 2010,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_LAYOUT_GSUB_TABLE_HH -#define HB_OT_LAYOUT_GSUB_TABLE_HH - -#include "hb-ot-layout-gsubgpos-private.hh" - - -namespace OT { - - -struct SingleSubstFormat1 -{ - inline void closure (hb_closure_context_t *c) const - { - TRACE_CLOSURE (this); - Coverage::Iter iter; - for (iter.init (this+coverage); iter.more (); iter.next ()) { - hb_codepoint_t glyph_id = iter.get_glyph (); - if (c->glyphs->has (glyph_id)) - c->glyphs->add ((glyph_id + deltaGlyphID) & 0xFFFF); - } - } - - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - Coverage::Iter iter; - for (iter.init (this+coverage); iter.more (); iter.next ()) { - hb_codepoint_t glyph_id = iter.get_glyph (); - c->input->add (glyph_id); - c->output->add ((glyph_id + deltaGlyphID) & 0xFFFF); - } - } - - inline const Coverage &get_coverage (void) const - { - return this+coverage; - } - - inline bool would_apply (hb_would_apply_context_t *c) const - { - TRACE_WOULD_APPLY (this); - return TRACE_RETURN (c->len == 1 && (this+coverage).get_coverage (c->glyphs[0]) != NOT_COVERED); - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - hb_codepoint_t glyph_id = c->buffer->cur().codepoint; - unsigned int index = (this+coverage).get_coverage (glyph_id); - if (likely (index == NOT_COVERED)) return TRACE_RETURN (false); - - /* According to the Adobe Annotated OpenType Suite, result is always - * limited to 16bit. */ - glyph_id = (glyph_id + deltaGlyphID) & 0xFFFF; - c->replace_glyph (glyph_id); - - return TRACE_RETURN (true); - } - - inline bool serialize (hb_serialize_context_t *c, - Supplier<GlyphID> &glyphs, - unsigned int num_glyphs, - int delta) - { - TRACE_SERIALIZE (this); - if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false); - if (unlikely (!coverage.serialize (c, this).serialize (c, glyphs, num_glyphs))) return TRACE_RETURN (false); - deltaGlyphID.set (delta); /* TODO(serilaize) overflow? */ - return TRACE_RETURN (true); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (coverage.sanitize (c, this) && deltaGlyphID.sanitize (c)); - } - - protected: - USHORT format; /* Format identifier--format = 1 */ - OffsetTo<Coverage> - coverage; /* Offset to Coverage table--from - * beginning of Substitution table */ - SHORT deltaGlyphID; /* Add to original GlyphID to get - * substitute GlyphID */ - public: - DEFINE_SIZE_STATIC (6); -}; - -struct SingleSubstFormat2 -{ - inline void closure (hb_closure_context_t *c) const - { - TRACE_CLOSURE (this); - Coverage::Iter iter; - for (iter.init (this+coverage); iter.more (); iter.next ()) { - if (c->glyphs->has (iter.get_glyph ())) - c->glyphs->add (substitute[iter.get_coverage ()]); - } - } - - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - Coverage::Iter iter; - for (iter.init (this+coverage); iter.more (); iter.next ()) { - c->input->add (iter.get_glyph ()); - c->output->add (substitute[iter.get_coverage ()]); - } - } - - inline const Coverage &get_coverage (void) const - { - return this+coverage; - } - - inline bool would_apply (hb_would_apply_context_t *c) const - { - TRACE_WOULD_APPLY (this); - return TRACE_RETURN (c->len == 1 && (this+coverage).get_coverage (c->glyphs[0]) != NOT_COVERED); - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - hb_codepoint_t glyph_id = c->buffer->cur().codepoint; - unsigned int index = (this+coverage).get_coverage (glyph_id); - if (likely (index == NOT_COVERED)) return TRACE_RETURN (false); - - if (unlikely (index >= substitute.len)) return TRACE_RETURN (false); - - glyph_id = substitute[index]; - c->replace_glyph (glyph_id); - - return TRACE_RETURN (true); - } - - inline bool serialize (hb_serialize_context_t *c, - Supplier<GlyphID> &glyphs, - Supplier<GlyphID> &substitutes, - unsigned int num_glyphs) - { - TRACE_SERIALIZE (this); - if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false); - if (unlikely (!substitute.serialize (c, substitutes, num_glyphs))) return TRACE_RETURN (false); - if (unlikely (!coverage.serialize (c, this).serialize (c, glyphs, num_glyphs))) return TRACE_RETURN (false); - return TRACE_RETURN (true); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (coverage.sanitize (c, this) && substitute.sanitize (c)); - } - - protected: - USHORT format; /* Format identifier--format = 2 */ - OffsetTo<Coverage> - coverage; /* Offset to Coverage table--from - * beginning of Substitution table */ - ArrayOf<GlyphID> - substitute; /* Array of substitute - * GlyphIDs--ordered by Coverage Index */ - public: - DEFINE_SIZE_ARRAY (6, substitute); -}; - -struct SingleSubst -{ - inline bool serialize (hb_serialize_context_t *c, - Supplier<GlyphID> &glyphs, - Supplier<GlyphID> &substitutes, - unsigned int num_glyphs) - { - TRACE_SERIALIZE (this); - if (unlikely (!c->extend_min (u.format))) return TRACE_RETURN (false); - unsigned int format = 2; - int delta; - if (num_glyphs) { - format = 1; - /* TODO(serialize) check for wrap-around */ - delta = substitutes[0] - glyphs[0]; - for (unsigned int i = 1; i < num_glyphs; i++) - if (delta != substitutes[i] - glyphs[i]) { - format = 2; - break; - } - } - u.format.set (format); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.serialize (c, glyphs, num_glyphs, delta)); - case 2: return TRACE_RETURN (u.format2.serialize (c, glyphs, substitutes, num_glyphs)); - default:return TRACE_RETURN (false); - } - } - - template <typename context_t> - inline typename context_t::return_t dispatch (context_t *c) const - { - TRACE_DISPATCH (this); - switch (u.format) { - case 1: return TRACE_RETURN (c->dispatch (u.format1)); - case 2: return TRACE_RETURN (c->dispatch (u.format2)); - default:return TRACE_RETURN (c->default_return_value ()); - } - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!u.format.sanitize (c)) return TRACE_RETURN (false); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.sanitize (c)); - case 2: return TRACE_RETURN (u.format2.sanitize (c)); - default:return TRACE_RETURN (true); - } - } - - protected: - union { - USHORT format; /* Format identifier */ - SingleSubstFormat1 format1; - SingleSubstFormat2 format2; - } u; -}; - - -struct Sequence -{ - inline void closure (hb_closure_context_t *c) const - { - TRACE_CLOSURE (this); - unsigned int count = substitute.len; - for (unsigned int i = 0; i < count; i++) - c->glyphs->add (substitute[i]); - } - - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - unsigned int count = substitute.len; - for (unsigned int i = 0; i < count; i++) - c->output->add (substitute[i]); - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - if (unlikely (!substitute.len)) return TRACE_RETURN (false); - - unsigned int klass = c->buffer->cur().glyph_props() & - HB_OT_LAYOUT_GLYPH_PROPS_LIGATURE ? HB_OT_LAYOUT_GLYPH_PROPS_BASE_GLYPH : 0; - unsigned int count = substitute.len; - for (unsigned int i = 0; i < count; i++) { - set_lig_props_for_component (c->buffer->cur(), i); - c->output_glyph (substitute.array[i], klass); - } - c->buffer->skip_glyph (); - - return TRACE_RETURN (true); - } - - inline bool serialize (hb_serialize_context_t *c, - Supplier<GlyphID> &glyphs, - unsigned int num_glyphs) - { - TRACE_SERIALIZE (this); - if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false); - if (unlikely (!substitute.serialize (c, glyphs, num_glyphs))) return TRACE_RETURN (false); - return TRACE_RETURN (true); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (substitute.sanitize (c)); - } - - protected: - ArrayOf<GlyphID> - substitute; /* String of GlyphIDs to substitute */ - public: - DEFINE_SIZE_ARRAY (2, substitute); -}; - -struct MultipleSubstFormat1 -{ - inline void closure (hb_closure_context_t *c) const - { - TRACE_CLOSURE (this); - Coverage::Iter iter; - for (iter.init (this+coverage); iter.more (); iter.next ()) { - if (c->glyphs->has (iter.get_glyph ())) - (this+sequence[iter.get_coverage ()]).closure (c); - } - } - - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - (this+coverage).add_coverage (c->input); - unsigned int count = sequence.len; - for (unsigned int i = 0; i < count; i++) - (this+sequence[i]).collect_glyphs (c); - } - - inline const Coverage &get_coverage (void) const - { - return this+coverage; - } - - inline bool would_apply (hb_would_apply_context_t *c) const - { - TRACE_WOULD_APPLY (this); - return TRACE_RETURN (c->len == 1 && (this+coverage).get_coverage (c->glyphs[0]) != NOT_COVERED); - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - - unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint); - if (likely (index == NOT_COVERED)) return TRACE_RETURN (false); - - return TRACE_RETURN ((this+sequence[index]).apply (c)); - } - - inline bool serialize (hb_serialize_context_t *c, - Supplier<GlyphID> &glyphs, - Supplier<unsigned int> &substitute_len_list, - unsigned int num_glyphs, - Supplier<GlyphID> &substitute_glyphs_list) - { - TRACE_SERIALIZE (this); - if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false); - if (unlikely (!sequence.serialize (c, num_glyphs))) return TRACE_RETURN (false); - for (unsigned int i = 0; i < num_glyphs; i++) - if (unlikely (!sequence[i].serialize (c, this).serialize (c, - substitute_glyphs_list, - substitute_len_list[i]))) return TRACE_RETURN (false); - substitute_len_list.advance (num_glyphs); - if (unlikely (!coverage.serialize (c, this).serialize (c, glyphs, num_glyphs))) return TRACE_RETURN (false); - return TRACE_RETURN (true); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (coverage.sanitize (c, this) && sequence.sanitize (c, this)); - } - - protected: - USHORT format; /* Format identifier--format = 1 */ - OffsetTo<Coverage> - coverage; /* Offset to Coverage table--from - * beginning of Substitution table */ - OffsetArrayOf<Sequence> - sequence; /* Array of Sequence tables - * ordered by Coverage Index */ - public: - DEFINE_SIZE_ARRAY (6, sequence); -}; - -struct MultipleSubst -{ - inline bool serialize (hb_serialize_context_t *c, - Supplier<GlyphID> &glyphs, - Supplier<unsigned int> &substitute_len_list, - unsigned int num_glyphs, - Supplier<GlyphID> &substitute_glyphs_list) - { - TRACE_SERIALIZE (this); - if (unlikely (!c->extend_min (u.format))) return TRACE_RETURN (false); - unsigned int format = 1; - u.format.set (format); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.serialize (c, glyphs, substitute_len_list, num_glyphs, substitute_glyphs_list)); - default:return TRACE_RETURN (false); - } - } - - template <typename context_t> - inline typename context_t::return_t dispatch (context_t *c) const - { - TRACE_DISPATCH (this); - switch (u.format) { - case 1: return TRACE_RETURN (c->dispatch (u.format1)); - default:return TRACE_RETURN (c->default_return_value ()); - } - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!u.format.sanitize (c)) return TRACE_RETURN (false); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.sanitize (c)); - default:return TRACE_RETURN (true); - } - } - - protected: - union { - USHORT format; /* Format identifier */ - MultipleSubstFormat1 format1; - } u; -}; - - -typedef ArrayOf<GlyphID> AlternateSet; /* Array of alternate GlyphIDs--in - * arbitrary order */ - -struct AlternateSubstFormat1 -{ - inline void closure (hb_closure_context_t *c) const - { - TRACE_CLOSURE (this); - Coverage::Iter iter; - for (iter.init (this+coverage); iter.more (); iter.next ()) { - if (c->glyphs->has (iter.get_glyph ())) { - const AlternateSet &alt_set = this+alternateSet[iter.get_coverage ()]; - unsigned int count = alt_set.len; - for (unsigned int i = 0; i < count; i++) - c->glyphs->add (alt_set[i]); - } - } - } - - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - Coverage::Iter iter; - for (iter.init (this+coverage); iter.more (); iter.next ()) { - c->input->add (iter.get_glyph ()); - const AlternateSet &alt_set = this+alternateSet[iter.get_coverage ()]; - unsigned int count = alt_set.len; - for (unsigned int i = 0; i < count; i++) - c->output->add (alt_set[i]); - } - } - - inline const Coverage &get_coverage (void) const - { - return this+coverage; - } - - inline bool would_apply (hb_would_apply_context_t *c) const - { - TRACE_WOULD_APPLY (this); - return TRACE_RETURN (c->len == 1 && (this+coverage).get_coverage (c->glyphs[0]) != NOT_COVERED); - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - hb_codepoint_t glyph_id = c->buffer->cur().codepoint; - - unsigned int index = (this+coverage).get_coverage (glyph_id); - if (likely (index == NOT_COVERED)) return TRACE_RETURN (false); - - const AlternateSet &alt_set = this+alternateSet[index]; - - if (unlikely (!alt_set.len)) return TRACE_RETURN (false); - - hb_mask_t glyph_mask = c->buffer->cur().mask; - hb_mask_t lookup_mask = c->lookup_mask; - - /* Note: This breaks badly if two features enabled this lookup together. */ - unsigned int shift = _hb_ctz (lookup_mask); - unsigned int alt_index = ((lookup_mask & glyph_mask) >> shift); - - if (unlikely (alt_index > alt_set.len || alt_index == 0)) return TRACE_RETURN (false); - - glyph_id = alt_set[alt_index - 1]; - - c->replace_glyph (glyph_id); - - return TRACE_RETURN (true); - } - - inline bool serialize (hb_serialize_context_t *c, - Supplier<GlyphID> &glyphs, - Supplier<unsigned int> &alternate_len_list, - unsigned int num_glyphs, - Supplier<GlyphID> &alternate_glyphs_list) - { - TRACE_SERIALIZE (this); - if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false); - if (unlikely (!alternateSet.serialize (c, num_glyphs))) return TRACE_RETURN (false); - for (unsigned int i = 0; i < num_glyphs; i++) - if (unlikely (!alternateSet[i].serialize (c, this).serialize (c, - alternate_glyphs_list, - alternate_len_list[i]))) return TRACE_RETURN (false); - alternate_len_list.advance (num_glyphs); - if (unlikely (!coverage.serialize (c, this).serialize (c, glyphs, num_glyphs))) return TRACE_RETURN (false); - return TRACE_RETURN (true); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (coverage.sanitize (c, this) && alternateSet.sanitize (c, this)); - } - - protected: - USHORT format; /* Format identifier--format = 1 */ - OffsetTo<Coverage> - coverage; /* Offset to Coverage table--from - * beginning of Substitution table */ - OffsetArrayOf<AlternateSet> - alternateSet; /* Array of AlternateSet tables - * ordered by Coverage Index */ - public: - DEFINE_SIZE_ARRAY (6, alternateSet); -}; - -struct AlternateSubst -{ - inline bool serialize (hb_serialize_context_t *c, - Supplier<GlyphID> &glyphs, - Supplier<unsigned int> &alternate_len_list, - unsigned int num_glyphs, - Supplier<GlyphID> &alternate_glyphs_list) - { - TRACE_SERIALIZE (this); - if (unlikely (!c->extend_min (u.format))) return TRACE_RETURN (false); - unsigned int format = 1; - u.format.set (format); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.serialize (c, glyphs, alternate_len_list, num_glyphs, alternate_glyphs_list)); - default:return TRACE_RETURN (false); - } - } - - template <typename context_t> - inline typename context_t::return_t dispatch (context_t *c) const - { - TRACE_DISPATCH (this); - switch (u.format) { - case 1: return TRACE_RETURN (c->dispatch (u.format1)); - default:return TRACE_RETURN (c->default_return_value ()); - } - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!u.format.sanitize (c)) return TRACE_RETURN (false); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.sanitize (c)); - default:return TRACE_RETURN (true); - } - } - - protected: - union { - USHORT format; /* Format identifier */ - AlternateSubstFormat1 format1; - } u; -}; - - -struct Ligature -{ - inline void closure (hb_closure_context_t *c) const - { - TRACE_CLOSURE (this); - unsigned int count = component.len; - for (unsigned int i = 1; i < count; i++) - if (!c->glyphs->has (component[i])) - return; - c->glyphs->add (ligGlyph); - } - - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - unsigned int count = component.len; - for (unsigned int i = 1; i < count; i++) - c->input->add (component[i]); - c->output->add (ligGlyph); - } - - inline bool would_apply (hb_would_apply_context_t *c) const - { - TRACE_WOULD_APPLY (this); - if (c->len != component.len) - return TRACE_RETURN (false); - - for (unsigned int i = 1; i < c->len; i++) - if (likely (c->glyphs[i] != component[i])) - return TRACE_RETURN (false); - - return TRACE_RETURN (true); - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - unsigned int count = component.len; - if (unlikely (count < 1)) return TRACE_RETURN (false); - - unsigned int end_offset = 0; - bool is_mark_ligature = false; - unsigned int total_component_count = 0; - - if (likely (!match_input (c, count, - &component[1], - match_glyph, - NULL, - &end_offset, - &is_mark_ligature, - &total_component_count))) - return TRACE_RETURN (false); - - /* Deal, we are forming the ligature. */ - c->buffer->merge_clusters (c->buffer->idx, c->buffer->idx + end_offset); - - ligate_input (c, - count, - &component[1], - match_glyph, - NULL, - ligGlyph, - is_mark_ligature, - total_component_count); - - return TRACE_RETURN (true); - } - - inline bool serialize (hb_serialize_context_t *c, - GlyphID ligature, - Supplier<GlyphID> &components, /* Starting from second */ - unsigned int num_components /* Including first component */) - { - TRACE_SERIALIZE (this); - if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false); - ligGlyph = ligature; - if (unlikely (!component.serialize (c, components, num_components))) return TRACE_RETURN (false); - return TRACE_RETURN (true); - } - - public: - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (ligGlyph.sanitize (c) && component.sanitize (c)); - } - - protected: - GlyphID ligGlyph; /* GlyphID of ligature to substitute */ - HeadlessArrayOf<GlyphID> - component; /* Array of component GlyphIDs--start - * with the second component--ordered - * in writing direction */ - public: - DEFINE_SIZE_ARRAY (4, component); -}; - -struct LigatureSet -{ - inline void closure (hb_closure_context_t *c) const - { - TRACE_CLOSURE (this); - unsigned int num_ligs = ligature.len; - for (unsigned int i = 0; i < num_ligs; i++) - (this+ligature[i]).closure (c); - } - - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - unsigned int num_ligs = ligature.len; - for (unsigned int i = 0; i < num_ligs; i++) - (this+ligature[i]).collect_glyphs (c); - } - - inline bool would_apply (hb_would_apply_context_t *c) const - { - TRACE_WOULD_APPLY (this); - unsigned int num_ligs = ligature.len; - for (unsigned int i = 0; i < num_ligs; i++) - { - const Ligature &lig = this+ligature[i]; - if (lig.would_apply (c)) - return TRACE_RETURN (true); - } - return TRACE_RETURN (false); - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - unsigned int num_ligs = ligature.len; - for (unsigned int i = 0; i < num_ligs; i++) - { - const Ligature &lig = this+ligature[i]; - if (lig.apply (c)) return TRACE_RETURN (true); - } - - return TRACE_RETURN (false); - } - - inline bool serialize (hb_serialize_context_t *c, - Supplier<GlyphID> &ligatures, - Supplier<unsigned int> &component_count_list, - unsigned int num_ligatures, - Supplier<GlyphID> &component_list /* Starting from second for each ligature */) - { - TRACE_SERIALIZE (this); - if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false); - if (unlikely (!ligature.serialize (c, num_ligatures))) return TRACE_RETURN (false); - for (unsigned int i = 0; i < num_ligatures; i++) - if (unlikely (!ligature[i].serialize (c, this).serialize (c, - ligatures[i], - component_list, - component_count_list[i]))) return TRACE_RETURN (false); - ligatures.advance (num_ligatures); - component_count_list.advance (num_ligatures); - return TRACE_RETURN (true); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (ligature.sanitize (c, this)); - } - - protected: - OffsetArrayOf<Ligature> - ligature; /* Array LigatureSet tables - * ordered by preference */ - public: - DEFINE_SIZE_ARRAY (2, ligature); -}; - -struct LigatureSubstFormat1 -{ - inline void closure (hb_closure_context_t *c) const - { - TRACE_CLOSURE (this); - Coverage::Iter iter; - for (iter.init (this+coverage); iter.more (); iter.next ()) { - if (c->glyphs->has (iter.get_glyph ())) - (this+ligatureSet[iter.get_coverage ()]).closure (c); - } - } - - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - Coverage::Iter iter; - for (iter.init (this+coverage); iter.more (); iter.next ()) { - c->input->add (iter.get_glyph ()); - (this+ligatureSet[iter.get_coverage ()]).collect_glyphs (c); - } - } - - inline const Coverage &get_coverage (void) const - { - return this+coverage; - } - - inline bool would_apply (hb_would_apply_context_t *c) const - { - TRACE_WOULD_APPLY (this); - unsigned int index = (this+coverage).get_coverage (c->glyphs[0]); - if (likely (index == NOT_COVERED)) return TRACE_RETURN (false); - - const LigatureSet &lig_set = this+ligatureSet[index]; - return TRACE_RETURN (lig_set.would_apply (c)); - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - hb_codepoint_t glyph_id = c->buffer->cur().codepoint; - - unsigned int index = (this+coverage).get_coverage (glyph_id); - if (likely (index == NOT_COVERED)) return TRACE_RETURN (false); - - const LigatureSet &lig_set = this+ligatureSet[index]; - return TRACE_RETURN (lig_set.apply (c)); - } - - inline bool serialize (hb_serialize_context_t *c, - Supplier<GlyphID> &first_glyphs, - Supplier<unsigned int> &ligature_per_first_glyph_count_list, - unsigned int num_first_glyphs, - Supplier<GlyphID> &ligatures_list, - Supplier<unsigned int> &component_count_list, - Supplier<GlyphID> &component_list /* Starting from second for each ligature */) - { - TRACE_SERIALIZE (this); - if (unlikely (!c->extend_min (*this))) return TRACE_RETURN (false); - if (unlikely (!ligatureSet.serialize (c, num_first_glyphs))) return TRACE_RETURN (false); - for (unsigned int i = 0; i < num_first_glyphs; i++) - if (unlikely (!ligatureSet[i].serialize (c, this).serialize (c, - ligatures_list, - component_count_list, - ligature_per_first_glyph_count_list[i], - component_list))) return TRACE_RETURN (false); - ligature_per_first_glyph_count_list.advance (num_first_glyphs); - if (unlikely (!coverage.serialize (c, this).serialize (c, first_glyphs, num_first_glyphs))) return TRACE_RETURN (false); - return TRACE_RETURN (true); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (coverage.sanitize (c, this) && ligatureSet.sanitize (c, this)); - } - - protected: - USHORT format; /* Format identifier--format = 1 */ - OffsetTo<Coverage> - coverage; /* Offset to Coverage table--from - * beginning of Substitution table */ - OffsetArrayOf<LigatureSet> - ligatureSet; /* Array LigatureSet tables - * ordered by Coverage Index */ - public: - DEFINE_SIZE_ARRAY (6, ligatureSet); -}; - -struct LigatureSubst -{ - inline bool serialize (hb_serialize_context_t *c, - Supplier<GlyphID> &first_glyphs, - Supplier<unsigned int> &ligature_per_first_glyph_count_list, - unsigned int num_first_glyphs, - Supplier<GlyphID> &ligatures_list, - Supplier<unsigned int> &component_count_list, - Supplier<GlyphID> &component_list /* Starting from second for each ligature */) - { - TRACE_SERIALIZE (this); - if (unlikely (!c->extend_min (u.format))) return TRACE_RETURN (false); - unsigned int format = 1; - u.format.set (format); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.serialize (c, first_glyphs, ligature_per_first_glyph_count_list, num_first_glyphs, - ligatures_list, component_count_list, component_list)); - default:return TRACE_RETURN (false); - } - } - - template <typename context_t> - inline typename context_t::return_t dispatch (context_t *c) const - { - TRACE_DISPATCH (this); - switch (u.format) { - case 1: return TRACE_RETURN (c->dispatch (u.format1)); - default:return TRACE_RETURN (c->default_return_value ()); - } - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!u.format.sanitize (c)) return TRACE_RETURN (false); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.sanitize (c)); - default:return TRACE_RETURN (true); - } - } - - protected: - union { - USHORT format; /* Format identifier */ - LigatureSubstFormat1 format1; - } u; -}; - - -struct ContextSubst : Context {}; - -struct ChainContextSubst : ChainContext {}; - -struct ExtensionSubst : Extension<ExtensionSubst> -{ - typedef struct SubstLookupSubTable LookupSubTable; - - inline bool is_reverse (void) const; -}; - - -struct ReverseChainSingleSubstFormat1 -{ - inline void closure (hb_closure_context_t *c) const - { - TRACE_CLOSURE (this); - const OffsetArrayOf<Coverage> &lookahead = StructAfter<OffsetArrayOf<Coverage> > (backtrack); - - unsigned int count; - - count = backtrack.len; - for (unsigned int i = 0; i < count; i++) - if (!(this+backtrack[i]).intersects (c->glyphs)) - return; - - count = lookahead.len; - for (unsigned int i = 0; i < count; i++) - if (!(this+lookahead[i]).intersects (c->glyphs)) - return; - - const ArrayOf<GlyphID> &substitute = StructAfter<ArrayOf<GlyphID> > (lookahead); - Coverage::Iter iter; - for (iter.init (this+coverage); iter.more (); iter.next ()) { - if (c->glyphs->has (iter.get_glyph ())) - c->glyphs->add (substitute[iter.get_coverage ()]); - } - } - - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - - const OffsetArrayOf<Coverage> &lookahead = StructAfter<OffsetArrayOf<Coverage> > (backtrack); - - unsigned int count; - - (this+coverage).add_coverage (c->input); - - count = backtrack.len; - for (unsigned int i = 0; i < count; i++) - (this+backtrack[i]).add_coverage (c->before); - - count = lookahead.len; - for (unsigned int i = 0; i < count; i++) - (this+lookahead[i]).add_coverage (c->after); - - const ArrayOf<GlyphID> &substitute = StructAfter<ArrayOf<GlyphID> > (lookahead); - count = substitute.len; - for (unsigned int i = 0; i < count; i++) - c->output->add (substitute[i]); - } - - inline const Coverage &get_coverage (void) const - { - return this+coverage; - } - - inline bool would_apply (hb_would_apply_context_t *c) const - { - TRACE_WOULD_APPLY (this); - return TRACE_RETURN (c->len == 1 && (this+coverage).get_coverage (c->glyphs[0]) != NOT_COVERED); - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - if (unlikely (c->nesting_level_left != MAX_NESTING_LEVEL)) - return TRACE_RETURN (false); /* No chaining to this type */ - - unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint); - if (likely (index == NOT_COVERED)) return TRACE_RETURN (false); - - const OffsetArrayOf<Coverage> &lookahead = StructAfter<OffsetArrayOf<Coverage> > (backtrack); - const ArrayOf<GlyphID> &substitute = StructAfter<ArrayOf<GlyphID> > (lookahead); - - if (match_backtrack (c, - backtrack.len, (USHORT *) backtrack.array, - match_coverage, this) && - match_lookahead (c, - lookahead.len, (USHORT *) lookahead.array, - match_coverage, this, - 1)) - { - c->replace_glyph_inplace (substitute[index]); - c->buffer->idx--; /* Reverse! */ - return TRACE_RETURN (true); - } - - return TRACE_RETURN (false); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!(coverage.sanitize (c, this) && backtrack.sanitize (c, this))) - return TRACE_RETURN (false); - OffsetArrayOf<Coverage> &lookahead = StructAfter<OffsetArrayOf<Coverage> > (backtrack); - if (!lookahead.sanitize (c, this)) - return TRACE_RETURN (false); - ArrayOf<GlyphID> &substitute = StructAfter<ArrayOf<GlyphID> > (lookahead); - return TRACE_RETURN (substitute.sanitize (c)); - } - - protected: - USHORT format; /* Format identifier--format = 1 */ - OffsetTo<Coverage> - coverage; /* Offset to Coverage table--from - * beginning of table */ - OffsetArrayOf<Coverage> - backtrack; /* Array of coverage tables - * in backtracking sequence, in glyph - * sequence order */ - OffsetArrayOf<Coverage> - lookaheadX; /* Array of coverage tables - * in lookahead sequence, in glyph - * sequence order */ - ArrayOf<GlyphID> - substituteX; /* Array of substitute - * GlyphIDs--ordered by Coverage Index */ - public: - DEFINE_SIZE_MIN (10); -}; - -struct ReverseChainSingleSubst -{ - template <typename context_t> - inline typename context_t::return_t dispatch (context_t *c) const - { - TRACE_DISPATCH (this); - switch (u.format) { - case 1: return TRACE_RETURN (c->dispatch (u.format1)); - default:return TRACE_RETURN (c->default_return_value ()); - } - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!u.format.sanitize (c)) return TRACE_RETURN (false); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.sanitize (c)); - default:return TRACE_RETURN (true); - } - } - - protected: - union { - USHORT format; /* Format identifier */ - ReverseChainSingleSubstFormat1 format1; - } u; -}; - - - -/* - * SubstLookup - */ - -struct SubstLookupSubTable -{ - friend struct SubstLookup; - - enum Type { - Single = 1, - Multiple = 2, - Alternate = 3, - Ligature = 4, - Context = 5, - ChainContext = 6, - Extension = 7, - ReverseChainSingle = 8 - }; - - template <typename context_t> - inline typename context_t::return_t dispatch (context_t *c, unsigned int lookup_type) const - { - TRACE_DISPATCH (this); - switch (lookup_type) { - case Single: return TRACE_RETURN (u.single.dispatch (c)); - case Multiple: return TRACE_RETURN (u.multiple.dispatch (c)); - case Alternate: return TRACE_RETURN (u.alternate.dispatch (c)); - case Ligature: return TRACE_RETURN (u.ligature.dispatch (c)); - case Context: return TRACE_RETURN (u.context.dispatch (c)); - case ChainContext: return TRACE_RETURN (u.chainContext.dispatch (c)); - case Extension: return TRACE_RETURN (u.extension.dispatch (c)); - case ReverseChainSingle: return TRACE_RETURN (u.reverseChainContextSingle.dispatch (c)); - default: return TRACE_RETURN (c->default_return_value ()); - } - } - - inline bool sanitize (hb_sanitize_context_t *c, unsigned int lookup_type) { - TRACE_SANITIZE (this); - if (!u.header.sub_format.sanitize (c)) - return TRACE_RETURN (false); - switch (lookup_type) { - case Single: return TRACE_RETURN (u.single.sanitize (c)); - case Multiple: return TRACE_RETURN (u.multiple.sanitize (c)); - case Alternate: return TRACE_RETURN (u.alternate.sanitize (c)); - case Ligature: return TRACE_RETURN (u.ligature.sanitize (c)); - case Context: return TRACE_RETURN (u.context.sanitize (c)); - case ChainContext: return TRACE_RETURN (u.chainContext.sanitize (c)); - case Extension: return TRACE_RETURN (u.extension.sanitize (c)); - case ReverseChainSingle: return TRACE_RETURN (u.reverseChainContextSingle.sanitize (c)); - default: return TRACE_RETURN (true); - } - } - - protected: - union { - struct { - USHORT sub_format; - } header; - SingleSubst single; - MultipleSubst multiple; - AlternateSubst alternate; - LigatureSubst ligature; - ContextSubst context; - ChainContextSubst chainContext; - ExtensionSubst extension; - ReverseChainSingleSubst reverseChainContextSingle; - } u; - public: - DEFINE_SIZE_UNION (2, header.sub_format); -}; - - -struct SubstLookup : Lookup -{ - inline const SubstLookupSubTable& get_subtable (unsigned int i) const - { return this+CastR<OffsetArrayOf<SubstLookupSubTable> > (subTable)[i]; } - - inline static bool lookup_type_is_reverse (unsigned int lookup_type) - { return lookup_type == SubstLookupSubTable::ReverseChainSingle; } - - inline bool is_reverse (void) const - { - unsigned int type = get_type (); - if (unlikely (type == SubstLookupSubTable::Extension)) - return CastR<ExtensionSubst> (get_subtable(0)).is_reverse (); - return lookup_type_is_reverse (type); - } - - inline hb_closure_context_t::return_t closure (hb_closure_context_t *c) const - { - TRACE_CLOSURE (this); - c->set_recurse_func (dispatch_recurse_func<hb_closure_context_t>); - return TRACE_RETURN (dispatch (c)); - } - - inline hb_collect_glyphs_context_t::return_t collect_glyphs_lookup (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - c->set_recurse_func (dispatch_recurse_func<hb_collect_glyphs_context_t>); - return TRACE_RETURN (dispatch (c)); - } - - template <typename set_t> - inline void add_coverage (set_t *glyphs) const - { - hb_get_coverage_context_t c; - const Coverage *last = NULL; - unsigned int count = get_subtable_count (); - for (unsigned int i = 0; i < count; i++) { - const Coverage *coverage = &get_subtable (i).dispatch (&c, get_type ()); - if (coverage != last) { - coverage->add_coverage (glyphs); - last = coverage; - } - } - } - - inline bool would_apply (hb_would_apply_context_t *c, const hb_set_digest_t *digest) const - { - TRACE_WOULD_APPLY (this); - if (unlikely (!c->len)) return TRACE_RETURN (false); - if (!digest->may_have (c->glyphs[0])) return TRACE_RETURN (false); - return TRACE_RETURN (dispatch (c)); - } - - inline bool apply_once (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - if (!c->check_glyph_property (&c->buffer->cur(), c->lookup_props)) - return TRACE_RETURN (false); - return TRACE_RETURN (dispatch (c)); - } - - static bool apply_recurse_func (hb_apply_context_t *c, unsigned int lookup_index); - inline bool apply_string (hb_apply_context_t *c, const hb_set_digest_t *digest) const - { - bool ret = false; - - if (unlikely (!c->buffer->len || !c->lookup_mask)) - return false; - - c->set_recurse_func (apply_recurse_func); - c->set_lookup (*this); - - if (likely (!is_reverse ())) - { - /* in/out forward substitution */ - c->buffer->clear_output (); - c->buffer->idx = 0; - - while (c->buffer->idx < c->buffer->len) - { - if ((c->buffer->cur().mask & c->lookup_mask) && - digest->may_have (c->buffer->cur().codepoint) && - apply_once (c)) - ret = true; - else - c->buffer->next_glyph (); - } - if (ret) - c->buffer->swap_buffers (); - } - else - { - /* in-place backward substitution */ - c->buffer->remove_output (); - c->buffer->idx = c->buffer->len - 1; - do - { - if ((c->buffer->cur().mask & c->lookup_mask) && - digest->may_have (c->buffer->cur().codepoint) && - apply_once (c)) - ret = true; - else - c->buffer->idx--; - - } - while ((int) c->buffer->idx >= 0); - } - - return ret; - } - - inline SubstLookupSubTable& serialize_subtable (hb_serialize_context_t *c, - unsigned int i) - { return CastR<OffsetArrayOf<SubstLookupSubTable> > (subTable)[i].serialize (c, this); } - - inline bool serialize_single (hb_serialize_context_t *c, - uint32_t lookup_props, - Supplier<GlyphID> &glyphs, - Supplier<GlyphID> &substitutes, - unsigned int num_glyphs) - { - TRACE_SERIALIZE (this); - if (unlikely (!Lookup::serialize (c, SubstLookupSubTable::Single, lookup_props, 1))) return TRACE_RETURN (false); - return TRACE_RETURN (serialize_subtable (c, 0).u.single.serialize (c, glyphs, substitutes, num_glyphs)); - } - - inline bool serialize_multiple (hb_serialize_context_t *c, - uint32_t lookup_props, - Supplier<GlyphID> &glyphs, - Supplier<unsigned int> &substitute_len_list, - unsigned int num_glyphs, - Supplier<GlyphID> &substitute_glyphs_list) - { - TRACE_SERIALIZE (this); - if (unlikely (!Lookup::serialize (c, SubstLookupSubTable::Multiple, lookup_props, 1))) return TRACE_RETURN (false); - return TRACE_RETURN (serialize_subtable (c, 0).u.multiple.serialize (c, glyphs, substitute_len_list, num_glyphs, - substitute_glyphs_list)); - } - - inline bool serialize_alternate (hb_serialize_context_t *c, - uint32_t lookup_props, - Supplier<GlyphID> &glyphs, - Supplier<unsigned int> &alternate_len_list, - unsigned int num_glyphs, - Supplier<GlyphID> &alternate_glyphs_list) - { - TRACE_SERIALIZE (this); - if (unlikely (!Lookup::serialize (c, SubstLookupSubTable::Alternate, lookup_props, 1))) return TRACE_RETURN (false); - return TRACE_RETURN (serialize_subtable (c, 0).u.alternate.serialize (c, glyphs, alternate_len_list, num_glyphs, - alternate_glyphs_list)); - } - - inline bool serialize_ligature (hb_serialize_context_t *c, - uint32_t lookup_props, - Supplier<GlyphID> &first_glyphs, - Supplier<unsigned int> &ligature_per_first_glyph_count_list, - unsigned int num_first_glyphs, - Supplier<GlyphID> &ligatures_list, - Supplier<unsigned int> &component_count_list, - Supplier<GlyphID> &component_list /* Starting from second for each ligature */) - { - TRACE_SERIALIZE (this); - if (unlikely (!Lookup::serialize (c, SubstLookupSubTable::Ligature, lookup_props, 1))) return TRACE_RETURN (false); - return TRACE_RETURN (serialize_subtable (c, 0).u.ligature.serialize (c, first_glyphs, ligature_per_first_glyph_count_list, num_first_glyphs, - ligatures_list, component_count_list, component_list)); - } - - template <typename context_t> - static inline typename context_t::return_t dispatch_recurse_func (context_t *c, unsigned int lookup_index); - - template <typename context_t> - inline typename context_t::return_t dispatch (context_t *c) const - { - TRACE_DISPATCH (this); - unsigned int lookup_type = get_type (); - unsigned int count = get_subtable_count (); - for (unsigned int i = 0; i < count; i++) { - typename context_t::return_t r = get_subtable (i).dispatch (c, lookup_type); - if (c->stop_sublookup_iteration (r)) - return TRACE_RETURN (r); - } - return TRACE_RETURN (c->default_return_value ()); - } - - inline bool sanitize (hb_sanitize_context_t *c) - { - TRACE_SANITIZE (this); - if (unlikely (!Lookup::sanitize (c))) return TRACE_RETURN (false); - OffsetArrayOf<SubstLookupSubTable> &list = CastR<OffsetArrayOf<SubstLookupSubTable> > (subTable); - if (unlikely (!list.sanitize (c, this, get_type ()))) return TRACE_RETURN (false); - - if (unlikely (get_type () == SubstLookupSubTable::Extension)) - { - /* The spec says all subtables of an Extension lookup should - * have the same type. This is specially important if one has - * a reverse type! */ - unsigned int type = get_subtable (0).u.extension.get_type (); - unsigned int count = get_subtable_count (); - for (unsigned int i = 1; i < count; i++) - if (get_subtable (i).u.extension.get_type () != type) - return TRACE_RETURN (false); - } - return TRACE_RETURN (true); - } -}; - -typedef OffsetListOf<SubstLookup> SubstLookupList; - -/* - * GSUB -- The Glyph Substitution Table - */ - -struct GSUB : GSUBGPOS -{ - static const hb_tag_t Tag = HB_OT_TAG_GSUB; - - inline const SubstLookup& get_lookup (unsigned int i) const - { return CastR<SubstLookup> (GSUBGPOS::get_lookup (i)); } - - static inline void substitute_start (hb_font_t *font, hb_buffer_t *buffer); - static inline void substitute_finish (hb_font_t *font, hb_buffer_t *buffer); - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (unlikely (!GSUBGPOS::sanitize (c))) return TRACE_RETURN (false); - OffsetTo<SubstLookupList> &list = CastR<OffsetTo<SubstLookupList> > (lookupList); - return TRACE_RETURN (list.sanitize (c, this)); - } - public: - DEFINE_SIZE_STATIC (10); -}; - - -void -GSUB::substitute_start (hb_font_t *font, hb_buffer_t *buffer) -{ - HB_BUFFER_ALLOCATE_VAR (buffer, glyph_props); - HB_BUFFER_ALLOCATE_VAR (buffer, lig_props); - HB_BUFFER_ALLOCATE_VAR (buffer, syllable); - - const GDEF &gdef = *hb_ot_layout_from_face (font->face)->gdef; - unsigned int count = buffer->len; - for (unsigned int i = 0; i < count; i++) { - buffer->info[i].lig_props() = buffer->info[i].syllable() = 0; - buffer->info[i].glyph_props() = gdef.get_glyph_props (buffer->info[i].codepoint); - } -} - -void -GSUB::substitute_finish (hb_font_t *font HB_UNUSED, hb_buffer_t *buffer HB_UNUSED) -{ -} - - -/* Out-of-class implementation for methods recursing */ - -inline bool ExtensionSubst::is_reverse (void) const -{ - unsigned int type = get_type (); - if (unlikely (type == SubstLookupSubTable::Extension)) - return CastR<ExtensionSubst> (get_subtable<SubstLookupSubTable>()).is_reverse (); - return SubstLookup::lookup_type_is_reverse (type); -} - -template <typename context_t> -inline typename context_t::return_t SubstLookup::dispatch_recurse_func (context_t *c, unsigned int lookup_index) -{ - const GSUB &gsub = *(hb_ot_layout_from_face (c->face)->gsub); - const SubstLookup &l = gsub.get_lookup (lookup_index); - return l.dispatch (c); -} - -inline bool SubstLookup::apply_recurse_func (hb_apply_context_t *c, unsigned int lookup_index) -{ - const GSUB &gsub = *(hb_ot_layout_from_face (c->face)->gsub); - const SubstLookup &l = gsub.get_lookup (lookup_index); - unsigned int saved_lookup_props = c->lookup_props; - c->set_lookup (l); - bool ret = l.apply_once (c); - c->lookup_props = saved_lookup_props; - return ret; -} - - -} /* namespace OT */ - - -#endif /* HB_OT_LAYOUT_GSUB_TABLE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout-gsubgpos-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout-gsubgpos-private.hh deleted file mode 100644 index f46b3782ec7..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout-gsubgpos-private.hh +++ /dev/null @@ -1,2279 +0,0 @@ -/* - * Copyright © 2007,2008,2009,2010 Red Hat, Inc. - * Copyright © 2010,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_LAYOUT_GSUBGPOS_PRIVATE_HH -#define HB_OT_LAYOUT_GSUBGPOS_PRIVATE_HH - -#include "hb-buffer-private.hh" -#include "hb-ot-layout-gdef-table.hh" -#include "hb-set-private.hh" - - -namespace OT { - - - -#define TRACE_DISPATCH(this) \ - hb_auto_trace_t<context_t::max_debug_depth, typename context_t::return_t> trace \ - (&c->debug_depth, c->get_name (), this, HB_FUNC, \ - ""); - - -#ifndef HB_DEBUG_CLOSURE -#define HB_DEBUG_CLOSURE (HB_DEBUG+0) -#endif - -#define TRACE_CLOSURE(this) \ - hb_auto_trace_t<HB_DEBUG_CLOSURE, hb_void_t> trace \ - (&c->debug_depth, c->get_name (), this, HB_FUNC, \ - ""); - -struct hb_closure_context_t -{ - inline const char *get_name (void) { return "CLOSURE"; } - static const unsigned int max_debug_depth = HB_DEBUG_CLOSURE; - typedef hb_void_t return_t; - typedef return_t (*recurse_func_t) (hb_closure_context_t *c, unsigned int lookup_index); - template <typename T> - inline return_t dispatch (const T &obj) { obj.closure (this); return HB_VOID; } - static return_t default_return_value (void) { return HB_VOID; } - bool stop_sublookup_iteration (return_t r HB_UNUSED) const { return false; } - return_t recurse (unsigned int lookup_index) - { - if (unlikely (nesting_level_left == 0 || !recurse_func)) - return default_return_value (); - - nesting_level_left--; - recurse_func (this, lookup_index); - nesting_level_left++; - return HB_VOID; - } - - hb_face_t *face; - hb_set_t *glyphs; - recurse_func_t recurse_func; - unsigned int nesting_level_left; - unsigned int debug_depth; - - hb_closure_context_t (hb_face_t *face_, - hb_set_t *glyphs_, - unsigned int nesting_level_left_ = MAX_NESTING_LEVEL) : - face (face_), - glyphs (glyphs_), - recurse_func (NULL), - nesting_level_left (nesting_level_left_), - debug_depth (0) {} - - void set_recurse_func (recurse_func_t func) { recurse_func = func; } -}; - - - -#ifndef HB_DEBUG_WOULD_APPLY -#define HB_DEBUG_WOULD_APPLY (HB_DEBUG+0) -#endif - -#define TRACE_WOULD_APPLY(this) \ - hb_auto_trace_t<HB_DEBUG_WOULD_APPLY, bool> trace \ - (&c->debug_depth, c->get_name (), this, HB_FUNC, \ - "%d glyphs", c->len); - -struct hb_would_apply_context_t -{ - inline const char *get_name (void) { return "WOULD_APPLY"; } - static const unsigned int max_debug_depth = HB_DEBUG_WOULD_APPLY; - typedef bool return_t; - template <typename T> - inline return_t dispatch (const T &obj) { return obj.would_apply (this); } - static return_t default_return_value (void) { return false; } - bool stop_sublookup_iteration (return_t r) const { return r; } - - hb_face_t *face; - const hb_codepoint_t *glyphs; - unsigned int len; - bool zero_context; - unsigned int debug_depth; - - hb_would_apply_context_t (hb_face_t *face_, - const hb_codepoint_t *glyphs_, - unsigned int len_, - bool zero_context_) : - face (face_), - glyphs (glyphs_), - len (len_), - zero_context (zero_context_), - debug_depth (0) {} -}; - - - -#ifndef HB_DEBUG_COLLECT_GLYPHS -#define HB_DEBUG_COLLECT_GLYPHS (HB_DEBUG+0) -#endif - -#define TRACE_COLLECT_GLYPHS(this) \ - hb_auto_trace_t<HB_DEBUG_COLLECT_GLYPHS, hb_void_t> trace \ - (&c->debug_depth, c->get_name (), this, HB_FUNC, \ - ""); - -struct hb_collect_glyphs_context_t -{ - inline const char *get_name (void) { return "COLLECT_GLYPHS"; } - static const unsigned int max_debug_depth = HB_DEBUG_COLLECT_GLYPHS; - typedef hb_void_t return_t; - typedef return_t (*recurse_func_t) (hb_collect_glyphs_context_t *c, unsigned int lookup_index); - template <typename T> - inline return_t dispatch (const T &obj) { obj.collect_glyphs (this); return HB_VOID; } - static return_t default_return_value (void) { return HB_VOID; } - bool stop_sublookup_iteration (return_t r HB_UNUSED) const { return false; } - return_t recurse (unsigned int lookup_index) - { - if (unlikely (nesting_level_left == 0 || !recurse_func)) - return default_return_value (); - - /* Note that GPOS sets recurse_func to NULL already, so it doesn't get - * past the previous check. For GSUB, we only want to collect the output - * glyphs in the recursion. If output is not requested, we can go home now. */ - - if (output == hb_set_get_empty ()) - return HB_VOID; - - hb_set_t *old_before = before; - hb_set_t *old_input = input; - hb_set_t *old_after = after; - before = input = after = hb_set_get_empty (); - - nesting_level_left--; - recurse_func (this, lookup_index); - nesting_level_left++; - - before = old_before; - input = old_input; - after = old_after; - - return HB_VOID; - } - - hb_face_t *face; - hb_set_t *before; - hb_set_t *input; - hb_set_t *after; - hb_set_t *output; - recurse_func_t recurse_func; - unsigned int nesting_level_left; - unsigned int debug_depth; - - hb_collect_glyphs_context_t (hb_face_t *face_, - hb_set_t *glyphs_before, /* OUT. May be NULL */ - hb_set_t *glyphs_input, /* OUT. May be NULL */ - hb_set_t *glyphs_after, /* OUT. May be NULL */ - hb_set_t *glyphs_output, /* OUT. May be NULL */ - unsigned int nesting_level_left_ = MAX_NESTING_LEVEL) : - face (face_), - before (glyphs_before ? glyphs_before : hb_set_get_empty ()), - input (glyphs_input ? glyphs_input : hb_set_get_empty ()), - after (glyphs_after ? glyphs_after : hb_set_get_empty ()), - output (glyphs_output ? glyphs_output : hb_set_get_empty ()), - recurse_func (NULL), - nesting_level_left (nesting_level_left_), - debug_depth (0) {} - - void set_recurse_func (recurse_func_t func) { recurse_func = func; } -}; - - - -struct hb_get_coverage_context_t -{ - inline const char *get_name (void) { return "GET_COVERAGE"; } - static const unsigned int max_debug_depth = 0; - typedef const Coverage &return_t; - template <typename T> - inline return_t dispatch (const T &obj) { return obj.get_coverage (); } - static return_t default_return_value (void) { return Null(Coverage); } - - hb_get_coverage_context_t (void) : - debug_depth (0) {} - - unsigned int debug_depth; -}; - - - -#ifndef HB_DEBUG_APPLY -#define HB_DEBUG_APPLY (HB_DEBUG+0) -#endif - -#define TRACE_APPLY(this) \ - hb_auto_trace_t<HB_DEBUG_APPLY, bool> trace \ - (&c->debug_depth, c->get_name (), this, HB_FUNC, \ - "idx %d codepoint %u", c->buffer->idx, c->buffer->cur().codepoint); - -struct hb_apply_context_t -{ - inline const char *get_name (void) { return "APPLY"; } - static const unsigned int max_debug_depth = HB_DEBUG_APPLY; - typedef bool return_t; - typedef return_t (*recurse_func_t) (hb_apply_context_t *c, unsigned int lookup_index); - template <typename T> - inline return_t dispatch (const T &obj) { return obj.apply (this); } - static return_t default_return_value (void) { return false; } - bool stop_sublookup_iteration (return_t r) const { return r; } - return_t recurse (unsigned int lookup_index) - { - if (unlikely (nesting_level_left == 0 || !recurse_func)) - return default_return_value (); - - nesting_level_left--; - bool ret = recurse_func (this, lookup_index); - nesting_level_left++; - return ret; - } - - unsigned int table_index; /* GSUB/GPOS */ - hb_font_t *font; - hb_face_t *face; - hb_buffer_t *buffer; - hb_direction_t direction; - hb_mask_t lookup_mask; - bool auto_zwj; - recurse_func_t recurse_func; - unsigned int nesting_level_left; - unsigned int lookup_props; - const GDEF &gdef; - bool has_glyph_classes; - unsigned int debug_depth; - - - hb_apply_context_t (unsigned int table_index_, - hb_font_t *font_, - hb_buffer_t *buffer_, - hb_mask_t lookup_mask_, - bool auto_zwj_) : - table_index (table_index_), - font (font_), face (font->face), buffer (buffer_), - direction (buffer_->props.direction), - lookup_mask (lookup_mask_), - auto_zwj (auto_zwj_), - recurse_func (NULL), - nesting_level_left (MAX_NESTING_LEVEL), - lookup_props (0), - gdef (*hb_ot_layout_from_face (face)->gdef), - has_glyph_classes (gdef.has_glyph_classes ()), - debug_depth (0) {} - - inline void set_recurse_func (recurse_func_t func) { recurse_func = func; } - inline void set_lookup_props (unsigned int lookup_props_) { lookup_props = lookup_props_; } - inline void set_lookup (const Lookup &l) { lookup_props = l.get_props (); } - - struct matcher_t - { - inline matcher_t (void) : - lookup_props (0), - ignore_zwnj (false), - ignore_zwj (false), - mask (-1), -#define arg1(arg) (arg) /* Remove the macro to see why it's needed! */ - syllable arg1(0), -#undef arg1 - match_func (NULL), - match_data (NULL) {}; - - typedef bool (*match_func_t) (hb_codepoint_t glyph_id, const USHORT &value, const void *data); - - inline void set_ignore_zwnj (bool ignore_zwnj_) { ignore_zwnj = ignore_zwnj_; } - inline void set_ignore_zwj (bool ignore_zwj_) { ignore_zwj = ignore_zwj_; } - inline void set_lookup_props (unsigned int lookup_props_) { lookup_props = lookup_props_; } - inline void set_mask (hb_mask_t mask_) { mask = mask_; } - inline void set_syllable (uint8_t syllable_) { syllable = syllable_; } - inline void set_match_func (match_func_t match_func_, - const void *match_data_) - { match_func = match_func_; match_data = match_data_; } - - enum may_match_t { - MATCH_NO, - MATCH_YES, - MATCH_MAYBE - }; - - inline may_match_t may_match (const hb_glyph_info_t &info, - const USHORT *glyph_data) const - { - if (!(info.mask & mask) || - (syllable && syllable != info.syllable ())) - return MATCH_NO; - - if (match_func) - return match_func (info.codepoint, *glyph_data, match_data) ? MATCH_YES : MATCH_NO; - - return MATCH_MAYBE; - } - - enum may_skip_t { - SKIP_NO, - SKIP_YES, - SKIP_MAYBE - }; - - inline may_skip_t - may_skip (const hb_apply_context_t *c, - const hb_glyph_info_t &info) const - { - unsigned int property; - - property = info.glyph_props(); - - if (!c->match_properties (info.codepoint, property, lookup_props)) - return SKIP_YES; - - if (unlikely (_hb_glyph_info_is_default_ignorable (&info) && - (ignore_zwnj || !_hb_glyph_info_is_zwnj (&info)) && - (ignore_zwj || !_hb_glyph_info_is_zwj (&info)) && - !is_a_ligature (info))) - return SKIP_MAYBE; - - return SKIP_NO; - } - - protected: - unsigned int lookup_props; - bool ignore_zwnj; - bool ignore_zwj; - hb_mask_t mask; - uint8_t syllable; - match_func_t match_func; - const void *match_data; - }; - - struct skipping_forward_iterator_t - { - inline skipping_forward_iterator_t (hb_apply_context_t *c_, - unsigned int start_index_, - unsigned int num_items_, - bool context_match = false) : - idx (start_index_), - c (c_), - match_glyph_data (NULL), - num_items (num_items_), - end (c->buffer->len) - { - matcher.set_lookup_props (c->lookup_props); - /* Ignore ZWNJ if we are matching GSUB context, or matching GPOS. */ - matcher.set_ignore_zwnj (context_match || c->table_index == 1); - /* Ignore ZWJ if we are matching GSUB context, or matching GPOS, or if asked to. */ - matcher.set_ignore_zwj (context_match || c->table_index == 1 || c->auto_zwj); - if (!context_match) - matcher.set_mask (c->lookup_mask); - matcher.set_syllable (start_index_ == c->buffer->idx ? c->buffer->cur().syllable () : 0); - } - inline void set_lookup_props (unsigned int lookup_props) { matcher.set_lookup_props (lookup_props); } - inline void set_syllable (unsigned int syllable) { matcher.set_syllable (syllable); } - inline void set_match_func (matcher_t::match_func_t match_func, - const void *match_data, - const USHORT glyph_data[]) - { - matcher.set_match_func (match_func, match_data); - match_glyph_data = glyph_data; - } - - inline bool has_no_chance (void) const { return unlikely (num_items && idx + num_items >= end); } - inline void reject (void) { num_items++; match_glyph_data--; } - inline bool next (void) - { - assert (num_items > 0); - while (!has_no_chance ()) - { - idx++; - const hb_glyph_info_t &info = c->buffer->info[idx]; - - matcher_t::may_skip_t skip = matcher.may_skip (c, info); - if (unlikely (skip == matcher_t::SKIP_YES)) - continue; - - matcher_t::may_match_t match = matcher.may_match (info, match_glyph_data); - if (match == matcher_t::MATCH_YES || - (match == matcher_t::MATCH_MAYBE && - skip == matcher_t::SKIP_NO)) - { - num_items--; - match_glyph_data++; - return true; - } - - if (skip == matcher_t::SKIP_NO) - return false; - } - return false; - } - - unsigned int idx; - protected: - hb_apply_context_t *c; - matcher_t matcher; - const USHORT *match_glyph_data; - - unsigned int num_items; - unsigned int end; - }; - - struct skipping_backward_iterator_t - { - inline skipping_backward_iterator_t (hb_apply_context_t *c_, - unsigned int start_index_, - unsigned int num_items_, - bool context_match = false) : - idx (start_index_), - c (c_), - match_glyph_data (NULL), - num_items (num_items_) - { - matcher.set_lookup_props (c->lookup_props); - /* Ignore ZWNJ if we are matching GSUB context, or matching GPOS. */ - matcher.set_ignore_zwnj (context_match || c->table_index == 1); - /* Ignore ZWJ if we are matching GSUB context, or matching GPOS, or if asked to. */ - matcher.set_ignore_zwj (context_match || c->table_index == 1 || c->auto_zwj); - if (!context_match) - matcher.set_mask (c->lookup_mask); - matcher.set_syllable (start_index_ == c->buffer->idx ? c->buffer->cur().syllable () : 0); - } - inline void set_lookup_props (unsigned int lookup_props) { matcher.set_lookup_props (lookup_props); } - inline void set_syllable (unsigned int syllable) { matcher.set_syllable (syllable); } - inline void set_match_func (matcher_t::match_func_t match_func, - const void *match_data, - const USHORT glyph_data[]) - { - matcher.set_match_func (match_func, match_data); - match_glyph_data = glyph_data; - } - - inline bool has_no_chance (void) const { return unlikely (idx < num_items); } - inline void reject (void) { num_items++; } - inline bool prev (void) - { - assert (num_items > 0); - while (!has_no_chance ()) - { - idx--; - const hb_glyph_info_t &info = c->buffer->out_info[idx]; - - matcher_t::may_skip_t skip = matcher.may_skip (c, info); - - if (unlikely (skip == matcher_t::SKIP_YES)) - continue; - - matcher_t::may_match_t match = matcher.may_match (info, match_glyph_data); - if (match == matcher_t::MATCH_YES || - (match == matcher_t::MATCH_MAYBE && - skip == matcher_t::SKIP_NO)) - { - num_items--; - match_glyph_data++; - return true; - } - - if (skip == matcher_t::SKIP_NO) - return false; - } - return false; - } - - unsigned int idx; - protected: - hb_apply_context_t *c; - matcher_t matcher; - const USHORT *match_glyph_data; - - unsigned int num_items; - }; - - inline bool - match_properties_mark (hb_codepoint_t glyph, - unsigned int glyph_props, - unsigned int lookup_props) const - { - /* If using mark filtering sets, the high short of - * lookup_props has the set index. - */ - if (lookup_props & LookupFlag::UseMarkFilteringSet) - return gdef.mark_set_covers (lookup_props >> 16, glyph); - - /* The second byte of lookup_props has the meaning - * "ignore marks of attachment type different than - * the attachment type specified." - */ - if (lookup_props & LookupFlag::MarkAttachmentType) - return (lookup_props & LookupFlag::MarkAttachmentType) == (glyph_props & LookupFlag::MarkAttachmentType); - - return true; - } - - inline bool - match_properties (hb_codepoint_t glyph, - unsigned int glyph_props, - unsigned int lookup_props) const - { - /* Not covered, if, for example, glyph class is ligature and - * lookup_props includes LookupFlags::IgnoreLigatures - */ - if (glyph_props & lookup_props & LookupFlag::IgnoreFlags) - return false; - - if (unlikely (glyph_props & HB_OT_LAYOUT_GLYPH_PROPS_MARK)) - return match_properties_mark (glyph, glyph_props, lookup_props); - - return true; - } - - inline bool - check_glyph_property (hb_glyph_info_t *info, - unsigned int lookup_props) const - { - unsigned int property; - - property = info->glyph_props(); - - return match_properties (info->codepoint, property, lookup_props); - } - - inline void set_class (hb_codepoint_t glyph_index, unsigned int class_guess) const - { - if (likely (has_glyph_classes)) - buffer->cur().glyph_props() = gdef.get_glyph_props (glyph_index); - else if (class_guess) - buffer->cur().glyph_props() = class_guess; - } - - inline void output_glyph (hb_codepoint_t glyph_index, - unsigned int class_guess = 0) const - { - set_class (glyph_index, class_guess); - buffer->output_glyph (glyph_index); - } - inline void replace_glyph (hb_codepoint_t glyph_index, - unsigned int class_guess = 0) const - { - set_class (glyph_index, class_guess); - buffer->replace_glyph (glyph_index); - } - inline void replace_glyph_inplace (hb_codepoint_t glyph_index, - unsigned int class_guess = 0) const - { - set_class (glyph_index, class_guess); - buffer->cur().codepoint = glyph_index; - } -}; - - - -typedef bool (*intersects_func_t) (hb_set_t *glyphs, const USHORT &value, const void *data); -typedef void (*collect_glyphs_func_t) (hb_set_t *glyphs, const USHORT &value, const void *data); -typedef bool (*match_func_t) (hb_codepoint_t glyph_id, const USHORT &value, const void *data); - -struct ContextClosureFuncs -{ - intersects_func_t intersects; -}; -struct ContextCollectGlyphsFuncs -{ - collect_glyphs_func_t collect; -}; -struct ContextApplyFuncs -{ - match_func_t match; -}; - - -static inline bool intersects_glyph (hb_set_t *glyphs, const USHORT &value, const void *data HB_UNUSED) -{ - return glyphs->has (value); -} -static inline bool intersects_class (hb_set_t *glyphs, const USHORT &value, const void *data) -{ - const ClassDef &class_def = *reinterpret_cast<const ClassDef *>(data); - return class_def.intersects_class (glyphs, value); -} -static inline bool intersects_coverage (hb_set_t *glyphs, const USHORT &value, const void *data) -{ - const OffsetTo<Coverage> &coverage = (const OffsetTo<Coverage>&)value; - return (data+coverage).intersects (glyphs); -} - -static inline bool intersects_array (hb_closure_context_t *c, - unsigned int count, - const USHORT values[], - intersects_func_t intersects_func, - const void *intersects_data) -{ - for (unsigned int i = 0; i < count; i++) - if (likely (!intersects_func (c->glyphs, values[i], intersects_data))) - return false; - return true; -} - - -static inline void collect_glyph (hb_set_t *glyphs, const USHORT &value, const void *data HB_UNUSED) -{ - glyphs->add (value); -} -static inline void collect_class (hb_set_t *glyphs, const USHORT &value, const void *data) -{ - const ClassDef &class_def = *reinterpret_cast<const ClassDef *>(data); - class_def.add_class (glyphs, value); -} -static inline void collect_coverage (hb_set_t *glyphs, const USHORT &value, const void *data) -{ - const OffsetTo<Coverage> &coverage = (const OffsetTo<Coverage>&)value; - (data+coverage).add_coverage (glyphs); -} -static inline void collect_array (hb_collect_glyphs_context_t *c HB_UNUSED, - hb_set_t *glyphs, - unsigned int count, - const USHORT values[], - collect_glyphs_func_t collect_func, - const void *collect_data) -{ - for (unsigned int i = 0; i < count; i++) - collect_func (glyphs, values[i], collect_data); -} - - -static inline bool match_glyph (hb_codepoint_t glyph_id, const USHORT &value, const void *data HB_UNUSED) -{ - return glyph_id == value; -} -static inline bool match_class (hb_codepoint_t glyph_id, const USHORT &value, const void *data) -{ - const ClassDef &class_def = *reinterpret_cast<const ClassDef *>(data); - return class_def.get_class (glyph_id) == value; -} -static inline bool match_coverage (hb_codepoint_t glyph_id, const USHORT &value, const void *data) -{ - const OffsetTo<Coverage> &coverage = (const OffsetTo<Coverage>&)value; - return (data+coverage).get_coverage (glyph_id) != NOT_COVERED; -} - -static inline bool would_match_input (hb_would_apply_context_t *c, - unsigned int count, /* Including the first glyph (not matched) */ - const USHORT input[], /* Array of input values--start with second glyph */ - match_func_t match_func, - const void *match_data) -{ - if (count != c->len) - return false; - - for (unsigned int i = 1; i < count; i++) - if (likely (!match_func (c->glyphs[i], input[i - 1], match_data))) - return false; - - return true; -} -static inline bool match_input (hb_apply_context_t *c, - unsigned int count, /* Including the first glyph (not matched) */ - const USHORT input[], /* Array of input values--start with second glyph */ - match_func_t match_func, - const void *match_data, - unsigned int *end_offset = NULL, - bool *p_is_mark_ligature = NULL, - unsigned int *p_total_component_count = NULL) -{ - TRACE_APPLY (NULL); - - hb_apply_context_t::skipping_forward_iterator_t skippy_iter (c, c->buffer->idx, count - 1); - skippy_iter.set_match_func (match_func, match_data, input); - if (skippy_iter.has_no_chance ()) return TRACE_RETURN (false); - - /* - * This is perhaps the trickiest part of OpenType... Remarks: - * - * - If all components of the ligature were marks, we call this a mark ligature. - * - * - If there is no GDEF, and the ligature is NOT a mark ligature, we categorize - * it as a ligature glyph. - * - * - Ligatures cannot be formed across glyphs attached to different components - * of previous ligatures. Eg. the sequence is LAM,SHADDA,LAM,FATHA,HEH, and - * LAM,LAM,HEH form a ligature, leaving SHADDA,FATHA next to eachother. - * However, it would be wrong to ligate that SHADDA,FATHA sequence.o - * There is an exception to this: If a ligature tries ligating with marks that - * belong to it itself, go ahead, assuming that the font designer knows what - * they are doing (otherwise it can break Indic stuff when a matra wants to - * ligate with a conjunct...) - */ - - bool is_mark_ligature = !!(c->buffer->cur().glyph_props() & HB_OT_LAYOUT_GLYPH_PROPS_MARK); - - unsigned int total_component_count = 0; - total_component_count += get_lig_num_comps (c->buffer->cur()); - - unsigned int first_lig_id = get_lig_id (c->buffer->cur()); - unsigned int first_lig_comp = get_lig_comp (c->buffer->cur()); - - for (unsigned int i = 1; i < count; i++) - { - if (!skippy_iter.next ()) return TRACE_RETURN (false); - - unsigned int this_lig_id = get_lig_id (c->buffer->info[skippy_iter.idx]); - unsigned int this_lig_comp = get_lig_comp (c->buffer->info[skippy_iter.idx]); - - if (first_lig_id && first_lig_comp) { - /* If first component was attached to a previous ligature component, - * all subsequent components should be attached to the same ligature - * component, otherwise we shouldn't ligate them. */ - if (first_lig_id != this_lig_id || first_lig_comp != this_lig_comp) - return TRACE_RETURN (false); - } else { - /* If first component was NOT attached to a previous ligature component, - * all subsequent components should also NOT be attached to any ligature - * component, unless they are attached to the first component itself! */ - if (this_lig_id && this_lig_comp && (this_lig_id != first_lig_id)) - return TRACE_RETURN (false); - } - - is_mark_ligature = is_mark_ligature && (c->buffer->info[skippy_iter.idx].glyph_props() & HB_OT_LAYOUT_GLYPH_PROPS_MARK); - total_component_count += get_lig_num_comps (c->buffer->info[skippy_iter.idx]); - } - - if (end_offset) - *end_offset = skippy_iter.idx - c->buffer->idx + 1; - - if (p_is_mark_ligature) - *p_is_mark_ligature = is_mark_ligature; - - if (p_total_component_count) - *p_total_component_count = total_component_count; - - return TRACE_RETURN (true); -} -static inline void ligate_input (hb_apply_context_t *c, - unsigned int count, /* Including the first glyph (not matched) */ - const USHORT input[], /* Array of input values--start with second glyph */ - match_func_t match_func, - const void *match_data, - hb_codepoint_t lig_glyph, - bool is_mark_ligature, - unsigned int total_component_count) -{ - hb_apply_context_t::skipping_forward_iterator_t skippy_iter (c, c->buffer->idx, count - 1); - skippy_iter.set_match_func (match_func, match_data, input); - if (skippy_iter.has_no_chance ()) return; - - /* - * - If it *is* a mark ligature, we don't allocate a new ligature id, and leave - * the ligature to keep its old ligature id. This will allow it to attach to - * a base ligature in GPOS. Eg. if the sequence is: LAM,LAM,SHADDA,FATHA,HEH, - * and LAM,LAM,HEH for a ligature, they will leave SHADDA and FATHA wit a - * ligature id and component value of 2. Then if SHADDA,FATHA form a ligature - * later, we don't want them to lose their ligature id/component, otherwise - * GPOS will fail to correctly position the mark ligature on top of the - * LAM,LAM,HEH ligature. See: - * https://bugzilla.gnome.org/show_bug.cgi?id=676343 - * - * - If a ligature is formed of components that some of which are also ligatures - * themselves, and those ligature components had marks attached to *their* - * components, we have to attach the marks to the new ligature component - * positions! Now *that*'s tricky! And these marks may be following the - * last component of the whole sequence, so we should loop forward looking - * for them and update them. - * - * Eg. the sequence is LAM,LAM,SHADDA,FATHA,HEH, and the font first forms a - * 'calt' ligature of LAM,HEH, leaving the SHADDA and FATHA with a ligature - * id and component == 1. Now, during 'liga', the LAM and the LAM-HEH ligature - * form a LAM-LAM-HEH ligature. We need to reassign the SHADDA and FATHA to - * the new ligature with a component value of 2. - * - * This in fact happened to a font... See: - * https://bugzilla.gnome.org/show_bug.cgi?id=437633 - */ - - unsigned int klass = is_mark_ligature ? 0 : HB_OT_LAYOUT_GLYPH_PROPS_LIGATURE; - unsigned int lig_id = is_mark_ligature ? 0 : allocate_lig_id (c->buffer); - unsigned int last_lig_id = get_lig_id (c->buffer->cur()); - unsigned int last_num_components = get_lig_num_comps (c->buffer->cur()); - unsigned int components_so_far = last_num_components; - - if (!is_mark_ligature) - set_lig_props_for_ligature (c->buffer->cur(), lig_id, total_component_count); - c->replace_glyph (lig_glyph, klass); - - for (unsigned int i = 1; i < count; i++) - { - if (!skippy_iter.next ()) return; - - while (c->buffer->idx < skippy_iter.idx) - { - if (!is_mark_ligature) { - unsigned int new_lig_comp = components_so_far - last_num_components + - MIN (MAX (get_lig_comp (c->buffer->cur()), 1u), last_num_components); - set_lig_props_for_mark (c->buffer->cur(), lig_id, new_lig_comp); - } - c->buffer->next_glyph (); - } - - last_lig_id = get_lig_id (c->buffer->cur()); - last_num_components = get_lig_num_comps (c->buffer->cur()); - components_so_far += last_num_components; - - /* Skip the base glyph */ - c->buffer->idx++; - } - - if (!is_mark_ligature && last_lig_id) { - /* Re-adjust components for any marks following. */ - for (unsigned int i = c->buffer->idx; i < c->buffer->len; i++) { - if (last_lig_id == get_lig_id (c->buffer->info[i])) { - unsigned int new_lig_comp = components_so_far - last_num_components + - MIN (MAX (get_lig_comp (c->buffer->info[i]), 1u), last_num_components); - set_lig_props_for_mark (c->buffer->info[i], lig_id, new_lig_comp); - } else - break; - } - } -} - -static inline bool match_backtrack (hb_apply_context_t *c, - unsigned int count, - const USHORT backtrack[], - match_func_t match_func, - const void *match_data) -{ - TRACE_APPLY (NULL); - - hb_apply_context_t::skipping_backward_iterator_t skippy_iter (c, c->buffer->backtrack_len (), count, true); - skippy_iter.set_match_func (match_func, match_data, backtrack); - if (skippy_iter.has_no_chance ()) return TRACE_RETURN (false); - - for (unsigned int i = 0; i < count; i++) - if (!skippy_iter.prev ()) - return TRACE_RETURN (false); - - return TRACE_RETURN (true); -} - -static inline bool match_lookahead (hb_apply_context_t *c, - unsigned int count, - const USHORT lookahead[], - match_func_t match_func, - const void *match_data, - unsigned int offset) -{ - TRACE_APPLY (NULL); - - hb_apply_context_t::skipping_forward_iterator_t skippy_iter (c, c->buffer->idx + offset - 1, count, true); - skippy_iter.set_match_func (match_func, match_data, lookahead); - if (skippy_iter.has_no_chance ()) return TRACE_RETURN (false); - - for (unsigned int i = 0; i < count; i++) - if (!skippy_iter.next ()) - return TRACE_RETURN (false); - - return TRACE_RETURN (true); -} - - - -struct LookupRecord -{ - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this)); - } - - USHORT sequenceIndex; /* Index into current glyph - * sequence--first glyph = 0 */ - USHORT lookupListIndex; /* Lookup to apply to that - * position--zero--based */ - public: - DEFINE_SIZE_STATIC (4); -}; - - -template <typename context_t> -static inline void recurse_lookups (context_t *c, - unsigned int lookupCount, - const LookupRecord lookupRecord[] /* Array of LookupRecords--in design order */) -{ - for (unsigned int i = 0; i < lookupCount; i++) - c->recurse (lookupRecord->lookupListIndex); -} - -static inline bool apply_lookup (hb_apply_context_t *c, - unsigned int count, /* Including the first glyph */ - const USHORT input[], /* Array of input values--start with second glyph */ - match_func_t match_func, - const void *match_data, - unsigned int lookupCount, - const LookupRecord lookupRecord[] /* Array of LookupRecords--in design order */) -{ - TRACE_APPLY (NULL); - - unsigned int end = c->buffer->len; - if (unlikely (count == 0 || c->buffer->idx + count > end)) - return TRACE_RETURN (false); - - /* TODO We don't support lookupRecord arrays that are not increasing: - * Should be easy for in_place ones at least. */ - - /* Note: If sublookup is reverse, it will underflow after the first loop - * and we jump out of it. Not entirely disastrous. So we don't check - * for reverse lookup here. - */ - - hb_apply_context_t::skipping_forward_iterator_t skippy_iter (c, c->buffer->idx, count - 1); - skippy_iter.set_match_func (match_func, match_data, input); - uint8_t syllable = c->buffer->cur().syllable(); - - unsigned int i = 0; - if (lookupCount && 0 == lookupRecord->sequenceIndex) - { - unsigned int old_pos = c->buffer->idx; - - /* Apply a lookup */ - bool done = c->recurse (lookupRecord->lookupListIndex); - - lookupRecord++; - lookupCount--; - /* Err, this is wrong if the lookup jumped over some glyphs */ - i += c->buffer->idx - old_pos; - - if (!done) - goto not_applied; - else - { - /* Reinitialize iterator. */ - hb_apply_context_t::skipping_forward_iterator_t tmp (c, c->buffer->idx - 1, count - i); - tmp.set_syllable (syllable); - skippy_iter = tmp; - } - } - else - { - not_applied: - /* No lookup applied for this index */ - c->buffer->next_glyph (); - i++; - } - while (i < count) - { - if (!skippy_iter.next ()) return TRACE_RETURN (true); - while (c->buffer->idx < skippy_iter.idx) - c->buffer->next_glyph (); - - if (lookupCount && i == lookupRecord->sequenceIndex) - { - unsigned int old_pos = c->buffer->idx; - - /* Apply a lookup */ - bool done = c->recurse (lookupRecord->lookupListIndex); - - lookupRecord++; - lookupCount--; - /* Err, this is wrong if the lookup jumped over some glyphs */ - i += c->buffer->idx - old_pos; - - if (!done) - goto not_applied2; - else - { - /* Reinitialize iterator. */ - hb_apply_context_t::skipping_forward_iterator_t tmp (c, c->buffer->idx - 1, count - i); - tmp.set_syllable (syllable); - skippy_iter = tmp; - } - } - else - { - not_applied2: - /* No lookup applied for this index */ - c->buffer->next_glyph (); - i++; - } - } - - return TRACE_RETURN (true); -} - - - -/* Contextual lookups */ - -struct ContextClosureLookupContext -{ - ContextClosureFuncs funcs; - const void *intersects_data; -}; - -struct ContextCollectGlyphsLookupContext -{ - ContextCollectGlyphsFuncs funcs; - const void *collect_data; -}; - -struct ContextApplyLookupContext -{ - ContextApplyFuncs funcs; - const void *match_data; -}; - -static inline void context_closure_lookup (hb_closure_context_t *c, - unsigned int inputCount, /* Including the first glyph (not matched) */ - const USHORT input[], /* Array of input values--start with second glyph */ - unsigned int lookupCount, - const LookupRecord lookupRecord[], - ContextClosureLookupContext &lookup_context) -{ - if (intersects_array (c, - inputCount ? inputCount - 1 : 0, input, - lookup_context.funcs.intersects, lookup_context.intersects_data)) - recurse_lookups (c, - lookupCount, lookupRecord); -} - -static inline void context_collect_glyphs_lookup (hb_collect_glyphs_context_t *c, - unsigned int inputCount, /* Including the first glyph (not matched) */ - const USHORT input[], /* Array of input values--start with second glyph */ - unsigned int lookupCount, - const LookupRecord lookupRecord[], - ContextCollectGlyphsLookupContext &lookup_context) -{ - collect_array (c, c->input, - inputCount ? inputCount - 1 : 0, input, - lookup_context.funcs.collect, lookup_context.collect_data); - recurse_lookups (c, - lookupCount, lookupRecord); -} - -static inline bool context_would_apply_lookup (hb_would_apply_context_t *c, - unsigned int inputCount, /* Including the first glyph (not matched) */ - const USHORT input[], /* Array of input values--start with second glyph */ - unsigned int lookupCount HB_UNUSED, - const LookupRecord lookupRecord[] HB_UNUSED, - ContextApplyLookupContext &lookup_context) -{ - return would_match_input (c, - inputCount, input, - lookup_context.funcs.match, lookup_context.match_data); -} -static inline bool context_apply_lookup (hb_apply_context_t *c, - unsigned int inputCount, /* Including the first glyph (not matched) */ - const USHORT input[], /* Array of input values--start with second glyph */ - unsigned int lookupCount, - const LookupRecord lookupRecord[], - ContextApplyLookupContext &lookup_context) -{ - return match_input (c, - inputCount, input, - lookup_context.funcs.match, lookup_context.match_data) - && apply_lookup (c, - inputCount, input, - lookup_context.funcs.match, lookup_context.match_data, - lookupCount, lookupRecord); -} - -struct Rule -{ - inline void closure (hb_closure_context_t *c, ContextClosureLookupContext &lookup_context) const - { - TRACE_CLOSURE (this); - const LookupRecord *lookupRecord = &StructAtOffset<LookupRecord> (input, input[0].static_size * (inputCount ? inputCount - 1 : 0)); - context_closure_lookup (c, - inputCount, input, - lookupCount, lookupRecord, - lookup_context); - } - - inline void collect_glyphs (hb_collect_glyphs_context_t *c, ContextCollectGlyphsLookupContext &lookup_context) const - { - TRACE_COLLECT_GLYPHS (this); - const LookupRecord *lookupRecord = &StructAtOffset<LookupRecord> (input, input[0].static_size * (inputCount ? inputCount - 1 : 0)); - context_collect_glyphs_lookup (c, - inputCount, input, - lookupCount, lookupRecord, - lookup_context); - } - - inline bool would_apply (hb_would_apply_context_t *c, ContextApplyLookupContext &lookup_context) const - { - TRACE_WOULD_APPLY (this); - const LookupRecord *lookupRecord = &StructAtOffset<LookupRecord> (input, input[0].static_size * (inputCount ? inputCount - 1 : 0)); - return TRACE_RETURN (context_would_apply_lookup (c, inputCount, input, lookupCount, lookupRecord, lookup_context)); - } - - inline bool apply (hb_apply_context_t *c, ContextApplyLookupContext &lookup_context) const - { - TRACE_APPLY (this); - const LookupRecord *lookupRecord = &StructAtOffset<LookupRecord> (input, input[0].static_size * (inputCount ? inputCount - 1 : 0)); - return TRACE_RETURN (context_apply_lookup (c, inputCount, input, lookupCount, lookupRecord, lookup_context)); - } - - public: - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return inputCount.sanitize (c) - && lookupCount.sanitize (c) - && c->check_range (input, - input[0].static_size * inputCount - + lookupRecordX[0].static_size * lookupCount); - } - - protected: - USHORT inputCount; /* Total number of glyphs in input - * glyph sequence--includes the first - * glyph */ - USHORT lookupCount; /* Number of LookupRecords */ - USHORT input[VAR]; /* Array of match inputs--start with - * second glyph */ - LookupRecord lookupRecordX[VAR]; /* Array of LookupRecords--in - * design order */ - public: - DEFINE_SIZE_ARRAY2 (4, input, lookupRecordX); -}; - -struct RuleSet -{ - inline void closure (hb_closure_context_t *c, ContextClosureLookupContext &lookup_context) const - { - TRACE_CLOSURE (this); - unsigned int num_rules = rule.len; - for (unsigned int i = 0; i < num_rules; i++) - (this+rule[i]).closure (c, lookup_context); - } - - inline void collect_glyphs (hb_collect_glyphs_context_t *c, ContextCollectGlyphsLookupContext &lookup_context) const - { - TRACE_COLLECT_GLYPHS (this); - unsigned int num_rules = rule.len; - for (unsigned int i = 0; i < num_rules; i++) - (this+rule[i]).collect_glyphs (c, lookup_context); - } - - inline bool would_apply (hb_would_apply_context_t *c, ContextApplyLookupContext &lookup_context) const - { - TRACE_WOULD_APPLY (this); - unsigned int num_rules = rule.len; - for (unsigned int i = 0; i < num_rules; i++) - { - if ((this+rule[i]).would_apply (c, lookup_context)) - return TRACE_RETURN (true); - } - return TRACE_RETURN (false); - } - - inline bool apply (hb_apply_context_t *c, ContextApplyLookupContext &lookup_context) const - { - TRACE_APPLY (this); - unsigned int num_rules = rule.len; - for (unsigned int i = 0; i < num_rules; i++) - { - if ((this+rule[i]).apply (c, lookup_context)) - return TRACE_RETURN (true); - } - return TRACE_RETURN (false); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (rule.sanitize (c, this)); - } - - protected: - OffsetArrayOf<Rule> - rule; /* Array of Rule tables - * ordered by preference */ - public: - DEFINE_SIZE_ARRAY (2, rule); -}; - - -struct ContextFormat1 -{ - inline void closure (hb_closure_context_t *c) const - { - TRACE_CLOSURE (this); - - const Coverage &cov = (this+coverage); - - struct ContextClosureLookupContext lookup_context = { - {intersects_glyph}, - NULL - }; - - unsigned int count = ruleSet.len; - for (unsigned int i = 0; i < count; i++) - if (cov.intersects_coverage (c->glyphs, i)) { - const RuleSet &rule_set = this+ruleSet[i]; - rule_set.closure (c, lookup_context); - } - } - - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - (this+coverage).add_coverage (c->input); - - struct ContextCollectGlyphsLookupContext lookup_context = { - {collect_glyph}, - NULL - }; - - unsigned int count = ruleSet.len; - for (unsigned int i = 0; i < count; i++) - (this+ruleSet[i]).collect_glyphs (c, lookup_context); - } - - inline bool would_apply (hb_would_apply_context_t *c) const - { - TRACE_WOULD_APPLY (this); - - const RuleSet &rule_set = this+ruleSet[(this+coverage).get_coverage (c->glyphs[0])]; - struct ContextApplyLookupContext lookup_context = { - {match_glyph}, - NULL - }; - return TRACE_RETURN (rule_set.would_apply (c, lookup_context)); - } - - inline const Coverage &get_coverage (void) const - { - return this+coverage; - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint); - if (likely (index == NOT_COVERED)) - return TRACE_RETURN (false); - - const RuleSet &rule_set = this+ruleSet[index]; - struct ContextApplyLookupContext lookup_context = { - {match_glyph}, - NULL - }; - return TRACE_RETURN (rule_set.apply (c, lookup_context)); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (coverage.sanitize (c, this) && ruleSet.sanitize (c, this)); - } - - protected: - USHORT format; /* Format identifier--format = 1 */ - OffsetTo<Coverage> - coverage; /* Offset to Coverage table--from - * beginning of table */ - OffsetArrayOf<RuleSet> - ruleSet; /* Array of RuleSet tables - * ordered by Coverage Index */ - public: - DEFINE_SIZE_ARRAY (6, ruleSet); -}; - - -struct ContextFormat2 -{ - inline void closure (hb_closure_context_t *c) const - { - TRACE_CLOSURE (this); - if (!(this+coverage).intersects (c->glyphs)) - return; - - const ClassDef &class_def = this+classDef; - - struct ContextClosureLookupContext lookup_context = { - {intersects_class}, - &class_def - }; - - unsigned int count = ruleSet.len; - for (unsigned int i = 0; i < count; i++) - if (class_def.intersects_class (c->glyphs, i)) { - const RuleSet &rule_set = this+ruleSet[i]; - rule_set.closure (c, lookup_context); - } - } - - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - (this+coverage).add_coverage (c->input); - - const ClassDef &class_def = this+classDef; - struct ContextCollectGlyphsLookupContext lookup_context = { - {collect_class}, - &class_def - }; - - unsigned int count = ruleSet.len; - for (unsigned int i = 0; i < count; i++) - (this+ruleSet[i]).collect_glyphs (c, lookup_context); - } - - inline bool would_apply (hb_would_apply_context_t *c) const - { - TRACE_WOULD_APPLY (this); - - const ClassDef &class_def = this+classDef; - unsigned int index = class_def.get_class (c->glyphs[0]); - const RuleSet &rule_set = this+ruleSet[index]; - struct ContextApplyLookupContext lookup_context = { - {match_class}, - &class_def - }; - return TRACE_RETURN (rule_set.would_apply (c, lookup_context)); - } - - inline const Coverage &get_coverage (void) const - { - return this+coverage; - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint); - if (likely (index == NOT_COVERED)) return TRACE_RETURN (false); - - const ClassDef &class_def = this+classDef; - index = class_def.get_class (c->buffer->cur().codepoint); - const RuleSet &rule_set = this+ruleSet[index]; - struct ContextApplyLookupContext lookup_context = { - {match_class}, - &class_def - }; - return TRACE_RETURN (rule_set.apply (c, lookup_context)); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (coverage.sanitize (c, this) && classDef.sanitize (c, this) && ruleSet.sanitize (c, this)); - } - - protected: - USHORT format; /* Format identifier--format = 2 */ - OffsetTo<Coverage> - coverage; /* Offset to Coverage table--from - * beginning of table */ - OffsetTo<ClassDef> - classDef; /* Offset to glyph ClassDef table--from - * beginning of table */ - OffsetArrayOf<RuleSet> - ruleSet; /* Array of RuleSet tables - * ordered by class */ - public: - DEFINE_SIZE_ARRAY (8, ruleSet); -}; - - -struct ContextFormat3 -{ - inline void closure (hb_closure_context_t *c) const - { - TRACE_CLOSURE (this); - if (!(this+coverage[0]).intersects (c->glyphs)) - return; - - const LookupRecord *lookupRecord = &StructAtOffset<LookupRecord> (coverage, coverage[0].static_size * glyphCount); - struct ContextClosureLookupContext lookup_context = { - {intersects_coverage}, - this - }; - context_closure_lookup (c, - glyphCount, (const USHORT *) (coverage + 1), - lookupCount, lookupRecord, - lookup_context); - } - - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - (this+coverage[0]).add_coverage (c->input); - - const LookupRecord *lookupRecord = &StructAtOffset<LookupRecord> (coverage, coverage[0].static_size * glyphCount); - struct ContextCollectGlyphsLookupContext lookup_context = { - {collect_coverage}, - this - }; - - context_collect_glyphs_lookup (c, - glyphCount, (const USHORT *) (coverage + 1), - lookupCount, lookupRecord, - lookup_context); - } - - inline bool would_apply (hb_would_apply_context_t *c) const - { - TRACE_WOULD_APPLY (this); - - const LookupRecord *lookupRecord = &StructAtOffset<LookupRecord> (coverage, coverage[0].static_size * glyphCount); - struct ContextApplyLookupContext lookup_context = { - {match_coverage}, - this - }; - return TRACE_RETURN (context_would_apply_lookup (c, glyphCount, (const USHORT *) (coverage + 1), lookupCount, lookupRecord, lookup_context)); - } - - inline const Coverage &get_coverage (void) const - { - return this+coverage[0]; - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - unsigned int index = (this+coverage[0]).get_coverage (c->buffer->cur().codepoint); - if (likely (index == NOT_COVERED)) return TRACE_RETURN (false); - - const LookupRecord *lookupRecord = &StructAtOffset<LookupRecord> (coverage, coverage[0].static_size * glyphCount); - struct ContextApplyLookupContext lookup_context = { - {match_coverage}, - this - }; - return TRACE_RETURN (context_apply_lookup (c, glyphCount, (const USHORT *) (coverage + 1), lookupCount, lookupRecord, lookup_context)); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!c->check_struct (this)) return TRACE_RETURN (false); - unsigned int count = glyphCount; - if (!c->check_array (coverage, coverage[0].static_size, count)) return TRACE_RETURN (false); - for (unsigned int i = 0; i < count; i++) - if (!coverage[i].sanitize (c, this)) return TRACE_RETURN (false); - LookupRecord *lookupRecord = &StructAtOffset<LookupRecord> (coverage, coverage[0].static_size * count); - return TRACE_RETURN (c->check_array (lookupRecord, lookupRecord[0].static_size, lookupCount)); - } - - protected: - USHORT format; /* Format identifier--format = 3 */ - USHORT glyphCount; /* Number of glyphs in the input glyph - * sequence */ - USHORT lookupCount; /* Number of LookupRecords */ - OffsetTo<Coverage> - coverage[VAR]; /* Array of offsets to Coverage - * table in glyph sequence order */ - LookupRecord lookupRecordX[VAR]; /* Array of LookupRecords--in - * design order */ - public: - DEFINE_SIZE_ARRAY2 (6, coverage, lookupRecordX); -}; - -struct Context -{ - template <typename context_t> - inline typename context_t::return_t dispatch (context_t *c) const - { - TRACE_DISPATCH (this); - switch (u.format) { - case 1: return TRACE_RETURN (c->dispatch (u.format1)); - case 2: return TRACE_RETURN (c->dispatch (u.format2)); - case 3: return TRACE_RETURN (c->dispatch (u.format3)); - default:return TRACE_RETURN (c->default_return_value ()); - } - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!u.format.sanitize (c)) return TRACE_RETURN (false); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.sanitize (c)); - case 2: return TRACE_RETURN (u.format2.sanitize (c)); - case 3: return TRACE_RETURN (u.format3.sanitize (c)); - default:return TRACE_RETURN (true); - } - } - - protected: - union { - USHORT format; /* Format identifier */ - ContextFormat1 format1; - ContextFormat2 format2; - ContextFormat3 format3; - } u; -}; - - -/* Chaining Contextual lookups */ - -struct ChainContextClosureLookupContext -{ - ContextClosureFuncs funcs; - const void *intersects_data[3]; -}; - -struct ChainContextCollectGlyphsLookupContext -{ - ContextCollectGlyphsFuncs funcs; - const void *collect_data[3]; -}; - -struct ChainContextApplyLookupContext -{ - ContextApplyFuncs funcs; - const void *match_data[3]; -}; - -static inline void chain_context_closure_lookup (hb_closure_context_t *c, - unsigned int backtrackCount, - const USHORT backtrack[], - unsigned int inputCount, /* Including the first glyph (not matched) */ - const USHORT input[], /* Array of input values--start with second glyph */ - unsigned int lookaheadCount, - const USHORT lookahead[], - unsigned int lookupCount, - const LookupRecord lookupRecord[], - ChainContextClosureLookupContext &lookup_context) -{ - if (intersects_array (c, - backtrackCount, backtrack, - lookup_context.funcs.intersects, lookup_context.intersects_data[0]) - && intersects_array (c, - inputCount ? inputCount - 1 : 0, input, - lookup_context.funcs.intersects, lookup_context.intersects_data[1]) - && intersects_array (c, - lookaheadCount, lookahead, - lookup_context.funcs.intersects, lookup_context.intersects_data[2])) - recurse_lookups (c, - lookupCount, lookupRecord); -} - -static inline void chain_context_collect_glyphs_lookup (hb_collect_glyphs_context_t *c, - unsigned int backtrackCount, - const USHORT backtrack[], - unsigned int inputCount, /* Including the first glyph (not matched) */ - const USHORT input[], /* Array of input values--start with second glyph */ - unsigned int lookaheadCount, - const USHORT lookahead[], - unsigned int lookupCount, - const LookupRecord lookupRecord[], - ChainContextCollectGlyphsLookupContext &lookup_context) -{ - collect_array (c, c->before, - backtrackCount, backtrack, - lookup_context.funcs.collect, lookup_context.collect_data[0]); - collect_array (c, c->input, - inputCount ? inputCount - 1 : 0, input, - lookup_context.funcs.collect, lookup_context.collect_data[1]); - collect_array (c, c->after, - lookaheadCount, lookahead, - lookup_context.funcs.collect, lookup_context.collect_data[2]); - recurse_lookups (c, - lookupCount, lookupRecord); -} - -static inline bool chain_context_would_apply_lookup (hb_would_apply_context_t *c, - unsigned int backtrackCount, - const USHORT backtrack[] HB_UNUSED, - unsigned int inputCount, /* Including the first glyph (not matched) */ - const USHORT input[], /* Array of input values--start with second glyph */ - unsigned int lookaheadCount, - const USHORT lookahead[] HB_UNUSED, - unsigned int lookupCount HB_UNUSED, - const LookupRecord lookupRecord[] HB_UNUSED, - ChainContextApplyLookupContext &lookup_context) -{ - return (c->zero_context ? !backtrackCount && !lookaheadCount : true) - && would_match_input (c, - inputCount, input, - lookup_context.funcs.match, lookup_context.match_data[1]); -} - -static inline bool chain_context_apply_lookup (hb_apply_context_t *c, - unsigned int backtrackCount, - const USHORT backtrack[], - unsigned int inputCount, /* Including the first glyph (not matched) */ - const USHORT input[], /* Array of input values--start with second glyph */ - unsigned int lookaheadCount, - const USHORT lookahead[], - unsigned int lookupCount, - const LookupRecord lookupRecord[], - ChainContextApplyLookupContext &lookup_context) -{ - unsigned int lookahead_offset = 0; - return match_input (c, - inputCount, input, - lookup_context.funcs.match, lookup_context.match_data[1], - &lookahead_offset) - && match_backtrack (c, - backtrackCount, backtrack, - lookup_context.funcs.match, lookup_context.match_data[0]) - && match_lookahead (c, - lookaheadCount, lookahead, - lookup_context.funcs.match, lookup_context.match_data[2], - lookahead_offset) - && apply_lookup (c, - inputCount, input, - lookup_context.funcs.match, lookup_context.match_data[1], - lookupCount, lookupRecord); -} - -struct ChainRule -{ - inline void closure (hb_closure_context_t *c, ChainContextClosureLookupContext &lookup_context) const - { - TRACE_CLOSURE (this); - const HeadlessArrayOf<USHORT> &input = StructAfter<HeadlessArrayOf<USHORT> > (backtrack); - const ArrayOf<USHORT> &lookahead = StructAfter<ArrayOf<USHORT> > (input); - const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead); - chain_context_closure_lookup (c, - backtrack.len, backtrack.array, - input.len, input.array, - lookahead.len, lookahead.array, - lookup.len, lookup.array, - lookup_context); - } - - inline void collect_glyphs (hb_collect_glyphs_context_t *c, ChainContextCollectGlyphsLookupContext &lookup_context) const - { - TRACE_COLLECT_GLYPHS (this); - const HeadlessArrayOf<USHORT> &input = StructAfter<HeadlessArrayOf<USHORT> > (backtrack); - const ArrayOf<USHORT> &lookahead = StructAfter<ArrayOf<USHORT> > (input); - const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead); - chain_context_collect_glyphs_lookup (c, - backtrack.len, backtrack.array, - input.len, input.array, - lookahead.len, lookahead.array, - lookup.len, lookup.array, - lookup_context); - } - - inline bool would_apply (hb_would_apply_context_t *c, ChainContextApplyLookupContext &lookup_context) const - { - TRACE_WOULD_APPLY (this); - const HeadlessArrayOf<USHORT> &input = StructAfter<HeadlessArrayOf<USHORT> > (backtrack); - const ArrayOf<USHORT> &lookahead = StructAfter<ArrayOf<USHORT> > (input); - const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead); - return TRACE_RETURN (chain_context_would_apply_lookup (c, - backtrack.len, backtrack.array, - input.len, input.array, - lookahead.len, lookahead.array, lookup.len, - lookup.array, lookup_context)); - } - - inline bool apply (hb_apply_context_t *c, ChainContextApplyLookupContext &lookup_context) const - { - TRACE_APPLY (this); - const HeadlessArrayOf<USHORT> &input = StructAfter<HeadlessArrayOf<USHORT> > (backtrack); - const ArrayOf<USHORT> &lookahead = StructAfter<ArrayOf<USHORT> > (input); - const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead); - return TRACE_RETURN (chain_context_apply_lookup (c, - backtrack.len, backtrack.array, - input.len, input.array, - lookahead.len, lookahead.array, lookup.len, - lookup.array, lookup_context)); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!backtrack.sanitize (c)) return TRACE_RETURN (false); - HeadlessArrayOf<USHORT> &input = StructAfter<HeadlessArrayOf<USHORT> > (backtrack); - if (!input.sanitize (c)) return TRACE_RETURN (false); - ArrayOf<USHORT> &lookahead = StructAfter<ArrayOf<USHORT> > (input); - if (!lookahead.sanitize (c)) return TRACE_RETURN (false); - ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead); - return TRACE_RETURN (lookup.sanitize (c)); - } - - protected: - ArrayOf<USHORT> - backtrack; /* Array of backtracking values - * (to be matched before the input - * sequence) */ - HeadlessArrayOf<USHORT> - inputX; /* Array of input values (start with - * second glyph) */ - ArrayOf<USHORT> - lookaheadX; /* Array of lookahead values's (to be - * matched after the input sequence) */ - ArrayOf<LookupRecord> - lookupX; /* Array of LookupRecords--in - * design order) */ - public: - DEFINE_SIZE_MIN (8); -}; - -struct ChainRuleSet -{ - inline void closure (hb_closure_context_t *c, ChainContextClosureLookupContext &lookup_context) const - { - TRACE_CLOSURE (this); - unsigned int num_rules = rule.len; - for (unsigned int i = 0; i < num_rules; i++) - (this+rule[i]).closure (c, lookup_context); - } - - inline void collect_glyphs (hb_collect_glyphs_context_t *c, ChainContextCollectGlyphsLookupContext &lookup_context) const - { - TRACE_COLLECT_GLYPHS (this); - unsigned int num_rules = rule.len; - for (unsigned int i = 0; i < num_rules; i++) - (this+rule[i]).collect_glyphs (c, lookup_context); - } - - inline bool would_apply (hb_would_apply_context_t *c, ChainContextApplyLookupContext &lookup_context) const - { - TRACE_WOULD_APPLY (this); - unsigned int num_rules = rule.len; - for (unsigned int i = 0; i < num_rules; i++) - if ((this+rule[i]).would_apply (c, lookup_context)) - return TRACE_RETURN (true); - - return TRACE_RETURN (false); - } - - inline bool apply (hb_apply_context_t *c, ChainContextApplyLookupContext &lookup_context) const - { - TRACE_APPLY (this); - unsigned int num_rules = rule.len; - for (unsigned int i = 0; i < num_rules; i++) - if ((this+rule[i]).apply (c, lookup_context)) - return TRACE_RETURN (true); - - return TRACE_RETURN (false); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (rule.sanitize (c, this)); - } - - protected: - OffsetArrayOf<ChainRule> - rule; /* Array of ChainRule tables - * ordered by preference */ - public: - DEFINE_SIZE_ARRAY (2, rule); -}; - -struct ChainContextFormat1 -{ - inline void closure (hb_closure_context_t *c) const - { - TRACE_CLOSURE (this); - const Coverage &cov = (this+coverage); - - struct ChainContextClosureLookupContext lookup_context = { - {intersects_glyph}, - {NULL, NULL, NULL} - }; - - unsigned int count = ruleSet.len; - for (unsigned int i = 0; i < count; i++) - if (cov.intersects_coverage (c->glyphs, i)) { - const ChainRuleSet &rule_set = this+ruleSet[i]; - rule_set.closure (c, lookup_context); - } - } - - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - (this+coverage).add_coverage (c->input); - - struct ChainContextCollectGlyphsLookupContext lookup_context = { - {collect_glyph}, - {NULL, NULL, NULL} - }; - - unsigned int count = ruleSet.len; - for (unsigned int i = 0; i < count; i++) - (this+ruleSet[i]).collect_glyphs (c, lookup_context); - } - - inline bool would_apply (hb_would_apply_context_t *c) const - { - TRACE_WOULD_APPLY (this); - - const ChainRuleSet &rule_set = this+ruleSet[(this+coverage).get_coverage (c->glyphs[0])]; - struct ChainContextApplyLookupContext lookup_context = { - {match_glyph}, - {NULL, NULL, NULL} - }; - return TRACE_RETURN (rule_set.would_apply (c, lookup_context)); - } - - inline const Coverage &get_coverage (void) const - { - return this+coverage; - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint); - if (likely (index == NOT_COVERED)) return TRACE_RETURN (false); - - const ChainRuleSet &rule_set = this+ruleSet[index]; - struct ChainContextApplyLookupContext lookup_context = { - {match_glyph}, - {NULL, NULL, NULL} - }; - return TRACE_RETURN (rule_set.apply (c, lookup_context)); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (coverage.sanitize (c, this) && ruleSet.sanitize (c, this)); - } - - protected: - USHORT format; /* Format identifier--format = 1 */ - OffsetTo<Coverage> - coverage; /* Offset to Coverage table--from - * beginning of table */ - OffsetArrayOf<ChainRuleSet> - ruleSet; /* Array of ChainRuleSet tables - * ordered by Coverage Index */ - public: - DEFINE_SIZE_ARRAY (6, ruleSet); -}; - -struct ChainContextFormat2 -{ - inline void closure (hb_closure_context_t *c) const - { - TRACE_CLOSURE (this); - if (!(this+coverage).intersects (c->glyphs)) - return; - - const ClassDef &backtrack_class_def = this+backtrackClassDef; - const ClassDef &input_class_def = this+inputClassDef; - const ClassDef &lookahead_class_def = this+lookaheadClassDef; - - struct ChainContextClosureLookupContext lookup_context = { - {intersects_class}, - {&backtrack_class_def, - &input_class_def, - &lookahead_class_def} - }; - - unsigned int count = ruleSet.len; - for (unsigned int i = 0; i < count; i++) - if (input_class_def.intersects_class (c->glyphs, i)) { - const ChainRuleSet &rule_set = this+ruleSet[i]; - rule_set.closure (c, lookup_context); - } - } - - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - (this+coverage).add_coverage (c->input); - - const ClassDef &backtrack_class_def = this+backtrackClassDef; - const ClassDef &input_class_def = this+inputClassDef; - const ClassDef &lookahead_class_def = this+lookaheadClassDef; - - struct ChainContextCollectGlyphsLookupContext lookup_context = { - {collect_class}, - {&backtrack_class_def, - &input_class_def, - &lookahead_class_def} - }; - - unsigned int count = ruleSet.len; - for (unsigned int i = 0; i < count; i++) - (this+ruleSet[i]).collect_glyphs (c, lookup_context); - } - - inline bool would_apply (hb_would_apply_context_t *c) const - { - TRACE_WOULD_APPLY (this); - - const ClassDef &backtrack_class_def = this+backtrackClassDef; - const ClassDef &input_class_def = this+inputClassDef; - const ClassDef &lookahead_class_def = this+lookaheadClassDef; - - unsigned int index = input_class_def.get_class (c->glyphs[0]); - const ChainRuleSet &rule_set = this+ruleSet[index]; - struct ChainContextApplyLookupContext lookup_context = { - {match_class}, - {&backtrack_class_def, - &input_class_def, - &lookahead_class_def} - }; - return TRACE_RETURN (rule_set.would_apply (c, lookup_context)); - } - - inline const Coverage &get_coverage (void) const - { - return this+coverage; - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - unsigned int index = (this+coverage).get_coverage (c->buffer->cur().codepoint); - if (likely (index == NOT_COVERED)) return TRACE_RETURN (false); - - const ClassDef &backtrack_class_def = this+backtrackClassDef; - const ClassDef &input_class_def = this+inputClassDef; - const ClassDef &lookahead_class_def = this+lookaheadClassDef; - - index = input_class_def.get_class (c->buffer->cur().codepoint); - const ChainRuleSet &rule_set = this+ruleSet[index]; - struct ChainContextApplyLookupContext lookup_context = { - {match_class}, - {&backtrack_class_def, - &input_class_def, - &lookahead_class_def} - }; - return TRACE_RETURN (rule_set.apply (c, lookup_context)); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (coverage.sanitize (c, this) && backtrackClassDef.sanitize (c, this) && - inputClassDef.sanitize (c, this) && lookaheadClassDef.sanitize (c, this) && - ruleSet.sanitize (c, this)); - } - - protected: - USHORT format; /* Format identifier--format = 2 */ - OffsetTo<Coverage> - coverage; /* Offset to Coverage table--from - * beginning of table */ - OffsetTo<ClassDef> - backtrackClassDef; /* Offset to glyph ClassDef table - * containing backtrack sequence - * data--from beginning of table */ - OffsetTo<ClassDef> - inputClassDef; /* Offset to glyph ClassDef - * table containing input sequence - * data--from beginning of table */ - OffsetTo<ClassDef> - lookaheadClassDef; /* Offset to glyph ClassDef table - * containing lookahead sequence - * data--from beginning of table */ - OffsetArrayOf<ChainRuleSet> - ruleSet; /* Array of ChainRuleSet tables - * ordered by class */ - public: - DEFINE_SIZE_ARRAY (12, ruleSet); -}; - -struct ChainContextFormat3 -{ - inline void closure (hb_closure_context_t *c) const - { - TRACE_CLOSURE (this); - const OffsetArrayOf<Coverage> &input = StructAfter<OffsetArrayOf<Coverage> > (backtrack); - - if (!(this+input[0]).intersects (c->glyphs)) - return; - - const OffsetArrayOf<Coverage> &lookahead = StructAfter<OffsetArrayOf<Coverage> > (input); - const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead); - struct ChainContextClosureLookupContext lookup_context = { - {intersects_coverage}, - {this, this, this} - }; - chain_context_closure_lookup (c, - backtrack.len, (const USHORT *) backtrack.array, - input.len, (const USHORT *) input.array + 1, - lookahead.len, (const USHORT *) lookahead.array, - lookup.len, lookup.array, - lookup_context); - } - - inline void collect_glyphs (hb_collect_glyphs_context_t *c) const - { - TRACE_COLLECT_GLYPHS (this); - const OffsetArrayOf<Coverage> &input = StructAfter<OffsetArrayOf<Coverage> > (backtrack); - - (this+input[0]).add_coverage (c->input); - - const OffsetArrayOf<Coverage> &lookahead = StructAfter<OffsetArrayOf<Coverage> > (input); - const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead); - struct ChainContextCollectGlyphsLookupContext lookup_context = { - {collect_coverage}, - {this, this, this} - }; - chain_context_collect_glyphs_lookup (c, - backtrack.len, (const USHORT *) backtrack.array, - input.len, (const USHORT *) input.array + 1, - lookahead.len, (const USHORT *) lookahead.array, - lookup.len, lookup.array, - lookup_context); - } - - inline bool would_apply (hb_would_apply_context_t *c) const - { - TRACE_WOULD_APPLY (this); - - const OffsetArrayOf<Coverage> &input = StructAfter<OffsetArrayOf<Coverage> > (backtrack); - const OffsetArrayOf<Coverage> &lookahead = StructAfter<OffsetArrayOf<Coverage> > (input); - const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead); - struct ChainContextApplyLookupContext lookup_context = { - {match_coverage}, - {this, this, this} - }; - return TRACE_RETURN (chain_context_would_apply_lookup (c, - backtrack.len, (const USHORT *) backtrack.array, - input.len, (const USHORT *) input.array + 1, - lookahead.len, (const USHORT *) lookahead.array, - lookup.len, lookup.array, lookup_context)); - } - - inline const Coverage &get_coverage (void) const - { - const OffsetArrayOf<Coverage> &input = StructAfter<OffsetArrayOf<Coverage> > (backtrack); - return this+input[0]; - } - - inline bool apply (hb_apply_context_t *c) const - { - TRACE_APPLY (this); - const OffsetArrayOf<Coverage> &input = StructAfter<OffsetArrayOf<Coverage> > (backtrack); - - unsigned int index = (this+input[0]).get_coverage (c->buffer->cur().codepoint); - if (likely (index == NOT_COVERED)) return TRACE_RETURN (false); - - const OffsetArrayOf<Coverage> &lookahead = StructAfter<OffsetArrayOf<Coverage> > (input); - const ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead); - struct ChainContextApplyLookupContext lookup_context = { - {match_coverage}, - {this, this, this} - }; - return TRACE_RETURN (chain_context_apply_lookup (c, - backtrack.len, (const USHORT *) backtrack.array, - input.len, (const USHORT *) input.array + 1, - lookahead.len, (const USHORT *) lookahead.array, - lookup.len, lookup.array, lookup_context)); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!backtrack.sanitize (c, this)) return TRACE_RETURN (false); - OffsetArrayOf<Coverage> &input = StructAfter<OffsetArrayOf<Coverage> > (backtrack); - if (!input.sanitize (c, this)) return TRACE_RETURN (false); - OffsetArrayOf<Coverage> &lookahead = StructAfter<OffsetArrayOf<Coverage> > (input); - if (!lookahead.sanitize (c, this)) return TRACE_RETURN (false); - ArrayOf<LookupRecord> &lookup = StructAfter<ArrayOf<LookupRecord> > (lookahead); - return TRACE_RETURN (lookup.sanitize (c)); - } - - protected: - USHORT format; /* Format identifier--format = 3 */ - OffsetArrayOf<Coverage> - backtrack; /* Array of coverage tables - * in backtracking sequence, in glyph - * sequence order */ - OffsetArrayOf<Coverage> - inputX ; /* Array of coverage - * tables in input sequence, in glyph - * sequence order */ - OffsetArrayOf<Coverage> - lookaheadX; /* Array of coverage tables - * in lookahead sequence, in glyph - * sequence order */ - ArrayOf<LookupRecord> - lookupX; /* Array of LookupRecords--in - * design order) */ - public: - DEFINE_SIZE_MIN (10); -}; - -struct ChainContext -{ - template <typename context_t> - inline typename context_t::return_t dispatch (context_t *c) const - { - TRACE_DISPATCH (this); - switch (u.format) { - case 1: return TRACE_RETURN (c->dispatch (u.format1)); - case 2: return TRACE_RETURN (c->dispatch (u.format2)); - case 3: return TRACE_RETURN (c->dispatch (u.format3)); - default:return TRACE_RETURN (c->default_return_value ()); - } - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!u.format.sanitize (c)) return TRACE_RETURN (false); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.sanitize (c)); - case 2: return TRACE_RETURN (u.format2.sanitize (c)); - case 3: return TRACE_RETURN (u.format3.sanitize (c)); - default:return TRACE_RETURN (true); - } - } - - protected: - union { - USHORT format; /* Format identifier */ - ChainContextFormat1 format1; - ChainContextFormat2 format2; - ChainContextFormat3 format3; - } u; -}; - - -struct ExtensionFormat1 -{ - inline unsigned int get_type (void) const { return extensionLookupType; } - inline unsigned int get_offset (void) const { return extensionOffset; } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this)); - } - - protected: - USHORT format; /* Format identifier. Set to 1. */ - USHORT extensionLookupType; /* Lookup type of subtable referenced - * by ExtensionOffset (i.e. the - * extension subtable). */ - ULONG extensionOffset; /* Offset to the extension subtable, - * of lookup type subtable. */ - public: - DEFINE_SIZE_STATIC (8); -}; - -template <typename T> -struct Extension -{ - inline unsigned int get_type (void) const - { - switch (u.format) { - case 1: return u.format1.get_type (); - default:return 0; - } - } - inline unsigned int get_offset (void) const - { - switch (u.format) { - case 1: return u.format1.get_offset (); - default:return 0; - } - } - - template <typename X> - inline const X& get_subtable (void) const - { - unsigned int offset = get_offset (); - if (unlikely (!offset)) return Null(typename T::LookupSubTable); - return StructAtOffset<typename T::LookupSubTable> (this, offset); - } - - template <typename context_t> - inline typename context_t::return_t dispatch (context_t *c) const - { - return get_subtable<typename T::LookupSubTable> ().dispatch (c, get_type ()); - } - - inline bool sanitize_self (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!u.format.sanitize (c)) return TRACE_RETURN (false); - switch (u.format) { - case 1: return TRACE_RETURN (u.format1.sanitize (c)); - default:return TRACE_RETURN (true); - } - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - if (!sanitize_self (c)) return TRACE_RETURN (false); - unsigned int offset = get_offset (); - if (unlikely (!offset)) return TRACE_RETURN (true); - return TRACE_RETURN (StructAtOffset<typename T::LookupSubTable> (this, offset).sanitize (c, get_type ())); - } - - protected: - union { - USHORT format; /* Format identifier */ - ExtensionFormat1 format1; - } u; -}; - - -/* - * GSUB/GPOS Common - */ - -struct GSUBGPOS -{ - static const hb_tag_t GSUBTag = HB_OT_TAG_GSUB; - static const hb_tag_t GPOSTag = HB_OT_TAG_GPOS; - - inline unsigned int get_script_count (void) const - { return (this+scriptList).len; } - inline const Tag& get_script_tag (unsigned int i) const - { return (this+scriptList).get_tag (i); } - inline unsigned int get_script_tags (unsigned int start_offset, - unsigned int *script_count /* IN/OUT */, - hb_tag_t *script_tags /* OUT */) const - { return (this+scriptList).get_tags (start_offset, script_count, script_tags); } - inline const Script& get_script (unsigned int i) const - { return (this+scriptList)[i]; } - inline bool find_script_index (hb_tag_t tag, unsigned int *index) const - { return (this+scriptList).find_index (tag, index); } - - inline unsigned int get_feature_count (void) const - { return (this+featureList).len; } - inline const Tag& get_feature_tag (unsigned int i) const - { return (this+featureList).get_tag (i); } - inline unsigned int get_feature_tags (unsigned int start_offset, - unsigned int *feature_count /* IN/OUT */, - hb_tag_t *feature_tags /* OUT */) const - { return (this+featureList).get_tags (start_offset, feature_count, feature_tags); } - inline const Feature& get_feature (unsigned int i) const - { return (this+featureList)[i]; } - inline bool find_feature_index (hb_tag_t tag, unsigned int *index) const - { return (this+featureList).find_index (tag, index); } - - inline unsigned int get_lookup_count (void) const - { return (this+lookupList).len; } - inline const Lookup& get_lookup (unsigned int i) const - { return (this+lookupList)[i]; } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (version.sanitize (c) && likely (version.major == 1) && - scriptList.sanitize (c, this) && - featureList.sanitize (c, this) && - lookupList.sanitize (c, this)); - } - - protected: - FixedVersion version; /* Version of the GSUB/GPOS table--initially set - * to 0x00010000 */ - OffsetTo<ScriptList> - scriptList; /* ScriptList table */ - OffsetTo<FeatureList> - featureList; /* FeatureList table */ - OffsetTo<LookupList> - lookupList; /* LookupList table */ - public: - DEFINE_SIZE_STATIC (10); -}; - - -} /* namespace OT */ - - -#endif /* HB_OT_LAYOUT_GSUBGPOS_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout-private.hh deleted file mode 100644 index 4866c419125..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout-private.hh +++ /dev/null @@ -1,273 +0,0 @@ -/* - * Copyright © 2007,2008,2009 Red Hat, Inc. - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_LAYOUT_PRIVATE_HH -#define HB_OT_LAYOUT_PRIVATE_HH - -#include "hb-private.hh" - -#include "hb-ot-layout.h" - -#include "hb-font-private.hh" -#include "hb-buffer-private.hh" -#include "hb-set-private.hh" - - -/* buffer var allocations, used during the GSUB/GPOS processing */ -#define glyph_props() var1.u16[0] /* GDEF glyph properties */ -#define syllable() var1.u8[2] /* GSUB/GPOS shaping boundaries */ -#define lig_props() var1.u8[3] /* GSUB/GPOS ligature tracking */ - -/* buffer var allocations, used during the entire shaping process */ -#define unicode_props0() var2.u8[0] -#define unicode_props1() var2.u8[1] - - -inline void -_hb_glyph_info_set_unicode_props (hb_glyph_info_t *info, hb_unicode_funcs_t *unicode) -{ - info->unicode_props0() = ((unsigned int) unicode->general_category (info->codepoint)) | - (unicode->is_default_ignorable (info->codepoint) ? 0x80 : 0) | - (info->codepoint == 0x200C ? 0x40 : 0) | - (info->codepoint == 0x200D ? 0x20 : 0); - info->unicode_props1() = unicode->modified_combining_class (info->codepoint); -} - -inline hb_unicode_general_category_t -_hb_glyph_info_get_general_category (const hb_glyph_info_t *info) -{ - return (hb_unicode_general_category_t) (info->unicode_props0() & 0x1F); -} - -inline void -_hb_glyph_info_set_modified_combining_class (hb_glyph_info_t *info, unsigned int modified_class) -{ - info->unicode_props1() = modified_class; -} - -inline unsigned int -_hb_glyph_info_get_modified_combining_class (const hb_glyph_info_t *info) -{ - return info->unicode_props1(); -} - -inline hb_bool_t -_hb_glyph_info_is_default_ignorable (const hb_glyph_info_t *info) -{ - return !!(info->unicode_props0() & 0x80); -} - -inline hb_bool_t -_hb_glyph_info_is_zwnj (const hb_glyph_info_t *info) -{ - return !!(info->unicode_props0() & 0x40); -} - -inline hb_bool_t -_hb_glyph_info_is_zwj (const hb_glyph_info_t *info) -{ - return !!(info->unicode_props0() & 0x20); -} - - -#define hb_ot_layout_from_face(face) ((hb_ot_layout_t *) face->shaper_data.ot) - -/* - * GDEF - */ - -typedef enum { - HB_OT_LAYOUT_GLYPH_PROPS_UNCLASSIFIED = 1 << HB_OT_LAYOUT_GLYPH_CLASS_UNCLASSIFIED, - HB_OT_LAYOUT_GLYPH_PROPS_BASE_GLYPH = 1 << HB_OT_LAYOUT_GLYPH_CLASS_BASE_GLYPH, - HB_OT_LAYOUT_GLYPH_PROPS_LIGATURE = 1 << HB_OT_LAYOUT_GLYPH_CLASS_LIGATURE, - HB_OT_LAYOUT_GLYPH_PROPS_MARK = 1 << HB_OT_LAYOUT_GLYPH_CLASS_MARK, - HB_OT_LAYOUT_GLYPH_PROPS_COMPONENT = 1 << HB_OT_LAYOUT_GLYPH_CLASS_COMPONENT -} hb_ot_layout_glyph_class_mask_t; - - - -/* - * GSUB/GPOS - */ - -/* lig_id / lig_comp - * - * When a ligature is formed: - * - * - The ligature glyph and any marks in between all the same newly allocated - * lig_id, - * - The ligature glyph will get lig_num_comps set to the number of components - * - The marks get lig_comp > 0, reflecting which component of the ligature - * they were applied to. - * - This is used in GPOS to attach marks to the right component of a ligature - * in MarkLigPos. - * - * When a multiple-substitution is done: - * - * - All resulting glyphs will have lig_id = 0, - * - The resulting glyphs will have lig_comp = 0, 1, 2, ... respectively. - * - This is used in GPOS to attach marks to the first component of a - * multiple substitution in MarkBasePos. - * - * The numbers are also used in GPOS to do mark-to-mark positioning only - * to marks that belong to the same component of a ligature in MarkMarPos. - */ -#define IS_LIG_BASE 0x10 -static inline void -set_lig_props_for_ligature (hb_glyph_info_t &info, unsigned int lig_id, unsigned int lig_num_comps) -{ - info.lig_props() = (lig_id << 5) | IS_LIG_BASE | (lig_num_comps & 0x0F); -} -static inline void -set_lig_props_for_mark (hb_glyph_info_t &info, unsigned int lig_id, unsigned int lig_comp) -{ - info.lig_props() = (lig_id << 5) | (lig_comp & 0x0F); -} -static inline void -set_lig_props_for_component (hb_glyph_info_t &info, unsigned int comp) -{ - set_lig_props_for_mark (info, 0, comp); -} - -static inline unsigned int -get_lig_id (const hb_glyph_info_t &info) -{ - return info.lig_props() >> 5; -} -static inline bool -is_a_ligature (const hb_glyph_info_t &info) -{ - return !!(info.lig_props() & IS_LIG_BASE); -} -static inline unsigned int -get_lig_comp (const hb_glyph_info_t &info) -{ - if (is_a_ligature (info)) - return 0; - else - return info.lig_props() & 0x0F; -} -static inline unsigned int -get_lig_num_comps (const hb_glyph_info_t &info) -{ - if ((info.glyph_props() & HB_OT_LAYOUT_GLYPH_PROPS_LIGATURE) && is_a_ligature (info)) - return info.lig_props() & 0x0F; - else - return 1; -} - -static inline uint8_t allocate_lig_id (hb_buffer_t *buffer) { - uint8_t lig_id = buffer->next_serial () & 0x07; - if (unlikely (!lig_id)) - lig_id = allocate_lig_id (buffer); /* in case of overflow */ - return lig_id; -} - - -HB_INTERNAL hb_bool_t -hb_ot_layout_lookup_would_substitute_fast (hb_face_t *face, - unsigned int lookup_index, - const hb_codepoint_t *glyphs, - unsigned int glyphs_length, - hb_bool_t zero_context); - - -/* Should be called before all the substitute_lookup's are done. */ -HB_INTERNAL void -hb_ot_layout_substitute_start (hb_font_t *font, - hb_buffer_t *buffer); - -HB_INTERNAL hb_bool_t -hb_ot_layout_substitute_lookup (hb_font_t *font, - hb_buffer_t *buffer, - unsigned int lookup_index, - hb_mask_t mask, - hb_bool_t auto_zwj); - -/* Should be called after all the substitute_lookup's are done */ -HB_INTERNAL void -hb_ot_layout_substitute_finish (hb_font_t *font, - hb_buffer_t *buffer); - - -/* Should be called before all the position_lookup's are done. Resets positions to zero. */ -HB_INTERNAL void -hb_ot_layout_position_start (hb_font_t *font, - hb_buffer_t *buffer); - -HB_INTERNAL hb_bool_t -hb_ot_layout_position_lookup (hb_font_t *font, - hb_buffer_t *buffer, - unsigned int lookup_index, - hb_mask_t mask, - hb_bool_t auto_zwj); - -/* Should be called after all the position_lookup's are done */ -HB_INTERNAL void -hb_ot_layout_position_finish (hb_font_t *font, - hb_buffer_t *buffer); - - - -/* - * hb_ot_layout_t - */ - -namespace OT { - struct GDEF; - struct GSUB; - struct GPOS; -} - -struct hb_ot_layout_t -{ - hb_blob_t *gdef_blob; - hb_blob_t *gsub_blob; - hb_blob_t *gpos_blob; - - const struct OT::GDEF *gdef; - const struct OT::GSUB *gsub; - const struct OT::GPOS *gpos; - - unsigned int gsub_lookup_count; - unsigned int gpos_lookup_count; - - hb_set_digest_t *gsub_digests; - hb_set_digest_t *gpos_digests; -}; - - -HB_INTERNAL hb_ot_layout_t * -_hb_ot_layout_create (hb_face_t *face); - -HB_INTERNAL void -_hb_ot_layout_destroy (hb_ot_layout_t *layout); - - - -#endif /* HB_OT_LAYOUT_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout.cc deleted file mode 100644 index 8161ce3d9e2..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout.cc +++ /dev/null @@ -1,780 +0,0 @@ -/* - * Copyright © 1998-2004 David Turner and Werner Lemberg - * Copyright © 2006 Behdad Esfahbod - * Copyright © 2007,2008,2009 Red Hat, Inc. - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-ot-layout-private.hh" - -#include "hb-ot-layout-gdef-table.hh" -#include "hb-ot-layout-gsub-table.hh" -#include "hb-ot-layout-gpos-table.hh" - -#include <stdlib.h> -#include <string.h> - - -HB_SHAPER_DATA_ENSURE_DECLARE(ot, face) - -hb_ot_layout_t * -_hb_ot_layout_create (hb_face_t *face) -{ - hb_ot_layout_t *layout = (hb_ot_layout_t *) calloc (1, sizeof (hb_ot_layout_t)); - if (unlikely (!layout)) - return NULL; - - layout->gdef_blob = OT::Sanitizer<OT::GDEF>::sanitize (face->reference_table (HB_OT_TAG_GDEF)); - layout->gdef = OT::Sanitizer<OT::GDEF>::lock_instance (layout->gdef_blob); - - layout->gsub_blob = OT::Sanitizer<OT::GSUB>::sanitize (face->reference_table (HB_OT_TAG_GSUB)); - layout->gsub = OT::Sanitizer<OT::GSUB>::lock_instance (layout->gsub_blob); - - layout->gpos_blob = OT::Sanitizer<OT::GPOS>::sanitize (face->reference_table (HB_OT_TAG_GPOS)); - layout->gpos = OT::Sanitizer<OT::GPOS>::lock_instance (layout->gpos_blob); - - layout->gsub_lookup_count = layout->gsub->get_lookup_count (); - layout->gpos_lookup_count = layout->gpos->get_lookup_count (); - - layout->gsub_digests = (hb_set_digest_t *) calloc (layout->gsub->get_lookup_count (), sizeof (hb_set_digest_t)); - layout->gpos_digests = (hb_set_digest_t *) calloc (layout->gpos->get_lookup_count (), sizeof (hb_set_digest_t)); - - if (unlikely ((layout->gsub_lookup_count && !layout->gsub_digests) || - (layout->gpos_lookup_count && !layout->gpos_digests))) - { - _hb_ot_layout_destroy (layout); - return NULL; - } - - for (unsigned int i = 0; i < layout->gsub_lookup_count; i++) - layout->gsub->get_lookup (i).add_coverage (&layout->gsub_digests[i]); - for (unsigned int i = 0; i < layout->gpos_lookup_count; i++) - layout->gpos->get_lookup (i).add_coverage (&layout->gpos_digests[i]); - - return layout; -} - -void -_hb_ot_layout_destroy (hb_ot_layout_t *layout) -{ - hb_blob_destroy (layout->gdef_blob); - hb_blob_destroy (layout->gsub_blob); - hb_blob_destroy (layout->gpos_blob); - - free (layout->gsub_digests); - free (layout->gpos_digests); - - free (layout); -} - -static inline const OT::GDEF& -_get_gdef (hb_face_t *face) -{ - if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return OT::Null(OT::GDEF); - return *hb_ot_layout_from_face (face)->gdef; -} -static inline const OT::GSUB& -_get_gsub (hb_face_t *face) -{ - if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return OT::Null(OT::GSUB); - return *hb_ot_layout_from_face (face)->gsub; -} -static inline const OT::GPOS& -_get_gpos (hb_face_t *face) -{ - if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return OT::Null(OT::GPOS); - return *hb_ot_layout_from_face (face)->gpos; -} - - -/* - * GDEF - */ - -hb_bool_t -hb_ot_layout_has_glyph_classes (hb_face_t *face) -{ - return _get_gdef (face).has_glyph_classes (); -} - -hb_ot_layout_glyph_class_t -hb_ot_layout_get_glyph_class (hb_face_t *face, - hb_codepoint_t glyph) -{ - return (hb_ot_layout_glyph_class_t) _get_gdef (face).get_glyph_class (glyph); -} - -void -hb_ot_layout_get_glyphs_in_class (hb_face_t *face, - hb_ot_layout_glyph_class_t klass, - hb_set_t *glyphs /* OUT */) -{ - return _get_gdef (face).get_glyphs_in_class (klass, glyphs); -} - -unsigned int -hb_ot_layout_get_attach_points (hb_face_t *face, - hb_codepoint_t glyph, - unsigned int start_offset, - unsigned int *point_count /* IN/OUT */, - unsigned int *point_array /* OUT */) -{ - return _get_gdef (face).get_attach_points (glyph, start_offset, point_count, point_array); -} - -unsigned int -hb_ot_layout_get_ligature_carets (hb_font_t *font, - hb_direction_t direction, - hb_codepoint_t glyph, - unsigned int start_offset, - unsigned int *caret_count /* IN/OUT */, - int *caret_array /* OUT */) -{ - return _get_gdef (font->face).get_lig_carets (font, direction, glyph, start_offset, caret_count, caret_array); -} - - -/* - * GSUB/GPOS - */ - -static const OT::GSUBGPOS& -get_gsubgpos_table (hb_face_t *face, - hb_tag_t table_tag) -{ - switch (table_tag) { - case HB_OT_TAG_GSUB: return _get_gsub (face); - case HB_OT_TAG_GPOS: return _get_gpos (face); - default: return OT::Null(OT::GSUBGPOS); - } -} - - -unsigned int -hb_ot_layout_table_get_script_tags (hb_face_t *face, - hb_tag_t table_tag, - unsigned int start_offset, - unsigned int *script_count /* IN/OUT */, - hb_tag_t *script_tags /* OUT */) -{ - const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag); - - return g.get_script_tags (start_offset, script_count, script_tags); -} - -#define HB_OT_TAG_LATIN_SCRIPT HB_TAG ('l', 'a', 't', 'n') - -hb_bool_t -hb_ot_layout_table_find_script (hb_face_t *face, - hb_tag_t table_tag, - hb_tag_t script_tag, - unsigned int *script_index) -{ - ASSERT_STATIC (OT::Index::NOT_FOUND_INDEX == HB_OT_LAYOUT_NO_SCRIPT_INDEX); - const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag); - - if (g.find_script_index (script_tag, script_index)) - return true; - - /* try finding 'DFLT' */ - if (g.find_script_index (HB_OT_TAG_DEFAULT_SCRIPT, script_index)) - return false; - - /* try with 'dflt'; MS site has had typos and many fonts use it now :(. - * including many versions of DejaVu Sans Mono! */ - if (g.find_script_index (HB_OT_TAG_DEFAULT_LANGUAGE, script_index)) - return false; - - /* try with 'latn'; some old fonts put their features there even though - they're really trying to support Thai, for example :( */ - if (g.find_script_index (HB_OT_TAG_LATIN_SCRIPT, script_index)) - return false; - - if (script_index) *script_index = HB_OT_LAYOUT_NO_SCRIPT_INDEX; - return false; -} - -hb_bool_t -hb_ot_layout_table_choose_script (hb_face_t *face, - hb_tag_t table_tag, - const hb_tag_t *script_tags, - unsigned int *script_index, - hb_tag_t *chosen_script) -{ - ASSERT_STATIC (OT::Index::NOT_FOUND_INDEX == HB_OT_LAYOUT_NO_SCRIPT_INDEX); - const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag); - - while (*script_tags) - { - if (g.find_script_index (*script_tags, script_index)) { - if (chosen_script) - *chosen_script = *script_tags; - return true; - } - script_tags++; - } - - /* try finding 'DFLT' */ - if (g.find_script_index (HB_OT_TAG_DEFAULT_SCRIPT, script_index)) { - if (chosen_script) - *chosen_script = HB_OT_TAG_DEFAULT_SCRIPT; - return false; - } - - /* try with 'dflt'; MS site has had typos and many fonts use it now :( */ - if (g.find_script_index (HB_OT_TAG_DEFAULT_LANGUAGE, script_index)) { - if (chosen_script) - *chosen_script = HB_OT_TAG_DEFAULT_LANGUAGE; - return false; - } - - /* try with 'latn'; some old fonts put their features there even though - they're really trying to support Thai, for example :( */ - if (g.find_script_index (HB_OT_TAG_LATIN_SCRIPT, script_index)) { - if (chosen_script) - *chosen_script = HB_OT_TAG_LATIN_SCRIPT; - return false; - } - - if (script_index) *script_index = HB_OT_LAYOUT_NO_SCRIPT_INDEX; - if (chosen_script) - *chosen_script = HB_OT_LAYOUT_NO_SCRIPT_INDEX; - return false; -} - -unsigned int -hb_ot_layout_table_get_feature_tags (hb_face_t *face, - hb_tag_t table_tag, - unsigned int start_offset, - unsigned int *feature_count /* IN/OUT */, - hb_tag_t *feature_tags /* OUT */) -{ - const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag); - - return g.get_feature_tags (start_offset, feature_count, feature_tags); -} - - -unsigned int -hb_ot_layout_script_get_language_tags (hb_face_t *face, - hb_tag_t table_tag, - unsigned int script_index, - unsigned int start_offset, - unsigned int *language_count /* IN/OUT */, - hb_tag_t *language_tags /* OUT */) -{ - const OT::Script &s = get_gsubgpos_table (face, table_tag).get_script (script_index); - - return s.get_lang_sys_tags (start_offset, language_count, language_tags); -} - -hb_bool_t -hb_ot_layout_script_find_language (hb_face_t *face, - hb_tag_t table_tag, - unsigned int script_index, - hb_tag_t language_tag, - unsigned int *language_index) -{ - ASSERT_STATIC (OT::Index::NOT_FOUND_INDEX == HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX); - const OT::Script &s = get_gsubgpos_table (face, table_tag).get_script (script_index); - - if (s.find_lang_sys_index (language_tag, language_index)) - return true; - - /* try with 'dflt'; MS site has had typos and many fonts use it now :( */ - if (s.find_lang_sys_index (HB_OT_TAG_DEFAULT_LANGUAGE, language_index)) - return false; - - if (language_index) *language_index = HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX; - return false; -} - -hb_bool_t -hb_ot_layout_language_get_required_feature_index (hb_face_t *face, - hb_tag_t table_tag, - unsigned int script_index, - unsigned int language_index, - unsigned int *feature_index) -{ - const OT::LangSys &l = get_gsubgpos_table (face, table_tag).get_script (script_index).get_lang_sys (language_index); - - if (feature_index) *feature_index = l.get_required_feature_index (); - - return l.has_required_feature (); -} - -unsigned int -hb_ot_layout_language_get_feature_indexes (hb_face_t *face, - hb_tag_t table_tag, - unsigned int script_index, - unsigned int language_index, - unsigned int start_offset, - unsigned int *feature_count /* IN/OUT */, - unsigned int *feature_indexes /* OUT */) -{ - const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag); - const OT::LangSys &l = g.get_script (script_index).get_lang_sys (language_index); - - return l.get_feature_indexes (start_offset, feature_count, feature_indexes); -} - -unsigned int -hb_ot_layout_language_get_feature_tags (hb_face_t *face, - hb_tag_t table_tag, - unsigned int script_index, - unsigned int language_index, - unsigned int start_offset, - unsigned int *feature_count /* IN/OUT */, - hb_tag_t *feature_tags /* OUT */) -{ - const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag); - const OT::LangSys &l = g.get_script (script_index).get_lang_sys (language_index); - - ASSERT_STATIC (sizeof (unsigned int) == sizeof (hb_tag_t)); - unsigned int ret = l.get_feature_indexes (start_offset, feature_count, (unsigned int *) feature_tags); - - if (feature_tags) { - unsigned int count = *feature_count; - for (unsigned int i = 0; i < count; i++) - feature_tags[i] = g.get_feature_tag ((unsigned int) feature_tags[i]); - } - - return ret; -} - - -hb_bool_t -hb_ot_layout_language_find_feature (hb_face_t *face, - hb_tag_t table_tag, - unsigned int script_index, - unsigned int language_index, - hb_tag_t feature_tag, - unsigned int *feature_index) -{ - ASSERT_STATIC (OT::Index::NOT_FOUND_INDEX == HB_OT_LAYOUT_NO_FEATURE_INDEX); - const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag); - const OT::LangSys &l = g.get_script (script_index).get_lang_sys (language_index); - - unsigned int num_features = l.get_feature_count (); - for (unsigned int i = 0; i < num_features; i++) { - unsigned int f_index = l.get_feature_index (i); - - if (feature_tag == g.get_feature_tag (f_index)) { - if (feature_index) *feature_index = f_index; - return true; - } - } - - if (feature_index) *feature_index = HB_OT_LAYOUT_NO_FEATURE_INDEX; - return false; -} - -unsigned int -hb_ot_layout_feature_get_lookups (hb_face_t *face, - hb_tag_t table_tag, - unsigned int feature_index, - unsigned int start_offset, - unsigned int *lookup_count /* IN/OUT */, - unsigned int *lookup_indexes /* OUT */) -{ - const OT::GSUBGPOS &g = get_gsubgpos_table (face, table_tag); - const OT::Feature &f = g.get_feature (feature_index); - - return f.get_lookup_indexes (start_offset, lookup_count, lookup_indexes); -} - -static void -_hb_ot_layout_collect_lookups_lookups (hb_face_t *face, - hb_tag_t table_tag, - unsigned int feature_index, - hb_set_t *lookup_indexes /* OUT */) -{ - unsigned int lookup_indices[32]; - unsigned int offset, len; - - offset = 0; - do { - len = ARRAY_LENGTH (lookup_indices); - hb_ot_layout_feature_get_lookups (face, - table_tag, - feature_index, - offset, &len, - lookup_indices); - - for (unsigned int i = 0; i < len; i++) - lookup_indexes->add (lookup_indices[i]); - - offset += len; - } while (len == ARRAY_LENGTH (lookup_indices)); -} - -static void -_hb_ot_layout_collect_lookups_features (hb_face_t *face, - hb_tag_t table_tag, - unsigned int script_index, - unsigned int language_index, - const hb_tag_t *features, - hb_set_t *lookup_indexes /* OUT */) -{ - unsigned int required_feature_index; - if (hb_ot_layout_language_get_required_feature_index (face, - table_tag, - script_index, - language_index, - &required_feature_index)) - _hb_ot_layout_collect_lookups_lookups (face, - table_tag, - required_feature_index, - lookup_indexes); - - if (!features) - { - /* All features */ - unsigned int feature_indices[32]; - unsigned int offset, len; - - offset = 0; - do { - len = ARRAY_LENGTH (feature_indices); - hb_ot_layout_language_get_feature_indexes (face, - table_tag, - script_index, - language_index, - offset, &len, - feature_indices); - - for (unsigned int i = 0; i < len; i++) - _hb_ot_layout_collect_lookups_lookups (face, - table_tag, - feature_indices[i], - lookup_indexes); - - offset += len; - } while (len == ARRAY_LENGTH (feature_indices)); - } - else - { - for (; *features; features++) - { - unsigned int feature_index; - if (hb_ot_layout_language_find_feature (face, - table_tag, - script_index, - language_index, - *features, - &feature_index)) - _hb_ot_layout_collect_lookups_lookups (face, - table_tag, - feature_index, - lookup_indexes); - } - } -} - -static void -_hb_ot_layout_collect_lookups_languages (hb_face_t *face, - hb_tag_t table_tag, - unsigned int script_index, - const hb_tag_t *languages, - const hb_tag_t *features, - hb_set_t *lookup_indexes /* OUT */) -{ - _hb_ot_layout_collect_lookups_features (face, - table_tag, - script_index, - HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX, - features, - lookup_indexes); - - if (!languages) - { - /* All languages */ - unsigned int count = hb_ot_layout_script_get_language_tags (face, - table_tag, - script_index, - 0, NULL, NULL); - for (unsigned int language_index = 0; language_index < count; language_index++) - _hb_ot_layout_collect_lookups_features (face, - table_tag, - script_index, - language_index, - features, - lookup_indexes); - } - else - { - for (; *languages; languages++) - { - unsigned int language_index; - if (hb_ot_layout_script_find_language (face, - table_tag, - script_index, - *languages, - &language_index)) - _hb_ot_layout_collect_lookups_features (face, - table_tag, - script_index, - language_index, - features, - lookup_indexes); - } - } -} - -void -hb_ot_layout_collect_lookups (hb_face_t *face, - hb_tag_t table_tag, - const hb_tag_t *scripts, - const hb_tag_t *languages, - const hb_tag_t *features, - hb_set_t *lookup_indexes /* OUT */) -{ - if (!scripts) - { - /* All scripts */ - unsigned int count = hb_ot_layout_table_get_script_tags (face, - table_tag, - 0, NULL, NULL); - for (unsigned int script_index = 0; script_index < count; script_index++) - _hb_ot_layout_collect_lookups_languages (face, - table_tag, - script_index, - languages, - features, - lookup_indexes); - } - else - { - for (; *scripts; scripts++) - { - unsigned int script_index; - if (hb_ot_layout_table_find_script (face, - table_tag, - *scripts, - &script_index)) - _hb_ot_layout_collect_lookups_languages (face, - table_tag, - script_index, - languages, - features, - lookup_indexes); - } - } -} - -void -hb_ot_layout_lookup_collect_glyphs (hb_face_t *face, - hb_tag_t table_tag, - unsigned int lookup_index, - hb_set_t *glyphs_before, /* OUT. May be NULL */ - hb_set_t *glyphs_input, /* OUT. May be NULL */ - hb_set_t *glyphs_after, /* OUT. May be NULL */ - hb_set_t *glyphs_output /* OUT. May be NULL */) -{ - if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return; - - OT::hb_collect_glyphs_context_t c (face, - glyphs_before, - glyphs_input, - glyphs_after, - glyphs_output); - - switch (table_tag) - { - case HB_OT_TAG_GSUB: - { - const OT::SubstLookup& l = hb_ot_layout_from_face (face)->gsub->get_lookup (lookup_index); - l.collect_glyphs_lookup (&c); - return; - } - case HB_OT_TAG_GPOS: - { - const OT::PosLookup& l = hb_ot_layout_from_face (face)->gpos->get_lookup (lookup_index); - l.collect_glyphs_lookup (&c); - return; - } - } -} - - -/* - * OT::GSUB - */ - -hb_bool_t -hb_ot_layout_has_substitution (hb_face_t *face) -{ - return &_get_gsub (face) != &OT::Null(OT::GSUB); -} - -hb_bool_t -hb_ot_layout_lookup_would_substitute (hb_face_t *face, - unsigned int lookup_index, - const hb_codepoint_t *glyphs, - unsigned int glyphs_length, - hb_bool_t zero_context) -{ - if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return false; - return hb_ot_layout_lookup_would_substitute_fast (face, lookup_index, glyphs, glyphs_length, zero_context); -} - -hb_bool_t -hb_ot_layout_lookup_would_substitute_fast (hb_face_t *face, - unsigned int lookup_index, - const hb_codepoint_t *glyphs, - unsigned int glyphs_length, - hb_bool_t zero_context) -{ - if (unlikely (lookup_index >= hb_ot_layout_from_face (face)->gsub_lookup_count)) return false; - OT::hb_would_apply_context_t c (face, glyphs, glyphs_length, zero_context); - - const OT::SubstLookup& l = hb_ot_layout_from_face (face)->gsub->get_lookup (lookup_index); - - return l.would_apply (&c, &hb_ot_layout_from_face (face)->gsub_digests[lookup_index]); -} - -void -hb_ot_layout_substitute_start (hb_font_t *font, hb_buffer_t *buffer) -{ - OT::GSUB::substitute_start (font, buffer); -} - -hb_bool_t -hb_ot_layout_substitute_lookup (hb_font_t *font, - hb_buffer_t *buffer, - unsigned int lookup_index, - hb_mask_t mask, - hb_bool_t auto_zwj) -{ - if (unlikely (lookup_index >= hb_ot_layout_from_face (font->face)->gsub_lookup_count)) return false; - - OT::hb_apply_context_t c (0, font, buffer, mask, auto_zwj); - - const OT::SubstLookup& l = hb_ot_layout_from_face (font->face)->gsub->get_lookup (lookup_index); - - return l.apply_string (&c, &hb_ot_layout_from_face (font->face)->gsub_digests[lookup_index]); -} - -void -hb_ot_layout_substitute_finish (hb_font_t *font, hb_buffer_t *buffer) -{ - OT::GSUB::substitute_finish (font, buffer); -} - -void -hb_ot_layout_lookup_substitute_closure (hb_face_t *face, - unsigned int lookup_index, - hb_set_t *glyphs) -{ - OT::hb_closure_context_t c (face, glyphs); - - const OT::SubstLookup& l = _get_gsub (face).get_lookup (lookup_index); - - l.closure (&c); -} - -/* - * OT::GPOS - */ - -hb_bool_t -hb_ot_layout_has_positioning (hb_face_t *face) -{ - return &_get_gpos (face) != &OT::Null(OT::GPOS); -} - -void -hb_ot_layout_position_start (hb_font_t *font, hb_buffer_t *buffer) -{ - OT::GPOS::position_start (font, buffer); -} - -hb_bool_t -hb_ot_layout_position_lookup (hb_font_t *font, - hb_buffer_t *buffer, - unsigned int lookup_index, - hb_mask_t mask, - hb_bool_t auto_zwj) -{ - if (unlikely (lookup_index >= hb_ot_layout_from_face (font->face)->gpos_lookup_count)) return false; - - OT::hb_apply_context_t c (1, font, buffer, mask, auto_zwj); - - const OT::PosLookup& l = hb_ot_layout_from_face (font->face)->gpos->get_lookup (lookup_index); - - return l.apply_string (&c, &hb_ot_layout_from_face (font->face)->gpos_digests[lookup_index]); -} - -void -hb_ot_layout_position_finish (hb_font_t *font, hb_buffer_t *buffer) -{ - OT::GPOS::position_finish (font, buffer); -} - -hb_bool_t -hb_ot_layout_get_size_params (hb_face_t *face, - unsigned int *design_size, /* OUT. May be NULL */ - unsigned int *subfamily_id, /* OUT. May be NULL */ - unsigned int *subfamily_name_id, /* OUT. May be NULL */ - unsigned int *range_start, /* OUT. May be NULL */ - unsigned int *range_end /* OUT. May be NULL */) -{ - const OT::GPOS &gpos = _get_gpos (face); - const hb_tag_t tag = HB_TAG ('s','i','z','e'); - - unsigned int num_features = gpos.get_feature_count (); - for (unsigned int i = 0; i < num_features; i++) - { - if (tag == gpos.get_feature_tag (i)) - { - const OT::Feature &f = gpos.get_feature (i); - const OT::FeatureParamsSize ¶ms = f.get_feature_params ().get_size_params (tag); - - if (params.designSize) - { -#define PARAM(a, A) if (a) *a = params.A - PARAM (design_size, designSize); - PARAM (subfamily_id, subfamilyID); - PARAM (subfamily_name_id, subfamilyNameID); - PARAM (range_start, rangeStart); - PARAM (range_end, rangeEnd); -#undef PARAM - - return true; - } - } - } - -#define PARAM(a, A) if (a) *a = 0 - PARAM (design_size, designSize); - PARAM (subfamily_id, subfamilyID); - PARAM (subfamily_name_id, subfamilyNameID); - PARAM (range_start, rangeStart); - PARAM (range_end, rangeEnd); -#undef PARAM - - return false; -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout.h deleted file mode 100644 index 134f1a6c164..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-layout.h +++ /dev/null @@ -1,293 +0,0 @@ -/* - * Copyright © 2007,2008,2009 Red Hat, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_H_IN -#error "Include <hb-ot.h> instead." -#endif - -#ifndef HB_OT_LAYOUT_H -#define HB_OT_LAYOUT_H - -#include "hb.h" - -#include "hb-ot-tag.h" - -HB_BEGIN_DECLS - - -#define HB_OT_TAG_GDEF HB_TAG('G','D','E','F') -#define HB_OT_TAG_GSUB HB_TAG('G','S','U','B') -#define HB_OT_TAG_GPOS HB_TAG('G','P','O','S') - - -/* - * GDEF - */ - -hb_bool_t -hb_ot_layout_has_glyph_classes (hb_face_t *face); - -typedef enum { - HB_OT_LAYOUT_GLYPH_CLASS_UNCLASSIFIED = 0, - HB_OT_LAYOUT_GLYPH_CLASS_BASE_GLYPH = 1, - HB_OT_LAYOUT_GLYPH_CLASS_LIGATURE = 2, - HB_OT_LAYOUT_GLYPH_CLASS_MARK = 3, - HB_OT_LAYOUT_GLYPH_CLASS_COMPONENT = 4 -} hb_ot_layout_glyph_class_t; - -hb_ot_layout_glyph_class_t -hb_ot_layout_get_glyph_class (hb_face_t *face, - hb_codepoint_t glyph); - -void -hb_ot_layout_get_glyphs_in_class (hb_face_t *face, - hb_ot_layout_glyph_class_t klass, - hb_set_t *glyphs /* OUT */); - - -/* Not that useful. Provides list of attach points for a glyph that a - * client may want to cache */ -unsigned int -hb_ot_layout_get_attach_points (hb_face_t *face, - hb_codepoint_t glyph, - unsigned int start_offset, - unsigned int *point_count /* IN/OUT */, - unsigned int *point_array /* OUT */); - -/* Ligature caret positions */ -unsigned int -hb_ot_layout_get_ligature_carets (hb_font_t *font, - hb_direction_t direction, - hb_codepoint_t glyph, - unsigned int start_offset, - unsigned int *caret_count /* IN/OUT */, - hb_position_t *caret_array /* OUT */); - - -/* - * GSUB/GPOS feature query and enumeration interface - */ - -#define HB_OT_LAYOUT_NO_SCRIPT_INDEX ((unsigned int) 0xFFFF) -#define HB_OT_LAYOUT_NO_FEATURE_INDEX ((unsigned int) 0xFFFF) -#define HB_OT_LAYOUT_DEFAULT_LANGUAGE_INDEX ((unsigned int) 0xFFFF) - -unsigned int -hb_ot_layout_table_get_script_tags (hb_face_t *face, - hb_tag_t table_tag, - unsigned int start_offset, - unsigned int *script_count /* IN/OUT */, - hb_tag_t *script_tags /* OUT */); - -hb_bool_t -hb_ot_layout_table_find_script (hb_face_t *face, - hb_tag_t table_tag, - hb_tag_t script_tag, - unsigned int *script_index); - -/* Like find_script, but takes zero-terminated array of scripts to test */ -hb_bool_t -hb_ot_layout_table_choose_script (hb_face_t *face, - hb_tag_t table_tag, - const hb_tag_t *script_tags, - unsigned int *script_index, - hb_tag_t *chosen_script); - -unsigned int -hb_ot_layout_table_get_feature_tags (hb_face_t *face, - hb_tag_t table_tag, - unsigned int start_offset, - unsigned int *feature_count /* IN/OUT */, - hb_tag_t *feature_tags /* OUT */); - -unsigned int -hb_ot_layout_script_get_language_tags (hb_face_t *face, - hb_tag_t table_tag, - unsigned int script_index, - unsigned int start_offset, - unsigned int *language_count /* IN/OUT */, - hb_tag_t *language_tags /* OUT */); - -hb_bool_t -hb_ot_layout_script_find_language (hb_face_t *face, - hb_tag_t table_tag, - unsigned int script_index, - hb_tag_t language_tag, - unsigned int *language_index); - -hb_bool_t -hb_ot_layout_language_get_required_feature_index (hb_face_t *face, - hb_tag_t table_tag, - unsigned int script_index, - unsigned int language_index, - unsigned int *feature_index); - -unsigned int -hb_ot_layout_language_get_feature_indexes (hb_face_t *face, - hb_tag_t table_tag, - unsigned int script_index, - unsigned int language_index, - unsigned int start_offset, - unsigned int *feature_count /* IN/OUT */, - unsigned int *feature_indexes /* OUT */); - -unsigned int -hb_ot_layout_language_get_feature_tags (hb_face_t *face, - hb_tag_t table_tag, - unsigned int script_index, - unsigned int language_index, - unsigned int start_offset, - unsigned int *feature_count /* IN/OUT */, - hb_tag_t *feature_tags /* OUT */); - -hb_bool_t -hb_ot_layout_language_find_feature (hb_face_t *face, - hb_tag_t table_tag, - unsigned int script_index, - unsigned int language_index, - hb_tag_t feature_tag, - unsigned int *feature_index); - -unsigned int -hb_ot_layout_feature_get_lookups (hb_face_t *face, - hb_tag_t table_tag, - unsigned int feature_index, - unsigned int start_offset, - unsigned int *lookup_count /* IN/OUT */, - unsigned int *lookup_indexes /* OUT */); - -void -hb_ot_layout_collect_lookups (hb_face_t *face, - hb_tag_t table_tag, - const hb_tag_t *scripts, - const hb_tag_t *languages, - const hb_tag_t *features, - hb_set_t *lookup_indexes /* OUT */); - -void -hb_ot_shape_plan_collect_lookups (hb_shape_plan_t *shape_plan, - hb_tag_t table_tag, - hb_set_t *lookup_indexes /* OUT */); - -void -hb_ot_layout_lookup_collect_glyphs (hb_face_t *face, - hb_tag_t table_tag, - unsigned int lookup_index, - hb_set_t *glyphs_before, /* OUT. May be NULL */ - hb_set_t *glyphs_input, /* OUT. May be NULL */ - hb_set_t *glyphs_after, /* OUT. May be NULL */ - hb_set_t *glyphs_output /* OUT. May be NULL */); - -#ifdef HB_NOT_IMPLEMENTED -typedef struct -{ - const hb_codepoint_t *before, - unsigned int before_length, - const hb_codepoint_t *input, - unsigned int input_length, - const hb_codepoint_t *after, - unsigned int after_length, -} hb_ot_layout_glyph_sequence_t; - -typedef hb_bool_t -(*hb_ot_layout_glyph_sequence_func_t) (hb_font_t *font, - hb_tag_t table_tag, - unsigned int lookup_index, - const hb_ot_layout_glyph_sequence_t *sequence, - void *user_data); - -void -Xhb_ot_layout_lookup_enumerate_sequences (hb_face_t *face, - hb_tag_t table_tag, - unsigned int lookup_index, - hb_ot_layout_glyph_sequence_func_t callback, - void *user_data); -#endif - - -/* - * GSUB - */ - -hb_bool_t -hb_ot_layout_has_substitution (hb_face_t *face); - -hb_bool_t -hb_ot_layout_lookup_would_substitute (hb_face_t *face, - unsigned int lookup_index, - const hb_codepoint_t *glyphs, - unsigned int glyphs_length, - hb_bool_t zero_context); - -void -hb_ot_layout_lookup_substitute_closure (hb_face_t *face, - unsigned int lookup_index, - hb_set_t *glyphs - /*TODO , hb_bool_t inclusive */); - -#ifdef HB_NOT_IMPLEMENTED -/* Note: You better have GDEF when using this API, or marks won't do much. */ -hb_bool_t -Xhb_ot_layout_lookup_substitute (hb_font_t *font, - unsigned int lookup_index, - const hb_ot_layout_glyph_sequence_t *sequence, - unsigned int out_size, - hb_codepoint_t *glyphs_out, /* OUT */ - unsigned int *clusters_out, /* OUT */ - unsigned int *out_length /* OUT */); -#endif - - -/* - * GPOS - */ - -hb_bool_t -hb_ot_layout_has_positioning (hb_face_t *face); - -#ifdef HB_NOT_IMPLEMENTED -/* Note: You better have GDEF when using this API, or marks won't do much. */ -hb_bool_t -Xhb_ot_layout_lookup_position (hb_font_t *font, - unsigned int lookup_index, - const hb_ot_layout_glyph_sequence_t *sequence, - hb_glyph_position_t *positions /* IN / OUT */); -#endif - -/* Optical 'size' feature info. Returns true if found. - * http://www.microsoft.com/typography/otspec/features_pt.htm#size */ -hb_bool_t -hb_ot_layout_get_size_params (hb_face_t *face, - unsigned int *design_size, /* OUT. May be NULL */ - unsigned int *subfamily_id, /* OUT. May be NULL */ - unsigned int *subfamily_name_id, /* OUT. May be NULL */ - unsigned int *range_start, /* OUT. May be NULL */ - unsigned int *range_end /* OUT. May be NULL */); - - -HB_END_DECLS - -#endif /* HB_OT_LAYOUT_H */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-map-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-map-private.hh deleted file mode 100644 index a679fb5990e..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-map-private.hh +++ /dev/null @@ -1,241 +0,0 @@ -/* - * Copyright © 2009,2010 Red Hat, Inc. - * Copyright © 2010,2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_MAP_PRIVATE_HH -#define HB_OT_MAP_PRIVATE_HH - -#include "hb-buffer-private.hh" - -#include "hb-ot-layout-private.hh" - - -static const hb_tag_t table_tags[2] = {HB_OT_TAG_GSUB, HB_OT_TAG_GPOS}; - -struct hb_ot_map_t -{ - friend struct hb_ot_map_builder_t; - - public: - - struct feature_map_t { - hb_tag_t tag; /* should be first for our bsearch to work */ - unsigned int index[2]; /* GSUB/GPOS */ - unsigned int stage[2]; /* GSUB/GPOS */ - unsigned int shift; - hb_mask_t mask; - hb_mask_t _1_mask; /* mask for value=1, for quick access */ - unsigned int needs_fallback : 1; - unsigned int auto_zwj : 1; - - static int cmp (const feature_map_t *a, const feature_map_t *b) - { return a->tag < b->tag ? -1 : a->tag > b->tag ? 1 : 0; } - }; - - struct lookup_map_t { - unsigned short index; - unsigned short auto_zwj : 1; - hb_mask_t mask; - - static int cmp (const lookup_map_t *a, const lookup_map_t *b) - { return a->index < b->index ? -1 : a->index > b->index ? 1 : 0; } - }; - - typedef void (*pause_func_t) (const struct hb_ot_shape_plan_t *plan, hb_font_t *font, hb_buffer_t *buffer); - - struct pause_map_t { - unsigned int num_lookups; /* Cumulative */ - pause_func_t callback; - }; - - - hb_ot_map_t (void) { memset (this, 0, sizeof (*this)); } - - inline hb_mask_t get_global_mask (void) const { return global_mask; } - - inline hb_mask_t get_mask (hb_tag_t feature_tag, unsigned int *shift = NULL) const { - const feature_map_t *map = features.bsearch (&feature_tag); - if (shift) *shift = map ? map->shift : 0; - return map ? map->mask : 0; - } - - inline bool needs_fallback (hb_tag_t feature_tag) const { - const feature_map_t *map = features.bsearch (&feature_tag); - return map ? map->needs_fallback : false; - } - - inline hb_mask_t get_1_mask (hb_tag_t feature_tag) const { - const feature_map_t *map = features.bsearch (&feature_tag); - return map ? map->_1_mask : 0; - } - - inline unsigned int get_feature_index (unsigned int table_index, hb_tag_t feature_tag) const { - const feature_map_t *map = features.bsearch (&feature_tag); - return map ? map->index[table_index] : HB_OT_LAYOUT_NO_FEATURE_INDEX; - } - - inline unsigned int get_feature_stage (unsigned int table_index, hb_tag_t feature_tag) const { - const feature_map_t *map = features.bsearch (&feature_tag); - return map ? map->stage[table_index] : (unsigned int) -1; - } - - inline void get_stage_lookups (unsigned int table_index, unsigned int stage, - const struct lookup_map_t **plookups, unsigned int *lookup_count) const { - if (unlikely (stage == (unsigned int) -1)) { - *plookups = NULL; - *lookup_count = 0; - return; - } - assert (stage <= pauses[table_index].len); - unsigned int start = stage ? pauses[table_index][stage - 1].num_lookups : 0; - unsigned int end = stage < pauses[table_index].len ? pauses[table_index][stage].num_lookups : lookups[table_index].len; - *plookups = &lookups[table_index][start]; - *lookup_count = end - start; - } - - HB_INTERNAL void collect_lookups (unsigned int table_index, hb_set_t *lookups) const; - HB_INTERNAL void substitute (const struct hb_ot_shape_plan_t *plan, hb_font_t *font, hb_buffer_t *buffer) const; - HB_INTERNAL void position (const struct hb_ot_shape_plan_t *plan, hb_font_t *font, hb_buffer_t *buffer) const; - - inline void finish (void) { - features.finish (); - lookups[0].finish (); - lookups[1].finish (); - pauses[0].finish (); - pauses[1].finish (); - } - - public: - hb_tag_t chosen_script[2]; - bool found_script[2]; - - private: - - HB_INTERNAL void add_lookups (hb_face_t *face, - unsigned int table_index, - unsigned int feature_index, - hb_mask_t mask, - bool auto_zwj); - - hb_mask_t global_mask; - - hb_prealloced_array_t<feature_map_t, 8> features; - hb_prealloced_array_t<lookup_map_t, 32> lookups[2]; /* GSUB/GPOS */ - hb_prealloced_array_t<pause_map_t, 1> pauses[2]; /* GSUB/GPOS */ -}; - -enum hb_ot_map_feature_flags_t { - F_NONE = 0x0000, - F_GLOBAL = 0x0001, - F_HAS_FALLBACK = 0x0002, - F_MANUAL_ZWJ = 0x0004 -}; -/* Macro version for where const is desired. */ -#define F_COMBINE(l,r) (hb_ot_map_feature_flags_t ((unsigned int) (l) | (unsigned int) (r))) -inline hb_ot_map_feature_flags_t -operator | (hb_ot_map_feature_flags_t l, hb_ot_map_feature_flags_t r) -{ return hb_ot_map_feature_flags_t ((unsigned int) l | (unsigned int) r); } -inline hb_ot_map_feature_flags_t -operator & (hb_ot_map_feature_flags_t l, hb_ot_map_feature_flags_t r) -{ return hb_ot_map_feature_flags_t ((unsigned int) l & (unsigned int) r); } -inline hb_ot_map_feature_flags_t -operator ~ (hb_ot_map_feature_flags_t r) -{ return hb_ot_map_feature_flags_t (~(unsigned int) r); } -inline hb_ot_map_feature_flags_t& -operator |= (hb_ot_map_feature_flags_t &l, hb_ot_map_feature_flags_t r) -{ l = l | r; return l; } -inline hb_ot_map_feature_flags_t& -operator &= (hb_ot_map_feature_flags_t& l, hb_ot_map_feature_flags_t r) -{ l = l & r; return l; } - - -struct hb_ot_map_builder_t -{ - public: - - HB_INTERNAL hb_ot_map_builder_t (hb_face_t *face_, - const hb_segment_properties_t *props_); - - HB_INTERNAL void add_feature (hb_tag_t tag, unsigned int value, - hb_ot_map_feature_flags_t flags); - - inline void add_global_bool_feature (hb_tag_t tag) - { add_feature (tag, 1, F_GLOBAL); } - - inline void add_gsub_pause (hb_ot_map_t::pause_func_t pause_func) - { add_pause (0, pause_func); } - inline void add_gpos_pause (hb_ot_map_t::pause_func_t pause_func) - { add_pause (1, pause_func); } - - HB_INTERNAL void compile (struct hb_ot_map_t &m); - - inline void finish (void) { - feature_infos.finish (); - pauses[0].finish (); - pauses[1].finish (); - } - - private: - - struct feature_info_t { - hb_tag_t tag; - unsigned int seq; /* sequence#, used for stable sorting only */ - unsigned int max_value; - hb_ot_map_feature_flags_t flags; - unsigned int default_value; /* for non-global features, what should the unset glyphs take */ - unsigned int stage[2]; /* GSUB/GPOS */ - - static int cmp (const feature_info_t *a, const feature_info_t *b) - { return (a->tag != b->tag) ? (a->tag < b->tag ? -1 : 1) : (a->seq < b->seq ? -1 : 1); } - }; - - struct pause_info_t { - unsigned int stage; - hb_ot_map_t::pause_func_t callback; - }; - - HB_INTERNAL void add_pause (unsigned int table_index, hb_ot_map_t::pause_func_t pause_func); - - public: - - hb_face_t *face; - hb_segment_properties_t props; - - hb_tag_t chosen_script[2]; - bool found_script[2]; - unsigned int script_index[2], language_index[2]; - - private: - - unsigned int current_stage[2]; /* GSUB/GPOS */ - hb_prealloced_array_t<feature_info_t,16> feature_infos; - hb_prealloced_array_t<pause_info_t, 1> pauses[2]; /* GSUB/GPOS */ -}; - - - -#endif /* HB_OT_MAP_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-map.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-map.cc deleted file mode 100644 index 85e6e16375a..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-map.cc +++ /dev/null @@ -1,321 +0,0 @@ -/* - * Copyright © 2009,2010 Red Hat, Inc. - * Copyright © 2010,2011 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-ot-map-private.hh" - - -void -hb_ot_map_t::add_lookups (hb_face_t *face, - unsigned int table_index, - unsigned int feature_index, - hb_mask_t mask, - bool auto_zwj) -{ - unsigned int lookup_indices[32]; - unsigned int offset, len; - - offset = 0; - do { - len = ARRAY_LENGTH (lookup_indices); - hb_ot_layout_feature_get_lookups (face, - table_tags[table_index], - feature_index, - offset, &len, - lookup_indices); - - for (unsigned int i = 0; i < len; i++) { - hb_ot_map_t::lookup_map_t *lookup = lookups[table_index].push (); - if (unlikely (!lookup)) - return; - lookup->mask = mask; - lookup->index = lookup_indices[i]; - lookup->auto_zwj = auto_zwj; - } - - offset += len; - } while (len == ARRAY_LENGTH (lookup_indices)); -} - -hb_ot_map_builder_t::hb_ot_map_builder_t (hb_face_t *face_, - const hb_segment_properties_t *props_) -{ - memset (this, 0, sizeof (*this)); - - face = face_; - props = *props_; - - - /* Fetch script/language indices for GSUB/GPOS. We need these later to skip - * features not available in either table and not waste precious bits for them. */ - - hb_tag_t script_tags[3] = {HB_TAG_NONE, HB_TAG_NONE, HB_TAG_NONE}; - hb_tag_t language_tag; - - hb_ot_tags_from_script (props.script, &script_tags[0], &script_tags[1]); - language_tag = hb_ot_tag_from_language (props.language); - - for (unsigned int table_index = 0; table_index < 2; table_index++) { - hb_tag_t table_tag = table_tags[table_index]; - found_script[table_index] = hb_ot_layout_table_choose_script (face, table_tag, script_tags, &script_index[table_index], &chosen_script[table_index]); - hb_ot_layout_script_find_language (face, table_tag, script_index[table_index], language_tag, &language_index[table_index]); - } -} - -void hb_ot_map_builder_t::add_feature (hb_tag_t tag, unsigned int value, - hb_ot_map_feature_flags_t flags) -{ - feature_info_t *info = feature_infos.push(); - if (unlikely (!info)) return; - info->tag = tag; - info->seq = feature_infos.len; - info->max_value = value; - info->flags = flags; - info->default_value = (flags & F_GLOBAL) ? value : 0; - info->stage[0] = current_stage[0]; - info->stage[1] = current_stage[1]; -} - -/* Keep the next two functions in sync. */ - -void hb_ot_map_t::substitute (const hb_ot_shape_plan_t *plan, hb_font_t *font, hb_buffer_t *buffer) const -{ - const unsigned int table_index = 0; - unsigned int i = 0; - - for (unsigned int pause_index = 0; pause_index < pauses[table_index].len; pause_index++) { - const pause_map_t *pause = &pauses[table_index][pause_index]; - for (; i < pause->num_lookups; i++) - hb_ot_layout_substitute_lookup (font, buffer, - lookups[table_index][i].index, - lookups[table_index][i].mask, - lookups[table_index][i].auto_zwj); - - buffer->clear_output (); - - if (pause->callback) - pause->callback (plan, font, buffer); - } - - for (; i < lookups[table_index].len; i++) - hb_ot_layout_substitute_lookup (font, buffer, lookups[table_index][i].index, - lookups[table_index][i].mask, - lookups[table_index][i].auto_zwj); -} - -void hb_ot_map_t::position (const hb_ot_shape_plan_t *plan, hb_font_t *font, hb_buffer_t *buffer) const -{ - const unsigned int table_index = 1; - unsigned int i = 0; - - for (unsigned int pause_index = 0; pause_index < pauses[table_index].len; pause_index++) { - const pause_map_t *pause = &pauses[table_index][pause_index]; - for (; i < pause->num_lookups; i++) - hb_ot_layout_position_lookup (font, buffer, lookups[table_index][i].index, - lookups[table_index][i].mask, - lookups[table_index][i].auto_zwj); - - if (pause->callback) - pause->callback (plan, font, buffer); - } - - for (; i < lookups[table_index].len; i++) - hb_ot_layout_position_lookup (font, buffer, lookups[table_index][i].index, - lookups[table_index][i].mask, - lookups[table_index][i].auto_zwj); -} - -void hb_ot_map_t::collect_lookups (unsigned int table_index, hb_set_t *lookups_out) const -{ - for (unsigned int i = 0; i < lookups[table_index].len; i++) - hb_set_add (lookups_out, lookups[table_index][i].index); -} - -void hb_ot_map_builder_t::add_pause (unsigned int table_index, hb_ot_map_t::pause_func_t pause_func) -{ - pause_info_t *p = pauses[table_index].push (); - if (likely (p)) { - p->stage = current_stage[table_index]; - p->callback = pause_func; - } - - current_stage[table_index]++; -} - -void -hb_ot_map_builder_t::compile (hb_ot_map_t &m) -{ - m.global_mask = 1; - - for (unsigned int table_index = 0; table_index < 2; table_index++) { - m.chosen_script[table_index] = chosen_script[table_index]; - m.found_script[table_index] = found_script[table_index]; - } - - if (!feature_infos.len) - return; - - /* Sort features and merge duplicates */ - { - feature_infos.sort (); - unsigned int j = 0; - for (unsigned int i = 1; i < feature_infos.len; i++) - if (feature_infos[i].tag != feature_infos[j].tag) - feature_infos[++j] = feature_infos[i]; - else { - if (feature_infos[i].flags & F_GLOBAL) { - feature_infos[j].flags |= F_GLOBAL; - feature_infos[j].max_value = feature_infos[i].max_value; - feature_infos[j].default_value = feature_infos[i].default_value; - } else { - feature_infos[j].flags &= ~F_GLOBAL; - feature_infos[j].max_value = MAX (feature_infos[j].max_value, feature_infos[i].max_value); - /* Inherit default_value from j */ - } - feature_infos[j].flags |= (feature_infos[i].flags & F_HAS_FALLBACK); - feature_infos[j].stage[0] = MIN (feature_infos[j].stage[0], feature_infos[i].stage[0]); - feature_infos[j].stage[1] = MIN (feature_infos[j].stage[1], feature_infos[i].stage[1]); - } - feature_infos.shrink (j + 1); - } - - - /* Allocate bits now */ - unsigned int next_bit = 1; - for (unsigned int i = 0; i < feature_infos.len; i++) { - const feature_info_t *info = &feature_infos[i]; - - unsigned int bits_needed; - - if ((info->flags & F_GLOBAL) && info->max_value == 1) - /* Uses the global bit */ - bits_needed = 0; - else - bits_needed = _hb_bit_storage (info->max_value); - - if (!info->max_value || next_bit + bits_needed > 8 * sizeof (hb_mask_t)) - continue; /* Feature disabled, or not enough bits. */ - - - bool found = false; - unsigned int feature_index[2]; - for (unsigned int table_index = 0; table_index < 2; table_index++) - found |= hb_ot_layout_language_find_feature (face, - table_tags[table_index], - script_index[table_index], - language_index[table_index], - info->tag, - &feature_index[table_index]); - if (!found && !(info->flags & F_HAS_FALLBACK)) - continue; - - - hb_ot_map_t::feature_map_t *map = m.features.push (); - if (unlikely (!map)) - break; - - map->tag = info->tag; - map->index[0] = feature_index[0]; - map->index[1] = feature_index[1]; - map->stage[0] = info->stage[0]; - map->stage[1] = info->stage[1]; - map->auto_zwj = !(info->flags & F_MANUAL_ZWJ); - if ((info->flags & F_GLOBAL) && info->max_value == 1) { - /* Uses the global bit */ - map->shift = 0; - map->mask = 1; - } else { - map->shift = next_bit; - map->mask = (1 << (next_bit + bits_needed)) - (1 << next_bit); - next_bit += bits_needed; - m.global_mask |= (info->default_value << map->shift) & map->mask; - } - map->_1_mask = (1 << map->shift) & map->mask; - map->needs_fallback = !found; - - } - feature_infos.shrink (0); /* Done with these */ - - - add_gsub_pause (NULL); - add_gpos_pause (NULL); - - for (unsigned int table_index = 0; table_index < 2; table_index++) { - hb_tag_t table_tag = table_tags[table_index]; - - /* Collect lookup indices for features */ - - unsigned int required_feature_index; - if (hb_ot_layout_language_get_required_feature_index (face, - table_tag, - script_index[table_index], - language_index[table_index], - &required_feature_index)) - m.add_lookups (face, table_index, required_feature_index, 1, true); - - unsigned int pause_index = 0; - unsigned int last_num_lookups = 0; - for (unsigned stage = 0; stage < current_stage[table_index]; stage++) - { - for (unsigned i = 0; i < m.features.len; i++) - if (m.features[i].stage[table_index] == stage) - m.add_lookups (face, table_index, - m.features[i].index[table_index], - m.features[i].mask, - m.features[i].auto_zwj); - - /* Sort lookups and merge duplicates */ - if (last_num_lookups < m.lookups[table_index].len) - { - m.lookups[table_index].sort (last_num_lookups, m.lookups[table_index].len); - - unsigned int j = last_num_lookups; - for (unsigned int i = j + 1; i < m.lookups[table_index].len; i++) - if (m.lookups[table_index][i].index != m.lookups[table_index][j].index) - m.lookups[table_index][++j] = m.lookups[table_index][i]; - else - { - m.lookups[table_index][j].mask |= m.lookups[table_index][i].mask; - m.lookups[table_index][j].auto_zwj &= m.lookups[table_index][i].auto_zwj; - } - m.lookups[table_index].shrink (j + 1); - } - - last_num_lookups = m.lookups[table_index].len; - - if (pause_index < pauses[table_index].len && pauses[table_index][pause_index].stage == stage) { - hb_ot_map_t::pause_map_t *pause_map = m.pauses[table_index].push (); - if (likely (pause_map)) { - pause_map->num_lookups = last_num_lookups; - pause_map->callback = pauses[table_index][pause_index].callback; - } - - pause_index++; - } - } - } -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-maxp-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-maxp-table.hh deleted file mode 100644 index 0ce3ebcc2a6..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-maxp-table.hh +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_MAXP_TABLE_HH -#define HB_OT_MAXP_TABLE_HH - -#include "hb-open-type-private.hh" - - -namespace OT { - - -/* - * maxp -- The Maximum Profile Table - */ - -#define HB_OT_TAG_maxp HB_TAG('m','a','x','p') - -struct maxp -{ - static const hb_tag_t Tag = HB_OT_TAG_maxp; - - inline unsigned int get_num_glyphs (void) const { - return numGlyphs; - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this) && - likely (version.major == 1 || (version.major == 0 && version.minor == 0x5000))); - } - - /* We only implement version 0.5 as none of the extra fields in version 1.0 are useful. */ - protected: - FixedVersion version; /* Version of the maxp table (0.5 or 1.0), - * 0x00005000 or 0x00010000. */ - USHORT numGlyphs; /* The number of glyphs in the font. */ - public: - DEFINE_SIZE_STATIC (6); -}; - - -} /* namespace OT */ - - -#endif /* HB_OT_MAXP_TABLE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-name-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-name-table.hh deleted file mode 100644 index 75a1b94ea31..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-name-table.hh +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_NAME_TABLE_HH -#define HB_OT_NAME_TABLE_HH - -#include "hb-open-type-private.hh" - - -namespace OT { - - -/* - * name -- The Naming Table - */ - -#define HB_OT_TAG_name HB_TAG('n','a','m','e') - - -struct NameRecord -{ - static int cmp (const NameRecord *a, const NameRecord *b) - { - int ret; - ret = b->platformID.cmp (a->platformID); - if (ret) return ret; - ret = b->encodingID.cmp (a->encodingID); - if (ret) return ret; - ret = b->languageID.cmp (a->languageID); - if (ret) return ret; - ret = b->nameID.cmp (a->nameID); - if (ret) return ret; - return 0; - } - - inline bool sanitize (hb_sanitize_context_t *c, void *base) { - TRACE_SANITIZE (this); - /* We can check from base all the way up to the end of string... */ - return TRACE_RETURN (c->check_struct (this) && c->check_range ((char *) base, (unsigned int) length + offset)); - } - - USHORT platformID; /* Platform ID. */ - USHORT encodingID; /* Platform-specific encoding ID. */ - USHORT languageID; /* Language ID. */ - USHORT nameID; /* Name ID. */ - USHORT length; /* String length (in bytes). */ - USHORT offset; /* String offset from start of storage area (in bytes). */ - public: - DEFINE_SIZE_STATIC (12); -}; - -struct name -{ - static const hb_tag_t Tag = HB_OT_TAG_name; - - inline unsigned int get_name (unsigned int platform_id, - unsigned int encoding_id, - unsigned int language_id, - unsigned int name_id, - void *buffer, - unsigned int buffer_length) const - { - NameRecord key; - key.platformID.set (platform_id); - key.encodingID.set (encoding_id); - key.languageID.set (language_id); - key.nameID.set (name_id); - NameRecord *match = (NameRecord *) bsearch (&key, nameRecord, count, sizeof (nameRecord[0]), (hb_compare_func_t) NameRecord::cmp); - - if (!match) - return 0; - - unsigned int length = MIN (buffer_length, (unsigned int) match->length); - memcpy (buffer, (char *) this + stringOffset + match->offset, length); - return length; - } - - inline bool sanitize_records (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - char *string_pool = (char *) this + stringOffset; - unsigned int _count = count; - for (unsigned int i = 0; i < _count; i++) - if (!nameRecord[i].sanitize (c, string_pool)) return TRACE_RETURN (false); - return TRACE_RETURN (true); - } - - inline bool sanitize (hb_sanitize_context_t *c) { - TRACE_SANITIZE (this); - return TRACE_RETURN (c->check_struct (this) && - likely (format == 0 || format == 1) && - c->check_array (nameRecord, nameRecord[0].static_size, count) && - sanitize_records (c)); - } - - /* We only implement format 0 for now. */ - protected: - USHORT format; /* Format selector (=0/1). */ - USHORT count; /* Number of name records. */ - Offset stringOffset; /* Offset to start of string storage (from start of table). */ - NameRecord nameRecord[VAR]; /* The name records where count is the number of records. */ - public: - DEFINE_SIZE_ARRAY (6, nameRecord); -}; - - -} /* namespace OT */ - - -#endif /* HB_OT_NAME_TABLE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-arabic-fallback.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-arabic-fallback.hh deleted file mode 100644 index 5e151f75704..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-arabic-fallback.hh +++ /dev/null @@ -1,253 +0,0 @@ -/* - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_SHAPE_COMPLEX_ARABIC_FALLBACK_HH -#define HB_OT_SHAPE_COMPLEX_ARABIC_FALLBACK_HH - -#include "hb-private.hh" - -#include "hb-ot-shape-private.hh" -#include "hb-ot-layout-gsub-table.hh" - - -static const hb_tag_t arabic_fallback_features[] = -{ - HB_TAG('i','n','i','t'), - HB_TAG('m','e','d','i'), - HB_TAG('f','i','n','a'), - HB_TAG('i','s','o','l'), - HB_TAG('r','l','i','g'), -}; - -/* Same order as the fallback feature array */ -enum { - FALLBACK_INIT, - FALLBACK_MEDI, - FALLBACK_FINA, - FALLBACK_ISOL, - FALLBACK_RLIG, - ARABIC_NUM_FALLBACK_FEATURES -}; - -static OT::SubstLookup * -arabic_fallback_synthesize_lookup_single (const hb_ot_shape_plan_t *plan HB_UNUSED, - hb_font_t *font, - unsigned int feature_index) -{ - OT::GlyphID glyphs[SHAPING_TABLE_LAST - SHAPING_TABLE_FIRST + 1]; - OT::GlyphID substitutes[SHAPING_TABLE_LAST - SHAPING_TABLE_FIRST + 1]; - unsigned int num_glyphs = 0; - - /* Populate arrays */ - for (hb_codepoint_t u = SHAPING_TABLE_FIRST; u < SHAPING_TABLE_LAST + 1; u++) - { - hb_codepoint_t s = shaping_table[u - SHAPING_TABLE_FIRST][feature_index]; - hb_codepoint_t u_glyph, s_glyph; - - if (!s || - !hb_font_get_glyph (font, u, 0, &u_glyph) || - !hb_font_get_glyph (font, s, 0, &s_glyph) || - u_glyph == s_glyph || - u_glyph > 0xFFFF || s_glyph > 0xFFFF) - continue; - - glyphs[num_glyphs].set (u_glyph); - substitutes[num_glyphs].set (s_glyph); - - num_glyphs++; - } - - /* Bubble-sort! - * May not be good-enough for presidential candidate interviews, but good-enough for us... */ - hb_bubble_sort (&glyphs[0], num_glyphs, OT::GlyphID::cmp, &substitutes[0]); - - OT::Supplier<OT::GlyphID> glyphs_supplier (glyphs, num_glyphs); - OT::Supplier<OT::GlyphID> substitutes_supplier (substitutes, num_glyphs); - - /* Each glyph takes four bytes max, and there's some overhead. */ - char buf[(SHAPING_TABLE_LAST - SHAPING_TABLE_FIRST + 1) * 4 + 128]; - OT::hb_serialize_context_t c (buf, sizeof (buf)); - OT::SubstLookup *lookup = c.start_serialize<OT::SubstLookup> (); - bool ret = lookup->serialize_single (&c, - OT::LookupFlag::IgnoreMarks, - glyphs_supplier, - substitutes_supplier, - num_glyphs); - c.end_serialize (); - /* TODO sanitize the results? */ - - return ret ? c.copy<OT::SubstLookup> () : NULL; -} - -static OT::SubstLookup * -arabic_fallback_synthesize_lookup_ligature (const hb_ot_shape_plan_t *plan HB_UNUSED, - hb_font_t *font) -{ - OT::GlyphID first_glyphs[ARRAY_LENGTH_CONST (ligature_table)]; - unsigned int first_glyphs_indirection[ARRAY_LENGTH_CONST (ligature_table)]; - unsigned int ligature_per_first_glyph_count_list[ARRAY_LENGTH_CONST (first_glyphs)]; - unsigned int num_first_glyphs = 0; - - /* We know that all our ligatures are 2-component */ - OT::GlyphID ligature_list[ARRAY_LENGTH_CONST (first_glyphs) * ARRAY_LENGTH_CONST(ligature_table[0].ligatures)]; - unsigned int component_count_list[ARRAY_LENGTH_CONST (ligature_list)]; - OT::GlyphID component_list[ARRAY_LENGTH_CONST (ligature_list) * 1/* One extra component per ligature */]; - unsigned int num_ligatures = 0; - - /* Populate arrays */ - - /* Sort out the first-glyphs */ - for (unsigned int first_glyph_idx = 0; first_glyph_idx < ARRAY_LENGTH (first_glyphs); first_glyph_idx++) - { - hb_codepoint_t first_u = ligature_table[first_glyph_idx].first; - hb_codepoint_t first_glyph; - if (!hb_font_get_glyph (font, first_u, 0, &first_glyph)) - continue; - first_glyphs[num_first_glyphs].set (first_glyph); - ligature_per_first_glyph_count_list[num_first_glyphs] = 0; - first_glyphs_indirection[num_first_glyphs] = first_glyph_idx; - num_first_glyphs++; - } - hb_bubble_sort (&first_glyphs[0], num_first_glyphs, OT::GlyphID::cmp, &first_glyphs_indirection[0]); - - /* Now that the first-glyphs are sorted, walk again, populate ligatures. */ - for (unsigned int i = 0; i < num_first_glyphs; i++) - { - unsigned int first_glyph_idx = first_glyphs_indirection[i]; - - for (unsigned int second_glyph_idx = 0; second_glyph_idx < ARRAY_LENGTH (ligature_table[0].ligatures); second_glyph_idx++) - { - hb_codepoint_t second_u = ligature_table[first_glyph_idx].ligatures[second_glyph_idx].second; - hb_codepoint_t ligature_u = ligature_table[first_glyph_idx].ligatures[second_glyph_idx].ligature; - hb_codepoint_t second_glyph, ligature_glyph; - if (!second_u || - !hb_font_get_glyph (font, second_u, 0, &second_glyph) || - !hb_font_get_glyph (font, ligature_u, 0, &ligature_glyph)) - continue; - - ligature_per_first_glyph_count_list[i]++; - - ligature_list[num_ligatures].set (ligature_glyph); - component_count_list[num_ligatures] = 2; - component_list[num_ligatures].set (second_glyph); - num_ligatures++; - } - } - - OT::Supplier<OT::GlyphID> first_glyphs_supplier (first_glyphs, num_first_glyphs); - OT::Supplier<unsigned int > ligature_per_first_glyph_count_supplier (ligature_per_first_glyph_count_list, num_first_glyphs); - OT::Supplier<OT::GlyphID> ligatures_supplier (ligature_list, num_ligatures); - OT::Supplier<unsigned int > component_count_supplier (component_count_list, num_ligatures); - OT::Supplier<OT::GlyphID> component_supplier (component_list, num_ligatures); - - /* 16 bytes per ligature ought to be enough... */ - char buf[ARRAY_LENGTH_CONST (ligature_list) * 16 + 128]; - OT::hb_serialize_context_t c (buf, sizeof (buf)); - OT::SubstLookup *lookup = c.start_serialize<OT::SubstLookup> (); - bool ret = lookup->serialize_ligature (&c, - OT::LookupFlag::IgnoreMarks, - first_glyphs_supplier, - ligature_per_first_glyph_count_supplier, - num_first_glyphs, - ligatures_supplier, - component_count_supplier, - component_supplier); - - c.end_serialize (); - /* TODO sanitize the results? */ - - return ret ? c.copy<OT::SubstLookup> () : NULL; -} - -static OT::SubstLookup * -arabic_fallback_synthesize_lookup (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - unsigned int feature_index) -{ - if (feature_index < 4) - return arabic_fallback_synthesize_lookup_single (plan, font, feature_index); - else - return arabic_fallback_synthesize_lookup_ligature (plan, font); -} - -struct arabic_fallback_plan_t -{ - ASSERT_POD (); - - hb_mask_t mask_array[ARABIC_NUM_FALLBACK_FEATURES]; - OT::SubstLookup *lookup_array[ARABIC_NUM_FALLBACK_FEATURES]; - hb_set_digest_t digest_array[ARABIC_NUM_FALLBACK_FEATURES]; -}; - -static const arabic_fallback_plan_t arabic_fallback_plan_nil = {}; - -static arabic_fallback_plan_t * -arabic_fallback_plan_create (const hb_ot_shape_plan_t *plan, - hb_font_t *font) -{ - arabic_fallback_plan_t *fallback_plan = (arabic_fallback_plan_t *) calloc (1, sizeof (arabic_fallback_plan_t)); - if (unlikely (!fallback_plan)) - return const_cast<arabic_fallback_plan_t *> (&arabic_fallback_plan_nil); - - for (unsigned int i = 0; i < ARABIC_NUM_FALLBACK_FEATURES; i++) { - fallback_plan->mask_array[i] = plan->map.get_1_mask (arabic_fallback_features[i]); - if (fallback_plan->mask_array[i]) { - fallback_plan->lookup_array[i] = arabic_fallback_synthesize_lookup (plan, font, i); - if (fallback_plan->lookup_array[i]) - fallback_plan->lookup_array[i]->add_coverage (&fallback_plan->digest_array[i]); - } - } - - return fallback_plan; -} - -static void -arabic_fallback_plan_destroy (arabic_fallback_plan_t *fallback_plan) -{ - if (!fallback_plan || fallback_plan == &arabic_fallback_plan_nil) - return; - - for (unsigned int i = 0; i < ARABIC_NUM_FALLBACK_FEATURES; i++) - if (fallback_plan->lookup_array[i]) - free (fallback_plan->lookup_array[i]); - - free (fallback_plan); -} - -static void -arabic_fallback_plan_shape (arabic_fallback_plan_t *fallback_plan, - hb_font_t *font, - hb_buffer_t *buffer) -{ - for (unsigned int i = 0; i < ARABIC_NUM_FALLBACK_FEATURES; i++) - if (fallback_plan->lookup_array[i]) { - OT::hb_apply_context_t c (0, font, buffer, fallback_plan->mask_array[i], true/*auto_zwj*/); - fallback_plan->lookup_array[i]->apply_string (&c, &fallback_plan->digest_array[i]); - } -} - - -#endif /* HB_OT_SHAPE_COMPLEX_ARABIC_FALLBACK_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-arabic-table.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-arabic-table.hh deleted file mode 100644 index 730a275bf0a..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-arabic-table.hh +++ /dev/null @@ -1,942 +0,0 @@ -/* == Start of generated table == */ -/* - * The following table is generated by running: - * - * ./gen-arabic-table.py ArabicShaping.txt UnicodeData.txt - * - * on files with these headers: - * - * # ArabicShaping-6.2.0.txt - * # Date: 2012-05-15, 21:05:00 GMT [KW] - * UnicodeData.txt does not have a header. - */ - -#ifndef HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_HH -#define HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_HH - - -static const uint8_t joining_table[] = -{ - - /* Arabic Characters */ - - JOINING_TYPE_U, /* 0600; ARABIC NUMBER SIGN; U; No_Joining_Group */ - JOINING_TYPE_U, /* 0601; ARABIC SIGN SANAH; U; No_Joining_Group */ - JOINING_TYPE_U, /* 0602; ARABIC FOOTNOTE MARKER; U; No_Joining_Group */ - JOINING_TYPE_U, /* 0603; ARABIC SIGN SAFHA; U; No_Joining_Group */ - JOINING_TYPE_U, /* 0604; ARABIC SIGN SAMVAT; U; No_Joining_Group */ - JOINING_TYPE_X, /* 0605 */ - JOINING_TYPE_X, /* 0606 */ - JOINING_TYPE_X, /* 0607 */ - JOINING_TYPE_U, /* 0608; ARABIC RAY; U; No_Joining_Group */ - JOINING_TYPE_X, /* 0609 */ - JOINING_TYPE_X, /* 060A */ - JOINING_TYPE_U, /* 060B; AFGHANI SIGN; U; No_Joining_Group */ - JOINING_TYPE_X, /* 060C */ - JOINING_TYPE_X, /* 060D */ - JOINING_TYPE_X, /* 060E */ - JOINING_TYPE_X, /* 060F */ - JOINING_TYPE_X, /* 0610 */ - JOINING_TYPE_X, /* 0611 */ - JOINING_TYPE_X, /* 0612 */ - JOINING_TYPE_X, /* 0613 */ - JOINING_TYPE_X, /* 0614 */ - JOINING_TYPE_X, /* 0615 */ - JOINING_TYPE_X, /* 0616 */ - JOINING_TYPE_X, /* 0617 */ - JOINING_TYPE_X, /* 0618 */ - JOINING_TYPE_X, /* 0619 */ - JOINING_TYPE_X, /* 061A */ - JOINING_TYPE_X, /* 061B */ - JOINING_TYPE_X, /* 061C */ - JOINING_TYPE_X, /* 061D */ - JOINING_TYPE_X, /* 061E */ - JOINING_TYPE_X, /* 061F */ - JOINING_TYPE_D, /* 0620; DOTLESS YEH WITH SEPARATE RING BELOW; D; YEH */ - JOINING_TYPE_U, /* 0621; HAMZA; U; No_Joining_Group */ - JOINING_TYPE_R, /* 0622; ALEF WITH MADDA ABOVE; R; ALEF */ - JOINING_TYPE_R, /* 0623; ALEF WITH HAMZA ABOVE; R; ALEF */ - JOINING_TYPE_R, /* 0624; WAW WITH HAMZA ABOVE; R; WAW */ - JOINING_TYPE_R, /* 0625; ALEF WITH HAMZA BELOW; R; ALEF */ - JOINING_TYPE_D, /* 0626; DOTLESS YEH WITH HAMZA ABOVE; D; YEH */ - JOINING_TYPE_R, /* 0627; ALEF; R; ALEF */ - JOINING_TYPE_D, /* 0628; BEH; D; BEH */ - JOINING_TYPE_R, /* 0629; TEH MARBUTA; R; TEH MARBUTA */ - JOINING_TYPE_D, /* 062A; DOTLESS BEH WITH 2 DOTS ABOVE; D; BEH */ - JOINING_TYPE_D, /* 062B; DOTLESS BEH WITH 3 DOTS ABOVE; D; BEH */ - JOINING_TYPE_D, /* 062C; HAH WITH DOT BELOW; D; HAH */ - JOINING_TYPE_D, /* 062D; HAH; D; HAH */ - JOINING_TYPE_D, /* 062E; HAH WITH DOT ABOVE; D; HAH */ - JOINING_TYPE_R, /* 062F; DAL; R; DAL */ - JOINING_TYPE_R, /* 0630; DAL WITH DOT ABOVE; R; DAL */ - JOINING_TYPE_R, /* 0631; REH; R; REH */ - JOINING_TYPE_R, /* 0632; REH WITH DOT ABOVE; R; REH */ - JOINING_TYPE_D, /* 0633; SEEN; D; SEEN */ - JOINING_TYPE_D, /* 0634; SEEN WITH 3 DOTS ABOVE; D; SEEN */ - JOINING_TYPE_D, /* 0635; SAD; D; SAD */ - JOINING_TYPE_D, /* 0636; SAD WITH DOT ABOVE; D; SAD */ - JOINING_TYPE_D, /* 0637; TAH; D; TAH */ - JOINING_TYPE_D, /* 0638; TAH WITH DOT ABOVE; D; TAH */ - JOINING_TYPE_D, /* 0639; AIN; D; AIN */ - JOINING_TYPE_D, /* 063A; AIN WITH DOT ABOVE; D; AIN */ - JOINING_TYPE_D, /* 063B; KEHEH WITH 2 DOTS ABOVE; D; GAF */ - JOINING_TYPE_D, /* 063C; KEHEH WITH 3 DOTS BELOW; D; GAF */ - JOINING_TYPE_D, /* 063D; FARSI YEH WITH INVERTED V ABOVE; D; FARSI YEH */ - JOINING_TYPE_D, /* 063E; FARSI YEH WITH 2 DOTS ABOVE; D; FARSI YEH */ - JOINING_TYPE_D, /* 063F; FARSI YEH WITH 3 DOTS ABOVE; D; FARSI YEH */ - JOINING_TYPE_C, /* 0640; TATWEEL; C; No_Joining_Group */ - JOINING_TYPE_D, /* 0641; FEH; D; FEH */ - JOINING_TYPE_D, /* 0642; QAF; D; QAF */ - JOINING_TYPE_D, /* 0643; KAF; D; KAF */ - JOINING_TYPE_D, /* 0644; LAM; D; LAM */ - JOINING_TYPE_D, /* 0645; MEEM; D; MEEM */ - JOINING_TYPE_D, /* 0646; NOON; D; NOON */ - JOINING_TYPE_D, /* 0647; HEH; D; HEH */ - JOINING_TYPE_R, /* 0648; WAW; R; WAW */ - JOINING_TYPE_D, /* 0649; DOTLESS YEH; D; YEH */ - JOINING_TYPE_D, /* 064A; YEH; D; YEH */ - JOINING_TYPE_X, /* 064B */ - JOINING_TYPE_X, /* 064C */ - JOINING_TYPE_X, /* 064D */ - JOINING_TYPE_X, /* 064E */ - JOINING_TYPE_X, /* 064F */ - JOINING_TYPE_X, /* 0650 */ - JOINING_TYPE_X, /* 0651 */ - JOINING_TYPE_X, /* 0652 */ - JOINING_TYPE_X, /* 0653 */ - JOINING_TYPE_X, /* 0654 */ - JOINING_TYPE_X, /* 0655 */ - JOINING_TYPE_X, /* 0656 */ - JOINING_TYPE_X, /* 0657 */ - JOINING_TYPE_X, /* 0658 */ - JOINING_TYPE_X, /* 0659 */ - JOINING_TYPE_X, /* 065A */ - JOINING_TYPE_X, /* 065B */ - JOINING_TYPE_X, /* 065C */ - JOINING_TYPE_X, /* 065D */ - JOINING_TYPE_X, /* 065E */ - JOINING_TYPE_X, /* 065F */ - JOINING_TYPE_X, /* 0660 */ - JOINING_TYPE_X, /* 0661 */ - JOINING_TYPE_X, /* 0662 */ - JOINING_TYPE_X, /* 0663 */ - JOINING_TYPE_X, /* 0664 */ - JOINING_TYPE_X, /* 0665 */ - JOINING_TYPE_X, /* 0666 */ - JOINING_TYPE_X, /* 0667 */ - JOINING_TYPE_X, /* 0668 */ - JOINING_TYPE_X, /* 0669 */ - JOINING_TYPE_X, /* 066A */ - JOINING_TYPE_X, /* 066B */ - JOINING_TYPE_X, /* 066C */ - JOINING_TYPE_X, /* 066D */ - JOINING_TYPE_D, /* 066E; DOTLESS BEH; D; BEH */ - JOINING_TYPE_D, /* 066F; DOTLESS QAF; D; QAF */ - JOINING_TYPE_X, /* 0670 */ - JOINING_TYPE_R, /* 0671; ALEF WITH WASLA ABOVE; R; ALEF */ - JOINING_TYPE_R, /* 0672; ALEF WITH WAVY HAMZA ABOVE; R; ALEF */ - JOINING_TYPE_R, /* 0673; ALEF WITH WAVY HAMZA BELOW; R; ALEF */ - JOINING_TYPE_U, /* 0674; HIGH HAMZA; U; No_Joining_Group */ - JOINING_TYPE_R, /* 0675; HIGH HAMZA ALEF; R; ALEF */ - JOINING_TYPE_R, /* 0676; HIGH HAMZA WAW; R; WAW */ - JOINING_TYPE_R, /* 0677; HIGH HAMZA WAW WITH DAMMA ABOVE; R; WAW */ - JOINING_TYPE_D, /* 0678; HIGH HAMZA DOTLESS YEH; D; YEH */ - JOINING_TYPE_D, /* 0679; DOTLESS BEH WITH TAH ABOVE; D; BEH */ - JOINING_TYPE_D, /* 067A; DOTLESS BEH WITH VERTICAL 2 DOTS ABOVE; D; BEH */ - JOINING_TYPE_D, /* 067B; DOTLESS BEH WITH VERTICAL 2 DOTS BELOW; D; BEH */ - JOINING_TYPE_D, /* 067C; DOTLESS BEH WITH ATTACHED RING BELOW AND 2 DOTS ABOVE; D; BEH */ - JOINING_TYPE_D, /* 067D; DOTLESS BEH WITH INVERTED 3 DOTS ABOVE; D; BEH */ - JOINING_TYPE_D, /* 067E; DOTLESS BEH WITH 3 DOTS BELOW; D; BEH */ - JOINING_TYPE_D, /* 067F; DOTLESS BEH WITH 4 DOTS ABOVE; D; BEH */ - JOINING_TYPE_D, /* 0680; DOTLESS BEH WITH 4 DOTS BELOW; D; BEH */ - JOINING_TYPE_D, /* 0681; HAH WITH HAMZA ABOVE; D; HAH */ - JOINING_TYPE_D, /* 0682; HAH WITH VERTICAL 2 DOTS ABOVE; D; HAH */ - JOINING_TYPE_D, /* 0683; HAH WITH 2 DOTS BELOW; D; HAH */ - JOINING_TYPE_D, /* 0684; HAH WITH VERTICAL 2 DOTS BELOW; D; HAH */ - JOINING_TYPE_D, /* 0685; HAH WITH 3 DOTS ABOVE; D; HAH */ - JOINING_TYPE_D, /* 0686; HAH WITH 3 DOTS BELOW; D; HAH */ - JOINING_TYPE_D, /* 0687; HAH WITH 4 DOTS BELOW; D; HAH */ - JOINING_TYPE_R, /* 0688; DAL WITH TAH ABOVE; R; DAL */ - JOINING_TYPE_R, /* 0689; DAL WITH ATTACHED RING BELOW; R; DAL */ - JOINING_TYPE_R, /* 068A; DAL WITH DOT BELOW; R; DAL */ - JOINING_TYPE_R, /* 068B; DAL WITH DOT BELOW AND TAH ABOVE; R; DAL */ - JOINING_TYPE_R, /* 068C; DAL WITH 2 DOTS ABOVE; R; DAL */ - JOINING_TYPE_R, /* 068D; DAL WITH 2 DOTS BELOW; R; DAL */ - JOINING_TYPE_R, /* 068E; DAL WITH 3 DOTS ABOVE; R; DAL */ - JOINING_TYPE_R, /* 068F; DAL WITH INVERTED 3 DOTS ABOVE; R; DAL */ - JOINING_TYPE_R, /* 0690; DAL WITH 4 DOTS ABOVE; R; DAL */ - JOINING_TYPE_R, /* 0691; REH WITH TAH ABOVE; R; REH */ - JOINING_TYPE_R, /* 0692; REH WITH V ABOVE; R; REH */ - JOINING_TYPE_R, /* 0693; REH WITH ATTACHED RING BELOW; R; REH */ - JOINING_TYPE_R, /* 0694; REH WITH DOT BELOW; R; REH */ - JOINING_TYPE_R, /* 0695; REH WITH V BELOW; R; REH */ - JOINING_TYPE_R, /* 0696; REH WITH DOT BELOW AND DOT WITHIN; R; REH */ - JOINING_TYPE_R, /* 0697; REH WITH 2 DOTS ABOVE; R; REH */ - JOINING_TYPE_R, /* 0698; REH WITH 3 DOTS ABOVE; R; REH */ - JOINING_TYPE_R, /* 0699; REH WITH 4 DOTS ABOVE; R; REH */ - JOINING_TYPE_D, /* 069A; SEEN WITH DOT BELOW AND DOT ABOVE; D; SEEN */ - JOINING_TYPE_D, /* 069B; SEEN WITH 3 DOTS BELOW; D; SEEN */ - JOINING_TYPE_D, /* 069C; SEEN WITH 3 DOTS BELOW AND 3 DOTS ABOVE; D; SEEN */ - JOINING_TYPE_D, /* 069D; SAD WITH 2 DOTS BELOW; D; SAD */ - JOINING_TYPE_D, /* 069E; SAD WITH 3 DOTS ABOVE; D; SAD */ - JOINING_TYPE_D, /* 069F; TAH WITH 3 DOTS ABOVE; D; TAH */ - JOINING_TYPE_D, /* 06A0; AIN WITH 3 DOTS ABOVE; D; AIN */ - JOINING_TYPE_D, /* 06A1; DOTLESS FEH; D; FEH */ - JOINING_TYPE_D, /* 06A2; DOTLESS FEH WITH DOT BELOW; D; FEH */ - JOINING_TYPE_D, /* 06A3; FEH WITH DOT BELOW; D; FEH */ - JOINING_TYPE_D, /* 06A4; DOTLESS FEH WITH 3 DOTS ABOVE; D; FEH */ - JOINING_TYPE_D, /* 06A5; DOTLESS FEH WITH 3 DOTS BELOW; D; FEH */ - JOINING_TYPE_D, /* 06A6; DOTLESS FEH WITH 4 DOTS ABOVE; D; FEH */ - JOINING_TYPE_D, /* 06A7; DOTLESS QAF WITH DOT ABOVE; D; QAF */ - JOINING_TYPE_D, /* 06A8; DOTLESS QAF WITH 3 DOTS ABOVE; D; QAF */ - JOINING_TYPE_D, /* 06A9; KEHEH; D; GAF */ - JOINING_TYPE_D, /* 06AA; SWASH KAF; D; SWASH KAF */ - JOINING_TYPE_D, /* 06AB; KEHEH WITH ATTACHED RING BELOW; D; GAF */ - JOINING_TYPE_D, /* 06AC; KAF WITH DOT ABOVE; D; KAF */ - JOINING_TYPE_D, /* 06AD; KAF WITH 3 DOTS ABOVE; D; KAF */ - JOINING_TYPE_D, /* 06AE; KAF WITH 3 DOTS BELOW; D; KAF */ - JOINING_TYPE_D, /* 06AF; GAF; D; GAF */ - JOINING_TYPE_D, /* 06B0; GAF WITH ATTACHED RING BELOW; D; GAF */ - JOINING_TYPE_D, /* 06B1; GAF WITH 2 DOTS ABOVE; D; GAF */ - JOINING_TYPE_D, /* 06B2; GAF WITH 2 DOTS BELOW; D; GAF */ - JOINING_TYPE_D, /* 06B3; GAF WITH VERTICAL 2 DOTS BELOW; D; GAF */ - JOINING_TYPE_D, /* 06B4; GAF WITH 3 DOTS ABOVE; D; GAF */ - JOINING_TYPE_D, /* 06B5; LAM WITH V ABOVE; D; LAM */ - JOINING_TYPE_D, /* 06B6; LAM WITH DOT ABOVE; D; LAM */ - JOINING_TYPE_D, /* 06B7; LAM WITH 3 DOTS ABOVE; D; LAM */ - JOINING_TYPE_D, /* 06B8; LAM WITH 3 DOTS BELOW; D; LAM */ - JOINING_TYPE_D, /* 06B9; NOON WITH DOT BELOW; D; NOON */ - JOINING_TYPE_D, /* 06BA; DOTLESS NOON; D; NOON */ - JOINING_TYPE_D, /* 06BB; DOTLESS NOON WITH TAH ABOVE; D; NOON */ - JOINING_TYPE_D, /* 06BC; NOON WITH ATTACHED RING BELOW; D; NOON */ - JOINING_TYPE_D, /* 06BD; NYA; D; NYA */ - JOINING_TYPE_D, /* 06BE; KNOTTED HEH; D; KNOTTED HEH */ - JOINING_TYPE_D, /* 06BF; HAH WITH 3 DOTS BELOW AND DOT ABOVE; D; HAH */ - JOINING_TYPE_R, /* 06C0; DOTLESS TEH MARBUTA WITH HAMZA ABOVE; R; TEH MARBUTA */ - JOINING_TYPE_D, /* 06C1; HEH GOAL; D; HEH GOAL */ - JOINING_TYPE_D, /* 06C2; HEH GOAL WITH HAMZA ABOVE; D; HEH GOAL */ - JOINING_TYPE_R, /* 06C3; TEH MARBUTA GOAL; R; TEH MARBUTA GOAL */ - JOINING_TYPE_R, /* 06C4; WAW WITH ATTACHED RING WITHIN; R; WAW */ - JOINING_TYPE_R, /* 06C5; WAW WITH BAR; R; WAW */ - JOINING_TYPE_R, /* 06C6; WAW WITH V ABOVE; R; WAW */ - JOINING_TYPE_R, /* 06C7; WAW WITH DAMMA ABOVE; R; WAW */ - JOINING_TYPE_R, /* 06C8; WAW WITH ALEF ABOVE; R; WAW */ - JOINING_TYPE_R, /* 06C9; WAW WITH INVERTED V ABOVE; R; WAW */ - JOINING_TYPE_R, /* 06CA; WAW WITH 2 DOTS ABOVE; R; WAW */ - JOINING_TYPE_R, /* 06CB; WAW WITH 3 DOTS ABOVE; R; WAW */ - JOINING_TYPE_D, /* 06CC; FARSI YEH; D; FARSI YEH */ - JOINING_TYPE_R, /* 06CD; YEH WITH TAIL; R; YEH WITH TAIL */ - JOINING_TYPE_D, /* 06CE; FARSI YEH WITH V ABOVE; D; FARSI YEH */ - JOINING_TYPE_R, /* 06CF; WAW WITH DOT ABOVE; R; WAW */ - JOINING_TYPE_D, /* 06D0; DOTLESS YEH WITH VERTICAL 2 DOTS BELOW; D; YEH */ - JOINING_TYPE_D, /* 06D1; DOTLESS YEH WITH 3 DOTS BELOW; D; YEH */ - JOINING_TYPE_R, /* 06D2; YEH BARREE; R; YEH BARREE */ - JOINING_TYPE_R, /* 06D3; YEH BARREE WITH HAMZA ABOVE; R; YEH BARREE */ - JOINING_TYPE_X, /* 06D4 */ - JOINING_TYPE_R, /* 06D5; DOTLESS TEH MARBUTA; R; TEH MARBUTA */ - JOINING_TYPE_X, /* 06D6 */ - JOINING_TYPE_X, /* 06D7 */ - JOINING_TYPE_X, /* 06D8 */ - JOINING_TYPE_X, /* 06D9 */ - JOINING_TYPE_X, /* 06DA */ - JOINING_TYPE_X, /* 06DB */ - JOINING_TYPE_X, /* 06DC */ - JOINING_TYPE_U, /* 06DD; ARABIC END OF AYAH; U; No_Joining_Group */ - JOINING_TYPE_X, /* 06DE */ - JOINING_TYPE_X, /* 06DF */ - JOINING_TYPE_X, /* 06E0 */ - JOINING_TYPE_X, /* 06E1 */ - JOINING_TYPE_X, /* 06E2 */ - JOINING_TYPE_X, /* 06E3 */ - JOINING_TYPE_X, /* 06E4 */ - JOINING_TYPE_X, /* 06E5 */ - JOINING_TYPE_X, /* 06E6 */ - JOINING_TYPE_X, /* 06E7 */ - JOINING_TYPE_X, /* 06E8 */ - JOINING_TYPE_X, /* 06E9 */ - JOINING_TYPE_X, /* 06EA */ - JOINING_TYPE_X, /* 06EB */ - JOINING_TYPE_X, /* 06EC */ - JOINING_TYPE_X, /* 06ED */ - JOINING_TYPE_R, /* 06EE; DAL WITH INVERTED V ABOVE; R; DAL */ - JOINING_TYPE_R, /* 06EF; REH WITH INVERTED V ABOVE; R; REH */ - JOINING_TYPE_X, /* 06F0 */ - JOINING_TYPE_X, /* 06F1 */ - JOINING_TYPE_X, /* 06F2 */ - JOINING_TYPE_X, /* 06F3 */ - JOINING_TYPE_X, /* 06F4 */ - JOINING_TYPE_X, /* 06F5 */ - JOINING_TYPE_X, /* 06F6 */ - JOINING_TYPE_X, /* 06F7 */ - JOINING_TYPE_X, /* 06F8 */ - JOINING_TYPE_X, /* 06F9 */ - JOINING_TYPE_D, /* 06FA; SEEN WITH DOT BELOW AND 3 DOTS ABOVE; D; SEEN */ - JOINING_TYPE_D, /* 06FB; SAD WITH DOT BELOW AND DOT ABOVE; D; SAD */ - JOINING_TYPE_D, /* 06FC; AIN WITH DOT BELOW AND DOT ABOVE; D; AIN */ - JOINING_TYPE_X, /* 06FD */ - JOINING_TYPE_X, /* 06FE */ - JOINING_TYPE_D, /* 06FF; KNOTTED HEH WITH INVERTED V ABOVE; D; KNOTTED HEH */ - - /* Syriac Characters */ - - JOINING_TYPE_X, /* 0700 */ - JOINING_TYPE_X, /* 0701 */ - JOINING_TYPE_X, /* 0702 */ - JOINING_TYPE_X, /* 0703 */ - JOINING_TYPE_X, /* 0704 */ - JOINING_TYPE_X, /* 0705 */ - JOINING_TYPE_X, /* 0706 */ - JOINING_TYPE_X, /* 0707 */ - JOINING_TYPE_X, /* 0708 */ - JOINING_TYPE_X, /* 0709 */ - JOINING_TYPE_X, /* 070A */ - JOINING_TYPE_X, /* 070B */ - JOINING_TYPE_X, /* 070C */ - JOINING_TYPE_X, /* 070D */ - JOINING_TYPE_X, /* 070E */ - JOINING_TYPE_X, /* 070F */ - JOINING_GROUP_ALAPH, /* 0710; ALAPH; R; ALAPH */ - JOINING_TYPE_X, /* 0711 */ - JOINING_TYPE_D, /* 0712; BETH; D; BETH */ - JOINING_TYPE_D, /* 0713; GAMAL; D; GAMAL */ - JOINING_TYPE_D, /* 0714; GAMAL GARSHUNI; D; GAMAL */ - JOINING_GROUP_DALATH_RISH, /* 0715; DALATH; R; DALATH RISH */ - JOINING_GROUP_DALATH_RISH, /* 0716; DOTLESS DALATH RISH; R; DALATH RISH */ - JOINING_TYPE_R, /* 0717; HE; R; HE */ - JOINING_TYPE_R, /* 0718; WAW; R; SYRIAC WAW */ - JOINING_TYPE_R, /* 0719; ZAIN; R; ZAIN */ - JOINING_TYPE_D, /* 071A; HETH; D; HETH */ - JOINING_TYPE_D, /* 071B; TETH; D; TETH */ - JOINING_TYPE_D, /* 071C; TETH GARSHUNI; D; TETH */ - JOINING_TYPE_D, /* 071D; YUDH; D; YUDH */ - JOINING_TYPE_R, /* 071E; YUDH HE; R; YUDH HE */ - JOINING_TYPE_D, /* 071F; KAPH; D; KAPH */ - JOINING_TYPE_D, /* 0720; LAMADH; D; LAMADH */ - JOINING_TYPE_D, /* 0721; MIM; D; MIM */ - JOINING_TYPE_D, /* 0722; NUN; D; NUN */ - JOINING_TYPE_D, /* 0723; SEMKATH; D; SEMKATH */ - JOINING_TYPE_D, /* 0724; FINAL SEMKATH; D; FINAL SEMKATH */ - JOINING_TYPE_D, /* 0725; E; D; E */ - JOINING_TYPE_D, /* 0726; PE; D; PE */ - JOINING_TYPE_D, /* 0727; REVERSED PE; D; REVERSED PE */ - JOINING_TYPE_R, /* 0728; SADHE; R; SADHE */ - JOINING_TYPE_D, /* 0729; QAPH; D; QAPH */ - JOINING_GROUP_DALATH_RISH, /* 072A; RISH; R; DALATH RISH */ - JOINING_TYPE_D, /* 072B; SHIN; D; SHIN */ - JOINING_TYPE_R, /* 072C; TAW; R; TAW */ - JOINING_TYPE_D, /* 072D; PERSIAN BHETH; D; BETH */ - JOINING_TYPE_D, /* 072E; PERSIAN GHAMAL; D; GAMAL */ - JOINING_GROUP_DALATH_RISH, /* 072F; PERSIAN DHALATH; R; DALATH RISH */ - JOINING_TYPE_X, /* 0730 */ - JOINING_TYPE_X, /* 0731 */ - JOINING_TYPE_X, /* 0732 */ - JOINING_TYPE_X, /* 0733 */ - JOINING_TYPE_X, /* 0734 */ - JOINING_TYPE_X, /* 0735 */ - JOINING_TYPE_X, /* 0736 */ - JOINING_TYPE_X, /* 0737 */ - JOINING_TYPE_X, /* 0738 */ - JOINING_TYPE_X, /* 0739 */ - JOINING_TYPE_X, /* 073A */ - JOINING_TYPE_X, /* 073B */ - JOINING_TYPE_X, /* 073C */ - JOINING_TYPE_X, /* 073D */ - JOINING_TYPE_X, /* 073E */ - JOINING_TYPE_X, /* 073F */ - JOINING_TYPE_X, /* 0740 */ - JOINING_TYPE_X, /* 0741 */ - JOINING_TYPE_X, /* 0742 */ - JOINING_TYPE_X, /* 0743 */ - JOINING_TYPE_X, /* 0744 */ - JOINING_TYPE_X, /* 0745 */ - JOINING_TYPE_X, /* 0746 */ - JOINING_TYPE_X, /* 0747 */ - JOINING_TYPE_X, /* 0748 */ - JOINING_TYPE_X, /* 0749 */ - JOINING_TYPE_X, /* 074A */ - JOINING_TYPE_X, /* 074B */ - JOINING_TYPE_X, /* 074C */ - JOINING_TYPE_R, /* 074D; SOGDIAN ZHAIN; R; ZHAIN */ - JOINING_TYPE_D, /* 074E; SOGDIAN KHAPH; D; KHAPH */ - JOINING_TYPE_D, /* 074F; SOGDIAN FE; D; FE */ - - /* Arabic Supplement Characters */ - - JOINING_TYPE_D, /* 0750; DOTLESS BEH WITH HORIZONTAL 3 DOTS BELOW; D; BEH */ - JOINING_TYPE_D, /* 0751; BEH WITH 3 DOTS ABOVE; D; BEH */ - JOINING_TYPE_D, /* 0752; DOTLESS BEH WITH INVERTED 3 DOTS BELOW; D; BEH */ - JOINING_TYPE_D, /* 0753; DOTLESS BEH WITH INVERTED 3 DOTS BELOW AND 2 DOTS ABOVE; D; BEH */ - JOINING_TYPE_D, /* 0754; DOTLESS BEH WITH 2 DOTS BELOW AND DOT ABOVE; D; BEH */ - JOINING_TYPE_D, /* 0755; DOTLESS BEH WITH INVERTED V BELOW; D; BEH */ - JOINING_TYPE_D, /* 0756; DOTLESS BEH WITH V ABOVE; D; BEH */ - JOINING_TYPE_D, /* 0757; HAH WITH 2 DOTS ABOVE; D; HAH */ - JOINING_TYPE_D, /* 0758; HAH WITH INVERTED 3 DOTS BELOW; D; HAH */ - JOINING_TYPE_R, /* 0759; DAL WITH VERTICAL 2 DOTS BELOW AND TAH ABOVE; R; DAL */ - JOINING_TYPE_R, /* 075A; DAL WITH INVERTED V BELOW; R; DAL */ - JOINING_TYPE_R, /* 075B; REH WITH BAR; R; REH */ - JOINING_TYPE_D, /* 075C; SEEN WITH 4 DOTS ABOVE; D; SEEN */ - JOINING_TYPE_D, /* 075D; AIN WITH 2 DOTS ABOVE; D; AIN */ - JOINING_TYPE_D, /* 075E; AIN WITH INVERTED 3 DOTS ABOVE; D; AIN */ - JOINING_TYPE_D, /* 075F; AIN WITH VERTICAL 2 DOTS ABOVE; D; AIN */ - JOINING_TYPE_D, /* 0760; DOTLESS FEH WITH 2 DOTS BELOW; D; FEH */ - JOINING_TYPE_D, /* 0761; DOTLESS FEH WITH INVERTED 3 DOTS BELOW; D; FEH */ - JOINING_TYPE_D, /* 0762; KEHEH WITH DOT ABOVE; D; GAF */ - JOINING_TYPE_D, /* 0763; KEHEH WITH 3 DOTS ABOVE; D; GAF */ - JOINING_TYPE_D, /* 0764; KEHEH WITH INVERTED 3 DOTS BELOW; D; GAF */ - JOINING_TYPE_D, /* 0765; MEEM WITH DOT ABOVE; D; MEEM */ - JOINING_TYPE_D, /* 0766; MEEM WITH DOT BELOW; D; MEEM */ - JOINING_TYPE_D, /* 0767; NOON WITH 2 DOTS BELOW; D; NOON */ - JOINING_TYPE_D, /* 0768; NOON WITH TAH ABOVE; D; NOON */ - JOINING_TYPE_D, /* 0769; NOON WITH V ABOVE; D; NOON */ - JOINING_TYPE_D, /* 076A; LAM WITH BAR; D; LAM */ - JOINING_TYPE_R, /* 076B; REH WITH VERTICAL 2 DOTS ABOVE; R; REH */ - JOINING_TYPE_R, /* 076C; REH WITH HAMZA ABOVE; R; REH */ - JOINING_TYPE_D, /* 076D; SEEN WITH VERTICAL 2 DOTS ABOVE; D; SEEN */ - JOINING_TYPE_D, /* 076E; HAH WITH TAH BELOW; D; HAH */ - JOINING_TYPE_D, /* 076F; HAH WITH TAH AND 2 DOTS BELOW; D; HAH */ - JOINING_TYPE_D, /* 0770; SEEN WITH 2 DOTS AND TAH ABOVE; D; SEEN */ - JOINING_TYPE_R, /* 0771; REH WITH 2 DOTS AND TAH ABOVE; R; REH */ - JOINING_TYPE_D, /* 0772; HAH WITH TAH ABOVE; D; HAH */ - JOINING_TYPE_R, /* 0773; ALEF WITH DIGIT TWO ABOVE; R; ALEF */ - JOINING_TYPE_R, /* 0774; ALEF WITH DIGIT THREE ABOVE; R; ALEF */ - JOINING_TYPE_D, /* 0775; FARSI YEH WITH DIGIT TWO ABOVE; D; FARSI YEH */ - JOINING_TYPE_D, /* 0776; FARSI YEH WITH DIGIT THREE ABOVE; D; FARSI YEH */ - JOINING_TYPE_D, /* 0777; DOTLESS YEH WITH DIGIT FOUR BELOW; D; YEH */ - JOINING_TYPE_R, /* 0778; WAW WITH DIGIT TWO ABOVE; R; WAW */ - JOINING_TYPE_R, /* 0779; WAW WITH DIGIT THREE ABOVE; R; WAW */ - JOINING_TYPE_D, /* 077A; BURUSHASKI YEH BARREE WITH DIGIT TWO ABOVE; D; BURUSHASKI YEH BARREE */ - JOINING_TYPE_D, /* 077B; BURUSHASKI YEH BARREE WITH DIGIT THREE ABOVE; D; BURUSHASKI YEH BARREE */ - JOINING_TYPE_D, /* 077C; HAH WITH DIGIT FOUR BELOW; D; HAH */ - JOINING_TYPE_D, /* 077D; SEEN WITH DIGIT FOUR ABOVE; D; SEEN */ - JOINING_TYPE_D, /* 077E; SEEN WITH INVERTED V ABOVE; D; SEEN */ - JOINING_TYPE_D, /* 077F; KAF WITH 2 DOTS ABOVE; D; KAF */ - - /* N'Ko Characters */ - - JOINING_TYPE_X, /* 0780 */ - JOINING_TYPE_X, /* 0781 */ - JOINING_TYPE_X, /* 0782 */ - JOINING_TYPE_X, /* 0783 */ - JOINING_TYPE_X, /* 0784 */ - JOINING_TYPE_X, /* 0785 */ - JOINING_TYPE_X, /* 0786 */ - JOINING_TYPE_X, /* 0787 */ - JOINING_TYPE_X, /* 0788 */ - JOINING_TYPE_X, /* 0789 */ - JOINING_TYPE_X, /* 078A */ - JOINING_TYPE_X, /* 078B */ - JOINING_TYPE_X, /* 078C */ - JOINING_TYPE_X, /* 078D */ - JOINING_TYPE_X, /* 078E */ - JOINING_TYPE_X, /* 078F */ - JOINING_TYPE_X, /* 0790 */ - JOINING_TYPE_X, /* 0791 */ - JOINING_TYPE_X, /* 0792 */ - JOINING_TYPE_X, /* 0793 */ - JOINING_TYPE_X, /* 0794 */ - JOINING_TYPE_X, /* 0795 */ - JOINING_TYPE_X, /* 0796 */ - JOINING_TYPE_X, /* 0797 */ - JOINING_TYPE_X, /* 0798 */ - JOINING_TYPE_X, /* 0799 */ - JOINING_TYPE_X, /* 079A */ - JOINING_TYPE_X, /* 079B */ - JOINING_TYPE_X, /* 079C */ - JOINING_TYPE_X, /* 079D */ - JOINING_TYPE_X, /* 079E */ - JOINING_TYPE_X, /* 079F */ - JOINING_TYPE_X, /* 07A0 */ - JOINING_TYPE_X, /* 07A1 */ - JOINING_TYPE_X, /* 07A2 */ - JOINING_TYPE_X, /* 07A3 */ - JOINING_TYPE_X, /* 07A4 */ - JOINING_TYPE_X, /* 07A5 */ - JOINING_TYPE_X, /* 07A6 */ - JOINING_TYPE_X, /* 07A7 */ - JOINING_TYPE_X, /* 07A8 */ - JOINING_TYPE_X, /* 07A9 */ - JOINING_TYPE_X, /* 07AA */ - JOINING_TYPE_X, /* 07AB */ - JOINING_TYPE_X, /* 07AC */ - JOINING_TYPE_X, /* 07AD */ - JOINING_TYPE_X, /* 07AE */ - JOINING_TYPE_X, /* 07AF */ - JOINING_TYPE_X, /* 07B0 */ - JOINING_TYPE_X, /* 07B1 */ - JOINING_TYPE_X, /* 07B2 */ - JOINING_TYPE_X, /* 07B3 */ - JOINING_TYPE_X, /* 07B4 */ - JOINING_TYPE_X, /* 07B5 */ - JOINING_TYPE_X, /* 07B6 */ - JOINING_TYPE_X, /* 07B7 */ - JOINING_TYPE_X, /* 07B8 */ - JOINING_TYPE_X, /* 07B9 */ - JOINING_TYPE_X, /* 07BA */ - JOINING_TYPE_X, /* 07BB */ - JOINING_TYPE_X, /* 07BC */ - JOINING_TYPE_X, /* 07BD */ - JOINING_TYPE_X, /* 07BE */ - JOINING_TYPE_X, /* 07BF */ - JOINING_TYPE_X, /* 07C0 */ - JOINING_TYPE_X, /* 07C1 */ - JOINING_TYPE_X, /* 07C2 */ - JOINING_TYPE_X, /* 07C3 */ - JOINING_TYPE_X, /* 07C4 */ - JOINING_TYPE_X, /* 07C5 */ - JOINING_TYPE_X, /* 07C6 */ - JOINING_TYPE_X, /* 07C7 */ - JOINING_TYPE_X, /* 07C8 */ - JOINING_TYPE_X, /* 07C9 */ - JOINING_TYPE_D, /* 07CA; NKO A; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07CB; NKO EE; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07CC; NKO I; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07CD; NKO E; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07CE; NKO U; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07CF; NKO OO; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07D0; NKO O; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07D1; NKO DAGBASINNA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07D2; NKO N; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07D3; NKO BA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07D4; NKO PA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07D5; NKO TA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07D6; NKO JA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07D7; NKO CHA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07D8; NKO DA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07D9; NKO RA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07DA; NKO RRA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07DB; NKO SA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07DC; NKO GBA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07DD; NKO FA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07DE; NKO KA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07DF; NKO LA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07E0; NKO NA WOLOSO; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07E1; NKO MA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07E2; NKO NYA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07E3; NKO NA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07E4; NKO HA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07E5; NKO WA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07E6; NKO YA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07E7; NKO NYA WOLOSO; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07E8; NKO JONA JA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07E9; NKO JONA CHA; D; No_Joining_Group */ - JOINING_TYPE_D, /* 07EA; NKO JONA RA; D; No_Joining_Group */ - JOINING_TYPE_X, /* 07EB */ - JOINING_TYPE_X, /* 07EC */ - JOINING_TYPE_X, /* 07ED */ - JOINING_TYPE_X, /* 07EE */ - JOINING_TYPE_X, /* 07EF */ - JOINING_TYPE_X, /* 07F0 */ - JOINING_TYPE_X, /* 07F1 */ - JOINING_TYPE_X, /* 07F2 */ - JOINING_TYPE_X, /* 07F3 */ - JOINING_TYPE_X, /* 07F4 */ - JOINING_TYPE_X, /* 07F5 */ - JOINING_TYPE_X, /* 07F6 */ - JOINING_TYPE_X, /* 07F7 */ - JOINING_TYPE_X, /* 07F8 */ - JOINING_TYPE_X, /* 07F9 */ - JOINING_TYPE_C, /* 07FA; NKO LAJANYALAN; C; No_Joining_Group */ - - /* Mandaic Characters */ - - JOINING_TYPE_X, /* 07FB */ - JOINING_TYPE_X, /* 07FC */ - JOINING_TYPE_X, /* 07FD */ - JOINING_TYPE_X, /* 07FE */ - JOINING_TYPE_X, /* 07FF */ - JOINING_TYPE_X, /* 0800 */ - JOINING_TYPE_X, /* 0801 */ - JOINING_TYPE_X, /* 0802 */ - JOINING_TYPE_X, /* 0803 */ - JOINING_TYPE_X, /* 0804 */ - JOINING_TYPE_X, /* 0805 */ - JOINING_TYPE_X, /* 0806 */ - JOINING_TYPE_X, /* 0807 */ - JOINING_TYPE_X, /* 0808 */ - JOINING_TYPE_X, /* 0809 */ - JOINING_TYPE_X, /* 080A */ - JOINING_TYPE_X, /* 080B */ - JOINING_TYPE_X, /* 080C */ - JOINING_TYPE_X, /* 080D */ - JOINING_TYPE_X, /* 080E */ - JOINING_TYPE_X, /* 080F */ - JOINING_TYPE_X, /* 0810 */ - JOINING_TYPE_X, /* 0811 */ - JOINING_TYPE_X, /* 0812 */ - JOINING_TYPE_X, /* 0813 */ - JOINING_TYPE_X, /* 0814 */ - JOINING_TYPE_X, /* 0815 */ - JOINING_TYPE_X, /* 0816 */ - JOINING_TYPE_X, /* 0817 */ - JOINING_TYPE_X, /* 0818 */ - JOINING_TYPE_X, /* 0819 */ - JOINING_TYPE_X, /* 081A */ - JOINING_TYPE_X, /* 081B */ - JOINING_TYPE_X, /* 081C */ - JOINING_TYPE_X, /* 081D */ - JOINING_TYPE_X, /* 081E */ - JOINING_TYPE_X, /* 081F */ - JOINING_TYPE_X, /* 0820 */ - JOINING_TYPE_X, /* 0821 */ - JOINING_TYPE_X, /* 0822 */ - JOINING_TYPE_X, /* 0823 */ - JOINING_TYPE_X, /* 0824 */ - JOINING_TYPE_X, /* 0825 */ - JOINING_TYPE_X, /* 0826 */ - JOINING_TYPE_X, /* 0827 */ - JOINING_TYPE_X, /* 0828 */ - JOINING_TYPE_X, /* 0829 */ - JOINING_TYPE_X, /* 082A */ - JOINING_TYPE_X, /* 082B */ - JOINING_TYPE_X, /* 082C */ - JOINING_TYPE_X, /* 082D */ - JOINING_TYPE_X, /* 082E */ - JOINING_TYPE_X, /* 082F */ - JOINING_TYPE_X, /* 0830 */ - JOINING_TYPE_X, /* 0831 */ - JOINING_TYPE_X, /* 0832 */ - JOINING_TYPE_X, /* 0833 */ - JOINING_TYPE_X, /* 0834 */ - JOINING_TYPE_X, /* 0835 */ - JOINING_TYPE_X, /* 0836 */ - JOINING_TYPE_X, /* 0837 */ - JOINING_TYPE_X, /* 0838 */ - JOINING_TYPE_X, /* 0839 */ - JOINING_TYPE_X, /* 083A */ - JOINING_TYPE_X, /* 083B */ - JOINING_TYPE_X, /* 083C */ - JOINING_TYPE_X, /* 083D */ - JOINING_TYPE_X, /* 083E */ - JOINING_TYPE_X, /* 083F */ - JOINING_TYPE_R, /* 0840; MANDAIC HALQA; R; No_Joining_Group */ - JOINING_TYPE_D, /* 0841; MANDAIC AB; D; No_Joining_Group */ - JOINING_TYPE_D, /* 0842; MANDAIC AG; D; No_Joining_Group */ - JOINING_TYPE_D, /* 0843; MANDAIC AD; D; No_Joining_Group */ - JOINING_TYPE_D, /* 0844; MANDAIC AH; D; No_Joining_Group */ - JOINING_TYPE_D, /* 0845; MANDAIC USHENNA; D; No_Joining_Group */ - JOINING_TYPE_R, /* 0846; MANDAIC AZ; R; No_Joining_Group */ - JOINING_TYPE_D, /* 0847; MANDAIC IT; D; No_Joining_Group */ - JOINING_TYPE_D, /* 0848; MANDAIC ATT; D; No_Joining_Group */ - JOINING_TYPE_R, /* 0849; MANDAIC AKSA; R; No_Joining_Group */ - JOINING_TYPE_D, /* 084A; MANDAIC AK; D; No_Joining_Group */ - JOINING_TYPE_D, /* 084B; MANDAIC AL; D; No_Joining_Group */ - JOINING_TYPE_D, /* 084C; MANDAIC AM; D; No_Joining_Group */ - JOINING_TYPE_D, /* 084D; MANDAIC AN; D; No_Joining_Group */ - JOINING_TYPE_D, /* 084E; MANDAIC AS; D; No_Joining_Group */ - JOINING_TYPE_R, /* 084F; MANDAIC IN; R; No_Joining_Group */ - JOINING_TYPE_D, /* 0850; MANDAIC AP; D; No_Joining_Group */ - JOINING_TYPE_D, /* 0851; MANDAIC ASZ; D; No_Joining_Group */ - JOINING_TYPE_D, /* 0852; MANDAIC AQ; D; No_Joining_Group */ - JOINING_TYPE_D, /* 0853; MANDAIC AR; D; No_Joining_Group */ - JOINING_TYPE_R, /* 0854; MANDAIC ASH; R; No_Joining_Group */ - JOINING_TYPE_D, /* 0855; MANDAIC AT; D; No_Joining_Group */ - JOINING_TYPE_U, /* 0856; MANDAIC DUSHENNA; U; No_Joining_Group */ - JOINING_TYPE_U, /* 0857; MANDAIC KAD; U; No_Joining_Group */ - JOINING_TYPE_U, /* 0858; MANDAIC AIN; U; No_Joining_Group */ - - /* Arabic Extended-A Characters */ - - JOINING_TYPE_X, /* 0859 */ - JOINING_TYPE_X, /* 085A */ - JOINING_TYPE_X, /* 085B */ - JOINING_TYPE_X, /* 085C */ - JOINING_TYPE_X, /* 085D */ - JOINING_TYPE_X, /* 085E */ - JOINING_TYPE_X, /* 085F */ - JOINING_TYPE_X, /* 0860 */ - JOINING_TYPE_X, /* 0861 */ - JOINING_TYPE_X, /* 0862 */ - JOINING_TYPE_X, /* 0863 */ - JOINING_TYPE_X, /* 0864 */ - JOINING_TYPE_X, /* 0865 */ - JOINING_TYPE_X, /* 0866 */ - JOINING_TYPE_X, /* 0867 */ - JOINING_TYPE_X, /* 0868 */ - JOINING_TYPE_X, /* 0869 */ - JOINING_TYPE_X, /* 086A */ - JOINING_TYPE_X, /* 086B */ - JOINING_TYPE_X, /* 086C */ - JOINING_TYPE_X, /* 086D */ - JOINING_TYPE_X, /* 086E */ - JOINING_TYPE_X, /* 086F */ - JOINING_TYPE_X, /* 0870 */ - JOINING_TYPE_X, /* 0871 */ - JOINING_TYPE_X, /* 0872 */ - JOINING_TYPE_X, /* 0873 */ - JOINING_TYPE_X, /* 0874 */ - JOINING_TYPE_X, /* 0875 */ - JOINING_TYPE_X, /* 0876 */ - JOINING_TYPE_X, /* 0877 */ - JOINING_TYPE_X, /* 0878 */ - JOINING_TYPE_X, /* 0879 */ - JOINING_TYPE_X, /* 087A */ - JOINING_TYPE_X, /* 087B */ - JOINING_TYPE_X, /* 087C */ - JOINING_TYPE_X, /* 087D */ - JOINING_TYPE_X, /* 087E */ - JOINING_TYPE_X, /* 087F */ - JOINING_TYPE_X, /* 0880 */ - JOINING_TYPE_X, /* 0881 */ - JOINING_TYPE_X, /* 0882 */ - JOINING_TYPE_X, /* 0883 */ - JOINING_TYPE_X, /* 0884 */ - JOINING_TYPE_X, /* 0885 */ - JOINING_TYPE_X, /* 0886 */ - JOINING_TYPE_X, /* 0887 */ - JOINING_TYPE_X, /* 0888 */ - JOINING_TYPE_X, /* 0889 */ - JOINING_TYPE_X, /* 088A */ - JOINING_TYPE_X, /* 088B */ - JOINING_TYPE_X, /* 088C */ - JOINING_TYPE_X, /* 088D */ - JOINING_TYPE_X, /* 088E */ - JOINING_TYPE_X, /* 088F */ - JOINING_TYPE_X, /* 0890 */ - JOINING_TYPE_X, /* 0891 */ - JOINING_TYPE_X, /* 0892 */ - JOINING_TYPE_X, /* 0893 */ - JOINING_TYPE_X, /* 0894 */ - JOINING_TYPE_X, /* 0895 */ - JOINING_TYPE_X, /* 0896 */ - JOINING_TYPE_X, /* 0897 */ - JOINING_TYPE_X, /* 0898 */ - JOINING_TYPE_X, /* 0899 */ - JOINING_TYPE_X, /* 089A */ - JOINING_TYPE_X, /* 089B */ - JOINING_TYPE_X, /* 089C */ - JOINING_TYPE_X, /* 089D */ - JOINING_TYPE_X, /* 089E */ - JOINING_TYPE_X, /* 089F */ - JOINING_TYPE_D, /* 08A0; DOTLESS BEH WITH V BELOW; D; BEH */ - JOINING_TYPE_X, /* 08A1 */ - JOINING_TYPE_D, /* 08A2; HAH WITH DOT BELOW AND 2 DOTS ABOVE; D; HAH */ - JOINING_TYPE_D, /* 08A3; TAH WITH 2 DOTS ABOVE; D; TAH */ - JOINING_TYPE_D, /* 08A4; DOTLESS FEH WITH DOT BELOW AND 3 DOTS ABOVE; D; FEH */ - JOINING_TYPE_D, /* 08A5; QAF WITH DOT BELOW; D; QAF */ - JOINING_TYPE_D, /* 08A6; LAM WITH DOUBLE BAR; D; LAM */ - JOINING_TYPE_D, /* 08A7; MEEM WITH 3 DOTS ABOVE; D; MEEM */ - JOINING_TYPE_D, /* 08A8; YEH WITH HAMZA ABOVE; D; YEH */ - JOINING_TYPE_D, /* 08A9; YEH WITH DOT ABOVE; D; YEH */ - JOINING_TYPE_R, /* 08AA; REH WITH LOOP; R; REH */ - JOINING_TYPE_R, /* 08AB; WAW WITH DOT WITHIN; R; WAW */ - JOINING_TYPE_R, /* 08AC; ROHINGYA YEH; R; ROHINGYA YEH */ - -}; - -#define JOINING_TABLE_FIRST 0x0600 -#define JOINING_TABLE_LAST 0x08AC - - -static const uint16_t shaping_table[][4] = -{ - {0x0000, 0x0000, 0x0000, 0xFE80}, /* U+0621 ARABIC LETTER HAMZA ISOLATED FORM */ - {0x0000, 0x0000, 0xFE82, 0xFE81}, /* U+0622 ARABIC LETTER ALEF WITH MADDA ABOVE */ - {0x0000, 0x0000, 0xFE84, 0xFE83}, /* U+0623 ARABIC LETTER ALEF WITH HAMZA ABOVE */ - {0x0000, 0x0000, 0xFE86, 0xFE85}, /* U+0624 ARABIC LETTER WAW WITH HAMZA ABOVE */ - {0x0000, 0x0000, 0xFE88, 0xFE87}, /* U+0625 ARABIC LETTER ALEF WITH HAMZA BELOW */ - {0xFE8B, 0xFE8C, 0xFE8A, 0xFE89}, /* U+0626 ARABIC LETTER YEH WITH HAMZA ABOVE */ - {0x0000, 0x0000, 0xFE8E, 0xFE8D}, /* U+0627 ARABIC LETTER ALEF */ - {0xFE91, 0xFE92, 0xFE90, 0xFE8F}, /* U+0628 ARABIC LETTER BEH */ - {0x0000, 0x0000, 0xFE94, 0xFE93}, /* U+0629 ARABIC LETTER TEH MARBUTA */ - {0xFE97, 0xFE98, 0xFE96, 0xFE95}, /* U+062A ARABIC LETTER TEH */ - {0xFE9B, 0xFE9C, 0xFE9A, 0xFE99}, /* U+062B ARABIC LETTER THEH */ - {0xFE9F, 0xFEA0, 0xFE9E, 0xFE9D}, /* U+062C ARABIC LETTER JEEM */ - {0xFEA3, 0xFEA4, 0xFEA2, 0xFEA1}, /* U+062D ARABIC LETTER HAH */ - {0xFEA7, 0xFEA8, 0xFEA6, 0xFEA5}, /* U+062E ARABIC LETTER KHAH */ - {0x0000, 0x0000, 0xFEAA, 0xFEA9}, /* U+062F ARABIC LETTER DAL */ - {0x0000, 0x0000, 0xFEAC, 0xFEAB}, /* U+0630 ARABIC LETTER THAL */ - {0x0000, 0x0000, 0xFEAE, 0xFEAD}, /* U+0631 ARABIC LETTER REH */ - {0x0000, 0x0000, 0xFEB0, 0xFEAF}, /* U+0632 ARABIC LETTER ZAIN */ - {0xFEB3, 0xFEB4, 0xFEB2, 0xFEB1}, /* U+0633 ARABIC LETTER SEEN */ - {0xFEB7, 0xFEB8, 0xFEB6, 0xFEB5}, /* U+0634 ARABIC LETTER SHEEN */ - {0xFEBB, 0xFEBC, 0xFEBA, 0xFEB9}, /* U+0635 ARABIC LETTER SAD */ - {0xFEBF, 0xFEC0, 0xFEBE, 0xFEBD}, /* U+0636 ARABIC LETTER DAD */ - {0xFEC3, 0xFEC4, 0xFEC2, 0xFEC1}, /* U+0637 ARABIC LETTER TAH */ - {0xFEC7, 0xFEC8, 0xFEC6, 0xFEC5}, /* U+0638 ARABIC LETTER ZAH */ - {0xFECB, 0xFECC, 0xFECA, 0xFEC9}, /* U+0639 ARABIC LETTER AIN */ - {0xFECF, 0xFED0, 0xFECE, 0xFECD}, /* U+063A ARABIC LETTER GHAIN */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+063B */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+063C */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+063D */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+063E */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+063F */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0640 */ - {0xFED3, 0xFED4, 0xFED2, 0xFED1}, /* U+0641 ARABIC LETTER FEH */ - {0xFED7, 0xFED8, 0xFED6, 0xFED5}, /* U+0642 ARABIC LETTER QAF */ - {0xFEDB, 0xFEDC, 0xFEDA, 0xFED9}, /* U+0643 ARABIC LETTER KAF */ - {0xFEDF, 0xFEE0, 0xFEDE, 0xFEDD}, /* U+0644 ARABIC LETTER LAM */ - {0xFEE3, 0xFEE4, 0xFEE2, 0xFEE1}, /* U+0645 ARABIC LETTER MEEM */ - {0xFEE7, 0xFEE8, 0xFEE6, 0xFEE5}, /* U+0646 ARABIC LETTER NOON */ - {0xFEEB, 0xFEEC, 0xFEEA, 0xFEE9}, /* U+0647 ARABIC LETTER HEH */ - {0x0000, 0x0000, 0xFEEE, 0xFEED}, /* U+0648 ARABIC LETTER WAW */ - {0xFBE8, 0xFBE9, 0xFEF0, 0xFEEF}, /* U+0649 ARABIC LETTER */ - {0xFEF3, 0xFEF4, 0xFEF2, 0xFEF1}, /* U+064A ARABIC LETTER YEH */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+064B */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+064C */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+064D */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+064E */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+064F */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0650 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0651 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0652 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0653 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0654 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0655 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0656 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0657 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0658 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0659 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+065A */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+065B */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+065C */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+065D */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+065E */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+065F */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0660 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0661 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0662 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0663 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0664 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0665 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0666 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0667 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0668 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0669 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+066A */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+066B */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+066C */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+066D */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+066E */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+066F */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0670 */ - {0x0000, 0x0000, 0xFB51, 0xFB50}, /* U+0671 ARABIC LETTER ALEF WASLA */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0672 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0673 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0674 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0675 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0676 */ - {0x0000, 0x0000, 0x0000, 0xFBDD}, /* U+0677 ARABIC LETTER U WITH HAMZA ABOVE ISOLATED FORM */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0678 */ - {0xFB68, 0xFB69, 0xFB67, 0xFB66}, /* U+0679 ARABIC LETTER TTEH */ - {0xFB60, 0xFB61, 0xFB5F, 0xFB5E}, /* U+067A ARABIC LETTER TTEHEH */ - {0xFB54, 0xFB55, 0xFB53, 0xFB52}, /* U+067B ARABIC LETTER BEEH */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+067C */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+067D */ - {0xFB58, 0xFB59, 0xFB57, 0xFB56}, /* U+067E ARABIC LETTER PEH */ - {0xFB64, 0xFB65, 0xFB63, 0xFB62}, /* U+067F ARABIC LETTER TEHEH */ - {0xFB5C, 0xFB5D, 0xFB5B, 0xFB5A}, /* U+0680 ARABIC LETTER BEHEH */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0681 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0682 */ - {0xFB78, 0xFB79, 0xFB77, 0xFB76}, /* U+0683 ARABIC LETTER NYEH */ - {0xFB74, 0xFB75, 0xFB73, 0xFB72}, /* U+0684 ARABIC LETTER DYEH */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0685 */ - {0xFB7C, 0xFB7D, 0xFB7B, 0xFB7A}, /* U+0686 ARABIC LETTER TCHEH */ - {0xFB80, 0xFB81, 0xFB7F, 0xFB7E}, /* U+0687 ARABIC LETTER TCHEHEH */ - {0x0000, 0x0000, 0xFB89, 0xFB88}, /* U+0688 ARABIC LETTER DDAL */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0689 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+068A */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+068B */ - {0x0000, 0x0000, 0xFB85, 0xFB84}, /* U+068C ARABIC LETTER DAHAL */ - {0x0000, 0x0000, 0xFB83, 0xFB82}, /* U+068D ARABIC LETTER DDAHAL */ - {0x0000, 0x0000, 0xFB87, 0xFB86}, /* U+068E ARABIC LETTER DUL */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+068F */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0690 */ - {0x0000, 0x0000, 0xFB8D, 0xFB8C}, /* U+0691 ARABIC LETTER RREH */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0692 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0693 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0694 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0695 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0696 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0697 */ - {0x0000, 0x0000, 0xFB8B, 0xFB8A}, /* U+0698 ARABIC LETTER JEH */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+0699 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+069A */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+069B */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+069C */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+069D */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+069E */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+069F */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06A0 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06A1 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06A2 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06A3 */ - {0xFB6C, 0xFB6D, 0xFB6B, 0xFB6A}, /* U+06A4 ARABIC LETTER VEH */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06A5 */ - {0xFB70, 0xFB71, 0xFB6F, 0xFB6E}, /* U+06A6 ARABIC LETTER PEHEH */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06A7 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06A8 */ - {0xFB90, 0xFB91, 0xFB8F, 0xFB8E}, /* U+06A9 ARABIC LETTER KEHEH */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06AA */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06AB */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06AC */ - {0xFBD5, 0xFBD6, 0xFBD4, 0xFBD3}, /* U+06AD ARABIC LETTER NG */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06AE */ - {0xFB94, 0xFB95, 0xFB93, 0xFB92}, /* U+06AF ARABIC LETTER GAF */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06B0 */ - {0xFB9C, 0xFB9D, 0xFB9B, 0xFB9A}, /* U+06B1 ARABIC LETTER NGOEH */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06B2 */ - {0xFB98, 0xFB99, 0xFB97, 0xFB96}, /* U+06B3 ARABIC LETTER GUEH */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06B4 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06B5 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06B6 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06B7 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06B8 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06B9 */ - {0x0000, 0x0000, 0xFB9F, 0xFB9E}, /* U+06BA ARABIC LETTER NOON GHUNNA */ - {0xFBA2, 0xFBA3, 0xFBA1, 0xFBA0}, /* U+06BB ARABIC LETTER RNOON */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06BC */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06BD */ - {0xFBAC, 0xFBAD, 0xFBAB, 0xFBAA}, /* U+06BE ARABIC LETTER HEH DOACHASHMEE */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06BF */ - {0x0000, 0x0000, 0xFBA5, 0xFBA4}, /* U+06C0 ARABIC LETTER HEH WITH YEH ABOVE */ - {0xFBA8, 0xFBA9, 0xFBA7, 0xFBA6}, /* U+06C1 ARABIC LETTER HEH GOAL */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06C2 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06C3 */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06C4 */ - {0x0000, 0x0000, 0xFBE1, 0xFBE0}, /* U+06C5 ARABIC LETTER KIRGHIZ OE */ - {0x0000, 0x0000, 0xFBDA, 0xFBD9}, /* U+06C6 ARABIC LETTER OE */ - {0x0000, 0x0000, 0xFBD8, 0xFBD7}, /* U+06C7 ARABIC LETTER U */ - {0x0000, 0x0000, 0xFBDC, 0xFBDB}, /* U+06C8 ARABIC LETTER YU */ - {0x0000, 0x0000, 0xFBE3, 0xFBE2}, /* U+06C9 ARABIC LETTER KIRGHIZ YU */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06CA */ - {0x0000, 0x0000, 0xFBDF, 0xFBDE}, /* U+06CB ARABIC LETTER VE */ - {0xFBFE, 0xFBFF, 0xFBFD, 0xFBFC}, /* U+06CC ARABIC LETTER FARSI YEH */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06CD */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06CE */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06CF */ - {0xFBE6, 0xFBE7, 0xFBE5, 0xFBE4}, /* U+06D0 ARABIC LETTER E */ - {0x0000, 0x0000, 0x0000, 0x0000}, /* U+06D1 */ - {0x0000, 0x0000, 0xFBAF, 0xFBAE}, /* U+06D2 ARABIC LETTER YEH BARREE */ - {0x0000, 0x0000, 0xFBB1, 0xFBB0}, /* U+06D3 ARABIC LETTER YEH BARREE WITH HAMZA ABOVE */ -}; - -#define SHAPING_TABLE_FIRST 0x0621 -#define SHAPING_TABLE_LAST 0x06D3 - - -static const struct ligature_set_t { - uint16_t first; - struct ligature_pairs_t { - uint16_t second; - uint16_t ligature; - } ligatures[4]; -} ligature_table[] = -{ - { 0xFEDF, { - { 0xFE88, 0xFEF9 }, /* ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW ISOLATED FORM */ - { 0xFE82, 0xFEF5 }, /* ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE ISOLATED FORM */ - { 0xFE8E, 0xFEFB }, /* ARABIC LIGATURE LAM WITH ALEF ISOLATED FORM */ - { 0xFE84, 0xFEF7 }, /* ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE ISOLATED FORM */ - }}, - { 0xFEE0, { - { 0xFE88, 0xFEFA }, /* ARABIC LIGATURE LAM WITH ALEF WITH HAMZA BELOW FINAL FORM */ - { 0xFE82, 0xFEF6 }, /* ARABIC LIGATURE LAM WITH ALEF WITH MADDA ABOVE FINAL FORM */ - { 0xFE8E, 0xFEFC }, /* ARABIC LIGATURE LAM WITH ALEF FINAL FORM */ - { 0xFE84, 0xFEF8 }, /* ARABIC LIGATURE LAM WITH ALEF WITH HAMZA ABOVE FINAL FORM */ - }}, -}; - - -#endif /* HB_OT_SHAPE_COMPLEX_ARABIC_TABLE_HH */ - -/* == End of generated table == */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-arabic.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-arabic.cc deleted file mode 100644 index 2f069d05f61..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-arabic.cc +++ /dev/null @@ -1,357 +0,0 @@ -/* - * Copyright © 2010,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-ot-shape-complex-private.hh" -#include "hb-ot-shape-private.hh" - - -/* buffer var allocations */ -#define arabic_shaping_action() complex_var_u8_0() /* arabic shaping action */ - - -/* - * Bits used in the joining tables - */ -enum { - JOINING_TYPE_U = 0, - JOINING_TYPE_L = 1, - JOINING_TYPE_R = 2, - JOINING_TYPE_D = 3, - JOINING_TYPE_C = JOINING_TYPE_D, - JOINING_GROUP_ALAPH = 4, - JOINING_GROUP_DALATH_RISH = 5, - NUM_STATE_MACHINE_COLS = 6, - - JOINING_TYPE_T = 7, - JOINING_TYPE_X = 8 /* means: use general-category to choose between U or T. */ -}; - -/* - * Joining types: - */ - -#include "hb-ot-shape-complex-arabic-table.hh" - -static unsigned int get_joining_type (hb_codepoint_t u, hb_unicode_general_category_t gen_cat) -{ - if (likely (hb_in_range<hb_codepoint_t> (u, JOINING_TABLE_FIRST, JOINING_TABLE_LAST))) { - unsigned int j_type = joining_table[u - JOINING_TABLE_FIRST]; - if (likely (j_type != JOINING_TYPE_X)) - return j_type; - } - - /* Mongolian joining data is not in ArabicJoining.txt yet. */ - if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x1800, 0x18AF))) - { - if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x1880, 0x1886))) - return JOINING_TYPE_U; - - /* All letters, SIBE SYLLABLE BOUNDARY MARKER, and NIRUGU are D */ - if ((FLAG(gen_cat) & (FLAG (HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER) | - FLAG (HB_UNICODE_GENERAL_CATEGORY_MODIFIER_LETTER))) - || u == 0x1807 || u == 0x180A) - return JOINING_TYPE_D; - } - - /* 'Phags-pa joining data is not in ArabicJoining.txt yet. */ - if (unlikely (hb_in_range<hb_codepoint_t> (u, 0xA840, 0xA872))) - { - if (unlikely (u == 0xA872)) - return JOINING_TYPE_L; - - return JOINING_TYPE_D; - } - - if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x200C, 0x200D))) - { - return u == 0x200C ? JOINING_TYPE_U : JOINING_TYPE_C; - } - - return (FLAG(gen_cat) & (FLAG(HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK) | FLAG(HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK) | FLAG(HB_UNICODE_GENERAL_CATEGORY_FORMAT))) ? - JOINING_TYPE_T : JOINING_TYPE_U; -} - -static const hb_tag_t arabic_features[] = -{ - HB_TAG('i','n','i','t'), - HB_TAG('m','e','d','i'), - HB_TAG('f','i','n','a'), - HB_TAG('i','s','o','l'), - /* Syriac */ - HB_TAG('m','e','d','2'), - HB_TAG('f','i','n','2'), - HB_TAG('f','i','n','3'), - HB_TAG_NONE -}; - - -/* Same order as the feature array */ -enum { - INIT, - MEDI, - FINA, - ISOL, - - /* Syriac */ - MED2, - FIN2, - FIN3, - - NONE, - - ARABIC_NUM_FEATURES = NONE -}; - -static const struct arabic_state_table_entry { - uint8_t prev_action; - uint8_t curr_action; - uint16_t next_state; -} arabic_state_table[][NUM_STATE_MACHINE_COLS] = -{ - /* jt_U, jt_L, jt_R, jt_D, jg_ALAPH, jg_DALATH_RISH */ - - /* State 0: prev was U, not willing to join. */ - { {NONE,NONE,0}, {NONE,ISOL,2}, {NONE,ISOL,1}, {NONE,ISOL,2}, {NONE,ISOL,1}, {NONE,ISOL,6}, }, - - /* State 1: prev was R or ISOL/ALAPH, not willing to join. */ - { {NONE,NONE,0}, {NONE,ISOL,2}, {NONE,ISOL,1}, {NONE,ISOL,2}, {NONE,FIN2,5}, {NONE,ISOL,6}, }, - - /* State 2: prev was D/L in ISOL form, willing to join. */ - { {NONE,NONE,0}, {NONE,ISOL,2}, {INIT,FINA,1}, {INIT,FINA,3}, {INIT,FINA,4}, {INIT,FINA,6}, }, - - /* State 3: prev was D in FINA form, willing to join. */ - { {NONE,NONE,0}, {NONE,ISOL,2}, {MEDI,FINA,1}, {MEDI,FINA,3}, {MEDI,FINA,4}, {MEDI,FINA,6}, }, - - /* State 4: prev was FINA ALAPH, not willing to join. */ - { {NONE,NONE,0}, {NONE,ISOL,2}, {MED2,ISOL,1}, {MED2,ISOL,2}, {MED2,FIN2,5}, {MED2,ISOL,6}, }, - - /* State 5: prev was FIN2/FIN3 ALAPH, not willing to join. */ - { {NONE,NONE,0}, {NONE,ISOL,2}, {ISOL,ISOL,1}, {ISOL,ISOL,2}, {ISOL,FIN2,5}, {ISOL,ISOL,6}, }, - - /* State 6: prev was DALATH/RISH, not willing to join. */ - { {NONE,NONE,0}, {NONE,ISOL,2}, {NONE,ISOL,1}, {NONE,ISOL,2}, {NONE,FIN3,5}, {NONE,ISOL,6}, } -}; - - -static void -arabic_fallback_shape (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer); - -static void -collect_features_arabic (hb_ot_shape_planner_t *plan) -{ - hb_ot_map_builder_t *map = &plan->map; - - /* For Language forms (in ArabicOT speak), we do the iso/fina/medi/init together, - * then rlig and calt each in their own stage. This makes IranNastaliq's ALLAH - * ligature work correctly. It's unfortunate though... - * - * This also makes Arial Bold in Windows7 work. See: - * https://bugzilla.mozilla.org/show_bug.cgi?id=644184 - * - * TODO: Add test cases for these two. - */ - - map->add_global_bool_feature (HB_TAG('c','c','m','p')); - map->add_global_bool_feature (HB_TAG('l','o','c','l')); - - map->add_gsub_pause (NULL); - - for (unsigned int i = 0; i < ARABIC_NUM_FEATURES; i++) - map->add_feature (arabic_features[i], 1, i < 4 ? F_HAS_FALLBACK : F_NONE); /* The first four features have fallback. */ - - map->add_gsub_pause (NULL); - - map->add_feature (HB_TAG('r','l','i','g'), 1, F_GLOBAL|F_HAS_FALLBACK); - map->add_gsub_pause (arabic_fallback_shape); - - map->add_global_bool_feature (HB_TAG('c','a','l','t')); - map->add_gsub_pause (NULL); - - map->add_global_bool_feature (HB_TAG('c','s','w','h')); - map->add_global_bool_feature (HB_TAG('d','l','i','g')); - map->add_global_bool_feature (HB_TAG('m','s','e','t')); -} - -#include "hb-ot-shape-complex-arabic-fallback.hh" - -struct arabic_shape_plan_t -{ - ASSERT_POD (); - - /* The "+ 1" in the next array is to accommodate for the "NONE" command, - * which is not an OpenType feature, but this simplifies the code by not - * having to do a "if (... < NONE) ..." and just rely on the fact that - * mask_array[NONE] == 0. */ - hb_mask_t mask_array[ARABIC_NUM_FEATURES + 1]; - - bool do_fallback; - arabic_fallback_plan_t *fallback_plan; -}; - -static void * -data_create_arabic (const hb_ot_shape_plan_t *plan) -{ - arabic_shape_plan_t *arabic_plan = (arabic_shape_plan_t *) calloc (1, sizeof (arabic_shape_plan_t)); - if (unlikely (!arabic_plan)) - return NULL; - - arabic_plan->do_fallback = plan->props.script == HB_SCRIPT_ARABIC; - for (unsigned int i = 0; i < ARABIC_NUM_FEATURES; i++) { - arabic_plan->mask_array[i] = plan->map.get_1_mask (arabic_features[i]); - if (i < 4) - arabic_plan->do_fallback = arabic_plan->do_fallback && plan->map.needs_fallback (arabic_features[i]); - } - - return arabic_plan; -} - -static void -data_destroy_arabic (void *data) -{ - arabic_shape_plan_t *arabic_plan = (arabic_shape_plan_t *) data; - - arabic_fallback_plan_destroy (arabic_plan->fallback_plan); - - free (data); -} - -static void -arabic_joining (hb_buffer_t *buffer) -{ - unsigned int count = buffer->len; - unsigned int prev = (unsigned int) -1, state = 0; - - HB_BUFFER_ALLOCATE_VAR (buffer, arabic_shaping_action); - - /* Check pre-context */ - if (!(buffer->flags & HB_BUFFER_FLAG_BOT)) - for (unsigned int i = 0; i < buffer->context_len[0]; i++) - { - unsigned int this_type = get_joining_type (buffer->context[0][i], buffer->unicode->general_category (buffer->context[0][i])); - - if (unlikely (this_type == JOINING_TYPE_T)) - continue; - - const arabic_state_table_entry *entry = &arabic_state_table[state][this_type]; - state = entry->next_state; - break; - } - - for (unsigned int i = 0; i < count; i++) - { - unsigned int this_type = get_joining_type (buffer->info[i].codepoint, _hb_glyph_info_get_general_category (&buffer->info[i])); - - if (unlikely (this_type == JOINING_TYPE_T)) { - buffer->info[i].arabic_shaping_action() = NONE; - continue; - } - - const arabic_state_table_entry *entry = &arabic_state_table[state][this_type]; - - if (entry->prev_action != NONE && prev != (unsigned int) -1) - buffer->info[prev].arabic_shaping_action() = entry->prev_action; - - buffer->info[i].arabic_shaping_action() = entry->curr_action; - - prev = i; - state = entry->next_state; - } - - if (!(buffer->flags & HB_BUFFER_FLAG_EOT)) - for (unsigned int i = 0; i < buffer->context_len[1]; i++) - { - unsigned int this_type = get_joining_type (buffer->context[1][i], buffer->unicode->general_category (buffer->context[1][i])); - - if (unlikely (this_type == JOINING_TYPE_T)) - continue; - - const arabic_state_table_entry *entry = &arabic_state_table[state][this_type]; - if (entry->prev_action != NONE && prev != (unsigned int) -1) - buffer->info[prev].arabic_shaping_action() = entry->prev_action; - break; - } - - - HB_BUFFER_DEALLOCATE_VAR (buffer, arabic_shaping_action); -} - -static void -setup_masks_arabic (const hb_ot_shape_plan_t *plan, - hb_buffer_t *buffer, - hb_font_t *font HB_UNUSED) -{ - const arabic_shape_plan_t *arabic_plan = (const arabic_shape_plan_t *) plan->data; - - arabic_joining (buffer); - unsigned int count = buffer->len; - for (unsigned int i = 0; i < count; i++) - buffer->info[i].mask |= arabic_plan->mask_array[buffer->info[i].arabic_shaping_action()]; -} - - -static void -arabic_fallback_shape (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer) -{ - const arabic_shape_plan_t *arabic_plan = (const arabic_shape_plan_t *) plan->data; - - if (!arabic_plan->do_fallback) - return; - -retry: - arabic_fallback_plan_t *fallback_plan = (arabic_fallback_plan_t *) hb_atomic_ptr_get (&arabic_plan->fallback_plan); - if (unlikely (!fallback_plan)) - { - /* This sucks. We need a font to build the fallback plan... */ - fallback_plan = arabic_fallback_plan_create (plan, font); - if (unlikely (!hb_atomic_ptr_cmpexch (&(const_cast<arabic_shape_plan_t *> (arabic_plan))->fallback_plan, NULL, fallback_plan))) { - arabic_fallback_plan_destroy (fallback_plan); - goto retry; - } - } - - arabic_fallback_plan_shape (fallback_plan, font, buffer); -} - - -const hb_ot_complex_shaper_t _hb_ot_complex_shaper_arabic = -{ - "arabic", - collect_features_arabic, - NULL, /* override_features */ - data_create_arabic, - data_destroy_arabic, - NULL, /* preprocess_text_arabic */ - NULL, /* normalization_preference */ - NULL, /* decompose */ - NULL, /* compose */ - setup_masks_arabic, - HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF, - true, /* fallback_position */ -}; diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-default.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-default.cc deleted file mode 100644 index ca092b5e9bc..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-default.cc +++ /dev/null @@ -1,220 +0,0 @@ -/* - * Copyright © 2010,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-ot-shape-complex-private.hh" - - -/* TODO Add kana, and other small shapers here */ - - -/* The default shaper *only* adds additional per-script features.*/ - -static const hb_tag_t hangul_features[] = -{ - HB_TAG('l','j','m','o'), - HB_TAG('v','j','m','o'), - HB_TAG('t','j','m','o'), - HB_TAG_NONE -}; - -static const hb_tag_t tibetan_features[] = -{ - HB_TAG('a','b','v','s'), - HB_TAG('b','l','w','s'), - HB_TAG('a','b','v','m'), - HB_TAG('b','l','w','m'), - HB_TAG_NONE -}; - -static void -collect_features_default (hb_ot_shape_planner_t *plan) -{ - const hb_tag_t *script_features = NULL; - - switch ((hb_tag_t) plan->props.script) - { - /* Unicode-1.1 additions */ - case HB_SCRIPT_HANGUL: - script_features = hangul_features; - break; - - /* Unicode-2.0 additions */ - case HB_SCRIPT_TIBETAN: - script_features = tibetan_features; - break; - } - - for (; script_features && *script_features; script_features++) - plan->map.add_global_bool_feature (*script_features); -} - -static hb_ot_shape_normalization_mode_t -normalization_preference_default (const hb_segment_properties_t *props) -{ - return HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS; -} - -static bool -compose_default (const hb_ot_shape_normalize_context_t *c, - hb_codepoint_t a, - hb_codepoint_t b, - hb_codepoint_t *ab) -{ - /* Hebrew presentation-form shaping. - * https://bugzilla.mozilla.org/show_bug.cgi?id=728866 - * Hebrew presentation forms with dagesh, for characters 0x05D0..0x05EA; - * Note that some letters do not have a dagesh presForm encoded. - */ - static const hb_codepoint_t sDageshForms[0x05EA - 0x05D0 + 1] = { - 0xFB30, /* ALEF */ - 0xFB31, /* BET */ - 0xFB32, /* GIMEL */ - 0xFB33, /* DALET */ - 0xFB34, /* HE */ - 0xFB35, /* VAV */ - 0xFB36, /* ZAYIN */ - 0x0000, /* HET */ - 0xFB38, /* TET */ - 0xFB39, /* YOD */ - 0xFB3A, /* FINAL KAF */ - 0xFB3B, /* KAF */ - 0xFB3C, /* LAMED */ - 0x0000, /* FINAL MEM */ - 0xFB3E, /* MEM */ - 0x0000, /* FINAL NUN */ - 0xFB40, /* NUN */ - 0xFB41, /* SAMEKH */ - 0x0000, /* AYIN */ - 0xFB43, /* FINAL PE */ - 0xFB44, /* PE */ - 0x0000, /* FINAL TSADI */ - 0xFB46, /* TSADI */ - 0xFB47, /* QOF */ - 0xFB48, /* RESH */ - 0xFB49, /* SHIN */ - 0xFB4A /* TAV */ - }; - - bool found = c->unicode->compose (a, b, ab); - - if (!found && (b & ~0x7F) == 0x0580) { - /* Special-case Hebrew presentation forms that are excluded from - * standard normalization, but wanted for old fonts. */ - switch (b) { - case 0x05B4: /* HIRIQ */ - if (a == 0x05D9) { /* YOD */ - *ab = 0xFB1D; - found = true; - } - break; - case 0x05B7: /* patah */ - if (a == 0x05F2) { /* YIDDISH YOD YOD */ - *ab = 0xFB1F; - found = true; - } else if (a == 0x05D0) { /* ALEF */ - *ab = 0xFB2E; - found = true; - } - break; - case 0x05B8: /* QAMATS */ - if (a == 0x05D0) { /* ALEF */ - *ab = 0xFB2F; - found = true; - } - break; - case 0x05B9: /* HOLAM */ - if (a == 0x05D5) { /* VAV */ - *ab = 0xFB4B; - found = true; - } - break; - case 0x05BC: /* DAGESH */ - if (a >= 0x05D0 && a <= 0x05EA) { - *ab = sDageshForms[a - 0x05D0]; - found = (*ab != 0); - } else if (a == 0xFB2A) { /* SHIN WITH SHIN DOT */ - *ab = 0xFB2C; - found = true; - } else if (a == 0xFB2B) { /* SHIN WITH SIN DOT */ - *ab = 0xFB2D; - found = true; - } - break; - case 0x05BF: /* RAFE */ - switch (a) { - case 0x05D1: /* BET */ - *ab = 0xFB4C; - found = true; - break; - case 0x05DB: /* KAF */ - *ab = 0xFB4D; - found = true; - break; - case 0x05E4: /* PE */ - *ab = 0xFB4E; - found = true; - break; - } - break; - case 0x05C1: /* SHIN DOT */ - if (a == 0x05E9) { /* SHIN */ - *ab = 0xFB2A; - found = true; - } else if (a == 0xFB49) { /* SHIN WITH DAGESH */ - *ab = 0xFB2C; - found = true; - } - break; - case 0x05C2: /* SIN DOT */ - if (a == 0x05E9) { /* SHIN */ - *ab = 0xFB2B; - found = true; - } else if (a == 0xFB49) { /* SHIN WITH DAGESH */ - *ab = 0xFB2D; - found = true; - } - break; - } - } - - return found; -} - -const hb_ot_complex_shaper_t _hb_ot_complex_shaper_default = -{ - "default", - collect_features_default, - NULL, /* override_features */ - NULL, /* data_create */ - NULL, /* data_destroy */ - NULL, /* preprocess_text */ - normalization_preference_default, - NULL, /* decompose */ - compose_default, - NULL, /* setup_masks */ - HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE, - true, /* fallback_position */ -}; diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-indic-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-indic-machine.hh deleted file mode 100644 index 9bae3a3b8c3..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-indic-machine.hh +++ /dev/null @@ -1,1443 +0,0 @@ - -#line 1 "../../src/hb-ot-shape-complex-indic-machine.rl" -/* - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_SHAPE_COMPLEX_INDIC_MACHINE_HH -#define HB_OT_SHAPE_COMPLEX_INDIC_MACHINE_HH - -#include "hb-private.hh" - - -#line 36 "hb-ot-shape-complex-indic-machine.hh.tmp" -static const unsigned char _indic_syllable_machine_trans_keys[] = { - 1u, 16u, 13u, 13u, 5u, 7u, 5u, 7u, 7u, 7u, 5u, 7u, 5u, 7u, 7u, 7u, - 5u, 7u, 5u, 7u, 7u, 7u, 5u, 7u, 5u, 7u, 7u, 7u, 4u, 4u, 6u, 6u, - 16u, 16u, 4u, 7u, 6u, 6u, 16u, 16u, 4u, 7u, 6u, 6u, 16u, 16u, 4u, 7u, - 6u, 6u, 16u, 16u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, - 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 1u, 16u, 13u, 13u, 5u, 7u, 5u, 7u, - 7u, 7u, 5u, 7u, 5u, 7u, 7u, 7u, 5u, 7u, 5u, 7u, 7u, 7u, 5u, 7u, - 5u, 7u, 7u, 7u, 4u, 4u, 6u, 6u, 16u, 16u, 4u, 7u, 6u, 6u, 16u, 16u, - 4u, 7u, 6u, 6u, 16u, 16u, 4u, 7u, 6u, 6u, 16u, 16u, 4u, 14u, 4u, 14u, - 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, - 1u, 16u, 13u, 13u, 5u, 7u, 5u, 7u, 7u, 7u, 5u, 7u, 5u, 7u, 7u, 7u, - 5u, 7u, 5u, 7u, 7u, 7u, 5u, 7u, 5u, 7u, 7u, 7u, 4u, 4u, 6u, 6u, - 16u, 16u, 4u, 7u, 6u, 6u, 16u, 16u, 4u, 7u, 6u, 6u, 16u, 16u, 4u, 7u, - 6u, 6u, 16u, 16u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, - 4u, 14u, 4u, 14u, 4u, 14u, 1u, 16u, 13u, 13u, 5u, 7u, 5u, 7u, 7u, 7u, - 5u, 7u, 5u, 7u, 7u, 7u, 5u, 7u, 5u, 7u, 7u, 7u, 5u, 7u, 5u, 7u, - 7u, 7u, 4u, 4u, 6u, 6u, 16u, 16u, 4u, 7u, 6u, 6u, 16u, 16u, 4u, 7u, - 6u, 6u, 16u, 16u, 4u, 7u, 6u, 6u, 16u, 16u, 4u, 14u, 4u, 14u, 4u, 14u, - 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, 4u, 14u, - 4u, 14u, 5u, 7u, 5u, 7u, 5u, 7u, 5u, 7u, 7u, 7u, 5u, 7u, 5u, 7u, - 7u, 7u, 5u, 7u, 5u, 7u, 7u, 7u, 1u, 16u, 13u, 13u, 4u, 4u, 6u, 6u, - 16u, 16u, 4u, 7u, 6u, 6u, 16u, 16u, 4u, 7u, 6u, 6u, 16u, 16u, 4u, 7u, - 6u, 6u, 16u, 16u, 1u, 16u, 3u, 17u, 3u, 14u, 4u, 14u, 1u, 16u, 3u, 17u, - 3u, 14u, 4u, 14u, 1u, 16u, 3u, 17u, 3u, 14u, 4u, 14u, 1u, 16u, 3u, 17u, - 3u, 14u, 4u, 14u, 1u, 16u, 3u, 17u, 3u, 14u, 4u, 14u, 5u, 14u, 8u, 14u, - 5u, 9u, 9u, 9u, 9u, 9u, 3u, 17u, 3u, 9u, 8u, 9u, 3u, 9u, 3u, 13u, - 3u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, - 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 6u, 14u, 3u, 14u, 4u, 14u, 1u, 16u, - 3u, 14u, 3u, 14u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 14u, - 3u, 14u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 14u, 3u, 14u, - 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 14u, 3u, 14u, 1u, 16u, - 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 14u, 3u, 14u, 3u, 14u, 3u, 14u, - 4u, 14u, 1u, 16u, 3u, 17u, 3u, 14u, 4u, 14u, 1u, 16u, 3u, 17u, 3u, 14u, - 4u, 14u, 1u, 16u, 3u, 17u, 3u, 14u, 4u, 14u, 1u, 16u, 3u, 17u, 3u, 14u, - 4u, 14u, 5u, 14u, 8u, 14u, 5u, 9u, 9u, 9u, 9u, 9u, 3u, 17u, 3u, 9u, - 8u, 9u, 3u, 9u, 3u, 13u, 3u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, - 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 6u, 14u, - 3u, 14u, 1u, 16u, 3u, 14u, 3u, 14u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, - 1u, 16u, 3u, 14u, 3u, 14u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, - 3u, 14u, 3u, 14u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 14u, - 3u, 14u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 4u, 14u, 1u, 16u, 3u, 14u, - 3u, 14u, 4u, 14u, 1u, 16u, 3u, 17u, 3u, 14u, 4u, 14u, 1u, 16u, 3u, 17u, - 3u, 14u, 4u, 14u, 1u, 16u, 3u, 17u, 3u, 14u, 4u, 14u, 1u, 16u, 3u, 17u, - 3u, 14u, 4u, 14u, 5u, 14u, 8u, 14u, 5u, 9u, 9u, 9u, 9u, 9u, 3u, 17u, - 3u, 9u, 8u, 9u, 3u, 9u, 3u, 13u, 3u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, - 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, - 6u, 14u, 3u, 14u, 1u, 16u, 3u, 14u, 3u, 14u, 1u, 16u, 1u, 16u, 1u, 16u, - 1u, 16u, 1u, 16u, 3u, 14u, 3u, 14u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, - 1u, 16u, 3u, 14u, 3u, 14u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, - 3u, 14u, 3u, 14u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 4u, 14u, - 3u, 14u, 4u, 14u, 3u, 14u, 3u, 14u, 4u, 14u, 1u, 16u, 3u, 17u, 3u, 14u, - 4u, 14u, 1u, 16u, 3u, 17u, 3u, 14u, 4u, 14u, 1u, 16u, 3u, 17u, 3u, 14u, - 4u, 14u, 1u, 16u, 3u, 17u, 3u, 14u, 4u, 14u, 5u, 14u, 8u, 14u, 5u, 9u, - 9u, 9u, 9u, 9u, 3u, 17u, 3u, 9u, 8u, 9u, 3u, 9u, 3u, 13u, 3u, 14u, - 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, - 5u, 14u, 3u, 14u, 4u, 14u, 6u, 14u, 3u, 14u, 1u, 16u, 3u, 14u, 3u, 14u, - 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 14u, 3u, 14u, 1u, 16u, - 1u, 16u, 1u, 16u, 1u, 16u, 1u, 16u, 3u, 14u, 3u, 14u, 1u, 16u, 1u, 16u, - 1u, 16u, 1u, 16u, 1u, 16u, 3u, 14u, 3u, 14u, 1u, 16u, 1u, 16u, 1u, 16u, - 1u, 16u, 1u, 16u, 3u, 14u, 1u, 16u, 3u, 17u, 1u, 16u, 4u, 14u, 1u, 16u, - 3u, 17u, 3u, 14u, 4u, 14u, 5u, 9u, 9u, 9u, 9u, 9u, 3u, 14u, 3u, 14u, - 1u, 16u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 5u, 14u, 3u, 14u, - 4u, 14u, 5u, 14u, 3u, 14u, 4u, 14u, 8u, 14u, 3u, 17u, 3u, 9u, 8u, 9u, - 3u, 9u, 3u, 13u, 1u, 16u, 0 -}; - -static const char _indic_syllable_machine_key_spans[] = { - 16, 1, 3, 3, 1, 3, 3, 1, - 3, 3, 1, 3, 3, 1, 1, 1, - 1, 4, 1, 1, 4, 1, 1, 4, - 1, 1, 11, 11, 11, 11, 11, 11, - 11, 11, 11, 11, 16, 1, 3, 3, - 1, 3, 3, 1, 3, 3, 1, 3, - 3, 1, 1, 1, 1, 4, 1, 1, - 4, 1, 1, 4, 1, 1, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 11, - 16, 1, 3, 3, 1, 3, 3, 1, - 3, 3, 1, 3, 3, 1, 1, 1, - 1, 4, 1, 1, 4, 1, 1, 4, - 1, 1, 11, 11, 11, 11, 11, 11, - 11, 11, 11, 16, 1, 3, 3, 1, - 3, 3, 1, 3, 3, 1, 3, 3, - 1, 1, 1, 1, 4, 1, 1, 4, - 1, 1, 4, 1, 1, 11, 11, 11, - 11, 11, 11, 11, 11, 11, 11, 11, - 11, 3, 3, 3, 3, 1, 3, 3, - 1, 3, 3, 1, 16, 1, 1, 1, - 1, 4, 1, 1, 4, 1, 1, 4, - 1, 1, 16, 15, 12, 11, 16, 15, - 12, 11, 16, 15, 12, 11, 16, 15, - 12, 11, 16, 15, 12, 11, 10, 7, - 5, 1, 1, 15, 7, 2, 7, 11, - 12, 12, 11, 10, 12, 11, 10, 12, - 11, 10, 12, 11, 9, 12, 11, 16, - 12, 12, 16, 16, 16, 16, 16, 12, - 12, 16, 16, 16, 16, 16, 12, 12, - 16, 16, 16, 16, 16, 12, 12, 16, - 16, 16, 16, 16, 12, 12, 12, 12, - 11, 16, 15, 12, 11, 16, 15, 12, - 11, 16, 15, 12, 11, 16, 15, 12, - 11, 10, 7, 5, 1, 1, 15, 7, - 2, 7, 11, 12, 12, 11, 10, 12, - 11, 10, 12, 11, 10, 12, 11, 9, - 12, 16, 12, 12, 16, 16, 16, 16, - 16, 12, 12, 16, 16, 16, 16, 16, - 12, 12, 16, 16, 16, 16, 16, 12, - 12, 16, 16, 16, 16, 11, 16, 12, - 12, 11, 16, 15, 12, 11, 16, 15, - 12, 11, 16, 15, 12, 11, 16, 15, - 12, 11, 10, 7, 5, 1, 1, 15, - 7, 2, 7, 11, 12, 12, 11, 10, - 12, 11, 10, 12, 11, 10, 12, 11, - 9, 12, 16, 12, 12, 16, 16, 16, - 16, 16, 12, 12, 16, 16, 16, 16, - 16, 12, 12, 16, 16, 16, 16, 16, - 12, 12, 16, 16, 16, 16, 16, 11, - 12, 11, 12, 12, 11, 16, 15, 12, - 11, 16, 15, 12, 11, 16, 15, 12, - 11, 16, 15, 12, 11, 10, 7, 5, - 1, 1, 15, 7, 2, 7, 11, 12, - 12, 11, 10, 12, 11, 10, 12, 11, - 10, 12, 11, 9, 12, 16, 12, 12, - 16, 16, 16, 16, 16, 12, 12, 16, - 16, 16, 16, 16, 12, 12, 16, 16, - 16, 16, 16, 12, 12, 16, 16, 16, - 16, 16, 12, 16, 15, 16, 11, 16, - 15, 12, 11, 5, 1, 1, 12, 12, - 16, 12, 11, 10, 12, 11, 10, 12, - 11, 10, 12, 11, 7, 15, 7, 2, - 7, 11, 16 -}; - -static const short _indic_syllable_machine_index_offsets[] = { - 0, 17, 19, 23, 27, 29, 33, 37, - 39, 43, 47, 49, 53, 57, 59, 61, - 63, 65, 70, 72, 74, 79, 81, 83, - 88, 90, 92, 104, 116, 128, 140, 152, - 164, 176, 188, 200, 212, 229, 231, 235, - 239, 241, 245, 249, 251, 255, 259, 261, - 265, 269, 271, 273, 275, 277, 282, 284, - 286, 291, 293, 295, 300, 302, 304, 316, - 328, 340, 352, 364, 376, 388, 400, 412, - 424, 441, 443, 447, 451, 453, 457, 461, - 463, 467, 471, 473, 477, 481, 483, 485, - 487, 489, 494, 496, 498, 503, 505, 507, - 512, 514, 516, 528, 540, 552, 564, 576, - 588, 600, 612, 624, 641, 643, 647, 651, - 653, 657, 661, 663, 667, 671, 673, 677, - 681, 683, 685, 687, 689, 694, 696, 698, - 703, 705, 707, 712, 714, 716, 728, 740, - 752, 764, 776, 788, 800, 812, 824, 836, - 848, 860, 864, 868, 872, 876, 878, 882, - 886, 888, 892, 896, 898, 915, 917, 919, - 921, 923, 928, 930, 932, 937, 939, 941, - 946, 948, 950, 967, 983, 996, 1008, 1025, - 1041, 1054, 1066, 1083, 1099, 1112, 1124, 1141, - 1157, 1170, 1182, 1199, 1215, 1228, 1240, 1251, - 1259, 1265, 1267, 1269, 1285, 1293, 1296, 1304, - 1316, 1329, 1342, 1354, 1365, 1378, 1390, 1401, - 1414, 1426, 1437, 1450, 1462, 1472, 1485, 1497, - 1514, 1527, 1540, 1557, 1574, 1591, 1608, 1625, - 1638, 1651, 1668, 1685, 1702, 1719, 1736, 1749, - 1762, 1779, 1796, 1813, 1830, 1847, 1860, 1873, - 1890, 1907, 1924, 1941, 1958, 1971, 1984, 1997, - 2010, 2022, 2039, 2055, 2068, 2080, 2097, 2113, - 2126, 2138, 2155, 2171, 2184, 2196, 2213, 2229, - 2242, 2254, 2265, 2273, 2279, 2281, 2283, 2299, - 2307, 2310, 2318, 2330, 2343, 2356, 2368, 2379, - 2392, 2404, 2415, 2428, 2440, 2451, 2464, 2476, - 2486, 2499, 2516, 2529, 2542, 2559, 2576, 2593, - 2610, 2627, 2640, 2653, 2670, 2687, 2704, 2721, - 2738, 2751, 2764, 2781, 2798, 2815, 2832, 2849, - 2862, 2875, 2892, 2909, 2926, 2943, 2955, 2972, - 2985, 2998, 3010, 3027, 3043, 3056, 3068, 3085, - 3101, 3114, 3126, 3143, 3159, 3172, 3184, 3201, - 3217, 3230, 3242, 3253, 3261, 3267, 3269, 3271, - 3287, 3295, 3298, 3306, 3318, 3331, 3344, 3356, - 3367, 3380, 3392, 3403, 3416, 3428, 3439, 3452, - 3464, 3474, 3487, 3504, 3517, 3530, 3547, 3564, - 3581, 3598, 3615, 3628, 3641, 3658, 3675, 3692, - 3709, 3726, 3739, 3752, 3769, 3786, 3803, 3820, - 3837, 3850, 3863, 3880, 3897, 3914, 3931, 3948, - 3960, 3973, 3985, 3998, 4011, 4023, 4040, 4056, - 4069, 4081, 4098, 4114, 4127, 4139, 4156, 4172, - 4185, 4197, 4214, 4230, 4243, 4255, 4266, 4274, - 4280, 4282, 4284, 4300, 4308, 4311, 4319, 4331, - 4344, 4357, 4369, 4380, 4393, 4405, 4416, 4429, - 4441, 4452, 4465, 4477, 4487, 4500, 4517, 4530, - 4543, 4560, 4577, 4594, 4611, 4628, 4641, 4654, - 4671, 4688, 4705, 4722, 4739, 4752, 4765, 4782, - 4799, 4816, 4833, 4850, 4863, 4876, 4893, 4910, - 4927, 4944, 4961, 4974, 4991, 5007, 5024, 5036, - 5053, 5069, 5082, 5094, 5100, 5102, 5104, 5117, - 5130, 5147, 5160, 5172, 5183, 5196, 5208, 5219, - 5232, 5244, 5255, 5268, 5280, 5288, 5304, 5312, - 5315, 5323, 5335 -}; - -static const short _indic_syllable_machine_indicies[] = { - 1, 2, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 1, - 0, 3, 0, 4, 4, 5, 0, 6, - 6, 5, 0, 5, 0, 7, 7, 8, - 0, 9, 9, 8, 0, 8, 0, 10, - 10, 11, 0, 12, 12, 11, 0, 11, - 0, 13, 13, 14, 0, 15, 15, 14, - 0, 14, 0, 16, 0, 17, 0, 18, - 0, 19, 13, 13, 14, 0, 20, 0, - 21, 0, 22, 10, 10, 11, 0, 23, - 0, 24, 0, 25, 7, 7, 8, 0, - 26, 0, 27, 0, 28, 4, 4, 5, - 0, 0, 0, 0, 0, 0, 28, 0, - 28, 4, 4, 5, 0, 0, 0, 0, - 0, 29, 28, 0, 30, 4, 4, 5, - 0, 0, 0, 0, 0, 0, 30, 0, - 30, 4, 4, 5, 0, 0, 0, 0, - 0, 31, 30, 0, 32, 4, 4, 5, - 0, 0, 0, 0, 0, 0, 32, 0, - 32, 4, 4, 5, 0, 0, 0, 0, - 0, 33, 32, 0, 34, 4, 4, 5, - 0, 0, 0, 0, 0, 0, 34, 0, - 34, 4, 4, 5, 0, 0, 0, 0, - 0, 35, 34, 0, 36, 4, 4, 5, - 0, 0, 0, 0, 0, 0, 36, 0, - 36, 4, 4, 5, 0, 0, 0, 0, - 0, 37, 36, 0, 39, 40, 38, 38, - 38, 38, 38, 38, 38, 38, 38, 38, - 38, 38, 38, 39, 38, 41, 38, 42, - 42, 43, 38, 44, 44, 43, 38, 43, - 38, 45, 45, 46, 38, 47, 47, 46, - 38, 46, 38, 48, 48, 49, 38, 50, - 50, 49, 38, 49, 38, 51, 51, 52, - 38, 53, 53, 52, 38, 52, 38, 54, - 38, 55, 38, 56, 38, 57, 51, 51, - 52, 38, 58, 38, 59, 38, 60, 48, - 48, 49, 38, 61, 38, 62, 38, 63, - 45, 45, 46, 38, 64, 38, 65, 38, - 66, 42, 42, 43, 38, 38, 38, 38, - 38, 38, 66, 38, 66, 42, 42, 43, - 38, 38, 38, 38, 38, 67, 66, 38, - 68, 42, 42, 43, 38, 38, 38, 38, - 38, 38, 68, 38, 68, 42, 42, 43, - 38, 38, 38, 38, 38, 69, 68, 38, - 70, 42, 42, 43, 38, 38, 38, 38, - 38, 38, 70, 38, 70, 42, 42, 43, - 38, 38, 38, 38, 38, 71, 70, 38, - 72, 42, 42, 43, 38, 38, 38, 38, - 38, 38, 72, 38, 72, 42, 42, 43, - 38, 38, 38, 38, 38, 73, 72, 38, - 74, 42, 42, 43, 38, 38, 38, 38, - 38, 38, 74, 38, 74, 42, 42, 43, - 38, 38, 38, 38, 38, 75, 74, 38, - 77, 78, 76, 76, 76, 76, 76, 76, - 76, 76, 76, 76, 76, 76, 76, 77, - 76, 79, 76, 80, 80, 81, 76, 83, - 83, 81, 82, 81, 82, 84, 84, 85, - 76, 86, 86, 85, 76, 85, 76, 87, - 87, 88, 76, 89, 89, 88, 76, 88, - 76, 90, 90, 91, 76, 92, 92, 91, - 76, 91, 76, 93, 76, 94, 76, 95, - 76, 96, 90, 90, 91, 76, 97, 76, - 98, 76, 99, 87, 87, 88, 76, 100, - 76, 101, 76, 102, 84, 84, 85, 76, - 103, 76, 104, 76, 105, 80, 80, 81, - 76, 76, 76, 76, 76, 76, 105, 76, - 105, 80, 80, 81, 76, 76, 76, 76, - 76, 106, 105, 76, 107, 80, 80, 81, - 76, 76, 76, 76, 76, 76, 107, 76, - 107, 80, 80, 81, 76, 76, 76, 76, - 76, 108, 107, 76, 109, 80, 80, 81, - 76, 76, 76, 76, 76, 76, 109, 76, - 109, 80, 80, 81, 76, 76, 76, 76, - 76, 110, 109, 76, 111, 80, 80, 81, - 82, 82, 82, 82, 82, 82, 111, 82, - 111, 80, 80, 81, 76, 76, 76, 76, - 76, 112, 111, 76, 113, 80, 80, 81, - 76, 76, 76, 76, 76, 76, 113, 76, - 115, 116, 114, 114, 114, 114, 114, 114, - 114, 114, 114, 114, 114, 114, 114, 115, - 114, 117, 114, 118, 118, 119, 114, 120, - 120, 119, 114, 119, 114, 121, 121, 122, - 114, 123, 123, 122, 114, 122, 114, 124, - 124, 125, 114, 126, 126, 125, 114, 125, - 114, 127, 127, 128, 114, 129, 129, 128, - 114, 128, 114, 130, 114, 131, 114, 132, - 114, 133, 127, 127, 128, 114, 134, 114, - 135, 114, 136, 124, 124, 125, 114, 137, - 114, 138, 114, 139, 121, 121, 122, 114, - 140, 114, 141, 114, 142, 118, 118, 119, - 114, 114, 114, 114, 114, 114, 142, 114, - 142, 118, 118, 119, 114, 114, 114, 114, - 114, 143, 142, 114, 144, 118, 118, 119, - 114, 114, 114, 114, 114, 114, 144, 114, - 144, 118, 118, 119, 114, 114, 114, 114, - 114, 145, 144, 114, 146, 118, 118, 119, - 114, 114, 114, 114, 114, 114, 146, 114, - 146, 118, 118, 119, 114, 114, 114, 114, - 114, 147, 146, 114, 148, 118, 118, 119, - 114, 114, 114, 114, 114, 114, 148, 114, - 148, 118, 118, 119, 114, 114, 114, 114, - 114, 149, 148, 114, 150, 118, 118, 119, - 114, 114, 114, 114, 114, 114, 150, 114, - 150, 118, 118, 119, 114, 114, 114, 114, - 114, 151, 150, 114, 113, 80, 80, 81, - 76, 76, 76, 76, 76, 152, 113, 76, - 111, 80, 80, 81, 0, 0, 0, 0, - 0, 153, 111, 0, 154, 154, 155, 0, - 6, 6, 155, 0, 156, 156, 157, 0, - 158, 158, 157, 0, 157, 0, 159, 159, - 160, 0, 161, 161, 160, 0, 160, 0, - 162, 162, 163, 0, 164, 164, 163, 0, - 163, 0, 165, 166, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 165, 0, 167, 0, 168, 0, 169, - 0, 170, 0, 171, 162, 162, 163, 0, - 172, 0, 173, 0, 174, 159, 159, 160, - 0, 175, 0, 176, 0, 177, 156, 156, - 157, 0, 178, 0, 179, 0, 181, 182, - 183, 184, 185, 186, 81, 187, 188, 180, - 189, 189, 152, 190, 191, 192, 180, 194, - 195, 196, 197, 5, 198, 199, 200, 193, - 193, 37, 201, 193, 193, 181, 193, 202, - 195, 203, 203, 5, 198, 199, 200, 193, - 193, 193, 201, 193, 195, 203, 203, 5, - 198, 199, 200, 193, 193, 193, 201, 193, - 204, 193, 193, 193, 18, 205, 193, 198, - 199, 193, 193, 193, 193, 206, 193, 204, - 193, 207, 208, 209, 210, 5, 198, 199, - 200, 193, 193, 35, 211, 193, 193, 204, - 193, 212, 208, 213, 213, 5, 198, 199, - 200, 193, 193, 193, 211, 193, 208, 213, - 213, 5, 198, 199, 200, 193, 193, 193, - 211, 193, 214, 193, 193, 193, 18, 215, - 193, 198, 199, 193, 193, 193, 193, 206, - 193, 214, 193, 216, 217, 218, 219, 5, - 198, 199, 200, 193, 193, 33, 220, 193, - 193, 214, 193, 221, 217, 222, 222, 5, - 198, 199, 200, 193, 193, 193, 220, 193, - 217, 222, 222, 5, 198, 199, 200, 193, - 193, 193, 220, 193, 223, 193, 193, 193, - 18, 224, 193, 198, 199, 193, 193, 193, - 193, 206, 193, 223, 193, 225, 226, 227, - 228, 5, 198, 199, 200, 193, 193, 31, - 229, 193, 193, 223, 193, 230, 226, 231, - 231, 5, 198, 199, 200, 193, 193, 193, - 229, 193, 226, 231, 231, 5, 198, 199, - 200, 193, 193, 193, 229, 193, 232, 193, - 193, 193, 18, 233, 193, 198, 199, 193, - 193, 193, 193, 206, 193, 232, 193, 234, - 235, 236, 237, 5, 198, 199, 200, 193, - 193, 29, 238, 193, 193, 232, 193, 239, - 235, 240, 240, 5, 198, 199, 200, 193, - 193, 193, 238, 193, 235, 240, 240, 5, - 198, 199, 200, 193, 193, 193, 238, 193, - 18, 241, 193, 198, 199, 193, 193, 193, - 193, 206, 193, 198, 199, 193, 193, 193, - 193, 206, 193, 242, 193, 193, 193, 199, - 193, 199, 193, 243, 193, 244, 193, 245, - 246, 193, 198, 199, 193, 193, 193, 3, - 193, 193, 193, 1, 193, 2, 193, 193, - 193, 193, 198, 199, 193, 198, 199, 193, - 244, 193, 193, 193, 193, 198, 199, 193, - 244, 193, 245, 193, 193, 198, 199, 193, - 193, 193, 3, 193, 18, 193, 247, 247, - 5, 198, 199, 193, 193, 193, 193, 206, - 193, 248, 27, 249, 250, 8, 198, 199, - 193, 193, 193, 193, 206, 193, 27, 249, - 250, 8, 198, 199, 193, 193, 193, 193, - 206, 193, 249, 249, 8, 198, 199, 193, - 193, 193, 193, 206, 193, 251, 24, 252, - 253, 11, 198, 199, 193, 193, 193, 193, - 206, 193, 24, 252, 253, 11, 198, 199, - 193, 193, 193, 193, 206, 193, 252, 252, - 11, 198, 199, 193, 193, 193, 193, 206, - 193, 254, 21, 255, 256, 14, 198, 199, - 193, 193, 193, 193, 206, 193, 21, 255, - 256, 14, 198, 199, 193, 193, 193, 193, - 206, 193, 255, 255, 14, 198, 199, 193, - 193, 193, 193, 206, 193, 257, 18, 193, - 258, 193, 198, 199, 193, 193, 193, 193, - 206, 193, 18, 193, 258, 193, 198, 199, - 193, 193, 193, 193, 206, 193, 259, 193, - 198, 199, 193, 193, 193, 193, 206, 193, - 18, 193, 193, 193, 193, 198, 199, 193, - 193, 193, 193, 206, 193, 235, 240, 240, - 5, 198, 199, 193, 193, 193, 193, 238, - 193, 1, 2, 193, 193, 18, 241, 193, - 198, 199, 193, 193, 193, 193, 206, 193, - 1, 193, 234, 235, 240, 240, 5, 198, - 199, 200, 193, 193, 193, 238, 193, 234, - 235, 236, 240, 5, 198, 199, 200, 193, - 193, 29, 238, 193, 232, 193, 260, 193, - 247, 247, 5, 198, 199, 193, 193, 193, - 193, 206, 193, 232, 193, 232, 193, 193, - 193, 193, 193, 193, 198, 199, 193, 193, - 193, 193, 206, 193, 232, 193, 232, 193, - 193, 193, 193, 261, 193, 198, 199, 193, - 193, 193, 193, 206, 193, 232, 193, 232, - 193, 260, 193, 193, 193, 193, 198, 199, - 193, 193, 193, 193, 206, 193, 232, 193, - 232, 2, 193, 193, 18, 233, 193, 198, - 199, 193, 193, 193, 193, 206, 193, 232, - 193, 225, 226, 231, 231, 5, 198, 199, - 200, 193, 193, 193, 229, 193, 225, 226, - 227, 231, 5, 198, 199, 200, 193, 193, - 31, 229, 193, 223, 193, 262, 193, 247, - 247, 5, 198, 199, 193, 193, 193, 193, - 206, 193, 223, 193, 223, 193, 193, 193, - 193, 193, 193, 198, 199, 193, 193, 193, - 193, 206, 193, 223, 193, 223, 193, 193, - 193, 193, 263, 193, 198, 199, 193, 193, - 193, 193, 206, 193, 223, 193, 223, 193, - 262, 193, 193, 193, 193, 198, 199, 193, - 193, 193, 193, 206, 193, 223, 193, 223, - 2, 193, 193, 18, 224, 193, 198, 199, - 193, 193, 193, 193, 206, 193, 223, 193, - 216, 217, 222, 222, 5, 198, 199, 200, - 193, 193, 193, 220, 193, 216, 217, 218, - 222, 5, 198, 199, 200, 193, 193, 33, - 220, 193, 214, 193, 264, 193, 247, 247, - 5, 198, 199, 193, 193, 193, 193, 206, - 193, 214, 193, 214, 193, 193, 193, 193, - 193, 193, 198, 199, 193, 193, 193, 193, - 206, 193, 214, 193, 214, 193, 193, 193, - 193, 265, 193, 198, 199, 193, 193, 193, - 193, 206, 193, 214, 193, 214, 193, 264, - 193, 193, 193, 193, 198, 199, 193, 193, - 193, 193, 206, 193, 214, 193, 214, 2, - 193, 193, 18, 215, 193, 198, 199, 193, - 193, 193, 193, 206, 193, 214, 193, 207, - 208, 213, 213, 5, 198, 199, 200, 193, - 193, 193, 211, 193, 207, 208, 209, 213, - 5, 198, 199, 200, 193, 193, 35, 211, - 193, 204, 193, 266, 193, 247, 247, 5, - 198, 199, 193, 193, 193, 193, 206, 193, - 204, 193, 204, 193, 193, 193, 193, 193, - 193, 198, 199, 193, 193, 193, 193, 206, - 193, 204, 193, 204, 193, 193, 193, 193, - 267, 193, 198, 199, 193, 193, 193, 193, - 206, 193, 204, 193, 204, 193, 266, 193, - 193, 193, 193, 198, 199, 193, 193, 193, - 193, 206, 193, 204, 193, 204, 2, 193, - 193, 18, 205, 193, 198, 199, 193, 193, - 193, 193, 206, 193, 204, 193, 194, 195, - 203, 203, 5, 198, 199, 200, 193, 193, - 193, 201, 193, 194, 195, 196, 203, 5, - 198, 199, 200, 193, 193, 37, 201, 193, - 269, 270, 271, 272, 43, 273, 274, 268, - 268, 268, 75, 275, 268, 276, 270, 277, - 272, 43, 273, 274, 268, 268, 268, 268, - 275, 268, 270, 277, 272, 43, 273, 274, - 268, 268, 268, 268, 275, 268, 278, 268, - 268, 268, 56, 279, 268, 273, 274, 268, - 268, 268, 268, 280, 268, 278, 268, 281, - 282, 283, 284, 43, 273, 274, 268, 268, - 268, 73, 285, 268, 268, 278, 268, 286, - 282, 287, 287, 43, 273, 274, 268, 268, - 268, 268, 285, 268, 282, 287, 287, 43, - 273, 274, 268, 268, 268, 268, 285, 268, - 288, 268, 268, 268, 56, 289, 268, 273, - 274, 268, 268, 268, 268, 280, 268, 288, - 268, 290, 291, 292, 293, 43, 273, 274, - 268, 268, 268, 71, 294, 268, 268, 288, - 268, 295, 291, 296, 296, 43, 273, 274, - 268, 268, 268, 268, 294, 268, 291, 296, - 296, 43, 273, 274, 268, 268, 268, 268, - 294, 268, 297, 268, 268, 268, 56, 298, - 268, 273, 274, 268, 268, 268, 268, 280, - 268, 297, 268, 299, 300, 301, 302, 43, - 273, 274, 268, 268, 268, 69, 303, 268, - 268, 297, 268, 304, 300, 305, 305, 43, - 273, 274, 268, 268, 268, 268, 303, 268, - 300, 305, 305, 43, 273, 274, 268, 268, - 268, 268, 303, 268, 306, 268, 268, 268, - 56, 307, 268, 273, 274, 268, 268, 268, - 268, 280, 268, 306, 268, 308, 309, 310, - 311, 43, 273, 274, 268, 268, 268, 67, - 312, 268, 268, 306, 268, 313, 309, 314, - 314, 43, 273, 274, 268, 268, 268, 268, - 312, 268, 309, 314, 314, 43, 273, 274, - 268, 268, 268, 268, 312, 268, 56, 315, - 268, 273, 274, 268, 268, 268, 268, 280, - 268, 273, 274, 268, 268, 268, 268, 280, - 268, 316, 268, 268, 268, 274, 268, 274, - 268, 317, 268, 318, 268, 319, 320, 268, - 273, 274, 268, 268, 268, 41, 268, 268, - 268, 39, 268, 40, 268, 268, 268, 268, - 273, 274, 268, 273, 274, 268, 318, 268, - 268, 268, 268, 273, 274, 268, 318, 268, - 319, 268, 268, 273, 274, 268, 268, 268, - 41, 268, 56, 268, 321, 321, 43, 273, - 274, 268, 268, 268, 268, 280, 268, 322, - 65, 323, 324, 46, 273, 274, 268, 268, - 268, 268, 280, 268, 65, 323, 324, 46, - 273, 274, 268, 268, 268, 268, 280, 268, - 323, 323, 46, 273, 274, 268, 268, 268, - 268, 280, 268, 325, 62, 326, 327, 49, - 273, 274, 268, 268, 268, 268, 280, 268, - 62, 326, 327, 49, 273, 274, 268, 268, - 268, 268, 280, 268, 326, 326, 49, 273, - 274, 268, 268, 268, 268, 280, 268, 328, - 59, 329, 330, 52, 273, 274, 268, 268, - 268, 268, 280, 268, 59, 329, 330, 52, - 273, 274, 268, 268, 268, 268, 280, 268, - 329, 329, 52, 273, 274, 268, 268, 268, - 268, 280, 268, 331, 56, 268, 332, 268, - 273, 274, 268, 268, 268, 268, 280, 268, - 56, 268, 332, 268, 273, 274, 268, 268, - 268, 268, 280, 268, 333, 268, 273, 274, - 268, 268, 268, 268, 280, 268, 56, 268, - 268, 268, 268, 273, 274, 268, 268, 268, - 268, 280, 268, 39, 40, 268, 268, 56, - 315, 268, 273, 274, 268, 268, 268, 268, - 280, 268, 39, 268, 308, 309, 314, 314, - 43, 273, 274, 268, 268, 268, 268, 312, - 268, 308, 309, 310, 314, 43, 273, 274, - 268, 268, 268, 67, 312, 268, 306, 268, - 334, 268, 321, 321, 43, 273, 274, 268, - 268, 268, 268, 280, 268, 306, 268, 306, - 268, 268, 268, 268, 268, 268, 273, 274, - 268, 268, 268, 268, 280, 268, 306, 268, - 306, 268, 268, 268, 268, 335, 268, 273, - 274, 268, 268, 268, 268, 280, 268, 306, - 268, 306, 268, 334, 268, 268, 268, 268, - 273, 274, 268, 268, 268, 268, 280, 268, - 306, 268, 306, 40, 268, 268, 56, 307, - 268, 273, 274, 268, 268, 268, 268, 280, - 268, 306, 268, 299, 300, 305, 305, 43, - 273, 274, 268, 268, 268, 268, 303, 268, - 299, 300, 301, 305, 43, 273, 274, 268, - 268, 268, 69, 303, 268, 297, 268, 336, - 268, 321, 321, 43, 273, 274, 268, 268, - 268, 268, 280, 268, 297, 268, 297, 268, - 268, 268, 268, 268, 268, 273, 274, 268, - 268, 268, 268, 280, 268, 297, 268, 297, - 268, 268, 268, 268, 337, 268, 273, 274, - 268, 268, 268, 268, 280, 268, 297, 268, - 297, 268, 336, 268, 268, 268, 268, 273, - 274, 268, 268, 268, 268, 280, 268, 297, - 268, 297, 40, 268, 268, 56, 298, 268, - 273, 274, 268, 268, 268, 268, 280, 268, - 297, 268, 290, 291, 296, 296, 43, 273, - 274, 268, 268, 268, 268, 294, 268, 290, - 291, 292, 296, 43, 273, 274, 268, 268, - 268, 71, 294, 268, 288, 268, 338, 268, - 321, 321, 43, 273, 274, 268, 268, 268, - 268, 280, 268, 288, 268, 288, 268, 268, - 268, 268, 268, 268, 273, 274, 268, 268, - 268, 268, 280, 268, 288, 268, 288, 268, - 268, 268, 268, 339, 268, 273, 274, 268, - 268, 268, 268, 280, 268, 288, 268, 288, - 268, 338, 268, 268, 268, 268, 273, 274, - 268, 268, 268, 268, 280, 268, 288, 268, - 288, 40, 268, 268, 56, 289, 268, 273, - 274, 268, 268, 268, 268, 280, 268, 288, - 268, 281, 282, 287, 287, 43, 273, 274, - 268, 268, 268, 268, 285, 268, 281, 282, - 283, 287, 43, 273, 274, 268, 268, 268, - 73, 285, 268, 278, 268, 340, 268, 321, - 321, 43, 273, 274, 268, 268, 268, 268, - 280, 268, 278, 268, 278, 268, 268, 268, - 268, 268, 268, 273, 274, 268, 268, 268, - 268, 280, 268, 278, 268, 278, 268, 268, - 268, 268, 341, 268, 273, 274, 268, 268, - 268, 268, 280, 268, 278, 268, 278, 268, - 340, 268, 268, 268, 268, 273, 274, 268, - 268, 268, 268, 280, 268, 278, 268, 74, - 42, 42, 43, 268, 268, 268, 268, 268, - 268, 74, 268, 278, 40, 268, 268, 56, - 279, 268, 273, 274, 268, 268, 268, 268, - 280, 268, 278, 268, 269, 270, 277, 272, - 43, 273, 274, 268, 268, 268, 268, 275, - 268, 343, 184, 344, 344, 81, 187, 188, - 342, 342, 342, 342, 190, 342, 184, 344, - 344, 81, 187, 188, 342, 342, 342, 342, - 190, 342, 345, 342, 342, 342, 95, 346, - 342, 187, 188, 342, 342, 342, 342, 347, - 342, 345, 342, 348, 349, 350, 351, 81, - 187, 188, 342, 342, 342, 112, 352, 342, - 342, 345, 342, 353, 349, 354, 354, 81, - 187, 188, 342, 342, 342, 342, 352, 342, - 349, 354, 354, 81, 187, 188, 342, 342, - 342, 342, 352, 342, 355, 342, 342, 342, - 95, 356, 342, 187, 188, 342, 342, 342, - 342, 347, 342, 355, 342, 357, 358, 359, - 360, 81, 187, 188, 342, 342, 342, 110, - 361, 342, 342, 355, 342, 362, 358, 363, - 363, 81, 187, 188, 342, 342, 342, 342, - 361, 342, 358, 363, 363, 81, 187, 188, - 342, 342, 342, 342, 361, 342, 364, 342, - 342, 342, 95, 365, 342, 187, 188, 342, - 342, 342, 342, 347, 342, 364, 342, 366, - 367, 368, 369, 81, 187, 188, 342, 342, - 342, 108, 370, 342, 342, 364, 342, 371, - 367, 372, 372, 81, 187, 188, 342, 342, - 342, 342, 370, 342, 367, 372, 372, 81, - 187, 188, 342, 342, 342, 342, 370, 342, - 373, 342, 342, 342, 95, 374, 342, 187, - 188, 342, 342, 342, 342, 347, 342, 373, - 342, 375, 376, 377, 378, 81, 187, 188, - 342, 342, 342, 106, 379, 342, 342, 373, - 342, 380, 376, 381, 381, 81, 187, 188, - 342, 342, 342, 342, 379, 342, 376, 381, - 381, 81, 187, 188, 342, 342, 342, 342, - 379, 342, 95, 382, 342, 187, 188, 342, - 342, 342, 342, 347, 342, 187, 188, 342, - 342, 342, 342, 347, 342, 383, 342, 342, - 342, 188, 342, 188, 342, 384, 342, 385, - 342, 386, 387, 342, 187, 188, 342, 342, - 342, 79, 342, 342, 342, 77, 342, 78, - 342, 342, 342, 342, 187, 188, 342, 187, - 188, 342, 385, 342, 342, 342, 342, 187, - 188, 342, 385, 342, 386, 342, 342, 187, - 188, 342, 342, 342, 79, 342, 95, 342, - 388, 388, 81, 187, 188, 342, 342, 342, - 342, 347, 342, 389, 104, 390, 391, 85, - 187, 188, 342, 342, 342, 342, 347, 342, - 104, 390, 391, 85, 187, 188, 342, 342, - 342, 342, 347, 342, 390, 390, 85, 187, - 188, 342, 342, 342, 342, 347, 342, 392, - 101, 393, 394, 88, 187, 188, 342, 342, - 342, 342, 347, 342, 101, 393, 394, 88, - 187, 188, 342, 342, 342, 342, 347, 342, - 393, 393, 88, 187, 188, 342, 342, 342, - 342, 347, 342, 395, 98, 396, 397, 91, - 187, 188, 342, 342, 342, 342, 347, 342, - 98, 396, 397, 91, 187, 188, 342, 342, - 342, 342, 347, 342, 396, 396, 91, 187, - 188, 342, 342, 342, 342, 347, 342, 398, - 95, 342, 399, 342, 187, 188, 342, 342, - 342, 342, 347, 342, 95, 342, 399, 342, - 187, 188, 342, 342, 342, 342, 347, 342, - 400, 342, 187, 188, 342, 342, 342, 342, - 347, 342, 95, 342, 342, 342, 342, 187, - 188, 342, 342, 342, 342, 347, 342, 77, - 78, 342, 342, 95, 382, 342, 187, 188, - 342, 342, 342, 342, 347, 342, 77, 342, - 375, 376, 381, 381, 81, 187, 188, 342, - 342, 342, 342, 379, 342, 375, 376, 377, - 381, 81, 187, 188, 342, 342, 342, 106, - 379, 342, 373, 342, 401, 342, 388, 388, - 81, 187, 188, 342, 342, 342, 342, 347, - 342, 373, 342, 373, 342, 342, 342, 342, - 342, 342, 187, 188, 342, 342, 342, 342, - 347, 342, 373, 342, 373, 342, 342, 342, - 342, 402, 342, 187, 188, 342, 342, 342, - 342, 347, 342, 373, 342, 373, 342, 401, - 342, 342, 342, 342, 187, 188, 342, 342, - 342, 342, 347, 342, 373, 342, 373, 78, - 342, 342, 95, 374, 342, 187, 188, 342, - 342, 342, 342, 347, 342, 373, 342, 366, - 367, 372, 372, 81, 187, 188, 342, 342, - 342, 342, 370, 342, 366, 367, 368, 372, - 81, 187, 188, 342, 342, 342, 108, 370, - 342, 364, 342, 403, 342, 388, 388, 81, - 187, 188, 342, 342, 342, 342, 347, 342, - 364, 342, 364, 342, 342, 342, 342, 342, - 342, 187, 188, 342, 342, 342, 342, 347, - 342, 364, 342, 364, 342, 342, 342, 342, - 404, 342, 187, 188, 342, 342, 342, 342, - 347, 342, 364, 342, 364, 342, 403, 342, - 342, 342, 342, 187, 188, 342, 342, 342, - 342, 347, 342, 364, 342, 364, 78, 342, - 342, 95, 365, 342, 187, 188, 342, 342, - 342, 342, 347, 342, 364, 342, 357, 358, - 363, 363, 81, 187, 188, 342, 342, 342, - 342, 361, 342, 357, 358, 359, 363, 81, - 187, 188, 342, 342, 342, 110, 361, 342, - 355, 342, 405, 342, 388, 388, 81, 187, - 188, 342, 342, 342, 342, 347, 342, 355, - 342, 355, 342, 342, 342, 342, 342, 342, - 187, 188, 342, 342, 342, 342, 347, 342, - 355, 342, 355, 342, 342, 342, 342, 406, - 342, 187, 188, 342, 342, 342, 342, 347, - 342, 355, 342, 355, 342, 405, 342, 342, - 342, 342, 187, 188, 342, 342, 342, 342, - 347, 342, 355, 342, 355, 78, 342, 342, - 95, 356, 342, 187, 188, 342, 342, 342, - 342, 347, 342, 355, 342, 348, 349, 354, - 354, 81, 187, 188, 342, 342, 342, 342, - 352, 342, 348, 349, 350, 354, 81, 187, - 188, 342, 342, 342, 112, 352, 342, 345, - 342, 407, 342, 388, 388, 81, 187, 188, - 342, 342, 342, 342, 347, 342, 345, 342, - 345, 342, 342, 342, 342, 342, 342, 187, - 188, 342, 342, 342, 342, 347, 342, 345, - 342, 345, 342, 342, 342, 342, 408, 342, - 187, 188, 342, 342, 342, 342, 347, 342, - 345, 342, 345, 342, 407, 342, 342, 342, - 342, 187, 188, 342, 342, 342, 342, 347, - 342, 345, 342, 345, 78, 342, 342, 95, - 346, 342, 187, 188, 342, 342, 342, 342, - 347, 342, 345, 342, 113, 80, 80, 81, - 409, 409, 409, 409, 409, 152, 113, 409, - 183, 184, 344, 344, 81, 187, 188, 342, - 342, 342, 342, 190, 342, 113, 80, 80, - 81, 409, 409, 409, 409, 409, 409, 113, - 409, 411, 412, 413, 414, 119, 415, 416, - 410, 410, 410, 151, 417, 410, 418, 412, - 414, 414, 119, 415, 416, 410, 410, 410, - 410, 417, 410, 412, 414, 414, 119, 415, - 416, 410, 410, 410, 410, 417, 410, 419, - 410, 410, 410, 132, 420, 410, 415, 416, - 410, 410, 410, 410, 421, 410, 419, 410, - 422, 423, 424, 425, 119, 415, 416, 410, - 410, 410, 149, 426, 410, 410, 419, 410, - 427, 423, 428, 428, 119, 415, 416, 410, - 410, 410, 410, 426, 410, 423, 428, 428, - 119, 415, 416, 410, 410, 410, 410, 426, - 410, 429, 410, 410, 410, 132, 430, 410, - 415, 416, 410, 410, 410, 410, 421, 410, - 429, 410, 431, 432, 433, 434, 119, 415, - 416, 410, 410, 410, 147, 435, 410, 410, - 429, 410, 436, 432, 437, 437, 119, 415, - 416, 410, 410, 410, 410, 435, 410, 432, - 437, 437, 119, 415, 416, 410, 410, 410, - 410, 435, 410, 438, 410, 410, 410, 132, - 439, 410, 415, 416, 410, 410, 410, 410, - 421, 410, 438, 410, 440, 441, 442, 443, - 119, 415, 416, 410, 410, 410, 145, 444, - 410, 410, 438, 410, 445, 441, 446, 446, - 119, 415, 416, 410, 410, 410, 410, 444, - 410, 441, 446, 446, 119, 415, 416, 410, - 410, 410, 410, 444, 410, 447, 410, 410, - 410, 132, 448, 410, 415, 416, 410, 410, - 410, 410, 421, 410, 447, 410, 449, 450, - 451, 452, 119, 415, 416, 410, 410, 410, - 143, 453, 410, 410, 447, 410, 454, 450, - 455, 455, 119, 415, 416, 410, 410, 410, - 410, 453, 410, 450, 455, 455, 119, 415, - 416, 410, 410, 410, 410, 453, 410, 132, - 456, 410, 415, 416, 410, 410, 410, 410, - 421, 410, 415, 416, 410, 410, 410, 410, - 421, 410, 457, 410, 410, 410, 416, 410, - 416, 410, 458, 410, 459, 410, 460, 461, - 410, 415, 416, 410, 410, 410, 117, 410, - 410, 410, 115, 410, 116, 410, 410, 410, - 410, 415, 416, 410, 415, 416, 410, 459, - 410, 410, 410, 410, 415, 416, 410, 459, - 410, 460, 410, 410, 415, 416, 410, 410, - 410, 117, 410, 132, 410, 462, 462, 119, - 415, 416, 410, 410, 410, 410, 421, 410, - 463, 141, 464, 465, 122, 415, 416, 410, - 410, 410, 410, 421, 410, 141, 464, 465, - 122, 415, 416, 410, 410, 410, 410, 421, - 410, 464, 464, 122, 415, 416, 410, 410, - 410, 410, 421, 410, 466, 138, 467, 468, - 125, 415, 416, 410, 410, 410, 410, 421, - 410, 138, 467, 468, 125, 415, 416, 410, - 410, 410, 410, 421, 410, 467, 467, 125, - 415, 416, 410, 410, 410, 410, 421, 410, - 469, 135, 470, 471, 128, 415, 416, 410, - 410, 410, 410, 421, 410, 135, 470, 471, - 128, 415, 416, 410, 410, 410, 410, 421, - 410, 470, 470, 128, 415, 416, 410, 410, - 410, 410, 421, 410, 472, 132, 410, 473, - 410, 415, 416, 410, 410, 410, 410, 421, - 410, 132, 410, 473, 410, 415, 416, 410, - 410, 410, 410, 421, 410, 474, 410, 415, - 416, 410, 410, 410, 410, 421, 410, 132, - 410, 410, 410, 410, 415, 416, 410, 410, - 410, 410, 421, 410, 115, 116, 410, 410, - 132, 456, 410, 415, 416, 410, 410, 410, - 410, 421, 410, 115, 410, 449, 450, 455, - 455, 119, 415, 416, 410, 410, 410, 410, - 453, 410, 449, 450, 451, 455, 119, 415, - 416, 410, 410, 410, 143, 453, 410, 447, - 410, 475, 410, 462, 462, 119, 415, 416, - 410, 410, 410, 410, 421, 410, 447, 410, - 447, 410, 410, 410, 410, 410, 410, 415, - 416, 410, 410, 410, 410, 421, 410, 447, - 410, 447, 410, 410, 410, 410, 476, 410, - 415, 416, 410, 410, 410, 410, 421, 410, - 447, 410, 447, 410, 475, 410, 410, 410, - 410, 415, 416, 410, 410, 410, 410, 421, - 410, 447, 410, 447, 116, 410, 410, 132, - 448, 410, 415, 416, 410, 410, 410, 410, - 421, 410, 447, 410, 440, 441, 446, 446, - 119, 415, 416, 410, 410, 410, 410, 444, - 410, 440, 441, 442, 446, 119, 415, 416, - 410, 410, 410, 145, 444, 410, 438, 410, - 477, 410, 462, 462, 119, 415, 416, 410, - 410, 410, 410, 421, 410, 438, 410, 438, - 410, 410, 410, 410, 410, 410, 415, 416, - 410, 410, 410, 410, 421, 410, 438, 410, - 438, 410, 410, 410, 410, 478, 410, 415, - 416, 410, 410, 410, 410, 421, 410, 438, - 410, 438, 410, 477, 410, 410, 410, 410, - 415, 416, 410, 410, 410, 410, 421, 410, - 438, 410, 438, 116, 410, 410, 132, 439, - 410, 415, 416, 410, 410, 410, 410, 421, - 410, 438, 410, 431, 432, 437, 437, 119, - 415, 416, 410, 410, 410, 410, 435, 410, - 431, 432, 433, 437, 119, 415, 416, 410, - 410, 410, 147, 435, 410, 429, 410, 479, - 410, 462, 462, 119, 415, 416, 410, 410, - 410, 410, 421, 410, 429, 410, 429, 410, - 410, 410, 410, 410, 410, 415, 416, 410, - 410, 410, 410, 421, 410, 429, 410, 429, - 410, 410, 410, 410, 480, 410, 415, 416, - 410, 410, 410, 410, 421, 410, 429, 410, - 429, 410, 479, 410, 410, 410, 410, 415, - 416, 410, 410, 410, 410, 421, 410, 429, - 410, 429, 116, 410, 410, 132, 430, 410, - 415, 416, 410, 410, 410, 410, 421, 410, - 429, 410, 422, 423, 428, 428, 119, 415, - 416, 410, 410, 410, 410, 426, 410, 422, - 423, 424, 428, 119, 415, 416, 410, 410, - 410, 149, 426, 410, 419, 410, 481, 410, - 462, 462, 119, 415, 416, 410, 410, 410, - 410, 421, 410, 419, 410, 419, 410, 410, - 410, 410, 410, 410, 415, 416, 410, 410, - 410, 410, 421, 410, 419, 410, 419, 410, - 410, 410, 410, 482, 410, 415, 416, 410, - 410, 410, 410, 421, 410, 419, 410, 419, - 410, 481, 410, 410, 410, 410, 415, 416, - 410, 410, 410, 410, 421, 410, 419, 410, - 419, 116, 410, 410, 132, 420, 410, 415, - 416, 410, 410, 410, 410, 421, 410, 419, - 410, 411, 412, 414, 414, 119, 415, 416, - 410, 410, 410, 410, 417, 410, 181, 182, - 183, 184, 483, 344, 81, 187, 188, 342, - 189, 189, 152, 190, 342, 181, 342, 194, - 484, 196, 197, 5, 198, 199, 200, 193, - 193, 37, 201, 193, 193, 181, 193, 204, - 182, 183, 184, 485, 486, 81, 487, 488, - 193, 189, 189, 152, 489, 193, 204, 193, - 113, 80, 80, 81, 198, 199, 193, 193, - 193, 152, 490, 193, 491, 2, 342, 342, - 342, 408, 342, 187, 188, 342, 342, 342, - 342, 347, 342, 491, 342, 492, 349, 493, - 494, 81, 487, 488, 193, 193, 193, 153, - 352, 193, 193, 491, 193, 495, 349, 354, - 354, 81, 487, 488, 193, 193, 193, 193, - 352, 193, 349, 354, 354, 81, 487, 488, - 193, 193, 193, 193, 352, 193, 496, 193, - 193, 193, 488, 193, 488, 193, 243, 193, - 492, 349, 354, 354, 81, 487, 488, 193, - 193, 193, 193, 352, 193, 492, 349, 493, - 354, 81, 487, 488, 193, 193, 193, 153, - 352, 193, 204, 193, 266, 113, 497, 497, - 155, 198, 199, 193, 193, 193, 193, 490, - 193, 204, 193, 498, 179, 499, 500, 157, - 487, 488, 193, 193, 193, 193, 501, 193, - 179, 499, 500, 157, 487, 488, 193, 193, - 193, 193, 501, 193, 499, 499, 157, 487, - 488, 193, 193, 193, 193, 501, 193, 502, - 176, 503, 504, 160, 487, 488, 193, 193, - 193, 193, 501, 193, 176, 503, 504, 160, - 487, 488, 193, 193, 193, 193, 501, 193, - 503, 503, 160, 487, 488, 193, 193, 193, - 193, 501, 193, 505, 173, 506, 507, 163, - 487, 488, 193, 193, 193, 193, 501, 193, - 173, 506, 507, 163, 487, 488, 193, 193, - 193, 193, 501, 193, 506, 506, 163, 487, - 488, 193, 193, 193, 193, 501, 193, 508, - 170, 193, 509, 193, 487, 488, 193, 193, - 193, 193, 501, 193, 170, 193, 509, 193, - 487, 488, 193, 193, 193, 193, 501, 193, - 487, 488, 193, 193, 193, 193, 501, 193, - 510, 193, 511, 512, 193, 487, 488, 193, - 193, 193, 167, 193, 193, 193, 165, 193, - 166, 193, 193, 193, 193, 487, 488, 193, - 487, 488, 193, 510, 193, 193, 193, 193, - 487, 488, 193, 510, 193, 511, 193, 193, - 487, 488, 193, 193, 193, 167, 193, 491, - 166, 342, 342, 95, 346, 342, 187, 188, - 342, 342, 342, 342, 347, 342, 491, 342, - 0 -}; - -static const short _indic_syllable_machine_trans_targs[] = { - 170, 195, 197, 198, 3, 201, 4, 6, - 204, 7, 9, 207, 10, 12, 210, 13, - 15, 16, 191, 18, 19, 209, 21, 22, - 206, 24, 25, 203, 212, 216, 220, 223, - 227, 230, 234, 237, 241, 244, 170, 270, - 272, 273, 39, 276, 40, 42, 279, 43, - 45, 282, 46, 48, 285, 49, 51, 52, - 266, 54, 55, 284, 57, 58, 281, 60, - 61, 278, 287, 290, 294, 297, 301, 304, - 308, 311, 315, 319, 170, 343, 345, 346, - 75, 349, 170, 76, 78, 352, 79, 81, - 355, 82, 84, 358, 85, 87, 88, 339, - 90, 91, 357, 93, 94, 354, 96, 97, - 351, 360, 363, 367, 370, 374, 377, 381, - 384, 388, 170, 418, 420, 421, 110, 424, - 111, 113, 427, 114, 116, 430, 117, 119, - 433, 120, 122, 123, 414, 125, 126, 432, - 128, 129, 429, 131, 132, 426, 435, 438, - 442, 445, 449, 452, 456, 459, 463, 466, - 392, 478, 146, 481, 148, 484, 149, 151, - 487, 152, 154, 490, 155, 493, 495, 496, - 159, 160, 492, 162, 163, 489, 165, 166, - 486, 168, 169, 483, 170, 171, 246, 320, - 322, 391, 393, 340, 342, 394, 390, 467, - 468, 170, 172, 174, 35, 245, 192, 194, - 214, 243, 173, 34, 175, 239, 0, 176, - 178, 33, 238, 236, 177, 32, 179, 232, - 180, 182, 31, 231, 229, 181, 30, 183, - 225, 184, 186, 29, 224, 222, 185, 28, - 187, 218, 188, 190, 27, 217, 215, 189, - 26, 200, 193, 170, 196, 1, 199, 2, - 202, 5, 23, 205, 8, 20, 208, 11, - 17, 211, 14, 213, 219, 221, 226, 228, - 233, 235, 240, 242, 170, 247, 249, 71, - 317, 267, 269, 318, 248, 70, 250, 313, - 36, 251, 253, 69, 312, 310, 252, 68, - 254, 306, 255, 257, 67, 305, 303, 256, - 66, 258, 299, 259, 261, 65, 298, 296, - 260, 64, 262, 292, 263, 265, 63, 291, - 289, 264, 62, 275, 268, 170, 271, 37, - 274, 38, 277, 41, 59, 280, 44, 56, - 283, 47, 53, 286, 50, 288, 293, 295, - 300, 302, 307, 309, 314, 316, 170, 321, - 106, 323, 386, 72, 324, 326, 105, 385, - 383, 325, 104, 327, 379, 328, 330, 103, - 378, 376, 329, 102, 331, 372, 332, 334, - 101, 371, 369, 333, 100, 335, 365, 336, - 338, 99, 364, 362, 337, 98, 348, 341, - 170, 344, 73, 347, 74, 350, 77, 95, - 353, 80, 92, 356, 83, 89, 359, 86, - 361, 366, 368, 373, 375, 380, 382, 387, - 389, 170, 170, 395, 397, 142, 141, 415, - 417, 465, 396, 398, 461, 107, 399, 401, - 140, 460, 458, 400, 139, 402, 454, 403, - 405, 138, 453, 451, 404, 137, 406, 447, - 407, 409, 136, 446, 444, 408, 135, 410, - 440, 411, 413, 134, 439, 437, 412, 133, - 423, 416, 170, 419, 108, 422, 109, 425, - 112, 130, 428, 115, 127, 431, 118, 124, - 434, 121, 436, 441, 443, 448, 450, 455, - 457, 462, 464, 143, 469, 470, 480, 475, - 477, 498, 471, 472, 473, 144, 479, 474, - 476, 145, 482, 147, 167, 156, 485, 150, - 164, 488, 153, 161, 491, 158, 494, 157, - 497 -}; - -static const char _indic_syllable_machine_trans_actions[] = { - 1, 2, 0, 0, 0, 2, 0, 0, - 2, 0, 0, 2, 0, 0, 2, 0, - 0, 0, 2, 0, 0, 2, 0, 0, - 2, 0, 0, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 3, 2, - 0, 0, 0, 2, 0, 0, 2, 0, - 0, 2, 0, 0, 2, 0, 0, 0, - 2, 0, 0, 2, 0, 0, 2, 0, - 0, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 4, 2, 0, 0, - 0, 2, 5, 0, 0, 2, 0, 0, - 2, 0, 0, 2, 0, 0, 0, 2, - 0, 0, 2, 0, 0, 2, 0, 0, - 2, 2, 6, 2, 6, 2, 6, 2, - 6, 2, 7, 2, 0, 0, 0, 2, - 0, 0, 2, 0, 0, 2, 0, 0, - 2, 0, 0, 0, 2, 0, 0, 2, - 0, 0, 2, 0, 0, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, - 6, 8, 0, 2, 0, 2, 0, 0, - 2, 0, 0, 2, 0, 2, 0, 0, - 0, 0, 2, 0, 0, 2, 0, 0, - 2, 0, 0, 2, 11, 2, 2, 6, - 2, 12, 12, 0, 0, 2, 2, 6, - 2, 13, 2, 2, 0, 2, 0, 0, - 2, 2, 2, 0, 2, 2, 0, 2, - 2, 0, 2, 2, 2, 0, 2, 2, - 2, 2, 0, 2, 2, 2, 0, 2, - 2, 2, 2, 0, 2, 2, 2, 0, - 2, 2, 2, 2, 0, 2, 2, 2, - 0, 2, 0, 14, 0, 0, 2, 0, - 2, 0, 0, 2, 0, 0, 2, 0, - 0, 2, 0, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 15, 2, 2, 0, - 2, 0, 0, 2, 2, 0, 2, 2, - 0, 2, 2, 0, 2, 2, 2, 0, - 2, 2, 2, 2, 0, 2, 2, 2, - 0, 2, 2, 2, 2, 0, 2, 2, - 2, 0, 2, 2, 2, 2, 0, 2, - 2, 2, 0, 2, 0, 16, 0, 0, - 2, 0, 2, 0, 0, 2, 0, 0, - 2, 0, 0, 2, 0, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 17, 6, - 0, 6, 6, 0, 6, 2, 0, 6, - 2, 6, 0, 6, 6, 6, 2, 0, - 6, 2, 6, 0, 6, 6, 6, 2, - 0, 6, 2, 6, 0, 6, 6, 6, - 2, 0, 6, 2, 6, 0, 6, 0, - 18, 0, 0, 2, 0, 2, 0, 0, - 2, 0, 0, 2, 0, 0, 2, 0, - 2, 2, 2, 2, 2, 2, 2, 2, - 2, 19, 20, 2, 2, 0, 0, 0, - 0, 2, 2, 2, 2, 0, 2, 2, - 0, 2, 2, 2, 0, 2, 2, 2, - 2, 0, 2, 2, 2, 0, 2, 2, - 2, 2, 0, 2, 2, 2, 0, 2, - 2, 2, 2, 0, 2, 2, 2, 0, - 2, 0, 21, 0, 0, 2, 0, 2, - 0, 0, 2, 0, 0, 2, 0, 0, - 2, 0, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 0, 0, 8, 2, 0, - 0, 2, 2, 8, 8, 0, 8, 8, - 0, 0, 2, 0, 0, 0, 2, 0, - 0, 2, 0, 0, 2, 0, 0, 0, - 2 -}; - -static const char _indic_syllable_machine_to_state_actions[] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 9, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0 -}; - -static const char _indic_syllable_machine_from_state_actions[] = { - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 10, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0 -}; - -static const short _indic_syllable_machine_eof_trans[] = { - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, - 39, 39, 39, 39, 39, 39, 39, 39, - 77, 77, 77, 83, 83, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, - 77, 77, 77, 77, 77, 77, 77, 77, - 83, 77, 77, 115, 115, 115, 115, 115, - 115, 115, 115, 115, 115, 115, 115, 115, - 115, 115, 115, 115, 115, 115, 115, 115, - 115, 115, 115, 115, 115, 115, 115, 115, - 115, 115, 115, 115, 115, 115, 115, 77, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 1, 1, 1, 1, 1, 1, - 1, 1, 0, 194, 194, 194, 194, 194, - 194, 194, 194, 194, 194, 194, 194, 194, - 194, 194, 194, 194, 194, 194, 194, 194, - 194, 194, 194, 194, 194, 194, 194, 194, - 194, 194, 194, 194, 194, 194, 194, 194, - 194, 194, 194, 194, 194, 194, 194, 194, - 194, 194, 194, 194, 194, 194, 194, 194, - 194, 194, 194, 194, 194, 194, 194, 194, - 194, 194, 194, 194, 194, 194, 194, 194, - 194, 194, 194, 194, 194, 194, 269, 269, - 269, 269, 269, 269, 269, 269, 269, 269, - 269, 269, 269, 269, 269, 269, 269, 269, - 269, 269, 269, 269, 269, 269, 269, 269, - 269, 269, 269, 269, 269, 269, 269, 269, - 269, 269, 269, 269, 269, 269, 269, 269, - 269, 269, 269, 269, 269, 269, 269, 269, - 269, 269, 269, 269, 269, 269, 269, 269, - 269, 269, 269, 269, 269, 269, 269, 269, - 269, 269, 269, 269, 269, 269, 269, 269, - 343, 343, 343, 343, 343, 343, 343, 343, - 343, 343, 343, 343, 343, 343, 343, 343, - 343, 343, 343, 343, 343, 343, 343, 343, - 343, 343, 343, 343, 343, 343, 343, 343, - 343, 343, 343, 343, 343, 343, 343, 343, - 343, 343, 343, 343, 343, 343, 343, 343, - 343, 343, 343, 343, 343, 343, 343, 343, - 343, 343, 343, 343, 343, 343, 343, 343, - 343, 343, 343, 343, 343, 343, 343, 410, - 343, 410, 411, 411, 411, 411, 411, 411, - 411, 411, 411, 411, 411, 411, 411, 411, - 411, 411, 411, 411, 411, 411, 411, 411, - 411, 411, 411, 411, 411, 411, 411, 411, - 411, 411, 411, 411, 411, 411, 411, 411, - 411, 411, 411, 411, 411, 411, 411, 411, - 411, 411, 411, 411, 411, 411, 411, 411, - 411, 411, 411, 411, 411, 411, 411, 411, - 411, 411, 411, 411, 411, 411, 411, 411, - 411, 411, 411, 343, 194, 194, 194, 343, - 194, 194, 194, 194, 194, 194, 194, 194, - 194, 194, 194, 194, 194, 194, 194, 194, - 194, 194, 194, 194, 194, 194, 194, 194, - 194, 194, 343 -}; - -static const int indic_syllable_machine_start = 170; -static const int indic_syllable_machine_first_final = 170; -static const int indic_syllable_machine_error = -1; - -static const int indic_syllable_machine_en_main = 170; - - -#line 36 "../../src/hb-ot-shape-complex-indic-machine.rl" - - - -#line 91 "../../src/hb-ot-shape-complex-indic-machine.rl" - - -#define found_syllable(syllable_type) \ - HB_STMT_START { \ - if (0) fprintf (stderr, "syllable %d..%d %s\n", last, p+1, #syllable_type); \ - for (unsigned int i = last; i < p+1; i++) \ - info[i].syllable() = (syllable_serial << 4) | syllable_type; \ - last = p+1; \ - syllable_serial++; \ - if (unlikely (syllable_serial == 16)) syllable_serial = 1; \ - } HB_STMT_END - -static void -find_syllables (hb_buffer_t *buffer) -{ - unsigned int p, pe, eof, ts HB_UNUSED, te HB_UNUSED, act HB_UNUSED; - int cs; - hb_glyph_info_t *info = buffer->info; - -#line 1273 "hb-ot-shape-complex-indic-machine.hh.tmp" - { - cs = indic_syllable_machine_start; - ts = 0; - te = 0; - act = 0; - } - -#line 112 "../../src/hb-ot-shape-complex-indic-machine.rl" - - - p = 0; - pe = eof = buffer->len; - - unsigned int last = 0; - unsigned int syllable_serial = 1; - -#line 1290 "hb-ot-shape-complex-indic-machine.hh.tmp" - { - int _slen; - int _trans; - const unsigned char *_keys; - const short *_inds; - if ( p == pe ) - goto _test_eof; -_resume: - switch ( _indic_syllable_machine_from_state_actions[cs] ) { - case 10: -#line 1 "NONE" - {ts = p;} - break; -#line 1304 "hb-ot-shape-complex-indic-machine.hh.tmp" - } - - _keys = _indic_syllable_machine_trans_keys + (cs<<1); - _inds = _indic_syllable_machine_indicies + _indic_syllable_machine_index_offsets[cs]; - - _slen = _indic_syllable_machine_key_spans[cs]; - _trans = _inds[ _slen > 0 && _keys[0] <=( info[p].indic_category()) && - ( info[p].indic_category()) <= _keys[1] ? - ( info[p].indic_category()) - _keys[0] : _slen ]; - -_eof_trans: - cs = _indic_syllable_machine_trans_targs[_trans]; - - if ( _indic_syllable_machine_trans_actions[_trans] == 0 ) - goto _again; - - switch ( _indic_syllable_machine_trans_actions[_trans] ) { - case 2: -#line 1 "NONE" - {te = p+1;} - break; - case 14: -#line 83 "../../src/hb-ot-shape-complex-indic-machine.rl" - {te = p+1;{ found_syllable (consonant_syllable); }} - break; - case 16: -#line 84 "../../src/hb-ot-shape-complex-indic-machine.rl" - {te = p+1;{ found_syllable (vowel_syllable); }} - break; - case 21: -#line 85 "../../src/hb-ot-shape-complex-indic-machine.rl" - {te = p+1;{ found_syllable (standalone_cluster); }} - break; - case 18: -#line 86 "../../src/hb-ot-shape-complex-indic-machine.rl" - {te = p+1;{ found_syllable (broken_cluster); }} - break; - case 11: -#line 87 "../../src/hb-ot-shape-complex-indic-machine.rl" - {te = p+1;{ found_syllable (non_indic_cluster); }} - break; - case 13: -#line 83 "../../src/hb-ot-shape-complex-indic-machine.rl" - {te = p;p--;{ found_syllable (consonant_syllable); }} - break; - case 15: -#line 84 "../../src/hb-ot-shape-complex-indic-machine.rl" - {te = p;p--;{ found_syllable (vowel_syllable); }} - break; - case 20: -#line 85 "../../src/hb-ot-shape-complex-indic-machine.rl" - {te = p;p--;{ found_syllable (standalone_cluster); }} - break; - case 17: -#line 86 "../../src/hb-ot-shape-complex-indic-machine.rl" - {te = p;p--;{ found_syllable (broken_cluster); }} - break; - case 19: -#line 87 "../../src/hb-ot-shape-complex-indic-machine.rl" - {te = p;p--;{ found_syllable (non_indic_cluster); }} - break; - case 1: -#line 83 "../../src/hb-ot-shape-complex-indic-machine.rl" - {{p = ((te))-1;}{ found_syllable (consonant_syllable); }} - break; - case 3: -#line 84 "../../src/hb-ot-shape-complex-indic-machine.rl" - {{p = ((te))-1;}{ found_syllable (vowel_syllable); }} - break; - case 7: -#line 85 "../../src/hb-ot-shape-complex-indic-machine.rl" - {{p = ((te))-1;}{ found_syllable (standalone_cluster); }} - break; - case 4: -#line 86 "../../src/hb-ot-shape-complex-indic-machine.rl" - {{p = ((te))-1;}{ found_syllable (broken_cluster); }} - break; - case 5: -#line 1 "NONE" - { switch( act ) { - case 1: - {{p = ((te))-1;} found_syllable (consonant_syllable); } - break; - case 4: - {{p = ((te))-1;} found_syllable (broken_cluster); } - break; - case 5: - {{p = ((te))-1;} found_syllable (non_indic_cluster); } - break; - } - } - break; - case 8: -#line 1 "NONE" - {te = p+1;} -#line 83 "../../src/hb-ot-shape-complex-indic-machine.rl" - {act = 1;} - break; - case 6: -#line 1 "NONE" - {te = p+1;} -#line 86 "../../src/hb-ot-shape-complex-indic-machine.rl" - {act = 4;} - break; - case 12: -#line 1 "NONE" - {te = p+1;} -#line 87 "../../src/hb-ot-shape-complex-indic-machine.rl" - {act = 5;} - break; -#line 1415 "hb-ot-shape-complex-indic-machine.hh.tmp" - } - -_again: - switch ( _indic_syllable_machine_to_state_actions[cs] ) { - case 9: -#line 1 "NONE" - {ts = 0;} - break; -#line 1424 "hb-ot-shape-complex-indic-machine.hh.tmp" - } - - if ( ++p != pe ) - goto _resume; - _test_eof: {} - if ( p == eof ) - { - if ( _indic_syllable_machine_eof_trans[cs] > 0 ) { - _trans = _indic_syllable_machine_eof_trans[cs] - 1; - goto _eof_trans; - } - } - - } - -#line 121 "../../src/hb-ot-shape-complex-indic-machine.rl" - -} - -#endif /* HB_OT_SHAPE_COMPLEX_INDIC_MACHINE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-indic-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-indic-machine.rl deleted file mode 100644 index f9f07d801d9..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-indic-machine.rl +++ /dev/null @@ -1,124 +0,0 @@ -/* - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_SHAPE_COMPLEX_INDIC_MACHINE_HH -#define HB_OT_SHAPE_COMPLEX_INDIC_MACHINE_HH - -#include "hb-private.hh" - -%%{ - machine indic_syllable_machine; - alphtype unsigned char; - write data; -}%% - -%%{ - -# Same order as enum indic_category_t. Not sure how to avoid duplication. -X = 0; -C = 1; -V = 2; -N = 3; -H = 4; -ZWNJ = 5; -ZWJ = 6; -M = 7; -SM = 8; -VD = 9; -A = 10; -NBSP = 11; -DOTTEDCIRCLE = 12; -RS = 13; -Coeng = 14; -Repha = 15; -Ra = 16; -CM = 17; - -c = (C | Ra)CM*; # is_consonant -n = ((ZWNJ?.RS)? (N.N?)?); # is_consonant_modifier -z = ZWJ|ZWNJ; # is_joiner -h = H | Coeng; # is_halant_or_coeng -reph = (Ra H | Repha); # possible reph - -cn = c.ZWJ?.n?; -forced_rakar = ZWJ H ZWJ Ra; -matra_group = z{0,3}.M.N?.(H | forced_rakar)?; -syllable_tail = (Coeng (cn|V))? (SM.ZWNJ?)? (VD VD?)?; -place_holder = NBSP | DOTTEDCIRCLE; -halant_group = (z?.h.(ZWJ.N?)?); -final_halant_group = halant_group | h.ZWNJ; -halant_or_matra_group = (final_halant_group | (h.ZWJ)? matra_group{0,4}); - - -consonant_syllable = Repha? (cn.halant_group){0,4} cn A? halant_or_matra_group? syllable_tail; -vowel_syllable = reph? V.n? (ZWJ | (halant_group.cn){0,4} halant_or_matra_group? syllable_tail); -standalone_cluster = reph? place_holder.n? (halant_group.cn){0,4} halant_or_matra_group? syllable_tail; -broken_cluster = reph? n? (halant_group.cn){0,4} halant_or_matra_group syllable_tail; -other = any; - -main := |* - consonant_syllable => { found_syllable (consonant_syllable); }; - vowel_syllable => { found_syllable (vowel_syllable); }; - standalone_cluster => { found_syllable (standalone_cluster); }; - broken_cluster => { found_syllable (broken_cluster); }; - other => { found_syllable (non_indic_cluster); }; -*|; - - -}%% - -#define found_syllable(syllable_type) \ - HB_STMT_START { \ - if (0) fprintf (stderr, "syllable %d..%d %s\n", last, p+1, #syllable_type); \ - for (unsigned int i = last; i < p+1; i++) \ - info[i].syllable() = (syllable_serial << 4) | syllable_type; \ - last = p+1; \ - syllable_serial++; \ - if (unlikely (syllable_serial == 16)) syllable_serial = 1; \ - } HB_STMT_END - -static void -find_syllables (hb_buffer_t *buffer) -{ - unsigned int p, pe, eof, ts HB_UNUSED, te HB_UNUSED, act HB_UNUSED; - int cs; - hb_glyph_info_t *info = buffer->info; - %%{ - write init; - getkey info[p].indic_category(); - }%% - - p = 0; - pe = eof = buffer->len; - - unsigned int last = 0; - unsigned int syllable_serial = 1; - %%{ - write exec; - }%% -} - -#endif /* HB_OT_SHAPE_COMPLEX_INDIC_MACHINE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-indic-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-indic-private.hh deleted file mode 100644 index 39268b14533..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-indic-private.hh +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_SHAPE_COMPLEX_INDIC_PRIVATE_HH -#define HB_OT_SHAPE_COMPLEX_INDIC_PRIVATE_HH - -#include "hb-private.hh" - - -#include "hb-ot-shape-complex-private.hh" -#include "hb-ot-shape-private.hh" /* XXX Remove */ - - -#define INDIC_TABLE_ELEMENT_TYPE uint16_t - -/* Cateories used in the OpenType spec: - * https://www.microsoft.com/typography/otfntdev/devanot/shaping.aspx - */ -/* Note: This enum is duplicated in the -machine.rl source file. - * Not sure how to avoid duplication. */ -enum indic_category_t { - OT_X = 0, - OT_C, - OT_V, - OT_N, - OT_H, - OT_ZWNJ, - OT_ZWJ, - OT_M, - OT_SM, - OT_VD, - OT_A, - OT_NBSP, - OT_DOTTEDCIRCLE, /* Not in the spec, but special in Uniscribe. /Very very/ special! */ - OT_RS, /* Register Shifter, used in Khmer OT spec */ - OT_Coeng, - OT_Repha, - OT_Ra, /* Not explicitly listed in the OT spec, but used in the grammar. */ - OT_CM -}; - -/* Visual positions in a syllable from left to right. */ -enum indic_position_t { - POS_START, - - POS_RA_TO_BECOME_REPH, - POS_PRE_M, - POS_PRE_C, - - POS_BASE_C, - POS_AFTER_MAIN, - - POS_ABOVE_C, - - POS_BEFORE_SUB, - POS_BELOW_C, - POS_AFTER_SUB, - - POS_BEFORE_POST, - POS_POST_C, - POS_AFTER_POST, - - POS_FINAL_C, - POS_SMVD, - - POS_END -}; - -/* Categories used in IndicSyllabicCategory.txt from UCD. */ -enum indic_syllabic_category_t { - INDIC_SYLLABIC_CATEGORY_OTHER = OT_X, - - INDIC_SYLLABIC_CATEGORY_AVAGRAHA = OT_X, - INDIC_SYLLABIC_CATEGORY_BINDU = OT_SM, - INDIC_SYLLABIC_CATEGORY_CONSONANT = OT_C, - INDIC_SYLLABIC_CATEGORY_CONSONANT_DEAD = OT_C, - INDIC_SYLLABIC_CATEGORY_CONSONANT_FINAL = OT_CM, - INDIC_SYLLABIC_CATEGORY_CONSONANT_HEAD_LETTER = OT_C, - INDIC_SYLLABIC_CATEGORY_CONSONANT_MEDIAL = OT_CM, - INDIC_SYLLABIC_CATEGORY_CONSONANT_PLACEHOLDER = OT_NBSP, - INDIC_SYLLABIC_CATEGORY_CONSONANT_SUBJOINED = OT_C, - INDIC_SYLLABIC_CATEGORY_CONSONANT_REPHA = OT_Repha, - INDIC_SYLLABIC_CATEGORY_MODIFYING_LETTER = OT_X, - INDIC_SYLLABIC_CATEGORY_NUKTA = OT_N, - INDIC_SYLLABIC_CATEGORY_REGISTER_SHIFTER = OT_RS, - INDIC_SYLLABIC_CATEGORY_TONE_LETTER = OT_X, - INDIC_SYLLABIC_CATEGORY_TONE_MARK = OT_N, - INDIC_SYLLABIC_CATEGORY_VIRAMA = OT_H, - INDIC_SYLLABIC_CATEGORY_VISARGA = OT_SM, - INDIC_SYLLABIC_CATEGORY_VOWEL = OT_V, - INDIC_SYLLABIC_CATEGORY_VOWEL_DEPENDENT = OT_M, - INDIC_SYLLABIC_CATEGORY_VOWEL_INDEPENDENT = OT_V -}; - -/* Categories used in IndicSMatraCategory.txt from UCD */ -enum indic_matra_category_t { - INDIC_MATRA_CATEGORY_NOT_APPLICABLE = POS_END, - - INDIC_MATRA_CATEGORY_LEFT = POS_PRE_C, - INDIC_MATRA_CATEGORY_TOP = POS_ABOVE_C, - INDIC_MATRA_CATEGORY_BOTTOM = POS_BELOW_C, - INDIC_MATRA_CATEGORY_RIGHT = POS_POST_C, - - /* These should resolve to the position of the last part of the split sequence. */ - INDIC_MATRA_CATEGORY_BOTTOM_AND_RIGHT = INDIC_MATRA_CATEGORY_RIGHT, - INDIC_MATRA_CATEGORY_LEFT_AND_RIGHT = INDIC_MATRA_CATEGORY_RIGHT, - INDIC_MATRA_CATEGORY_TOP_AND_BOTTOM = INDIC_MATRA_CATEGORY_BOTTOM, - INDIC_MATRA_CATEGORY_TOP_AND_BOTTOM_AND_RIGHT = INDIC_MATRA_CATEGORY_RIGHT, - INDIC_MATRA_CATEGORY_TOP_AND_LEFT = INDIC_MATRA_CATEGORY_TOP, - INDIC_MATRA_CATEGORY_TOP_AND_LEFT_AND_RIGHT = INDIC_MATRA_CATEGORY_RIGHT, - INDIC_MATRA_CATEGORY_TOP_AND_RIGHT = INDIC_MATRA_CATEGORY_RIGHT, - - INDIC_MATRA_CATEGORY_INVISIBLE = INDIC_MATRA_CATEGORY_NOT_APPLICABLE, - INDIC_MATRA_CATEGORY_OVERSTRUCK = POS_AFTER_MAIN, - INDIC_MATRA_CATEGORY_VISUAL_ORDER_LEFT = POS_PRE_M -}; - -/* Note: We use ASSERT_STATIC_EXPR_ZERO() instead of ASSERT_STATIC_EXPR() and the comma operation - * because gcc fails to optimize the latter and fills the table in at runtime. */ -#define INDIC_COMBINE_CATEGORIES(S,M) \ - (ASSERT_STATIC_EXPR_ZERO (M == INDIC_MATRA_CATEGORY_NOT_APPLICABLE || (S == INDIC_SYLLABIC_CATEGORY_VIRAMA || S == INDIC_SYLLABIC_CATEGORY_VOWEL_DEPENDENT)) + \ - ASSERT_STATIC_EXPR_ZERO (S < 255 && M < 255) + \ - ((M << 8) | S)) - -HB_INTERNAL INDIC_TABLE_ELEMENT_TYPE -hb_indic_get_categories (hb_codepoint_t u); - -#endif /* HB_OT_SHAPE_COMPLEX_INDIC_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-indic-table.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-indic-table.cc deleted file mode 100644 index 18a022bc507..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-indic-table.cc +++ /dev/null @@ -1,869 +0,0 @@ -/* == Start of generated table == */ -/* - * The following table is generated by running: - * - * ./gen-indic-table.py IndicSyllabicCategory.txt IndicMatraCategory.txt Blocks.txt - * - * on files with these headers: - * - * # IndicSyllabicCategory-6.2.0.txt - * # Date: 2012-05-15, 21:12:00 GMT [KW] - * # IndicMatraCategory-6.2.0.txt - * # Date: 2012-05-15, 21:10:00 GMT [KW] - * # Blocks-6.2.0.txt - * # Date: 2012-05-14, 22:42:00 GMT [KW, LI] - */ - -#include "hb-ot-shape-complex-indic-private.hh" - - -#define ISC_A INDIC_SYLLABIC_CATEGORY_AVAGRAHA /* 11 chars; Avagraha */ -#define ISC_Bi INDIC_SYLLABIC_CATEGORY_BINDU /* 34 chars; Bindu */ -#define ISC_C INDIC_SYLLABIC_CATEGORY_CONSONANT /* 123 chars; Consonant */ -#define ISC_CD INDIC_SYLLABIC_CATEGORY_CONSONANT_DEAD /* 2 chars; Consonant_Dead */ -#define ISC_CF INDIC_SYLLABIC_CATEGORY_CONSONANT_FINAL /* 17 chars; Consonant_Final */ -#define ISC_CHL INDIC_SYLLABIC_CATEGORY_CONSONANT_HEAD_LETTER /* 1 chars; Consonant_Head_Letter */ -#define ISC_CM INDIC_SYLLABIC_CATEGORY_CONSONANT_MEDIAL /* 12 chars; Consonant_Medial */ -#define ISC_CP INDIC_SYLLABIC_CATEGORY_CONSONANT_PLACEHOLDER /* 4 chars; Consonant_Placeholder */ -#define ISC_CR INDIC_SYLLABIC_CATEGORY_CONSONANT_REPHA /* 5 chars; Consonant_Repha */ -#define ISC_CS INDIC_SYLLABIC_CATEGORY_CONSONANT_SUBJOINED /* 10 chars; Consonant_Subjoined */ -#define ISC_ML INDIC_SYLLABIC_CATEGORY_MODIFYING_LETTER /* 1 chars; Modifying_Letter */ -#define ISC_N INDIC_SYLLABIC_CATEGORY_NUKTA /* 12 chars; Nukta */ -#define ISC_x INDIC_SYLLABIC_CATEGORY_OTHER /* 1 chars; Other */ -#define ISC_RS INDIC_SYLLABIC_CATEGORY_REGISTER_SHIFTER /* 1 chars; Register_Shifter */ -#define ISC_TL INDIC_SYLLABIC_CATEGORY_TONE_LETTER /* 3 chars; Tone_Letter */ -#define ISC_TM INDIC_SYLLABIC_CATEGORY_TONE_MARK /* 16 chars; Tone_Mark */ -#define ISC_V INDIC_SYLLABIC_CATEGORY_VIRAMA /* 34 chars; Virama */ -#define ISC_Vs INDIC_SYLLABIC_CATEGORY_VISARGA /* 25 chars; Visarga */ -#define ISC_Vo INDIC_SYLLABIC_CATEGORY_VOWEL /* 5 chars; Vowel */ -#define ISC_M INDIC_SYLLABIC_CATEGORY_VOWEL_DEPENDENT /* 165 chars; Vowel_Dependent */ -#define ISC_VI INDIC_SYLLABIC_CATEGORY_VOWEL_INDEPENDENT /* 59 chars; Vowel_Independent */ - -#define IMC_B INDIC_MATRA_CATEGORY_BOTTOM /* 65 chars; Bottom */ -#define IMC_BR INDIC_MATRA_CATEGORY_BOTTOM_AND_RIGHT /* 2 chars; Bottom_And_Right */ -#define IMC_I INDIC_MATRA_CATEGORY_INVISIBLE /* 6 chars; Invisible */ -#define IMC_L INDIC_MATRA_CATEGORY_LEFT /* 30 chars; Left */ -#define IMC_LR INDIC_MATRA_CATEGORY_LEFT_AND_RIGHT /* 8 chars; Left_And_Right */ -#define IMC_x INDIC_MATRA_CATEGORY_NOT_APPLICABLE /* 1 chars; Not_Applicable */ -#define IMC_O INDIC_MATRA_CATEGORY_OVERSTRUCK /* 2 chars; Overstruck */ -#define IMC_R INDIC_MATRA_CATEGORY_RIGHT /* 75 chars; Right */ -#define IMC_T INDIC_MATRA_CATEGORY_TOP /* 83 chars; Top */ -#define IMC_TB INDIC_MATRA_CATEGORY_TOP_AND_BOTTOM /* 6 chars; Top_And_Bottom */ -#define IMC_TBR INDIC_MATRA_CATEGORY_TOP_AND_BOTTOM_AND_RIGHT /* 1 chars; Top_And_Bottom_And_Right */ -#define IMC_TL INDIC_MATRA_CATEGORY_TOP_AND_LEFT /* 4 chars; Top_And_Left */ -#define IMC_TLR INDIC_MATRA_CATEGORY_TOP_AND_LEFT_AND_RIGHT /* 2 chars; Top_And_Left_And_Right */ -#define IMC_TR INDIC_MATRA_CATEGORY_TOP_AND_RIGHT /* 8 chars; Top_And_Right */ -#define IMC_VOL INDIC_MATRA_CATEGORY_VISUAL_ORDER_LEFT /* 5 chars; Visual_Order_Left */ - -#define _(S,M) INDIC_COMBINE_CATEGORIES (ISC_##S, IMC_##M) - - -static const INDIC_TABLE_ELEMENT_TYPE indic_table[] = { - - -#define indic_offset_0x0900 0 - - - /* Devanagari (0900..097F) */ - - /* 0900 */ _(Bi,x), _(Bi,x), _(Bi,x), _(Vs,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), - /* 0908 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), - /* 0910 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), - /* 0918 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0920 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0928 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0930 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0938 */ _(C,x), _(C,x), _(M,T), _(M,R), _(N,x), _(A,x), _(M,R), _(M,L), - /* 0940 */ _(M,R), _(M,B), _(M,B), _(M,B), _(M,B), _(M,T), _(M,T), _(M,T), - /* 0948 */ _(M,T), _(M,R), _(M,R), _(M,R), _(M,R), _(V,B), _(M,L), _(M,R), - /* 0950 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(M,T), _(M,B), _(M,B), - /* 0958 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0960 */ _(VI,x), _(VI,x), _(M,B), _(M,B), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0968 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0970 */ _(x,x), _(x,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), - /* 0978 */ _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - - /* Bengali (0980..09FF) */ - - /* 0980 */ _(x,x), _(Bi,x), _(Bi,x), _(Vs,x), _(x,x), _(VI,x), _(VI,x), _(VI,x), - /* 0988 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(x,x), _(x,x), _(VI,x), - /* 0990 */ _(VI,x), _(x,x), _(x,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), - /* 0998 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 09A0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 09A8 */ _(C,x), _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 09B0 */ _(C,x), _(x,x), _(C,x), _(x,x), _(x,x), _(x,x), _(C,x), _(C,x), - /* 09B8 */ _(C,x), _(C,x), _(x,x), _(x,x), _(N,x), _(A,x), _(M,R), _(M,L), - /* 09C0 */ _(M,R), _(M,B), _(M,B), _(M,B), _(M,B), _(x,x), _(x,x), _(M,L), - /* 09C8 */ _(M,L), _(x,x), _(x,x), _(M,LR), _(M,LR), _(V,B), _(CD,x), _(x,x), - /* 09D0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(M,R), - /* 09D8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(C,x), _(C,x), _(x,x), _(C,x), - /* 09E0 */ _(VI,x), _(VI,x), _(M,B), _(M,B), _(x,x), _(x,x), _(x,x), _(x,x), - /* 09E8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 09F0 */ _(C,x), _(C,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 09F8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Gurmukhi (0A00..0A7F) */ - - /* 0A00 */ _(x,x), _(Bi,x), _(Bi,x), _(Vs,x), _(x,x), _(VI,x), _(VI,x), _(VI,x), - /* 0A08 */ _(VI,x), _(VI,x), _(VI,x), _(x,x), _(x,x), _(x,x), _(x,x), _(VI,x), - /* 0A10 */ _(VI,x), _(x,x), _(x,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), - /* 0A18 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0A20 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0A28 */ _(C,x), _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0A30 */ _(C,x), _(x,x), _(C,x), _(C,x), _(x,x), _(C,x), _(C,x), _(x,x), - /* 0A38 */ _(C,x), _(C,x), _(x,x), _(x,x), _(N,x), _(x,x), _(M,R), _(M,L), - /* 0A40 */ _(M,R), _(M,B), _(M,B), _(x,x), _(x,x), _(x,x), _(x,x), _(M,T), - /* 0A48 */ _(M,T), _(x,x), _(x,x), _(M,T), _(M,T), _(V,B), _(x,x), _(x,x), - /* 0A50 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0A58 */ _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), _(x,x), _(C,x), _(x,x), - /* 0A60 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0A68 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0A70 */ _(Bi,x), _(x,x), _(CP,x), _(CP,x), _(x,x), _(CM,x), _(x,x), _(x,x), - /* 0A78 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Gujarati (0A80..0AFF) */ - - /* 0A80 */ _(x,x), _(Bi,x), _(Bi,x), _(Vs,x), _(x,x), _(VI,x), _(VI,x), _(VI,x), - /* 0A88 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(x,x), _(VI,x), - /* 0A90 */ _(VI,x), _(VI,x), _(x,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), - /* 0A98 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0AA0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0AA8 */ _(C,x), _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0AB0 */ _(C,x), _(x,x), _(C,x), _(C,x), _(x,x), _(C,x), _(C,x), _(C,x), - /* 0AB8 */ _(C,x), _(C,x), _(x,x), _(x,x), _(N,x), _(A,x), _(M,R), _(M,L), - /* 0AC0 */ _(M,R), _(M,B), _(M,B), _(M,B), _(M,B), _(M,T), _(x,x), _(M,T), - /* 0AC8 */ _(M,T), _(M,TR), _(x,x), _(M,R), _(M,R), _(V,B), _(x,x), _(x,x), - /* 0AD0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0AD8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0AE0 */ _(VI,x), _(VI,x), _(M,B), _(M,B), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0AE8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0AF0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0AF8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Oriya (0B00..0B7F) */ - - /* 0B00 */ _(x,x), _(Bi,x), _(Bi,x), _(Vs,x), _(x,x), _(VI,x), _(VI,x), _(VI,x), - /* 0B08 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(x,x), _(x,x), _(VI,x), - /* 0B10 */ _(VI,x), _(x,x), _(x,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), - /* 0B18 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0B20 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0B28 */ _(C,x), _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0B30 */ _(C,x), _(x,x), _(C,x), _(C,x), _(x,x), _(C,x), _(C,x), _(C,x), - /* 0B38 */ _(C,x), _(C,x), _(x,x), _(x,x), _(N,x), _(A,x), _(M,R), _(M,T), - /* 0B40 */ _(M,R), _(M,B), _(M,B), _(M,B), _(M,B), _(x,x), _(x,x), _(M,L), - /* 0B48 */ _(M,TL), _(x,x), _(x,x), _(M,LR),_(M,TLR), _(V,B), _(x,x), _(x,x), - /* 0B50 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(M,T), _(M,TR), - /* 0B58 */ _(x,x), _(x,x), _(x,x), _(x,x), _(C,x), _(C,x), _(x,x), _(C,x), - /* 0B60 */ _(VI,x), _(VI,x), _(M,B), _(M,B), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0B68 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0B70 */ _(x,x), _(C,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0B78 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Tamil (0B80..0BFF) */ - - /* 0B80 */ _(x,x), _(x,x), _(Bi,x), _(ML,x), _(x,x), _(VI,x), _(VI,x), _(VI,x), - /* 0B88 */ _(VI,x), _(VI,x), _(VI,x), _(x,x), _(x,x), _(x,x), _(VI,x), _(VI,x), - /* 0B90 */ _(VI,x), _(x,x), _(VI,x), _(VI,x), _(VI,x), _(C,x), _(x,x), _(x,x), - /* 0B98 */ _(x,x), _(C,x), _(C,x), _(x,x), _(C,x), _(x,x), _(C,x), _(C,x), - /* 0BA0 */ _(x,x), _(x,x), _(x,x), _(C,x), _(C,x), _(x,x), _(x,x), _(x,x), - /* 0BA8 */ _(C,x), _(C,x), _(C,x), _(x,x), _(x,x), _(x,x), _(C,x), _(C,x), - /* 0BB0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0BB8 */ _(C,x), _(C,x), _(x,x), _(x,x), _(x,x), _(x,x), _(M,R), _(M,R), - /* 0BC0 */ _(M,T), _(M,B), _(M,B), _(x,x), _(x,x), _(x,x), _(M,L), _(M,L), - /* 0BC8 */ _(M,L), _(x,x), _(M,LR), _(M,LR), _(M,LR), _(V,T), _(x,x), _(x,x), - /* 0BD0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(M,R), - /* 0BD8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0BE0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0BE8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0BF0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0BF8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Telugu (0C00..0C7F) */ - - /* 0C00 */ _(x,x), _(Bi,x), _(Bi,x), _(Vs,x), _(x,x), _(VI,x), _(VI,x), _(VI,x), - /* 0C08 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(x,x), _(VI,x), _(VI,x), - /* 0C10 */ _(VI,x), _(x,x), _(VI,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), - /* 0C18 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0C20 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0C28 */ _(C,x), _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0C30 */ _(C,x), _(C,x), _(C,x), _(C,x), _(x,x), _(C,x), _(C,x), _(C,x), - /* 0C38 */ _(C,x), _(C,x), _(x,x), _(x,x), _(x,x), _(A,x), _(M,T), _(M,T), - /* 0C40 */ _(M,T), _(M,R), _(M,R), _(M,R), _(M,R), _(x,x), _(M,T), _(M,T), - /* 0C48 */ _(M,TB), _(x,x), _(M,T), _(M,T), _(M,T), _(V,T), _(x,x), _(x,x), - /* 0C50 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(M,T), _(M,B), _(x,x), - /* 0C58 */ _(C,x), _(C,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0C60 */ _(VI,x), _(VI,x), _(M,B), _(M,B), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0C68 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0C70 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0C78 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Kannada (0C80..0CFF) */ - - /* 0C80 */ _(x,x), _(x,x), _(Bi,x), _(Vs,x), _(x,x), _(VI,x), _(VI,x), _(VI,x), - /* 0C88 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(x,x), _(VI,x), _(VI,x), - /* 0C90 */ _(VI,x), _(x,x), _(VI,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), - /* 0C98 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0CA0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0CA8 */ _(C,x), _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0CB0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(x,x), _(C,x), _(C,x), _(C,x), - /* 0CB8 */ _(C,x), _(C,x), _(x,x), _(x,x), _(N,x), _(A,x), _(M,R), _(M,T), - /* 0CC0 */ _(M,TR), _(M,R), _(M,R), _(M,R), _(M,R), _(x,x), _(M,T), _(M,TR), - /* 0CC8 */ _(M,TR), _(x,x), _(M,TR), _(M,TR), _(M,T), _(V,T), _(x,x), _(x,x), - /* 0CD0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(M,R), _(M,R), _(x,x), - /* 0CD8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(C,x), _(x,x), - /* 0CE0 */ _(VI,x), _(VI,x), _(M,B), _(M,B), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0CE8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0CF0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0CF8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Malayalam (0D00..0D7F) */ - - /* 0D00 */ _(x,x), _(x,x), _(Bi,x), _(Vs,x), _(x,x), _(VI,x), _(VI,x), _(VI,x), - /* 0D08 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(x,x), _(VI,x), _(VI,x), - /* 0D10 */ _(VI,x), _(x,x), _(VI,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), - /* 0D18 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0D20 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0D28 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0D30 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0D38 */ _(C,x), _(C,x), _(C,x), _(x,x), _(x,x), _(A,x), _(M,R), _(M,R), - /* 0D40 */ _(M,R), _(M,R), _(M,R), _(M,B), _(M,B), _(x,x), _(M,L), _(M,L), - /* 0D48 */ _(M,L), _(x,x), _(M,LR), _(M,LR), _(M,LR), _(V,T), _(CR,x), _(x,x), - /* 0D50 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(M,R), - /* 0D58 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0D60 */ _(VI,x), _(VI,x), _(M,B), _(M,B), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0D68 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0D70 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0D78 */ _(x,x), _(x,x), _(CD,x), _(CD,x), _(CD,x), _(CD,x), _(CD,x), _(CD,x), - - /* Sinhala (0D80..0DFF) */ - - /* 0D80 */ _(x,x), _(x,x), _(Bi,x), _(Vs,x), _(x,x), _(VI,x), _(VI,x), _(VI,x), - /* 0D88 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), - /* 0D90 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(x,x), - /* 0D98 */ _(x,x), _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0DA0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0DA8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0DB0 */ _(C,x), _(C,x), _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0DB8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(x,x), _(C,x), _(x,x), _(x,x), - /* 0DC0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(x,x), - /* 0DC8 */ _(x,x), _(x,x), _(V,T), _(x,x), _(x,x), _(x,x), _(x,x), _(M,R), - /* 0DD0 */ _(M,R), _(M,R), _(M,T), _(M,T), _(M,B), _(x,x), _(M,B), _(x,x), - /* 0DD8 */ _(M,R), _(M,L), _(M,TL), _(M,L), _(M,LR), _(M,LR), _(M,LR), _(M,R), - /* 0DE0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0DE8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0DF0 */ _(x,x), _(x,x), _(M,R), _(M,R), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0DF8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Thai (0E00..0E7F) */ - - /* 0E00 */ _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0E08 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0E10 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0E18 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0E20 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0E28 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(x,x), - /* 0E30 */ _(M,R), _(M,T), _(M,R), _(M,R), _(M,T), _(M,T), _(M,T), _(M,T), - /* 0E38 */ _(M,B), _(M,B), _(V,B), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0E40 */_(M,VOL),_(M,VOL),_(M,VOL),_(M,VOL),_(M,VOL), _(M,R), _(x,x), _(M,T), - /* 0E48 */ _(TM,x), _(TM,x), _(TM,x), _(TM,x), _(x,x), _(Bi,x), _(V,T), _(x,x), - /* 0E50 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0E58 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0E60 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0E68 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0E70 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0E78 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Lao (0E80..0EFF) */ - - /* 0E80 */ _(x,x), _(C,x), _(C,x), _(x,x), _(C,x), _(x,x), _(x,x), _(C,x), - /* 0E88 */ _(C,x), _(x,x), _(C,x), _(x,x), _(x,x), _(C,x), _(x,x), _(x,x), - /* 0E90 */ _(x,x), _(x,x), _(x,x), _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0E98 */ _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0EA0 */ _(x,x), _(C,x), _(C,x), _(C,x), _(x,x), _(C,x), _(x,x), _(C,x), - /* 0EA8 */ _(x,x), _(x,x), _(C,x), _(C,x), _(x,x), _(C,x), _(C,x), _(x,x), - /* 0EB0 */ _(M,R), _(M,T), _(M,R), _(M,R), _(M,T), _(M,T), _(M,T), _(M,T), - /* 0EB8 */ _(M,B), _(M,B), _(x,x), _(M,T), _(CM,x), _(CM,x), _(x,x), _(x,x), - /* 0EC0 */_(M,VOL),_(M,VOL),_(M,VOL),_(M,VOL),_(M,VOL), _(x,x), _(x,x), _(x,x), - /* 0EC8 */ _(TM,x), _(TM,x), _(TM,x), _(TM,x), _(x,x), _(Bi,x), _(x,x), _(x,x), - /* 0ED0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0ED8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(C,x), _(C,x), _(x,x), _(x,x), - /* 0EE0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0EE8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0EF0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0EF8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Tibetan (0F00..0FFF) */ - - /* 0F00 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0F08 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0F10 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0F18 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0F20 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0F28 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0F30 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0F38 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0F40 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0F48 */ _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0F50 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0F58 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0F60 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 0F68 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(x,x), _(x,x), _(x,x), - /* 0F70 */ _(x,x), _(M,B), _(M,T), _(M,TB), _(M,B), _(M,B), _(M,TB), _(M,TB), - /* 0F78 */ _(M,TB), _(M,TB), _(M,T), _(M,T), _(M,T), _(M,T), _(Bi,x), _(Vs,x), - /* 0F80 */ _(M,T), _(M,TB), _(Bi,x), _(Bi,x), _(V,B), _(A,x), _(x,x), _(x,x), - /* 0F88 */_(CHL,x),_(CHL,x),_(CHL,x),_(CHL,x),_(CHL,x), _(CS,x), _(CS,x), _(CS,x), - /* 0F90 */ _(CS,x), _(CS,x), _(CS,x), _(CS,x), _(CS,x), _(CS,x), _(CS,x), _(CS,x), - /* 0F98 */ _(x,x), _(CS,x), _(CS,x), _(CS,x), _(CS,x), _(CS,x), _(CS,x), _(CS,x), - /* 0FA0 */ _(CS,x), _(CS,x), _(CS,x), _(CS,x), _(CS,x), _(CS,x), _(CS,x), _(CS,x), - /* 0FA8 */ _(CS,x), _(CS,x), _(CS,x), _(CS,x), _(CS,x), _(CS,x), _(CS,x), _(CS,x), - /* 0FB0 */ _(CS,x), _(CS,x), _(CS,x), _(CS,x), _(CS,x), _(CS,x), _(CS,x), _(CS,x), - /* 0FB8 */ _(CS,x), _(CS,x), _(CS,x), _(CS,x), _(CS,x), _(x,x), _(x,x), _(x,x), - /* 0FC0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0FC8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0FD0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0FD8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0FE0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0FE8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0FF0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 0FF8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Myanmar (1000..109F) */ - - /* 1000 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1008 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1010 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1018 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1020 */ _(C,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), - /* 1028 */ _(VI,x), _(VI,x), _(VI,x), _(M,R), _(M,R), _(M,T), _(M,T), _(M,B), - /* 1030 */ _(M,B), _(M,L), _(M,T), _(M,T), _(M,T), _(M,T), _(Bi,x), _(TM,x), - /* 1038 */ _(Vs,x), _(V,I), _(V,T), _(CM,x), _(CM,x), _(CM,x), _(CM,x), _(C,x), - /* 1040 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1048 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1050 */ _(C,x), _(C,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(M,R), _(M,R), - /* 1058 */ _(M,B), _(M,B), _(C,x), _(C,x), _(C,x), _(C,x), _(CM,x), _(CM,x), - /* 1060 */ _(CM,x), _(C,x), _(M,R), _(TM,x), _(TM,x), _(C,x), _(C,x), _(M,R), - /* 1068 */ _(M,R), _(TM,x), _(TM,x), _(TM,x), _(TM,x), _(TM,x), _(C,x), _(C,x), - /* 1070 */ _(C,x), _(M,T), _(M,T), _(M,T), _(M,T), _(C,x), _(C,x), _(C,x), - /* 1078 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1080 */ _(C,x), _(C,x), _(CM,x), _(M,R), _(M,L), _(M,T), _(M,T), _(TM,x), - /* 1088 */ _(TM,x), _(TM,x), _(TM,x), _(TM,x), _(TM,x), _(TM,x), _(C,x), _(TM,x), - /* 1090 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1098 */ _(x,x), _(x,x), _(TM,x), _(TM,x), _(M,R), _(M,T), _(x,x), _(x,x), - -#define indic_offset_0x1700 1952 - - - /* Tagalog (1700..171F) */ - - /* 1700 */ _(VI,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1708 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(x,x), _(C,x), _(C,x), - /* 1710 */ _(C,x), _(C,x), _(M,T), _(M,B), _(V,B), _(x,x), _(x,x), _(x,x), - /* 1718 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Hanunoo (1720..173F) */ - - /* 1720 */ _(VI,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1728 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1730 */ _(C,x), _(C,x), _(M,T), _(M,B), _(V,B), _(x,x), _(x,x), _(x,x), - /* 1738 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Buhid (1740..175F) */ - - /* 1740 */ _(VI,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1748 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1750 */ _(C,x), _(C,x), _(M,T), _(M,B), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1758 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Tagbanwa (1760..177F) */ - - /* 1760 */ _(VI,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1768 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(x,x), _(C,x), _(C,x), - /* 1770 */ _(C,x), _(x,x), _(M,T), _(M,B), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1778 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Khmer (1780..17FF) */ - - /* 1780 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1788 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1790 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1798 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 17A0 */ _(C,x), _(C,x), _(C,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), - /* 17A8 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), - /* 17B0 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(x,x), _(x,x), _(M,R), _(M,T), - /* 17B8 */ _(M,T), _(M,T), _(M,T), _(M,B), _(M,B), _(M,B), _(M,TL),_(M,TLR), - /* 17C0 */ _(M,LR), _(M,L), _(M,L), _(M,L), _(M,LR), _(M,LR), _(Bi,x), _(Vs,x), - /* 17C8 */ _(M,R), _(RS,x), _(RS,x), _(x,x), _(CR,x), _(x,x), _(x,x), _(x,x), - /* 17D0 */ _(x,x), _(V,T), _(V,I), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 17D8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(A,x), _(x,x), _(x,x), _(x,x), - /* 17E0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 17E8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 17F0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 17F8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - -#define indic_offset_0x1900 2208 - - - /* Limbu (1900..194F) */ - - /* 1900 */ _(CP,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1908 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1910 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1918 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(x,x), _(x,x), _(x,x), - /* 1920 */ _(M,T), _(M,T), _(M,B), _(M,R), _(M,R), _(M,TR), _(M,TR), _(M,T), - /* 1928 */ _(M,T), _(CS,x), _(CS,x), _(CS,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1930 */ _(CF,x), _(CF,x), _(Bi,x), _(CF,x), _(CF,x), _(CF,x), _(CF,x), _(CF,x), - /* 1938 */ _(CF,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1940 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1948 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Tai Le (1950..197F) */ - - /* 1950 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1958 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1960 */ _(C,x), _(C,x), _(C,x), _(Vo,x), _(Vo,x), _(Vo,x), _(Vo,x), _(Vo,x), - /* 1968 */ _(Vo,x), _(Vo,x), _(Vo,x), _(Vo,x), _(Vo,x), _(Vo,x), _(x,x), _(x,x), - /* 1970 */ _(TL,x), _(TL,x), _(TL,x), _(TL,x), _(TL,x), _(x,x), _(x,x), _(x,x), - /* 1978 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* New Tai Lue (1980..19DF) */ - - /* 1980 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1988 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1990 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1998 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 19A0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 19A8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 19B0 */ _(M,R), _(M,R), _(M,R), _(M,R), _(M,R), _(M,L), _(M,L), _(M,L), - /* 19B8 */ _(M,R), _(M,R), _(M,L), _(M,R), _(M,R), _(M,R), _(M,R), _(M,R), - /* 19C0 */ _(M,R), _(CF,x), _(CF,x), _(CF,x), _(CF,x), _(CF,x), _(CF,x), _(CF,x), - /* 19C8 */ _(TM,x), _(TM,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 19D0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 19D8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* FILLER (19E0..19FF) */ - - /* 19E0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 19E8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 19F0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 19F8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Buginese (1A00..1A1F) */ - - /* 1A00 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1A08 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1A10 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(M,T), - /* 1A18 */ _(M,B), _(M,L), _(M,R), _(M,L), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Tai Tham (1A20..1AAF) */ - - /* 1A20 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1A28 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1A30 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1A38 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1A40 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1A48 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(VI,x), _(VI,x), _(VI,x), - /* 1A50 */ _(VI,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(CM,x), _(CM,x), _(CF,x), - /* 1A58 */ _(CF,x), _(CF,x), _(CF,x), _(CF,x), _(CF,x), _(CF,x), _(CF,x), _(x,x), - /* 1A60 */ _(V,I), _(M,R), _(M,T), _(M,R), _(M,R), _(M,T), _(M,T), _(M,T), - /* 1A68 */ _(M,T), _(M,B), _(M,B), _(M,T), _(M,B), _(M,R), _(M,L), _(M,L), - /* 1A70 */ _(M,L), _(M,L), _(M,L), _(M,T), _(M,T), _(TM,x), _(TM,x), _(TM,x), - /* 1A78 */ _(TM,x), _(TM,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1A80 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1A88 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1A90 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1A98 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1AA0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1AA8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - -#define indic_offset_0x1b00 2640 - - - /* Balinese (1B00..1B7F) */ - - /* 1B00 */ _(Bi,x), _(Bi,x), _(Bi,x), _(CR,x), _(Vs,x), _(VI,x), _(VI,x), _(VI,x), - /* 1B08 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), - /* 1B10 */ _(VI,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1B18 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1B20 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1B28 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1B30 */ _(C,x), _(C,x), _(C,x), _(C,x), _(N,x), _(M,R), _(M,T), _(M,T), - /* 1B38 */ _(M,B), _(M,B), _(M,B), _(M,BR), _(M,TB),_(M,TBR), _(M,L), _(M,L), - /* 1B40 */ _(M,LR), _(M,LR), _(M,T), _(M,TR), _(V,R), _(C,x), _(C,x), _(C,x), - /* 1B48 */ _(C,x), _(C,x), _(C,x), _(C,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1B50 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1B58 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1B60 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1B68 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1B70 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1B78 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Sundanese (1B80..1BBF) */ - - /* 1B80 */ _(Bi,x), _(CR,x), _(Vs,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), - /* 1B88 */ _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1B90 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1B98 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1BA0 */ _(C,x), _(CS,x), _(CS,x), _(CS,x), _(M,T), _(M,B), _(M,L), _(M,R), - /* 1BA8 */ _(M,T), _(M,T), _(V,R), _(V,x), _(CS,x), _(CS,x), _(C,x), _(C,x), - /* 1BB0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1BB8 */ _(x,x), _(x,x), _(A,x), _(C,x), _(C,x), _(C,x), _(CF,x), _(CF,x), - - /* Batak (1BC0..1BFF) */ - - /* 1BC0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1BC8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1BD0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1BD8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1BE0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(VI,x), _(VI,x), _(N,x), _(M,x), - /* 1BE8 */ _(M,x), _(M,x), _(M,x), _(M,x), _(M,x), _(M,x), _(M,x), _(M,x), - /* 1BF0 */ _(CF,x), _(CF,x), _(V,R), _(V,R), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1BF8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Lepcha (1C00..1C4F) */ - - /* 1C00 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1C08 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1C10 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1C18 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 1C20 */ _(C,x), _(C,x), _(C,x), _(C,x), _(CS,x), _(CS,x), _(M,R), _(M,L), - /* 1C28 */ _(M,L), _(M,TL), _(M,R), _(M,R), _(M,B), _(CF,x), _(CF,x), _(CF,x), - /* 1C30 */ _(CF,x), _(CF,x), _(CF,x), _(CF,x), _(Bi,x), _(Bi,x), _(x,x), _(N,x), - /* 1C38 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1C40 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1C48 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(C,x), _(C,x), _(C,x), - -#define indic_offset_0x1cd0 2976 - - - /* Vedic Extensions (1CD0..1CFF) */ - - /* 1CD0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1CD8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1CE0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1CE8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1CF0 */ _(x,x), _(x,x), _(Vs,x), _(Vs,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 1CF8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - -#define indic_offset_0xa800 3024 - - - /* Syloti Nagri (A800..A82F) */ - - /* A800 */ _(VI,x), _(VI,x), _(x,x), _(VI,x), _(VI,x), _(VI,x), _(V,T), _(C,x), - /* A808 */ _(C,x), _(C,x), _(C,x), _(Bi,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* A810 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* A818 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* A820 */ _(C,x), _(C,x), _(C,x), _(M,R), _(M,R), _(M,B), _(M,T), _(M,R), - /* A828 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* FILLER (A830..A83F) */ - - /* A830 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* A838 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Phags-pa (A840..A87F) */ - - /* A840 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* A848 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* A850 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* A858 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(Vo,x), _(Vo,x), - /* A860 */ _(Vo,x), _(Vo,x), _(C,x), _(C,x), _(C,x), _(C,x), _(Vo,x), _(CS,x), - /* A868 */ _(CS,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* A870 */ _(C,x), _(CS,x), _(C,x), _(Bi,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* A878 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Saurashtra (A880..A8DF) */ - - /* A880 */ _(Bi,x), _(Vs,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), - /* A888 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), - /* A890 */ _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* A898 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* A8A0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* A8A8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* A8B0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(CF,x), _(M,R), _(M,R), _(M,R), - /* A8B8 */ _(M,R), _(M,R), _(M,R), _(M,R), _(M,R), _(M,R), _(M,R), _(M,R), - /* A8C0 */ _(M,R), _(M,R), _(M,R), _(M,R), _(V,B), _(x,x), _(x,x), _(x,x), - /* A8C8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* A8D0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* A8D8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* FILLER (A8E0..A8FF) */ - - /* A8E0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* A8E8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* A8F0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* A8F8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Kayah Li (A900..A92F) */ - - /* A900 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* A908 */ _(x,x), _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* A910 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* A918 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* A920 */ _(C,x), _(C,x), _(Vo,x), _(Vo,x), _(Vo,x), _(Vo,x), _(Vo,x), _(Vo,x), - /* A928 */ _(Vo,x), _(Vo,x), _(Vo,x), _(TM,x), _(TM,x), _(TM,x), _(x,x), _(x,x), - - /* Rejang (A930..A95F) */ - - /* A930 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* A938 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* A940 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(M,B), - /* A948 */ _(M,B), _(M,B), _(M,T), _(M,B), _(M,B), _(M,B), _(M,B), _(CF,x), - /* A950 */ _(CF,x), _(CF,x), _(CF,x), _(V,R), _(x,x), _(x,x), _(x,x), _(x,x), - /* A958 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* FILLER (A960..A97F) */ - - /* A960 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* A968 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* A970 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* A978 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Javanese (A980..A9DF) */ - - /* A980 */ _(Bi,x), _(Bi,x), _(CR,x), _(Vs,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), - /* A988 */ _(VI,x), _(C,x), _(C,x), _(C,x), _(VI,x), _(VI,x), _(VI,x), _(C,x), - /* A990 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* A998 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* A9A0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* A9A8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* A9B0 */ _(C,x), _(C,x), _(C,x), _(N,x), _(M,R), _(M,R), _(M,T), _(M,T), - /* A9B8 */ _(M,B), _(M,B), _(M,L), _(M,L), _(M,T), _(CS,x), _(CM,x), _(CM,x), - /* A9C0 */ _(V,BR), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* A9C8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* A9D0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* A9D8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* FILLER (A9E0..A9FF) */ - - /* A9E0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* A9E8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* A9F0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* A9F8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Cham (AA00..AA5F) */ - - /* AA00 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(C,x), _(C,x), - /* AA08 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* AA10 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* AA18 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* AA20 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* AA28 */ _(C,x), _(M,T), _(M,T), _(M,T), _(M,T), _(M,B), _(M,T), _(M,L), - /* AA30 */ _(M,L), _(M,T), _(M,B), _(CM,x), _(CM,x), _(CM,x), _(CM,x), _(x,x), - /* AA38 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* AA40 */ _(CF,x), _(CF,x), _(CF,x), _(CF,x), _(CF,x), _(CF,x), _(CF,x), _(CF,x), - /* AA48 */ _(CF,x), _(CF,x), _(CF,x), _(CF,x), _(CF,x), _(CF,x), _(x,x), _(x,x), - /* AA50 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* AA58 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Myanmar Extended-A (AA60..AA7F) */ - - /* AA60 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* AA68 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* AA70 */ _(x,x), _(C,x), _(C,x), _(C,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* AA78 */ _(x,x), _(x,x), _(C,x), _(TM,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Tai Viet (AA80..AADF) */ - - /* AA80 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* AA88 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* AA90 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* AA98 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* AAA0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* AAA8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* AAB0 */ _(M,T), _(M,R), _(M,T), _(M,T), _(M,B),_(M,VOL),_(M,VOL), _(M,T), - /* AAB8 */ _(M,T),_(M,VOL), _(M,R),_(M,VOL),_(M,VOL), _(M,R), _(M,T), _(TM,x), - /* AAC0 */ _(TL,x), _(TM,x), _(TL,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* AAC8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* AAD0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* AAD8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Meetei Mayek Extensions (AAE0..AAFF) */ - - /* AAE0 */ _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* AAE8 */ _(C,x), _(C,x), _(C,x), _(M,L), _(M,B), _(M,T), _(M,L), _(M,R), - /* AAF0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(Vs,x), _(V,I), _(x,x), - /* AAF8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - -#define indic_offset_0xabc0 3792 - - - /* Meetei Mayek (ABC0..ABFF) */ - - /* ABC0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* ABC8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(VI,x), _(VI,x), - /* ABD0 */ _(C,x), _(VI,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* ABD8 */ _(C,x), _(C,x), _(C,x), _(CF,x), _(CF,x), _(CF,x), _(CF,x), _(CF,x), - /* ABE0 */ _(CF,x), _(CF,x), _(CF,x), _(M,R), _(M,R), _(M,T), _(M,R), _(M,R), - /* ABE8 */ _(M,B), _(M,R), _(M,R), _(x,x), _(TM,x), _(V,B), _(x,x), _(x,x), - /* ABF0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* ABF8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - -#define indic_offset_0x10a00 3856 - - - /* Kharoshthi (10A00..10A5F) */ - - /* 10A00 */ _(C,x), _(M,O), _(M,B), _(M,B), _(x,x), _(M,T), _(M,O), _(x,x), - /* 10A08 */ _(x,x), _(x,x), _(x,x), _(x,x), _(M,B), _(x,x), _(Bi,x), _(Vs,x), - /* 10A10 */ _(C,x), _(C,x), _(C,x), _(C,x), _(x,x), _(C,x), _(C,x), _(C,x), - /* 10A18 */ _(x,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 10A20 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 10A28 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 10A30 */ _(C,x), _(C,x), _(C,x), _(C,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 10A38 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(V,I), - /* 10A40 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 10A48 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 10A50 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 10A58 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - -#define indic_offset_0x11000 3952 - - - /* Brahmi (11000..1107F) */ - - /* 11000 */ _(Bi,x), _(Bi,x), _(Vs,x), _(x,x), _(x,x), _(VI,x), _(VI,x), _(VI,x), - /* 11008 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), - /* 11010 */ _(VI,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 11018 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 11020 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 11028 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 11030 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 11038 */ _(M,T), _(M,T), _(M,T), _(M,T), _(M,B), _(M,B), _(M,B), _(M,B), - /* 11040 */ _(M,B), _(M,B), _(M,T), _(M,T), _(M,T), _(M,T), _(V,T), _(x,x), - /* 11048 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 11050 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 11058 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 11060 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 11068 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 11070 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 11078 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - - /* Kaithi (11080..110CF) */ - - /* 11080 */ _(Bi,x), _(Bi,x), _(Vs,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), - /* 11088 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), - /* 11090 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 11098 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 110A0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 110A8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 110B0 */ _(M,R), _(M,L), _(M,R), _(M,B), _(M,B), _(M,T), _(M,T), _(M,R), - /* 110B8 */ _(M,R), _(V,B), _(N,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 110C0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 110C8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - -#define indic_offset_0x11100 4160 - - - /* Chakma (11100..1114F) */ - - /* 11100 */ _(Bi,x), _(Bi,x), _(Vs,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(C,x), - /* 11108 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 11110 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 11118 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 11120 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(M,T), - /* 11128 */ _(M,T), _(M,T), _(M,B), _(M,B), _(M,L), _(M,T), _(M,TB), _(M,TB), - /* 11130 */ _(M,T), _(M,B), _(M,B), _(V,I), _(V,T), _(x,x), _(x,x), _(x,x), - /* 11138 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 11140 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 11148 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - -#define indic_offset_0x11180 4240 - - - /* Sharada (11180..111DF) */ - - /* 11180 */ _(Bi,x), _(Bi,x), _(Vs,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), - /* 11188 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), - /* 11190 */ _(VI,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 11198 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 111A0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 111A8 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 111B0 */ _(C,x), _(C,x), _(C,x), _(M,R), _(M,L), _(M,R), _(M,B), _(M,B), - /* 111B8 */ _(M,B), _(M,B), _(M,B), _(M,B), _(M,T), _(M,T), _(M,T), _(M,TR), - /* 111C0 */ _(V,R), _(A,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 111C8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 111D0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 111D8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - -#define indic_offset_0x11680 4336 - - - /* Takri (11680..116CF) */ - - /* 11680 */ _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), _(VI,x), - /* 11688 */ _(VI,x), _(VI,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 11690 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 11698 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 116A0 */ _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), _(C,x), - /* 116A8 */ _(C,x), _(C,x), _(C,x), _(Bi,x), _(Vs,x), _(M,T), _(M,L), _(M,R), - /* 116B0 */ _(M,B), _(M,B), _(M,T), _(M,T), _(M,T), _(M,T), _(V,T), _(N,x), - /* 116B8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 116C0 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - /* 116C8 */ _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), _(x,x), - -#define indic_offset_total 4416 - -}; /* Table occupancy: 60% */ - -INDIC_TABLE_ELEMENT_TYPE -hb_indic_get_categories (hb_codepoint_t u) -{ - if (0x0900 <= u && u <= 0x10A0) return indic_table[u - 0x0900 + indic_offset_0x0900]; - if (0x1700 <= u && u <= 0x1800) return indic_table[u - 0x1700 + indic_offset_0x1700]; - if (0x1900 <= u && u <= 0x1AB0) return indic_table[u - 0x1900 + indic_offset_0x1900]; - if (0x1B00 <= u && u <= 0x1C50) return indic_table[u - 0x1B00 + indic_offset_0x1b00]; - if (0x1CD0 <= u && u <= 0x1D00) return indic_table[u - 0x1CD0 + indic_offset_0x1cd0]; - if (0xA800 <= u && u <= 0xAB00) return indic_table[u - 0xA800 + indic_offset_0xa800]; - if (0xABC0 <= u && u <= 0xAC00) return indic_table[u - 0xABC0 + indic_offset_0xabc0]; - if (0x10A00 <= u && u <= 0x10A60) return indic_table[u - 0x10A00 + indic_offset_0x10a00]; - if (0x11000 <= u && u <= 0x110D0) return indic_table[u - 0x11000 + indic_offset_0x11000]; - if (0x11100 <= u && u <= 0x11150) return indic_table[u - 0x11100 + indic_offset_0x11100]; - if (0x11180 <= u && u <= 0x111E0) return indic_table[u - 0x11180 + indic_offset_0x11180]; - if (0x11680 <= u && u <= 0x116D0) return indic_table[u - 0x11680 + indic_offset_0x11680]; - if (unlikely (u == 0x00A0)) return _(CP,x); - if (unlikely (u == 0x25CC)) return _(CP,x); - return _(x,x); -} - -#undef _ - -#undef ISC_A -#undef ISC_Bi -#undef ISC_C -#undef ISC_CD -#undef ISC_CF -#undef ISC_CHL -#undef ISC_CM -#undef ISC_CP -#undef ISC_CR -#undef ISC_CS -#undef ISC_ML -#undef ISC_N -#undef ISC_x -#undef ISC_RS -#undef ISC_TL -#undef ISC_TM -#undef ISC_V -#undef ISC_Vs -#undef ISC_Vo -#undef ISC_M -#undef ISC_VI - -#undef IMC_B -#undef IMC_BR -#undef IMC_I -#undef IMC_L -#undef IMC_LR -#undef IMC_x -#undef IMC_O -#undef IMC_R -#undef IMC_T -#undef IMC_TB -#undef IMC_TBR -#undef IMC_TL -#undef IMC_TLR -#undef IMC_TR -#undef IMC_VOL - -/* == End of generated table == */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-indic.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-indic.cc deleted file mode 100644 index eb1e0be9def..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-indic.cc +++ /dev/null @@ -1,1672 +0,0 @@ -/* - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-ot-shape-complex-indic-private.hh" -#include "hb-ot-layout-private.hh" - -/* buffer var allocations */ -#define indic_category() complex_var_u8_0() /* indic_category_t */ -#define indic_position() complex_var_u8_1() /* indic_position_t */ - - -/* - * Indic shaper. - */ - - -#define IN_HALF_BLOCK(u, Base) (((u) & ~0x7F) == (Base)) - -#define IS_DEVA(u) (IN_HALF_BLOCK (u, 0x0900)) -#define IS_BENG(u) (IN_HALF_BLOCK (u, 0x0980)) -#define IS_GURU(u) (IN_HALF_BLOCK (u, 0x0A00)) -#define IS_GUJR(u) (IN_HALF_BLOCK (u, 0x0A80)) -#define IS_ORYA(u) (IN_HALF_BLOCK (u, 0x0B00)) -#define IS_TAML(u) (IN_HALF_BLOCK (u, 0x0B80)) -#define IS_TELU(u) (IN_HALF_BLOCK (u, 0x0C00)) -#define IS_KNDA(u) (IN_HALF_BLOCK (u, 0x0C80)) -#define IS_MLYM(u) (IN_HALF_BLOCK (u, 0x0D00)) -#define IS_SINH(u) (IN_HALF_BLOCK (u, 0x0D80)) -#define IS_KHMR(u) (IN_HALF_BLOCK (u, 0x1780)) - - -#define MATRA_POS_LEFT(u) POS_PRE_M -#define MATRA_POS_RIGHT(u) ( \ - IS_DEVA(u) ? POS_AFTER_SUB : \ - IS_BENG(u) ? POS_AFTER_POST : \ - IS_GURU(u) ? POS_AFTER_POST : \ - IS_GUJR(u) ? POS_AFTER_POST : \ - IS_ORYA(u) ? POS_AFTER_POST : \ - IS_TAML(u) ? POS_AFTER_POST : \ - IS_TELU(u) ? (u <= 0x0C42 ? POS_BEFORE_SUB : POS_AFTER_SUB) : \ - IS_KNDA(u) ? (u < 0x0CC3 || u > 0xCD6 ? POS_BEFORE_SUB : POS_AFTER_SUB) : \ - IS_MLYM(u) ? POS_AFTER_POST : \ - IS_SINH(u) ? POS_AFTER_SUB : \ - IS_KHMR(u) ? POS_AFTER_POST : \ - /*default*/ POS_AFTER_SUB \ - ) -#define MATRA_POS_TOP(u) ( /* BENG and MLYM don't have top matras. */ \ - IS_DEVA(u) ? POS_AFTER_SUB : \ - IS_GURU(u) ? POS_AFTER_POST : /* Deviate from spec */ \ - IS_GUJR(u) ? POS_AFTER_SUB : \ - IS_ORYA(u) ? POS_AFTER_MAIN : \ - IS_TAML(u) ? POS_AFTER_SUB : \ - IS_TELU(u) ? POS_BEFORE_SUB : \ - IS_KNDA(u) ? POS_BEFORE_SUB : \ - IS_SINH(u) ? POS_AFTER_SUB : \ - IS_KHMR(u) ? POS_AFTER_POST : \ - /*default*/ POS_AFTER_SUB \ - ) -#define MATRA_POS_BOTTOM(u) ( \ - IS_DEVA(u) ? POS_AFTER_SUB : \ - IS_BENG(u) ? POS_AFTER_SUB : \ - IS_GURU(u) ? POS_AFTER_POST : \ - IS_GUJR(u) ? POS_AFTER_POST : \ - IS_ORYA(u) ? POS_AFTER_SUB : \ - IS_TAML(u) ? POS_AFTER_POST : \ - IS_TELU(u) ? POS_BEFORE_SUB : \ - IS_KNDA(u) ? POS_BEFORE_SUB : \ - IS_MLYM(u) ? POS_AFTER_POST : \ - IS_SINH(u) ? POS_AFTER_SUB : \ - IS_KHMR(u) ? POS_AFTER_POST : \ - /*default*/ POS_AFTER_SUB \ - ) - -static inline indic_position_t -matra_position (hb_codepoint_t u, indic_position_t side) -{ - switch ((int) side) - { - case POS_PRE_C: return MATRA_POS_LEFT (u); - case POS_POST_C: return MATRA_POS_RIGHT (u); - case POS_ABOVE_C: return MATRA_POS_TOP (u); - case POS_BELOW_C: return MATRA_POS_BOTTOM (u); - }; - return side; -} - -/* XXX - * This is a hack for now. We should move this data into the main Indic table. - * Or completely remove it and just check in the tables. - */ -static const hb_codepoint_t ra_chars[] = { - 0x0930, /* Devanagari */ - 0x09B0, /* Bengali */ - 0x09F0, /* Bengali */ - 0x0A30, /* Gurmukhi */ /* No Reph */ - 0x0AB0, /* Gujarati */ - 0x0B30, /* Oriya */ - 0x0BB0, /* Tamil */ /* No Reph */ - 0x0C30, /* Telugu */ /* Reph formed only with ZWJ */ - 0x0CB0, /* Kannada */ - 0x0D30, /* Malayalam */ /* No Reph, Logical Repha */ - - 0x0DBB, /* Sinhala */ /* Reph formed only with ZWJ */ - - 0x179A, /* Khmer */ /* No Reph, Visual Repha */ -}; - -static inline indic_position_t -consonant_position (hb_codepoint_t u) -{ - if ((u & ~0x007F) == 0x1780) - return POS_BELOW_C; /* In Khmer coeng model, post and below forms should not be reordered. */ - return POS_BASE_C; /* Will recategorize later based on font lookups. */ -} - -static inline bool -is_ra (hb_codepoint_t u) -{ - for (unsigned int i = 0; i < ARRAY_LENGTH (ra_chars); i++) - if (u == ra_chars[i]) - return true; - return false; -} - -static inline bool -is_one_of (const hb_glyph_info_t &info, unsigned int flags) -{ - /* If it ligated, all bets are off. */ - if (is_a_ligature (info)) return false; - return !!(FLAG (info.indic_category()) & flags); -} - -#define JOINER_FLAGS (FLAG (OT_ZWJ) | FLAG (OT_ZWNJ)) -static inline bool -is_joiner (const hb_glyph_info_t &info) -{ - return is_one_of (info, JOINER_FLAGS); -} - -/* Note: - * - * We treat Vowels and placeholders as if they were consonants. This is safe because Vowels - * cannot happen in a consonant syllable. The plus side however is, we can call the - * consonant syllable logic from the vowel syllable function and get it all right! */ -#define CONSONANT_FLAGS (FLAG (OT_C) | FLAG (OT_CM) | FLAG (OT_Ra) | FLAG (OT_V) | FLAG (OT_NBSP) | FLAG (OT_DOTTEDCIRCLE)) -static inline bool -is_consonant (const hb_glyph_info_t &info) -{ - return is_one_of (info, CONSONANT_FLAGS); -} - -#define HALANT_OR_COENG_FLAGS (FLAG (OT_H) | FLAG (OT_Coeng)) -static inline bool -is_halant_or_coeng (const hb_glyph_info_t &info) -{ - return is_one_of (info, HALANT_OR_COENG_FLAGS); -} - -static inline void -set_indic_properties (hb_glyph_info_t &info) -{ - hb_codepoint_t u = info.codepoint; - unsigned int type = hb_indic_get_categories (u); - indic_category_t cat = (indic_category_t) (type & 0x7F); - indic_position_t pos = (indic_position_t) (type >> 8); - - - /* - * Re-assign category - */ - - - /* The spec says U+0952 is OT_A. However, testing shows that Uniscribe - * treats U+0951..U+0952 all as OT_VD. - * TESTS: - * U+092E,U+0947,U+0952 - * U+092E,U+0952,U+0947 - * U+092E,U+0947,U+0951 - * U+092E,U+0951,U+0947 - * */ - if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x0951, 0x0954))) - cat = OT_VD; - - if (unlikely (u == 0x17D1)) - cat = OT_X; - if (cat == OT_X && - unlikely (hb_in_range<hb_codepoint_t> (u, 0x17CB, 0x17D3))) /* Khmer Various signs */ - { - /* These are like Top Matras. */ - cat = OT_M; - pos = POS_ABOVE_C; - } - if (u == 0x17C6) /* Khmer Bindu doesn't like to be repositioned. */ - cat = OT_N; - - if (unlikely (u == 0x17D2)) cat = OT_Coeng; /* Khmer coeng */ - else if (unlikely (u == 0x200C)) cat = OT_ZWNJ; - else if (unlikely (u == 0x200D)) cat = OT_ZWJ; - else if (unlikely (u == 0x25CC)) cat = OT_DOTTEDCIRCLE; - else if (unlikely (u == 0x0A71)) cat = OT_SM; /* GURMUKHI ADDAK. More like consonant medial. like 0A75. */ - - if (cat == OT_Repha) { - /* There are two kinds of characters marked as Repha: - * - The ones that are GenCat=Mn are already positioned visually, ie. after base. (eg. Khmer) - * - The ones that are GenCat=Lo is encoded logically, ie. beginning of syllable. (eg. Malayalam) - * - * We recategorize the first kind to look like a Nukta and attached to the base directly. - */ - if (_hb_glyph_info_get_general_category (&info) == HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK) - cat = OT_N; - } - - - - /* - * Re-assign position. - */ - - if ((FLAG (cat) & CONSONANT_FLAGS)) - { - pos = consonant_position (u); - if (is_ra (u)) - cat = OT_Ra; - } - else if (cat == OT_M) - { - pos = matra_position (u, pos); - } - else if (cat == OT_SM || cat == OT_VD) - { - pos = POS_SMVD; - } - - if (unlikely (u == 0x0B01)) pos = POS_BEFORE_SUB; /* Oriya Bindu is BeforeSub in the spec. */ - - - - info.indic_category() = cat; - info.indic_position() = pos; -} - -/* - * Things above this line should ideally be moved to the Indic table itself. - */ - - -/* - * Indic configurations. Note that we do not want to keep every single script-specific - * behavior in these tables necessarily. This should mainly be used for per-script - * properties that are cheaper keeping here, than in the code. Ie. if, say, one and - * only one script has an exception, that one script can be if'ed directly in the code, - * instead of adding a new flag in these structs. - */ - -enum base_position_t { - BASE_POS_FIRST, - BASE_POS_LAST -}; -enum reph_position_t { - REPH_POS_DEFAULT = POS_BEFORE_POST, - - REPH_POS_AFTER_MAIN = POS_AFTER_MAIN, - REPH_POS_BEFORE_SUB = POS_BEFORE_SUB, - REPH_POS_AFTER_SUB = POS_AFTER_SUB, - REPH_POS_BEFORE_POST = POS_BEFORE_POST, - REPH_POS_AFTER_POST = POS_AFTER_POST -}; -enum reph_mode_t { - REPH_MODE_IMPLICIT, /* Reph formed out of initial Ra,H sequence. */ - REPH_MODE_EXPLICIT, /* Reph formed out of initial Ra,H,ZWJ sequence. */ - REPH_MODE_VIS_REPHA, /* Encoded Repha character, no reordering needed. */ - REPH_MODE_LOG_REPHA /* Encoded Repha character, needs reordering. */ -}; -struct indic_config_t -{ - hb_script_t script; - bool has_old_spec; - hb_codepoint_t virama; - base_position_t base_pos; - reph_position_t reph_pos; - reph_mode_t reph_mode; -}; - -static const indic_config_t indic_configs[] = -{ - /* Default. Should be first. */ - {HB_SCRIPT_INVALID, false, 0,BASE_POS_LAST, REPH_POS_DEFAULT, REPH_MODE_IMPLICIT}, - {HB_SCRIPT_DEVANAGARI,true, 0x094D,BASE_POS_LAST, REPH_POS_BEFORE_POST,REPH_MODE_IMPLICIT}, - {HB_SCRIPT_BENGALI, true, 0x09CD,BASE_POS_LAST, REPH_POS_AFTER_SUB, REPH_MODE_IMPLICIT}, - {HB_SCRIPT_GURMUKHI, true, 0x0A4D,BASE_POS_LAST, REPH_POS_BEFORE_SUB, REPH_MODE_IMPLICIT}, - {HB_SCRIPT_GUJARATI, true, 0x0ACD,BASE_POS_LAST, REPH_POS_BEFORE_POST,REPH_MODE_IMPLICIT}, - {HB_SCRIPT_ORIYA, true, 0x0B4D,BASE_POS_LAST, REPH_POS_AFTER_MAIN, REPH_MODE_IMPLICIT}, - {HB_SCRIPT_TAMIL, true, 0x0BCD,BASE_POS_LAST, REPH_POS_AFTER_POST, REPH_MODE_IMPLICIT}, - {HB_SCRIPT_TELUGU, true, 0x0C4D,BASE_POS_LAST, REPH_POS_AFTER_POST, REPH_MODE_EXPLICIT}, - {HB_SCRIPT_KANNADA, true, 0x0CCD,BASE_POS_LAST, REPH_POS_AFTER_POST, REPH_MODE_IMPLICIT}, - {HB_SCRIPT_MALAYALAM, true, 0x0D4D,BASE_POS_LAST, REPH_POS_AFTER_MAIN, REPH_MODE_LOG_REPHA}, - {HB_SCRIPT_SINHALA, false,0x0DCA,BASE_POS_FIRST,REPH_POS_AFTER_MAIN, REPH_MODE_EXPLICIT}, - {HB_SCRIPT_KHMER, false,0x17D2,BASE_POS_FIRST,REPH_POS_DEFAULT, REPH_MODE_VIS_REPHA}, -}; - - - -/* - * Indic shaper. - */ - -struct feature_list_t { - hb_tag_t tag; - hb_ot_map_feature_flags_t flags; -}; - -static const feature_list_t -indic_features[] = -{ - /* - * Basic features. - * These features are applied in order, one at a time, after initial_reordering. - */ - {HB_TAG('n','u','k','t'), F_GLOBAL}, - {HB_TAG('a','k','h','n'), F_GLOBAL}, - {HB_TAG('r','p','h','f'), F_NONE}, - {HB_TAG('r','k','r','f'), F_GLOBAL}, - {HB_TAG('p','r','e','f'), F_NONE}, - {HB_TAG('b','l','w','f'), F_NONE}, - {HB_TAG('h','a','l','f'), F_NONE}, - {HB_TAG('a','b','v','f'), F_NONE}, - {HB_TAG('p','s','t','f'), F_NONE}, - {HB_TAG('c','f','a','r'), F_NONE}, - {HB_TAG('v','a','t','u'), F_GLOBAL}, - {HB_TAG('c','j','c','t'), F_GLOBAL}, - /* - * Other features. - * These features are applied all at once, after final_reordering. - */ - {HB_TAG('i','n','i','t'), F_NONE}, - {HB_TAG('p','r','e','s'), F_GLOBAL}, - {HB_TAG('a','b','v','s'), F_GLOBAL}, - {HB_TAG('b','l','w','s'), F_GLOBAL}, - {HB_TAG('p','s','t','s'), F_GLOBAL}, - {HB_TAG('h','a','l','n'), F_GLOBAL}, - /* Positioning features, though we don't care about the types. */ - {HB_TAG('d','i','s','t'), F_GLOBAL}, - {HB_TAG('a','b','v','m'), F_GLOBAL}, - {HB_TAG('b','l','w','m'), F_GLOBAL}, -}; - -/* - * Must be in the same order as the indic_features array. - */ -enum { - _NUKT, - _AKHN, - RPHF, - _RKRF, - PREF, - BLWF, - HALF, - ABVF, - PSTF, - CFAR, - _VATU, - _CJCT, - - INIT, - _PRES, - _ABVS, - _BLWS, - _PSTS, - _HALN, - _DIST, - _ABVM, - _BLWM, - - INDIC_NUM_FEATURES, - INDIC_BASIC_FEATURES = INIT /* Don't forget to update this! */ -}; - -static void -setup_syllables (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer); -static void -initial_reordering (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer); -static void -final_reordering (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer); - -static void -collect_features_indic (hb_ot_shape_planner_t *plan) -{ - hb_ot_map_builder_t *map = &plan->map; - - /* Do this before any lookups have been applied. */ - map->add_gsub_pause (setup_syllables); - - map->add_global_bool_feature (HB_TAG('l','o','c','l')); - /* The Indic specs do not require ccmp, but we apply it here since if - * there is a use of it, it's typically at the beginning. */ - map->add_global_bool_feature (HB_TAG('c','c','m','p')); - - - unsigned int i = 0; - map->add_gsub_pause (initial_reordering); - for (; i < INDIC_BASIC_FEATURES; i++) { - map->add_feature (indic_features[i].tag, 1, indic_features[i].flags | F_MANUAL_ZWJ); - map->add_gsub_pause (NULL); - } - map->add_gsub_pause (final_reordering); - for (; i < INDIC_NUM_FEATURES; i++) { - map->add_feature (indic_features[i].tag, 1, indic_features[i].flags | F_MANUAL_ZWJ); - } -} - -static void -override_features_indic (hb_ot_shape_planner_t *plan) -{ - /* Uniscribe does not apply 'kern'. */ - if (hb_options ().uniscribe_bug_compatible) - plan->map.add_feature (HB_TAG('k','e','r','n'), 0, F_GLOBAL); - - plan->map.add_feature (HB_TAG('l','i','g','a'), 0, F_GLOBAL); -} - - -struct would_substitute_feature_t -{ - inline void init (const hb_ot_map_t *map, hb_tag_t feature_tag) - { - map->get_stage_lookups (0/*GSUB*/, - map->get_feature_stage (0/*GSUB*/, feature_tag), - &lookups, &count); - } - - inline bool would_substitute (const hb_codepoint_t *glyphs, - unsigned int glyphs_count, - bool zero_context, - hb_face_t *face) const - { - for (unsigned int i = 0; i < count; i++) - if (hb_ot_layout_lookup_would_substitute_fast (face, lookups[i].index, glyphs, glyphs_count, zero_context)) - return true; - return false; - } - - private: - const hb_ot_map_t::lookup_map_t *lookups; - unsigned int count; -}; - -struct indic_shape_plan_t -{ - ASSERT_POD (); - - inline bool get_virama_glyph (hb_font_t *font, hb_codepoint_t *pglyph) const - { - hb_codepoint_t glyph = virama_glyph; - if (unlikely (virama_glyph == (hb_codepoint_t) -1)) - { - if (!config->virama || !font->get_glyph (config->virama, 0, &glyph)) - glyph = 0; - /* Technically speaking, the spec says we should apply 'locl' to virama too. - * Maybe one day... */ - - /* Our get_glyph() function needs a font, so we can't get the virama glyph - * during shape planning... Instead, overwrite it here. It's safe. Don't worry! */ - (const_cast<indic_shape_plan_t *> (this))->virama_glyph = glyph; - } - - *pglyph = glyph; - return glyph != 0; - } - - const indic_config_t *config; - - bool is_old_spec; - hb_codepoint_t virama_glyph; - - would_substitute_feature_t rphf; - would_substitute_feature_t pref; - would_substitute_feature_t blwf; - would_substitute_feature_t pstf; - - hb_mask_t mask_array[INDIC_NUM_FEATURES]; -}; - -static void * -data_create_indic (const hb_ot_shape_plan_t *plan) -{ - indic_shape_plan_t *indic_plan = (indic_shape_plan_t *) calloc (1, sizeof (indic_shape_plan_t)); - if (unlikely (!indic_plan)) - return NULL; - - indic_plan->config = &indic_configs[0]; - for (unsigned int i = 1; i < ARRAY_LENGTH (indic_configs); i++) - if (plan->props.script == indic_configs[i].script) { - indic_plan->config = &indic_configs[i]; - break; - } - - indic_plan->is_old_spec = indic_plan->config->has_old_spec && ((plan->map.chosen_script[0] & 0x000000FF) != '2'); - indic_plan->virama_glyph = (hb_codepoint_t) -1; - - indic_plan->rphf.init (&plan->map, HB_TAG('r','p','h','f')); - indic_plan->pref.init (&plan->map, HB_TAG('p','r','e','f')); - indic_plan->blwf.init (&plan->map, HB_TAG('b','l','w','f')); - indic_plan->pstf.init (&plan->map, HB_TAG('p','s','t','f')); - - for (unsigned int i = 0; i < ARRAY_LENGTH (indic_plan->mask_array); i++) - indic_plan->mask_array[i] = (indic_features[i].flags & F_GLOBAL) ? - 0 : plan->map.get_1_mask (indic_features[i].tag); - - return indic_plan; -} - -static void -data_destroy_indic (void *data) -{ - free (data); -} - -static indic_position_t -consonant_position_from_face (const indic_shape_plan_t *indic_plan, - const hb_codepoint_t glyphs[2], - hb_face_t *face) -{ - /* For old-spec, the order of glyphs is Consonant,Virama, - * whereas for new-spec, it's Virama,Consonant. However, - * some broken fonts (like Free Sans) simply copied lookups - * from old-spec to new-spec without modification. - * And oddly enough, Uniscribe seems to respect those lookups. - * Eg. in the sequence U+0924,U+094D,U+0930, Uniscribe finds - * base at 0. The font however, only has lookups matching - * 930,94D in 'blwf', not the expected 94D,930 (with new-spec - * table). As such, we simply match both sequences. Seems - * to work. */ - bool zero_context = indic_plan->is_old_spec ? false : true; - hb_codepoint_t glyphs_r[2] = {glyphs[1], glyphs[0]}; - if (indic_plan->pref.would_substitute (glyphs , 2, zero_context, face) || - indic_plan->pref.would_substitute (glyphs_r, 2, zero_context, face)) - return POS_POST_C; - if (indic_plan->blwf.would_substitute (glyphs , 2, zero_context, face) || - indic_plan->blwf.would_substitute (glyphs_r, 2, zero_context, face)) - return POS_BELOW_C; - if (indic_plan->pstf.would_substitute (glyphs , 2, zero_context, face) || - indic_plan->pstf.would_substitute (glyphs_r, 2, zero_context, face)) - return POS_POST_C; - return POS_BASE_C; -} - - -enum syllable_type_t { - consonant_syllable, - vowel_syllable, - standalone_cluster, - broken_cluster, - non_indic_cluster, -}; - -#include "hb-ot-shape-complex-indic-machine.hh" - - -static void -setup_masks_indic (const hb_ot_shape_plan_t *plan HB_UNUSED, - hb_buffer_t *buffer, - hb_font_t *font HB_UNUSED) -{ - HB_BUFFER_ALLOCATE_VAR (buffer, indic_category); - HB_BUFFER_ALLOCATE_VAR (buffer, indic_position); - - /* We cannot setup masks here. We save information about characters - * and setup masks later on in a pause-callback. */ - - unsigned int count = buffer->len; - for (unsigned int i = 0; i < count; i++) - set_indic_properties (buffer->info[i]); -} - -static void -setup_syllables (const hb_ot_shape_plan_t *plan HB_UNUSED, - hb_font_t *font HB_UNUSED, - hb_buffer_t *buffer) -{ - find_syllables (buffer); -} - -static int -compare_indic_order (const hb_glyph_info_t *pa, const hb_glyph_info_t *pb) -{ - int a = pa->indic_position(); - int b = pb->indic_position(); - - return a < b ? -1 : a == b ? 0 : +1; -} - - - -static void -update_consonant_positions (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer) -{ - const indic_shape_plan_t *indic_plan = (const indic_shape_plan_t *) plan->data; - - hb_codepoint_t glyphs[2]; - if (indic_plan->get_virama_glyph (font, &glyphs[0])) - { - hb_face_t *face = font->face; - unsigned int count = buffer->len; - for (unsigned int i = 0; i < count; i++) - if (buffer->info[i].indic_position() == POS_BASE_C) { - glyphs[1] = buffer->info[i].codepoint; - buffer->info[i].indic_position() = consonant_position_from_face (indic_plan, glyphs, face); - } - } -} - - -/* Rules from: - * https://www.microsoft.com/typography/otfntdev/devanot/shaping.aspx */ - -static void -initial_reordering_consonant_syllable (const hb_ot_shape_plan_t *plan, - hb_face_t *face, - hb_buffer_t *buffer, - unsigned int start, unsigned int end) -{ - const indic_shape_plan_t *indic_plan = (const indic_shape_plan_t *) plan->data; - hb_glyph_info_t *info = buffer->info; - - - /* 1. Find base consonant: - * - * The shaping engine finds the base consonant of the syllable, using the - * following algorithm: starting from the end of the syllable, move backwards - * until a consonant is found that does not have a below-base or post-base - * form (post-base forms have to follow below-base forms), or that is not a - * pre-base reordering Ra, or arrive at the first consonant. The consonant - * stopped at will be the base. - * - * o If the syllable starts with Ra + Halant (in a script that has Reph) - * and has more than one consonant, Ra is excluded from candidates for - * base consonants. - */ - - unsigned int base = end; - bool has_reph = false; - - { - /* -> If the syllable starts with Ra + Halant (in a script that has Reph) - * and has more than one consonant, Ra is excluded from candidates for - * base consonants. */ - unsigned int limit = start; - if (indic_plan->mask_array[RPHF] && - start + 3 <= end && - ( - (indic_plan->config->reph_mode == REPH_MODE_IMPLICIT && !is_joiner (info[start + 2])) || - (indic_plan->config->reph_mode == REPH_MODE_EXPLICIT && info[start + 2].indic_category() == OT_ZWJ) - )) - { - /* See if it matches the 'rphf' feature. */ - hb_codepoint_t glyphs[2] = {info[start].codepoint, info[start + 1].codepoint}; - if (indic_plan->rphf.would_substitute (glyphs, ARRAY_LENGTH (glyphs), true, face)) - { - limit += 2; - while (limit < end && is_joiner (info[limit])) - limit++; - base = start; - has_reph = true; - } - } else if (indic_plan->config->reph_mode == REPH_MODE_LOG_REPHA && info[start].indic_category() == OT_Repha) - { - limit += 1; - while (limit < end && is_joiner (info[limit])) - limit++; - base = start; - has_reph = true; - } - - switch (indic_plan->config->base_pos) - { - default: - assert (false); - /* fallthrough */ - - case BASE_POS_LAST: - { - /* -> starting from the end of the syllable, move backwards */ - unsigned int i = end; - bool seen_below = false; - do { - i--; - /* -> until a consonant is found */ - if (is_consonant (info[i])) - { - /* -> that does not have a below-base or post-base form - * (post-base forms have to follow below-base forms), */ - if (info[i].indic_position() != POS_BELOW_C && - (info[i].indic_position() != POS_POST_C || seen_below)) - { - base = i; - break; - } - if (info[i].indic_position() == POS_BELOW_C) - seen_below = true; - - /* -> or that is not a pre-base reordering Ra, - * - * IMPLEMENTATION NOTES: - * - * Our pre-base reordering Ra's are marked POS_POST_C, so will be skipped - * by the logic above already. - */ - - /* -> or arrive at the first consonant. The consonant stopped at will - * be the base. */ - base = i; - } - else - { - /* A ZWJ after a Halant stops the base search, and requests an explicit - * half form. - * A ZWJ before a Halant, requests a subjoined form instead, and hence - * search continues. This is particularly important for Bengali - * sequence Ra,H,Ya that should form Ya-Phalaa by subjoining Ya. */ - if (start < i && - info[i].indic_category() == OT_ZWJ && - info[i - 1].indic_category() == OT_H) - break; - } - } while (i > limit); - } - break; - - case BASE_POS_FIRST: - { - /* In scripts without half forms (eg. Khmer), the first consonant is always the base. */ - - if (!has_reph) - base = limit; - - /* Find the last base consonant that is not blocked by ZWJ. If there is - * a ZWJ right before a base consonant, that would request a subjoined form. */ - for (unsigned int i = limit; i < end; i++) - if (is_consonant (info[i]) && info[i].indic_position() == POS_BASE_C) - { - if (limit < i && info[i - 1].indic_category() == OT_ZWJ) - break; - else - base = i; - } - - /* Mark all subsequent consonants as below. */ - for (unsigned int i = base + 1; i < end; i++) - if (is_consonant (info[i]) && info[i].indic_position() == POS_BASE_C) - info[i].indic_position() = POS_BELOW_C; - } - break; - } - - /* -> If the syllable starts with Ra + Halant (in a script that has Reph) - * and has more than one consonant, Ra is excluded from candidates for - * base consonants. - * - * Only do this for unforced Reph. (ie. not for Ra,H,ZWJ. */ - if (has_reph && base == start && limit - base <= 2) { - /* Have no other consonant, so Reph is not formed and Ra becomes base. */ - has_reph = false; - } - } - - - /* 2. Decompose and reorder Matras: - * - * Each matra and any syllable modifier sign in the cluster are moved to the - * appropriate position relative to the consonant(s) in the cluster. The - * shaping engine decomposes two- or three-part matras into their constituent - * parts before any repositioning. Matra characters are classified by which - * consonant in a conjunct they have affinity for and are reordered to the - * following positions: - * - * o Before first half form in the syllable - * o After subjoined consonants - * o After post-form consonant - * o After main consonant (for above marks) - * - * IMPLEMENTATION NOTES: - * - * The normalize() routine has already decomposed matras for us, so we don't - * need to worry about that. - */ - - - /* 3. Reorder marks to canonical order: - * - * Adjacent nukta and halant or nukta and vedic sign are always repositioned - * if necessary, so that the nukta is first. - * - * IMPLEMENTATION NOTES: - * - * We don't need to do this: the normalize() routine already did this for us. - */ - - - /* Reorder characters */ - - for (unsigned int i = start; i < base; i++) - info[i].indic_position() = MIN (POS_PRE_C, (indic_position_t) info[i].indic_position()); - - if (base < end) - info[base].indic_position() = POS_BASE_C; - - /* Mark final consonants. A final consonant is one appearing after a matra, - * like in Khmer. */ - for (unsigned int i = base + 1; i < end; i++) - if (info[i].indic_category() == OT_M) { - for (unsigned int j = i + 1; j < end; j++) - if (is_consonant (info[j])) { - info[j].indic_position() = POS_FINAL_C; - break; - } - break; - } - - /* Handle beginning Ra */ - if (has_reph) - info[start].indic_position() = POS_RA_TO_BECOME_REPH; - - /* For old-style Indic script tags, move the first post-base Halant after - * last consonant. Only do this if there is *not* a Halant after last - * consonant. Otherwise it becomes messy. */ - if (indic_plan->is_old_spec) { - for (unsigned int i = base + 1; i < end; i++) - if (info[i].indic_category() == OT_H) { - unsigned int j; - for (j = end - 1; j > i; j--) - if (is_consonant (info[j]) || info[j].indic_category() == OT_H) - break; - if (info[j].indic_category() != OT_H && j > i) { - /* Move Halant to after last consonant. */ - hb_glyph_info_t t = info[i]; - memmove (&info[i], &info[i + 1], (j - i) * sizeof (info[0])); - info[j] = t; - } - break; - } - } - - /* Attach misc marks to previous char to move with them. */ - { - indic_position_t last_pos = POS_START; - for (unsigned int i = start; i < end; i++) - { - if ((FLAG (info[i].indic_category()) & (JOINER_FLAGS | FLAG (OT_N) | FLAG (OT_RS) | HALANT_OR_COENG_FLAGS))) - { - info[i].indic_position() = last_pos; - if (unlikely (info[i].indic_category() == OT_H && - info[i].indic_position() == POS_PRE_M)) - { - /* - * Uniscribe doesn't move the Halant with Left Matra. - * TEST: U+092B,U+093F,U+094DE - * We follow. This is important for the Sinhala - * U+0DDA split matra since it decomposes to U+0DD9,U+0DCA - * where U+0DD9 is a left matra and U+0DCA is the virama. - * We don't want to move the virama with the left matra. - * TEST: U+0D9A,U+0DDA - */ - for (unsigned int j = i; j > start; j--) - if (info[j - 1].indic_position() != POS_PRE_M) { - info[i].indic_position() = info[j - 1].indic_position(); - break; - } - } - } else if (info[i].indic_position() != POS_SMVD) { - last_pos = (indic_position_t) info[i].indic_position(); - } - } - } - /* Re-attach ZWJ, ZWNJ, and halant to next char, for after-base consonants. */ - { - unsigned int last_halant = end; - for (unsigned int i = base + 1; i < end; i++) - if (is_halant_or_coeng (info[i])) - last_halant = i; - else if (is_consonant (info[i])) { - for (unsigned int j = last_halant; j < i; j++) - if (info[j].indic_position() != POS_SMVD) - info[j].indic_position() = info[i].indic_position(); - } - } - - { - /* Things are out-of-control for post base positions, they may shuffle - * around like crazy, so merge clusters. For pre-base stuff, we handle - * cluster issues in final reordering. */ - buffer->merge_clusters (base, end); - /* Sit tight, rock 'n roll! */ - hb_bubble_sort (info + start, end - start, compare_indic_order); - /* Find base again */ - base = end; - for (unsigned int i = start; i < end; i++) - if (info[i].indic_position() == POS_BASE_C) { - base = i; - break; - } - } - - /* Setup masks now */ - - { - hb_mask_t mask; - - /* Reph */ - for (unsigned int i = start; i < end && info[i].indic_position() == POS_RA_TO_BECOME_REPH; i++) - info[i].mask |= indic_plan->mask_array[RPHF]; - - /* Pre-base */ - mask = indic_plan->mask_array[HALF]; - for (unsigned int i = start; i < base; i++) - info[i].mask |= mask; - /* Base */ - mask = 0; - if (base < end) - info[base].mask |= mask; - /* Post-base */ - mask = indic_plan->mask_array[BLWF] | indic_plan->mask_array[ABVF] | indic_plan->mask_array[PSTF]; - for (unsigned int i = base + 1; i < end; i++) - info[i].mask |= mask; - } - - if (indic_plan->is_old_spec && - buffer->props.script == HB_SCRIPT_DEVANAGARI) - { - /* Old-spec eye-lash Ra needs special handling. From the - * spec: - * - * "The feature 'below-base form' is applied to consonants - * having below-base forms and following the base consonant. - * The exception is vattu, which may appear below half forms - * as well as below the base glyph. The feature 'below-base - * form' will be applied to all such occurrences of Ra as well." - * - * Test case: U+0924,U+094D,U+0930,U+094d,U+0915 - * with Sanskrit 2003 font. - * - * However, note that Ra,Halant,ZWJ is the correct way to - * request eyelash form of Ra, so we wouldbn't inhibit it - * in that sequence. - * - * Test case: U+0924,U+094D,U+0930,U+094d,U+200D,U+0915 - */ - for (unsigned int i = start; i + 1 < base; i++) - if (info[i ].indic_category() == OT_Ra && - info[i+1].indic_category() == OT_H && - (i + 2 == base || - info[i+2].indic_category() != OT_ZWJ)) - { - info[i ].mask |= indic_plan->mask_array[BLWF]; - info[i+1].mask |= indic_plan->mask_array[BLWF]; - } - } - - if (indic_plan->mask_array[PREF] && base + 2 < end) - { - /* Find a Halant,Ra sequence and mark it for pre-base reordering processing. */ - for (unsigned int i = base + 1; i + 1 < end; i++) { - hb_codepoint_t glyphs[2] = {info[i].codepoint, info[i + 1].codepoint}; - if (indic_plan->pref.would_substitute (glyphs, ARRAY_LENGTH (glyphs), true, face)) - { - info[i++].mask |= indic_plan->mask_array[PREF]; - info[i++].mask |= indic_plan->mask_array[PREF]; - - /* Mark the subsequent stuff with 'cfar'. Used in Khmer. - * Read the feature spec. - * This allows distinguishing the following cases with MS Khmer fonts: - * U+1784,U+17D2,U+179A,U+17D2,U+1782 - * U+1784,U+17D2,U+1782,U+17D2,U+179A - */ - for (; i < end; i++) - info[i].mask |= indic_plan->mask_array[CFAR]; - - break; - } - } - } - - /* Apply ZWJ/ZWNJ effects */ - for (unsigned int i = start + 1; i < end; i++) - if (is_joiner (info[i])) { - bool non_joiner = info[i].indic_category() == OT_ZWNJ; - unsigned int j = i; - - do { - j--; - - /* ZWJ/ZWNJ should disable CJCT. They do that by simply - * being there, since we don't skip them for the CJCT - * feature (ie. F_MANUAL_ZWJ) */ - - /* A ZWNJ disables HALF. */ - if (non_joiner) - info[j].mask &= ~indic_plan->mask_array[HALF]; - - } while (j > start && !is_consonant (info[j])); - } -} - - -static void -initial_reordering_vowel_syllable (const hb_ot_shape_plan_t *plan, - hb_face_t *face, - hb_buffer_t *buffer, - unsigned int start, unsigned int end) -{ - /* We made the vowels look like consonants. So let's call the consonant logic! */ - initial_reordering_consonant_syllable (plan, face, buffer, start, end); -} - -static void -initial_reordering_standalone_cluster (const hb_ot_shape_plan_t *plan, - hb_face_t *face, - hb_buffer_t *buffer, - unsigned int start, unsigned int end) -{ - /* We treat NBSP/dotted-circle as if they are consonants, so we should just chain. - * Only if not in compatibility mode that is... */ - - if (hb_options ().uniscribe_bug_compatible) - { - /* For dotted-circle, this is what Uniscribe does: - * If dotted-circle is the last glyph, it just does nothing. - * Ie. It doesn't form Reph. */ - if (buffer->info[end - 1].indic_category() == OT_DOTTEDCIRCLE) - return; - } - - initial_reordering_consonant_syllable (plan, face, buffer, start, end); -} - -static void -initial_reordering_broken_cluster (const hb_ot_shape_plan_t *plan, - hb_face_t *face, - hb_buffer_t *buffer, - unsigned int start, unsigned int end) -{ - /* We already inserted dotted-circles, so just call the standalone_cluster. */ - initial_reordering_standalone_cluster (plan, face, buffer, start, end); -} - -static void -initial_reordering_non_indic_cluster (const hb_ot_shape_plan_t *plan HB_UNUSED, - hb_face_t *face HB_UNUSED, - hb_buffer_t *buffer HB_UNUSED, - unsigned int start HB_UNUSED, unsigned int end HB_UNUSED) -{ - /* Nothing to do right now. If we ever switch to using the output - * buffer in the reordering process, we'd need to next_glyph() here. */ -} - - -static void -initial_reordering_syllable (const hb_ot_shape_plan_t *plan, - hb_face_t *face, - hb_buffer_t *buffer, - unsigned int start, unsigned int end) -{ - syllable_type_t syllable_type = (syllable_type_t) (buffer->info[start].syllable() & 0x0F); - switch (syllable_type) { - case consonant_syllable: initial_reordering_consonant_syllable (plan, face, buffer, start, end); return; - case vowel_syllable: initial_reordering_vowel_syllable (plan, face, buffer, start, end); return; - case standalone_cluster: initial_reordering_standalone_cluster (plan, face, buffer, start, end); return; - case broken_cluster: initial_reordering_broken_cluster (plan, face, buffer, start, end); return; - case non_indic_cluster: initial_reordering_non_indic_cluster (plan, face, buffer, start, end); return; - } -} - -static inline void -insert_dotted_circles (const hb_ot_shape_plan_t *plan HB_UNUSED, - hb_font_t *font, - hb_buffer_t *buffer) -{ - /* Note: This loop is extra overhead, but should not be measurable. */ - bool has_broken_syllables = false; - unsigned int count = buffer->len; - for (unsigned int i = 0; i < count; i++) - if ((buffer->info[i].syllable() & 0x0F) == broken_cluster) { - has_broken_syllables = true; - break; - } - if (likely (!has_broken_syllables)) - return; - - - hb_codepoint_t dottedcircle_glyph; - if (!font->get_glyph (0x25CC, 0, &dottedcircle_glyph)) - return; - - hb_glyph_info_t dottedcircle = {0}; - dottedcircle.codepoint = 0x25CC; - set_indic_properties (dottedcircle); - dottedcircle.codepoint = dottedcircle_glyph; - - buffer->clear_output (); - - buffer->idx = 0; - unsigned int last_syllable = 0; - while (buffer->idx < buffer->len) - { - unsigned int syllable = buffer->cur().syllable(); - syllable_type_t syllable_type = (syllable_type_t) (syllable & 0x0F); - if (unlikely (last_syllable != syllable && syllable_type == broken_cluster)) - { - last_syllable = syllable; - - hb_glyph_info_t info = dottedcircle; - info.cluster = buffer->cur().cluster; - info.mask = buffer->cur().mask; - info.syllable() = buffer->cur().syllable(); - - /* Insert dottedcircle after possible Repha. */ - while (buffer->idx < buffer->len && - last_syllable == buffer->cur().syllable() && - buffer->cur().indic_category() == OT_Repha) - buffer->next_glyph (); - - buffer->output_info (info); - } - else - buffer->next_glyph (); - } - - buffer->swap_buffers (); -} - -static void -initial_reordering (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer) -{ - update_consonant_positions (plan, font, buffer); - insert_dotted_circles (plan, font, buffer); - - hb_glyph_info_t *info = buffer->info; - unsigned int count = buffer->len; - if (unlikely (!count)) return; - unsigned int last = 0; - unsigned int last_syllable = info[0].syllable(); - for (unsigned int i = 1; i < count; i++) - if (last_syllable != info[i].syllable()) { - initial_reordering_syllable (plan, font->face, buffer, last, i); - last = i; - last_syllable = info[last].syllable(); - } - initial_reordering_syllable (plan, font->face, buffer, last, count); -} - -static void -final_reordering_syllable (const hb_ot_shape_plan_t *plan, - hb_buffer_t *buffer, - unsigned int start, unsigned int end) -{ - const indic_shape_plan_t *indic_plan = (const indic_shape_plan_t *) plan->data; - hb_glyph_info_t *info = buffer->info; - - /* 4. Final reordering: - * - * After the localized forms and basic shaping forms GSUB features have been - * applied (see below), the shaping engine performs some final glyph - * reordering before applying all the remaining font features to the entire - * cluster. - */ - - /* Find base again */ - unsigned int base; - for (base = start; base < end; base++) - if (info[base].indic_position() >= POS_BASE_C) { - if (start < base && info[base].indic_position() > POS_BASE_C) - base--; - break; - } - if (base == end && start < base && - info[base - 1].indic_category() != OT_ZWJ) - base--; - while (start < base && - (info[base].indic_category() == OT_H || - info[base].indic_category() == OT_N)) - base--; - - - /* o Reorder matras: - * - * If a pre-base matra character had been reordered before applying basic - * features, the glyph can be moved closer to the main consonant based on - * whether half-forms had been formed. Actual position for the matra is - * defined as “after last standalone halant glyph, after initial matra - * position and before the main consonant”. If ZWJ or ZWNJ follow this - * halant, position is moved after it. - */ - - if (start + 1 < end && start < base) /* Otherwise there can't be any pre-base matra characters. */ - { - /* If we lost track of base, alas, position before last thingy. */ - unsigned int new_pos = base == end ? base - 2 : base - 1; - - /* Malayalam / Tamil do not have "half" forms or explicit virama forms. - * The glyphs formed by 'half' are Chillus or ligated explicit viramas. - * We want to position matra after them. - */ - if (buffer->props.script != HB_SCRIPT_MALAYALAM && buffer->props.script != HB_SCRIPT_TAMIL) - { - while (new_pos > start && - !(is_one_of (info[new_pos], (FLAG (OT_M) | FLAG (OT_H) | FLAG (OT_Coeng))))) - new_pos--; - - /* If we found no Halant we are done. - * Otherwise only proceed if the Halant does - * not belong to the Matra itself! */ - if (is_halant_or_coeng (info[new_pos]) && - info[new_pos].indic_position() != POS_PRE_M) - { - /* -> If ZWJ or ZWNJ follow this halant, position is moved after it. */ - if (new_pos + 1 < end && is_joiner (info[new_pos + 1])) - new_pos++; - } - else - new_pos = start; /* No move. */ - } - - if (start < new_pos && info[new_pos].indic_position () != POS_PRE_M) - { - /* Now go see if there's actually any matras... */ - for (unsigned int i = new_pos; i > start; i--) - if (info[i - 1].indic_position () == POS_PRE_M) - { - unsigned int old_pos = i - 1; - hb_glyph_info_t tmp = info[old_pos]; - memmove (&info[old_pos], &info[old_pos + 1], (new_pos - old_pos) * sizeof (info[0])); - info[new_pos] = tmp; - if (old_pos < base && base <= new_pos) /* Shouldn't actually happen. */ - base--; - new_pos--; - } - buffer->merge_clusters (new_pos, MIN (end, base + 1)); - } else { - for (unsigned int i = start; i < base; i++) - if (info[i].indic_position () == POS_PRE_M) { - buffer->merge_clusters (i, MIN (end, base + 1)); - break; - } - } - } - - - /* o Reorder reph: - * - * Reph’s original position is always at the beginning of the syllable, - * (i.e. it is not reordered at the character reordering stage). However, - * it will be reordered according to the basic-forms shaping results. - * Possible positions for reph, depending on the script, are; after main, - * before post-base consonant forms, and after post-base consonant forms. - */ - - /* If there's anything after the Ra that has the REPH pos, it ought to be halant. - * Which means that the font has failed to ligate the Reph. In which case, we - * shouldn't move. */ - if (start + 1 < end && - info[start].indic_position() == POS_RA_TO_BECOME_REPH && - info[start + 1].indic_position() != POS_RA_TO_BECOME_REPH) - { - unsigned int new_reph_pos; - reph_position_t reph_pos = indic_plan->config->reph_pos; - - /* XXX Figure out old behavior too */ - - /* 1. If reph should be positioned after post-base consonant forms, - * proceed to step 5. - */ - if (reph_pos == REPH_POS_AFTER_POST) - { - goto reph_step_5; - } - - /* 2. If the reph repositioning class is not after post-base: target - * position is after the first explicit halant glyph between the - * first post-reph consonant and last main consonant. If ZWJ or ZWNJ - * are following this halant, position is moved after it. If such - * position is found, this is the target position. Otherwise, - * proceed to the next step. - * - * Note: in old-implementation fonts, where classifications were - * fixed in shaping engine, there was no case where reph position - * will be found on this step. - */ - { - new_reph_pos = start + 1; - while (new_reph_pos < base && !is_halant_or_coeng (info[new_reph_pos])) - new_reph_pos++; - - if (new_reph_pos < base && is_halant_or_coeng (info[new_reph_pos])) - { - /* ->If ZWJ or ZWNJ are following this halant, position is moved after it. */ - if (new_reph_pos + 1 < base && is_joiner (info[new_reph_pos + 1])) - new_reph_pos++; - goto reph_move; - } - } - - /* 3. If reph should be repositioned after the main consonant: find the - * first consonant not ligated with main, or find the first - * consonant that is not a potential pre-base reordering Ra. - */ - if (reph_pos == REPH_POS_AFTER_MAIN) - { - new_reph_pos = base; - /* XXX Skip potential pre-base reordering Ra. */ - while (new_reph_pos + 1 < end && info[new_reph_pos + 1].indic_position() <= POS_AFTER_MAIN) - new_reph_pos++; - if (new_reph_pos < end) - goto reph_move; - } - - /* 4. If reph should be positioned before post-base consonant, find - * first post-base classified consonant not ligated with main. If no - * consonant is found, the target position should be before the - * first matra, syllable modifier sign or vedic sign. - */ - /* This is our take on what step 4 is trying to say (and failing, BADLY). */ - if (reph_pos == REPH_POS_AFTER_SUB) - { - new_reph_pos = base; - while (new_reph_pos < end && - !( FLAG (info[new_reph_pos + 1].indic_position()) & (FLAG (POS_POST_C) | FLAG (POS_AFTER_POST) | FLAG (POS_SMVD)))) - new_reph_pos++; - if (new_reph_pos < end) - goto reph_move; - } - - /* 5. If no consonant is found in steps 3 or 4, move reph to a position - * immediately before the first post-base matra, syllable modifier - * sign or vedic sign that has a reordering class after the intended - * reph position. For example, if the reordering position for reph - * is post-main, it will skip above-base matras that also have a - * post-main position. - */ - reph_step_5: - { - /* Copied from step 2. */ - new_reph_pos = start + 1; - while (new_reph_pos < base && !is_halant_or_coeng (info[new_reph_pos])) - new_reph_pos++; - - if (new_reph_pos < base && is_halant_or_coeng (info[new_reph_pos])) - { - /* ->If ZWJ or ZWNJ are following this halant, position is moved after it. */ - if (new_reph_pos + 1 < base && is_joiner (info[new_reph_pos + 1])) - new_reph_pos++; - goto reph_move; - } - } - - /* 6. Otherwise, reorder reph to the end of the syllable. - */ - { - new_reph_pos = end - 1; - while (new_reph_pos > start && info[new_reph_pos].indic_position() == POS_SMVD) - new_reph_pos--; - - /* - * If the Reph is to be ending up after a Matra,Halant sequence, - * position it before that Halant so it can interact with the Matra. - * However, if it's a plain Consonant,Halant we shouldn't do that. - * Uniscribe doesn't do this. - * TEST: U+0930,U+094D,U+0915,U+094B,U+094D - */ - if (!hb_options ().uniscribe_bug_compatible && - unlikely (is_halant_or_coeng (info[new_reph_pos]))) { - for (unsigned int i = base + 1; i < new_reph_pos; i++) - if (info[i].indic_category() == OT_M) { - /* Ok, got it. */ - new_reph_pos--; - } - } - goto reph_move; - } - - reph_move: - { - /* Yay, one big cluster! Merge before moving. */ - buffer->merge_clusters (start, end); - - /* Move */ - hb_glyph_info_t reph = info[start]; - memmove (&info[start], &info[start + 1], (new_reph_pos - start) * sizeof (info[0])); - info[new_reph_pos] = reph; - if (start < base && base <= new_reph_pos) - base--; - } - } - - - /* o Reorder pre-base reordering consonants: - * - * If a pre-base reordering consonant is found, reorder it according to - * the following rules: - */ - - if (indic_plan->mask_array[PREF] && base + 1 < end) /* Otherwise there can't be any pre-base reordering Ra. */ - { - for (unsigned int i = base + 1; i < end; i++) - if ((info[i].mask & indic_plan->mask_array[PREF]) != 0) - { - /* 1. Only reorder a glyph produced by substitution during application - * of the <pref> feature. (Note that a font may shape a Ra consonant with - * the feature generally but block it in certain contexts.) - */ - if (i + 1 == end || (info[i + 1].mask & indic_plan->mask_array[PREF]) == 0) - { - /* - * 2. Try to find a target position the same way as for pre-base matra. - * If it is found, reorder pre-base consonant glyph. - * - * 3. If position is not found, reorder immediately before main - * consonant. - */ - - unsigned int new_pos = base; - /* Malayalam / Tamil do not have "half" forms or explicit virama forms. - * The glyphs formed by 'half' are Chillus or ligated explicit viramas. - * We want to position matra after them. - */ - if (buffer->props.script != HB_SCRIPT_MALAYALAM && buffer->props.script != HB_SCRIPT_TAMIL) - { - while (new_pos > start && - !(is_one_of (info[new_pos - 1], FLAG(OT_M) | HALANT_OR_COENG_FLAGS))) - new_pos--; - - /* In Khmer coeng model, a V,Ra can go *after* matras. If it goes after a - * split matra, it should be reordered to *before* the left part of such matra. */ - if (new_pos > start && info[new_pos - 1].indic_category() == OT_M) - { - unsigned int old_pos = i; - for (unsigned int i = base + 1; i < old_pos; i++) - if (info[i].indic_category() == OT_M) - { - new_pos--; - break; - } - } - } - - if (new_pos > start && is_halant_or_coeng (info[new_pos - 1])) - { - /* -> If ZWJ or ZWNJ follow this halant, position is moved after it. */ - if (new_pos < end && is_joiner (info[new_pos])) - new_pos++; - } - - { - unsigned int old_pos = i; - buffer->merge_clusters (new_pos, old_pos + 1); - hb_glyph_info_t tmp = info[old_pos]; - memmove (&info[new_pos + 1], &info[new_pos], (old_pos - new_pos) * sizeof (info[0])); - info[new_pos] = tmp; - if (new_pos <= base && base < old_pos) - base++; - } - } - - break; - } - } - - - /* Apply 'init' to the Left Matra if it's a word start. */ - if (info[start].indic_position () == POS_PRE_M && - (!start || - !(FLAG (_hb_glyph_info_get_general_category (&info[start - 1])) & - FLAG_RANGE (HB_UNICODE_GENERAL_CATEGORY_FORMAT, HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK)))) - info[start].mask |= indic_plan->mask_array[INIT]; - - - /* - * Finish off the clusters and go home! - */ - if (hb_options ().uniscribe_bug_compatible) - { - /* Uniscribe merges the entire cluster. - * This means, half forms are submerged into the main consonants cluster. - * This is unnecessary, and makes cursor positioning harder, but that's what - * Uniscribe does. */ - buffer->merge_clusters (start, end); - } -} - - -static void -final_reordering (const hb_ot_shape_plan_t *plan, - hb_font_t *font HB_UNUSED, - hb_buffer_t *buffer) -{ - unsigned int count = buffer->len; - if (unlikely (!count)) return; - - hb_glyph_info_t *info = buffer->info; - unsigned int last = 0; - unsigned int last_syllable = info[0].syllable(); - for (unsigned int i = 1; i < count; i++) - if (last_syllable != info[i].syllable()) { - final_reordering_syllable (plan, buffer, last, i); - last = i; - last_syllable = info[last].syllable(); - } - final_reordering_syllable (plan, buffer, last, count); - - /* Zero syllables now... */ - for (unsigned int i = 0; i < count; i++) - info[i].syllable() = 0; - - HB_BUFFER_DEALLOCATE_VAR (buffer, indic_category); - HB_BUFFER_DEALLOCATE_VAR (buffer, indic_position); -} - - -static hb_ot_shape_normalization_mode_t -normalization_preference_indic (const hb_segment_properties_t *props HB_UNUSED) -{ - return HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS_NO_SHORT_CIRCUIT; -} - -static bool -decompose_indic (const hb_ot_shape_normalize_context_t *c, - hb_codepoint_t ab, - hb_codepoint_t *a, - hb_codepoint_t *b) -{ - switch (ab) - { - /* Don't decompose these. */ - case 0x0931 : return false; - case 0x0B94 : return false; - - - /* - * Decompose split matras that don't have Unicode decompositions. - */ - - case 0x0F77 : *a = 0x0FB2; *b= 0x0F81; return true; - case 0x0F79 : *a = 0x0FB3; *b= 0x0F81; return true; - case 0x17BE : *a = 0x17C1; *b= 0x17BE; return true; - case 0x17BF : *a = 0x17C1; *b= 0x17BF; return true; - case 0x17C0 : *a = 0x17C1; *b= 0x17C0; return true; - case 0x17C4 : *a = 0x17C1; *b= 0x17C4; return true; - case 0x17C5 : *a = 0x17C1; *b= 0x17C5; return true; - case 0x1925 : *a = 0x1920; *b= 0x1923; return true; - case 0x1926 : *a = 0x1920; *b= 0x1924; return true; - case 0x1B3C : *a = 0x1B42; *b= 0x1B3C; return true; - case 0x1112E : *a = 0x11127; *b= 0x11131; return true; - case 0x1112F : *a = 0x11127; *b= 0x11132; return true; -#if 0 - /* This one has no decomposition in Unicode, but needs no decomposition either. */ - /* case 0x0AC9 : return false; */ - case 0x0B57 : *a = no decomp, -> RIGHT; return true; - case 0x1C29 : *a = no decomp, -> LEFT; return true; - case 0xA9C0 : *a = no decomp, -> RIGHT; return true; - case 0x111BF : *a = no decomp, -> ABOVE; return true; -#endif - } - - if ((ab == 0x0DDA || hb_in_range<hb_codepoint_t> (ab, 0x0DDC, 0x0DDE))) - { - /* - * Sinhala split matras... Let the fun begin. - * - * These four characters have Unicode decompositions. However, Uniscribe - * decomposes them "Khmer-style", that is, it uses the character itself to - * get the second half. The first half of all four decompositions is always - * U+0DD9. - * - * Now, there are buggy fonts, namely, the widely used lklug.ttf, that are - * broken with Uniscribe. But we need to support them. As such, we only - * do the Uniscribe-style decomposition if the character is transformed into - * its "sec.half" form by the 'pstf' feature. Otherwise, we fall back to - * Unicode decomposition. - * - * Note that we can't unconditionally use Unicode decomposition. That would - * break some other fonts, that are designed to work with Uniscribe, and - * don't have positioning features for the Unicode-style decomposition. - * - * Argh... - * - * The Uniscribe behavior is now documented in the newly published Sinhala - * spec in 2012: - * - * http://www.microsoft.com/typography/OpenTypeDev/sinhala/intro.htm#shaping - */ - - const indic_shape_plan_t *indic_plan = (const indic_shape_plan_t *) c->plan->data; - - hb_codepoint_t glyph; - - if (hb_options ().uniscribe_bug_compatible || - (c->font->get_glyph (ab, 0, &glyph) && - indic_plan->pstf.would_substitute (&glyph, 1, true, c->font->face))) - { - /* Ok, safe to use Uniscribe-style decomposition. */ - *a = 0x0DD9; - *b = ab; - return true; - } - } - - return c->unicode->decompose (ab, a, b); -} - -static bool -compose_indic (const hb_ot_shape_normalize_context_t *c, - hb_codepoint_t a, - hb_codepoint_t b, - hb_codepoint_t *ab) -{ - /* Avoid recomposing split matras. */ - if (HB_UNICODE_GENERAL_CATEGORY_IS_MARK (c->unicode->general_category (a))) - return false; - - /* Composition-exclusion exceptions that we want to recompose. */ - if (a == 0x09AF && b == 0x09BC) { *ab = 0x09DF; return true; } - - return c->unicode->compose (a, b, ab); -} - - -const hb_ot_complex_shaper_t _hb_ot_complex_shaper_indic = -{ - "indic", - collect_features_indic, - override_features_indic, - data_create_indic, - data_destroy_indic, - NULL, /* preprocess_text */ - normalization_preference_indic, - decompose_indic, - compose_indic, - setup_masks_indic, - HB_OT_SHAPE_ZERO_WIDTH_MARKS_NONE, - false, /* fallback_position */ -}; diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-myanmar-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-myanmar-machine.hh deleted file mode 100644 index 797bfc5bea0..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-myanmar-machine.hh +++ /dev/null @@ -1,391 +0,0 @@ - -#line 1 "../../src/hb-ot-shape-complex-myanmar-machine.rl" -/* - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_SHAPE_COMPLEX_MYANMAR_MACHINE_HH -#define HB_OT_SHAPE_COMPLEX_MYANMAR_MACHINE_HH - -#include "hb-private.hh" - - -#line 36 "hb-ot-shape-complex-myanmar-machine.hh.tmp" -static const unsigned char _myanmar_syllable_machine_trans_keys[] = { - 1u, 30u, 3u, 30u, 5u, 29u, 5u, 8u, 5u, 29u, 3u, 25u, 5u, 25u, 5u, 25u, - 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 1u, 16u, 3u, 29u, 3u, 29u, 3u, 29u, - 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 5u, 29u, 5u, 8u, - 5u, 29u, 3u, 25u, 5u, 25u, 5u, 25u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, - 3u, 30u, 3u, 29u, 1u, 30u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, - 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 0 -}; - -static const char _myanmar_syllable_machine_key_spans[] = { - 30, 28, 25, 4, 25, 23, 21, 21, - 27, 27, 27, 27, 16, 27, 27, 27, - 27, 27, 27, 27, 27, 27, 25, 4, - 25, 23, 21, 21, 27, 27, 27, 27, - 28, 27, 30, 27, 27, 27, 27, 27, - 27, 27, 27, 27 -}; - -static const short _myanmar_syllable_machine_index_offsets[] = { - 0, 31, 60, 86, 91, 117, 141, 163, - 185, 213, 241, 269, 297, 314, 342, 370, - 398, 426, 454, 482, 510, 538, 566, 592, - 597, 623, 647, 669, 691, 719, 747, 775, - 803, 832, 860, 891, 919, 947, 975, 1003, - 1031, 1059, 1087, 1115 -}; - -static const char _myanmar_syllable_machine_indicies[] = { - 1, 1, 2, 3, 4, 4, 0, 5, - 0, 6, 0, 1, 0, 0, 0, 7, - 0, 8, 1, 0, 9, 10, 11, 12, - 13, 14, 15, 16, 17, 18, 0, 20, - 21, 22, 22, 19, 23, 19, 24, 19, - 19, 19, 19, 19, 19, 19, 25, 19, - 19, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 19, 22, 22, 19, 23, - 19, 19, 19, 19, 19, 19, 19, 19, - 19, 36, 19, 19, 19, 19, 19, 19, - 30, 19, 19, 19, 34, 19, 22, 22, - 19, 23, 19, 22, 22, 19, 23, 19, - 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 30, - 19, 19, 19, 34, 19, 37, 19, 22, - 22, 19, 23, 19, 30, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 30, 19, 22, 22, 19, - 23, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 38, 19, 19, 19, 19, 19, - 19, 30, 19, 22, 22, 19, 23, 19, - 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 30, - 19, 20, 19, 22, 22, 19, 23, 19, - 24, 19, 19, 19, 19, 19, 19, 19, - 39, 19, 19, 39, 19, 19, 19, 30, - 40, 19, 19, 34, 19, 20, 19, 22, - 22, 19, 23, 19, 24, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 30, 19, 19, 19, 34, - 19, 20, 19, 22, 22, 19, 23, 19, - 24, 19, 19, 19, 19, 19, 19, 19, - 39, 19, 19, 19, 19, 19, 19, 30, - 40, 19, 19, 34, 19, 20, 19, 22, - 22, 19, 23, 19, 24, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 30, 40, 19, 19, 34, - 19, 1, 1, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, - 1, 19, 20, 19, 22, 22, 19, 23, - 19, 24, 19, 19, 19, 19, 19, 19, - 19, 25, 19, 19, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 19, 20, 19, - 22, 22, 19, 23, 19, 24, 19, 19, - 19, 19, 19, 19, 19, 33, 19, 19, - 19, 19, 19, 19, 30, 31, 32, 33, - 34, 19, 20, 19, 22, 22, 19, 23, - 19, 24, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, - 30, 31, 32, 33, 34, 19, 20, 19, - 22, 22, 19, 23, 19, 24, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 30, 31, 32, 19, - 34, 19, 20, 19, 22, 22, 19, 23, - 19, 24, 19, 19, 19, 19, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, - 30, 19, 32, 19, 34, 19, 20, 19, - 22, 22, 19, 23, 19, 24, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, - 26, 19, 28, 19, 30, 31, 32, 33, - 34, 19, 20, 19, 22, 22, 19, 23, - 19, 24, 19, 19, 19, 19, 19, 19, - 19, 33, 19, 19, 26, 19, 19, 19, - 30, 31, 32, 33, 34, 19, 20, 19, - 22, 22, 19, 23, 19, 24, 19, 19, - 19, 19, 19, 19, 19, 19, 19, 19, - 26, 27, 28, 19, 30, 31, 32, 33, - 34, 19, 20, 21, 22, 22, 19, 23, - 19, 24, 19, 19, 19, 19, 19, 19, - 19, 25, 19, 19, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 19, 3, 3, - 41, 5, 41, 41, 41, 41, 41, 41, - 41, 41, 41, 42, 41, 41, 41, 41, - 41, 41, 13, 41, 41, 41, 17, 41, - 3, 3, 41, 5, 41, 3, 3, 41, - 5, 41, 41, 41, 41, 41, 41, 41, - 41, 41, 41, 41, 41, 41, 41, 41, - 41, 13, 41, 41, 41, 17, 41, 43, - 41, 3, 3, 41, 5, 41, 13, 41, - 41, 41, 41, 41, 41, 41, 41, 41, - 41, 41, 41, 41, 41, 13, 41, 3, - 3, 41, 5, 41, 41, 41, 41, 41, - 41, 41, 41, 41, 44, 41, 41, 41, - 41, 41, 41, 13, 41, 3, 3, 41, - 5, 41, 41, 41, 41, 41, 41, 41, - 41, 41, 41, 41, 41, 41, 41, 41, - 41, 13, 41, 2, 41, 3, 3, 41, - 5, 41, 6, 41, 41, 41, 41, 41, - 41, 41, 45, 41, 41, 45, 41, 41, - 41, 13, 46, 41, 41, 17, 41, 2, - 41, 3, 3, 41, 5, 41, 6, 41, - 41, 41, 41, 41, 41, 41, 41, 41, - 41, 41, 41, 41, 41, 13, 41, 41, - 41, 17, 41, 2, 41, 3, 3, 41, - 5, 41, 6, 41, 41, 41, 41, 41, - 41, 41, 45, 41, 41, 41, 41, 41, - 41, 13, 46, 41, 41, 17, 41, 2, - 41, 3, 3, 41, 5, 41, 6, 41, - 41, 41, 41, 41, 41, 41, 41, 41, - 41, 41, 41, 41, 41, 13, 46, 41, - 41, 17, 41, 20, 21, 22, 22, 19, - 23, 19, 24, 19, 19, 19, 19, 19, - 19, 19, 47, 19, 19, 26, 27, 28, - 29, 30, 31, 32, 33, 34, 35, 19, - 20, 48, 22, 22, 19, 23, 19, 24, - 19, 19, 19, 19, 19, 19, 19, 25, - 19, 19, 26, 27, 28, 29, 30, 31, - 32, 33, 34, 19, 1, 1, 2, 3, - 3, 3, 41, 5, 41, 6, 41, 1, - 41, 41, 41, 1, 41, 8, 1, 41, - 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 41, 2, 41, 3, 3, 41, - 5, 41, 6, 41, 41, 41, 41, 41, - 41, 41, 8, 41, 41, 9, 10, 11, - 12, 13, 14, 15, 16, 17, 41, 2, - 41, 3, 3, 41, 5, 41, 6, 41, - 41, 41, 41, 41, 41, 41, 16, 41, - 41, 41, 41, 41, 41, 13, 14, 15, - 16, 17, 41, 2, 41, 3, 3, 41, - 5, 41, 6, 41, 41, 41, 41, 41, - 41, 41, 41, 41, 41, 41, 41, 41, - 41, 13, 14, 15, 16, 17, 41, 2, - 41, 3, 3, 41, 5, 41, 6, 41, - 41, 41, 41, 41, 41, 41, 41, 41, - 41, 41, 41, 41, 41, 13, 14, 15, - 41, 17, 41, 2, 41, 3, 3, 41, - 5, 41, 6, 41, 41, 41, 41, 41, - 41, 41, 41, 41, 41, 41, 41, 41, - 41, 13, 41, 15, 41, 17, 41, 2, - 41, 3, 3, 41, 5, 41, 6, 41, - 41, 41, 41, 41, 41, 41, 41, 41, - 41, 9, 41, 11, 41, 13, 14, 15, - 16, 17, 41, 2, 41, 3, 3, 41, - 5, 41, 6, 41, 41, 41, 41, 41, - 41, 41, 16, 41, 41, 9, 41, 41, - 41, 13, 14, 15, 16, 17, 41, 2, - 41, 3, 3, 41, 5, 41, 6, 41, - 41, 41, 41, 41, 41, 41, 41, 41, - 41, 9, 10, 11, 41, 13, 14, 15, - 16, 17, 41, 2, 3, 3, 3, 41, - 5, 41, 6, 41, 41, 41, 41, 41, - 41, 41, 8, 41, 41, 9, 10, 11, - 12, 13, 14, 15, 16, 17, 41, 0 -}; - -static const char _myanmar_syllable_machine_trans_targs[] = { - 0, 1, 22, 0, 0, 23, 29, 32, - 35, 36, 40, 41, 42, 25, 38, 39, - 37, 28, 43, 0, 2, 12, 0, 3, - 9, 13, 14, 18, 19, 20, 5, 16, - 17, 15, 8, 21, 4, 6, 7, 10, - 11, 0, 24, 26, 27, 30, 31, 33, - 34 -}; - -static const char _myanmar_syllable_machine_trans_actions[] = { - 3, 0, 0, 4, 5, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 6, 0, 0, 7, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 8, 0, 0, 0, 0, 0, 0, - 0 -}; - -static const char _myanmar_syllable_machine_to_state_actions[] = { - 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0 -}; - -static const char _myanmar_syllable_machine_from_state_actions[] = { - 2, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0 -}; - -static const short _myanmar_syllable_machine_eof_trans[] = { - 0, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 20, 20, - 20, 20, 20, 20, 20, 20, 42, 42, - 42, 42, 42, 42, 42, 42, 42, 42, - 20, 20, 42, 42, 42, 42, 42, 42, - 42, 42, 42, 42 -}; - -static const int myanmar_syllable_machine_start = 0; -static const int myanmar_syllable_machine_first_final = 0; -static const int myanmar_syllable_machine_error = -1; - -static const int myanmar_syllable_machine_en_main = 0; - - -#line 36 "../../src/hb-ot-shape-complex-myanmar-machine.rl" - - - -#line 90 "../../src/hb-ot-shape-complex-myanmar-machine.rl" - - -#define found_syllable(syllable_type) \ - HB_STMT_START { \ - if (0) fprintf (stderr, "syllable %d..%d %s\n", last, p+1, #syllable_type); \ - for (unsigned int i = last; i < p+1; i++) \ - info[i].syllable() = (syllable_serial << 4) | syllable_type; \ - last = p+1; \ - syllable_serial++; \ - if (unlikely (syllable_serial == 16)) syllable_serial = 1; \ - } HB_STMT_END - -static void -find_syllables (hb_buffer_t *buffer) -{ - unsigned int p, pe, eof, ts HB_UNUSED, te HB_UNUSED, act HB_UNUSED; - int cs; - hb_glyph_info_t *info = buffer->info; - -#line 288 "hb-ot-shape-complex-myanmar-machine.hh.tmp" - { - cs = myanmar_syllable_machine_start; - ts = 0; - te = 0; - act = 0; - } - -#line 111 "../../src/hb-ot-shape-complex-myanmar-machine.rl" - - - p = 0; - pe = eof = buffer->len; - - unsigned int last = 0; - unsigned int syllable_serial = 1; - -#line 305 "hb-ot-shape-complex-myanmar-machine.hh.tmp" - { - int _slen; - int _trans; - const unsigned char *_keys; - const char *_inds; - if ( p == pe ) - goto _test_eof; -_resume: - switch ( _myanmar_syllable_machine_from_state_actions[cs] ) { - case 2: -#line 1 "NONE" - {ts = p;} - break; -#line 319 "hb-ot-shape-complex-myanmar-machine.hh.tmp" - } - - _keys = _myanmar_syllable_machine_trans_keys + (cs<<1); - _inds = _myanmar_syllable_machine_indicies + _myanmar_syllable_machine_index_offsets[cs]; - - _slen = _myanmar_syllable_machine_key_spans[cs]; - _trans = _inds[ _slen > 0 && _keys[0] <=( info[p].myanmar_category()) && - ( info[p].myanmar_category()) <= _keys[1] ? - ( info[p].myanmar_category()) - _keys[0] : _slen ]; - -_eof_trans: - cs = _myanmar_syllable_machine_trans_targs[_trans]; - - if ( _myanmar_syllable_machine_trans_actions[_trans] == 0 ) - goto _again; - - switch ( _myanmar_syllable_machine_trans_actions[_trans] ) { - case 7: -#line 83 "../../src/hb-ot-shape-complex-myanmar-machine.rl" - {te = p+1;{ found_syllable (consonant_syllable); }} - break; - case 5: -#line 84 "../../src/hb-ot-shape-complex-myanmar-machine.rl" - {te = p+1;{ found_syllable (non_myanmar_cluster); }} - break; - case 4: -#line 85 "../../src/hb-ot-shape-complex-myanmar-machine.rl" - {te = p+1;{ found_syllable (broken_cluster); }} - break; - case 3: -#line 86 "../../src/hb-ot-shape-complex-myanmar-machine.rl" - {te = p+1;{ found_syllable (non_myanmar_cluster); }} - break; - case 6: -#line 83 "../../src/hb-ot-shape-complex-myanmar-machine.rl" - {te = p;p--;{ found_syllable (consonant_syllable); }} - break; - case 8: -#line 85 "../../src/hb-ot-shape-complex-myanmar-machine.rl" - {te = p;p--;{ found_syllable (broken_cluster); }} - break; -#line 361 "hb-ot-shape-complex-myanmar-machine.hh.tmp" - } - -_again: - switch ( _myanmar_syllable_machine_to_state_actions[cs] ) { - case 1: -#line 1 "NONE" - {ts = 0;} - break; -#line 370 "hb-ot-shape-complex-myanmar-machine.hh.tmp" - } - - if ( ++p != pe ) - goto _resume; - _test_eof: {} - if ( p == eof ) - { - if ( _myanmar_syllable_machine_eof_trans[cs] > 0 ) { - _trans = _myanmar_syllable_machine_eof_trans[cs] - 1; - goto _eof_trans; - } - } - - } - -#line 120 "../../src/hb-ot-shape-complex-myanmar-machine.rl" - -} - -#undef found_syllable - -#endif /* HB_OT_SHAPE_COMPLEX_MYANMAR_MACHINE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-myanmar-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-myanmar-machine.rl deleted file mode 100644 index 51d42dd64ab..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-myanmar-machine.rl +++ /dev/null @@ -1,125 +0,0 @@ -/* - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_SHAPE_COMPLEX_MYANMAR_MACHINE_HH -#define HB_OT_SHAPE_COMPLEX_MYANMAR_MACHINE_HH - -#include "hb-private.hh" - -%%{ - machine myanmar_syllable_machine; - alphtype unsigned char; - write data; -}%% - -%%{ - -# Same order as enum myanmar_category_t. Not sure how to avoid duplication. -A = 10; -As = 18; -C = 1; -D = 19; -D0 = 20; -DB = 3; -GB = 12; -H = 4; -IV = 2; -MH = 21; -MR = 22; -MW = 23; -MY = 24; -PT = 25; -V = 8; -VAbv = 26; -VBlw = 27; -VPre = 28; -VPst = 29; -VS = 30; -ZWJ = 6; -ZWNJ = 5; -Ra = 16; - -j = ZWJ|ZWNJ; # Joiners -k = (Ra As H); # Kinzi - -c = C|Ra; # is_consonant - -medial_group = MY? MR? ((MW MH? | MH) As?)?; -main_vowel_group = VPre* VAbv* VBlw* A* (DB As?)?; -post_vowel_group = VPst MH? As* VAbv* A* (DB As?)?; -pwo_tone_group = PT A* (DB As?)?; - -complex_syllable_tail = As* medial_group main_vowel_group post_vowel_group* pwo_tone_group* V* j?; -syllable_tail = (H | complex_syllable_tail); - -consonant_syllable = k? (c|IV|D|GB).VS? (H (c|IV).VS?)* syllable_tail; -broken_cluster = k? VS? syllable_tail; -other = any; - -main := |* - consonant_syllable => { found_syllable (consonant_syllable); }; - j => { found_syllable (non_myanmar_cluster); }; - broken_cluster => { found_syllable (broken_cluster); }; - other => { found_syllable (non_myanmar_cluster); }; -*|; - - -}%% - -#define found_syllable(syllable_type) \ - HB_STMT_START { \ - if (0) fprintf (stderr, "syllable %d..%d %s\n", last, p+1, #syllable_type); \ - for (unsigned int i = last; i < p+1; i++) \ - info[i].syllable() = (syllable_serial << 4) | syllable_type; \ - last = p+1; \ - syllable_serial++; \ - if (unlikely (syllable_serial == 16)) syllable_serial = 1; \ - } HB_STMT_END - -static void -find_syllables (hb_buffer_t *buffer) -{ - unsigned int p, pe, eof, ts HB_UNUSED, te HB_UNUSED, act HB_UNUSED; - int cs; - hb_glyph_info_t *info = buffer->info; - %%{ - write init; - getkey info[p].myanmar_category(); - }%% - - p = 0; - pe = eof = buffer->len; - - unsigned int last = 0; - unsigned int syllable_serial = 1; - %%{ - write exec; - }%% -} - -#undef found_syllable - -#endif /* HB_OT_SHAPE_COMPLEX_MYANMAR_MACHINE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-myanmar.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-myanmar.cc deleted file mode 100644 index ff13bdd1ebe..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-myanmar.cc +++ /dev/null @@ -1,545 +0,0 @@ -/* - * Copyright © 2011,2012,2013 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-ot-shape-complex-indic-private.hh" - -/* buffer var allocations */ -#define myanmar_category() complex_var_u8_0() /* myanmar_category_t */ -#define myanmar_position() complex_var_u8_1() /* myanmar_position_t */ - - -/* - * Myanmar shaper. - */ - -static const hb_tag_t -basic_features[] = -{ - /* - * Basic features. - * These features are applied in order, one at a time, after initial_reordering. - */ - HB_TAG('r','p','h','f'), - HB_TAG('p','r','e','f'), - HB_TAG('b','l','w','f'), - HB_TAG('p','s','t','f'), -}; -static const hb_tag_t -other_features[] = -{ - /* - * Other features. - * These features are applied all at once, after final_reordering. - */ - HB_TAG('p','r','e','s'), - HB_TAG('a','b','v','s'), - HB_TAG('b','l','w','s'), - HB_TAG('p','s','t','s'), - /* Positioning features, though we don't care about the types. */ - HB_TAG('d','i','s','t'), -}; - -static void -setup_syllables (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer); -static void -initial_reordering (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer); -static void -final_reordering (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer); - -static void -collect_features_myanmar (hb_ot_shape_planner_t *plan) -{ - hb_ot_map_builder_t *map = &plan->map; - - /* Do this before any lookups have been applied. */ - map->add_gsub_pause (setup_syllables); - - map->add_global_bool_feature (HB_TAG('l','o','c','l')); - /* The Indic specs do not require ccmp, but we apply it here since if - * there is a use of it, it's typically at the beginning. */ - map->add_global_bool_feature (HB_TAG('c','c','m','p')); - - - map->add_gsub_pause (initial_reordering); - for (unsigned int i = 0; i < ARRAY_LENGTH (basic_features); i++) - { - map->add_feature (basic_features[i], 1, F_GLOBAL | F_MANUAL_ZWJ); - map->add_gsub_pause (NULL); - } - map->add_gsub_pause (final_reordering); - for (unsigned int i = 0; i < ARRAY_LENGTH (other_features); i++) - map->add_feature (other_features[i], 1, F_GLOBAL | F_MANUAL_ZWJ); -} - -static void -override_features_myanmar (hb_ot_shape_planner_t *plan) -{ - plan->map.add_feature (HB_TAG('l','i','g','a'), 0, F_GLOBAL); - - /* - * Note: - * - * Spec says 'mark' is used, and the mmrtext.ttf font from - * Windows 8 has lookups for it. But testing suggests that - * Windows 8 Uniscribe is NOT applying it. It *is* applying - * 'mkmk' however. - */ - if (hb_options ().uniscribe_bug_compatible) - plan->map.add_feature (HB_TAG('m','a','r','k'), 0, F_GLOBAL); -} - - -enum syllable_type_t { - consonant_syllable, - broken_cluster, - non_myanmar_cluster, -}; - -#include "hb-ot-shape-complex-myanmar-machine.hh" - - -/* Note: This enum is duplicated in the -machine.rl source file. - * Not sure how to avoid duplication. */ -enum myanmar_category_t { - OT_As = 18, /* Asat */ - OT_D = 19, /* Digits except zero */ - OT_D0 = 20, /* Digit zero */ - OT_DB = OT_N, /* Dot below */ - OT_GB = OT_DOTTEDCIRCLE, - OT_MH = 21, /* Various consonant medial types */ - OT_MR = 22, /* Various consonant medial types */ - OT_MW = 23, /* Various consonant medial types */ - OT_MY = 24, /* Various consonant medial types */ - OT_PT = 25, /* Pwo and other tones */ - OT_VAbv = 26, - OT_VBlw = 27, - OT_VPre = 28, - OT_VPst = 29, - OT_VS = 30 /* Variation selectors */ -}; - - -static inline bool -is_one_of (const hb_glyph_info_t &info, unsigned int flags) -{ - /* If it ligated, all bets are off. */ - if (is_a_ligature (info)) return false; - return !!(FLAG (info.myanmar_category()) & flags); -} - -/* Note: - * - * We treat Vowels and placeholders as if they were consonants. This is safe because Vowels - * cannot happen in a consonant syllable. The plus side however is, we can call the - * consonant syllable logic from the vowel syllable function and get it all right! */ -#define CONSONANT_FLAGS (FLAG (OT_C) | FLAG (OT_CM) | FLAG (OT_Ra) | FLAG (OT_V) | FLAG (OT_NBSP) | FLAG (OT_GB)) -static inline bool -is_consonant (const hb_glyph_info_t &info) -{ - return is_one_of (info, CONSONANT_FLAGS); -} - - -static inline void -set_myanmar_properties (hb_glyph_info_t &info) -{ - hb_codepoint_t u = info.codepoint; - unsigned int type = hb_indic_get_categories (u); - indic_category_t cat = (indic_category_t) (type & 0x7F); - indic_position_t pos = (indic_position_t) (type >> 8); - - /* Myanmar - * http://www.microsoft.com/typography/OpenTypeDev/myanmar/intro.htm#analyze - */ - if (unlikely (hb_in_range<hb_codepoint_t> (u, 0xFE00, 0xFE0F))) - cat = (indic_category_t) OT_VS; - else if (unlikely (u == 0x200C)) cat = (indic_category_t) OT_ZWNJ; - else if (unlikely (u == 0x200D)) cat = (indic_category_t) OT_ZWJ; - - switch (u) - { - case 0x002D: case 0x00A0: case 0x00D7: case 0x2012: - case 0x2013: case 0x2014: case 0x2015: case 0x2022: - case 0x25CC: case 0x25FB: case 0x25FC: case 0x25FD: - case 0x25FE: - cat = (indic_category_t) OT_GB; - break; - - case 0x1004: case 0x101B: case 0x105A: - cat = (indic_category_t) OT_Ra; - break; - - case 0x1032: case 0x1036: - cat = (indic_category_t) OT_A; - break; - - case 0x103A: - cat = (indic_category_t) OT_As; - break; - - case 0x1041: case 0x1042: case 0x1043: case 0x1044: - case 0x1045: case 0x1046: case 0x1047: case 0x1048: - case 0x1049: case 0x1090: case 0x1091: case 0x1092: - case 0x1093: case 0x1094: case 0x1095: case 0x1096: - case 0x1097: case 0x1098: case 0x1099: - cat = (indic_category_t) OT_D; - break; - - case 0x1040: - cat = (indic_category_t) OT_D; /* XXX The spec says D0, but Uniscribe doesn't seem to do. */ - break; - - case 0x103E: case 0x1060: - cat = (indic_category_t) OT_MH; - break; - - case 0x103C: - cat = (indic_category_t) OT_MR; - break; - - case 0x103D: case 0x1082: - cat = (indic_category_t) OT_MW; - break; - - case 0x103B: case 0x105E: case 0x105F: - cat = (indic_category_t) OT_MY; - break; - - case 0x1063: case 0x1064: case 0x1069: case 0x106A: - case 0x106B: case 0x106C: case 0x106D: case 0xAA7B: - cat = (indic_category_t) OT_PT; - break; - - case 0x1038: case 0x1087: case 0x1088: case 0x1089: - case 0x108A: case 0x108B: case 0x108C: case 0x108D: - case 0x108F: case 0x109A: case 0x109B: case 0x109C: - cat = (indic_category_t) OT_SM; - break; - } - - if (cat == OT_M) - { - switch ((int) pos) - { - case POS_PRE_C: cat = (indic_category_t) OT_VPre; - pos = POS_PRE_M; break; - case POS_ABOVE_C: cat = (indic_category_t) OT_VAbv; break; - case POS_BELOW_C: cat = (indic_category_t) OT_VBlw; break; - case POS_POST_C: cat = (indic_category_t) OT_VPst; break; - } - } - - info.myanmar_category() = (myanmar_category_t) cat; - info.myanmar_position() = pos; -} - - - -static void -setup_masks_myanmar (const hb_ot_shape_plan_t *plan HB_UNUSED, - hb_buffer_t *buffer, - hb_font_t *font HB_UNUSED) -{ - HB_BUFFER_ALLOCATE_VAR (buffer, myanmar_category); - HB_BUFFER_ALLOCATE_VAR (buffer, myanmar_position); - - /* We cannot setup masks here. We save information about characters - * and setup masks later on in a pause-callback. */ - - unsigned int count = buffer->len; - for (unsigned int i = 0; i < count; i++) - set_myanmar_properties (buffer->info[i]); -} - -static void -setup_syllables (const hb_ot_shape_plan_t *plan HB_UNUSED, - hb_font_t *font HB_UNUSED, - hb_buffer_t *buffer) -{ - find_syllables (buffer); -} - -static int -compare_myanmar_order (const hb_glyph_info_t *pa, const hb_glyph_info_t *pb) -{ - int a = pa->myanmar_position(); - int b = pb->myanmar_position(); - - return a < b ? -1 : a == b ? 0 : +1; -} - - -/* Rules from: - * http://www.microsoft.com/typography/OpenTypeDev/myanmar/intro.htm */ - -static void -initial_reordering_consonant_syllable (const hb_ot_shape_plan_t *plan, - hb_face_t *face, - hb_buffer_t *buffer, - unsigned int start, unsigned int end) -{ - hb_glyph_info_t *info = buffer->info; - - unsigned int base = end; - bool has_reph = false; - - { - unsigned int limit = start; - if (start + 3 <= end && - info[start ].myanmar_category() == OT_Ra && - info[start+1].myanmar_category() == OT_As && - info[start+2].myanmar_category() == OT_H) - { - limit += 3; - base = start; - has_reph = true; - } - - { - if (!has_reph) - base = limit; - - for (unsigned int i = limit; i < end; i++) - if (is_consonant (info[i])) - { - base = i; - break; - } - } - } - - /* Reorder! */ - { - unsigned int i = start; - for (; i < start + (has_reph ? 3 : 0); i++) - info[i].myanmar_position() = POS_AFTER_MAIN; - for (; i < base; i++) - info[i].myanmar_position() = POS_PRE_C; - if (i < end) - { - info[i].myanmar_position() = POS_BASE_C; - i++; - } - indic_position_t pos = POS_AFTER_MAIN; - /* The following loop may be ugly, but it implements all of - * Myanmar reordering! */ - for (; i < end; i++) - { - if (info[i].myanmar_category() == OT_MR) /* Pre-base reordering */ - { - info[i].myanmar_position() = POS_PRE_C; - continue; - } - if (info[i].myanmar_position() < POS_BASE_C) /* Left matra */ - { - continue; - } - - if (pos == POS_AFTER_MAIN && info[i].myanmar_category() == OT_VBlw) - { - pos = POS_BELOW_C; - info[i].myanmar_position() = pos; - continue; - } - - if (pos == POS_BELOW_C && info[i].myanmar_category() == OT_A) - { - info[i].myanmar_position() = POS_BEFORE_SUB; - continue; - } - if (pos == POS_BELOW_C && info[i].myanmar_category() == OT_VBlw) - { - info[i].myanmar_position() = pos; - continue; - } - if (pos == POS_BELOW_C && info[i].myanmar_category() != OT_A) - { - pos = POS_AFTER_SUB; - info[i].myanmar_position() = pos; - continue; - } - info[i].myanmar_position() = pos; - } - } - - buffer->merge_clusters (start, end); - /* Sit tight, rock 'n roll! */ - hb_bubble_sort (info + start, end - start, compare_myanmar_order); -} - -static void -initial_reordering_broken_cluster (const hb_ot_shape_plan_t *plan, - hb_face_t *face, - hb_buffer_t *buffer, - unsigned int start, unsigned int end) -{ - /* We already inserted dotted-circles, so just call the consonant_syllable. */ - initial_reordering_consonant_syllable (plan, face, buffer, start, end); -} - -static void -initial_reordering_non_myanmar_cluster (const hb_ot_shape_plan_t *plan HB_UNUSED, - hb_face_t *face HB_UNUSED, - hb_buffer_t *buffer HB_UNUSED, - unsigned int start HB_UNUSED, unsigned int end HB_UNUSED) -{ - /* Nothing to do right now. If we ever switch to using the output - * buffer in the reordering process, we'd need to next_glyph() here. */ -} - - -static void -initial_reordering_syllable (const hb_ot_shape_plan_t *plan, - hb_face_t *face, - hb_buffer_t *buffer, - unsigned int start, unsigned int end) -{ - syllable_type_t syllable_type = (syllable_type_t) (buffer->info[start].syllable() & 0x0F); - switch (syllable_type) { - case consonant_syllable: initial_reordering_consonant_syllable (plan, face, buffer, start, end); return; - case broken_cluster: initial_reordering_broken_cluster (plan, face, buffer, start, end); return; - case non_myanmar_cluster: initial_reordering_non_myanmar_cluster (plan, face, buffer, start, end); return; - } -} - -static inline void -insert_dotted_circles (const hb_ot_shape_plan_t *plan HB_UNUSED, - hb_font_t *font, - hb_buffer_t *buffer) -{ - /* Note: This loop is extra overhead, but should not be measurable. */ - bool has_broken_syllables = false; - unsigned int count = buffer->len; - for (unsigned int i = 0; i < count; i++) - if ((buffer->info[i].syllable() & 0x0F) == broken_cluster) { - has_broken_syllables = true; - break; - } - if (likely (!has_broken_syllables)) - return; - - - hb_codepoint_t dottedcircle_glyph; - if (!font->get_glyph (0x25CC, 0, &dottedcircle_glyph)) - return; - - hb_glyph_info_t dottedcircle = {0}; - dottedcircle.codepoint = 0x25CC; - set_myanmar_properties (dottedcircle); - dottedcircle.codepoint = dottedcircle_glyph; - - buffer->clear_output (); - - buffer->idx = 0; - unsigned int last_syllable = 0; - while (buffer->idx < buffer->len) - { - unsigned int syllable = buffer->cur().syllable(); - syllable_type_t syllable_type = (syllable_type_t) (syllable & 0x0F); - if (unlikely (last_syllable != syllable && syllable_type == broken_cluster)) - { - last_syllable = syllable; - - hb_glyph_info_t info = dottedcircle; - info.cluster = buffer->cur().cluster; - info.mask = buffer->cur().mask; - info.syllable() = buffer->cur().syllable(); - - buffer->output_info (info); - } - else - buffer->next_glyph (); - } - - buffer->swap_buffers (); -} - -static void -initial_reordering (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer) -{ - insert_dotted_circles (plan, font, buffer); - - hb_glyph_info_t *info = buffer->info; - unsigned int count = buffer->len; - if (unlikely (!count)) return; - unsigned int last = 0; - unsigned int last_syllable = info[0].syllable(); - for (unsigned int i = 1; i < count; i++) - if (last_syllable != info[i].syllable()) { - initial_reordering_syllable (plan, font->face, buffer, last, i); - last = i; - last_syllable = info[last].syllable(); - } - initial_reordering_syllable (plan, font->face, buffer, last, count); -} - -static void -final_reordering (const hb_ot_shape_plan_t *plan, - hb_font_t *font HB_UNUSED, - hb_buffer_t *buffer) -{ - hb_glyph_info_t *info = buffer->info; - unsigned int count = buffer->len; - - /* Zero syllables now... */ - for (unsigned int i = 0; i < count; i++) - info[i].syllable() = 0; - - HB_BUFFER_DEALLOCATE_VAR (buffer, myanmar_category); - HB_BUFFER_DEALLOCATE_VAR (buffer, myanmar_position); -} - - -static hb_ot_shape_normalization_mode_t -normalization_preference_myanmar (const hb_segment_properties_t *props HB_UNUSED) -{ - return HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS_NO_SHORT_CIRCUIT; -} - - -const hb_ot_complex_shaper_t _hb_ot_complex_shaper_myanmar = -{ - "myanmar", - collect_features_myanmar, - override_features_myanmar, - NULL, /* data_create */ - NULL, /* data_destroy */ - NULL, /* preprocess_text */ - normalization_preference_myanmar, - NULL, /* decompose */ - NULL, /* compose */ - setup_masks_myanmar, - HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF, - false, /* fallback_position */ -}; diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-private.hh deleted file mode 100644 index 1474a3df070..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-private.hh +++ /dev/null @@ -1,355 +0,0 @@ -/* - * Copyright © 2010,2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_SHAPE_COMPLEX_PRIVATE_HH -#define HB_OT_SHAPE_COMPLEX_PRIVATE_HH - -#include "hb-private.hh" - -#include "hb-ot-shape-private.hh" -#include "hb-ot-shape-normalize-private.hh" - - - -/* buffer var allocations, used by complex shapers */ -#define complex_var_u8_0() var2.u8[2] -#define complex_var_u8_1() var2.u8[3] - - -enum hb_ot_shape_zero_width_marks_type_t { - HB_OT_SHAPE_ZERO_WIDTH_MARKS_NONE, - HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE, - HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF -}; - - -/* Master OT shaper list */ -#define HB_COMPLEX_SHAPERS_IMPLEMENT_SHAPERS \ - HB_COMPLEX_SHAPER_IMPLEMENT (default) /* should be first */ \ - HB_COMPLEX_SHAPER_IMPLEMENT (arabic) \ - HB_COMPLEX_SHAPER_IMPLEMENT (indic) \ - HB_COMPLEX_SHAPER_IMPLEMENT (myanmar) \ - HB_COMPLEX_SHAPER_IMPLEMENT (sea) \ - HB_COMPLEX_SHAPER_IMPLEMENT (thai) \ - /* ^--- Add new shapers here */ - - -struct hb_ot_complex_shaper_t -{ - char name[8]; - - /* collect_features() - * Called during shape_plan(). - * Shapers should use plan->map to add their features and callbacks. - * May be NULL. - */ - void (*collect_features) (hb_ot_shape_planner_t *plan); - - /* override_features() - * Called during shape_plan(). - * Shapers should use plan->map to override features and add callbacks after - * common features are added. - * May be NULL. - */ - void (*override_features) (hb_ot_shape_planner_t *plan); - - - /* data_create() - * Called at the end of shape_plan(). - * Whatever shapers return will be accessible through plan->data later. - * If NULL is returned, means a plan failure. - */ - void *(*data_create) (const hb_ot_shape_plan_t *plan); - - /* data_destroy() - * Called when the shape_plan is being destroyed. - * plan->data is passed here for destruction. - * If NULL is returned, means a plan failure. - * May be NULL. - */ - void (*data_destroy) (void *data); - - - /* preprocess_text() - * Called during shape(). - * Shapers can use to modify text before shaping starts. - * May be NULL. - */ - void (*preprocess_text) (const hb_ot_shape_plan_t *plan, - hb_buffer_t *buffer, - hb_font_t *font); - - - /* normalization_preference() - * Called during shape(). - * May be NULL. - */ - hb_ot_shape_normalization_mode_t - (*normalization_preference) (const hb_segment_properties_t *props); - - /* decompose() - * Called during shape()'s normalization. - * May be NULL. - */ - bool (*decompose) (const hb_ot_shape_normalize_context_t *c, - hb_codepoint_t ab, - hb_codepoint_t *a, - hb_codepoint_t *b); - - /* compose() - * Called during shape()'s normalization. - * May be NULL. - */ - bool (*compose) (const hb_ot_shape_normalize_context_t *c, - hb_codepoint_t a, - hb_codepoint_t b, - hb_codepoint_t *ab); - - /* setup_masks() - * Called during shape(). - * Shapers should use map to get feature masks and set on buffer. - * Shapers may NOT modify characters. - * May be NULL. - */ - void (*setup_masks) (const hb_ot_shape_plan_t *plan, - hb_buffer_t *buffer, - hb_font_t *font); - - hb_ot_shape_zero_width_marks_type_t zero_width_marks; - - bool fallback_position; -}; - -#define HB_COMPLEX_SHAPER_IMPLEMENT(name) extern HB_INTERNAL const hb_ot_complex_shaper_t _hb_ot_complex_shaper_##name; -HB_COMPLEX_SHAPERS_IMPLEMENT_SHAPERS -#undef HB_COMPLEX_SHAPER_IMPLEMENT - - -static inline const hb_ot_complex_shaper_t * -hb_ot_shape_complex_categorize (const hb_ot_shape_planner_t *planner) -{ - switch ((hb_tag_t) planner->props.script) - { - default: - return &_hb_ot_complex_shaper_default; - - - /* Unicode-1.1 additions */ - case HB_SCRIPT_ARABIC: - case HB_SCRIPT_MONGOLIAN: - case HB_SCRIPT_SYRIAC: - - /* Unicode-5.0 additions */ - case HB_SCRIPT_NKO: - case HB_SCRIPT_PHAGS_PA: - - /* Unicode-6.0 additions */ - case HB_SCRIPT_MANDAIC: - - /* For Arabic script, use the Arabic shaper even if no OT script tag was found. - * This is because we do fallback shaping for Arabic script (and not others). */ - if (planner->map.chosen_script[0] != HB_OT_TAG_DEFAULT_SCRIPT || - planner->props.script == HB_SCRIPT_ARABIC) - return &_hb_ot_complex_shaper_arabic; - else - return &_hb_ot_complex_shaper_default; - - - /* Unicode-1.1 additions */ - case HB_SCRIPT_THAI: - case HB_SCRIPT_LAO: - - return &_hb_ot_complex_shaper_thai; - - -#if 0 - /* Note: - * Currently we don't have a separate Hangul shaper. The default shaper handles - * Hangul by enabling jamo features. We may want to implement a separate shaper - * in the future. See this thread for details of what such a shaper would do: - * - * http://lists.freedesktop.org/archives/harfbuzz/2013-April/003070.html - */ - /* Unicode-1.1 additions */ - case HB_SCRIPT_HANGUL: - - return &_hb_ot_complex_shaper_hangul; -#endif - - - /* ^--- Add new shapers here */ - - -#if 0 - /* Note: - * - * These disabled scripts are listed in ucd/IndicSyllabicCategory.txt, but according - * to Martin Hosken and Jonathan Kew do not require complex shaping. - * - * TODO We should automate figuring out which scripts do not need complex shaping - * - * TODO We currently keep data for these scripts in our indic table. Need to fix the - * generator to not do that. - */ - - - /* Simple? */ - - /* Unicode-3.2 additions */ - case HB_SCRIPT_BUHID: - case HB_SCRIPT_HANUNOO: - - /* Unicode-5.1 additions */ - case HB_SCRIPT_SAURASHTRA: - - /* Unicode-6.0 additions */ - case HB_SCRIPT_BATAK: - case HB_SCRIPT_BRAHMI: - - - /* Simple */ - - /* Unicode-1.1 additions */ - /* These have their own shaper now. */ - case HB_SCRIPT_LAO: - case HB_SCRIPT_THAI: - - /* Unicode-2.0 additions */ - case HB_SCRIPT_TIBETAN: - - /* Unicode-3.2 additions */ - case HB_SCRIPT_TAGALOG: - case HB_SCRIPT_TAGBANWA: - - /* Unicode-4.0 additions */ - case HB_SCRIPT_LIMBU: - case HB_SCRIPT_TAI_LE: - - /* Unicode-4.1 additions */ - case HB_SCRIPT_KHAROSHTHI: - case HB_SCRIPT_SYLOTI_NAGRI: - - /* Unicode-5.1 additions */ - case HB_SCRIPT_KAYAH_LI: - - /* Unicode-5.2 additions */ - case HB_SCRIPT_TAI_VIET: - - -#endif - - /* Unicode-1.1 additions */ - case HB_SCRIPT_BENGALI: - case HB_SCRIPT_DEVANAGARI: - case HB_SCRIPT_GUJARATI: - case HB_SCRIPT_GURMUKHI: - case HB_SCRIPT_KANNADA: - case HB_SCRIPT_MALAYALAM: - case HB_SCRIPT_ORIYA: - case HB_SCRIPT_TAMIL: - case HB_SCRIPT_TELUGU: - - /* Unicode-3.0 additions */ - case HB_SCRIPT_SINHALA: - - /* Unicode-4.1 additions */ - case HB_SCRIPT_BUGINESE: - - /* Unicode-5.0 additions */ - case HB_SCRIPT_BALINESE: - - /* Unicode-5.1 additions */ - case HB_SCRIPT_LEPCHA: - case HB_SCRIPT_REJANG: - case HB_SCRIPT_SUNDANESE: - - /* Unicode-5.2 additions */ - case HB_SCRIPT_JAVANESE: - case HB_SCRIPT_KAITHI: - case HB_SCRIPT_MEETEI_MAYEK: - - /* Unicode-6.0 additions */ - - /* Unicode-6.1 additions */ - case HB_SCRIPT_CHAKMA: - case HB_SCRIPT_SHARADA: - case HB_SCRIPT_TAKRI: - - /* If the designer designed the font for the 'DFLT' script, - * use the default shaper. Otherwise, use the Indic shaper. - * Note that for some simple scripts, there may not be *any* - * GSUB/GPOS needed, so there may be no scripts found! */ - if (planner->map.chosen_script[0] == HB_TAG ('D','F','L','T')) - return &_hb_ot_complex_shaper_default; - else - return &_hb_ot_complex_shaper_indic; - - case HB_SCRIPT_KHMER: - /* A number of Khmer fonts in the wild don't have a 'pref' feature, - * and as such won't shape properly via the Indic shaper; - * however, they typically have 'liga' / 'clig' features that implement - * the necessary "reordering" by means of ligature substitutions. - * So we send such pref-less fonts through the generic shaper instead. */ - if (planner->map.found_script[0] && - hb_ot_layout_language_find_feature (planner->face, HB_OT_TAG_GSUB, - planner->map.script_index[0], - planner->map.language_index[0], - HB_TAG ('p','r','e','f'), - NULL)) - return &_hb_ot_complex_shaper_indic; - else - return &_hb_ot_complex_shaper_default; - - case HB_SCRIPT_MYANMAR: - /* For Myanmar, we only want to use the Myanmar shaper if the "new" script - * tag is found. For "old" script tag we want to use the default shaper. */ - if (planner->map.chosen_script[0] == HB_TAG ('m','y','m','2')) - return &_hb_ot_complex_shaper_myanmar; - else - return &_hb_ot_complex_shaper_default; - - /* Unicode-4.1 additions */ - case HB_SCRIPT_NEW_TAI_LUE: - - /* Unicode-5.1 additions */ - case HB_SCRIPT_CHAM: - - /* Unicode-5.2 additions */ - case HB_SCRIPT_TAI_THAM: - - /* If the designer designed the font for the 'DFLT' script, - * use the default shaper. Otherwise, use the Indic shaper. - * Note that for some simple scripts, there may not be *any* - * GSUB/GPOS needed, so there may be no scripts found! */ - if (planner->map.chosen_script[0] == HB_TAG ('D','F','L','T')) - return &_hb_ot_complex_shaper_default; - else - return &_hb_ot_complex_shaper_sea; - } -} - - -#endif /* HB_OT_SHAPE_COMPLEX_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-sea-machine.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-sea-machine.hh deleted file mode 100644 index 86b7ae7d5ca..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-sea-machine.hh +++ /dev/null @@ -1,224 +0,0 @@ - -#line 1 "../../src/hb-ot-shape-complex-sea-machine.rl" -/* - * Copyright © 2011,2012,2013 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_SHAPE_COMPLEX_SEA_MACHINE_HH -#define HB_OT_SHAPE_COMPLEX_SEA_MACHINE_HH - -#include "hb-private.hh" - - -#line 36 "hb-ot-shape-complex-sea-machine.hh.tmp" -static const unsigned char _sea_syllable_machine_trans_keys[] = { - 1u, 1u, 1u, 1u, 1u, 29u, 3u, 29u, 3u, 29u, 1u, 1u, 0 -}; - -static const char _sea_syllable_machine_key_spans[] = { - 1, 1, 29, 27, 27, 1 -}; - -static const char _sea_syllable_machine_index_offsets[] = { - 0, 2, 4, 34, 62, 90 -}; - -static const char _sea_syllable_machine_indicies[] = { - 1, 0, 3, 2, 1, 1, 3, 5, - 4, 4, 4, 4, 4, 3, 4, 1, - 4, 4, 4, 4, 3, 4, 4, 4, - 4, 3, 4, 4, 4, 3, 3, 3, - 3, 4, 1, 7, 6, 6, 6, 6, - 6, 1, 6, 6, 6, 6, 6, 6, - 1, 6, 6, 6, 6, 1, 6, 6, - 6, 1, 1, 1, 1, 6, 3, 9, - 8, 8, 8, 8, 8, 3, 8, 8, - 8, 8, 8, 8, 3, 8, 8, 8, - 8, 3, 8, 8, 8, 3, 3, 3, - 3, 8, 3, 10, 0 -}; - -static const char _sea_syllable_machine_trans_targs[] = { - 2, 3, 2, 4, 2, 5, 2, 0, - 2, 1, 2 -}; - -static const char _sea_syllable_machine_trans_actions[] = { - 1, 2, 3, 2, 6, 0, 7, 0, - 8, 0, 9 -}; - -static const char _sea_syllable_machine_to_state_actions[] = { - 0, 0, 4, 0, 0, 0 -}; - -static const char _sea_syllable_machine_from_state_actions[] = { - 0, 0, 5, 0, 0, 0 -}; - -static const char _sea_syllable_machine_eof_trans[] = { - 1, 3, 0, 7, 9, 11 -}; - -static const int sea_syllable_machine_start = 2; -static const int sea_syllable_machine_first_final = 2; -static const int sea_syllable_machine_error = -1; - -static const int sea_syllable_machine_en_main = 2; - - -#line 36 "../../src/hb-ot-shape-complex-sea-machine.rl" - - - -#line 67 "../../src/hb-ot-shape-complex-sea-machine.rl" - - -#define found_syllable(syllable_type) \ - HB_STMT_START { \ - if (0) fprintf (stderr, "syllable %d..%d %s\n", last, p+1, #syllable_type); \ - for (unsigned int i = last; i < p+1; i++) \ - info[i].syllable() = (syllable_serial << 4) | syllable_type; \ - last = p+1; \ - syllable_serial++; \ - if (unlikely (syllable_serial == 16)) syllable_serial = 1; \ - } HB_STMT_END - -static void -find_syllables (hb_buffer_t *buffer) -{ - unsigned int p, pe, eof, ts HB_UNUSED, te HB_UNUSED, act HB_UNUSED; - int cs; - hb_glyph_info_t *info = buffer->info; - -#line 117 "hb-ot-shape-complex-sea-machine.hh.tmp" - { - cs = sea_syllable_machine_start; - ts = 0; - te = 0; - act = 0; - } - -#line 88 "../../src/hb-ot-shape-complex-sea-machine.rl" - - - p = 0; - pe = eof = buffer->len; - - unsigned int last = 0; - unsigned int syllable_serial = 1; - -#line 134 "hb-ot-shape-complex-sea-machine.hh.tmp" - { - int _slen; - int _trans; - const unsigned char *_keys; - const char *_inds; - if ( p == pe ) - goto _test_eof; -_resume: - switch ( _sea_syllable_machine_from_state_actions[cs] ) { - case 5: -#line 1 "NONE" - {ts = p;} - break; -#line 148 "hb-ot-shape-complex-sea-machine.hh.tmp" - } - - _keys = _sea_syllable_machine_trans_keys + (cs<<1); - _inds = _sea_syllable_machine_indicies + _sea_syllable_machine_index_offsets[cs]; - - _slen = _sea_syllable_machine_key_spans[cs]; - _trans = _inds[ _slen > 0 && _keys[0] <=( info[p].sea_category()) && - ( info[p].sea_category()) <= _keys[1] ? - ( info[p].sea_category()) - _keys[0] : _slen ]; - -_eof_trans: - cs = _sea_syllable_machine_trans_targs[_trans]; - - if ( _sea_syllable_machine_trans_actions[_trans] == 0 ) - goto _again; - - switch ( _sea_syllable_machine_trans_actions[_trans] ) { - case 2: -#line 1 "NONE" - {te = p+1;} - break; - case 6: -#line 63 "../../src/hb-ot-shape-complex-sea-machine.rl" - {te = p+1;{ found_syllable (non_sea_cluster); }} - break; - case 7: -#line 61 "../../src/hb-ot-shape-complex-sea-machine.rl" - {te = p;p--;{ found_syllable (consonant_syllable); }} - break; - case 8: -#line 62 "../../src/hb-ot-shape-complex-sea-machine.rl" - {te = p;p--;{ found_syllable (broken_cluster); }} - break; - case 9: -#line 63 "../../src/hb-ot-shape-complex-sea-machine.rl" - {te = p;p--;{ found_syllable (non_sea_cluster); }} - break; - case 1: -#line 61 "../../src/hb-ot-shape-complex-sea-machine.rl" - {{p = ((te))-1;}{ found_syllable (consonant_syllable); }} - break; - case 3: -#line 62 "../../src/hb-ot-shape-complex-sea-machine.rl" - {{p = ((te))-1;}{ found_syllable (broken_cluster); }} - break; -#line 194 "hb-ot-shape-complex-sea-machine.hh.tmp" - } - -_again: - switch ( _sea_syllable_machine_to_state_actions[cs] ) { - case 4: -#line 1 "NONE" - {ts = 0;} - break; -#line 203 "hb-ot-shape-complex-sea-machine.hh.tmp" - } - - if ( ++p != pe ) - goto _resume; - _test_eof: {} - if ( p == eof ) - { - if ( _sea_syllable_machine_eof_trans[cs] > 0 ) { - _trans = _sea_syllable_machine_eof_trans[cs] - 1; - goto _eof_trans; - } - } - - } - -#line 97 "../../src/hb-ot-shape-complex-sea-machine.rl" - -} - -#undef found_syllable - -#endif /* HB_OT_SHAPE_COMPLEX_SEA_MACHINE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-sea-machine.rl b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-sea-machine.rl deleted file mode 100644 index 46140fc4d5f..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-sea-machine.rl +++ /dev/null @@ -1,102 +0,0 @@ -/* - * Copyright © 2011,2012,2013 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_SHAPE_COMPLEX_SEA_MACHINE_HH -#define HB_OT_SHAPE_COMPLEX_SEA_MACHINE_HH - -#include "hb-private.hh" - -%%{ - machine sea_syllable_machine; - alphtype unsigned char; - write data; -}%% - -%%{ - -# Same order as enum sea_category_t. Not sure how to avoid duplication. -C = 1; -GB = 12; # Generic Base -H = 4; # Halant -IV = 2; # Independent Vowel -MR = 22; # Medial Ra -CM = 17; # Consonant Medial -VAbv = 26; -VBlw = 27; -VPre = 28; -VPst = 29; -T = 3; # Tone Marks -A = 10; # Anusvara - -syllable_tail = (VPre|VAbv|VBlw|VPst|H.C|CM|MR|T|A)*; - -consonant_syllable = (C|IV|GB) syllable_tail; -broken_cluster = syllable_tail; -other = any; - -main := |* - consonant_syllable => { found_syllable (consonant_syllable); }; - broken_cluster => { found_syllable (broken_cluster); }; - other => { found_syllable (non_sea_cluster); }; -*|; - - -}%% - -#define found_syllable(syllable_type) \ - HB_STMT_START { \ - if (0) fprintf (stderr, "syllable %d..%d %s\n", last, p+1, #syllable_type); \ - for (unsigned int i = last; i < p+1; i++) \ - info[i].syllable() = (syllable_serial << 4) | syllable_type; \ - last = p+1; \ - syllable_serial++; \ - if (unlikely (syllable_serial == 16)) syllable_serial = 1; \ - } HB_STMT_END - -static void -find_syllables (hb_buffer_t *buffer) -{ - unsigned int p, pe, eof, ts HB_UNUSED, te HB_UNUSED, act HB_UNUSED; - int cs; - hb_glyph_info_t *info = buffer->info; - %%{ - write init; - getkey info[p].sea_category(); - }%% - - p = 0; - pe = eof = buffer->len; - - unsigned int last = 0; - unsigned int syllable_serial = 1; - %%{ - write exec; - }%% -} - -#undef found_syllable - -#endif /* HB_OT_SHAPE_COMPLEX_SEA_MACHINE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-sea.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-sea.cc deleted file mode 100644 index 9c0c303e3df..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-sea.cc +++ /dev/null @@ -1,384 +0,0 @@ -/* - * Copyright © 2011,2012,2013 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-ot-shape-complex-indic-private.hh" - -/* buffer var allocations */ -#define sea_category() complex_var_u8_0() /* indic_category_t */ -#define sea_position() complex_var_u8_1() /* indic_position_t */ - - -/* - * South-East Asian shaper. - * Loosely based on the Myanmar spec / shaper. - * There is no OpenType spec for this. - */ - -static const hb_tag_t -basic_features[] = -{ - /* - * Basic features. - * These features are applied in order, one at a time, after initial_reordering. - */ - HB_TAG('p','r','e','f'), - HB_TAG('a','b','v','f'), - HB_TAG('b','l','w','f'), - HB_TAG('p','s','t','f'), -}; -static const hb_tag_t -other_features[] = -{ - /* - * Other features. - * These features are applied all at once, after final_reordering. - */ - HB_TAG('p','r','e','s'), - HB_TAG('a','b','v','s'), - HB_TAG('b','l','w','s'), - HB_TAG('p','s','t','s'), - /* Positioning features, though we don't care about the types. */ - HB_TAG('d','i','s','t'), -}; - -static void -setup_syllables (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer); -static void -initial_reordering (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer); -static void -final_reordering (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer); - -static void -collect_features_sea (hb_ot_shape_planner_t *plan) -{ - hb_ot_map_builder_t *map = &plan->map; - - /* Do this before any lookups have been applied. */ - map->add_gsub_pause (setup_syllables); - - map->add_global_bool_feature (HB_TAG('l','o','c','l')); - /* The Indic specs do not require ccmp, but we apply it here since if - * there is a use of it, it's typically at the beginning. */ - map->add_global_bool_feature (HB_TAG('c','c','m','p')); - - map->add_gsub_pause (initial_reordering); - for (unsigned int i = 0; i < ARRAY_LENGTH (basic_features); i++) - { - map->add_feature (basic_features[i], 1, F_GLOBAL | F_MANUAL_ZWJ); - map->add_gsub_pause (NULL); - } - map->add_gsub_pause (final_reordering); - for (unsigned int i = 0; i < ARRAY_LENGTH (other_features); i++) - map->add_feature (other_features[i], 1, F_GLOBAL | F_MANUAL_ZWJ); -} - -static void -override_features_sea (hb_ot_shape_planner_t *plan) -{ - plan->map.add_feature (HB_TAG('l','i','g','a'), 0, F_GLOBAL); -} - - -enum syllable_type_t { - consonant_syllable, - broken_cluster, - non_sea_cluster, -}; - -#include "hb-ot-shape-complex-sea-machine.hh" - - -/* Note: This enum is duplicated in the -machine.rl source file. - * Not sure how to avoid duplication. */ -enum sea_category_t { -// OT_C = 1, - OT_GB = 12, /* Generic Base XXX DOTTED CIRCLE only for now */ -// OT_H = 4, /* Halant */ - OT_IV = 2, /* Independent Vowel */ - OT_MR = 22, /* Medial Ra */ -// OT_CM = 17, /* Consonant Medial */ - OT_VAbv = 26, - OT_VBlw = 27, - OT_VPre = 28, - OT_VPst = 29, - OT_T = 3, /* Tone Marks */ -// OT_A = 10, /* Anusvara */ -}; - -static inline void -set_sea_properties (hb_glyph_info_t &info) -{ - hb_codepoint_t u = info.codepoint; - unsigned int type = hb_indic_get_categories (u); - indic_category_t cat = (indic_category_t) (type & 0x7F); - indic_position_t pos = (indic_position_t) (type >> 8); - - /* Medial Ra */ - if (u == 0x1A55 || u == 0xAA34) - cat = (indic_category_t) OT_MR; - - if (cat == OT_M) - { - switch ((int) pos) - { - case POS_PRE_C: cat = (indic_category_t) OT_VPre; break; - case POS_ABOVE_C: cat = (indic_category_t) OT_VAbv; break; - case POS_BELOW_C: cat = (indic_category_t) OT_VBlw; break; - case POS_POST_C: cat = (indic_category_t) OT_VPst; break; - } - } - - info.sea_category() = (sea_category_t) cat; - info.sea_position() = pos; -} - - -static void -setup_masks_sea (const hb_ot_shape_plan_t *plan HB_UNUSED, - hb_buffer_t *buffer, - hb_font_t *font HB_UNUSED) -{ - HB_BUFFER_ALLOCATE_VAR (buffer, sea_category); - HB_BUFFER_ALLOCATE_VAR (buffer, sea_position); - - /* We cannot setup masks here. We save information about characters - * and setup masks later on in a pause-callback. */ - - unsigned int count = buffer->len; - for (unsigned int i = 0; i < count; i++) - set_sea_properties (buffer->info[i]); -} - -static void -setup_syllables (const hb_ot_shape_plan_t *plan HB_UNUSED, - hb_font_t *font HB_UNUSED, - hb_buffer_t *buffer) -{ - find_syllables (buffer); -} - -static int -compare_sea_order (const hb_glyph_info_t *pa, const hb_glyph_info_t *pb) -{ - int a = pa->sea_position(); - int b = pb->sea_position(); - - return a < b ? -1 : a == b ? 0 : +1; -} - - -static void -initial_reordering_consonant_syllable (const hb_ot_shape_plan_t *plan, - hb_face_t *face, - hb_buffer_t *buffer, - unsigned int start, unsigned int end) -{ - hb_glyph_info_t *info = buffer->info; - unsigned int base = start; - - /* Reorder! */ - unsigned int i = start; - for (; i < base; i++) - info[i].sea_position() = POS_PRE_C; - if (i < end) - { - info[i].sea_position() = POS_BASE_C; - i++; - } - for (; i < end; i++) - { - if (info[i].sea_category() == OT_MR) /* Pre-base reordering */ - { - info[i].sea_position() = POS_PRE_C; - continue; - } - if (info[i].sea_category() == OT_VPre) /* Left matra */ - { - info[i].sea_position() = POS_PRE_M; - continue; - } - - info[i].sea_position() = POS_AFTER_MAIN; - } - - buffer->merge_clusters (start, end); - /* Sit tight, rock 'n roll! */ - hb_bubble_sort (info + start, end - start, compare_sea_order); -} - -static void -initial_reordering_broken_cluster (const hb_ot_shape_plan_t *plan, - hb_face_t *face, - hb_buffer_t *buffer, - unsigned int start, unsigned int end) -{ - /* We already inserted dotted-circles, so just call the consonant_syllable. */ - initial_reordering_consonant_syllable (plan, face, buffer, start, end); -} - -static void -initial_reordering_non_sea_cluster (const hb_ot_shape_plan_t *plan HB_UNUSED, - hb_face_t *face HB_UNUSED, - hb_buffer_t *buffer HB_UNUSED, - unsigned int start HB_UNUSED, unsigned int end HB_UNUSED) -{ - /* Nothing to do right now. If we ever switch to using the output - * buffer in the reordering process, we'd need to next_glyph() here. */ -} - - -static void -initial_reordering_syllable (const hb_ot_shape_plan_t *plan, - hb_face_t *face, - hb_buffer_t *buffer, - unsigned int start, unsigned int end) -{ - syllable_type_t syllable_type = (syllable_type_t) (buffer->info[start].syllable() & 0x0F); - switch (syllable_type) { - case consonant_syllable: initial_reordering_consonant_syllable (plan, face, buffer, start, end); return; - case broken_cluster: initial_reordering_broken_cluster (plan, face, buffer, start, end); return; - case non_sea_cluster: initial_reordering_non_sea_cluster (plan, face, buffer, start, end); return; - } -} - -static inline void -insert_dotted_circles (const hb_ot_shape_plan_t *plan HB_UNUSED, - hb_font_t *font, - hb_buffer_t *buffer) -{ - /* Note: This loop is extra overhead, but should not be measurable. */ - bool has_broken_syllables = false; - unsigned int count = buffer->len; - for (unsigned int i = 0; i < count; i++) - if ((buffer->info[i].syllable() & 0x0F) == broken_cluster) { - has_broken_syllables = true; - break; - } - if (likely (!has_broken_syllables)) - return; - - - hb_codepoint_t dottedcircle_glyph; - if (!font->get_glyph (0x25CC, 0, &dottedcircle_glyph)) - return; - - hb_glyph_info_t dottedcircle = {0}; - dottedcircle.codepoint = 0x25CC; - set_sea_properties (dottedcircle); - dottedcircle.codepoint = dottedcircle_glyph; - - buffer->clear_output (); - - buffer->idx = 0; - unsigned int last_syllable = 0; - while (buffer->idx < buffer->len) - { - unsigned int syllable = buffer->cur().syllable(); - syllable_type_t syllable_type = (syllable_type_t) (syllable & 0x0F); - if (unlikely (last_syllable != syllable && syllable_type == broken_cluster)) - { - last_syllable = syllable; - - hb_glyph_info_t info = dottedcircle; - info.cluster = buffer->cur().cluster; - info.mask = buffer->cur().mask; - info.syllable() = buffer->cur().syllable(); - - buffer->output_info (info); - } - else - buffer->next_glyph (); - } - - buffer->swap_buffers (); -} - -static void -initial_reordering (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer) -{ - insert_dotted_circles (plan, font, buffer); - - hb_glyph_info_t *info = buffer->info; - unsigned int count = buffer->len; - if (unlikely (!count)) return; - unsigned int last = 0; - unsigned int last_syllable = info[0].syllable(); - for (unsigned int i = 1; i < count; i++) - if (last_syllable != info[i].syllable()) { - initial_reordering_syllable (plan, font->face, buffer, last, i); - last = i; - last_syllable = info[last].syllable(); - } - initial_reordering_syllable (plan, font->face, buffer, last, count); -} - -static void -final_reordering (const hb_ot_shape_plan_t *plan, - hb_font_t *font HB_UNUSED, - hb_buffer_t *buffer) -{ - hb_glyph_info_t *info = buffer->info; - unsigned int count = buffer->len; - - /* Zero syllables now... */ - for (unsigned int i = 0; i < count; i++) - info[i].syllable() = 0; - - HB_BUFFER_DEALLOCATE_VAR (buffer, sea_category); - HB_BUFFER_DEALLOCATE_VAR (buffer, sea_position); -} - - -static hb_ot_shape_normalization_mode_t -normalization_preference_sea (const hb_segment_properties_t *props HB_UNUSED) -{ - return HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS_NO_SHORT_CIRCUIT; -} - - -const hb_ot_complex_shaper_t _hb_ot_complex_shaper_sea = -{ - "sea", - collect_features_sea, - override_features_sea, - NULL, /* data_create */ - NULL, /* data_destroy */ - NULL, /* preprocess_text */ - normalization_preference_sea, - NULL, /* decompose */ - NULL, /* compose */ - setup_masks_sea, - HB_OT_SHAPE_ZERO_WIDTH_MARKS_NONE, - false, /* fallback_position */ -}; diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-thai.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-thai.cc deleted file mode 100644 index 5cbb6e391c2..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-complex-thai.cc +++ /dev/null @@ -1,378 +0,0 @@ -/* - * Copyright © 2010,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-ot-shape-complex-private.hh" - - -/* Thai / Lao shaper */ - - -/* PUA shaping */ - - -enum thai_consonant_type_t -{ - NC, - AC, - RC, - DC, - NOT_CONSONANT, - NUM_CONSONANT_TYPES = NOT_CONSONANT -}; - -static thai_consonant_type_t -get_consonant_type (hb_codepoint_t u) -{ - if (u == 0x0E1B || u == 0x0E1D || u == 0x0E1F/* || u == 0x0E2C*/) - return AC; - if (u == 0x0E0D || u == 0x0E10) - return RC; - if (u == 0x0E0E || u == 0x0E0F) - return DC; - if (hb_in_range<hb_codepoint_t> (u, 0x0E01, 0x0E2E)) - return NC; - return NOT_CONSONANT; -} - - -enum thai_mark_type_t -{ - AV, - BV, - T, - NOT_MARK, - NUM_MARK_TYPES = NOT_MARK -}; - -static thai_mark_type_t -get_mark_type (hb_codepoint_t u) -{ - if (u == 0x0E31 || hb_in_range<hb_codepoint_t> (u, 0x0E34, 0x0E37) || - u == 0x0E47 || hb_in_range<hb_codepoint_t> (u, 0x0E4D, 0x0E4E)) - return AV; - if (hb_in_range<hb_codepoint_t> (u, 0x0E38, 0x0E3A)) - return BV; - if (hb_in_range<hb_codepoint_t> (u, 0x0E48, 0x0E4C)) - return T; - return NOT_MARK; -} - - -enum thai_action_t -{ - NOP, - SD, /* Shift combining-mark down */ - SL, /* Shift combining-mark left */ - SDL, /* Shift combining-mark down-left */ - RD /* Remove descender from base */ -}; - -static hb_codepoint_t -thai_pua_shape (hb_codepoint_t u, thai_action_t action, hb_font_t *font) -{ - struct thai_pua_mapping_t { - hb_codepoint_t u; - hb_codepoint_t win_pua; - hb_codepoint_t mac_pua; - } const *pua_mappings = NULL; - static const thai_pua_mapping_t SD_mappings[] = { - {0x0E48, 0xF70A, 0xF88B}, /* MAI EK */ - {0x0E49, 0xF70B, 0xF88E}, /* MAI THO */ - {0x0E4A, 0xF70C, 0xF891}, /* MAI TRI */ - {0x0E4B, 0xF70D, 0xF894}, /* MAI CHATTAWA */ - {0x0E4C, 0xF70E, 0xF897}, /* THANTHAKHAT */ - {0x0E38, 0xF718, 0xF89B}, /* SARA U */ - {0x0E39, 0xF719, 0xF89C}, /* SARA UU */ - {0x0E3A, 0xF71A, 0xF89D}, /* PHINTHU */ - {0x0000, 0x0000, 0x0000} - }; - static const thai_pua_mapping_t SDL_mappings[] = { - {0x0E48, 0xF705, 0xF88C}, /* MAI EK */ - {0x0E49, 0xF706, 0xF88F}, /* MAI THO */ - {0x0E4A, 0xF707, 0xF892}, /* MAI TRI */ - {0x0E4B, 0xF708, 0xF895}, /* MAI CHATTAWA */ - {0x0E4C, 0xF709, 0xF898}, /* THANTHAKHAT */ - {0x0000, 0x0000, 0x0000} - }; - static const thai_pua_mapping_t SL_mappings[] = { - {0x0E48, 0xF713, 0xF88A}, /* MAI EK */ - {0x0E49, 0xF714, 0xF88D}, /* MAI THO */ - {0x0E4A, 0xF715, 0xF890}, /* MAI TRI */ - {0x0E4B, 0xF716, 0xF893}, /* MAI CHATTAWA */ - {0x0E4C, 0xF717, 0xF896}, /* THANTHAKHAT */ - {0x0E31, 0xF710, 0xF884}, /* MAI HAN-AKAT */ - {0x0E34, 0xF701, 0xF885}, /* SARA I */ - {0x0E35, 0xF702, 0xF886}, /* SARA II */ - {0x0E36, 0xF703, 0xF887}, /* SARA UE */ - {0x0E37, 0xF704, 0xF888}, /* SARA UEE */ - {0x0E47, 0xF712, 0xF889}, /* MAITAIKHU */ - {0x0E4D, 0xF711, 0xF899}, /* NIKHAHIT */ - {0x0000, 0x0000, 0x0000} - }; - static const thai_pua_mapping_t RD_mappings[] = { - {0x0E0D, 0xF70F, 0xF89A}, /* YO YING */ - {0x0E10, 0xF700, 0xF89E}, /* THO THAN */ - {0x0000, 0x0000, 0x0000} - }; - - switch (action) { - default: assert (false); /* Fallthrough */ - case NOP: return u; - case SD: pua_mappings = SD_mappings; break; - case SDL: pua_mappings = SDL_mappings; break; - case SL: pua_mappings = SL_mappings; break; - case RD: pua_mappings = RD_mappings; break; - } - for (; pua_mappings->u; pua_mappings++) - if (pua_mappings->u == u) - { - hb_codepoint_t glyph; - if (hb_font_get_glyph (font, pua_mappings->win_pua, 0, &glyph)) - return pua_mappings->win_pua; - if (hb_font_get_glyph (font, pua_mappings->mac_pua, 0, &glyph)) - return pua_mappings->mac_pua; - break; - } - return u; -} - - -static enum thai_above_state_t -{ /* Cluster above looks like: */ - T0, /* ⣤ */ - T1, /* ⣼ */ - T2, /* ⣾ */ - T3, /* ⣿ */ - NUM_ABOVE_STATES -} thai_above_start_state[NUM_CONSONANT_TYPES + 1/* For NOT_CONSONANT */] = -{ - T0, /* NC */ - T1, /* AC */ - T0, /* RC */ - T0, /* DC */ - T3, /* NOT_CONSONANT */ -}; - -static const struct thai_above_state_machine_edge_t { - thai_action_t action; - thai_above_state_t next_state; -} thai_above_state_machine[NUM_ABOVE_STATES][NUM_MARK_TYPES] = -{ /*AV*/ /*BV*/ /*T*/ -/*T0*/ {{NOP,T3}, {NOP,T0}, {SD, T3}}, -/*T1*/ {{SL, T2}, {NOP,T1}, {SDL,T2}}, -/*T2*/ {{NOP,T3}, {NOP,T2}, {SL, T3}}, -/*T3*/ {{NOP,T3}, {NOP,T3}, {NOP,T3}}, -}; - - -static enum thai_below_state_t -{ - B0, /* No descender */ - B1, /* Removable descender */ - B2, /* Strict descender */ - NUM_BELOW_STATES -} thai_below_start_state[NUM_CONSONANT_TYPES + 1/* For NOT_CONSONANT */] = -{ - B0, /* NC */ - B0, /* AC */ - B1, /* RC */ - B2, /* DC */ - B2, /* NOT_CONSONANT */ -}; - -static const struct thai_below_state_machine_edge_t { - thai_action_t action; - thai_below_state_t next_state; -} thai_below_state_machine[NUM_BELOW_STATES][NUM_MARK_TYPES] = -{ /*AV*/ /*BV*/ /*T*/ -/*B0*/ {{NOP,B0}, {NOP,B2}, {NOP, B0}}, -/*B1*/ {{NOP,B1}, {RD, B2}, {NOP, B1}}, -/*B2*/ {{NOP,B2}, {SD, B2}, {NOP, B2}}, -}; - - -static void -do_thai_pua_shaping (const hb_ot_shape_plan_t *plan HB_UNUSED, - hb_buffer_t *buffer, - hb_font_t *font) -{ - thai_above_state_t above_state = thai_above_start_state[NOT_CONSONANT]; - thai_below_state_t below_state = thai_below_start_state[NOT_CONSONANT]; - unsigned int base = 0; - - hb_glyph_info_t *info = buffer->info; - unsigned int count = buffer->len; - for (unsigned int i = 0; i < count; i++) - { - thai_mark_type_t mt = get_mark_type (info[i].codepoint); - - if (mt == NOT_MARK) { - thai_consonant_type_t ct = get_consonant_type (info[i].codepoint); - above_state = thai_above_start_state[ct]; - below_state = thai_below_start_state[ct]; - base = i; - continue; - } - - const thai_above_state_machine_edge_t &above_edge = thai_above_state_machine[above_state][mt]; - const thai_below_state_machine_edge_t &below_edge = thai_below_state_machine[below_state][mt]; - above_state = above_edge.next_state; - below_state = below_edge.next_state; - - /* At least one of the above/below actions is NOP. */ - thai_action_t action = above_edge.action != NOP ? above_edge.action : below_edge.action; - - if (action == RD) - info[base].codepoint = thai_pua_shape (info[base].codepoint, action, font); - else - info[i].codepoint = thai_pua_shape (info[i].codepoint, action, font); - } -} - - -static void -preprocess_text_thai (const hb_ot_shape_plan_t *plan, - hb_buffer_t *buffer, - hb_font_t *font) -{ - /* This function implements the shaping logic documented here: - * - * http://linux.thai.net/~thep/th-otf/shaping.html - * - * The first shaping rule listed there is needed even if the font has Thai - * OpenType tables. The rest do fallback positioning based on PUA codepoints. - * We implement that only if there exist no Thai GSUB in the font. - */ - - /* The following is NOT specified in the MS OT Thai spec, however, it seems - * to be what Uniscribe and other engines implement. According to Eric Muller: - * - * When you have a SARA AM, decompose it in NIKHAHIT + SARA AA, *and* move the - * NIKHAHIT backwards over any tone mark (0E48-0E4B). - * - * <0E14, 0E4B, 0E33> -> <0E14, 0E4D, 0E4B, 0E32> - * - * This reordering is legit only when the NIKHAHIT comes from a SARA AM, not - * when it's there to start with. The string <0E14, 0E4B, 0E4D> is probably - * not what a user wanted, but the rendering is nevertheless nikhahit above - * chattawa. - * - * Same for Lao. - * - * Note: - * - * Uniscribe also does some below-marks reordering. Namely, it positions U+0E3A - * after U+0E38 and U+0E39. We do that by modifying the ccc for U+0E3A. - * See unicode->modified_combining_class (). Lao does NOT have a U+0E3A - * equivalent. - */ - - - /* - * Here are the characters of significance: - * - * Thai Lao - * SARA AM: U+0E33 U+0EB3 - * SARA AA: U+0E32 U+0EB2 - * Nikhahit: U+0E4D U+0ECD - * - * Testing shows that Uniscribe reorder the following marks: - * Thai: <0E31,0E34..0E37,0E47..0E4E> - * Lao: <0EB1,0EB4..0EB7,0EC7..0ECE> - * - * Note how the Lao versions are the same as Thai + 0x80. - */ - - /* We only get one script at a time, so a script-agnostic implementation - * is adequate here. */ -#define IS_SARA_AM(x) (((x) & ~0x0080) == 0x0E33) -#define NIKHAHIT_FROM_SARA_AM(x) ((x) - 0xE33 + 0xE4D) -#define SARA_AA_FROM_SARA_AM(x) ((x) - 1) -#define IS_TONE_MARK(x) (hb_in_ranges<hb_codepoint_t> ((x) & ~0x0080, 0x0E34, 0x0E37, 0x0E47, 0x0E4E, 0x0E31, 0x0E31)) - - buffer->clear_output (); - unsigned int count = buffer->len; - for (buffer->idx = 0; buffer->idx < count;) - { - hb_codepoint_t u = buffer->cur().codepoint; - if (likely (!IS_SARA_AM (u))) { - buffer->next_glyph (); - continue; - } - - /* Is SARA AM. Decompose and reorder. */ - hb_codepoint_t decomposed[2] = {hb_codepoint_t (NIKHAHIT_FROM_SARA_AM (u)), - hb_codepoint_t (SARA_AA_FROM_SARA_AM (u))}; - buffer->replace_glyphs (1, 2, decomposed); - if (unlikely (buffer->in_error)) - return; - - /* Ok, let's see... */ - unsigned int end = buffer->out_len; - unsigned int start = end - 2; - while (start > 0 && IS_TONE_MARK (buffer->out_info[start - 1].codepoint)) - start--; - - if (start + 2 < end) - { - /* Move Nikhahit (end-2) to the beginning */ - buffer->merge_out_clusters (start, end); - hb_glyph_info_t t = buffer->out_info[end - 2]; - memmove (buffer->out_info + start + 1, - buffer->out_info + start, - sizeof (buffer->out_info[0]) * (end - start - 2)); - buffer->out_info[start] = t; - } - else - { - /* Since we decomposed, and NIKHAHIT is combining, merge clusters with the - * previous cluster. */ - if (start) - buffer->merge_out_clusters (start - 1, end); - } - } - buffer->swap_buffers (); - - /* If font has Thai GSUB, we are done. */ - if (plan->props.script == HB_SCRIPT_THAI && !plan->map.found_script[0]) - do_thai_pua_shaping (plan, buffer, font); -} - -const hb_ot_complex_shaper_t _hb_ot_complex_shaper_thai = -{ - "thai", - NULL, /* collect_features */ - NULL, /* override_features */ - NULL, /* data_create */ - NULL, /* data_destroy */ - preprocess_text_thai, - NULL, /* normalization_preference */ - NULL, /* decompose */ - NULL, /* compose */ - NULL, /* setup_masks */ - HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE, - false,/* fallback_position */ -}; diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-fallback-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-fallback-private.hh deleted file mode 100644 index ec653513f1b..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-fallback-private.hh +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_SHAPE_FALLBACK_PRIVATE_HH -#define HB_OT_SHAPE_FALLBACK_PRIVATE_HH - -#include "hb-private.hh" - -#include "hb-ot-shape-private.hh" - - -HB_INTERNAL void _hb_ot_shape_fallback_position (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer); - -HB_INTERNAL void _hb_ot_shape_fallback_position_recategorize_marks (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer); - - -HB_INTERNAL void _hb_ot_shape_fallback_kern (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer); - - -#endif /* HB_OT_SHAPE_FALLBACK_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-fallback.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-fallback.cc deleted file mode 100644 index 3341825449b..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-fallback.cc +++ /dev/null @@ -1,455 +0,0 @@ -/* - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-ot-shape-fallback-private.hh" -#include "hb-ot-layout-gsubgpos-private.hh" - -static unsigned int -recategorize_combining_class (hb_codepoint_t u, - unsigned int klass) -{ - if (klass >= 200) - return klass; - - /* Thai / Lao need some per-character work. */ - if ((u & ~0xFF) == 0x0E00) - { - if (unlikely (klass == 0)) - { - switch (u) - { - case 0x0E31: - case 0x0E34: - case 0x0E35: - case 0x0E36: - case 0x0E37: - case 0x0E47: - case 0x0E4C: - case 0x0E4D: - case 0x0E4E: - klass = HB_UNICODE_COMBINING_CLASS_ABOVE_RIGHT; - break; - - case 0x0EB1: - case 0x0EB4: - case 0x0EB5: - case 0x0EB6: - case 0x0EB7: - case 0x0EBB: - case 0x0ECC: - case 0x0ECD: - klass = HB_UNICODE_COMBINING_CLASS_ABOVE; - break; - - case 0x0EBC: - klass = HB_UNICODE_COMBINING_CLASS_BELOW; - break; - } - } else { - /* Thai virama is below-right */ - if (u == 0x0E3A) - klass = HB_UNICODE_COMBINING_CLASS_BELOW_RIGHT; - } - } - - switch (klass) - { - - /* Hebrew */ - - case HB_MODIFIED_COMBINING_CLASS_CCC10: /* sheva */ - case HB_MODIFIED_COMBINING_CLASS_CCC11: /* hataf segol */ - case HB_MODIFIED_COMBINING_CLASS_CCC12: /* hataf patah */ - case HB_MODIFIED_COMBINING_CLASS_CCC13: /* hataf qamats */ - case HB_MODIFIED_COMBINING_CLASS_CCC14: /* hiriq */ - case HB_MODIFIED_COMBINING_CLASS_CCC15: /* tsere */ - case HB_MODIFIED_COMBINING_CLASS_CCC16: /* segol */ - case HB_MODIFIED_COMBINING_CLASS_CCC17: /* patah */ - case HB_MODIFIED_COMBINING_CLASS_CCC18: /* qamats */ - case HB_MODIFIED_COMBINING_CLASS_CCC20: /* qubuts */ - case HB_MODIFIED_COMBINING_CLASS_CCC22: /* meteg */ - return HB_UNICODE_COMBINING_CLASS_BELOW; - - case HB_MODIFIED_COMBINING_CLASS_CCC23: /* rafe */ - return HB_UNICODE_COMBINING_CLASS_ATTACHED_ABOVE; - - case HB_MODIFIED_COMBINING_CLASS_CCC24: /* shin dot */ - return HB_UNICODE_COMBINING_CLASS_ABOVE_RIGHT; - - case HB_MODIFIED_COMBINING_CLASS_CCC25: /* sin dot */ - case HB_MODIFIED_COMBINING_CLASS_CCC19: /* holam */ - return HB_UNICODE_COMBINING_CLASS_ABOVE_LEFT; - - case HB_MODIFIED_COMBINING_CLASS_CCC26: /* point varika */ - return HB_UNICODE_COMBINING_CLASS_ABOVE; - - case HB_MODIFIED_COMBINING_CLASS_CCC21: /* dagesh */ - break; - - - /* Arabic and Syriac */ - - case HB_MODIFIED_COMBINING_CLASS_CCC27: /* fathatan */ - case HB_MODIFIED_COMBINING_CLASS_CCC28: /* dammatan */ - case HB_MODIFIED_COMBINING_CLASS_CCC30: /* fatha */ - case HB_MODIFIED_COMBINING_CLASS_CCC31: /* damma */ - case HB_MODIFIED_COMBINING_CLASS_CCC33: /* shadda */ - case HB_MODIFIED_COMBINING_CLASS_CCC34: /* sukun */ - case HB_MODIFIED_COMBINING_CLASS_CCC35: /* superscript alef */ - case HB_MODIFIED_COMBINING_CLASS_CCC36: /* superscript alaph */ - return HB_UNICODE_COMBINING_CLASS_ABOVE; - - case HB_MODIFIED_COMBINING_CLASS_CCC29: /* kasratan */ - case HB_MODIFIED_COMBINING_CLASS_CCC32: /* kasra */ - return HB_UNICODE_COMBINING_CLASS_BELOW; - - - /* Thai */ - - case HB_MODIFIED_COMBINING_CLASS_CCC103: /* sara u / sara uu */ - return HB_UNICODE_COMBINING_CLASS_BELOW_RIGHT; - - case HB_MODIFIED_COMBINING_CLASS_CCC107: /* mai */ - return HB_UNICODE_COMBINING_CLASS_ABOVE_RIGHT; - - - /* Lao */ - - case HB_MODIFIED_COMBINING_CLASS_CCC118: /* sign u / sign uu */ - return HB_UNICODE_COMBINING_CLASS_BELOW; - - case HB_MODIFIED_COMBINING_CLASS_CCC122: /* mai */ - return HB_UNICODE_COMBINING_CLASS_ABOVE; - - - /* Tibetan */ - - case HB_MODIFIED_COMBINING_CLASS_CCC129: /* sign aa */ - return HB_UNICODE_COMBINING_CLASS_BELOW; - - case HB_MODIFIED_COMBINING_CLASS_CCC130: /* sign i*/ - return HB_UNICODE_COMBINING_CLASS_ABOVE; - - case HB_MODIFIED_COMBINING_CLASS_CCC132: /* sign u */ - return HB_UNICODE_COMBINING_CLASS_BELOW; - - } - - return klass; -} - -void -_hb_ot_shape_fallback_position_recategorize_marks (const hb_ot_shape_plan_t *plan HB_UNUSED, - hb_font_t *font HB_UNUSED, - hb_buffer_t *buffer) -{ - unsigned int count = buffer->len; - for (unsigned int i = 0; i < count; i++) - if (_hb_glyph_info_get_general_category (&buffer->info[i]) == HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK) { - unsigned int combining_class = _hb_glyph_info_get_modified_combining_class (&buffer->info[i]); - combining_class = recategorize_combining_class (buffer->info[i].codepoint, combining_class); - _hb_glyph_info_set_modified_combining_class (&buffer->info[i], combining_class); - } -} - - -static void -zero_mark_advances (hb_buffer_t *buffer, - unsigned int start, - unsigned int end) -{ - for (unsigned int i = start; i < end; i++) - if (_hb_glyph_info_get_general_category (&buffer->info[i]) == HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK) - { - buffer->pos[i].x_advance = 0; - buffer->pos[i].y_advance = 0; - } -} - -static inline void -position_mark (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer, - hb_glyph_extents_t &base_extents, - unsigned int i, - unsigned int combining_class) -{ - hb_glyph_extents_t mark_extents; - if (!font->get_glyph_extents (buffer->info[i].codepoint, - &mark_extents)) - return; - - hb_position_t y_gap = font->y_scale / 16; - - hb_glyph_position_t &pos = buffer->pos[i]; - pos.x_offset = pos.y_offset = 0; - - - /* We dont position LEFT and RIGHT marks. */ - - /* X positioning */ - switch (combining_class) - { - case HB_UNICODE_COMBINING_CLASS_DOUBLE_BELOW: - case HB_UNICODE_COMBINING_CLASS_DOUBLE_ABOVE: - if (buffer->props.direction == HB_DIRECTION_LTR) { - pos.x_offset += base_extents.x_bearing - mark_extents.width / 2 - mark_extents.x_bearing; - break; - } else if (buffer->props.direction == HB_DIRECTION_RTL) { - pos.x_offset += base_extents.x_bearing + base_extents.width - mark_extents.width / 2 - mark_extents.x_bearing; - break; - } - /* Fall through */ - - default: - case HB_UNICODE_COMBINING_CLASS_ATTACHED_BELOW: - case HB_UNICODE_COMBINING_CLASS_ATTACHED_ABOVE: - case HB_UNICODE_COMBINING_CLASS_BELOW: - case HB_UNICODE_COMBINING_CLASS_ABOVE: - /* Center align. */ - pos.x_offset += base_extents.x_bearing + (base_extents.width - mark_extents.width) / 2 - mark_extents.x_bearing; - break; - - case HB_UNICODE_COMBINING_CLASS_ATTACHED_BELOW_LEFT: - case HB_UNICODE_COMBINING_CLASS_BELOW_LEFT: - case HB_UNICODE_COMBINING_CLASS_ABOVE_LEFT: - /* Left align. */ - pos.x_offset += base_extents.x_bearing - mark_extents.x_bearing; - break; - - case HB_UNICODE_COMBINING_CLASS_ATTACHED_ABOVE_RIGHT: - case HB_UNICODE_COMBINING_CLASS_BELOW_RIGHT: - case HB_UNICODE_COMBINING_CLASS_ABOVE_RIGHT: - /* Right align. */ - pos.x_offset += base_extents.x_bearing + base_extents.width - mark_extents.width - mark_extents.x_bearing; - break; - } - - /* Y positioning */ - switch (combining_class) - { - case HB_UNICODE_COMBINING_CLASS_DOUBLE_BELOW: - case HB_UNICODE_COMBINING_CLASS_BELOW_LEFT: - case HB_UNICODE_COMBINING_CLASS_BELOW: - case HB_UNICODE_COMBINING_CLASS_BELOW_RIGHT: - /* Add gap, fall-through. */ - base_extents.height -= y_gap; - - case HB_UNICODE_COMBINING_CLASS_ATTACHED_BELOW_LEFT: - case HB_UNICODE_COMBINING_CLASS_ATTACHED_BELOW: - pos.y_offset += base_extents.y_bearing + base_extents.height - mark_extents.y_bearing; - base_extents.height += mark_extents.height; - break; - - case HB_UNICODE_COMBINING_CLASS_DOUBLE_ABOVE: - case HB_UNICODE_COMBINING_CLASS_ABOVE_LEFT: - case HB_UNICODE_COMBINING_CLASS_ABOVE: - case HB_UNICODE_COMBINING_CLASS_ABOVE_RIGHT: - /* Add gap, fall-through. */ - base_extents.y_bearing += y_gap; - base_extents.height -= y_gap; - - case HB_UNICODE_COMBINING_CLASS_ATTACHED_ABOVE: - case HB_UNICODE_COMBINING_CLASS_ATTACHED_ABOVE_RIGHT: - pos.y_offset += base_extents.y_bearing - (mark_extents.y_bearing + mark_extents.height); - base_extents.y_bearing -= mark_extents.height; - base_extents.height += mark_extents.height; - break; - } -} - -static inline void -position_around_base (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer, - unsigned int base, - unsigned int end) -{ - hb_direction_t horiz_dir = HB_DIRECTION_INVALID; - hb_glyph_extents_t base_extents; - if (!font->get_glyph_extents (buffer->info[base].codepoint, - &base_extents)) - { - /* If extents don't work, zero marks and go home. */ - zero_mark_advances (buffer, base + 1, end); - return; - } - base_extents.x_bearing += buffer->pos[base].x_offset; - base_extents.y_bearing += buffer->pos[base].y_offset; - - unsigned int lig_id = get_lig_id (buffer->info[base]); - unsigned int num_lig_components = get_lig_num_comps (buffer->info[base]); - - hb_position_t x_offset = 0, y_offset = 0; - if (HB_DIRECTION_IS_FORWARD (buffer->props.direction)) { - x_offset -= buffer->pos[base].x_advance; - y_offset -= buffer->pos[base].y_advance; - } - - hb_glyph_extents_t component_extents = base_extents; - unsigned int last_lig_component = (unsigned int) -1; - unsigned int last_combining_class = 255; - hb_glyph_extents_t cluster_extents = base_extents; /* Initialization is just to shut gcc up. */ - for (unsigned int i = base + 1; i < end; i++) - if (_hb_glyph_info_get_modified_combining_class (&buffer->info[i])) - { - if (num_lig_components > 1) { - unsigned int this_lig_id = get_lig_id (buffer->info[i]); - unsigned int this_lig_component = get_lig_comp (buffer->info[i]) - 1; - /* Conditions for attaching to the last component. */ - if (!lig_id || lig_id != this_lig_id || this_lig_component >= num_lig_components) - this_lig_component = num_lig_components - 1; - if (last_lig_component != this_lig_component) - { - last_lig_component = this_lig_component; - last_combining_class = 255; - component_extents = base_extents; - if (unlikely (horiz_dir == HB_DIRECTION_INVALID)) { - if (HB_DIRECTION_IS_HORIZONTAL (plan->props.direction)) - horiz_dir = plan->props.direction; - else - horiz_dir = hb_script_get_horizontal_direction (plan->props.script); - } - if (horiz_dir == HB_DIRECTION_LTR) - component_extents.x_bearing += (this_lig_component * component_extents.width) / num_lig_components; - else - component_extents.x_bearing += ((num_lig_components - 1 - this_lig_component) * component_extents.width) / num_lig_components; - component_extents.width /= num_lig_components; - } - } - - unsigned int this_combining_class = _hb_glyph_info_get_modified_combining_class (&buffer->info[i]); - if (last_combining_class != this_combining_class) - { - last_combining_class = this_combining_class; - cluster_extents = component_extents; - } - - position_mark (plan, font, buffer, cluster_extents, i, this_combining_class); - - buffer->pos[i].x_advance = 0; - buffer->pos[i].y_advance = 0; - buffer->pos[i].x_offset += x_offset; - buffer->pos[i].y_offset += y_offset; - - } else { - if (HB_DIRECTION_IS_FORWARD (buffer->props.direction)) { - x_offset -= buffer->pos[i].x_advance; - y_offset -= buffer->pos[i].y_advance; - } else { - x_offset += buffer->pos[i].x_advance; - y_offset += buffer->pos[i].y_advance; - } - } -} - -static inline void -position_cluster (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer, - unsigned int start, - unsigned int end) -{ - if (end - start < 2) - return; - - /* Find the base glyph */ - for (unsigned int i = start; i < end; i++) - if (!HB_UNICODE_GENERAL_CATEGORY_IS_MARK (_hb_glyph_info_get_general_category (&buffer->info[i]))) - { - /* Find mark glyphs */ - unsigned int j; - for (j = i + 1; j < end; j++) - if (!HB_UNICODE_GENERAL_CATEGORY_IS_MARK (_hb_glyph_info_get_general_category (&buffer->info[j]))) - break; - - position_around_base (plan, font, buffer, i, j); - - i = j - 1; - } -} - -void -_hb_ot_shape_fallback_position (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer) -{ - unsigned int start = 0; - unsigned int last_cluster = buffer->info[0].cluster; - unsigned int count = buffer->len; - for (unsigned int i = 1; i < count; i++) - if (buffer->info[i].cluster != last_cluster) { - position_cluster (plan, font, buffer, start, i); - start = i; - last_cluster = buffer->info[i].cluster; - } - position_cluster (plan, font, buffer, start, count); -} - - -/* Performs old-style TrueType kerning. */ -void -_hb_ot_shape_fallback_kern (const hb_ot_shape_plan_t *plan, - hb_font_t *font, - hb_buffer_t *buffer) -{ - unsigned int count = buffer->len; - hb_mask_t kern_mask = plan->map.get_1_mask (HB_DIRECTION_IS_HORIZONTAL (buffer->props.direction) ? - HB_TAG ('k','e','r','n') : HB_TAG ('v','k','r','n')); - - OT::hb_apply_context_t c (1, font, buffer, kern_mask, true/*auto_zwj*/); - c.set_lookup_props (OT::LookupFlag::IgnoreMarks); - - for (buffer->idx = 0; buffer->idx < count;) - { - OT::hb_apply_context_t::skipping_forward_iterator_t skippy_iter (&c, buffer->idx, 1); - if (!skippy_iter.next ()) - { - buffer->idx++; - continue; - } - - hb_position_t x_kern, y_kern, kern1, kern2; - font->get_glyph_kerning_for_direction (buffer->info[buffer->idx].codepoint, - buffer->info[skippy_iter.idx].codepoint, - buffer->props.direction, - &x_kern, &y_kern); - - kern1 = x_kern >> 1; - kern2 = x_kern - kern1; - buffer->pos[buffer->idx].x_advance += kern1; - buffer->pos[skippy_iter.idx].x_advance += kern2; - buffer->pos[skippy_iter.idx].x_offset += kern2; - - kern1 = y_kern >> 1; - kern2 = y_kern - kern1; - buffer->pos[buffer->idx].y_advance += kern1; - buffer->pos[skippy_iter.idx].y_advance += kern2; - buffer->pos[skippy_iter.idx].y_offset += kern2; - - buffer->idx = skippy_iter.idx; - } -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-normalize-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-normalize-private.hh deleted file mode 100644 index 085d48511d0..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-normalize-private.hh +++ /dev/null @@ -1,70 +0,0 @@ -/* - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_SHAPE_NORMALIZE_PRIVATE_HH -#define HB_OT_SHAPE_NORMALIZE_PRIVATE_HH - -#include "hb-private.hh" - -#include "hb-font.h" -#include "hb-buffer.h" - -/* buffer var allocations, used during the normalization process */ -#define glyph_index() var1.u32 - -struct hb_ot_shape_plan_t; - -enum hb_ot_shape_normalization_mode_t { - HB_OT_SHAPE_NORMALIZATION_MODE_DECOMPOSED, - HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS, /* never composes base-to-base */ - HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS_NO_SHORT_CIRCUIT, /* always fully decomposes and then recompose back */ - - HB_OT_SHAPE_NORMALIZATION_MODE_DEFAULT = HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS -}; - -HB_INTERNAL void _hb_ot_shape_normalize (const hb_ot_shape_plan_t *shaper, - hb_buffer_t *buffer, - hb_font_t *font); - - -struct hb_ot_shape_normalize_context_t -{ - const hb_ot_shape_plan_t *plan; - hb_buffer_t *buffer; - hb_font_t *font; - hb_unicode_funcs_t *unicode; - bool (*decompose) (const hb_ot_shape_normalize_context_t *c, - hb_codepoint_t ab, - hb_codepoint_t *a, - hb_codepoint_t *b); - bool (*compose) (const hb_ot_shape_normalize_context_t *c, - hb_codepoint_t a, - hb_codepoint_t b, - hb_codepoint_t *ab); -}; - - -#endif /* HB_OT_SHAPE_NORMALIZE_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-normalize.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-normalize.cc deleted file mode 100644 index 7f83d9d258c..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-normalize.cc +++ /dev/null @@ -1,392 +0,0 @@ -/* - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-ot-shape-normalize-private.hh" -#include "hb-ot-shape-complex-private.hh" -#include "hb-ot-shape-private.hh" - - -/* - * HIGHLEVEL DESIGN: - * - * This file exports one main function: _hb_ot_shape_normalize(). - * - * This function closely reflects the Unicode Normalization Algorithm, - * yet it's different. - * - * Each shaper specifies whether it prefers decomposed (NFD) or composed (NFC). - * The logic however tries to use whatever the font can support. - * - * In general what happens is that: each grapheme is decomposed in a chain - * of 1:2 decompositions, marks reordered, and then recomposed if desired, - * so far it's like Unicode Normalization. However, the decomposition and - * recomposition only happens if the font supports the resulting characters. - * - * The goals are: - * - * - Try to render all canonically equivalent strings similarly. To really - * achieve this we have to always do the full decomposition and then - * selectively recompose from there. It's kinda too expensive though, so - * we skip some cases. For example, if composed is desired, we simply - * don't touch 1-character clusters that are supported by the font, even - * though their NFC may be different. - * - * - When a font has a precomposed character for a sequence but the 'ccmp' - * feature in the font is not adequate, use the precomposed character - * which typically has better mark positioning. - * - * - When a font does not support a combining mark, but supports it precomposed - * with previous base, use that. This needs the itemizer to have this - * knowledge too. We need to provide assistance to the itemizer. - * - * - When a font does not support a character but supports its decomposition, - * well, use the decomposition (preferring the canonical decomposition, but - * falling back to the compatibility decomposition if necessary). The - * compatibility decomposition is really nice to have, for characters like - * ellipsis, or various-sized space characters. - * - * - The complex shapers can customize the compose and decompose functions to - * offload some of their requirements to the normalizer. For example, the - * Indic shaper may want to disallow recomposing of two matras. - * - * - We try compatibility decomposition if decomposing through canonical - * decomposition alone failed to find a sequence that the font supports. - * We don't try compatibility decomposition recursively during the canonical - * decomposition phase. This has minimal impact. There are only a handful - * of Greek letter that have canonical decompositions that include characters - * with compatibility decomposition. Those can be found using this command: - * - * egrep "`echo -n ';('; grep ';<' UnicodeData.txt | cut -d';' -f1 | tr '\n' '|'; echo ') '`" UnicodeData.txt - */ - -static bool -decompose_unicode (const hb_ot_shape_normalize_context_t *c, - hb_codepoint_t ab, - hb_codepoint_t *a, - hb_codepoint_t *b) -{ - return c->unicode->decompose (ab, a, b); -} - -static bool -compose_unicode (const hb_ot_shape_normalize_context_t *c, - hb_codepoint_t a, - hb_codepoint_t b, - hb_codepoint_t *ab) -{ - return c->unicode->compose (a, b, ab); -} - -static inline void -set_glyph (hb_glyph_info_t &info, hb_font_t *font) -{ - font->get_glyph (info.codepoint, 0, &info.glyph_index()); -} - -static inline void -output_char (hb_buffer_t *buffer, hb_codepoint_t unichar, hb_codepoint_t glyph) -{ - buffer->cur().glyph_index() = glyph; - buffer->output_glyph (unichar); - _hb_glyph_info_set_unicode_props (&buffer->prev(), buffer->unicode); -} - -static inline void -next_char (hb_buffer_t *buffer, hb_codepoint_t glyph) -{ - buffer->cur().glyph_index() = glyph; - buffer->next_glyph (); -} - -static inline void -skip_char (hb_buffer_t *buffer) -{ - buffer->skip_glyph (); -} - -/* Returns 0 if didn't decompose, number of resulting characters otherwise. */ -static inline unsigned int -decompose (const hb_ot_shape_normalize_context_t *c, bool shortest, hb_codepoint_t ab) -{ - hb_codepoint_t a, b, a_glyph, b_glyph; - - if (!c->decompose (c, ab, &a, &b) || - (b && !c->font->get_glyph (b, 0, &b_glyph))) - return 0; - - bool has_a = c->font->get_glyph (a, 0, &a_glyph); - if (shortest && has_a) { - /* Output a and b */ - output_char (c->buffer, a, a_glyph); - if (likely (b)) { - output_char (c->buffer, b, b_glyph); - return 2; - } - return 1; - } - - unsigned int ret; - if ((ret = decompose (c, shortest, a))) { - if (b) { - output_char (c->buffer, b, b_glyph); - return ret + 1; - } - return ret; - } - - if (has_a) { - output_char (c->buffer, a, a_glyph); - if (likely (b)) { - output_char (c->buffer, b, b_glyph); - return 2; - } - return 1; - } - - return 0; -} - -/* Returns 0 if didn't decompose, number of resulting characters otherwise. */ -static inline unsigned int -decompose_compatibility (const hb_ot_shape_normalize_context_t *c, hb_codepoint_t u) -{ - unsigned int len, i; - hb_codepoint_t decomposed[HB_UNICODE_MAX_DECOMPOSITION_LEN]; - hb_codepoint_t glyphs[HB_UNICODE_MAX_DECOMPOSITION_LEN]; - - len = c->buffer->unicode->decompose_compatibility (u, decomposed); - if (!len) - return 0; - - for (i = 0; i < len; i++) - if (!c->font->get_glyph (decomposed[i], 0, &glyphs[i])) - return 0; - - for (i = 0; i < len; i++) - output_char (c->buffer, decomposed[i], glyphs[i]); - - return len; -} - -static inline void -decompose_current_character (const hb_ot_shape_normalize_context_t *c, bool shortest) -{ - hb_buffer_t * const buffer = c->buffer; - hb_codepoint_t glyph; - - /* Kind of a cute waterfall here... */ - if (shortest && c->font->get_glyph (buffer->cur().codepoint, 0, &glyph)) - next_char (buffer, glyph); - else if (decompose (c, shortest, buffer->cur().codepoint)) - skip_char (buffer); - else if (!shortest && c->font->get_glyph (buffer->cur().codepoint, 0, &glyph)) - next_char (buffer, glyph); - else if (decompose_compatibility (c, buffer->cur().codepoint)) - skip_char (buffer); - else - next_char (buffer, glyph); /* glyph is initialized in earlier branches. */ -} - -static inline void -handle_variation_selector_cluster (const hb_ot_shape_normalize_context_t *c, unsigned int end) -{ - hb_buffer_t * const buffer = c->buffer; - for (; buffer->idx < end - 1;) { - if (unlikely (buffer->unicode->is_variation_selector (buffer->cur(+1).codepoint))) { - /* The next two lines are some ugly lines... But work. */ - c->font->get_glyph (buffer->cur().codepoint, buffer->cur(+1).codepoint, &buffer->cur().glyph_index()); - buffer->replace_glyphs (2, 1, &buffer->cur().codepoint); - } else { - set_glyph (buffer->cur(), c->font); - buffer->next_glyph (); - } - } - if (likely (buffer->idx < end)) { - set_glyph (buffer->cur(), c->font); - buffer->next_glyph (); - } -} - -static inline void -decompose_multi_char_cluster (const hb_ot_shape_normalize_context_t *c, unsigned int end) -{ - hb_buffer_t * const buffer = c->buffer; - /* TODO Currently if there's a variation-selector we give-up, it's just too hard. */ - for (unsigned int i = buffer->idx; i < end; i++) - if (unlikely (buffer->unicode->is_variation_selector (buffer->info[i].codepoint))) { - handle_variation_selector_cluster (c, end); - return; - } - - while (buffer->idx < end) - decompose_current_character (c, false); -} - -static inline void -decompose_cluster (const hb_ot_shape_normalize_context_t *c, bool short_circuit, unsigned int end) -{ - if (likely (c->buffer->idx + 1 == end)) - decompose_current_character (c, short_circuit); - else - decompose_multi_char_cluster (c, end); -} - - -static int -compare_combining_class (const hb_glyph_info_t *pa, const hb_glyph_info_t *pb) -{ - unsigned int a = _hb_glyph_info_get_modified_combining_class (pa); - unsigned int b = _hb_glyph_info_get_modified_combining_class (pb); - - return a < b ? -1 : a == b ? 0 : +1; -} - - -void -_hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan, - hb_buffer_t *buffer, - hb_font_t *font) -{ - hb_ot_shape_normalization_mode_t mode = plan->shaper->normalization_preference ? - plan->shaper->normalization_preference (&buffer->props) : - HB_OT_SHAPE_NORMALIZATION_MODE_DEFAULT; - const hb_ot_shape_normalize_context_t c = { - plan, - buffer, - font, - buffer->unicode, - plan->shaper->decompose ? plan->shaper->decompose : decompose_unicode, - plan->shaper->compose ? plan->shaper->compose : compose_unicode - }; - - bool short_circuit = mode != HB_OT_SHAPE_NORMALIZATION_MODE_DECOMPOSED && - mode != HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS_NO_SHORT_CIRCUIT; - unsigned int count; - - /* We do a fairly straightforward yet custom normalization process in three - * separate rounds: decompose, reorder, recompose (if desired). Currently - * this makes two buffer swaps. We can make it faster by moving the last - * two rounds into the inner loop for the first round, but it's more readable - * this way. */ - - - /* First round, decompose */ - - buffer->clear_output (); - count = buffer->len; - for (buffer->idx = 0; buffer->idx < count;) - { - unsigned int end; - for (end = buffer->idx + 1; end < count; end++) - if (buffer->cur().cluster != buffer->info[end].cluster) - break; - - decompose_cluster (&c, short_circuit, end); - } - buffer->swap_buffers (); - - - /* Second round, reorder (inplace) */ - - count = buffer->len; - for (unsigned int i = 0; i < count; i++) - { - if (_hb_glyph_info_get_modified_combining_class (&buffer->info[i]) == 0) - continue; - - unsigned int end; - for (end = i + 1; end < count; end++) - if (_hb_glyph_info_get_modified_combining_class (&buffer->info[end]) == 0) - break; - - /* We are going to do a bubble-sort. Only do this if the - * sequence is short. Doing it on long sequences can result - * in an O(n^2) DoS. */ - if (end - i > 10) { - i = end; - continue; - } - - hb_bubble_sort (buffer->info + i, end - i, compare_combining_class); - - i = end; - } - - - if (mode == HB_OT_SHAPE_NORMALIZATION_MODE_DECOMPOSED) - return; - - /* Third round, recompose */ - - /* As noted in the comment earlier, we don't try to combine - * ccc=0 chars with their previous Starter. */ - - buffer->clear_output (); - count = buffer->len; - unsigned int starter = 0; - buffer->next_glyph (); - while (buffer->idx < count) - { - hb_codepoint_t composed, glyph; - if (/* We don't try to compose a non-mark character with it's preceding starter. - * This is both an optimization to avoid trying to compose every two neighboring - * glyphs in most scripts AND a desired feature for Hangul. Apparently Hangul - * fonts are not designed to mix-and-match pre-composed syllables and Jamo. */ - HB_UNICODE_GENERAL_CATEGORY_IS_MARK (_hb_glyph_info_get_general_category (&buffer->cur())) && - /* If there's anything between the starter and this char, they should have CCC - * smaller than this character's. */ - (starter == buffer->out_len - 1 || - _hb_glyph_info_get_modified_combining_class (&buffer->prev()) < _hb_glyph_info_get_modified_combining_class (&buffer->cur())) && - /* And compose. */ - c.compose (&c, - buffer->out_info[starter].codepoint, - buffer->cur().codepoint, - &composed) && - /* And the font has glyph for the composite. */ - font->get_glyph (composed, 0, &glyph)) - { - /* Composes. */ - buffer->next_glyph (); /* Copy to out-buffer. */ - if (unlikely (buffer->in_error)) - return; - buffer->merge_out_clusters (starter, buffer->out_len); - buffer->out_len--; /* Remove the second composable. */ - buffer->out_info[starter].codepoint = composed; /* Modify starter and carry on. */ - set_glyph (buffer->out_info[starter], font); - _hb_glyph_info_set_unicode_props (&buffer->out_info[starter], buffer->unicode); - - continue; - } - - /* Blocked, or doesn't compose. */ - buffer->next_glyph (); - - if (_hb_glyph_info_get_modified_combining_class (&buffer->prev()) == 0) - starter = buffer->out_len - 1; - } - buffer->swap_buffers (); - -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-private.hh deleted file mode 100644 index 9599f8e722c..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape-private.hh +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Copyright © 2010 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_SHAPE_PRIVATE_HH -#define HB_OT_SHAPE_PRIVATE_HH - -#include "hb-private.hh" - -#include "hb-ot-map-private.hh" - - - - - -struct hb_ot_shape_plan_t -{ - hb_segment_properties_t props; - const struct hb_ot_complex_shaper_t *shaper; - hb_ot_map_t map; - const void *data; - - inline void collect_lookups (hb_tag_t table_tag, hb_set_t *lookups) const - { - unsigned int table_index; - switch (table_tag) { - case HB_OT_TAG_GSUB: table_index = 0; break; - case HB_OT_TAG_GPOS: table_index = 1; break; - default: return; - } - map.collect_lookups (table_index, lookups); - } - inline void substitute (hb_font_t *font, hb_buffer_t *buffer) const { map.substitute (this, font, buffer); } - inline void position (hb_font_t *font, hb_buffer_t *buffer) const { map.position (this, font, buffer); } - - void finish (void) { map.finish (); } -}; - -struct hb_ot_shape_planner_t -{ - /* In the order that they are filled in. */ - hb_face_t *face; - hb_segment_properties_t props; - const struct hb_ot_complex_shaper_t *shaper; - hb_ot_map_builder_t map; - - hb_ot_shape_planner_t (const hb_shape_plan_t *master_plan) : - face (master_plan->face), - props (master_plan->props), - shaper (NULL), - map (face, &props) {} - ~hb_ot_shape_planner_t (void) { map.finish (); } - - inline void compile (hb_ot_shape_plan_t &plan) - { - plan.props = props; - plan.shaper = shaper; - map.compile (plan.map); - } - - private: - NO_COPY (hb_ot_shape_planner_t); -}; - - -#endif /* HB_OT_SHAPE_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape.cc deleted file mode 100644 index f65861f959f..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-shape.cc +++ /dev/null @@ -1,654 +0,0 @@ -/* - * Copyright © 2009,2010 Red Hat, Inc. - * Copyright © 2010,2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#define HB_SHAPER ot -#define hb_ot_shaper_face_data_t hb_ot_layout_t -#define hb_ot_shaper_shape_plan_data_t hb_ot_shape_plan_t -#include "hb-shaper-impl-private.hh" - -#include "hb-ot-shape-private.hh" -#include "hb-ot-shape-complex-private.hh" -#include "hb-ot-shape-fallback-private.hh" -#include "hb-ot-shape-normalize-private.hh" - -#include "hb-ot-layout-private.hh" -#include "hb-set-private.hh" - - -static hb_tag_t common_features[] = { - HB_TAG('c','c','m','p'), - HB_TAG('l','i','g','a'), - HB_TAG('l','o','c','l'), - HB_TAG('m','a','r','k'), - HB_TAG('m','k','m','k'), - HB_TAG('r','l','i','g'), -}; - - -static hb_tag_t horizontal_features[] = { - HB_TAG('c','a','l','t'), - HB_TAG('c','l','i','g'), - HB_TAG('c','u','r','s'), - HB_TAG('k','e','r','n'), - HB_TAG('r','c','l','t'), -}; - -/* Note: - * Technically speaking, vrt2 and vert are mutually exclusive. - * According to the spec, valt and vpal are also mutually exclusive. - * But we apply them all for now. - */ -static hb_tag_t vertical_features[] = { - HB_TAG('v','a','l','t'), - HB_TAG('v','e','r','t'), - HB_TAG('v','k','r','n'), - HB_TAG('v','p','a','l'), - HB_TAG('v','r','t','2'), -}; - - - -static void -hb_ot_shape_collect_features (hb_ot_shape_planner_t *planner, - const hb_segment_properties_t *props, - const hb_feature_t *user_features, - unsigned int num_user_features) -{ - hb_ot_map_builder_t *map = &planner->map; - - switch (props->direction) { - case HB_DIRECTION_LTR: - map->add_global_bool_feature (HB_TAG ('l','t','r','a')); - map->add_global_bool_feature (HB_TAG ('l','t','r','m')); - break; - case HB_DIRECTION_RTL: - map->add_global_bool_feature (HB_TAG ('r','t','l','a')); - map->add_feature (HB_TAG ('r','t','l','m'), 1, F_NONE); - break; - case HB_DIRECTION_TTB: - case HB_DIRECTION_BTT: - case HB_DIRECTION_INVALID: - default: - break; - } - - if (planner->shaper->collect_features) - planner->shaper->collect_features (planner); - - for (unsigned int i = 0; i < ARRAY_LENGTH (common_features); i++) - map->add_global_bool_feature (common_features[i]); - - if (HB_DIRECTION_IS_HORIZONTAL (props->direction)) - for (unsigned int i = 0; i < ARRAY_LENGTH (horizontal_features); i++) - map->add_feature (horizontal_features[i], 1, F_GLOBAL | - (horizontal_features[i] == HB_TAG('k','e','r','n') ? - F_HAS_FALLBACK : F_NONE)); - else - for (unsigned int i = 0; i < ARRAY_LENGTH (vertical_features); i++) - map->add_feature (vertical_features[i], 1, F_GLOBAL | - (vertical_features[i] == HB_TAG('v','k','r','n') ? - F_HAS_FALLBACK : F_NONE)); - - if (planner->shaper->override_features) - planner->shaper->override_features (planner); - - for (unsigned int i = 0; i < num_user_features; i++) { - const hb_feature_t *feature = &user_features[i]; - map->add_feature (feature->tag, feature->value, - (feature->start == 0 && feature->end == (unsigned int) -1) ? - F_GLOBAL : F_NONE); - } -} - - -/* - * shaper face data - */ - -hb_ot_shaper_face_data_t * -_hb_ot_shaper_face_data_create (hb_face_t *face) -{ - return _hb_ot_layout_create (face); -} - -void -_hb_ot_shaper_face_data_destroy (hb_ot_shaper_face_data_t *data) -{ - _hb_ot_layout_destroy (data); -} - - -/* - * shaper font data - */ - -struct hb_ot_shaper_font_data_t {}; - -hb_ot_shaper_font_data_t * -_hb_ot_shaper_font_data_create (hb_font_t *font) -{ - return (hb_ot_shaper_font_data_t *) HB_SHAPER_DATA_SUCCEEDED; -} - -void -_hb_ot_shaper_font_data_destroy (hb_ot_shaper_font_data_t *data) -{ -} - - -/* - * shaper shape_plan data - */ - -hb_ot_shaper_shape_plan_data_t * -_hb_ot_shaper_shape_plan_data_create (hb_shape_plan_t *shape_plan, - const hb_feature_t *user_features, - unsigned int num_user_features) -{ - hb_ot_shape_plan_t *plan = (hb_ot_shape_plan_t *) calloc (1, sizeof (hb_ot_shape_plan_t)); - if (unlikely (!plan)) - return NULL; - - hb_ot_shape_planner_t planner (shape_plan); - - planner.shaper = hb_ot_shape_complex_categorize (&planner); - - hb_ot_shape_collect_features (&planner, &shape_plan->props, user_features, num_user_features); - - planner.compile (*plan); - - if (plan->shaper->data_create) { - plan->data = plan->shaper->data_create (plan); - if (unlikely (!plan->data)) - return NULL; - } - - return plan; -} - -void -_hb_ot_shaper_shape_plan_data_destroy (hb_ot_shaper_shape_plan_data_t *plan) -{ - if (plan->shaper->data_destroy) - plan->shaper->data_destroy (const_cast<void *> (plan->data)); - - plan->finish (); - - free (plan); -} - - -/* - * shaper - */ - -struct hb_ot_shape_context_t -{ - hb_ot_shape_plan_t *plan; - hb_font_t *font; - hb_face_t *face; - hb_buffer_t *buffer; - const hb_feature_t *user_features; - unsigned int num_user_features; - - /* Transient stuff */ - hb_direction_t target_direction; -}; - - - -/* Main shaper */ - - -/* Prepare */ - -static void -hb_set_unicode_props (hb_buffer_t *buffer) -{ - unsigned int count = buffer->len; - for (unsigned int i = 0; i < count; i++) - _hb_glyph_info_set_unicode_props (&buffer->info[i], buffer->unicode); -} - -static void -hb_insert_dotted_circle (hb_buffer_t *buffer, hb_font_t *font) -{ - if (!(buffer->flags & HB_BUFFER_FLAG_BOT) || - _hb_glyph_info_get_general_category (&buffer->info[0]) != - HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK) - return; - - hb_codepoint_t dottedcircle_glyph; - if (!font->get_glyph (0x25CC, 0, &dottedcircle_glyph)) - return; - - hb_glyph_info_t dottedcircle; - dottedcircle.codepoint = 0x25CC; - _hb_glyph_info_set_unicode_props (&dottedcircle, buffer->unicode); - - buffer->clear_output (); - - buffer->idx = 0; - hb_glyph_info_t info = dottedcircle; - info.cluster = buffer->cur().cluster; - info.mask = buffer->cur().mask; - buffer->output_info (info); - while (buffer->idx < buffer->len) - buffer->next_glyph (); - - buffer->swap_buffers (); -} - -static void -hb_form_clusters (hb_buffer_t *buffer) -{ - unsigned int count = buffer->len; - for (unsigned int i = 1; i < count; i++) - if (HB_UNICODE_GENERAL_CATEGORY_IS_MARK (_hb_glyph_info_get_general_category (&buffer->info[i]))) - buffer->merge_clusters (i - 1, i + 1); -} - -static void -hb_ensure_native_direction (hb_buffer_t *buffer) -{ - hb_direction_t direction = buffer->props.direction; - - /* TODO vertical: - * The only BTT vertical script is Ogham, but it's not clear to me whether OpenType - * Ogham fonts are supposed to be implemented BTT or not. Need to research that - * first. */ - if ((HB_DIRECTION_IS_HORIZONTAL (direction) && direction != hb_script_get_horizontal_direction (buffer->props.script)) || - (HB_DIRECTION_IS_VERTICAL (direction) && direction != HB_DIRECTION_TTB)) - { - hb_buffer_reverse_clusters (buffer); - buffer->props.direction = HB_DIRECTION_REVERSE (buffer->props.direction); - } -} - - -/* Substitute */ - -static inline void -hb_ot_mirror_chars (hb_ot_shape_context_t *c) -{ - if (HB_DIRECTION_IS_FORWARD (c->target_direction)) - return; - - hb_unicode_funcs_t *unicode = c->buffer->unicode; - hb_mask_t rtlm_mask = c->plan->map.get_1_mask (HB_TAG ('r','t','l','m')); - - unsigned int count = c->buffer->len; - for (unsigned int i = 0; i < count; i++) { - hb_codepoint_t codepoint = unicode->mirroring (c->buffer->info[i].codepoint); - if (likely (codepoint == c->buffer->info[i].codepoint)) - c->buffer->info[i].mask |= rtlm_mask; - else - c->buffer->info[i].codepoint = codepoint; - } -} - -static inline void -hb_ot_shape_setup_masks (hb_ot_shape_context_t *c) -{ - hb_ot_map_t *map = &c->plan->map; - - hb_mask_t global_mask = map->get_global_mask (); - c->buffer->reset_masks (global_mask); - - if (c->plan->shaper->setup_masks) - c->plan->shaper->setup_masks (c->plan, c->buffer, c->font); - - for (unsigned int i = 0; i < c->num_user_features; i++) - { - const hb_feature_t *feature = &c->user_features[i]; - if (!(feature->start == 0 && feature->end == (unsigned int)-1)) { - unsigned int shift; - hb_mask_t mask = map->get_mask (feature->tag, &shift); - c->buffer->set_masks (feature->value << shift, mask, feature->start, feature->end); - } - } -} - -static inline void -hb_ot_map_glyphs_fast (hb_buffer_t *buffer) -{ - /* Normalization process sets up glyph_index(), we just copy it. */ - unsigned int count = buffer->len; - for (unsigned int i = 0; i < count; i++) - buffer->info[i].codepoint = buffer->info[i].glyph_index(); -} - -static inline void -hb_synthesize_glyph_classes (hb_ot_shape_context_t *c) -{ - unsigned int count = c->buffer->len; - for (unsigned int i = 0; i < count; i++) - c->buffer->info[i].glyph_props() = _hb_glyph_info_get_general_category (&c->buffer->info[i]) == HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK ? - HB_OT_LAYOUT_GLYPH_PROPS_MARK : - HB_OT_LAYOUT_GLYPH_PROPS_BASE_GLYPH; -} - -static inline void -hb_ot_substitute_default (hb_ot_shape_context_t *c) -{ - if (c->plan->shaper->preprocess_text) - c->plan->shaper->preprocess_text (c->plan, c->buffer, c->font); - - hb_ot_mirror_chars (c); - - HB_BUFFER_ALLOCATE_VAR (c->buffer, glyph_index); - - _hb_ot_shape_normalize (c->plan, c->buffer, c->font); - - hb_ot_shape_setup_masks (c); - - /* This is unfortunate to go here, but necessary... */ - if (!hb_ot_layout_has_positioning (c->face)) - _hb_ot_shape_fallback_position_recategorize_marks (c->plan, c->font, c->buffer); - - hb_ot_map_glyphs_fast (c->buffer); - - HB_BUFFER_DEALLOCATE_VAR (c->buffer, glyph_index); -} - -static inline void -hb_ot_substitute_complex (hb_ot_shape_context_t *c) -{ - hb_ot_layout_substitute_start (c->font, c->buffer); - - if (!hb_ot_layout_has_glyph_classes (c->face)) - hb_synthesize_glyph_classes (c); - - c->plan->substitute (c->font, c->buffer); - - hb_ot_layout_substitute_finish (c->font, c->buffer); - - return; -} - -static inline void -hb_ot_substitute (hb_ot_shape_context_t *c) -{ - hb_ot_substitute_default (c); - hb_ot_substitute_complex (c); -} - -/* Position */ - -static inline void -hb_ot_position_default (hb_ot_shape_context_t *c) -{ - hb_ot_layout_position_start (c->font, c->buffer); - - unsigned int count = c->buffer->len; - for (unsigned int i = 0; i < count; i++) - { - c->font->get_glyph_advance_for_direction (c->buffer->info[i].codepoint, - c->buffer->props.direction, - &c->buffer->pos[i].x_advance, - &c->buffer->pos[i].y_advance); - c->font->subtract_glyph_origin_for_direction (c->buffer->info[i].codepoint, - c->buffer->props.direction, - &c->buffer->pos[i].x_offset, - &c->buffer->pos[i].y_offset); - - } - - /* Zero'ing mark widths by GDEF (as used in Myanmar spec) happens - * *before* GPOS. */ - switch (c->plan->shaper->zero_width_marks) - { - case HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF: - for (unsigned int i = 0; i < count; i++) - if ((c->buffer->info[i].glyph_props() & HB_OT_LAYOUT_GLYPH_PROPS_MARK)) - { - c->buffer->pos[i].x_advance = 0; - c->buffer->pos[i].y_advance = 0; - } - break; - - default: - case HB_OT_SHAPE_ZERO_WIDTH_MARKS_NONE: - case HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE: - break; - } -} - -static inline bool -hb_ot_position_complex (hb_ot_shape_context_t *c) -{ - bool ret = false; - unsigned int count = c->buffer->len; - - if (hb_ot_layout_has_positioning (c->face)) - { - /* Change glyph origin to what GPOS expects, apply GPOS, change it back. */ - - for (unsigned int i = 0; i < count; i++) { - c->font->add_glyph_origin_for_direction (c->buffer->info[i].codepoint, - HB_DIRECTION_LTR, - &c->buffer->pos[i].x_offset, - &c->buffer->pos[i].y_offset); - } - - c->plan->position (c->font, c->buffer); - - for (unsigned int i = 0; i < count; i++) { - c->font->subtract_glyph_origin_for_direction (c->buffer->info[i].codepoint, - HB_DIRECTION_LTR, - &c->buffer->pos[i].x_offset, - &c->buffer->pos[i].y_offset); - } - - ret = true; - } - - /* Zero'ing mark widths by Unicode happens - * *after* GPOS. */ - switch (c->plan->shaper->zero_width_marks) - { - case HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_UNICODE: - for (unsigned int i = 0; i < count; i++) - if (_hb_glyph_info_get_general_category (&c->buffer->info[i]) == HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK) - { - c->buffer->pos[i].x_advance = 0; - c->buffer->pos[i].y_advance = 0; - } - break; - - default: - case HB_OT_SHAPE_ZERO_WIDTH_MARKS_NONE: - case HB_OT_SHAPE_ZERO_WIDTH_MARKS_BY_GDEF: - break; - } - - hb_ot_layout_position_finish (c->font, c->buffer); - - return ret; -} - -static inline void -hb_ot_position (hb_ot_shape_context_t *c) -{ - hb_ot_position_default (c); - - hb_bool_t fallback = !hb_ot_position_complex (c); - - if (fallback && c->plan->shaper->fallback_position) - _hb_ot_shape_fallback_position (c->plan, c->font, c->buffer); - - if (HB_DIRECTION_IS_BACKWARD (c->buffer->props.direction)) - hb_buffer_reverse (c->buffer); - - /* Visual fallback goes here. */ - - if (fallback) - _hb_ot_shape_fallback_kern (c->plan, c->font, c->buffer); -} - - -/* Post-process */ - -static void -hb_ot_hide_default_ignorables (hb_ot_shape_context_t *c) -{ - if (c->buffer->flags & HB_BUFFER_FLAG_PRESERVE_DEFAULT_IGNORABLES) - return; - - hb_codepoint_t space = 0; - - unsigned int count = c->buffer->len; - for (unsigned int i = 0; i < count; i++) - if (unlikely (!is_a_ligature (c->buffer->info[i]) && - _hb_glyph_info_is_default_ignorable (&c->buffer->info[i]))) - { - if (!space) { - /* We assume that the space glyph is not gid0. */ - if (unlikely (!c->font->get_glyph (' ', 0, &space)) || !space) - return; /* No point! */ - } - c->buffer->info[i].codepoint = space; - c->buffer->pos[i].x_advance = 0; - c->buffer->pos[i].y_advance = 0; - } -} - - -/* Pull it all together! */ - -static void -hb_ot_shape_internal (hb_ot_shape_context_t *c) -{ - c->buffer->deallocate_var_all (); - - /* Save the original direction, we use it later. */ - c->target_direction = c->buffer->props.direction; - - HB_BUFFER_ALLOCATE_VAR (c->buffer, unicode_props0); - HB_BUFFER_ALLOCATE_VAR (c->buffer, unicode_props1); - - c->buffer->clear_output (); - - hb_set_unicode_props (c->buffer); - hb_insert_dotted_circle (c->buffer, c->font); - hb_form_clusters (c->buffer); - - hb_ensure_native_direction (c->buffer); - - hb_ot_substitute (c); - hb_ot_position (c); - - hb_ot_hide_default_ignorables (c); - - HB_BUFFER_DEALLOCATE_VAR (c->buffer, unicode_props1); - HB_BUFFER_DEALLOCATE_VAR (c->buffer, unicode_props0); - - c->buffer->props.direction = c->target_direction; - - c->buffer->deallocate_var_all (); -} - - -hb_bool_t -_hb_ot_shape (hb_shape_plan_t *shape_plan, - hb_font_t *font, - hb_buffer_t *buffer, - const hb_feature_t *features, - unsigned int num_features) -{ - hb_ot_shape_context_t c = {HB_SHAPER_DATA_GET (shape_plan), font, font->face, buffer, features, num_features}; - hb_ot_shape_internal (&c); - - return true; -} - - -void -hb_ot_shape_plan_collect_lookups (hb_shape_plan_t *shape_plan, - hb_tag_t table_tag, - hb_set_t *lookup_indexes /* OUT */) -{ - /* XXX Does the first part always succeed? */ - HB_SHAPER_DATA_GET (shape_plan)->collect_lookups (table_tag, lookup_indexes); -} - - -/* TODO Move this to hb-ot-shape-normalize, make it do decompose, and make it public. */ -static void -add_char (hb_font_t *font, - hb_unicode_funcs_t *unicode, - hb_bool_t mirror, - hb_codepoint_t u, - hb_set_t *glyphs) -{ - hb_codepoint_t glyph; - if (font->get_glyph (u, 0, &glyph)) - glyphs->add (glyph); - if (mirror) - { - hb_codepoint_t m = unicode->mirroring (u); - if (m != u && font->get_glyph (m, 0, &glyph)) - glyphs->add (glyph); - } -} - - -void -hb_ot_shape_glyphs_closure (hb_font_t *font, - hb_buffer_t *buffer, - const hb_feature_t *features, - unsigned int num_features, - hb_set_t *glyphs) -{ - hb_ot_shape_plan_t plan; - - const char *shapers[] = {"ot", NULL}; - hb_shape_plan_t *shape_plan = hb_shape_plan_create_cached (font->face, &buffer->props, - features, num_features, shapers); - - bool mirror = hb_script_get_horizontal_direction (buffer->props.script) == HB_DIRECTION_RTL; - - unsigned int count = buffer->len; - for (unsigned int i = 0; i < count; i++) - add_char (font, buffer->unicode, mirror, buffer->info[i].codepoint, glyphs); - - hb_set_t lookups; - lookups.init (); - hb_ot_shape_plan_collect_lookups (shape_plan, HB_OT_TAG_GSUB, &lookups); - - /* And find transitive closure. */ - hb_set_t copy; - copy.init (); - do { - copy.set (glyphs); - for (hb_codepoint_t lookup_index = -1; hb_set_next (&lookups, &lookup_index);) - hb_ot_layout_lookup_substitute_closure (font->face, lookup_index, glyphs); - } while (!copy.is_equal (glyphs)); - - hb_shape_plan_destroy (shape_plan); -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-tag.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-tag.cc deleted file mode 100644 index 91ebec76ee3..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-tag.cc +++ /dev/null @@ -1,722 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * Copyright © 2011 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod, Roozbeh Pournader - */ - -#include "hb-private.hh" -#include "hb-ot.h" - -#include <string.h> - - - -/* hb_script_t */ - -static hb_tag_t -hb_ot_old_tag_from_script (hb_script_t script) -{ - /* This seems to be accurate as of end of 2012. */ - - switch ((hb_tag_t) script) { - case HB_SCRIPT_INVALID: return HB_OT_TAG_DEFAULT_SCRIPT; - - /* KATAKANA and HIRAGANA both map to 'kana' */ - case HB_SCRIPT_HIRAGANA: return HB_TAG('k','a','n','a'); - - /* Spaces at the end are preserved, unlike ISO 15924 */ - case HB_SCRIPT_LAO: return HB_TAG('l','a','o',' '); - case HB_SCRIPT_YI: return HB_TAG('y','i',' ',' '); - /* Unicode-5.0 additions */ - case HB_SCRIPT_NKO: return HB_TAG('n','k','o',' '); - /* Unicode-5.1 additions */ - case HB_SCRIPT_VAI: return HB_TAG('v','a','i',' '); - /* Unicode-5.2 additions */ - /* Unicode-6.0 additions */ - } - - /* Else, just change first char to lowercase and return */ - return ((hb_tag_t) script) | 0x20000000; -} - -static hb_script_t -hb_ot_old_tag_to_script (hb_tag_t tag) -{ - if (unlikely (tag == HB_OT_TAG_DEFAULT_SCRIPT)) - return HB_SCRIPT_INVALID; - - /* This side of the conversion is fully algorithmic. */ - - /* Any spaces at the end of the tag are replaced by repeating the last - * letter. Eg 'nko ' -> 'Nkoo' */ - if (unlikely ((tag & 0x0000FF00) == 0x00002000)) - tag |= (tag >> 8) & 0x0000FF00; /* Copy second letter to third */ - if (unlikely ((tag & 0x000000FF) == 0x00000020)) - tag |= (tag >> 8) & 0x000000FF; /* Copy third letter to fourth */ - - /* Change first char to uppercase and return */ - return (hb_script_t) (tag & ~0x20000000); -} - -static hb_tag_t -hb_ot_new_tag_from_script (hb_script_t script) -{ - switch ((hb_tag_t) script) { - case HB_SCRIPT_BENGALI: return HB_TAG('b','n','g','2'); - case HB_SCRIPT_DEVANAGARI: return HB_TAG('d','e','v','2'); - case HB_SCRIPT_GUJARATI: return HB_TAG('g','j','r','2'); - case HB_SCRIPT_GURMUKHI: return HB_TAG('g','u','r','2'); - case HB_SCRIPT_KANNADA: return HB_TAG('k','n','d','2'); - case HB_SCRIPT_MALAYALAM: return HB_TAG('m','l','m','2'); - case HB_SCRIPT_ORIYA: return HB_TAG('o','r','y','2'); - case HB_SCRIPT_TAMIL: return HB_TAG('t','m','l','2'); - case HB_SCRIPT_TELUGU: return HB_TAG('t','e','l','2'); - case HB_SCRIPT_MYANMAR: return HB_TAG('m','y','m','2'); - } - - return HB_OT_TAG_DEFAULT_SCRIPT; -} - -static hb_script_t -hb_ot_new_tag_to_script (hb_tag_t tag) -{ - switch (tag) { - case HB_TAG('b','n','g','2'): return HB_SCRIPT_BENGALI; - case HB_TAG('d','e','v','2'): return HB_SCRIPT_DEVANAGARI; - case HB_TAG('g','j','r','2'): return HB_SCRIPT_GUJARATI; - case HB_TAG('g','u','r','2'): return HB_SCRIPT_GURMUKHI; - case HB_TAG('k','n','d','2'): return HB_SCRIPT_KANNADA; - case HB_TAG('m','l','m','2'): return HB_SCRIPT_MALAYALAM; - case HB_TAG('o','r','y','2'): return HB_SCRIPT_ORIYA; - case HB_TAG('t','m','l','2'): return HB_SCRIPT_TAMIL; - case HB_TAG('t','e','l','2'): return HB_SCRIPT_TELUGU; - case HB_TAG('m','y','m','2'): return HB_SCRIPT_MYANMAR; - } - - return HB_SCRIPT_UNKNOWN; -} - -/* - * Complete list at: - * https://www.microsoft.com/typography/otspec/scripttags.htm - * https://www.microsoft.com/typography/otspec160/scripttagsProposed.htm - * - * Most of the script tags are the same as the ISO 15924 tag but lowercased. - * So we just do that, and handle the exceptional cases in a switch. - */ - -void -hb_ot_tags_from_script (hb_script_t script, - hb_tag_t *script_tag_1, - hb_tag_t *script_tag_2) -{ - hb_tag_t new_tag; - - *script_tag_2 = HB_OT_TAG_DEFAULT_SCRIPT; - *script_tag_1 = hb_ot_old_tag_from_script (script); - - new_tag = hb_ot_new_tag_from_script (script); - if (unlikely (new_tag != HB_OT_TAG_DEFAULT_SCRIPT)) { - *script_tag_2 = *script_tag_1; - *script_tag_1 = new_tag; - } -} - -hb_script_t -hb_ot_tag_to_script (hb_tag_t tag) -{ - if (unlikely ((tag & 0x000000FF) == '2')) - return hb_ot_new_tag_to_script (tag); - - return hb_ot_old_tag_to_script (tag); -} - - -/* hb_language_t */ - -typedef struct { - char language[6]; - hb_tag_t tag; -} LangTag; - -/* - * Complete list at: - * http://www.microsoft.com/typography/otspec/languagetags.htm - * - * Generated by intersecting the OpenType language tag list from - * Draft OpenType 1.5 spec, with with the ISO 639-3 codes from - * 2008/08/04, matching on name, and finally adjusted manually. - * - * Updated on 2012/12/07 with more research into remaining codes. - * - * Some items still missing. Those are commented out at the end. - * Keep sorted for bsearch. - */ - -static const LangTag ot_languages[] = { - {"aa", HB_TAG('A','F','R',' ')}, /* Afar */ - {"ab", HB_TAG('A','B','K',' ')}, /* Abkhazian */ - {"abq", HB_TAG('A','B','A',' ')}, /* Abaza */ - {"ada", HB_TAG('D','N','G',' ')}, /* Dangme */ - {"ady", HB_TAG('A','D','Y',' ')}, /* Adyghe */ - {"af", HB_TAG('A','F','K',' ')}, /* Afrikaans */ - {"aii", HB_TAG('S','W','A',' ')}, /* Swadaya Aramaic */ - {"aiw", HB_TAG('A','R','I',' ')}, /* Aari */ - {"alt", HB_TAG('A','L','T',' ')}, /* [Southern] Altai */ - {"am", HB_TAG('A','M','H',' ')}, /* Amharic */ - {"amf", HB_TAG('H','B','N',' ')}, /* Hammer-Banna */ - {"ar", HB_TAG('A','R','A',' ')}, /* Arabic */ - {"arn", HB_TAG('M','A','P',' ')}, /* Mapudungun */ - {"as", HB_TAG('A','S','M',' ')}, /* Assamese */ - {"ath", HB_TAG('A','T','H',' ')}, /* Athapaskan [family] */ - {"atv", HB_TAG('A','L','T',' ')}, /* [Northern] Altai */ - {"av", HB_TAG('A','V','R',' ')}, /* Avaric */ - {"awa", HB_TAG('A','W','A',' ')}, /* Awadhi */ - {"ay", HB_TAG('A','Y','M',' ')}, /* Aymara */ - {"az", HB_TAG('A','Z','E',' ')}, /* Azerbaijani */ - {"ba", HB_TAG('B','S','H',' ')}, /* Bashkir */ - {"bai", HB_TAG('B','M','L',' ')}, /* Bamileke [family] */ - {"bal", HB_TAG('B','L','I',' ')}, /* Baluchi */ - {"bci", HB_TAG('B','A','U',' ')}, /* Baule */ - {"bcq", HB_TAG('B','C','H',' ')}, /* Bench */ - {"be", HB_TAG('B','E','L',' ')}, /* Belarussian */ - {"bem", HB_TAG('B','E','M',' ')}, /* Bemba (Zambia) */ - {"ber", HB_TAG('B','E','R',' ')}, /* Berber [family] */ - {"bfq", HB_TAG('B','A','D',' ')}, /* Badaga */ - {"bft", HB_TAG('B','L','T',' ')}, /* Balti */ - {"bfy", HB_TAG('B','A','G',' ')}, /* Baghelkhandi */ - {"bg", HB_TAG('B','G','R',' ')}, /* Bulgarian */ - {"bhb", HB_TAG('B','H','I',' ')}, /* Bhili */ - {"bho", HB_TAG('B','H','O',' ')}, /* Bhojpuri */ - {"bik", HB_TAG('B','I','K',' ')}, /* Bikol */ - {"bin", HB_TAG('E','D','O',' ')}, /* Bini */ - {"bjt", HB_TAG('B','L','N',' ')}, /* Balanta-Ganja */ - {"bla", HB_TAG('B','K','F',' ')}, /* Blackfoot */ - {"ble", HB_TAG('B','L','N',' ')}, /* Balanta-Kentohe */ - {"bm", HB_TAG('B','M','B',' ')}, /* Bambara */ - {"bn", HB_TAG('B','E','N',' ')}, /* Bengali */ - {"bo", HB_TAG('T','I','B',' ')}, /* Tibetan */ - {"br", HB_TAG('B','R','E',' ')}, /* Breton */ - {"bra", HB_TAG('B','R','I',' ')}, /* Braj Bhasha */ - {"brh", HB_TAG('B','R','H',' ')}, /* Brahui */ - {"bs", HB_TAG('B','O','S',' ')}, /* Bosnian */ - {"btb", HB_TAG('B','T','I',' ')}, /* Beti (Cameroon) */ - {"bxr", HB_TAG('R','B','U',' ')}, /* Russian Buriat */ - {"byn", HB_TAG('B','I','L',' ')}, /* Bilen */ - {"ca", HB_TAG('C','A','T',' ')}, /* Catalan */ - {"ce", HB_TAG('C','H','E',' ')}, /* Chechen */ - {"ceb", HB_TAG('C','E','B',' ')}, /* Cebuano */ - {"chp", HB_TAG('C','H','P',' ')}, /* Chipewyan */ - {"chr", HB_TAG('C','H','R',' ')}, /* Cherokee */ - {"ckt", HB_TAG('C','H','K',' ')}, /* Chukchi */ - {"cop", HB_TAG('C','O','P',' ')}, /* Coptic */ - {"cr", HB_TAG('C','R','E',' ')}, /* Cree */ - {"crh", HB_TAG('C','R','T',' ')}, /* Crimean Tatar */ - {"crj", HB_TAG('E','C','R',' ')}, /* [Southern] East Cree */ - {"crl", HB_TAG('E','C','R',' ')}, /* [Northern] East Cree */ - {"crm", HB_TAG('M','C','R',' ')}, /* Moose Cree */ - {"crx", HB_TAG('C','R','R',' ')}, /* Carrier */ - {"cs", HB_TAG('C','S','Y',' ')}, /* Czech */ - {"cu", HB_TAG('C','S','L',' ')}, /* Church Slavic */ - {"cv", HB_TAG('C','H','U',' ')}, /* Chuvash */ - {"cwd", HB_TAG('D','C','R',' ')}, /* Woods Cree */ - {"cy", HB_TAG('W','E','L',' ')}, /* Welsh */ - {"da", HB_TAG('D','A','N',' ')}, /* Danish */ - {"dap", HB_TAG('N','I','S',' ')}, /* Nisi (India) */ - {"dar", HB_TAG('D','A','R',' ')}, /* Dargwa */ - {"de", HB_TAG('D','E','U',' ')}, /* German */ - {"din", HB_TAG('D','N','K',' ')}, /* Dinka */ - {"dje", HB_TAG('D','J','R',' ')}, /* Djerma */ - {"dng", HB_TAG('D','U','N',' ')}, /* Dungan */ - {"doi", HB_TAG('D','G','R',' ')}, /* Dogri */ - {"dsb", HB_TAG('L','S','B',' ')}, /* Lower Sorbian */ - {"dv", HB_TAG('D','I','V',' ')}, /* Dhivehi */ - {"dyu", HB_TAG('J','U','L',' ')}, /* Jula */ - {"dz", HB_TAG('D','Z','N',' ')}, /* Dzongkha */ - {"ee", HB_TAG('E','W','E',' ')}, /* Ewe */ - {"efi", HB_TAG('E','F','I',' ')}, /* Efik */ - {"el", HB_TAG('E','L','L',' ')}, /* Modern Greek (1453-) */ - {"en", HB_TAG('E','N','G',' ')}, /* English */ - {"eo", HB_TAG('N','T','O',' ')}, /* Esperanto */ - {"eot", HB_TAG('B','T','I',' ')}, /* Beti (Côte d'Ivoire) */ - {"es", HB_TAG('E','S','P',' ')}, /* Spanish */ - {"et", HB_TAG('E','T','I',' ')}, /* Estonian */ - {"eu", HB_TAG('E','U','Q',' ')}, /* Basque */ - {"eve", HB_TAG('E','V','N',' ')}, /* Even */ - {"evn", HB_TAG('E','V','K',' ')}, /* Evenki */ - {"fa", HB_TAG('F','A','R',' ')}, /* Persian */ - {"ff", HB_TAG('F','U','L',' ')}, /* Fulah */ - {"fi", HB_TAG('F','I','N',' ')}, /* Finnish */ - {"fil", HB_TAG('P','I','L',' ')}, /* Filipino */ - {"fj", HB_TAG('F','J','I',' ')}, /* Fijian */ - {"fo", HB_TAG('F','O','S',' ')}, /* Faroese */ - {"fon", HB_TAG('F','O','N',' ')}, /* Fon */ - {"fr", HB_TAG('F','R','A',' ')}, /* French */ - {"fur", HB_TAG('F','R','L',' ')}, /* Friulian */ - {"fy", HB_TAG('F','R','I',' ')}, /* Western Frisian */ - {"ga", HB_TAG('I','R','I',' ')}, /* Irish */ - {"gaa", HB_TAG('G','A','D',' ')}, /* Ga */ - {"gag", HB_TAG('G','A','G',' ')}, /* Gagauz */ - {"gbm", HB_TAG('G','A','W',' ')}, /* Garhwali */ - {"gd", HB_TAG('G','A','E',' ')}, /* Scottish Gaelic */ - {"gez", HB_TAG('G','E','Z',' ')}, /* Ge'ez */ - {"gl", HB_TAG('G','A','L',' ')}, /* Galician */ - {"gld", HB_TAG('N','A','N',' ')}, /* Nanai */ - {"gn", HB_TAG('G','U','A',' ')}, /* Guarani */ - {"gon", HB_TAG('G','O','N',' ')}, /* Gondi */ - {"grt", HB_TAG('G','R','O',' ')}, /* Garo */ - {"gru", HB_TAG('S','O','G',' ')}, /* Sodo Gurage */ - {"gu", HB_TAG('G','U','J',' ')}, /* Gujarati */ - {"guk", HB_TAG('G','M','Z',' ')}, /* Gumuz */ - {"gv", HB_TAG('M','N','X',' ')}, /* Manx Gaelic */ - {"ha", HB_TAG('H','A','U',' ')}, /* Hausa */ - {"har", HB_TAG('H','R','I',' ')}, /* Harari */ - {"haw", HB_TAG('H','A','W',' ')}, /* Hawaiin */ - {"he", HB_TAG('I','W','R',' ')}, /* Hebrew */ - {"hi", HB_TAG('H','I','N',' ')}, /* Hindi */ - {"hil", HB_TAG('H','I','L',' ')}, /* Hiligaynon */ - {"hnd", HB_TAG('H','N','D',' ')}, /* [Southern] Hindko */ - {"hne", HB_TAG('C','H','H',' ')}, /* Chattisgarhi */ - {"hno", HB_TAG('H','N','D',' ')}, /* [Northern] Hindko */ - {"hoc", HB_TAG('H','O',' ',' ')}, /* Ho */ - {"hoj", HB_TAG('H','A','R',' ')}, /* Harauti */ - {"hr", HB_TAG('H','R','V',' ')}, /* Croatian */ - {"hsb", HB_TAG('U','S','B',' ')}, /* Upper Sorbian */ - {"ht", HB_TAG('H','A','I',' ')}, /* Haitian */ - {"hu", HB_TAG('H','U','N',' ')}, /* Hungarian */ - {"hy", HB_TAG('H','Y','E',' ')}, /* Armenian */ - {"id", HB_TAG('I','N','D',' ')}, /* Indonesian */ - {"ig", HB_TAG('I','B','O',' ')}, /* Igbo */ - {"igb", HB_TAG('E','B','I',' ')}, /* Ebira */ - {"ijo", HB_TAG('I','J','O',' ')}, /* Ijo [family] */ - {"ilo", HB_TAG('I','L','O',' ')}, /* Ilokano */ - {"inh", HB_TAG('I','N','G',' ')}, /* Ingush */ - {"is", HB_TAG('I','S','L',' ')}, /* Icelandic */ - {"it", HB_TAG('I','T','A',' ')}, /* Italian */ - {"iu", HB_TAG('I','N','U',' ')}, /* Inuktitut */ - {"ja", HB_TAG('J','A','N',' ')}, /* Japanese */ - {"jv", HB_TAG('J','A','V',' ')}, /* Javanese */ - {"ka", HB_TAG('K','A','T',' ')}, /* Georgian */ - {"kaa", HB_TAG('K','R','K',' ')}, /* Karakalpak */ - {"kam", HB_TAG('K','M','B',' ')}, /* Kamba (Kenya) */ - {"kar", HB_TAG('K','R','N',' ')}, /* Karen [family] */ - {"kbd", HB_TAG('K','A','B',' ')}, /* Kabardian */ - {"kdr", HB_TAG('K','R','M',' ')}, /* Karaim */ - {"kdt", HB_TAG('K','U','Y',' ')}, /* Kuy */ - {"kex", HB_TAG('K','K','N',' ')}, /* Kokni */ - {"kfr", HB_TAG('K','A','C',' ')}, /* Kachchi */ - {"kfy", HB_TAG('K','M','N',' ')}, /* Kumaoni */ - {"kha", HB_TAG('K','S','I',' ')}, /* Khasi */ - {"khb", HB_TAG('X','B','D',' ')}, /* Tai Lue */ - {"khw", HB_TAG('K','H','W',' ')}, /* Khowar */ - {"ki", HB_TAG('K','I','K',' ')}, /* Kikuyu */ - {"kjh", HB_TAG('K','H','A',' ')}, /* Khakass */ - {"kk", HB_TAG('K','A','Z',' ')}, /* Kazakh */ - {"kl", HB_TAG('G','R','N',' ')}, /* Kalaallisut */ - {"kln", HB_TAG('K','A','L',' ')}, /* Kalenjin */ - {"km", HB_TAG('K','H','M',' ')}, /* Central Khmer */ - {"kmb", HB_TAG('M','B','N',' ')}, /* [North] Mbundu */ - {"kmw", HB_TAG('K','M','O',' ')}, /* Komo (Democratic Republic of Congo) */ - {"kn", HB_TAG('K','A','N',' ')}, /* Kannada */ - {"ko", HB_TAG('K','O','R',' ')}, /* Korean */ - {"koi", HB_TAG('K','O','P',' ')}, /* Komi-Permyak */ - {"kok", HB_TAG('K','O','K',' ')}, /* Konkani */ - {"kpe", HB_TAG('K','P','L',' ')}, /* Kpelle */ - {"kpv", HB_TAG('K','O','Z',' ')}, /* Komi-Zyrian */ - {"kpy", HB_TAG('K','Y','K',' ')}, /* Koryak */ - {"kqy", HB_TAG('K','R','T',' ')}, /* Koorete */ - {"kr", HB_TAG('K','N','R',' ')}, /* Kanuri */ - {"kri", HB_TAG('K','R','I',' ')}, /* Krio */ - {"krl", HB_TAG('K','R','L',' ')}, /* Karelian */ - {"kru", HB_TAG('K','U','U',' ')}, /* Kurukh */ - {"ks", HB_TAG('K','S','H',' ')}, /* Kashmiri */ - {"ku", HB_TAG('K','U','R',' ')}, /* Kurdish */ - {"kum", HB_TAG('K','U','M',' ')}, /* Kumyk */ - {"kvd", HB_TAG('K','U','I',' ')}, /* Kui (Indonesia) */ - {"kxc", HB_TAG('K','M','S',' ')}, /* Komso */ - {"kxu", HB_TAG('K','U','I',' ')}, /* Kui (India) */ - {"ky", HB_TAG('K','I','R',' ')}, /* Kirghiz */ - {"la", HB_TAG('L','A','T',' ')}, /* Latin */ - {"lad", HB_TAG('J','U','D',' ')}, /* Ladino */ - {"lb", HB_TAG('L','T','Z',' ')}, /* Luxembourgish */ - {"lbe", HB_TAG('L','A','K',' ')}, /* Lak */ - {"lbj", HB_TAG('L','D','K',' ')}, /* Ladakhi */ - {"lez", HB_TAG('L','E','Z',' ')}, /* Lezgi */ - {"lg", HB_TAG('L','U','G',' ')}, /* Luganda */ - {"lif", HB_TAG('L','M','B',' ')}, /* Limbu */ - {"lld", HB_TAG('L','A','D',' ')}, /* Ladin */ - {"lmn", HB_TAG('L','A','M',' ')}, /* Lambani */ - {"ln", HB_TAG('L','I','N',' ')}, /* Lingala */ - {"lo", HB_TAG('L','A','O',' ')}, /* Lao */ - {"lt", HB_TAG('L','T','H',' ')}, /* Lithuanian */ - {"lu", HB_TAG('L','U','B',' ')}, /* Luba-Katanga */ - {"lua", HB_TAG('L','U','B',' ')}, /* Luba-Kasai */ - {"luo", HB_TAG('L','U','O',' ')}, /* Luo (Kenya and Tanzania) */ - {"lus", HB_TAG('M','I','Z',' ')}, /* Mizo */ - {"luy", HB_TAG('L','U','H',' ')}, /* Luhya [macrolanguage] */ - {"lv", HB_TAG('L','V','I',' ')}, /* Latvian */ - {"lzz", HB_TAG('L','A','Z',' ')}, /* Laz */ - {"mai", HB_TAG('M','T','H',' ')}, /* Maithili */ - {"mdc", HB_TAG('M','L','E',' ')}, /* Male (Papua New Guinea) */ - {"mdf", HB_TAG('M','O','K',' ')}, /* Moksha */ - {"mdy", HB_TAG('M','L','E',' ')}, /* Male (Ethiopia) */ - {"men", HB_TAG('M','D','E',' ')}, /* Mende (Sierra Leone) */ - {"mg", HB_TAG('M','L','G',' ')}, /* Malagasy */ - {"mhr", HB_TAG('L','M','A',' ')}, /* Low Mari */ - {"mi", HB_TAG('M','R','I',' ')}, /* Maori */ - {"mk", HB_TAG('M','K','D',' ')}, /* Macedonian */ - {"ml", HB_TAG('M','L','R',' ')}, /* Malayalam */ - {"mn", HB_TAG('M','N','G',' ')}, /* Mongolian */ - {"mnc", HB_TAG('M','C','H',' ')}, /* Manchu */ - {"mni", HB_TAG('M','N','I',' ')}, /* Manipuri */ - {"mnk", HB_TAG('M','N','D',' ')}, /* Mandinka */ - {"mns", HB_TAG('M','A','N',' ')}, /* Mansi */ - {"mnw", HB_TAG('M','O','N',' ')}, /* Mon */ - {"mo", HB_TAG('M','O','L',' ')}, /* Moldavian */ - {"moh", HB_TAG('M','O','H',' ')}, /* Mohawk */ - {"mpe", HB_TAG('M','A','J',' ')}, /* Majang */ - {"mr", HB_TAG('M','A','R',' ')}, /* Marathi */ - {"mrj", HB_TAG('H','M','A',' ')}, /* High Mari */ - {"ms", HB_TAG('M','L','Y',' ')}, /* Malay */ - {"mt", HB_TAG('M','T','S',' ')}, /* Maltese */ - {"mwr", HB_TAG('M','A','W',' ')}, /* Marwari */ - {"my", HB_TAG('B','R','M',' ')}, /* Burmese */ - {"mym", HB_TAG('M','E','N',' ')}, /* Me'en */ - {"myv", HB_TAG('E','R','Z',' ')}, /* Erzya */ - {"nag", HB_TAG('N','A','G',' ')}, /* Naga-Assamese */ - {"nb", HB_TAG('N','O','R',' ')}, /* Norwegian Bokmål */ - {"nco", HB_TAG('S','I','B',' ')}, /* Sibe */ - {"nd", HB_TAG('N','D','B',' ')}, /* [North] Ndebele */ - {"ne", HB_TAG('N','E','P',' ')}, /* Nepali */ - {"new", HB_TAG('N','E','W',' ')}, /* Newari */ - {"ng", HB_TAG('N','D','G',' ')}, /* Ndonga */ - {"ngl", HB_TAG('L','M','W',' ')}, /* Lomwe */ - {"niu", HB_TAG('N','I','U',' ')}, /* Niuean */ - {"niv", HB_TAG('G','I','L',' ')}, /* Gilyak */ - {"nl", HB_TAG('N','L','D',' ')}, /* Dutch */ - {"nn", HB_TAG('N','Y','N',' ')}, /* Norwegian Nynorsk */ - {"no", HB_TAG('N','O','R',' ')}, /* Norwegian (deprecated) */ - {"nod", HB_TAG('N','T','A',' ')}, /* Northern Tai */ - {"nog", HB_TAG('N','O','G',' ')}, /* Nogai */ - {"nqo", HB_TAG('N','K','O',' ')}, /* N'Ko */ - {"nr", HB_TAG('N','D','B',' ')}, /* [South] Ndebele */ - {"nsk", HB_TAG('N','A','S',' ')}, /* Naskapi */ - {"nso", HB_TAG('S','O','T',' ')}, /* [Northern] Sotho */ - {"ny", HB_TAG('C','H','I',' ')}, /* Nyanja */ - {"nyn", HB_TAG('N','K','L',' ')}, /* Nkole */ - {"oc", HB_TAG('O','C','I',' ')}, /* Occitan (post 1500) */ - {"oj", HB_TAG('O','J','B',' ')}, /* Ojibwa */ - {"ojs", HB_TAG('O','C','R',' ')}, /* Oji-Cree */ - {"om", HB_TAG('O','R','O',' ')}, /* Oromo */ - {"or", HB_TAG('O','R','I',' ')}, /* Oriya */ - {"os", HB_TAG('O','S','S',' ')}, /* Ossetian */ - {"pa", HB_TAG('P','A','N',' ')}, /* Panjabi */ - {"pce", HB_TAG('P','L','G',' ')}, /* [Ruching] Palaung */ - {"pi", HB_TAG('P','A','L',' ')}, /* Pali */ - {"pl", HB_TAG('P','L','K',' ')}, /* Polish */ - {"pll", HB_TAG('P','L','G',' ')}, /* [Shwe] Palaung */ - {"plp", HB_TAG('P','A','P',' ')}, /* Palpa */ - {"prs", HB_TAG('D','R','I',' ')}, /* Dari */ - {"ps", HB_TAG('P','A','S',' ')}, /* Pushto */ - {"pt", HB_TAG('P','T','G',' ')}, /* Portuguese */ - {"raj", HB_TAG('R','A','J',' ')}, /* Rajasthani */ - {"rbb", HB_TAG('P','L','G',' ')}, /* [Rumai] Palaung */ - {"ria", HB_TAG('R','I','A',' ')}, /* Riang (India) */ - {"ril", HB_TAG('R','I','A',' ')}, /* Riang (Myanmar) */ - {"rki", HB_TAG('A','R','K',' ')}, /* Arakanese */ - {"rm", HB_TAG('R','M','S',' ')}, /* Rhaeto-Romanic */ - {"ro", HB_TAG('R','O','M',' ')}, /* Romanian */ - {"rom", HB_TAG('R','O','Y',' ')}, /* Romany */ - {"ru", HB_TAG('R','U','S',' ')}, /* Russian */ - {"rue", HB_TAG('R','S','Y',' ')}, /* Rusyn */ - {"rw", HB_TAG('R','U','A',' ')}, /* Ruanda */ - {"sa", HB_TAG('S','A','N',' ')}, /* Sanskrit */ - {"sah", HB_TAG('Y','A','K',' ')}, /* Yakut */ - {"sat", HB_TAG('S','A','T',' ')}, /* Santali */ - {"sck", HB_TAG('S','A','D',' ')}, /* Sadri */ - {"scs", HB_TAG('S','L','A',' ')}, /* [North] Slavey */ - {"sd", HB_TAG('S','N','D',' ')}, /* Sindhi */ - {"se", HB_TAG('N','S','M',' ')}, /* Northern Sami */ - {"seh", HB_TAG('S','N','A',' ')}, /* Sena */ - {"sel", HB_TAG('S','E','L',' ')}, /* Selkup */ - {"sg", HB_TAG('S','G','O',' ')}, /* Sango */ - {"shn", HB_TAG('S','H','N',' ')}, /* Shan */ - {"si", HB_TAG('S','N','H',' ')}, /* Sinhala */ - {"sid", HB_TAG('S','I','D',' ')}, /* Sidamo */ - {"sjd", HB_TAG('K','S','M',' ')}, /* Kildin Sami */ - {"sk", HB_TAG('S','K','Y',' ')}, /* Slovak */ - {"skr", HB_TAG('S','R','K',' ')}, /* Seraiki */ - {"sl", HB_TAG('S','L','V',' ')}, /* Slovenian */ - {"sm", HB_TAG('S','M','O',' ')}, /* Samoan */ - {"sma", HB_TAG('S','S','M',' ')}, /* Southern Sami */ - {"smj", HB_TAG('L','S','M',' ')}, /* Lule Sami */ - {"smn", HB_TAG('I','S','M',' ')}, /* Inari Sami */ - {"sms", HB_TAG('S','K','S',' ')}, /* Skolt Sami */ - {"snk", HB_TAG('S','N','K',' ')}, /* Soninke */ - {"so", HB_TAG('S','M','L',' ')}, /* Somali */ - {"sq", HB_TAG('S','Q','I',' ')}, /* Albanian */ - {"sr", HB_TAG('S','R','B',' ')}, /* Serbian */ - {"srr", HB_TAG('S','R','R',' ')}, /* Serer */ - {"ss", HB_TAG('S','W','Z',' ')}, /* Swazi */ - {"st", HB_TAG('S','O','T',' ')}, /* [Southern] Sotho */ - {"suq", HB_TAG('S','U','R',' ')}, /* Suri */ - {"sv", HB_TAG('S','V','E',' ')}, /* Swedish */ - {"sva", HB_TAG('S','V','A',' ')}, /* Svan */ - {"sw", HB_TAG('S','W','K',' ')}, /* Swahili */ - {"swb", HB_TAG('C','M','R',' ')}, /* Comorian */ - {"syr", HB_TAG('S','Y','R',' ')}, /* Syriac */ - {"ta", HB_TAG('T','A','M',' ')}, /* Tamil */ - {"tab", HB_TAG('T','A','B',' ')}, /* Tabasaran */ - {"tcy", HB_TAG('T','U','L',' ')}, /* Tulu */ - {"te", HB_TAG('T','E','L',' ')}, /* Telugu */ - {"tem", HB_TAG('T','M','N',' ')}, /* Temne */ - {"tg", HB_TAG('T','A','J',' ')}, /* Tajik */ - {"th", HB_TAG('T','H','A',' ')}, /* Thai */ - {"ti", HB_TAG('T','G','Y',' ')}, /* Tigrinya */ - {"tig", HB_TAG('T','G','R',' ')}, /* Tigre */ - {"tk", HB_TAG('T','K','M',' ')}, /* Turkmen */ - {"tn", HB_TAG('T','N','A',' ')}, /* Tswana */ - {"to", HB_TAG('T','G','N',' ')}, /* Tonga (Tonga Islands) */ - {"tr", HB_TAG('T','R','K',' ')}, /* Turkish */ - {"tru", HB_TAG('T','U','A',' ')}, /* Turoyo Aramaic */ - {"ts", HB_TAG('T','S','G',' ')}, /* Tsonga */ - {"tt", HB_TAG('T','A','T',' ')}, /* Tatar */ - {"tw", HB_TAG('T','W','I',' ')}, /* Twi */ - {"ty", HB_TAG('T','H','T',' ')}, /* Tahitian */ - {"tyv", HB_TAG('T','U','V',' ')}, /* Tuvin */ - {"udm", HB_TAG('U','D','M',' ')}, /* Udmurt */ - {"ug", HB_TAG('U','Y','G',' ')}, /* Uighur */ - {"uk", HB_TAG('U','K','R',' ')}, /* Ukrainian */ - {"umb", HB_TAG('M','B','N',' ')}, /* [South] Mbundu */ - {"unr", HB_TAG('M','U','N',' ')}, /* Mundari */ - {"ur", HB_TAG('U','R','D',' ')}, /* Urdu */ - {"uz", HB_TAG('U','Z','B',' ')}, /* Uzbek */ - {"ve", HB_TAG('V','E','N',' ')}, /* Venda */ - {"vi", HB_TAG('V','I','T',' ')}, /* Vietnamese */ - {"vmw", HB_TAG('M','A','K',' ')}, /* Makua */ - {"wbm", HB_TAG('W','A',' ',' ')}, /* Wa */ - {"wbr", HB_TAG('W','A','G',' ')}, /* Wagdi */ - {"wo", HB_TAG('W','L','F',' ')}, /* Wolof */ - {"xal", HB_TAG('K','L','M',' ')}, /* Kalmyk */ - {"xh", HB_TAG('X','H','S',' ')}, /* Xhosa */ - {"xom", HB_TAG('K','M','O',' ')}, /* Komo (Sudan) */ - {"xsl", HB_TAG('S','S','L',' ')}, /* South Slavey */ - {"yi", HB_TAG('J','I','I',' ')}, /* Yiddish */ - {"yo", HB_TAG('Y','B','A',' ')}, /* Yoruba */ - {"yso", HB_TAG('N','I','S',' ')}, /* Nisi (China) */ - {"zne", HB_TAG('Z','N','D',' ')}, /* Zande */ - {"zu", HB_TAG('Z','U','L',' ')} /* Zulu */ - - /* The corresponding languages IDs for the following IDs are unclear, - * overlap, or are architecturally weird. Needs more research. */ - -/*{"ahg/awn/xan?", HB_TAG('A','G','W',' ')},*/ /* Agaw */ -/*{"gsw?/gsw-FR?", HB_TAG('A','L','S',' ')},*/ /* Alsatian */ -/*{"krc", HB_TAG('B','A','L',' ')},*/ /* Balkar */ -/*{"??", HB_TAG('B','C','R',' ')},*/ /* Bible Cree */ -/*{"sgw?", HB_TAG('C','H','G',' ')},*/ /* Chaha Gurage */ -/*{"acf/gcf?", HB_TAG('F','A','N',' ')},*/ /* French Antillean */ -/*{"vls/nl-be", HB_TAG('F','L','E',' ')},*/ /* Flemish */ -/*{"enf?/yrk?", HB_TAG('F','N','E',' ')},*/ /* Forest Nenets */ -/*{"fuf?", HB_TAG('F','T','A',' ')},*/ /* Futa */ -/*{"ar-Syrc?", HB_TAG('G','A','R',' ')},*/ /* Garshuni */ -/*{"cfm/rnl?", HB_TAG('H','A','L',' ')},*/ /* Halam */ -/*{"ga-Latg?/Latg?", HB_TAG('I','R','T',' ')},*/ /* Irish Traditional */ -/*{"krc", HB_TAG('K','A','R',' ')},*/ /* Karachay */ -/*{"alw?/ktb?", HB_TAG('K','E','B',' ')},*/ /* Kebena */ -/*{"Geok", HB_TAG('K','G','E',' ')},*/ /* Khutsuri Georgian */ -/*{"kca", HB_TAG('K','H','K',' ')},*/ /* Khanty-Kazim */ -/*{"kca", HB_TAG('K','H','S',' ')},*/ /* Khanty-Shurishkar */ -/*{"kca", HB_TAG('K','H','V',' ')},*/ /* Khanty-Vakhi */ -/*{"guz?/kqs?/kss?", HB_TAG('K','I','S',' ')},*/ /* Kisii */ -/*{"kfa/kfi?/kpb?/xua?/xuj?", HB_TAG('K','O','D',' ')},*/ /* Kodagu */ -/*{"okm?/oko?", HB_TAG('K','O','H',' ')},*/ /* Korean Old Hangul */ -/*{"kon?/ktu?/...", HB_TAG('K','O','N',' ')},*/ /* Kikongo */ -/*{"kfx?", HB_TAG('K','U','L',' ')},*/ /* Kulvi */ -/*{"??", HB_TAG('L','A','H',' ')},*/ /* Lahuli */ -/*{"??", HB_TAG('L','C','R',' ')},*/ /* L-Cree */ -/*{"??", HB_TAG('M','A','L',' ')},*/ /* Malayalam Traditional */ -/*{"mnk?/mlq?/...", HB_TAG('M','L','N',' ')},*/ /* Malinke */ -/*{"man?/myq?/mku?/msc?/...", HB_TAG('M','N','K',' ')},*/ /* Maninka */ -/*{"??", HB_TAG('M','O','R',' ')},*/ /* Moroccan */ -/*{"??", HB_TAG('N','C','R',' ')},*/ /* N-Cree */ -/*{"??", HB_TAG('N','H','C',' ')},*/ /* Norway House Cree */ -/*{"jpa?/sam?", HB_TAG('P','A','A',' ')},*/ /* Palestinian Aramaic */ -/*{"polyton", HB_TAG('P','G','R',' ')},*/ /* Polytonic Greek */ -/*{"??", HB_TAG('Q','I','N',' ')},*/ /* Asho Chin */ -/*{"??", HB_TAG('R','C','R',' ')},*/ /* R-Cree */ -/*{"chp?", HB_TAG('S','A','Y',' ')},*/ /* Sayisi */ -/*{"xan?", HB_TAG('S','E','K',' ')},*/ /* Sekota */ -/*{"stv/wle?/xst?", HB_TAG('S','I','G',' ')},*/ /* Silte Gurage */ -/*{"ngo?", HB_TAG('S','X','T',' ')},*/ /* Sutu */ -/*{"??", HB_TAG('T','C','R',' ')},*/ /* TH-Cree */ -/*{"tnz?/tog?/toi?", HB_TAG('T','N','G',' ')},*/ /* Tonga */ -/*{"enh?/yrk?", HB_TAG('T','N','E',' ')},*/ /* Tundra Nenets */ -/*{"??", HB_TAG('T','O','D',' ')},*/ /* Todo */ -/*{"??", HB_TAG('W','C','R',' ')},*/ /* West-Cree */ -/*{"??", HB_TAG('Y','C','R',' ')},*/ /* Y-Cree */ -/*{"??", HB_TAG('Y','I','C',' ')},*/ /* Yi Classic */ -/*{"ii?/Yiii?", HB_TAG('Y','I','M',' ')},*/ /* Yi Modern */ -/*{"??", HB_TAG('Z','H','P',' ')},*/ /* Chinese Phonetic */ -}; - -static const LangTag ot_languages_zh[] = { - {"zh-cn", HB_TAG('Z','H','S',' ')}, /* Chinese (China) */ - {"zh-hk", HB_TAG('Z','H','H',' ')}, /* Chinese (Hong Kong) */ - {"zh-mo", HB_TAG('Z','H','T',' ')}, /* Chinese (Macao) */ - {"zh-sg", HB_TAG('Z','H','S',' ')}, /* Chinese (Singapore) */ - {"zh-tw", HB_TAG('Z','H','T',' ')} /* Chinese (Taiwan) */ -}; - -static int -lang_compare_first_component (const char *a, - const char *b) -{ - unsigned int da, db; - const char *p; - - p = strchr (a, '-'); - da = p ? (unsigned int) (p - a) : strlen (a); - - p = strchr (b, '-'); - db = p ? (unsigned int) (p - b) : strlen (b); - - return strncmp (a, b, MAX (da, db)); -} - -static hb_bool_t -lang_matches (const char *lang_str, const char *spec) -{ - unsigned int len = strlen (spec); - - return strncmp (lang_str, spec, len) == 0 && - (lang_str[len] == '\0' || lang_str[len] == '-'); -} - -hb_tag_t -hb_ot_tag_from_language (hb_language_t language) -{ - const char *lang_str, *s; - const LangTag *lang_tag; - - if (language == HB_LANGUAGE_INVALID) - return HB_OT_TAG_DEFAULT_LANGUAGE; - - lang_str = hb_language_to_string (language); - - s = strstr (lang_str, "x-hbot"); - if (s) { - char tag[4]; - int i; - s += 6; - for (i = 0; i < 4 && ISALPHA (s[i]); i++) - tag[i] = TOUPPER (s[i]); - if (i) { - for (; i < 4; i++) - tag[i] = ' '; - return HB_TAG_CHAR4 (tag); - } - } - - /* Find a language matching in the first component */ - lang_tag = (LangTag *) bsearch (lang_str, ot_languages, - ARRAY_LENGTH (ot_languages), sizeof (LangTag), - (hb_compare_func_t) lang_compare_first_component); - if (lang_tag) - return lang_tag->tag; - - /* Otherwise, check the Chinese ones */ - if (0 == lang_compare_first_component (lang_str, "zh")) - { - unsigned int i; - - for (i = 0; i < ARRAY_LENGTH (ot_languages_zh); i++) - { - lang_tag = &ot_languages_zh[i]; - if (lang_matches (lang_tag->language, lang_str)) - return lang_tag->tag; - } - - /* Otherwise just return 'ZHS ' */ - return HB_TAG('Z','H','S',' '); - } - - s = strchr (lang_str, '-'); - if (!s) - s = lang_str + strlen (lang_str); - if (s - lang_str == 3) { - /* Assume it's ISO-639-3 and upper-case and use it. */ - return hb_tag_from_string (lang_str, s - lang_str) & ~0x20202000; - } - - return HB_OT_TAG_DEFAULT_LANGUAGE; -} - -hb_language_t -hb_ot_tag_to_language (hb_tag_t tag) -{ - unsigned int i; - - if (tag == HB_OT_TAG_DEFAULT_LANGUAGE) - return NULL; - - for (i = 0; i < ARRAY_LENGTH (ot_languages); i++) - if (ot_languages[i].tag == tag) - return hb_language_from_string (ot_languages[i].language, -1); - - /* If tag starts with ZH, it's Chinese */ - if ((tag & 0xFFFF0000) == 0x5A480000) { - switch (tag) { - case HB_TAG('Z','H','H',' '): return hb_language_from_string ("zh-hk", -1); /* Hong Kong */ - default: { - /* Encode the tag... */ - unsigned char buf[14] = "zh-x-hbot"; - buf[9] = tag >> 24; - buf[10] = (tag >> 16) & 0xFF; - buf[11] = (tag >> 8) & 0xFF; - buf[12] = tag & 0xFF; - if (buf[12] == 0x20) - buf[12] = '\0'; - buf[13] = '\0'; - return hb_language_from_string ((char *) buf, -1); - } - } - } - - /* Else return a custom language in the form of "x-hbotABCD" */ - { - unsigned char buf[11] = "x-hbot"; - buf[6] = tag >> 24; - buf[7] = (tag >> 16) & 0xFF; - buf[8] = (tag >> 8) & 0xFF; - buf[9] = tag & 0xFF; - if (buf[9] == 0x20) - buf[9] = '\0'; - buf[10] = '\0'; - return hb_language_from_string ((char *) buf, -1); - } -} - - diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-tag.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-tag.h deleted file mode 100644 index 1bf12ab3c09..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot-tag.h +++ /dev/null @@ -1,59 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_H_IN -#error "Include <hb-ot.h> instead." -#endif - -#ifndef HB_OT_TAG_H -#define HB_OT_TAG_H - -#include "hb.h" - -HB_BEGIN_DECLS - - -#define HB_OT_TAG_DEFAULT_SCRIPT HB_TAG ('D', 'F', 'L', 'T') -#define HB_OT_TAG_DEFAULT_LANGUAGE HB_TAG ('d', 'f', 'l', 't') - -void -hb_ot_tags_from_script (hb_script_t script, - hb_tag_t *script_tag_1, - hb_tag_t *script_tag_2); - -hb_script_t -hb_ot_tag_to_script (hb_tag_t tag); - -hb_tag_t -hb_ot_tag_from_language (hb_language_t language); - -hb_language_t -hb_ot_tag_to_language (hb_tag_t tag); - - -HB_END_DECLS - -#endif /* HB_OT_TAG_H */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot.h deleted file mode 100644 index 80739063991..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ot.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - */ - -#ifndef HB_OT_H -#define HB_OT_H -#define HB_OT_H_IN - -#include "hb.h" - -#include "hb-ot-layout.h" -#include "hb-ot-tag.h" - -HB_BEGIN_DECLS - -/* TODO remove */ -void -hb_ot_shape_glyphs_closure (hb_font_t *font, - hb_buffer_t *buffer, - const hb_feature_t *features, - unsigned int num_features, - hb_set_t *glyphs); - -HB_END_DECLS - -#undef HB_OT_H_IN -#endif /* HB_OT_H */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-private.hh deleted file mode 100644 index ff1e85d8d0f..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-private.hh +++ /dev/null @@ -1,901 +0,0 @@ -/* - * Copyright © 2007,2008,2009 Red Hat, Inc. - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_PRIVATE_HH -#define HB_PRIVATE_HH - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "hb.h" -#define HB_H_IN -#ifdef HAVE_OT -#include "hb-ot.h" -#define HB_OT_H_IN -#endif - -#include <stdlib.h> -#include <stddef.h> -#include <string.h> -#include <assert.h> - -/* We only use these two for debug output. However, the debug code is - * always seen by the compiler (and optimized out in non-debug builds. - * If including these becomes a problem, we can start thinking about - * someway around that. */ -#include <stdio.h> -#include <errno.h> -#include <stdarg.h> - - - -/* Essentials */ - -#ifndef NULL -# define NULL ((void *) 0) -#endif - - -/* Void! */ -struct _hb_void_t {}; -typedef const _hb_void_t &hb_void_t; -#define HB_VOID (* (const _hb_void_t *) NULL) - - -/* Basics */ - - -#undef MIN -template <typename Type> -static inline Type MIN (const Type &a, const Type &b) { return a < b ? a : b; } - -#undef MAX -template <typename Type> -static inline Type MAX (const Type &a, const Type &b) { return a > b ? a : b; } - - -#undef ARRAY_LENGTH -template <typename Type, unsigned int n> -static inline unsigned int ARRAY_LENGTH (const Type (&)[n]) { return n; } -/* A const version, but does not detect erratically being called on pointers. */ -#define ARRAY_LENGTH_CONST(__array) ((signed int) (sizeof (__array) / sizeof (__array[0]))) - -#define HB_STMT_START do -#define HB_STMT_END while (0) - -#define _ASSERT_STATIC1(_line, _cond) typedef int _static_assert_on_line_##_line##_failed[(_cond)?1:-1] -#define _ASSERT_STATIC0(_line, _cond) _ASSERT_STATIC1 (_line, (_cond)) -#define ASSERT_STATIC(_cond) _ASSERT_STATIC0 (__LINE__, (_cond)) - -#define ASSERT_STATIC_EXPR(_cond)((void) sizeof (char[(_cond) ? 1 : -1])) -#define ASSERT_STATIC_EXPR_ZERO(_cond) (0 * sizeof (char[(_cond) ? 1 : -1])) - -#define _PASTE1(a,b) a##b -#define PASTE(a,b) _PASTE1(a,b) - -/* Lets assert int types. Saves trouble down the road. */ - -ASSERT_STATIC (sizeof (int8_t) == 1); -ASSERT_STATIC (sizeof (uint8_t) == 1); -ASSERT_STATIC (sizeof (int16_t) == 2); -ASSERT_STATIC (sizeof (uint16_t) == 2); -ASSERT_STATIC (sizeof (int32_t) == 4); -ASSERT_STATIC (sizeof (uint32_t) == 4); -ASSERT_STATIC (sizeof (int64_t) == 8); -ASSERT_STATIC (sizeof (uint64_t) == 8); - -ASSERT_STATIC (sizeof (hb_codepoint_t) == 4); -ASSERT_STATIC (sizeof (hb_position_t) == 4); -ASSERT_STATIC (sizeof (hb_mask_t) == 4); -ASSERT_STATIC (sizeof (hb_var_int_t) == 4); - - -/* We like our types POD */ - -#define _ASSERT_TYPE_POD1(_line, _type) union _type_##_type##_on_line_##_line##_is_not_POD { _type instance; } -#define _ASSERT_TYPE_POD0(_line, _type) _ASSERT_TYPE_POD1 (_line, _type) -#define ASSERT_TYPE_POD(_type) _ASSERT_TYPE_POD0 (__LINE__, _type) - -#ifdef __GNUC__ -# define _ASSERT_INSTANCE_POD1(_line, _instance) \ - HB_STMT_START { \ - typedef __typeof__(_instance) _type_##_line; \ - _ASSERT_TYPE_POD1 (_line, _type_##_line); \ - } HB_STMT_END -#else -# define _ASSERT_INSTANCE_POD1(_line, _instance) typedef int _assertion_on_line_##_line##_not_tested -#endif -# define _ASSERT_INSTANCE_POD0(_line, _instance) _ASSERT_INSTANCE_POD1 (_line, _instance) -# define ASSERT_INSTANCE_POD(_instance) _ASSERT_INSTANCE_POD0 (__LINE__, _instance) - -/* Check _assertion in a method environment */ -#define _ASSERT_POD1(_line) \ - inline void _static_assertion_on_line_##_line (void) const \ - { _ASSERT_INSTANCE_POD1 (_line, *this); /* Make sure it's POD. */ } -# define _ASSERT_POD0(_line) _ASSERT_POD1 (_line) -# define ASSERT_POD() _ASSERT_POD0 (__LINE__) - - - -/* Misc */ - - -#if defined(__GNUC__) && (__GNUC__ > 2) && defined(__OPTIMIZE__) -#define _HB_BOOLEAN_EXPR(expr) ((expr) ? 1 : 0) -#define likely(expr) (__builtin_expect (_HB_BOOLEAN_EXPR(expr), 1)) -#define unlikely(expr) (__builtin_expect (_HB_BOOLEAN_EXPR(expr), 0)) -#else -#define likely(expr) (expr) -#define unlikely(expr) (expr) -#endif - -#ifndef __GNUC__ -#undef __attribute__ -#define __attribute__(x) -#endif - -#if __GNUC__ >= 3 -#define HB_PURE_FUNC __attribute__((pure)) -#define HB_CONST_FUNC __attribute__((const)) -#define HB_PRINTF_FUNC(format_idx, arg_idx) __attribute__((__format__ (__printf__, format_idx, arg_idx))) -#else -#define HB_PURE_FUNC -#define HB_CONST_FUNC -#define HB_PRINTF_FUNC(format_idx, arg_idx) -#endif -#if __GNUC__ >= 4 -#define HB_UNUSED __attribute__((unused)) -#else -#define HB_UNUSED -#endif - -#ifndef HB_INTERNAL -# ifndef __MINGW32__ -# define HB_INTERNAL __attribute__((__visibility__("hidden"))) -# else -# define HB_INTERNAL -# endif -#endif - - -#if (defined(__WIN32__) && !defined(__WINE__)) || defined(_MSC_VER) -#define snprintf _snprintf -#endif - -#ifdef _MSC_VER -#undef inline -#define inline __inline -#endif - -#ifdef __STRICT_ANSI__ -#undef inline -#define inline __inline__ -#endif - - -#if __GNUC__ >= 3 -#define HB_FUNC __PRETTY_FUNCTION__ -#elif defined(_MSC_VER) -#define HB_FUNC __FUNCSIG__ -#else -#define HB_FUNC __func__ -#endif - - -/* Return the number of 1 bits in mask. */ -static inline HB_CONST_FUNC unsigned int -_hb_popcount32 (uint32_t mask) -{ -#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4) - return __builtin_popcount (mask); -#else - /* "HACKMEM 169" */ - register uint32_t y; - y = (mask >> 1) &033333333333; - y = mask - y - ((y >>1) & 033333333333); - return (((y + (y >> 3)) & 030707070707) % 077); -#endif -} - -/* Returns the number of bits needed to store number */ -static inline HB_CONST_FUNC unsigned int -_hb_bit_storage (unsigned int number) -{ -#if defined(__GNUC__) && (__GNUC__ >= 4) && defined(__OPTIMIZE__) - return likely (number) ? (sizeof (unsigned int) * 8 - __builtin_clz (number)) : 0; -#else - register unsigned int n_bits = 0; - while (number) { - n_bits++; - number >>= 1; - } - return n_bits; -#endif -} - -/* Returns the number of zero bits in the least significant side of number */ -static inline HB_CONST_FUNC unsigned int -_hb_ctz (unsigned int number) -{ -#if defined(__GNUC__) && (__GNUC__ >= 4) && defined(__OPTIMIZE__) - return likely (number) ? __builtin_ctz (number) : 0; -#else - register unsigned int n_bits = 0; - if (unlikely (!number)) return 0; - while (!(number & 1)) { - n_bits++; - number >>= 1; - } - return n_bits; -#endif -} - -static inline bool -_hb_unsigned_int_mul_overflows (unsigned int count, unsigned int size) -{ - return (size > 0) && (count >= ((unsigned int) -1) / size); -} - - -/* Type of bsearch() / qsort() compare function */ -typedef int (*hb_compare_func_t) (const void *, const void *); - - - - -/* arrays and maps */ - - -#define HB_PREALLOCED_ARRAY_INIT {0} -template <typename Type, unsigned int StaticSize> -struct hb_prealloced_array_t -{ - unsigned int len; - unsigned int allocated; - Type *array; - Type static_array[StaticSize]; - - void init (void) { memset (this, 0, sizeof (*this)); } - - inline Type& operator [] (unsigned int i) { return array[i]; } - inline const Type& operator [] (unsigned int i) const { return array[i]; } - - inline Type *push (void) - { - if (!array) { - array = static_array; - allocated = ARRAY_LENGTH (static_array); - } - if (likely (len < allocated)) - return &array[len++]; - - /* Need to reallocate */ - unsigned int new_allocated = allocated + (allocated >> 1) + 8; - Type *new_array = NULL; - - if (array == static_array) { - new_array = (Type *) calloc (new_allocated, sizeof (Type)); - if (new_array) - memcpy (new_array, array, len * sizeof (Type)); - } else { - bool overflows = (new_allocated < allocated) || _hb_unsigned_int_mul_overflows (new_allocated, sizeof (Type)); - if (likely (!overflows)) { - new_array = (Type *) realloc (array, new_allocated * sizeof (Type)); - } - } - - if (unlikely (!new_array)) - return NULL; - - array = new_array; - allocated = new_allocated; - return &array[len++]; - } - - inline void pop (void) - { - len--; - /* TODO: shrink array if needed */ - } - - inline void shrink (unsigned int l) - { - if (l < len) - len = l; - /* TODO: shrink array if needed */ - } - - template <typename T> - inline Type *find (T v) { - for (unsigned int i = 0; i < len; i++) - if (array[i] == v) - return &array[i]; - return NULL; - } - template <typename T> - inline const Type *find (T v) const { - for (unsigned int i = 0; i < len; i++) - if (array[i] == v) - return &array[i]; - return NULL; - } - - inline void sort (void) - { - qsort (array, len, sizeof (Type), (hb_compare_func_t) Type::cmp); - } - - inline void sort (unsigned int start, unsigned int end) - { - qsort (array + start, end - start, sizeof (Type), (hb_compare_func_t) Type::cmp); - } - - template <typename T> - inline Type *bsearch (T *key) - { - return (Type *) ::bsearch (key, array, len, sizeof (Type), (hb_compare_func_t) Type::cmp); - } - template <typename T> - inline const Type *bsearch (T *key) const - { - return (const Type *) ::bsearch (key, array, len, sizeof (Type), (hb_compare_func_t) Type::cmp); - } - - inline void finish (void) - { - if (array != static_array) - free (array); - array = NULL; - allocated = len = 0; - } -}; - -#define HB_AUTO_ARRAY_PREALLOCED 64 -template <typename Type> -struct hb_auto_array_t : hb_prealloced_array_t <Type, HB_AUTO_ARRAY_PREALLOCED> -{ - hb_auto_array_t (void) { hb_prealloced_array_t<Type, HB_AUTO_ARRAY_PREALLOCED>::init (); } - ~hb_auto_array_t (void) { hb_prealloced_array_t<Type, HB_AUTO_ARRAY_PREALLOCED>::finish (); } -}; - - -#define HB_LOCKABLE_SET_INIT {HB_PREALLOCED_ARRAY_INIT} -template <typename item_t, typename lock_t> -struct hb_lockable_set_t -{ - hb_prealloced_array_t <item_t, 2> items; - - inline void init (void) { items.init (); } - - template <typename T> - inline item_t *replace_or_insert (T v, lock_t &l, bool replace) - { - l.lock (); - item_t *item = items.find (v); - if (item) { - if (replace) { - item_t old = *item; - *item = v; - l.unlock (); - old.finish (); - } - else { - item = NULL; - l.unlock (); - } - } else { - item = items.push (); - if (likely (item)) - *item = v; - l.unlock (); - } - return item; - } - - template <typename T> - inline void remove (T v, lock_t &l) - { - l.lock (); - item_t *item = items.find (v); - if (item) { - item_t old = *item; - *item = items[items.len - 1]; - items.pop (); - l.unlock (); - old.finish (); - } else { - l.unlock (); - } - } - - template <typename T> - inline bool find (T v, item_t *i, lock_t &l) - { - l.lock (); - item_t *item = items.find (v); - if (item) - *i = *item; - l.unlock (); - return !!item; - } - - template <typename T> - inline item_t *find_or_insert (T v, lock_t &l) - { - l.lock (); - item_t *item = items.find (v); - if (!item) { - item = items.push (); - if (likely (item)) - *item = v; - } - l.unlock (); - return item; - } - - inline void finish (lock_t &l) - { - if (!items.len) { - /* No need for locking. */ - items.finish (); - return; - } - l.lock (); - while (items.len) { - item_t old = items[items.len - 1]; - items.pop (); - l.unlock (); - old.finish (); - l.lock (); - } - items.finish (); - l.unlock (); - } - -}; - - - - -/* Big-endian handling */ - -static inline uint16_t hb_be_uint16 (const uint16_t v) -{ - const uint8_t *V = (const uint8_t *) &v; - return (V[0] << 8) | V[1]; -} - -static inline uint16_t hb_uint16_swap (const uint16_t v) -{ - return (v >> 8) | (v << 8); -} - -static inline uint32_t hb_uint32_swap (const uint32_t v) -{ - return (hb_uint16_swap (v) << 16) | hb_uint16_swap (v >> 16); -} - -/* Note, of the following macros, uint16_get is the one called many many times. - * If there is any optimizations to be done, it's in that macro. However, I - * already confirmed that on my T400 ThinkPad at least, using bswap_16(), which - * results in a single ror instruction, does NOT speed this up. In fact, it - * resulted in a minor slowdown. At any rate, note that v may not be correctly - * aligned, so I think the current implementation is optimal. - */ - -#define hb_be_uint16_put(v,V) HB_STMT_START { v[0] = (V>>8); v[1] = (V); } HB_STMT_END -#define hb_be_uint16_get(v) (uint16_t) ((v[0] << 8) + v[1]) -#define hb_be_uint16_eq(a,b) (a[0] == b[0] && a[1] == b[1]) - -#define hb_be_uint32_put(v,V) HB_STMT_START { v[0] = (V>>24); v[1] = (V>>16); v[2] = (V>>8); v[3] = (V); } HB_STMT_END -#define hb_be_uint32_get(v) (uint32_t) ((v[0] << 24) + (v[1] << 16) + (v[2] << 8) + v[3]) -#define hb_be_uint32_eq(a,b) (a[0] == b[0] && a[1] == b[1] && a[2] == b[2] && a[3] == b[3]) - -#define hb_be_uint24_put(v,V) HB_STMT_START { v[0] = (V>>16); v[1] = (V>>8); v[2] (V); } HB_STMT_END -#define hb_be_uint24_get(v) (uint32_t) ((v[0] << 16) + (v[1] << 8) + v[2]) -#define hb_be_uint24_eq(a,b) (a[0] == b[0] && a[1] == b[1] && a[2] == b[2]) - - -/* ASCII tag/character handling */ - -static inline bool ISALPHA (unsigned char c) -{ return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'); } -static inline bool ISALNUM (unsigned char c) -{ return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') || (c >= '0' && c <= '9'); } -static inline bool ISSPACE (unsigned char c) -{ return c == ' ' || c =='\f'|| c =='\n'|| c =='\r'|| c =='\t'|| c =='\v'; } -static inline unsigned char TOUPPER (unsigned char c) -{ return (c >= 'a' && c <= 'z') ? c - 'a' + 'A' : c; } -static inline unsigned char TOLOWER (unsigned char c) -{ return (c >= 'A' && c <= 'Z') ? c - 'A' + 'a' : c; } - -#define HB_TAG_CHAR4(s) (HB_TAG(((const char *) s)[0], \ - ((const char *) s)[1], \ - ((const char *) s)[2], \ - ((const char *) s)[3])) - - -/* C++ helpers */ - -/* Makes class uncopyable. Use in private: section. */ -#define NO_COPY(T) \ - T (const T &o); \ - T &operator = (const T &o) - - -/* Debug */ - - -#ifndef HB_DEBUG -#define HB_DEBUG 0 -#endif - -static inline bool -_hb_debug (unsigned int level, - unsigned int max_level) -{ - return level < max_level; -} - -#define DEBUG_LEVEL(WHAT, LEVEL) (_hb_debug ((LEVEL), HB_DEBUG_##WHAT)) -#define DEBUG(WHAT) (DEBUG_LEVEL (WHAT, 0)) - -template <int max_level> static inline void -_hb_debug_msg_va (const char *what, - const void *obj, - const char *func, - bool indented, - unsigned int level, - int level_dir, - const char *message, - va_list ap) -{ - if (!_hb_debug (level, max_level)) - return; - - fprintf (stderr, "%-10s", what ? what : ""); - - if (obj) - fprintf (stderr, "(%0*lx) ", (unsigned int) (2 * sizeof (void *)), (unsigned long) obj); - else - fprintf (stderr, " %*s ", (unsigned int) (2 * sizeof (void *)), ""); - - if (indented) { -/* One may want to add ASCII version of these. See: - * https://bugs.freedesktop.org/show_bug.cgi?id=50970 */ -#define VBAR "\342\224\202" /* U+2502 BOX DRAWINGS LIGHT VERTICAL */ -#define VRBAR "\342\224\234" /* U+251C BOX DRAWINGS LIGHT VERTICAL AND RIGHT */ -#define DLBAR "\342\225\256" /* U+256E BOX DRAWINGS LIGHT ARC DOWN AND LEFT */ -#define ULBAR "\342\225\257" /* U+256F BOX DRAWINGS LIGHT ARC UP AND LEFT */ -#define LBAR "\342\225\264" /* U+2574 BOX DRAWINGS LIGHT LEFT */ - static const char bars[] = VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR VBAR; - fprintf (stderr, "%2d %s" VRBAR "%s", - level, - bars + sizeof (bars) - 1 - MIN ((unsigned int) sizeof (bars), (unsigned int) (sizeof (VBAR) - 1) * level), - level_dir ? (level_dir > 0 ? DLBAR : ULBAR) : LBAR); - } else - fprintf (stderr, " " VRBAR LBAR); - - if (func) - { - unsigned int func_len = strlen (func); -#ifndef HB_DEBUG_VERBOSE - /* Skip "typename" */ - if (0 == strncmp (func, "typename ", 9)) - func += 9; - /* Skip return type */ - const char *space = strchr (func, ' '); - if (space) - func = space + 1; - /* Skip parameter list */ - const char *paren = strchr (func, '('); - if (paren) - func_len = paren - func; -#endif - fprintf (stderr, "%.*s: ", func_len, func); - } - - if (message) - vfprintf (stderr, message, ap); - - fprintf (stderr, "\n"); -} -template <> inline void -_hb_debug_msg_va<0> (const char *what HB_UNUSED, - const void *obj HB_UNUSED, - const char *func HB_UNUSED, - bool indented HB_UNUSED, - unsigned int level HB_UNUSED, - int level_dir HB_UNUSED, - const char *message HB_UNUSED, - va_list ap HB_UNUSED) {} - -template <int max_level> static inline void -_hb_debug_msg (const char *what, - const void *obj, - const char *func, - bool indented, - unsigned int level, - int level_dir, - const char *message, - ...) HB_PRINTF_FUNC(7, 8); -template <int max_level> static inline void -_hb_debug_msg (const char *what, - const void *obj, - const char *func, - bool indented, - unsigned int level, - int level_dir, - const char *message, - ...) -{ - va_list ap; - va_start (ap, message); - _hb_debug_msg_va<max_level> (what, obj, func, indented, level, level_dir, message, ap); - va_end (ap); -} -template <> inline void -_hb_debug_msg<0> (const char *what HB_UNUSED, - const void *obj HB_UNUSED, - const char *func HB_UNUSED, - bool indented HB_UNUSED, - unsigned int level HB_UNUSED, - int level_dir HB_UNUSED, - const char *message HB_UNUSED, - ...) HB_PRINTF_FUNC(7, 8); -template <> inline void -_hb_debug_msg<0> (const char *what HB_UNUSED, - const void *obj HB_UNUSED, - const char *func HB_UNUSED, - bool indented HB_UNUSED, - unsigned int level HB_UNUSED, - int level_dir HB_UNUSED, - const char *message HB_UNUSED, - ...) {} - -#define DEBUG_MSG_LEVEL(WHAT, OBJ, LEVEL, LEVEL_DIR, ...) _hb_debug_msg<HB_DEBUG_##WHAT> (#WHAT, (OBJ), NULL, true, (LEVEL), (LEVEL_DIR), __VA_ARGS__) -#define DEBUG_MSG(WHAT, OBJ, ...) _hb_debug_msg<HB_DEBUG_##WHAT> (#WHAT, (OBJ), NULL, false, 0, 0, __VA_ARGS__) -#define DEBUG_MSG_FUNC(WHAT, OBJ, ...) _hb_debug_msg<HB_DEBUG_##WHAT> (#WHAT, (OBJ), HB_FUNC, false, 0, 0, __VA_ARGS__) - - -/* - * Printer - */ - -template <typename T> -struct hb_printer_t {}; - -template <> -struct hb_printer_t<bool> { - const char *print (bool v) { return v ? "true" : "false"; } -}; - -template <> -struct hb_printer_t<hb_void_t> { - const char *print (hb_void_t) { return ""; } -}; - - -/* - * Trace - */ - -template <typename T> -static inline void _hb_warn_no_return (bool returned) -{ - if (unlikely (!returned)) { - fprintf (stderr, "OUCH, returned with no call to TRACE_RETURN. This is a bug, please report.\n"); - } -} -template <> -inline void _hb_warn_no_return<hb_void_t> (bool returned HB_UNUSED) -{} - -template <int max_level, typename ret_t> -struct hb_auto_trace_t { - explicit inline hb_auto_trace_t (unsigned int *plevel_, - const char *what_, - const void *obj_, - const char *func, - const char *message, - ...) : plevel (plevel_), what (what_), obj (obj_), returned (false) - { - if (plevel) ++*plevel; - - va_list ap; - va_start (ap, message); - _hb_debug_msg_va<max_level> (what, obj, func, true, plevel ? *plevel : 0, +1, message, ap); - va_end (ap); - } - inline ~hb_auto_trace_t (void) - { - _hb_warn_no_return<ret_t> (returned); - if (!returned) { - _hb_debug_msg<max_level> (what, obj, NULL, true, plevel ? *plevel : 1, -1, " "); - } - if (plevel) --*plevel; - } - - inline ret_t ret (ret_t v, unsigned int line = 0) - { - if (unlikely (returned)) { - fprintf (stderr, "OUCH, double calls to TRACE_RETURN. This is a bug, please report.\n"); - return v; - } - - _hb_debug_msg<max_level> (what, obj, NULL, true, plevel ? *plevel : 1, -1, - "return %s (line %d)", - hb_printer_t<ret_t>().print (v), line); - if (plevel) --*plevel; - plevel = NULL; - returned = true; - return v; - } - - private: - unsigned int *plevel; - const char *what; - const void *obj; - bool returned; -}; -template <typename ret_t> /* Optimize when tracing is disabled */ -struct hb_auto_trace_t<0, ret_t> { - explicit inline hb_auto_trace_t (unsigned int *plevel_ HB_UNUSED, - const char *what HB_UNUSED, - const void *obj HB_UNUSED, - const char *func HB_UNUSED, - const char *message HB_UNUSED, - ...) {} - - inline ret_t ret (ret_t v, unsigned int line HB_UNUSED = 0) { return v; } -}; - -#define TRACE_RETURN(RET) trace.ret (RET, __LINE__) - -/* Misc */ - - -/* Pre-mature optimization: - * Checks for lo <= u <= hi but with an optimization if lo and hi - * are only different in a contiguous set of lower-most bits. - */ -template <typename T> static inline bool -hb_in_range (T u, T lo, T hi) -{ - if ( ((lo^hi) & lo) == 0 && - ((lo^hi) & hi) == (lo^hi) && - ((lo^hi) & ((lo^hi) + 1)) == 0 ) - return (u & ~(lo^hi)) == lo; - else - return lo <= u && u <= hi; -} - -template <typename T> static inline bool -hb_in_ranges (T u, T lo1, T hi1, T lo2, T hi2, T lo3, T hi3) -{ - return hb_in_range (u, lo1, hi1) || hb_in_range (u, lo2, hi2) || hb_in_range (u, lo3, hi3); -} - - -/* Useful for set-operations on small enums. - * For example, for testing "x ∈ {x1, x2, x3}" use: - * (FLAG(x) & (FLAG(x1) | FLAG(x2) | FLAG(x3))) - */ -#define FLAG(x) (1<<(x)) -#define FLAG_RANGE(x,y) (ASSERT_STATIC_EXPR_ZERO ((x) < (y)) + FLAG(y+1) - FLAG(x)) - - -template <typename T, typename T2> inline void -hb_bubble_sort (T *array, unsigned int len, int(*compar)(const T *, const T *), T2 *array2) -{ - if (unlikely (!len)) - return; - - unsigned int k = len - 1; - do { - unsigned int new_k = 0; - - for (unsigned int j = 0; j < k; j++) - if (compar (&array[j], &array[j+1]) > 0) - { - { - T t; - t = array[j]; - array[j] = array[j + 1]; - array[j + 1] = t; - } - if (array2) - { - T2 t; - t = array2[j]; - array2[j] = array2[j + 1]; - array2[j + 1] = t; - } - - new_k = j; - } - k = new_k; - } while (k); -} - -template <typename T> inline void -hb_bubble_sort (T *array, unsigned int len, int(*compar)(const T *, const T *)) -{ - hb_bubble_sort (array, len, compar, (int *) NULL); -} - -static inline hb_bool_t -hb_codepoint_parse (const char *s, unsigned int len, int base, hb_codepoint_t *out) -{ - /* Pain because we don't know whether s is nul-terminated. */ - char buf[64]; - len = MIN (ARRAY_LENGTH (buf) - 1, len); - strncpy (buf, s, len); - buf[len] = '\0'; - - char *end; - errno = 0; - unsigned long v = strtoul (buf, &end, base); - if (errno) return false; - if (*end) return false; - *out = v; - return true; -} - - -/* Global runtime options. */ - -struct hb_options_t -{ - int initialized : 1; - int uniscribe_bug_compatible : 1; -}; - -union hb_options_union_t { - int i; - hb_options_t opts; -}; -ASSERT_STATIC (sizeof (int) == sizeof (hb_options_union_t)); - -HB_INTERNAL void -_hb_options_init (void); - -extern HB_INTERNAL hb_options_union_t _hb_options; - -static inline hb_options_t -hb_options (void) -{ - if (unlikely (!_hb_options.i)) - _hb_options_init (); - - return _hb_options.opts; -} - - -#endif /* HB_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-set-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-set-private.hh deleted file mode 100644 index 5e30a7e3616..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-set-private.hh +++ /dev/null @@ -1,324 +0,0 @@ -/* - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_SET_PRIVATE_HH -#define HB_SET_PRIVATE_HH - -#include "hb-private.hh" -#include "hb-set.h" -#include "hb-object-private.hh" - - -struct hb_set_digest_common_bits_t -{ - ASSERT_POD (); - - typedef unsigned int mask_t; - - inline void init (void) { - mask = ~0; - value = (mask_t) -1; - } - - inline void add (hb_codepoint_t g) { - if (unlikely (value == (mask_t) -1)) { - value = g; - return; - } - - mask ^= (g & mask) ^ value; - value &= mask; - } - - inline void add_range (hb_codepoint_t a, hb_codepoint_t b) { - /* The negation here stands for ~(x-1). */ - mask &= -(1 << _hb_bit_storage (a ^ b)); - value &= mask; - } - - inline bool may_have (hb_codepoint_t g) const { - return (g & mask) == value; - } - - private: - mask_t mask; - mask_t value; -}; - -struct hb_set_digest_lowest_bits_t -{ - ASSERT_POD (); - - typedef unsigned long mask_t; - - inline void init (void) { - mask = 0; - } - - inline void add (hb_codepoint_t g) { - mask |= mask_for (g); - } - - inline void add_range (hb_codepoint_t a, hb_codepoint_t b) { - if (b - a >= sizeof (mask_t) * 8 - 1) - mask = (mask_t) -1; - else { - mask_t ma = mask_for (a); - mask_t mb = mask_for (b); - mask |= mb + (mb - ma) - (mb < ma); - } - } - - inline bool may_have (hb_codepoint_t g) const { - return !!(mask & mask_for (g)); - } - - private: - - static inline mask_t mask_for (hb_codepoint_t g) { return ((mask_t) 1) << (g & (sizeof (mask_t) * 8 - 1)); } - mask_t mask; -}; - -struct hb_set_digest_t -{ - ASSERT_POD (); - - inline void init (void) { - digest1.init (); - digest2.init (); - } - - inline void add (hb_codepoint_t g) { - digest1.add (g); - digest2.add (g); - } - - inline void add_range (hb_codepoint_t a, hb_codepoint_t b) { - digest1.add_range (a, b); - digest2.add_range (a, b); - } - - inline bool may_have (hb_codepoint_t g) const { - return digest1.may_have (g) && digest2.may_have (g); - } - - private: - hb_set_digest_common_bits_t digest1; - hb_set_digest_lowest_bits_t digest2; -}; - - -/* TODO Make this faster and memmory efficient. */ - -struct hb_set_t -{ - hb_object_header_t header; - ASSERT_POD (); - bool in_error; - - inline void init (void) { - header.init (); - clear (); - } - inline void fini (void) { - } - inline void clear (void) { - if (unlikely (hb_object_is_inert (this))) - return; - in_error = false; - memset (elts, 0, sizeof elts); - } - inline bool is_empty (void) const { - for (unsigned int i = 0; i < ARRAY_LENGTH (elts); i++) - if (elts[i]) - return false; - return true; - } - inline void add (hb_codepoint_t g) - { - if (unlikely (in_error)) return; - if (unlikely (g == SENTINEL)) return; - if (unlikely (g > MAX_G)) return; - elt (g) |= mask (g); - } - inline void add_range (hb_codepoint_t a, hb_codepoint_t b) - { - if (unlikely (in_error)) return; - /* TODO Speedup */ - for (unsigned int i = a; i < b + 1; i++) - add (i); - } - inline void del (hb_codepoint_t g) - { - if (unlikely (in_error)) return; - if (unlikely (g > MAX_G)) return; - elt (g) &= ~mask (g); - } - inline void del_range (hb_codepoint_t a, hb_codepoint_t b) - { - if (unlikely (in_error)) return; - /* TODO Speedup */ - for (unsigned int i = a; i < b + 1; i++) - del (i); - } - inline bool has (hb_codepoint_t g) const - { - if (unlikely (g > MAX_G)) return false; - return !!(elt (g) & mask (g)); - } - inline bool intersects (hb_codepoint_t first, - hb_codepoint_t last) const - { - if (unlikely (first > MAX_G)) return false; - if (unlikely (last > MAX_G)) last = MAX_G; - unsigned int end = last + 1; - for (hb_codepoint_t i = first; i < end; i++) - if (has (i)) - return true; - return false; - } - inline bool is_equal (const hb_set_t *other) const - { - for (unsigned int i = 0; i < ELTS; i++) - if (elts[i] != other->elts[i]) - return false; - return true; - } - inline void set (const hb_set_t *other) - { - if (unlikely (in_error)) return; - for (unsigned int i = 0; i < ELTS; i++) - elts[i] = other->elts[i]; - } - inline void union_ (const hb_set_t *other) - { - if (unlikely (in_error)) return; - for (unsigned int i = 0; i < ELTS; i++) - elts[i] |= other->elts[i]; - } - inline void intersect (const hb_set_t *other) - { - if (unlikely (in_error)) return; - for (unsigned int i = 0; i < ELTS; i++) - elts[i] &= other->elts[i]; - } - inline void subtract (const hb_set_t *other) - { - if (unlikely (in_error)) return; - for (unsigned int i = 0; i < ELTS; i++) - elts[i] &= ~other->elts[i]; - } - inline void symmetric_difference (const hb_set_t *other) - { - if (unlikely (in_error)) return; - for (unsigned int i = 0; i < ELTS; i++) - elts[i] ^= other->elts[i]; - } - inline void invert (void) - { - if (unlikely (in_error)) return; - for (unsigned int i = 0; i < ELTS; i++) - elts[i] = ~elts[i]; - } - inline bool next (hb_codepoint_t *codepoint) const - { - if (unlikely (*codepoint == SENTINEL)) { - hb_codepoint_t i = get_min (); - if (i != SENTINEL) { - *codepoint = i; - return true; - } else - return false; - } - for (hb_codepoint_t i = *codepoint + 1; i < MAX_G + 1; i++) - if (has (i)) { - *codepoint = i; - return true; - } - return false; - } - inline bool next_range (hb_codepoint_t *first, hb_codepoint_t *last) const - { - hb_codepoint_t i; - - i = *last; - if (!next (&i)) - return false; - - *last = *first = i; - while (next (&i) && i == *last + 1) - (*last)++; - - return true; - } - - inline unsigned int get_population (void) const - { - unsigned int count = 0; - for (unsigned int i = 0; i < ELTS; i++) - count += _hb_popcount32 (elts[i]); - return count; - } - inline hb_codepoint_t get_min (void) const - { - for (unsigned int i = 0; i < ELTS; i++) - if (elts[i]) - for (unsigned int j = 0; i < BITS; j++) - if (elts[i] & (1 << j)) - return i * BITS + j; - return SENTINEL; - } - inline hb_codepoint_t get_max (void) const - { - for (unsigned int i = ELTS; i; i--) - if (elts[i - 1]) - for (unsigned int j = BITS; j; j--) - if (elts[i - 1] & (1 << (j - 1))) - return (i - 1) * BITS + (j - 1); - return SENTINEL; - } - - typedef uint32_t elt_t; - static const unsigned int MAX_G = 65536 - 1; /* XXX Fix this... */ - static const unsigned int SHIFT = 5; - static const unsigned int BITS = (1 << SHIFT); - static const unsigned int MASK = BITS - 1; - static const unsigned int ELTS = (MAX_G + 1 + (BITS - 1)) / BITS; - static const hb_codepoint_t SENTINEL = (hb_codepoint_t) -1; - - elt_t &elt (hb_codepoint_t g) { return elts[g >> SHIFT]; } - elt_t elt (hb_codepoint_t g) const { return elts[g >> SHIFT]; } - elt_t mask (hb_codepoint_t g) const { return elt_t (1) << (g & MASK); } - - elt_t elts[ELTS]; /* XXX 8kb */ - - ASSERT_STATIC (sizeof (elt_t) * 8 == BITS); - ASSERT_STATIC (sizeof (elt_t) * 8 * ELTS > MAX_G); -}; - - - -#endif /* HB_SET_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-set.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-set.cc deleted file mode 100644 index 5f427a5d8e0..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-set.cc +++ /dev/null @@ -1,228 +0,0 @@ -/* - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-set-private.hh" - - - -/* Public API */ - - -hb_set_t * -hb_set_create (void) -{ - hb_set_t *set; - - if (!(set = hb_object_create<hb_set_t> ())) - return hb_set_get_empty (); - - set->clear (); - - return set; -} - -hb_set_t * -hb_set_get_empty (void) -{ - static const hb_set_t _hb_set_nil = { - HB_OBJECT_HEADER_STATIC, - true, /* in_error */ - - {0} /* elts */ - }; - - return const_cast<hb_set_t *> (&_hb_set_nil); -} - -hb_set_t * -hb_set_reference (hb_set_t *set) -{ - return hb_object_reference (set); -} - -void -hb_set_destroy (hb_set_t *set) -{ - if (!hb_object_destroy (set)) return; - - set->fini (); - - free (set); -} - -hb_bool_t -hb_set_set_user_data (hb_set_t *set, - hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy, - hb_bool_t replace) -{ - return hb_object_set_user_data (set, key, data, destroy, replace); -} - -void * -hb_set_get_user_data (hb_set_t *set, - hb_user_data_key_t *key) -{ - return hb_object_get_user_data (set, key); -} - - -hb_bool_t -hb_set_allocation_successful (const hb_set_t *set HB_UNUSED) -{ - return !set->in_error; -} - -void -hb_set_clear (hb_set_t *set) -{ - set->clear (); -} - -hb_bool_t -hb_set_is_empty (const hb_set_t *set) -{ - return set->is_empty (); -} - -hb_bool_t -hb_set_has (const hb_set_t *set, - hb_codepoint_t codepoint) -{ - return set->has (codepoint); -} - -void -hb_set_add (hb_set_t *set, - hb_codepoint_t codepoint) -{ - set->add (codepoint); -} - -void -hb_set_add_range (hb_set_t *set, - hb_codepoint_t first, - hb_codepoint_t last) -{ - set->add_range (first, last); -} - -void -hb_set_del (hb_set_t *set, - hb_codepoint_t codepoint) -{ - set->del (codepoint); -} - -void -hb_set_del_range (hb_set_t *set, - hb_codepoint_t first, - hb_codepoint_t last) -{ - set->del_range (first, last); -} - -hb_bool_t -hb_set_is_equal (const hb_set_t *set, - const hb_set_t *other) -{ - return set->is_equal (other); -} - -void -hb_set_set (hb_set_t *set, - const hb_set_t *other) -{ - set->set (other); -} - -void -hb_set_union (hb_set_t *set, - const hb_set_t *other) -{ - set->union_ (other); -} - -void -hb_set_intersect (hb_set_t *set, - const hb_set_t *other) -{ - set->intersect (other); -} - -void -hb_set_subtract (hb_set_t *set, - const hb_set_t *other) -{ - set->subtract (other); -} - -void -hb_set_symmetric_difference (hb_set_t *set, - const hb_set_t *other) -{ - set->symmetric_difference (other); -} - -void -hb_set_invert (hb_set_t *set) -{ - set->invert (); -} - -unsigned int -hb_set_get_population (const hb_set_t *set) -{ - return set->get_population (); -} - -hb_codepoint_t -hb_set_get_min (const hb_set_t *set) -{ - return set->get_min (); -} - -hb_codepoint_t -hb_set_get_max (const hb_set_t *set) -{ - return set->get_max (); -} - -hb_bool_t -hb_set_next (const hb_set_t *set, - hb_codepoint_t *codepoint) -{ - return set->next (codepoint); -} - -hb_bool_t -hb_set_next_range (const hb_set_t *set, - hb_codepoint_t *first, - hb_codepoint_t *last) -{ - return set->next_range (first, last); -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-set.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-set.h deleted file mode 100644 index 291e24974e6..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-set.h +++ /dev/null @@ -1,152 +0,0 @@ -/* - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_H_IN -#error "Include <hb.h> instead." -#endif - -#ifndef HB_SET_H -#define HB_SET_H - -#include "hb-common.h" - -HB_BEGIN_DECLS - - -typedef struct hb_set_t hb_set_t; - - -hb_set_t * -hb_set_create (void); - -hb_set_t * -hb_set_get_empty (void); - -hb_set_t * -hb_set_reference (hb_set_t *set); - -void -hb_set_destroy (hb_set_t *set); - -hb_bool_t -hb_set_set_user_data (hb_set_t *set, - hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy, - hb_bool_t replace); - -void * -hb_set_get_user_data (hb_set_t *set, - hb_user_data_key_t *key); - - -/* Returns false if allocation has failed before */ -hb_bool_t -hb_set_allocation_successful (const hb_set_t *set); - -void -hb_set_clear (hb_set_t *set); - -hb_bool_t -hb_set_is_empty (const hb_set_t *set); - -hb_bool_t -hb_set_has (const hb_set_t *set, - hb_codepoint_t codepoint); - -/* Right now limited to 16-bit integers. Eventually will do full codepoint range, sans -1 - * which we will use as a sentinel. */ -void -hb_set_add (hb_set_t *set, - hb_codepoint_t codepoint); - -void -hb_set_add_range (hb_set_t *set, - hb_codepoint_t first, - hb_codepoint_t last); - -void -hb_set_del (hb_set_t *set, - hb_codepoint_t codepoint); - -void -hb_set_del_range (hb_set_t *set, - hb_codepoint_t first, - hb_codepoint_t last); - -hb_bool_t -hb_set_is_equal (const hb_set_t *set, - const hb_set_t *other); - -void -hb_set_set (hb_set_t *set, - const hb_set_t *other); - -void -hb_set_union (hb_set_t *set, - const hb_set_t *other); - -void -hb_set_intersect (hb_set_t *set, - const hb_set_t *other); - -void -hb_set_subtract (hb_set_t *set, - const hb_set_t *other); - -void -hb_set_symmetric_difference (hb_set_t *set, - const hb_set_t *other); - -void -hb_set_invert (hb_set_t *set); - -unsigned int -hb_set_get_population (const hb_set_t *set); - -/* Returns -1 if set empty. */ -hb_codepoint_t -hb_set_get_min (const hb_set_t *set); - -/* Returns -1 if set empty. */ -hb_codepoint_t -hb_set_get_max (const hb_set_t *set); - -/* Pass -1 in to get started. */ -hb_bool_t -hb_set_next (const hb_set_t *set, - hb_codepoint_t *codepoint); - -/* Pass -1 for first and last to get started. */ -hb_bool_t -hb_set_next_range (const hb_set_t *set, - hb_codepoint_t *first, - hb_codepoint_t *last); - - -HB_END_DECLS - -#endif /* HB_SET_H */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shape-plan-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shape-plan-private.hh deleted file mode 100644 index dd014e38d01..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shape-plan-private.hh +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_SHAPE_PLAN_PRIVATE_HH -#define HB_SHAPE_PLAN_PRIVATE_HH - -#include "hb-private.hh" -#include "hb-shape-plan.h" -#include "hb-object-private.hh" -#include "hb-shaper-private.hh" - - -struct hb_shape_plan_t -{ - hb_object_header_t header; - ASSERT_POD (); - - hb_bool_t default_shaper_list; - hb_face_t *face; - hb_segment_properties_t props; - - hb_shape_func_t *shaper_func; - const char *shaper_name; - - struct hb_shaper_data_t shaper_data; -}; - -#define HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS \ - , const hb_feature_t *user_features \ - , unsigned int num_user_features -#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_PROTOTYPE(shaper, shape_plan); -#include "hb-shaper-list.hh" -#undef HB_SHAPER_IMPLEMENT -#undef HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS - - -#endif /* HB_SHAPE_PLAN_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shape-plan.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shape-plan.cc deleted file mode 100644 index a6d2d262100..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shape-plan.cc +++ /dev/null @@ -1,314 +0,0 @@ -/* - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-shape-plan-private.hh" -#include "hb-shaper-private.hh" -#include "hb-font-private.hh" -#include "hb-buffer-private.hh" - -#define HB_SHAPER_IMPLEMENT(shaper) \ - HB_SHAPER_DATA_ENSURE_DECLARE(shaper, face) \ - HB_SHAPER_DATA_ENSURE_DECLARE(shaper, font) -#include "hb-shaper-list.hh" -#undef HB_SHAPER_IMPLEMENT - - -static void -hb_shape_plan_plan (hb_shape_plan_t *shape_plan, - const hb_feature_t *user_features, - unsigned int num_user_features, - const char * const *shaper_list) -{ - const hb_shaper_pair_t *shapers = _hb_shapers_get (); - -#define HB_SHAPER_PLAN(shaper) \ - HB_STMT_START { \ - if (hb_##shaper##_shaper_face_data_ensure (shape_plan->face)) { \ - HB_SHAPER_DATA (shaper, shape_plan) = \ - HB_SHAPER_DATA_CREATE_FUNC (shaper, shape_plan) (shape_plan, user_features, num_user_features); \ - shape_plan->shaper_func = _hb_##shaper##_shape; \ - shape_plan->shaper_name = #shaper; \ - return; \ - } \ - } HB_STMT_END - - if (likely (!shaper_list)) { - for (unsigned int i = 0; i < HB_SHAPERS_COUNT; i++) - if (0) - ; -#define HB_SHAPER_IMPLEMENT(shaper) \ - else if (shapers[i].func == _hb_##shaper##_shape) \ - HB_SHAPER_PLAN (shaper); -#include "hb-shaper-list.hh" -#undef HB_SHAPER_IMPLEMENT - } else { - for (; *shaper_list; shaper_list++) - if (0) - ; -#define HB_SHAPER_IMPLEMENT(shaper) \ - else if (0 == strcmp (*shaper_list, #shaper)) \ - HB_SHAPER_PLAN (shaper); -#include "hb-shaper-list.hh" -#undef HB_SHAPER_IMPLEMENT - } - -#undef HB_SHAPER_PLAN -} - - -/* - * hb_shape_plan_t - */ - -hb_shape_plan_t * -hb_shape_plan_create (hb_face_t *face, - const hb_segment_properties_t *props, - const hb_feature_t *user_features, - unsigned int num_user_features, - const char * const *shaper_list) -{ - assert (props->direction != HB_DIRECTION_INVALID); - - hb_shape_plan_t *shape_plan; - - if (unlikely (!face)) - face = hb_face_get_empty (); - if (unlikely (!props || hb_object_is_inert (face))) - return hb_shape_plan_get_empty (); - if (!(shape_plan = hb_object_create<hb_shape_plan_t> ())) - return hb_shape_plan_get_empty (); - - hb_face_make_immutable (face); - shape_plan->default_shaper_list = shaper_list == NULL; - shape_plan->face = hb_face_reference (face); - shape_plan->props = *props; - - hb_shape_plan_plan (shape_plan, user_features, num_user_features, shaper_list); - - return shape_plan; -} - -hb_shape_plan_t * -hb_shape_plan_get_empty (void) -{ - static const hb_shape_plan_t _hb_shape_plan_nil = { - HB_OBJECT_HEADER_STATIC, - - true, /* default_shaper_list */ - NULL, /* face */ - HB_SEGMENT_PROPERTIES_DEFAULT, /* props */ - - NULL, /* shaper_func */ - NULL, /* shaper_name */ - - { -#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_INVALID, -#include "hb-shaper-list.hh" -#undef HB_SHAPER_IMPLEMENT - } - }; - - return const_cast<hb_shape_plan_t *> (&_hb_shape_plan_nil); -} - -hb_shape_plan_t * -hb_shape_plan_reference (hb_shape_plan_t *shape_plan) -{ - return hb_object_reference (shape_plan); -} - -void -hb_shape_plan_destroy (hb_shape_plan_t *shape_plan) -{ - if (!hb_object_destroy (shape_plan)) return; - -#define HB_SHAPER_IMPLEMENT(shaper) HB_SHAPER_DATA_DESTROY(shaper, shape_plan); -#include "hb-shaper-list.hh" -#undef HB_SHAPER_IMPLEMENT - - hb_face_destroy (shape_plan->face); - - free (shape_plan); -} - -hb_bool_t -hb_shape_plan_set_user_data (hb_shape_plan_t *shape_plan, - hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy, - hb_bool_t replace) -{ - return hb_object_set_user_data (shape_plan, key, data, destroy, replace); -} - -void * -hb_shape_plan_get_user_data (hb_shape_plan_t *shape_plan, - hb_user_data_key_t *key) -{ - return hb_object_get_user_data (shape_plan, key); -} - - -hb_bool_t -hb_shape_plan_execute (hb_shape_plan_t *shape_plan, - hb_font_t *font, - hb_buffer_t *buffer, - const hb_feature_t *features, - unsigned int num_features) -{ - if (unlikely (hb_object_is_inert (shape_plan) || - hb_object_is_inert (font) || - hb_object_is_inert (buffer))) - return false; - - assert (shape_plan->face == font->face); - assert (hb_segment_properties_equal (&shape_plan->props, &buffer->props)); - -#define HB_SHAPER_EXECUTE(shaper) \ - HB_STMT_START { \ - return HB_SHAPER_DATA (shaper, shape_plan) && \ - hb_##shaper##_shaper_font_data_ensure (font) && \ - _hb_##shaper##_shape (shape_plan, font, buffer, features, num_features); \ - } HB_STMT_END - - if (0) - ; -#define HB_SHAPER_IMPLEMENT(shaper) \ - else if (shape_plan->shaper_func == _hb_##shaper##_shape) \ - HB_SHAPER_EXECUTE (shaper); -#include "hb-shaper-list.hh" -#undef HB_SHAPER_IMPLEMENT - -#undef HB_SHAPER_EXECUTE - - return false; -} - - -/* - * caching - */ - -#if 0 -static unsigned int -hb_shape_plan_hash (const hb_shape_plan_t *shape_plan) -{ - return hb_segment_properties_hash (&shape_plan->props) + - shape_plan->default_shaper_list ? 0 : (intptr_t) shape_plan->shaper_func; -} -#endif - -/* TODO no user-feature caching for now. */ -struct hb_shape_plan_proposal_t -{ - const hb_segment_properties_t props; - const char * const *shaper_list; - hb_shape_func_t *shaper_func; -}; - -static hb_bool_t -hb_shape_plan_matches (const hb_shape_plan_t *shape_plan, - const hb_shape_plan_proposal_t *proposal) -{ - return hb_segment_properties_equal (&shape_plan->props, &proposal->props) && - ((shape_plan->default_shaper_list && proposal->shaper_list == NULL) || - (shape_plan->shaper_func == proposal->shaper_func)); -} - -hb_shape_plan_t * -hb_shape_plan_create_cached (hb_face_t *face, - const hb_segment_properties_t *props, - const hb_feature_t *user_features, - unsigned int num_user_features, - const char * const *shaper_list) -{ - if (num_user_features) - return hb_shape_plan_create (face, props, user_features, num_user_features, shaper_list); - - hb_shape_plan_proposal_t proposal = { - *props, - shaper_list, - NULL - }; - - if (shaper_list) { - /* Choose shaper. Adapted from hb_shape_plan_plan(). */ -#define HB_SHAPER_PLAN(shaper) \ - HB_STMT_START { \ - if (hb_##shaper##_shaper_face_data_ensure (face)) \ - proposal.shaper_func = _hb_##shaper##_shape; \ - } HB_STMT_END - - for (const char * const *shaper_item = shaper_list; *shaper_item; shaper_item++) - if (0) - ; -#define HB_SHAPER_IMPLEMENT(shaper) \ - else if (0 == strcmp (*shaper_item, #shaper)) \ - HB_SHAPER_PLAN (shaper); -#include "hb-shaper-list.hh" -#undef HB_SHAPER_IMPLEMENT - -#undef HB_SHAPER_PLAN - - if (unlikely (!proposal.shaper_list)) - return hb_shape_plan_get_empty (); - } - - -retry: - hb_face_t::plan_node_t *cached_plan_nodes = (hb_face_t::plan_node_t *) hb_atomic_ptr_get (&face->shape_plans); - for (hb_face_t::plan_node_t *node = cached_plan_nodes; node; node = node->next) - if (hb_shape_plan_matches (node->shape_plan, &proposal)) - return hb_shape_plan_reference (node->shape_plan); - - /* Not found. */ - - hb_shape_plan_t *shape_plan = hb_shape_plan_create (face, props, user_features, num_user_features, shaper_list); - - hb_face_t::plan_node_t *node = (hb_face_t::plan_node_t *) calloc (1, sizeof (hb_face_t::plan_node_t)); - if (unlikely (!node)) - return shape_plan; - - node->shape_plan = shape_plan; - node->next = cached_plan_nodes; - - if (!hb_atomic_ptr_cmpexch (&face->shape_plans, cached_plan_nodes, node)) { - hb_shape_plan_destroy (shape_plan); - free (node); - goto retry; - } - - /* Release our reference on face. */ - hb_face_destroy (face); - - return hb_shape_plan_reference (shape_plan); -} - -const char * -hb_shape_plan_get_shaper (hb_shape_plan_t *shape_plan) -{ - return shape_plan->shaper_name; -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shape-plan.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shape-plan.h deleted file mode 100644 index 8f54552f90b..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shape-plan.h +++ /dev/null @@ -1,89 +0,0 @@ -/* - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_H_IN -#error "Include <hb.h> instead." -#endif - -#ifndef HB_SHAPE_PLAN_H -#define HB_SHAPE_PLAN_H - -#include "hb-common.h" -#include "hb-font.h" - -HB_BEGIN_DECLS - -typedef struct hb_shape_plan_t hb_shape_plan_t; - -hb_shape_plan_t * -hb_shape_plan_create (hb_face_t *face, - const hb_segment_properties_t *props, - const hb_feature_t *user_features, - unsigned int num_user_features, - const char * const *shaper_list); - -hb_shape_plan_t * -hb_shape_plan_create_cached (hb_face_t *face, - const hb_segment_properties_t *props, - const hb_feature_t *user_features, - unsigned int num_user_features, - const char * const *shaper_list); - -hb_shape_plan_t * -hb_shape_plan_get_empty (void); - -hb_shape_plan_t * -hb_shape_plan_reference (hb_shape_plan_t *shape_plan); - -void -hb_shape_plan_destroy (hb_shape_plan_t *shape_plan); - -hb_bool_t -hb_shape_plan_set_user_data (hb_shape_plan_t *shape_plan, - hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy, - hb_bool_t replace); - -void * -hb_shape_plan_get_user_data (hb_shape_plan_t *shape_plan, - hb_user_data_key_t *key); - - -hb_bool_t -hb_shape_plan_execute (hb_shape_plan_t *shape_plan, - hb_font_t *font, - hb_buffer_t *buffer, - const hb_feature_t *features, - unsigned int num_features); - -const char * -hb_shape_plan_get_shaper (hb_shape_plan_t *shape_plan); - - -HB_END_DECLS - -#endif /* HB_SHAPE_PLAN_H */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shape.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shape.cc deleted file mode 100644 index 67ef7e6a8f5..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shape.cc +++ /dev/null @@ -1,275 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-private.hh" - -#include "hb-shaper-private.hh" -#include "hb-shape-plan-private.hh" -#include "hb-buffer-private.hh" -#include "hb-font-private.hh" - - -static void -parse_space (const char **pp, const char *end) -{ - char c; - while (*pp < end && (c = **pp, ISSPACE (c))) - (*pp)++; -} - -static hb_bool_t -parse_char (const char **pp, const char *end, char c) -{ - parse_space (pp, end); - - if (*pp == end || **pp != c) - return false; - - (*pp)++; - return true; -} - -static hb_bool_t -parse_uint (const char **pp, const char *end, unsigned int *pv) -{ - char buf[32]; - unsigned int len = MIN (ARRAY_LENGTH (buf) - 1, (unsigned int) (end - *pp)); - strncpy (buf, *pp, len); - buf[len] = '\0'; - - char *p = buf; - char *pend = p; - unsigned int v; - - /* Intentionally use strtol instead of strtoul, such that - * -1 turns into "big number"... */ - errno = 0; - v = strtol (p, &pend, 0); - if (errno || p == pend) - return false; - - *pv = v; - *pp += pend - p; - return true; -} - -static hb_bool_t -parse_feature_value_prefix (const char **pp, const char *end, hb_feature_t *feature) -{ - if (parse_char (pp, end, '-')) - feature->value = 0; - else { - parse_char (pp, end, '+'); - feature->value = 1; - } - - return true; -} - -static hb_bool_t -parse_feature_tag (const char **pp, const char *end, hb_feature_t *feature) -{ - const char *p = *pp; - char c; - - parse_space (pp, end); - -#define ISALNUM(c) (('a' <= (c) && (c) <= 'z') || ('A' <= (c) && (c) <= 'Z') || ('0' <= (c) && (c) <= '9')) - while (*pp < end && (c = **pp, ISALNUM(c))) - (*pp)++; -#undef ISALNUM - - if (p == *pp) - return false; - - feature->tag = hb_tag_from_string (p, *pp - p); - return true; -} - -static hb_bool_t -parse_feature_indices (const char **pp, const char *end, hb_feature_t *feature) -{ - parse_space (pp, end); - - hb_bool_t has_start; - - feature->start = 0; - feature->end = (unsigned int) -1; - - if (!parse_char (pp, end, '[')) - return true; - - has_start = parse_uint (pp, end, &feature->start); - - if (parse_char (pp, end, ':')) { - parse_uint (pp, end, &feature->end); - } else { - if (has_start) - feature->end = feature->start + 1; - } - - return parse_char (pp, end, ']'); -} - -static hb_bool_t -parse_feature_value_postfix (const char **pp, const char *end, hb_feature_t *feature) -{ - return !parse_char (pp, end, '=') || parse_uint (pp, end, &feature->value); -} - - -static hb_bool_t -parse_one_feature (const char **pp, const char *end, hb_feature_t *feature) -{ - return parse_feature_value_prefix (pp, end, feature) && - parse_feature_tag (pp, end, feature) && - parse_feature_indices (pp, end, feature) && - parse_feature_value_postfix (pp, end, feature) && - *pp == end; -} - -hb_bool_t -hb_feature_from_string (const char *str, int len, - hb_feature_t *feature) -{ - if (len < 0) - len = strlen (str); - - return parse_one_feature (&str, str + len, feature); -} - -void -hb_feature_to_string (hb_feature_t *feature, - char *buf, unsigned int size) -{ - if (unlikely (!size)) return; - - char s[128]; - unsigned int len = 0; - if (feature->value == 0) - s[len++] = '-'; - hb_tag_to_string (feature->tag, s + len); - len += 4; - while (len && s[len - 1] == ' ') - len--; - if (feature->start != 0 || feature->end != (unsigned int) -1) - { - s[len++] = '['; - if (feature->start) - len += snprintf (s + len, ARRAY_LENGTH (s) - len, "%d", feature->start); - if (feature->end != feature->start + 1) { - s[len++] = ':'; - if (feature->end != (unsigned int) -1) - len += snprintf (s + len, ARRAY_LENGTH (s) - len, "%d", feature->end); - } - s[len++] = ']'; - } - if (feature->value > 1) - { - s[len++] = '='; - len += snprintf (s + len, ARRAY_LENGTH (s) - len, "%d", feature->value); - } - assert (len < ARRAY_LENGTH (s)); - len = MIN (len, size - 1); - memcpy (buf, s, len); - s[len] = '\0'; -} - - -static const char **static_shaper_list; - -static inline -void free_static_shaper_list (void) -{ - free (static_shaper_list); -} - -const char ** -hb_shape_list_shapers (void) -{ -retry: - const char **shaper_list = (const char **) hb_atomic_ptr_get (&static_shaper_list); - - if (unlikely (!shaper_list)) - { - /* Not found; allocate one. */ - shaper_list = (const char **) calloc (1 + HB_SHAPERS_COUNT, sizeof (const char *)); - if (unlikely (!shaper_list)) { - static const char *nil_shaper_list[] = {NULL}; - return nil_shaper_list; - } - - const hb_shaper_pair_t *shapers = _hb_shapers_get (); - unsigned int i; - for (i = 0; i < HB_SHAPERS_COUNT; i++) - shaper_list[i] = shapers[i].name; - shaper_list[i] = NULL; - - if (!hb_atomic_ptr_cmpexch (&static_shaper_list, NULL, shaper_list)) { - free (shaper_list); - goto retry; - } - -#ifdef HAVE_ATEXIT - atexit (free_static_shaper_list); /* First person registers atexit() callback. */ -#endif - } - - return shaper_list; -} - - -hb_bool_t -hb_shape_full (hb_font_t *font, - hb_buffer_t *buffer, - const hb_feature_t *features, - unsigned int num_features, - const char * const *shaper_list) -{ - if (unlikely (!buffer->len)) - return true; - - assert (buffer->content_type == HB_BUFFER_CONTENT_TYPE_UNICODE); - - hb_shape_plan_t *shape_plan = hb_shape_plan_create_cached (font->face, &buffer->props, features, num_features, shaper_list); - hb_bool_t res = hb_shape_plan_execute (shape_plan, font, buffer, features, num_features); - hb_shape_plan_destroy (shape_plan); - - if (res) - buffer->content_type = HB_BUFFER_CONTENT_TYPE_GLYPHS; - return res; -} - -void -hb_shape (hb_font_t *font, - hb_buffer_t *buffer, - const hb_feature_t *features, - unsigned int num_features) -{ - hb_shape_full (font, buffer, features, num_features, NULL); -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shape.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shape.h deleted file mode 100644 index 10a35cb517e..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shape.h +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_H_IN -#error "Include <hb.h> instead." -#endif - -#ifndef HB_SHAPE_H -#define HB_SHAPE_H - -#include "hb-common.h" -#include "hb-buffer.h" -#include "hb-font.h" - -HB_BEGIN_DECLS - - -typedef struct hb_feature_t { - hb_tag_t tag; - uint32_t value; - unsigned int start; - unsigned int end; -} hb_feature_t; - -/* len=-1 means str is NUL-terminated */ -hb_bool_t -hb_feature_from_string (const char *str, int len, - hb_feature_t *feature); - -/* Something like 128 bytes is more than enough. - * nul-terminates. */ -void -hb_feature_to_string (hb_feature_t *feature, - char *buf, unsigned int size); - - -void -hb_shape (hb_font_t *font, - hb_buffer_t *buffer, - const hb_feature_t *features, - unsigned int num_features); - -hb_bool_t -hb_shape_full (hb_font_t *font, - hb_buffer_t *buffer, - const hb_feature_t *features, - unsigned int num_features, - const char * const *shaper_list); - -const char ** -hb_shape_list_shapers (void); - - -HB_END_DECLS - -#endif /* HB_SHAPE_H */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shaper-impl-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shaper-impl-private.hh deleted file mode 100644 index 7844081e95b..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shaper-impl-private.hh +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_SHAPER_IMPL_PRIVATE_HH -#define HB_SHAPER_IMPL_PRIVATE_HH - -#include "hb-private.hh" - -#include "hb-shaper-private.hh" -#include "hb-shape-plan-private.hh" -#include "hb-font-private.hh" -#include "hb-buffer-private.hh" - - -#ifdef HB_SHAPER -#define HB_SHAPER_DATA_GET(object) HB_SHAPER_DATA (HB_SHAPER, object) -#endif - - -#endif /* HB_SHAPER_IMPL_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shaper-list.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shaper-list.hh deleted file mode 100644 index b9c029e58f1..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shaper-list.hh +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_SHAPER_LIST_HH -#define HB_SHAPER_LIST_HH -#endif /* HB_SHAPER_LIST_HH */ /* Dummy header guards */ - -/* v--- Add new shapers in the right place here. */ - -#ifdef HAVE_GRAPHITE2 -/* Only picks up fonts that have a "Silf" table. */ -HB_SHAPER_IMPLEMENT (graphite2) -#endif - -#ifdef HAVE_OT -HB_SHAPER_IMPLEMENT (ot) /* <--- This is our main OpenType shaper. */ -#endif - -#ifdef HAVE_HB_OLD -HB_SHAPER_IMPLEMENT (old) -#endif -#ifdef HAVE_ICU_LE -HB_SHAPER_IMPLEMENT (icu_le) -#endif -#ifdef HAVE_UNISCRIBE -HB_SHAPER_IMPLEMENT (uniscribe) -#endif -#ifdef HAVE_CORETEXT -HB_SHAPER_IMPLEMENT (coretext) -#endif - -HB_SHAPER_IMPLEMENT (fallback) /* <--- This should be last. */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shaper-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shaper-private.hh deleted file mode 100644 index 29c4493943d..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shaper-private.hh +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_SHAPER_PRIVATE_HH -#define HB_SHAPER_PRIVATE_HH - -#include "hb-private.hh" - -typedef hb_bool_t hb_shape_func_t (hb_shape_plan_t *shape_plan, - hb_font_t *font, - hb_buffer_t *buffer, - const hb_feature_t *features, - unsigned int num_features); - -#define HB_SHAPER_IMPLEMENT(name) \ - extern "C" HB_INTERNAL hb_shape_func_t _hb_##name##_shape; -#include "hb-shaper-list.hh" -#undef HB_SHAPER_IMPLEMENT - -struct hb_shaper_pair_t { - char name[16]; - hb_shape_func_t *func; -}; - -HB_INTERNAL const hb_shaper_pair_t * -_hb_shapers_get (void); - - -/* For embedding in face / font / ... */ -struct hb_shaper_data_t { -#define HB_SHAPER_IMPLEMENT(shaper) void *shaper; -#include "hb-shaper-list.hh" -#undef HB_SHAPER_IMPLEMENT -}; - -#define HB_SHAPERS_COUNT (sizeof (hb_shaper_data_t) / sizeof (void *)) - -/* Means: succeeded, but don't need to keep any data. */ -#define HB_SHAPER_DATA_SUCCEEDED ((void *) +1) - -/* Means: tried but failed to create. */ -#define HB_SHAPER_DATA_INVALID ((void *) -1) -#define HB_SHAPER_DATA_IS_INVALID(data) ((void *) (data) == HB_SHAPER_DATA_INVALID) - -#define HB_SHAPER_DATA_TYPE(shaper, object) struct hb_##shaper##_shaper_##object##_data_t -#define HB_SHAPER_DATA_INSTANCE(shaper, object, instance) (* (HB_SHAPER_DATA_TYPE(shaper, object) **) &(instance)->shaper_data.shaper) -#define HB_SHAPER_DATA(shaper, object) HB_SHAPER_DATA_INSTANCE (shaper, object, object) -#define HB_SHAPER_DATA_CREATE_FUNC(shaper, object) _hb_##shaper##_shaper_##object##_data_create -#define HB_SHAPER_DATA_DESTROY_FUNC(shaper, object) _hb_##shaper##_shaper_##object##_data_destroy - -#define HB_SHAPER_DATA_PROTOTYPE(shaper, object) \ - HB_SHAPER_DATA_TYPE (shaper, object); /* Type forward declaration. */ \ - extern "C" HB_INTERNAL HB_SHAPER_DATA_TYPE (shaper, object) * \ - HB_SHAPER_DATA_CREATE_FUNC (shaper, object) (hb_##object##_t *object HB_SHAPER_DATA_CREATE_FUNC_EXTRA_ARGS); \ - extern "C" HB_INTERNAL void \ - HB_SHAPER_DATA_DESTROY_FUNC (shaper, object) (HB_SHAPER_DATA_TYPE (shaper, object) *data) - -#define HB_SHAPER_DATA_DESTROY(shaper, object) \ - if (object->shaper_data.shaper && \ - object->shaper_data.shaper != HB_SHAPER_DATA_INVALID && \ - object->shaper_data.shaper != HB_SHAPER_DATA_SUCCEEDED) \ - HB_SHAPER_DATA_DESTROY_FUNC (shaper, object) (HB_SHAPER_DATA (shaper, object)); - -#define HB_SHAPER_DATA_ENSURE_DECLARE(shaper, object) \ -static inline bool \ -hb_##shaper##_shaper_##object##_data_ensure (hb_##object##_t *object) \ -{\ - retry: \ - HB_SHAPER_DATA_TYPE (shaper, object) *data = (HB_SHAPER_DATA_TYPE (shaper, object) *) hb_atomic_ptr_get (&HB_SHAPER_DATA (shaper, object)); \ - if (unlikely (!data)) { \ - data = HB_SHAPER_DATA_CREATE_FUNC (shaper, object) (object); \ - if (unlikely (!data)) \ - data = (HB_SHAPER_DATA_TYPE (shaper, object) *) HB_SHAPER_DATA_INVALID; \ - if (!hb_atomic_ptr_cmpexch (&HB_SHAPER_DATA (shaper, object), NULL, data)) { \ - if (data && \ - data != HB_SHAPER_DATA_INVALID && \ - data != HB_SHAPER_DATA_SUCCEEDED) \ - HB_SHAPER_DATA_DESTROY_FUNC (shaper, object) (data); \ - goto retry; \ - } \ - } \ - return data != NULL && !HB_SHAPER_DATA_IS_INVALID (data); \ -} - - -#endif /* HB_SHAPER_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shaper.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shaper.cc deleted file mode 100644 index 44f718aa702..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-shaper.cc +++ /dev/null @@ -1,109 +0,0 @@ -/* - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-private.hh" -#include "hb-shaper-private.hh" -#include "hb-atomic-private.hh" - - -static const hb_shaper_pair_t all_shapers[] = { -#define HB_SHAPER_IMPLEMENT(name) {#name, _hb_##name##_shape}, -#include "hb-shaper-list.hh" -#undef HB_SHAPER_IMPLEMENT -}; - - -/* Thread-safe, lock-free, shapers */ - -static const hb_shaper_pair_t *static_shapers; - -static inline -void free_static_shapers (void) -{ - if (unlikely (static_shapers != all_shapers)) - free ((void *) static_shapers); -} - -const hb_shaper_pair_t * -_hb_shapers_get (void) -{ -retry: - hb_shaper_pair_t *shapers = (hb_shaper_pair_t *) hb_atomic_ptr_get (&static_shapers); - - if (unlikely (!shapers)) - { - char *env = getenv ("HB_SHAPER_LIST"); - if (!env || !*env) { - (void) hb_atomic_ptr_cmpexch (&static_shapers, NULL, &all_shapers[0]); - return (const hb_shaper_pair_t *) all_shapers; - } - - /* Not found; allocate one. */ - shapers = (hb_shaper_pair_t *) malloc (sizeof (all_shapers)); - if (unlikely (!shapers)) { - (void) hb_atomic_ptr_cmpexch (&static_shapers, NULL, &all_shapers[0]); - return (const hb_shaper_pair_t *) all_shapers; - } - - memcpy (shapers, all_shapers, sizeof (all_shapers)); - - /* Reorder shaper list to prefer requested shapers. */ - unsigned int i = 0; - char *end, *p = env; - for (;;) { - end = strchr (p, ','); - if (!end) - end = p + strlen (p); - - for (unsigned int j = i; j < ARRAY_LENGTH (all_shapers); j++) - if (end - p == (int) strlen (shapers[j].name) && - 0 == strncmp (shapers[j].name, p, end - p)) - { - /* Reorder this shaper to position i */ - struct hb_shaper_pair_t t = shapers[j]; - memmove (&shapers[i + 1], &shapers[i], sizeof (shapers[i]) * (j - i)); - shapers[i] = t; - i++; - } - - if (!*end) - break; - else - p = end + 1; - } - - if (!hb_atomic_ptr_cmpexch (&static_shapers, NULL, shapers)) { - free (shapers); - goto retry; - } - -#ifdef HAVE_ATEXIT - atexit (free_static_shapers); /* First person registers atexit() callback. */ -#endif - } - - return shapers; -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-tt-font.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-tt-font.cc deleted file mode 100644 index c503a404380..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-tt-font.cc +++ /dev/null @@ -1,79 +0,0 @@ -/* - * Copyright © 2011 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-font-private.hh" /* Shall be first since may include windows.h */ - -#include "hb-open-type-private.hh" - -#include "hb-ot-hhea-table.hh" -#include "hb-ot-hmtx-table.hh" - -#include "hb-blob.h" - -#include <string.h> - - - -#if 0 -struct hb_tt_font_t -{ - const struct hhea *hhea; - hb_blob_t *hhea_blob; -}; - - -static hb_tt_font_t * -_hb_tt_font_create (hb_font_t *font) -{ - /* TODO Remove this object altogether */ - hb_tt_font_t *tt = (hb_tt_font_t *) calloc (1, sizeof (hb_tt_font_t)); - - tt->hhea_blob = Sanitizer<hhea>::sanitize (font->face->reference_table (HB_OT_TAG_hhea)); - tt->hhea = Sanitizer<hhea>::lock_instance (tt->hhea_blob); - - return tt; -} - -static void -_hb_tt_font_destroy (hb_tt_font_t *tt) -{ - hb_blob_destroy (tt->hhea_blob); - - free (tt); -} - -static inline const hhea& -_get_hhea (hb_face_t *face) -{ - return likely (face->tt && face->tt->hhea) ? *face->tt->hhea : Null(hhea); -} - - -/* - * hb_tt_font_funcs_t - */ - -#endif diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ucdn.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ucdn.cc deleted file mode 100644 index 61e6ad36229..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-ucdn.cc +++ /dev/null @@ -1,208 +0,0 @@ -/* - * Copyright (C) 2012 Grigori Goronzy <greg@kinoho.net> - * - * Permission to use, copy, modify, and/or distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include "hb-private.hh" - -#include "hb-unicode-private.hh" - -#include "ucdn.h" - -static const hb_script_t ucdn_script_translate[] = -{ - HB_SCRIPT_COMMON, - HB_SCRIPT_LATIN, - HB_SCRIPT_GREEK, - HB_SCRIPT_CYRILLIC, - HB_SCRIPT_ARMENIAN, - HB_SCRIPT_HEBREW, - HB_SCRIPT_ARABIC, - HB_SCRIPT_SYRIAC, - HB_SCRIPT_THAANA, - HB_SCRIPT_DEVANAGARI, - HB_SCRIPT_BENGALI, - HB_SCRIPT_GURMUKHI, - HB_SCRIPT_GUJARATI, - HB_SCRIPT_ORIYA, - HB_SCRIPT_TAMIL, - HB_SCRIPT_TELUGU, - HB_SCRIPT_KANNADA, - HB_SCRIPT_MALAYALAM, - HB_SCRIPT_SINHALA, - HB_SCRIPT_THAI, - HB_SCRIPT_LAO, - HB_SCRIPT_TIBETAN, - HB_SCRIPT_MYANMAR, - HB_SCRIPT_GEORGIAN, - HB_SCRIPT_HANGUL, - HB_SCRIPT_ETHIOPIC, - HB_SCRIPT_CHEROKEE, - HB_SCRIPT_CANADIAN_ABORIGINAL, - HB_SCRIPT_OGHAM, - HB_SCRIPT_RUNIC, - HB_SCRIPT_KHMER, - HB_SCRIPT_MONGOLIAN, - HB_SCRIPT_HIRAGANA, - HB_SCRIPT_KATAKANA, - HB_SCRIPT_BOPOMOFO, - HB_SCRIPT_HAN, - HB_SCRIPT_YI, - HB_SCRIPT_OLD_ITALIC, - HB_SCRIPT_GOTHIC, - HB_SCRIPT_DESERET, - HB_SCRIPT_INHERITED, - HB_SCRIPT_TAGALOG, - HB_SCRIPT_HANUNOO, - HB_SCRIPT_BUHID, - HB_SCRIPT_TAGBANWA, - HB_SCRIPT_LIMBU, - HB_SCRIPT_TAI_LE, - HB_SCRIPT_LINEAR_B, - HB_SCRIPT_UGARITIC, - HB_SCRIPT_SHAVIAN, - HB_SCRIPT_OSMANYA, - HB_SCRIPT_CYPRIOT, - HB_SCRIPT_BRAILLE, - HB_SCRIPT_BUGINESE, - HB_SCRIPT_COPTIC, - HB_SCRIPT_NEW_TAI_LUE, - HB_SCRIPT_GLAGOLITIC, - HB_SCRIPT_TIFINAGH, - HB_SCRIPT_SYLOTI_NAGRI, - HB_SCRIPT_OLD_PERSIAN, - HB_SCRIPT_KHAROSHTHI, - HB_SCRIPT_BALINESE, - HB_SCRIPT_CUNEIFORM, - HB_SCRIPT_PHOENICIAN, - HB_SCRIPT_PHAGS_PA, - HB_SCRIPT_NKO, - HB_SCRIPT_SUNDANESE, - HB_SCRIPT_LEPCHA, - HB_SCRIPT_OL_CHIKI, - HB_SCRIPT_VAI, - HB_SCRIPT_SAURASHTRA, - HB_SCRIPT_KAYAH_LI, - HB_SCRIPT_REJANG, - HB_SCRIPT_LYCIAN, - HB_SCRIPT_CARIAN, - HB_SCRIPT_LYDIAN, - HB_SCRIPT_CHAM, - HB_SCRIPT_TAI_THAM, - HB_SCRIPT_TAI_VIET, - HB_SCRIPT_AVESTAN, - HB_SCRIPT_EGYPTIAN_HIEROGLYPHS, - HB_SCRIPT_SAMARITAN, - HB_SCRIPT_LISU, - HB_SCRIPT_BAMUM, - HB_SCRIPT_JAVANESE, - HB_SCRIPT_MEETEI_MAYEK, - HB_SCRIPT_IMPERIAL_ARAMAIC, - HB_SCRIPT_OLD_SOUTH_ARABIAN, - HB_SCRIPT_INSCRIPTIONAL_PARTHIAN, - HB_SCRIPT_INSCRIPTIONAL_PAHLAVI, - HB_SCRIPT_OLD_TURKIC, - HB_SCRIPT_KAITHI, - HB_SCRIPT_BATAK, - HB_SCRIPT_BRAHMI, - HB_SCRIPT_MANDAIC, - HB_SCRIPT_CHAKMA, - HB_SCRIPT_MEROITIC_CURSIVE, - HB_SCRIPT_MEROITIC_HIEROGLYPHS, - HB_SCRIPT_MIAO, - HB_SCRIPT_SHARADA, - HB_SCRIPT_SORA_SOMPENG, - HB_SCRIPT_TAKRI, - HB_SCRIPT_UNKNOWN, -}; - -static hb_unicode_combining_class_t -hb_ucdn_combining_class(hb_unicode_funcs_t *ufuncs, hb_codepoint_t unicode, - void *user_data HB_UNUSED) -{ - return (hb_unicode_combining_class_t) ucdn_get_combining_class(unicode); -} - -static unsigned int -hb_ucdn_eastasian_width(hb_unicode_funcs_t *ufuncs, hb_codepoint_t unicode, - void *user_data HB_UNUSED) -{ - int w = ucdn_get_east_asian_width(unicode); - return (w == UCDN_EAST_ASIAN_F || w == UCDN_EAST_ASIAN_W) ? 2 : 1; -} - -static hb_unicode_general_category_t -hb_ucdn_general_category(hb_unicode_funcs_t *ufuncs, hb_codepoint_t unicode, - void *user_data HB_UNUSED) -{ - return (hb_unicode_general_category_t)ucdn_get_general_category(unicode); -} - -static hb_codepoint_t -hb_ucdn_mirroring(hb_unicode_funcs_t *ufuncs, hb_codepoint_t unicode, - void *user_data HB_UNUSED) -{ - return ucdn_mirror(unicode); -} - -static hb_script_t -hb_ucdn_script(hb_unicode_funcs_t *ufuncs, hb_codepoint_t unicode, - void *user_data HB_UNUSED) -{ - return ucdn_script_translate[ucdn_get_script(unicode)]; -} - -static hb_bool_t -hb_ucdn_compose(hb_unicode_funcs_t *ufuncs, - hb_codepoint_t a, hb_codepoint_t b, hb_codepoint_t *ab, - void *user_data HB_UNUSED) -{ - return ucdn_compose(ab, a, b); -} - -static hb_bool_t -hb_ucdn_decompose(hb_unicode_funcs_t *ufuncs, - hb_codepoint_t ab, hb_codepoint_t *a, hb_codepoint_t *b, - void *user_data HB_UNUSED) -{ - return ucdn_decompose(ab, a, b); -} - -static unsigned int -hb_ucdn_decompose_compatibility(hb_unicode_funcs_t *ufuncs, - hb_codepoint_t u, hb_codepoint_t *decomposed, - void *user_data HB_UNUSED) -{ - return ucdn_compat_decompose(u, decomposed); -} - -extern "C" HB_INTERNAL -hb_unicode_funcs_t * -hb_ucdn_get_unicode_funcs (void) -{ - static const hb_unicode_funcs_t _hb_ucdn_unicode_funcs = { - HB_OBJECT_HEADER_STATIC, - - NULL, /* parent */ - true, /* immutable */ - { -#define HB_UNICODE_FUNC_IMPLEMENT(name) hb_ucdn_##name, - HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS -#undef HB_UNICODE_FUNC_IMPLEMENT - } - }; - - return const_cast<hb_unicode_funcs_t *> (&_hb_ucdn_unicode_funcs); -} - diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-unicode-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-unicode-private.hh deleted file mode 100644 index 155a8a350b7..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-unicode-private.hh +++ /dev/null @@ -1,313 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * Copyright © 2011 Codethink Limited - * Copyright © 2010,2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Codethink Author(s): Ryan Lortie - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_UNICODE_PRIVATE_HH -#define HB_UNICODE_PRIVATE_HH - -#include "hb-private.hh" - -#include "hb-unicode.h" -#include "hb-object-private.hh" - - -extern HB_INTERNAL const uint8_t _hb_modified_combining_class[256]; - -/* - * hb_unicode_funcs_t - */ - -#define HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS \ - HB_UNICODE_FUNC_IMPLEMENT (combining_class) \ - HB_UNICODE_FUNC_IMPLEMENT (eastasian_width) \ - HB_UNICODE_FUNC_IMPLEMENT (general_category) \ - HB_UNICODE_FUNC_IMPLEMENT (mirroring) \ - HB_UNICODE_FUNC_IMPLEMENT (script) \ - HB_UNICODE_FUNC_IMPLEMENT (compose) \ - HB_UNICODE_FUNC_IMPLEMENT (decompose) \ - HB_UNICODE_FUNC_IMPLEMENT (decompose_compatibility) \ - /* ^--- Add new callbacks here */ - -/* Simple callbacks are those taking a hb_codepoint_t and returning a hb_codepoint_t */ -#define HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS_SIMPLE \ - HB_UNICODE_FUNC_IMPLEMENT (hb_unicode_combining_class_t, combining_class) \ - HB_UNICODE_FUNC_IMPLEMENT (unsigned int, eastasian_width) \ - HB_UNICODE_FUNC_IMPLEMENT (hb_unicode_general_category_t, general_category) \ - HB_UNICODE_FUNC_IMPLEMENT (hb_codepoint_t, mirroring) \ - HB_UNICODE_FUNC_IMPLEMENT (hb_script_t, script) \ - /* ^--- Add new simple callbacks here */ - -struct hb_unicode_funcs_t { - hb_object_header_t header; - ASSERT_POD (); - - hb_unicode_funcs_t *parent; - - bool immutable; - -#define HB_UNICODE_FUNC_IMPLEMENT(return_type, name) \ - inline return_type name (hb_codepoint_t unicode) { return func.name (this, unicode, user_data.name); } -HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS_SIMPLE -#undef HB_UNICODE_FUNC_IMPLEMENT - - inline hb_bool_t compose (hb_codepoint_t a, hb_codepoint_t b, - hb_codepoint_t *ab) - { - *ab = 0; - if (unlikely (!a || !b)) return false; - return func.compose (this, a, b, ab, user_data.compose); - } - - inline hb_bool_t decompose (hb_codepoint_t ab, - hb_codepoint_t *a, hb_codepoint_t *b) - { - *a = ab; *b = 0; - return func.decompose (this, ab, a, b, user_data.decompose); - } - - inline unsigned int decompose_compatibility (hb_codepoint_t u, - hb_codepoint_t *decomposed) - { - unsigned int ret = func.decompose_compatibility (this, u, decomposed, user_data.decompose_compatibility); - if (ret == 1 && u == decomposed[0]) { - decomposed[0] = 0; - return 0; - } - decomposed[ret] = 0; - return ret; - } - - - unsigned int - modified_combining_class (hb_codepoint_t unicode) - { - /* XXX This hack belongs to the Myanmar shaper. */ - if (unicode == 0x1037) unicode = 0x103A; - - return _hb_modified_combining_class[combining_class (unicode)]; - } - - inline hb_bool_t - is_variation_selector (hb_codepoint_t unicode) - { - return unlikely (hb_in_ranges<hb_codepoint_t> (unicode, - 0x180B, 0x180D, /* MONGOLIAN FREE VARIATION SELECTOR ONE..THREE */ - 0xFE00, 0xFE0F, /* VARIATION SELECTOR-1..16 */ - 0xE0100, 0xE01EF)); /* VARIATION SELECTOR-17..256 */ - } - - /* Default_Ignorable codepoints: - * - * Note that as of Oct 2012 (Unicode 6.2), U+180E MONGOLIAN VOWEL SEPARATOR - * is NOT Default_Ignorable, but it really behaves in a way that it should - * be. That has been reported to the Unicode Technical Committee for - * consideration. As such, we include it here, since Uniscribe removes it. - * - * Note: While U+115F and U+1160 are Default_Ignorable, we do NOT want to - * hide them, as the way Uniscribe has implemented them is with regular - * spacing glyphs, and that's the way fonts are made to work. As such, - * we make exceptions for those two. - * - * Gathered from: - * http://unicode.org/cldr/utility/list-unicodeset.jsp?a=[:DI:]&abb=on&ucd=on&esc=on - * - * Last updated to the page with the following versions: - * Version 3.6; ICU version: 50.0.1.0; Unicode version: 6.1.0.0 - * - * 4,167 Code Points - * - * [\u00AD\u034F\u115F\u1160\u17B4\u17B5\u180B-\u180D\u200B-\u200F\u202A-\u202E\u2060-\u206F\u3164\uFE00-\uFE0F\uFEFF\uFFA0\uFFF0-\uFFF8\U0001D173-\U0001D17A\U000E0000-\U000E0FFF] - * - * 00AD ;SOFT HYPHEN - * 034F ;COMBINING GRAPHEME JOINER - * #115F ;HANGUL CHOSEONG FILLER - * #1160 ;HANGUL JUNGSEONG FILLER - * 17B4 ;KHMER VOWEL INHERENT AQ - * 17B5 ;KHMER VOWEL INHERENT AA - * 180B..180D ;MONGOLIAN FREE VARIATION SELECTOR THREE - * 200B..200F ;RIGHT-TO-LEFT MARK - * 202A..202E ;RIGHT-TO-LEFT OVERRIDE - * 2060..206F ;NOMINAL DIGIT SHAPES - * 3164 ;HANGUL FILLER - * FE00..FE0F ;VARIATION SELECTOR-16 - * FEFF ;ZERO WIDTH NO-BREAK SPACE - * FFA0 ;HALFWIDTH HANGUL FILLER - * FFF0..FFF8 ;<unassigned-FFF8> - * 1D173..1D17A ;MUSICAL SYMBOL END PHRASE - * E0000..E0FFF ;<unassigned-E0FFF> - */ - inline hb_bool_t - is_default_ignorable (hb_codepoint_t ch) - { - hb_codepoint_t plane = ch >> 16; - if (likely (plane == 0)) - { - /* BMP */ - hb_codepoint_t page = ch >> 8; - switch (page) { - case 0x00: return unlikely (ch == 0x00AD); - case 0x03: return unlikely (ch == 0x034F); - case 0x17: return hb_in_range<hb_codepoint_t> (ch, 0x17B4, 0x17B5); - case 0x18: return hb_in_range<hb_codepoint_t> (ch, 0x180B, 0x180E); - case 0x20: return hb_in_ranges<hb_codepoint_t> (ch, 0x200B, 0x200F, - 0x202A, 0x202E, - 0x2060, 0x206F); - case 0x31: return unlikely (ch == 0x3164); - case 0xFE: return hb_in_range<hb_codepoint_t> (ch, 0xFE00, 0xFE0F) || ch == 0xFEFF; - case 0xFF: return hb_in_range<hb_codepoint_t> (ch, 0xFFF0, 0xFFF8) || ch == 0xFFA0; - default: return false; - } - } - else - { - /* Other planes */ - switch (plane) { - case 0x01: return hb_in_range<hb_codepoint_t> (ch, 0x0001D173, 0x0001D17A); - case 0x0E: return hb_in_range<hb_codepoint_t> (ch, 0x000E0000, 0x000E0FFF); - default: return false; - } - } - } - - - struct { -#define HB_UNICODE_FUNC_IMPLEMENT(name) hb_unicode_##name##_func_t name; - HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS -#undef HB_UNICODE_FUNC_IMPLEMENT - } func; - - struct { -#define HB_UNICODE_FUNC_IMPLEMENT(name) void *name; - HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS -#undef HB_UNICODE_FUNC_IMPLEMENT - } user_data; - - struct { -#define HB_UNICODE_FUNC_IMPLEMENT(name) hb_destroy_func_t name; - HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS -#undef HB_UNICODE_FUNC_IMPLEMENT - } destroy; -}; - - -extern HB_INTERNAL const hb_unicode_funcs_t _hb_unicode_funcs_nil; - - -/* Modified combining marks */ - -/* Hebrew - * - * We permute the "fixed-position" classes 10-26 into the order - * described in the SBL Hebrew manual: - * - * http://www.sbl-site.org/Fonts/SBLHebrewUserManual1.5x.pdf - * - * (as recommended by: - * http://forum.fontlab.com/archive-old-microsoft-volt-group/vista-and-diacritic-ordering-t6751.0.html) - * - * More details here: - * https://bugzilla.mozilla.org/show_bug.cgi?id=662055 - */ -#define HB_MODIFIED_COMBINING_CLASS_CCC10 22 /* sheva */ -#define HB_MODIFIED_COMBINING_CLASS_CCC11 15 /* hataf segol */ -#define HB_MODIFIED_COMBINING_CLASS_CCC12 16 /* hataf patah */ -#define HB_MODIFIED_COMBINING_CLASS_CCC13 17 /* hataf qamats */ -#define HB_MODIFIED_COMBINING_CLASS_CCC14 23 /* hiriq */ -#define HB_MODIFIED_COMBINING_CLASS_CCC15 18 /* tsere */ -#define HB_MODIFIED_COMBINING_CLASS_CCC16 19 /* segol */ -#define HB_MODIFIED_COMBINING_CLASS_CCC17 20 /* patah */ -#define HB_MODIFIED_COMBINING_CLASS_CCC18 21 /* qamats */ -#define HB_MODIFIED_COMBINING_CLASS_CCC19 14 /* holam */ -#define HB_MODIFIED_COMBINING_CLASS_CCC20 24 /* qubuts */ -#define HB_MODIFIED_COMBINING_CLASS_CCC21 12 /* dagesh */ -#define HB_MODIFIED_COMBINING_CLASS_CCC22 25 /* meteg */ -#define HB_MODIFIED_COMBINING_CLASS_CCC23 13 /* rafe */ -#define HB_MODIFIED_COMBINING_CLASS_CCC24 10 /* shin dot */ -#define HB_MODIFIED_COMBINING_CLASS_CCC25 11 /* sin dot */ -#define HB_MODIFIED_COMBINING_CLASS_CCC26 26 /* point varika */ - -/* - * Arabic - * - * Modify to move Shadda (ccc=33) before other marks. See: - * http://unicode.org/faq/normalization.html#8 - * http://unicode.org/faq/normalization.html#9 - */ -#define HB_MODIFIED_COMBINING_CLASS_CCC27 28 /* fathatan */ -#define HB_MODIFIED_COMBINING_CLASS_CCC28 29 /* dammatan */ -#define HB_MODIFIED_COMBINING_CLASS_CCC29 30 /* kasratan */ -#define HB_MODIFIED_COMBINING_CLASS_CCC30 31 /* fatha */ -#define HB_MODIFIED_COMBINING_CLASS_CCC31 32 /* damma */ -#define HB_MODIFIED_COMBINING_CLASS_CCC32 33 /* kasra */ -#define HB_MODIFIED_COMBINING_CLASS_CCC33 27 /* shadda */ -#define HB_MODIFIED_COMBINING_CLASS_CCC34 34 /* sukun */ -#define HB_MODIFIED_COMBINING_CLASS_CCC35 35 /* superscript alef */ - -/* Syriac */ -#define HB_MODIFIED_COMBINING_CLASS_CCC36 36 /* superscript alaph */ - -/* Telugu - * - * Modify Telugu length marks (ccc=84, ccc=91). - * These are the only matras in the main Indic scripts range that have - * a non-zero ccc. That makes them reorder with the Halant that is - * ccc=9. Just zero them, we don't need them in our Indic shaper. - */ -#define HB_MODIFIED_COMBINING_CLASS_CCC84 0 /* length mark */ -#define HB_MODIFIED_COMBINING_CLASS_CCC91 0 /* ai length mark */ - -/* Thai - * - * Modify U+0E38 and U+0E39 (ccc=103) to be reordered before U+0E3A (ccc=9). - * Assign 3, which is unassigned otherwise. - * Uniscribe does this reordering too. - */ -#define HB_MODIFIED_COMBINING_CLASS_CCC103 3 /* sara u / sara uu */ -#define HB_MODIFIED_COMBINING_CLASS_CCC107 107 /* mai * */ - -/* Lao */ -#define HB_MODIFIED_COMBINING_CLASS_CCC118 118 /* sign u / sign uu */ -#define HB_MODIFIED_COMBINING_CLASS_CCC122 122 /* mai * */ - -/* Tibetan */ -#define HB_MODIFIED_COMBINING_CLASS_CCC129 129 /* sign aa */ -#define HB_MODIFIED_COMBINING_CLASS_CCC130 130 /* sign i */ -#define HB_MODIFIED_COMBINING_CLASS_CCC132 132 /* sign u */ - - -/* Misc */ - -#define HB_UNICODE_GENERAL_CATEGORY_IS_MARK(gen_cat) \ - (FLAG (gen_cat) & \ - (FLAG (HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK) | \ - FLAG (HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK) | \ - FLAG (HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK))) - - -#endif /* HB_UNICODE_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-unicode.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-unicode.cc deleted file mode 100644 index 0a3907eec8c..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-unicode.cc +++ /dev/null @@ -1,435 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * Copyright © 2011 Codethink Limited - * Copyright © 2010,2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Codethink Author(s): Ryan Lortie - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-private.hh" - -#include "hb-unicode-private.hh" - - - -/* - * hb_unicode_funcs_t - */ - -static hb_unicode_combining_class_t -hb_unicode_combining_class_nil (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t unicode HB_UNUSED, - void *user_data HB_UNUSED) -{ - return HB_UNICODE_COMBINING_CLASS_NOT_REORDERED; -} - -static unsigned int -hb_unicode_eastasian_width_nil (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t unicode HB_UNUSED, - void *user_data HB_UNUSED) -{ - return 1; -} - -static hb_unicode_general_category_t -hb_unicode_general_category_nil (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t unicode HB_UNUSED, - void *user_data HB_UNUSED) -{ - return HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER; -} - -static hb_codepoint_t -hb_unicode_mirroring_nil (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t unicode HB_UNUSED, - void *user_data HB_UNUSED) -{ - return unicode; -} - -static hb_script_t -hb_unicode_script_nil (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t unicode HB_UNUSED, - void *user_data HB_UNUSED) -{ - return HB_SCRIPT_UNKNOWN; -} - -static hb_bool_t -hb_unicode_compose_nil (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t a HB_UNUSED, - hb_codepoint_t b HB_UNUSED, - hb_codepoint_t *ab HB_UNUSED, - void *user_data HB_UNUSED) -{ - return false; -} - -static hb_bool_t -hb_unicode_decompose_nil (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t ab HB_UNUSED, - hb_codepoint_t *a HB_UNUSED, - hb_codepoint_t *b HB_UNUSED, - void *user_data HB_UNUSED) -{ - return false; -} - - -static unsigned int -hb_unicode_decompose_compatibility_nil (hb_unicode_funcs_t *ufuncs HB_UNUSED, - hb_codepoint_t u HB_UNUSED, - hb_codepoint_t *decomposed HB_UNUSED, - void *user_data HB_UNUSED) -{ - return 0; -} - - -#define HB_UNICODE_FUNCS_IMPLEMENT_SET \ - HB_UNICODE_FUNCS_IMPLEMENT (glib) \ - HB_UNICODE_FUNCS_IMPLEMENT (icu) \ - HB_UNICODE_FUNCS_IMPLEMENT (ucdn) \ - HB_UNICODE_FUNCS_IMPLEMENT (nil) \ - /* ^--- Add new callbacks before nil */ - -#define hb_nil_get_unicode_funcs hb_unicode_funcs_get_empty - -/* Prototype them all */ -#define HB_UNICODE_FUNCS_IMPLEMENT(set) \ -extern "C" hb_unicode_funcs_t *hb_##set##_get_unicode_funcs (void); -HB_UNICODE_FUNCS_IMPLEMENT_SET -#undef HB_UNICODE_FUNCS_IMPLEMENT - - -hb_unicode_funcs_t * -hb_unicode_funcs_get_default (void) -{ -#define HB_UNICODE_FUNCS_IMPLEMENT(set) \ - return hb_##set##_get_unicode_funcs (); - -#ifdef HAVE_GLIB - HB_UNICODE_FUNCS_IMPLEMENT(glib) -#elif defined(HAVE_ICU) - HB_UNICODE_FUNCS_IMPLEMENT(icu) -#elif defined(HAVE_UCDN) - HB_UNICODE_FUNCS_IMPLEMENT(ucdn) -#else -#define HB_UNICODE_FUNCS_NIL 1 - HB_UNICODE_FUNCS_IMPLEMENT(nil) -#endif - -#undef HB_UNICODE_FUNCS_IMPLEMENT -} - -#if !defined(HB_NO_UNICODE_FUNCS) && defined(HB_UNICODE_FUNCS_NIL) -#pragma message("Could not find any Unicode functions implementation, you have to provide your own.") -#pragma message("To suppress this warnings, define HB_NO_UNICODE_FUNCS.") -#endif - -hb_unicode_funcs_t * -hb_unicode_funcs_create (hb_unicode_funcs_t *parent) -{ - hb_unicode_funcs_t *ufuncs; - - if (!(ufuncs = hb_object_create<hb_unicode_funcs_t> ())) - return hb_unicode_funcs_get_empty (); - - if (!parent) - parent = hb_unicode_funcs_get_empty (); - - hb_unicode_funcs_make_immutable (parent); - ufuncs->parent = hb_unicode_funcs_reference (parent); - - ufuncs->func = parent->func; - - /* We can safely copy user_data from parent since we hold a reference - * onto it and it's immutable. We should not copy the destroy notifiers - * though. */ - ufuncs->user_data = parent->user_data; - - return ufuncs; -} - - -const hb_unicode_funcs_t _hb_unicode_funcs_nil = { - HB_OBJECT_HEADER_STATIC, - - NULL, /* parent */ - true, /* immutable */ - { -#define HB_UNICODE_FUNC_IMPLEMENT(name) hb_unicode_##name##_nil, - HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS -#undef HB_UNICODE_FUNC_IMPLEMENT - } -}; - -hb_unicode_funcs_t * -hb_unicode_funcs_get_empty (void) -{ - return const_cast<hb_unicode_funcs_t *> (&_hb_unicode_funcs_nil); -} - -hb_unicode_funcs_t * -hb_unicode_funcs_reference (hb_unicode_funcs_t *ufuncs) -{ - return hb_object_reference (ufuncs); -} - -void -hb_unicode_funcs_destroy (hb_unicode_funcs_t *ufuncs) -{ - if (!hb_object_destroy (ufuncs)) return; - -#define HB_UNICODE_FUNC_IMPLEMENT(name) \ - if (ufuncs->destroy.name) ufuncs->destroy.name (ufuncs->user_data.name); - HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS -#undef HB_UNICODE_FUNC_IMPLEMENT - - hb_unicode_funcs_destroy (ufuncs->parent); - - free (ufuncs); -} - -hb_bool_t -hb_unicode_funcs_set_user_data (hb_unicode_funcs_t *ufuncs, - hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy, - hb_bool_t replace) -{ - return hb_object_set_user_data (ufuncs, key, data, destroy, replace); -} - -void * -hb_unicode_funcs_get_user_data (hb_unicode_funcs_t *ufuncs, - hb_user_data_key_t *key) -{ - return hb_object_get_user_data (ufuncs, key); -} - - -void -hb_unicode_funcs_make_immutable (hb_unicode_funcs_t *ufuncs) -{ - if (hb_object_is_inert (ufuncs)) - return; - - ufuncs->immutable = true; -} - -hb_bool_t -hb_unicode_funcs_is_immutable (hb_unicode_funcs_t *ufuncs) -{ - return ufuncs->immutable; -} - -hb_unicode_funcs_t * -hb_unicode_funcs_get_parent (hb_unicode_funcs_t *ufuncs) -{ - return ufuncs->parent ? ufuncs->parent : hb_unicode_funcs_get_empty (); -} - - -#define HB_UNICODE_FUNC_IMPLEMENT(name) \ - \ -void \ -hb_unicode_funcs_set_##name##_func (hb_unicode_funcs_t *ufuncs, \ - hb_unicode_##name##_func_t func, \ - void *user_data, \ - hb_destroy_func_t destroy) \ -{ \ - if (ufuncs->immutable) \ - return; \ - \ - if (ufuncs->destroy.name) \ - ufuncs->destroy.name (ufuncs->user_data.name); \ - \ - if (func) { \ - ufuncs->func.name = func; \ - ufuncs->user_data.name = user_data; \ - ufuncs->destroy.name = destroy; \ - } else { \ - ufuncs->func.name = ufuncs->parent->func.name; \ - ufuncs->user_data.name = ufuncs->parent->user_data.name; \ - ufuncs->destroy.name = NULL; \ - } \ -} - -HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS -#undef HB_UNICODE_FUNC_IMPLEMENT - - -#define HB_UNICODE_FUNC_IMPLEMENT(return_type, name) \ - \ -return_type \ -hb_unicode_##name (hb_unicode_funcs_t *ufuncs, \ - hb_codepoint_t unicode) \ -{ \ - return ufuncs->name (unicode); \ -} -HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS_SIMPLE -#undef HB_UNICODE_FUNC_IMPLEMENT - -hb_bool_t -hb_unicode_compose (hb_unicode_funcs_t *ufuncs, - hb_codepoint_t a, - hb_codepoint_t b, - hb_codepoint_t *ab) -{ - return ufuncs->compose (a, b, ab); -} - -hb_bool_t -hb_unicode_decompose (hb_unicode_funcs_t *ufuncs, - hb_codepoint_t ab, - hb_codepoint_t *a, - hb_codepoint_t *b) -{ - return ufuncs->decompose (ab, a, b); -} - -unsigned int -hb_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs, - hb_codepoint_t u, - hb_codepoint_t *decomposed) -{ - return ufuncs->decompose_compatibility (u, decomposed); -} - - -/* See hb-unicode-private.hh for details. */ -const uint8_t -_hb_modified_combining_class[256] = -{ - 0, /* HB_UNICODE_COMBINING_CLASS_NOT_REORDERED */ - 1, /* HB_UNICODE_COMBINING_CLASS_OVERLAY */ - 2, 3, 4, 5, 6, - 7, /* HB_UNICODE_COMBINING_CLASS_NUKTA */ - 8, /* HB_UNICODE_COMBINING_CLASS_KANA_VOICING */ - 9, /* HB_UNICODE_COMBINING_CLASS_VIRAMA */ - - /* Hebrew */ - HB_MODIFIED_COMBINING_CLASS_CCC10, - HB_MODIFIED_COMBINING_CLASS_CCC11, - HB_MODIFIED_COMBINING_CLASS_CCC12, - HB_MODIFIED_COMBINING_CLASS_CCC13, - HB_MODIFIED_COMBINING_CLASS_CCC14, - HB_MODIFIED_COMBINING_CLASS_CCC15, - HB_MODIFIED_COMBINING_CLASS_CCC16, - HB_MODIFIED_COMBINING_CLASS_CCC17, - HB_MODIFIED_COMBINING_CLASS_CCC18, - HB_MODIFIED_COMBINING_CLASS_CCC19, - HB_MODIFIED_COMBINING_CLASS_CCC20, - HB_MODIFIED_COMBINING_CLASS_CCC21, - HB_MODIFIED_COMBINING_CLASS_CCC22, - HB_MODIFIED_COMBINING_CLASS_CCC23, - HB_MODIFIED_COMBINING_CLASS_CCC24, - HB_MODIFIED_COMBINING_CLASS_CCC25, - HB_MODIFIED_COMBINING_CLASS_CCC26, - - /* Arabic */ - HB_MODIFIED_COMBINING_CLASS_CCC27, - HB_MODIFIED_COMBINING_CLASS_CCC28, - HB_MODIFIED_COMBINING_CLASS_CCC29, - HB_MODIFIED_COMBINING_CLASS_CCC30, - HB_MODIFIED_COMBINING_CLASS_CCC31, - HB_MODIFIED_COMBINING_CLASS_CCC32, - HB_MODIFIED_COMBINING_CLASS_CCC33, - HB_MODIFIED_COMBINING_CLASS_CCC34, - HB_MODIFIED_COMBINING_CLASS_CCC35, - - /* Syriac */ - HB_MODIFIED_COMBINING_CLASS_CCC36, - - 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, - 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, - 80, 81, 82, 83, - - /* Telugu */ - HB_MODIFIED_COMBINING_CLASS_CCC84, - 85, 86, 87, 88, 89, 90, - HB_MODIFIED_COMBINING_CLASS_CCC91, - 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, - - /* Thai */ - HB_MODIFIED_COMBINING_CLASS_CCC103, - 104, 105, 106, - HB_MODIFIED_COMBINING_CLASS_CCC107, - 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, - - /* Lao */ - HB_MODIFIED_COMBINING_CLASS_CCC118, - 119, 120, 121, - HB_MODIFIED_COMBINING_CLASS_CCC122, - 123, 124, 125, 126, 127, 128, - - /* Tibetan */ - HB_MODIFIED_COMBINING_CLASS_CCC129, - HB_MODIFIED_COMBINING_CLASS_CCC130, - 131, - HB_MODIFIED_COMBINING_CLASS_CCC132, - 133, 134, 135, 136, 137, 138, 139, - - - 140, 141, 142, 143, 144, 145, 146, 147, 148, 149, - 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, - 160, 161, 162, 163, 164, 165, 166, 167, 168, 169, - 170, 171, 172, 173, 174, 175, 176, 177, 178, 179, - 180, 181, 182, 183, 184, 185, 186, 187, 188, 189, - 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, - - 200, /* HB_UNICODE_COMBINING_CLASS_ATTACHED_BELOW_LEFT */ - 201, - 202, /* HB_UNICODE_COMBINING_CLASS_ATTACHED_BELOW */ - 203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, - 214, /* HB_UNICODE_COMBINING_CLASS_ATTACHED_ABOVE */ - 215, - 216, /* HB_UNICODE_COMBINING_CLASS_ATTACHED_ABOVE_RIGHT */ - 217, - 218, /* HB_UNICODE_COMBINING_CLASS_BELOW_LEFT */ - 219, - 220, /* HB_UNICODE_COMBINING_CLASS_BELOW */ - 221, - 222, /* HB_UNICODE_COMBINING_CLASS_BELOW_RIGHT */ - 223, - 224, /* HB_UNICODE_COMBINING_CLASS_LEFT */ - 225, - 226, /* HB_UNICODE_COMBINING_CLASS_RIGHT */ - 227, - 228, /* HB_UNICODE_COMBINING_CLASS_ABOVE_LEFT */ - 229, - 230, /* HB_UNICODE_COMBINING_CLASS_ABOVE */ - 231, - 232, /* HB_UNICODE_COMBINING_CLASS_ABOVE_RIGHT */ - 233, /* HB_UNICODE_COMBINING_CLASS_DOUBLE_BELOW */ - 234, /* HB_UNICODE_COMBINING_CLASS_DOUBLE_ABOVE */ - 235, 236, 237, 238, 239, - 240, /* HB_UNICODE_COMBINING_CLASS_IOTA_SUBSCRIPT */ - 241, 242, 243, 244, 245, 246, 247, 248, 249, 250, 251, 252, 253, 254, - 255, /* HB_UNICODE_COMBINING_CLASS_INVALID */ -}; diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-unicode.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-unicode.h deleted file mode 100644 index 2e10d98a3b3..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-unicode.h +++ /dev/null @@ -1,357 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * Copyright © 2011 Codethink Limited - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - * Codethink Author(s): Ryan Lortie - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_H_IN -#error "Include <hb.h> instead." -#endif - -#ifndef HB_UNICODE_H -#define HB_UNICODE_H - -#include "hb-common.h" - -HB_BEGIN_DECLS - - -/* hb_unicode_general_category_t */ - -/* Unicode Character Database property: General_Category (gc) */ -typedef enum -{ - HB_UNICODE_GENERAL_CATEGORY_CONTROL, /* Cc */ - HB_UNICODE_GENERAL_CATEGORY_FORMAT, /* Cf */ - HB_UNICODE_GENERAL_CATEGORY_UNASSIGNED, /* Cn */ - HB_UNICODE_GENERAL_CATEGORY_PRIVATE_USE, /* Co */ - HB_UNICODE_GENERAL_CATEGORY_SURROGATE, /* Cs */ - HB_UNICODE_GENERAL_CATEGORY_LOWERCASE_LETTER, /* Ll */ - HB_UNICODE_GENERAL_CATEGORY_MODIFIER_LETTER, /* Lm */ - HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER, /* Lo */ - HB_UNICODE_GENERAL_CATEGORY_TITLECASE_LETTER, /* Lt */ - HB_UNICODE_GENERAL_CATEGORY_UPPERCASE_LETTER, /* Lu */ - HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK, /* Mc */ - HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK, /* Me */ - HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK, /* Mn */ - HB_UNICODE_GENERAL_CATEGORY_DECIMAL_NUMBER, /* Nd */ - HB_UNICODE_GENERAL_CATEGORY_LETTER_NUMBER, /* Nl */ - HB_UNICODE_GENERAL_CATEGORY_OTHER_NUMBER, /* No */ - HB_UNICODE_GENERAL_CATEGORY_CONNECT_PUNCTUATION, /* Pc */ - HB_UNICODE_GENERAL_CATEGORY_DASH_PUNCTUATION, /* Pd */ - HB_UNICODE_GENERAL_CATEGORY_CLOSE_PUNCTUATION, /* Pe */ - HB_UNICODE_GENERAL_CATEGORY_FINAL_PUNCTUATION, /* Pf */ - HB_UNICODE_GENERAL_CATEGORY_INITIAL_PUNCTUATION, /* Pi */ - HB_UNICODE_GENERAL_CATEGORY_OTHER_PUNCTUATION, /* Po */ - HB_UNICODE_GENERAL_CATEGORY_OPEN_PUNCTUATION, /* Ps */ - HB_UNICODE_GENERAL_CATEGORY_CURRENCY_SYMBOL, /* Sc */ - HB_UNICODE_GENERAL_CATEGORY_MODIFIER_SYMBOL, /* Sk */ - HB_UNICODE_GENERAL_CATEGORY_MATH_SYMBOL, /* Sm */ - HB_UNICODE_GENERAL_CATEGORY_OTHER_SYMBOL, /* So */ - HB_UNICODE_GENERAL_CATEGORY_LINE_SEPARATOR, /* Zl */ - HB_UNICODE_GENERAL_CATEGORY_PARAGRAPH_SEPARATOR, /* Zp */ - HB_UNICODE_GENERAL_CATEGORY_SPACE_SEPARATOR /* Zs */ -} hb_unicode_general_category_t; - -/* hb_unicode_combining_class_t */ - -/* Note: newer versions of Unicode may add new values. Clients should be ready to handle - * any value in the 0..254 range being returned from hb_unicode_combining_class(). - */ - -/* Unicode Character Database property: Canonical_Combining_Class (ccc) */ -typedef enum -{ - HB_UNICODE_COMBINING_CLASS_NOT_REORDERED = 0, - HB_UNICODE_COMBINING_CLASS_OVERLAY = 1, - HB_UNICODE_COMBINING_CLASS_NUKTA = 7, - HB_UNICODE_COMBINING_CLASS_KANA_VOICING = 8, - HB_UNICODE_COMBINING_CLASS_VIRAMA = 9, - - /* Hebrew */ - HB_UNICODE_COMBINING_CLASS_CCC10 = 10, - HB_UNICODE_COMBINING_CLASS_CCC11 = 11, - HB_UNICODE_COMBINING_CLASS_CCC12 = 12, - HB_UNICODE_COMBINING_CLASS_CCC13 = 13, - HB_UNICODE_COMBINING_CLASS_CCC14 = 14, - HB_UNICODE_COMBINING_CLASS_CCC15 = 15, - HB_UNICODE_COMBINING_CLASS_CCC16 = 16, - HB_UNICODE_COMBINING_CLASS_CCC17 = 17, - HB_UNICODE_COMBINING_CLASS_CCC18 = 18, - HB_UNICODE_COMBINING_CLASS_CCC19 = 19, - HB_UNICODE_COMBINING_CLASS_CCC20 = 20, - HB_UNICODE_COMBINING_CLASS_CCC21 = 21, - HB_UNICODE_COMBINING_CLASS_CCC22 = 22, - HB_UNICODE_COMBINING_CLASS_CCC23 = 23, - HB_UNICODE_COMBINING_CLASS_CCC24 = 24, - HB_UNICODE_COMBINING_CLASS_CCC25 = 25, - HB_UNICODE_COMBINING_CLASS_CCC26 = 26, - - /* Arabic */ - HB_UNICODE_COMBINING_CLASS_CCC27 = 27, - HB_UNICODE_COMBINING_CLASS_CCC28 = 28, - HB_UNICODE_COMBINING_CLASS_CCC29 = 29, - HB_UNICODE_COMBINING_CLASS_CCC30 = 30, - HB_UNICODE_COMBINING_CLASS_CCC31 = 31, - HB_UNICODE_COMBINING_CLASS_CCC32 = 32, - HB_UNICODE_COMBINING_CLASS_CCC33 = 33, - HB_UNICODE_COMBINING_CLASS_CCC34 = 34, - HB_UNICODE_COMBINING_CLASS_CCC35 = 35, - - /* Syriac */ - HB_UNICODE_COMBINING_CLASS_CCC36 = 36, - - /* Telugu */ - HB_UNICODE_COMBINING_CLASS_CCC84 = 84, - HB_UNICODE_COMBINING_CLASS_CCC91 = 91, - - /* Thai */ - HB_UNICODE_COMBINING_CLASS_CCC103 = 103, - HB_UNICODE_COMBINING_CLASS_CCC107 = 107, - - /* Lao */ - HB_UNICODE_COMBINING_CLASS_CCC118 = 118, - HB_UNICODE_COMBINING_CLASS_CCC122 = 122, - - /* Tibetan */ - HB_UNICODE_COMBINING_CLASS_CCC129 = 129, - HB_UNICODE_COMBINING_CLASS_CCC130 = 130, - HB_UNICODE_COMBINING_CLASS_CCC133 = 132, - - - HB_UNICODE_COMBINING_CLASS_ATTACHED_BELOW_LEFT = 200, - HB_UNICODE_COMBINING_CLASS_ATTACHED_BELOW = 202, - HB_UNICODE_COMBINING_CLASS_ATTACHED_ABOVE = 214, - HB_UNICODE_COMBINING_CLASS_ATTACHED_ABOVE_RIGHT = 216, - HB_UNICODE_COMBINING_CLASS_BELOW_LEFT = 218, - HB_UNICODE_COMBINING_CLASS_BELOW = 220, - HB_UNICODE_COMBINING_CLASS_BELOW_RIGHT = 222, - HB_UNICODE_COMBINING_CLASS_LEFT = 224, - HB_UNICODE_COMBINING_CLASS_RIGHT = 226, - HB_UNICODE_COMBINING_CLASS_ABOVE_LEFT = 228, - HB_UNICODE_COMBINING_CLASS_ABOVE = 230, - HB_UNICODE_COMBINING_CLASS_ABOVE_RIGHT = 232, - HB_UNICODE_COMBINING_CLASS_DOUBLE_BELOW = 233, - HB_UNICODE_COMBINING_CLASS_DOUBLE_ABOVE = 234, - - HB_UNICODE_COMBINING_CLASS_IOTA_SUBSCRIPT = 240, - - HB_UNICODE_COMBINING_CLASS_INVALID = 255 -} hb_unicode_combining_class_t; - - -/* - * hb_unicode_funcs_t - */ - -typedef struct hb_unicode_funcs_t hb_unicode_funcs_t; - - -/* - * just give me the best implementation you've got there. - */ -hb_unicode_funcs_t * -hb_unicode_funcs_get_default (void); - - -hb_unicode_funcs_t * -hb_unicode_funcs_create (hb_unicode_funcs_t *parent); - -hb_unicode_funcs_t * -hb_unicode_funcs_get_empty (void); - -hb_unicode_funcs_t * -hb_unicode_funcs_reference (hb_unicode_funcs_t *ufuncs); - -void -hb_unicode_funcs_destroy (hb_unicode_funcs_t *ufuncs); - -hb_bool_t -hb_unicode_funcs_set_user_data (hb_unicode_funcs_t *ufuncs, - hb_user_data_key_t *key, - void * data, - hb_destroy_func_t destroy, - hb_bool_t replace); - - -void * -hb_unicode_funcs_get_user_data (hb_unicode_funcs_t *ufuncs, - hb_user_data_key_t *key); - - -void -hb_unicode_funcs_make_immutable (hb_unicode_funcs_t *ufuncs); - -hb_bool_t -hb_unicode_funcs_is_immutable (hb_unicode_funcs_t *ufuncs); - -hb_unicode_funcs_t * -hb_unicode_funcs_get_parent (hb_unicode_funcs_t *ufuncs); - - -/* - * funcs - */ - -/* typedefs */ - -typedef hb_unicode_combining_class_t (*hb_unicode_combining_class_func_t) (hb_unicode_funcs_t *ufuncs, - hb_codepoint_t unicode, - void *user_data); -typedef unsigned int (*hb_unicode_eastasian_width_func_t) (hb_unicode_funcs_t *ufuncs, - hb_codepoint_t unicode, - void *user_data); -typedef hb_unicode_general_category_t (*hb_unicode_general_category_func_t) (hb_unicode_funcs_t *ufuncs, - hb_codepoint_t unicode, - void *user_data); -typedef hb_codepoint_t (*hb_unicode_mirroring_func_t) (hb_unicode_funcs_t *ufuncs, - hb_codepoint_t unicode, - void *user_data); -typedef hb_script_t (*hb_unicode_script_func_t) (hb_unicode_funcs_t *ufuncs, - hb_codepoint_t unicode, - void *user_data); - -typedef hb_bool_t (*hb_unicode_compose_func_t) (hb_unicode_funcs_t *ufuncs, - hb_codepoint_t a, - hb_codepoint_t b, - hb_codepoint_t *ab, - void *user_data); -typedef hb_bool_t (*hb_unicode_decompose_func_t) (hb_unicode_funcs_t *ufuncs, - hb_codepoint_t ab, - hb_codepoint_t *a, - hb_codepoint_t *b, - void *user_data); - -/** - * hb_unicode_decompose_compatibility_func_t: - * @ufuncs: Unicode function structure - * @u: codepoint to decompose - * @decomposed: address of codepoint array (of length %HB_UNICODE_MAX_DECOMPOSITION_LEN) to write decomposition into - * @user_data: user data pointer as passed to hb_unicode_funcs_set_decompose_compatibility_func() - * - * Fully decompose @u to its Unicode compatibility decomposition. The codepoints of the decomposition will be written to @decomposed. - * The complete length of the decomposition will be returned. - * - * If @u has no compatibility decomposition, zero should be returned. - * - * The Unicode standard guarantees that a buffer of length %HB_UNICODE_MAX_DECOMPOSITION_LEN codepoints will always be sufficient for any - * compatibility decomposition plus an terminating value of 0. Consequently, @decompose must be allocated by the caller to be at least this length. Implementations - * of this function type must ensure that they do not write past the provided array. - * - * Return value: number of codepoints in the full compatibility decomposition of @u, or 0 if no decomposition available. - */ -typedef unsigned int (*hb_unicode_decompose_compatibility_func_t) (hb_unicode_funcs_t *ufuncs, - hb_codepoint_t u, - hb_codepoint_t *decomposed, - void *user_data); - -/* See Unicode 6.1 for details on the maximum decomposition length. */ -#define HB_UNICODE_MAX_DECOMPOSITION_LEN (18+1) /* codepoints */ - -/* setters */ - -void -hb_unicode_funcs_set_combining_class_func (hb_unicode_funcs_t *ufuncs, - hb_unicode_combining_class_func_t combining_class_func, - void *user_data, hb_destroy_func_t destroy); - -void -hb_unicode_funcs_set_eastasian_width_func (hb_unicode_funcs_t *ufuncs, - hb_unicode_eastasian_width_func_t eastasian_width_func, - void *user_data, hb_destroy_func_t destroy); - -void -hb_unicode_funcs_set_general_category_func (hb_unicode_funcs_t *ufuncs, - hb_unicode_general_category_func_t general_category_func, - void *user_data, hb_destroy_func_t destroy); - -void -hb_unicode_funcs_set_mirroring_func (hb_unicode_funcs_t *ufuncs, - hb_unicode_mirroring_func_t mirroring_func, - void *user_data, hb_destroy_func_t destroy); - -void -hb_unicode_funcs_set_script_func (hb_unicode_funcs_t *ufuncs, - hb_unicode_script_func_t script_func, - void *user_data, hb_destroy_func_t destroy); - -void -hb_unicode_funcs_set_compose_func (hb_unicode_funcs_t *ufuncs, - hb_unicode_compose_func_t compose_func, - void *user_data, hb_destroy_func_t destroy); - -void -hb_unicode_funcs_set_decompose_func (hb_unicode_funcs_t *ufuncs, - hb_unicode_decompose_func_t decompose_func, - void *user_data, hb_destroy_func_t destroy); - -void -hb_unicode_funcs_set_decompose_compatibility_func (hb_unicode_funcs_t *ufuncs, - hb_unicode_decompose_compatibility_func_t decompose_compatibility_func, - void *user_data, hb_destroy_func_t destroy); - -/* accessors */ - -hb_unicode_combining_class_t -hb_unicode_combining_class (hb_unicode_funcs_t *ufuncs, - hb_codepoint_t unicode); - -unsigned int -hb_unicode_eastasian_width (hb_unicode_funcs_t *ufuncs, - hb_codepoint_t unicode); - -hb_unicode_general_category_t -hb_unicode_general_category (hb_unicode_funcs_t *ufuncs, - hb_codepoint_t unicode); - -hb_codepoint_t -hb_unicode_mirroring (hb_unicode_funcs_t *ufuncs, - hb_codepoint_t unicode); - -hb_script_t -hb_unicode_script (hb_unicode_funcs_t *ufuncs, - hb_codepoint_t unicode); - -hb_bool_t -hb_unicode_compose (hb_unicode_funcs_t *ufuncs, - hb_codepoint_t a, - hb_codepoint_t b, - hb_codepoint_t *ab); -hb_bool_t -hb_unicode_decompose (hb_unicode_funcs_t *ufuncs, - hb_codepoint_t ab, - hb_codepoint_t *a, - hb_codepoint_t *b); - -unsigned int -hb_unicode_decompose_compatibility (hb_unicode_funcs_t *ufuncs, - hb_codepoint_t u, - hb_codepoint_t *decomposed); - -HB_END_DECLS - -#endif /* HB_UNICODE_H */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-uniscribe.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-uniscribe.cc deleted file mode 100644 index 2f01c28778f..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-uniscribe.cc +++ /dev/null @@ -1,475 +0,0 @@ -/* - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#define _WIN32_WINNT 0x0600 -#define WIN32_LEAN_AND_MEAN - -#define HB_SHAPER uniscribe -#include "hb-shaper-impl-private.hh" - -#include <windows.h> -#include <usp10.h> - -#include "hb-uniscribe.h" - -#include "hb-ot-name-table.hh" -#include "hb-ot-tag.h" - - -#ifndef HB_DEBUG_UNISCRIBE -#define HB_DEBUG_UNISCRIBE (HB_DEBUG+0) -#endif - - -/* -DWORD GetFontData( - __in HDC hdc, - __in DWORD dwTable, - __in DWORD dwOffset, - __out LPVOID lpvBuffer, - __in DWORD cbData -); -*/ - - -HB_SHAPER_DATA_ENSURE_DECLARE(uniscribe, face) -HB_SHAPER_DATA_ENSURE_DECLARE(uniscribe, font) - - -/* - * shaper face data - */ - -struct hb_uniscribe_shaper_face_data_t { - HANDLE fh; -}; - -hb_uniscribe_shaper_face_data_t * -_hb_uniscribe_shaper_face_data_create (hb_face_t *face) -{ - hb_uniscribe_shaper_face_data_t *data = (hb_uniscribe_shaper_face_data_t *) calloc (1, sizeof (hb_uniscribe_shaper_face_data_t)); - if (unlikely (!data)) - return NULL; - - hb_blob_t *blob = hb_face_reference_blob (face); - unsigned int blob_length; - const char *blob_data = hb_blob_get_data (blob, &blob_length); - if (unlikely (!blob_length)) - DEBUG_MSG (UNISCRIBE, face, "Face has empty blob"); - - DWORD num_fonts_installed; - data->fh = AddFontMemResourceEx ((void *) blob_data, blob_length, 0, &num_fonts_installed); - hb_blob_destroy (blob); - if (unlikely (!data->fh)) { - DEBUG_MSG (UNISCRIBE, face, "Face AddFontMemResourceEx() failed"); - free (data); - return NULL; - } - - return data; -} - -void -_hb_uniscribe_shaper_face_data_destroy (hb_uniscribe_shaper_face_data_t *data) -{ - RemoveFontMemResourceEx (data->fh); - free (data); -} - - -/* - * shaper font data - */ - -struct hb_uniscribe_shaper_font_data_t { - HDC hdc; - LOGFONTW log_font; - HFONT hfont; - SCRIPT_CACHE script_cache; -}; - -static bool -populate_log_font (LOGFONTW *lf, - hb_font_t *font) -{ - memset (lf, 0, sizeof (*lf)); - lf->lfHeight = -font->y_scale; - lf->lfCharSet = DEFAULT_CHARSET; - - hb_blob_t *blob = OT::Sanitizer<OT::name>::sanitize (hb_face_reference_table (font->face, HB_TAG ('n','a','m','e'))); - const OT::name *name_table = OT::Sanitizer<OT::name>::lock_instance (blob); - unsigned int len = name_table->get_name (3, 1, 0x409, 4, - lf->lfFaceName, - sizeof (lf->lfFaceName[0]) * LF_FACESIZE) - / sizeof (lf->lfFaceName[0]); - hb_blob_destroy (blob); - - if (unlikely (!len)) { - DEBUG_MSG (UNISCRIBE, NULL, "Didn't find English name table entry"); - return false; - } - if (unlikely (len >= LF_FACESIZE)) { - DEBUG_MSG (UNISCRIBE, NULL, "Font name too long"); - return false; - } - - for (unsigned int i = 0; i < len; i++) - lf->lfFaceName[i] = hb_be_uint16 (lf->lfFaceName[i]); - lf->lfFaceName[len] = 0; - - return true; -} - -hb_uniscribe_shaper_font_data_t * -_hb_uniscribe_shaper_font_data_create (hb_font_t *font) -{ - if (unlikely (!hb_uniscribe_shaper_face_data_ensure (font->face))) return NULL; - - hb_uniscribe_shaper_font_data_t *data = (hb_uniscribe_shaper_font_data_t *) calloc (1, sizeof (hb_uniscribe_shaper_font_data_t)); - if (unlikely (!data)) - return NULL; - - data->hdc = GetDC (NULL); - - if (unlikely (!populate_log_font (&data->log_font, font))) { - DEBUG_MSG (UNISCRIBE, font, "Font populate_log_font() failed"); - _hb_uniscribe_shaper_font_data_destroy (data); - return NULL; - } - - data->hfont = CreateFontIndirectW (&data->log_font); - if (unlikely (!data->hfont)) { - DEBUG_MSG (UNISCRIBE, font, "Font CreateFontIndirectW() failed"); - _hb_uniscribe_shaper_font_data_destroy (data); - return NULL; - } - - if (!SelectObject (data->hdc, data->hfont)) { - DEBUG_MSG (UNISCRIBE, font, "Font SelectObject() failed"); - _hb_uniscribe_shaper_font_data_destroy (data); - return NULL; - } - - return data; -} - -void -_hb_uniscribe_shaper_font_data_destroy (hb_uniscribe_shaper_font_data_t *data) -{ - if (data->hdc) - ReleaseDC (NULL, data->hdc); - if (data->hfont) - DeleteObject (data->hfont); - if (data->script_cache) - ScriptFreeCache (&data->script_cache); - free (data); -} - -LOGFONTW * -hb_uniscribe_font_get_logfontw (hb_font_t *font) -{ - if (unlikely (!hb_uniscribe_shaper_font_data_ensure (font))) return NULL; - hb_uniscribe_shaper_font_data_t *font_data = HB_SHAPER_DATA_GET (font); - return &font_data->log_font; -} - -HFONT -hb_uniscribe_font_get_hfont (hb_font_t *font) -{ - if (unlikely (!hb_uniscribe_shaper_font_data_ensure (font))) return NULL; - hb_uniscribe_shaper_font_data_t *font_data = HB_SHAPER_DATA_GET (font); - return font_data->hfont; -} - - -/* - * shaper shape_plan data - */ - -struct hb_uniscribe_shaper_shape_plan_data_t {}; - -hb_uniscribe_shaper_shape_plan_data_t * -_hb_uniscribe_shaper_shape_plan_data_create (hb_shape_plan_t *shape_plan HB_UNUSED, - const hb_feature_t *user_features HB_UNUSED, - unsigned int num_user_features HB_UNUSED) -{ - return (hb_uniscribe_shaper_shape_plan_data_t *) HB_SHAPER_DATA_SUCCEEDED; -} - -void -_hb_uniscribe_shaper_shape_plan_data_destroy (hb_uniscribe_shaper_shape_plan_data_t *data HB_UNUSED) -{ -} - - -/* - * shaper - */ - - -hb_bool_t -_hb_uniscribe_shape (hb_shape_plan_t *shape_plan, - hb_font_t *font, - hb_buffer_t *buffer, - const hb_feature_t *features, - unsigned int num_features) -{ - hb_face_t *face = font->face; - hb_uniscribe_shaper_face_data_t *face_data = HB_SHAPER_DATA_GET (face); - hb_uniscribe_shaper_font_data_t *font_data = HB_SHAPER_DATA_GET (font); - -#define FAIL(...) \ - HB_STMT_START { \ - DEBUG_MSG (UNISCRIBE, NULL, __VA_ARGS__); \ - return false; \ - } HB_STMT_END; - - HRESULT hr; - -retry: - - unsigned int scratch_size; - char *scratch = (char *) buffer->get_scratch_buffer (&scratch_size); - - /* Allocate char buffers; they all fit */ - -#define ALLOCATE_ARRAY(Type, name, len) \ - Type *name = (Type *) scratch; \ - scratch += (len) * sizeof ((name)[0]); \ - scratch_size -= (len) * sizeof ((name)[0]); - -#define utf16_index() var1.u32 - - WCHAR *pchars = (WCHAR *) scratch; - unsigned int chars_len = 0; - for (unsigned int i = 0; i < buffer->len; i++) { - hb_codepoint_t c = buffer->info[i].codepoint; - buffer->info[i].utf16_index() = chars_len; - if (likely (c < 0x10000)) - pchars[chars_len++] = c; - else if (unlikely (c >= 0x110000)) - pchars[chars_len++] = 0xFFFD; - else { - pchars[chars_len++] = 0xD800 + ((c - 0x10000) >> 10); - pchars[chars_len++] = 0xDC00 + ((c - 0x10000) & ((1 << 10) - 1)); - } - } - - ALLOCATE_ARRAY (WCHAR, wchars, chars_len); - ALLOCATE_ARRAY (WORD, log_clusters, chars_len); - ALLOCATE_ARRAY (SCRIPT_CHARPROP, char_props, chars_len); - - /* On Windows, we don't care about alignment...*/ - unsigned int glyphs_size = scratch_size / (sizeof (WORD) + - sizeof (SCRIPT_GLYPHPROP) + - sizeof (int) + - sizeof (GOFFSET) + - sizeof (uint32_t)); - - ALLOCATE_ARRAY (WORD, glyphs, glyphs_size); - ALLOCATE_ARRAY (SCRIPT_GLYPHPROP, glyph_props, glyphs_size); - ALLOCATE_ARRAY (int, advances, glyphs_size); - ALLOCATE_ARRAY (GOFFSET, offsets, glyphs_size); - ALLOCATE_ARRAY (uint32_t, vis_clusters, glyphs_size); - -#undef ALLOCATE_ARRAY - -#define MAX_ITEMS 256 - - SCRIPT_ITEM items[MAX_ITEMS + 1]; - SCRIPT_CONTROL bidi_control = {0}; - SCRIPT_STATE bidi_state = {0}; - ULONG script_tags[MAX_ITEMS]; - int item_count; - - /* MinGW32 doesn't define fMergeNeutralItems, so we bruteforce */ - //bidi_control.fMergeNeutralItems = true; - *(uint32_t*)&bidi_control |= 1<<24; - - bidi_state.uBidiLevel = HB_DIRECTION_IS_FORWARD (buffer->props.direction) ? 0 : 1; - bidi_state.fOverrideDirection = 1; - - hr = ScriptItemizeOpenType (wchars, - chars_len, - MAX_ITEMS, - &bidi_control, - &bidi_state, - items, - script_tags, - &item_count); - if (unlikely (FAILED (hr))) - FAIL ("ScriptItemizeOpenType() failed: 0x%08xL", hr); - -#undef MAX_ITEMS - - int *range_char_counts = NULL; - TEXTRANGE_PROPERTIES **range_properties = NULL; - int range_count = 0; - if (num_features) { - /* TODO setup ranges */ - } - - OPENTYPE_TAG language_tag = hb_uint32_swap (hb_ot_tag_from_language (buffer->props.language)); - - unsigned int glyphs_offset = 0; - unsigned int glyphs_len; - bool backward = HB_DIRECTION_IS_BACKWARD (buffer->props.direction); - for (unsigned int j = 0; j < item_count; j++) - { - unsigned int i = backward ? item_count - 1 - j : j; - unsigned int chars_offset = items[i].iCharPos; - unsigned int item_chars_len = items[i + 1].iCharPos - chars_offset; - - retry_shape: - hr = ScriptShapeOpenType (font_data->hdc, - &font_data->script_cache, - &items[i].a, - script_tags[i], - language_tag, - range_char_counts, - range_properties, - range_count, - wchars + chars_offset, - item_chars_len, - glyphs_size - glyphs_offset, - /* out */ - log_clusters + chars_offset, - char_props + chars_offset, - glyphs + glyphs_offset, - glyph_props + glyphs_offset, - (int *) &glyphs_len); - - if (unlikely (items[i].a.fNoGlyphIndex)) - FAIL ("ScriptShapeOpenType() set fNoGlyphIndex"); - if (unlikely (hr == E_OUTOFMEMORY)) - { - buffer->ensure (buffer->allocated * 2); - if (buffer->in_error) - FAIL ("Buffer resize failed"); - goto retry; - } - if (unlikely (hr == USP_E_SCRIPT_NOT_IN_FONT)) - { - if (items[i].a.eScript == SCRIPT_UNDEFINED) - FAIL ("ScriptShapeOpenType() failed: Font doesn't support script"); - items[i].a.eScript = SCRIPT_UNDEFINED; - goto retry_shape; - } - if (unlikely (FAILED (hr))) - { - FAIL ("ScriptShapeOpenType() failed: 0x%08xL", hr); - } - - for (unsigned int j = chars_offset; j < chars_offset + item_chars_len; j++) - log_clusters[j] += glyphs_offset; - - hr = ScriptPlaceOpenType (font_data->hdc, - &font_data->script_cache, - &items[i].a, - script_tags[i], - language_tag, - range_char_counts, - range_properties, - range_count, - wchars + chars_offset, - log_clusters + chars_offset, - char_props + chars_offset, - item_chars_len, - glyphs + glyphs_offset, - glyph_props + glyphs_offset, - glyphs_len, - /* out */ - advances + glyphs_offset, - offsets + glyphs_offset, - NULL); - if (unlikely (FAILED (hr))) - FAIL ("ScriptPlaceOpenType() failed: 0x%08xL", hr); - - glyphs_offset += glyphs_len; - } - glyphs_len = glyphs_offset; - - /* Ok, we've got everything we need, now compose output buffer, - * very, *very*, carefully! */ - - /* Calculate visual-clusters. That's what we ship. */ - for (unsigned int i = 0; i < glyphs_len; i++) - vis_clusters[i] = -1; - for (unsigned int i = 0; i < buffer->len; i++) { - uint32_t *p = &vis_clusters[log_clusters[buffer->info[i].utf16_index()]]; - *p = MIN (*p, buffer->info[i].cluster); - } - if (!backward) { - for (unsigned int i = 1; i < glyphs_len; i++) - if (vis_clusters[i] == -1) - vis_clusters[i] = vis_clusters[i - 1]; - } else { - for (int i = glyphs_len - 2; i >= 0; i--) - if (vis_clusters[i] == -1) - vis_clusters[i] = vis_clusters[i + 1]; - } - -#undef utf16_index - - buffer->ensure (glyphs_len); - if (buffer->in_error) - FAIL ("Buffer in error"); - -#undef FAIL - - /* Set glyph infos */ - buffer->len = 0; - for (unsigned int i = 0; i < glyphs_len; i++) - { - hb_glyph_info_t *info = &buffer->info[buffer->len++]; - - info->codepoint = glyphs[i]; - info->cluster = vis_clusters[i]; - - /* The rest is crap. Let's store position info there for now. */ - info->mask = advances[i]; - info->var1.u32 = offsets[i].du; - info->var2.u32 = offsets[i].dv; - } - - /* Set glyph positions */ - buffer->clear_positions (); - for (unsigned int i = 0; i < glyphs_len; i++) - { - hb_glyph_info_t *info = &buffer->info[i]; - hb_glyph_position_t *pos = &buffer->pos[i]; - - /* TODO vertical */ - pos->x_advance = info->mask; - pos->x_offset = info->var1.u32; - pos->y_offset = info->var2.u32; - } - - /* Wow, done! */ - return true; -} - - diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-uniscribe.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-uniscribe.h deleted file mode 100644 index 51887c8794b..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-uniscribe.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright © 2011 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_UNISCRIBE_H -#define HB_UNISCRIBE_H - -#include "hb.h" - -#ifndef _WIN32_WINNT -#define _WIN32_WINNT 0x0600 -#endif -#include <windows.h> - -HB_BEGIN_DECLS - - -LOGFONTW * -hb_uniscribe_font_get_logfontw (hb_font_t *font); - -HFONT -hb_uniscribe_font_get_hfont (hb_font_t *font); - - -HB_END_DECLS - -#endif /* HB_UNISCRIBE_H */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-utf-private.hh b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-utf-private.hh deleted file mode 100644 index b9a6519d28e..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-utf-private.hh +++ /dev/null @@ -1,204 +0,0 @@ -/* - * Copyright © 2011,2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_UTF_PRIVATE_HH -#define HB_UTF_PRIVATE_HH - -#include "hb-private.hh" - - -/* UTF-8 */ - -#define HB_UTF8_COMPUTE(Char, Mask, Len) \ - if (Char < 128) { Len = 1; Mask = 0x7f; } \ - else if ((Char & 0xe0) == 0xc0) { Len = 2; Mask = 0x1f; } \ - else if ((Char & 0xf0) == 0xe0) { Len = 3; Mask = 0x0f; } \ - else if ((Char & 0xf8) == 0xf0) { Len = 4; Mask = 0x07; } \ - else Len = 0; - -static inline const uint8_t * -hb_utf_next (const uint8_t *text, - const uint8_t *end, - hb_codepoint_t *unicode) -{ - hb_codepoint_t c = *text, mask; - unsigned int len; - - /* TODO check for overlong sequences? */ - - HB_UTF8_COMPUTE (c, mask, len); - if (unlikely (!len || (unsigned int) (end - text) < len)) { - *unicode = -1; - return text + 1; - } else { - hb_codepoint_t result; - unsigned int i; - result = c & mask; - for (i = 1; i < len; i++) - { - if (unlikely ((text[i] & 0xc0) != 0x80)) - { - *unicode = -1; - return text + 1; - } - result <<= 6; - result |= (text[i] & 0x3f); - } - *unicode = result; - return text + len; - } -} - -static inline const uint8_t * -hb_utf_prev (const uint8_t *text, - const uint8_t *start, - hb_codepoint_t *unicode) -{ - const uint8_t *end = text--; - while (start < text && (*text & 0xc0) == 0x80 && end - text < 4) - text--; - - hb_codepoint_t c = *text, mask; - unsigned int len; - - /* TODO check for overlong sequences? */ - - HB_UTF8_COMPUTE (c, mask, len); - if (unlikely (!len || (unsigned int) (end - text) != len)) { - *unicode = -1; - return end - 1; - } else { - hb_codepoint_t result; - unsigned int i; - result = c & mask; - for (i = 1; i < len; i++) - { - result <<= 6; - result |= (text[i] & 0x3f); - } - *unicode = result; - return text; - } -} - - -static inline unsigned int -hb_utf_strlen (const uint8_t *text) -{ - return strlen ((const char *) text); -} - - -/* UTF-16 */ - -static inline const uint16_t * -hb_utf_next (const uint16_t *text, - const uint16_t *end, - hb_codepoint_t *unicode) -{ - hb_codepoint_t c = *text++; - - if (unlikely (hb_in_range<hb_codepoint_t> (c, 0xd800, 0xdbff))) - { - /* high surrogate */ - hb_codepoint_t l; - if (text < end && ((l = *text), likely (hb_in_range<hb_codepoint_t> (l, 0xdc00, 0xdfff)))) - { - /* low surrogate */ - *unicode = (c << 10) + l - ((0xd800 << 10) - 0x10000 + 0xdc00); - text++; - } else - *unicode = -1; - } else - *unicode = c; - - return text; -} - -static inline const uint16_t * -hb_utf_prev (const uint16_t *text, - const uint16_t *start, - hb_codepoint_t *unicode) -{ - hb_codepoint_t c = *--text; - - if (unlikely (hb_in_range<hb_codepoint_t> (c, 0xdc00, 0xdfff))) - { - /* low surrogate */ - hb_codepoint_t h; - if (start < text && ((h = *(text - 1)), likely (hb_in_range<hb_codepoint_t> (h, 0xd800, 0xdbff)))) - { - /* high surrogate */ - *unicode = (h << 10) + c - ((0xd800 << 10) - 0x10000 + 0xdc00); - text--; - } else - *unicode = -1; - } else - *unicode = c; - - return text; -} - - -static inline unsigned int -hb_utf_strlen (const uint16_t *text) -{ - unsigned int l = 0; - while (*text++) l++; - return l; -} - - -/* UTF-32 */ - -static inline const uint32_t * -hb_utf_next (const uint32_t *text, - const uint32_t *end HB_UNUSED, - hb_codepoint_t *unicode) -{ - *unicode = *text++; - return text; -} - -static inline const uint32_t * -hb_utf_prev (const uint32_t *text, - const uint32_t *start HB_UNUSED, - hb_codepoint_t *unicode) -{ - *unicode = *--text; - return text; -} - -static inline unsigned int -hb_utf_strlen (const uint32_t *text) -{ - unsigned int l = 0; - while (*text++) l++; - return l; -} - - -#endif /* HB_UTF_PRIVATE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-version.h.in b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-version.h.in deleted file mode 100644 index 43634f91ce8..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-version.h.in +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright © 2011 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifndef HB_H_IN -#error "Include <hb.h> instead." -#endif - -#ifndef HB_VERSION_H -#define HB_VERSION_H - -#include "hb-common.h" - -HB_BEGIN_DECLS - - -#define HB_VERSION_MAJOR @HB_VERSION_MAJOR@ -#define HB_VERSION_MINOR @HB_VERSION_MINOR@ -#define HB_VERSION_MICRO @HB_VERSION_MICRO@ - -#define HB_VERSION_STRING "@HB_VERSION@" - -#define HB_VERSION_CHECK(major,minor,micro) \ - ((major)*10000+(minor)*100+(micro) >= \ - HB_VERSION_MAJOR*10000+HB_VERSION_MINOR*100+HB_VERSION_MICRO) - - -void -hb_version (unsigned int *major, - unsigned int *minor, - unsigned int *micro); - -const char * -hb_version_string (void); - -hb_bool_t -hb_version_check (unsigned int major, - unsigned int minor, - unsigned int micro); - - -HB_END_DECLS - -#endif /* HB_VERSION_H */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-warning.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-warning.cc deleted file mode 100644 index 4f1f65f5a21..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb-warning.cc +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright © 2012 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#include "hb-atomic-private.hh" -#include "hb-mutex-private.hh" - - -#if defined(HB_ATOMIC_INT_NIL) -#ifdef _MSC_VER -#pragma message("Could not find any system to define atomic_int macros, library may NOT be thread-safe") -#else -#warning "Could not find any system to define atomic_int macros, library may NOT be thread-safe" -#endif -#endif - -#if defined(HB_MUTEX_IMPL_NIL) -#ifdef _MSC_VER -#pragma message("Could not find any system to define mutex macros, library may NOT be thread-safe") -#else -#warning "Could not find any system to define mutex macros, library may NOT be thread-safe" -#endif -#endif - -#if defined(HB_ATOMIC_INT_NIL) || defined(HB_MUTEX_IMPL_NIL) -#ifdef _MSC_VER -#pragma message("To suppress these warnings, define HB_NO_MT") -#else -#warning "To suppress these warnings, define HB_NO_MT" -#endif -#endif - - -#include "hb-unicode-private.hh" - -#if !defined(HB_NO_UNICODE_FUNCS) && defined(HB_UNICODE_FUNCS_NIL) -#ifdef _MSC_VER -#pragma message("Could not find any Unicode functions implementation, you have to provide your own") -#pragma message("To suppress this warnings, define HB_NO_UNICODE_FUNCS") -#else -#warning "Could not find any Unicode functions implementation, you have to provide your own" -#warning "To suppress this warning, define HB_NO_UNICODE_FUNCS" -#endif -#endif diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb.h b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb.h deleted file mode 100644 index 52c479cc2e5..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/hb.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Copyright © 2009 Red Hat, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - */ - -#ifndef HB_H -#define HB_H -#define HB_H_IN - -#include "hb-blob.h" -#include "hb-buffer.h" -#include "hb-common.h" -#include "hb-font.h" -#include "hb-set.h" -#include "hb-shape.h" -#include "hb-shape-plan.h" -#include "hb-unicode.h" -#include "hb-version.h" - -HB_BEGIN_DECLS -HB_END_DECLS - -#undef HB_H_IN -#endif /* HB_H */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/main.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/main.cc deleted file mode 100644 index b362744e213..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/main.cc +++ /dev/null @@ -1,197 +0,0 @@ -/* - * Copyright © 2007,2008,2009 Red Hat, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Red Hat Author(s): Behdad Esfahbod - */ - -#include "hb-mutex-private.hh" -#include "hb-open-file-private.hh" -#include "hb-ot-layout-gdef-table.hh" -#include "hb-ot-layout-gsubgpos-private.hh" - -#ifdef HAVE_GLIB -#include <glib.h> -#endif -#include <stdlib.h> -#include <stdio.h> - - -using namespace OT; - - -int -main (int argc, char **argv) -{ - if (argc != 2) { - fprintf (stderr, "usage: %s font-file.ttf\n", argv[0]); - exit (1); - } - - const char *font_data = NULL; - int len = 0; - -#ifdef HAVE_GLIB - GMappedFile *mf = g_mapped_file_new (argv[1], false, NULL); - font_data = g_mapped_file_get_contents (mf); - len = g_mapped_file_get_length (mf); -#else - FILE *f = fopen (argv[1], "rb"); - fseek (f, 0, SEEK_END); - len = ftell (f); - fseek (f, 0, SEEK_SET); - font_data = (const char *) malloc (len); - len = fread ((char *) font_data, 1, len, f); -#endif - - printf ("Opened font file %s: %d bytes long\n", argv[1], len); - - const OpenTypeFontFile &ot = *CastP<OpenTypeFontFile> (font_data); - - switch (ot.get_tag ()) { - case OpenTypeFontFile::TrueTypeTag: - printf ("OpenType font with TrueType outlines\n"); - break; - case OpenTypeFontFile::CFFTag: - printf ("OpenType font with CFF (Type1) outlines\n"); - break; - case OpenTypeFontFile::TTCTag: - printf ("TrueType Collection of OpenType fonts\n"); - break; - case OpenTypeFontFile::TrueTag: - printf ("Obsolete Apple TrueType font\n"); - break; - case OpenTypeFontFile::Typ1Tag: - printf ("Obsolete Apple Type1 font in SFNT container\n"); - break; - default: - printf ("Unknown font format\n"); - break; - } - - int num_fonts = ot.get_face_count (); - printf ("%d font(s) found in file\n", num_fonts); - for (int n_font = 0; n_font < num_fonts; n_font++) { - const OpenTypeFontFace &font = ot.get_face (n_font); - printf ("Font %d of %d:\n", n_font, num_fonts); - - int num_tables = font.get_table_count (); - printf (" %d table(s) found in font\n", num_tables); - for (int n_table = 0; n_table < num_tables; n_table++) { - const OpenTypeTable &table = font.get_table (n_table); - printf (" Table %2d of %2d: %.4s (0x%08x+0x%08x)\n", n_table, num_tables, - (const char *)table.tag, - (unsigned int) table.offset, - (unsigned int) table.length); - - switch (table.tag) { - - case GSUBGPOS::GSUBTag: - case GSUBGPOS::GPOSTag: - { - - const GSUBGPOS &g = *CastP<GSUBGPOS> (font_data + table.offset); - - int num_scripts = g.get_script_count (); - printf (" %d script(s) found in table\n", num_scripts); - for (int n_script = 0; n_script < num_scripts; n_script++) { - const Script &script = g.get_script (n_script); - printf (" Script %2d of %2d: %.4s\n", n_script, num_scripts, - (const char *)g.get_script_tag(n_script)); - - if (!script.has_default_lang_sys()) - printf (" No default language system\n"); - int num_langsys = script.get_lang_sys_count (); - printf (" %d language system(s) found in script\n", num_langsys); - for (int n_langsys = script.has_default_lang_sys() ? -1 : 0; n_langsys < num_langsys; n_langsys++) { - const LangSys &langsys = n_langsys == -1 - ? script.get_default_lang_sys () - : script.get_lang_sys (n_langsys); - if (n_langsys == -1) - printf (" Default Language System\n"); - else - printf (" Language System %2d of %2d: %.4s\n", n_langsys, num_langsys, - (const char *)script.get_lang_sys_tag (n_langsys)); - if (langsys.get_required_feature_index () == Index::NOT_FOUND_INDEX) - printf (" No required feature\n"); - - int num_features = langsys.get_feature_count (); - printf (" %d feature(s) found in language system\n", num_features); - for (int n_feature = 0; n_feature < num_features; n_feature++) { - printf (" Feature index %2d of %2d: %d\n", n_feature, num_features, - langsys.get_feature_index (n_feature)); - } - } - } - - int num_features = g.get_feature_count (); - printf (" %d feature(s) found in table\n", num_features); - for (int n_feature = 0; n_feature < num_features; n_feature++) { - const Feature &feature = g.get_feature (n_feature); - printf (" Feature %2d of %2d: %.4s; %d lookup(s)\n", n_feature, num_features, - (const char *)g.get_feature_tag(n_feature), - feature.get_lookup_count()); - - int num_lookups = feature.get_lookup_count (); - printf (" %d lookup(s) found in feature\n", num_lookups); - for (int n_lookup = 0; n_lookup < num_lookups; n_lookup++) { - printf (" Lookup index %2d of %2d: %d\n", n_lookup, num_lookups, - feature.get_lookup_index (n_lookup)); - } - } - - int num_lookups = g.get_lookup_count (); - printf (" %d lookup(s) found in table\n", num_lookups); - for (int n_lookup = 0; n_lookup < num_lookups; n_lookup++) { - const Lookup &lookup = g.get_lookup (n_lookup); - printf (" Lookup %2d of %2d: type %d, props 0x%04X\n", n_lookup, num_lookups, - lookup.get_type(), lookup.get_props()); - } - - } - break; - - case GDEF::Tag: - { - - const GDEF &gdef = *CastP<GDEF> (font_data + table.offset); - - printf (" Has %sglyph classes\n", - gdef.has_glyph_classes () ? "" : "no "); - printf (" Has %smark attachment types\n", - gdef.has_mark_attachment_types () ? "" : "no "); - printf (" Has %sattach points\n", - gdef.has_attach_points () ? "" : "no "); - printf (" Has %slig carets\n", - gdef.has_lig_carets () ? "" : "no "); - printf (" Has %smark sets\n", - gdef.has_mark_sets () ? "" : "no "); - break; - } - } - } - } - - return 0; -} - - diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/test-buffer-serialize.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/test-buffer-serialize.cc deleted file mode 100644 index 3577dbf688e..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/test-buffer-serialize.cc +++ /dev/null @@ -1,126 +0,0 @@ -/* - * Copyright © 2010,2011,2013 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "hb.h" -#ifdef HAVE_FREETYPE -#include "hb-ft.h" -#endif - -#ifdef HAVE_GLIB -#include <glib.h> -#endif -#include <stdlib.h> -#include <stdio.h> - -int -main (int argc, char **argv) -{ - hb_blob_t *blob = NULL; - - if (argc != 2) { - fprintf (stderr, "usage: %s font-file\n", argv[0]); - exit (1); - } - - /* Create the blob */ - { - const char *font_data; - unsigned int len; - hb_destroy_func_t destroy; - void *user_data; - hb_memory_mode_t mm; - -#ifdef HAVE_GLIB - GMappedFile *mf = g_mapped_file_new (argv[1], false, NULL); - font_data = g_mapped_file_get_contents (mf); - len = g_mapped_file_get_length (mf); - destroy = (hb_destroy_func_t) g_mapped_file_unref; - user_data = (void *) mf; - mm = HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE; -#else - FILE *f = fopen (argv[1], "rb"); - fseek (f, 0, SEEK_END); - len = ftell (f); - fseek (f, 0, SEEK_SET); - font_data = (const char *) malloc (len); - if (!font_data) len = 0; - len = fread ((char *) font_data, 1, len, f); - destroy = free; - user_data = (void *) font_data; - fclose (f); - mm = HB_MEMORY_MODE_WRITABLE; -#endif - - blob = hb_blob_create (font_data, len, mm, user_data, destroy); - } - - hb_face_t *face = hb_face_create (blob, 0 /* first face */); - hb_blob_destroy (blob); - blob = NULL; - - unsigned int upem = hb_face_get_upem (face); - hb_font_t *font = hb_font_create (face); - hb_face_destroy (face); - hb_font_set_scale (font, upem, upem); -#ifdef HAVE_FREETYPE - hb_ft_font_set_funcs (font); -#endif - - hb_buffer_t *buf; - buf = hb_buffer_create (); - - bool ret = true; - char line[BUFSIZ], out[BUFSIZ]; - while (fgets (line, sizeof(line), stdin) != 0) - { - hb_buffer_clear_contents (buf); - - const char *p = line; - while (hb_buffer_deserialize_glyphs (buf, - p, -1, &p, - font, - HB_BUFFER_SERIALIZE_FORMAT_JSON)) - ; - if (*p && *p != '\n') - ret = false; - - hb_buffer_serialize_glyphs (buf, 0, hb_buffer_get_length (buf), - out, sizeof (out), NULL, - font, HB_BUFFER_SERIALIZE_FORMAT_JSON, - HB_BUFFER_SERIALIZE_FLAGS_DEFAULT); - puts (out); - } - - hb_buffer_destroy (buf); - - hb_font_destroy (font); - - return !ret; -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/test-size-params.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/test-size-params.cc deleted file mode 100644 index 947b5669a14..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/test-size-params.cc +++ /dev/null @@ -1,93 +0,0 @@ -/* - * Copyright © 2010,2011 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "hb.h" -#include "hb-ot.h" - -#ifdef HAVE_GLIB -#include <glib.h> -#endif -#include <stdlib.h> -#include <stdio.h> - -int -main (int argc, char **argv) -{ - hb_blob_t *blob = NULL; - - if (argc != 2) { - fprintf (stderr, "usage: %s font-file\n", argv[0]); - exit (1); - } - - /* Create the blob */ - { - const char *font_data; - unsigned int len; - hb_destroy_func_t destroy; - void *user_data; - hb_memory_mode_t mm; - -#ifdef HAVE_GLIB - GMappedFile *mf = g_mapped_file_new (argv[1], false, NULL); - font_data = g_mapped_file_get_contents (mf); - len = g_mapped_file_get_length (mf); - destroy = (hb_destroy_func_t) g_mapped_file_unref; - user_data = (void *) mf; - mm = HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE; -#else - FILE *f = fopen (argv[1], "rb"); - fseek (f, 0, SEEK_END); - len = ftell (f); - fseek (f, 0, SEEK_SET); - font_data = (const char *) malloc (len); - if (!font_data) len = 0; - len = fread ((char *) font_data, 1, len, f); - destroy = free; - user_data = (void *) font_data; - fclose (f); - mm = HB_MEMORY_MODE_WRITABLE; -#endif - - blob = hb_blob_create (font_data, len, mm, user_data, destroy); - } - - /* Create the face */ - hb_face_t *face = hb_face_create (blob, 0 /* first face */); - hb_blob_destroy (blob); - blob = NULL; - - unsigned int p[5]; - bool ret = hb_ot_layout_get_size_params (face, p, p+1, p+2, p+3, p+4); - - printf ("%g %u %u %g %g\n", p[0]/10., p[1], p[2], p[3]/10., p[4]/10.); - - return !ret; -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/test-would-substitute.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/test-would-substitute.cc deleted file mode 100644 index 4731e265607..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/test-would-substitute.cc +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright © 2010,2011 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "hb.h" -#include "hb-ot.h" - -#ifdef HAVE_GLIB -#include <glib.h> -#endif -#include <stdlib.h> -#include <stdio.h> - -#ifdef HAVE_FREETYPE -#include "hb-ft.h" -#endif - -int -main (int argc, char **argv) -{ - hb_blob_t *blob = NULL; - - if (argc != 4 && argc != 5) { - fprintf (stderr, "usage: %s font-file lookup-index first-glyph [second-glyph]\n", argv[0]); - exit (1); - } - - /* Create the blob */ - { - const char *font_data; - unsigned int len; - hb_destroy_func_t destroy; - void *user_data; - hb_memory_mode_t mm; - -#ifdef HAVE_GLIB - GMappedFile *mf = g_mapped_file_new (argv[1], false, NULL); - font_data = g_mapped_file_get_contents (mf); - len = g_mapped_file_get_length (mf); - destroy = (hb_destroy_func_t) g_mapped_file_unref; - user_data = (void *) mf; - mm = HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE; -#else - FILE *f = fopen (argv[1], "rb"); - fseek (f, 0, SEEK_END); - len = ftell (f); - fseek (f, 0, SEEK_SET); - font_data = (const char *) malloc (len); - if (!font_data) len = 0; - len = fread ((char *) font_data, 1, len, f); - destroy = free; - user_data = (void *) font_data; - fclose (f); - mm = HB_MEMORY_MODE_WRITABLE; -#endif - - blob = hb_blob_create (font_data, len, mm, user_data, destroy); - } - - /* Create the face */ - hb_face_t *face = hb_face_create (blob, 0 /* first face */); - hb_blob_destroy (blob); - blob = NULL; - - hb_font_t *font = hb_font_create (face); -#ifdef HAVE_FREETYPE - hb_ft_font_set_funcs (font); -#endif - - unsigned int len = argc - 3; - hb_codepoint_t glyphs[2]; - if (!hb_font_glyph_from_string (font, argv[3], -1, &glyphs[0]) || - (argc > 4 && - !hb_font_glyph_from_string (font, argv[4], -1, &glyphs[1]))) - return 2; - return !hb_ot_layout_lookup_would_substitute (face, strtol (argv[2], NULL, 0), glyphs, len, false); -} diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/test.cc b/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/test.cc deleted file mode 100644 index 22108b86b7a..00000000000 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15/src/test.cc +++ /dev/null @@ -1,132 +0,0 @@ -/* - * Copyright © 2010,2011 Google, Inc. - * - * This is part of HarfBuzz, a text shaping library. - * - * Permission is hereby granted, without written agreement and without - * license or royalty fees, to use, copy, modify, and distribute this - * software and its documentation for any purpose, provided that the - * above copyright notice and the following two paragraphs appear in - * all copies of this software. - * - * IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE TO ANY PARTY FOR - * DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES - * ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN - * IF THE COPYRIGHT HOLDER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH - * DAMAGE. - * - * THE COPYRIGHT HOLDER SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND - * FITNESS FOR A PARTICULAR PURPOSE. THE SOFTWARE PROVIDED HEREUNDER IS - * ON AN "AS IS" BASIS, AND THE COPYRIGHT HOLDER HAS NO OBLIGATION TO - * PROVIDE MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - * - * Google Author(s): Behdad Esfahbod - */ - -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif - -#include "hb.h" - -#ifdef HAVE_GLIB -#include <glib.h> -#endif -#include <stdlib.h> -#include <stdio.h> - -#ifdef HAVE_FREETYPE -#include "hb-ft.h" -#endif - -int -main (int argc, char **argv) -{ - hb_blob_t *blob = NULL; - - if (argc != 2) { - fprintf (stderr, "usage: %s font-file.ttf\n", argv[0]); - exit (1); - } - - /* Create the blob */ - { - const char *font_data; - unsigned int len; - hb_destroy_func_t destroy; - void *user_data; - hb_memory_mode_t mm; - -#ifdef HAVE_GLIB - GMappedFile *mf = g_mapped_file_new (argv[1], false, NULL); - font_data = g_mapped_file_get_contents (mf); - len = g_mapped_file_get_length (mf); - destroy = (hb_destroy_func_t) g_mapped_file_unref; - user_data = (void *) mf; - mm = HB_MEMORY_MODE_READONLY_MAY_MAKE_WRITABLE; -#else - FILE *f = fopen (argv[1], "rb"); - fseek (f, 0, SEEK_END); - len = ftell (f); - fseek (f, 0, SEEK_SET); - font_data = (const char *) malloc (len); - if (!font_data) len = 0; - len = fread ((char *) font_data, 1, len, f); - destroy = free; - user_data = (void *) font_data; - fclose (f); - mm = HB_MEMORY_MODE_WRITABLE; -#endif - - blob = hb_blob_create (font_data, len, mm, user_data, destroy); - } - - printf ("Opened font file %s: %u bytes long\n", argv[1], hb_blob_get_length (blob)); - - /* Create the face */ - hb_face_t *face = hb_face_create (blob, 0 /* first face */); - hb_blob_destroy (blob); - blob = NULL; - unsigned int upem = hb_face_get_upem (face); - - hb_font_t *font = hb_font_create (face); - hb_font_set_scale (font, upem, upem); - -#ifdef HAVE_FREETYPE - hb_ft_font_set_funcs (font); -#endif - - hb_buffer_t *buffer = hb_buffer_create (); - - hb_buffer_add_utf8 (buffer, "\xe0\xa4\x95\xe0\xa5\x8d\xe0\xa4\xb0\xe0\xa5\x8d\xe0\xa4\x95", -1, 0, -1); - - hb_shape (font, buffer, NULL, 0); - - unsigned int count = hb_buffer_get_length (buffer); - hb_glyph_info_t *infos = hb_buffer_get_glyph_infos (buffer, NULL); - hb_glyph_position_t *positions = hb_buffer_get_glyph_positions (buffer, NULL); - - for (unsigned int i = 0; i < count; i++) - { - hb_glyph_info_t *info = &infos[i]; - hb_glyph_position_t *pos = &positions[i]; - - printf ("cluster %d glyph 0x%x at (%d,%d)+(%d,%d)\n", - info->cluster, - info->codepoint, - pos->x_offset, - pos->x_offset, - pos->x_advance, - pos->y_advance); - - } - - hb_buffer_destroy (buffer); - hb_font_destroy (font); - hb_face_destroy (face); - - return 0; -} - - diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15-PATCHES/ChangeLog b/Build/source/libs/harfbuzz/harfbuzz-0.9.18-PATCHES/ChangeLog index bb62aac75d1..49b7a445c2b 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15-PATCHES/ChangeLog +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.18-PATCHES/ChangeLog @@ -1,3 +1,8 @@ +2013-06-02 Peter Breitenlohner <peb@mppmu.mpg.de> + + Imported harfbuzz-0.9.18 source tree from: + http://www.freedesktop.org/software/harfbuzz/release/ + 2013-03-22 Khaled Hosny <khaledhosny@eglug.org> Imported harfbuzz-0.9.14 source tree from: diff --git a/Build/source/libs/harfbuzz/harfbuzz-0.9.15-PATCHES/TL-Changes b/Build/source/libs/harfbuzz/harfbuzz-0.9.18-PATCHES/TL-Changes index 9f5a3cba6bd..624c391e0b5 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-0.9.15-PATCHES/TL-Changes +++ b/Build/source/libs/harfbuzz/harfbuzz-0.9.18-PATCHES/TL-Changes @@ -1,5 +1,5 @@ -Changes applied to the harfbuzz-0.9.15/ tree as obtained from: - http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.15.tar.bz2 +Changes applied to the harfbuzz-0.9.18/ tree as obtained from: + http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-0.9.18.tar.bz2 Removed: COPYING diff --git a/Build/source/libs/harfbuzz/include/Makefile.in b/Build/source/libs/harfbuzz/include/Makefile.in index bcbf6169166..e2fd75e8786 100644 --- a/Build/source/libs/harfbuzz/include/Makefile.in +++ b/Build/source/libs/harfbuzz/include/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ diff --git a/Build/source/libs/harfbuzz/version.ac b/Build/source/libs/harfbuzz/version.ac index 7eb3f495597..0ada72bb8f7 100644 --- a/Build/source/libs/harfbuzz/version.ac +++ b/Build/source/libs/harfbuzz/version.ac @@ -8,4 +8,4 @@ dnl dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current harfbuzz version -m4_define([harfbuzz_version], [0.9.15]) +m4_define([harfbuzz_version], [0.9.18]) |