Merge branch '6.0'

Author: PaulWessel

cmake/ConfigUserTemplate.cmake

@@ -249,24 +249,24 @@
 #set (CMAKE_BUILD_TYPE Debug)
 
 # Extra debugging for developers:
-if ( CMAKE_GENERATOR STREQUAL "Xcode" )
-#	So Xcode can find the supplemental plug-ins during debug sessions
-	add_definitions(-DXCODER)			# Handle a debug plugin directory
-	add_definitions(-DDEBUG_MODERN)			# To set PPID == 0 during Xcode test
-	message("Add Xcode definition for GMT")
-endif()
+#if ( CMAKE_GENERATOR STREQUAL "Xcode" )
+#   #	So Xcode can find the supplemental plug-ins during debug sessions
+#	add_definitions(-DXCODER)			# Handle a debug plugin directory
+#	add_definitions(-DDEBUG_MODERN)			# To set PPID == 0 during Xcode test
+#	message("Add Xcode definition for GMT")
+#endif()
 # Uncomment these two statements if you are a developer debugging GMT:
 #add_definitions(-DDEBUG)
 #add_definitions(-DMEMDEBUG) # Turn on memory tracking see gmt_support.c for extra info
 #set (CMAKE_C_FLAGS "-Wall -Wdeclaration-after-statement") # recommended even for release build
 #set (CMAKE_C_FLAGS "-Wextra ${CMAKE_C_FLAGS}")            # extra warnings
 #set (CMAKE_C_FLAGS_DEBUG -ggdb3)                          # gdb debugging symbols
 #set (CMAKE_LINK_DEPENDS_DEBUG_MODE TRUE)                  # debug link dependencies
-if (HAVE_OPENMP)
-	set (CMAKE_C_FLAGS_RELEASE "-ggdb3 -O2 -Wuninitialized -flax-vector-conversions")  # check uninitialized variables
-else (HAVE_OPENMP)
-	set (CMAKE_C_FLAGS_RELEASE "-ggdb3 -O2 -Wuninitialized")  # check uninitialized variables
-endif (HAVE_OPENMP)
+#if (HAVE_OPENMP)
+#	set (CMAKE_C_FLAGS_RELEASE "-ggdb3 -O2 -Wuninitialized -flax-vector-conversions")  # check uninitialized variables
+#else (HAVE_OPENMP)
+#	set (CMAKE_C_FLAGS_RELEASE "-ggdb3 -O2 -Wuninitialized")  # check uninitialized variables
+#endif (HAVE_OPENMP)
 
 #
 # System specific tweaks

doc/rst/source/colorbar_common.rst_

@@ -30,9 +30,11 @@ Optional Arguments
     the right of a vertical bar), except when using the **+m** modifier of the **-D** option. As an
     option, use the y-axis label to plot the data unit to the right of a
     horizontal bar (and above a vertical bar). If **-B** is omitted, or no annotation intervals are
-    provided, the default is to annotate every color level based on the
+    provided (classic mode only), the default is to annotate every color level based on the
     numerical entries in the CPT (which may be overridden by ULB
-    flags in the CPT). To specify custom text annotations for
+    flags in the CPT). The exception to this rule is for CPT files that were scaled to fit the range
+    of a grid exactly and thus have arbitrary color levels; these will trigger an automatic **-Baf** setting.
+    To specify custom text annotations for
     intervals, you must append ;\ *annotation* to each z-slice in the CPT.
     For standard **-B** operations, see below.
 

doc/rst/source/grd2kml.rst

@@ -54,16 +54,17 @@ Optional Arguments
 
 .. _-C:
 
-**-C**\ *cpt*
-    Name of the color palette table (CPT). Alternatively,
-    supply the name of a GMT color master dynamic CPT [turbo] to
+**-C**\ [*cpt* \|\ *master*\ [**+i**\ *zinc*] \|\ *color1,color2*\ [,\ *color3*\ ,...]]
+    Name of the CPT (for *grd_z* only). Alternatively,
+    supply the name of a GMT color master dynamic CPT [turbo, but geo
+    for @earth_relief and srtm for @srtm_relief data] to
     automatically determine a continuous CPT from
