diff options
| author | Steven G. Johnson <stevenj@mit.edu> | 2015-10-29 21:45:52 -0400 |
|---|---|---|
| committer | Steven G. Johnson <stevenj@mit.edu> | 2015-10-29 21:45:52 -0400 |
| commit | 1e411777c592a1ccd99458211df7d2013289bbf9 (patch) | |
| tree | 5c8a37056cc9223163a81c0b9e8f80c3950b0d52 /data/charwidths.jl | |
| parent | e52c8c4c8f0f10aa71c8dbd633a359895157c871 (diff) | |
| parent | d32140821042a27b1ffa033c429f381a3bc95d4b (diff) | |
| download | libutf8proc-1e411777c592a1ccd99458211df7d2013289bbf9.tar.gz libutf8proc-1e411777c592a1ccd99458211df7d2013289bbf9.tar.bz2 | |
Merge pull request #56 from petercolberg/master
Fix Travis build and improve build reproducibility
Diffstat (limited to 'data/charwidths.jl')
| -rw-r--r-- | data/charwidths.jl | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/data/charwidths.jl b/data/charwidths.jl index 7b32a82..417483c 100644 --- a/data/charwidths.jl +++ b/data/charwidths.jl @@ -51,12 +51,6 @@ end ############################################################################# # Widths from GNU Unifont -universion=get(ENV, "UNIFONT_VERSION", "7.0.06") -for fontfile in ["unifont-$universion", "unifont_upper-$universion"] - isfile("$fontfile.ttf") || download("http://unifoundry.com/pub/unifont-$universion/font-builds/$fontfile.ttf", "$fontfile.ttf") - isfile("$fontfile.sfd") || run(`fontforge -lang=ff -c "Open(\"$fontfile.ttf\");Save(\"$fontfile.sfd\");Quit(0);"`) -end - #Read sfdfile for character widths function parsesfd(filename::String, CharWidths::Dict{Int,Int}=Dict{Int,Int}()) state=:seekchar @@ -87,15 +81,14 @@ function parsesfd(filename::String, CharWidths::Dict{Int,Int}=Dict{Int,Int}()) end CharWidths end -CharWidths=parsesfd("unifont-$universion.sfd", CharWidths) -CharWidths=parsesfd("unifont_upper-$universion.sfd", CharWidths) +CharWidths=parsesfd("unifont.sfd", CharWidths) +CharWidths=parsesfd("unifont_upper.sfd", CharWidths) ############################################################################# # Widths from UAX #11: East Asian Width # .. these take precedence over the Unifont width for all codepoints # listed explicitly as wide/full/narrow/half-width -isfile("EastAsianWidth.txt") || download("http://www.unicode.org/Public/UNIDATA/EastAsianWidth.txt", "EastAsianWidth.txt") for line in readlines(open("EastAsianWidth.txt")) #Strip comments line[1] == '#' && continue |