fix some runic inconsistencies (#422)

Author: t-bltg

ext/FreeTypeExt.jl

@@ -76,9 +76,8 @@ end
 add_mono(fts...) = tuple(map(x -> x * "Mono", fts)..., fts...)
 
 # COV_EXCL_START
-fallback_fonts() =
-    # those fallback fonts are likely to fail braille characters
-    if Sys.islinux()
+# those fallback fonts are likely to fail braille characters
+fallback_fonts() = if Sys.islinux()
     add_mono("DejaVu Sans ", "Ubuntu ", "Noto ", "Free", "Liberation ")  # NOTE: trailing space intended
 elseif Sys.isbsd()
     ("Courier New", "Helvetica")
@@ -192,8 +191,7 @@ 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)
 
-FontExtent(fontmetric::FT_Glyph_Metrics, scale::T = 64.0) where {T <: AbstractFloat} =
-    FontExtent(
+FontExtent(fontmetric::FT_Glyph_Metrics, scale::T = 64.0) where {T <: AbstractFloat} = FontExtent(
     SVector{2, T}(fontmetric.vertBearingX, fontmetric.vertBearingY) ./ scale,
     SVector{2, T}(fontmetric.horiBearingX, fontmetric.horiBearingY) ./ scale,
     SVector{2, T}(fontmetric.horiAdvance, fontmetric.vertAdvance) ./ scale,
@@ -257,9 +255,9 @@ function glyph_bitmap(bitmap::FT_Bitmap)
     return bmp
 end
 
-render_face(face::FTFont, glyph, pixelsize::Integer; kw...) =
-let gl = load_glyph(face, glyph, pixelsize; kw...)
-    glyph_bitmap(gl.bitmap), FontExtent(gl.metrics)
+function render_face(face::FTFont, glyph, pixelsize::Integer; kw...)
+    gl = load_glyph(face, glyph, pixelsize; kw...)
+    return glyph_bitmap(gl.bitmap), FontExtent(gl.metrics)
 end
 
 extents(face::FTFont, glyph, pixelsize::Integer) =
@@ -444,8 +442,7 @@ function ft_done()
     end
 end
 
-add_recursive(result, path) =
-    for p in readdir(path)
+add_recursive(result, path) = for p in readdir(path)
     if (pabs = joinpath(path, p)) |> isdir
         push!(result, pabs)
         add_recursive(result, pabs)

src/common.jl

@@ -214,8 +214,7 @@ const ASPECT_RATIO = Ref(4 / 3)
 const DEFAULT_HEIGHT = Ref(15)
 const DEFAULT_WIDTH = Ref(round(Int, DEFAULT_HEIGHT[] * 2ASPECT_RATIO[]))
 
-colormode() =
-if (cm = COLORMODE[]) ≡ Crayons.COLORS_256
+colormode() = if (cm = COLORMODE[]) ≡ Crayons.COLORS_256
     8
 elseif cm ≡ Crayons.COLORS_24BIT
     24
@@ -252,8 +251,7 @@ function init_8bit()
     return nothing
 end
 
-get_have_truecolor() =
-if isdefined(Base, :get_have_truecolor)
+get_have_truecolor() = if isdefined(Base, :get_have_truecolor)
     Base.get_have_truecolor()
 else
     # see gist.github.com/XVilka/8346728#checking-for-colorterm
@@ -289,13 +287,11 @@ function default_size!(;
     return DEFAULT_HEIGHT[], DEFAULT_WIDTH[]  # `displaysize` order convention
 end
 
-function char_marker(marker::MarkerType)::Char
-    return if marker isa Symbol
-        get(MARKERS, marker, MARKERS[:circle])
-    else
-        length(marker) ≡ 1 || throw(ArgumentError("`marker` keyword has a non unit length"))
-        first(marker)
-    end
+char_marker(marker::MarkerType)::Char = if marker isa Symbol
+    get(MARKERS, marker, MARKERS[:circle])
+else
+    length(marker) ≡ 1 || throw(ArgumentError("`marker` keyword has a non unit length"))
+    first(marker)
 end
 
 iterable(obj::AbstractVecOrMat) = obj

src/interface/histogram.jl

@@ -160,37 +160,37 @@ $(
 
 ```julia-repl
 julia> histogram(randn(1_000) * .1, closed=:right, nbins=15)
-                  ┌                                        ┐ 
-   (-0.3 , -0.25] ┤▎ 1                                       
-   (-0.25, -0.2 ] ┤██▉ 17                                    
-   (-0.2 , -0.15] ┤█████████▍ 53                             
-   (-0.15, -0.1 ] ┤████████████████▎ 92                      
-   (-0.1 , -0.05] ┤████████████████████████▋ 141             
-   (-0.05,  0.0 ] ┤███████████████████████████████████  200  
-   ( 0.0 ,  0.05] ┤█████████████████████████████████▋ 192    
-   ( 0.05,  0.1 ] ┤█████████████████████████▏ 143            
-   ( 0.1 ,  0.15] ┤████████████████▎ 92                      
-   ( 0.15,  0.2 ] ┤███████▊ 45                               
-   ( 0.2 ,  0.25] ┤██▋ 15                                    
-   ( 0.25,  0.3 ] ┤█▍ 8                                      
-   ( 0.3 ,  0.35] ┤▎ 1                                       
-                  └                                        ┘ 
-                                   Frequency                
+                  ┌                                        ┐
+   (-0.3 , -0.25] ┤▎ 1
+   (-0.25, -0.2 ] ┤██▉ 17
+   (-0.2 , -0.15] ┤█████████▍ 53
+   (-0.15, -0.1 ] ┤████████████████▎ 92
+   (-0.1 , -0.05] ┤████████████████████████▋ 141
+   (-0.05,  0.0 ] ┤███████████████████████████████████  200
+   ( 0.0 ,  0.05] ┤█████████████████████████████████▋ 192
+   ( 0.05,  0.1 ] ┤█████████████████████████▏ 143
+   ( 0.1 ,  0.15] ┤████████████████▎ 92
+   ( 0.15,  0.2 ] ┤███████▊ 45
+   ( 0.2 ,  0.25] ┤██▋ 15
+   ( 0.25,  0.3 ] ┤█▍ 8
+   ( 0.3 ,  0.35] ┤▎ 1
+                  └                                        ┘
+                                   Frequency
 julia> histogram(randn(100_000) .* .1, nbins=60, vertical=true, height=10)
-         ┌                                             ┐ 
-   8_093  ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀▃█▇▃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀  
-          ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀▅████▆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀  
-          ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀▇██████▅⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀  
-          ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀▅████████▄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀  
-          ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀▃██████████▃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀  
-          ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀▂████████████▂⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀  
-          ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀▂██████████████▃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀  
-          ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀▁████████████████▃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀  
-          ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀▁▅██████████████████▅▁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀  
-       0  ⠀⠀⠀⠀⠀⠀▁▁▂▃▅██████████████████████▆▃▂▁▁⠀⠀⠀⠀⠀⠀⠀  
-         └                                             ┘ 
-         ⠀-0.44⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀0.46⠀ 
-         ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀μ ± σ: 0.0 ± 0.1⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀ 
+         ┌                                             ┐
+   8_093  ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀▃█▇▃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+          ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀▅████▆⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+          ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀▇██████▅⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+          ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀▅████████▄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+          ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀▃██████████▃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+          ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀▂████████████▂⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+          ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀▂██████████████▃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+          ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀▁████████████████▃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+          ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀▁▅██████████████████▅▁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
+       0  ⠀⠀⠀⠀⠀⠀▁▁▂▃▅██████████████████████▆▃▂▁▁⠀⠀⠀⠀⠀⠀⠀
+         └                                             ┘
+         ⠀-0.44⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀0.46⠀
+         ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀μ ± σ: 0.0 ± 0.1⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀
 ```
 
 # See also
@@ -207,10 +207,11 @@ function histogram(x::AbstractArray; closed = :left, vertical = false, stats = t
         mx, Mx = extrema(x_plot)
         μ = sum(x_plot) / len
         σ = √(sum((x_plot .- μ) .^ 2) / len)
-        "μ ± σ: " *
-            lpad(round(μ; digits), digits + 1) *
-            " ± " *
-            lpad(round(σ; digits), digits + 1)
+        (
+            "μ ± σ: " *
+                lpad(round(μ; digits), digits + 1) * " ± " *
+                lpad(round(σ; digits), digits + 1)
+        )
     else
         ""
     end