-    the grid's z-range.  If the dynamic CPT has a default range then
-    that range will be imposed instead.
-    Another option is to specify **-C**\ *color1*\ ,\ *color2*\ [,\ *color3*\ ,...]
-    to build a linear continuous CPT from those colors automatically, scaled to fit the data range.
-    In this case *color1*, etc., can be a *r/g/b* triplet, a color name,
-    or an HTML hexadecimal color (e.g. #aabbcc ).
+    the grid's z-range; you may round up/down the z-range by adding **+i**\ *zinc*.
+    Yet another option is to specify **-C**\ *color1*\ ,\ *color2*\ [,\ *color3*\ ,...]
+    to build a linear continuous CPT from those colors automatically.
+    In this case *color1* etc can be a r/g/b triplet, a color name,
+    or an HTML hexadecimal color (e.g. #aabbcc ).  If no argument is given to **-C**
+    then under modern mode we select the current CPT.
 
 .. _-E:
 

doc/rst/source/grdcontour_common.rst_

@@ -127,7 +127,7 @@ Optional Arguments
     (see `Units`_ for available units and how distances are computed),
     including **c** (Cartesian distances using user coordinates) or **C** for plot
     length units in current plot units after projecting the coordinates.
-    Optionally, append **z** to exclude the zero contour.
+    Optionally, append **+z** to exclude the zero contour.
 
 .. _-R:
 

doc/rst/source/psternary.rst

@@ -14,7 +14,7 @@ Synopsis
 
 **gmt psternary** [ *table* ]
 [ **-JX**\ *width*\ [unit] ]
-[ |SYN_OPT-Rz| ]
+[ |-R|\ *amin/amax/bmin/bmax/cmin/cmax* ]
 [ |SYN_OPT-B| ]
 [ |-C|\ *cpt* ]
 [ |-G|\ *fill* ]
@@ -29,7 +29,6 @@ Synopsis
 [ |-W|\ [*pen*][*attr*] ]
 [ |SYN_OPT-X| ]
 [ |SYN_OPT-Y| ]
-[ |SYN_OPT-a| ]
 [ |SYN_OPT-bi| ]
 [ |SYN_OPT-di| ]
 [ |SYN_OPT-e| ]
@@ -53,14 +52,12 @@ Examples
 
 To plot circles (diameter = 0.1 cm) on a 6-inch-wide ternary diagram at the positions listed
 in the file ternary.txt, with default annotations and gridline spacings, using the
-specified labeling, tru
-
-   ::
-
-    gmt psternary ternary.txt -R0/100/0/100/0/100 -JX6i -P -Xc -Baafg+l"Water component"+u" %" \
-    -Bbafg+l"Air component"+u" %" -Bcagf+l"Limestone component"+u" %" \
-    -B+givory+t"Example data from MATLAB Central" -Sc0.1c -Ct.cpt -Y2i -LWater/Air/Limestone > map.ps
+specified labeling, try::
 
+    gmt makecpt -Cturbo -T0/80/10 > t.cpt
+    gmt psternary @ternary.txt -R0/100/0/100/0/100 -JX6i -P -Sc0.1c -Ct.cpt -LWater/Air/Limestone \
+        -Baafg+l"Water component"+u" %" -Bbafg+l"Air component"+u" %" -Bcagf+l"Limestone component"+u" %" \
+        -B+givory+t"Example data from MATLAB Central" > map.ps
 
 See Also
 --------

doc/rst/source/ternary.rst

@@ -14,7 +14,7 @@ Synopsis
 
 **gmt ternary** [ *table* ]
 [ **-JX**\ *width*\ [unit] ]
-[ |SYN_OPT-Rz| ]
+[ |-R|\ *amin/amax/bmin/bmax/cmin/cmax* ]
 [ |SYN_OPT-B| ]
 [ |-C|\ *cpt* ]
 [ |-G|\ *fill* ]
@@ -27,7 +27,6 @@ Synopsis
 [ |-W|\ [*pen*][*attr*] ]
 [ |SYN_OPT-X| ]
 [ |SYN_OPT-Y| ]
-[ |SYN_OPT-a| ]
 [ |SYN_OPT-bi| ]
 [ |SYN_OPT-di| ]
 [ |SYN_OPT-e| ]
@@ -45,18 +44,16 @@ Synopsis
 Examples
 --------
 
-.. include:: explain_example.rst_
-
-.. include:: oneliner_info.rst_
-
 To plot circles (diameter = 0.1 cm) on a 6-inch-wide ternary diagram at the positions listed
 in the file ternary.txt, with default annotations and gridline spacings, using the
 specified labeling, try::
 
-    gmt ternary ternary.txt -R0/100/0/100/0/100 -JX6i -Xc -Baafg+l"Water component"+u" %" \
-        -Bbafg+l"Air component"+u" %" -Bcagf+l"Limestone component"+u" %" \
-        -B+givory+t"Example data from MATLAB Central" -Sc0.1c -Ct.cpt -Y2i -LWater/Air/Limestone -pdf map
-
+    gmt begin map
+    gmt makecpt -Cturbo -T0/80/10
+    gmt ternary @ternary.txt -R0/100/0/100/0/100 -JX6i -Sc0.1c -C -LWater/Air/Limestone \
+        -Baafg+l"Water component"+u" %" -Bbafg+l"Air component"+u" %" -Bcagf+l"Limestone component"+u" %" \
+        -B+givory+t"Example data from MATLAB Central"
+    gmt end show
 
 See Also
 --------

doc/rst/source/ternary_common.rst_

@@ -19,7 +19,7 @@ Either **-M** (for dumping data) or **-R** and **-J** must be selected.
 Optional Arguments
 ------------------
 
-.. |Add_intables| replace:: Use **-T** to ignore all input files, including standard input (see below).
+.. |Add_intables| unicode:: 0x20 .. just an invisible code
 .. include:: explain_intables.rst_
 
 .. _-B:
@@ -105,8 +105,6 @@ Optional Arguments
 .. |Add_-bi| replace:: [Default is the required number of columns given the chosen settings].
 .. include:: explain_-bi.rst_
 
-.. include:: explain_-aspatial.rst_
-
 .. |Add_-di| unicode:: 0x20 .. just an invisible code
 .. include:: explain_-di.rst_
 

doc/scripts/GMT_App_P_1.ps

@@ -15850,6 +15850,18 @@ GMT_LOCAL bool check_if_autosize (struct GMTAPI_CTRL *API, int ID) {
 	return false;
 }
 
+GMT_LOCAL bool A_was_given (char *text) {
+	/* Determine if A is one of the arguments */
+	size_t k = 1;
+	if (!text || !text[0]) return false;	/* No args means -A was not given */
+	if (text[0] == 'A') return true;	/* A was given as first option */
+	while (text[k]) {
+		if (text[k] == 'A' && text[k-1] == ',') return true;	/* Found A as first letter after comma */
+		k++;
+	}
+	return false;
+}
+
 GMT_LOCAL int process_figures (struct GMTAPI_CTRL *API, char *show) {
 	/* Loop over all registered figures and their selected formats and
 	 * convert the hidden PostScript figures to selected graphics.
@@ -15937,7 +15949,7 @@ GMT_LOCAL int process_figures (struct GMTAPI_CTRL *API, char *show) {
 						if (p[0] == 'D') strcpy (dir, &p[1]);	/* Needed in show */
 					}
 				}
-				if (not_PS && auto_size && strchr (fig[k].options, 'A') == NULL)	/* Must always add -A if not PostScript unless when media size is given, unless crop is off via +n */
+				if (not_PS && auto_size && !A_was_given (fig[k].options))	/* Must always add -A if not PostScript unless when media size is given, unless crop is off via +n */
 					strcat (cmd, " -A");
 			}
 			else if (API->GMT->current.setting.ps_convert[0]) {	/* Supply chosen session settings for psconvert */
@@ -15950,7 +15962,7 @@ GMT_LOCAL int process_figures (struct GMTAPI_CTRL *API, char *show) {
 						if (p[0] == 'D') strcpy (dir, &p[1]);	/* Needed in show */
 					}
 				}
