revert bearing change

Author: t-bltg

src/rendering.jl

@@ -186,13 +186,13 @@ function renderstring!(
 
         # draw glyph bounding box
         if bbox_glyph !== nothing
-            rect = boundingbox(metric)
-            (mc, mr), (Mc, Mr) = extrema(rect)
-            r1, r2 = clamp(py + mr, 1, imgh), clamp(py + Mr, 1, imgh)
-            c1, c2 = clamp(px + mc, 1, imgw), clamp(px + Mc, 1, imgw)
-            # ^^^ should be equivalent to vvv
-            # r1, r2 = clamp(oy + row_lo, 1, imgh), clamp(oy + row_hi, 1, imgh)
-            # c1, c2 = clamp(ox + col_lo, 1, imgw), clamp(ox + col_hi, 1, imgw)
+            # rect = boundingbox(metric)
+            # (mc, mr), (Mc, Mr) = extrema(rect)
+            # r1, r2 = clamp(py + mr, 1, imgh), clamp(py + Mr, 1, imgh)
+            # c1, c2 = clamp(px + mc, 1, imgw), clamp(px + Mc, 1, imgw)
+            # ^^^ should be equivalent to vvv: see JuliaGraphics/FreeTypeAbstraction.jl/pull/71
+            r1, r2 = clamp(oy + row_lo, 1, imgh), clamp(oy + row_hi, 1, imgh)
+            c1, c2 = clamp(ox + col_lo, 1, imgw), clamp(ox + col_hi, 1, imgw)
             if r2 > r1 && c2 > c1
                 img[r1, c1:c2] .= bbox_glyph
                 img[r2, c1:c2] .= bbox_glyph

src/types.jl

@@ -104,9 +104,11 @@ function FontExtent(fontmetric::FreeType.FT_Glyph_Metrics, scale::Integer)
 end
 
 function bearing(extent::FontExtent{T}) where T
+    # origin to SW corner of the horizontal metric
+    # with the conventions of freetype.org/freetype2/docs/glyphs/glyphs-3.html
     return Vec2{T}(
-        +extent.horizontal_bearing[1],
-        -extent.horizontal_bearing[2],
+        hbearing_ori_to_left(extent),
+        hbearing_ori_to_top(extent) - inkheight(extent),
     )
 end
 

test/runtests.jl

@@ -16,7 +16,7 @@ face = FA.findfont("hack")
     @test FA.descender(face) isa Real
 
     bb = FA.boundingbox("asdasd", face, 64)
-    @test round.(Int, minimum(bb)) == Vec(4, -49)
+    @test round.(Int, minimum(bb)) == Vec(4, -1)
     @test round.(Int, widths(bb)) == Vec2(221, 50)
 
     FA.set_pixelsize(face, 64) # should be the default