plot/plot3d/clip: Simplify the -A syntax to -Ax|y (#8674)

Author: seisman

doc/rst/source/clip.rst

@@ -14,7 +14,7 @@ Synopsis
 
 **gmt clip** [ *table* ] |-J|\ *parameters* |-C|\ [*n*]
 |SYN_OPT-Rz|
-[ |-A|\ [**m**\|\ **p**\|\ **x**\|\ **y**\|\ **r**\|\ **t**] ]
+[ |-A|\ [**x**\|\ **y**] ]
 [ |SYN_OPT-B| ]
 |-J|\ **z**\|\ **Z**\ *parameters* ]
 [ |-N| ]
@@ -89,16 +89,20 @@ Optional Arguments
 
 .. _-A:
 
-**-A**\ [**m**\|\ **p**\|\ **x**\|\ **y**\|\ **r**\|\ **t**]
-    By default, geographic line segments are connected as great circle arcs. To connect them as
-    straight lines, use the |-A| flag. Alternatively, add **m** to connect
-    the line by first following a meridian, then a parallel. Or append **p**
-    to start following a parallel, then a meridian. (This can be practical
-    to connect lines along parallels, for example).
-    For Cartesian data, points are simply connected, unless you append
-    **x** or **y** to construct stair-case paths whose first move is along
-    *x* or *y*, respectively. For polar projection, append **r** or **t** to
-    draw stair-case curves that whose first move is along *r* or *theta*, respectively.
+**-A**\ [**x**\|\ **y**]
+    By default, geographic line segments are connected as great circle arcs by resampling
+    coarse input data along such arcs. To disable this sampling and connect them as
+    straight lines, use the |-A| flag. For Cartesian data, points are simply connected.
+    To adjust these behaviors, append a directive:
+
+    - **x** - First follow *x*, then *y* for staircase curves.
+    - **y** - First follow *y*, then *x* for staircase curves.
+
+    Here, *x* and *y* have the following meanings:
+
+    - For Cartesian projections, *x* and *y* are the X- and Y-axis.
+    - For gragraphic projections, *x* and *y* are parallels and meridians.
+    - For polar projections, *x* and *y* are theta and radius.
 
 .. |Add_-B| replace:: |Add_-B_links|
 .. include:: explain_-B.rst_

doc/rst/source/explain_line_draw.rst_

@@ -1,15 +1,16 @@
-**-A**\ [**m**\|\ **p**\|\ **x**\|\ **y**\|\ **r**\|\ **t**]
+**-A**\ [**x**\|\ **y**]
     By default, geographic line segments are drawn as great circle arcs by resampling
     coarse input data along such arcs. To disable this sampling and draw them as
     straight lines, use the |-A| flag.  For Cartesian data, points are simply connected.
     To adjust these behaviors, append a directive:
 
-    - **m** - Draw the line by first following a meridian, then a parallel.
-    - **p** - Start following a parallel, then a meridian. (This can be practical
-      to draw a line along parallels, for example).
-    - **r** - For polar projections, draw stair-case curves whose first move is along *r*.
-    - **t** - Same, but first move is along *theta*.
-    - **x** - For Cartesian data, draw stair-case curves that whose first move is along *x*.
-    - **y** - Same, but first move is along *y*.
+    - **x** - First follow *x*, then *y* for staircase curves.
+    - **y** - First follow *y*, then *x* for staircase curves.
+
+    Here, *x* and *y* have the following meanings:
+
+    - For Cartesian projections, *x* and *y* are the X- and Y-axis.
+    - For gragraphic projections, *x* and *y* are parallels and meridians.
+    - For polar projections, *x* and *y* are theta and radius.
 
     **Note**: In :doc:`plot3d`, the |-A| option requires constant *z*-coordinates.

doc/rst/source/plot.rst

@@ -14,7 +14,7 @@ Synopsis
 
 **gmt plot** [ *table* ] |-J|\ *parameters*
 |SYN_OPT-Rz|
