revert style changes

Author: t-bltg

src/findfonts.jl

@@ -1,16 +1,20 @@
 if Sys.isapple()
-    _font_paths() = [
-        "/Library/Fonts", # Additional fonts that can be used by all users. This is generally where fonts go if they are to be used by other applications.
-        joinpath(homedir(), "Library/Fonts"), # Fonts specific to each user.
-        "/Network/Library/Fonts", # Fonts shared for users on a network
-        "/System/Library/Fonts", # System specific fonts
-        "/System/Library/Fonts/Supplemental", # new location since Catalina
-    ]
+    function _font_paths()
+        return [
+            "/Library/Fonts", # Additional fonts that can be used by all users. This is generally where fonts go if they are to be used by other applications.
+            joinpath(homedir(), "Library/Fonts"), # Fonts specific to each user.
+            "/Network/Library/Fonts", # Fonts shared for users on a network
+            "/System/Library/Fonts", # System specific fonts
+            "/System/Library/Fonts/Supplemental", # new location since Catalina
+        ]
+    end
 elseif Sys.iswindows()
-    _font_paths() = [
-        joinpath(get(ENV, "SYSTEMROOT", "C:\\Windows"), "Fonts"),
-        joinpath(homedir(), "AppData", "Local", "Microsoft", "Windows", "Fonts"),
-    ]
+    function _font_paths()
+        return [
+            joinpath(get(ENV, "SYSTEMROOT", "C:\\Windows"), "Fonts"),
+            joinpath(homedir(), "AppData", "Local", "Microsoft", "Windows", "Fonts"),
+        ]
+    end
 else
     function add_recursive(result, path)
         for p in readdir(path)
@@ -29,7 +33,7 @@ else
                 add_recursive(result, p)
             end
         end
-        result
+        return result
     end
 end
 
@@ -99,7 +103,7 @@ function match_font(face::FTFont, searchparts)::Tuple{Int, Int, Bool, Int}
 
     style_score = sum(length(part) for part in remaining_parts if occursin(part, sname))
 
-    (family_score, style_score, is_regular_style, fontlength_penalty)
+    return (family_score, style_score, is_regular_style, fontlength_penalty)
 end
 
 function try_load(fpath)
