README

-$Id: README 19521 2017-12-27 22:38:24Z pwessel $
+$Id: README 19731 2018-02-08 10:49:07Z remko $
 
 == Information for installing GMT 5 ==
 
@@ -75,6 +75,9 @@ search options, e.g., gmtconvert) you must have the PCRE library and include
 files installed.  PCRE is available through your favorite package manager
 on many *NIX systems.
 
+Because GDAL already links with PCRE1 it is most practical to use that version.
+But if you insist, GMT can also be compiled with PCRE2.
+
 
 LAPACK (optional)
 ---------------

README.CMake

 ////
-$Id: README.CMake 19521 2017-12-27 22:38:24Z pwessel $
+$Id: README.CMake 19731 2018-02-08 10:49:07Z remko $
 
 Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis
 and F. Wobbe. See LICENSE.TXT file for copying and redistribution conditions.
@@ -20,7 +20,7 @@ Build and runtime prerequisites
 
 1. Software:
   You need Ghostscript, CMake (>=2.8.5), netCDF (>=4.0, netCDF-4/HDF5
-  support mandatory).  Optionally install Sphinx, PCRE, GDAL, LAPACK
+  support mandatory).  Optionally install Sphinx, PCRE1 or PCRE2, GDAL, LAPACK
   and FFTW (single precision version).
 2. Data:
   You need gshhg (>=2.2.2); optionally install dcw-gmt (>=1.0.5)

cmake/ConfigDefault.cmake

 #
-# $Id: ConfigDefault.cmake 19529 2017-12-28 08:30:55Z pwessel $
+# $Id: ConfigDefault.cmake 20314 2018-06-28 02:11:28Z pwessel $
 #
 # Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
 # See LICENSE.TXT file for copying and redistribution conditions.
@@ -42,13 +42,13 @@ set (GMT_VERSION_YEAR "2018")
 # The GMT package version.
 set (GMT_PACKAGE_VERSION_MAJOR 5)
 set (GMT_PACKAGE_VERSION_MINOR 4)
-set (GMT_PACKAGE_VERSION_PATCH 3)
+set (GMT_PACKAGE_VERSION_PATCH 4)
 
 # The subversion revision of the GMT source code.
 # This is manually set when making GMT *public* releases.
 # However, when making internal releases or just an ordinary developer build, leave it
 # empty; if it is empty, the revision number is automatically populated for you on build.
-set (GMT_SOURCE_CODE_CONTROL_VERSION_STRING "19528")
+set (GMT_SOURCE_CODE_CONTROL_VERSION_STRING "20314")
 #set (GMT_SOURCE_CODE_CONTROL_VERSION_STRING "")
 
 # The GMT package version.

cmake/ConfigUserTemplate.cmake

 #
-# $Id: ConfigUserTemplate.cmake 19521 2017-12-27 22:38:24Z pwessel $
+# $Id: ConfigUserTemplate.cmake 19731 2018-02-08 10:49:07Z remko $
 #
 # Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
 # See LICENSE.TXT file for copying and redistribution conditions.
@@ -56,9 +56,10 @@
 # Make executables relocatable on supported platforms (relative RPATH) [FALSE]:
 #set (GMT_INSTALL_RELOCATABLE TRUE)
 
-# Exclude optional GDAL, PCRE, FFTW3, LAPACK, ZLIB dependencies even if you have them installed [FALSE]
+# Exclude optional GDAL, PCRE, PCRE2, FFTW3, LAPACK, ZLIB dependencies even if you have them installed [FALSE]
 #set (GMT_EXCLUDE_GDAL TRUE)
 #set (GMT_EXCLUDE_PCRE TRUE)
+#set (GMT_EXCLUDE_PCRE2 TRUE)
 #set (GMT_EXCLUDE_FFTW3 TRUE)
 #set (GMT_EXCLUDE_LAPACK TRUE)
 #set (GMT_EXCLUDE_ZLIB TRUE)
