From 87f01602eca19ccd4a12e60b13a8ddd24b35d30d Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Sat, 16 Oct 2021 17:14:44 -1000
Subject: [PATCH 1/3] Add -B modifier to skip annotation(s) at end of axis

When composing multible frames or plots, expecially with y-annotations parallel to the axis, it is convenient to be able to skip plotting the annotations that land exactly at the end of an axis (or just one end).  This is difficult todo in GMT without changing -R (say -R0/0.9999 instead of -R0/1) but that is not a satisfactory solution.  The new axis modifier +e[l|h] will turn off both or just the lower or upper annotation if it lands at the end of the axis.  I have added a simple test script to illustrate the effect and ensure it works.
---
 doc/rst/source/explain_-B.rst_ |   4 +++-
 src/gmt_constants.h            |   5 +++++
 src/gmt_init.c                 |  33 +++++++++++++++++++++++----------
 src/gmt_parse.c                |   2 +-
 src/gmt_plot.c                 |  16 +++++++++++++---
 src/gmt_project.h              |   1 +
 test/psbasemap/skipannots.ps   | Bin 0 -> 46224 bytes
 test/psbasemap/skipannots.sh   |  19 +++++++++++++++++++
 8 files changed, 65 insertions(+), 15 deletions(-)
 create mode 100644 test/psbasemap/skipannots.ps
 create mode 100755 test/psbasemap/skipannots.sh

diff --git a/doc/rst/source/explain_-B.rst_ b/doc/rst/source/explain_-B.rst_
index 136194d1bc7..95e32b6374e 100644
--- a/doc/rst/source/explain_-B.rst_
+++ b/doc/rst/source/explain_-B.rst_
@@ -95,7 +95,7 @@ The Axes settings are specified by
 
 but you may also split this into two separate invocations for clarity, i.e.,
 
-   | **-B**\ [**p**\|\ **s**][**x**\|\ **y**\|\ **z**][**+a**\ *angle*\|\ **n**\|\ **p**][**+f**]\
+   | **-B**\ [**p**\|\ **s**][**x**\|\ **y**\|\ **z**][**+a**\ *angle*\|\ **n**\|\ **p**][**+e**\ [**l**\|\ **u**]][**+f**]\
      [**+l**\|\ **L**\ *label*][**+p**\ *prefix*][**+s**\|\ **S**\ *seclabel*][**+u**\ *unit*]
    | **-B**\ [**p**\|\ **s**][**x**\|\ **y**\|\ **z**]\ *intervals*
 
@@ -110,6 +110,8 @@ The following modifiers can be appended to **-B** to control the Axes settings:
 - **x**\|\ **y**\|\ **z** to set which axes the modifiers apply to [default is **xy**]. If you wish to give different
   annotation intervals or labels for the various axes then you must repeat the **B** option for each axis. For a
   3-D plot with the **-p** and **-Jz** options used, **-Bz** can be used to provide settings for the verical axis.
+- **+e** to give skip annotations that fall exactly at the ends of the axis.  Append **l** or **u** to only
+  skip the lower or upper annotation, respectively.
 - **+f** (for geographic axes only) to give fancy annotations with W\|\ E\|\ S\|\ N suffices encoding the sign.
 - **+l**\|\ **+L**\ *label* (for Cartesian plots only) to add a label to an axis. **+l** uses the default
   label orientation; **+L** forces a horizontal label for *y*-axes, which is useful for very short labels.
