Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Makeotf fixes #458

Merged
merged 15 commits into from
Jul 9, 2018
Merged

Makeotf fixes #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f43f983
[fdkutils] Don't decode the log data
miguelsousa Jun 30, 2018
64f4bb0
[makeotf] Path to features file may be None
miguelsousa Jun 30, 2018
e1ef5cf
[makeotf_tests] Change font names
miguelsousa Jun 30, 2018
2d6c337
Remove unreferenced files from 'Adobe Cmaps' folder
miguelsousa Jun 30, 2018
ea0ac12
Update CMap files
miguelsousa Jul 1, 2018
94352e3
[makeotf_tests] Add CID font without PostScript names
miguelsousa Jul 1, 2018
d25b28a
[makeotf] Write output OTF to same directory as input font regardless…
miguelsousa Jul 1, 2018
bc2641f
[makeotf_tests] Include CID font in tests
miguelsousa Jul 2, 2018
252a43e
[makeotf_tests] Convert expected results to TTX
miguelsousa Jul 2, 2018
c3fd33e
[makeotf] Support building in release mode from Type 1 without GlyphO…
miguelsousa Jul 2, 2018
a70c4b8
[makeotf] Fix regexps matching 'include' and 'vert' feature
miguelsousa Jul 3, 2018
bb62172
[travis] Build all branches
miguelsousa Jul 3, 2018
12c7320
[makeotf] Enable passing args to main()
miguelsousa Jul 3, 2018
8eebcfb
[makeotf] Correct -shw/-nshw options
miguelsousa Jul 3, 2018
5e3f43a
[makeotf] Options -cs/-cl are not exclusive to CID-keyed fonts
miguelsousa Jul 5, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 16 additions & 17 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,14 @@ matrix:
include:
- os: linux
env: NAME=Linux
if: type = pull_request
# BUILD NOTE:
# Travis treats git tags as if they're branches.
# All branches (with and without a PR) are allowed to be built as
# long as they do NOT match the regex below. Git tags matching the
# regex below are used when we want a deployment to happen.
# The regex is meant to match:
# digit(s).digit(s).digit(s) plus optional additional characters.
if: NOT branch =~ /^\d+\.\d+\.\d+.*$/
python: 2.7
install:
- sudo apt-get install g++-multilib
Expand All @@ -16,7 +23,8 @@ matrix:

- os: osx
env: NAME=OSX
if: type = pull_request
# See 'BUILD NOTE' above.
if: NOT branch =~ /^\d+\.\d+\.\d+.*$/
language: generic
install:
- curl -O https://bootstrap.pypa.io/get-pip.py
Expand Down Expand Up @@ -58,7 +66,10 @@ matrix:
- NAME=Linux-deploy
- DOCKER_IMAGE=quay.io/pypa/manylinux1_x86_64
- BUILD_DIST=true
if: type = push
# DEPLOYMENT NOTE:
# Deploy only when a git tag matching the regex below is pushed.
# Travis treats git tags as if they're branches.
if: type = push AND branch =~ /^\d+\.\d+\.\d+.*$/
language: python
python: 2.7
# skip default 'install' and 'script' steps: all the work is in
Expand All @@ -71,27 +82,15 @@ matrix:
env:
- NAME=OSX-deploy
- BUILD_DIST=true
if: type = push
# See 'DEPLOYMENT NOTE' above.
if: type = push AND branch =~ /^\d+\.\d+\.\d+.*$/
language: generic

cache:
- pip
- directories:
- $HOME/.pyenv_cache

# Only build for *pushes* to 'master', 'develop' and 'release',
# not for pushes to other branches
# (build for PRs from any branch).
# The regex below is because Travis treats a tag on the master branch as if it
# were a different branch. The regex below is meant to match:
# digit(s).digit(s).digit(s) plus optional additional characters.
branches:
only:
- master
- /^\d+\.\d+\.\d+.*$/
- develop
- release

