Skip to content

Commit 9a8769f

Browse files
seismanseisman
authored
plot/plot3d/clip: Simplify the -A syntax to -Ax|y (#8674)
1 parent 985a0c5 commit 9a8769f

19 files changed

+85
-86
lines changed

‎doc/rst/source/clip.rst

+15-11
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Synopsis
1414

1515
**gmt clip** [ *table* ] |-J|\ *parameters* |-C|\ [*n*]
1616
|SYN_OPT-Rz|
17-
[ |-A|\ [**m**\|\ **p**\|\ **x**\|\ **y**\|\ **r**\|\ **t**] ]
17+
[ |-A|\ [**x**\|\ **y**] ]
1818
[ |SYN_OPT-B| ]
1919
|-J|\ **z**\|\ **Z**\ *parameters* ]
2020
[ |-N| ]
@@ -89,16 +89,20 @@ Optional Arguments
8989

9090
.. _-A:
9191

92-
**-A**\ [**m**\|\ **p**\|\ **x**\|\ **y**\|\ **r**\|\ **t**]
93-
By default, geographic line segments are connected as great circle arcs. To connect them as
94-
straight lines, use the |-A| flag. Alternatively, add **m** to connect
95-
the line by first following a meridian, then a parallel. Or append **p**
96-
to start following a parallel, then a meridian. (This can be practical
97-
to connect lines along parallels, for example).
98-
For Cartesian data, points are simply connected, unless you append
99-
**x** or **y** to construct stair-case paths whose first move is along
100-
*x* or *y*, respectively. For polar projection, append **r** or **t** to
101-
draw stair-case curves that whose first move is along *r* or *theta*, respectively.
92+
**-A**\ [**x**\|\ **y**]
93+
By default, geographic line segments are connected as great circle arcs by resampling
94+
coarse input data along such arcs. To disable this sampling and connect them as
95+
straight lines, use the |-A| flag. For Cartesian data, points are simply connected.
96+
To adjust these behaviors, append a directive:
97+
98+
- **x** - First follow *x*, then *y* for staircase curves.
99+
- **y** - First follow *y*, then *x* for staircase curves.
100+
101+
Here, *x* and *y* have the following meanings:
102+
103+
- For Cartesian projections, *x* and *y* are the X- and Y-axis.
104+
- For gragraphic projections, *x* and *y* are parallels and meridians.
105+
- For polar projections, *x* and *y* are theta and radius.
102106

103107
.. |Add_-B| replace:: |Add_-B_links|
104108
.. include:: explain_-B.rst_

‎doc/rst/source/explain_line_draw.rst_

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
**-A**\ [**m**\|\ **p**\|\ **x**\|\ **y**\|\ **r**\|\ **t**]
1+
**-A**\ [**x**\|\ **y**]
22
By default, geographic line segments are drawn as great circle arcs by resampling
33
coarse input data along such arcs. To disable this sampling and draw them as
44
straight lines, use the |-A| flag. For Cartesian data, points are simply connected.
55
To adjust these behaviors, append a directive:
66

7-
- **m** - Draw the line by first following a meridian, then a parallel.
8-
- **p** - Start following a parallel, then a meridian. (This can be practical
9-
to draw a line along parallels, for example).
10-
- **r** - For polar projections, draw stair-case curves whose first move is along *r*.
11-
- **t** - Same, but first move is along *theta*.
12-
- **x** - For Cartesian data, draw stair-case curves that whose first move is along *x*.
13-
- **y** - Same, but first move is along *y*.
7+
- **x** - First follow *x*, then *y* for staircase curves.
8+
- **y** - First follow *y*, then *x* for staircase curves.
9+
10+
Here, *x* and *y* have the following meanings:
11+
12+
- For Cartesian projections, *x* and *y* are the X- and Y-axis.
13+
- For gragraphic projections, *x* and *y* are parallels and meridians.
14+
- For polar projections, *x* and *y* are theta and radius.
1415

1516
**Note**: In :doc:`plot3d`, the |-A| option requires constant *z*-coordinates.

‎doc/rst/source/plot.rst

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Synopsis
1414

