Merge branch 'breaking-0.22' of https://github.com/MakieOrg/Makie.jl …

…into breaking-0.22
MakieOrg · Oct 21, 2024 · c164de6 · c164de6
2 parents 8e2be19 + 0d6532b
commit c164de6
Show file tree

Hide file tree

Showing 5 changed files with 174 additions and 50 deletions.
diff --git a/docs/Project.toml b/docs/Project.toml
@@ -26,4 +26,5 @@ NodeJS = "2bd173c7-0d6d-553b-b6af-13a54713934c"
 Observables = "510215fc-4207-5dde-b226-833fc4488ee2"
 RPRMakie = "22d9f318-5e34-4b44-b769-6e3734a732a6"
 RadeonProRender = "27029320-176d-4a42-b57d-56729d2ad457"
+Typst_jll = "eb4b1da6-20f6-5c66-9826-fdb8ad410d0e"
 WGLMakie = "276b4fcb-3e11-5398-bf8b-a0c2d153d008"
diff --git a/docs/makedocs.jl b/docs/makedocs.jl
@@ -188,6 +188,7 @@ pages = [
         "explanations/transparency.md",
     ],
     "How-Tos" => [
+        "how-to/match-figure-size-font-sizes-and-dpi.md",
         "how-to/draw-boxes-around-subfigures.md",
         "how-to/save-figure-with-transparency.md",
     ],
@@ -198,25 +199,29 @@ pages = [
     ]
 ]
 
-empty!(MakieDocsHelpers.FIGURES)
-
-# filter pages here when working on docs interactively
-# pages = nested_filter(pages, r"reference/blocks/(axis|axis3|overview)")
-
-Documenter.makedocs(;
-    sitename="Makie",
-    format=DocumenterVitepress.MarkdownVitepress(;
-        repo = "github.com/MakieOrg/Makie.jl",
-        devurl = "dev",
-        devbranch = "master",
-        deploy_url = "https://docs.makie.org", # for local testing not setting this has broken links with Makie.jl in them
-        description = "Create impressive data visualizations with Makie, the plotting ecosystem for the Julia language. Build aesthetic plots with beautiful customizable themes, control every last detail of publication quality vector graphics, assemble complex layouts and quickly prototype interactive applications to explore your data live.",
-        deploy_decision,
-    ),
-    pages,
-    expandfirst = unnest(nested_filter(pages, r"reference/(plots|blocks)/(?!overview)")),
-    warnonly = get(ENV, "CI", "false") != "true",
-    pagesonly = true,
+function make_docs(; pages)
+    empty!(MakieDocsHelpers.FIGURES)
+
+    Documenter.makedocs(;
+        sitename="Makie",
+        format=DocumenterVitepress.MarkdownVitepress(;
+            repo = "github.com/MakieOrg/Makie.jl",
+            devurl = "dev",
+            devbranch = "master",
+            deploy_url = "https://docs.makie.org", # for local testing not setting this has broken links with Makie.jl in them
+            description = "Create impressive data visualizations with Makie, the plotting ecosystem for the Julia language. Build aesthetic plots with beautiful customizable themes, control every last detail of publication quality vector graphics, assemble complex layouts and quickly prototype interactive applications to explore your data live.",
+            deploy_decision,
+        ),
+        pages,
+        expandfirst = unnest(nested_filter(pages, r"reference/(plots|blocks)/(?!overview)")),
+        warnonly = get(ENV, "CI", "false") != "true",
+        pagesonly = true,
+    )
+end
+
+make_docs(;
+    # filter pages here when working on docs interactively
+    pages # = nested_filter(pages, r"explanations/figure|match-figure"),
 )
 
 ##