notifications:
slack: typekit:TRAVIS_SLACK_TOKEN
email:
Expand Down
1 change: 1 addition & 0 deletions Tests/buildmasterotfs_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ def test_cjk_var():
os.path.basename(otf_path)[:-3] + 'ttx')
assert differ([expected_ttx, actual_ttx,
'-s',
'<ttFont sfntVersion' + SPLIT_MARKER +
' <checkSumAdjustment value=' + SPLIT_MARKER +
' <created value=' + SPLIT_MARKER +
' <modified value='])
125 changes: 125 additions & 0 deletions Tests/makeotf_data/expected_output/cidfont-cmap.ttx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
<?xml version="1.0" encoding="UTF-8"?>
<ttFont sfntVersion="OTTO" ttLibVersion="3.28">

<cmap>
<tableVersion version="0"/>
<cmap_format_4 platformID="0" platEncID="3" language="0">
<map code="0x0" name="cid00001"/><!-- ???? -->
<map code="0x1" name="cid00001"/><!-- ???? -->
<map code="0x2" name="cid00001"/><!-- ???? -->
<map code="0x3" name="cid00001"/><!-- ???? -->
<map code="0x4" name="cid00001"/><!-- ???? -->
<map code="0x5" name="cid00001"/><!-- ???? -->
<map code="0x6" name="cid00001"/><!-- ???? -->
<map code="0x7" name="cid00001"/><!-- ???? -->
<map code="0x8" name="cid00001"/><!-- ???? -->
<map code="0x9" name="cid00001"/><!-- ???? -->
<map code="0xa" name="cid00001"/><!-- ???? -->
<map code="0xb" name="cid00001"/><!-- ???? -->
<map code="0xc" name="cid00001"/><!-- ???? -->
<map code="0xd" name="cid00001"/><!-- ???? -->
<map code="0xe" name="cid00001"/><!-- ???? -->
<map code="0xf" name="cid00001"/><!-- ???? -->
<map code="0x10" name="cid00001"/><!-- ???? -->
<map code="0x11" name="cid00001"/><!-- ???? -->
<map code="0x12" name="cid00001"/><!-- ???? -->
<map code="0x13" name="cid00001"/><!-- ???? -->
<map code="0x14" name="cid00001"/><!-- ???? -->
<map code="0x15" name="cid00001"/><!-- ???? -->
<map code="0x16" name="cid00001"/><!-- ???? -->
<map code="0x17" name="cid00001"/><!-- ???? -->
<map code="0x18" name="cid00001"/><!-- ???? -->
<map code="0x19" name="cid00001"/><!-- ???? -->
<map code="0x1a" name="cid00001"/><!-- ???? -->
<map code="0x1b" name="cid00001"/><!-- ???? -->
<map code="0x1c" name="cid00001"/><!-- ???? -->
<map code="0x1d" name="cid00001"/><!-- ???? -->
<map code="0x1e" name="cid00001"/><!-- ???? -->
<map code="0x1f" name="cid00001"/><!-- ???? -->
<map code="0x20" name="cid00001"/><!-- SPACE -->
<map code="0xa0" name="cid00001"/><!-- NO-BREAK SPACE -->
<map code="0x4e9c" name="cid01125"/><!-- CJK UNIFIED IDEOGRAPH-4E9C -->
<map code="0x9bf5" name="cid01143"/><!-- CJK UNIFIED IDEOGRAPH-9BF5 -->
</cmap_format_4>
<cmap_format_14 platformID="0" platEncID="5" format="14" length="33" numVarSelectorRecords="1">
<map uvs="0xe0100" uv="0x4e9c" name="None"/>
<map uvs="0xe0100" uv="0x9bf5" name="None"/>
</cmap_format_14>
<cmap_format_2 platformID="1" platEncID="1" language="0">
<map code="0x0" name="cid00001"/>
<map code="0x1" name="cid00001"/>
<map code="0x2" name="cid00001"/>
<map code="0x3" name="cid00001"/>
<map code="0x4" name="cid00001"/>
<map code="0x5" name="cid00001"/>
<map code="0x6" name="cid00001"/>
<map code="0x7" name="cid00001"/>
<map code="0x8" name="cid00001"/>
<map code="0x9" name="cid00001"/>
<map code="0xa" name="cid00001"/>
<map code="0xb" name="cid00001"/>
<map code="0xc" name="cid00001"/>
<map code="0xd" name="cid00001"/>
<map code="0xe" name="cid00001"/>
<map code="0xf" name="cid00001"/>
<map code="0x10" name="cid00001"/>
<map code="0x11" name="cid00001"/>
<map code="0x12" name="cid00001"/>
<map code="0x13" name="cid00001"/>
<map code="0x14" name="cid00001"/>
<map code="0x15" name="cid00001"/>
<map code="0x16" name="cid00001"/>
<map code="0x17" name="cid00001"/>
<map code="0x18" name="cid00001"/>
<map code="0x19" name="cid00001"/>
<map code="0x1a" name="cid00001"/>
<map code="0x1b" name="cid00001"/>
<map code="0x1c" name="cid00001"/>
<map code="0x1d" name="cid00001"/>
<map code="0x1e" name="cid00001"/>
<map code="0x1f" name="cid00001"/>
<map code="0x20" name="cid00001"/>
<map code="0x889f" name="cid01125"/>
<map code="0x88b1" name="cid01143"/>
</cmap_format_2>
<cmap_format_4 platformID="3" platEncID="1" language="0">
<map code="0x0" name="cid00001"/><!-- ???? -->
<map code="0x1" name="cid00001"/><!-- ???? -->
<map code="0x2" name="cid00001"/><!-- ???? -->
<map code="0x3" name="cid00001"/><!-- ???? -->
<map code="0x4" name="cid00001"/><!-- ???? -->
<map code="0x5" name="cid00001"/><!-- ???? -->
<map code="0x6" name="cid00001"/><!-- ???? -->
<map code="0x7" name="cid00001"/><!-- ???? -->
<map code="0x8" name="cid00001"/><!-- ???? -->
<map code="0x9" name="cid00001"/><!-- ???? -->
<map code="0xa" name="cid00001"/><!-- ???? -->
<map code="0xb" name="cid00001"/><!-- ???? -->
<map code="0xc" name="cid00001"/><!-- ???? -->
<map code="0xd" name="cid00001"/><!-- ???? -->
<map code="0xe" name="cid00001"/><!-- ???? -->
<map code="0xf" name="cid00001"/><!-- ???? -->
<map code="0x10" name="cid00001"/><!-- ???? -->
<map code="0x11" name="cid00001"/><!-- ???? -->
<map code="0x12" name="cid00001"/><!-- ???? -->
<map code="0x13" name="cid00001"/><!-- ???? -->
<map code="0x14" name="cid00001"/><!-- ???? -->
<map code="0x15" name="cid00001"/><!-- ???? -->
<map code="0x16" name="cid00001"/><!-- ???? -->
<map code="0x17" name="cid00001"/><!-- ???? -->
<map code="0x18" name="cid00001"/><!-- ???? -->
<map code="0x19" name="cid00001"/><!-- ???? -->
<map code="0x1a" name="cid00001"/><!-- ???? -->
<map code="0x1b" name="cid00001"/><!-- ???? -->
<map code="0x1c" name="cid00001"/><!-- ???? -->
<map code="0x1d" name="cid00001"/><!-- ???? -->
<map code="0x1e" name="cid00001"/><!-- ???? -->
<map code="0x1f" name="cid00001"/><!-- ???? -->
<map code="0x20" name="cid00001"/><!-- SPACE -->
<map code="0xa0" name="cid00001"/><!-- NO-BREAK SPACE -->
<map code="0x4e9c" name="cid01125"/><!-- CJK UNIFIED IDEOGRAPH-4E9C -->
<map code="0x9bf5" name="cid01143"/><!-- CJK UNIFIED IDEOGRAPH-9BF5 -->
</cmap_format_4>
</cmap>

