Kolaru compat with mathtexengine

Project.toml

@@ -73,7 +73,7 @@ KernelDensity = "0.5, 0.6"
 LaTeXStrings = "1.2"
 MakieCore = "0.3.1"
 Match = "1.1"
-MathTeXEngine = "0.2"
+MathTeXEngine = "0.4"
 Observables = "0.5.1"
 OffsetArrays = "1"
 Packing = "0.4"

ReferenceTests/src/tests/text.jl

@@ -252,7 +252,7 @@ end
         axis = (
                 title = L"\sum_k{x y_k}",
                 xlabel = L"\lim_{x →\infty} A^j v_{(a + b)_k}^i \sqrt{23.5} x!= \sqrt{\frac{1+6}{4+a+g}}\int_{0}^{2π} \sin(x) dx",
-                ylabel = L"x + y - sin(x) × tan(y) + \sqrt{2}",
+                ylabel = L"x + y - \sin(x) × \tan(y) + \sqrt{2}",
             ),
         figure = (fontsize = 18,)
     )

src/Makie.jl

@@ -51,6 +51,7 @@ using GeometryBasics: widths, positive_widths, VecTypes, AbstractPolygon, value,
 using Distributions: Distribution, VariateForm, Discrete, QQPair, pdf, quantile, qqbuild
 
 import FileIO: save
+import FreeTypeAbstraction: height_insensitive_boundingbox
 using Printf: @sprintf
 using StatsFuns: logit, logistic
 # Imports from Base which we don't want to have to qualify

src/basic_recipes/text.jl

