Merge pull request #12 from SimonDanisch/sd/1

1.0 support

Author: SimonDanisch

.travis.yml

@@ -4,7 +4,8 @@ os:
   - linux
   - osx
 julia:
-  - 0.6
+  - 0.7
+  - 1.0
   - nightly
 notifications:
   email: false

appveyor.yml

@@ -1,9 +1,12 @@
 environment:
   matrix:
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
-  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
-  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
-  - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
+  - julia_version: 0.7
+  - julia_version: 1
+  - julia_version: nightly
+
+platform:
+  - x86 # 32-bit
+  - x64 # 64-bit
 
 branches:
   only:
@@ -17,19 +20,12 @@ notifications:
     on_build_status_changed: false
 
 install:
-  - ps: "[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]::Tls12"
-# Download most recent Julia Windows binary
-  - ps: (new-object net.webclient).DownloadFile(
-        $env:JULIA_URL,
-        "C:\projects\julia-binary.exe")
-# Run installer silently, output to C:\projects\julia
-  - C:\projects\julia-binary.exe /S /D=C:\projects\julia
+  - ps: iex ((new-object net.webclient).DownloadString("https://raw.githubusercontent.com/JuliaCI/Appveyor.jl/version-1/bin/install.ps1"))
 
 build_script:
-# Need to convert from shallow to complete for Pkg.clone to work
-  - IF EXIST .git\shallow (git fetch --unshallow)
-  - C:\projects\julia\bin\julia -e "versioninfo();
-      Pkg.clone(pwd(), \"UnicodeFun\"); Pkg.build(\"UnicodeFun\")"
+  - echo "%JL_BUILD_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_BUILD_SCRIPT%"
 
 test_script:
-  - C:\projects\julia\bin\julia -e "Pkg.test(\"UnicodeFun\")"
+  - echo "%JL_TEST_SCRIPT%"
+  - C:\julia\bin\julia -e "%JL_TEST_SCRIPT%"

src/latex.jl

@@ -23,23 +23,31 @@ end
 Base findnext doesn't handle utf8 strings correctly
 """
 function utf8_findnext(A::AbstractString, v::Char, idx::Integer)
-    while !done(A, idx)
+    while true
         lastidx = idx
-        elem, idx = next(A, idx)
+        elem_idx = iterate(A, idx)
+        elem_idx === nothing && break
+        elem, idx = elem_idx
         elem == v && return lastidx
     end
     0
 end
 
 function to_latex(text)
     io = IOBuffer()
-    idx = start(text)
-    while !done(text, idx)
-        char, idx = next(text, idx)
+    charidx = iterate(text)
+    charidx === nothing && return ""
+    char, idx = charidx
+    started = true
+    while true
+        started || (charidx = iterate(text, idx))
+        started = false
+        charidx === nothing && break
+        char, idx = charidx
         if char in ('^', '_', '\\')
             mod = string(char)
             if mod == "\\"
-                ss = SubString(text, idx, endof(text))
+                ss = SubString(text, idx, lastindex(text))
                 for mod_candidate in ("bb", "bf", "it", "cal", "frak", "mono")
                     if startswith(ss, mod_candidate)
                         mod = mod_candidate
@@ -64,14 +72,14 @@ function to_latex(text)
                     end
                 end
             end
-            char, idx = next(text, idx)
+            char, idx = iterate(text, idx)
             if char == '{'
                 i = utf8_findnext(text, '}', idx)
                 if i == 0
                     error("Invalid latex. Couldn't find matching } in $(text[idx:end])")
                 end
                 print_modifier(io, mod, SubString(text, idx, prevind(text, i)))
-                char, idx = next(text, i)
+                char, idx = iterate(text, i)
             else
                 print_modifier(io, mod, char)
             end

src/sub_super_scripts.jl

@@ -58,6 +58,7 @@ let subscript_map = Dict(
         'φ' => 'ᵩ',
         'χ' => 'ᵪ',
     )
+    global to_subscript
     function to_subscript(x::Char)
         haskey(subscript_map, x) || error("Char $x doesn't have a unicode superscript")
         subscript_map[x]
@@ -153,6 +154,7 @@ let superscript_map = Dict(
         'φ' => 'ᵠ',
         'χ' => 'ᵡ'
     )
+    global to_superscript
     function to_superscript(x::Char)
         haskey(superscript_map, x) || error("Char $x doesn't have a unicode superscript")
         superscript_map[x]

test/runtests.jl

@@ -1,5 +1,5 @@
 using UnicodeFun
-using Base.Test
+using Test
 
 # write your own tests here
 @test UnicodeFun.to_superscript(-1234567890) == "⁻¹²³⁴⁵⁶⁷⁸⁹⁰"
@@ -25,4 +25,3 @@ latexstring = "\\bf{boldface} \\it{italic} \\bb{blackboard} \\cal{calligraphic}
 @test to_root(3,"542") == "∛5̅4̅2̅"
 @test to_root(4,"542") == "∜5̅4̅2̅"
 @test to_root(17,"542") == "¹⁷√5̅4̅2̅"
-