@@ -126,6 +127,9 @@
 # Set location of PCRE (can be root directory, path to header file or path to
 # pcre-config) [auto]:
 #set (PCRE_ROOT "pcre_install_prefix")
+# Alternatively, set location of PCRE2 (can be root directory, path to header file or path to
+# pcre2-config) [auto]:
+#set (PCRE2_ROOT "pcre2_install_prefix")
 
 # Set location of single precision FFTW (can be root directory or path to
 # header file) [auto]:

cmake/dist/CMakeLists.txt

 #
-# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
+# $Id: CMakeLists.txt 19651 2018-01-23 00:09:28Z jluis $
 #
 # Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
 # See LICENSE.TXT file for copying and redistribution conditions.
@@ -170,11 +170,11 @@ if (WIN32 AND NOT CYGWIN)
 	if (WIN32 AND TRUE) 
 		# Install the gmtmex on Windows. Need to make this work via variables in ConfigUser.cmake
 		if (BITAGE EQUAL 64)
-			install (PROGRAMS "C:/progs_cygw/GMTdev/gmt-mex/trunk/src/gmtmex.mexw64" DESTINATION ${GMT_BINDIR} COMPONENT Runtime)
+			install (PROGRAMS "C:/progs_cygw/GMTdev/gmt-mex/branches/5.4/src/gmtmex.mexw64" DESTINATION ${GMT_BINDIR} COMPONENT Runtime)
 		else ()
-			install (PROGRAMS "C:/progs_cygw/GMTdev/gmt-mex/trunk/src/gmtmex.mexw32" DESTINATION ${GMT_BINDIR} COMPONENT Runtime)
+			install (PROGRAMS "C:/progs_cygw/GMTdev/gmt-mex/branches/5.4/src/gmtmex.mexw32" DESTINATION ${GMT_BINDIR} COMPONENT Runtime)
 		endif ()
-		install (PROGRAMS "C:/progs_cygw/GMTdev/gmt-mex/trunk/src/gmt.m" DESTINATION ${GMT_BINDIR} COMPONENT Runtime)
+		install (PROGRAMS "C:/progs_cygw/GMTdev/gmt-mex/branches/5.4/src/gmt.m" DESTINATION ${GMT_BINDIR} COMPONENT Runtime)
 	endif (WIN32 AND TRUE)
 
 	# Fix bundle:

cmake/modules/FindPCRE2.cmake