</ttFont>
125 changes: 125 additions & 0 deletions Tests/makeotf_data/expected_output/cidfont-cmap_cl3.ttx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,125 @@
<?xml version="1.0" encoding="UTF-8"?>
<ttFont sfntVersion="OTTO" ttLibVersion="3.28">

<cmap>
<tableVersion version="0"/>
<cmap_format_4 platformID="0" platEncID="3" language="0">
<map code="0x0" name="cid00001"/><!-- ???? -->
<map code="0x1" name="cid00001"/><!-- ???? -->
<map code="0x2" name="cid00001"/><!-- ???? -->
<map code="0x3" name="cid00001"/><!-- ???? -->
<map code="0x4" name="cid00001"/><!-- ???? -->
<map code="0x5" name="cid00001"/><!-- ???? -->
<map code="0x6" name="cid00001"/><!-- ???? -->
<map code="0x7" name="cid00001"/><!-- ???? -->
<map code="0x8" name="cid00001"/><!-- ???? -->
<map code="0x9" name="cid00001"/><!-- ???? -->
<map code="0xa" name="cid00001"/><!-- ???? -->
<map code="0xb" name="cid00001"/><!-- ???? -->
<map code="0xc" name="cid00001"/><!-- ???? -->
<map code="0xd" name="cid00001"/><!-- ???? -->
<map code="0xe" name="cid00001"/><!-- ???? -->
<map code="0xf" name="cid00001"/><!-- ???? -->
<map code="0x10" name="cid00001"/><!-- ???? -->
<map code="0x11" name="cid00001"/><!-- ???? -->
<map code="0x12" name="cid00001"/><!-- ???? -->
<map code="0x13" name="cid00001"/><!-- ???? -->
<map code="0x14" name="cid00001"/><!-- ???? -->
<map code="0x15" name="cid00001"/><!-- ???? -->
<map code="0x16" name="cid00001"/><!-- ???? -->
<map code="0x17" name="cid00001"/><!-- ???? -->
<map code="0x18" name="cid00001"/><!-- ???? -->
<map code="0x19" name="cid00001"/><!-- ???? -->
<map code="0x1a" name="cid00001"/><!-- ???? -->
<map code="0x1b" name="cid00001"/><!-- ???? -->
<map code="0x1c" name="cid00001"/><!-- ???? -->
<map code="0x1d" name="cid00001"/><!-- ???? -->
<map code="0x1e" name="cid00001"/><!-- ???? -->
<map code="0x1f" name="cid00001"/><!-- ???? -->
<map code="0x20" name="cid00001"/><!-- SPACE -->
<map code="0xa0" name="cid00001"/><!-- NO-BREAK SPACE -->
<map code="0x4e9c" name="cid01125"/><!-- CJK UNIFIED IDEOGRAPH-4E9C -->
<map code="0x9bf5" name="cid01143"/><!-- CJK UNIFIED IDEOGRAPH-9BF5 -->
</cmap_format_4>
<cmap_format_14 platformID="0" platEncID="5" format="14" length="33" numVarSelectorRecords="1">
<map uvs="0xe0100" uv="0x4e9c" name="None"/>
<map uvs="0xe0100" uv="0x9bf5" name="None"/>
</cmap_format_14>
<cmap_format_2 platformID="1" platEncID="1" language="3">
<map code="0x0" name="cid00001"/>
<map code="0x1" name="cid00001"/>
<map code="0x2" name="cid00001"/>
<map code="0x3" name="cid00001"/>
<map code="0x4" name="cid00001"/>
<map code="0x5" name="cid00001"/>
<map code="0x6" name="cid00001"/>
<map code="0x7" name="cid00001"/>
<map code="0x8" name="cid00001"/>
<map code="0x9" name="cid00001"/>
<map code="0xa" name="cid00001"/>
<map code="0xb" name="cid00001"/>
<map code="0xc" name="cid00001"/>
<map code="0xd" name="cid00001"/>
<map code="0xe" name="cid00001"/>
<map code="0xf" name="cid00001"/>
<map code="0x10" name="cid00001"/>
<map code="0x11" name="cid00001"/>
<map code="0x12" name="cid00001"/>
<map code="0x13" name="cid00001"/>
<map code="0x14" name="cid00001"/>
<map code="0x15" name="cid00001"/>
<map code="0x16" name="cid00001"/>
<map code="0x17" name="cid00001"/>
<map code="0x18" name="cid00001"/>
<map code="0x19" name="cid00001"/>
<map code="0x1a" name="cid00001"/>
<map code="0x1b" name="cid00001"/>
<map code="0x1c" name="cid00001"/>
<map code="0x1d" name="cid00001"/>
<map code="0x1e" name="cid00001"/>
<map code="0x1f" name="cid00001"/>
<map code="0x20" name="cid00001"/>
<map code="0x889f" name="cid01125"/>
<map code="0x88b1" name="cid01143"/>
</cmap_format_2>
<cmap_format_4 platformID="3" platEncID="1" language="0">
<map code="0x0" name="cid00001"/><!-- ???? -->
<map code="0x1" name="cid00001"/><!-- ???? -->
<map code="0x2" name="cid00001"/><!-- ???? -->
<map code="0x3" name="cid00001"/><!-- ???? -->
<map code="0x4" name="cid00001"/><!-- ???? -->
<map code="0x5" name="cid00001"/><!-- ???? -->
<map code="0x6" name="cid00001"/><!-- ???? -->
<map code="0x7" name="cid00001"/><!-- ???? -->
<map code="0x8" name="cid00001"/><!-- ???? -->
<map code="0x9" name="cid00001"/><!-- ???? -->
<map code="0xa" name="cid00001"/><!-- ???? -->
<map code="0xb" name="cid00001"/><!-- ???? -->
<map code="0xc" name="cid00001"/><!-- ???? -->
<map code="0xd" name="cid00001"/><!-- ???? -->
<map code="0xe" name="cid00001"/><!-- ???? -->
<map code="0xf" name="cid00001"/><!-- ???? -->
<map code="0x10" name="cid00001"/><!-- ???? -->
<map code="0x11" name="cid00001"/><!-- ???? -->
<map code="0x12" name="cid00001"/><!-- ???? -->
<map code="0x13" name="cid00001"/><!-- ???? -->
<map code="0x14" name="cid00001"/><!-- ???? -->
<map code="0x15" name="cid00001"/><!-- ???? -->
<map code="0x16" name="cid00001"/><!-- ???? -->
<map code="0x17" name="cid00001"/><!-- ???? -->
<map code="0x18" name="cid00001"/><!-- ???? -->
<map code="0x19" name="cid00001"/><!-- ???? -->
<map code="0x1a" name="cid00001"/><!-- ???? -->
<map code="0x1b" name="cid00001"/><!-- ???? -->
<map code="0x1c" name="cid00001"/><!-- ???? -->
<map code="0x1d" name="cid00001"/><!-- ???? -->
<map code="0x1e" name="cid00001"/><!-- ???? -->
<map code="0x1f" name="cid00001"/><!-- ???? -->
<map code="0x20" name="cid00001"/><!-- SPACE -->
<map code="0xa0" name="cid00001"/><!-- NO-BREAK SPACE -->
<map code="0x4e9c" name="cid01125"/><!-- CJK UNIFIED IDEOGRAPH-4E9C -->
<map code="0x9bf5" name="cid01143"/><!-- CJK UNIFIED IDEOGRAPH-9BF5 -->
</cmap_format_4>
</cmap>

</ttFont>
Loading