work with new FreeTypeAbstraction

* refactor text

* hmpf

* Add FreeTypeAbstraction branch

* CompatHelper: bump compat for "FreeTypeAbstraction" to "0.6"

* fix tests

* only allow 0.6

* refactor text

* hmpf

* Add FreeTypeAbstraction branch

* CompatHelper: bump compat for "FreeTypeAbstraction" to "0.6"

* fix tests

* only allow 0.6

* No need for Makie here

* try out a temp project

* fix the FFMPEG version too...something must not like it

* Add FFMPEG v0.3 support (#327)

* Work with FFMPEG 0.3

* Override the Travis script to add MakieGallery master

Co-authored-by: Simon <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Author: 3 people

.gitlab-ci.yml

@@ -16,7 +16,8 @@ test:
     script:
       - mkdir $JULIA_DEPOT_PATH # Pkg.jl#325
       - julia -e 'using InteractiveUtils; versioninfo()'
-      - julia --project -e 'using Pkg; Pkg.pkg"add Makie#master StatsMakie#master MakieGallery#master GLMakie#master; test"'
+      - mkdir temporary_for_project
+      - julia --project=temporary_for_project -e 'using Pkg; Pkg.pkg"dev --local .; add StatsMakie#master MakieGallery#master GLMakie#master [email protected]; test AbstractPlotting"'
 
     artifacts:
         when: on_failure

.travis.yml

@@ -16,6 +16,14 @@ matrix:
   allow_failures:
     - julia: 1.3
 
+script:
+  - export JL_PKG=AbstractPlotting
+  - julia --color=yes -e "using Pkg; if VERSION >= v\"1.1.0-rc1\"; Pkg.build(verbose=true); else Pkg.build(); end"
+  - julia -e 'using Pkg; pkg"add MakieGallery#master"'
+  - julia --check-bounds=yes --color=yes -e "using Pkg; Pkg.test(coverage=true)"
+
+
+
 ## uncomment the following lines to override the default test script
 #script:
 #  - julia -e 'Pkg.clone(pwd()); Pkg.build("AbstractPlotting"); Pkg.test("AbstractPlotting"; coverage=true)'

Project.toml

@@ -42,11 +42,11 @@ ColorTypes = "0.8, 0.9"
 Colors = "0.9, 0.10, 0.11"
 Contour = "0.5"
 DocStringExtensions = "0.8.0"
-FFMPEG = "0.2"
+FFMPEG = "0.2, 0.3"
 FileIO = "1.1"
 FixedPointNumbers = "0.6, 0.7, 0.8"
 FreeType = "2.1, 3.0"
-FreeTypeAbstraction = "0.4.2, 0.5"
+FreeTypeAbstraction = "0.6"
 GeometryTypes = "0.7.2"
 ImageMagick = "0.7, 1.0"
 IntervalSets = "0.3, 0.4"

src/basic_recipes/axis.jl

@@ -144,7 +144,7 @@ $(ATTRIBUTES)
             textcolor = (tick_color, tick_color, tick_color),
 
             rotation = tickrotations3d,
-            textsize =  (tsize, tsize, tsize),
+            textsize = (tsize, tsize, tsize),
             align = tickalign3d,
             gap = 1,
             font = lift(dim3, theme(scene, :font)),
@@ -248,16 +248,16 @@ default_labels(x::Tuple, ranges, formatter) = default_labels.(x, (ranges,), (for
 default_labels(x::AbstractVector{<: AbstractString}, ranges, formatter::Function) = x
 default_labels(x::AbstractVector{<: AbstractString}, ranges::AbstractVector, formatter::Function) = x
 
-
-
 function convert_arguments(::Type{<: Axis2D}, limits::Rect)
     e = (minimum(limits), maximum(limits))
     (((e[1][1], e[2][1]), (e[1][2], e[2][2])),)
 end
+
 function convert_arguments(::Type{<: Axis3D}, limits::Rect)
     e = (minimum(limits), maximum(limits))
     (((e[1][1], e[2][1]), (e[1][2], e[2][2]), (e[1][3], e[2][3])),)
 end
+
 a_length(x::AbstractVector) = length(x)
 a_length(x::Automatic) = x
 
@@ -302,17 +302,11 @@ function draw_tickmarks(
         pos = ntuple(i-> i != dim ? origin[i] : tick, Val(2))
         posf0 = Point2f0(pos)
         dirf0  = Pointf0{N}(dir)
-        append!(linebuffer,
-              [posf0, posf0 .+ dirf0],
-              color = linecolor[dim], linewidth = linewidth[dim]
-              )
+        append!(linebuffer, [posf0, posf0 .+ dirf0],
+                color = linecolor[dim], linewidth = linewidth[dim])
     end
 end
 
-
-
-
-
 function draw_grid(
         linebuffer, dim, origin, ticks, dir::NTuple{N},
         linewidth, linecolor, linestyle

src/conversions.jl

@@ -581,7 +581,7 @@ function convert_attribute(x::Union{Symbol, String}, k::key"font")
     get!(_font_cache, str) do
         str == "default" && return convert_attribute("Dejavu Sans", k)
         fontpath = joinpath(@__DIR__, "..", "assets", "fonts")
-        font = FreeTypeAbstraction.findfont(str, additional_fonts = fontpath)
+        font = FreeTypeAbstraction.findfont(str; additional_fonts=fontpath)
         if font == nothing
             @warn("Could not find font $str, using Dejavu Sans")
             if "dejavu sans" == lowercase(str)
@@ -590,7 +590,7 @@ function convert_attribute(x::Union{Symbol, String}, k::key"font")
             end
             return convert_attribute("dejavu sans", k)
         end
-        [font] # TODO do we really need the array around it!??!?
+        return font # TODO do we really need the array around it!??!?
     end
 end
 convert_attribute(x::Vector{String}, k::key"font") = convert_attribute.(x, k)

src/display.jl

@@ -290,6 +290,11 @@ struct VideoStream
     path::String
 end
 
+# This is compat between FFMPEG versions 0.2 and 0.3,
+# where 0.3 uses artifacts but 0.2 does not.
+# Because of this, we need to check which variable will give FFMPEG's path.
+const _ffmpeg_path = isdefined(FFMPEG, :ffmpeg_path) ? FFMPEG.ffmpeg_path : FFMPEG.ffmpeg
+
 """
     VideoStream(scene::Scene, framerate = 24)
 
@@ -309,7 +314,7 @@ function VideoStream(
     _xdim, _ydim = size(scene)
     xdim = _xdim % 2 == 0 ? _xdim : _xdim + 1
     ydim = _ydim % 2 == 0 ? _ydim : _ydim + 1
-    process = @ffmpeg_env open(`$ffmpeg -loglevel quiet -f rawvideo -pixel_format rgb24 -r $framerate -s:v $(xdim)x$(ydim) -i pipe:0 -vf vflip -y $path`, "w")
+    process = @ffmpeg_env open(`$_ffmpeg_path -loglevel quiet -f rawvideo -pixel_format rgb24 -r $framerate -s:v $(xdim)x$(ydim) -i pipe:0 -vf vflip -y $path`, "w")
     VideoStream(process.in, process, screen, abspath(path))
 end
 

src/layouting/boundingbox.jl

@@ -90,7 +90,7 @@ function boundingbox(x::Text, text::String)
     wh = widths(bb)
     whp = project_widths(pm, wh)
     aoffset = whp .* to_ndim(Vec3f0, align, 0f0)
-    FRect3D(minimum(bb) .- aoffset, whp)
+    return FRect3D(minimum(bb) .- aoffset, whp)
 end
 
 boundingbox(x::Text) = boundingbox(x, to_value(x[1]))
@@ -106,6 +106,37 @@ function boundingbox(
 
 end
 
+# function boundingbox(
+#         text::String, position, textsize, fonts,
+#         align, rotation, model = Mat4f0(I)
+#     )
+#     isempty(text) && return FRect3D()
+#     pos_per_char = !isa(position, VecTypes)
+#
+#     start_pos = Vec(pos_per_char ? first(position) : position)
+#     start_pos3d = project(model, to_ndim(Vec3f0, start_pos, 0.0))
+#     bb = FRect3D(start_pos3d, Vec3f0(0))
+#
+#     if pos_per_char
+#         broadcast_foreach(position, textsize, fonts, collect(text)) do pos, scale, font, char
+#             rect, extent = FreeTypeAbstraction.metrics_bb(char, font, scale)
+#             bb = union(FRect3D(rect) + to_ndim(Vec3f0, pos, 0.0), bb)
+#             @show pos scale
+#         end
+#     else
+#         y_advance = 0.0
+#         line_advance = FreeTypeAbstraction.get_extent(fonts, 'x').advance[2]
+#         for line in split(text, r"(\r\n|\r|\n)")
+#             rectangles = FreeTypeAbstraction.glyph_rects(line, fonts, textsize)
+#             bb2d = reduce(union, rectangles)
+#             bb2d = bb2d + Vec2f0(0, y_advance)
+#             bb = union(bb, FRect3D(bb2d))
+#             y_advance += line_advance
+#             @show y_advance
+#         end
+#     end
+#     return bb
+# end
 
 function boundingbox(
         text::String, position, textsize, font,
@@ -138,5 +169,5 @@ function boundingbox(
             bb = GeometryTypes.update(bb, pos .+ srot)
         end
     end
-    bb
+    return bb
 end

src/types.jl

@@ -531,7 +531,7 @@ const automatic = Automatic()
 const Vecf0{N} = Vec{N, Float32}
 const Pointf0{N} = Point{N, Float32}
 export Vecf0, Pointf0
-const NativeFont = Vector{Ptr{FreeType.FT_FaceRec}}
+const NativeFont = FreeTypeAbstraction.FTFont
 
 """
 `PlotSpec{P<:AbstractPlot}(args...; kwargs...)`