Merge pull request #1977 from GenericMappingTools/fix-xvals

Fix the xvals option in labellines

Author: joa-quim

src/legend_funs.jl

@@ -814,7 +814,18 @@ Called from `_common_plot_xyz()` when the `labellines` keyword is used.
 function add_labellines!(curves, d::Dict{Symbol,Any}, _cmd::Vector{String})
 	val = find_in_dict(d, [:labellines])[1]
 	if isa(val, Vector{<:AbstractString})
-		_add_labellines(curves, _cmd, [string(l) for l in val], 8, :middle)
+		labels = [string(l) for l in val]
+		xv = find_in_dict(d, [:xvals])[1]
+		yv = find_in_dict(d, [:yvals])[1]
+		if xv !== nothing || yv !== nothing
+			nc = length(curves)
+			_xv = xv === nothing ? Float64[] : isa(xv, Real) ? fill(Float64(xv), nc) : Float64.(collect(xv))
+			_yv = yv === nothing ? Float64[] : isa(yv, Real) ? fill(Float64(yv), nc) : Float64.(collect(yv))
+			pos = _label_pos_at_vals(curves, nc, _xv, _yv)
+			_add_labellines_apply(curves, _cmd, labels, 8, pos)
+		else
+			_add_labellines(curves, _cmd, labels, 8, :middle)
+		end
 		return curves
 	end
 	# NamedTuple path — dispatch to the right inner function based on which options are set

src/utils_types.jl

@@ -264,7 +264,8 @@ function _mat2ds(@nospecialize(mat::Array{<:Real}), txt::Union{String,Vector{Str
 			_lts[k] = " -W" * string(_lt[((k % n_thick) != 0) ? k % n_thick : n_thick])
 		end
 	else
-		theW = (color_cycle || haskey(d, :ls) || haskey(d, :linestyle) || haskey(d, :pen)) ? " -W" : ""
+		theW = (color_cycle || get(d, :ls, nothing) !== nothing || get(d, :linestyle, nothing) !== nothing || get(d, :pen, nothing) !== nothing) ? " -W" : ""
+		#theW = (color_cycle || haskey(d, :ls) || haskey(d, :linestyle) || haskey(d, :pen)) ? " -W" : ""
 		_lts = fill(theW, n_ds)		# If no pen setting no need to set -W
 	end