Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow to use FreeTypeAbstraction fonts and render glyph by index #357

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Allow to use FreeTypeAbstraction fonts and render glyph by index #357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac90eae
Allow to set FTFont and use glyph index
Kolaru Oct 3, 2022
0ee1994
Add compat entry for FreeTypeAbstraction
Kolaru Oct 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,20 @@ version = "1.0.5"
[deps]
Cairo_jll = "83423d85-b0ee-5818-9007-b63ccbeb887a"
Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
FreeTypeAbstraction = "663a7486-cb36-511b-a19d-713bb74d65c9"
Glib_jll = "7746bdde-850d-59dc-9ae8-88ece973131d"
Graphics = "a2bd30eb-e257-5431-a919-1863eab51364"
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
Pango_jll = "36c8627f-9965-5494-a995-c6b170f724f3"

[compat]
julia = "1.3"
Cairo_jll = "1.16.0"
Colors = "0.9, 0.10, 0.11, 0.12"
Glib_jll = "2.59.0"
Graphics = "0.4, 1"
FreeTypeAbstraction = "0.10"
Pango_jll = "1.42.4"
julia = "1.3"

[extras]
Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
Expand Down
31 changes: 30 additions & 1 deletion src/Cairo.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Base.@deprecate_binding _jl_libpango Cairo.libpango false
Base.@deprecate_binding _jl_libpangocairo Cairo.libpango false

using Colors

using FreeTypeAbstraction
import Graphics
using Graphics: BoundingBox, GraphicsContext, GraphicsDevice
import Graphics: arc, clip, clip_preserve, close_path, creategc, device_to_user!, device_to_user_distance!, fill_preserve, height, line_to, move_to, new_path, new_sub_path, paint, rectangle, rel_line_to, rel_move_to, reset_clip, restore, rotate, save, scale, set_dash, set_line_width, set_source, set_source_rgb, set_source_rgba, stroke, stroke_preserve, stroke_transformed, stroke_transformed_preserve, textwidth, translate, user_to_device!, user_to_device_distance!, width, circle, reset_transform
Expand Down Expand Up @@ -1182,6 +1182,16 @@ function set_font_face(ctx::CairoContext, str::AbstractString)
(Ptr{Nothing},), fontdesc)
end

function set_font_face(ctx::CairoContext, font::FreeTypeAbstraction.FTFont)
font_face = ccall(
(:cairo_ft_font_face_create_for_ft_face, libcairo),
Ptr{Nothing}, (FreeTypeAbstraction.FT_Face, Cint),
font, 0)
ccall((:cairo_set_font_face, libcairo), Nothing,
(Ptr{Nothing}, Ptr{Nothing}), ctx.ptr, font_face)
return font_face
end

function set_text(ctx::CairoContext, text::AbstractString, markup::Bool = false)
if markup
ccall((:pango_layout_set_markup,libpango), Nothing,
Expand Down Expand Up @@ -1251,6 +1261,25 @@ function text_path(ctx::CairoContext,value::AbstractString)
ctx.ptr, String(value))
end

struct CairoGlyph
index::Culong
x::Cdouble
y::Cdouble
end

function show_glyph(ctx::CairoContext, glyph::CairoGlyph)
cg = Ref(glyph)
ccall((:cairo_show_glyphs, Cairo.libcairo),
Nothing, (Ptr{Nothing}, Ptr{CairoGlyph}, Cint),
ctx.ptr, cg, 1)
end

function glyph_path(ctx::CairoContext, glyph::CairoGlyph)
cg = Ref(glyph)
ccall((:cairo_glyph_path, Cairo.libcairo),
Nothing, (Ptr{Nothing}, Ptr{CairoGlyph}, Cint),
ctx.ptr, cg, 1)
end

function select_font_face(ctx::CairoContext,family::AbstractString,slant,weight)
ccall((:cairo_select_font_face, libcairo),
Expand Down