allow annotations to take a tuple and pass it to text

PlotDisplay -> PlotsDisplay

NEWS.md

@@ -11,6 +11,9 @@
 ---
 ## (current master)
 
+## 0.22.1
+- push PlotsDisplay just after REPLDisplay
+
 ## 0.22.0
 - deprecate GLVisualize
 - allow 1-row and 1-column heatmaps

src/components.jl

@@ -554,7 +554,7 @@ function process_annotation(sp::Subplot, xs, ys, labs, font = font())
             alphabet = "abcdefghijklmnopqrstuvwxyz"
             push!(anns, (x, y, text(string("(", alphabet[sp[:subplot_index]], ")"), font)))
         else
-            push!(anns, (x, y, isa(lab, PlotText) ? lab : text(lab, font)))
+            push!(anns, (x, y, isa(lab, PlotText) ? lab : isa(lab, Tuple) ? text(lab...) : text(lab, font)))
         end
     end
     anns
@@ -569,7 +569,7 @@ function process_annotation(sp::Subplot, positions::Union{AVec{Symbol},Symbol},
             alphabet = "abcdefghijklmnopqrstuvwxyz"
             push!(anns, (pos, text(string("(", alphabet[sp[:subplot_index]], ")"), font)))
         else
-            push!(anns, (pos, isa(lab, PlotText) ? lab : text(lab, font)))
+            push!(anns, (pos, isa(lab, PlotText) ? lab : isa(lab, Tuple) ? text(lab...) : text(lab, font)))
         end
     end
     anns

src/init.jl

@@ -1,3 +1,5 @@
+using REPL
+
 const use_local_dependencies = Ref(false)
 
 function __init__()
@@ -10,13 +12,14 @@ function __init__()
             k == :theme || default(k, v)
         end
     end
-    pushdisplay(PlotsDisplay())
+
+    insert!(Base.Multimedia.displays, findlast(x -> x isa Base.TextDisplay || x isa REPL.REPLDisplay, Base.Multimedia.displays) + 1, PlotsDisplay())
 
     atreplinit(i -> begin
-        if PlotDisplay() in Base.Multimedia.displays
+        while PlotsDisplay() in Base.Multimedia.displays
             popdisplay(PlotsDisplay())
         end
-        pushdisplay(PlotsDisplay())
+        insert!(Base.Multimedia.displays, findlast(x -> x isa REPL.REPLDisplay, Base.Multimedia.displays) + 1, PlotsDisplay())
     end)
 
     @require HDF5 = "f67ccb44-e63f-5c2f-98bd-6dc0ccc4ba2f" include(joinpath(@__DIR__, "backends", "hdf5.jl"))