@@ -160,5 +164,5 @@ function findfont(
         end
     end
 
-    best_font
+    return best_font
 end

src/layout.jl

@@ -58,7 +58,9 @@ function glyph_rects(line::AbstractString, fonts, scales)
     return rects
 end
 
-boundingbox(line::AbstractString, fonts, scales) = reduce(union, glyph_rects(line, fonts, scales))
+function boundingbox(line::AbstractString, fonts, scales)
+    return reduce(union, glyph_rects(line, fonts, scales))
+end
 
 function inkboundingbox(ext::FontExtent)
     l = leftinkbound(ext)

src/rendering.jl

@@ -9,16 +9,17 @@ function loadglyph(face::FTFont, c::Char, pixelsize::Integer)
     loadchar(face, c)
     glyph = unsafe_load(face.glyph)
     @assert glyph.format == FreeType.FT_GLYPH_FORMAT_BITMAP
-    glyph
+    return glyph
 end
 
 function renderface(face::FTFont, c::Char, pixelsize::Integer)
     glyph = loadglyph(face, c, pixelsize)
-    glyphbitmap(glyph.bitmap), FontExtent(glyph.metrics)
+    return glyphbitmap(glyph.bitmap), FontExtent(glyph.metrics)
 end
 
-extents(face::FTFont, c::Char, pixelsize::Integer) =
-    FontExtent(loadglyph(face, c, pixelsize).metrics)
+function extents(face::FTFont, c::Char, pixelsize::Integer)
+    return FontExtent(loadglyph(face, c, pixelsize).metrics)
+end
 
 function glyphbitmap(bitmap::FreeType.FT_Bitmap)
     @assert bitmap.pixel_mode == FreeType.FT_PIXEL_MODE_GRAY
@@ -32,7 +33,7 @@ function glyphbitmap(bitmap::FreeType.FT_Bitmap)
         bmp[:, r] = src
         row += bitmap.pitch
     end
-    bmp
+    return bmp
 end
 
 one_or_typemax(::Type{T}) where {T<:Union{Real,Colorant}} = T<:Integer ? typemax(T) : oneunit(T)

src/types.jl

@@ -31,73 +31,81 @@ struct FontExtent{T}
     scale::Vec{2, T}
 end
 
-@inline hadvance(ext::FontExtent) = ext.advance[1]
-@inline vadvance(ext::FontExtent) = ext.advance[2]
-@inline inkwidth(ext::FontExtent) = ext.scale[1]
-@inline inkheight(ext::FontExtent) = ext.scale[2]
-@inline hbearing_ori_to_left(ext::FontExtent) = ext.horizontal_bearing[1]
-@inline hbearing_ori_to_top(ext::FontExtent) = ext.horizontal_bearing[2]
-@inline leftinkbound(ext::FontExtent) = hbearing_ori_to_left(ext)
-@inline rightinkbound(ext::FontExtent) = leftinkbound(ext) + inkwidth(ext)
-@inline bottominkbound(ext::FontExtent) = hbearing_ori_to_top(ext) - inkheight(ext)
-@inline topinkbound(ext::FontExtent) = hbearing_ori_to_top(ext)
+hadvance(ext::FontExtent) = ext.advance[1]
+vadvance(ext::FontExtent) = ext.advance[2]
+inkwidth(ext::FontExtent) = ext.scale[1]
+inkheight(ext::FontExtent) = ext.scale[2]
+hbearing_ori_to_left(ext::FontExtent) = ext.horizontal_bearing[1]
+hbearing_ori_to_top(ext::FontExtent) = ext.horizontal_bearing[2]
+leftinkbound(ext::FontExtent) = hbearing_ori_to_left(ext)
+rightinkbound(ext::FontExtent) = leftinkbound(ext) + inkwidth(ext)
+bottominkbound(ext::FontExtent) = hbearing_ori_to_top(ext) - inkheight(ext)
+topinkbound(ext::FontExtent) = hbearing_ori_to_top(ext)
 
 BroadcastStyle(::Type{<: FontExtent}) = Style{FontExtent}()
 BroadcastStyle(::Style{FontExtent}, x) = Style{FontExtent}()
 BroadcastStyle(x, ::Style{FontExtent}) = Style{FontExtent}()
 
-broadcasted(op::Function, f::FontExtent, scaling::StaticVector) =
-FontExtent(
+function broadcasted(op::Function, f::FontExtent, scaling::StaticVector)
+    return FontExtent(
         op.(f.vertical_bearing, scaling[1]),
         op.(f.horizontal_bearing, scaling[2]),
         op.(f.advance, scaling),
         op.(f.scale, scaling),
     )
+end
 
-broadcasted(op::Function, f::FontExtent) =
-    FontExtent(
+function broadcasted(op::Function, f::FontExtent)
+    return FontExtent(
         op.(f.vertical_bearing),
         op.(f.horizontal_bearing),
         op.(f.advance),
         op.(f.scale),
     )
+end
 
-broadcasted(op::Function, ::Type{T}, f::FontExtent) where T =
-    FontExtent(
+function broadcasted(op::Function, ::Type{T}, f::FontExtent) where T
+    return FontExtent(
         map(x-> op(T, x), f.vertical_bearing),
         map(x-> op(T, x), f.horizontal_bearing),
         map(x-> op(T, x), f.advance),
         map(x-> op(T, x), f.scale),
     )
+end
 
-FontExtent(fontmetric::FreeType.FT_Glyph_Metrics, scale::T = 64.0) where T <: AbstractFloat =
-    FontExtent(
+function FontExtent(fontmetric::FreeType.FT_Glyph_Metrics, scale::T = 64.0) where T <: AbstractFloat
+    return FontExtent(
         Vec{2, T}(fontmetric.vertBearingX, fontmetric.vertBearingY) ./ scale,
         Vec{2, T}(fontmetric.horiBearingX, fontmetric.horiBearingY) ./ scale,
         Vec{2, T}(fontmetric.horiAdvance, fontmetric.vertAdvance) ./ scale,
         Vec{2, T}(fontmetric.width, fontmetric.height) ./ scale
     )
+end
 
-==(x::FontExtent, y::FontExtent) = (
-    x.vertical_bearing == y.vertical_bearing &&
-    x.horizontal_bearing == y.horizontal_bearing &&
-    x.advance == y.advance &&
-    x.scale == y.scale
-)
+function ==(x::FontExtent, y::FontExtent)
+    return (
+        x.vertical_bearing == y.vertical_bearing &&
+        x.horizontal_bearing == y.horizontal_bearing &&
+        x.advance == y.advance &&
+        x.scale == y.scale
+    )
+end
 
-FontExtent(fontmetric::FreeType.FT_Glyph_Metrics, scale::Integer) =
-    FontExtent(
+function FontExtent(fontmetric::FreeType.FT_Glyph_Metrics, scale::Integer)
+    return FontExtent(
         div.(Vec{2, Int}(fontmetric.vertBearingX, fontmetric.vertBearingY), scale),
         div.(Vec{2, Int}(fontmetric.horiBearingX, fontmetric.horiBearingY), scale),
         div.(Vec{2, Int}(fontmetric.horiAdvance, fontmetric.vertAdvance), scale),
         div.(Vec{2, Int}(fontmetric.width, fontmetric.height), scale)
     )
+end
 
-bearing(extent::FontExtent{T}) where T = 
-    Vec2{T}(
+function bearing(extent::FontExtent{T}) where T
+    return Vec2{T}(
         +extent.horizontal_bearing[1],
         -extent.horizontal_bearing[2],
     )
+end
 
 function safe_free(face)
     ptr = getfield(face, :ft_ptr)
@@ -143,8 +151,9 @@ function Base.getproperty(font::FTFont, fieldname::Symbol)
     end
 end
 
-Base.show(io::IO, font::FTFont) =
+function Base.show(io::IO, font::FTFont)
     print(io, "FTFont (family = $(font.family_name), style = $(font.style_name))")
+end
 
 # Allow broadcasting over fonts
 Base.Broadcast.broadcastable(ft::FTFont) = Ref(ft)