AUTHORS.md

 # The Founders
 
 GMT was conceived and designed in the late 1980s and early 1990s
-by [Paul Wessel](http://www.soest.hawaii.edu/pwessel/), and
+by [Paul Wessel](http://www.soest.hawaii.edu/pwessel/) and
 [Walter H.F. Smith](https://www.star.nesdis.noaa.gov/star/Smith_WHF.php).
 The two founders built and maintained GMT from version 1 through 3.
 
@@ -24,7 +24,7 @@ contributed the segy supplement, while
 [Kurt Feigl](http://geoscience.wisc.edu/geoscience/people/faculty/feigl/) and
 Genevieve Patau wrote the seis supplement.
 [Dennis Milbert](https://geodesyworld.github.io) donated the Fortran code that
-was translated to become earthtide.c 
+was translated to become earthtide.c.
 [David Sandwell](https://topex.ucsd.edu/sandwell/) contributed the img supplement.
 
 # Further Acknowledgments

BUILDING.md

@@ -39,7 +39,7 @@ To build GMT, you must install:
 - [netCDF](https://www.unidata.ucar.edu/software/netcdf/) (>=4.0, netCDF-4/HDF5 support mandatory)
 - [curl](https://curl.haxx.se/)
 
-Optionally install for more capabilities within GMT:
+Optionally install these for more capabilities within GMT:
 
 - [GDAL](https://www.gdal.org/) (Ability to read and write numerous grid and image formats)
 - [PCRE](https://www.pcre.org/) or PCRE2 (Regular expression support)
@@ -52,13 +52,17 @@ For movie-making capabilities these executables are needed:
 - [GraphicsMagick](http://www.graphicsmagick.org/) (Convert images to animated GIFs)
 - [FFmpeg](http://www.ffmpeg.org/) (Convert images to videos)
 
+For viewing plots and documentation under Linux via gmt docs, your need xdg-open:
+
+- xdg-open (Unified open for a variety of files)
+
 Optionally install for building GMT documentations and running tests:
 
 - [Sphinx](http://www.sphinx-doc.org) (>=1.4.x, for building the manpage, HTML and PDF documentation)
 - [TeXLive](https://www.tug.org/texlive/) (for building the PDF documentation)
 - [GraphicsMagick](http://www.graphicsmagick.org/) (for running the tests)
 
-You also need download support data:
+You also need to download support data:
 
 - [GSHHG](https://www.soest.hawaii.edu/pwessel/gshhg/): A Global Self-consistent, Hierarchical, High-resolution Geography Database (>=2.2.0)
 - [DCW-GMT](https://www.soest.hawaii.edu/pwessel/dcw/): The Digital Chart of the World (optional, >=1.0.5)
@@ -79,6 +83,9 @@ Install the GMT dependencies with:
     # to enable movie-making
     sudo apt-get install graphicsmagick ffmpeg
 
+    # to enable document viewing via gmt docs
+    sudo apt-get install xdg-utils
+
     # to enable testing
     sudo apt-get install graphicsmagick
 
@@ -108,6 +115,9 @@ You then can install the GMT dependencies with:
     sudo yum localinstall --nogpgcheck https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm
     sudo yum install GraphicsMagick ffmpeg
 
+    # to enable document viewing via gmt docs
+    sudo yum install xdg-utils
+
     # to enable testing
     sudo yum install GraphicsMagick
 
@@ -133,6 +143,9 @@ Install the GMT dependencies with:
     sudo dnf install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm
     sudo dnf install GraphicsMagick ffmpeg
 
+    # to enable document viewing via gmt docs
+    sudo dnf install xdg-utils
+
     # to enable testing
     sudo dnf install GraphicsMagick
 
@@ -156,6 +169,9 @@ Install the gmt dependencies with:
     # to enable movie-making
     sudo pacman -S graphicsmagick ffmpeg
 
+    # to enable document viewing via gmt docs
+    sudo pacman -S xdg-utils
+
     # to enable testing
     sudo pacman -S graphicsmagick
 
@@ -176,6 +192,9 @@ Install the gmt dependencies with:
     # to enable movie-making
     sudo pkg install graphics/GraphicsMagick multimedia/ffmpeg
 
+    # to enable document viewing via gmt docs
+    sudo pkg install xdg-utils
+
     # to enable testing
     sudo pkg install graphics/GraphicsMagick
 
@@ -265,9 +284,9 @@ GMT can be built on any platform supported by CMake. CMake is a cross-platform,
 open-source system for managing the build process. The building process is
 controlled by two configuration files in the `cmake` directory:
 
--   *ConfigDefault.cmake*: is version controlled and used to add new default
+-   *ConfigDefault.cmake* is version controlled and used to add new default
     variables and set defaults for everyone. **You should NOT edit this file.**
--   *ConfigUser.cmake*: is not version controlled and used to override defaults
+-   *ConfigUser.cmake* is not version controlled and used to override defaults
     on a per-user basis.
     There is a template file, *ConfigUserTemplate.cmake*, that you should copy
     to *ConfigUser.cmake* and make your changes therein.
@@ -300,7 +319,7 @@ set (CMAKE_C_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE ${CMA
 See the additional comments in `cmake/ConfigUserTemplate.cmake` for more details.
 
 Now that you made your configuration choices, it is time for invoking CMake.
-To keep separately generated files from binary tree and source files from source tree,
+To keep generated files separate from source files in the source tree,
 you should create a build directory in the top-level directory,
 where the build files will be generated, and change into your build directory:
 
@@ -310,7 +329,7 @@ cd build
 cmake ..
 ```
 
-For Windows users, you need open a command prompt and run:
+For Windows users, you need to open a command prompt and run:
 
 ```
 mkdir build

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 "rc2")
+set (GMT_PACKAGE_VERSION_SUFFIX "rc3")
 
 # Whether to make a public release.
 # When making internal releases or just an ordinary developer build, it is set to FALSE.

cmake/dist/CMakeLists.txt

@@ -35,7 +35,11 @@ set (CPACK_PACKAGE_DESCRIPTION_FILE
 	"${CMAKE_CURRENT_SOURCE_DIR}/cpack_package_description.txt")
 
 if (WIN32)
-    set (CPACK_PACKAGE_FILE_NAME "gmt-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}")
+    if (CMAKE_SIZEOF_VOID_P EQUAL 8) # 64 bits
+        set (CPACK_PACKAGE_FILE_NAME "gmt-${CPACK_PACKAGE_VERSION}-win64")
+    elseif (CMAKE_SIZEOF_VOID_P EQUAL 4) # 32 bits
+        set (CPACK_PACKAGE_FILE_NAME "gmt-${CPACK_PACKAGE_VERSION}-win32")
+    endif()
 endif (WIN32)
 if (APPLE)
     set (CPACK_PACKAGE_FILE_NAME "gmt-${CPACK_PACKAGE_VERSION}-darwin-x86_64")

cmake/dist/add_exes_cpack.txt

@@ -3,6 +3,7 @@
 
 SET (PATO_GDAL_BIN  "C:/programs/compa_libs/gdal_GIT/compileds/${VC}_${BITAGE}/bin")
 SET (PATO_PROJ_BIN  "C:/programs/compa_libs/proj5_GIT/compileds/${VC}_${BITAGE}/bin")
+SET (PATO_FFMPEG_BIN  "C:/programs/compa_libs/ffmpeg/vcpkg_bin")
 
 install (PROGRAMS 
 	${PATO_GDAL_BIN}/gdaladdo.exe
@@ -42,3 +43,17 @@ install (PROGRAMS
 	${PATO_PROJ_BIN}/projinfo.exe
 	DESTINATION ${GMT_BINDIR}
 	COMPONENT Runtime)
+
+install (PROGRAMS 
+	${PATO_FFMPEG_BIN}/ffmpeg.exe
+	${PATO_FFMPEG_BIN}/atk-1.dll
+	${PATO_FFMPEG_BIN}/avcodec-58.dll
+	${PATO_FFMPEG_BIN}/avdevice-58.dll
+	${PATO_FFMPEG_BIN}/avfilter-7.dll
+	${PATO_FFMPEG_BIN}/avformat-58.dll
+	${PATO_FFMPEG_BIN}/avutil-56.dll
+	${PATO_FFMPEG_BIN}/swresample-3.dll
+	${PATO_FFMPEG_BIN}/swscale-5.dll
+	${PATO_FFMPEG_BIN}/lzma.dll
+	DESTINATION ${GMT_BINDIR}
+	COMPONENT Runtime)

debian/changelog

-gmt (6.0.0~rc2+dfsg-1~exp2) UNRELEASED; urgency=medium
+gmt (6.0.0~rc3+dfsg-1~exp1) experimental; urgency=medium
 
+  * New upstream release candidate.
   * Update gbp.conf to use --source-only-changes by default.
+  * Bump Standards-Version to 4.4.0, no changes.
+  * Drop spelling-errors.patch, applied upstream.
+  * Update symbols for 6.0.0~rc3.
+  * Drop unused override for pkg-js-tools-test-is-missing.
 
- -- Bas Couwenberg <sebastic@debian.org>  Sun, 07 Jul 2019 08:07:04 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 16 Jul 2019 06:03:19 +0200
 
 gmt (6.0.0~rc2+dfsg-1~exp1) experimental; urgency=medium
 

debian/control

@@ -31,7 +31,7 @@ Build-Depends: debhelper (>= 9.20160114),
                docbook-xsl,
                docbook-xml,
                xsltproc
-Standards-Version: 4.3.0
+Standards-Version: 4.4.0
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/gmt
 Vcs-Git: https://salsa.debian.org/debian-gis-team/gmt.git -b experimental
 Homepage: http://gmt.soest.hawaii.edu/

debian/libgmt6.symbols

@@ -323,7 +323,6 @@ libgmt.so.6 #PACKAGE# #MINVER#
  gmt_chebyshev@Base 5.3.1
  gmt_check_binary_io@Base 5.3.1
  gmt_check_filearg@Base 5.3.1
- gmt_check_if_modern_mode_oneliner@Base 6.0.0~rc1
  gmt_check_region@Base 5.3.1
  gmt_check_scalingopt@Base 5.3.1
  gmt_check_z_io@Base 5.3.1
@@ -778,6 +777,7 @@ libgmt.so.6 #PACKAGE# #MINVER#
  gmt_near_a_point@Base 5.3.1
  gmt_near_lines@Base 5.3.1
  gmt_new_record@Base 6.0.0~rc1
+ gmt_no_pstext_input@Base 6.0.0~rc3
  gmt_non_zero_winding@Base 5.3.1
  gmt_normalize2v@Base 5.3.1
  gmt_normalize3v@Base 5.3.1
@@ -871,6 +871,7 @@ libgmt.so.6 #PACKAGE# #MINVER#
  gmt_remove_dir@Base 5.4.0
  gmt_remove_file@Base 5.4.0
  gmt_rename_file@Base 5.4.0
+ gmt_replace_backslash_in_path@Base 6.0.0~rc3
  gmt_report_usage@Base 6.0.0~rc1
  gmt_resample_data@Base 5.3.1
  gmt_resample_path@Base 5.3.1

debian/patches/series

 disable-triangle.patch
 manpage-section.patch
 use-mathjax-package.patch
-spelling-errors.patch
 incorrect-path-for-interpreter.patch

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
-Applied-Upstream: https://github.com/GenericMappingTools/gmt/pull/1101
-
---- a/src/PSL_prologue.ps
-+++ b/src/PSL_prologue.ps
-@@ -113,7 +113,7 @@
- % Translate and memorize advance
- /PSL_xorig 0 def /PSL_yorig 0 def
- /TM {2 copy T PSL_yorig add /PSL_yorig edef PSL_xorig add /PSL_xorig edef}!
--% To reencode one font with the provided encoding vector
-+% To re-encode one font with the provided encoding vector
- /PSL_reencode {findfont dup length dict begin
-   {1 index /FID ne {def}{pop pop} ifelse} forall
-   exch /Encoding edef currentdict end definefont pop
---- a/src/PSL_strings.h
-+++ b/src/PSL_strings.h
-@@ -1032,7 +1032,7 @@ static char *PSL_prologue_str =
- "% Translate and memorize advance\n"
- "/PSL_xorig 0 def /PSL_yorig 0 def\n"
- "/TM {2 copy T PSL_yorig add /PSL_yorig edef PSL_xorig add /PSL_xorig edef}!\n"
--"% To reencode one font with the provided encoding vector\n"
-+"% To re-encode one font with the provided encoding vector\n"
- "/PSL_reencode {findfont dup length dict begin\n"
- "  {1 index /FID ne {def}{pop pop} ifelse} forall\n"
- "  exch /Encoding edef currentdict end definefont pop\n"
---- a/src/postscriptlight.c
-+++ b/src/postscriptlight.c
-@@ -75,7 +75,7 @@
-  * PSL_setdefaults	   : Change several PSL session default values
-  * PSL_setdash		   : Specify pattern for dashed line
-  * PSL_setfill		   : Sets the fill color or pattern
-- * PSL_setfont		   : Changes current font and possibly reencodes it to current encoding
-+ * PSL_setfont		   : Changes current font and possibly re-encodes it to current encoding
-  * PSL_setformat	   : Changes # of decimals used in color and gray specs [3]
-  * PSL_setlinecap	   : Changes the line cap setting
-  * PSL_setlinejoin	   : Changes the line join setting
-@@ -1465,7 +1465,7 @@ static int psl_putfont (struct PSL_CTRL
- 
- static int psl_encodefont (struct PSL_CTRL *PSL, int font_no) {
- 	if (PSL->init.encoding == NULL) return (PSL_NO_ERROR);		/* Already have StandardEncoding by default */
--	if (PSL->internal.font[font_no].encoded) return (PSL_NO_ERROR);	/* Already reencoded or should not be reencoded ever */
-+	if (PSL->internal.font[font_no].encoded) return (PSL_NO_ERROR);	/* Already re-encoded or should not be re-encoded ever */
- 
- 	/* Re-encode fonts with Standard+ or ISOLatin1[+] encodings */
- 	PSL_command (PSL, "PSL_font_encode %d get 0 eq {%s_Encoding /%s /%s PSL_reencode PSL_font_encode %d 1 put} if", font_no, PSL->init.encoding, PSL->internal.font[font_no].name, PSL->internal.font[font_no].name, font_no);
---- a/src/postscriptlight_f77.c
-+++ b/src/postscriptlight_f77.c
-@@ -64,7 +64,7 @@
-  * PSL_setdefaults	: Change several PSL session default values
-  * PSL_setdash		: Specify pattern for dashed line
-  * PSL_setfill		: Sets the fill color or pattern
-- * PSL_setfont		: Changes current font and possibly reencodes it to current encoding
-+ * PSL_setfont		: Changes current font and possibly re-encodes it to current encoding
-  * PSL_setformat	: Changes # of decimals used in color and gray specs [3]
-  * PSL_setlinecap	: Changes the line cap setting
-  * PSL_setlinejoin	: Changes the line join setting

debian/source/lintian-overrides

@@ -4,6 +4,3 @@ debian-watch-uses-insecure-uri ftp://ftp.soest.hawaii.edu/gmt/
 # Not worth the effort
 testsuite-autopkgtest-missing
 
-# False positive, nodejs is not used
-pkg-js-tools-test-is-missing
-

doc/examples/ex03/example_03.sh

@@ -4,7 +4,7 @@
 # Purpose:	Resample track data, do spectral analysis, and plot
 # GMT modules:	filter1d, fitcircle, gmtconvert, gmtinfo, project, sample1d
 # GMT modules:	spectrum1d, trend1d, pshistogram, psxy, pstext
-# Unix progs:	echo, rm
+# Unix progs:	rm
 #
 # This example begins with data files "ship_03.txt" and "sat_03.txt" which
 # are measurements of a quantity "g" (a "gravity anomaly" which is an
@@ -106,13 +106,12 @@ gmt convert -A samp_ship.pg samp_sat.pg -o1,3 | gmt spectrum1d -S256 -D1 -W -C -
 gmt psxy spectrum.coh -Bxa1f3p+l"Wavelength (km)" -Bya0.25f0.05+l"Coherency@+2@+" \
 	-BWeSn+g240/255/240 -JX-4il/3.75i -R1/1000/0/1 -P -K -X2.5i -Sc0.07i -Gpurple \
 	-Ey+p0.5p -Y1.5i > $ps
-echo "Coherency@+2@+" | gmt pstext -R -J -F+cTR+f18p,Helvetica-Bold -Dj0.1i \
-	-O -K >> $ps
+gmt pstext -R -J -F+cTR+f18p,Helvetica-Bold+tCoherency@+2@+ -Dj0.1i -O -K >> $ps
 gmt psxy spectrum.xpower -Bxa1f3p -Bya1f3p+l"Power (mGal@+2@+km)" \
 	-BWeSn+t"Ship and Satellite Gravity"+g240/255/240 \
 	-Gred -ST0.07i -O -R1/1000/0.1/10000 -JX-4il/3.75il -Y4.2i -K -Ey+p0.5p >> $ps
 gmt psxy spectrum.ypower -R -JX -O -K -Gblue -Sc0.07i -Ey+p0.5p >> $ps
-echo "Input Power" | gmt pstext -R0/4/0/3.75 -Jx1i -F+cTR+f18p,Helvetica-Bold -Dj0.1i -O -K >> $ps
+gmt pstext -R0/4/0/3.75 -Jx1i -F+cTR+f18p,Helvetica-Bold+t"Input Power" -Dj0.1i -O -K >> $ps
 gmt pslegend -R -J -O -DjBL+w1.2i+o0.25i -F+gwhite+pthicker --FONT_ANNOT_PRIMARY=14p,Helvetica-Bold << EOF >> $ps
 S 0.1i T 0.07i red - 0.3i Ship
 S 0.1i c 0.07i blue - 0.3i Satellite
@@ -158,14 +157,12 @@ gmt convert -A samp2_ship.pg samp2_sat.pg -o1,3 | gmt spectrum1d -S256 -D1 -W -C
 gmt psxy spectrum.coh -Bxa1f3p+l"Wavelength (km)" -Bya0.25f0.05+l"Coherency@+2@+" -BWeSn \
 	-JX-4il/3.75i -R1/1000/0/1 -U"Example 3f in Cookbook"+o-2.25i/-1.25i -P -K -X2.5i \
 	-Sc0.07i -Gblack -Ey+p0.5p -Y1.5i > example_03f.ps
-echo "Coherency@+2@+" | gmt pstext -R -J -F+cTR+f18p,Helvetica-Bold -Dj0.1i \
-	-O -K -Wthicker -C0.1i >> example_03f.ps
+gmt pstext -R -J -F+cTR+f18p,Helvetica-Bold+t"Coherency@+2@+" -Dj0.1i -O -K -Wthicker -C0.1i >> example_03f.ps
 gmt psxy -Bxa1f3p -Bya1f3p+l"Power (mGal@+2@+km)" -BWeSn+t"Ship and Satellite Gravity" \
 	spectrum.xpower -ST0.07i -O -R1/1000/0.1/10000 -JX-4il/3.75il -Y4.2i -K -Ey+p0.5p \
 	>> example_03f.ps
 gmt psxy spectrum.ypower -R -J -O -K -Gblack -Sc0.07i -Ey+p0.5p >> example_03f.ps
-echo "Input Power" | gmt pstext -R -J -F+cTR+f18p,Helvetica-Bold -Dj0.1i \
-	-O -K -Wthicker -C0.1i >> example_03f.ps
+gmt pstext -R -J -F+cTR+f18p,Helvetica-Bold+t"Input Power" -Dj0.1i -O -K -Wthicker -C0.1i >> example_03f.ps
 gmt pslegend -R0/4/0/3.75 -Jx -O -DjBL+w1.2i+o0.25i -F+glightgray+pthicker \
 	--FONT_ANNOT_PRIMARY=14p,Helvetica-Bold << EOF >> example_03f.ps
 S 0.1i T 0.07i black - 0.3i Ship

doc/examples/ex40/example_40.sh

@@ -16,7 +16,7 @@ gmt spatial @GSHHS_h_Australia.txt -fg -Qk | $AWK '{printf "Full area = %.0f km@
 gmt spatial T500k.txt -fg -Qk | $AWK '{printf "Reduced area = %.0f km@+2@+\n", $3}' > area_T500k.txt
 gmt psxy -R -J -O -K -W1p,blue T500k.txt >> $ps
 gmt psxy -R -J -O -K -Sx0.3i -W3p centroid.txt >> $ps
-echo T = 500 km | gmt pstext -R -J -O -K -Dj0.1i/0.1i -F+cLT+jTL+f18p >> $ps
+gmt pstext -R -J -O -K -Dj0.1i/0.1i -F+cLT+jTL+f18p+t"T = 500 km" >> $ps
 gmt pstext -R -J -O -K area.txt -F+f14p+cCM >> $ps
 gmt pstext -R -J -O -K area_T500k.txt -F+f14p+cLB -Dj0.2i >> $ps
 gmt psbasemap -R -J -O -K -B20+lightgray -BWsne+g240/255/240 -Y4.7i >> $ps
@@ -26,7 +26,7 @@ gmt simplify @GSHHS_h_Australia.txt -T100k > T100k.txt
 gmt spatial T100k.txt -fg -Qk | $AWK '{printf "Reduced area = %.0f km@+2@+\n", $3}' > area_T100k.txt
 gmt psxy -R -J -O -K -W1p,blue T100k.txt >> $ps
 gmt psxy -R -J -O -K -Sx0.3i -W3p centroid.txt >> $ps
-echo T = 100 km | gmt pstext -R -J -O -K -Dj0.1i/0.1i -F+cLT+jTL+f18p >> $ps
+gmt pstext -R -J -O -K -Dj0.1i/0.1i -F+cLT+jTL+f18p+t"T = 100 km" >> $ps
 gmt pstext -R -J -O -K area.txt -F+f14p+cCM >> $ps
 gmt pstext -R -J -O -K area_T100k.txt -F+f14p+cLB -Dj0.2i >> $ps
 gmt psxy -R -J -O -T >> $ps

doc/examples/ex45/example_45.sh

@@ -3,7 +3,7 @@
 #
 # Purpose:      Illustrate use of trend1d mixed models
 # GMT modules:  pstext, psxy, trend1d
-# Unix progs:   echo, rm
+# Unix progs:   rm
 #
 
 ps=example_45.ps
@@ -11,18 +11,18 @@ ps=example_45.ps
 gmt trend1d -Fxm @MaunaLoa_CO2.txt -Np1 > model.txt
 gmt psxy -R1958/2016/310/410 -JX6i/1.9i -P -Bxaf -Byaf+u" ppm" -BWSne+gazure1 -Sc0.05c -Gred -K @MaunaLoa_CO2.txt -X1.5i > $ps
 gmt psxy -R -J -O -K -W0.5p,blue model.txt >> $ps
-echo "m@-2@-(t) = a + b\264t" | gmt pstext -R -J -O -K -F+f12p+cTL -Dj0.1i -Glightyellow >> $ps
+gmt pstext -R -J -O -K -F+f12p+cTL+t"m@-2@-(t) = a + b\264t" -Dj0.1i -Glightyellow >> $ps
 # Basic LS line y = a + bx + cx^2
 gmt trend1d -Fxm @MaunaLoa_CO2.txt -Np2 > model.txt
 gmt psxy -R -J -O -Bxaf -Byaf+u" ppm" -BWSne+gazure1 -Sc0.05c -Gred -K @MaunaLoa_CO2.txt -Y2.3i >> $ps
 gmt psxy -R -J -O -K -W0.5p,blue model.txt >> $ps
-echo "m@-3@-(t) = a + b\264t + c\264t@+2@+" | gmt pstext -R -J -O -K -F+f12p+cTL -Dj0.1i -Glightyellow >> $ps
+gmt pstext -R -J -O -K -F+f12p+cTL+t"m@-3@-(t) = a + b\264t + c\264t@+2@+" -Dj0.1i -Glightyellow >> $ps
 # Basic LS line y = a + bx + cx^2 + seasonal change
 gmt trend1d -Fxmr @MaunaLoa_CO2.txt -Np2,f1+o1958+l1 > model.txt
 gmt psxy -R -J -O -Bxaf -Byaf+u" ppm" -BWSne+gazure1 -Sc0.05c -Gred -K @MaunaLoa_CO2.txt -Y2.3i >> $ps
 gmt psxy -R -J -O -K -W0.25p,blue model.txt >> $ps
-echo "m@-5@-(t) = a + b\264t + c\264t@+2@+ + d\264cos(2@~p@~t) + e\264sin(2@~p@~t)" | gmt pstext -R -J -O -K -F+f12p+cTL -Dj0.1i -Glightyellow >> $ps
+gmt pstext -R -J -O -K -F+f12p+cTL+t"m@-5@-(t) = a + b\264t + c\264t@+2@+ + d\264cos(2@~p@~t) + e\264sin(2@~p@~t)" -Dj0.1i -Glightyellow >> $ps
 # Plot residuals of last model
 gmt psxy -R1958/2016/-4/4 -J -O -Bxaf -Byafg10+u" ppm" -BWSne+t"The Keeling Curve [CO@-2@- at Mauna Loa]"+gazure1 -Sc0.05c -Gred -K model.txt -i0,2 -Y2.3i >> $ps
-echo "@~e@~(t) = y(t) - m@-5@-(t)" | gmt pstext -R -J -O -F+f12p+cTL -Dj0.1i -Glightyellow >> $ps
+gmt pstext -R -J -O -F+f12p+cTL+t"@~e@~(t) = y(t) - m@-5@-(t)" -Dj0.1i -Glightyellow >> $ps
 rm -f model.txt

doc/examples/ex47/example_47.sh

@@ -38,9 +38,9 @@ plot_one -Eo -Nr wesn -Xa5.4i -Ya3.2i >> $ps
 plot_one -Ex -Nr wesn -Xa5.4i -Ya5.4i >> $ps
 plot_one -Ey -Nr wesn+tLMS -Xa5.4i -Ya7.6i >> $ps
 # Labels
-echo REDUCED MAJOR AXIS | gmt pstext -R -J -O -K -F+cRM+jTC+a90 -N -Dj0.2i -Xa5.4i -Ya1i >> $ps
-echo ORTHOGONAL | gmt pstext -R -J -O -K -F+cRM+jTC+a90 -N -Dj0.2i -Xa5.4i -Ya3.2i >> $ps
-echo X ON Y | gmt pstext -R -J -O -K -F+cRM+jTC+a90 -N -Dj0.2i -Xa5.4i -Ya5.4i >> $ps
-echo Y ON X | gmt pstext -R -J -O -K -F+cRM+jTC+a90 -N -Dj0.2i -Xa5.4i -Ya7.6i >> $ps
+gmt pstext -R -J -O -K -F+cRM+jTC+a90+t"REDUCED MAJOR AXIS" -N -Dj0.2i -Xa5.4i -Ya1i >> $ps
+gmt pstext -R -J -O -K -F+cRM+jTC+a90+tORTHOGONAL -N -Dj0.2i -Xa5.4i -Ya3.2i >> $ps
+gmt pstext -R -J -O -K -F+cRM+jTC+a90+t"X ON Y" -N -Dj0.2i -Xa5.4i -Ya5.4i >> $ps
+gmt pstext -R -J -O -K -F+cRM+jTC+a90+t"Y ON X" -N -Dj0.2i -Xa5.4i -Ya7.6i >> $ps
 gmt psxy -R -J -O -T >> $ps
 rm -f tmp data giants

doc/examples/ex50/example_50.sh

@@ -71,7 +71,7 @@ gmt psxy -R0/6/0/1.02 -J -O -K p.txt -L+yb -Glightred -W1p -BES -Bxa1 -Byaf -Y0.
 # Plot Chi-squared cumulative distribution
 gmt math -T0/12/0.1 T 4 CHI2CDF = p.txt
 gmt psxy -R0/12/0/1.02 -J -O -K p.txt -L+yb -Glightred -W1p -BES -Bxa1 -Byaf -Y0.9i >> $ps
-echo "Probability @;lightgreen;Density@;; and @;lightred;Cumulative@;; Distribution Functions" | gmt pstext -R0/6.5/0/1.25 -Jx1i -N -X-3.5i -O -K -F+f18p+cTC >> $ps
+gmt pstext -R0/6.5/0/1.25 -Jx1i -N -X-3.5i -O -K -F+f18p+cTC+t"Probability @;lightgreen;Density@;; and @;lightred;Cumulative@;; Distribution Functions" >> $ps
 gmt pstext -R0/6.5/0/10 -J -O -F+f14p,Times-Italic+jTC -Dj0.35i -N -Y-8.1i << EOF >> $ps
 3.25 0.9 Binomial P@-8,0.25@-
 3.25 1.8 Poisson P(@~l=2@~)

doc/rst/source/GMT_Docs.rst

@@ -4286,7 +4286,7 @@ Variable $GMT_DATADIR and parameter DIR_DATA
     the current directory. This allows maintainers to consolidate large
     data files and to simplify scripting that use these files since the
     absolute path need not be specified. Separate multiple directories
-    with colons (:) – under Windows use semi-colons (;). Any directory
+    with commas. Any directory
     name that ends in a trailing slash (/) will be searched recursively
     (not under Windows).
 

doc/rst/source/GMT_Docs_classic.rst

@@ -4335,7 +4335,7 @@ Variable $GMT_DATADIR and parameter DIR_DATA
     the current directory. This allows maintainers to consolidate large
     data files and to simplify scripting that use these files since the
     absolute path need not be specified. Separate multiple directories
-    with colons (:) – under Windows use semi-colons (;). Any directory
+    with commas. Any directory
     name that ends in a trailing slash (/) will be searched recursively
     (not under Windows).
 

doc/rst/source/coast.rst

@@ -30,7 +30,6 @@ Synopsis
 [ |-Q| ]
 [ |-S|\ *fill*\ \|\ **c** ]
 [ |-T|\ *rose* ]
-[ |-T|\ *mag_rose* ]
 [ |SYN_OPT-U| ]
 [ |SYN_OPT-V| ]
 [ |-W|\ [*level*/]\ *pen* ]