.circleci/config.yml | 40 +++++++--- src/gen-use-table.py | 3 src/hb-ot-shape-complex-use-table.cc | 2 test/shaping/fonts/sha1sum/59a585a63b3df608fbeef00956c8c108deec7de6.ttf |binary test/shaping/tests/use-syllable.tests | 1 5 files changed, 35 insertions(+), 11 deletions(-)
New commits: commit 7bfdf1a94192dd83ab55202d259703f36ed060e5 Author: David Corbett <corbett....@husky.neu.edu> Date: Wed Nov 22 16:32:52 2017 -0500 Forbid Batak killers after vowel signs diff --git a/src/gen-use-table.py b/src/gen-use-table.py index 4ded5423..bbcaaf89 100755 --- a/src/gen-use-table.py +++ b/src/gen-use-table.py @@ -297,6 +297,9 @@ def map_to_use(data): if U == 0x17DD: UISC = Vowel_Dependent if 0x1CE2 <= U <= 0x1CE8: UISC = Cantillation_Mark + # TODO: https://github.com/harfbuzz/harfbuzz/pull/627 + if 0x1BF2 <= U <= 0x1BF3: UISC = Nukta; UIPC = Bottom + # TODO: U+1CED should only be allowed after some of # the nasalization marks, maybe only for U+1CE9..U+1CF1. if U == 0x1CED: UISC = Tone_Mark diff --git a/src/hb-ot-shape-complex-use-table.cc b/src/hb-ot-shape-complex-use-table.cc index fd6978f2..c1a33625 100644 --- a/src/hb-ot-shape-complex-use-table.cc +++ b/src/hb-ot-shape-complex-use-table.cc @@ -307,7 +307,7 @@ static const USE_TABLE_ELEMENT_TYPE use_table[] = { /* 1BC0 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, /* 1BD0 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, /* 1BE0 */ B, B, B, B, B, B, CMAbv, VPst, VAbv, VAbv, VPst, VPst, VPst, VAbv, VPst, VAbv, - /* 1BF0 */ FAbv, FAbv, VPst, VPst, O, O, O, O, O, O, O, O, O, O, O, O, + /* 1BF0 */ FAbv, FAbv, CMBlw, CMBlw, O, O, O, O, O, O, O, O, O, O, O, O, /* Lepcha */ diff --git a/test/shaping/fonts/sha1sum/59a585a63b3df608fbeef00956c8c108deec7de6.ttf b/test/shaping/fonts/sha1sum/59a585a63b3df608fbeef00956c8c108deec7de6.ttf new file mode 100644 index 00000000..70f0513d Binary files /dev/null and b/test/shaping/fonts/sha1sum/59a585a63b3df608fbeef00956c8c108deec7de6.ttf differ diff --git a/test/shaping/tests/use-syllable.tests b/test/shaping/tests/use-syllable.tests index 0661142c..a48633b8 100644 --- a/test/shaping/tests/use-syllable.tests +++ b/test/shaping/tests/use-syllable.tests @@ -4,3 +4,4 @@ fonts/sha1sum/e68a88939e0f06e34d2bc911f09b70890289c8fd.ttf::U+AA00,U+AA35,U+AA33 fonts/sha1sum/e68a88939e0f06e34d2bc911f09b70890289c8fd.ttf::U+AA00,U+AA35,U+AA36:[a_cham=0+1121|laMedial_waMedial_cham=0@43,0+0] fonts/sha1sum/074a5ae6b19de8f29772fdd5df2d3d833f81f5e6.ttf:--no-glyph-names:U+11320,U+20F0,U+11367:[3=0+502|1=0@33,0+0|4=0@300,8+0] fonts/sha1sum/373e67bf41ca264e260a9716162b71a23549e885.ttf:--no-glyph-names:U+A8AC,U+A8B4,U+A8B5:[2=0+377|3=0+242|4=0+210] +fonts/sha1sum/59a585a63b3df608fbeef00956c8c108deec7de6.ttf:--no-glyph-names:U+1BC7,U+1BEA,U+1BF3:[1=0+749|2=0+402|4=0+535|3=0+401] commit 9890782736b9ce708c1fedd1cbb3db45cfef4c69 Author: Ebrahim Byagowi <ebra...@gnu.org> Date: Mon Dec 25 01:32:46 2017 +0330 [ci] Add -Wno-attributes to djgpp, add alpine, format (#663) diff --git a/.circleci/config.yml b/.circleci/config.yml index 25dfccde..8b596ac1 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -20,7 +20,8 @@ jobs: steps: - checkout - run: dnf install -y pkg-config ragel gcc gcc-c++ automake autoconf libtool make which glib2-devel freetype-devel cairo-devel libicu-devel gobject-introspection-devel graphite2-devel redhat-rpm-config || true - - run: ./autogen.sh --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-graphite2 && make && make check + - run: ./autogen.sh --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-graphite2 + - run: make && make check archlinux: docker: @@ -28,7 +29,8 @@ jobs: steps: - checkout - run: pacman --noconfirm -Syu freetype2 cairo icu gettext gobject-introspection gcc gcc-libs glib2 graphite pkg-config ragel - - run: ./autogen.sh --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-graphite2 && make && make check + - run: ./autogen.sh --with-freetype --with-glib --with-gobject --with-cairo --with-icu --with-graphite2 + - run: make && make check freebsd9: docker: @@ -36,7 +38,8 @@ jobs: steps: - checkout - run: apt update && apt install -y pkg-config ragel - - run: ./autogen.sh --prefix=/freebsd --host=x86_64-pc-freebsd9 && make + - run: ./autogen.sh --prefix=/freebsd --host=x86_64-pc-freebsd9 + - run: make base: docker: @@ -65,7 +68,8 @@ jobs: - checkout - run: apt update && apt install ragel - run: git clone https://github.com/vitasdk/vdpm && cd vdpm && ./bootstrap-vitasdk.sh - - run: cmake -Bbuild -H. -GNinja -DCMAKE_TOOLCHAIN_FILE=/usr/local/vitasdk/share/vita.toolchain.cmake && ninja -Cbuild + - run: ./autogen.sh --prefix=/usr/local/vitasdk/arm-vita-eabi --host=arm-vita-eabi + - run: make android-arm: docker: @@ -73,7 +77,8 @@ jobs: steps: - checkout - run: apt update && apt install ragel - - run: cmake -Bbuild -H. -GNinja && ninja -Cbuild + - run: cmake -Bbuild -H. -GNinja + - run: ninja -Cbuild browser-asmjs: docker: @@ -81,7 +86,8 @@ jobs: steps: - checkout - run: apt update && apt install ragel - - run: cmake -Bbuild -H. -GNinja && ninja -Cbuild + - run: cmake -Bbuild -H. -GNinja + - run: ninja -Cbuild linux-arm64: docker: @@ -89,7 +95,8 @@ jobs: steps: - checkout - run: apt update && apt install ragel - - run: cmake -Bbuild -H. -GNinja && ninja -Cbuild + - run: cmake -Bbuild -H. -GNinja + - run: ninja -Cbuild linux-mips: docker: @@ -97,7 +104,8 @@ jobs: steps: - checkout - run: apt update && apt install ragel - - run: cmake -Bbuild -H. -GNinja && ninja -Cbuild + - run: cmake -Bbuild -H. -GNinja + - run: ninja -Cbuild windows-x64: docker: @@ -105,7 +113,17 @@ jobs: steps: - checkout - run: apt update && apt install ragel - - run: cmake -Bbuild -H. -GNinja && ninja -Cbuild + - run: cmake -Bbuild -H. -GNinja + - run: ninja -Cbuild + + alpine: + docker: + - image: alpine + steps: + - checkout + - run: apk update && apk add ragel make pkgconfig libtool autoconf automake gettext gcc g++ glib-dev freetype-dev cairo-dev + - run: ./autogen.sh + - run: make && make check dos: docker: @@ -113,7 +131,8 @@ jobs: steps: - checkout - run: apt update && apt install -y ragel pkg-config libtool autoconf - - run: ./autogen.sh --prefix=/usr/local/djgpp --host=i586-pc-msdosdjgpp && make + - run: CFLAGS="-Wno-attributes" CXXFLAGS="-Wno-attributes" ./autogen.sh --prefix=/usr/local/djgpp --host=i586-pc-msdosdjgpp + - run: make workflows: version: 2 @@ -131,4 +150,5 @@ workflows: - linux-arm64 - linux-mips - windows-x64 + - alpine - dos _______________________________________________ HarfBuzz mailing list HarfBuzz@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/harfbuzz