Merge branch 'master' into axis3d

Author: fhagemann

.github/workflows/reference_tests.yml

@@ -145,7 +145,7 @@ jobs:
           # dev mono repo versions
           pkg"registry up"
           Pkg.update()
-          pkg"dev . ./MakieCore ./WGLMakie ./ReferenceTests; add Bonito#sd/fix-ci"
+          pkg"dev . ./MakieCore ./WGLMakie ./ReferenceTests"
       - name: Run the tests
         continue-on-error: true
         run: >

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## [Unreleased]
 
+- Added `alpha` keyword to `density` recipe [#4975](https://github.com/MakieOrg/Makie.jl/pull/4975).
+
+## [0.22.5] - 2025-05-12
+
 - Added LegendElements for meshscatter, mesh, image, heatmap and surface [#4924](https://github.com/MakieOrg/Makie.jl/pull/4924)
 - Moved some of the TextureAtlas logic to JS, speeding up text updates and fixing texture atlas updates [4942](https://github.com/MakieOrg/Makie.jl/pull/4942).
 - Added ability to hide and show individual plot elements by clicking their corresponding `Legend` entry [#2276](https://github.com/MakieOrg/Makie.jl/pull/2276).
@@ -11,6 +15,7 @@
 - Fixed issues with anisotropic markersizes (e.g. `(10, 50)`) causing anti-aliasing to become blurry in GLMakie and WGLMakie. [#4918](https://github.com/MakieOrg/Makie.jl/pull/4918)
 - Added `direction = :y` option for vertical `band`s [#4949](https://github.com/MakieOrg/Makie.jl/pull/4949).
 - Fixed line-ordering of `lines(::Rect3)` [#4954](https://github.com/MakieOrg/Makie.jl/pull/4954).
+- Fixed issue with `sprint`ing to SVG using CairoMakie in Julia 1.11 and above [#4971](https://github.com/MakieOrg/Makie.jl/pull/4971).
 
 ## [0.22.4] - 2025-04-11
 
@@ -794,7 +799,8 @@ All other changes are collected [in this PR](https://github.com/MakieOrg/Makie.j
 - Fixed rendering of `heatmap`s with one or more reversed ranges in CairoMakie, as in `heatmap(1:10, 10:-1:1, rand(10, 10))` [#1100](https://github.com/MakieOrg/Makie.jl/pull/1100).
 - Fixed volume slice recipe and added docs for it [#1123](https://github.com/MakieOrg/Makie.jl/pull/1123).
 
-[Unreleased]: https://github.com/MakieOrg/Makie.jl/compare/v0.22.4...HEAD
+[Unreleased]: https://github.com/MakieOrg/Makie.jl/compare/v0.22.5...HEAD
+[0.22.5]: https://github.com/MakieOrg/Makie.jl/compare/v0.22.4...v0.22.5
 [0.22.4]: https://github.com/MakieOrg/Makie.jl/compare/v0.22.3...v0.22.4
 [0.22.3]: https://github.com/MakieOrg/Makie.jl/compare/v0.22.2...v0.22.3
 [0.22.2]: https://github.com/MakieOrg/Makie.jl/compare/v0.22.1...v0.22.2

CairoMakie/Project.toml

@@ -1,7 +1,7 @@
 name = "CairoMakie"
 uuid = "13f3f980-e62b-5c42-98c6-ff1f3baf88f0"
 author = ["Simon Danisch <sdanisch@gmail.com>"]
-version = "0.13.4"
+version = "0.13.5"
 
 [deps]
 CRC32c = "8bf52ea8-c179-5cab-976a-9e18b702a9bc"
@@ -24,7 +24,7 @@ FileIO = "1.1"
 FreeType = "3, 4.0"
 GeometryBasics = "0.5"
 LinearAlgebra = "1.0, 1.6"
-Makie = "=0.22.4"
+Makie = "=0.22.5"
 PrecompileTools = "1.0"
 julia = "1.3"
 

CairoMakie/src/display.jl

@@ -51,6 +51,15 @@ function Base.display(screen::Screen{IMAGE}, scene::Scene; connect=false, screen
 end
 
 function Makie.backend_show(screen::Screen{SVG}, io::IO, ::MIME"image/svg+xml", scene::Scene)
+    mark(io)
+    # fix for #4970, to avoid that the finalizer of this surface tries to write to `io` later
+    # when `io` is possibly not valid anymore
+    Cairo.finish(screen.surface)
+    # we can't avoid that Cairo writes an svg scaffold into `io` unless
+    # we refactor the whole screen setup code so the svg surface isn't initialized with the `io`
+    # in the first place, so instead we just overwrite that part again with the string we build below
+    reset(io)
+
     Makie.push_screen!(scene, screen)
     # Display the plot on a new screen writing to a string, so that we can manipulate the
     # result (the io in `screen` should directly write to the file we're saving)

CairoMakie/test/runtests.jl

@@ -317,3 +317,12 @@ end
     @test length(ps) == length(data) # this should never clip!
 
 end
+
+@testset "issue 4970 (invalid io use during finalization)" begin
+    @testset "$mime" for mime in CairoMakie.SUPPORTED_MIMES
+        @test_nowarn begin
+            sprint(io -> show(io, mime, Scene()))
+            GC.gc()
+        end
+    end
+end

GLMakie/Project.toml

@@ -1,6 +1,6 @@
 name = "GLMakie"
 uuid = "e9467ef8-e4e7-5192-8a1a-b1aee30e663a"
-version = "0.11.5"
+version = "0.11.6"
 
 [deps]
 ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"
@@ -30,7 +30,7 @@ FreeTypeAbstraction = "0.10"
 GLFW = "3.4.3"
 GeometryBasics = "0.5"
 LinearAlgebra = "1.0, 1.6"
-Makie = "=0.22.4"
+Makie = "=0.22.5"
 Markdown = "1.0, 1.6"
 MeshIO = "0.5"
 ModernGL = "1"

MakieCore/Project.toml

@@ -1,7 +1,7 @@
 name = "MakieCore"
 uuid = "20f20a25-4f0e-4fdf-b5d1-57303727442b"
 authors = ["Simon Danisch"]
-version = "0.9.2"
+version = "0.9.3"
 
 [deps]
 ColorTypes = "3da002f7-5984-5a60-b8a6-cbb66c0b333f"

Project.toml

@@ -1,7 +1,7 @@
 name = "Makie"
 uuid = "ee78f7c6-11fb-53f2-987a-cfe4a2b5a57a"
 authors = ["Simon Danisch", "Julius Krumbiegel"]
-version = "0.22.4"
+version = "0.22.5"
 
 [deps]
 Animations = "27a7e980-b3e6-11e9-2bcd-0b925532e340"
@@ -97,7 +97,7 @@ KernelDensity = "0.5, 0.6"
 LaTeXStrings = "1.2"
 LinearAlgebra = "1.0, 1.6"
 MacroTools = "0.5"
-MakieCore = "=0.9.2"
+MakieCore = "=0.9.3"
 Markdown = "1.0, 1.6"
 MathTeXEngine = "0.5, 0.6"
 Observables = "0.5.5"

RPRMakie/Project.toml

@@ -1,7 +1,7 @@
 name = "RPRMakie"
 uuid = "22d9f318-5e34-4b44-b769-6e3734a732a6"
 authors = ["Simon Danisch"]
-version = "0.8.4"
+version = "0.8.5"
 
 [deps]
 Colors = "5ae59095-9a9b-59fe-a467-6f913c188581"
@@ -17,7 +17,7 @@ Colors = "0.9, 0.10, 0.11, 0.12, 0.13"
 FileIO = "1.6"
 GeometryBasics = "0.5"
 LinearAlgebra = "1.0, 1.6"
-Makie = "=0.22.4"
+Makie = "=0.22.5"
 Printf = "1.0, 1.6"
 RadeonProRender = "0.3.2"
 julia = "1.3"

WGLMakie/Project.toml

@@ -1,7 +1,7 @@
 name = "WGLMakie"
 uuid = "276b4fcb-3e11-5398-bf8b-a0c2d153d008"
 authors = ["SimonDanisch <sdanisch@gmail.com>"]
-version = "0.11.4"
+version = "0.11.5"
 
 [deps]
 Bonito = "824d6782-a2ef-11e9-3a09-e5662e0c26f8"
@@ -27,7 +27,7 @@ FreeTypeAbstraction = "0.10"
 GeometryBasics = "0.5"
 Hyperscript = "0.0.3, 0.0.4, 0.0.5"
 LinearAlgebra = "1.0, 1.6"
-Makie = "=0.22.4"
+Makie = "=0.22.5"
 Observables = "0.5.1"
 PNGFiles = "0.3, 0.4"
 PrecompileTools = "1.0"

docs/src/reference/plots/density.md

@@ -12,6 +12,7 @@ f = Figure()
 Axis(f[1, 1])
 
 density!(randn(200))
+density!(randn(200) .+ 2, alpha = 0.8)
 
 f
 ```

src/stats/density.jl

@@ -49,6 +49,11 @@ Plot a kernel density estimate of `values`.
     weights = automatic
     cycle = [:color => :patchcolor]
     inspectable = @inherit inspectable
+    """
+    The alpha value of the colormap or color attribute. Multiple alphas like
+    in plot(alpha=0.2, color=(:red, 0.5), will get multiplied.
+    """
+    alpha = 1.0
 end
 
 function plot!(plot::Density{<:Tuple{<:AbstractVector}})
@@ -112,9 +117,9 @@ function plot!(plot::Density{<:Tuple{<:AbstractVector}})
     end
 
     band!(plot, lower, upper, color = colorobs, colormap = plot.colormap, colorscale = plot.colorscale,
-        colorrange = plot.colorrange, inspectable = plot.inspectable)
+        colorrange = plot.colorrange, inspectable = plot.inspectable, alpha = plot.alpha)
     l = lines!(plot, linepoints, color = plot.strokecolor,
         linestyle = plot.linestyle, linewidth = plot.strokewidth,
-        inspectable = plot.inspectable)
+        inspectable = plot.inspectable, alpha = plot.alpha)
     plot
 end