Skip to content

Restore the paper mode facility that was broken by the explicit R change #1523

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 11, 2024
Merged

Restore the paper mode facility that was broken by the explicit R change #1523

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/common_options.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ function parse_R(d::Dict, cmd::String, O::Bool=false, del::Bool=true, RIr::Bool=
end

# I've seen grdview! screwing with "-R" so we should probably always explicitly set -R. Let's try carefully.
(!IamModern[1] && opt_R == " -R" && CTRL.pocket_R[1] != "") && (opt_R = CTRL.pocket_R[1])
(!IamModern[1] && !CTRL.IamInPaperMode[1] && opt_R == " -R" && CTRL.pocket_R[1] != "") && (opt_R = CTRL.pocket_R[1])
cmd = cmd * opt_R
return cmd, opt_R
end
Expand Down Expand Up @@ -4421,13 +4421,11 @@ function finish_PS_module(d::Dict, cmd::Vector{String}, opt_extra::String, K::Bo
cmd[k] = replace(cmd[k], J2 => islowercase(J2[1]) ? "x" * fig_size : "X" * fig_size) # Fails for scales
end
end
if (opt_R == " -R") # Should not happen anymore, but just in case
cmd[k] = replace(cmd[k], " -R" => opt_R)
elseif (opt_R != "") # opt_R is "" when J2 == "". Hmmm, has a sniff
if (opt_R != "") # opt_R is "" when J2 == "". Hmmm, has a sniff
cmd[k] = replace(cmd[k], scan_opt(cmd[k], "-R", true) => opt_R)
end
end
have_Vd && println("\t",cmd[k]) # Useful to know what command was actually executed.
have_Vd && println("\t",cmd[k]) # Useful to know what command was actually executed.
orig_J, orig_R = J1, scan_opt(cmd[1], "-R")
end
elseif (k >= 1+fi && !is_psscale && !is_pscoast && !is_basemap && !is_text && (CTRL.pocket_call[1] !== nothing))
Expand Down
Loading