-[ |-A|\ [**m**\|\ **p**\|\ **x**\|\ **y**\|\ **r**\|\ **t**] ]
+[ |-A|\ [**x**\|\ **y**] ]
 [ |SYN_OPT-B| ]
 [ |-C|\ *cpt* ]
 [ |-D|\ *dx*\ [/*dy*] ]
@@ -249,13 +249,13 @@ Optional Arguments
       as column 2 (i.e., third) in any number of files having three columns. Each file may
       contain any number of segments per file.
     - **s** - Same but the two curves are given via separate pairs of tables [Default].
-    
+
     Several modifiers are at your disposal:
 
     - **+g** - We use the *fill* set via |-G| to fill the areas where :math:`y_0(x)` exceeds
-      :math:`y_1(x)`. For the opposite case, append another *fill* here.  
+      :math:`y_1(x)`. For the opposite case, append another *fill* here.
     - **+l** - For the primary curve :math:`y_0(x)`, a legend label can be set via option
-      |SYN_OPT-l|. For a secondary label use this modifier to append the label.  
+      |SYN_OPT-l|. For a secondary label use this modifier to append the label.
     - **+p** - Specify a separate pen for drawing curve :math:`y_1(x)` [Default is same pen
       as :math:`y_0(x)`]. See |-W| for specifying the pen for curve :math:`y_0(x)`.
     - **+r** - Specify a pen to simply draw a line instead of a filled box in the legend, but
@@ -309,7 +309,7 @@ Optional Arguments
     *width* = 0.25p, *color* = black, *style* = solid]. Modifiers can be used to change the
     appearance of the line:
 
-    - **+c** - Determine how the color from the cpt file lookup is applied to symbol 
+    - **+c** - Determine how the color from the cpt file lookup is applied to symbol
       and|or fill.  Append **l** to have the color of the line to be taken from the CPT (see
       |-C|). If instead **f** is appended then the color from the cpt file is applied
       to symbol fill.  If no argument is given the we use the color for both pen and fill.

doc/rst/source/plot3d.rst

@@ -15,7 +15,7 @@ Synopsis
 **gmt plot3d** [ *table* ] |-J|\ *parameters*
 |-Jz|\ \|\ **Z**\ *parameters*
 |SYN_OPT-Rz|
-[ |-A|\ [**m**\|\ **p**\|\ **x**\|\ **y**\|\ **r**\|\ **t**] ]
+[ |-A|\ [**x**\|\ **y**] ]
 [ |SYN_OPT-B| ]
 [ |-C|\ *cpt* ]
 [ |-D|\ *dx*/*dy*\ [/*dz*] ]
@@ -211,7 +211,7 @@ Optional Arguments
     *width* = 0.25p, *color* = black, *style* = solid]. Modifiers can be used to change the
     appearance of the line:
 
-    - **+c** - Determine how the color from the cpt file lookup is applied to symbol 
+    - **+c** - Determine how the color from the cpt file lookup is applied to symbol
       and|or fill.  Append **l** to have the color of the line to be taken from the CPT (see
       |-C|). If instead **f** is appended then the color from the cpt file is applied
       to symbol fill.  If no argument is given the we use the color for both pen and fill.

doc/rst/source/psclip.rst

@@ -14,7 +14,7 @@ Synopsis
 
 **gmt psclip** [ *table* ] |-J|\ *parameters* |-C|\ [*n*]
 |SYN_OPT-Rz|
-[ |-A|\ [**m**\|\ **p**\|\ **x**\|\ **y**\|\ **r**\|\ **t**] ]
+[ |-A|\ [**x**\|\ **y**] ]
 [ |SYN_OPT-B| ]
 [ |-K| ] [ |-N| ] [ |-O| ]
 [ |-P| ] [ |-T| ]

doc/rst/source/psxy.rst

@@ -14,7 +14,7 @@ Synopsis
 
 **gmt psxy** [ *table* ] |-J|\ *parameters*
 |SYN_OPT-Rz|
-[ |-A|\ [**m**\|\ **p**\|\ **x**\|\ **y**\|\ **r**\|\ **t**] ]
+[ |-A|\ [**x**\|\ **y**] ]
 [ |SYN_OPT-B| ]
 [ |-C|\ *cpt* ]
 [ |-D|\ *dx*/*dy* ]

doc/rst/source/psxyz.rst

@@ -15,7 +15,7 @@ Synopsis
 **gmt psxyz** [ *table* ] |-J|\ *parameters*
 |-J|\ **z**\|\ **Z**\ *parameters*
 |SYN_OPT-Rz|
-[ |-A|\ [**m**\|\ **p**\|\ **x**\|\ **y**\|\ **r**\|\ **t**] ]
+[ |-A|\ [**x**\|\ **y**] ]
 [ |SYN_OPT-B| ]
 [ |-C|\ *cpt* ]
 [ |-D|\ *dx*/*dy*\ [/*dz*] ]

src/longopt/psclip_inc.h

@@ -25,8 +25,8 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = {
 		  short_directives,    long_directives,
 		  short_modifiers,     long_modifiers,
 		  transproc_mask */
-	{ 0, 'A', "straightlines|steps",
-	          "m,p,x,y,r,t",       "meridian,parallel,x,y,r,theta",
+	{ 0, 'A', "steps|stairs|straight_lines",
+	          "x,y",               "x,y",
 	          "",                  "",
 		  GMT_TP_STANDARD },
 	{ 0, 'C', "endclip",    "", "", "", "", GMT_TP_STANDARD },

src/longopt/psxy_inc.h

@@ -25,8 +25,8 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = { /* Local options for this m
 		  short_directives,    long_directives,
 		  short_modifiers,     long_modifiers,
 		  transproc_mask */
-	{ 0, 'A', "straightlines",
-	          "m,p,x,y,r,t",             "mpfollow,pmfollow,xyalong,yxalong,rtalong,tralong",
+	{ 0, 'A', "steps|stairs|straight_lines",
+	          "x,y",                     "x,y",
 	          "",                        "",
 		  GMT_TP_STANDARD },
 	GMT_C_CPT_KW,

src/longopt/psxyz_inc.h

@@ -25,8 +25,8 @@ static struct GMT_KEYWORD_DICTIONARY module_kw[] = {
 		  short_directives,    long_directives,
 		  short_modifiers,     long_modifiers,
 		  transproc_mask */
-	{ 0, 'A', "straightlines|straight_lines|straight_line",
-	          "m,p,x,y,r,t",       "mpfollow,pmfollow,xyalong,yxalong,rtalong,tralong",
+	{ 0, 'A', "steps|stairs|straight_lines",
+	          "x,y",               "x,y",
 	          "",                  "",
 		  GMT_TP_STANDARD },
 	GMT_C_CPT_KW,