+#
+# $Id: FindPCRE2.cmake 19719 2018-02-05 20:22:07Z remko $
+#
+# Locate pcre2
+#
+# This module accepts the following environment variables:
+#
+#    PCRE2_DIR or PCRE2_ROOT - Specify the location of PCRE2
+#
+# This module defines the following CMake variables:
+#
+#    PCRE2_FOUND - True if libpcre2 is found
+#    PCRE2_LIBRARY - A variable pointing to the PCRE2 library
+#    PCRE2_INCLUDE_DIR - Where to find the headers
+
+#=============================================================================
+# Inspired by FindGDAL
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See COPYING-CMAKE-SCRIPTS for more information.
+#=============================================================================
+
+# This makes the presumption that you are include pcre2.h like
+#
+#include "pcre2.h"
+
+if (DEFINED PCRE2_ROOT AND NOT PCRE2_ROOT)
+	set (PCRE2_LIBRARY "" CACHE INTERNAL "")
+	set (PCRE2_INCLUDE_DIR "" CACHE INTERNAL "")
+	return ()
+endif (DEFINED PCRE2_ROOT AND NOT PCRE2_ROOT)
+
+if (UNIX AND NOT PCRE2_FOUND)
+	# Use pcre2-config to obtain the library location and name, something like
+	# -L/sw/lib -lpcre2-8)
+	find_program (PCRE2_CONFIG pcre2-config
+		HINTS
+		${PCRE2_DIR}
+		${PCRE2_ROOT}
+		$ENV{PCRE2_DIR}
+		$ENV{PCRE2_ROOT}
+		PATH_SUFFIXES bin
+		PATHS
+		/sw # Fink
+		/opt/local # DarwinPorts
+		/opt/csw # Blastwave
+		/opt
+		/usr/local
+	)
+
+	if (PCRE2_CONFIG)
+		execute_process (COMMAND ${PCRE2_CONFIG} --cflags
+			ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
+			OUTPUT_VARIABLE PCRE2_CONFIG_CFLAGS)
+		if (PCRE2_CONFIG_CFLAGS)
+			string (REGEX MATCHALL "-I[^ ]+" _pcre2_dashI ${PCRE2_CONFIG_CFLAGS})
+			string (REGEX REPLACE "-I" "" _pcre2_includepath "${_pcre2_dashI}")
+			string (REGEX REPLACE "-I[^ ]+" "" _pcre2_cflags_other ${PCRE2_CONFIG_CFLAGS})
+		endif (PCRE2_CONFIG_CFLAGS)
+		execute_process (COMMAND ${PCRE2_CONFIG} --libs8
+			ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE
+			OUTPUT_VARIABLE PCRE2_CONFIG_LIBS)
+		if (PCRE2_CONFIG_LIBS)
+			string (REGEX MATCHALL "-l[^ ]+" _pcre2_dashl ${PCRE2_CONFIG_LIBS})
+			string (REGEX REPLACE "-l" "" _pcre2_lib "${_pcre2_dashl}")
+			string (REGEX MATCHALL "-L[^ ]+" _pcre2_dashL ${PCRE2_CONFIG_LIBS})
+			string (REGEX REPLACE "-L" "" _pcre2_libpath "${_pcre2_dashL}")
+		endif (PCRE2_CONFIG_LIBS)
+	endif (PCRE2_CONFIG)
+endif (UNIX AND NOT PCRE2_FOUND)
+
+find_path (PCRE2_INCLUDE_DIR pcre2.h
+	HINTS
+	${_pcre2_includepath}
+	${PCRE2_DIR}
+	${PCRE2_ROOT}
+	$ENV{PCRE2_DIR}
+	$ENV{PCRE2_ROOT}
+	PATH_SUFFIXES
+	include/pcre2
+	include/PCRE2
+	include
+	PATHS
+	~/Library/Frameworks/pcre2.framework/Headers
+	/Library/Frameworks/pcre2.framework/Headers
+	/sw # Fink
+	/opt/local # DarwinPorts
+	/opt/csw # Blastwave
+	/opt
+	/usr/local
+)
+
+find_library (PCRE2_LIBRARY
+	NAMES ${_pcre2_lib} pcre2-8 PCRE2
+	HINTS
+	${PCRE2_DIR}
+	${PCRE2_ROOT}
+	$ENV{PCRE2_DIR}
+	$ENV{PCRE2_ROOT}
+	${_pcre2_libpath}
+	PATH_SUFFIXES lib
+	PATHS
+	~/Library/Frameworks/pcre2.framework
+	/Library/Frameworks/pcre2.framework
+	/sw
+	/opt/local
+	/opt/csw
+	/opt
+	/usr/local
+)
+
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (PCRE2 DEFAULT_MSG PCRE2_LIBRARY PCRE2_INCLUDE_DIR)
+
+set (PCRE2_LIBRARIES ${PCRE2_LIBRARY})
+set (PCRE2_INCLUDE_DIRS ${PCRE2_INCLUDE_DIR})
+
+# vim: textwidth=78 noexpandtab tabstop=2 softtabstop=2 shiftwidth=2

debian/changelog