1515
**gmt plot** [ *table* ] |-J|\ *parameters*
1616
|SYN_OPT-Rz|
17-
[ |-A|\ [**m**\|\ **p**\|\ **x**\|\ **y**\|\ **r**\|\ **t**] ]
17+
[ |-A|\ [**x**\|\ **y**] ]
1818
[ |SYN_OPT-B| ]
1919
[ |-C|\ *cpt* ]
2020
[ |-D|\ *dx*\ [/*dy*] ]
@@ -249,13 +249,13 @@ Optional Arguments
249249
as column 2 (i.e., third) in any number of files having three columns. Each file may
250250
contain any number of segments per file.
251251
- **s** - Same but the two curves are given via separate pairs of tables [Default].
252-
252+
253253
Several modifiers are at your disposal:
254254

255255
- **+g** - We use the *fill* set via |-G| to fill the areas where :math:`y_0(x)` exceeds
256-
:math:`y_1(x)`. For the opposite case, append another *fill* here.
256+
:math:`y_1(x)`. For the opposite case, append another *fill* here.
257257
- **+l** - For the primary curve :math:`y_0(x)`, a legend label can be set via option
258-
|SYN_OPT-l|. For a secondary label use this modifier to append the label.
258+
|SYN_OPT-l|. For a secondary label use this modifier to append the label.
259259
- **+p** - Specify a separate pen for drawing curve :math:`y_1(x)` [Default is same pen
260260
as :math:`y_0(x)`]. See |-W| for specifying the pen for curve :math:`y_0(x)`.
261261
- **+r** - Specify a pen to simply draw a line instead of a filled box in the legend, but
@@ -309,7 +309,7 @@ Optional Arguments
309309
*width* = 0.25p, *color* = black, *style* = solid]. Modifiers can be used to change the
310310
appearance of the line:
311311

312-
- **+c** - Determine how the color from the cpt file lookup is applied to symbol
312+
- **+c** - Determine how the color from the cpt file lookup is applied to symbol
313313
and|or fill. Append **l** to have the color of the line to be taken from the CPT (see
314314
|-C|). If instead **f** is appended then the color from the cpt file is applied
315315
to symbol fill. If no argument is given the we use the color for both pen and fill.

‎doc/rst/source/plot3d.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Synopsis
1515
**gmt plot3d** [ *table* ] |-J|\ *parameters*
1616
|-Jz|\ \|\ **Z**\ *parameters*
1717
|SYN_OPT-Rz|
18-
[ |-A|\ [**m**\|\ **p**\|\ **x**\|\ **y**\|\ **r**\|\ **t**] ]
18+
[ |-A|\ [**x**\|\ **y**] ]
1919
[ |SYN_OPT-B| ]
2020
[ |-C|\ *cpt* ]
2121
[ |-D|\ *dx*/*dy*\ [/*dz*] ]
@@ -211,7 +211,7 @@ Optional Arguments
211211
*width* = 0.25p, *color* = black, *style* = solid]. Modifiers can be used to change the
212212
appearance of the line:
213213

214-
- **+c** - Determine how the color from the cpt file lookup is applied to symbol
214+
- **+c** - Determine how the color from the cpt file lookup is applied to symbol
215215
and|or fill. Append **l** to have the color of the line to be taken from the CPT (see
216216
|-C|). If instead **f** is appended then the color from the cpt file is applied
217217
to symbol fill. If no argument is given the we use the color for both pen and fill.

‎doc/rst/source/psclip.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Synopsis
1414

1515
**gmt psclip** [ *table* ] |-J|\ *parameters* |-C|\ [*n*]
1616
|SYN_OPT-Rz|
17-
[ |-A|\ [**m**\|\ **p**\|\ **x**\|\ **y**\|\ **r**\|\ **t**] ]
17+
[ |-A|\ [**x**\|\ **y**] ]
1818
[ |SYN_OPT-B| ]
1919
[ |-K| ] [ |-N| ] [ |-O| ]
2020
[ |-P| ] [ |-T| ]

‎doc/rst/source/psxy.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Synopsis
1414

1515
**gmt psxy** [ *table* ] |-J|\ *parameters*
1616
|SYN_OPT-Rz|
17-
[ |-A|\ [**m**\|\ **p**\|\ **x**\|\ **y**\|\ **r**\|\ **t**] ]
17+
[ |-A|\ [**x**\|\ **y**] ]
1818
[ |SYN_OPT-B| ]
1919
[ |-C|\ *cpt* ]
2020
[ |-D|\ *dx*/*dy* ]

‎doc/rst/source/psxyz.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Synopsis
1515
**gmt psxyz** [ *table* ] |-J|\ *parameters*
1616
|-J|\ **z**\|\ **Z**\ *parameters*
1717
|SYN_OPT-Rz|
18-
[ |-A|\ [**m**\|\ **p**\|\ **x**\|\ **y**\|\ **r**\|\ **t**] ]
18+
[ |-A|\ [**x**\|\ **y**] ]
1919
[ |SYN_OPT-B| ]
2020
[ |-C|\ *cpt* ]
2121
[ |-D|\ *dx*/*dy*\ [/*dz*] ]

‎src/longopt/psclip_inc.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = {
2525
short_directives, long_directives,
2626
short_modifiers, long_modifiers,
2727
transproc_mask */
28-
{ 0, 'A', "straightlines|steps",
29-
"m,p,x,y,r,t", "meridian,parallel,x,y,r,theta",
28+
{ 0, 'A', "steps|stairs|straight_lines",
29+
"x,y", "x,y",
3030
"", "",
3131
GMT_TP_STANDARD },
3232
{ 0, 'C', "endclip", "", "", "", "", GMT_TP_STANDARD },

‎src/longopt/psxy_inc.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = { /* Local options for this m
2525
short_directives, long_directives,
2626
short_modifiers, long_modifiers,
2727
transproc_mask */
28-
{ 0, 'A', "straightlines",
29-
"m,p,x,y,r,t", "mpfollow,pmfollow,xyalong,yxalong,rtalong,tralong",
28+
{ 0, 'A', "steps|stairs|straight_lines",
29+
"x,y", "x,y",
3030
"", "",
3131
GMT_TP_STANDARD },
3232
GMT_C_CPT_KW,

‎src/longopt/psxyz_inc.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = {
2525
short_directives, long_directives,
2626
short_modifiers, long_modifiers,
2727
transproc_mask */
28-
{ 0, 'A', "straightlines|straight_lines|straight_line",
29-
"m,p,x,y,r,t", "mpfollow,pmfollow,xyalong,yxalong,rtalong,tralong",
28+
{ 0, 'A', "steps|stairs|straight_lines",
29+
"x,y", "x,y",
3030
"", "",
3131
GMT_TP_STANDARD },
3232
GMT_C_CPT_KW,

‎src/psclip.c

+10-10
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#define THIS_MODULE_OPTIONS "-:>BJKOPRUVXYbdefghipqtxy" GMT_OPT("EZMmc")
3838

3939
struct PSCLIP_CTRL {
40-
struct PSCLIP_A { /* -A[m|y|p|x|r|t<step>] */
40+
struct PSCLIP_A { /* -A[x|y] */
4141
bool active;
4242
unsigned int mode;
4343
double step;
@@ -79,7 +79,7 @@ static int usage (struct GMTAPI_CTRL *API, int level) {
7979
if (level == GMT_MODULE_PURPOSE) return (GMT_NOERROR);
8080
GMT_Usage (API, 0, "usage: %s -C[a|<n>] [-K] [-O]\n", name);
8181
GMT_Usage (API, 1, "or\n");
82-
GMT_Usage (API, 0, "usage: %s [<table>] %s %s [-A[m|p|r|t|x|y]] [%s] %s[-N] %s%s[-T] "
82+
GMT_Usage (API, 0, "usage: %s [<table>] %s %s [-A[x|y]] [%s] %s[-N] %s%s[-T] "
8383
"[%s] [%s] [-W[<pen>]] [%s] [%s] [%s] %s[%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s]\n",
8484
name, GMT_J_OPT, GMT_Rgeoz_OPT, GMT_B_OPT, API->K_OPT, API->O_OPT, API->P_OPT, GMT_U_OPT, GMT_V_OPT,
8585
GMT_X_OPT, GMT_Y_OPT, GMT_bi_OPT, API->c_OPT, GMT_di_OPT, GMT_e_OPT, GMT_f_OPT, GMT_g_OPT, GMT_h_OPT,
@@ -94,15 +94,15 @@ static int usage (struct GMTAPI_CTRL *API, int level) {
9494
"Terminates all clipping; optionally append how many clip levels to restore [all].");
9595
GMT_Option (API, "J-Z,R");
9696
GMT_Message (API, GMT_TIME_NONE, "\n OPTIONAL ARGUMENTS:\n");
97-
GMT_Usage (API, 1, "\n-A[m|p|r|t|x|y]");
97+
GMT_Usage (API, 1, "\n-A[x|y]");
9898
GMT_Usage (API, -2, "Suppress drawing geographic line segments as great circle arcs, i.e., draw "
99-
"straight lines instead. Six optional directives instead convert paths to staircase curves:");
100-
GMT_Usage (API, 3, "m: First follow meridians, then parallels when connecting geographic points.");
101-
GMT_Usage (API, 3, "p: First follow parallels, then meridians when connecting geographic point.");
102-
GMT_Usage (API, 3, "r: First follow radius, then theta for staircase curves for Polar projection.");
103-
GMT_Usage (API, 3, "t: First follow theta, then radius for staircase curves for Polar projection.");
104-
GMT_Usage (API, 3, "x: First follow x, then y for staircase curves for Cartesian projections.");
105-
GMT_Usage (API, 3, "y: First follow y, then x for staircase curves for Cartesian projections.");
99+
"straight lines instead. Two optional directives instead convert paths to staircase curves:");
100+
GMT_Usage (API, 3, "x: First follow x, then y for staircase curves.");
101+
GMT_Usage (API, 3, "y: First follow y, then x for staircase curves.");
102+
GMT_Usage (API, -2, "Here, x and y have the following meanings: "
103+
"For Cartesian projections, x and y are the X- and Y-axis; "
104+
"For gragraphic projections, x and y are parallels and meridians; "
105+
"For polar projections, x and y are theta and radius.");
106106
GMT_Option (API, "B-,K");
107107
GMT_Usage (API, 1, "\n-N Use the outside of the polygons and the map boundary as clip paths.");
108108
GMT_Option (API, "O,P");

‎src/psxy.c

+11-10
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343

4444
struct PSXY_CTRL {
4545
bool no_RJ_needed; /* Special case of -T and no -B when -R -J is not required */
46-
struct PSXY_A { /* -A[m|y|p|x|r|t<step>] */
46+
struct PSXY_A { /* -A[x|y]] */
4747
bool active;
4848
unsigned int mode;
4949
double step;
@@ -529,7 +529,7 @@ static int usage (struct GMTAPI_CTRL *API, int level) {
529529
const char *mod_name = &name[4]; /* To skip the leading gmt for usage messages */
530530
if (level == GMT_MODULE_PURPOSE) return (GMT_NOERROR);
531531

532-
GMT_Usage (API, 0, "usage: %s [<table>] %s %s [-A[m|p|r|t|x|y]] [%s] [-C<cpt>] [-D<dx>/<dy>] [%s] [-F%s] [-G<fill>|+z] "
532+
GMT_Usage (API, 0, "usage: %s [<table>] %s %s [-A[x|y]] [%s] [-C<cpt>] [-D<dx>/<dy>] [%s] [-F%s] [-G<fill>|+z] "
533533
"[-H[<scale>]] [-I[<intens>]] %s[%s] [-M[c|s][+g<fill>][+l<seclabel>][+p<pen>][+r[<pen>]][+y[<level>]]] [-N[c|r]] %s%s [-S[<symbol>][<size>]] [%s] [%s] [-W[<pen>][<attr>]] [%s] [%s] "
534534
"[-Z<value>|<file>[+t|T]] [%s] [%s] %s[%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s]\n",
535535
name, GMT_J_OPT, GMT_Rgeoz_OPT, GMT_B_OPT, PSXY_E_OPT, GMT_SEGMENTIZE3, API->K_OPT, PLOT_L_OPT, API->O_OPT, API->P_OPT,
@@ -542,15 +542,15 @@ static int usage (struct GMTAPI_CTRL *API, int level) {
542542
GMT_Message (API, GMT_TIME_NONE, " REQUIRED ARGUMENTS:\n");
543543
GMT_Option (API, "<,J-Z,R");
544544
GMT_Message (API, GMT_TIME_NONE, "\n OPTIONAL ARGUMENTS:\n");
545-
GMT_Usage (API, 1, "\n-A[m|p|r|t|x|y]");
545+
GMT_Usage (API, 1, "\n-A[x|y]");
546546
GMT_Usage (API, -2, "Suppress drawing geographic line segments as great circle arcs, i.e., draw "
547-
"straight lines instead. Six optional directives instead convert paths to staircase curves:");
548-
GMT_Usage (API, 3, "m: First follow meridians, then parallels when connecting geographic points.");
549-
GMT_Usage (API, 3, "p: First follow parallels, then meridians when connecting geographic point.");
550-
GMT_Usage (API, 3, "r: First follow radius, then theta for staircase curves for Polar projection.");
551-
GMT_Usage (API, 3, "t: First follow theta, then radius for staircase curves for Polar projection.");
552-
GMT_Usage (API, 3, "x: First follow x, then y for staircase curves for Cartesian projections.");
553-
GMT_Usage (API, 3, "y: First follow y, then x for staircase curves for Cartesian projections.");
547+
"straight lines instead. Two optional directives instead convert paths to staircase curves:");
548+
GMT_Usage (API, 3, "x: First follow x, then y for staircase curves.");
549+
GMT_Usage (API, 3, "y: First follow y, then x for staircase curves.");
550+
GMT_Usage (API, -2, "Here, x and y have the following meanings: "
551+
"For Cartesian projections, x and y are the X- and Y-axis; "
552+
"For gragraphic projections, x and y are parallels and meridians; "
553+
"For polar projections, x and y are theta and radius.");
554554
GMT_Option (API, "B-");
555555
GMT_Usage (API, 1, "\n-C<cpt>|<color1>,<color2>[,<color3>,...]");
556556
GMT_Usage (API, -2, "Assign symbol colors based on z-value in 3rd column. "
@@ -837,6 +837,7 @@ static int parse (struct GMT_CTRL *GMT, struct PSXY_CTRL *Ctrl, struct GMT_OPTIO
837837

838838
case 'A': /* Turn off draw_arc mode */
839839
n_errors += gmt_M_repeated_module_option (API, Ctrl->A.active);
840+
/* There are 6 optional directives but only x|y are documented since 6.6.0 */
840841
switch (opt->arg[0]) {
841842
case 'm': case 'y': case 'r': Ctrl->A.mode = GMT_STAIRS_Y; break;
842843
case 'p': case 'x': case 't': Ctrl->A.mode = GMT_STAIRS_X; break;

‎src/psxyz.c

+11-10
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
/* Control structure for psxyz */
4141

4242
struct PSXYZ_CTRL {
43-
struct PSXYZ_A { /* -A[m|y|p|x|r|t|step] */
43+
struct PSXYZ_A { /* -A[x|y] */
4444
bool active;
4545
unsigned int mode;
4646
double step;
@@ -173,7 +173,7 @@ static int usage (struct GMTAPI_CTRL *API, int level) {
173173
const char *mod_name = &name[4]; /* To skip the leading gmt for usage messages */
174174
const char *T[2] = {" [-T]", ""};
175175
if (level == GMT_MODULE_PURPOSE) return (GMT_NOERROR);
176-
GMT_Usage (API, 0, "usage: %s [<table>] %s %s [%s] [%s] [-A[m|p|r|t|x|y]] [-C<cpt>] [-D<dx>/<dy>[/<dz>]] [-G<fill>] "
176+
GMT_Usage (API, 0, "usage: %s [<table>] %s %s [%s] [%s] [-A[x|y]] [-C<cpt>] [-D<dx>/<dy>[/<dz>]] [-G<fill>] "
177177
"[-H[<scale>]] [-I[<intens>]] %s [%s] [-N[c|r]] %s %s[-Q] [-S[<symbol>][<size>][/size_y]]%s [%s] [%s] [-W[<pen>][<attr>]] "
178178
"[%s] [%s] [-Z<value>|<file>[+t|T]] [%s] [%s] %s[%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s] [%s]\n",
179179
name, GMT_J_OPT, GMT_Rgeoz_OPT, GMT_B_OPT, GMT_Jz_OPT, API->K_OPT, PLOT_L_OPT, API->O_OPT, API->P_OPT,
@@ -187,15 +187,15 @@ static int usage (struct GMTAPI_CTRL *API, int level) {
187187
GMT_Option (API, "<,J-Z,R3");
188188
GMT_Message (API, GMT_TIME_NONE, "\n OPTIONAL ARGUMENTS:\n");
189189
GMT_Option (API, "B-");
190-
GMT_Usage (API, 1, "\n-A[m|p|r|t|x|y]");
190+
GMT_Usage (API, 1, "\n-A[x|y]");
191191
GMT_Usage (API, -2, "Suppress drawing geographic line segments as great circle arcs, i.e., draw "
192-
"straight lines instead. Six optional directives instead convert paths to staircase curves:");
193-
GMT_Usage (API, 3, "m: First follow meridians, then parallels when connecting geographic points.");
194-
GMT_Usage (API, 3, "p: First follow parallels, then meridians when connecting geographic point.");
195-
GMT_Usage (API, 3, "r: First follow radius, then theta for staircase curves for Polar projection.");
196-
GMT_Usage (API, 3, "t: First follow theta, then radius for staircase curves for Polar projection.");
197-
GMT_Usage (API, 3, "x: First follow x, then y for staircase curves for Cartesian projections.");
198-
GMT_Usage (API, 3, "y: First follow y, then x for staircase curves for Cartesian projections.");
192+
"straight lines instead. Two optional directives instead convert paths to staircase curves:");
193+
GMT_Usage (API, 3, "x: First follow x, then y for staircase curves.");
194+
GMT_Usage (API, 3, "y: First follow y, then x for staircase curves.");
195+
GMT_Usage (API, -2, "Here, x and y have the following meanings: "
196+
"For Cartesian projections, x and y are the X- and Y-axis; "
197+
"For gragraphic projections, x and y are parallels and meridians; "
198+
"For polar projections, x and y are theta and radius.");
199199
GMT_Usage (API, 1, "\n-C<cpt>|<color1>,<color2>[,<color3>,...]");
200200
GMT_Usage (API, -2, "Assign symbol colors based on z-value in 3rd column. "
201201
"Note: requires -S. Without -S, %s excepts lines/polygons "
@@ -422,6 +422,7 @@ static int parse (struct GMT_CTRL *GMT, struct PSXYZ_CTRL *Ctrl, struct GMT_OPTI
422422

423423
case 'A': /* Turn off draw_arc mode */
424424
n_errors += gmt_M_repeated_module_option (API, Ctrl->A.active);
425+
/* There are 6 optional directives but only x|y are documented since 6.6.0 */
425426
switch (opt->arg[0]) {
426427
case 'm': case 'y': case 'r': Ctrl->A.mode = GMT_STAIRS_Y; break;
427428
case 'p': case 'x': case 't': Ctrl->A.mode = GMT_STAIRS_X; break;

‎test/baseline/psxy.dvc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
outs:
2-
- md5: 239f4bd18d38b222c7da4a1fa70bb7aa.dir
2+
- md5: c597478c2dfc51aa340071f73df8731c.dir
33
nfiles: 142
44
path: psxy
55
hash: md5

‎test/psclip/psclip-l2s.sh

+1-5
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,15 @@ b=$m-l2s-b.txt
99
rm -f $a $b ; touch $b
1010

1111
cat << EOF > $a
12-
--l2stranstest -Am -Ap
1312
--l2stranstest -Ax -Ay
14-
--l2stranstest -Ar -At
1513
--l2stranstest -C -C5
1614
--l2stranstest -N
1715
--l2stranstest -T
1816
--l2stranstest -W0.1c,120-1-1
1917
EOF
2018

2119
# module-specific longopts
22-
gmt $m $l2s --straightlines=meridian --steps=parallel >> $b
23-
gmt $m $l2s --straightlines=x --straightlines=y >> $b
24-
gmt $m $l2s --straightlines=r --straightlines=theta >> $b
20+
gmt $m $l2s --straight_lines=x --straight_lines=y >> $b
2521
gmt $m $l2s --endclip --endclip=5 >> $b
2622
gmt $m $l2s --invert >> $b
2723
gmt $m $l2s --clipregion >> $b

‎test/psxy/nojump.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ cat << EOF > t.txt
1212
115 -20
1313
EOF
1414
gmt psxy -R110/215/-27/20 -JM6i t.txt -Wfat,green -Baf -BWSne -A -P -K -Xc > $ps
15-
gmt psxy -R -J t.txt -Wfat,green -Baf -BWSne -Ap -O -K -Y3.15i >> $ps
15+
gmt psxy -R -J t.txt -Wfat,green -Baf -BWSne -Ax -O -K -Y3.15i >> $ps
1616
gmt psxy -R -J t.txt -Wfat,green -Baf -BWSne -O -Y3.15i >> $ps

‎test/psxy/polarcurves.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env bash
2-
# test the -Ar|t line-resampling for polar projections
2+
# test the -Ax|y line-resampling for polar projections
33
cat << EOF > t.txt
44
10 5
55
30 4
@@ -10,11 +10,11 @@ gmt begin polarcurves ps
1010
gmt subplot set 0 -A"No -A"
1111
gmt plot -W2p,red t.txt
1212
gmt plot t.txt -Sc0.2c -Wthin
13-
gmt subplot set 1 -A"-At: @~q@~, then r"
14-
gmt plot -W2p,red -At t.txt
13+
gmt subplot set 1 -A"-Ax: @~q@~, then r"
14+
gmt plot -W2p,red -Ax t.txt
1515
gmt plot t.txt -Sc0.2c -Wthin
16-
gmt subplot set 2 -A"-Ar: r, then @~q@~"
17-
gmt plot -W2p,red -Ar t.txt
16+
gmt subplot set 2 -A"-Ay: r, then @~q@~"
17+
gmt plot -W2p,red -Ay t.txt
1818
gmt plot t.txt -Sc0.2c -Wthin
1919
gmt subplot end
2020
gmt end show

‎test/psxy/psxy-l2s.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ b=$m-l2s-b.txt
99
rm -f $a $b ; touch $b
1010

1111
cat << EOF > $a
12-
--l2stranstest -Am -Ap -Ax
13-
--l2stranstest -Ay -Ar -At
12+
--l2stranstest -Ax
13+
--l2stranstest -Ay
1414
--l2stranstest -Csomecpt -Cred,green,blue -C#22aa33,#ff00ff,#0077ee
1515
--l2stranstest -D -D12/24
1616
--l2stranstest -Ex+a -Ey+A
@@ -30,8 +30,8 @@ cat << EOF > $a
3030
EOF
3131

3232
# module-specific longopts
33-
gmt $m $l2s --straightlines=mpfollow --straightlines=pmfollow --straightlines=xyalong >> $b
34-
gmt $m $l2s --straightlines=yxalong --straightlines=rtalong --straightlines=tralong >> $b
33+
gmt $m $l2s --straight_lines=x >> $b
34+
gmt $m $l2s --straight_lines=y >> $b
3535
gmt $m $l2s --cpt=somecpt --cmap=red,green,blue --cpt=#22aa33,#ff00ff,#0077ee >> $b
3636
gmt $m $l2s --offset --offset=12/24 >> $b
3737
gmt $m $l2s --errorbars=xbar+asymmetrical --errorbars=ybar+lhbounds >> $b

0 commit comments

Comments
 (0)