MakieOrg · SimonDanisch · Nov 17, 2023 · Mar 31, 2023 · Aug 1, 2023 · Aug 1, 2023
diff --git a/CairoMakie/Project.toml b/CairoMakie/Project.toml
@@ -1,7 +1,7 @@
 name = "CairoMakie"
 uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
 author = ["Simon Danisch <[email protected]>"]
-version = "0.10.7"
+version = "0.11.0"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -23,7 +23,7 @@ FFTW = "1"
 FileIO = "1.1"
 FreeType = "3, 4.0"
 GeometryBasics = "0.4.1"
-Makie = "=0.19.7"
+Makie = "=0.20.0"
 PrecompileTools = "1.0"
 julia = "1.3"
 

diff --git a/CairoMakie/src/display.jl b/CairoMakie/src/display.jl
@@ -117,10 +117,7 @@ end
 
 const DISABLED_MIMES = Set{String}()
 const SUPPORTED_MIMES = Set([
-    "text/html",
-    "application/vnd.webio.application+html",
-    "application/prs.juno.plotpane+html",
-    "juliavscode/html",
+    map(x->string(x()), Makie.WEB_MIMES)...,
     "image/svg+xml",
     "application/pdf",
     "application/postscript",

diff --git a/CairoMakie/src/screen.jl b/CairoMakie/src/screen.jl
@@ -81,8 +81,8 @@ end
 to_cairo_antialias(aa::Int) = aa
 
 """
-* `px_per_unit = 2.0`: see [figure docs](https://docs.makie.org/stable/documentation/figure/).
-* `pt_per_unit = 0.75`: see [figure docs](https://docs.makie.org/stable/documentation/figure/).
+* `px_per_unit = 2.0`: see [figure docs](https://docs.makie.org/stable/documentation/figure_size/).
+* `pt_per_unit = 0.75`: see [figure docs](https://docs.makie.org/stable/documentation/figure_size/).
 * `antialias::Union{Symbol, Int} = :best`: antialias modus Cairo uses to draw. Applicable options: `[:best => Cairo.ANTIALIAS_BEST, :good => Cairo.ANTIALIAS_GOOD, :subpixel => Cairo.ANTIALIAS_SUBPIXEL, :none => Cairo.ANTIALIAS_NONE]`.
 * `visible::Bool`: if true, a browser/image viewer will open to display rendered output.
 """

diff --git a/GLMakie/Project.toml b/GLMakie/Project.toml
@@ -1,6 +1,6 @@
 name = "GLMakie"
 uuid = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
-version = "0.8.7"
+version = "0.9.0"
 
 [deps]
 ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
@@ -29,7 +29,7 @@ FixedPointNumbers = "0.7, 0.8"
 FreeTypeAbstraction = "0.10"
 GLFW = "3.3"
 GeometryBasics = "0.4.1"
-Makie = "=0.19.7"
+Makie = "=0.20.0"
 MeshIO = "0.4"
 ModernGL = "1"
 Observables = "0.5.1"

diff --git a/GLMakie/src/display.jl b/GLMakie/src/display.jl
@@ -10,4 +10,4 @@ function Base.display(screen::Screen, scene::Scene; connect=true)
     return screen
 end
 
-Makie.backend_showable(::Type{Screen}, ::Union{MIME"image/jpeg", MIME"image/png"}) = true
+Makie.backend_showable(::Type{Screen}, ::Union{MIME"image/jpeg", MIME"image/png", Makie.WEB_MIMES...}) = true
diff --git a/GLMakie/src/drawing_primitives.jl b/GLMakie/src/drawing_primitives.jl
@@ -281,6 +281,7 @@ function draw_atomic(screen::Screen, scene::Scene, @nospecialize(x::Lines))
         data = Dict{Symbol, Any}(gl_attributes)
 
         positions = handle_view(x[1], data)
+
         transform_func = transform_func_obs(x)
 
         # Tweak things for px_per_unit
@@ -340,10 +341,10 @@ function draw_atomic(screen::Screen, scene::Scene, @nospecialize(x::LineSegments
         if haskey(data, :intensity)
             data[:color] = pop!(data, :intensity)
         end
+
         # Tweak things for px_per_unit
         resolution = pop!(data, :resolution)
         data[:resolution] = map((ppu, res) -> ppu .* res, px_per_unit, resolution)
-
         return draw_linesegments(screen, positions, data)
     end
 end

diff --git a/GLMakie/src/screen.jl b/GLMakie/src/screen.jl
@@ -711,7 +711,8 @@ function Makie.colorbuffer(screen::Screen, format::Makie.ImageStorageFormat = Ma
     # polling may change window size, when its bigger than monitor!
     # we still need to poll though, to get all the newest events!
     # GLFW.PollEvents()
-    render_frame(screen, resize_buffers=true) # let it render
+    # keep current buffer size to allows larger-than-window renders
+    render_frame(screen, resize_buffers=false) # let it render
     if screen.config.visible
         GLFW.SwapBuffers(to_native(screen))
     else

diff --git a/NEWS.md b/NEWS.md
@@ -1,12 +1,15 @@
 # News
 
-## master
+## beta
 
-- Fixed an issue where NaN was interpreted as zero when rendering `surface` through CairoMakie. [#2598](https://github.com/MakieOrg/Makie.jl/pull/2598)
 - GLMakie has gained support for HiDPI (aka Retina) screens.
   This also enables saving images with higher resolution than screen pixel dimensions.
   [#2544](https://github.com/MakieOrg/Makie.jl/pull/2544)
+- Fixed an issue where NaN was interpreted as zero when rendering `surface` through CairoMakie. [#2598](https://github.com/MakieOrg/Makie.jl/pull/2598)
 - Improved 3D camera handling, hotkeys and functionality [#2746](https://github.com/MakieOrg/Makie.jl/pull/2746)
+
+## master
+
 - Fixed incorrect placement of contourlabels with transform functions [#3083](https://github.com/MakieOrg/Makie.jl/pull/3083)
 - Fix automatic normal generation for meshes with shading and no normals [#3041](https://github.com/MakieOrg/Makie.jl/pull/3041).
 
@@ -36,7 +39,6 @@
 - Adjusted scaling of scatter/text stroke, glow and anti-aliasing width under non-uniform 2D scaling (Vec2f markersize/fontsize) in GLMakie [#2950](https://github.com/MakieOrg/Makie.jl/pull/2950).
 - Scaled `errorbar` whiskers and `bracket` correctly with transformations [#3012](https://github.com/MakieOrg/Makie.jl/pull/3012).
 - Updated `bracket` when the screen is resized or transformations change [#3012](https://github.com/MakieOrg/Makie.jl/pull/3012).
-- Added auto-resizing functionality to WGLMakie plot figures [#3042](https://github.com/MakieOrg/Makie.jl/pull/3042)
 
 ## v0.19.6
 

diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Makie"
 uuid = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
 authors = ["Simon Danisch", "Julius Krumbiegel"]
-version = "0.19.7"
+version = "0.20.0"
 
 [deps]
 Animations = "27a7e980-b3e6-11e9-2bcd-0b925532e340"

diff --git a/RPRMakie/Project.toml b/RPRMakie/Project.toml
@@ -1,7 +1,7 @@
 name = "RPRMakie"
 uuid = "22d9f318-5e34-4b44-b769-6e3734a732a6"
 authors = ["Simon Danisch"]
-version = "0.5.7"
+version = "0.6.0"
 
 [deps]
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
@@ -17,7 +17,7 @@ julia = "1.3"
 Colors = "0.9, 0.10, 0.11, 0.12"
 FileIO = "1.6"
 GeometryBasics = "0.4.1"
-Makie = "=0.19.7"
+Makie = "=0.20.0"
 RadeonProRender = "0.3.0"
 
 [extras]

diff --git a/ReferenceTests/src/tests/primitives.jl b/ReferenceTests/src/tests/primitives.jl
@@ -446,18 +446,6 @@ end
     scene
 end
 
-@reference_test "barplot with TeX-ed labels" begin
-    fig = Figure(resolution = (800, 800))
-    lab1 = L"\int f(x) dx"
-    lab2 = lab1
-    # lab2 = L"\frac{a}{b} - \sqrt{b}" # this will not work until #2667 is fixed
-
-    barplot(fig[1,1], [1, 2], [0.5, 0.2], bar_labels = [lab1, lab2], flip_labels_at = 0.3, direction=:x)
-    barplot(fig[1,2], [1, 2], [0.5, 0.2], bar_labels = [lab1, lab2], flip_labels_at = 0.3)
-
-    fig
-end
-
 @reference_test "Surface with NaN points" begin
     # prepare surface data
     zs = [x^2 + y^2 for x in range(-2, 0, length=10), y in range(-2, 0, length=10)]
@@ -471,3 +459,15 @@ end
     wireframe!(a, m, depth_shift = -1f-3, color = :black)
     f
 end
+
+  @reference_test "barplot with TeX-ed labels" begin
+    fig = Figure(resolution = (800, 800))
+    lab1 = L"\int f(x) dx"
+    lab2 = lab1
+    # lab2 = L"\frac{a}{b} - \sqrt{b}" # this will not work until #2667 is fixed
+
+    barplot(fig[1,1], [1, 2], [0.5, 0.2], bar_labels = [lab1, lab2], flip_labels_at = 0.3, direction=:x)
+    barplot(fig[1,2], [1, 2], [0.5, 0.2], bar_labels = [lab1, lab2], flip_labels_at = 0.3)
+
+    fig
+end
diff --git a/WGLMakie/Project.toml b/WGLMakie/Project.toml
@@ -1,7 +1,7 @@
 name = "WGLMakie"
 uuid = "276b4fcb-3e11-5398-bf8b-a0c2d153d008"
 authors = ["SimonDanisch <[email protected]>"]
-version = "0.8.11"
+version = "0.9.0"
 
 [deps]
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
@@ -26,7 +26,7 @@ FreeTypeAbstraction = "0.10"
 GeometryBasics = "0.4.1"
 Hyperscript = "0.0.3, 0.0.4"
 JSServe = "2.2"
-Makie = "=0.19.7"
+Makie = "=0.20.0"
 Observables = "0.5.1"
 RelocatableFolders = "0.1, 0.2, 0.3, 1.0"
 ShaderAbstractions = "0.3"

diff --git a/WGLMakie/src/imagelike.jl b/WGLMakie/src/imagelike.jl
@@ -148,5 +148,6 @@ function limits_to_uvmesh(plot)
         uv = Buffer(lift(fast_uv, resolution))
     end
     vertices = GeometryBasics.meta(positions; uv=uv)
+
     return Dict(:positions => positions, :faces => faces, :uv => uv)
 end
diff --git a/src/display.jl b/src/display.jl
@@ -213,9 +213,6 @@ const WEB_MIMES = (
     MIME"application/prs.juno.plotpane+html",
     MIME"juliavscode/html")
 
-# because we have a default way to display pngs in html contexts, we can say that
-# if png is showable, so are the html types
-Base.showable(mime::Union{WEB_MIMES...}, fig::FigureLike) = showable(MIME"image/png"(), fig)
 
 backend_showable(@nospecialize(screen), @nospecialize(mime)) = false
 
@@ -474,4 +471,4 @@ function backend_show(screen::MakieScreen, io::IO, ::Union{WEB_MIMES...}, scene:
     b64 = Base64.base64encode(String(take!(png_io)))
     print(io, "<img width=$w height=$h style='object-fit: contain;' src=\"data:image/png;base64, $(b64)\"/>")
     return
-end
+end