diff --git a/src/gmt_constants.h b/src/gmt_constants.h
index 570ce6ccba1..18fa3e401c7 100644
--- a/src/gmt_constants.h
+++ b/src/gmt_constants.h
@@ -340,6 +340,11 @@ enum GMT_time_period {
 /* Valid options to psconvert from figure and begin */
 #define GMT_PSCONVERT_LIST "ACDEHIMNQS"
 
+/* Valid frame setting modifiers */
+#define GMT_FRAME_LIST "bginotwxyz"
+/* Valid axis setting modifiers */
+#define GMT_AXIS_LIST "aefLlpsSu"
+
 /* Settings for usage message indents and break/continue characters */
 
 #define GMT_LINE_BREAK	"\xe2\x8f\x8e"	/* Glyph for return symbol in UTF-8 */
diff --git a/src/gmt_init.c b/src/gmt_init.c
index 871708501fa..c6353672174 100644
--- a/src/gmt_init.c
+++ b/src/gmt_init.c
@@ -4367,9 +4367,10 @@ GMT_LOCAL int gmtinit_parse5_B_option (struct GMT_CTRL *GMT, char *in) {
 	 * Axis settings:
 	 * 	-B[p|s][x|y|z]<info>
 	 *   where <info> is of the format
-	 * 	<intervals>[+a<angle>|n|p][+L|l<label>][+S|s<altlabel>][+p<prefix>][+u<unit>]
+	 * 	<intervals>[+a<angle>|n|p][+e[l|u]][+L|l<label>][+S|s<altlabel>][+p<prefix>][+u<unit>]
 	 *   and each <intervals> is a concatenation of one or more [t][value]
 	 *    		+a<angle> sets a fixed annotation angle with respect to axis (Cartesian only), n or p for normal or parallel
+	 *    		+e[l|u] tells GMT to not plot an annotation at the lower and|or upper end of an axis [both are plotted]
 	 *    		+l<label> as labels for the respective axes [none]. Use +L for only horizontal labels
 	 *    		+s<altlabel> as alternate label for the far axis [same as <label>]. Use +S for only horizontal labels
 	 *    		+u<unit> as as annotation suffix unit [none].
@@ -4404,7 +4405,7 @@ GMT_LOCAL int gmtinit_parse5_B_option (struct GMT_CTRL *GMT, char *in) {
 	if ((error = gmtinit_parse5_B_frame_setting (GMT, in)) >= 0) return (error);	/* Parsed the -B frame settings separately */
 	error = 0;	/* Reset since otherwise it is -1 */
 
-	if (gmt_found_modifier (GMT, in, "bginotwxyz")) {
+	if (gmt_found_modifier (GMT, in, GMT_FRAME_LIST)) {
 		GMT_Report (GMT->parent, GMT_MSG_ERROR, "Option -B: Found frame setting modifiers (+b|g|i|n|o|t|w|x|y|z) mixed with axes settings!\n");
 		return (GMT_PARSE_ERROR);
 	}
@@ -4438,9 +4439,9 @@ GMT_LOCAL int gmtinit_parse5_B_option (struct GMT_CTRL *GMT, char *in) {
 	GMT->current.map.frame.axis[GMT_Z].angle = 0.0;	/* Default is plotting normal to axis for Z, i.e., will look horizontal on the plot */
 	GMT->current.map.frame.axis[GMT_Z].use_angle = true;
 	strncpy (text, &in[k], GMT_BUFSIZ-1);	/* Make a copy of the input, starting after the leading -B[p|s][xyz] indicators */
-	gmt_handle5_plussign (GMT, text, "afLlpsSu", 0);	/* Temporarily change any +<letter> except +L|l, +f, +p, +S|s, +u to ASCII 1 to avoid interference with +modifiers */
-	k = 0;					/* Start at beginning of text and look for first occurrence of +L|l, +f, +p, +S|s or +u */
-	while (text[k] && !(text[k] == '+' && strchr ("afLlpSsu", text[k+1]))) k++;
+	gmt_handle5_plussign (GMT, text, GMT_AXIS_LIST, 0);	/* Temporarily change any +<letter> except +L|l, +f, +p, +S|s, +u to ASCII 1 to avoid interference with +modifiers */
+	k = 0;					/* Start at beginning of text and look for first occurrence of +L|l, +e, +f, +p, +S|s or +u */
+	while (text[k] && !(text[k] == '+' && strchr (GMT_AXIS_LIST, text[k+1]))) k++;
 	gmt_M_memset (orig_string, GMT_BUFSIZ, char);
 	strncpy (orig_string, text, k);		/* orig_string now has the interval information */
 	gmt_handle5_plussign (GMT, orig_string, NULL, 1);	/* Recover any non-modifier plus signs */
@@ -4498,6 +4499,17 @@ GMT_LOCAL int gmtinit_parse5_B_option (struct GMT_CTRL *GMT, char *in) {
 						else
 							GMT_Report (GMT->parent, GMT_MSG_WARNING, "Option -B: Cannot use +f for Cartesian axes - modifier ignored\n");
 						break;
+					case 'e':	/* Turn off end annotations if within distance of axis en */
+							switch (p[1]) {	/* See if lower or upper was specified, or default to both */
+								case 'l': GMT->current.map.frame.axis[no].skip[0] = true; break;
+								case 'u': GMT->current.map.frame.axis[no].skip[1] = true; break;
+								case '\0': GMT->current.map.frame.axis[no].skip[0] = GMT->current.map.frame.axis[no].skip[1] = true; break;
+								default:
+									GMT_Report (GMT->parent, GMT_MSG_WARNING, "Option -B: Unrecognized argument to modifier +e (%s). Syntax is +e[l|u].\n", &p[1]);
+									error++;
+									break;
+						}
+						break;
 					case 'L':	/* Force horizontal axis label */
 						GMT->current.map.frame.axis[no].label_mode = 1;
 						/* Intentionally fall through - to 'l' */
@@ -7138,7 +7150,7 @@ void gmtlib_explain_options (struct GMT_CTRL *GMT, char *options) {
 				"The full axes specification is");
 			GMT_Usage (API, 3, "-B[p|s][x|y|z]<intervals>[+a<angle>|n|p][+f][+l|L<label>][+p<prefix>][+s|S<secondary_label>][+u<unit>");
 			GMT_Usage (API, -2, "Alternatively, you may break this syntax into two separate -B options:");
-			GMT_Usage (API, 3, "-B[p|s][x|y|z][+a<angle>|n|p][+f][+l|L<label>][+p<prefix>][+s|S<secondary_label>][+u<unit>]");
+			GMT_Usage (API, 3, "-B[p|s][x|y|z][+a<angle>|n|p][+e[l|u]][+f][+l|L<label>][+p<prefix>][+s|S<secondary_label>][+u<unit>]");
 			GMT_Usage (API, 3, "-B[p|s][x|y|z]<intervals>");
 			GMT_Usage (API, -2, "There are two levels of annotations: Primary and secondary (most situations only require primary). "
 				"The -B[p] sets (p)rimary (more frequent) annotations while -Bs sets (s)econdary (less frequent) annotations. "
@@ -7182,9 +7194,8 @@ void gmtlib_explain_options (struct GMT_CTRL *GMT, char *options) {
 				"When <stride> is omitted, a reasonable value will be determined automatically, e.g., -Bafg. "
 				"Log10 axis: Append l to annotate log10 (value) or p for 10^(log10(value)) [Default annotates value]. "
 				"Power axis: Append p to annotate value at equidistant pow increments [Default is nonlinear]. Optional modifiers: ");
-			GMT_Usage (API, 3, "+p Prepend <prefix> to each annotation (e.g., $ 10, $ 20 ...).");
-			GMT_Usage (API, 3, "+u Append <unit> to each annotation (e.g., 5 km, 10 km ...).");
 			GMT_Usage (API, 3, "+a Append <angle> for slanted or use +an|p for orthogonal|parallel annotations [+ap].");
+			GMT_Usage (API, 3, "+e Skip annotation that land exactly at one (append l or u) or both ends of the axis [no skipping].");
 			GMT_Usage (API, 3, "+f Let geographic axes place \"fancy\" annotations with W|E|S|N suffices.");
 			GMT_Usage (API, 3, "+l Place <label> for the axis.  Use +L to enforce horizontal labels for y-axes. "
 				"For another axis label on the opposite axis, use +s|S as well. "
@@ -7194,6 +7205,8 @@ void gmtlib_explain_options (struct GMT_CTRL *GMT, char *options) {
 				"A <label> may contain LaTeX code enclosed by @[ .... @[  (or alternatively <math> ... </math>). "
 				"Using LaTeX expressions requires you to have a functioning latex and dvips installation, including required fonts. "
 				"Geographic map annotations will automatically have degree, minute, seconds units.");
+			GMT_Usage (API, 3, "+p Prepend <prefix> to each annotation (e.g., $ 10, $ 20 ...).");
+			GMT_Usage (API, 3, "+u Append <unit> to each annotation (e.g., 5 km, 10 km ...).");
 			GMT_Usage (API, -2, "See basemap documentation for more details and examples of all settings.");
 			break;
 
@@ -7203,7 +7216,7 @@ void gmtlib_explain_options (struct GMT_CTRL *GMT, char *options) {
 			GMT_Usage (API, 2, "Frame settings are modified via an optional single invocation of "
 				"-B[<axes>][+b][+g<fill>][+i[<val>]][+n][+o<lon>/<lat>][+s<subtitle>][+t<title>][+w[<pen>]][+x<fill>][+y<fill>][+z<fill>]");
 			GMT_Usage (API, 2, "Axes parameters are specified via one or more invocations of "
-				"-B[p|s][x|y|z]<intervals>[+a<angle>|n|p][+f][+l|L<label>][+p<prefix>][+s|S<secondary_label>][+u<unit>");
+				"-B[p|s][x|y|z]<intervals>[+a<angle>|n|p][+e[l|u]][+f][+l|L<label>][+p<prefix>][+s|S<secondary_label>][+u<unit>");
 			GMT_Usage (API, -2, "<intervals> is composed of concatenated [<type>]<stride>[l|p] sub-strings. "
 				"See basemap documentation for more details and examples of all settings.");
 			break;
@@ -17386,7 +17399,7 @@ int gmt_parse_common_options (struct GMT_CTRL *GMT, char *list, char option, cha
 				if (GMT->current.setting.run_mode == GMT_MODERN && (!GMT->current.map.frame.set[GMT_X] || !GMT->current.map.frame.set[GMT_Y] || (GMT->common.J.zactive && !GMT->current.map.frame.set[GMT_Z]))) {
 					char code[2], args[GMT_LEN256] = {""}, *c = strchr (item, '+');	/* Start of modifiers, if any */
 					if (item[q] && strstr (item, "+f")) GMT->current.plot.calclock.geo.wesn = 1;	/* Got +f, so enable W|E|S|N suffices */
-					if (c && strchr ("aflLsSu", c[1]))	/* We got the ones suitable for axes that we can chop off */
+					if (c && strchr (GMT_AXIS_LIST, c[1]))	/* We got the ones suitable for axes that we can chop off */
 						c[0] = '\0';	/* Temporarily chop off these modifiers only */
 					code[0] = item[q]; code[1] = (item[q]) ? item[q+1] : '\0';
 					if (c) c[0] = '+';	/* Restore modifiers */
diff --git a/src/gmt_parse.c b/src/gmt_parse.c
index 81b1d0307ed..cbe349802f9 100644
--- a/src/gmt_parse.c
+++ b/src/gmt_parse.c
@@ -503,7 +503,7 @@ GMT_LOCAL struct GMT_OPTION * gmtparse_ensure_b_and_dash_options_order (struct G
 				this_priority = 2;
 			n_B++;
 		}
-		else if ((c = gmt_first_modifier (GMT, opt->arg, "aflLpsSu"))) {	/* Option has axis modifier(s) */
+		else if ((c = gmt_first_modifier (GMT, opt->arg, GMT_AXIS_LIST))) {	/* Option has axis modifier(s) */
 			c[0] = '\0';	/* Temporary chop them off */
 			j = 0;	/* Start of option string, then advance past any leading [p|s][x|y|z] */
 			if (strchr ("ps",  opt->arg[j])) j++;
diff --git a/src/gmt_plot.c b/src/gmt_plot.c
index bfd9c659e0f..266dc6c89e5 100644
--- a/src/gmt_plot.c
+++ b/src/gmt_plot.c
@@ -1771,6 +1771,14 @@ GMT_LOCAL double gmtplot_curved_boundary_offset (struct GMT_CTRL *GMT, double lo
 	return boost;
 }
 
+GMT_LOCAL bool gmtplot_skip_end_annotation (struct GMT_CTRL *GMT, unsigned int axis, double x, double length) {
+	/* Returns true if this is an annotation at the end of the axis and we are either in GMT_IS_INSIDE mode or user added modifer +e[l|u] to the axis annotation settings */
+	if (GMT->current.map.frame.axis[axis].skip[0] && fabs (x) < GMT_CONV4_LIMIT) return true;   /* Skip annotation if it falls ~exactly at the start of the axis */
+	if (GMT->current.map.frame.axis[axis].skip[1] && fabs (x - length) < GMT_CONV4_LIMIT) return true;   /* Skip annotation if t falls ~exactly at the end of the axis */
+	if (GMT->current.setting.map_frame_type & GMT_IS_INSIDE && (fabs (x) < GMT_CONV4_LIMIT || fabs (x - length) < GMT_CONV4_LIMIT)) return true;   /* Skip annotation on edges when MAP_FRAME_TYPE = inside */
+	return false;	/* No, let's plot it */
+}
+
 GMT_LOCAL void gmtplot_map_symbol (struct GMT_CTRL *GMT, struct PSL_CTRL *PSL, struct GMT_XINGS *xings, char *label, unsigned int type, bool annot, unsigned int level, unsigned int form) {
 	/* type = 0 for lon and 1 for lat */
 
@@ -1807,7 +1815,10 @@ GMT_LOCAL void gmtplot_map_symbol (struct GMT_CTRL *GMT, struct PSL_CTRL *PSL, s
 		}
 
 		if (annot) {
+			double length = (type == GMT_X) ? GMT->current.map.width : GMT->current.map.height;
+			double pos = (type == GMT_X) ? xx[i] : yy[i];
 			if (gmtplot_annot_too_crowded (GMT, xx[i], yy[i], sides[i])) continue;
+			if (gmtplot_skip_end_annotation (GMT, type, pos, length)) continue;	/* Don't want annotations exactly at one or both ends of the axis */
 			if (GMT->current.proj.three_D && GMT->current.proj.z_project.cos_az > 0) {	/* Rotate annotation when seen "from North" */
 				if (!flip) justify = gmt_flip_justify (GMT, justify);
 				text_angle += 180.0;
@@ -5570,7 +5581,6 @@ void gmt_xy_axis (struct GMT_CTRL *GMT, double x0, double y0, double length, dou
 			for (i = 0; i < nx; i++) {
 				x = (*xyz_fwd) (GMT, knots[i]);	/* Convert to inches on the page */
 				if (x < (- GMT_CONV4_LIMIT) || x > (length + GMT_CONV4_LIMIT)) continue;	/* Outside the range */
-				if (GMT->current.setting.map_frame_type & GMT_IS_INSIDE && (fabs (x) < GMT_CONV4_LIMIT || fabs (x - length) < GMT_CONV4_LIMIT)) continue;	/* Skip annotation on edges when MAP_FRAME_TYPE = inside */
 				if (gmtplot_skip_second_annot (k, knots[i], knots_p, np, primary)) continue;	/* Minor tick marks skipped when coinciding with major */
 				if (horizontal)
 					PSL_plotsegment (PSL, x, 0.0, x, ((neg) ? -1.0 : 1.0) * GMT->current.setting.map_tick_length[k]);
@@ -5597,7 +5607,7 @@ void gmt_xy_axis (struct GMT_CTRL *GMT, double x0, double y0, double length, dou
 				if (gmtlib_annot_pos (GMT, val0, val1, T, &knots[i], &t_use)) continue;			/* Outside range */
 				if (axis == GMT_Z && fabs (knots[i] - GMT->current.proj.z_level) < GMT_CONV8_LIMIT) continue;	/* Skip z annotation coinciding with z-level plane */
 				x = (*xyz_fwd) (GMT, knots[i]);	/* Convert to inches on the page */
-				if (GMT->current.setting.map_frame_type & GMT_IS_INSIDE && (fabs (x) < GMT_CONV4_LIMIT || fabs (x - length) < GMT_CONV4_LIMIT)) continue;	/* Skip annotation on edges when MAP_FRAME_TYPE = inside */
+				if (gmtplot_skip_end_annotation (GMT, axis, x, length)) continue;	/* Don't want annotations exactly at one or both ends of the axis */
 				if (!is_interval && gmtplot_skip_second_annot (k, knots[i], knots_p, np, primary)) continue;	/* Secondary annotation skipped when coinciding with primary annotation */
 				if (label_c && label_c[i] && label_c[i][0]) {
 					strncpy (string, label_c[i], GMT_LEN256-1);
@@ -5636,7 +5646,7 @@ void gmt_xy_axis (struct GMT_CTRL *GMT, double x0, double y0, double length, dou
 				if (gmtlib_annot_pos (GMT, val0, val1, T, &knots[i], &t_use)) continue;			/* Outside range */
 				if (axis == GMT_Z && fabs (knots[i] - GMT->current.proj.z_level) < GMT_CONV8_LIMIT) continue;	/* Skip z annotation coinciding with z-level plane */
 				x = (*xyz_fwd) (GMT, t_use);	/* Convert to inches on the page */
-				if (GMT->current.setting.map_frame_type & GMT_IS_INSIDE && (fabs (x) < GMT_CONV4_LIMIT || fabs (x - length) < GMT_CONV4_LIMIT)) continue;	/* Skip annotation on edges when MAP_FRAME_TYPE = inside */
+				if (gmtplot_skip_end_annotation (GMT, axis, x, length)) continue;	/* Don't want annotations exactly at one or both ends of the axis */
 				if (!is_interval && gmtplot_skip_second_annot (k, knots[i], knots_p, np, primary)) continue;	/* Secondary annotation skipped when coinciding with primary annotation */
 				/* Move to new anchor point */
 				PSL_command (PSL, "%d PSL_A%d_y MM\n", PSL_IZ (PSL, x), annot_pos);
diff --git a/src/gmt_project.h b/src/gmt_project.h
index ec67c8c9606..4529931ecdc 100644
--- a/src/gmt_project.h
+++ b/src/gmt_project.h
@@ -499,6 +499,7 @@ struct GMT_PLOT_AXIS {		/* Information for one time axis */
 	unsigned int label_mode;	/* 0 = parallel to all axes, 1 = always horizontal on map */
 	bool substitute_pi;		/* True if we need to plot fractions of pi on this axis */
 	bool use_angle;			/* True if we got +a<angle>|n|p for this axis */
+	bool skip[2];			/* Determins if we skip annotations at the lower or upper bounds of an axis [false/false] */
 	struct GMT_PLOT_AXIS_ITEM item[8];	/* see above defines for which is which */
 	double phase;			/* Phase offset for strides: (knot-phase)%interval = 0  */
 	double angle;			/* Annotations angle set by user */
diff --git a/test/psbasemap/skipannots.ps b/test/psbasemap/skipannots.ps
new file mode 100644
index 0000000000000000000000000000000000000000..c7848b076f623a31e8a62162fa3bab201c726215
GIT binary patch
literal 46224
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
ao?ce?dolc74FFtbil1r1IY|8e%Krgv7w>8S

literal 0
HcmV?d00001

diff --git a/test/psbasemap/skipannots.sh b/test/psbasemap/skipannots.sh
new file mode 100755
index 00000000000..ff06f8451cf
--- /dev/null
+++ b/test/psbasemap/skipannots.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+# Test the new +e modifier to -B
+gmt begin skipannots ps
+  gmt set MAP_FRAME_TYPE plain PS_MEDIA letter
+  echo "-Bx -By" | gmt text -R0/80/0/30 -Jx0.1c -Bx -By -F+cCM+f14p -Y1.25c
+  echo "-Bx+e -By" | gmt text -Bx+e -By -Y3.75c -F+cCM+f14p
+  echo "-Bx+el -By" | gmt text -Bx+el -By -Y3.75c -F+cCM+f14p
+  echo "-Bx+eu -By" | gmt text -Bx+eu -By -Y3.75c -F+cCM+f14p
+  echo "-Bx -By+e" | gmt text -Bx -By+e -Y3.75c -F+cCM+f14p
+  echo "-Bx -By+el" | gmt text -Bx -By+el -Y3.75c -F+cCM+f14p
+  echo "-Bx -By+eu" | gmt text -Bx -By+eu -Y3.75c -F+cCM+f14p
+  echo "-Bx -By" | gmt text -R0/60/0/30 -Jq0.1c -Bx -By -X10 -F+cCM+f14p
+  echo "-Bx+e -By+el" | gmt text -Bx+e -By+el -Y-3.75c -F+cCM+f14p
+  echo "-Bx+e -By+eu" | gmt text -Bx+e -By+eu -Y-3.75c -F+cCM+f14p
+  echo "-Bx+e -By+e" | gmt text -Bx+e -By+e -Y-3.75c -F+cCM+f14p
+  echo "-Bx+el -By+el" | gmt text -Bx+el -By+el -Y-3.75c -F+cCM+f14p
+  echo "-Bx+el -By+eu" | gmt text -Bx+el -By+eu -Y-3.75c -F+cCM+f14p
+  echo "-Bx+eu -By+eu" | gmt text -Bx+eu -By+eu -Y-3.75c -F+cCM+f14p
+gmt end show

From 3614a2864021af02d87c0a04995c8a36879d2c79 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Sat, 16 Oct 2021 17:24:06 -1000
Subject: [PATCH 2/3] Update skipannots.sh

---
 test/psbasemap/skipannots.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/psbasemap/skipannots.sh b/test/psbasemap/skipannots.sh
index ff06f8451cf..e7306becba0 100755
--- a/test/psbasemap/skipannots.sh
+++ b/test/psbasemap/skipannots.sh
@@ -9,7 +9,7 @@ gmt begin skipannots ps
   echo "-Bx -By+e" | gmt text -Bx -By+e -Y3.75c -F+cCM+f14p
   echo "-Bx -By+el" | gmt text -Bx -By+el -Y3.75c -F+cCM+f14p
   echo "-Bx -By+eu" | gmt text -Bx -By+eu -Y3.75c -F+cCM+f14p
-  echo "-Bx -By" | gmt text -R0/60/0/30 -Jq0.1c -Bx -By -X10 -F+cCM+f14p
+  echo "-Bx -By" | gmt text -R0/60/0/30 -Jq0.1c -Bx -By -X10c -F+cCM+f14p
   echo "-Bx+e -By+el" | gmt text -Bx+e -By+el -Y-3.75c -F+cCM+f14p
   echo "-Bx+e -By+eu" | gmt text -Bx+e -By+eu -Y-3.75c -F+cCM+f14p
   echo "-Bx+e -By+e" | gmt text -Bx+e -By+e -Y-3.75c -F+cCM+f14p

From eb8a76ceab74f4e52b27ba2f5200f1439457e279 Mon Sep 17 00:00:00 2001
From: Paul Wessel <pwessel@hawaii.edu>
Date: Sat, 16 Oct 2021 18:07:14 -1000
Subject: [PATCH 3/3] Rename constants

---
 src/gmt_constants.h | 4 ++--
 src/gmt_init.c      | 8 ++++----
 src/gmt_parse.c     | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/gmt_constants.h b/src/gmt_constants.h
index 18fa3e401c7..0b963b4be0a 100644
--- a/src/gmt_constants.h
+++ b/src/gmt_constants.h
@@ -341,9 +341,9 @@ enum GMT_time_period {
 #define GMT_PSCONVERT_LIST "ACDEHIMNQS"
 
 /* Valid frame setting modifiers */
-#define GMT_FRAME_LIST "bginotwxyz"
+#define GMT_FRAME_MODIFIERS "bginotwxyz"
 /* Valid axis setting modifiers */
-#define GMT_AXIS_LIST "aefLlpsSu"
+#define GMT_AXIS_MODIFIERS "aefLlpsSu"
 
 /* Settings for usage message indents and break/continue characters */
 
diff --git a/src/gmt_init.c b/src/gmt_init.c
index c6353672174..c8e4223cb7f 100644
--- a/src/gmt_init.c
+++ b/src/gmt_init.c
@@ -4405,7 +4405,7 @@ GMT_LOCAL int gmtinit_parse5_B_option (struct GMT_CTRL *GMT, char *in) {
 	if ((error = gmtinit_parse5_B_frame_setting (GMT, in)) >= 0) return (error);	/* Parsed the -B frame settings separately */
 	error = 0;	/* Reset since otherwise it is -1 */
 
-	if (gmt_found_modifier (GMT, in, GMT_FRAME_LIST)) {
+	if (gmt_found_modifier (GMT, in, GMT_FRAME_MODIFIERS)) {
 		GMT_Report (GMT->parent, GMT_MSG_ERROR, "Option -B: Found frame setting modifiers (+b|g|i|n|o|t|w|x|y|z) mixed with axes settings!\n");
 		return (GMT_PARSE_ERROR);
 	}
@@ -4439,9 +4439,9 @@ GMT_LOCAL int gmtinit_parse5_B_option (struct GMT_CTRL *GMT, char *in) {
 	GMT->current.map.frame.axis[GMT_Z].angle = 0.0;	/* Default is plotting normal to axis for Z, i.e., will look horizontal on the plot */
 	GMT->current.map.frame.axis[GMT_Z].use_angle = true;
 	strncpy (text, &in[k], GMT_BUFSIZ-1);	/* Make a copy of the input, starting after the leading -B[p|s][xyz] indicators */
-	gmt_handle5_plussign (GMT, text, GMT_AXIS_LIST, 0);	/* Temporarily change any +<letter> except +L|l, +f, +p, +S|s, +u to ASCII 1 to avoid interference with +modifiers */
+	gmt_handle5_plussign (GMT, text, GMT_AXIS_MODIFIERS, 0);	/* Temporarily change any +<letter> except +L|l, +f, +p, +S|s, +u to ASCII 1 to avoid interference with +modifiers */
 	k = 0;					/* Start at beginning of text and look for first occurrence of +L|l, +e, +f, +p, +S|s or +u */
-	while (text[k] && !(text[k] == '+' && strchr (GMT_AXIS_LIST, text[k+1]))) k++;
+	while (text[k] && !(text[k] == '+' && strchr (GMT_AXIS_MODIFIERS, text[k+1]))) k++;
 	gmt_M_memset (orig_string, GMT_BUFSIZ, char);
 	strncpy (orig_string, text, k);		/* orig_string now has the interval information */
 	gmt_handle5_plussign (GMT, orig_string, NULL, 1);	/* Recover any non-modifier plus signs */
@@ -17399,7 +17399,7 @@ int gmt_parse_common_options (struct GMT_CTRL *GMT, char *list, char option, cha
 				if (GMT->current.setting.run_mode == GMT_MODERN && (!GMT->current.map.frame.set[GMT_X] || !GMT->current.map.frame.set[GMT_Y] || (GMT->common.J.zactive && !GMT->current.map.frame.set[GMT_Z]))) {
 					char code[2], args[GMT_LEN256] = {""}, *c = strchr (item, '+');	/* Start of modifiers, if any */
 					if (item[q] && strstr (item, "+f")) GMT->current.plot.calclock.geo.wesn = 1;	/* Got +f, so enable W|E|S|N suffices */
-					if (c && strchr (GMT_AXIS_LIST, c[1]))	/* We got the ones suitable for axes that we can chop off */
+					if (c && strchr (GMT_AXIS_MODIFIERS, c[1]))	/* We got the ones suitable for axes that we can chop off */
 						c[0] = '\0';	/* Temporarily chop off these modifiers only */
 					code[0] = item[q]; code[1] = (item[q]) ? item[q+1] : '\0';
 					if (c) c[0] = '+';	/* Restore modifiers */
diff --git a/src/gmt_parse.c b/src/gmt_parse.c
index cbe349802f9..e6f32799fc2 100644
--- a/src/gmt_parse.c
+++ b/src/gmt_parse.c
@@ -503,7 +503,7 @@ GMT_LOCAL struct GMT_OPTION * gmtparse_ensure_b_and_dash_options_order (struct G
 				this_priority = 2;
 			n_B++;
 		}
-		else if ((c = gmt_first_modifier (GMT, opt->arg, GMT_AXIS_LIST))) {	/* Option has axis modifier(s) */
+		else if ((c = gmt_first_modifier (GMT, opt->arg, GMT_AXIS_MODIFIERS))) {	/* Option has axis modifier(s) */
 			c[0] = '\0';	/* Temporary chop them off */
 			j = 0;	/* Start of option string, then advance past any leading [p|s][x|y|z] */
 			if (strchr ("ps",  opt->arg[j])) j++;