Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg · Bas Couwenberg
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -229,7 +229,7 @@ Open a command prompt, and install vcpkg with:

 After installing vcpkg, you can install the GMT dependency libraries with (it may take more than 30 minutes):

-    # Build and insatll libraries
+    # Build and install libraries
    # If you want to build x64 libraries (recommended)
    vcpkg install netcdf-c gdal pcre fftw3 clapack openblas --triplet x64-windows

@@ -436,12 +436,12 @@ cmake --build . --target gmt_release_tar  # create tarballs (in tar.gz and tar.x

 Currently, packaging with CPack works on macOS (Bundle, TGZ, TBZ2),
 Windows (ZIP, NSIS), and UNIX (TGZ, TBZ2). On Windows you need to install
-[NSIS](http://nsis.sourceforge.net/). After building GMT and the documentation
+[NSIS](http://nsis.sourceforge.net/). After building GMT and the documentation,
 build and place the executables, including the supplements, with

-...
+```
 cmake --build . --target install
-...
+```

 and then create the package with either one of these:


--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -90,7 +90,6 @@ if (DO_EXAMPLES OR DO_TESTS AND NOT GRAPHICSMAGICK)
 endif (DO_EXAMPLES OR DO_TESTS AND NOT GRAPHICSMAGICK)

 # Add subdirectories
-#set(_manfiles_ps "" CACHE INTERNAL "Global list of PS manpages")
 add_subdirectory (src)
 add_subdirectory (share)      # share must be processed *after* src (GSHHG_PATH)
 add_subdirectory (doc)        # doc must be processed *after* src (PDF manpages)
@@ -108,6 +107,7 @@ if (GIT_FOUND AND HAVE_GIT_VERSION)
 	add_custom_target (git_prune_dirs
 		COMMAND ${CMAKE_COMMAND} -E remove_directory ${GMT_RELEASE_PREFIX}/.git
 		COMMAND ${CMAKE_COMMAND} -E remove_directory ${GMT_RELEASE_PREFIX}/.github
+		COMMAND ${CMAKE_COMMAND} -E remove_directory ${GMT_RELEASE_PREFIX}/admin
 		COMMAND ${CMAKE_COMMAND} -E remove_directory ${GMT_RELEASE_PREFIX}/ci
 		COMMAND ${CMAKE_COMMAND} -E remove_directory ${GMT_RELEASE_PREFIX}/test)
 	add_custom_target (git_prune_files

--- a/INSTALL.md
+++ b/INSTALL.md
@@ -69,14 +69,18 @@ You can use the [conda package manager](https://conda.io/) that comes with the

 ### Standalone Installer

-Application bundle is available from from the [GMT main site](https://www.generic-mapping-tools.org).
+Application bundle is available from the [GMT main site](https://www.generic-mapping-tools.org).
 Download the application bundle (gmt-6.x.x-darwin-x86_64.dmg)
 and drag GMT-6.x.x.app to any folder. This bundle includes a self contained GMT installation.
 GMT-6.x.x.app opens a terminal from which you can invoke GMT programs and scripts.
 If you like, you can add the GMT programs contained in the application bundle to
-your search path for executables. For that, just run GMT.app once and type:
+your search path for executables. For that, just run GMT-6.x.x.app once and type:

-    echo ${PATH%%:*}
+    dirname `which gmt`
+
+or:
+
+    echo ${BUNDLE_RESOURCES}/bin

 in the terminal. Then prepend this directory to your PATH environment variable,
 e.g., in `~/.bashrc`. Note: The installer is always built for the latest macOS version only.

--- a/cmake/ConfigDefault.cmake
+++ b/cmake/ConfigDefault.cmake
@@ -42,7 +42,7 @@ set (GMT_PACKAGE_VERSION_MAJOR 6)
 set (GMT_PACKAGE_VERSION_MINOR 0)
 set (GMT_PACKAGE_VERSION_PATCH 0)
 # If this is a beta version or similar, add a string suffix
-set (GMT_PACKAGE_VERSION_SUFFIX "rc1")
+set (GMT_PACKAGE_VERSION_SUFFIX "rc2")

 # Whether to make a public release.
 # When making internal releases or just an ordinary developer build, it is set to FALSE.

--- a/cmake/dist/CMakeLists.txt
+++ b/cmake/dist/CMakeLists.txt
@@ -34,45 +34,12 @@ endif (NOT DEFINED CPACK_PACKAGE_INSTALL_DIRECTORY)
 set (CPACK_PACKAGE_DESCRIPTION_FILE
 	"${CMAKE_CURRENT_SOURCE_DIR}/cpack_package_description.txt")

-if (GMT_BUNDLE_ACCEPT_BUTTON AND FALSE)
-	# A license with an accept button will only be displayed if
-	# GMT_BUNDLE_ACCEPT_BUTTON is set.
-	set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}/COPYING.COMBINED")
-
-	# Read GPL and LGPL license files
-	file(READ ${COPYING_GPL} _license_gpl)
-	file(READ ${COPYING_LGPL} _license_lgpl)
-
-	set (_license_extra)
-	if (NOT LICENSE_RESTRICTED)
-		# Read extra license files
-		foreach (_license_file ${GMT_EXTRA_LICENSE_FILES})
-			file(READ ${_license_file} _license_string)
-			set (_license_extra
-				"${_license_extra}\n---------------------------------------------------------------------------\n\n${_license_string}")
-		endforeach (_license_file ${GMT_EXTRA_LICENSE_FILES})
-
-		# Copy combined license template
-		execute_process(COMMAND ${CMAKE_COMMAND} -E copy
-			${CMAKE_CURRENT_SOURCE_DIR}/COPYING.RESTRICTED.template
-			${CMAKE_CURRENT_BINARY_DIR}/COPYING.COMBINED)
-	else (NOT LICENSE_RESTRICTED)
-		# Clear contents of license file if it exists
-		execute_process(COMMAND ${CMAKE_COMMAND} -E remove -f
-			${CMAKE_CURRENT_BINARY_DIR}/COPYING.COMBINED)
-	endif (NOT LICENSE_RESTRICTED)
-
-	# Append GPL, LGPL, and licenses from GMT_EXTRA_LICENSE_FILES
-	set (_license_combined "${_license_gpl}")
-	if (NOT LICENSE_RESTRICTED STREQUAL GPL)
-		set (_license_combined
-			"${_license_combined}\n---------------------------------------------------------------------------\n\n${_license_lgpl}")
-	endif (NOT LICENSE_RESTRICTED STREQUAL GPL)
-	set (_license_combined "${_license_combined}\n${_license_extra}")
-
-	# Append to COPYING.COMBINED or create new combined license file
-	file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/COPYING.COMBINED "${_license_combined}")
-endif (GMT_BUNDLE_ACCEPT_BUTTON AND FALSE)
+if (WIN32)
+    set (CPACK_PACKAGE_FILE_NAME "gmt-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}")
+endif (WIN32)
+if (APPLE)
+    set (CPACK_PACKAGE_FILE_NAME "gmt-${CPACK_PACKAGE_VERSION}-darwin-x86_64")
+endif (APPLE)

 # Install components:
 set (CPACK_COMPONENTS_ALL Runtime Documentation DCW GSHHG GDALDATA)
@@ -98,8 +65,8 @@ set (CPACK_COMPONENT_GSHHG_INSTALL_TYPES Full)
 set (CPACK_COMPONENT_DCW_INSTALL_TYPES Full)
 set (CPACK_COMPONENT_GDALDATA_INSTALL_TYPES Full)

-# One package per COMPONENT:
-set(CPACK_COMPONENTS_GROUPING "IGNORE")
+# Creates a single package with all (requested) components
+set (CPACK_COMPONENTS_GROUPING "ALL_COMPONENTS_IN_ONE")

 # Enable component install for archive generators:
 set (CPACK_ARCHIVE_COMPONENT_INSTALL ON)

--- a/cmake/dist/COPYING.RESTRICTED.template
+++ b/cmake/dist/COPYING.RESTRICTED.template
-GMT is distributed under the GNU Lesser General Public License
-(LGPL) version 3 or later. Copies of the The GNU General Public
-License (GPL) and the GNU Lesser General Public License (LGPL) are
-distributed along with this package and are printed below.
-
-NOTE: This package uses code that is distributed under a
-proprietary non-permissive license. Refer to the additional
-license terms below.
-
------------------------------------------------------------------
-
-
--- a/debian/changelog
+++ b/debian/changelog
+gmt (6.0.0~rc2+dfsg-1~exp1) experimental; urgency=medium
+
+  * New upstream release candidate.
+  * Refresh patches.
+  * Update symbols for 6.0.0~rc2.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Thu, 04 Jul 2019 06:18:13 +0200
+
 gmt (6.0.0~rc1+dfsg-1~exp1) experimental; urgency=medium

  * New upstream release candidate.

--- a/debian/libgmt6.symbols
+++ b/debian/libgmt6.symbols
@@ -230,15 +230,19 @@ libgmt.so.6 #PACKAGE# #MINVER#
 api_get_record_fp_sub@Base 6.0.0~rc1
 api_get_record_matrix@Base 6.0.0~rc1
 api_get_record_vector@Base 6.0.0~rc1
+ cleanup_action@Base 6.0.0~rc2
 close_files@Base 6.0.0~rc1
+ default_action@Base 6.0.0~rc2
 dlopen_special@Base 5.1.2
 doubleAlmostEqualUlps@Base 5.1.2
 doubleAlmostEqualUlpsAndAbs@Base 5.1.2
 file_rewind@Base 5.3.1
+ file_to_delete_if_ctrl_C@Base 6.0.0~rc2
 find_quad_above@Base 6.0.0~rc1
 floatAlmostEqualUlps@Base 5.1.2
 floatAlmostEqualUlpsAndAbs@Base 5.1.2
 get_attrib_from_string@Base 5.3.1
+ get_session_name_and_format@Base 6.0.0~rc2
 gmt_BB_clip_on@Base 6.0.0~rc1
 gmt_BC_init@Base 5.3.1
 gmt_DCW_free@Base 5.3.1

--- a/debian/patches/disable-triangle.patch
+++ b/debian/patches/disable-triangle.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed

 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -326,16 +326,16 @@ if (DO_API_TESTS)
+@@ -333,16 +333,16 @@ if (DO_API_TESTS)
 		test_walter.c testapi_usergrid.c testapi_userdataset.c testapi_uservectors.c)
 endif (DO_API_TESTS)
 
@@ -29,7 +29,7 @@ Forwarded: not-needed
 
 # Note: Developers can set EXTRA_MODULES in ConfigUser.cmake to test new modules
 set (GMT_PROGS_SRCS blockmean.c blockmedian.c blockmode.c docs.c dimfilter.c filter1d.c grd2kml.c
-@@ -380,7 +380,7 @@ set (GMT_LIB_SRCS block_subs.h common_by
+@@ -387,7 +387,7 @@ set (GMT_LIB_SRCS block_subs.h common_by
 	gmt_plot.h gmt_project.h gmt_prototypes.h gmt_psl.h gmt_shore.h gmt_gsformats.h
 	gmt_symbol.h gmt_synopsis.h gmt_texture.h gmt_time.h gmt_cpt_masters.h
 	gmt_types.h gmt_unique.h gmt_version.h gshhg_version.h postscriptlight.h
@@ -38,7 +38,7 @@ Forwarded: not-needed
 	gmt_error_codes.h gmt_api.c gmt_bcr.c gmt_calclock.c gmt_cdf.c gmt_compat.c
 	gmt_customio.c gmt_dcw.c gmt_error.c gmt_fft.c gmt_grdio.c gmt_io.c
 	gmt_memory.c gmt_nc.c gmt_notposix.c gmt_proj.c gmt_shore.c gmt_sph.c
-@@ -436,11 +436,6 @@ configure_file (gmt-config.in gmt-config
+@@ -443,11 +443,6 @@ configure_file (gmt-config.in gmt-config
 # gmtprogram
 set (GMT_PROGRAM ${GMT_SOURCE_DIR}/src/gmtprogram.c)
 

--- a/debian/patches/spelling-errors.patch
+++ b/debian/patches/spelling-errors.patch
 Description: Fix spelling errors.
 * reencode -> re-encode
 Author: Bas Couwenberg <sebastic@debian.org>
+Forwarded: https://github.com/GenericMappingTools/gmt/pull/1100

 --- a/src/PSL_prologue.ps
 +++ b/src/PSL_prologue.ps

--- a/doc/examples/ex03/example_03.ps
+++ b/doc/examples/ex03/example_03.ps
--- a/doc/examples/ex33/example_33.ps
+++ b/doc/examples/ex33/example_33.ps
 %!PS-Adobe-3.0
 %%BoundingBox: 0 0 612 792
 %%HiResBoundingBox: 0 0 612.0000 792.0000             
-%%Title: GMT v6.0.0_1ded948 [64-bit] Document from grdimage
+%%Title: GMT v6.0.0_831abca_2019.06.27 [64-bit] Document from grdimage
 %%Creator: GMT6
 %%For: unknown
 %%DocumentNeededResources: font Helvetica
-%%CreationDate: Thu Dec  6 10:51:37 2018
+%%CreationDate: Thu Jun 27 12:16:19 2019
 %%LanguageLevel: 2
 %%DocumentData: Clean7Bit
 %%Orientation: Portrait
@@ -336,9 +336,7 @@ end
  n 0 eq {PSL_CT_drawline} if
 } def
 /PSL_CT_textline
-{ /psl_fnt PSL_fnt k get def
-  psl_fnt (FS) search {pop pop pop /PSL_fmode 2 def} {pop /PSL_fmode 1 def} ifelse
-  psl_fnt cvx exec
+{ PSL_fnt k get cvx exec
  /PSL_height PSL_heights k get def
  PSL_placetext	{PSL_CT_placelabel} if
  PSL_clippath {PSL_CT_clippath} if
@@ -594,9 +592,7 @@ end
  /psl_xp PSL_txt_x psl_k get def
  /psl_yp PSL_txt_y psl_k get def
  /psl_label PSL_label_str psl_k get def
-  /psl_fnt PSL_label_font psl_k get def
-  psl_fnt cvx exec
-  psl_fnt (FS) search {pop pop pop /PSL_fmode 2 def} {pop /PSL_fmode 1 def} ifelse
+  PSL_label_font psl_k get cvx exec
  /PSL_height PSL_heights psl_k get def
  /psl_boxH PSL_height PSL_gap_y 2 mul add def
  /PSL_just PSL_label_justify psl_k get def
@@ -639,8 +635,7 @@ end
 {
    V psl_xp psl_yp T psl_angle R
    psl_SW PSL_justx mul psl_y0 M
-    psl_label dup sd neg 0 exch G
-    PSL_fmode 1 eq {show} {false charpath V S U fs N} ifelse
+    psl_label dup sd neg 0 exch G show
    U
 } def
 /PSL_nclip 0 def
@@ -9808,6 +9803,13 @@ O0
 3.32551 setmiterlimit
 33 W
 0 0 1 C
+clipsave
+0 0 M
+7200 0 D
+0 6528 D
+-7200 0 D
+P
+PSL_clip N
 4189 5643 M
 -158 -615 D
 -180 -690 D
@@ -9818,6 +9820,7 @@ O0
 -103 -372 D
 -15 -54 D
 S
+PSL_cliprestore
 %%EndObject
 0 A
 FQ
@@ -9859,6 +9862,13 @@ O0
 0 setlinejoin
 3.32551 setmiterlimit
 8 W
+clipsave
+0 0 M
+7200 0 D
+0 6528 D
+-7200 0 D
+P
+PSL_clip N
 2641 6060 M
 369 -104 D
 479 -130 D
@@ -10453,6 +10463,7 @@ S
 222 -55 D
 222 -54 D
 S
+PSL_cliprestore
 %%EndObject
 0 A
 FQ
@@ -10466,7 +10477,170 @@ O0
 0 setlinecap
 0 setlinejoin
 3.32551 setmiterlimit
+25 W
+4 W
+3600 0 M
+0 3600 D
+S
+2 setlinecap
+25 W
+N 0 3600 M 0 -3600 D S
+/PSL_A0_y 83 def
+/PSL_A1_y 0 def
+8 W
+N 0 0 M -83 0 D S
+N 0 1200 M -83 0 D S
+N 0 2400 M -83 0 D S
+N 0 3600 M -83 0 D S
+/PSL_AH0 0
+/MM {neg exch M} def
+PSL_font_encode 0 get 0 eq {Standard+_Encoding /Helvetica /Helvetica PSL_reencode PSL_font_encode 0 1 put} if
+200 F0
+(3500) sw mx
+(3000) sw mx
+(2500) sw mx
+(2000) sw mx
+def
+/PSL_A0_y PSL_A0_y 83 add def
+0 PSL_A0_y MM
+(3500) mr Z
+1200 PSL_A0_y MM
+(3000) mr Z
+2400 PSL_A0_y MM
+(2500) mr Z
+3600 PSL_A0_y MM
+(2000) mr Z
+/PSL_A0_y PSL_A0_y PSL_AH0 add def
+N 0 240 M -42 0 D S
+N 0 480 M -42 0 D S
+N 0 720 M -42 0 D S
+N 0 960 M -42 0 D S
+N 0 1440 M -42 0 D S
+N 0 1680 M -42 0 D S
+N 0 1920 M -42 0 D S
+N 0 2160 M -42 0 D S
+N 0 2640 M -42 0 D S
+N 0 2880 M -42 0 D S
+N 0 3120 M -42 0 D S
+N 0 3360 M -42 0 D S
+/PSL_LH 267 F0
+(M) sh def
+/PSL_L_y PSL_A0_y PSL_A1_y mx 133 add def
+1800 PSL_L_y MM
+V 90 R (Depth \(m\)) bc Z U
+7200 0 T
+25 W
+N 0 3600 M 0 -3600 D S
+/PSL_A0_y 83 def
+/PSL_A1_y 0 def
+8 W
+N 0 0 M 83 0 D S
+N 0 1200 M 83 0 D S
+N 0 2400 M 83 0 D S
+N 0 3600 M 83 0 D S
+N 0 240 M 42 0 D S
+N 0 480 M 42 0 D S
+N 0 720 M 42 0 D S
+N 0 960 M 42 0 D S
+N 0 1440 M 42 0 D S
+N 0 1680 M 42 0 D S
+N 0 1920 M 42 0 D S
+N 0 2160 M 42 0 D S
+N 0 2640 M 42 0 D S
+N 0 2880 M 42 0 D S
+N 0 3120 M 42 0 D S
+N 0 3360 M 42 0 D S
+/PSL_LH 0 def /PSL_L_y PSL_A0_y PSL_A1_y mx def
+-7200 0 T
+25 W
+N 0 0 M 7200 0 D S
+/PSL_A0_y 83 def
+/PSL_A1_y 0 def
+8 W
+N 0 0 M 0 -83 D S
+N 1800 0 M 0 -83 D S
+N 3600 0 M 0 -83 D S
+N 5400 0 M 0 -83 D S
+N 7200 0 M 0 -83 D S
+/PSL_AH0 0
+/MM {neg M} def
+200 F0
+(200) sh mx
+(100) sh mx
+(0) sh mx
+(100) sh mx
+(200) sh mx
+def
+/PSL_A0_y PSL_A0_y 83 add PSL_AH0 add def
+0 PSL_A0_y MM
+(200) bc Z
+1800 PSL_A0_y MM
+(100) bc Z
+3600 PSL_A0_y MM
+(0) bc Z
+5400 PSL_A0_y MM
+(100) bc Z
+7200 PSL_A0_y MM
+(200) bc Z
+N 360 0 M 0 -42 D S
+N 720 0 M 0 -42 D S
+N 1080 0 M 0 -42 D S
+N 1440 0 M 0 -42 D S
+N 2160 0 M 0 -42 D S
+N 2520 0 M 0 -42 D S
+N 2880 0 M 0 -42 D S
+N 3240 0 M 0 -42 D S
+N 3960 0 M 0 -42 D S
+N 4320 0 M 0 -42 D S
+N 4680 0 M 0 -42 D S
+N 5040 0 M 0 -42 D S
+N 5760 0 M 0 -42 D S
+N 6120 0 M 0 -42 D S
+N 6480 0 M 0 -42 D S
+N 6840 0 M 0 -42 D S
+/PSL_LH 267 F0
+(M) sh def
+/PSL_L_y PSL_A0_y PSL_A1_y mx 133 add PSL_LH add def
+3600 PSL_L_y MM
+(Distance from ridge \(km\)) bc Z
+0 3600 T
+25 W
+N 0 0 M 7200 0 D S
+/PSL_A0_y 83 def
+/PSL_A1_y 0 def
+8 W
+N 0 0 M 0 83 D S
+N 1800 0 M 0 83 D S
+N 3600 0 M 0 83 D S
+N 5400 0 M 0 83 D S
+N 7200 0 M 0 83 D S
+N 360 0 M 0 42 D S
+N 720 0 M 0 42 D S
+N 1080 0 M 0 42 D S
+N 1440 0 M 0 42 D S
+N 2160 0 M 0 42 D S
+N 2520 0 M 0 42 D S
+N 2880 0 M 0 42 D S
+N 3240 0 M 0 42 D S
+N 3960 0 M 0 42 D S
+N 4320 0 M 0 42 D S
+N 4680 0 M 0 42 D S
+N 5040 0 M 0 42 D S
+N 5760 0 M 0 42 D S
+N 6120 0 M 0 42 D S
+N 6480 0 M 0 42 D S
+N 6840 0 M 0 42 D S
+/PSL_LH 0 def /PSL_L_y PSL_A0_y PSL_A1_y mx def
+0 -3600 T
+0 setlinecap
 4 W
+clipsave
+0 0 M
+7200 0 D
+0 3600 D
+-7200 0 D
+P
+PSL_clip N
 {0.827 A} FS
 /FO {P}!
 0 54 M
@@ -10868,162 +11042,7 @@ P
 FO
 /FO {fs os}!
 FO
-25 W
-4 W
-3600 0 M
-0 3600 D
-S
-2 setlinecap
-25 W
-N 0 3600 M 0 -3600 D S
-/PSL_A0_y 83 def
-/PSL_A1_y 0 def
-8 W
-N 0 0 M -83 0 D S
-N 0 1200 M -83 0 D S
-N 0 2400 M -83 0 D S
-N 0 3600 M -83 0 D S
-/PSL_AH0 0
-/MM {neg exch M} def
-PSL_font_encode 0 get 0 eq {Standard+_Encoding /Helvetica /Helvetica PSL_reencode PSL_font_encode 0 1 put} if
-200 F0
-(3500) sw mx
-(3000) sw mx
-(2500) sw mx
-(2000) sw mx
-def
-/PSL_A0_y PSL_A0_y 83 add def
-0 PSL_A0_y MM
-(3500) mr Z
-1200 PSL_A0_y MM
-(3000) mr Z
-2400 PSL_A0_y MM
-(2500) mr Z
-3600 PSL_A0_y MM
-(2000) mr Z
-/PSL_A0_y PSL_A0_y PSL_AH0 add def
-N 0 240 M -42 0 D S
-N 0 480 M -42 0 D S
-N 0 720 M -42 0 D S
-N 0 960 M -42 0 D S
-N 0 1440 M -42 0 D S
-N 0 1680 M -42 0 D S
-N 0 1920 M -42 0 D S
-N 0 2160 M -42 0 D S
-N 0 2640 M -42 0 D S
-N 0 2880 M -42 0 D S
-N 0 3120 M -42 0 D S
-N 0 3360 M -42 0 D S
-/PSL_LH 267 F0
-(M) sh def
-/PSL_L_y PSL_A0_y PSL_A1_y mx 133 add def
-1800 PSL_L_y MM
-V 90 R (Depth \(m\)) bc Z U
-7200 0 T
-25 W
-N 0 3600 M 0 -3600 D S
-/PSL_A0_y 83 def
-/PSL_A1_y 0 def
-8 W
-N 0 0 M 83 0 D S
-N 0 1200 M 83 0 D S
-N 0 2400 M 83 0 D S
-N 0 3600 M 83 0 D S
-N 0 240 M 42 0 D S
-N 0 480 M 42 0 D S
-N 0 720 M 42 0 D S
-N 0 960 M 42 0 D S
-N 0 1440 M 42 0 D S
-N 0 1680 M 42 0 D S
-N 0 1920 M 42 0 D S
-N 0 2160 M 42 0 D S
-N 0 2640 M 42 0 D S
-N 0 2880 M 42 0 D S
-N 0 3120 M 42 0 D S
-N 0 3360 M 42 0 D S
-/PSL_LH 0 def /PSL_L_y PSL_A0_y PSL_A1_y mx def
-7200 0 T
-25 W
-N 0 0 M 7200 0 D S
-/PSL_A0_y 83 def
-/PSL_A1_y 0 def
-8 W
-N 0 0 M 0 -83 D S
-N 1800 0 M 0 -83 D S
-N 3600 0 M 0 -83 D S
-N 5400 0 M 0 -83 D S
-N 7200 0 M 0 -83 D S
-/PSL_AH0 0
-/MM {neg M} def
-200 F0
-(200) sh mx
-(100) sh mx
-(0) sh mx
-(100) sh mx
-(200) sh mx
-def
-/PSL_A0_y PSL_A0_y 83 add PSL_AH0 add def
-0 PSL_A0_y MM
-(200) bc Z
-1800 PSL_A0_y MM
-(100) bc Z
-3600 PSL_A0_y MM
-(0) bc Z
-5400 PSL_A0_y MM
-(100) bc Z
-7200 PSL_A0_y MM
-(200) bc Z
-N 360 0 M 0 -42 D S
-N 720 0 M 0 -42 D S
-N 1080 0 M 0 -42 D S
-N 1440 0 M 0 -42 D S
-N 2160 0 M 0 -42 D S
-N 2520 0 M 0 -42 D S
-N 2880 0 M 0 -42 D S
-N 3240 0 M 0 -42 D S
-N 3960 0 M 0 -42 D S
-N 4320 0 M 0 -42 D S
-N 4680 0 M 0 -42 D S
-N 5040 0 M 0 -42 D S
-N 5760 0 M 0 -42 D S
-N 6120 0 M 0 -42 D S
-N 6480 0 M 0 -42 D S
-N 6840 0 M 0 -42 D S
-/PSL_LH 267 F0
-(M) sh def
-/PSL_L_y PSL_A0_y PSL_A1_y mx 133 add PSL_LH add def
-3600 PSL_L_y MM
-(Distance from ridge \(km\)) bc Z
-0 3600 T
-25 W
-N 0 0 M 7200 0 D S
-/PSL_A0_y 83 def
-/PSL_A1_y 0 def
-8 W
-N 0 0 M 0 83 D S
-N 1800 0 M 0 83 D S
-N 3600 0 M 0 83 D S
-N 5400 0 M 0 83 D S
-N 7200 0 M 0 83 D S
-N 360 0 M 0 42 D S
-N 720 0 M 0 42 D S
-N 1080 0 M 0 42 D S
-N 1440 0 M 0 42 D S
-N 2160 0 M 0 42 D S
-N 2520 0 M 0 42 D S
-N 2880 0 M 0 42 D S
-N 3240 0 M 0 42 D S
-N 3960 0 M 0 42 D S
-N 4320 0 M 0 42 D S
-N 4680 0 M 0 42 D S
-N 5040 0 M 0 42 D S
-N 5760 0 M 0 42 D S
-N 6120 0 M 0 42 D S
-N 6480 0 M 0 42 D S
-N 6840 0 M 0 42 D S
-/PSL_LH 0 def /PSL_L_y PSL_A0_y PSL_A1_y mx def
-0 -3600 T
-0 setlinecap
+PSL_cliprestore
 %%EndObject
 0 A
 FQ
@@ -11038,7 +11057,15 @@ O0
 0 setlinejoin
 3.32551 setmiterlimit
 50 W
-0 625 M
+clipsave
+0 0 M
+7200 0 D
+0 3600 D
+-7200 0 D
+P
+PSL_clip N
+-4 624 M
+4 1 D
 65 13 D
 36 3 D
 36 -8 D
@@ -11229,7 +11256,8 @@ O0
 36 -23 D
 36 -74 D
 29 -15 D
-S
+12 -7 D S
+PSL_cliprestore
 %%EndObject
 0 A
 FQ

--- a/doc/examples/ex47/example_47.ps
+++ b/doc/examples/ex47/example_47.ps
--- a/doc/examples/ex50/example_50.ps
+++ b/doc/examples/ex50/example_50.ps
--- a/doc/rst/source/GMT_Docs.rst
+++ b/doc/rst/source/GMT_Docs.rst
@@ -216,7 +216,7 @@ Command-line completion

 GMT provides basic command-line completion (tab completion) for bash.
 The easiest way to use the feature is to install the
-`bash-completion <http://bash-completion.alioth.debian.org/>`_ package
+`bash-completion <https://github.com/scop/bash-completion/>`_ package
 which is available in many operating system distributions.

 Depending on the distribution, you may still need to source it from
@@ -1900,8 +1900,10 @@ implies we should first take :math:`\log_{10}` of the data [leave as
 is]. Next, we may scale the result by the given *scale* [1]. Finally, we
 add in the specified *offset* [0].  If you want the trailing text to remain
 part of your subset logical record then also select the special column
-by requesting column **t**, otherwise we ignore trailing text.  Finally,
-to use the entire numerical record and ignoring trailing text, use **-in**.
+by requesting column **t**, otherwise we ignore trailing text.  If you only
+want to select one word from the trailing text, then append the word number
+(0 is the first word).  Finally, to use the entire numerical record and
+ignore trailing text, use **-in**.

 .. _gmt_record:

@@ -1921,9 +1923,10 @@ to use the entire numerical record and ignoring trailing text, use **-in**.
   from the data themselves (such as when reading a binary file).  Finally, if
   a module needs to write out only a portion of the current logical record then
   you may use the corresponding **-o** option to select desired columns, including
-   the trailing text column **t**.  Note that these column numbers now refer to
-   the logical record, not the physical, since after reading the data there is no
-   physical record, only the logical record in memory.
+   the trailing text column **t**.  If you only want to output one word from the
+   trailing text, then append the word number (0 is the first word).  Note that
+   these column numbers now refer to the logical record, not the physical, since
+   after reading the data there is no physical record, only the logical record in memory.

 Grid interpolation parameters: The **-n** option
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1958,9 +1961,11 @@ You can also use a column more than once, e.g., **-o**\ 3,1,3, to
 duplicate a column on output.  Finally, if your logical record in memory
 contains trailing text then you can include that by including the special
 column **t** to your selections.  The text is always written after any
-numerical columns.  Note that if you wanted to scale or shift the output
-values you need to do so during reading, using the **-i** option.
-To output all numerical columns and ignoring trailing text, use **-on**.
+numerical columns.  If you only want to output one word from the trailing
+text, then append the word number (0 is the first word).  Note that if you 
+wanted to scale or shift the output values you need to do so during reading,
+using the **-i** option. To output all numerical columns and ignoring
+trailing text, use **-on**.

 Perspective view: The **-p** option
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -8165,7 +8170,7 @@ Normally, the **l** macro code will place a hard-wired text string.  However,
 you can also obtain the entire string from your input file via a single symbol
 variable **$t** that must be declared with type **s** (string).  The string will be taken
 as all trialing text in your data record.  To select a single word from the trailing text
-you just use $k, where k starts at 1 for the first word, regardless of how many numerical
+you just use **$t**\ *k*, where *k* starts at 0 for the first word, regardless of how many numerical
 columns that precede it.  For each word you plan to use you must add a type **s** above.
 Words must be separated by one tab or space only.  To place the dollar sign $ itself you must
 use octal \\044 so as to not confuse the parser with a symbol variable.

--- a/doc/rst/source/GMT_Docs_classic.rst
+++ b/doc/rst/source/GMT_Docs_classic.rst
@@ -216,7 +216,7 @@ Command-line completion

 GMT provides basic command-line completion (tab completion) for bash.
 The easiest way to use the feature is to install the
-`bash-completion <http://bash-completion.alioth.debian.org/>`_ package
+`bash-completion <https://github.com/scop/bash-completion>`_ package
 which is available in many operating system distributions.

 Depending on the distribution, you may still need to source it from
@@ -1961,8 +1961,10 @@ implies we should first take :math:`\log_{10}` of the data [leave as
 is]. Next, we may scale the result by the given *scale* [1]. Finally, we
 add in the specified *offset* [0].  If you want the trailing text to remain
 part of your subset logical record then also select the special column
-by requesting column **t**, otherwise we ignore trailing text.  Finally,
-to use the entire numerical record and ignoring trailing text, use **-in**.
+by requesting column **t**, otherwise we ignore trailing text.  If you only
+want to select one word from the trailing text, then append the word number
+(0 is the first word).  Finally, to use the entire numerical record and
+ignore trailing text, use **-in**.

 .. _gmt_record:

@@ -1982,9 +1984,10 @@ to use the entire numerical record and ignoring trailing text, use **-in**.
   from the data themselves (such as when reading a binary file).  Finally, if
   a module needs to write out only a portion of the current logical record then
   you may use the corresponding **-o** option to select desired columns, including
-   the trailing text column **t**.  Note that these column numbers now refer to
-   the logical record, not the physical, since after reading the data there is no
-   physical record, only the logical record in memory.
+   the trailing text column **t**.  If you only want to output one word from the
+   trailing text, then append the word number (0 is the first word).  Note that
+   these column numbers now refer to the logical record, not the physical, since
+   after reading the data there is no physical record, only the logical record in memory.

 Grid interpolation parameters: The **-n** option
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2019,9 +2022,11 @@ You can also use a column more than once, e.g., **-o**\ 3,1,3, to
 duplicate a column on output.  Finally, if your logical record in memory
 contains trailing text then you can include that by including the special
 column **t** to your selections.  The text is always written after any
-numerical columns.  Note that if you wanted to scale or shift the output
-values you need to do so during reading, using the **-i** option.
-To output all numerical columns and ignoring trailing text, use **-on**.
+numerical columns.  If you only want to output one word from the trailing
+text, then append the word number (0 is the first word).  Note that if you 
+wanted to scale or shift the output values you need to do so during reading,
+using the **-i** option. To output all numerical columns and ignoring
+trailing text, use **-on**.

 Perspective view: The **-p** option
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -8202,7 +8207,7 @@ Normally, the **l** macro code will place a hard-wired text string.  However,
 you can also obtain the entire string from your input file via a single symbol
 variable **$t** that must be declared with type **s** (string).  The string will be taken
 as all trialing text in your data record.  To select a single word from the trailing text
-you just use $k, where k starts at 1 for the first word, regardless of how many numerical
+you just use **$t**\ *k*, where *k* starts at 0 for the first word, regardless of how many numerical
 columns that precede it.  For each word you plan to use you must add a type **s** above.
 Words must be separated by one tab or space only.  To place the dollar sign $ itself you must
 use octal \\044 so as to not confuse the parser with a symbol variable.

--- a/doc/rst/source/begin.rst_
+++ b/doc/rst/source/begin.rst_
@@ -11,7 +11,6 @@ Synopsis

 **gmt begin** [*prefix*] [*formats*]
 [ |SYN_OPT-V| ]
-[ |SYN_OPT--| ]

 |No-spaces|


--- a/doc/rst/source/clear.rst_
+++ b/doc/rst/source/clear.rst_
@@ -11,7 +11,6 @@ Synopsis

 **gmt clear** [ **all** \| **cache** \| **conf** \| **cpt** \| **data** \| **history** \| **sessions** ]
 [ |SYN_OPT-V| ]
-[ |SYN_OPT--| ]

 |No-spaces|


--- a/doc/rst/source/end.rst_
+++ b/doc/rst/source/end.rst_
@@ -10,8 +10,8 @@ Synopsis
 .. include:: common_SYN_OPTs.rst_

 **gmt end**
+[ **show** ]
 [ |SYN_OPT-V| ]
-[ |SYN_OPT--| ]

 |No-spaces|

@@ -25,6 +25,9 @@ will be removed.
 Optional Arguments
 ------------------

+**show**
+    Open all graphics produced by the session in the default viewer via call(s) to gmt :doc:`docs`.
+
 .. _end-V:

 .. |Add_-V| unicode:: 0x20 .. just an invisible code

--- a/doc/rst/source/explain_-c_full.rst_
+++ b/doc/rst/source/explain_-c_full.rst_
@@ -3,4 +3,6 @@
 **-c**\ [*row*\ ,\ *col*]
    Used to advance to the selected subplot panel.  Only allowed when in
    subplot mode.  Available to all plot modules.  If no arguments are
-    given then we advance to the next panel in the selected order.
+    given then we advance to the next panel in the selected order. If
+    no **-c** is given and we just entered subplot mode then the first
+    panel (top, left) is selected.