@@ -126,7 +126,7 @@ function plot!(plot::Text{<:Tuple{<:Union{LaTeXString, AbstractVector{<:LaTeXStr
     scene = Makie.parent_scene(plot)
 
     onany(lineels_glyphcollection_offset, plot.position, scene.camera.projectionview
-            ) do (allels, gcs, offs), pos, projview
+            ) do (allels, gcs, offs), pos, _
 
         if pos isa Vector && (length(pos) != length(allels))
             return
@@ -147,7 +147,7 @@ function plot!(plot::Text{<:Tuple{<:Union{LaTeXString, AbstractVector{<:LaTeXStr
             allels = [allels]
         end
         broadcast_foreach(allels, offs, pos, ts, rot) do allels, offs, pos, ts, rot
-            offset = Point2f(pos)
+            offset = project(scene.camera, :data, :pixel, Point2f(pos))[Vec(1, 2)]
 
             els = map(allels) do el
                 el[1] isa VLine || el[1] isa HLine || return nothing
@@ -183,7 +183,7 @@ function plot!(plot::Text{<:Tuple{<:Union{LaTeXString, AbstractVector{<:LaTeXStr
     linesegments!(
         plot, linepairs, linewidth = linewidths, color = plot.color,
         visible = plot.visible, inspectable = plot.inspectable, 
-        transparent = plot.transparency
+        transparent = plot.transparency, space = :pixel
     )
 
     plot
@@ -202,13 +202,13 @@ function texelems_and_glyph_collection(str::LaTeXString, fontscale_px, halign, v
 
     scales_2d = [Vec2f(x[3] * Vec2f(fs)) for x in els]
 
-    chars = [x[1].char for x in els]
-    fonts = [x[1].font for x in els]
+    texchars = [x[1] for x in els]
+    chars = [texchar.char for texchar in texchars]
+    fonts = [texchar.font for texchar in texchars]
+    extents = GlyphExtent.(texchars)
 
-    extents = [FreeTypeAbstraction.get_extent(f, c) for (f, c) in zip(fonts, chars)]
-
-    bboxes = map(extents, fonts, scales_2d) do ext, font, scale
-        unscaled_hi_bb = FreeTypeAbstraction.height_insensitive_boundingbox(ext, font)
+    bboxes = map(extents, scales_2d) do ext, scale
+        unscaled_hi_bb = height_insensitive_boundingbox_with_advance(ext)
         return Rect2f(
             origin(unscaled_hi_bb) * scale,
             widths(unscaled_hi_bb) * scale

src/interaction/inspector.jl

@@ -188,8 +188,8 @@ end
 function Bbox_from_glyphcollection(text, gc)
     bbox = Rect2f(0, 0, 0, 0)
     bboxes = Rect2f[]
-    broadcast_foreach(gc.extents, gc.fonts, gc.scales) do extent, font, scale
-        b = FreeTypeAbstraction.height_insensitive_boundingbox(extent, font) * scale
+    broadcast_foreach(gc.extents, gc.scales) do extent, scale
+        b = height_insensitive_boundingbox_with_advance(extent) * scale
         push!(bboxes, b)
     end
     for (c, o, bb) in zip(text, gc.origins, bboxes)

src/layouting/boundingbox.jl

@@ -1,5 +1,3 @@
-using FreeTypeAbstraction: height_insensitive_boundingbox
-
 function parent_transform(x)
     p = parent(transformation(x))
     isnothing(p) ? Mat4f(I) : p.model[]
@@ -22,21 +20,29 @@ end
 
 function gl_bboxes(gl::GlyphCollection)
     scales = gl.scales.sv isa Vec2f ? (gl.scales.sv for _ in gl.extents) : gl.scales.sv
-    map(gl.extents, gl.fonts, scales) do ext, font, scale
-        unscaled_hi_bb = height_insensitive_boundingbox_with_advance(ext, font)
-        hi_bb = Rect2f(
-            Makie.origin(unscaled_hi_bb) * scale,
-            widths(unscaled_hi_bb) * scale
+    map(gl.extents, scales) do ext, scale
+        hi_bb = height_insensitive_boundingbox_with_advance(ext)
+        Rect2f(
+            Makie.origin(hi_bb) * scale,
+            widths(hi_bb) * scale
         )
     end
 end
 
-function height_insensitive_boundingbox_with_advance(ext, font)
+function height_insensitive_boundingbox(ext::GlyphExtent)
+    l = ext.ink_bounding_box.origin[1]
+    w = ext.ink_bounding_box.widths[1]
+    b = ext.descender
+    h = ext.ascender
+    return Rect2f((l, b), (w, h - b))
+end
+
+function height_insensitive_boundingbox_with_advance(ext::GlyphExtent)
     l = 0f0
-    r = FreeTypeAbstraction.hadvance(ext)
-    b = FreeTypeAbstraction.descender(font)
-    t = FreeTypeAbstraction.ascender(font)
-    return Rect2f((l, b), (r - l, t - b))
+    r = ext.hadvance
+    b = ext.descender
+    h = ext.ascender
+    return Rect2f((l, b), (r - l, h - b))
 end
 
 function boundingbox(glyphcollection::GlyphCollection, position::Point3f, rotation::Quaternion)
@@ -45,15 +51,11 @@ function boundingbox(glyphcollection::GlyphCollection, position::Point3f, rotati
         return Rect3f(position, Vec3f(0, 0, 0))
     end
 
-    chars = glyphcollection.glyphs
     glyphorigins = glyphcollection.origins
     glyphbbs = gl_bboxes(glyphcollection)
 
     bb = Rect3f()
-    for (char, charo, glyphbb) in zip(chars, glyphorigins, glyphbbs)
-        # ignore line breaks
-        # char in ('\r', '\n') && continue
-
+    for (charo, glyphbb) in zip(glyphorigins, glyphbbs)
         charbb = rotate_bbox(Rect3f(glyphbb), rotation) + charo + position
         if !isfinite_rect(bb)
             bb = charbb

src/layouting/layouting.jl

@@ -79,14 +79,13 @@ function glyph_collection(
 
     # collect information about every character in the string
     charinfos = broadcast((c for c in str), font_per_char, fontscale_px) do char, font, scale
-        unscaled_extent = get_extent(font, char)
-        lineheight = Float32(font.height / font.units_per_EM * lineheight_factor * scale)
-        unscaled_hi_bb = height_insensitive_boundingbox(unscaled_extent, font)
-        hi_bb = Rect2f(
-            Makie.origin(unscaled_hi_bb) * scale,
-            widths(unscaled_hi_bb) * scale)
-        (char = char, font = font, scale = scale, hadvance = hadvance(unscaled_extent) * scale,
-            hi_bb = hi_bb, lineheight = lineheight, extent = unscaled_extent)
+        (
+            char = char,
+            font = font,
+            scale = scale,
+            lineheight = Float32(font.height / font.units_per_EM * lineheight_factor * scale),
+            extent = GlyphExtent(font, char)
+        )
     end
 
     # split the character info vector into lines after every \n
@@ -112,7 +111,7 @@ function glyph_collection(
 
         for (i, ci) in enumerate(charinfos)
             push!(xs[end], x)
-            x += charinfos[i].hadvance
+            x += ci.extent.hadvance * ci.scale
 
             if 0 < word_wrap_width < x && (ci.char == ' ' || i == length(charinfos)) && 
                     last_space_local_idx != 0
@@ -122,13 +121,13 @@ function glyph_collection(
                 xs[end-1] = xs[end-1][1:last_space_local_idx]
                 push!(lineinfos, view(charinfos, last_line_start:last_space_global_idx))
                 last_line_start = last_space_global_idx+1
-                x = xs[end][end] + charinfos[i].hadvance
+                x = xs[end][end] + ci.extent.hadvance * ci.scale
 
                 # TODO Do we need to redo the metrics for newlines?
                 charinfos[last_space_global_idx] = let 
-                    _, font, scale, hadvance, hi_bb, lineheight, extent = charinfos[last_space_global_idx]
-                    (char = '\n', font = font, scale = scale, hadvance = hadvance,
-                        hi_bb = hi_bb, lineheight = lineheight, extent = extent)
+                    _, font, scale, lineheight, extent = charinfos[last_space_global_idx]
+                    (char = '\n', font = font, scale = scale, 
+                        lineheight = lineheight, extent = extent)
                 end
 
                 if i == length(charinfos)
@@ -158,7 +157,7 @@ function glyph_collection(
         # if the last and not the only character is \n, take the previous one
         # to compute the width
         i = (nchars > 1 && line[end].char == '\n') ? nchars - 1 : nchars
-        xx[i] + line[i].hadvance
+        xx[i] + line[i].extent.hadvance * line[i].scale
     end
 
     # the maximum width is needed for justification
@@ -219,11 +218,11 @@ function glyph_collection(
     # for y alignment, we need the largest ascender of the first line
     # and the largest descender of the last line
     first_line_ascender = maximum(lineinfos[1]) do l
-        ascender(l.font) * l.scale
+        l.scale * l.extent.ascender
     end
 
     last_line_descender = minimum(lineinfos[end]) do l
-        descender(l.font) * l.scale
+        l.scale * l.extent.descender
     end
 
     # compute the height of all lines together
@@ -244,7 +243,6 @@ function glyph_collection(
         else
             error("Invalid valign $valign. Valid values are <:Number, :bottom, :baseline, :top, and :center.")
         end
-
         ys .- first_line_ascender .+ (1 - va) .* overall_height
     end
 

src/makielayout/blocks/textbox.jl

@@ -77,7 +77,7 @@ function initialize_block!(tbox::Textbox)
 
         hadvances = Float32[]
         broadcast_foreach(glyphcollection.extents, glyphcollection.scales) do ex, sc
-            hadvance = Makie.FreeTypeAbstraction.hadvance(ex) * sc[1]
+            hadvance = ex.hadvance * sc[1]
             push!(hadvances, hadvance)
         end
 
@@ -257,8 +257,8 @@ function charbbs(text)
     end
     pos = Point2f(text.position[])
     bbs = Rect2f[]
-    broadcast_foreach(gc.extents, gc.scales, gc.origins, gc.fonts) do ext, sc, ori, font
-        bb = Makie.FreeTypeAbstraction.height_insensitive_boundingbox(ext, font) * sc
+    broadcast_foreach(gc.extents, gc.scales, gc.origins) do ext, sc, ori
+        bb = Makie.height_insensitive_boundingbox_with_advance(ext) * sc
         fr = Rect2f(Point2f(ori) + bb.origin + pos, bb.widths)
         push!(bbs, fr)
     end

src/makielayout/types.jl

@@ -244,7 +244,7 @@ end
         "The padding between the xlabel and the ticks or axis."
         xlabelpadding::Float64 = 3f0
         "The padding between the ylabel and the ticks or axis."
-        ylabelpadding::Float64 = 5f0 # because of boundingbox inaccuracies of ticklabels
+        ylabelpadding::Float64 = 5f0 # xlabels usually have some more visual padding because of ascenders, which are larger than the hadvance gaps of ylabels
         "The font family of the xticklabels."
         xticklabelfont::Makie.FreeTypeAbstraction.FTFont = @inherit(:font, "TeX Gyre Heros Makie")
         "The font family of the yticklabels."

src/types.jl

@@ -305,6 +305,40 @@ function collect_vector(sv::ScalarOrVector, n::Int)
     end
 end
 
+"""
+    GlyphExtent
+
+Store information about the bounding box of a single glyph.
+"""
+struct GlyphExtent
+    ink_bounding_box::Rect2f
+    ascender::Float32
+    descender::Float32
+    hadvance::Float32
+end
+
+function GlyphExtent(font, char)
+    extent = get_extent(font, char)
+    ink_bb = FreeTypeAbstraction.inkboundingbox(extent)
+    ascender = FreeTypeAbstraction.ascender(font)
+    descender = FreeTypeAbstraction.descender(font)
+    hadvance = FreeTypeAbstraction.hadvance(extent)
+
+    return GlyphExtent(ink_bb, ascender, descender, hadvance)
+end
+
+function GlyphExtent(texchar::TeXChar)
+    l = MathTeXEngine.leftinkbound(texchar)
+    r = MathTeXEngine.rightinkbound(texchar)
+    b = MathTeXEngine.bottominkbound(texchar)
+    t = MathTeXEngine.topinkbound(texchar)
+    ascender = MathTeXEngine.ascender(texchar)
+    descender = MathTeXEngine.descender(texchar)
+    hadvance = MathTeXEngine.hadvance(texchar)
+
+    return GlyphExtent(Rect2f((l, b), (r - l, t - b)), ascender, descender, hadvance)
+end
+
 """
     GlyphCollection
 
@@ -314,7 +348,7 @@ struct GlyphCollection
     glyphs::Vector{Char}
     fonts::Vector{FTFont}
     origins::Vector{Point3f}
-    extents::Vector{FreeTypeAbstraction.FontExtent{Float32}}
+    extents::Vector{GlyphExtent}
     scales::ScalarOrVector{Vec2f}
     rotations::ScalarOrVector{Quaternionf}
     colors::ScalarOrVector{RGBAf}

test/text.jl

@@ -44,13 +44,19 @@
     @test glyph_collection.glyphs == chars
     @test glyph_collection.fonts == [font for _ in 1:4]
     @test all(isapprox.(glyph_collection.origins, [Point3f(x, 0, 0) for x in origins], atol = 1e-10))
-    @test glyph_collection.extents == unit_extents
     @test glyph_collection.scales.sv == [Vec2f(p.textsize[]) for _ in 1:4]
     @test glyph_collection.rotations.sv == [Quaternionf(0,0,0,1) for _ in 1:4]
     @test glyph_collection.colors.sv == [RGBAf(0,0,0,1) for _ in 1:4]
     @test glyph_collection.strokecolors.sv == [RGBAf(0,0,0,0) for _ in 1:4]
     @test glyph_collection.strokewidths.sv == Float32[0, 0, 0, 0]
 
+    makie_hi_bb = Makie.height_insensitive_boundingbox.(glyph_collection.extents)
+    makie_hi_bb_wa = Makie.height_insensitive_boundingbox_with_advance.(glyph_collection.extents)
+    fta_hi_bb = FreeTypeAbstraction.height_insensitive_boundingbox.(unit_extents, Ref(font))
+    fta_ha = FreeTypeAbstraction.hadvance.(unit_extents)
+    @test makie_hi_bb == fta_hi_bb
+    @test fta_ha == [bb.origin[1] + bb.widths[1] for bb in makie_hi_bb_wa]
+
     # Test quad data
     positions, char_offsets, quad_offsets, uvs, scales = Makie.text_quads(
         to_ndim(Point3f, p.position[], 0), glyph_collection,