diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile | 4 | ||||
| -rw-r--r-- | data/charwidths.jl | 13 |
2 files changed, 3 insertions, 14 deletions
diff --git a/data/Makefile b/data/Makefile index f1a3f5f..1bf49e1 100644 --- a/data/Makefile +++ b/data/Makefile @@ -20,7 +20,7 @@ utf8proc_data.c.new: data_generator.rb UnicodeData.txt GraphemeBreakProperty.txt $(RUBY) data_generator.rb < UnicodeData.txt > $@ # GNU Unifont version for font metric calculations: -UNIFONT_VERSION=9.0.04 +UNIFONT_VERSION=10.0.07 unifont.ttf: $(CURL) $(CURLFLAGS) -o $@ $(URLCACHE)https://mirrors.kernel.org/gnu/unifont/unifont-$(UNIFONT_VERSION)/unifont-$(UNIFONT_VERSION).ttf @@ -35,7 +35,7 @@ CharWidths.txt: charwidths.jl unifont.sfd unifont_upper.sfd EastAsianWidth.txt $(JULIA) charwidths.jl > $@ # Unicode data version -UNICODE_VERSION=9.0.0 +UNICODE_VERSION=10.0.0 UnicodeData.txt: $(CURL) $(CURLFLAGS) -o $@ -O http://www.unicode.org/Public/$(UNICODE_VERSION)/ucd/UnicodeData.txt diff --git a/data/charwidths.jl b/data/charwidths.jl index bdcbc6c..ba54ccb 100644 --- a/data/charwidths.jl +++ b/data/charwidths.jl @@ -7,17 +7,6 @@ # Requires Julia (obviously) and FontForge. ############################################################################# -# Julia 0.3/0.4 compatibility (taken from Compat package) -if VERSION < v"0.4.0-dev+1387" - typealias AbstractString String -end -if VERSION < v"0.4.0-dev+1419" - const UInt32 = Uint32 -end -if VERSION < v"0.4.0-dev+3874" - Base.parse{T<:Integer}(::Type{T}, s::AbstractString) = parseint(T, s) -end - CharWidths = Dict{Int,Int}() ############################################################################# @@ -97,7 +86,7 @@ CharWidths=parsesfd("unifont_upper.sfd", CharWidths) for line in readlines(open("EastAsianWidth.txt")) #Strip comments - line[1] == '#' && continue + (isempty(line) || line[1] == '#') && continue precomment = split(line, '#')[1] #Parse code point range and width code tokens = split(precomment, ';') |