-				if (not_PS && auto_size && strchr (API->GMT->current.setting.ps_convert, 'A') == NULL)	/* Must always add -A if not PostScript unless when media size is given */
+				if (not_PS && auto_size && !A_was_given (API->GMT->current.setting.ps_convert))	/* Must always add -A if not PostScript unless when media size is given */
 					strcat (cmd, " -A");
 			}
 			else if (not_PS && auto_size) /* No specific settings but must always add -A if not PostScript unless when media size is given */

doc/scripts/GMT_App_P_1.sh

@@ -7170,9 +7170,9 @@ struct GMT_PALETTE * gmtlib_read_cpt (struct GMT_CTRL *GMT, void *source, unsign
 	 * GMT_CPT_EXTEND_BNF = Make B and F equal to low and high color
 	 */
 
-	unsigned int n = 0, i, nread, annot, id, n_cat_records = 0, color_model, n_master = 0;
+	unsigned int n = 0, i, nread, annot, id, n_cat_records = 0, color_model;
 	size_t k;
-	bool gap, overlap, error = false, close_file = false, check_headers = true, master = false;
+	bool gap, overlap, error = false, close_file = false, check_headers = true;
 	size_t n_alloc = GMT_SMALL_CHUNK, n_hdr_alloc = 0;
 	double dz;
 	char T0[GMT_LEN64] = {""}, T1[GMT_LEN64] = {""}, T2[GMT_LEN64] = {""}, T3[GMT_LEN64] = {""}, T4[GMT_LEN64] = {""};
@@ -7181,6 +7181,7 @@ struct GMT_PALETTE * gmtlib_read_cpt (struct GMT_CTRL *GMT, void *source, unsign
 	char *name = NULL, *h = NULL;
 	FILE *fp = NULL;
 	struct GMT_PALETTE *X = NULL;
+	struct GMT_PALETTE_HIDDEN *XH = NULL;
 	struct CPT_Z_SCALE *Z = NULL;	/* For unit manipulations */
 
 	/* Determine input source */
@@ -7231,7 +7232,7 @@ struct GMT_PALETTE * gmtlib_read_cpt (struct GMT_CTRL *GMT, void *source, unsign
 	color_model = GMT->current.setting.color_model;		/* Save the original setting since it may be modified by settings in the CPT */
 	/* Also: GMT->current.setting.color_model is used in some rgb_to_xxx functions so it must be set if changed by cpt */
 	X->is_gray = X->is_bw = true;	/* May be changed when reading the actual colors */
-
+	XH = gmt_get_C_hidden (X);
 	/* Set default BFN colors; these may be overwritten by things in the CPT */
 	for (id = 0; id < 3; id++) {
 		gmt_M_rgb_copy (X->bfn[id].rgb, GMT->current.setting.color_patch[id]);
@@ -7290,17 +7291,14 @@ struct GMT_PALETTE * gmtlib_read_cpt (struct GMT_CTRL *GMT, void *source, unsign
 		}
 		else if ((h = strstr (line, "CYCLIC")))	/* CPT should wrap around */
 			X->is_wrapping = 1;
+		else if ((h = strstr (line, "ENABLE_B_OPTION")))	/* CPT was stretched to exact min/max with no dz rounding */
+			XH->auto_scale = 1;
 
 		GMT->current.setting.color_model = X->model;
 
 		if (c == '#') {	/* Possibly a header/comment record */
 			if (GMT->common.h.mode == GMT_COMMENT_IS_RESET) continue;	/* Simplest way to replace headers on output is to ignore them on input */
 			if (!check_headers) continue;	/* Done with the initial header records */
-			if (strstr (line, "$Id:")) master = true;
-			if (master) {
-				n_master++;
-				if (n_master <= 2) continue;	/* Skip first 2 lines of GMT master CPTs */
-			}
 			if (n_hdr_alloc == 0) X->header = gmt_M_memory (GMT, X->header, (n_hdr_alloc = GMT_TINY_CHUNK), char *);
 			X->header[X->n_headers] = strdup (line);
 			X->n_headers++;
@@ -7763,6 +7761,7 @@ struct GMT_PALETTE *gmt_get_palette (struct GMT_CTRL *GMT, char *file, enum GMT_
 	if (is_cpt_master) {	/* Take master cpt and stretch to fit data range using continuous colors */
 		char *master = NULL, *current_cpt = NULL;
 		double noise;
+		struct GMT_PALETTE_HIDDEN *PH = NULL;
 
 		if (gmt_M_is_dnan (zmin) || gmt_M_is_dnan (zmax)) {	/* Safety valve 1 */
 			GMT_Report (GMT->parent, GMT_MSG_NORMAL, "Passing zmax or zmin == NaN prevents automatic CPT generation!\n");
@@ -7794,6 +7793,8 @@ struct GMT_PALETTE *gmt_get_palette (struct GMT_CTRL *GMT, char *file, enum GMT_
 			zmax = (ceil (zmax / dz) * dz);
 			GMT_Report (GMT->parent, GMT_MSG_LONG_VERBOSE, "Auto-stretching CPT file %s to fit rounded data range %g to %g\n", master, zmin, zmax);
 		}
+		PH = gmt_get_C_hidden (P);
+		PH->auto_scale = 1;	/* Flag for colorbar to supply -Baf if not given */
 		gmt_stretch_cpt (GMT, P, zmin, zmax);
 		gmt_save_current_cpt (GMT, P, 0);	/* Save for use by session, if modern */
 	}
@@ -8211,6 +8212,7 @@ int gmtlib_write_cpt (struct GMT_CTRL *GMT, void *dest, unsigned int dest_type,
 	static char *msg1[2] = {"Writing", "Appending"};
 	FILE *fp = NULL;
 	struct CPT_Z_SCALE *Z = NULL;	/* For unit manipulations */
+	struct GMT_PALETTE_HIDDEN *PH = NULL;
 
 	/* When writing the CPT to file it is no longer a normalized CPT with a hinge */
 	P->has_range = P->has_hinge = 0;
@@ -8259,6 +8261,8 @@ int gmtlib_write_cpt (struct GMT_CTRL *GMT, void *dest, unsigned int dest_type,
 	}
 	GMT_Report (GMT->parent, GMT_MSG_DEBUG, "%s CPT to %s\n", msg1[append], &cpt_file[append]);
 
+	PH = gmt_get_C_hidden (P);
+
 	/* Start writing CPT info to fp */
 
 	for (i = 0; i < P->n_headers; i++) {	/* First write the old headers */
@@ -8280,6 +8284,8 @@ int gmtlib_write_cpt (struct GMT_CTRL *GMT, void *dest, unsigned int dest_type,
 	}
 	if (P->is_wrapping)
 		fprintf (fp, "# CYCLIC\n");
+	if (PH->auto_scale)
+		fprintf (fp, "# ENABLE_B_OPTION\n");
 
 	sprintf (format, "%%s\t%%s%%c");
 

doc/scripts/GMT_App_P_2.ps

@@ -1,6 +1,6 @@
 /*--------------------------------------------------------------------
  *
- *	Copyright (c) 1991-$year by the GMT Team (https://www.generic-mapping-tools.org/team.html)
+ *	Copyright (c) 1991-2019 by the GMT Team (https://www.generic-mapping-tools.org/team.html)
  *	See LICENSE.TXT file for copying and redistribution conditions.
  *
  *	This program is free software; you can redistribute it and/or modify

doc/scripts/GMT_App_P_2.sh

@@ -75,7 +75,7 @@ home=`pwd`
 if [ ! -f "$home/.gmtversions" ]; then	# No .gmtversions exists yet, first do that part
   cat << EOF >&2
 
-GMTSWITCH $Revision$
+GMTSWITCH
 
 gmtswitch helps you modify your environment to allow for the switching back and
 forth between several GMT versions, in particular GMT 5 and previous GMT