cycled color and automatic markercolor for scatterlines

NEWS.md

@@ -2,9 +2,9 @@
 
 ## master
 
+- The plot function `scatterlines` now uses `color` as `markercolor` if `markercolor` is `automatic`. Also, cycling of the `color` attribute is enabled. [#1463](https://github.com/JuliaPlots/Makie.jl/pull/1463)
 - Added the function `resize_to_layout!`, which allows to resize a `Figure` so that it contains its top `GridLayout` without additional whitespace or clipping.
 
-
 ## v0.15.3
 
 - The functions `labelslidergrid!` and `labelslider!` now set fixed widths for the value column with a heuristic. It is possible now to pass `Formatting.format` format strings as format specifiers in addition to the previous functions.

docs/examples/plotting_functions/scatterlines.md

@@ -2,9 +2,9 @@
 
 {{doc scatterlines}}
 
-### Examples
+## Examples
 
-\begin{examplefigure}{}
+\begin{examplefigure}{svg = true}
 ```julia
 using CairoMakie
 CairoMakie.activate!() # hide
@@ -19,8 +19,8 @@ ys = 0.5 .* sin.(xs)
 scatterlines!(xs, ys, color = :red)
 scatterlines!(xs, ys .- 1, color = xs, markercolor = :red)
 scatterlines!(xs, ys .- 2, markersize = LinRange(5, 30, 20))
-scatterlines!(xs, ys .- 3, marker = :cross, strokewidth = 0,
-    strokecolor = :red, markercolor = :orange)
+scatterlines!(xs, ys .- 3, marker = :cross, strokewidth = 1,
+    markersize = 20, color = :orange, strokecolor = :black)
 
 f
 ```

src/basic_recipes/scatterlines.jl

@@ -15,19 +15,30 @@ $(ATTRIBUTES)
         colorrange = get(l_theme.attributes, :colorrange, automatic),
         linestyle = l_theme.linestyle,
         linewidth = l_theme.linewidth,
-        markercolor = s_theme.color,
+        markercolor = automatic,
         markercolormap = s_theme.colormap,
         markercolorrange = get(s_theme.attributes, :colorrange, automatic),
         markersize = s_theme.markersize,
         strokecolor = s_theme.strokecolor,
         strokewidth = s_theme.strokewidth,
         marker = s_theme.marker,
-        inspectable = theme(scene, :inspectable)
+        inspectable = theme(scene, :inspectable),
+        cycle = [:color],
     )
 end
 
 
 function plot!(p::Combined{scatterlines, <:NTuple{N, Any}}) where N
+
+    # markercolor is the same as linecolor if left automatic
+    real_markercolor = lift(Any, p.color, p.markercolor) do col, mcol
+        if mcol === automatic
+            col
+        else
+            mcol
+        end
+    end
+
     lines!(p, p[1:N]...;
         color = p.color,
         linestyle = p.linestyle,
@@ -37,7 +48,7 @@ function plot!(p::Combined{scatterlines, <:NTuple{N, Any}}) where N
         inspectable = p.inspectable
     )
     scatter!(p, p[1:N]...;
-        color = p.markercolor,
+        color = real_markercolor,
         strokecolor = p.strokecolor,
         strokewidth = p.strokewidth,
         marker = p.marker,