adhere to COLUMNS=80

Author: t-bltg

src/findfonts.jl

@@ -27,7 +27,12 @@ else
     end
     function _font_paths()
         result = String[]
-        for p in ("/usr/share/fonts", joinpath(homedir(), ".fonts"), joinpath(homedir(), ".local/share/fonts"), "/usr/local/share/fonts",)
+        for p in (
+            "/usr/share/fonts",
+            joinpath(homedir(), ".fonts"),
+            joinpath(homedir(), ".local/share/fonts"),
+            "/usr/local/share/fonts"
+        )
             if isdir(p)
                 push!(result, p)
                 add_recursive(result, p)

src/rendering.jl

@@ -36,7 +36,9 @@ function glyphbitmap(bitmap::FreeType.FT_Bitmap)
     return bmp
 end
 
-one_or_typemax(::Type{T}) where {T<:Union{Real,Colorant}} = T<:Integer ? typemax(T) : oneunit(T)
+function one_or_typemax(::Type{T}) where {T<:Union{Real,Colorant}}
+    return T<:Integer ? typemax(T) : oneunit(T)
+end
 
 """
     renderstring!(img::AbstractMatrix, str::String, face, pixelsize, y0, x0;

src/types.jl

@@ -1,15 +1,18 @@
-check_error(err, error_msg) = err == 0 || error(error_msg * " with error: $(err)")
+check_error(err, error_msg) = err == 0 || error("$error_msg with error: $err")
 
 const FREE_FONT_LIBRARY = FT_Library[C_NULL]
 
 function ft_init()
-    FREE_FONT_LIBRARY[1] != C_NULL && error("Freetype already initalized. init() called two times?")
-    err = FT_Init_FreeType(FREE_FONT_LIBRARY)
-    return err == 0
+    if FREE_FONT_LIBRARY[1] != C_NULL
+        error("Freetype already initalized. init() called two times?")
+    end
+    return FT_Init_FreeType(FREE_FONT_LIBRARY) == 0
 end
 
 function ft_done()
-    FREE_FONT_LIBRARY[1] == C_NULL && error("Library == CNULL. FreeTypeAbstraction.done() called before init(), or done called two times?")
+    if FREE_FONT_LIBRARY[1] == C_NULL
+        error("Library == CNULL. FreeTypeAbstraction.done() called before init(), or done called two times?")
+    end
     err = FT_Done_FreeType(FREE_FONT_LIBRARY[1])
     FREE_FONT_LIBRARY[1] = C_NULL
     return err == 0
@@ -114,7 +117,9 @@ function safe_free(face)
     end
 end
 
-boundingbox(extent::FontExtent{T}) where T = Rect2(bearing(extent), Vec2{T}(extent.scale))
+function boundingbox(extent::FontExtent{T}) where T
+    return Rect2(bearing(extent), Vec2{T}(extent.scale))
+end
 
 mutable struct FTFont
     ft_ptr::FreeType.FT_Face
@@ -136,7 +141,9 @@ FTFont(path::String) = FTFont(newface(path))
 # C interop
 Base.cconvert(::Type{FreeType.FT_Face}, font::FTFont) = font
 
-Base.unsafe_convert(::Type{FreeType.FT_Face}, font::FTFont) = getfield(font, :ft_ptr)
+function Base.unsafe_convert(::Type{FreeType.FT_Face}, font::FTFont)
+    return getfield(font, :ft_ptr)
+end
 
 Base.propertynames(font::FTFont) = fieldnames(FreeType.FT_FaceRec)