Skip to content

Commit 88cdf05

Browse files
committed
Remove special case for modern mode when parsing B
Removes some special casing of modern mode in parsee_B and parse_BJR. This does not allow J option defaults for modern mode yet. Also, this breaks some subplot code, e.g. example 2 in https://www.generic-mapping-tools.org/GMT.jl/dev/subplot/#Examples. Issue GenericMappingTools#703
1 parent 880e32b commit 88cdf05

File tree

1 file changed

+4
-6
lines changed

1 file changed

+4
-6
lines changed

src/common_options.jl

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -598,8 +598,8 @@ function parse_B(d::Dict, cmd::String, opt_B::String="", del::Bool=true)::Tuple{
598598
(show_kwargs[1]) && return (print_kwarg_opts([:B :frame :axes :axis :xaxis :yaxis :zaxis :axis2 :xaxis2 :yaxis2], "NamedTuple | String"), "")
599599

600600
parse_theme(d) # Must be first because some themes change def_fig_axes
601-
def_fig_axes_ = (IamModern[1]) ? "" : def_fig_axes[1] # def_fig_axes is a global const
602-
def_fig_axes3_ = (IamModern[1]) ? "" : def_fig_axes3[1] # def_fig_axes is a global const
601+
def_fig_axes_ = def_fig_axes[1] # def_fig_axes is a global const
602+
def_fig_axes3_ = def_fig_axes3[1] # def_fig_axes is a global const
603603

604604
have_Bframe, got_Bstring, have_axes = false, false, false # To know if the axis() function returns a -B<frame> setting
605605

@@ -758,7 +758,6 @@ function parse_B(d::Dict, cmd::String, opt_B::String="", del::Bool=true)::Tuple{
758758
if (def_fig_axes[1] != def_fig_axes_bak && opt_B != def_fig_axes[1]) # Consolidation only under themes
759759
if (opt_B != "" && !got_Bstring && CTRL.proj_linear[1] && !occursin(def_fig_axes_, opt_B) &&
760760
!(occursin("pxc", opt_B) || occursin("pyc", opt_B)))
761-
# By using def_fig_axes_ this has no effect in modern mode.
762761
opt_B = ((have_Bframe) ? split(def_fig_axes_)[1] : def_fig_axes_) * opt_B
763762
end
764763
opt_B = consolidate_Baxes(opt_B)
@@ -913,12 +912,11 @@ function parse_BJR(d::Dict, cmd::String, caller::String, O::Bool, defaultJ::Stri
913912
cmd, opt_J = parse_J(d, cmd, defaultJ, true, O, del)
914913

915914
parse_theme(d) # Must be first because some themes change def_fig_axes
916-
def_fig_axes_ = (IamModern[1]) ? "" : def_fig_axes[1] # def_fig_axes is a global const
915+
def_fig_axes_ = def_fig_axes[1] # def_fig_axes is a global const
917916

918917
if (caller != "" && occursin("-JX", opt_J)) # e.g. plot() sets 'caller'
919918
if (occursin("3", caller) || caller == "grdview")
920-
def_fig_axes3_ = (IamModern[1]) ? "" : def_fig_axes3[1]
921-
cmd, opt_B = parse_B(d, cmd, (O ? "" : def_fig_axes3_), del)
919+
cmd, opt_B = parse_B(d, cmd, (O ? "" : def_fig_axes3[1]), del)
922920
else
923921
xx = (O ? "" : caller != "ternary" ? def_fig_axes_ : string(split(def_fig_axes_)[1]))
924922
cmd, opt_B = parse_B(d, cmd, xx, del) # For overlays, default is no axes

0 commit comments

Comments
 (0)