jk/glyph indices

CairoMakie/src/primitives.jl

@@ -425,19 +425,15 @@ function draw_glyph_collection(scene, ctx, position, glyph_collection, rotation,
         )
 
         Cairo.save(ctx)
-        Cairo.move_to(ctx, glyphpos...)
         set_font_matrix(ctx, mat)
-        Cairo.show_text(ctx, string(glyph))
-        # show_text makes an implicite move_to at the end, which starts a new one point path.
-        # `new_path` clears that path so it doesn't end up as an artifact in the next stroke call
-        Cairo.new_path(ctx)
+        show_glyph(ctx, glyph, glyphpos...)
         Cairo.restore(ctx)
 
         if strokewidth > 0 && strokecolor != RGBAf(0, 0, 0, 0)
             Cairo.save(ctx)
             Cairo.move_to(ctx, glyphpos...)
             set_font_matrix(ctx, mat)
-            Cairo.text_path(ctx, string(glyph))
+            glyph_path(ctx, glyph, glyphpos...)
             Cairo.set_source_rgba(ctx, rgbatuple(strokecolor)...)
             Cairo.set_line_width(ctx, strokewidth)
             Cairo.stroke(ctx)
@@ -453,6 +449,25 @@ function draw_glyph_collection(scene, ctx, position, glyph_collection, rotation,
     return
 end
 
+struct CairoGlyph
+    index::Culong
+    x::Cdouble
+    y::Cdouble
+end
+
+function show_glyph(ctx, glyph::Culong, x, y)
+    cg = Ref(CairoGlyph(glyph, x, y))
+    ccall((:cairo_show_glyphs, Cairo.libcairo),
+            Nothing, (Ptr{Nothing}, Ptr{CairoGlyph}, Cint),
+            ctx.ptr, cg, 1)
+end
+function glyph_path(ctx, glyph::Culong, x, y)
+    cg = Ref(CairoGlyph(glyph, x, y))
+    ccall((:cairo_glyph_path, Cairo.libcairo),
+            Nothing, (Ptr{Nothing}, Ptr{CairoGlyph}, Cint),
+            ctx.ptr, cg, 1)
+end
+
 ################################################################################
 #                                Heatmap, Image                                #
 ################################################################################

src/basic_recipes/text.jl

@@ -162,7 +162,7 @@ function texelems_and_glyph_collection(str::LaTeXString, fontscale_px, halign, v
     scales_2d = [Vec2f(x[3] * Vec2f(fs)) for x in els]
 
     texchars = [x[1] for x in els]
-    chars = [texchar.char for texchar in texchars]
+    glyphindices = [glyph_index(texchar) for texchar in texchars]
     fonts = [texchar.font for texchar in texchars]
     extents = GlyphExtent.(texchars)
 
@@ -229,38 +229,8 @@ function texelems_and_glyph_collection(str::LaTeXString, fontscale_px, halign, v
     positions = basepositions .- Ref(shift)
     positions .= Ref(rot) .* positions
 
-    # # we replace VLine and HLine with characters that are specifically scaled and positioned
-    # # such that they match line length and thickness
-    # for (el, position, _) in all_els
-    #     el isa MathTeXEngine.VLine || el isa MathTeXEngine.HLine || continue
-    #     if el isa MathTeXEngine.HLine
-    #         w, h = el.width, el.thickness
-    #     else
-    #         w, h = el.thickness, el.height
-    #     end
-    #     font = to_font("TeX Gyre Heros Makie")
-    #     c = el isa MathTeXEngine.HLine ? '_' : '|'
-    #     fext = get_extent(font, c)
-    #     inkbb = FreeTypeAbstraction.inkboundingbox(fext)
-    #     w_ink = width(inkbb)
-    #     h_ink = height(inkbb)
-    #     ori = inkbb.origin
-
-    #     char_scale = Vec2f(w / w_ink, h / h_ink) * fs
-
-    #     pos_scaled = fs * Vec2f(position)
-    #     pos_inkshifted = pos_scaled - char_scale * ori - Vec2f(0, h_ink / 2) # TODO fix for VLine
-    #     pos_final = rot * Vec3f((pos_inkshifted - Vec2f(shift[Vec(1, 2)]))..., 0)
-
-    #     push!(positions, pos_final)
-    #     push!(chars, c)
-    #     push!(fonts, font)
-    #     push!(extents, GlyphExtent(font, c))
-    #     push!(scales_2d, char_scale)
-    # end
-
     pre_align_gl = GlyphCollection(
-        chars,
+        glyphindices,
         fonts,
         Point3f.(positions),
         extents,
@@ -274,4 +244,8 @@ function texelems_and_glyph_collection(str::LaTeXString, fontscale_px, halign, v
     all_els, pre_align_gl, Point2f(xshift, yshift)
 end
 
+function glyph_index(t::TeXChar)
+    error("Correct glyph index needs to be picked on MathTeXEngine's side and returned here")
+end
+
 iswhitespace(l::LaTeXString) = iswhitespace(replace(l.s, '$' => ""))

src/layouting/layouting.jl

@@ -257,7 +257,7 @@ function glyph_collection(
     # interactive features that need to know where characters begin and end
     per_char(attr) = collect(attribute_per_char(str, attr)) # attribute_per_char returns generators
     return GlyphCollection(
-        [x.char for x in charinfos],
+        [glyph_index(x.char, x.font) for x in charinfos],
         [x.font for x in charinfos],
         reduce(vcat, charorigins),
         [x.extent for x in charinfos],
@@ -269,6 +269,10 @@ function glyph_collection(
     )
 end
 
+function glyph_index(char::Char, font)
+    FreeType.FT_Get_Char_Index(font, char)
+end
+
 # function to concatenate vectors with a value between every pair
 function padded_vcat(arrs::AbstractVector{T}, fillvalue) where T <: AbstractVector{S} where S
     n = sum(length.(arrs))

src/types.jl

@@ -345,7 +345,7 @@ end
 Stores information about the glyphs in a string that had a layout calculated for them.
 """
 struct GlyphCollection
-    glyphs::Vector{Char}
+    glyphs::Vector{Culong}
     fonts::Vector{FTFont}
     origins::Vector{Point3f}
     extents::Vector{GlyphExtent}