Symbols passed to hlp_desnany_str be in a vector (#1960)

Author: joa-quim

src/common_options.jl

@@ -1656,7 +1656,7 @@ end
 
 # ---------------------------------------------------------------------------------------------------
 function parse_write(d::Dict{Symbol,Any}, cmd::String)::String
-	if ((val = hlp_desnany_str(d, [:write :savefile :|>])) !== "")
+	if ((val = hlp_desnany_str(d, [:write, :savefile, :|>])) !== "")
 		cmd *=  " > " * val
 	end
 	return cmd
@@ -2233,7 +2233,7 @@ end
 
 # ---------------------------------------------------------------------------------------------------
 function finish_PS(d::Dict{Symbol,Any}, cmd::String, output::String, K::Bool, O::Bool)::String
-	if (!O && ((val = hlp_desnany_str(d, [:P :portrait])) === ""))  cmd *= " -P"  end
+	if (!O && ((val = hlp_desnany_str(d, [:P, :portrait])) === ""))  cmd *= " -P"  end
 
 	opt = (K && !O) ? " -K" : ((K && O) ? " -K -O" : "")
 
@@ -3371,7 +3371,7 @@ function vector_attrib(d::Dict{Symbol,Any})::String
 		end
 	end
 
-	if ((val = hlp_desnany_str(d, [:half :half_arrow])) !== "")
+	if ((val = hlp_desnany_str(d, [:half, :half_arrow])) !== "")
 		cmd = (val == "left") ? cmd * "+l" : cmd * "+r"
 	end
 
@@ -3421,7 +3421,7 @@ vector4_attrib(; kwargs...)::String = vector4_attrib(KW(kwargs))
 function vector4_attrib(d::Dict{Symbol,Any})::String
 	# Old GMT4 vectors (still supported in GMT6)
 	cmd::String = "t"
-	if ((val = hlp_desnany_str(d, [:align :center])) !== "")
+	if ((val = hlp_desnany_str(d, [:align, :center])) !== "")
 		c::Char = val[1]
 		if     (c == 'h' || c == 'b')  cmd = "h"		# Head
 		elseif (c == 'm' || c == 'c')  cmd = "b"		# Middle
@@ -3576,10 +3576,10 @@ function helper_decorated(d::Dict{Symbol,Any}, compose=false)
 		end
 	end
 	if (cmd == "" && optD == "")
-		optD = ((val = hlp_desnany_str(d, [:n_labels :n_symbols])) !== "") ? string("n",val) : "n1"
+		optD = ((val = hlp_desnany_str(d, [:n_labels, :n_symbols])) !== "") ? string("n",val) : "n1"
 	end
 	if (cmd == "")
-		if ((val = hlp_desnany_str(d, [:N_labels :N_symbols])) !== "")
+		if ((val = hlp_desnany_str(d, [:N_labels, :N_symbols])) !== "")
 			optD = string("N", val);
 		end
 	end
@@ -3638,7 +3638,7 @@ function fname_out(d::Dict{Symbol,Any}, del::Bool=false)
 	# Create a file name in the TMP dir when OUT holds only a known extension. The name is: GMT_user.ext
 
 	EXT::String = FMT[];	fname::AbstractString = ""
-	if ((val = hlp_desnany_str(d, [:savefig :figname :name], del)) !== "")
+	if ((val = hlp_desnany_str(d, [:savefig, :figname, :name], del)) !== "")
 		fname, EXT = splitext(val)
 		EXT = (EXT == "") ? FMT[] : EXT[2:end]
 	end
@@ -4248,7 +4248,7 @@ function showfig(d::Dict{Symbol, Any}, fname_ps::String, fname_ext::String, opt_
 
 	if (opt_T != "")
 		(K) && close_PS_file(fname_ps)			# Close the PS file first
-		((val = hlp_desnany_str(d, [:dpi :DPI])) !== "") && (opt_T *= " -E" *  val)
+		((val = hlp_desnany_str(d, [:dpi, :DPI])) !== "") && (opt_T *= " -E" *  val)
 		gmt(pscvt_cmd * fname_ps * opt_T * " *")
 		reset_theme()
 		out::String = fname_ps[1:end-2] * fname_ext
@@ -4743,7 +4743,7 @@ function put_in_legend_bag(d::Dict{Symbol,Any}, cmd, arg, O::Bool=false, opt_l::
 			elseif (_valLabel !== nothing)
 				valLabel_vec = [string.(_valLabel)...]		# We may have shits here
 			end
-			if ((ribs = hlp_desnany_str(dd, [:ribbon :band], false)) !== "")
+			if ((ribs = hlp_desnany_str(dd, [:ribbon, :band], false)) !== "")
 				(valLabel != "") && (valLabel_vec = [valLabel, ribs]; valLabel="")	# *promote* valLabel
 				have_ribbon = true
 			end

src/extras/seismicity.jl

@@ -93,7 +93,7 @@ function _seismicity(d::Dict{Symbol, Any}, starttime::String, endtime::String, m
 	no_plot && return D			# No map, just return the data.
 
 	Vd::Int = get(d, :Vd, 0)
-	name_bak::String = hlp_desnany_str(d, [:savefig :figname :name])	# Tmp remove it
+	name_bak::String = hlp_desnany_str(d, [:savefig, :figname, :name])	# Tmp remove it
 	(is_in_dict(d, [:G :land]) === nothing) && (d[:G] = "burlywood")
 	(is_in_dict(d, [:S :water :ocean]) === nothing) && (d[:S] = "lightblue")
 	r = coast(; R=opt_R[4:end], A="1000", Vd=Vd, d...)
@@ -148,8 +148,8 @@ function helper_get_date_interval(d::Dict{Symbol, Any}, last::Tuple{Int, String}
 		starttime = "$year-01-01"
 		endtime = (parse(Int,string(today())[1:4]) == year) ? string(today()) : "$year-12-31"
 	end
-	(starttime === "") && (starttime = hlp_desnany_str(d, [:startdate :start_date :start_time]))
-	(endtime === "")   && (endtime   = hlp_desnany_str(d, [:enddate :end_date :end_time]))
+	(starttime === "") && (starttime = hlp_desnany_str(d, [:startdate, :start_date, :start_time]))
+	(endtime === "")   && (endtime   = hlp_desnany_str(d, [:enddate, :end_date, :end_time]))
 	(starttime !== "") && (last = test_last(last, "Options 'starttime' and 'last' are incompatible. Droping 'last'."))
 	(endtime   !== ""  && starttime === "") && (@warn("Gave a 'endtime' but not a 'starttime'. Ignoring it."); endtime = "")
 	(last[1] > 0)      && (starttime = string(Date(now() - Dates.Day(last[1]))))

src/grd2cpt.jl

@@ -78,7 +78,7 @@ function grd2cpt_helper(w::wrapGrids, d::Dict{Symbol, Any})
 	cmd, Tvec = helper_cpt(d, cmd)
 	cmd = add_opt(d, cmd, "S", [:S :symetric])
 	!isempty(Tvec) && error("grd2cpt does not accept an array argument in the 'range' option")
-    ((val = hlp_desnany_str(d, [:E :nlevels])) !== "") && (cmd *= " -E" * val)
+    ((val = hlp_desnany_str(d, [:E, :nlevels])) !== "") && (cmd *= " -E" * val)
 	got_N = (is_in_dict(d, [:N :no_bg :nobg], del=true) !== nothing)
 
 	cmd, got_fname, arg1 = find_data(d, cmd0, cmd, arg1)

src/grd2xyz.jl

@@ -49,6 +49,6 @@ function grd2xyz_helper(w::wrapGrids, d::Dict{Symbol, Any})
 
 	cmd, = parse_common_opts(d, "", [:R :V_params :bo :d :f :h :o :s])
 	cmd  = parse_these_opts(cmd, d, [[:C :rcnumbers :row_col :rowcol], [:L :hvline], [:T :stl :STL], [:W :weight], [:Z :onecol :one_col]])
-	((val = hlp_desnany_str(d, [:name :save])) !== "") && (cmd *=  " > " *val)
+	((val = hlp_desnany_str(d, [:name, :save])) !== "") && (cmd *=  " > " *val)
 	common_grd(d, cmd0, cmd, "grd2xyz ", arg1)	# Finish build cmd and run it
 end

src/grdgradient.jl

@@ -49,7 +49,7 @@ function grdgradient(arg1; kw...)
 end
 
 # ---------------------------------------------------------------------------------------------------
-function parse_Q_grdgrad(d::Dict, symbs::Array{<:Symbol}, cmd::String)
+function parse_Q_grdgrad(d::Dict, symbs::Vector{<:Symbol}, cmd::String)
 	(SHOW_KWARGS[]) && return print_kwarg_opts(symbs, "String")
     if ((val_ = hlp_desnany_str(d, symbs)) !== "")
 		val = val_[1]
@@ -68,6 +68,6 @@ function grdgrad_helper(;kw...)
 	       (manip=("m", nothing, 1), simple=("s", nothing, 1), peucker=("p", nothing, 1), view=("", arg2str), ambient="+a", difuse="+d", specular="+p", shine="+s") )
 	cmd  = add_opt(d, cmd, "N", [:N :norm :normalize],
            (laplace=("e", nothing, 1), cauchy=("t", nothing, 1), amp="", sigma="+s", offset="+o"))
-	cmd = parse_Q_grdgrad(d, [:Q :save_stats], cmd)
+	cmd = parse_Q_grdgrad(d, [:Q, :save_stats], cmd)
 	return d, cmd
 end

src/linefit.jl

@@ -305,7 +305,7 @@ function _plotlinefit(D::GMTdataset, first::Bool, grp::Bool, d::Dict{Symbol,Any}
 	if ((opt_W = edit_segment_headers!(D, 'W', :get)) == "")
 		lc = ((val = find_in_dict(d, [:lc :linecolor])[1]) !== nothing) ? string(val)::String : "red"
 		lt = ((val = find_in_dict(d, [:lt :lw :linethickness])[1]) !== nothing) ? string(val)::String : "0.5"
-		ls = hlp_desnany_str(d, [:ls :linestyle])
+		ls = hlp_desnany_str(d, [:ls, :linestyle])
 		opt_W = lt * "," * lc * "," * ls
 	end
 

src/plot.jl

@@ -481,7 +481,7 @@ end
 function _bar(arg, first::Bool, d::Dict{Symbol,Any})
 
 	do_cat = ((haskey(d, :stack) || haskey(d, :stacked)) && isvector(arg) && length(arg) > 2) ? false : true
-	is_waterfall = ((val = hlp_desnany_str(d, [:stack :stacked], false)) !== "" && startswith(val, "water"))
+	is_waterfall = ((val = hlp_desnany_str(d, [:stack, :stacked], false)) !== "" && startswith(val, "water"))
 	if (is_waterfall)
 		isa(arg, Vector) && (arg = reshape(arg, 1, length(arg)))		# Waterfall stacks must be matrices
 		(arg[1] != 0) && (arg = hcat(repeat([1.0],size(arg,1)), arg))	# If first el != 0 assume coord is missing
@@ -818,7 +818,7 @@ function fill_between(arg1, arg2, first::Bool, d::Dict{Symbol, Any})
 		legs = fish_labels(val, legs, one_array, D1, D2)
 		if (isempty(legs) && isa(val, NamedTuple))		# Must break & complicate because here a setting applies to 2 lines
 			dd = nt2dict(val)
-			lab_pos = hlp_desnany_str(dd, [:pos :position])	# Legend position
+			lab_pos = hlp_desnany_str(dd, [:pos, :position])	# Legend position
 			((val = find_in_dict(dd, [:label :labels])[1]) !== nothing) && (legs = fish_labels(val, legs, one_array, D1, D2))
 			((val = find_in_dict(dd, [:box])[1]) !== nothing) && (lab_box = val)
 		end

src/pscoast.jl

@@ -110,7 +110,7 @@ function coast_parser(first::Bool, clip::String, O::Bool, d::Dict{Symbol, Any})
 
 	gmt_proggy = (IamModern[]) ? "coast "  : "pscoast "
 
-	if ((val = hlp_desnany_str(d, [:getR :getregion :get_region], false)) !== "")
+	if ((val = hlp_desnany_str(d, [:getR, :getregion, :get_region], false)) !== "")
 		t::String = string(gmt_proggy, " -E", val)
 		resto = d, "", O, true, false, ""
 		((Vd = hlp_desnany_int(d, [:Vd])) !== -999) && (Vd == 1 ? println(t) : Vd > 1 ? (return t, resto...) : nothing)

src/pslegend.jl

@@ -152,7 +152,7 @@ function mk_legend(; kwargs...)
 			((f = hlp_desnany_str(d, [:offset])) === "") && error("Must specify the 'offset' in 'colorbar'")
 			((val_s = hlp_desnany_str(d, [:height])) === "") && error("Must specify the 'height' in 'colorbar'")
 			f *= " " * string(val_s)::String
-			((val_s = hlp_desnany_str(d, [:extra :options])) === "") || (f *= " " * val_s)
+			((val_s = hlp_desnany_str(d, [:extra, :options])) === "") || (f *= " " * val_s)
 			leg[n] = "B " * string(d[Symbol.(keys(d))[1]])::String * " " * f
 			check_unused(d, kw_str, Symbol.(keys(d))[1])
 
@@ -174,22 +174,22 @@ function mk_legend(; kwargs...)
 		elseif (kw_str == "I" || startswith(kw_str, "image"))	# code = (image=fname)	I @SOEST_block4.png 3i CT
 			d = nt2dict(code)
 			((f = hlp_desnany_str(d, [:width])) === "") && error("Must specify the 'width' in 'image'")
-			((val_s = hlp_desnany_str(d, [:justify :justification])) === "") && error("Must specify the 'justify' in 'image'")
+			((val_s = hlp_desnany_str(d, [:justify, :justification])) === "") && error("Must specify the 'justify' in 'image'")
 			f *= " " * string(val_s)::String
 			leg[n] = "I " * string(d[Symbol.(keys(d))[1]])::String * " " * f
 			check_unused(d, kw_str, Symbol.(keys(d))[1])
 
 		elseif (kw_str == "L" || startswith(kw_str, "label"))	# code = L 9p,Times-Roman R Smith et al., @%5%J. Geophys. Res., 99@%%, 2000
 			d = nt2dict(code)
-			((f = hlp_desnany_str(d, [:justify :justification])) === "") && error("Must specify the ''justify' in 'label'")
+			((f = hlp_desnany_str(d, [:justify, :justification])) === "") && error("Must specify the ''justify' in 'label'")
 			f = (((val = find_in_dict(d, [:font])[1]) === nothing) ? "-" : font(val)) * " " * uppercase(f[1])
 			leg[n] = "L " * f * " " * string(d[Symbol.(keys(d))[1]])::String
 			check_unused(d, kw_str, Symbol.(keys(d))[1])
 
 		elseif (kw_str == "M" || occursin("scale", kw_str))		# code = (map_scale=)	M 5 5 600+u+f
 			d = nt2dict(code)
-			((f = hlp_desnany_str(d, [:lon :x])) === "") && (f = "-")
-			((val_s = hlp_desnany_str(d, [:lat :y])) === "") && error("Must specify the 'lat or y' in map_scale")
+			((f = hlp_desnany_str(d, [:lon, :x])) === "") && (f = "-")
+			((val_s = hlp_desnany_str(d, [:lat, :y])) === "") && error("Must specify the 'lat or y' in map_scale")
 			leg[n] = "M " * f * " " * val_s
 			((val_s = hlp_desnany_str(d, [:length])) === "") && error("Must specify the 'length' in map_scale")
 			leg[n] *= " " * val_s
@@ -216,7 +216,7 @@ function mk_legend(; kwargs...)
 			f = ((val_s = hlp_desnany_str(d, [:fill])) === "") ? "- " : get_color(val_s);		fill = f
 			f = add_opt_pen(d, [:pen], opt="");	pen = (f == "") ? " -" : " " * f		# TRUE to also seek (lw,lc,ls)
 			((_size = hlp_desnany_str(d, [:size])) === "") && error("Must specify the 'size' in 'symbol'")
-			f = hlp_desnany_str(d, [:label :text]);	label = f
+			f = hlp_desnany_str(d, [:label, :text]);	label = f
 			if (label != "")
 				f = ((val_s = hlp_desnany_str(d, [:dx_right])) === "") ? "- " : string(val_s, " ");	dx2 = f
 				label = " " * dx2 * label

src/psmask.jl

@@ -75,7 +75,7 @@ function mask(w::wrapDatasets, O::Bool, K::Bool, d::Dict{Symbol, Any})
 	cmd  = parse_these_opts(cmd, d, [[:C :endclip :end_clip_path], [:D :dump], [:L :nodegrid], [:N :invert :inverse],
 	                                 [:Q :cut :cut_number], [:S :search_radius], [:T :tiles]])
 
-	if ((val_s = hlp_desnany_str(d, [:F :oriented])) !== "")
+	if ((val_s = hlp_desnany_str(d, [:F, :oriented])) !== "")
         cmd = (val_s[1] == 'r') ? cmd * " -Fr" : cmd * " -Fl"
     end