+gmt (5.4.4+dfsg-1~bpo9+1) stretch-backports; urgency=medium
+
+  * Rebuild for stretch-backports.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Wed, 04 Jul 2018 07:53:08 +0200
+
+gmt (5.4.4+dfsg-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update copyright-format URL to use HTTPS.
+  * Fix deprecated source override location.
+  * Update Vcs-* URLs for Salsa.
+  * Bump Standards-Version to 4.1.4, no changes.
+  * Strip trailing whitespace from control & rules files.
+  * Refresh patches.
+  * Fix bash-completion installation.
+  * Update symbols for 5.4.4.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Sun, 01 Jul 2018 08:57:31 +0200
+
 gmt (5.4.3+dfsg-1~bpo9+1) stretch-backports; urgency=medium
 
   * Rebuild for stretch-backports.

debian/control

@@ -26,9 +26,9 @@ Build-Depends: debhelper (>= 9.20160114),
                docbook-xsl,
                docbook-xml,
                xsltproc
-Standards-Version: 4.1.3
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gmt.git
-Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gmt.git -b stretch-backports
+Standards-Version: 4.1.4
+Vcs-Browser: https://salsa.debian.org/debian-gis-team/gmt
+Vcs-Git: https://salsa.debian.org/debian-gis-team/gmt.git -b stretch-backports
 Homepage: http://gmt.soest.hawaii.edu/
 
 Package: gmt
@@ -157,4 +157,3 @@ Description: Example scripts illustrating the use of GMT
  boundaries.
  .
  This package contains example scripts illustrating the use of GMT.
-

debian/copyright

-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: GMT
 Upstream-Contact: Paul Wessel <wessel@soest.hawaii.edu> and Walter Smith <wsmith@nodc.noaa.gov>
 Source: http://gmt.soest.hawaii.edu/

debian/libgmt5.symbols

@@ -323,7 +323,7 @@ libgmt.so.5 libgmt5 #MINVER#
  gmt_delaunay@Base 5.3.1
  gmt_delaunay_free@Base 5.3.1
  gmt_dilog@Base 5.3.1
- gmt_disable_ih_opts@Base 5.4.2
+ gmt_disable_bhi_opts@Base 5.4.4
  gmt_dist_array@Base 5.3.1
  gmt_dist_array_2@Base 5.3.1
  gmt_dist_syntax@Base 5.3.1
@@ -751,7 +751,7 @@ libgmt.so.5 libgmt5 #MINVER#
  gmt_rd_from_gymd@Base 5.3.1
  gmt_rdc2dt@Base 5.3.1
  gmt_read_img@Base 5.3.1
- gmt_reenable_ih_opts@Base 5.4.2
+ gmt_reenable_bhi_opts@Base 5.4.4
  gmt_refpoint_syntax@Base 5.3.1
  gmt_remove_dir@Base 5.4.0
  gmt_remove_file@Base 5.4.0
@@ -829,6 +829,7 @@ libgmt.so.5 libgmt5 #MINVER#
  gmt_srf_write_grd@Base 5.3.1
  gmt_srf_write_grd_info@Base 5.3.1
  gmt_ssrfpack_grid@Base 5.3.1
+ gmt_std_weighted@Base 5.4.4
  gmt_stereo1_sph@Base 5.3.1
  gmt_stereo2_sph@Base 5.3.1
  gmt_str_setcase@Base 5.3.1

debian/patches/disable-triangle.patch

@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -237,15 +237,15 @@ if (DO_API_TESTS)
+@@ -246,15 +246,15 @@ if (DO_API_TESTS)
  	set (GMT_DEMOS_SRCS testapi.c testpsl.c testgmt5.c testgmtio.c testgrdio.c testio.c testapiconv.c example1.c testapi_matrix.c testapi_vector.c test_JL.c test_walter.c)
  endif (DO_API_TESTS)
  
@@ -27,7 +27,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 filter1d.c
-@@ -285,7 +285,7 @@ set (GMT_LIB_SRCS block_subs.h common_by
+@@ -294,7 +294,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_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
@@ -36,7 +36,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
-@@ -388,11 +388,6 @@ configure_file (gmt-config.in gmt-config
+@@ -397,11 +397,6 @@ configure_file (gmt-config.in gmt-config
  # gmtprogram
  set (GMT_PROGRAM ${GMT_SOURCE_DIR}/src/gmtprogram.c)
  

debian/rules

@@ -83,7 +83,7 @@ override_dh_auto_install:
 
 	# Fix bash-completion installation
 	mkdir -p debian/tmp/usr/share/bash-completion/completions
-	mv debian/tmp/usr/etc/bash_completion.d/gmt debian/tmp/usr/share/bash-completion/completions
+	mv debian/tmp/usr/etc/bash_completion.d/gmt_completion.bash debian/tmp/usr/share/bash-completion/completions
 	rm -rf debian/tmp/usr/etc/bash_completion.d
 	rmdir debian/tmp/usr/etc/
 
@@ -115,4 +115,3 @@ override_dh_strip:
 
 override_dh_makeshlibs:
 	dh_makeshlibs -- -v$(UPSTREAM_VERSION)
-

doc/examples/gmtest.in

 #!/bin/bash
 #
-# $Id: gmtest.in 18071 2017-04-30 00:32:27Z pwessel $
+# $Id: gmtest.in 20288 2018-06-25 05:54:37Z pwessel $
 #
 # Bash script inclusion to test all GMT examples.
 # It sets the environment such that the examples are created as in the manual.
@@ -71,7 +71,7 @@ if ! [ -x "$GRAPHICSMAGICK" ]; then
 fi
 for ps in *.ps ; do
   # syntax: gm compare [ options ... ] reference-image [ options ... ] compare-image [ options ... ]
-  rms=$("${GRAPHICSMAGICK}" compare -density 200 -maximum-error 0.001 -highlight-color magenta -highlight-style assign -metric rmse -file "${ps%.ps}.png" "$ps" "${src}/${ps}") || pscmpfailed="yes"
+  rms=$("${GRAPHICSMAGICK}" compare -density 200 -maximum-error 0.003 -highlight-color magenta -highlight-style assign -metric rmse -file "${ps%.ps}.png" "$ps" "${src}/${ps}") || pscmpfailed="yes"
   rms=$(perl -ne 'print $1 if /Total: ([0-9.]+)/' <<< "$rms")
   if [ -z "$rms" ]; then
     rms="NA"

doc/examples/run_ex_tests.sh

 #!/bin/bash
-#	$Id: run_ex_tests.sh 9857 2012-03-13 10:55:26Z fwobbe $
+#	$Id: run_ex_tests.sh 20288 2018-06-25 05:54:37Z pwessel $
 #
 #	Test newly created plots for documentation against archive
 #
@@ -17,7 +17,7 @@ rm -f fail_count.d
 for o in $* ; do
         f=`basename $o .ps`
 	printf "%-32s" $f.ps
-	rms=`gm compare -density 200 -maximum-error 0.001 -highlight-color magenta -highlight-style assign -metric rmse -file $f.png $f.ps ../fig/$f.ps 2>&1`
+	rms=`gm compare -density 200 -maximum-error 0.003 -highlight-color magenta -highlight-style assign -metric rmse -file $f.png $f.ps ../fig/$f.ps 2>&1`
 	if test $? -ne 0; then
         	echo "[FAIL]"
 		rms=`(sed -nE '/Total:/s/ +Total: ([0-9.]+) .+/\1/p'|cut -c-5) <<< "$rms"`

doc/rst/source/GMT_Docs.rst

-.. TODO: set tocdepth=2 when this issue resolved https://bitbucket.org/birkenfeld/sphinx/issue/1251
-
-:tocdepth: 3
-
 .. set default highlighting language for this document:
 .. highlight:: bash
-**The Generic Mapping Tools**
+The Generic Mapping Tools
+=========================
 **Technical Reference and Cookbook**
@@ -40,7 +37,7 @@
 Acknowledgments
-===============
+---------------
 The Generic Mapping Tools (GMT) could not have been designed without
 the generous support of several people. The Founders (Wessel and Smith)
@@ -7179,7 +7176,7 @@ that result in known (or named) projections. These are listed in Table :ref:`JY
 +===================+=====================+
 | Balthasart        | 50º                 |
 +-------------------+---------------------+
-| Gall-Peters       | 45º                 |
+| Gall              | 45º                 |
 +-------------------+---------------------+
 | Hobo-Dyer         | 37º30' (= 37.5º)    |
 +-------------------+---------------------+

doc/rst/source/explain_-J_full.rst_

@@ -121,7 +121,7 @@ projection names stands for Equal-Area and Conformal, respectively):
         standard parallel is typically one of these (but can be any value):
 
           * 50 - Balthasart
-          * 45 - Gall-Peters
+          * 45 - Gall
           * 37.0666 - Caster
           * 37.4 - Trystan Edwards
           * 37.5 - Hobo-Dyer

doc/rst/source/gmtinfo.rst

@@ -40,15 +40,17 @@ Description
 -----------
 
 **gmtinfo** reads its standard input [or from files] and finds the
-extreme values in each of the columns. It recognizes NaNs and will print
-warnings if the number of columns vary from record to record. As an
-option, **gmtinfo** will find the extent of the first *n* columns rounded
-up and down to the nearest multiple of the supplied increments. By
-default, this output will be in the form **-R**\ *w/e/s/n* which can be
-used directly in the command line for other programs (hence only *dx*
-and *dy* are needed), or the output will be in column form for as many
-columns as there are increments provided. A similar option (**-T**) will
-provide a **-T**\ *zmin/zmax/dz* string for makecpt. 
+extreme values in each of the columns reported as slash-separated min/max
+pairs. It recognizes NaNs and will print warnings if the number of columns
+vary from record to record. The pairs can be split into two separate columns
+by using the **-C** option.  As another option, **gmtinfo** can find the extent
+of data in the first two columns rounded up and down to the nearest multiple of the
+supplied increments given by **-I**. Such output will be in the text form
+**-R**\ *w/e/s/n*, which can be used directly on the command line for other
+modules (hence only *dx* and *dy* are needed).  If **-C** is combined with
+**-I** then the output will be in column form and rounded up/down for as many
+columns as there are increments provided in **-I**. A similar option (**-T**)
+will provide a **-T**\ *zmin/zmax/dz* string for makecpt.
 
 Required Arguments
 ------------------

doc/rst/source/grdsample.rst

@@ -106,6 +106,26 @@ Bilinear interpolation [**-n**] uses only a 2 by 2 neighborhood, but
 yields only zero-order continuity. Use bicubic when smoothness is
 important. Use bilinear to minimize the propagation of NaNs.
 
+Notes
+-----
+
+As an alternative to bicubic spline, linear spline or nearest neighbor interpolation one can
+instead send the entire dataset through :doc:`surface` for re-gridding.  This approach allows
+more control on aspects such as tension but it also leads to a solution that
+is not likely to have fully converged.  The general approach would be
+something like
+
+   ::
+
+    gmt grd2xyz old.grd | gmt surface -Rold.grd -Inewinc -Gnew.grd [other options]
+
+For moderate data set one could also achieve an exact solution with :doc:`greenspline`,
+such as
+
+::
+
+ gmt grd2xyz old.grd | gmt greenspline -Rold.grd -Inewinc -Gnew.grd [other options]
+
 Examples
 --------
 
@@ -125,5 +145,9 @@ registration while keeping the same region and grid interval:
 See Also
 --------
 
-:doc:`gmt`, :doc:`grdedit`,
-:doc:`grdfft`, :doc:`grdfilter`
+:doc:`gmt`,
+:doc:`grdedit`,
+:doc:`grdfft`,
+:doc:`grdfilter`,
+:doc:`greenspline`,
+:doc:`surface`

doc/rst/source/grdview.rst

@@ -178,7 +178,7 @@ Optional Arguments
 
 .. _-W:
 
-**-W**\ **c**\ |\ **m**\ |\ **f**\ *pen*
+**-W**\ **c**\ \|\ **m**\ \|\ **f**\ *pen*
 
     **-Wc**
         Draw contour lines on top of surface or mesh (not image). Append pen