Merge branch 'master' into sd/geometrybasics

Author: SimonDanisch

.travis.yml

@@ -7,3 +7,6 @@ julia:
 
 notifications:
   email: false
+
+after_success:
+  - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'

Project.toml

@@ -11,9 +11,9 @@ StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 
 [compat]
 ColorVectorSpace = "0.8"
-Colors = "0.11"
-FreeType = "2, 3"
 GeometryBasics = "0.2"
+Colors = "0.11, 0.12"
+FreeType = "3"
 StaticArrays = "0.12"
 julia = "1"
 

README.md

@@ -1,3 +1,5 @@
+[![codecov](https://codecov.io/gh/JuliaGraphics/FreeTypeAbstraction.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/JuliaGraphics/FreeTypeAbstraction.jl)
+[![Build Status](https://travis-ci.org/JuliaGraphics/FreeTypeAbstraction.jl.svg?branch=master)](https://travis-ci.org/JuliaGraphics/FreeTypeAbstraction.jl)
 # FreeTypeAbstraction
 
 Draw text into a Matrix.
@@ -7,7 +9,7 @@ Draw text into a Matrix.
 using FreeTypeAbstraction
 
 # load a font
-face = newface("hack_regular.ttf")
+face = FTFont("hack_regular.ttf")
 
 # render a character
 img, metric = renderface(face, 'C')

src/FreeTypeAbstraction.jl

@@ -10,6 +10,7 @@ include("findfonts.jl")
 include("layout.jl")
 include("rendering.jl")
 
+export FTFont
 export newface
 export renderface
 export FontExtent

src/layout.jl

@@ -32,8 +32,8 @@ function iterate_extents(f, line::AbstractString, fonts, scales)
     iterator = zip(line, iter_or_array(scales), iter_or_array(fonts))
     lastpos = 0.0
     for (char, scale, font) in iterator
-        extent, glyph_box = metrics_bb(char, font, scale)
-        mini = minimimum(glyph_box) .+ Vec2f0(lastpos, 0.0)
+        glyph_box, extent = metrics_bb(char, font, scale)
+        mini = minimum(glyph_box) .+ Vec2f0(lastpos, 0.0)
         glyph_box = Rect2D(mini, widths(glyph_box))
         glyph_advance = Point2f0(extent.advance)
         lastpos += glyph_advance[1]
@@ -51,5 +51,5 @@ function glyph_rects(line::AbstractString, fonts, scales)
 end
 
 function boundingbox(line::AbstractString, fonts, scales)
-    reduce(union, glyph_rects(lines, fonts, scales))
+    return reduce(union, glyph_rects(line, fonts, scales))
 end

src/types.jl

@@ -156,6 +156,9 @@ function Base.getproperty(font::FTFont, fieldname::Symbol)
     end
 end
 
+# Allow broadcasting over fonts
+Base.Broadcast.broadcastable(ft::FTFont) = Ref(ft)
+
 get_pixelsize(face::FTFont) = getfield(face, :current_pixelsize)[]
 
 function set_pixelsize(face::FTFont, size::Integer)

test/runtests.jl

@@ -1,10 +1,13 @@
 using FreeTypeAbstraction, Colors, ColorVectorSpace, GeometryBasics
 using Test
-using FreeTypeAbstraction: Vec, glyph_rects, get_extent, FTFont, kerning
+using FreeTypeAbstraction: boundingbox, Vec, glyph_rects, get_extent, FTFont, kerning
 using FreeType
 
 face = FreeTypeAbstraction.findfont("hack"; additional_fonts=@__DIR__)
 
+bb = boundingbox("asdasd", face, 1.0)
+@test bb == Rect(4.0, -1.0, 224.0, 50.0)
+
 FA = FreeTypeAbstraction
 
 FA.set_pixelsize(face, 64) # should be the default