[gmt] 01/07: New upstream version 5.4.3+dfsg
Bas Couwenberg
sebastic at debian.org
Wed Jan 3 10:08:49 UTC 2018
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository gmt.
commit 1f419ee618ab9b15ccad3fff492e01e6b1c99120
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Jan 3 07:51:46 2018 +0100
New upstream version 5.4.3+dfsg
---
CMakeLists.txt | 4 +-
README | 4 +-
README.CMake | 4 +-
cmake/ConfigDefault.cmake | 10 +-
cmake/ConfigUserTemplate.cmake | 4 +-
cmake/dist/CMakeLists.txt | 4 +-
cmake/modules/CopyDirIfDifferent.cmake | 4 +-
cmake/modules/CreateDebugSym.cmake | 4 +-
cmake/modules/GmtGenExtraHeaders.cmake | 4 +-
cmake/modules/GmtHelperMacros.cmake | 4 +-
cmake/modules/ManageString.cmake | 4 +-
doc/CMakeLists.txt | 4 +-
doc/examples/CMakeLists.txt | 4 +-
doc/examples/animate.in | 13 +-
doc/examples/ex14/example_14.ps | 47 +-
doc/examples/ex19/example_19.bat | 10 +-
doc/examples/ex19/example_19.ps | 14 +-
doc/examples/ex19/example_19.sh | 10 +-
doc/examples/ex31/example_31.ps | 22 +-
doc/fig/CMakeLists.txt | 4 +-
doc/rst/CMakeLists.txt | 4 +-
doc/rst/source/GMT_Docs.rst | 2 +-
doc/rst/source/explain_-B_full.rst_ | 2 +-
doc/rst/source/gmt.conf.rst | 4 +-
doc/rst/source/gmtinfo.rst | 7 +-
doc/rst/source/grdcontour.rst | 15 +-
doc/rst/source/grdlandmask.rst | 12 +
doc/rst/source/grdmask.rst | 12 +
doc/rst/source/grdview.rst | 5 +-
doc/rst/source/makecpt.rst | 13 +-
doc/rst/source/pstext.rst | 2 +-
doc/rst/source/std_opts.rst_ | 2 +-
doc/rst/source/supplements/img/img2grd.rst | 4 +-
doc/rst/source/xyz2grd.rst | 7 +
doc/scripts/CMakeLists.txt | 4 +-
doc/scripts/GMT_App_P_1.ps | 1018 +++++++++++-----------
doc/scripts/GMT_App_P_2.ps | 1279 ++++++++++++----------------
doc/scripts/GMT_mapscale.ps | 103 ++-
doc/tutorial/CMakeLists.txt | 2 +-
share/CMakeLists.txt | 4 +-
share/tools/CMakeLists.txt | 4 +-
share/tools/gmt5syntax.in | 4 +-
share/tools/gmt_aliases.csh | 4 +-
share/tools/gmt_completion.bash | 4 +-
share/tools/gmt_functions.sh | 4 +-
share/tools/gmt_links.sh | 4 +-
share/tools/gmt_make_custom_code.sh | 2 +-
share/tools/gmt_prepmex.sh | 4 +-
share/tools/gmt_uninstall.sh | 4 +-
share/tools/ncdeflate | 4 +-
src/CMakeLists.txt | 4 +-
src/block_subs.h | 4 +-
src/blockmean.c | 4 +-
src/blockmedian.c | 4 +-
src/blockmode.c | 4 +-
src/common_byteswap.h | 4 +-
src/common_math.c | 4 +-
src/common_math.h | 4 +-
src/common_runpath.c | 4 +-
src/common_runpath.h | 4 +-
src/common_sighandler.c | 4 +-
src/common_sighandler.h | 4 +-
src/common_string.c | 4 +-
src/common_string.h | 4 +-
src/compat/qsort.h | 4 +-
src/config.h.in | 8 +-
src/declspec.h | 4 +-
src/filter1d.c | 4 +-
src/fitcircle.c | 4 +-
src/gmt-config.in | 4 +-
src/gmt.c | 4 +-
src/gmt.h | 4 +-
src/gmt2kml.c | 4 +-
src/gmt_agc_io.c | 4 +-
src/gmt_api.c | 37 +-
src/gmt_bcr.c | 4 +-
src/gmt_calclock.c | 4 +-
src/gmt_cdf.c | 4 +-
src/gmt_common.h | 4 +-
src/gmt_compat.c | 4 +-
src/gmt_config.h.in | 4 +-
src/gmt_constants.h | 4 +-
src/gmt_contour.h | 4 +-
src/gmt_core_module.c | 4 +-
src/gmt_core_module.h | 4 +-
src/gmt_customio.c | 4 +-
src/gmt_customio.h | 4 +-
src/gmt_dcw.c | 4 +-
src/gmt_dcw.h | 4 +-
src/gmt_decorate.h | 4 +-
src/gmt_defaults.h | 4 +-
src/gmt_dev.h | 4 +-
src/gmt_dimensions.h.in | 4 +-
src/gmt_error.c | 4 +-
src/gmt_error.h | 4 +-
src/gmt_error_codes.c | 4 +-
src/gmt_error_codes.h | 4 +-
src/gmt_esri_io.c | 4 +-
src/gmt_fft.c | 4 +-
src/gmt_fft.h | 4 +-
src/gmt_gdal_librarified.c | 4 +-
src/gmt_gdalread.c | 6 +-
src/gmt_gdalread.h | 4 +-
src/gmt_gdalwrite.c | 4 +-
src/gmt_glib.h | 4 +-
src/gmt_grd.h | 4 +-
src/gmt_grdio.c | 61 +-
src/gmt_grdio.h | 7 +-
src/gmt_hash.h | 4 +-
src/gmt_init.c | 551 +++++-------
src/gmt_internals.h | 4 +-
src/gmt_io.c | 9 +-
src/gmt_io.h | 4 +-
src/gmt_macros.h | 4 +-
src/gmt_make_module_src.sh | 2 +-
src/gmt_map.c | 4 +-
src/gmt_memory.c | 4 +-
src/gmt_memory.h | 4 +-
src/gmt_nan.h | 4 +-
src/gmt_nc.c | 10 +-
src/gmt_notposix.c | 4 +-
src/gmt_notposix.h | 8 +-
src/gmt_parse.c | 12 +-
src/gmt_plot.c | 4 +-
src/gmt_plot.h | 4 +-
src/gmt_private.h | 4 +-
src/gmt_proj.c | 6 +-
src/gmt_project.h | 4 +-
src/gmt_prototypes.h | 6 +-
src/gmt_psl.h | 4 +-
src/gmt_regexp.c | 4 +-
src/gmt_resources.h | 4 +-
src/gmt_sharedlibs.c | 4 +-
src/gmt_sharedlibs.h | 4 +-
src/gmt_shore.c | 4 +-
src/gmt_shore.h | 4 +-
src/gmt_sph.c | 4 +-
src/gmt_sph.h | 4 +-
src/gmt_stat.c | 36 +-
src/gmt_supplements_module.c | 4 +-
src/gmt_supplements_module.h | 4 +-
src/gmt_support.c | 65 +-
src/gmt_symbol.h | 4 +-
src/gmt_synopsis.h | 4 +-
src/gmt_texture.h | 4 +-
src/gmt_time.h | 4 +-
src/gmt_types.h | 4 +-
src/gmt_vector.c | 4 +-
src/gmt_version.h.in | 4 +-
src/gmtconnect.c | 4 +-
src/gmtconvert.c | 4 +-
src/gmtdefaults.c | 4 +-
src/gmtget.c | 4 +-
src/gmtinfo.c | 4 +-
src/gmtlogo.c | 4 +-
src/gmtmath.c | 46 +-
src/gmtmath.h.in | 4 +-
src/gmtmath_explain.h.in | 4 +-
src/gmtmath_op.h.in | 4 +-
src/gmtread.c | 6 +-
src/gmtregress.c | 4 +-
src/gmtselect.c | 4 +-
src/gmtset.c | 4 +-
src/gmtsimplify.c | 4 +-
src/gmtspatial.c | 4 +-
src/gmtswitch | 6 +-
src/gmtswitch.bat | 4 +-
src/gmtvector.c | 4 +-
src/gmtwhich.c | 4 +-
src/gmtwrite.c | 4 +-
src/grd2cpt.c | 4 +-
src/grd2rgb.c | 4 +-
src/grd2sph.c.template | 4 +-
src/grd2xyz.c | 4 +-
src/grdblend.c | 22 +-
src/grdclip.c | 4 +-
src/grdcontour.c | 13 +-
src/grdconvert.c | 11 +-
src/grdcut.c | 4 +-
src/grdedit.c | 4 +-
src/grdfft.c | 4 +-
src/grdfill.c | 4 +-
src/grdfilter.c | 4 +-
src/grdfilter_mt.c | 4 +-
src/grdgradient.c | 4 +-
src/grdhisteq.c | 4 +-
src/grdimage.c | 14 +-
src/grdinfo.c | 4 +-
src/grdlandmask.c | 4 +-
src/grdmask.c | 4 +-
src/grdmath.c | 6 +-
src/grdmath.h.in | 4 +-
src/grdmath_explain.h.in | 4 +-
src/grdmath_op.h.in | 4 +-
src/grdpaste.c | 4 +-
src/grdproject.c | 17 +-
src/grdraster.c | 4 +-
src/grdsample.c | 4 +-
src/grdtrack.c | 4 +-
src/grdtrend.c | 4 +-
src/grdvector.c | 7 +-
src/grdview.c | 8 +-
src/grdvolume.c | 4 +-
src/greenspline.c | 4 +-
src/gshhg/CMakeLists.txt | 4 +-
src/gshhg/gmt_gshhg.h | 4 +-
src/gshhg/gshhg.c | 4 +-
src/gshhg/gshhg.h | 4 +-
src/gshhg_version.c | 4 +-
src/gshhg_version.h | 4 +-
src/img/CMakeLists.txt | 4 +-
src/img/img2google | 4 +-
src/img/img2grd.c | 4 +-
src/isogmt.in | 4 +-
src/kml2gmt.c | 4 +-
src/makecpt.c | 4 +-
src/mapproject.c | 4 +-
src/meca/CMakeLists.txt | 4 +-
src/meca/meca.h | 3 +-
src/meca/pscoupe.c | 3 +-
src/meca/psmeca.c | 8 +-
src/meca/pspolar.c | 3 +-
src/meca/pssac.c | 13 +-
src/meca/psvelo.c | 3 +-
src/meca/utilmeca.c | 3 +-
src/meca/utilmeca.h | 3 +-
src/mgd77/CMakeLists.txt | 4 +-
src/mgd77/mgd77.c | 11 +-
src/mgd77/mgd77.h | 4 +-
src/mgd77/mgd77_IGF_coeffs.h | 4 +-
src/mgd77/mgd77_codes.h | 4 +-
src/mgd77/mgd77_e77.h | 4 +-
src/mgd77/mgd77_functions.c | 4 +-
src/mgd77/mgd77_functions.h | 4 +-
src/mgd77/mgd77_init.h | 4 +-
src/mgd77/mgd77_recalc.h | 4 +-
src/mgd77/mgd77_rls_coeffs.h | 4 +-
src/mgd77/mgd77convert.c | 4 +-
src/mgd77/mgd77defaults.h | 2 +-
src/mgd77/mgd77header.c | 4 +-
src/mgd77/mgd77info.c | 4 +-
src/mgd77/mgd77list.c | 4 +-
src/mgd77/mgd77magref.c | 4 +-
src/mgd77/mgd77magref.h | 4 +-
src/mgd77/mgd77manage.c | 4 +-
src/mgd77/mgd77netcdfhelper.sh | 6 +-
src/mgd77/mgd77path.c | 4 +-
src/mgd77/mgd77sniffer.c | 67 +-
src/mgd77/mgd77sniffer.h | 4 +-
src/mgd77/mgd77snifferdefaults.h | 4 +-
src/mgd77/mgd77track.c | 4 +-
src/misc/CMakeLists.txt | 4 +-
src/nearneighbor.c | 4 +-
src/postscriptlight.c | 4 +-
src/postscriptlight.h | 4 +-
src/postscriptlight_f77.c | 4 +-
src/potential/CMakeLists.txt | 4 +-
src/potential/gmtflexure.c | 4 +-
src/potential/gmtgravmag3d.c | 4 +-
src/potential/gpsgridder.c | 4 +-
src/potential/gravfft.c | 4 +-
src/potential/grdflexure.c | 4 +-
src/potential/grdgravmag3d.c | 4 +-
src/potential/grdredpol.c | 4 +-
src/potential/grdseamount.c | 4 +-
src/potential/okbfuns.c | 4 +-
src/potential/okbfuns.h | 4 +-
src/potential/talwani.h | 4 +-
src/potential/talwani2d.c | 4 +-
src/potential/talwani3d.c | 4 +-
src/project.c | 13 +-
src/psbasemap.c | 4 +-
src/psclip.c | 4 +-
src/pscoast.c | 8 +-
src/pscontour.c | 17 +-
src/psconvert.c | 5 +-
src/pshistogram.c | 4 +-
src/psimage.c | 4 +-
src/psl_config.h.in | 4 +-
src/psldemo.h.in | 4 +-
src/pslegend.c | 4 +-
src/psmask.c | 4 +-
src/psrose.c | 4 +-
src/psscale.c | 6 +-
src/pssolar.c | 4 +-
src/psternary.c | 4 +-
src/pstext.c | 4 +-
src/pswiggle.c | 4 +-
src/psxy.c | 6 +-
src/psxyz.c | 4 +-
src/sample1d.c | 4 +-
src/script2verbatim.c | 4 +-
src/segy/CMakeLists.txt | 4 +-
src/segy/pssegy.c | 4 +-
src/segy/pssegyz.c | 4 +-
src/segy/segy2grd.c | 4 +-
src/spectrum1d.c | 4 +-
src/sph2grd.c | 4 +-
src/sphdistance.c | 4 +-
src/sphinterpolate.c | 4 +-
src/sphtriangulate.c | 4 +-
src/splitxyz.c | 4 +-
src/spotter/CMakeLists.txt | 4 +-
src/spotter/backtracker.c | 4 +-
src/spotter/gmtpmodeler.c | 4 +-
src/spotter/grdpmodeler.c | 4 +-
src/spotter/grdrotater.c | 4 +-
src/spotter/grdspotter.c | 4 +-
src/spotter/hotspotter.c | 4 +-
src/spotter/libspotter.c | 4 +-
src/spotter/originator.c | 4 +-
src/spotter/rotconverter.c | 4 +-
src/spotter/rotsmoother.c | 4 +-
src/spotter/spotter.h | 4 +-
src/surface.c | 4 +-
src/surface_mt.c | 2 +-
src/testapi.c | 4 +-
src/testapiconv.c | 4 +-
src/testgmt5.c | 4 +-
src/testgmtio.c | 4 +-
src/testgrdio.c | 4 +-
src/testio.c | 4 +-
src/testpsl.c | 4 +-
src/trend1d.c | 4 +-
src/trend2d.c | 4 +-
src/triangulate.c | 4 +-
src/x2sys/CMakeLists.txt | 4 +-
src/x2sys/split_file4coes.m | 4 +-
src/x2sys/x2sys.c | 4 +-
src/x2sys/x2sys.h | 4 +-
src/x2sys/x2sys_binlist.c | 4 +-
src/x2sys/x2sys_cross.c | 4 +-
src/x2sys/x2sys_datalist.c | 4 +-
src/x2sys/x2sys_get.c | 4 +-
src/x2sys/x2sys_init.c | 4 +-
src/x2sys/x2sys_list.c | 4 +-
src/x2sys/x2sys_merge.c | 4 +-
src/x2sys/x2sys_put.c | 4 +-
src/x2sys/x2sys_report.c | 4 +-
src/x2sys/x2sys_solve.c | 4 +-
src/xyz2grd.c | 4 +-
341 files changed, 2359 insertions(+), 2504 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1508ab7..91b93d2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
#
-# $Id: CMakeLists.txt 18037 2017-04-25 04:04:41Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/README b/README
index bd5af97..5cfc051 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-$Id: README 18132 2017-05-05 03:05:46Z pwessel $
+$Id: README 19521 2017-12-27 22:38:24Z pwessel $
== Information for installing GMT 5 ==
@@ -98,9 +98,7 @@ SOEST, U. of Hawaii ftp.soest.hawaii.edu
Lab for Satellite Altimetry, NOAA ibis.grdl.noaa.gov
IRIS, Washington, US ftp.iris.washington.edu
IAG-USP, U. of Sao Paulo, BRAZIL ftp.iag.usp.br
-Dep. Geology, U. in Oslo, NORWAY ftp.geologi.uio.no
ISV, Hokkaido U, Sapporo, JAPAN ftp.eos.hokudai.ac.jp
-GDS, Vienna U. of Technology, AUSTRIA gd.tuwien.ac.at
TENET, Tertiary Education & Research Networks, SOUTH AFRICA
gmt.mirror.ac.za
diff --git a/README.CMake b/README.CMake
index d825528..d3b0794 100644
--- a/README.CMake
+++ b/README.CMake
@@ -1,7 +1,7 @@
////
-$Id: README.CMake 18132 2017-05-05 03:05:46Z pwessel $
+$Id: README.CMake 19521 2017-12-27 22:38:24Z pwessel $
-Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis
+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.
Contact info: http://gmt.soest.hawaii.edu/
diff --git a/cmake/ConfigDefault.cmake b/cmake/ConfigDefault.cmake
index fa5f320..fae417b 100644
--- a/cmake/ConfigDefault.cmake
+++ b/cmake/ConfigDefault.cmake
@@ -1,7 +1,7 @@
#
-# $Id: ConfigDefault.cmake 18461 2017-06-25 01:18:55Z pwessel $
+# $Id: ConfigDefault.cmake 19529 2017-12-28 08:30:55Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
@@ -37,18 +37,18 @@ set (GMT_PACKAGE_DESCRIPTION_SUMMARY "The Generic Mapping Tools")
# GMT_VERSION_YEAR is set to current date in
# cmake/modules/ConfigCMake.cmake if not specified here:
-set (GMT_VERSION_YEAR "2017")
+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 2)
+set (GMT_PACKAGE_VERSION_PATCH 3)
# 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 "18461")
+set (GMT_SOURCE_CODE_CONTROL_VERSION_STRING "19528")
#set (GMT_SOURCE_CODE_CONTROL_VERSION_STRING "")
# The GMT package version.
diff --git a/cmake/ConfigUserTemplate.cmake b/cmake/ConfigUserTemplate.cmake
index 44d8d17..1310958 100644
--- a/cmake/ConfigUserTemplate.cmake
+++ b/cmake/ConfigUserTemplate.cmake
@@ -1,7 +1,7 @@
#
-# $Id: ConfigUserTemplate.cmake 18366 2017-06-12 01:57:16Z pwessel $
+# $Id: ConfigUserTemplate.cmake 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify it
diff --git a/cmake/dist/CMakeLists.txt b/cmake/dist/CMakeLists.txt
index a271b70..c1b7d60 100644
--- a/cmake/dist/CMakeLists.txt
+++ b/cmake/dist/CMakeLists.txt
@@ -1,7 +1,7 @@
#
-# $Id: CMakeLists.txt 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/cmake/modules/CopyDirIfDifferent.cmake b/cmake/modules/CopyDirIfDifferent.cmake
index 255fef5..c48d89f 100644
--- a/cmake/modules/CopyDirIfDifferent.cmake
+++ b/cmake/modules/CopyDirIfDifferent.cmake
@@ -1,7 +1,7 @@
#
-# $Id: CopyDirIfDifferent.cmake 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: CopyDirIfDifferent.cmake 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/cmake/modules/CreateDebugSym.cmake b/cmake/modules/CreateDebugSym.cmake
index 4c33449..3d1ff9e 100644
--- a/cmake/modules/CreateDebugSym.cmake
+++ b/cmake/modules/CreateDebugSym.cmake
@@ -1,5 +1,5 @@
#
-# $Id: CreateDebugSym.cmake 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: CreateDebugSym.cmake 19521 2017-12-27 22:38:24Z pwessel $
#
# - Generates Mac .dSYM bundle
# CREATE_DEBUG_SYM ( DESTINATION TARGETS )
@@ -7,7 +7,7 @@
# DESTINATION - destination directory for installed targets
# TARGETS - list of targets
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/cmake/modules/GmtGenExtraHeaders.cmake b/cmake/modules/GmtGenExtraHeaders.cmake
index 0e40d15..952dcff 100644
--- a/cmake/modules/GmtGenExtraHeaders.cmake
+++ b/cmake/modules/GmtGenExtraHeaders.cmake
@@ -1,10 +1,10 @@
#
-# $Id: GmtGenExtraHeaders.cmake 18101 2017-05-01 07:09:55Z pwessel $
+# $Id: GmtGenExtraHeaders.cmake 19521 2017-12-27 22:38:24Z pwessel $
#
# - Generates extra header files
# GMT_CREATE_HEADERS ()
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/cmake/modules/GmtHelperMacros.cmake b/cmake/modules/GmtHelperMacros.cmake
index 9e7a1a2..87ce45e 100644
--- a/cmake/modules/GmtHelperMacros.cmake
+++ b/cmake/modules/GmtHelperMacros.cmake
@@ -1,9 +1,9 @@
#
-# $Id: GmtHelperMacros.cmake 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: GmtHelperMacros.cmake 19521 2017-12-27 22:38:24Z pwessel $
#
# - Useful CMake macros
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/cmake/modules/ManageString.cmake b/cmake/modules/ManageString.cmake
index 828f112..dbf2dc8 100644
--- a/cmake/modules/ManageString.cmake
+++ b/cmake/modules/ManageString.cmake
@@ -1,5 +1,5 @@
#
-# $Id: ManageString.cmake 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: ManageString.cmake 19521 2017-12-27 22:38:24Z pwessel $
#
# - Collection of String utility macros.
# Defines the following macros:
@@ -78,7 +78,7 @@
# + PADDING: (Optional) apply padding at the location by the marker
# string PADDING
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 88e18dc..371c3f2 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -1,7 +1,7 @@
#
-# $Id: CMakeLists.txt 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/doc/examples/CMakeLists.txt b/doc/examples/CMakeLists.txt
index 186d013..2098423 100644
--- a/doc/examples/CMakeLists.txt
+++ b/doc/examples/CMakeLists.txt
@@ -1,7 +1,7 @@
#
-# $Id: CMakeLists.txt 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/doc/examples/animate.in b/doc/examples/animate.in
index b081c41..c1f25ec 100755
--- a/doc/examples/animate.in
+++ b/doc/examples/animate.in
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# $Id: animate.in 13990 2015-01-26 18:00:58Z pwessel $
+# $Id: animate.in 18471 2017-06-26 23:37:11Z pwessel $
#
# Bash script for creating videos of the animation examples.
# The videos will optionally be included in the RST gallery.
@@ -72,11 +72,16 @@ exec_dir="@CMAKE_CURRENT_BINARY_DIR@/${script_dir}"
rm -rf "$exec_dir"
mkdir -p "$exec_dir"
cd "$exec_dir"
-GLOBIGNORE="*.bat:*.ps:*.sh"
-for file in "$src"/* ; do
+# The GLOBIGNORE is not working for Paul on OSX - unknown why.
+# Until this can be solved I have replaced it with an egrep.
+#GLOBIGNORE="*.bat:*.ps:*.sh"
+#for file in "$src"/* ; do
+# test -f "$file" && ln -s "$file" .
+#done
+#unset GLOBIGNORE
+for file in `ls "$src"/* | egrep -v '.bat$|.ps$|.sh$'` ; do
test -f "$file" && ln -s "$file" .
done
-unset GLOBIGNORE
# Start with proper GMT defaults
gmt set -Du FORMAT_TIME_STAMP "Version 5"
diff --git a/doc/examples/ex14/example_14.ps b/doc/examples/ex14/example_14.ps
index 4206645..f26850a 100644
--- a/doc/examples/ex14/example_14.ps
+++ b/doc/examples/ex14/example_14.ps
@@ -1,11 +1,11 @@
%!PS-Adobe-3.0
%%BoundingBox: 0 0 612 792
%%HiResBoundingBox: 0 0 612 792
-%%Title: GMT v5.4.0_r17581M [64-bit] Document from psxy
+%%Title: GMT v5.4.3_r18644M [64-bit] Document from psxy
%%Creator: GMT5
-%%For: pwessel
+%%For: unknown
%%DocumentNeededResources: font Helvetica
-%%CreationDate: Thu Feb 23 10:53:19 2017
+%%CreationDate: Wed Jul 26 15:59:13 2017
%%LanguageLevel: 2
%%DocumentData: Clean7Bit
%%Orientation: Portrait
@@ -674,6 +674,7 @@ clipsave
3672 0 D
0 3780 D
-3672 0 D
+P
PSL_clip N
4 W
V
@@ -1013,6 +1014,7 @@ clipsave
3672 0 D
0 3780 D
-3672 0 D
+P
PSL_clip N
4 W
V
@@ -1512,6 +1514,7 @@ clipsave
3672 0 D
0 3780 D
-3672 0 D
+P
PSL_clip N
/PSL_setboxpen {4 W 0 A [] 0 B} def
/PSL_setboxrgb {1 A} def
@@ -1938,6 +1941,7 @@ PSL_path_pen 15 get cvx exec
S
PSL_cliprestore
U
+[] 0 B
PSL_cliprestore
25 W
2 setlinecap
@@ -2054,6 +2058,7 @@ clipsave
3672 0 D
0 3780 D
-3672 0 D
+P
PSL_clip N
4 W
V
@@ -2118,6 +2123,7 @@ clipsave
3672 0 D
0 3780 D
-3672 0 D
+P
PSL_clip N
/PSL_setboxpen {4 W 0 A [] 0 B} def
/PSL_setboxrgb {1 A} def
@@ -2521,6 +2527,7 @@ PSL_path_pen 11 get cvx exec
S
PSL_cliprestore
U
+[] 0 B
PSL_cliprestore
25 W
2 setlinecap
@@ -2644,12 +2651,12 @@ O0
3.32551 setmiterlimit
17 W
0 1253 M
-151 -67 D
-151 -61 D
-76 -28 D
-151 -50 D
-303 -90 D
-151 -48 D
+151 -64 D
+151 -60 D
+152 -54 D
+75 -25 D
+378 -117 D
+76 -24 D
151 -56 D
76 -33 D
226 -110 D
@@ -2687,11 +2694,11 @@ O0
227 34 D
75 12 D
152 31 D
-226 53 D
-227 59 D
-151 42 D
-152 47 D
-226 76 D
+151 35 D
+227 58 D
+226 65 D
+227 70 D
+151 49 D
S
25 W
2 setlinecap
@@ -2830,10 +2837,10 @@ O0
8 W
[67 33] 0 B
0 1552 M
-76 -53 D
-226 -165 D
-454 -319 D
-151 -103 D
+227 -157 D
+302 -215 D
+227 -164 D
+151 -104 D
76 -48 D
75 -44 D
152 -81 D
@@ -2862,8 +2869,8 @@ O0
226 11 D
152 4 D
226 -1 D
-303 -2 D
-227 1 D
+378 -2 D
+152 1 D
226 5 D
S
[] 0 B
diff --git a/doc/examples/ex19/example_19.bat b/doc/examples/ex19/example_19.bat
index 83616be..22e4af5 100755
--- a/doc/examples/ex19/example_19.bat
+++ b/doc/examples/ex19/example_19.bat
@@ -1,6 +1,6 @@
REM GMT EXAMPLE 19
REM
-REM $Id: example_19.bat 16792 2016-07-13 21:12:21Z pwessel $
+REM $Id: example_19.bat 18857 2017-09-06 01:07:34Z pwessel $
REM
REM Purpose: Illustrates various color pattern effects for maps
REM GMT progs: grdimage, grdmath, makecpt, pscoast, pstext, psimage
@@ -19,9 +19,9 @@ gmt pscoast -R -J -O -K -Dc -A5000 -Gc >> %ps%
gmt grdimage lon.nc -J -Clon.cpt -O -K -nl >> %ps%
gmt pscoast -R -J -O -K -Q >> %ps%
gmt pscoast -R -J -O -K -Dc -A5000 -Wthinnest >> %ps%
-echo 0 20 14TH INTERNATIONAL | gmt pstext -R -J -O -K -F+f32p,Helvetica-Bold,red=thinner >> %ps%
+echo 0 20 15TH INTERNATIONAL | gmt pstext -R -J -O -K -F+f32p,Helvetica-Bold,red=thinner >> %ps%
echo 0 -10 GMT CONFERENCE | gmt pstext -R -J -O -K -F+f32p,Helvetica-Bold,red=thinner >> %ps%
-echo 0 -30 Honolulu, Hawaii, April 1, 2017 | gmt pstext -R -J -O -K -F+f18p,Helvetica-Bold,green=thinnest >> %ps%
+echo 0 -30 Honolulu, Hawaii, April 1, 2018 | gmt pstext -R -J -O -K -F+f18p,Helvetica-Bold,green=thinnest >> %ps%
REM Then show example of color patterns and placing a PostScript image
@@ -37,9 +37,9 @@ gmt pscoast -R -J -O -K -Dc -A5000 -Gc >> %ps%
gmt grdimage lat.nc -J -Clat.cpt -O -K -nl >> %ps%
gmt pscoast -R -J -O -K -Q >> %ps%
gmt pscoast -R -J -O -K -Dc -A5000 -Wthinnest >> %ps%
-echo 0 20 14TH INTERNATIONAL | gmt pstext -R -J -O -K -F+f32p,Helvetica-Bold,red=thinner >> %ps%
+echo 0 20 15TH INTERNATIONAL | gmt pstext -R -J -O -K -F+f32p,Helvetica-Bold,red=thinner >> %ps%
echo 0 -10 GMT CONFERENCE | gmt pstext -R -J -O -K -F+f32p,Helvetica-Bold,red=thinner >> %ps%
-echo 0 -30 Honolulu, Hawaii, April 1, 2017 | gmt pstext -R -J -O -F+f18p,Helvetica-Bold,green=thinnest >> %ps%
+echo 0 -30 Honolulu, Hawaii, April 1, 2018 | gmt pstext -R -J -O -F+f18p,Helvetica-Bold,green=thinnest >> %ps%
del l*.nc
del l*.cpt
diff --git a/doc/examples/ex19/example_19.ps b/doc/examples/ex19/example_19.ps
index 01e1f28..49239ac 100644
--- a/doc/examples/ex19/example_19.ps
+++ b/doc/examples/ex19/example_19.ps
@@ -1,11 +1,11 @@
%!PS-Adobe-3.0
%%BoundingBox: 0 0 612 792
%%HiResBoundingBox: 0 0 612 792
-%%Title: GMT v5.4.0_r17581M [64-bit] Document from grdimage
+%%Title: GMT v5.4.3_r18845 [64-bit] Document from grdimage
%%Creator: GMT5
-%%For: pwessel
+%%For: unknown
%%DocumentNeededResources: font Helvetica
-%%CreationDate: Thu Feb 23 10:51:27 2017
+%%CreationDate: Tue Sep 5 15:06:13 2017
%%LanguageLevel: 2
%%DocumentData: Clean7Bit
%%Orientation: Portrait
@@ -15019,7 +15019,7 @@ PSL_font_encode 1 get 0 eq {Standard+_Encoding /Helvetica-Bold /Helvetica-Bold P
{1 0 0 C} FS
O1
3900 2382 M 533 F1
-(14TH INTERNATIONAL) mc false charpath fs S
+(15TH INTERNATIONAL) mc false charpath fs S
PSL_cliprestore
%%EndObject
0 A
@@ -15281,7 +15281,7 @@ PSL_font_encode 1 get 0 eq {Standard+_Encoding /Helvetica-Bold /Helvetica-Bold P
{0 1 0 C} FS
O1
3900 1302 M 300 F1
-(Honolulu, Hawaii, April 1, 2017) mc false charpath fs S
+(Honolulu, Hawaii, April 1, 2018) mc false charpath fs S
PSL_cliprestore
%%EndObject
0 A
@@ -43551,7 +43551,7 @@ PSL_font_encode 1 get 0 eq {Standard+_Encoding /Helvetica-Bold /Helvetica-Bold P
{1 0 0 C} FS
O1
3900 2382 M 533 F1
-(14TH INTERNATIONAL) mc false charpath fs S
+(15TH INTERNATIONAL) mc false charpath fs S
PSL_cliprestore
%%EndObject
0 A
@@ -43813,7 +43813,7 @@ PSL_font_encode 1 get 0 eq {Standard+_Encoding /Helvetica-Bold /Helvetica-Bold P
{0 1 0 C} FS
O1
3900 1302 M 300 F1
-(Honolulu, Hawaii, April 1, 2017) mc false charpath fs S
+(Honolulu, Hawaii, April 1, 2018) mc false charpath fs S
PSL_cliprestore
%%EndObject
%%PageTrailer
diff --git a/doc/examples/ex19/example_19.sh b/doc/examples/ex19/example_19.sh
index 826d00d..d048841 100755
--- a/doc/examples/ex19/example_19.sh
+++ b/doc/examples/ex19/example_19.sh
@@ -1,6 +1,6 @@
#!/bin/bash
# GMT EXAMPLE 19
-# $Id: example_19.sh 17436 2017-01-13 00:22:07Z pwessel $
+# $Id: example_19.sh 18857 2017-09-06 01:07:34Z pwessel $
#
# Purpose: Illustrates various color pattern effects for maps
# GMT modules: grdimage, grdmath, makecpt, pscoast, pstext, psimage
@@ -19,9 +19,9 @@ gmt pscoast -R -J -O -K -Dc -A5000 -Gc >> $ps
gmt grdimage lon.nc -J -Clon.cpt -O -K -nl >> $ps
gmt pscoast -R -J -O -K -Q >> $ps
gmt pscoast -R -J -O -K -Dc -A5000 -Wthinnest >> $ps
-echo "0 20 14TH INTERNATIONAL" | gmt pstext -R -J -O -K -F+f32p,Helvetica-Bold,red=thinner >> $ps
+echo "0 20 15TH INTERNATIONAL" | gmt pstext -R -J -O -K -F+f32p,Helvetica-Bold,red=thinner >> $ps
echo "0 -10 GMT CONFERENCE" | gmt pstext -R -J -O -K -F+f32p,Helvetica-Bold,red=thinner >> $ps
-echo "0 -30 Honolulu, Hawaii, April 1, 2017" | gmt pstext -R -J -O -K \
+echo "0 -30 Honolulu, Hawaii, April 1, 2018" | gmt pstext -R -J -O -K \
-F+f18p,Helvetica-Bold,green=thinnest >> $ps
# Then show example of color patterns and placing a PostScript image
@@ -38,9 +38,9 @@ gmt pscoast -R -J -O -K -Dc -A5000 -Gc >> $ps
gmt grdimage lat.nc -J -Clat.cpt -O -K -nl >> $ps
gmt pscoast -R -J -O -K -Q >> $ps
gmt pscoast -R -J -O -K -Dc -A5000 -Wthinnest >> $ps
-echo "0 20 14TH INTERNATIONAL" | gmt pstext -R -J -O -K -F+f32p,Helvetica-Bold,red=thinner >> $ps
+echo "0 20 15TH INTERNATIONAL" | gmt pstext -R -J -O -K -F+f32p,Helvetica-Bold,red=thinner >> $ps
echo "0 -10 GMT CONFERENCE" | gmt pstext -R -J -O -K -F+f32p,Helvetica-Bold,red=thinner >> $ps
-echo "0 -30 Honolulu, Hawaii, April 1, 2017" | gmt pstext -R -J -O \
+echo "0 -30 Honolulu, Hawaii, April 1, 2018" | gmt pstext -R -J -O \
-F+f18p,Helvetica-Bold,green=thinnest >> $ps
rm -f l*.nc l*.cpt gmt.conf
diff --git a/doc/examples/ex31/example_31.ps b/doc/examples/ex31/example_31.ps
index 48e5d9e..18fd39c 100644
--- a/doc/examples/ex31/example_31.ps
+++ b/doc/examples/ex31/example_31.ps
@@ -1,11 +1,11 @@
%!PS-Adobe-3.0
%%BoundingBox: 0 0 612 792
%%HiResBoundingBox: 0 0 612 792
-%%Title: GMT v5.4.2_r18363M [64-bit] Document from pscoast
+%%Title: GMT v5.4.3_r18901M [64-bit] Document from pscoast
%%Creator: GMT5
%%For: unknown
-%%DocumentNeededResources: font Helvetica LinLibertineOB
-%%CreationDate: Thu Jun 15 10:59:36 2017
+%%DocumentNeededResources: font LinBiolinumO LinLibertineOB
+%%CreationDate: Sat Sep 16 11:36:09 2017
%%LanguageLevel: 2
%%DocumentData: Clean7Bit
%%Orientation: Portrait
@@ -21213,6 +21213,7 @@ clipsave
7559 0 D
0 7608 D
-7559 0 D
+P
PSL_clip N
4 W
N 1257 507 M 185 -38 D S
@@ -21358,14 +21359,14 @@ N 7559 0 M 0 7608 D S
N 0 0 M 7559 0 D S
N 0 7608 M 7559 0 D S
0 setlinecap
-/PSL_H_y 500 PSL_font_encode 0 get 0 eq {ISO-8859-5_Encoding /Helvetica /Helvetica PSL_reencode PSL_font_encode 0 1 put} if
-200 F0
+PSL_font_encode 35 get 0 eq {ISO-8859-5_Encoding /LinBiolinumO /LinBiolinumO PSL_reencode PSL_font_encode 35 1 put} if
+/PSL_H_y 500 200 F35
(100\312) sh add def
3780 7608 PSL_H_y add M
PSL_font_encode 38 get 0 eq {ISO-8859-5_Encoding /LinLibertineOB /LinLibertineOB PSL_reencode PSL_font_encode 38 1 put} if
400 F38
(Europe\072 Countries and Capital Cities) bc Z
-496 7775 M 200 F0
+496 7775 M 200 F35
(30W) bc Z
1369 7775 M (20W) bc Z
2130 7775 M (10W) bc Z
@@ -21412,6 +21413,7 @@ clipsave
7559 0 D
0 7608 D
-7559 0 D
+P
PSL_clip N
4 W
V
@@ -21475,6 +21477,7 @@ clipsave
7559 0 D
0 7608 D
-7559 0 D
+P
PSL_clip N
4 W
V
@@ -21513,6 +21516,7 @@ clipsave
7559 0 D
0 7608 D
-7559 0 D
+P
PSL_clip N
21 W
V
@@ -21549,6 +21553,7 @@ clipsave
7559 0 D
0 7608 D
-7559 0 D
+P
PSL_clip N
PSL_font_encode 36 get 0 eq {ISO-8859-5_Encoding /LinBiolinumOI /LinBiolinumOI PSL_reencode PSL_font_encode 36 1 put} if
4 W
@@ -21695,13 +21700,12 @@ O0
PSL_font_encode 37 get 0 eq {ISO-8859-5_Encoding /LinBiolinumOB /LinBiolinumOB PSL_reencode PSL_font_encode 37 1 put} if
1890 1332 M 167 F37
(Population of the European Union capital cities) bc Z
-PSL_font_encode 0 get 0 eq {ISO-8859-5_Encoding /Helvetica /Helvetica PSL_reencode PSL_font_encode 0 1 put} if
-378 1093 M 133 F0
+PSL_font_encode 35 get 0 eq {ISO-8859-5_Encoding /LinBiolinumO /LinBiolinumO PSL_reencode PSL_font_encode 35 1 put} if
+378 1093 M 133 F35
(\< 1 Million inhabitants) bl Z
2268 1093 M (\> 1 Million inhabitants) bl Z
142 862 M 133 F37
(Population in Millions) bl Z
-PSL_font_encode 35 get 0 eq {ISO-8859-5_Encoding /LinBiolinumO /LinBiolinumO PSL_reencode PSL_font_encode 35 1 put} if
142 702 M 133 F35
(������:) bl Z
772 702 M (3.44) bl Z
diff --git a/doc/fig/CMakeLists.txt b/doc/fig/CMakeLists.txt
index 95e90f9..5d5793d 100644
--- a/doc/fig/CMakeLists.txt
+++ b/doc/fig/CMakeLists.txt
@@ -1,7 +1,7 @@
#
-# $Id: CMakeLists.txt 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/doc/rst/CMakeLists.txt b/doc/rst/CMakeLists.txt
index dec631d..537e0a9 100644
--- a/doc/rst/CMakeLists.txt
+++ b/doc/rst/CMakeLists.txt
@@ -1,7 +1,7 @@
#
-# $Id: CMakeLists.txt 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/doc/rst/source/GMT_Docs.rst b/doc/rst/source/GMT_Docs.rst
index 6a0123d..f26b1a5 100644
--- a/doc/rst/source/GMT_Docs.rst
+++ b/doc/rst/source/GMT_Docs.rst
@@ -159,7 +159,7 @@ such decisions by supporting the GMT project.
Copyright and Caveat Emptor!
============================
-Copyright ©1991--2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J.
+Copyright ©1991--2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J.
Luis and F. Wobbe
The Generic Mapping Tools (GMT) is free software; you can
diff --git a/doc/rst/source/explain_-B_full.rst_ b/doc/rst/source/explain_-B_full.rst_
index b4c1999..5300979 100644
--- a/doc/rst/source/explain_-B_full.rst_
+++ b/doc/rst/source/explain_-B_full.rst_
@@ -47,7 +47,7 @@
the addition of degree symbols, etc. is automatic (and controlled by the GMT
default setting :ref:`FORMAT_GEO_MAP <FORMAT_GEO_MAP>`). However, for other plots you can add
specific units by adding **+u**\ *unit*. If any of these text strings contain
- spaces or special UNIX characters you will need to enclose them in quotes.
+ spaces or special characters you will need to enclose them in quotes.
The *intervals* specification is a concatenated string made up of substrings
of the form
diff --git a/doc/rst/source/gmt.conf.rst b/doc/rst/source/gmt.conf.rst
index f4731ea..49c553a 100644
--- a/doc/rst/source/gmt.conf.rst
+++ b/doc/rst/source/gmt.conf.rst
@@ -114,7 +114,7 @@ fonts can be found in the :doc:`gmt` man page.
.. _DIR_CACHE:
**DIR_CACHE**
- Cache directory where to save files downloaded when using external URL addresses or the
+ Cache directory where to save files downloaded when using external URL addresses or the
files called **earth_relief_**\ *res*\ **.grd** or filenames starting in @ (e.g., @hotspots.txt)
.. _DIR_DATA:
@@ -138,7 +138,7 @@ fonts can be found in the :doc:`gmt` man page.
.. _FONT:
**FONT**
- Sets the default for all fonts, except FONT_LOGO. This setting is
+ Sets the default for all fonts, except **FONT_LOGO**. This setting is
not included in the **gmt.conf** file.
.. _FONT_ANNOT:
diff --git a/doc/rst/source/gmtinfo.rst b/doc/rst/source/gmtinfo.rst
index e022220..0f2960d 100644
--- a/doc/rst/source/gmtinfo.rst
+++ b/doc/rst/source/gmtinfo.rst
@@ -136,16 +136,15 @@ Optional Arguments
and when later plotting with :doc:`psxy` **-E**. **-Sx** leaves space
for horizontal error bars using the values in third
(2) column. **-Sy** leaves space for vertical error
- bars using the values in third (2) column. **-S**
+ bars using the values in fourth (3) column. **-S**
or **-Sxy** leaves space for both error bars using the values in
third and fourth (2 and 3) columns.
.. _-T:
**-T**\ *dz*\ [\ **+c**\ *col*]
- Report the min/max of the first (0'th) column to the nearest
- multiple of *dz* and output this as the string **-T**\ *zmin/zmax/dz*.
- To use another column, append **+c**\ *col*. Only works when **-I** is selected.
+ Report the min/max of the first (0'th) column to the nearest multiple of *dz* and output this as the
+ string **-T**\ *zmin/zmax/dz*. To use another column, append **+c**\ *col*. Cannot be used together with **-I**.
.. _-V:
diff --git a/doc/rst/source/grdcontour.rst b/doc/rst/source/grdcontour.rst
index 1ac2cbb..aedfeff 100644
--- a/doc/rst/source/grdcontour.rst
+++ b/doc/rst/source/grdcontour.rst
@@ -29,9 +29,11 @@ Synopsis
[ |-W|\ [*type*]\ *pen* ][**+c**\ [**l**\ \|\ **f**]]
[ |SYN_OPT-X| ]
[ |SYN_OPT-Y| ]
-[ |-Z|\ [**+s** \*factor*\ ][**+o**\ *shift*][**+p**] ]
+[ |-Z|\ [**+s**\ *factor*][**+o**\ *shift*][**+p**] ]
[ |SYN_OPT-bo| ]
[ |SYN_OPT-do| ]
+[ |SYN_OPT-e| ]
+[ |SYN_OPT-f| ]
[ **-ho**\ [*n*] ]
[ |SYN_OPT-p| ]
[ |SYN_OPT-t| ]
@@ -220,7 +222,7 @@ Optional Arguments
.. _-Z:
-**-Z**\ [**+s** \*factor*\ ][**+o**\ *shift*][**+p**]
+**-Z**\ [**+s**\ *factor*][**+o**\ *shift*][**+p**]
Use to subtract *shift* from the data and multiply the results by
*factor* before contouring starts [1/0]. (Numbers in **-A**, **-C**,
**-L** refer to values after this scaling has occurred.) Append
@@ -252,6 +254,15 @@ Optional Arguments
.. include:: explain_grd_inout_short.rst_
+Notes
+-----
+
+The angle of a contour is computed as an average over *n* points along the contour.
+If you obtain poor angles you can play with two variables: Change *n* via the **+w**
+modifier to **-A**, and/or resample the contour via **-S**. For a fixed *n* the
+**-S** will localize the calculation, while the opposite is true if you increase *n*
+for a constant **-S**.
+
Examples
--------
diff --git a/doc/rst/source/grdlandmask.rst b/doc/rst/source/grdlandmask.rst
index 805cb43..40e0319 100644
--- a/doc/rst/source/grdlandmask.rst
+++ b/doc/rst/source/grdlandmask.rst
@@ -109,6 +109,18 @@ Optional Arguments
.. include:: explain_grd_output.rst_
+Notes
+-----
+
+A grid produced by grdlandmask is a *categorical* dataset. As such,
+one has to be careful not to interpolate it with standard methods,
+such as splines. However, if you make a map of this grid using
+a map projection the grid will be reprojected to yield a rectangular
+matrix in the projected coordinates. This interpolation is done
+using splines by default and thus may yield artifacts in your map.
+We recommend you use :doc:`grdimage` **-nn** to instead use a nearest
+neighbor interpolation for such cases.
+
Examples
--------
diff --git a/doc/rst/source/grdmask.rst b/doc/rst/source/grdmask.rst
index 0ef8a37..8b01338 100644
--- a/doc/rst/source/grdmask.rst
+++ b/doc/rst/source/grdmask.rst
@@ -157,6 +157,18 @@ Optional Arguments
.. include:: explain_grd_coord.rst_
+Notes
+-----
+
+A grid produced by grdmask is a *categorical* dataset. As such,
+one has to be careful not to interpolate it with standard methods,
+such as splines. However, if you make a map of this grid using
+a map projection the grid will be reprojected to yield a rectangular
+matrix in the projected coordinates. This interpolation is done
+using splines by default and thus may yield artifacts in your map.
+We recommend you use :doc:`grdimage` **-nn** to instead use a nearest
+neighbor interpolation for such cases.
+
Save storage space
------------------
diff --git a/doc/rst/source/grdview.rst b/doc/rst/source/grdview.rst
index 6cd3f48..a402b3c 100644
--- a/doc/rst/source/grdview.rst
+++ b/doc/rst/source/grdview.rst
@@ -25,9 +25,10 @@ Synopsis
[ |-S|\ *smooth* ]
[ |-T|\ [**s**][\ **o**\ [*pen*]] ]
[ |SYN_OPT-U| ]
-[ |-W|\ **type**\ *pen* ]
+[ |-W|\ **c|m|f**\ *pen* ]
[ |SYN_OPT-X| ]
[ |SYN_OPT-Y| ]
+[ |SYN_OPT-f| ]
[ |SYN_OPT-n| ]
[ |SYN_OPT-p| ]
[ |SYN_OPT-t| ]
@@ -177,7 +178,7 @@ Optional Arguments
.. _-W:
-**-W**\ **type**\ *pen*
+**-W**\ **c**\ |\ **m**\ |\ **f**\ *pen*
**-Wc**
Draw contour lines on top of surface or mesh (not image). Append pen
diff --git a/doc/rst/source/makecpt.rst b/doc/rst/source/makecpt.rst
index 64223f0..d3342f8 100644
--- a/doc/rst/source/makecpt.rst
+++ b/doc/rst/source/makecpt.rst
@@ -25,6 +25,9 @@ Synopsis
[ |-V|\ [*level*\ ] ]
[ |-W|\ [**w**] ]
[ |-Z| ]
+[ |SYN_OPT-bi| ]
+[ |SYN_OPT-di| ]
+[ |SYN_OPT-i| ]
|No-spaces|
@@ -175,7 +178,7 @@ Optional Arguments
.. _-W:
-**-W**
+**-W**\ [**w**]
Do not interpolate the input color table but pick the output colors
starting at the beginning of the color table, until colors for all
intervals are assigned. This is particularly useful in combination
@@ -192,6 +195,14 @@ Optional Arguments
CPT remains untouched, in the second case it is only scaled to match the
range *z_min*/*z_max*.
+.. |Add_-bi| replace:: [Default is the required number of columns given the chosen settings].
+.. include:: explain_-bi.rst_
+
+.. |Add_-di| unicode:: 0x20 .. just an invisible code
+.. include:: explain_-di.rst_
+
+.. include:: explain_-icols.rst_
+
.. include:: explain_help.rst_
.. include:: explain_transparency.rst_
diff --git a/doc/rst/source/pstext.rst b/doc/rst/source/pstext.rst
index 64dc7bd..f61d3d4 100644
--- a/doc/rst/source/pstext.rst
+++ b/doc/rst/source/pstext.rst
@@ -19,7 +19,7 @@ Synopsis
|SYN_OPT-B|
[ |-D|\ [**j**\ \|\ **J**]\ *dx*\ [/*dy*][\ **+v**\ [*pen*]] ]
[ |-F|\ [**+a**\ [*angle*]][\ **+c**\ [*justify*]][\ **+f**\ [*font*]][\ **+j**\ [*justify*]][\ **+h**\ \|\ **+l**\|\ **+r**\ [*first*] \|\ **+t**\ *text*\ \|\ **+z**\ [*format*]] ]
-[ |-G|\ *color* ] [ |-J|\ *parameters* ]
+[ |-G|\ *color* ]
[ |-K| ]
[ |-L| ] [ |-M| ] [ |-N| ] [ |-O| ] [ |-P| ]
[ |-Q|\ **l**\ \|\ **u** ]
diff --git a/doc/rst/source/std_opts.rst_ b/doc/rst/source/std_opts.rst_
index 0dcf7df..247cd00 100644
--- a/doc/rst/source/std_opts.rst_
+++ b/doc/rst/source/std_opts.rst_
@@ -15,7 +15,7 @@
+--------------------------------------------------------------------+--------------------------------------------------------------------------+
| **-U**\ [[*just*]/\ *dx*/*dy*/][*label*] | Plot time-stamp on plot :ref:`(...) <-U_full>` |
+--------------------------------------------------------------------+--------------------------------------------------------------------------+
-| **-V** | Run in verbose mode :ref:`(...) <-V_full>` |
+| **-V**\ [*verbosity*] | Run in verbose mode :ref:`(...) <-V_full>` |
+--------------------------------------------------------------------+--------------------------------------------------------------------------+
| **-X**\ [**a**\ \|\ **c**\ \|\ **r**]\ *off*\ [**u**] | Shift plot origin in *x*-direction :ref:`(...) <-XY_full>` |
+--------------------------------------------------------------------+--------------------------------------------------------------------------+
diff --git a/doc/rst/source/supplements/img/img2grd.rst b/doc/rst/source/supplements/img/img2grd.rst
index f8516e2..1897b87 100644
--- a/doc/rst/source/supplements/img/img2grd.rst
+++ b/doc/rst/source/supplements/img/img2grd.rst
@@ -127,8 +127,8 @@ Optional Arguments
(corrected) meters [**-S**\ 1]; free-air gravity files in mGal\*10
[**-S**\ 0.1 to get mGal]; vertical deflection files in
micro-radians\*10 [**-S**\ 0.1 to get micro-radians], vertical gravity
- gradient files in Eotvos\*50 [**-S**\ 0.02 to get Eotvos, or
- **-S**\ 0.002 to get mGal/km]). If no *scale* is given we try to
+ gradient files in Eotvos\*10 [**-S**\ 0.1 to get Eotvos, or
+ **-S**\ 0.01 to get mGal/km]). If no *scale* is given we try to
determine the scale by examining the file name for clues.
.. _-T:
diff --git a/doc/rst/source/xyz2grd.rst b/doc/rst/source/xyz2grd.rst
index d763ef0..3fc0b59 100644
--- a/doc/rst/source/xyz2grd.rst
+++ b/doc/rst/source/xyz2grd.rst
@@ -18,6 +18,7 @@ Synopsis
|SYN_OPT-R|
[ |-A|\ [**d**\ \|\ **f**\ \|\ **l**\ \|\ **m**\ \|\ **n**\ \|\ **r**\ \|\ **S**\ \|\ **s**\ \|\ **u**\ \|\ **z**] ]
[ |-D|\ [**+x**\ *xname*][**+y**\ *yname*][**+z**\ *zname*][**+s**\ *scale*][**+o**\ *offset*][**+n**\ *invalid*][**+t**\ *title*][**+r**\ *remark*] ]
+[ |-J|\ *parameters* ]
[ |-S|\ [*zfile*] ]
[ |SYN_OPT-V| ]
[ |-Z|\ [*flags*\ ] ]
@@ -90,6 +91,12 @@ Optional Arguments
.. include:: explain_-D_cap.rst_
+.. _-J:
+
+.. |Add_-J| replace:: Use the **-J** syntax to save the georeferencing info as CF-1 compliant
+ metadata in netCDF grids. This metadata will be recognized by GDAL.
+.. include:: explain_-J.rst_
+
.. _-S:
**-S**\ [*zfile*]
diff --git a/doc/scripts/CMakeLists.txt b/doc/scripts/CMakeLists.txt
index 58b4391..ae5fc66 100644
--- a/doc/scripts/CMakeLists.txt
+++ b/doc/scripts/CMakeLists.txt
@@ -1,7 +1,7 @@
#
-# $Id: CMakeLists.txt 18086 2017-04-30 22:55:10Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/doc/scripts/GMT_App_P_1.ps b/doc/scripts/GMT_App_P_1.ps
index 155da79..7aa9393 100644
--- a/doc/scripts/GMT_App_P_1.ps
+++ b/doc/scripts/GMT_App_P_1.ps
@@ -1,11 +1,11 @@
%!PS-Adobe-3.0
%%BoundingBox: 0 0 612 792
-%%HiResBoundingBox: 0 0 612 792
-%%Title: GMT v5.1.2_r13347 [64-bit] Document from grdimage
+%%HiResBoundingBox: 0 0 612 792
+%%Title: GMT v5.4.3_r19525 [64-bit] Document from grdimage
%%Creator: GMT5
-%%For: pwessel
+%%For: unknown
%%DocumentNeededResources: font Helvetica
-%%CreationDate: Mon Jul 14 10:53:11 2014
+%%CreationDate: Wed Dec 27 15:10:12 2017
%%LanguageLevel: 2
%%DocumentData: Clean7Bit
%%Orientation: Portrait
@@ -272,7 +272,6 @@ end
PSL_heights psl_k PSL_height put
} for
} def
-%%%%%%%%%%%%%%%%%%% CURVED BASELINE TEXT PLACEMENT FUNCTIONS
/PSL_curved_path_labels
{ /psl_bits exch def
/PSL_placetext psl_bits 2 and 2 eq def
@@ -291,15 +290,15 @@ end
/PSL_m PSL_label_n psl_kk get def
/PSL_x PSL_path_x psl_k PSL_n getinterval def
/PSL_y PSL_path_y psl_k PSL_n getinterval def
- /PSL_node PSL_label_node psl_p PSL_m getinterval def
- /PSL_angle PSL_label_angle psl_p PSL_m getinterval def
- /PSL_str PSL_label_str psl_p PSL_m getinterval def
- /PSL_fnt PSL_label_font psl_p PSL_m getinterval def
+ /PSL_node_tmp PSL_label_node psl_p PSL_m getinterval def
+ /PSL_angle_tmp PSL_label_angle psl_p PSL_m getinterval def
+ /PSL_str_tmp PSL_label_str psl_p PSL_m getinterval def
+ /PSL_fnt_tmp PSL_label_font psl_p PSL_m getinterval def
PSL_curved_path_label
/psl_k psl_k PSL_n add def
/psl_p psl_p PSL_m add def
} for
- PSL_clippath {PSL_clip} if N
+ PSL_clippath {PSL_eoclip} if N
} def
/PSL_curved_path_label
{
@@ -307,6 +306,7 @@ end
/PSL_m1 PSL_m 1 sub def
PSL_CT_calcstringwidth
PSL_CT_calclinedist
+ PSL_CT_excludelabels
PSL_CT_addcutpoints
/PSL_nn1 PSL_nn 1 sub def
/n 0 def
@@ -343,11 +343,11 @@ end
/n 0 def /k k 1 add def
} def
/PSL_CT_calcstringwidth
-{ /PSL_width PSL_m array def
+{ /PSL_width_tmp PSL_m array def
0 1 PSL_m1
{ /i exch def
- PSL_fnt i get cvx exec
- PSL_width i PSL_str i get stringwidth pop put
+ PSL_fnt_tmp i get cvx exec
+ PSL_width_tmp i PSL_str_tmp i get stringwidth pop put
} for
} def
/PSL_CT_calclinedist
@@ -368,6 +368,33 @@ end
PSL_dist i dist put
} for
} def
+/PSL_CT_excludelabels
+{ /k 0 def
+ /PSL_width PSL_m array def
+ /PSL_angle PSL_m array def
+ /PSL_node PSL_m array def
+ /PSL_str PSL_m array def
+ /PSL_fnt PSL_m array def
+ /lastdist PSL_dist PSL_n1 get def
+ 0 1 PSL_m1
+ { /i exch def
+ /dist PSL_dist PSL_node_tmp i get get def
+ /halfwidth PSL_width_tmp i get 2 div PSL_gap_x add def
+ /L_dist dist halfwidth sub def
+ /R_dist dist halfwidth add def
+ L_dist 0 gt R_dist lastdist lt and
+ {
+ PSL_width k PSL_width_tmp i get put
+ PSL_node k PSL_node_tmp i get put
+ PSL_angle k PSL_angle_tmp i get put
+ PSL_str k PSL_str_tmp i get put
+ PSL_fnt k PSL_fnt_tmp i get put
+ /k k 1 add def
+ } if
+ } for
+ /PSL_m k def
+ /PSL_m1 PSL_m 1 sub def
+} def
/PSL_CT_addcutpoints
{ /k 0 def
/PSL_nc PSL_m 2 mul 1 add def
@@ -466,7 +493,7 @@ end
/dx x x1 sub def
/dy y y1 sub def
} ifelse
- dx 0.0 ne dy 0.0 ne and
+ dx 0.0 eq dy 0.0 eq and not
{ /angle dy dx atan 90 add def} if
/sina angle sin def
/cosa angle cos def
@@ -495,7 +522,6 @@ end
{PSL_xp 0 get PSL_yp 0 get M
1 1 j { /ii exch def PSL_xp ii get PSL_yp ii get L} for
} def
-%%%%%%%%%%%%%%%%%%% DRAW BASELINE TEXT SEGMENT LINES
/PSL_draw_path_lines
{
/PSL_n_paths1 PSL_n_paths 1 sub def
@@ -513,12 +539,14 @@ end
/psl_kk psl_i psl_start add def
PSL_path_x psl_kk get PSL_path_y psl_kk get L
} for
+ /psl_xclose PSL_path_x psl_kk get PSL_path_x psl_start get sub def
+ /psl_yclose PSL_path_y psl_kk get PSL_path_y psl_start get sub def
+ psl_xclose 0 eq psl_yclose 0 eq and { P } if
S
/psl_start psl_start PSL_n add def
} for
U
} def
-%%%%%%%%%%%%%%%%%%% STRAIGHT BASELINE TEXT PLACEMENT FUNCTIONS
/PSL_straight_path_labels
{
/psl_bits exch def
@@ -557,7 +585,7 @@ end
{PSL_ST_textbox_rect}
ifelse
} for
- PSL_clip N
+ PSL_eoclip N
} def
/PSL_ST_prepare_text
{
@@ -635,8 +663,8 @@ O0
1200 1200 TM
% PostScript produced by:
-%%GMT: grdimage /tmp/gmt.4t8V7n/lat.nc -JK6.5i -C/tmp/gmt.4t8V7n/lat.cpt -P -K -nl
-%%PROJ: eck6 -180.00000000 180.00000000 -90.00000000 90.00000000 -17653837.706 17653837.706 -8826918.853 8826918.853 +proj=eck6 +lon_0=0 +x_0=0 +y_0=0 +a=6378137.000 +b=6356752.314245
+%@GMT: grdimage /tmp/gmt.Jrmy7F/lat.nc -JK6.5i -C/tmp/gmt.Jrmy7F/lat.cpt -P -K -nl
+%@PROJ: eck6 -180.00000000 180.00000000 -90.00000000 90.00000000 -17653837.706 17653837.706 -8826918.853 8826918.853 +proj=eck6 +lon_0=0 +x_0=0 +y_0=0 +a=6378137.000 +b=6356752.314245 +ellps=WGS84 +datum=WGS84 +units=m +no_defs
%%BeginObject PSL_Layer_1
0 setlinecap
0 setlinejoin
@@ -748,6 +776,7 @@ clipsave
56 -35 D
19 -13 D
90 -57 D
+P
PSL_clip N
V N -11 -11 T 7822 3922 scale [/Indexed /DeviceRGB 209 <
808080FF0003FF0002FF000BFF000AFF0009FF000EFF000DFF0010FF0011FF0013FF0016FF0018FF001AFF001CFF001B
@@ -765,104 +794,27 @@ FF00CCFF00CDFF00CEFF00CFFF00D0FF00D1FF00D2FF00D3FF00D5FF00D6FF00D7FF00D8FF00D9FF
FF00DEFF00E0FF00E1FF00E3FF00E4FF00E5FF00E7FF00E9FF00ECFF00EFFF00EEFF00F1FF00F2FF00F4FF00F5FF00F6
FF00FCFF00FD>] setcolorspace
<< /ImageType 1 /Decode [0 255] /Width 361 /Height 181 /BitsPerComponent 8
- /ImageMatrix [361 0 0 -181 0 181] /DataSource currentfile /ASCII85Decode filter /LZWDecode filter
+ /ImageMatrix [361 0 0 -181 0 181] /DataSource currentfile /ASCII85Decode filter /FlateDecode filter
>> image
-J,g]g3$]7K#D>EP:q1$i!tU2U5Z&Ao<\5,H7Uo<*Zq`V'O at WnZ#kVFB-^757;Rp>H>q^bZ^joR`enm at 9:1mL.SF1eiTMT<$3
-[FEU8"0MZEscJ:SPQ1W^qb8m<io<$<bjRMeT;=,Y>spHgBEV^>-ch`2B,r-cW.F(!7`$bf'R[HJhKB>:%%t,^>JE^49cGkJ\
-kkN3, at Y4*K%[D1-!LCq^[]MAM;Yok'&sb"_`!]4XQLiVpoI(>.nOW?*DmsG$6Hrf58!M!r#p4k4a;=i,EpG4sq/+a5h8d>eU
--sS^4qN3aFqI=0:*@G'dN/kBFVsn9B=e50lU at kEl@"?GC-^h=(,dIU>=;fBr>1IXb_>T;2>aTjVsG!J/%6#6R4f6jj+5OA$S
-s_9e,I$,Vd_'aqkI`$Gc-E7?$A_pCdd%RZ?e1D at W&1arDnO8pF?`Y"/@)9.f?D&^M-b]OrHOmIK<a:\V[+h?NiN?cOX9U-pG
-P&-[:aqBZ0.E[gTXXhQpN/9-m^m)McbS(E(1!Gh4bqmTX9[u#FPAK&6c4^Vs3Ndn"-je2J`:#h7PMH+":_W3u5L2/4%7/AU'
-bs*`FA3WCdF=-p8^?s^.7mFd]]i.f!3JC[e.iE];:Lj_9iKRW9iY3DQ#0f.eeL>.=eu,+D-PU,c#m=DQ0j!,fG4pM at G$ktNF
-UWW*GK)Y!4Xar=r)gaBj*ECVe]JEV6t,Cp<BjZg_T:lD?BPA]lMnp28sZC=(U!+g6[NBES\++l"jLha8cY+QgOa$i"uq-J`)
-nJ%>3UV:)/KAQu3q"hc6%$M;jo*/W8X+c8CUAR-m+uj;AFrOlVo_9o7jcQoC;lR;Q;sjr'1jRHBp?D4B]+c?5]@RI5KijY at Z
-5U$.ptNMG_V:6h[?RVn[ol5G\ZWToqTXeb/6pc8q$HLA>Ilh^=oYj at i#]s@#E2UemI>Ai'!mG!ZX%rQ`[e[k2g*qR)2H`j[G
-"8iZ5_=3sJ%E%]U:DLk=S8TFgnf3]:amts>rnIVW%lMW'SF8VeoGnH2dI`t_:"/bU:K>s<SSq=9EpWQeg%Lu?D;4e*cZS(<S
-aV!ap`9s"iV8utNT0X_i'\01?=08cH2`#_k]rc'S*PBlO/M=@?H9VBH[cR>nU&#(_=)_85L&G?IrEs2rL\SSq#+R'l21H$c]
-YkmTC;^Xhuj(2:_!Ol=:G;h6j\E@/d=Sn*<Y5Q&V'99Vh/#&"lR<:K2?Fq6.e=*i<1<W:lZ/T=A9+\6n*gdC'kZj9afp50nr
-NM)FIVD%H55cLJ[C[6eHetiWMQ';%=M]dTQt:6qN54/ga!=SJ1"9;2S4G.RdIA(#m/7Mc"@E74=*e5t#.?;3!D$=Nq`D6tqW
-XXu8c%h&GC-EK3oA3_*<,(W]u5O&>=/8(db^j91$q;@Z#a=UcP87#@%(/k/Cb*?q8p#R*Jp'hLD9,p^-kP1"5A8VoGSV!OP6
-nr?L<)+c6Q1oZ`QJlYLs<@6fiZ'I/6=j#E5.-8+<Q."Afb5"gY816$V;\!81=cG/u7*1iq/nRf1SMTD]d at +!/C/%j525U?R"
-e`(8c+1GF-N)hldu&*>$-,&<m,sm;Wc?>+brR4gn=B06FO)E%4X\2>SWgX3caiF,BC,,[PQHG53Xn=;4SYP2i"o5D*CK%E&Y
-`6"MG[P/7Hh].UJu,k;;+0'kli6+<'hf2qFsQG74G'4Y*Mu>>taF90r at pqRT!C,:$KVWVc<)L_*DB:6%qV''ag[7>(9@`4[u
-Am-D]/&SPgqc8ubldVH"P(<%>jdW\mt_<LTshWqBYuon'JM.`YZW2/0*KFkD<rh-93!ENW<e\lW)&?0fITY>t#)=5*U[lihs
-E<XudMOCr"g7>\9M0#h#J*FnGiOg8"_b#qq#AaIC(ZW:th=[l9u/HqiT<fYU3>>8i!7B*[qY1?e2?#/h]Z*m]Yg07cf^4EDs
-[oVqR>MFREmKLG:<t=4p>E*Xj7EN)A0'6EnST:#u2S)sbl<RVrFmd6%]2rn<?/*&:mfh[_=,uiX>KqH^3h-EKY4c2Vh0\UEn
-\/)MqHmIoIIG/N^K9k&?ebO/n-/mtl-LDX>Rc8R7L?n50*Yh>*J<j9&].XG$=R0kL%*)"_cUgZ-,=SWnHL/T=H=)(>YU(F7O
-c;YY81U&?&S6-0ud>A)Im#?OTF#na&qdOA))KnnchD$=Uu]e>`Fm:7S1^)0.(5bSWiU7/I-Ps.V2keQ1Dptb?8a9A_atco*/
-XI=cY=M>g8].7VU%:!$5b-h4+"jER%_53bM^bSb'jHcWT^#BAEHXoEKln=q<\:i-V0i7Z#Mr01KX2*M`7]Oj[E/8nhQ_V=_c
-qdopZbC#(%[JbGee>)uQr>tq<k7]FpAY?#Do?*!XQZ.<+)>&.D\Xn at 7k#Q!mqCYaEBp'/@c>7Y1Z?&c,_7`j=f04o%VS[8$E
-dFh#L+DkDd[J%VngKST6D;Dn7pBKU3>E<fB?-TqS7d8`5YB(Y%K=gl4n_RKrH>d*V^%]PBhcoPuDr(B,p]giX>RuF*?3G+3(
-CB&*08=H&*Q.Z-&`R%kMK)rS`V at Ikj'6M_ES`k!q!jp]@14?#5#'/00.5iYVj29d=j))?/*4F=RI]c]b^#O6k.HnKF5CQT3O
-_37*:KPAc at sEP01G*[s.XUaF431*;<WEiTUETPeb[<hlWnG3Fl'g`qZgQr?&u:7?Hq1#7qq?rYI8W2h:9]Y70p^G\p%KJh#"
-R)mlfjHGJ<1r]<?YOILF!e%fbM#-[P;(0?/5)'B6ZKL at G14`qWmkh`R6dm[e4=q0t-W4Qhq!hLHf::ljl>8#c/fYL\$W?0hH
-EZ1_MMg3[1DmJY)9pKm=FHf'8:b(rU`?Ou.D?]FUT8'1R60BRZ>Sb)i9dJ at 3Gl@!$Ap&<"bq#rl+rSP<_rs.N\?]Xc,?d8EH
-8*TtZYP*G&h>@5-nbunAqL2>4'#2K_s'P6oJ)C2(n,WMC"TWKJ!3cn4n.>[T'`i7k!O*RFn,Oo1QND+T!jF6Xn1b#!2$7eX"
-0aojn3I1270IR$"L(T'n50?C<<Jt'$'8Ern6lMTAHm*f#-_qKn8S[eFU)l2#I&U]n::j!Ka;XS#dACs^mYS&SI%!<$*]s,OI
-$:CV$[d3$?2aIYb)9lYmIYB$ZM@=d%(QK]aR`B%$8X@&?-*MP75g=%?RCqd,,:/f+(X9$S^ZMi0ksbT+>o:&$Z!CnGs1U"V>
-Y[&?uZUnIZ?f'bPF'&[<>gnKAN",nV>'$5"j&nM(\32%ssi'<s\6nNdjD720`5'X:@HnPL#U<>BLV'sUFY5bf)LAJT9"(9q]
-lnSo@"FVf%C(U8B)nUVN3Kc"fd(pT&;nW=Yt;@69h)6o_MnY$jUV&F?Q)R6C_nZa#f[2X+r)mR'qn\H2"`>im1,ljh_n^/@3
-eK&Y_*O4E at n_kNDjW8F+*jP)RnaR\UocJ2L+0kbd at N#T:"X%gl+L2G!ne!$#'d7T8+gN+3nf]24,pI at Y,-idEnhD at E0HktI,
-I0HWnj+NV73lnF,dL,inkg\g<@)Zg-*gf&nmNk#AL;G3-=R_tdW$WiFXM3T-aJ.Jnpr2EKd^tu.'eg\nrY at VPppaA.C,Knnt
-7-kY:=Rl.^H0+o!']#[4?:./$ci=o"ck4`@Q&O/@*MOo$K$EeLb5C$PM8Io&22VjXtT<0!ajso'n at goe1@]0=(O0o)UO$"Yb
-!(0XD3?_ at R)2'esbI0s_lTo-#kF,r0Nj1:&Pfo.`$W2)B;61UB5#o0G2h757+?$WBbVo2.A$<Aei#27$RGo3jO5AN"UD2R at 6
-Yo5Q]FFZ4Ae2m[oh_@?rpKfF.134"T(o8u$hPrWoR3O>8:o:\3$V)i[s3jYqLo<CA5[5`aH$^87co>*OF`B84`4L<9po?f]W
-eNJ!,4gWs-oAMkhjZ[bM5-sW=!X]=AofmNn5I:;QoCNF?!C1`55dUtcoFXAFrBO<s6*qXuoH?MB,=6K$6F6bZPV#+/#Rf-B6
-aT!DoKbl%77;5h7'oZVoMJ%6<CM"47C6>hoO13GAO^cU6imW%oPmAXF[pP!8$m\7oRTOiKh-<B8 at 4@IoT;^%Pt?(c8[P$[oV
-"d,#RhEH9!k]moW_%G[7bVP9=2B*oYF3X`CtBq9XN&<o[-AieP1/=9*,;+1uV1dj\Bp^::0C`o^P^6ohT]*:UL'ro`7lH"]0
-=J:pga/oass9":S9J;7.EAoc[3j,uSk7;RJ)SoeBB&2,eWX;mebeog)P779"D$;F1KpF\u-r<E40E<OH+4ojLlYAQEqf<jcd
-Fol4%jF]W^2=1*HXomp,[":UQP=LF,jooWB7Q!&6t=gaf'oq>PHV-8#@>.(J9os%^Y[9Ida=[E6"[D?**`E[Q->d_g]p!I&&
-eQm=N?+&Kop#047j^*)o?FB0,p$l;(":WiV?a]i>p&SPZ"^lK[@($MPp(:^k'k)8'@C at 1bp*!m'-";$H?pXu)p+^&82.LeiA
-%"O1p-E4I7:^R5A@>3Cp/,BZ<Fp>VA[YlUp0hIJ":Z,\B!uPgp2O_'F_>lCB=<5$p46m8KkPXdBXWn6p5s&IQ"bE0B0ZG+2P
-FkDV.t1QC::6Zp9ABk[;0rrCUUolp;(Q'`GB_>CpqT)p<dXU!"Du^D788;p>KmIj_f8+DRSqMp at 3&Zol#$LDmoU_pAo4l"`S
-YlDF+I8G7egR'leF8EOQs.pE=Q9-$"2YEjmW at pG$_J203t%F14;RpH`f9":^\hFLOtdpJH&l<HWLgFgkY!pL/5(ATi93G.2=
-3pMkC9Fa&%TF[?3?[t/c_Km7fuGdiZWpQ9_[Q$ISAH+0>ipRumlV0[?bHFL#&pT\t[":`tnHag\8pVD59`I)mOI(. at JpX+CJ
-eU;YpICJ$\pYgQ[jaMF<HpRrFp[N_lom_2]J%,B+p]5n)"b:h(J at H&=p^r':'nLTIJ[c_Op`Y.(":c7tK"*Capb at C\21p-6K
-=F'spd'Qm7>,nWKXaa0pec`)<J>[#K0f\N3+7P$AVPGDL:D)Tpi2'KFbb3eLU_bfpjn5\Knsu1Lq&G#plU<J"qFb'M7B+5pn
-<R)V2BMsMR]dGpp#`:[>T:?Mn$HYpq_nK`Jf&`M?4%nGgVL1eW"h,NO[f(pu.5mjc4TMNk"J:q!jD)ooF at nO1>.Lq#QJ,#S*
-7/OLYg^q%8`L'p3bZOguKpq&tn]-'EO&P.<0-q(\'n23W;GOTGdu\NuH?7?i'hPds$hR8&r,<L%i4Q+:1cq+6hh@?u1QQFUj
-u3H(6EFdIAJQ<AKt+pnh5Kp[.BR(83Dq2q(*Q'locRCSlVq4X6;V4)\/R^oPhq6?DL[?uOS%f*f-q8&R]`LM4qS at Qn7q9b`n
-eX_!=S[mRIq;Io*jdpb^T"46Y!Y,_Yoq-O*T=Oomq>m6M"e^/JTXkT*q at TD^'qopkTt28<qB;Ro-(dL8%lu;:qD"a+25>IXU
-UiU`qE^o<7AP6$Uq09rqGF(M<Mb"EV7Ks,_ at R5]AYscfVRgWAqJiDoFf0P2Vn.;SqLPS+KrB<SW4IteqN7a<Q)6k\%sjeGqO
-soMV5ej at Wk,=4qQ[(^[B"VaX1H!FqSB6o`N4C-XLcV!5l%NCeZF/NXh*>jqVeS<jfWpoY.F#'qXLaMori];YIa\9qZ3oF((\
-"`Ye(@Kq[p(p'sW*'Z+D$]q]W7,-*hkHZF_]oq_>E=27%Wd+b9Ntqa%SN7C7D5[(B&>qbaa_<OI0V[C]_PqdHopA[Zr"[_$C
-bU)FR>Fgl^C\%@'tqgl7=Kt)Jd\@[a1qiSENQ+;70\\"ECqk:S_S0\1:]">)Uqm!ap[C^dr]=Ybgqn]p,`OpQ>]XuG$qpE)=
-e\-=_]])g#45mn8jh?*+^:WdHqshE_otPkL^UsHZquOSq"i,Kl^q:,lque<3"i5R(_7Uf)r#rp>-,P$Y_RqJ;r%Z)O28af%_
-n8.Mr'A7`7DiS:&:@3jr)(Eq<Q0>g`OoKqr*dT-A]B+3`k60.r,Kb>FiSlTa1Q(3Ta23\$ckGeaLmMRS;52`Q,t#4aaB;o]T
-:24TuamCb'\ocgl9IhXijtCbFH2f*1>"jK?N&>baasBgs=2La3 at l:aun4si<UaG%F0 at ccFiPir:/)qp!8$]cb05&r;k8."jh
-Z(d(Kn8r=RF?(!klI&H*Wsr?9TP-.72jd_.6\r at uba2:Ht6e%IonrB\pr7FZ`We at dObTb5g<<RlM#e\,8=rF+8?A_)9Df"Gq
-OrGgFPFk;%ef=cUarINNDS.Ro at fY*9srK5brQ.^SRftEs0rLqq.V:p?sg:aWBrNY*?[G-+s.H)#rrP at 8P`S>m`gqCtfrR'Fa
-e_PZ,h7_Y#rScTrjkbFMhS&=3U7r6Jp"t2nhnB!GrW1q@"lOh9i4]ZYrXn*Q(#aTZiP$>krZU8ar%=Z[&YU*%r\<Fs/`T#Pj
-.89kIQc])6fT4Rj5*GihFHX5;rmp>jaLLsr^5e=>NS+Jj^)Z`*`;)A5N][kir4;fhKA"18*Bkgk<=V4K'j6-Q0Eacl+W_Qrh
-8U at V<WN/lFsCcritcQ[Hi:Plb:'urk[qbPV[k3&`Fbs^<u<hcg<pFm=*aT^>82Uj6aS<m9],H*q/NGl0gh)m,%R,rp0#ZnaI
-U]n%T%ph[/\B&+KT2n37BP554U)-1ZNnnfJ&l_'/D72=l;Xo=mH[s$?9A7J)($oY4,ms&&GR<V:iEotOf*s'.IU,PHV$p:kJ
-<s)IctFn^B2pV2.Ns+0r0L%p.SpqMg`s,m+AN&KW at q7iKrs.T9RV>>\@qS00/s0;Gc[JPHaqnKiAs2"Ut`Vb4u3Pd*@s3^d0
-ebt!NrP.1es5ErAjo0borkIk"s7-+Rp&BO;s.TLWJO&.T=:bNG$&(_)OP"Y8.1qD)ifR?M?83=W7cTW`oR9(LO\"Pr=Yu^9&
-!]cKOJJtl at 540Dk*&rThJkQH:?Rhoo_sD-Thss;=k'mB8VX(@PhL7DTi%dglBPP\?EmY8<pQ%)omX_cYuPL=>;BO4Bsh.3QJ
-6PriGlD5m[%.chXPm)?LO68otJ\%V'[m`>W*Z9M8`roR+ujL+d'lWnsNak?SRtn at W5K(6>&TXd:i0@>rJ<PWRYbVRb`/%@Bn
-L%p7#?rO$1%>-F]K#pA]][iGeR^?8isgalRR=SDJHSU!`+CG?n?LDmA!_G5IiepOC$<nTau'?T4V)l1KB$T&4R,Xmq/o5+c2
-khspO at IfH%toD\eU0GF`n5d3'U"@4_7jTZm(llQL"0U*pl6EmgM$pu_u2\&3ZoKNmT0bd+j6kF00L(hs6<u+60FC,kS0pH;h
-7^9==*(Ma5G908ZoR at k"&eYmSaKdX`,Y9ajQR5;0FIssR16e[d9!Yh-/5%bJV'4$\5s[1u1DIkb9X?S%1efc*f/?@0FPf&Q1
-R.&`::"3=49,Nk6r;49jS_>?1Yhjncr9lN6I>@)#t<4jFWX"KZqVE1;A<so9N&6W/PT/#h)S;1eGVU/<4&b`4Ok_u=&r>/F^
-J6O23hfX<jf>R>ZWf5G@"@Yom^@M'hsE\=LL)JA6CfjQY'C/Fe<>N2O11T>.1iBCg/gJO^["@.83XopC4rYgp\$CEa4qodr=
-,e2;N?1(KK.5hNse\G2CiqnU=g=L#ma?pXT.khO"KRKOFRU#DM'&"hTQj"Z@`c@^rj"N+4iu2i_CXp-4XL3>P,JA at XToPN"T
-":/hr'AmL_b)4"WuAiYleRHE1oELpe<epEtNqA+^Rkdi[-RV3U?Q(R<02P$FS)>9,hko*$BQ"q[+;m'oIp:mhJ3u5lBCqDUO
-Zu%m*f=#P.G2KfHHHtXQ'jJ-8]Pfm_pV(RXpA_pI4;S7>E4e+?`,Rn@"hJ]M?Q[@04I7G<EkJk7b]>nu2pQKWpHR#H4VpW4n
-\$UV<cpQ,=4VN-G at 0!G4dTg8G.kA'gikp5GM[PWIo"u;^))RaGeQ+tjEWpjQf`S-GG")F5*r24HG6kJi-Qbo\*eUWpV63F58
-VB2I(qVdoR/r*fCjX-GMhic5EGkHQ3Dd(r-mPLnbrJpZi>LD!WPBnqZ("L!eAW!!l2;X"!B]:JP[Nk_&+<p+D_jGYYGQlQkK
-\^U`Y69L(-C,k6XS9-\W,/'gfE5$Xn-1L(M?B6TAch at C.tK&EY!#QqIrYLpDgK"sHAoM%O2R7u7g),t,82'4Q&ZM at i<,76$e
-g at I.%q!mWAd\@EDboO!OhL+u.WaVeSFB8mM#2+G+/)e1^,NWRR2a!g0lj0WuiZ0"/=\FgkPjF<5r!^"I@#p?#8Kolub>0*ZV
-+Co#DO&A;97k#;q,d77adUl3F\N)$JoUh?\L/CQ'8L\4-Vj.ml<D'f)-fhqD(@oIJ90$]<A[Jq5''<Im\Toi>oY6b,#%:1cM
-(N:d`rH2#APBY&1M1aTRM//)9f]11B!g0Z'4u)U\[aY2<61R2k&F-VaZ3ujkFE9`F\]L#4(i[(SeK+h:H at Z&B*@r/!pEq9WV
-Jb+h#<qPmXNS5"$e7l"JBiPJl$b26>0X1(K<;H;&UTGW-&fKe7+?`H3$MaXUh0`L6,5'nOZ12-`%NSPu>1r95/N%VA.%<;`\
-VeBsfmt']ti^>'L#Nm6 at Na#,,!WM,A"F8#[4MV,Y$o;egGNWYJ"!;qe/M"n98CeR#?-MR?N#j^5'2L9FW-_,dTgB<7AqZ.?M
-6>:W]jXqe[]<pJpM.ue\SFl'3">50d%oma1]#/OD'$"7X-LTqUA`E9_i at r-:KZ5*YY=YKh0CpfV9(1tfo]/aM?oq/T,L='0d
-8SN$!VmQU2b$)'(CMe3t[MHm9><?P9D7-j^(?XFW]6S=3otIhX"98ilM/c!%`439#i`rOFEc-$C\bA#G>s"$gDRIs(QY,I;X
-/U70Xk^KhL at AHKR<Ph,j1BN4l<]CNE3F3\(q7N\?T[M#Dmf>S(Zt[']D6qpp&DfE#6A24hgn6T#Jh6)"^nt\K5buE_AGcL at 6
->umE4-S#(cqfXZ&aZZp)h3iLCmuX8VqFF-cHq#'k4gYMfEna_g'*"%#en[EOIgH)!;oL]QoQXp-6V9#9dV?M32e\1<BLrAE:
-"Y19tLfadG4=ANZrVEir'X=][09XKRh.mU+._:GCo^]9r/<B$:"B1?A at sRmpN(c5FY_B)Lb]F09W1g#QaXN:i_4mWm-Hs$::
-7"/*"RIF.g860B7%S-E;:dK;==%/hWOFLIOb)J;cY>plNAp7KhQLJ_eL8Z-\XVp`IBB'Bb,!!\1]ef)J?lQ']AFged2)WtCA
-]kskDk.fOf#@VBWIBE0V!<<~>
+G[BdkpOgs`(rl(^6,e_=>sST^7F8C8H at Q`W0A(VQls6kpm(JqsB/p,0lsdka$K?Qrenf4WaYT.)4.As9cR/!`As1qsJ)s)*
+$k'-obUpfsThXXpn.BH*0jU-*l!$Uc7iTX>Fk."TL64^T07`ZF:CR97BPY.6Z=:M0J^?)%H:<'5I"p1"L;*rH>^id3mEc(/
+@=oahS'6EmMZI\$j#/@o[*d1Q\8IPMfl!&Mnq;-?:GtD;ct5 at PPG1>^mZ:/$#Aq!b2Cg,]D=9r452,9eo6LY1D`c=crS"!e
+d,t;[ZKP*b:U\ugp1aI=0a?*P^C;LY@@M:&):WM-(+=j=mE,RN:pbY]TH%.TN,=!_N_0/I:;[8'VGRs at 4-U>7inh0cb at qs[
+inCp56>;r.5 at Js$R*`AsUI at d^.#pANPoU4maNfGO3AHXC:.15MgP+ohW/Pnr-Bp!<h'`]n8o<#EP8Zr,A95k#8U'!EJu(;l
+g7`%k9US#>EGuU1Tkr<RTP,aDV*-7;8nXu5YF_?J)&bu8l))&f:))%0hNSEP1pdc:.%ucO#t#:6lpiC!7V%!(Ki06YJBX^S
+#nA4"-tfW6a:8Oqj']0HP"%Kcm%L?i%])!YefbNuFAUW+%]Aqqgor"O4VTj98BM"q%3.giTYM",;cY;d9lKLMhM,F"4A%hP
+\?,S!JKe/h,o9BiR5TIs@!]bI(C`$LcGu"sM4K\RG7lqY7kVc95+Z#:m<euG(";tHE\4TgN#="fBP2;'@#;Xf%$p\%.4Xu3
+jBb7;;b4ffcDQhcp<]_"Njd62PEnM*cQGC0ctAN5;!5/U;_.LnUabMT%d at __5*p at K6_?l[)P,2%D=u6lOLA?U$PUcYSp!F"
+(&Di6YGd2I8c#H\0-Yhpckhn[9'8jg#E_[$#Ed3N#Ed3O#E^OX#E^OY#Ec(.#Ec(/#J#TeODDrCOmC'nOmC*oOW2 at HOW2CI
+OdjDsOdjGtO^#m3&\42!<W=T82UYY94cAr46f4JK<q<U*qQJ7q"+!E'050brD=p+"]9BVP6d&c2X3k)<-=+mCpQ2OiBXsHd
+"eFa=daSUUpQM1FB6f%"KL<q8UdYK7Lig"HQA8%%HY@\X1^rV"ngM$bd91)-IVa0hK. at .!r7tnf`:$DtU#g97/[D_('BE1f
+B9=R`V:a)a'Y+o">+R'b&itq56`q\X(7?t&:1.tXL_gLRK$GS3a9 at g=@fH:No,E9IngOI4iNhlu#)Z[W/7jMJ2`sU`TYQ-A
+.1;A!j98-d`=70VdR/!ZH\p0:@>B)qdQgq[]L)<ge4?d+/X/*3CLdYRNV,?c5WKLj60;"f6uS5;PS/8"9V@=KhBiY"2"D,"
+.&!>Y.2`J+Y4''<^?-:O7\/e@](o)8ccZ,!#Gnd!!C]B7X=[PaTQ+ob)PLt]/>RG;=\AW7p,A#_aQAZ%P4#mh"\Yut,76`I
+ZM9fU:o]I<TfNl;])`fe5`qT3PY`Po4tA]/aIPbX(KHL7Sbk0GV"BB#345Qp:`@B?HsTR^4'-f,7OX.OV9<&7AP3\$Wmbp<
+]4mKtbEq=BE[^da9Mc.'?^Cp'U$eCj5T+tEp:K%VohWLC9]u at 4Pe`LOM[fp[kD(6KS+g^oO3=X81p;+rq6gBBgq029$#R9f
+IP)\KjUV*_B[DJqkL[9[(2(5ok0"Fh`B;iKX?rEDXP\m:D7&>P0*\f.*;H97cmJACcYeLrQldh/r`U0F%E"oAKGVO==P[Wb
+CS8r6b2<4%6Gpm:m2*Q`lR.F:?*q#0=ge*51T'KD0n%71<G5n<ZR52!)RgEQLGkFSs*b/DY5~>
U
PSL_cliprestore
%%EndObject
@@ -872,8 +824,8 @@ O0
0 0 TM
% PostScript produced by:
-%%GMT: pscoast -Rd -JK6.5i -O -Dc -A5000 -Gwhite -Bx60g30 -By30g30
-%%PROJ: eck6 -180.00000000 180.00000000 -90.00000000 90.00000000 -17653837.706 17653837.706 -8826918.853 8826918.853 +proj=eck6 +lon_0=0 +x_0=0 +y_0=0 +a=6378137.000 +b=6356752.314245
+%@GMT: pscoast -Rd -JK6.5i -O -Dc -A5000 -Gwhite -Bx60g30 -By30g30
+%@PROJ: eck6 -180.00000000 180.00000000 -90.00000000 90.00000000 -17653837.706 17653837.706 -8826918.853 8826918.853 +proj=eck6 +lon_0=0 +x_0=0 +y_0=0 +a=6378137.000 +b=6356752.314245 +ellps=WGS84 +datum=WGS84 +units=m +no_defs
%%BeginObject PSL_Layer_2
0 setlinecap
0 setlinejoin
@@ -902,7 +854,7 @@ O0
37 -11 D
20 21 D
11 1 D
--2 7 D
+P
{1 A} FS
FO
4124 3856 M
@@ -911,16 +863,16 @@ FO
-21 0 D
12 -4 D
14 1 D
--1 6 D
+P
FO
4164 3719 M
-1 0 D
-1 0 D
+P
FO
4190 3719 M
-23 5 D
4 -5 D
-19 0 D
+P
FO
4258 3719 M
-4 3 D
@@ -937,7 +889,7 @@ FO
6 14 D
-16 1 D
-11 -16 D
-67 0 D
+P
FO
4125 3850 M
20 0 D
@@ -949,12 +901,12 @@ FO
-3 4 D
-5 -5 D
-27 4 D
-1 -6 D
+P
FO
4128 3837 M
17 3 D
-19 4 D
-2 -7 D
+P
FO
4175 3827 M
-14 7 D
@@ -962,7 +914,7 @@ FO
2 -8 D
18 2 D
3 -4 D
-14 4 D
+P
FO
4598 3808 M
-41 -11 D
@@ -983,7 +935,7 @@ FO
-5 8 D
12 -2 D
8 5 D
--9 16 D
+P
FO
4564 3731 M
45 0 D
@@ -998,7 +950,7 @@ FO
-21 -12 D
8 -6 D
19 1 D
-12 -13 D
+P
FO
4802 3719 M
-8 14 D
@@ -1009,7 +961,7 @@ FO
0 -21 D
-16 -8 D
12 -18 D
-73 0 D
+P
FO
4870 3752 M
-23 5 D
@@ -1024,7 +976,7 @@ FO
25 -13 D
3 -10 D
74 0 D
--23 33 D
+P
FO
4607 3792 M
11 7 D
@@ -1033,7 +985,7 @@ FO
-39 -8 D
-43 -1 D
-11 -3 D
-9 -16 D
+P
FO
4928 3719 M
-7 3 D
@@ -1043,7 +995,7 @@ FO
-22 0 D
-21 5 D
23 -33 D
-35 0 D
+P
FO
5059 3814 M
-14 0 D
@@ -1064,7 +1016,7 @@ FO
19 -27 D
203 0 D
-15 17 D
--67 78 D
+P
FO
5027 3850 M
-16 3 D
@@ -1073,14 +1025,14 @@ FO
-50 -6 D
40 -6 D
47 -1 D
--8 9 D
+P
FO
4954 3852 M
39 2 D
7 4 D
-33 5 D
-40 -9 D
-27 -2 D
+P
FO
5340 3766 M
-23 4 D
@@ -1114,19 +1066,19 @@ FO
248 0 D
-29 27 D
-13 14 D
--7 6 D
+P
FO
5035 3841 M
-7 9 D
-1 0 D
-8 -9 D
+P
FO
5047 3831 M
54 6 D
-25 7 D
-13 -4 D
-5 6 D
--11 -15 D
+P
FO
5455 3719 M
-3 8 D
@@ -1155,29 +1107,29 @@ FO
14 -13 D
6 -7 D
29 -27 D
-66 0 D
+P
FO
5594 3755 M
-4 -5 D
17 -6 D
--13 11 D
+P
FO
5591 3757 M
-9 -2 D
11 1 D
--2 1 D
+P
FO
5571 3773 M
-1 -1 D
2 0 D
--1 1 D
+P
FO
5532 3805 M
-20 5 D
-12 -8 D
24 -9 D
23 0 D
--15 12 D
+P
FO
5884 3720 M
-32 14 D
@@ -1202,7 +1154,7 @@ FO
-2 1 D
29 -24 D
248 0 D
--1 1 D
+P
FO
5547 3793 M
42 0 D
@@ -1212,47 +1164,47 @@ FO
-57 9 D
-1 -7 D
-10 2 D
-15 -12 D
+P
FO
5572 3772 M
40 -2 D
1 3 D
-25 7 D
-17 -7 D
-1 -1 D
+P
FO
5629 3795 M
27 -4 D
16 6 D
-61 6 D
-18 -8 D
+P
FO
5886 3719 M
-2 1 D
-2 -1 D
+P
FO
6027 3719 M
-14 2 D
2 -2 D
-12 0 D
+P
FO
6098 3742 M
2 -9 D
9 2 D
--11 7 D
+P
FO
1926 3727 M
1 2 D
-29 -5 D
-13 -5 D
30 0 D
-11 8 D
+P
FO
1691 3735 M
39 4 D
-19 6 D
-9 -3 D
--11 -7 D
+P
FO
2131 3719 M
-6 2 D
@@ -1269,23 +1221,23 @@ FO
-13 -8 D
2 3 D
-11 -8 D
-216 0 D
+P
FO
2287 3719 M
9 4 D
-17 -4 D
-8 0 D
+P
FO
2326 3719 M
-4 10 D
-1 -8 D
-9 -2 D
-14 0 D
+P
FO
2356 3719 M
3 3 D
-7 -3 D
-4 0 D
+P
FO
2479 3784 M
-12 5 D
@@ -1297,14 +1249,14 @@ FO
37 6 D
12 8 D
5 2 D
-33 31 D
+P
FO
2516 3820 M
-43 -13 D
23 3 D
7 -3 D
4 5 D
-9 8 D
+P
FO
2647 3719 M
3 3 D
@@ -1334,39 +1286,39 @@ FO
23 -6 D
-78 -5 D
0 -1 D
-202 0 D
+P
FO
2700 3766 M
-4 -3 D
-21 5 D
-11 -6 D
19 -16 D
-17 20 D
+P
FO
2711 3778 M
-10 1 D
0 -6 D
-14 1 D
17 -4 D
-7 8 D
+P
FO
2732 3802 M
-12 -3 D
5 -4 D
4 5 D
-3 2 D
+P
FO
2735 3807 M
-16 6 D
5 -8 D
-25 -2 D
35 2 D
-1 2 D
+P
FO
2741 3813 M
-11 1 D
5 -7 D
-6 6 D
+P
FO
2763 3838 M
-2 2 D
@@ -1376,7 +1328,7 @@ FO
-17 -5 D
20 2 D
28 -4 D
-6 6 D
+P
FO
2503 3807 M
2 -1 D
@@ -1387,14 +1339,14 @@ FO
-27 -1 D
-13 -4 D
-9 -8 D
--4 -5 D
+P
FO
2446 3753 M
79 21 D
-18 11 D
-21 -4 D
-7 3 D
--33 -31 D
+P
FO
2542 3795 M
24 6 D
@@ -1420,13 +1372,13 @@ FO
-33 -5 D
28 2 D
-37 -6 D
-21 -3 D
+P
FO
2642 3831 M
-36 0 D
-5 -5 D
25 -1 D
-16 6 D
+P
FO
2751 3719 M
6 4 D
@@ -1435,7 +1387,7 @@ FO
-41 -18 D
9 -2 D
-14 -12 D
-43 0 D
+P
FO
2881 3719 M
-7 5 D
@@ -1464,12 +1416,12 @@ FO
8 -4 D
22 5 D
0 -9 D
-46 0 D
+P
FO
2947 3777 M
-9 1 D
2 -12 D
-7 11 D
+P
FO
2960 3794 M
-4 1 D
@@ -1499,7 +1451,7 @@ FO
5 4 D
16 -5 D
25 5 D
-1 1 D
+P
FO
2978 3821 M
-20 1 D
@@ -1541,7 +1493,7 @@ FO
-2 5 D
14 -9 D
13 2 D
-7 10 D
+P
FO
3016 3875 M
-27 -1 D
@@ -1566,13 +1518,13 @@ FO
-18 -2 D
26 1 D
11 2 D
-11 15 D
+P
FO
2757 3832 M
11 -2 D
-1 0 D
-4 8 D
--6 -6 D
+P
FO
2735 3807 M
1 -1 D
@@ -1586,7 +1538,7 @@ FO
-1 16 D
-10 -3 D
-10 0 D
--6 -6 D
+P
FO
2704 3770 M
2 0 D
@@ -1601,7 +1553,7 @@ FO
-20 4 D
27 10 D
-35 1 D
--7 -8 D
+P
FO
2832 3842 M
25 -4 D
@@ -1627,7 +1579,7 @@ FO
25 -1 D
-13 -5 D
54 0 D
--46 -3 D
+P
FO
2861 3740 M
-5 11 D
@@ -1637,7 +1589,7 @@ FO
-38 -10 D
-31 -26 D
34 -4 D
-25 1 D
+P
FO
2748 3751 M
24 7 D
@@ -1646,18 +1598,18 @@ FO
37 17 D
-60 1 D
-22 -30 D
-1 0 D
+P
FO
2802 3830 M
17 6 D
-33 4 D
-4 -8 D
-20 -2 D
+P
FO
2765 3795 M
33 -5 D
-2 13 D
--31 -8 D
+P
FO
2920 3719 M
-3 6 D
@@ -1693,12 +1645,12 @@ FO
-17 12 D
-4 -2 D
-27 -38 D
-13 0 D
+P
FO
3065 3719 M
-7 5 D
-14 -5 D
-21 0 D
+P
FO
3233 3868 M
-20 -1 D
@@ -1727,11 +1679,11 @@ FO
26 5 D
27 -3 D
9 -4 D
-32 62 D
+P
FO
3234 3869 M
-1 0 D
-1 0 D
+P
FO
3005 3860 M
39 5 D
@@ -1769,36 +1721,36 @@ FO
26 2 D
-118 1 D
-33 -2 D
--11 -15 D
+P
FO
2971 3811 M
21 3 D
9 6 D
-23 1 D
--7 -10 D
+P
FO
2962 3798 M
7 3 D
-4 1 D
--3 -4 D
+P
FO
2958 3792 M
9 1 D
-7 1 D
--2 -2 D
+P
FO
2940 3766 M
6 -3 D
40 1 D
-9 11 D
-30 2 D
--7 -11 D
+P
FO
3244 3719 M
-4 4 D
-18 0 D
-2 -4 D
-24 0 D
+P
FO
3458 3875 M
-46 3 D
@@ -1848,7 +1800,7 @@ FO
128 0 D
34 100 D
17 48 D
-3 8 D
+P
FO
3555 3719 M
-9 2 D
@@ -1946,13 +1898,13 @@ FO
-3 1 D
-40 -114 D
-14 -42 D
-151 0 D
+P
FO
3622 3719 M
4 2 D
-38 5 D
-25 -7 D
-59 0 D
+P
FO
3676 3858 M
59 2 D
@@ -1960,44 +1912,44 @@ FO
-43 2 D
-19 -4 D
-18 0 D
--1 -7 D
+P
FO
3675 3854 M
44 3 D
-43 0 D
--1 -3 D
+P
FO
3673 3842 M
29 10 D
-27 -2 D
--2 -8 D
+P
FO
3671 3828 M
9 1 D
-9 1 D
-0 -2 D
+P
FO
3669 3817 M
20 1 D
-1 6 D
-18 1 D
--1 -8 D
+P
FO
3668 3810 M
2 0 D
--2 0 D
+P
FO
3665 3797 M
5 0 D
4 7 D
-7 1 D
--2 -8 D
+P
FO
3663 3785 M
4 -1 D
9 4 D
-12 1 D
--1 -4 D
+P
FO
4201 3401 M
-8 -6 D
@@ -2039,12 +1991,12 @@ FO
1 -17 D
-5 -4 D
297 0 D
--17 107 D
+P
FO
4200 3412 M
-1 -7 D
2 0 D
--1 7 D
+P
FO
4150 3708 M
-1 -1 D
@@ -2165,20 +2117,21 @@ FO
0 49 D
7 -5 D
23 15 D
--19 109 D
+P
4100 3510 M
-3 -13 D
-20 -7 D
0 13 D
12 -1 D
-2 10 D
-13 -2 D
+P
FO
3900 3384 M
+P
FO
3900 3378 M
0 1 D
-0 -1 D
+P
FO
3900 3313 M
22 9 D
@@ -2188,7 +2141,7 @@ FO
12 21 D
-7 11 D
-20 -1 D
-0 -51 D
+P
FO
4078 3413 M
11 14 D
@@ -2198,7 +2151,7 @@ FO
-13 -6 D
19 -27 D
-1 10 D
--1 0 D
+P
FO
4430 3620 M
-22 5 D
@@ -2274,7 +2227,7 @@ FO
17 -107 D
319 0 D
-79 243 D
--28 83 D
+P
4285 3550 M
-10 11 D
12 -4 D
@@ -2291,7 +2244,7 @@ FO
0 -13 D
-17 -10 D
8 -2 D
--14 -2 D
+P
4369 3586 M
19 -9 D
17 -26 D
@@ -2304,22 +2257,22 @@ FO
-7 12 D
11 -11 D
6 4 D
--17 13 D
+P
4325 3562 M
34 -23 D
-17 -16 D
-30 28 D
-13 11 D
+P
FO
4423 3640 M
-3 -3 D
7 -7 D
--4 10 D
+P
FO
4150 3710 M
2 9 D
-3 -7 D
-1 -2 D
+P
FO
4656 3697 M
-1 0 D
@@ -2357,7 +2310,7 @@ FO
-68 144 D
-31 61 D
-74 148 D
--26 50 D
+P
4636 3405 M
-3 -7 D
8 -8 D
@@ -2377,18 +2330,18 @@ FO
3 -6 D
7 3 D
-36 -19 D
-0 -6 D
+P
FO
4418 3657 M
14 11 D
-24 17 D
-10 -28 D
+P
FO
4517 3697 M
14 7 D
-16 7 D
-10 -7 D
-12 -7 D
+P
FO
5035 3509 M
-14 6 D
@@ -2458,7 +2411,7 @@ FO
-8 12 D
-7 13 D
-89 139 D
--34 51 D
+P
FO
4938 3719 M
3 -5 D
@@ -2491,7 +2444,7 @@ FO
-43 52 D
-89 104 D
-12 14 D
--203 0 D
+P
5070 3609 M
5 -13 D
39 -21 D
@@ -2514,7 +2467,7 @@ FO
-18 16 D
-20 6 D
-8 -3 D
-21 -34 D
+P
FO
5581 3531 M
-13 -13 D
@@ -2553,7 +2506,7 @@ FO
-72 75 D
-54 55 D
-12 11 D
--11 12 D
+P
5525 3430 M
8 -1 D
25 -36 D
@@ -2566,7 +2519,7 @@ FO
18 6 D
4 20 D
1 28 D
--17 42 D
+P
FO
6076 3294 M
-10 12 D
@@ -2616,7 +2569,7 @@ FO
84 -88 D
7 -6 D
73 -78 D
-266 0 D
+P
FO
6089 3330 M
-11 -4 D
@@ -2627,12 +2580,12 @@ FO
50 0 D
-20 18 D
-4 5 D
--15 13 D
+P
FO
6049 3366 M
-2 -1 D
8 -5 D
--6 6 D
+P
FO
5510 3601 M
39 10 D
@@ -2650,7 +2603,7 @@ FO
4 -5 D
39 -37 D
14 -15 D
-15 -14 D
+P
FO
5580 3531 M
9 9 D
@@ -2662,7 +2615,7 @@ FO
-26 4 D
-40 -9 D
55 -54 D
-15 -16 D
+P
FO
6135 3294 M
-19 17 D
@@ -2684,7 +2637,7 @@ FO
15 -13 D
9 -10 D
15 -13 D
-7 0 D
+P
FO
6192 3294 M
-54 37 D
@@ -2695,7 +2648,7 @@ FO
26 -25 D
42 -29 D
29 -27 D
-29 0 D
+P
FO
6329 3387 M
-8 6 D
@@ -2709,13 +2662,13 @@ FO
-13 34 D
-23 17 D
21 2 D
--24 19 D
+P
FO
6106 3557 M
4 -5 D
9 -7 D
2 1 D
--15 11 D
+P
FO
5929 3472 M
-6 36 D
@@ -2738,12 +2691,12 @@ FO
-80 58 D
-248 0 D
131 -109 D
-161 -138 D
+P
FO
6080 3339 M
-9 13 D
-15 8 D
-24 -21 D
+P
FO
6160 3702 M
-73 15 D
@@ -2805,12 +2758,12 @@ FO
-15 1 D
56 1 D
-2 6 D
--111 72 D
+P
FO
6353 3368 M
1 0 D
-25 19 D
-24 -19 D
+P
FO
1547 3446 M
-9 -3 D
@@ -2824,7 +2777,7 @@ FO
21 12 D
-3 -7 D
32 10 D
-19 15 D
+P
FO
1885 3719 M
-43 -17 D
@@ -2872,7 +2825,7 @@ FO
123 90 D
13 9 D
25 18 D
--30 0 D
+P
FO
1529 3630 M
23 8 D
@@ -2900,7 +2853,7 @@ FO
25 28 D
-24 24 D
-96 -63 D
--15 -9 D
+P
FO
2153 3711 M
-22 8 D
@@ -2958,7 +2911,7 @@ FO
8 3 D
162 136 D
52 44 D
-11 9 D
+P
FO
1649 3459 M
10 3 D
@@ -2973,7 +2926,7 @@ FO
-13 -14 D
-5 7 D
-12 -6 D
-1 -7 D
+P
FO
1910 3294 M
1 8 D
@@ -2983,7 +2936,7 @@ FO
-20 -12 D
14 0 D
-1 -3 D
-30 0 D
+P
FO
1926 3294 M
7 4 D
@@ -3098,13 +3051,13 @@ FO
-18 -15 D
16 4 D
-19 -12 D
-12 0 D
+P
FO
2348 3657 M
-9 -2 D
6 -1 D
1 2 D
-2 1 D
+P
FO
1871 3363 M
11 6 D
@@ -3115,7 +3068,7 @@ FO
-9 4 D
-20 -26 D
1 -22 D
-3 17 D
+P
FO
1917 3413 M
-1 -7 D
@@ -3126,7 +3079,7 @@ FO
-15 -18 D
7 1 D
-13 -8 D
-5 -7 D
+P
FO
1943 3471 M
-2 11 D
@@ -3135,7 +3088,7 @@ FO
-15 4 D
-14 -18 D
10 8 D
-7 -5 D
+P
FO
2357 3357 M
4 4 D
@@ -3193,7 +3146,7 @@ FO
-116 -123 D
318 0 D
25 31 D
-24 32 D
+P
2302 3544 M
-28 9 D
21 -3 D
@@ -3211,7 +3164,7 @@ FO
13 0 D
-20 -3 D
-64 -29 D
--20 -3 D
+P
2378 3443 M
14 13 D
-8 -9 D
@@ -3219,13 +3172,13 @@ FO
8 15 D
30 16 D
-25 -26 D
--33 -16 D
+P
2310 3497 M
43 20 D
43 -7 D
-49 -3 D
-35 -15 D
--2 5 D
+P
FO
2445 3719 M
0 -10 D
@@ -3242,7 +3195,7 @@ FO
20 7 D
2 -4 D
4 5 D
--202 0 D
+P
FO
2644 3322 M
-8 3 D
@@ -3335,7 +3288,7 @@ FO
-44 -58 D
-5 -5 D
319 0 D
-17 28 D
+P
2390 3367 M
-7 7 D
15 13 D
@@ -3349,19 +3302,20 @@ FO
10 16 D
-12 -4 D
3 22 D
-11 4 D
+P
FO
2907 3719 M
+P
FO
2884 3719 M
9 -5 D
-4 5 D
--5 0 D
+P
FO
2839 3719 M
45 -2 D
-3 2 D
--42 0 D
+P
FO
2811 3597 M
16 7 D
@@ -3377,19 +3331,19 @@ FO
-3 -12 D
45 21 D
0 -10 D
-17 -5 D
+P
FO
2656 3701 M
24 -9 D
24 8 D
-21 18 D
--27 -17 D
+P
FO
2775 3585 M
-18 -8 D
-2 -6 D
37 16 D
--17 -2 D
+P
FO
2838 3294 M
8 6 D
@@ -3470,7 +3424,7 @@ FO
-15 -13 D
-4 1 D
-17 -28 D
-211 0 D
+P
2933 3408 M
1 -16 D
10 -2 D
@@ -3488,7 +3442,7 @@ FO
1 14 D
-1 -11 D
11 0 D
-4 14 D
+P
FO
3044 3719 M
-17 -6 D
@@ -3589,19 +3543,19 @@ FO
-35 1 D
37 3 D
2 5 D
--21 0 D
+P
FO
2907 3719 M
14 -2 D
-1 2 D
--13 0 D
+P
FO
2946 3684 M
-17 5 D
-16 -18 D
22 2 D
10 11 D
-1 0 D
+P
FO
3000 3294 M
25 26 D
@@ -3610,12 +3564,12 @@ FO
-3 6 D
-34 -22 D
-10 -17 D
-16 0 D
+P
FO
3006 3294 M
2 4 D
-5 -4 D
-3 0 D
+P
FO
3276 3719 M
-17 -13 D
@@ -3731,7 +3685,7 @@ FO
11 -3 D
5 8 D
29 83 D
--128 0 D
+P
FO
3220 3719 M
-3 -7 D
@@ -3739,7 +3693,7 @@ FO
-9 -5 D
25 5 D
-7 7 D
--24 0 D
+P
FO
2985 3380 M
32 15 D
@@ -3756,7 +3710,7 @@ FO
-9 -1 D
6 5 D
-5 -2 D
--19 -39 D
+P
FO
2948 3300 M
2 0 D
@@ -3774,7 +3728,7 @@ FO
9 12 D
-12 7 D
-36 -16 D
--37 -79 D
+P
FO
3639 3646 M
-5 3 D
@@ -3795,7 +3749,7 @@ FO
-20 -11 D
23 2 D
13 -5 D
-7 44 D
+P
FO
3563 3719 M
-3 -1 D
@@ -3821,7 +3775,7 @@ FO
6 -4 D
40 8 D
55 23 D
--59 0 D
+P
FO
3900 3364 M
0 15 D
@@ -3871,7 +3825,7 @@ FO
33 4 D
3 12 D
55 2 D
-0 51 D
+P
FO
3632 3602 M
16 -6 D
@@ -3889,7 +3843,7 @@ FO
-8 10 D
-10 -9 D
-7 4 D
--7 -44 D
+P
FO
3775 3339 M
27 9 D
@@ -3917,7 +3871,7 @@ FO
-10 -7 D
12 3 D
-6 -7 D
-28 10 D
+P
FO
4285 2797 M
-18 -15 D
@@ -3941,7 +3895,7 @@ FO
-20 -17 D
0 -156 D
387 0 D
--2 22 D
+P
FO
3921 3294 M
-21 -17 D
@@ -3985,31 +3939,31 @@ FO
15 -19 D
-26 188 D
-12 74 D
--297 0 D
+P
FO
3900 3004 M
4 3 D
-4 6 D
-0 -9 D
+P
FO
4051 3014 M
21 8 D
2 32 D
-12 19 D
-18 -8 D
-7 -51 D
+P
FO
4175 2954 M
7 41 D
-56 -6 D
4 -12 D
-45 -23 D
+P
FO
4057 3079 M
9 16 D
-4 24 D
-14 -17 D
-9 -23 D
+P
FO
4530 2775 M
-11 33 D
@@ -4026,7 +3980,7 @@ FO
3 -36 D
-1 -1 D
2 -22 D
-243 0 D
+P
FO
4603 3064 M
-28 0 D
@@ -4072,7 +4026,7 @@ FO
144 0 D
-28 124 D
-22 87 D
--21 78 D
+P
FO
4256 3032 M
16 -19 D
@@ -4155,7 +4109,7 @@ FO
-20 68 D
-319 0 D
25 -163 D
-13 -99 D
+P
4463 3257 M
7 3 D
9 -30 D
@@ -4167,7 +4121,7 @@ FO
17 0 D
-1 17 D
-70 40 D
-61 -33 D
+P
FO
4360 2909 M
26 0 D
@@ -4175,14 +4129,14 @@ FO
-9 -5 D
-43 13 D
2 -10 D
-22 -6 D
+P
FO
4516 2897 M
18 11 D
-5 8 D
10 11 D
-39 -15 D
-16 -15 D
+P
FO
4829 2775 M
-1 2 D
@@ -4219,7 +4173,7 @@ FO
31 -114 D
39 -168 D
1 -7 D
-155 0 D
+P
4782 3023 M
-5 21 D
14 6 D
@@ -4264,7 +4218,7 @@ FO
-37 -6 D
-57 26 D
-18 34 D
-6 12 D
+P
FO
4897 3202 M
-1 10 D
@@ -4290,7 +4244,7 @@ FO
-92 164 D
-63 104 D
-318 0 D
-42 -92 D
+P
5130 3205 M
9 11 D
59 -10 D
@@ -4300,12 +4254,12 @@ FO
-11 -17 D
13 -26 D
-24 21 D
-4 16 D
+P
5247 3111 M
7 -4 D
-8 -11 D
-26 6 D
-27 9 D
+P
FO
5449 2775 M
387 0 D
@@ -4323,7 +4277,7 @@ FO
7 -15 D
45 -88 D
52 -111 D
-13 -30 D
+P
FO
6143 2893 M
-21 8 D
@@ -4353,7 +4307,7 @@ FO
387 0 D
-12 20 D
-27 39 D
--41 59 D
+P
FO
6261 2775 M
-19 9 D
@@ -4368,12 +4322,12 @@ FO
50 -72 D
22 -33 D
8 -13 D
-38 0 D
+P
FO
6498 2914 M
5 -8 D
-2 5 D
--3 3 D
+P
FO
6398 3026 M
21 -34 D
@@ -4408,18 +4362,18 @@ FO
-10 14 D
5 -2 D
-73 82 D
--18 19 D
+P
FO
6365 3061 M
2 -5 D
14 -17 D
4 1 D
--20 21 D
+P
FO
6317 3111 M
0 -3 D
29 -27 D
--29 30 D
+P
FO
6078 3294 M
15 -31 D
@@ -4491,7 +4445,7 @@ FO
-19 69 D
-27 57 D
-40 37 D
--50 0 D
+P
FO
6117 2928 M
1 7 D
@@ -4504,7 +4458,7 @@ FO
-45 12 D
-7 -9 D
22 -28 D
-14 -19 D
+P
FO
6411 2802 M
6 10 D
@@ -4521,7 +4475,7 @@ FO
14 -33 D
14 -7 D
-6 15 D
-11 -19 D
+P
FO
6415 2855 M
-1 15 D
@@ -4535,7 +4489,7 @@ FO
6 3 D
18 -19 D
3 6 D
--1 0 D
+P
FO
6163 3294 M
104 -100 D
@@ -4548,13 +4502,13 @@ FO
14 3 D
28 -15 D
-49 33 D
--29 0 D
+P
FO
6168 3257 M
-7 12 D
-26 25 D
-7 0 D
-40 -37 D
+P
FO
6346 3081 M
15 6 D
@@ -4574,7 +4528,7 @@ FO
-19 1 D
12 -9 D
-2 -7 D
-29 -30 D
+P
FO
6385 3040 M
10 -8 D
@@ -4594,7 +4548,7 @@ FO
19 -14 D
-23 10 D
5 -12 D
-20 -21 D
+P
FO
1931 3294 M
-4 -7 D
@@ -4631,12 +4585,12 @@ FO
88 103 D
84 95 D
30 33 D
--59 0 D
+P
FO
1914 3294 M
2 -6 D
10 6 D
--12 0 D
+P
FO
1880 3294 M
-4 -25 D
@@ -4644,7 +4598,7 @@ FO
-17 -14 D
23 -6 D
8 38 D
--30 0 D
+P
FO
1682 2775 M
24 50 D
@@ -4667,7 +4621,7 @@ FO
21 -10 D
6 -21 D
-27 -87 D
-25 0 D
+P
FO
2164 2775 M
-12 6 D
@@ -4761,7 +4715,7 @@ FO
-33 -51 D
-62 -104 D
-37 -67 D
-200 0 D
+P
FO
2901 3197 M
-2 6 D
@@ -4772,7 +4726,7 @@ FO
-30 -26 D
-2 -12 D
27 10 D
-1 4 D
+P
FO
2555 3174 M
1 -8 D
@@ -4873,7 +4827,7 @@ FO
56 26 D
19 17 D
-211 0 D
--72 -120 D
+P
2616 3157 M
-15 -10 D
-5 -14 D
@@ -4883,20 +4837,20 @@ FO
34 1 D
9 7 D
-13 0 D
-36 10 D
+P
FO
2852 3194 M
21 12 D
-33 0 D
6 15 D
-12 -11 D
-18 -16 D
+P
FO
2902 3271 M
6 6 D
-10 9 D
-26 5 D
-30 -20 D
+P
FO
3003 3294 M
-13 -11 D
@@ -4942,12 +4896,12 @@ FO
17 13 D
-12 -1 D
1 2 D
--3 0 D
+P
FO
2900 3193 M
3 1 D
-2 3 D
--1 -4 D
+P
FO
3900 2931 M
-17 -3 D
@@ -4963,7 +4917,7 @@ FO
2 -35 D
-1 -2 D
188 0 D
-0 156 D
+P
FO
3900 3013 M
-4 5 D
@@ -5003,7 +4957,7 @@ FO
13 3 D
4 19 D
9 7 D
-0 9 D
+P
FO
3900 2227 M
428 0 D
@@ -5012,7 +4966,7 @@ FO
-11 129 D
-13 128 D
-387 0 D
-0 -548 D
+P
4222 2311 M
-24 -15 D
-18 38 D
@@ -5020,7 +4974,7 @@ FO
6 -18 D
7 5 D
1 -10 D
-20 -3 D
+P
FO
4742 2373 M
-4 6 D
@@ -5046,7 +5000,7 @@ FO
8 -161 D
428 0 D
-10 107 D
--4 39 D
+P
FO
4530 2775 M
44 -62 D
@@ -5062,7 +5016,7 @@ FO
-25 145 D
-22 109 D
-2 7 D
--144 0 D
+P
FO
4989 2227 M
-1 9 D
@@ -5084,7 +5038,7 @@ FO
-5 9 D
12 -119 D
2 -27 D
-233 0 D
+P
FO
4872 2775 M
38 -56 D
@@ -5095,7 +5049,7 @@ FO
23 -38 D
57 -13 D
-38 127 D
--190 0 D
+P
FO
4723 2514 M
19 -19 D
@@ -5139,7 +5093,7 @@ FO
-155 0 D
14 -65 D
19 -101 D
-16 -95 D
+P
FO
5594 2227 M
2 7 D
@@ -5181,7 +5135,7 @@ FO
42 -104 D
78 -136 D
12 -31 D
-63 0 D
+P
FO
6009 2227 M
3 9 D
@@ -5262,7 +5216,7 @@ FO
2 -26 D
8 -5 D
-3 -28 D
-6 -19 D
+P
FO
6174 2227 M
-3 5 D
@@ -5353,7 +5307,7 @@ FO
5 -18 D
4 6 D
31 -20 D
-25 0 D
+P
6164 2227 M
-19 19 D
-24 51 D
@@ -5382,7 +5336,7 @@ FO
23 -7 D
-25 6 D
14 -15 D
--1 0 D
+P
FO
6444 2227 M
14 14 D
@@ -5391,17 +5345,17 @@ FO
-7 6 D
4 -12 D
-7 -14 D
-2 0 D
+P
FO
6415 2402 M
-3 2 D
1 -12 D
14 -25 D
--12 35 D
+P
FO
6027 2286 M
-3 12 D
-3 -12 D
+P
FO
6164 2458 M
14 -6 D
@@ -5410,14 +5364,14 @@ FO
-7 10 D
-33 -3 D
-6 -17 D
-17 -25 D
+P
FO
6537 2227 M
2 22 D
-10 6 D
-1 -26 D
-2 -2 D
-11 0 D
+P
FO
6279 2685 M
3 -1 D
@@ -5435,7 +5389,7 @@ FO
-38 0 D
41 -64 D
11 -20 D
-4 -6 D
+P
FO
6427 2367 M
5 -8 D
@@ -5468,7 +5422,7 @@ FO
-37 5 D
21 -66 D
-10 5 D
-12 -35 D
+P
FO
6555 2255 M
20 -28 D
@@ -5476,14 +5430,14 @@ FO
6 -1 D
-14 30 D
-15 4 D
-6 -15 D
+P
FO
6365 2557 M
-20 83 D
-13 8 D
-5 -46 D
6 -15 D
-32 -30 D
+P
FO
6566 2263 M
18 -8 D
@@ -5491,26 +5445,26 @@ FO
-11 10 D
-18 0 D
23 -23 D
-3 -12 D
+P
FO
6508 2239 M
19 20 D
-3 12 D
-5 -5 D
-24 14 D
-13 -41 D
+P
FO
6462 2310 M
13 -21 D
6 1 D
-3 23 D
-29 11 D
-13 -14 D
+P
FO
673 2475 M
29 14 D
-10 21 D
--19 -35 D
+P
FO
1720 2775 M
-8 -28 D
@@ -5536,7 +5490,7 @@ FO
33 75 D
55 111 D
12 22 D
--244 0 D
+P
FO
1657 2775 M
-1 -7 D
@@ -5557,7 +5511,7 @@ FO
-7 33 D
8 19 D
-8 42 D
--25 0 D
+P
FO
2081 2227 M
-5 7 D
@@ -5636,11 +5590,11 @@ FO
-7 -4 D
6 -4 D
-4 -21 D
-14 0 D
+P
2075 2285 M
16 -28 D
-19 7 D
-3 21 D
+P
FO
2277 2583 M
-21 7 D
@@ -5654,7 +5608,7 @@ FO
-11 -3 D
5 -6 D
34 -8 D
-10 29 D
+P
FO
2276 2775 M
3 -2 D
@@ -5671,12 +5625,12 @@ FO
-3 -6 D
30 50 D
13 87 D
--52 0 D
+P
FO
2245 2775 M
-2 -9 D
20 9 D
--18 0 D
+P
FO
2359 2227 M
12 20 D
@@ -5690,7 +5644,7 @@ FO
-10 -9 D
-12 -18 D
-1 -4 D
-79 0 D
+P
FO
2562 2227 M
-6 10 D
@@ -5709,7 +5663,7 @@ FO
-6 3 D
-35 -21 D
6 -22 D
-185 0 D
+P
FO
2267 2554 M
24 -6 D
@@ -5724,7 +5678,7 @@ FO
-23 5 D
-45 44 D
-4 1 D
--10 -29 D
+P
FO
2420 2448 M
12 12 D
@@ -5745,20 +5699,20 @@ FO
39 6 D
9 -17 D
8 11 D
-1 0 D
+P
FO
2297 2443 M
17 2 D
-11 14 D
-31 -1 D
9 -14 D
-16 -1 D
+P
FO
2527 2447 M
10 11 D
-34 0 D
-2 -12 D
-26 1 D
+P
FO
3712 2775 M
-11 -19 D
@@ -5801,7 +5755,7 @@ FO
10 -6 D
299 0 D
0 548 D
--188 0 D
+P
FO
4333 1995 M
-15 -4 D
@@ -5871,14 +5825,15 @@ FO
8 -25 D
141 0 D
4 154 D
-1 168 D
+P
FO
3900 2160 M
+P
FO
3900 2138 M
3 13 D
-3 7 D
-0 -20 D
+P
FO
4627 1673 M
-1 8 D
@@ -5906,7 +5861,7 @@ FO
-52 -15 D
-1 -205 D
-4 -117 D
-299 0 D
+P
4585 1893 M
9 56 D
13 9 D
@@ -5928,7 +5883,7 @@ FO
2 14 D
-13 8 D
-10 -17 D
--3 22 D
+P
4528 1831 M
6 26 D
12 -68 D
@@ -5939,21 +5894,21 @@ FO
-5 34 D
-19 33 D
2 57 D
--4 -7 D
+P
4507 1686 M
1 12 D
17 14 D
-10 -24 D
--8 -2 D
+P
4682 2079 M
11 -63 D
-18 35 D
-7 28 D
+P
4561 1978 M
0 14 D
20 25 D
-3 -20 D
--17 -19 D
+P
FO
4766 1864 M
4 10 D
@@ -5969,18 +5924,18 @@ FO
7 -113 D
3 -106 D
1 -91 D
--1 -53 D
+P
FO
5615 2205 M
1 -34 D
-4 6 D
11 -33 D
--8 61 D
+P
FO
5613 2221 M
-2 -1 D
2 -1 D
-0 2 D
+P
FO
5531 2227 M
11 -30 D
@@ -5990,7 +5945,7 @@ FO
18 7 D
-7 6 D
4 14 D
--63 0 D
+P
FO
6064 2030 M
-5 8 D
@@ -6005,7 +5960,7 @@ FO
8 -41 D
19 -22 D
-2 88 D
--1 7 D
+P
FO
6046 2192 M
-6 15 D
@@ -6015,11 +5970,11 @@ FO
0 -50 D
7 6 D
36 -47 D
--9 56 D
+P
FO
6009 2227 M
0 -1 D
-0 1 D
+P
FO
5613 2219 M
10 -6 D
@@ -6032,19 +5987,19 @@ FO
-16 40 D
-30 37 D
-4 -1 D
-0 -2 D
+P
FO
6472 1692 M
-1 1 D
-23 -7 D
18 -13 D
2 0 D
-4 19 D
+P
FO
6476 1712 M
-5 -4 D
4 -1 D
-1 5 D
+P
FO
6500 1965 M
-3 -18 D
@@ -6061,19 +6016,19 @@ FO
12 -1 D
7 71 D
3 79 D
-0 21 D
+P
FO
6442 2227 M
-25 -46 D
15 15 D
9 29 D
3 2 D
--2 0 D
+P
FO
6177 2227 M
5 -5 D
-3 5 D
--2 0 D
+P
FO
6149 2227 M
0 -33 D
@@ -6082,7 +6037,7 @@ FO
-11 17 D
16 -12 D
-7 12 D
--25 0 D
+P
FO
6055 2136 M
3 -4 D
@@ -6097,7 +6052,7 @@ FO
-39 42 D
-26 8 D
-16 44 D
-9 -56 D
+P
FO
6067 1935 M
7 -9 D
@@ -6126,7 +6081,7 @@ FO
-2 -14 D
-22 30 D
2 -48 D
-1 -47 D
+P
FO
6387 1839 M
29 24 D
@@ -6186,7 +6141,7 @@ FO
-1 -9 D
20 3 D
0 -23 D
-9 5 D
+P
FO
6347 1712 M
12 -5 D
@@ -6205,7 +6160,7 @@ FO
29 -9 D
23 3 D
37 -16 D
-68 -11 D
+P
FO
6209 1867 M
4 12 D
@@ -6215,7 +6170,7 @@ FO
-5 -12 D
13 -1 D
3 -19 D
-16 -5 D
+P
FO
6409 1698 M
50 13 D
@@ -6224,25 +6179,25 @@ FO
11 -12 D
-24 8 D
-9 -8 D
-3 -12 D
+P
FO
6371 1723 M
-10 2 D
9 -20 D
15 12 D
--14 6 D
+P
FO
6485 1673 M
-13 19 D
-4 -19 D
-17 0 D
+P
FO
6564 1673 M
70 44 D
-48 -7 D
-37 -27 D
-5 -10 D
-20 0 D
+P
FO
6931 1889 M
-44 20 D
@@ -6287,14 +6242,14 @@ FO
24 7 D
10 53 D
9 61 D
-3 47 D
+P
FO
6526 2227 M
-6 -4 D
18 -23 D
5 8 D
-6 19 D
--11 0 D
+P
FO
6490 1794 M
10 0 D
@@ -6326,7 +6281,7 @@ FO
-5 -7 D
-3 -90 D
-5 -57 D
--3 -29 D
+P
FO
6475 1707 M
35 -4 D
@@ -6336,7 +6291,7 @@ FO
-21 -2 D
-21 11 D
-11 -10 D
--1 -5 D
+P
FO
6597 2112 M
5 7 D
@@ -6366,7 +6321,7 @@ FO
4 13 D
14 -13 D
0 -27 D
-23 -15 D
+P
FO
6673 1942 M
-1 21 D
@@ -6380,7 +6335,7 @@ FO
-11 -33 D
6 -35 D
17 -19 D
--10 17 D
+P
FO
6670 1865 M
-3 -14 D
@@ -6390,27 +6345,27 @@ FO
19 -15 D
-9 25 D
-28 5 D
--23 -8 D
+P
FO
6864 1717 M
22 10 D
6 13 D
-19 1 D
-17 -23 D
-8 -1 D
+P
FO
6797 1784 M
-7 -26 D
15 19 D
1 23 D
-10 -8 D
-1 -8 D
+P
FO
6626 1859 M
14 -16 D
13 7 D
-9 15 D
--18 -6 D
+P
FO
7108 1673 M
-3 5 D
@@ -6447,13 +6402,13 @@ FO
0 -11 D
25 -8 D
19 -53 D
-49 0 D
+P
FO
7328 1689 M
-5 5 D
-4 -8 D
8 -3 D
-1 6 D
+P
FO
7158 1784 M
26 16 D
@@ -6468,24 +6423,24 @@ FO
-7 -14 D
-34 -1 D
25 -20 D
-32 8 D
+P
FO
7242 1778 M
8 -18 D
10 3 D
-20 37 D
-2 -22 D
+P
FO
7208 1836 M
-43 43 D
30 -30 D
8 -34 D
-5 21 D
+P
FO
7327 1683 M
16 -6 D
-15 12 D
--1 -6 D
+P
FO
2169 1857 M
0 -1 D
@@ -6493,7 +6448,7 @@ FO
12 -39 D
-5 -9 D
26 -21 D
--7 94 D
+P
FO
2167 1953 M
-11 -14 D
@@ -6502,12 +6457,12 @@ FO
1 -36 D
15 -11 D
5 10 D
--1 69 D
+P
FO
2167 1972 M
-2 0 D
2 -11 D
-0 11 D
+P
FO
2179 2159 M
-8 19 D
@@ -6535,14 +6490,14 @@ FO
2 -19 D
9 1 D
11 7 D
-0 1 D
+P
FO
2067 2227 M
-1 -3 D
11 -9 D
6 7 D
-2 5 D
--14 0 D
+P
FO
2602 1859 M
-39 -19 D
@@ -6643,24 +6598,24 @@ FO
23 -49 D
390 0 D
-10 107 D
--4 79 D
+P
FO
2185 2203 M
3 5 D
-1 1 D
-2 -1 D
-0 -5 D
+P
FO
2183 2188 M
11 10 D
-2 3 D
-3 -2 D
-5 1 D
--1 -12 D
+P
FO
2179 2158 M
0 1 D
-0 -1 D
+P
FO
3034 1871 M
-49 0 D
@@ -6741,11 +6696,11 @@ FO
11 -121 D
428 0 D
-8 141 D
--2 57 D
+P
FO
2602 1862 M
1 -1 D
--1 1 D
+P
FO
2800 1928 M
6 -7 D
@@ -6755,7 +6710,7 @@ FO
21 10 D
10 32 D
-43 5 D
--9 -19 D
+P
FO
3127 1673 M
23 45 D
@@ -6767,7 +6722,7 @@ FO
-34 24 D
4 -106 D
6 -92 D
-83 0 D
+P
FO
3900 2130 M
-16 10 D
@@ -6800,7 +6755,7 @@ FO
45 7 D
44 -14 D
43 23 D
-0 25 D
+P
FO
4187 1673 M
9 -28 D
@@ -6816,7 +6771,7 @@ FO
14 159 D
10 145 D
8 161 D
--141 0 D
+P
FO
4498 1125 M
10 15 D
@@ -6849,7 +6804,7 @@ FO
-10 -145 D
-11 -129 D
-13 -128 D
-211 0 D
+P
FO
4739 1502 M
22 37 D
@@ -6859,7 +6814,7 @@ FO
8 17 D
-13 12 D
-5 -61 D
--11 -103 D
+P
FO
4799 1247 M
45 14 D
@@ -6894,7 +6849,7 @@ FO
-27 -37 D
-10 -27 D
2 -73 D
-17 -14 D
+P
FO
6376 1404 M
-21 -5 D
@@ -6917,12 +6872,12 @@ FO
61 110 D
7 15 D
22 44 D
-13 30 D
+P
FO
6466 1673 M
1 -1 D
1 1 D
--2 0 D
+P
FO
6819 1464 M
-8 1 D
@@ -7009,26 +6964,26 @@ FO
56 97 D
8 14 D
11 23 D
-22 44 D
+P
FO
6544 1673 M
-5 -10 D
12 2 D
13 8 D
--20 0 D
+P
FO
6467 1672 M
8 -8 D
10 8 D
0 1 D
--18 -1 D
+P
FO
6693 1635 M
-5 -5 D
-7 11 D
6 -22 D
17 14 D
--11 2 D
+P
FO
6869 1125 M
36 37 D
@@ -7063,7 +7018,7 @@ FO
-52 -89 D
-63 -95 D
-48 -66 D
-258 0 D
+P
FO
7059 1673 M
1 -3 D
@@ -7072,28 +7027,29 @@ FO
19 14 D
-18 4 D
-1 2 D
--49 0 D
+P
FO
7675 1503 M
-42 -18 D
31 1 D
5 8 D
-13 -6 D
-19 15 D
+P
FO
7617 1452 M
2 19 D
-30 -18 D
8 -8 D
-20 7 D
+P
FO
7300 1333 M
-21 62 D
-3 -35 D
23 -27 D
-1 0 D
+P
FO
125 1503 M
+P
FO
2226 1673 M
18 -36 D
@@ -7116,7 +7072,7 @@ FO
-18 92 D
-17 107 D
-7 54 D
--390 0 D
+P
2438 1524 M
24 -23 D
-3 -10 D
@@ -7124,7 +7080,7 @@ FO
-4 -6 D
-18 13 D
-1 14 D
-9 -2 D
+P
FO
2745 1125 M
-5 20 D
@@ -7166,7 +7122,7 @@ FO
13 -45 D
29 -98 D
5 -15 D
-7 0 D
+P
FO
3075 1400 M
3 8 D
@@ -7180,7 +7136,7 @@ FO
-83 0 D
11 -115 D
13 -108 D
-7 -50 D
+P
FO
4233 1125 M
15 -45 D
@@ -7191,7 +7147,7 @@ FO
20 -20 D
12 97 D
3 32 D
--54 0 D
+P
FO
4272 996 M
51 22 D
@@ -7201,7 +7157,7 @@ FO
23 35 D
-211 0 D
-14 -123 D
--1 -6 D
+P
FO
5002 613 M
8 6 D
@@ -7213,7 +7169,7 @@ FO
8 7 D
-11 -3 D
4 11 D
--13 -26 D
+P
FO
6126 1125 M
-7 -14 D
@@ -7227,7 +7183,7 @@ FO
2 0 D
50 72 D
21 33 D
--97 0 D
+P
FO
6152 1020 M
66 0 D
@@ -7264,7 +7220,7 @@ FO
22 28 D
-388 0 D
-39 -59 D
--32 -46 D
+P
FO
6446 927 M
-3 -16 D
@@ -7292,7 +7248,7 @@ FO
-56 -71 D
-35 -43 D
-67 -77 D
--7 -7 D
+P
FO
6405 773 M
6 -8 D
@@ -7307,7 +7263,7 @@ FO
-10 -25 D
-3 5 D
-10 -11 D
--5 -19 D
+P
FO
6974 833 M
-15 -7 D
@@ -7343,7 +7299,7 @@ FO
-29 -12 D
3 -17 D
-35 -27 D
-0 -1 D
+P
FO
6725 699 M
25 10 D
@@ -7371,7 +7327,7 @@ FO
-30 -23 D
18 1 D
6 -13 D
-30 11 D
+P
FO
2708 606 M
6 4 D
@@ -7380,7 +7336,7 @@ FO
-11 2 D
15 -15 D
0 15 D
-4 -17 D
+P
FO
2810 606 M
-7 6 D
@@ -7478,14 +7434,14 @@ FO
14 -13 D
-12 2 D
9 -9 D
-89 0 D
+P
FO
2631 772 M
6 6 D
-19 35 D
-9 0 D
13 -38 D
-9 -3 D
+P
FO
2747 1125 M
5 -17 D
@@ -7512,30 +7468,31 @@ FO
-16 -46 D
17 27 D
5 31 D
--183 0 D
+P
FO
2748 1096 M
3 8 D
-6 21 D
-7 0 D
-10 -29 D
+P
FO
3903 181 M
-3 7 D
0 -7 D
-3 0 D
+P
FO
3922 181 M
-11 2 D
-4 -2 D
-15 0 D
+P
FO
3971 181 M
+P
FO
4040 181 M
-35 2 D
-5 -2 D
-40 0 D
+P
FO
4149 185 M
-1 1 D
@@ -7545,12 +7502,12 @@ FO
-9 6 D
-23 -9 D
86 0 D
-1 4 D
+P
FO
4173 181 M
-24 4 D
-1 -4 D
-25 0 D
+P
FO
4379 181 M
-15 5 D
@@ -7558,13 +7515,13 @@ FO
-15 -7 D
-37 18 D
-96 -23 D
-151 0 D
+P
FO
4403 201 M
-2 0 D
-19 -20 D
14 0 D
-7 20 D
+P
FO
4667 225 M
-11 1 D
@@ -7583,7 +7540,7 @@ FO
-87 -21 D
-7 -20 D
248 0 D
-23 44 D
+P
FO
4916 215 M
-18 -4 D
@@ -7597,7 +7554,7 @@ FO
-120 5 D
-23 -44 D
249 0 D
-23 34 D
+P
FO
5206 257 M
-26 1 D
@@ -7615,7 +7572,7 @@ FO
-19 -4 D
-23 -34 D
248 0 D
-65 76 D
+P
FO
5445 235 M
-32 -1 D
@@ -7633,7 +7590,7 @@ FO
-3 0 D
-65 -76 D
248 0 D
-56 54 D
+P
FO
5707 239 M
-53 14 D
@@ -7649,7 +7606,7 @@ FO
-56 -54 D
248 0 D
49 41 D
-21 17 D
+P
FO
5893 187 M
1 2 D
@@ -7666,17 +7623,17 @@ FO
-25 6 D
-70 -58 D
248 0 D
-8 6 D
+P
FO
5892 181 M
1 6 D
-8 -6 D
-7 0 D
+P
FO
2980 181 M
-11 5 D
-10 -4 D
-21 -1 D
+P
FO
3049 181 M
-36 21 D
@@ -7684,7 +7641,7 @@ FO
11 -12 D
-16 4 D
1 -10 D
-58 0 D
+P
FO
3141 181 M
-9 10 D
@@ -7710,12 +7667,12 @@ FO
4 -17 D
-20 -3 D
10 -10 D
-91 0 D
+P
FO
2810 606 M
4 -3 D
5 3 D
--9 0 D
+P
FO
2721 606 M
8 -7 D
@@ -7761,9 +7718,10 @@ FO
-14 12 D
5 22 D
-4 4 D
--89 0 D
+P
FO
2708 606 M
+P
FO
2901 487 M
20 8 D
@@ -7782,7 +7740,7 @@ FO
-8 -2 D
-5 8 D
-14 -7 D
-84 -9 D
+P
FO
3104 282 M
5 3 D
@@ -7791,12 +7749,12 @@ FO
19 2 D
-11 8 D
-30 -12 D
-7 -13 D
+P
FO
3111 268 M
8 -1 D
-10 4 D
-2 -3 D
+P
FO
2984 556 M
6 1 D
@@ -7808,12 +7766,12 @@ FO
6 -13 D
-8 -8 D
9 -6 D
-2 7 D
+P
FO
3900 188 M
-20 -7 D
20 0 D
-0 7 D
+P
FO
4062 181 M
-3 -1 D
@@ -7829,7 +7787,7 @@ FO
0 -181 D
217 0 D
31 181 D
--86 0 D
+P
FO
4382 181 M
-1 -1 D
@@ -7840,7 +7798,7 @@ FO
-31 -181 D
216 0 D
63 181 D
--14 0 D
+P
FO
4333 0 M
217 0 D
@@ -7848,7 +7806,7 @@ FO
5 11 D
79 152 D
-248 0 D
--63 -181 D
+P
FO
4550 0 M
217 0 D
@@ -7857,7 +7815,7 @@ FO
-249 0 D
-83 -159 D
-3 -7 D
--8 -15 D
+P
FO
4767 0 M
216 0 D
@@ -7868,7 +7826,7 @@ FO
-68 -97 D
-52 -74 D
-3 -5 D
--3 -5 D
+P
FO
4983 0 M
217 0 D
@@ -7886,7 +7844,7 @@ FO
-32 -38 D
-38 -43 D
-7 -9 D
--2 -1 D
+P
FO
5200 0 M
217 0 D
@@ -7907,7 +7865,7 @@ FO
-4 -5 D
-2 -1 D
-1 -2 D
--3 -2 D
+P
FO
5417 0 M
216 0 D
@@ -7921,7 +7879,7 @@ FO
-48 -40 D
-30 -24 D
-129 -106 D
--13 -11 D
+P
FO
5961 70 M
-142 8 D
@@ -7951,7 +7909,7 @@ FO
-19 -14 D
217 0 D
102 65 D
-9 5 D
+P
FO
2072 68 M
-29 -6 D
@@ -7964,7 +7922,7 @@ FO
-4 2 D
-1 2 D
-8 5 D
--82 59 D
+P
FO
2261 100 M
-8 -2 D
@@ -7979,7 +7937,7 @@ FO
1 -2 D
4 -2 D
216 0 D
--122 100 D
+P
FO
2473 122 M
-31 2 D
@@ -7997,7 +7955,7 @@ FO
-4 5 D
-11 9 D
-5 6 D
--69 66 D
+P
FO
2685 151 M
-36 -6 D
@@ -8024,7 +7982,7 @@ FO
217 0 D
-11 12 D
-40 46 D
--81 93 D
+P
FO
2941 132 M
-8 2 D
@@ -8042,7 +8000,7 @@ FO
-25 37 D
-11 14 D
-11 17 D
--45 64 D
+P
FO
3196 102 M
-22 5 D
@@ -8074,7 +8032,7 @@ FO
10 -13 D
19 -28 D
217 0 D
--54 102 D
+P
FO
3443 67 M
-101 4 D
@@ -8086,12 +8044,12 @@ FO
217 0 D
-4 9 D
-3 11 D
--17 47 D
+P
FO
3179 135 M
1 6 D
-8 9 D
-7 -15 D
+P
FO
3660 131 M
-21 -16 D
@@ -8106,7 +8064,7 @@ FO
20 -55 D
3 -11 D
217 -1 D
--23 131 D
+P
FO
3880 181 M
-22 -8 D
@@ -8118,7 +8076,7 @@ FO
23 -131 D
217 0 D
0 181 D
--20 0 D
+P
FO
25 W
4 W
@@ -8945,36 +8903,6 @@ N 5850 3900 M 83 0 D S
N 1950 3900 M -83 0 D S
N 5850 3900 M 83 0 D S
N 1950 3900 M -83 0 D S
-2020 -128 M PSL_font_encode 0 get 0 eq {ISOLatin1+_Encoding /Helvetica /Helvetica PSL_reencode PSL_font_encode 0 1 put} if
-233 F0
-(-180�) tc Z
-2020 4028 M (-180�) bc Z
-2660 -141 M (-120�) tc Z
-2660 4041 M (-120�) bc Z
-3289 -157 M (-60�) tc Z
-3289 4057 M (-60�) bc Z
-3900 -167 M (0�) tc Z
-3900 4067 M (0�) bc Z
-4511 -157 M (60�) tc Z
-4511 4057 M (60�) bc Z
-5140 -141 M (120�) tc Z
-5140 4041 M (120�) bc Z
-5780 -128 M (180�) tc Z
-5780 4028 M (180�) bc Z
-1783 0 M (-90�) mr Z
-6017 0 M (-90�) ml Z
-1204 375 M (-60�) mr Z
-6596 375 M (-60�) ml Z
-248 1125 M (-30�) mr Z
-7552 1125 M (-30�) ml Z
--167 1950 M (0�) mr Z
-7967 1950 M (0�) ml Z
-248 2775 M (30�) mr Z
-7552 2775 M (30�) ml Z
-1204 3525 M (60�) mr Z
-6596 3525 M (60�) ml Z
-1783 3900 M (90�) mr Z
-6017 3900 M (90�) ml Z
25 W
1950 0 M
3900 0 D
@@ -9111,7 +9039,37 @@ N 1950 3900 M -83 0 D S
62 -39 D
25 -17 D
170 -108 D
-S
+P S
+2020 -128 M PSL_font_encode 0 get 0 eq {ISOLatin1+_Encoding /Helvetica /Helvetica PSL_reencode PSL_font_encode 0 1 put} if
+233 F0
+(-180�) tc Z
+2020 4028 M (-180�) bc Z
+2660 -141 M (-120�) tc Z
+2660 4041 M (-120�) bc Z
+3289 -157 M (-60�) tc Z
+3289 4057 M (-60�) bc Z
+3900 -167 M (0�) tc Z
+3900 4067 M (0�) bc Z
+4511 -157 M (60�) tc Z
+4511 4057 M (60�) bc Z
+5140 -141 M (120�) tc Z
+5140 4041 M (120�) bc Z
+5780 -128 M (180�) tc Z
+5780 4028 M (180�) bc Z
+1783 0 M (-90�) mr Z
+6017 0 M (-90�) ml Z
+1204 375 M (-60�) mr Z
+6596 375 M (-60�) ml Z
+248 1125 M (-30�) mr Z
+7552 1125 M (-30�) ml Z
+-167 1950 M (0�) mr Z
+7967 1950 M (0�) ml Z
+248 2775 M (30�) mr Z
+7552 2775 M (30�) ml Z
+1204 3525 M (60�) mr Z
+6596 3525 M (60�) ml Z
+1783 3900 M (90�) mr Z
+6017 3900 M (90�) ml Z
%%EndObject
%%PageTrailer
U
diff --git a/doc/scripts/GMT_App_P_2.ps b/doc/scripts/GMT_App_P_2.ps
index e9b1d15..4ab4658 100644
--- a/doc/scripts/GMT_App_P_2.ps
+++ b/doc/scripts/GMT_App_P_2.ps
@@ -1,11 +1,11 @@
%!PS-Adobe-3.0
%%BoundingBox: 0 0 612 792
-%%HiResBoundingBox: 0 0 612 792
-%%Title: GMT v5.1.2_r13347 [64-bit] Document from grdimage
+%%HiResBoundingBox: 0 0 612 792
+%%Title: GMT v5.4.3_r19525 [64-bit] Document from grdimage
%%Creator: GMT5
-%%For: pwessel
+%%For: unknown
%%DocumentNeededResources: font Helvetica
-%%CreationDate: Mon Jul 14 10:53:11 2014
+%%CreationDate: Wed Dec 27 15:10:12 2017
%%LanguageLevel: 2
%%DocumentData: Clean7Bit
%%Orientation: Portrait
@@ -272,7 +272,6 @@ end
PSL_heights psl_k PSL_height put
} for
} def
-%%%%%%%%%%%%%%%%%%% CURVED BASELINE TEXT PLACEMENT FUNCTIONS
/PSL_curved_path_labels
{ /psl_bits exch def
/PSL_placetext psl_bits 2 and 2 eq def
@@ -291,15 +290,15 @@ end
/PSL_m PSL_label_n psl_kk get def
/PSL_x PSL_path_x psl_k PSL_n getinterval def
/PSL_y PSL_path_y psl_k PSL_n getinterval def
- /PSL_node PSL_label_node psl_p PSL_m getinterval def
- /PSL_angle PSL_label_angle psl_p PSL_m getinterval def
- /PSL_str PSL_label_str psl_p PSL_m getinterval def
- /PSL_fnt PSL_label_font psl_p PSL_m getinterval def
+ /PSL_node_tmp PSL_label_node psl_p PSL_m getinterval def
+ /PSL_angle_tmp PSL_label_angle psl_p PSL_m getinterval def
+ /PSL_str_tmp PSL_label_str psl_p PSL_m getinterval def
+ /PSL_fnt_tmp PSL_label_font psl_p PSL_m getinterval def
PSL_curved_path_label
/psl_k psl_k PSL_n add def
/psl_p psl_p PSL_m add def
} for
- PSL_clippath {PSL_clip} if N
+ PSL_clippath {PSL_eoclip} if N
} def
/PSL_curved_path_label
{
@@ -307,6 +306,7 @@ end
/PSL_m1 PSL_m 1 sub def
PSL_CT_calcstringwidth
PSL_CT_calclinedist
+ PSL_CT_excludelabels
PSL_CT_addcutpoints
/PSL_nn1 PSL_nn 1 sub def
/n 0 def
@@ -343,11 +343,11 @@ end
/n 0 def /k k 1 add def
} def
/PSL_CT_calcstringwidth
-{ /PSL_width PSL_m array def
+{ /PSL_width_tmp PSL_m array def
0 1 PSL_m1
{ /i exch def
- PSL_fnt i get cvx exec
- PSL_width i PSL_str i get stringwidth pop put
+ PSL_fnt_tmp i get cvx exec
+ PSL_width_tmp i PSL_str_tmp i get stringwidth pop put
} for
} def
/PSL_CT_calclinedist
@@ -368,6 +368,33 @@ end
PSL_dist i dist put
} for
} def
+/PSL_CT_excludelabels
+{ /k 0 def
+ /PSL_width PSL_m array def
+ /PSL_angle PSL_m array def
+ /PSL_node PSL_m array def
+ /PSL_str PSL_m array def
+ /PSL_fnt PSL_m array def
+ /lastdist PSL_dist PSL_n1 get def
+ 0 1 PSL_m1
+ { /i exch def
+ /dist PSL_dist PSL_node_tmp i get get def
+ /halfwidth PSL_width_tmp i get 2 div PSL_gap_x add def
+ /L_dist dist halfwidth sub def
+ /R_dist dist halfwidth add def
+ L_dist 0 gt R_dist lastdist lt and
+ {
+ PSL_width k PSL_width_tmp i get put
+ PSL_node k PSL_node_tmp i get put
+ PSL_angle k PSL_angle_tmp i get put
+ PSL_str k PSL_str_tmp i get put
+ PSL_fnt k PSL_fnt_tmp i get put
+ /k k 1 add def
+ } if
+ } for
+ /PSL_m k def
+ /PSL_m1 PSL_m 1 sub def
+} def
/PSL_CT_addcutpoints
{ /k 0 def
/PSL_nc PSL_m 2 mul 1 add def
@@ -466,7 +493,7 @@ end
/dx x x1 sub def
/dy y y1 sub def
} ifelse
- dx 0.0 ne dy 0.0 ne and
+ dx 0.0 eq dy 0.0 eq and not
{ /angle dy dx atan 90 add def} if
/sina angle sin def
/cosa angle cos def
@@ -495,7 +522,6 @@ end
{PSL_xp 0 get PSL_yp 0 get M
1 1 j { /ii exch def PSL_xp ii get PSL_yp ii get L} for
} def
-%%%%%%%%%%%%%%%%%%% DRAW BASELINE TEXT SEGMENT LINES
/PSL_draw_path_lines
{
/PSL_n_paths1 PSL_n_paths 1 sub def
@@ -513,12 +539,14 @@ end
/psl_kk psl_i psl_start add def
PSL_path_x psl_kk get PSL_path_y psl_kk get L
} for
+ /psl_xclose PSL_path_x psl_kk get PSL_path_x psl_start get sub def
+ /psl_yclose PSL_path_y psl_kk get PSL_path_y psl_start get sub def
+ psl_xclose 0 eq psl_yclose 0 eq and { P } if
S
/psl_start psl_start PSL_n add def
} for
U
} def
-%%%%%%%%%%%%%%%%%%% STRAIGHT BASELINE TEXT PLACEMENT FUNCTIONS
/PSL_straight_path_labels
{
/psl_bits exch def
@@ -557,7 +585,7 @@ end
{PSL_ST_textbox_rect}
ifelse
} for
- PSL_clip N
+ PSL_eoclip N
} def
/PSL_ST_prepare_text
{
@@ -635,8 +663,8 @@ O0
1200 1200 TM
% PostScript produced by:
-%%GMT: grdimage /tmp/gmt.hKxwP9/lat.nc -JK6.5i -C/tmp/gmt.hKxwP9/lat.cpt -P -K -nl
-%%PROJ: eck6 -180.00000000 180.00000000 -90.00000000 90.00000000 -17653837.706 17653837.706 -8826918.853 8826918.853 +proj=eck6 +lon_0=0 +x_0=0 +y_0=0 +a=6378137.000 +b=6356752.314245
+%@GMT: grdimage /tmp/gmt.ObaI98/lat.nc -JK6.5i -C/tmp/gmt.ObaI98/lat.cpt -P -K -nl
+%@PROJ: eck6 -180.00000000 180.00000000 -90.00000000 90.00000000 -17653837.706 17653837.706 -8826918.853 8826918.853 +proj=eck6 +lon_0=0 +x_0=0 +y_0=0 +a=6378137.000 +b=6356752.314245 +ellps=WGS84 +datum=WGS84 +units=m +no_defs
%%BeginObject PSL_Layer_1
0 setlinecap
0 setlinejoin
@@ -748,326 +776,73 @@ clipsave
56 -35 D
19 -13 D
90 -57 D
+P
PSL_clip N
V N -11 -11 T 7822 3922 scale /DeviceRGB setcolorspace
<< /ImageType 1 /Decode [0 1 0 1 0 1] /Width 361 /Height 181 /BitsPerComponent 8
- /ImageMatrix [361 0 0 -181 0 181] /DataSource currentfile /ASCII85Decode filter /LZWDecode filter
+ /ImageMatrix [361 0 0 -181 0 181] /DataSource currentfile /ASCII85Decode filter /FlateDecode filter
>> image
-J05t23$]7K#D>EP:q1$o*=mro at So+\<\4o5KE)PPFDMm8NCP45fbB`D,R)77Ek+$4:G/#-A?kpR`a8\687qI=bh?2_R85,.)
->)(&6CQ1JF1M6%Ma4&dl-`^/&sZ%c9^6bh7-^U?W7 at t,RiHa`0s]3.p8Z(igL at SBCt+PX\jK;fe7/0ajnAY&^gM+`4=1jRLW
-!YA:j;]g2DC,KZ8jlC9.Q7MAVI[Rk$L9>ap[gP%/u8GS'pSDR_5Lb<MnB_obu'JMds-LCbo:tk21Nrhf*f[4mpXGa4Tdh*,Z
-P0?,Yml\Ju)\:HQeaBf4Q0?['3 at n9B=e5:;fBJU`e,A3XG/s6TLW^)oR`WW#6[IXXMrVt9QU57^Ee!Pcu4!<PFqZhjpAO:3!
-/,B-TnNPWu3+TfMVga`cKnE__;6]]_U"N0a[mh8&C":l'_O\A1W78L!6(e0V:,9"K2;pQK)OmIK<a:\o7]q=;I2^:l!3]8G/
-;G<T/ag+=2.*6LGTdNHQ`2P=]P0CTkaV)7S0$Fs8[kZ(t+oa(;1ITDDc1>b\2GQ%h2`aZ39_CHm1VBbPbu;QC2c(.rq*I_2'
-b<=NPEb#mdBnl64AcdR'dlnbe;$cIPjLV0e.i;nIuGf.^l=9F2-!OSFZKJ'<Af2.NRYA$D-5?=c"C'Xp"aap<jfnp at Fj!-ND
-rrE-'!K-<TTQL=*:X3B%QaA=)(nrh6CG>Fq'^TgQrACB3Z5.X`7J[%F8D9F`l;Xg%J-eFC(:+l$2(Ye`D0`GBL`NgU8E_IG4
-H*7>'P9:)/KAKE;'2ULS$tL`bYt2iD.TN\?7LGg8I/A(\dMN+3_08WI=@el.W=R5R-jiV?M_Qt<gWCk(L`*cI5')4ipVAiX1
-CQ=fst7AAsjmU_mN=iQYdl1p'nVs8P6JYq^7m]iDKRRUAUlFK0QTkdh<ae7u]k(B:BHJYd#D>O7FRVmH>a0oTjNZ5\#S*p6i
-aFh>f4/708s2/gr*t-'Wr+?>Unf17$a7<K=(!,p82^uu at gugE6oA#ZkcgtEQ4jiiV#>*56I"tSJo\F_$d<9oP;pt?Pa)B^U4
-b#]RFZp%5h=Y)%L"UZ5kEFp"]s!jTq#/g6jn`;=S`og<#IWsrT'\pqO9ja\Iull2c0us-0 at BIjIim57r;V!$oDS]]fD>H<Vs
-X;05O\+>+1qDu0F at fpfDts/Zj;2d!X$5.q#_`Z#(KHA"i-KG"CQltJ'_Kl6-'cCi$9CrE+T\JW(@5f$n-^hJdoT,0a_<a-&%
-GP(r&#C%H55cLIMu-LpAo_U&71unH'lP+VI9'oL4U6*Zi6JM%_(,7#CF at .$;$-&L+1RMX_l877b$'U;U)hd;gg.31Cdq"D3N
-gW]!>6h&>9XA;Y at V/B,-F*92]DNmWS<8!q77UXX.@&e72sfV'1Y4Dp99_F;H=q&UcFIuf`[6H8gO+XFF.M_WLOa8%e=A;m1A
-nk)a!B^6P3%"OS)dT+DFr=7qBZ'J;'Iu.&^/Vj+cQLaHKbK4`V-.K>h`,8u+q2$ff'YTnj)J)UaM_ZW,bF%lnB$CXE0IF0VR
-hKONbiu;iB$B,$P?)5=)9"BYguk1`Y&_e_aZ?>9j.+QgH-Z6M4/]1QSMT,J:Pmae-j8IsPNm]p\d(Hu4T1sQ#'eFN$Ua$H&Y
-`6!:lk-+7d.N$UD.U*;;*frkiEq^e:s,a3_`/E74"ceSs<4-=\J!b0r<CBQr?%_9khR'Vc;NDe!bPXl1I??[18j/8qg,W77X
-=W)Q$K&Ro8J+'WP/.WZC't.7i*d,B[CDeZ-5^C>E9uoj4n'lFBus2.`jHNjRB[`EDMTC93]3\^lYi?)t)JXqcu1f%TY$CV=_
-jQ28<uqXn:_V1>b8,/[NP).@?0Mm:i.`n-+TA?;npZPI<"ft0CYm0/'HQ?(AV)Y7V/-)\-$.b7ZO=(H/rUUF03WnU`pD90Mn
-,@\$>gS+XcXl[=,[dN,0+ocLuot\)H.cXdWPAr3ld(/lljkVGFE\>&U\sGnRh)hlcDU$tKpH%g"la;!*[DolrK(WGsh0?,Ok
-.VYWq-R at LIID%F^DE(2heW+<mnN_q=9en6bQi^'/aL%D.eqp1&VKRaqS2f$"5t3tGqI#R_c9N_MdeRrE;:Hj_u*\I*'-RZ.0
-%4&WtSsT?&N\\.E$JG(1UT`N3SBea#K\(A#sI+1%$p;Gc);;4CO>V7OH4/gEY`PSWe)K9ZT3>,id+ at Pk!U0b8CO/j]n.=Eoo
-R,R7A0,r5kAthH.kq!u9tB]pnQk@`_bS0P3GDRBbmtbupf)jXb>2ZYk<7q7AKH%.05L`ei!/o/UIN)4Y`UE6OsW%I%.Li!9%
-l,@^/%l)cb=o^8C$qN"Bd9gbnf7\8)_QW7cP=/kkAWRUdN=)0s9W:c1]f)"]8&,g4GFoK&+3nI_S%>h=_0"onA)eA9ZQ``51
-bh)_:C$dLSZF5e?ft.o1lJ8qYp?oQIRqHYV?+%5P0&kM&?Y=7Ne[7>:iSAjQG&BIX]JddadeiK^.FJ,LLtKWjHiSZc/cWV2*
-spl<.t_e9$,_!X#N:&'L[`S(`H[^\id<hDnW#cO\BbuO]T8'C%R8$[7jmBqCR+I.?-. at f,itQ>Qh&u^brLhFk'Y(+F2!"B\`
-Yj5*-7eESo)W]+"ugThkKa<QdRp59'BPNSTR,gaZ;XakhRVdo,[_[qZ5Xtj"uaSZ8^GAs(:VGQa?DBe(_K9B^S%$\otgFh7K
-;(m_-fQGL#m=qtFdn4gVqJ^Briq^OktS0?!X()rphAM!mN'^A-#'h7T)7nig9uH(PK)r:c$>5'+qo:IXN]8"]AO/'*">/*hU
-bYP!?#dJFGWm/70gpE%r2qeoF%4dW>=I>?g0;Z&c!OW,42.#n.es76.ZbkaOgk5?s(oKL%@qd3:drK"G[553k05BlDl0>I>_
--gCPYO7</+bPT%Udf(>loR>-DrVqr at s'LEVIo#e<&*Ekq"T+8^s6oOYO:M;p#6>A6!3b>^ckQQ,m/\mi!cT([0HgKo(B>"$"
-0a3V0J<;X5m)'oqQGk]n5(8OrYpGI)aZG%E*EM8 at NY)I+7NP?OCnd%D[0*M#1.]%ODtNPK*Q@:#dB!g&<R7FM$WTt$#lFAYb
-;>AUBrWB$F#j(OIlkV[0mPD#uH*Zd'jDp\I:0o$a at _\0ZOVV`=6e4%+*B2OP^JNK+1Z=%Zo]\0^T=roaS/$#-d\0Yi-+3W=S
-M*$kQPF0bE[PrYttt*'uRrJc?>0(D3no&s4OS0e3nL0+q,*'9Oj[Yqm'@2&$W]'JW;rYt#Jt<>@5k'N&-MnOXKN<u(7&(/\9
-O&SDmlD\fU!(QinWd:jF0FVli[(f>\uOae4QPo2<E)%iDVEM46>UDVCX)0)8e;6_%ERi9\P)j.HGdBsgR'-(e(+5t]o at Ep*+
-diB%N*J+52 at K.?&h]:,'*`;#?Z.g<So,dGd+0kJ[EW7*n!?[I,+4:H<nb40S'-M<3+As4';AgZ6+!@j<+VH:KZ6:E4/L+.J,
-4[$(&iV$j73g5@,P"DOE\/Ol:F1$]-*fTYdN^(O9."[V-1YmudHr:OBdJpb-F.V7Eb-WGcQ&+(Q@[g9 at GiANNZ[hT+7baIZC
-`RDOXa7s.[$JTd]k7LV^kZG/!@(dZBm$r]dkkW/@)`9d`3ppd4=e@/<\g?'$i0ci@]/c/TT`#ZILSuoe/)b.['0PP4:3r__+
-ji0Tt<I;[kDo%l#jP0=(C.ZO8M:#;T3q1:$'u')+,e0elTe134Zro+s0G75PXb.'lTc_>YMX2BJSN*qNGjZX+aF=<I-?2H+$
-BdqL]rCGp6H2fimrZZS5`EB"VO2q)h-ZXYtYPrJ<&3>7rDF,r8DRlJlr3)cY71T*:_[6#&437FQ^Z_'=#_)`7E4B&^OZbnkg
-d62Qq4Ysc51Yk1biB<Cb5-qFTF6>]mkrt=$4]Cr6Z]dWFq`g;+5SNNFZjAlOkquC86)?ggiV"L<,=3(j6F81.oI!!_/ONJl6
-ZbIYZp@'D776];6o7J'oM%b291<r"7?ge at ZscDqAOY*_7PnmMFDXN)ECY+h8$mD/e9ORVKh+%W8/.%SFH8u"O\'Y[8[O[Oe/
-_.,INO.?!!3$j[&<s=ZV'kt9!l-%FKnLrX\;^/9 at UpS'Y@%\dnI.#9U+ at -1so&Tbt\u9:/ob:2!n#%fhXH^:DE+jo^>S`!Dd
-hC:fQ1Go^,G>&Q%!M9_AcjFWjVhktj5d:mEP.PoWcq+]25Q;>!"L<BjA]6W4^I<)irtPtt?/;cFK5<7NEt'jjs@@o\e,<Ri[
-%eMC8A92&<]=/3JNe>l[O!E_YV=>['\[>.l"!Eg.o=]Lqo24%HGR9EUi=r!Z5orD:3UKZ3/>;a)uFbO%"Vd'tO>]n"ge[o!"
-a'@0D>?0!RQ-!>ifj7\+?BsJTFh_5T_d0\G>uf'S[IISro3\og?o?bJQ2tB9m9oW(?hOY1efeCD)e(]%?WJ[c(*?tN%:]#Y@
-b)u<[P;5l2e2POA(F at W<IJF'!Zgp5*YbYdJ,s6t?"Q!!AbKp?(2%5[DeE*bB,5]'[X2XFDeN1"B=<)!p4m??NG')9BblV@[[
-CkgK5"A[C%eB;eqn/XIqmQFC"B\+G.DBHV/02MCNbPNQHsBueS99DD)U-`QJlVfa)-"5DKaoTp?QP'nS7dbC:;r:f&L[,s)'
-aBE&RT4QK`=Rol(]@DH at Wo(E7>%fl<>^E7VR2="khLdn7)-!!1VkPcJl`!HY_3FB;%U2aMN:;foKIFOs`>G>WI+ at s%HFG#rO
-'f5#PrEHRUdFr,4BpNq)8H$<>@GaF&-f9(6#Mg9MrGk[VMGEmI*Rs9.LGLph\(T2R<Z$U\_HC(ITQ\BcfXaG>hHe5rY(X77b
-c[;(CHT0c,pXsl%_gV9kHroKZ(Y+!oRsu6hIQ..Qp\fT.q0dJMF#XRNiQ"R#&c`abJ[cGGp_eZ#*J-7"Jp8l!=>>E;1P5BZK
-=Epopc!jc4bQp'KQp4E\5 at pH<J:-KKfE4hpg&V6>D at B2L6uP,\8d8uFb\OoLH'X9G^YB-JV\Q#Lq&.pfSPFZ?\%iJ)jIC[^]
-B<0V2=uHME%YoGccl`Z&<k1Mn$0QfXZq8`JcduN#9fuGgD>Yd>`D$NO[Gspt:ZEh2XJZNd0rO=RhE]o8`V=O1>"Hq"Kk0rK(
-._OEh:s\Ijpk'p/5-OZ=;@fU4.=X%K(fP*E#1?icG$1QqPcP at +ET))[U\6'JiLPM&Tn=Z_ld4dB/;PF5L;fis]o;jJ:mQ?b]
-\fh[p%AX3(0Q^Mo]\RV!%KpN[6Qe@:a3KKK:NL>'SR at 0>.\Y5GeV3cJ&R[L(B\QPBsFdkCnS%6)!q6ukSJX]f_S(YcJH(CJY
-bFBI%SGAA>=j`]Vh46RfS[n-Z3Q[m2iLTdEOtVV0'WN&#X.TFnTUH%W\d+lh';6<^T_\tfg)$J%)5::VTirh<g+/l.,GQ.nU
-"VT'?id%V259q;UH1i<RQmU::Sg*HU`*=13aJUD8Ym=uV4)7u\oFRX<MirBVn./NqIulh3N"ohW-X/p)L&/A1T:.WWOdSY>)
-T?uIAiU2WVW$_g5W-oWN"UFWg^,l]"b7k`N*1QXEpqK)Te[ur6jPh9"N^V)W.\Yh6)(_Y+"IT]()s"ord$EY<)QaHMt'0!O-
-nMYe((CgBk+]'sTh<Yo=^gHQTN)+gQG at ZF_?eq^Jij/[IN!Z[4jA>=#U-6aQYY[(Ao:qa\%U9sn2&[<l2dRb"L4M+XJ$9"S[
-8)fN0sEOOV9\!qTNqfT at EF19nZ\,1lg]8a??NW:#N\=8bmgRG\lS[r$h\XTM.4.!PuT=UMY\@])Yqkq'\TtD>F]N_qZHcs$J
-c+SJO]DJY@>L1#FftL\@^:WX at gY]Y*mCjOu^3f[j>OfD^"h^?1^AIlES.WL4qnILl^q:2k49N:0-,2Pk_;$ESqn'\7/&AkU_
-`T0[>CEq/@MdOp`..h(r(G!k:W6R5`8"/h**Z%J?cG3:``uZdghXqm?,leDa';WaI"02,GK8Kc`ghh(S:SbOPK<ZIaaA*Lgn
-2YMM929/akWr=]S4KjYKD7#b++U;*4a/'V90dsbC%FSgo\cT]?GZUa]u[+r85d^c-BSEc@#$&r8#RZdE=YqcFiJf4P.olgX"
-[XclE;:r;Y*5pWm+/d!Z#D4W2R.iR1t2`(.HV'W][_!Rk=7dlfkCI6Z2o6.C<Oe at e6!rCPN[:";C0eU:`R?")9sA(CNhf"Ge
-KrFa_FD:`'5f6r)!]n+e+L"H9YfKG)DrJfJnMqNN at fq"D]]qO-XV:j\(g-)LjIBD6eZ.](,Do$!WTjp^.^&T1ogjR)qS]0D-
-!SmXsg`=r$^";*=e_QeXhEB9CrQX34oA:SOhd,'qSaG8SpY]?Wi1:&-^$4Gr'AacHi4]f\h at JRO+lU-'igpD6r[$JD0B55*i
-nb^9Sh]2q-ff_6j8ML.^*D_<46/S.j;qUg?<cP5/**:'jW6SH4o=BuC$.ZqkItHhSq#mO?g&Pdk[&]$^,P1\PN\TLgSPGqPc
-O'L!U=!e'jd[#rhiB&Xm80]lFsOgT!dn`Z0QkTl^l5b5QU6N]Bh`5m,$.UhV7H>bO/]am9\!(hWsS.g$X=`mloe#^>&)th=(
-?lmp?IlT*=YT"7Y1]n/hDpru^dG+n+;5nXhE'+#!3"1%TlPo=m*PT0`!s3V5N(oD_8NhbWm9a7S7doY3oh5 at O6B>P3JQp0Uh
-hIqSKt%I(fa'\',sFK>/O!Vg#Up`G:d5EYa!!VkQ/q*1;C5E#@[V>5V=qEL8@^T%)0VtpA#q`h@^hnSpcX81Ynqqnm\^VTjJ
-]DXt+qk(e(hqS(Dh>L^<rdU44hm*2'`Vk;\rh9Dm!%FR;8/rBJUP(qlOJl\.%1\1\i\<u/8h9t$6fBbeS8(2-N^I>48K:c,,
-*0kmEHs*Q5;8&?Usdp!VJ at uScK>h^eDb0sSkZ.=WZ;"p-(d`lZ[&r2Ka^4GlBPP\?EmY8<pQ%)omX_cYup at Y,m4S#!4:JI(>
-Dj#fl+E+DO1a=cL5ng?LLtMc2RNh^L2#J4>mQZKuDs?=PRLQ(QlaKZ5Gd5=##raAb12;k'oOfcKOm=9bs'mVq#LS<aBm`@Bn
-L%p6F^o#rT6K!&iaEcMMh#hXC6$/ft=Ba5D"6>[D%fT?HD:\fC-V-`bnaG.N+ILL7O'm.e4VD]aVVjl:U^T!'McU[[o"^#)&
-(TCM at Cr4S]:X8;_+0=1B@^^mdVs#pu>"TptC<"f>J:kT\m5VGeQ$U0X3rsHR2Cc_ki0VgE66kJBo'La`U<u*;SU'2?`&W&"T
-7^81p)Fj8H at i<;6iWU=Bn_A[;8>$*<,=f$ZFX0P!<.uJeZ at n&^7hSLp.ERac[49 at _bb$+P;[g,h9=#>!1X*/Kdjn(t<80(L'
-&;.n:33eu3D at mIo/4hbN/p-K'?(,=cuZ#?1f-!)%mE[/2&/>R1Y!R>:p^*<6;g^@+\Ki'D*Lir2%liX+B9fj;q3`_=&`1b<E
-iR*op&fd<].!l>?<]$G?`\,eU:b*p(`3h=;EcLA(\4YQXs=.9qQ$$(3QBe>'@<MCg+9lYAILPjhGZf2YG%.>^&'KFBk//!E%
-[^Fl'>7#SlD#?A(K)HsX;,m=!lb"n-kI2l6e1?l13oK&>3E%>A.KAeBRPpc\G/@X(WuLLI]Q221(X^+G.M=8#(Ej4N3CPN3R
-X<K-#W?8[mV)3.peAN>K>RH1o%5F^h][S`RT\b:ZIBR.UYT4Rj'OdbN;Q;+8fH=j(Okh8diVs;uRZ)ML4r\\q:3u(4NTN`fF
-ZgBh4f<fCa<nk-$qj-'LDEG#a]5KdNpUfn+f)<=$r"fIPE#^eA_sk</(WCC,:ERSs*-WXMEdY>Bb]:AB0?nRNk<I5`4SM:kF
-F?)@e9%6_(U<YHF(.>+?&/JFp0Fm'g%Qm2CYX+3f6c4qhA:h&GQ%Pej*6#CLY;KP09t[G*e1*NGs2J6kkLaYS*]qLmr.Q=Ic
-n]>HiCe)nb[aldImF/Vp4`-hiFW,HXDQ]qgI?tZhaS"e)c)JjncaD]`;Fc!.M-=pHWrK!+8b.IdfAk^mHJK+2eS=n'VKX8-K
-3j1`(CS^(E[eZlTJaGD,I]!()KB5bU"dL(LX.6KhDXiJ]UJnE(KQph^OM`'/r1nf#G#!>(sS.YuIR*Q1L"&n5B9M=AA07!OV
-(@C/siZ!&>?Lpn.oP[92d;Cf`mTbsOU8rW:0/jpPu'k9(-NU_`[7gS8tU@`5[EQ0iS8F[<;Cj(g.p,Y]ggE<9pF-+f;/B=^F
-*Fr,TOch%\a at RRk@3h1^Tu;LRTE-DcoUD'XG#6<V74DdnVj)5!;bF#d.ckcSQ4gK+9)3*NAYcf$dcO`V\T'8Ke at h4^raAIaM
-(iNm_jJn"A5'Op1M0V3R?KgK9c9oe-FD6jo2][%\[=A.bhnnQW_?/F6lO,\jo>F^F3^uj3[\nKSPut?:AO!7B8lJT'=)u23V
-bh9m.m:&eppOfpHYYSn=]ClJC$=L6>-N+Tp.0b:tcXPBS at +j1h)&6WY%[59c'SS8s%H37mC\k(8I+OPYt["8a-+%SJ8Ysdjc
-G5..%VD1tmo:b"5>VV*:_T@[^20;c)^q3iLR%U=>'g:FZ6/T<j][)^*-cK/H]1!!94OWj>aD-!dSeEj8X@`E):^@B>`cZITr
-->:XXmXYmi#<uT[rCRoLJ(#lgV9%@9`c$Z]q!kVP1oj=bRKs6jQ`E4W"?0kRGZ'E&Ef^]2Vm"L7sG%/Kog at Jl+h3tT,EmNG)
-2eXa*UpN$hb?6>iC@*%9ZM($:gFCrp/PWOYes>&oHXUdYmC]gV<H_A(Lf_Ip!k at .ijP7A0F)G"'\X,ME>oTbb0"'0>pK$Wd]
-<uj#c/6."K(!"baa!83ik6.oo\OrFHZ*Ka]m%Kj?Rt)_n$Vi'(Xi7hHhVu-jo<*J#6*OC!J)p?"i2#t"^l-aJoGSG_?FI%&1
-f..0Wl5/KEs2=S1TLM`Z;u7D\- at T8V]#9-,b%T%:ZD;Mf>gH`L*D;@dIT^nYS7apt$KqCf-75juULb!u>B/I>`+m6Gtl/+QL
-+QOn**EanV>OA3?cPZE>:kfbZ&JXJqG):0u*]?R]Rqa-SQiABXe</`n/VQ?#H4adL$jk:CbH1HoQt\[+A.]^_G2XqAMO<.S^
-*!MM>.K@(SR7-K%6UNC+/d<\;QBe:L(oX:%6)H0 at EI5e$Fk+C,VLJI+t6)c^WV:?KV<GHARWc`3[e_8&GCHZ%,FdBJeRbqCd
-SU%@qp:JrQpL%f#Ks>e2a4Qk+:M:%g'?Cs7!#n0ND#L??G-93H)cpb at D7R)umaiRcDf9MV_7)?=jkQ>Q!,d58\p!f6h:n]Dm
-k*;)GD>bG45YAQ^%K$^<rLnpCOkleV82j"!8s at TK^c\f^UPp)i;=OFnD5P2\*"Oa4C`_XXoHF#IidQR4*kmA)9=`q-K4l\Mt
-%9Iau>qDja=+fo+#EEG%7W\,R^,m!0>F9n,VX"#G:W at H-lCH5j8.[T(J&2d5lJAl$YdnoU^Q^HDa^-*F#Uf/u at .1k?$hpHa%
-W&a4C,8B'gU_ZM"3bfXjplm at D1HG4+JCHXBkBS_pmMY1_ZYIs1;ZpV(j4#MM96Fn#@q`:tD:iHnXbnD67:GqSjP4F_MC?<b9
-lY9W3k=%DE=Zm$&77K>S)Vt?RYdsA2plMYq/p)^QnHN.XEIAaRJhWNVi^N&^*f=gr#s5A=nM=>sI_t`+:jF"_'o6scdq4Bn9
-I35H\5.B#;s&\Q8^U<fbcenVlKC=72anYlpir'sco_s>GkYY_O+@,jUIfKNJ5I^7a+4pGjDuomOe,R2D!5I:`^`3>>/-/!4s
-$/sU^aoXS49rYY"MfZp5`>q5N!_g<$UDW95h$+UoDZQ'%D`/T_$gOa/.t44'L<E35jT4Nj:f?D(;X5Q_3>d&U`2Tf)SpM8_8
-HbulkdLn(r?+k64=C at e/?(r,XM&H_IOn-4=<I*qEfiY6B!-RbP)I5*/G.G6JO2D">3%=01,js_[qAce1ed.1.+_j_cQn+4>f
-KZ2FEE[6[Um]Zo5f)3lAlt_jikWS3Op(5==Kt_fS45"?+144iC;``&'s%/4IL!4N*1K6qftd4A*P^3^h1b6SqNU$r98j9LOP
-2`=u'86r69^;8k at L74_-OCfNgo=2eEH`C)UQPY+BG:rUXZ7GM)mZn)Rr)$gck`Z/H<"Cah_ at n&jt`__4U'P,4:Ak%_k`gg^3
-Htc'gC.?E^`k6.XoP2C1DT;lu`nY)p'QV5>DoXt^`uJteA9:=XFiS<C7bi8ZUio88GK3[28">"Jm!m'WIRh%d8/-MCb^`4%K
-#g1W83DIE%#)cE at n:Ei7l6)o9Sc5=M9*Ve8DJd;e;2.eNl\kp8G$9/!3H98JOrB48R.S'<0t^;Qq;Ceae0BjPafdjRE<sK8[
-P#0`1>$BTZN^qaonH\r16MCTh8"O8gL7UFJVR1Vogip8R/.8Uo?s[X%Jnab!`;QoVp!_X at iDX9+8)K1pY9bZV%=(92)&&A at K
-^?[7c1[98'08XLZNeZcgS$L_REnPc.7I^.\[Cb7qb9+95(l^WH\CMT?He'ZU1Va at qi=bbW>(XNA\nbfn#Mbe26FeB^hLccm0
-Nbp:Y11ssQ1d`k21buE9=9\7O"fM-J?c(s%;[+S0lg<Ijrc.(UpjPS5;i6CoQ:'BP$1uceKi_EJ5c<TGUAEV6[kg"#/c at kIX
-Pj6K:`X8XVL_(.nm-fH-mnXA]:DEBG,kHNhmS=hqcSY>k7/"r[n5!$YcZK$0V#,r^q9OHeca<[IeGdetr(mOrckQW.jRH%m"
-41$Kcs6`M%/E_:#gd,fd%ptD70uets%pZDcWp\#XU\1@&()*m;"Y7E'b\mt"joaNd8^n.AId+1'2]2V:urG>V$^)-(sbVjd<
-tdd<+#^aJPlaR;B6t0'dM-Q,Z6KFdUa`QFX9q>-IRl$dZl<1V(9ub/CLpX;T169oe+\s/lNK<diC-k,r="-1t+$6dmZ/n<Ar
-<[2q+$N;l)J&XZ=k<4O_84e%IroeN[!o5L^E5e0R at Z2*o_T6I\F`1]Ro>'h86($WMOGJ-AJC[7XE39%:gSeC@=Dbt1n-:/oJ
-8eJ2!4%7o#,;H5k[<Fnd&"]j/Z<7R74eU:TNKj3(b>1JU<e\ti#'jXi, at +DYlefA*u2-<l_ at b)9"ekKZ*<E[miA_*,J<deU]
-[7F>XC=\qNf$/!]eRDSPE7O>nf%k2p-#_ABF4V.Af2ZkB/S;.6#`'4@!!R[MTEj)>I+PKK=1*KYomPHrIb5*Zf=cc<21aCKJ
-QPp)f>WEq4b_O2LtIE5fTh6E[>NU*L=i&Tf\MKgKoK3rOP'5Uf`dMk23->VP1`9d=^@!>AXD(5I9BR;=`'JXSXA*LRouSYfY
-s?5Xe&ZiTNW(s=j<Yo%AMQFUY5UAfbL,\d]!4KJQdj0>+M\IQ)iW8XBN$5g?#HjorVF%Y1jDhgD.$K-*u>H[+dIG>=GsSFgg
-%Y[Tf$+gRYk/V7YKi]\BR%gVpm2e\9fB^YBR=>U at 2@/]$4"`8!f#gc`[4<QA?Ua4us$gni(s[E74;b1st\g6rV(0S*L(!*p&
-]h$)6_("3.Gdp49Kh.>-mFk'cOf%l>;J-FHYQ.t,kgteOWh8RlLjkX50i8+Xk?+&YIrSu`LjBaG!?8^g#FlH_=kh^aP?<ugP
-[H?=_lJBME?JXPrea?cJleV7(?R>-r?16Z&nD<R)?T%L_V>"=knm>u'?Z"t5SbV*Ei*X1cST"Q7(&n7<!+6QAi$JH^/cjlg"
-Q2`Qi'%A'<X3#E#N1mRi2-cf[L(m+$K/o5i78Crc4Ajq&7G2Ci?f/q2A'@e'&cS!iDp`QAf'E4(u]WU@>5ZY[Mn,E)I_29iS
-GR5jr`RU+Q;`3iW^T9(*_a-#b)S/!%oU-E.?kb-t7WRihe0a[OG\*.cS`(im7eejtG`N0]LY<is%8K(,04k1ZMLl at qILVFuA
-9.1uiI5A#;9H[Q!3+3Fg&lj/tRU\:<Pi53*JDj<chH%RT4t5 at deKj??#n7RuM$7c[<9jG#s2Q:g5X7q02*jOQq6mOmT":uq=
-2AEHbMc8q42rr?A*ARL#L?<:]U=65`Mjec-k[TV_+>33b0jjmc"c<o\q?tK%>jsFO!2IU2e at cgEqk#Q*VAnU74B]aJPAqk$^
-[VFsEC1c%4k2'q:k&9DUE9?S.k6>s>(38S-F6?SFB4c8KDKY,cGisg,kC.95"oeR_HtUfUkK\N`n-A.5IcqPtkU(dm2M('UK
-'5[XkZ3H%8:Th-LZi?,BQf6r[Yj:gMJ+o(ke<$imZ6SWOD+?9kiRuk2Nd5nO_IjGkrtBs:6t.!LZpFXl)'e][ZfsIS*@)Cl.
-1^UcCSbTSa$uDC&Xgk%\DpFU?Y4CC1`fI<hnr7VW]Y1kW'Dcn-a!FXG?eVC>Q(-k-+(DYj1Y]lMuEbY-Dap[-L2hlR'&U<jq
-=K\*K?bCHf8oG.[(K]^)0&CW='Qk.9mP^?cWLCaQsa0!/po_<a)!lrM-m5-o'K`b^+GCo5&8:<Dj_bj<?oli,.FY0LkWbA at a
-9D'mTq2TtJGdHs]WlpfNAnJ'mM%W.6ZL]5tDY1da$h!N,;mCqHEf&(?,hsM9<mO$k02W='fipK:tmT/K<:?V%Wk\bS-m\]7:
-[cq\LlL)s`maggok3q`pnF$#?D[,b#2Y-<+no%S#mp>YTB(tb;q!W+rmtU[WQMU'iqsW,5DkPfkn.>'g!/LRSE$#+"-Niis!
-<F8Fn1P"87gF!G#On&cn>?P2[gDQ=$Ll(FnCIh_mgS^k%WN!inJ;i.-PQ"l#4Pt6nM_5'7i(WM(\*h+nR!.'G8p(]*:]XAE<
-dEPh]MC/+E?Qfn?3pS%jUWm,]X\In@'W_:FG^G-urB-EfUKcNW0#D/99*eo$8q/h_+L*0Cou5F!i[50/<&W2"O3po05/)=#Y
-252tN at qo;=Qh[lO&p3qLBTo at H1tcTh$a5]cZboHurs2aMOU6M+&@oN+NSB1MT$8G%*tFGEH[[n?;58p&ZXo\W at 7k>1aE;"X3
-Ro*6e$p_I62<-:E)ok.:tG?&d@<qVMTop8kTVd&hd>kPR3FiR\e?X<@1?M51AFsg\k04FQ5AG/N)p-3'[s(6FUB(h:"p4mDV
-QYUcBB6MU<p;_(E^Mii/E-CtVp4%(+2fSL]EVEOUp@!%r:Ngr;GP at GHpJ6!WVgJ0!I!.3q?gnqWmsg,mIs;KSGSbu,-\M19K
-_RK[GXmJ_GD>mJL3T&?pn*B;Vi1>ZN;0T9prAD>f8fY3O80TQGpe^L09Q&hPkdh7q*12@=-n2FQhcu8q59U*\!d',Reb!pq:
-D56c_($rTR$:)qBr!52kbOfMi/VU!PbLXE. at _&W-WrlqPU=h\#F\oWqt&BqU_nHkHFa>Ykn+!HO$hQ2mW:i*.(2]HY9\^Dmf
-Id\GM&lqgZ3SQb.UB]DL3aHWRk,pV$J(]_iS]r$T:-2o5DV_Vb+%r(k?18&tO/aS^8(I##i at GK,$6bl"B`r3spuBWtk5*rQV
-sL]>bM0 at G8-eGVnfrBJm3=4_k5fDV&gr?*3\Vq?F<g&97OrR]p)kMQ6qi;NE/IL"j22rag,idOthra4acB at m*kk5L_1rcdZ,
-TBgs(li,N&ro`Wsp[.rUkl1&?Ijadd2t-c2o)D5Qs&\po+7Xhno`(97$LRip+8^Q'J,d:^J'\(L!=Su.JO(Dt=@=2F#)5HQY
-dedE+VTXM at Spg7?8WU\7O-<jr,t at NO\'(=GpK+Y.@*Tfd]%o. at kX6EAs7M1k&!/L:?U*["S.72U!RJ;H8R%-9;GK6W!\5JV,
-2`+.^aL!>-h>5=)4)th1iUPYZU8C>=F_*B=6H1QMYgEgN0l1/lu8rhXu'+?>m6'4mr9$_-q9WHmU'IM8j#pfW9fd,EKrSEd<
-%uB.9=oB/<]H#(K(5]@?Jo#T5^&X+0EB]$5E=@C+SQG$Ag\hfZKdDE$=`rqCu]iGj*)IO?A"al[X>gocDkUX/1IHC]MWB<Bn
-SG5L+Q#BRlAnb at L'IlF:Klh#Ne?JgOQjmMtfFS/0":'^Xnrr:=2!<,5Zr!*5;O?<sT^p%&U#!l(%+U>k\F=@L4Yac7S_U.'m
-%`7`53=nR*$qV&Ld1fFj`A'JT(<)D`<uAp(P[PHLdB%=+7o?pC*64/"2'5 at dm"lh*E\r[O[)a)j-:u8URj^l!N2\8KdZh!db
-;-`<0$BFU[kQ"S'YuNJdk&m%9iF1+1sM53h)NZcSDcM(;loLNcVq4H4O:@hrBS^D*</@P<&FtLd8WgX6rDH>+%FZmSL$nV1q
-aVMTAoDH:/c9%5u6!0ogr!0[2ht at TAo6<;q9E8 at 8p9-I:l[5Q+_$>f!X=R?<:.oJR@&0ond)/[N1?<fbRkSB%^4-R:k5SNN$
-Spet'!ZgD8VQDVI)J\Std)%EWVFe_OAJ>uc#(1*Cd\s*.jOIHc"5\"2o6h\Y,;Ic"6"q1%=)%LIYnfH(QTi>>l9L>b+@)2M_
-RN[]hEfTn7Lj#Fb1NoQN+2j!(Q(.")Dfe--bAQ_2uPi\<^?'s`aSme("=fub6jV6(iJ`is1J"YuY*eC&!=tYr4kup!5V!5Hs
-SZ(flStE%J>.1E2lWVTEXD?PH^TQoB*lYGO4$LcnCth_<[I)^LiO8/9Ic\0/S%e'umb?=_^$j_E!PWMWrs-@/S3IIpdmJEd`
-ZP,&+ia(XIj`>.SA-Z"o"<j7c?!7Z6-o1.pIWa(]cTtuoc7C8f(E<m=kE at QO(m6ih4JW>pDr.6hY025H/No'%uK9?hA;=6q*
-%$.k4tTuQg"8%Q_E[?hQMo5%Yu48J,?t[\a]LR(W#Y>h_3CJI:#4jo_kD3h>$r`TAfWq?a'"ss'N82r;Wtfs$.D%!8m\XJ5@
--c5^4"F?t9Oocn5R=fHCCUPSJd(?4&uS/I#VD)hZLP&4+r9#N6 at CKTK2.#GMG1L\r]Wd&n3PfOG<JPVn2WhAO4uD%<8X4,;2
-V+ at F5(&)nQpLli`'7$rlFi^?Is;)Tgjpn\XuUf!#S:+Jc#Ynl?3?&MR+/k,QS(h4h!N7!YA``UV,j&BlT0toP9#i-J1UiVKK
-7"LeXruRrrH&pA at 5KDFX+QO5jO>7kD8;Rd"A7UU\dOIdYfcqa&Pa.Dp?:i8,/LI:3S!29D:eAbt-fl>AP`hV:8sr=%j[?28;
-RT\"q.2(QUp65kc<Er0EA$@c]pDXn?;(*J0P2SUNs#;HO?&L[-</6XP<NR&)4`U]K[ZC=<btK%[5I+%fpe1SDb_1^39LG*S5
-Y_q:3kAMVe#%_Z`\LJ)<!^@I.a(0g3QP?ofd$Lpn-%'J'ZgL5j/pdTJR^A:l5]KBOqRFe1-8Ng*8uK8t$?&%Z?DE1IgTI*MZ
-S[N`#XA880 at mUstEgdTTL?kuB=31qo8S$=->>V),!ub+)C6F%toL4f=PDS^\R+:oX[dW7;ZZ<(`EQl<Qu\Ps2*G)Oj^kKiG'
-P<if;I[8j6g=f\rJY>uRX<)h5++Ea'$er&!\lXae4[B?u?)W=reI<D\mg:C at 3oj2FqGd#Zc^Xq3@@-eV^YVmQ>=GmVtCh8O0
-egeaCgEU4pQ'JY@?HLli/S;*'S$U[hcrnO\BC-_5[$I<4>+80"m7"+a<jpXaq`q$3YlhG0rnH1sD/Sa[]XLr8i*6)4DltD&\
- at 2t.>apjrmQJh*=$#JKqk\CPV9lg*:@$_?Z$,Qch7GUpmTp:7G]+ng][r&5?<bm(moAbgQbN.M)r5nFL%E%1f)/lJomQ;bq7
-i9qs'G at T-HI52+8?cX?sFFtn6QF;Qp1ga*#jS#L(qL,<t&Mb22/9s)8it&%q6MEM"(Bi`)rKA at XM15EFpW<fWQ+NggQ03Q8Q
-ZAh\p!`D2rVu43-">+Cj2ZO7F&TaI++njID3mZ:7L/ff(!%TgD$8R/b=>?RfWWXd694>Kb]D0P-qHQSTsqbdiKbAt78;o0.$
-9=h?S(r8jGiVJsi6cTC;pnXf@'IEsqR5%kB'TQDN5d+SjqBO):FoN$t!RQj7**?Cr_L6L'>=%m=&25Ts%RF at SI1$SX"Q.40X
-+F9E)lA\fCok(2R]!#1N*FZ&BI^Ra1gKJB at FfolL\C]I'?gHO!YkAjOfK10aClOF[G%SqNgFHrRh4q=MQIX]Y?YSnuXgY[Xg
-Y:J,E,Ek=\+^s&gmapWDOnt^pI=N*>ISiprP5:a at 0>A]s*O4*mCr>7r81`QJ8bDj^UPWli4KSQE1RZYpcf5H>W[[Zr[#L,po
-<<n?]"<5.E8m\)<9LjO7D'maS?Vuj?0&tEfNl:H"SYhgoHf_hIFb)QSmoqhjO)-D8`rn3p.LOTQC*dcak7#54Ri=O?SglqHl
-t]>sG3/%\;*qVc2m:9<<8BZdnp(?0e&2XnEgLfXhAum+n#8G#$T at qd4()S\MXX*o#KILNMrif=Z<Vp"d7CH1/H8^N^h$i;<P
-.n6R'NG^gIfHtS9*hClqEh]_(YQZ;6\**\Lh1-b]oSb$0;c?^!ak^=hRo\PMUH='V8rE$,oT"ihQ+'n6HLU6^2fA(^KFm].b
-\bD]qhg?Ml5fLd]p`CI6I".FPIV6ath_40jhkB]AQdtps?g<#7Z1YiWh><gomJ\3 at pqI'or83jmq/c$Y#TrCTs1A&ThrXb8T
-CMoQhtqnqli-q)r;TRi!"])0:]19T!s#P1!72A[&/P?9)Z`bU!K\B):a6%'+Tg"<!q7]B&2s\f3s.0$"->eNcpIqt7g.1-"V
-=<10M_jK>6U*q"`RrTct*CmB*Q^u!ftil6%gA"GTZF'#S;=g:k&aiK*[R"#geb at Ya5Y-R0c]M(_E5F:n%fRT*irC$Lk)(&@W
-$D]*g=-$]r14d)-9R`sg>6%1p\fd%_$=eIBm[%M7)!0]*@:lOK$F%WM"Ld.7^.pCGX@&+K6'&I/kE$P5$'&<PuaYnI_3%11C
-'R,O,LE?lXr.2(#U'+l`.0eX2;3tm`@'6-AQd7"`]7hj?D'bO"P;,7pH;\['/'sV6`O_5EVCDKca(6NMO;0*P9E>R#H(\(iL
-&Vh1-M&7t.(t"NaZ'Q=?R2D&p):>2sZ)8I:W>\X7)\K7l0qfN5],NK<)c=EiE?H`?"rX\j*<H0[n^SX7f,`8n*YI'H;;WF7i
-uX?O*msR#Z1f=Pq&`K2+;+Vr;>hW#"!FlS+OUoH&f2\])^/*"+d*ok;BmBK+X5>^,4[6/&iV%54!QLF,Eb>;dR,:C7jQMO,n
-`is1/B2o>:#G>-$!K<&]cfg"r_N!-NX5onoZ<8G:1gc-k^eR;L^*8K.)nD.+4;-ZBltjW@:`-.?^;Q;PP_)TdnKg.e9Vj'"9
-<1SL[UQ.l,!mP/Ssba"5Z^/J>`JP1M8Ufe!im/eZnk62rN7k:SOI0%0>E')*r?lS"Fo0(T0!'*g*F#r#9W0bWFlNfG5jYq`R
-++7gL.1EeMP.l*;A1356,dkrop2`&oE1_Vl+;a3*[6St!&1t,A[ZWB!t=Z',^2A9FU;dD;F at lCZ+2Uc_+'6cA+HT+lO2j8_N
-;hI&nJN2,63:i%g':1^XRlN9s3Kp-se"\sfV`N;'3tj,!A*tIJ]fWR7+7m0.1Vl1Pb<2!()jAT1F4WP'ff`9g4qlg;;r'X$j
-$'g451B*f'@B$cmm#:o5P+b;'F-m&$U?N"4Z![7PSHI5(I?Oi650qr1`o#J.mfIR68UD]e0dU?4$qF[6W?E:F?)_\912`R6k
-iQ`PY":8>=DLs72.%:oA;WJ/g+TC7eC^CoPmBCF[q[G8(</]["h0dM+CU(8JI4W</jJ6P=`-J8^sM-'W4OpX%H?n8sHMP<3o
-5^YtNTU9D#hi'ZWmHb=jb=9U*pueC.-Vf1jcF:))GX1uD&-lV<]5:3?)&eFcTOpJ9<9:_`_$<,2_*"s#Q1;$$\nobC=](K&^
-%;AC'I<?<7 at eP\7R;\^ra<@:^f1K0Q';q4652(_cB4&ja'<>@r&2, at 4P(K?Z(<L%&oF_=_iBi-`p<`Np:<HD6,D,Rcg=*8pn
-22>44EEH4l=V[!#<F&`bM-4tj=LFi*oqtsCCKT,f>#hh2Q#BkaRo#6g+CX)229$a2`E],A*Yle%e^n),gKaF/?'XASe`0u$k
-?c^"+8+)i($f4LmpD@[?e,<d[GP=l!FU'[@29#T2 at j&Y$Xm'X@?r-HFsgQ2+_$``@b*>B(*-m#4(@nJ at MUt7(-Q/.7phQNA@
->EIQ<.BN;.Z%nAC`VLemi:bCL[!MAeoH"e_OjQiEPmh+CXMJ2MN=IKkRoOB\&A](7/_.RqYooBpPB+<hjDqTk`/VCA+]D(:S
-'[]5'=>CR2ePf#)<ia)'>GD&1<32U?5 at gMN86D0FrVf&^cbkAJl:D\hSU<pssMo5BrpDq>)0[g-jg$#irRE>K.*<t0%JIn$.
-:+'0V+62tsa.<9V_Eu-KN="SK[1NU#aF2 at Bg(IrQ at 968]\FI,jHf1C'c=*<+pFr+)#='oul>BVr>G8G1A=(cQ_D0M=rG;k(s
- at K1Q'K6Z"'Go(+<\!)(2KmD9CH$>m+Q`#'EUNs>PHC'V;f<]gjV/pjiHe5NM2a_t:bC!B2Hl(+U[rZQ at g)si(IJ;_CpYgRFj
-aNQbIb41?\+b at gq0uKCJ/A69=8dZ:"+[ldJCkNd(`._t)hD*3JX at O2=<iEb+bJ>oK(pjK(cR(L4+fLWK:"rWfL(=Z7tfM`Kc
-!I:3)>61>D8GOKm7*]fO]dSB85&SLDX`TQeR:J:`hXTLYr2h3/<;,MhkJo*uKunR#d)kQ\j@[MAVh?31^*ePDWJGMO:`-Gdi
-SJOc,U7Mn$Z`(o`DFa,B`=N*+Jd\C$8fduE#%NL8acpuRK[kDn3LNO\;8)!-g'_iIpqO;RGEf`dJ)qh]RtOLYIS\IjqV'on\
-&OZ<`1R3@^&h3*%.P.8>kq"KQS3WK3FIMkG8q*UC78!M[qPo35[3DYoC>EtU`Q$Hl)fk$HeB9q4dQPjM(=`9XPF-i;EQe@"X
-\VHOiM3qG(R2M'R=cJi;PF8tJRG"@()5inuX.!1nR[L at K=gOTcZ('FUS,'[d)987MbFCT=S=.chGrqRKU]:GOIMq+8q;Zo)i
-LZJ#T,Ha_=mqu.o:MHNT at sC=g&mtY$_SCITUHC_\eUo")ke/lTpc4\)BGN?-_VG)U:N.TRQ$kM0r(0pU=pif)FpS!2l#(oUq
-0Eu\k/`%=eH[/V:nkC>%+:3CS_q`V7LN>>'6a3Dl,R:V`JgqqM1_IM5V>*W7mH/\qQ`$gSr9`*>d\7+93ECV5h<3Wd;"OqR*
- at B\#\5pX;\XL]#1TF\ZFN.XW#<]Ra\A7eZHF?Wqsc=)VqNal`F at PY1i'B>19Ynl*&h8YP7"Z])f.)o<;F.YWEN$HO$ep$a8;
-&Z!/0MgEEiV/$:r[Z9'kBHRZ9?/Z]mOZWfMqqa7`[!ONe/ZeJ9_>;NZk9=#RA[2T^_R\.$?W#U$?[bq1q4*S.QHad4-\!qlW
->D'GTJ[jHi\GM2p)je*>S%1VQ\XT;'gS;?LVn1WZ],Rf_40Q8#]=XQI]6hH-gVpfEa1U0M]c5),>L1!0e%M7.^"_S\]B?mIl
-+UBf^DlXV>OB1po=qp3^Y?f;]Eb"D\UFRk_#+fF*"g#7'u?C^_;$47*"B`s/&E8X_H\b3>SY,G2o?V"_q[V.*';	>hfE`1
-0WB>XcV:;oP86`7u6Lgge?o>K4<a`I'\cr--09F3!'U`a!f1*)Xd^Mo*,>a8Cq<4HmmW=ihY=adf!F>\hJeS'%8!b1r'$*21
-K%\]ER,bM7Ni*4Ndia3-S.^t]7 at 7$\c.iQ\"rc2?VHguls&l-<Q"cQ)E">j]k-o?Y)DceS]M*='ph$d`/gd%(]p>nbVV&^fD
-NdJY$4*@K9@/(-R6d[`, at h)!NN2q-S?e/^X#4[7G%9 at TM.e9t9Fh,VuG=4Q,2ef at oE?!l02A(I19c$aXQTr!2YGQ8b4fH#=k
-?%:LTK at l`T)P)f>?'!XoS(W4Rfq"J_h4r\pNS5DNgE!-DrO(@m\_;J8gYKd%]oh)UZeTtWg`=_r]t)r^c/%3bh-K'rh:pb6j
-k,"GhVIe\*T,a;dGDS4g>2ee?-2!<#N't8g\qfChA+pS);l=ii;O,>IO!hN-fNnIigqb&*])e]S_%14S\^eE!L`"t8cTo(jS
-hm8*`qH)iT+<DjrR[f5$R/u at HIK"k8n@#5&9<[Fm%Usk$EDu*e3@%;<V>Ekam:frfcPpH0Lo_l+WMK^7j_=V<XY?lJA/t?FB
-'I\*LcClFsgorb_".\a)GqlQ47:!!2Hca6Z"AmG:S)^=DH(l0U[nm9\uE*m*l"a7!?pl/)=*rrMT0pZ*D,*2/@@!KZc#)?:i
-snc'X#+"-V\iUL8"o,fFQ5:c>5!V67JoH-*c5;Dd07J,J!nfLNt+&DNY<V1cJo`&4iT4dcQC%`W1p0Unq?X*6]HhP3upYSpE
-5CN8jDta3hpjYm25E56kQhEY7pKs'X+/esBRJ.espReA[h_k8FPP`,&n__+YJ&D.*3W*6 at r4f$*5Ip`Bc1'U&rWJN(2rGMhi
-Vm3crr;ThhtR-mp`Kt]p]:Qu?pNYSQp`P5%#%!@d26[p*tO"C,#MI,?8WR\7q7[L'RE+gOiSg=R%0I(/WIoLd^b%V+XW[N-M
-'bZZ?6SI:1t=:N8fULThf:-=p48U7&J/lEiM8l8PcA:.9/E/19j`X7B?(gglAd5OJ"0 at RoQWED7<a;(E8Xbg]1Wqme:M9me)
-"@hsZp?p'1nV_dK_d>YZ at UNQ,JuGoV!#+d:)\Eu@[&?T4CuBCjgsmZ0Z0d:m_AI9)h?WRgA-gDu$p?a\R([[V]rkBXSp at 4n&
-k(CuAA[K%)i5"G]ob3*e*r4\L^S'^JCqY_J5CU;j`Er*KKkDQJ$nbN*sO!g.9hXu'jh]BhIfC.jM^:p5+iWo,T5>TK)rkIpF
-r;F731^+"IO$jWc54CZB#JH4g\HbGT*&.Q4n5I.1_/RmQ&AbUJk7YZdlq%f'0]W0K_f!q_)+JVAC-Vb&Jd3:9#T7+m8+GYm*
-QW7(I3D,o,`a(hdS-,U8@!W.-V8?;V^]`NXKsBK;Ugm]99TL&0?V_ma"GLj1rD.Do2#HEb`Yr_2G@&>b<!i\PhS5p;e5JZ:N
-QI$5#2j)Y<pKU*=YEa'Fb@;c87[-8'BDA.7qYr]XLAX<8AEaa0Np+;,hZ^iW']a*Dobc2.]ij<E4`W=Om)0CKad3STA":<Q0
-/h=1/9X at 9<.CK47sV23VM&G"%g1=gj$VBj'#`UMAM+[Bj[RG.kM)>LqoNEEkFK_/ik*4j.qQG?*C>fp+/LH!YL$8qGj7"n@"
-IkSZm>?T7rXJ7*Tp#D$:WrX4BefF at _4iL#>hKjja_-]$cLFt\ha=N3:YiHYVlNoISj+,aYhL/3ujR9iIG at p)i>Nb2Bg>E`[P
-:2ths3C[YQk4tlWT]^UOCSBtFrc=ju>#'L?J/RKNW9*lI;6&Zf^6PS[)Lf#ZCO0T0H>IpS7K=+c*mq=]4(d*RD-MbL\F'0Zl
-ah!2T(BR4>K6EPDnH;M_/K5n"2]$T2\X'uHq,'nEP.&Ka`6+6,KfS)[kl6LI(qbfF55qCd<%N!6.9q(5>0LKI90Y&m2I]gfg
-\4-3.[8V^N'<u*T)"r'7KV-hY;O)LYd:T(Q7@!hA:\(q;;LCk]qWDRHo0jT9JX<hQN:7G@'aInG<.i\*s/X2p:c?Iim#'I=F
-K9k^Hlj#Prm6:Po#Js*(mI]uTjCTBlQ-n+$ImL^O3TbP-I)*X4l##6#`<qLWWH$G`Sf"5l!PJIk9Z60LB2h6XG at OHe`)!@U4
-l8,s:,WY\!X?OGb.0SY[l)aa=4%H4BC+E6Ha6b$h at U'*N3;#VY+LlE$UA4h[J/g8.-KbInE;2LD..`;Ul'B0F%MK*Y^7B!g8
-,(s9\EJc;:8;e@\$rW%(W[gR&b8VZgE/cTp29&1n*2C_pNmW;>`u+=b,CG!$Z3E9Y\@!M)Cl4::)F?tT*@,,O<.r\#91!V<5
-ifudPB(h at 8bk@p,kRdpP)`I5.8_O*9W+.R[T6#r="Ip)ZBc-K>>&+=/LAoUQZD4p9DNuiAaI=%',"_I=ckH$<5t>i->(K4SM
-Xr3e!]f.Bh`<@2<NEAS!.<"9t=+Ik7lr9+94cj0bHGo:]R%BY^t)Fh)o=do:>KUH;?!U4t"kISeKt1:RV5HVsO,MPF@*M)@&
-Ih>m[/[nq5:m)+3UF$D:?jHdN`\7OW*RU==4@;!L83kj7i7<'l_q$9(O*4W^FVQAX*/<D4i1,GimrQ-hWk9^.6gUf>L&;bCt
-(.?-?coOacGH at 8O<"\GXllB]qWM,L>/8">iFWtulY+G_%A!!35(ebZUS.ck!<23tCGEX,_t7:rYZMRQVieQ_?FENPMC\Q8Rk
->3h`'Y1;+:<ndLY/*19FFb79Xb7 at uqm=hfg._XL#%:^q`J$HF[a4Y5/Ah38;Ya.VufddqQCuq(i(5C7?lR-4ZoqJf/U=39B?
-#4?uYd7B-]%_"'CoqQ^[J&V1>K^)^mKLM;G8 at F5H]`>AGQ88-%d)QiSTJb'e%,3Rl!8)(Fmdf5]9d!q?+[jqD[#16=-i at 4Hc
-^Re2<hf at Y4l8'iHoL&n%MlSqHnU4IW)Xj^DH><?eb[30GXW'GR":XHjt[H/doK41Bh1A+bT6[b/0NFj+hX[L&_Dr%iApi at D"
-g[0b,E.(j?O#Ho6dP*[\j.UD;c^>Dk4j+3%Ep'B<>%Lp=BK`VAm?@m"[k0oeT@\FUYLN(K0f5"*IOq^1B?Fd+W[:<GR!-"Lh
-qPk(,9b1SR%jLhISEpdAZR6*(_4NX#_(2:tF[k_N"c'u#qE6B+T3b4cBSo]p.c2"P(kKN+]Zc7F3\BbOrI1TRI!-'--1I^N`
-+f"[qNma at d9'JJjVKBhIde\/^C$dpYobO7NRY+OR4\r&"7]Y'C[oDYk=faK(Z.>Ai>AGg1X`_puf37oTC]/I]FnW]))\6Fp?
-'2BM<l`m?-Y at 2nSYPgPe(T<P239u)[>5Z7gDb?RD>h#Sp<M^QH[Bc5%E#aN53^kWHZj9Yh7Ik8o%eZAGjc+3]D#@fh]$3VD_
-;"'GII,#]AJ&)NX*>/:Aj&J.t[7c&&<Cm&)l;&L2[V=_DnG0iVZ?$EK2ut\@3[?I!^Zi%S+XNY9i;#LQul),K>!f0BAXIR<*
-gobIPYBkBs%jo?ML(H3Zgn]2PJHI2!P)(hMr[1]VWj!Rj)j:?l+PWHE4de[hYRlWm;iFl'CTqVPcJh1r$(5/Z#6k at j72QaZU
-*hq7g-DX%,+](\tKh7K;)mi?&QG(0>EqhJ_OIIF]@*t@/?f8K,^"2ag3rSfqpMXI&`a*00aidA4tn:"`eq4APfI-6me^5pV:
-?Rakq(THp'5KS542<[2YU%Y(Meb^G$jLRjnpR3K`O?\0o4qGR+*uEm`Di+#`=3:91,NjHhTC[Mee,!EQkl$"1p-,t=qk%fqI
-BUK]Ih1H7?^L>4J&hD82sU>`YP3M'iVPj+n, at gWqL="^rdV-Kru^k25O8A7quK%OJ%b1N5WA`FaFSs$J\Y4f^ha1iKEo;_#=
-)f,5a2XAF:CKo$c)*;^m#2B":RR1%m_HP_!D`Mg^1do'L:^o5thnWA/E(((r8$I5qEef>T3YG)*o5^_1WdoS/suO+@/sJ_:0
-IA4<m/I,sf0e6>Rg^9I<(O-UIAP_PATs]I?2&+[R_16*)0FX<^-^0#JAV6Q at dI/1e\42F?I__H]#eN&X0M.DqB'_mD6c4?Z'
-a!!8O=_t6.1pjn$u5su,K6mP,f"@, at C778[r6nCdFKL\Fp6c>ck`(Wb@`(Itt9>kX@`:QgCUdrAa6,^-.`?5.L*)B"&9Z7-5
-`H5(u1g%^b<^cj_7?gup$r'17<lM^T7DrS&r*`$I?:CAn7LWeH*+)-f>t&"/7U0Uqgh4WkAO`J+`k6!)FAt_G?H0?g`p at P3`
-,A-cE5qf[7jN%APWd&lFu3#BL_qKF*-Zo9H,lG"a/!uNa8e`CHH1\e8*kZEr-_)rJOg2s83D5i/;2)4J]Lf?87[?D"GOp]LW
-H9Ia=Mp6KT*tTNQA2[89Bd2e<!5fK?5BqaS_/kKTjMOMb,ad8S"&VjH7QSPt?@k8Z\#q]U$ZuSk4U-8^s?S"Hpm&S]Sg:8^)
-q31nmT9U<7;Fb%.Em*1tB,WQLI'9!"<#'WfHQTLWh%9)D$Y3.]6a!)"TD9,t<3/@<S_[7b>E974.jN42HE\4`@(9<>d!UqKF
-6^!"X69DlOu%)0q*^e?#i9J"+U4N0uN`_9(GbZr1^N6"\_a3:X,9XMr9]Zj-oc:l1&9\dt<m*JHHd7g@?9g$o*!$I(;eURWB
-9k;mNFP+iSf$/Tm9oRh$Ute\3J^)Eq9pFDX%,Xegg<KQSc.(ZH7,uPIi_Adsc7J,'9]Jm<kg"kC:425"N9/>!l:sb5:1Wfgb
-j3QUnP9;UcSY#b4S6s)nBR9d:F,[0r:WoSn^"<0:R(`PI.kk at mE``Ac^ar0]`6=%s%j.,:aH.gV$,.."jeh"cs6n&N<[a_lq
-irT:j!,kjPEU"%T)?h!SDsSaFV_B&((gud5V,''b\o"&lDXA;/I"EKbdNS(K%"Gd5;fh>oM,@)pqA$d?PNq`?<S$*7>!0;9^
--0*@0&J,LRSW;<9'#r?bEr,uU!P;QV at q/Lf+r/lHO>;PbG_>q=A%/5n,U;`uka"YA+[2,e'=dnMc!h)SDN3R\^%dhOrCXYA2
-24B(&f;h[A5rBA\95?!P,;l)k1bs^&57T;epd-XA'Ma[ZFJ^g=m<4,D!X\Dd.:"7E_<;fTm%8PFo:fSf=<@q0M4]PK><`Mjp
-eQl6VNEB2O=4OEU<OH"1]j4X_?<+sO<S_$4m9is8 at 9+sfeidJC7:T at mAl`2M<`Ng6D.qLKBi_?G<0_9#b=)GVJUrW.f&-O0"
-`IHODq=;rf-PN?*H5'pF4XuF=*8Z;20[Z;Gh5Z5f;3Q?<IEE.!*@]t=.OimXaaE+IFn^SfI_YUjb)1PKii2B==&LM7>Y-+MH
-ET*=ETO(c&>bqLfj%l=KRTcrJt&lMqK\.fc>e"9o[g`OP(q>=Tt-p?'JKWO]efR=]LbjKpgW=S_8F`=gac&rKu:"TN<^^>!8
-Y]!#5bV'\ZrGg/n>YD5c0:VcoXf>-4c-KrJ8#XBMI$>32sAorZs`WnQ"/g?kqF272+,[9Eg>g:a`FKt#fRZ<LVEgSMGb4hKH
-[^0BF.>FiL`"i&gB_-AS/>Wo](28n9=[p3LUgf;AL?--?2b$9A<>Kt:F]t at V+^ta(V>cl?-e]uspd+p;!>TM6u4igmAcs9Yt
-?$4ZQ*S0!,Ug:+W1f+d?*Sc/Kh;.JS?2`Vd"lEVqia*Yc?5;O-/`bbOj^)fd?@CqlNTXW5k['hG?ENR#V<qU&mG?+U?N'>"%
-IW*on6[L3?S1nW4nW/>p0UPfhd,t`NVHkOpYW+K?a]`;^%YgGra4t[!8rFd!!$CB!alK??lfF./d,Qg"^l3Ni-kl<L'M+H$=
-KG5@$V4/Xpj7&%:JT6@/^Vo%M)t`&7HUn at 4i7&-5BrQ(#_n'@=B#$NY^TF(h'9Z at BLSY^)^Xj*b!>8iSGYb*WKRi+uE+(#Tb
-4@!".^NJ`9c3 at SS3.Fspg;-=U"*if5MJQ7V%0.UmiZigqZ0p+^%-0]N?m@`C.^jtbrQ1uf?. at l?5TL,S(X3b&(Jj1[D2SigL
-H4(Hi(j*j/O<\e1I5ND/uA3N+d#!ZWf2e4g4A:?aR<^gP28Rq0[jG#_V/kojt9OnW&jPE;cG#.1r94]_<jX*FWmSr9h<FnX!
-AA1Om/m2bT70%jhJ9ZY,YQ/7c>\2brjj%66#%$ER at -/eCAenk;raY(3 at -2'3Aj0^:Nb7FFBP(:NAsR)l^2%?;A`fk,B$P:+`
-b/p"AEO/<B#\k'Y&e4sDJ*R(k:UC[G'N2)H=lSfB:aJ4p3gR;G3?#MBC:02%Y*YjJS,ICB)[0k7XaJAK]h3;BO6>TG(40`Jn
-S2:kN7ZcQAasUHYBjBBSLJ;VNGR0!!#Q at kr+]\(^+P:Q"aipJ-M;'I[K at hP\H_Tl'@ZMY*Wk2S8%D[Btg-Pp7:IiQg,'UC*o
-_?L7IN5VJ6mCC+cCJk+6<_WToM?l@,aJ^8YkuUh]>!C2U-<L9KnaYj+uhlLq7D*jk4hVe\JoCL4A_k-jQ`Z"msXCSm`i<k3!
-h^2(`ul^ke*Y-2Va\82A]C]:s4%_V-lW+d<nCjSSN(kI2CJaAHuCpqK&^<,`Ec0X$-CsL7 at huITud;:5Xm4Qe'%aXN3cYZ_7
-D!oJ`Iad[jf'S4HD4]DI^=-pWfkoTqmFKj*cJ3:Ag?p$BD<BhpQJV$>k&*B?mWR<%(>j"ik3ei&DGJsS?KuFblY`lfmag^lL
- at FX!j)5.gm`+hd7c\J'oC$;`mrnBm-M[$&ipW2rn$`)Zk/_JtrX26u!!%N;rrDNn!H9[nE'FBm:BPQ;"E7]QE,Q#$B*iO,$1
-Nu_E5)d"cO01!$ukA=E:4?Wrt05E&oeEpnK/Ea:D at eU'CfuUEH`1<Ii36e)KCNOEM"3?Y8hQ>*HCNfnS\?s%j:p;!!$(#!(S
-7(59u$a,7"5oEb?\=LF7+L-h;1&nujJ4^FF9].<=#hElTX"s!@71131\sEu-ZS0/2t+1\1i1Ep#?%?T.M23cgWLEsFRDIl-c
-#4`a[eoB/1+s#ot_6$+bFF<<VdT1!c37<CIWoRAjlmmcq67s&rHF=0ZO^G5B,9D#\_FOs')5>QAC7rfjVneY8J8@/AX!!%KK
-F^T^lE. at P9=`pWDol"(-O'M@]?1mYhouCG4f3n:7@<I?0Frt(75 at o!CAbJW,G&Li5O(@sV at eOGMG->_*-YR\$Bm+uDG5lK(c
-Wp2$E;&a at FuO422g"bkF8'$^pLe\oDfKt3H$<>8pIBT)O*u2lHM7YiGOKbN%t&T1Jp2utpcjB(%omj]L'pNZn,Nl9!"4%,M0
-P\Cpm?R+O,NeBN-Ns6GjgObc]Ir%Nd3:?Gi+_\#F'K]Pkd8(H%1tPGF825RJBpRH'atFc^X`KSp?*_q6-<6hk,32TR$R.H,l
-WT&#FS2U3]&$H=*:j:T+&]WHtbBqR<!ka/8^jW-Z4^H?YErs/p[GZ$PlCH(V3c2i%&jLAPnu"98u%!"SK'\;1*pL]=s_^V'H
-A\U3MOHhY4#n%=#a^&/ter&;Fh5Jm>*_L*0<r-uM0O2QF4`dCk-r3smtLWTJOb5Bl:r27a9pX&jDbl&p:I4rlo+4U6Zci%5"
-rI<:EO4SfHf);f&ICIdU^YO=ahL114rVtZ#fAD#fg3ql;r\r8PJ)u,]["0;!!A=ER-g1Jil%f<'#QO":\*Et-m/H25I`LpVp
-[*G8nc&"Es$-(((\N8Jo7'R)s)7[^J,+RIq>XgrJ%t^W\+p!$rdW:F!$C2k&=*J&J&.ds=?JJT%Y[4n0Z[K_.hdh/U(OoJ3]
-.q>8*!N=*+hbiP=T6sM.CX"/X8q>o''E-;_XBYjthjqmVNf3:hR-a]\83)U<fIk3"c:`:T.6-<B?sWX]MT)CK7t-G.h7e=DV
-#"-'leg(;PWIW"l0/COb*A(Fs at .j*&"<m^K71o(. at C>jiLkp(IUW_r>TZX6meBJAUAeR/Aiq/X"<<174$G<u[LNk]=;Yrg,L
-8dHIsi*DX(:Wmg8*RiSB4A['Ku1E-48f6=gVE&YCEFe=Z6jDoNN^1TBqcfU1Z6V&"bs3uPk],be@=/Xp at pcH0\s-(@_mJ&h.
-IiiaTmJ$O,*j;K2iU$Adrr0[akN_rZDu8Vr^2L at V!l, at 0')Y%Vj2D0eE.f/8_JhmH$Gg\'/IfTobV'IDn at T&>`%]t<$q.>l3
->"SRlqmsJ&WC9=`f[?>)oi<TEe+I/'R"uHVu2#ea7:3u*_>i9OX3O29Sk,h&nHtK8b-\o--C8PUFf*$gp&M)dO`-eb];dF1J
-AHMY;/h94NAqrdqk4*99Z0f3)4OBo/TIM>k($RoA'@,cVt&E6;Nd['/IqA<<kujF?LR.dT!=.8'R7*/MK[Om6+7p'b*T/O9,
-Id+eVgis&E&6>u+GN#Q7k-<]-^Z=]VqYDd-;.NFuNs<UFd3fG6&W?eBN2NFZ-lAX?ZT2Dpt;=Vc.TCYEqXYA7=MV1!8apB?7
-jg%Nt.F'JB-_f]4Mh8O)5[T2.,?5K0oF5HXco6&r7D=N$\\,H,Q>8N;+DH8VA'ntV6DB4M4Jk?.l at V?N&Iu/ELs,5nbr[En<
-=T1aNj&k_&OlRBT;3PP#[Te`a=_:U#A%;LuNFqueEL>p6`^u_7)+K=Pk]rb*ULkDSH)0KrQCFZ3\q[&Gk;fu;U?K1kM65t[G
-.En%qL4j/k;b`JX6P#>IALX=Nn^c*)eQ at Ile>ajY3\56Of`Ktma\dbS"?UdDHi.e]'WUT'uf^5D]K[PL_-A5E[Ul;an"5b--
-^KYs"V[er9$GmoR-s'dWGFH4jeC7k<IR at SR57IF^9K2fQM\P9AF^(O*0%F^&N$/pYIQEj*/4%Q/qb3kFLUXIXcS*H+p2Qi-K
-juZ0h=8f=UHq?+7`4HN*rhnbPGYeaIo-YG]G?+-5OZreeLuJI at 8MmXP7$kOAJCqu.]+mJalQ#ln?q!eE$D!5M\;!2*j6Jab]
-$^t:"9+LDK.0J3aLW$MUTr#C at 9;@u5t2[SF?&VQ7?'uCej$fN'BL!\*P6E"H'@Dk*[:spB%BO_S3oJq^=Fs+^oN=b%O6AVln
-*lQ^!&g9(oMGNX9`E95WikpZ_A-soLpq%@%jC*toMD.LZbo("ZA;sHX29)$:)rl$[NNpbg7nD_^A&NSP;;+3(R/7rboRW):%
-R8$;"X0ZeLQPI]7S&@V,34-2OqLM]7G+pmjM[IM8oup%.69]2>b70XJl0Yc5:B&"VNc+q<D#h].7b/SQ4gc0b:-dMjg;F]Eo
-pBF3DV9hoWac=dU(+BFYTaEa-Et0A5#Ra0."QPRBnY[bUK/<k(M6P1J2E+l*WD2SCX*,Ec').]/1kYigc3%E6[Xj2s21CSb(
--M:DrO_-A7k\;so*1e!(jY&9XX&%"HVR$UFm"!h^5KL/=$46Kg92U!uD^:eE-#k]I*(oO`eS=rBfn,oRn*Ef\X06Uth/-_Zb
-oPu>b+950)5V)1As;CWVSWNA.WFLm1S8o7A'76m_L\tW+AMbN?J&u?;RM:/Dn9W9<\UpT!Xe1-MZl8;_E'eYPHRS?L+h,C:Q
-MQbKDa'#Gp3iH$OPuc%_9P@]1Y#WcY=&QaSa;&qAiVL4=dJmORjaXJalG-L`%:8BaKs4T1_ at S4"@r,_:Yr54qfioP/lp[2E<
-^Ol1HSo at cjaOPeG0F+$0kfqhV6h#0elhkdC+QcpZo5YK=ds&?/L at R,f#HNL]3T;+9u"-G!npm0HYomMLU`Z<gYA87?*8n/\l
-VS'LiNVB#Sko4pM0,%Ha at qah;Gm]L at SWts*3uil+>Q5n6N*BHZ'Yg]pG>d?>JGGmre<;=5NUW9C[CJrT(_[mepNE$[o6BlbB
-pl!8u';K!6j0^3E9LiCj9)n+IU8fGb%R$p02_NX<W@#7]VX6\k1i,fEfO%p_k7Mt)Ju&d/J3&1hEX`/+Q939(oeXDO$'k!@"
-t#9DiPGE2588&tE=*otOtNUfh0a[?(VALssK12^%5Gn2-2I$'T_ej.A<@jbjcT9]!h7El]s0P-cXQUh$hc$>X9jrBq^ZbA]M
-)/hZMbi>2aY'nAoq`&5IVj2>#B@$E%1M=A`UU/6VcIq5KBh\\nZn@$R\DJ.fh*%[s\=Og0I";V68#aQ.U*'5q<U,Q<X*'/ue
-QT:[CAhkH286'?g>cLT%99O<m^^tS#@?]oB<a=SV:?M,AEs\UYI6pHf/kclm#>S]G.,TI>;p!Xc*Oa4(=_&!pMk$*V7:^jhU
-bu$DsY`p]!f-Kh>;DBD>fI'p9)d!)Xh;+?1YOL0$i'OK7\&K%2FS2!oYC(L%)?M_RP at 0+@<\rnD5\6G^g>Jr)8SpDEGi4rup
-FXO-"=p3Q?=l,2t_+O)g7Ra>mlUjkQnro)<@Iq):4n4?JDkY'nPTh`p3"s-3*r29n6!5Ns/'UN at Q<bW7+,kIgtrohMX0\i3:
-Hh)C:6rX[WX#@W&_m"#PibLsr9B'haV[<CESfa%;cm at DS2pKl\3];KE36iXZ?If8,N#BB5rX1n?n"5`qTGj`9^`HQeDiOj)N
-nX]!eGb6SLI)hB;^-BU4T.f@)c]do at F3jWR7H2!.T("n\eG6:@iQ)h5p&8a:Ft[_"rPK'^,RA%E+f"M?!<;fn$fLqIL,?Uta
-nVJ]j*VH4o"K%dq?.2eI4q_pI`K;!^L-7(_>j1Wccc.aHgq#A]CGncl270So7"I1qgXCdr#`9AIIG5RJ"Q3,^MioIYJ1">gA
-^RAq+pS]YG1o4Fs$0o!H8nWV*Z3^"<J`i*^U#3!WN3t0*3gb"#)\UO=LEP0a'0r"E6@(:eLn0-m.q1"OKjH0NSC=0a5p4"V<
-m$n8/A+D$?#5+7O7RY\OKJG6eb$!cWVnY]U&0K`_lL#]P%pd";YOR0V)=#B4/YYbqg^M$ia5$F$oBOLkg\P6?ub#4S;oOC&D
--b7%4L!l=%-cn,J6i<g,:%V!F#+9~>
+G[Bd(?-I1TFiTj5#?oh*(E at cfe(E-h[.J$i<[FV84X?8\dKjk:_#f0G.7B.%#\e*<g,'ot7L_1g+[A]YJq>Gk;A-3K6h%-)
+T$kXBd59sZ4^>e%;FPA+I6QNNH2"X0k.g%on(E'f=+6R]XSK!OZ_)Hf,k$j?N;_+iMZ0^@ccBFj`lT7s/t2+%b&kn2qj%sJ
+k/i>mh#"?@X-rMN at oc^@5MaEImMpX=N&cX,<qP!4?eN8hm\pAnEmD73?g2rUZeYL1GAYZN4h^PqmTT?<#0VZ!?An!\<m[b_
+Qr3'-U5,9jKJt,gbF8YgGdt#OUSRS19creB>67MP[]@6RDEbP;`3I"EDg at K+J%Kb)I8Gl*KO,eu>Zg7*<Hb7>6L0ku\*cGV
+2H>/tf5+B)Cpe&%/I_V&2.rj(\\PH">lf at SN%'Ng/p`rLV5ndUjdT"&=j:$3eZ%,I1YKaD]8s,W05F5bn(.FQOh5Jd<EJ%k
+gX]Z,g9'ls*4rmhcmQi#>3NReh^QbB>oVY2C7CW+dZIZ[X$^Bo[Z.H6]@usjh\aQoLR&A(=LFr?[r>g`In$W$eTTBPgXVbV
+F(7lhoQnpNAD(kj)F>TZ#_eWh'G:nL&2Su+bRb+u6hJb\7NZqEQ@(sk3jl\K334!&3'B(-0W0ak4iUSkD\g$c_1uPcn*&Z9
+);=uR+m]I'TqiV5fSo>jZi>Qi)[P)THNUDKS, at cCRg"4pN%p%C.SFZAHDdf.?6QDM"<jkH;uqE1N"La"/qij-qCifKL>F/$
+\*UMHn+OFU7Vu1[7W%:ApB^Ud)9%=/S`g0]C^]JmJXqH7..l.XT.6V#d"b$h at E"u4ak]].T9T;SepOUK*',-RhZhkBD4cjU
+D''"l[fpZ1^QN/TXkS(kctCN=1A'%iO34caG.`Q!D/M_92RfAWgE!"aQn^kij._T+]laj<S`%@KS`%@KS`%@KS`%@C#CX[P
+r^*4grK>Z7HZDN'_PP9?-X:Bl++;Xtm%Hp<T3?6ad)HG_%15Q6$:YI37L]\o%15Q6$:YI37L]\>%=Qrh>bT2+^Fo?lT,%d"
+((-?C$<bP"[KmQu/JK`f'Pd"i6(^.^EThn.rhj:FTtkj*/JM*ik[S8$$%5;8^I4,E>:@Fs:l&hZ&CWrh^4emI$\ar`$8F+H
+Se:VR1SR4.'g3_k((+AO+YjaPb>?836_PnG$C)BTreurc(I\:)oQuk32De/p+o)fdqOE.(ngQ!Z3<b,t;c'D%?P%;n(`oCN
+-\T\KF<DEtpn>ik<.;@:7u`hV*g46$POV4d//YPbY0*4%<Ef.Diij]6,^ooT_ijKZ!XXbI<)0AS\)KfPm9s\X&e9n)bg<:7
+*#c5PTi"HB1hm>Pkb'VQijd-_B. at c)iuS\q2eonp7W#*:;9PLhC:Wq46cXncN2KY]+\g>2R<9KJ+bXrg%aZ3Uhc0T'71UE6
+`X\MMVqNk?nJu_=Ae\%@Hs,RQ(!Vbc[Y-uB2IN4U)mI\f%9R;nqC+g&C)6>.'gd^0k[7+F*`I>hjfoQF%VIfF=ZD<Lf`^?-
+<#0k-eQ+b*1<H=n&fnAO`PX0YOAqkT2j*lgb(D19f[/?-6;/I.^3qEJoV(3tLI+ZV$GLp:`:Tb]gP8*hh^tL22t"1_A]oKH
+ko7#CqF7T?^/6DSDq%DCh`oKrjBe+`<US[>m5q39B`TML/YFAk(/SJi!_SDT5Y5-2TZ!c4Pf.8!+HA#@;B^_c"$2I;M;)#/
+H:,)I)^_2_S"lR\S)mH!bu%9ic/:$m-qfV*<7]j9l+j"K9N=(&FmN`!le'IMXCF3:!A-,lX?m11(3E6.M]5[Igp$$bAUK3[
+Hmk6A6QroLL!k>sPigRQkcbg:J$)*D.0js*MhjSt=n)Dj>6SW30VX^UMa1^LOsGrN at Ao>7Ma4!9&p/'tNpB]JgP$N4A0sgd
+W6HfENpgBG*Yh"4ae2!`5[:Fsi2Td]V3rbdC".H%)R\Fb7]j.q;<ofJe:p\81[$7](K[R5;&`TV-,!il^_L8*9:kha=-R]U
+>c'gn)&ML=B9.sNC0]3.oT8g1F6C6tgj(P5GMZ!<SbJ:gkIoqUH$$PP`^MA1OR[p_GaA,QPr7`C3__RkRAo+2:),sH%XR+o
+:M%AQX0rb`<5.&D_EjK1cNY0qZE/C2\8[O at h6XqOK.Q>[h+j[(Sh//a+bWMqFQaCV)cbajnjY!EJ`X]LbC]ta6NJ5+W&RH3
+oa'bH_;`B@(+3Fm3:VU>M&.^<]O5a="cF$I=IaWPi]pr>TF2krc;]'H,*cZf;E72uQ"/<A3C^,Ha/GhTN*7^OW24NnRaFFQ
+J9Mu2Z#Bm[]JR6g<jS8bc#0E/m&!XdRmtY?VUb%1;6ua+27mSP%]-m&?D0[kR02Y.n;)]H^M(N&k*,1E51sh"a`]J4CcCt-
+G10*mS,$U,R86#6kk6uAKb-!ud)?"EAL\&tXBJtWWsU9>ZRVWDc`2MYYc<5:5-"`WqQ(#PM6B7tK.B\sflB]]mn7V:E+)FW
+E+)FWE+)FWE+)FWE+)FWE+)FWE+)FWE+-'g>n<KGZ3haccCdh)-%8agMj(`MN"!EeA9eJ37$^VYKuift<er<q at 0LaQe3d1@
++Tu'c4!FG6.6%V?!@2$9$RR%mRTqNQC">Zg`a4Im9F)eAd'^+ed8P6LV3+><^6Q6Rs,6&ER>^gSG^X.FD(P+7"9+gFKN.G,
+_=[Go"$Ji+%gjZE60RSnSIe,V3:Din)`WY,52g+b-tb?tm,[9`9K/inFC-&l+G>h/]!%-$l^]hn:]fE_6:S4UDR,gnHfIdd
+#]\=:FhDTk]H.AX at TG/Z\s^8#aBl;pDu<WohLl$;L-Ln+r^oX8r_U4.a'h:?Z*8Rtr!pig\O[jbiGY<Mh5fR`63shm\Ml.2
+&/QL at O?o8`QasXfhG+>"FuEFB+,'1p,S3;"-2d[YY)Y"=+iM[glM+jU#dL_H3o3R:+a,bFa#/M]@V9b)r!=O"fNI#LKFm.f
+lLsu\63sj&q1n'D63sj&\N2o@#U+ at L=3"Y\6AV2WeSuNOK\4s_*IeaFh]dU_;CpeiGB7o^9*c\a2HRrt'B22$&2FNTqD++J
+6M*Q1#dJ?E&u,CsZLKU]894KpB4Uc%Ga&b+/F6[`s.#(p+G$WQ%qU=,P*(\fe</PurVWVh*"o-eXBtVl1OJ#A^$LkNLd"*1
++`<`Ma6NBnfA:c[#pmA]-=dhfj<iVq]f/tna4CS?Ul4ZAj')_J+e_]AR4cY89K>31(,s^%Bes$ra6NACRLhfS3:;dVeT'B:
+B982^4t)fT*d#'8BCS:(KKR>(Ff]JAB6QA`aJ:$;b$;UZ`Ug4U`VX#T^,!8XQ6H)e+bWf\f>_-QrZD at t+<c9rCN at 6:,[Z`C
+-6^X&kebsY;'gl,FB-gX^9=*?cokrNn.d.j93<@CHl=M'QC"gBA9n.hcrJI+o"5T%jp\gH3^]LhI89"Od#6i9i51l8i51l8
+i51l8i51l8i51l8i51l8i51l8i5.r8\fP*"s/eqSlX%VihPpWLqQ(#Pl*Dk4,ciJgUsH&kP!5oJ8trB5o`.=M<^Om_5So&%
+jI"(KD:m*\ZJE_PgJ'?SDW[/MAj4mcHHC=dT56IXaiDib)s`Th.3W43TZb,(jJ\Ml$41%-h+Xm&9qu;ZdqX'TW7an?AiJ1R
+G13DCc*Wqq1hoMo?QG&d-WL'KOifCnW>q\!at[Y1*2D)_A(4C:7P0m8e5A:rc/t[7+>DkrQ-UVH!sOSr03F`h_;`B@(+3Fm
+3:VU>M&.^<]O5a="cEJ:Q%L]>W0#?*Hq'I)"1Q):@"IFU!m?^VNdcSA8!FQ?-.&>](@mP>H!'f%9cR+-AqLHr=k5_T>WBg1
+mb-O86'cZ>"r at cTXF#+HKoUN>OMBC1*n:.;%8KW0._(R=AP]"PSgEG]-%q3nFMotignT#[DIe(7Hc`hi??5JHQ^g/+-0NR#
+agq"LEhYZWgt>'_<'n[95f^HsOP<e7Wf>cmP$TnFi!M1&,u8lAgP`R&efhNdP$<(4Z_a'=0PT$_9,b4pP")R_Uf$G0C".l3
+DDLE(%hS;?-%qKk3lHZ)gn8]J0$M*V1H at 3[D,(sjHj:/WTIr7!H^u`B",.>P,Zt6W6^8p"":@M],Zt6W]pGCE>=?R0PRp_&
+kf=MREh2W<^$bW!1VQ1i4qpW\Toe#a6>8Ut9(R6_kcbg=nfB*1$k#+nKn`j7HX*EEIJ;*+VCJ,$3d.k!FmS6aehNZXJ<h6s
+V90ltW:k#EjAU5Ce5LOsr$f6<l7'=_3e\(*BL4=O6:a>6j#F?+\#Wc.bB?Ufn!M7q"dBk3J<I9C5`&>G-o#H;-#'c;&u-4=
+&tu"O36I<jFe=R]dPkneoSm#\IA9h0hl)ge^MoY9`\uoP<6j*,];DtHKpY%<I/?`rksN:r%u$B7'R]dSM!7:C[h"1[^/I;;
+DB^7e.Np&PkeKnBjL99RfimhuaX!'68T`H/)"IlrZZOm/Fu[ZJcD"H`aJKsJRn<tV"Wa[IKY0q=2g!`]G20DM'H4@[$]Wkj
+Kgopp6DN+)+Z`LW$Md\e?WkcDa/H6FBA'8-N*:<.*MtiO*)o6q([(kD3okB/KJYtbLTq7JTM&%\[*=VX3)nb5jj"gQU%1Z)
+GM]:[c6Ec=(WK4k93"a7A\7@%2Df.TLINk-B[dY)NEXQQW$NE%[<+cX:`(c-0@;ph>\W"]Mo1_!P5#bC%SL-FHQt$$a&HB@
+bBDX>[S6CVo_"W2:82770ZB*2&i(QUJRE`@8YSEqqVk+O)]GWIOF.BBI83'Oq%OP>S:X)u.4E]#-h6'7';p_Z,&1qfi2%/4
+6QroIL"nEtMNXZ0D:.OmLl0YLInoWdZ\:_>$\ar`$8F+Hi`dhLZquQmTb,[>iABC1IDmjqrk)q4((+lUh*N8VM`u;Ri]&@_
+bG)c4dmCn!6G_):+`$nl(4h(6Kn?.T6ENDlHXjQF,^RIf6\[L*0PXE<C/?U!:bZW\0PXE<C/?U!:bZW\W+tPFAn6rY7:.9C
+C[K4Uq$EB+]:X&A6%&<%1]!$97,K+jCYcm9-b-BV-b-BV-b-BV-b-D25p%jlJ2gd*Yisaj%Tciod&>3+B[l0&1hsEAqLf_R
+`d+;n]4005bAO59\#^Q>^=I!.*KROF")b<N:WN1;O+Z3A!k63Wag/V2D4JX>@m'9>d0iA"[\AEb'\H"0JO5tLoVjU'Mi1"W
+&RDl4m.S+R7Vu1[7W%:A(\?K#F'Kk\8H5=nP;.[!8p%o"X1$aHlAo!PX"$C at X"%.8T-Ro?EK01i%GiU]NM1jhAn^Y:LThl9
+H]r=i?o,eEc2IhADBN=CmL?PsYP%qCY2Q33h0?]uJj3JIc+\NaX;P8&4YsT%X,0#'`ouFed2PMmW8KOd6HfuJ0gd?7*'tf\
+#_eWh'O$:UULQtC4sKhXd7*r[%3Jf^btL"ZaK1TUTeTL#7T\`ID0rU-$tbqq9*T:8>10f_\?U]OUY!M#4)*O<H;4%B0r>_1
+Lu'S,f;`+qa/2d0<qFjPFfI=V9QkF-m\?iY3u_,7]61kWjDJ1GeWmW4[WPZNG&)I5a):A(V(qF`5]k3JQ2\fSrL2(oA`Vm`
+:T7&gT@,UO'HC?ERU$;R^IZTel9uaJCpbU_c\aH8GXV1$-O\m3aP$-`Q#G&bO"d#.52>,*"I`Y5=+bGIHu<_V at s^)jnfl3U
+G)u.L?rZ+nU0eN2C'R8 at V\VDZS9<G4ebS!4\bfOtg7Ih\HL8E$[I.B1Q3[H'(=2p\mgV`j4=BtiU>H_lGA97tOmf$T:9%">
+m(.+<_.#TH=M_Zmqm2_/?U&.VFo._!VRCR<q91Ag+-g6FV#~>
U
PSL_cliprestore
%%EndObject
@@ -1077,8 +852,8 @@ O0
0 0 TM
% PostScript produced by:
-%%GMT: pscoast -Rd -JK6.5i -O -Dc -A5000 -Gwhite -Bx60g30 -By30g30
-%%PROJ: eck6 -180.00000000 180.00000000 -90.00000000 90.00000000 -17653837.706 17653837.706 -8826918.853 8826918.853 +proj=eck6 +lon_0=0 +x_0=0 +y_0=0 +a=6378137.000 +b=6356752.314245
+%@GMT: pscoast -Rd -JK6.5i -O -Dc -A5000 -Gwhite -Bx60g30 -By30g30
+%@PROJ: eck6 -180.00000000 180.00000000 -90.00000000 90.00000000 -17653837.706 17653837.706 -8826918.853 8826918.853 +proj=eck6 +lon_0=0 +x_0=0 +y_0=0 +a=6378137.000 +b=6356752.314245 +ellps=WGS84 +datum=WGS84 +units=m +no_defs
%%BeginObject PSL_Layer_2
0 setlinecap
0 setlinejoin
@@ -1107,7 +882,7 @@ O0
37 -11 D
20 21 D
11 1 D
--2 7 D
+P
{1 A} FS
FO
4124 3856 M
@@ -1116,16 +891,16 @@ FO
-21 0 D
12 -4 D
14 1 D
--1 6 D
+P
FO
4164 3719 M
-1 0 D
-1 0 D
+P
FO
4190 3719 M
-23 5 D
4 -5 D
-19 0 D
+P
FO
4258 3719 M
-4 3 D
@@ -1142,7 +917,7 @@ FO
6 14 D
-16 1 D
-11 -16 D
-67 0 D
+P
FO
4125 3850 M
20 0 D
@@ -1154,12 +929,12 @@ FO
-3 4 D
-5 -5 D
-27 4 D
-1 -6 D
+P
FO
4128 3837 M
17 3 D
-19 4 D
-2 -7 D
+P
FO
4175 3827 M
-14 7 D
@@ -1167,7 +942,7 @@ FO
2 -8 D
18 2 D
3 -4 D
-14 4 D
+P
FO
4598 3808 M
-41 -11 D
@@ -1188,7 +963,7 @@ FO
-5 8 D
12 -2 D
8 5 D
--9 16 D
+P
FO
4564 3731 M
45 0 D
@@ -1203,7 +978,7 @@ FO
-21 -12 D
8 -6 D
19 1 D
-12 -13 D
+P
FO
4802 3719 M
-8 14 D
@@ -1214,7 +989,7 @@ FO
0 -21 D
-16 -8 D
12 -18 D
-73 0 D
+P
FO
4870 3752 M
-23 5 D
@@ -1229,7 +1004,7 @@ FO
25 -13 D
3 -10 D
74 0 D
--23 33 D
+P
FO
4607 3792 M
11 7 D
@@ -1238,7 +1013,7 @@ FO
-39 -8 D
-43 -1 D
-11 -3 D
-9 -16 D
+P
FO
4928 3719 M
-7 3 D
@@ -1248,7 +1023,7 @@ FO
-22 0 D
-21 5 D
23 -33 D
-35 0 D
+P
FO
5059 3814 M
-14 0 D
@@ -1269,7 +1044,7 @@ FO
19 -27 D
203 0 D
-15 17 D
--67 78 D
+P
FO
5027 3850 M
-16 3 D
@@ -1278,14 +1053,14 @@ FO
-50 -6 D
40 -6 D
47 -1 D
--8 9 D
+P
FO
4954 3852 M
39 2 D
7 4 D
-33 5 D
-40 -9 D
-27 -2 D
+P
FO
5340 3766 M
-23 4 D
@@ -1319,19 +1094,19 @@ FO
248 0 D
-29 27 D
-13 14 D
--7 6 D
+P
FO
5035 3841 M
-7 9 D
-1 0 D
-8 -9 D
+P
FO
5047 3831 M
54 6 D
-25 7 D
-13 -4 D
-5 6 D
--11 -15 D
+P
FO
5455 3719 M
-3 8 D
@@ -1360,29 +1135,29 @@ FO
14 -13 D
6 -7 D
29 -27 D
-66 0 D
+P
FO
5594 3755 M
-4 -5 D
17 -6 D
--13 11 D
+P
FO
5591 3757 M
-9 -2 D
11 1 D
--2 1 D
+P
FO
5571 3773 M
-1 -1 D
2 0 D
--1 1 D
+P
FO
5532 3805 M
-20 5 D
-12 -8 D
24 -9 D
23 0 D
--15 12 D
+P
FO
5884 3720 M
-32 14 D
@@ -1407,7 +1182,7 @@ FO
-2 1 D
29 -24 D
248 0 D
--1 1 D
+P
FO
5547 3793 M
42 0 D
@@ -1417,47 +1192,47 @@ FO
-57 9 D
-1 -7 D
-10 2 D
-15 -12 D
+P
FO
5572 3772 M
40 -2 D
1 3 D
-25 7 D
-17 -7 D
-1 -1 D
+P
FO
5629 3795 M
27 -4 D
16 6 D
-61 6 D
-18 -8 D
+P
FO
5886 3719 M
-2 1 D
-2 -1 D
+P
FO
6027 3719 M
-14 2 D
2 -2 D
-12 0 D
+P
FO
6098 3742 M
2 -9 D
9 2 D
--11 7 D
+P
FO
1926 3727 M
1 2 D
-29 -5 D
-13 -5 D
30 0 D
-11 8 D
+P
FO
1691 3735 M
39 4 D
-19 6 D
-9 -3 D
--11 -7 D
+P
FO
2131 3719 M
-6 2 D
@@ -1474,23 +1249,23 @@ FO
-13 -8 D
2 3 D
-11 -8 D
-216 0 D
+P
FO
2287 3719 M
9 4 D
-17 -4 D
-8 0 D
+P
FO
2326 3719 M
-4 10 D
-1 -8 D
-9 -2 D
-14 0 D
+P
FO
2356 3719 M
3 3 D
-7 -3 D
-4 0 D
+P
FO
2479 3784 M
-12 5 D
@@ -1502,14 +1277,14 @@ FO
37 6 D
12 8 D
5 2 D
-33 31 D
+P
FO
2516 3820 M
-43 -13 D
23 3 D
7 -3 D
4 5 D
-9 8 D
+P
FO
2647 3719 M
3 3 D
@@ -1539,39 +1314,39 @@ FO
23 -6 D
-78 -5 D
0 -1 D
-202 0 D
+P
FO
2700 3766 M
-4 -3 D
-21 5 D
-11 -6 D
19 -16 D
-17 20 D
+P
FO
2711 3778 M
-10 1 D
0 -6 D
-14 1 D
17 -4 D
-7 8 D
+P
FO
2732 3802 M
-12 -3 D
5 -4 D
4 5 D
-3 2 D
+P
FO
2735 3807 M
-16 6 D
5 -8 D
-25 -2 D
35 2 D
-1 2 D
+P
FO
2741 3813 M
-11 1 D
5 -7 D
-6 6 D
+P
FO
2763 3838 M
-2 2 D
@@ -1581,7 +1356,7 @@ FO
-17 -5 D
20 2 D
28 -4 D
-6 6 D
+P
FO
2503 3807 M
2 -1 D
@@ -1592,14 +1367,14 @@ FO
-27 -1 D
-13 -4 D
-9 -8 D
--4 -5 D
+P
FO
2446 3753 M
79 21 D
-18 11 D
-21 -4 D
-7 3 D
--33 -31 D
+P
FO
2542 3795 M
24 6 D
@@ -1625,13 +1400,13 @@ FO
-33 -5 D
28 2 D
-37 -6 D
-21 -3 D
+P
FO
2642 3831 M
-36 0 D
-5 -5 D
25 -1 D
-16 6 D
+P
FO
2751 3719 M
6 4 D
@@ -1640,7 +1415,7 @@ FO
-41 -18 D
9 -2 D
-14 -12 D
-43 0 D
+P
FO
2881 3719 M
-7 5 D
@@ -1669,12 +1444,12 @@ FO
8 -4 D
22 5 D
0 -9 D
-46 0 D
+P
FO
2947 3777 M
-9 1 D
2 -12 D
-7 11 D
+P
FO
2960 3794 M
-4 1 D
@@ -1704,7 +1479,7 @@ FO
5 4 D
16 -5 D
25 5 D
-1 1 D
+P
FO
2978 3821 M
-20 1 D
@@ -1746,7 +1521,7 @@ FO
-2 5 D
14 -9 D
13 2 D
-7 10 D
+P
FO
3016 3875 M
-27 -1 D
@@ -1771,13 +1546,13 @@ FO
-18 -2 D
26 1 D
11 2 D
-11 15 D
+P
FO
2757 3832 M
11 -2 D
-1 0 D
-4 8 D
--6 -6 D
+P
FO
2735 3807 M
1 -1 D
@@ -1791,7 +1566,7 @@ FO
-1 16 D
-10 -3 D
-10 0 D
--6 -6 D
+P
FO
2704 3770 M
2 0 D
@@ -1806,7 +1581,7 @@ FO
-20 4 D
27 10 D
-35 1 D
--7 -8 D
+P
FO
2832 3842 M
25 -4 D
@@ -1832,7 +1607,7 @@ FO
25 -1 D
-13 -5 D
54 0 D
--46 -3 D
+P
FO
2861 3740 M
-5 11 D
@@ -1842,7 +1617,7 @@ FO
-38 -10 D
-31 -26 D
34 -4 D
-25 1 D
+P
FO
2748 3751 M
24 7 D
@@ -1851,18 +1626,18 @@ FO
37 17 D
-60 1 D
-22 -30 D
-1 0 D
+P
FO
2802 3830 M
17 6 D
-33 4 D
-4 -8 D
-20 -2 D
+P
FO
2765 3795 M
33 -5 D
-2 13 D
--31 -8 D
+P
FO
2920 3719 M
-3 6 D
@@ -1898,12 +1673,12 @@ FO
-17 12 D
-4 -2 D
-27 -38 D
-13 0 D
+P
FO
3065 3719 M
-7 5 D
-14 -5 D
-21 0 D
+P
FO
3233 3868 M
-20 -1 D
@@ -1932,11 +1707,11 @@ FO
26 5 D
27 -3 D
9 -4 D
-32 62 D
+P
FO
3234 3869 M
-1 0 D
-1 0 D
+P
FO
3005 3860 M
39 5 D
@@ -1974,36 +1749,36 @@ FO
26 2 D
-118 1 D
-33 -2 D
--11 -15 D
+P
FO
2971 3811 M
21 3 D
9 6 D
-23 1 D
--7 -10 D
+P
FO
2962 3798 M
7 3 D
-4 1 D
--3 -4 D
+P
FO
2958 3792 M
9 1 D
-7 1 D
--2 -2 D
+P
FO
2940 3766 M
6 -3 D
40 1 D
-9 11 D
-30 2 D
--7 -11 D
+P
FO
3244 3719 M
-4 4 D
-18 0 D
-2 -4 D
-24 0 D
+P
FO
3458 3875 M
-46 3 D
@@ -2053,7 +1828,7 @@ FO
128 0 D
34 100 D
17 48 D
-3 8 D
+P
FO
3555 3719 M
-9 2 D
@@ -2151,13 +1926,13 @@ FO
-3 1 D
-40 -114 D
-14 -42 D
-151 0 D
+P
FO
3622 3719 M
4 2 D
-38 5 D
-25 -7 D
-59 0 D
+P
FO
3676 3858 M
59 2 D
@@ -2165,44 +1940,44 @@ FO
-43 2 D
-19 -4 D
-18 0 D
--1 -7 D
+P
FO
3675 3854 M
44 3 D
-43 0 D
--1 -3 D
+P
FO
3673 3842 M
29 10 D
-27 -2 D
--2 -8 D
+P
FO
3671 3828 M
9 1 D
-9 1 D
-0 -2 D
+P
FO
3669 3817 M
20 1 D
-1 6 D
-18 1 D
--1 -8 D
+P
FO
3668 3810 M
2 0 D
--2 0 D
+P
FO
3665 3797 M
5 0 D
4 7 D
-7 1 D
--2 -8 D
+P
FO
3663 3785 M
4 -1 D
9 4 D
-12 1 D
--1 -4 D
+P
FO
4201 3401 M
-8 -6 D
@@ -2244,12 +2019,12 @@ FO
1 -17 D
-5 -4 D
297 0 D
--17 107 D
+P
FO
4200 3412 M
-1 -7 D
2 0 D
--1 7 D
+P
FO
4150 3708 M
-1 -1 D
@@ -2370,20 +2145,21 @@ FO
0 49 D
7 -5 D
23 15 D
--19 109 D
+P
4100 3510 M
-3 -13 D
-20 -7 D
0 13 D
12 -1 D
-2 10 D
-13 -2 D
+P
FO
3900 3384 M
+P
FO
3900 3378 M
0 1 D
-0 -1 D
+P
FO
3900 3313 M
22 9 D
@@ -2393,7 +2169,7 @@ FO
12 21 D
-7 11 D
-20 -1 D
-0 -51 D
+P
FO
4078 3413 M
11 14 D
@@ -2403,7 +2179,7 @@ FO
-13 -6 D
19 -27 D
-1 10 D
--1 0 D
+P
FO
4430 3620 M
-22 5 D
@@ -2479,7 +2255,7 @@ FO
17 -107 D
319 0 D
-79 243 D
--28 83 D
+P
4285 3550 M
-10 11 D
12 -4 D
@@ -2496,7 +2272,7 @@ FO
0 -13 D
-17 -10 D
8 -2 D
--14 -2 D
+P
4369 3586 M
19 -9 D
17 -26 D
@@ -2509,22 +2285,22 @@ FO
-7 12 D
11 -11 D
6 4 D
--17 13 D
+P
4325 3562 M
34 -23 D
-17 -16 D
-30 28 D
-13 11 D
+P
FO
4423 3640 M
-3 -3 D
7 -7 D
--4 10 D
+P
FO
4150 3710 M
2 9 D
-3 -7 D
-1 -2 D
+P
FO
4656 3697 M
-1 0 D
@@ -2562,7 +2338,7 @@ FO
-68 144 D
-31 61 D
-74 148 D
--26 50 D
+P
4636 3405 M
-3 -7 D
8 -8 D
@@ -2582,18 +2358,18 @@ FO
3 -6 D
7 3 D
-36 -19 D
-0 -6 D
+P
FO
4418 3657 M
14 11 D
-24 17 D
-10 -28 D
+P
FO
4517 3697 M
14 7 D
-16 7 D
-10 -7 D
-12 -7 D
+P
FO
5035 3509 M
-14 6 D
@@ -2663,7 +2439,7 @@ FO
-8 12 D
-7 13 D
-89 139 D
--34 51 D
+P
FO
4938 3719 M
3 -5 D
@@ -2696,7 +2472,7 @@ FO
-43 52 D
-89 104 D
-12 14 D
--203 0 D
+P
5070 3609 M
5 -13 D
39 -21 D
@@ -2719,7 +2495,7 @@ FO
-18 16 D
-20 6 D
-8 -3 D
-21 -34 D
+P
FO
5581 3531 M
-13 -13 D
@@ -2758,7 +2534,7 @@ FO
-72 75 D
-54 55 D
-12 11 D
--11 12 D
+P
5525 3430 M
8 -1 D
25 -36 D
@@ -2771,7 +2547,7 @@ FO
18 6 D
4 20 D
1 28 D
--17 42 D
+P
FO
6076 3294 M
-10 12 D
@@ -2821,7 +2597,7 @@ FO
84 -88 D
7 -6 D
73 -78 D
-266 0 D
+P
FO
6089 3330 M
-11 -4 D
@@ -2832,12 +2608,12 @@ FO
50 0 D
-20 18 D
-4 5 D
--15 13 D
+P
FO
6049 3366 M
-2 -1 D
8 -5 D
--6 6 D
+P
FO
5510 3601 M
39 10 D
@@ -2855,7 +2631,7 @@ FO
4 -5 D
39 -37 D
14 -15 D
-15 -14 D
+P
FO
5580 3531 M
9 9 D
@@ -2867,7 +2643,7 @@ FO
-26 4 D
-40 -9 D
55 -54 D
-15 -16 D
+P
FO
6135 3294 M
-19 17 D
@@ -2889,7 +2665,7 @@ FO
15 -13 D
9 -10 D
15 -13 D
-7 0 D
+P
FO
6192 3294 M
-54 37 D
@@ -2900,7 +2676,7 @@ FO
26 -25 D
42 -29 D
29 -27 D
-29 0 D
+P
FO
6329 3387 M
-8 6 D
@@ -2914,13 +2690,13 @@ FO
-13 34 D
-23 17 D
21 2 D
--24 19 D
+P
FO
6106 3557 M
4 -5 D
9 -7 D
2 1 D
--15 11 D
+P
FO
5929 3472 M
-6 36 D
@@ -2943,12 +2719,12 @@ FO
-80 58 D
-248 0 D
131 -109 D
-161 -138 D
+P
FO
6080 3339 M
-9 13 D
-15 8 D
-24 -21 D
+P
FO
6160 3702 M
-73 15 D
@@ -3010,12 +2786,12 @@ FO
-15 1 D
56 1 D
-2 6 D
--111 72 D
+P
FO
6353 3368 M
1 0 D
-25 19 D
-24 -19 D
+P
FO
1547 3446 M
-9 -3 D
@@ -3029,7 +2805,7 @@ FO
21 12 D
-3 -7 D
32 10 D
-19 15 D
+P
FO
1885 3719 M
-43 -17 D
@@ -3077,7 +2853,7 @@ FO
123 90 D
13 9 D
25 18 D
--30 0 D
+P
FO
1529 3630 M
23 8 D
@@ -3105,7 +2881,7 @@ FO
25 28 D
-24 24 D
-96 -63 D
--15 -9 D
+P
FO
2153 3711 M
-22 8 D
@@ -3163,7 +2939,7 @@ FO
8 3 D
162 136 D
52 44 D
-11 9 D
+P
FO
1649 3459 M
10 3 D
@@ -3178,7 +2954,7 @@ FO
-13 -14 D
-5 7 D
-12 -6 D
-1 -7 D
+P
FO
1910 3294 M
1 8 D
@@ -3188,7 +2964,7 @@ FO
-20 -12 D
14 0 D
-1 -3 D
-30 0 D
+P
FO
1926 3294 M
7 4 D
@@ -3303,13 +3079,13 @@ FO
-18 -15 D
16 4 D
-19 -12 D
-12 0 D
+P
FO
2348 3657 M
-9 -2 D
6 -1 D
1 2 D
-2 1 D
+P
FO
1871 3363 M
11 6 D
@@ -3320,7 +3096,7 @@ FO
-9 4 D
-20 -26 D
1 -22 D
-3 17 D
+P
FO
1917 3413 M
-1 -7 D
@@ -3331,7 +3107,7 @@ FO
-15 -18 D
7 1 D
-13 -8 D
-5 -7 D
+P
FO
1943 3471 M
-2 11 D
@@ -3340,7 +3116,7 @@ FO
-15 4 D
-14 -18 D
10 8 D
-7 -5 D
+P
FO
2357 3357 M
4 4 D
@@ -3398,7 +3174,7 @@ FO
-116 -123 D
318 0 D
25 31 D
-24 32 D
+P
2302 3544 M
-28 9 D
21 -3 D
@@ -3416,7 +3192,7 @@ FO
13 0 D
-20 -3 D
-64 -29 D
--20 -3 D
+P
2378 3443 M
14 13 D
-8 -9 D
@@ -3424,13 +3200,13 @@ FO
8 15 D
30 16 D
-25 -26 D
--33 -16 D
+P
2310 3497 M
43 20 D
43 -7 D
-49 -3 D
-35 -15 D
--2 5 D
+P
FO
2445 3719 M
0 -10 D
@@ -3447,7 +3223,7 @@ FO
20 7 D
2 -4 D
4 5 D
--202 0 D
+P
FO
2644 3322 M
-8 3 D
@@ -3540,7 +3316,7 @@ FO
-44 -58 D
-5 -5 D
319 0 D
-17 28 D
+P
2390 3367 M
-7 7 D
15 13 D
@@ -3554,19 +3330,20 @@ FO
10 16 D
-12 -4 D
3 22 D
-11 4 D
+P
FO
2907 3719 M
+P
FO
2884 3719 M
9 -5 D
-4 5 D
--5 0 D
+P
FO
2839 3719 M
45 -2 D
-3 2 D
--42 0 D
+P
FO
2811 3597 M
16 7 D
@@ -3582,19 +3359,19 @@ FO
-3 -12 D
45 21 D
0 -10 D
-17 -5 D
+P
FO
2656 3701 M
24 -9 D
24 8 D
-21 18 D
--27 -17 D
+P
FO
2775 3585 M
-18 -8 D
-2 -6 D
37 16 D
--17 -2 D
+P
FO
2838 3294 M
8 6 D
@@ -3675,7 +3452,7 @@ FO
-15 -13 D
-4 1 D
-17 -28 D
-211 0 D
+P
2933 3408 M
1 -16 D
10 -2 D
@@ -3693,7 +3470,7 @@ FO
1 14 D
-1 -11 D
11 0 D
-4 14 D
+P
FO
3044 3719 M
-17 -6 D
@@ -3794,19 +3571,19 @@ FO
-35 1 D
37 3 D
2 5 D
--21 0 D
+P
FO
2907 3719 M
14 -2 D
-1 2 D
--13 0 D
+P
FO
2946 3684 M
-17 5 D
-16 -18 D
22 2 D
10 11 D
-1 0 D
+P
FO
3000 3294 M
25 26 D
@@ -3815,12 +3592,12 @@ FO
-3 6 D
-34 -22 D
-10 -17 D
-16 0 D
+P
FO
3006 3294 M
2 4 D
-5 -4 D
-3 0 D
+P
FO
3276 3719 M
-17 -13 D
@@ -3936,7 +3713,7 @@ FO
11 -3 D
5 8 D
29 83 D
--128 0 D
+P
FO
3220 3719 M
-3 -7 D
@@ -3944,7 +3721,7 @@ FO
-9 -5 D
25 5 D
-7 7 D
--24 0 D
+P
FO
2985 3380 M
32 15 D
@@ -3961,7 +3738,7 @@ FO
-9 -1 D
6 5 D
-5 -2 D
--19 -39 D
+P
FO
2948 3300 M
2 0 D
@@ -3979,7 +3756,7 @@ FO
9 12 D
-12 7 D
-36 -16 D
--37 -79 D
+P
FO
3639 3646 M
-5 3 D
@@ -4000,7 +3777,7 @@ FO
-20 -11 D
23 2 D
13 -5 D
-7 44 D
+P
FO
3563 3719 M
-3 -1 D
@@ -4026,7 +3803,7 @@ FO
6 -4 D
40 8 D
55 23 D
--59 0 D
+P
FO
3900 3364 M
0 15 D
@@ -4076,7 +3853,7 @@ FO
33 4 D
3 12 D
55 2 D
-0 51 D
+P
FO
3632 3602 M
16 -6 D
@@ -4094,7 +3871,7 @@ FO
-8 10 D
-10 -9 D
-7 4 D
--7 -44 D
+P
FO
3775 3339 M
27 9 D
@@ -4122,7 +3899,7 @@ FO
-10 -7 D
12 3 D
-6 -7 D
-28 10 D
+P
FO
4285 2797 M
-18 -15 D
@@ -4146,7 +3923,7 @@ FO
-20 -17 D
0 -156 D
387 0 D
--2 22 D
+P
FO
3921 3294 M
-21 -17 D
@@ -4190,31 +3967,31 @@ FO
15 -19 D
-26 188 D
-12 74 D
--297 0 D
+P
FO
3900 3004 M
4 3 D
-4 6 D
-0 -9 D
+P
FO
4051 3014 M
21 8 D
2 32 D
-12 19 D
-18 -8 D
-7 -51 D
+P
FO
4175 2954 M
7 41 D
-56 -6 D
4 -12 D
-45 -23 D
+P
FO
4057 3079 M
9 16 D
-4 24 D
-14 -17 D
-9 -23 D
+P
FO
4530 2775 M
-11 33 D
@@ -4231,7 +4008,7 @@ FO
3 -36 D
-1 -1 D
2 -22 D
-243 0 D
+P
FO
4603 3064 M
-28 0 D
@@ -4277,7 +4054,7 @@ FO
144 0 D
-28 124 D
-22 87 D
--21 78 D
+P
FO
4256 3032 M
16 -19 D
@@ -4360,7 +4137,7 @@ FO
-20 68 D
-319 0 D
25 -163 D
-13 -99 D
+P
4463 3257 M
7 3 D
9 -30 D
@@ -4372,7 +4149,7 @@ FO
17 0 D
-1 17 D
-70 40 D
-61 -33 D
+P
FO
4360 2909 M
26 0 D
@@ -4380,14 +4157,14 @@ FO
-9 -5 D
-43 13 D
2 -10 D
-22 -6 D
+P
FO
4516 2897 M
18 11 D
-5 8 D
10 11 D
-39 -15 D
-16 -15 D
+P
FO
4829 2775 M
-1 2 D
@@ -4424,7 +4201,7 @@ FO
31 -114 D
39 -168 D
1 -7 D
-155 0 D
+P
4782 3023 M
-5 21 D
14 6 D
@@ -4469,7 +4246,7 @@ FO
-37 -6 D
-57 26 D
-18 34 D
-6 12 D
+P
FO
4897 3202 M
-1 10 D
@@ -4495,7 +4272,7 @@ FO
-92 164 D
-63 104 D
-318 0 D
-42 -92 D
+P
5130 3205 M
9 11 D
59 -10 D
@@ -4505,12 +4282,12 @@ FO
-11 -17 D
13 -26 D
-24 21 D
-4 16 D
+P
5247 3111 M
7 -4 D
-8 -11 D
-26 6 D
-27 9 D
+P
FO
5449 2775 M
387 0 D
@@ -4528,7 +4305,7 @@ FO
7 -15 D
45 -88 D
52 -111 D
-13 -30 D
+P
FO
6143 2893 M
-21 8 D
@@ -4558,7 +4335,7 @@ FO
387 0 D
-12 20 D
-27 39 D
--41 59 D
+P
FO
6261 2775 M
-19 9 D
@@ -4573,12 +4350,12 @@ FO
50 -72 D
22 -33 D
8 -13 D
-38 0 D
+P
FO
6498 2914 M
5 -8 D
-2 5 D
--3 3 D
+P
FO
6398 3026 M
21 -34 D
@@ -4613,18 +4390,18 @@ FO
-10 14 D
5 -2 D
-73 82 D
--18 19 D
+P
FO
6365 3061 M
2 -5 D
14 -17 D
4 1 D
--20 21 D
+P
FO
6317 3111 M
0 -3 D
29 -27 D
--29 30 D
+P
FO
6078 3294 M
15 -31 D
@@ -4696,7 +4473,7 @@ FO
-19 69 D
-27 57 D
-40 37 D
--50 0 D
+P
FO
6117 2928 M
1 7 D
@@ -4709,7 +4486,7 @@ FO
-45 12 D
-7 -9 D
22 -28 D
-14 -19 D
+P
FO
6411 2802 M
6 10 D
@@ -4726,7 +4503,7 @@ FO
14 -33 D
14 -7 D
-6 15 D
-11 -19 D
+P
FO
6415 2855 M
-1 15 D
@@ -4740,7 +4517,7 @@ FO
6 3 D
18 -19 D
3 6 D
--1 0 D
+P
FO
6163 3294 M
104 -100 D
@@ -4753,13 +4530,13 @@ FO
14 3 D
28 -15 D
-49 33 D
--29 0 D
+P
FO
6168 3257 M
-7 12 D
-26 25 D
-7 0 D
-40 -37 D
+P
FO
6346 3081 M
15 6 D
@@ -4779,7 +4556,7 @@ FO
-19 1 D
12 -9 D
-2 -7 D
-29 -30 D
+P
FO
6385 3040 M
10 -8 D
@@ -4799,7 +4576,7 @@ FO
19 -14 D
-23 10 D
5 -12 D
-20 -21 D
+P
FO
1931 3294 M
-4 -7 D
@@ -4836,12 +4613,12 @@ FO
88 103 D
84 95 D
30 33 D
--59 0 D
+P
FO
1914 3294 M
2 -6 D
10 6 D
--12 0 D
+P
FO
1880 3294 M
-4 -25 D
@@ -4849,7 +4626,7 @@ FO
-17 -14 D
23 -6 D
8 38 D
--30 0 D
+P
FO
1682 2775 M
24 50 D
@@ -4872,7 +4649,7 @@ FO
21 -10 D
6 -21 D
-27 -87 D
-25 0 D
+P
FO
2164 2775 M
-12 6 D
@@ -4966,7 +4743,7 @@ FO
-33 -51 D
-62 -104 D
-37 -67 D
-200 0 D
+P
FO
2901 3197 M
-2 6 D
@@ -4977,7 +4754,7 @@ FO
-30 -26 D
-2 -12 D
27 10 D
-1 4 D
+P
FO
2555 3174 M
1 -8 D
@@ -5078,7 +4855,7 @@ FO
56 26 D
19 17 D
-211 0 D
--72 -120 D
+P
2616 3157 M
-15 -10 D
-5 -14 D
@@ -5088,20 +4865,20 @@ FO
34 1 D
9 7 D
-13 0 D
-36 10 D
+P
FO
2852 3194 M
21 12 D
-33 0 D
6 15 D
-12 -11 D
-18 -16 D
+P
FO
2902 3271 M
6 6 D
-10 9 D
-26 5 D
-30 -20 D
+P
FO
3003 3294 M
-13 -11 D
@@ -5147,12 +4924,12 @@ FO
17 13 D
-12 -1 D
1 2 D
--3 0 D
+P
FO
2900 3193 M
3 1 D
-2 3 D
--1 -4 D
+P
FO
3900 2931 M
-17 -3 D
@@ -5168,7 +4945,7 @@ FO
2 -35 D
-1 -2 D
188 0 D
-0 156 D
+P
FO
3900 3013 M
-4 5 D
@@ -5208,7 +4985,7 @@ FO
13 3 D
4 19 D
9 7 D
-0 9 D
+P
FO
3900 2227 M
428 0 D
@@ -5217,7 +4994,7 @@ FO
-11 129 D
-13 128 D
-387 0 D
-0 -548 D
+P
4222 2311 M
-24 -15 D
-18 38 D
@@ -5225,7 +5002,7 @@ FO
6 -18 D
7 5 D
1 -10 D
-20 -3 D
+P
FO
4742 2373 M
-4 6 D
@@ -5251,7 +5028,7 @@ FO
8 -161 D
428 0 D
-10 107 D
--4 39 D
+P
FO
4530 2775 M
44 -62 D
@@ -5267,7 +5044,7 @@ FO
-25 145 D
-22 109 D
-2 7 D
--144 0 D
+P
FO
4989 2227 M
-1 9 D
@@ -5289,7 +5066,7 @@ FO
-5 9 D
12 -119 D
2 -27 D
-233 0 D
+P
FO
4872 2775 M
38 -56 D
@@ -5300,7 +5077,7 @@ FO
23 -38 D
57 -13 D
-38 127 D
--190 0 D
+P
FO
4723 2514 M
19 -19 D
@@ -5344,7 +5121,7 @@ FO
-155 0 D
14 -65 D
19 -101 D
-16 -95 D
+P
FO
5594 2227 M
2 7 D
@@ -5386,7 +5163,7 @@ FO
42 -104 D
78 -136 D
12 -31 D
-63 0 D
+P
FO
6009 2227 M
3 9 D
@@ -5467,7 +5244,7 @@ FO
2 -26 D
8 -5 D
-3 -28 D
-6 -19 D
+P
FO
6174 2227 M
-3 5 D
@@ -5558,7 +5335,7 @@ FO
5 -18 D
4 6 D
31 -20 D
-25 0 D
+P
6164 2227 M
-19 19 D
-24 51 D
@@ -5587,7 +5364,7 @@ FO
23 -7 D
-25 6 D
14 -15 D
--1 0 D
+P
FO
6444 2227 M
14 14 D
@@ -5596,17 +5373,17 @@ FO
-7 6 D
4 -12 D
-7 -14 D
-2 0 D
+P
FO
6415 2402 M
-3 2 D
1 -12 D
14 -25 D
--12 35 D
+P
FO
6027 2286 M
-3 12 D
-3 -12 D
+P
FO
6164 2458 M
14 -6 D
@@ -5615,14 +5392,14 @@ FO
-7 10 D
-33 -3 D
-6 -17 D
-17 -25 D
+P
FO
6537 2227 M
2 22 D
-10 6 D
-1 -26 D
-2 -2 D
-11 0 D
+P
FO
6279 2685 M
3 -1 D
@@ -5640,7 +5417,7 @@ FO
-38 0 D
41 -64 D
11 -20 D
-4 -6 D
+P
FO
6427 2367 M
5 -8 D
@@ -5673,7 +5450,7 @@ FO
-37 5 D
21 -66 D
-10 5 D
-12 -35 D
+P
FO
6555 2255 M
20 -28 D
@@ -5681,14 +5458,14 @@ FO
6 -1 D
-14 30 D
-15 4 D
-6 -15 D
+P
FO
6365 2557 M
-20 83 D
-13 8 D
-5 -46 D
6 -15 D
-32 -30 D
+P
FO
6566 2263 M
18 -8 D
@@ -5696,26 +5473,26 @@ FO
-11 10 D
-18 0 D
23 -23 D
-3 -12 D
+P
FO
6508 2239 M
19 20 D
-3 12 D
-5 -5 D
-24 14 D
-13 -41 D
+P
FO
6462 2310 M
13 -21 D
6 1 D
-3 23 D
-29 11 D
-13 -14 D
+P
FO
673 2475 M
29 14 D
-10 21 D
--19 -35 D
+P
FO
1720 2775 M
-8 -28 D
@@ -5741,7 +5518,7 @@ FO
33 75 D
55 111 D
12 22 D
--244 0 D
+P
FO
1657 2775 M
-1 -7 D
@@ -5762,7 +5539,7 @@ FO
-7 33 D
8 19 D
-8 42 D
--25 0 D
+P
FO
2081 2227 M
-5 7 D
@@ -5841,11 +5618,11 @@ FO
-7 -4 D
6 -4 D
-4 -21 D
-14 0 D
+P
2075 2285 M
16 -28 D
-19 7 D
-3 21 D
+P
FO
2277 2583 M
-21 7 D
@@ -5859,7 +5636,7 @@ FO
-11 -3 D
5 -6 D
34 -8 D
-10 29 D
+P
FO
2276 2775 M
3 -2 D
@@ -5876,12 +5653,12 @@ FO
-3 -6 D
30 50 D
13 87 D
--52 0 D
+P
FO
2245 2775 M
-2 -9 D
20 9 D
--18 0 D
+P
FO
2359 2227 M
12 20 D
@@ -5895,7 +5672,7 @@ FO
-10 -9 D
-12 -18 D
-1 -4 D
-79 0 D
+P
FO
2562 2227 M
-6 10 D
@@ -5914,7 +5691,7 @@ FO
-6 3 D
-35 -21 D
6 -22 D
-185 0 D
+P
FO
2267 2554 M
24 -6 D
@@ -5929,7 +5706,7 @@ FO
-23 5 D
-45 44 D
-4 1 D
--10 -29 D
+P
FO
2420 2448 M
12 12 D
@@ -5950,20 +5727,20 @@ FO
39 6 D
9 -17 D
8 11 D
-1 0 D
+P
FO
2297 2443 M
17 2 D
-11 14 D
-31 -1 D
9 -14 D
-16 -1 D
+P
FO
2527 2447 M
10 11 D
-34 0 D
-2 -12 D
-26 1 D
+P
FO
3712 2775 M
-11 -19 D
@@ -6006,7 +5783,7 @@ FO
10 -6 D
299 0 D
0 548 D
--188 0 D
+P
FO
4333 1995 M
-15 -4 D
@@ -6076,14 +5853,15 @@ FO
8 -25 D
141 0 D
4 154 D
-1 168 D
+P
FO
3900 2160 M
+P
FO
3900 2138 M
3 13 D
-3 7 D
-0 -20 D
+P
FO
4627 1673 M
-1 8 D
@@ -6111,7 +5889,7 @@ FO
-52 -15 D
-1 -205 D
-4 -117 D
-299 0 D
+P
4585 1893 M
9 56 D
13 9 D
@@ -6133,7 +5911,7 @@ FO
2 14 D
-13 8 D
-10 -17 D
--3 22 D
+P
4528 1831 M
6 26 D
12 -68 D
@@ -6144,21 +5922,21 @@ FO
-5 34 D
-19 33 D
2 57 D
--4 -7 D
+P
4507 1686 M
1 12 D
17 14 D
-10 -24 D
--8 -2 D
+P
4682 2079 M
11 -63 D
-18 35 D
-7 28 D
+P
4561 1978 M
0 14 D
20 25 D
-3 -20 D
--17 -19 D
+P
FO
4766 1864 M
4 10 D
@@ -6174,18 +5952,18 @@ FO
7 -113 D
3 -106 D
1 -91 D
--1 -53 D
+P
FO
5615 2205 M
1 -34 D
-4 6 D
11 -33 D
--8 61 D
+P
FO
5613 2221 M
-2 -1 D
2 -1 D
-0 2 D
+P
FO
5531 2227 M
11 -30 D
@@ -6195,7 +5973,7 @@ FO
18 7 D
-7 6 D
4 14 D
--63 0 D
+P
FO
6064 2030 M
-5 8 D
@@ -6210,7 +5988,7 @@ FO
8 -41 D
19 -22 D
-2 88 D
--1 7 D
+P
FO
6046 2192 M
-6 15 D
@@ -6220,11 +5998,11 @@ FO
0 -50 D
7 6 D
36 -47 D
--9 56 D
+P
FO
6009 2227 M
0 -1 D
-0 1 D
+P
FO
5613 2219 M
10 -6 D
@@ -6237,19 +6015,19 @@ FO
-16 40 D
-30 37 D
-4 -1 D
-0 -2 D
+P
FO
6472 1692 M
-1 1 D
-23 -7 D
18 -13 D
2 0 D
-4 19 D
+P
FO
6476 1712 M
-5 -4 D
4 -1 D
-1 5 D
+P
FO
6500 1965 M
-3 -18 D
@@ -6266,19 +6044,19 @@ FO
12 -1 D
7 71 D
3 79 D
-0 21 D
+P
FO
6442 2227 M
-25 -46 D
15 15 D
9 29 D
3 2 D
--2 0 D
+P
FO
6177 2227 M
5 -5 D
-3 5 D
--2 0 D
+P
FO
6149 2227 M
0 -33 D
@@ -6287,7 +6065,7 @@ FO
-11 17 D
16 -12 D
-7 12 D
--25 0 D
+P
FO
6055 2136 M
3 -4 D
@@ -6302,7 +6080,7 @@ FO
-39 42 D
-26 8 D
-16 44 D
-9 -56 D
+P
FO
6067 1935 M
7 -9 D
@@ -6331,7 +6109,7 @@ FO
-2 -14 D
-22 30 D
2 -48 D
-1 -47 D
+P
FO
6387 1839 M
29 24 D
@@ -6391,7 +6169,7 @@ FO
-1 -9 D
20 3 D
0 -23 D
-9 5 D
+P
FO
6347 1712 M
12 -5 D
@@ -6410,7 +6188,7 @@ FO
29 -9 D
23 3 D
37 -16 D
-68 -11 D
+P
FO
6209 1867 M
4 12 D
@@ -6420,7 +6198,7 @@ FO
-5 -12 D
13 -1 D
3 -19 D
-16 -5 D
+P
FO
6409 1698 M
50 13 D
@@ -6429,25 +6207,25 @@ FO
11 -12 D
-24 8 D
-9 -8 D
-3 -12 D
+P
FO
6371 1723 M
-10 2 D
9 -20 D
15 12 D
--14 6 D
+P
FO
6485 1673 M
-13 19 D
-4 -19 D
-17 0 D
+P
FO
6564 1673 M
70 44 D
-48 -7 D
-37 -27 D
-5 -10 D
-20 0 D
+P
FO
6931 1889 M
-44 20 D
@@ -6492,14 +6270,14 @@ FO
24 7 D
10 53 D
9 61 D
-3 47 D
+P
FO
6526 2227 M
-6 -4 D
18 -23 D
5 8 D
-6 19 D
--11 0 D
+P
FO
6490 1794 M
10 0 D
@@ -6531,7 +6309,7 @@ FO
-5 -7 D
-3 -90 D
-5 -57 D
--3 -29 D
+P
FO
6475 1707 M
35 -4 D
@@ -6541,7 +6319,7 @@ FO
-21 -2 D
-21 11 D
-11 -10 D
--1 -5 D
+P
FO
6597 2112 M
5 7 D
@@ -6571,7 +6349,7 @@ FO
4 13 D
14 -13 D
0 -27 D
-23 -15 D
+P
FO
6673 1942 M
-1 21 D
@@ -6585,7 +6363,7 @@ FO
-11 -33 D
6 -35 D
17 -19 D
--10 17 D
+P
FO
6670 1865 M
-3 -14 D
@@ -6595,27 +6373,27 @@ FO
19 -15 D
-9 25 D
-28 5 D
--23 -8 D
+P
FO
6864 1717 M
22 10 D
6 13 D
-19 1 D
-17 -23 D
-8 -1 D
+P
FO
6797 1784 M
-7 -26 D
15 19 D
1 23 D
-10 -8 D
-1 -8 D
+P
FO
6626 1859 M
14 -16 D
13 7 D
-9 15 D
--18 -6 D
+P
FO
7108 1673 M
-3 5 D
@@ -6652,13 +6430,13 @@ FO
0 -11 D
25 -8 D
19 -53 D
-49 0 D
+P
FO
7328 1689 M
-5 5 D
-4 -8 D
8 -3 D
-1 6 D
+P
FO
7158 1784 M
26 16 D
@@ -6673,24 +6451,24 @@ FO
-7 -14 D
-34 -1 D
25 -20 D
-32 8 D
+P
FO
7242 1778 M
8 -18 D
10 3 D
-20 37 D
-2 -22 D
+P
FO
7208 1836 M
-43 43 D
30 -30 D
8 -34 D
-5 21 D
+P
FO
7327 1683 M
16 -6 D
-15 12 D
--1 -6 D
+P
FO
2169 1857 M
0 -1 D
@@ -6698,7 +6476,7 @@ FO
12 -39 D
-5 -9 D
26 -21 D
--7 94 D
+P
FO
2167 1953 M
-11 -14 D
@@ -6707,12 +6485,12 @@ FO
1 -36 D
15 -11 D
5 10 D
--1 69 D
+P
FO
2167 1972 M
-2 0 D
2 -11 D
-0 11 D
+P
FO
2179 2159 M
-8 19 D
@@ -6740,14 +6518,14 @@ FO
2 -19 D
9 1 D
11 7 D
-0 1 D
+P
FO
2067 2227 M
-1 -3 D
11 -9 D
6 7 D
-2 5 D
--14 0 D
+P
FO
2602 1859 M
-39 -19 D
@@ -6848,24 +6626,24 @@ FO
23 -49 D
390 0 D
-10 107 D
--4 79 D
+P
FO
2185 2203 M
3 5 D
-1 1 D
-2 -1 D
-0 -5 D
+P
FO
2183 2188 M
11 10 D
-2 3 D
-3 -2 D
-5 1 D
--1 -12 D
+P
FO
2179 2158 M
0 1 D
-0 -1 D
+P
FO
3034 1871 M
-49 0 D
@@ -6946,11 +6724,11 @@ FO
11 -121 D
428 0 D
-8 141 D
--2 57 D
+P
FO
2602 1862 M
1 -1 D
--1 1 D
+P
FO
2800 1928 M
6 -7 D
@@ -6960,7 +6738,7 @@ FO
21 10 D
10 32 D
-43 5 D
--9 -19 D
+P
FO
3127 1673 M
23 45 D
@@ -6972,7 +6750,7 @@ FO
-34 24 D
4 -106 D
6 -92 D
-83 0 D
+P
FO
3900 2130 M
-16 10 D
@@ -7005,7 +6783,7 @@ FO
45 7 D
44 -14 D
43 23 D
-0 25 D
+P
FO
4187 1673 M
9 -28 D
@@ -7021,7 +6799,7 @@ FO
14 159 D
10 145 D
8 161 D
--141 0 D
+P
FO
4498 1125 M
10 15 D
@@ -7054,7 +6832,7 @@ FO
-10 -145 D
-11 -129 D
-13 -128 D
-211 0 D
+P
FO
4739 1502 M
22 37 D
@@ -7064,7 +6842,7 @@ FO
8 17 D
-13 12 D
-5 -61 D
--11 -103 D
+P
FO
4799 1247 M
45 14 D
@@ -7099,7 +6877,7 @@ FO
-27 -37 D
-10 -27 D
2 -73 D
-17 -14 D
+P
FO
6376 1404 M
-21 -5 D
@@ -7122,12 +6900,12 @@ FO
61 110 D
7 15 D
22 44 D
-13 30 D
+P
FO
6466 1673 M
1 -1 D
1 1 D
--2 0 D
+P
FO
6819 1464 M
-8 1 D
@@ -7214,26 +6992,26 @@ FO
56 97 D
8 14 D
11 23 D
-22 44 D
+P
FO
6544 1673 M
-5 -10 D
12 2 D
13 8 D
--20 0 D
+P
FO
6467 1672 M
8 -8 D
10 8 D
0 1 D
--18 -1 D
+P
FO
6693 1635 M
-5 -5 D
-7 11 D
6 -22 D
17 14 D
--11 2 D
+P
FO
6869 1125 M
36 37 D
@@ -7268,7 +7046,7 @@ FO
-52 -89 D
-63 -95 D
-48 -66 D
-258 0 D
+P
FO
7059 1673 M
1 -3 D
@@ -7277,28 +7055,29 @@ FO
19 14 D
-18 4 D
-1 2 D
--49 0 D
+P
FO
7675 1503 M
-42 -18 D
31 1 D
5 8 D
-13 -6 D
-19 15 D
+P
FO
7617 1452 M
2 19 D
-30 -18 D
8 -8 D
-20 7 D
+P
FO
7300 1333 M
-21 62 D
-3 -35 D
23 -27 D
-1 0 D
+P
FO
125 1503 M
+P
FO
2226 1673 M
18 -36 D
@@ -7321,7 +7100,7 @@ FO
-18 92 D
-17 107 D
-7 54 D
--390 0 D
+P
2438 1524 M
24 -23 D
-3 -10 D
@@ -7329,7 +7108,7 @@ FO
-4 -6 D
-18 13 D
-1 14 D
-9 -2 D
+P
FO
2745 1125 M
-5 20 D
@@ -7371,7 +7150,7 @@ FO
13 -45 D
29 -98 D
5 -15 D
-7 0 D
+P
FO
3075 1400 M
3 8 D
@@ -7385,7 +7164,7 @@ FO
-83 0 D
11 -115 D
13 -108 D
-7 -50 D
+P
FO
4233 1125 M
15 -45 D
@@ -7396,7 +7175,7 @@ FO
20 -20 D
12 97 D
3 32 D
--54 0 D
+P
FO
4272 996 M
51 22 D
@@ -7406,7 +7185,7 @@ FO
23 35 D
-211 0 D
-14 -123 D
--1 -6 D
+P
FO
5002 613 M
8 6 D
@@ -7418,7 +7197,7 @@ FO
8 7 D
-11 -3 D
4 11 D
--13 -26 D
+P
FO
6126 1125 M
-7 -14 D
@@ -7432,7 +7211,7 @@ FO
2 0 D
50 72 D
21 33 D
--97 0 D
+P
FO
6152 1020 M
66 0 D
@@ -7469,7 +7248,7 @@ FO
22 28 D
-388 0 D
-39 -59 D
--32 -46 D
+P
FO
6446 927 M
-3 -16 D
@@ -7497,7 +7276,7 @@ FO
-56 -71 D
-35 -43 D
-67 -77 D
--7 -7 D
+P
FO
6405 773 M
6 -8 D
@@ -7512,7 +7291,7 @@ FO
-10 -25 D
-3 5 D
-10 -11 D
--5 -19 D
+P
FO
6974 833 M
-15 -7 D
@@ -7548,7 +7327,7 @@ FO
-29 -12 D
3 -17 D
-35 -27 D
-0 -1 D
+P
FO
6725 699 M
25 10 D
@@ -7576,7 +7355,7 @@ FO
-30 -23 D
18 1 D
6 -13 D
-30 11 D
+P
FO
2708 606 M
6 4 D
@@ -7585,7 +7364,7 @@ FO
-11 2 D
15 -15 D
0 15 D
-4 -17 D
+P
FO
2810 606 M
-7 6 D
@@ -7683,14 +7462,14 @@ FO
14 -13 D
-12 2 D
9 -9 D
-89 0 D
+P
FO
2631 772 M
6 6 D
-19 35 D
-9 0 D
13 -38 D
-9 -3 D
+P
FO
2747 1125 M
5 -17 D
@@ -7717,30 +7496,31 @@ FO
-16 -46 D
17 27 D
5 31 D
--183 0 D
+P
FO
2748 1096 M
3 8 D
-6 21 D
-7 0 D
-10 -29 D
+P
FO
3903 181 M
-3 7 D
0 -7 D
-3 0 D
+P
FO
3922 181 M
-11 2 D
-4 -2 D
-15 0 D
+P
FO
3971 181 M
+P
FO
4040 181 M
-35 2 D
-5 -2 D
-40 0 D
+P
FO
4149 185 M
-1 1 D
@@ -7750,12 +7530,12 @@ FO
-9 6 D
-23 -9 D
86 0 D
-1 4 D
+P
FO
4173 181 M
-24 4 D
-1 -4 D
-25 0 D
+P
FO
4379 181 M
-15 5 D
@@ -7763,13 +7543,13 @@ FO
-15 -7 D
-37 18 D
-96 -23 D
-151 0 D
+P
FO
4403 201 M
-2 0 D
-19 -20 D
14 0 D
-7 20 D
+P
FO
4667 225 M
-11 1 D
@@ -7788,7 +7568,7 @@ FO
-87 -21 D
-7 -20 D
248 0 D
-23 44 D
+P
FO
4916 215 M
-18 -4 D
@@ -7802,7 +7582,7 @@ FO
-120 5 D
-23 -44 D
249 0 D
-23 34 D
+P
FO
5206 257 M
-26 1 D
@@ -7820,7 +7600,7 @@ FO
-19 -4 D
-23 -34 D
248 0 D
-65 76 D
+P
FO
5445 235 M
-32 -1 D
@@ -7838,7 +7618,7 @@ FO
-3 0 D
-65 -76 D
248 0 D
-56 54 D
+P
FO
5707 239 M
-53 14 D
@@ -7854,7 +7634,7 @@ FO
-56 -54 D
248 0 D
49 41 D
-21 17 D
+P
FO
5893 187 M
1 2 D
@@ -7871,17 +7651,17 @@ FO
-25 6 D
-70 -58 D
248 0 D
-8 6 D
+P
FO
5892 181 M
1 6 D
-8 -6 D
-7 0 D
+P
FO
2980 181 M
-11 5 D
-10 -4 D
-21 -1 D
+P
FO
3049 181 M
-36 21 D
@@ -7889,7 +7669,7 @@ FO
11 -12 D
-16 4 D
1 -10 D
-58 0 D
+P
FO
3141 181 M
-9 10 D
@@ -7915,12 +7695,12 @@ FO
4 -17 D
-20 -3 D
10 -10 D
-91 0 D
+P
FO
2810 606 M
4 -3 D
5 3 D
--9 0 D
+P
FO
2721 606 M
8 -7 D
@@ -7966,9 +7746,10 @@ FO
-14 12 D
5 22 D
-4 4 D
--89 0 D
+P
FO
2708 606 M
+P
FO
2901 487 M
20 8 D
@@ -7987,7 +7768,7 @@ FO
-8 -2 D
-5 8 D
-14 -7 D
-84 -9 D
+P
FO
3104 282 M
5 3 D
@@ -7996,12 +7777,12 @@ FO
19 2 D
-11 8 D
-30 -12 D
-7 -13 D
+P
FO
3111 268 M
8 -1 D
-10 4 D
-2 -3 D
+P
FO
2984 556 M
6 1 D
@@ -8013,12 +7794,12 @@ FO
6 -13 D
-8 -8 D
9 -6 D
-2 7 D
+P
FO
3900 188 M
-20 -7 D
20 0 D
-0 7 D
+P
FO
4062 181 M
-3 -1 D
@@ -8034,7 +7815,7 @@ FO
0 -181 D
217 0 D
31 181 D
--86 0 D
+P
FO
4382 181 M
-1 -1 D
@@ -8045,7 +7826,7 @@ FO
-31 -181 D
216 0 D
63 181 D
--14 0 D
+P
FO
4333 0 M
217 0 D
@@ -8053,7 +7834,7 @@ FO
5 11 D
79 152 D
-248 0 D
--63 -181 D
+P
FO
4550 0 M
217 0 D
@@ -8062,7 +7843,7 @@ FO
-249 0 D
-83 -159 D
-3 -7 D
--8 -15 D
+P
FO
4767 0 M
216 0 D
@@ -8073,7 +7854,7 @@ FO
-68 -97 D
-52 -74 D
-3 -5 D
--3 -5 D
+P
FO
4983 0 M
217 0 D
@@ -8091,7 +7872,7 @@ FO
-32 -38 D
-38 -43 D
-7 -9 D
--2 -1 D
+P
FO
5200 0 M
217 0 D
@@ -8112,7 +7893,7 @@ FO
-4 -5 D
-2 -1 D
-1 -2 D
--3 -2 D
+P
FO
5417 0 M
216 0 D
@@ -8126,7 +7907,7 @@ FO
-48 -40 D
-30 -24 D
-129 -106 D
--13 -11 D
+P
FO
5961 70 M
-142 8 D
@@ -8156,7 +7937,7 @@ FO
-19 -14 D
217 0 D
102 65 D
-9 5 D
+P
FO
2072 68 M
-29 -6 D
@@ -8169,7 +7950,7 @@ FO
-4 2 D
-1 2 D
-8 5 D
--82 59 D
+P
FO
2261 100 M
-8 -2 D
@@ -8184,7 +7965,7 @@ FO
1 -2 D
4 -2 D
216 0 D
--122 100 D
+P
FO
2473 122 M
-31 2 D
@@ -8202,7 +7983,7 @@ FO
-4 5 D
-11 9 D
-5 6 D
--69 66 D
+P
FO
2685 151 M
-36 -6 D
@@ -8229,7 +8010,7 @@ FO
217 0 D
-11 12 D
-40 46 D
--81 93 D
+P
FO
2941 132 M
-8 2 D
@@ -8247,7 +8028,7 @@ FO
-25 37 D
-11 14 D
-11 17 D
--45 64 D
+P
FO
3196 102 M
-22 5 D
@@ -8279,7 +8060,7 @@ FO
10 -13 D
19 -28 D
217 0 D
--54 102 D
+P
FO
3443 67 M
-101 4 D
@@ -8291,12 +8072,12 @@ FO
217 0 D
-4 9 D
-3 11 D
--17 47 D
+P
FO
3179 135 M
1 6 D
-8 9 D
-7 -15 D
+P
FO
3660 131 M
-21 -16 D
@@ -8311,7 +8092,7 @@ FO
20 -55 D
3 -11 D
217 -1 D
--23 131 D
+P
FO
3880 181 M
-22 -8 D
@@ -8323,7 +8104,7 @@ FO
23 -131 D
217 0 D
0 181 D
--20 0 D
+P
FO
25 W
4 W
@@ -9150,36 +8931,6 @@ N 5850 3900 M 83 0 D S
N 1950 3900 M -83 0 D S
N 5850 3900 M 83 0 D S
N 1950 3900 M -83 0 D S
-2020 -128 M PSL_font_encode 0 get 0 eq {ISOLatin1+_Encoding /Helvetica /Helvetica PSL_reencode PSL_font_encode 0 1 put} if
-233 F0
-(-180�) tc Z
-2020 4028 M (-180�) bc Z
-2660 -141 M (-120�) tc Z
-2660 4041 M (-120�) bc Z
-3289 -157 M (-60�) tc Z
-3289 4057 M (-60�) bc Z
-3900 -167 M (0�) tc Z
-3900 4067 M (0�) bc Z
-4511 -157 M (60�) tc Z
-4511 4057 M (60�) bc Z
-5140 -141 M (120�) tc Z
-5140 4041 M (120�) bc Z
-5780 -128 M (180�) tc Z
-5780 4028 M (180�) bc Z
-1783 0 M (-90�) mr Z
-6017 0 M (-90�) ml Z
-1204 375 M (-60�) mr Z
-6596 375 M (-60�) ml Z
-248 1125 M (-30�) mr Z
-7552 1125 M (-30�) ml Z
--167 1950 M (0�) mr Z
-7967 1950 M (0�) ml Z
-248 2775 M (30�) mr Z
-7552 2775 M (30�) ml Z
-1204 3525 M (60�) mr Z
-6596 3525 M (60�) ml Z
-1783 3900 M (90�) mr Z
-6017 3900 M (90�) ml Z
25 W
1950 0 M
3900 0 D
@@ -9316,7 +9067,37 @@ N 1950 3900 M -83 0 D S
62 -39 D
25 -17 D
170 -108 D
-S
+P S
+2020 -128 M PSL_font_encode 0 get 0 eq {ISOLatin1+_Encoding /Helvetica /Helvetica PSL_reencode PSL_font_encode 0 1 put} if
+233 F0
+(-180�) tc Z
+2020 4028 M (-180�) bc Z
+2660 -141 M (-120�) tc Z
+2660 4041 M (-120�) bc Z
+3289 -157 M (-60�) tc Z
+3289 4057 M (-60�) bc Z
+3900 -167 M (0�) tc Z
+3900 4067 M (0�) bc Z
+4511 -157 M (60�) tc Z
+4511 4057 M (60�) bc Z
+5140 -141 M (120�) tc Z
+5140 4041 M (120�) bc Z
+5780 -128 M (180�) tc Z
+5780 4028 M (180�) bc Z
+1783 0 M (-90�) mr Z
+6017 0 M (-90�) ml Z
+1204 375 M (-60�) mr Z
+6596 375 M (-60�) ml Z
+248 1125 M (-30�) mr Z
+7552 1125 M (-30�) ml Z
+-167 1950 M (0�) mr Z
+7967 1950 M (0�) ml Z
+248 2775 M (30�) mr Z
+7552 2775 M (30�) ml Z
+1204 3525 M (60�) mr Z
+6596 3525 M (60�) ml Z
+1783 3900 M (90�) mr Z
+6017 3900 M (90�) ml Z
%%EndObject
%%PageTrailer
U
diff --git a/doc/scripts/GMT_mapscale.ps b/doc/scripts/GMT_mapscale.ps
index 21f22c0..4b705cf 100644
--- a/doc/scripts/GMT_mapscale.ps
+++ b/doc/scripts/GMT_mapscale.ps
@@ -1,11 +1,11 @@
%!PS-Adobe-3.0
%%BoundingBox: 0 0 612 792
-%%HiResBoundingBox: 0 0 612 792
-%%Title: GMT v5.2.0_r14409M [64-bit] Document from psbasemap
+%%HiResBoundingBox: 0 0 612 792
+%%Title: GMT v5.4.3_r19525 [64-bit] Document from psbasemap
%%Creator: GMT5
-%%For: pwessel
+%%For: unknown
%%DocumentNeededResources: font Helvetica
-%%CreationDate: Sat Jun 27 14:42:20 2015
+%%CreationDate: Wed Dec 27 15:11:01 2017
%%LanguageLevel: 2
%%DocumentData: Clean7Bit
%%Orientation: Portrait
@@ -116,39 +116,39 @@
/pdfmark where {pop [ /BM exch /CA exch dup /ca exch /SetTransparency pdfmark}
{pop pop} ifelse} ifelse
}!
-/Standard+_Encoding [
+/ISOLatin1+_Encoding [
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
-/.notdef /threequarters /threesuperior /trademark /twosuperior /yacute /ydieresis /zcaron
+/.notdef /bullet /ellipsis /trademark /emdash /endash /fi /zcaron
/space /exclam /quotedbl /numbersign /dollar /percent /ampersand /quoteright
-/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash
+/parenleft /parenright /asterisk /plus /comma /minus /period /slash
/zero /one /two /three /four /five /six /seven
/eight /nine /colon /semicolon /less /equal /greater /question
/at /A /B /C /D /E /F /G
/H /I /J /K /L /M /N /O
/P /Q /R /S /T /U /V /W
/X /Y /Z /bracketleft /backslash /bracketright /asciicircum /underscore
-/quoteleft /a /b /c /d /e /f /g
+/quoteleft /a /b /c /d /e /f /g
/h /i /j /k /l /m /n /o
/p /q /r /s /t /u /v /w
-/x /y /z /braceleft /bar /braceright /asciitilde /florin
-/Atilde /Ccedilla /Eth /Lslash /Ntilde /Otilde /Scaron /Thorn
-/Yacute /Ydieresis /Zcaron /atilde /brokenbar /ccedilla /copyright /degree
-/divide /eth /logicalnot /lslash /minus /mu /multiply /ntilde
-/onehalf /onequarter /onesuperior /otilde /plusminus /registered /scaron /thorn
-/.notdef /exclamdown /cent /sterling /fraction /yen /florin /section
-/currency /quotesingle /quotedblleft /guillemotleft /guilsinglleft /guilsinglright /fi /fl
-/Aacute /endash /dagger /daggerdbl /periodcentered /Acircumflex /paragraph /bullet
-/quotesinglbase /quotedblbase /quotedblright /guillemotright /ellipsis /perthousand /Adieresis /questiondown
-/Agrave /grave /acute /circumflex /tilde /macron /breve /dotaccent
-/dieresis /Eacute /ring /cedilla /Ecircumflex /hungarumlaut /ogonek /caron
-/emdash /Edieresis /Egrave /Iacute /Icircumflex /Idieresis /Igrave /Oacute
-/Ocircumflex /Odieresis /Ograve /Uacute /Ucircumflex /Udieresis /Ugrave /aacute
-/acircumflex /AE /adieresis /ordfeminine /agrave /eacute /ecircumflex /edieresis
-/egrave /Oslash /OE /ordmasculine /iacute /icircumflex /idieresis /igrave
-/oacute /ae /ocircumflex /odieresis /ograve /dotlessi /uacute /ucircumflex
-/udieresis /oslash /oe /germandbls /ugrave /Aring /aring /ydieresis
+/x /y /z /braceleft /bar /braceright /asciitilde /scaron
+/OE /dagger /daggerdbl /Lslash /fraction /guilsinglleft /Scaron /guilsinglright
+/oe /Ydieresis /Zcaron /lslash /perthousand /quotedblbase /quotedblleft /quotedblright
+/dotlessi /grave /acute /circumflex /tilde /macron /breve /dotaccent
+/dieresis /quotesinglbase /ring /cedilla /quotesingle /hungarumlaut /ogonek /caron
+/space /exclamdown /cent /sterling /currency /yen /brokenbar /section
+/dieresis /copyright /ordfeminine /guillemotleft /logicalnot /hyphen /registered /macron
+/degree /plusminus /twosuperior /threesuperior /acute /mu /paragraph /periodcentered
+/cedilla /onesuperior /ordmasculine /guillemotright /onequarter /onehalf /threequarters /questiondown
+/Agrave /Aacute /Acircumflex /Atilde /Adieresis /Aring /AE /Ccedilla
+/Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex /Idieresis
+/Eth /Ntilde /Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply
+/Oslash /Ugrave /Uacute /Ucircumflex /Udieresis /Yacute /Thorn /germandbls
+/agrave /aacute /acircumflex /atilde /adieresis /aring /ae /ccedilla
+/egrave /eacute /ecircumflex /edieresis /igrave /iacute /icircumflex /idieresis
+/eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide
+/oslash /ugrave /uacute /ucircumflex /udieresis /yacute /thorn /ydieresis
] def
/PSL_font_encode 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 39 array astore def
/F0 {/Helvetica Y}!
@@ -272,7 +272,6 @@ end
PSL_heights psl_k PSL_height put
} for
} def
-%%%%%%%%%%%%%%%%%%% CURVED BASELINE TEXT PLACEMENT FUNCTIONS
/PSL_curved_path_labels
{ /psl_bits exch def
/PSL_placetext psl_bits 2 and 2 eq def
@@ -523,7 +522,6 @@ end
{PSL_xp 0 get PSL_yp 0 get M
1 1 j { /ii exch def PSL_xp ii get PSL_yp ii get L} for
} def
-%%%%%%%%%%%%%%%%%%% DRAW BASELINE TEXT SEGMENT LINES
/PSL_draw_path_lines
{
/PSL_n_paths1 PSL_n_paths 1 sub def
@@ -549,7 +547,6 @@ end
} for
U
} def
-%%%%%%%%%%%%%%%%%%% STRAIGHT BASELINE TEXT PLACEMENT FUNCTIONS
/PSL_straight_path_labels
{
/psl_bits exch def
@@ -666,8 +663,8 @@ O0
1200 1200 TM
% PostScript produced by:
-%%GMT: psbasemap -R0/40/50/56 -JM5i -Baf -P -K '-LjML+c53+w1000k+f+lScale at 53\312N' -F+glightcyan+c0+p
-%%PROJ: merc 0.00000000 40.00000000 50.00000000 56.00000000 -2226389.816 2226389.816 6413524.594 7522963.241 +proj=merc +lon_0=20 +k=1 +x_0=0 +y_0=0 +a=6378137.000 +b=6356752.314245 +ellps=WGS84
+%@GMT: psbasemap -R0/40/50/56 -JM5i -Baf -P -K '-LjML+c53+w1000k+f+lScale at 53\232N' -F+glightcyan+c0+p
+%@PROJ: merc 0.00000000 40.00000000 50.00000000 56.00000000 -2226389.816 2226389.816 6413524.594 7522963.241 +proj=merc +lon_0=20 +k=1 +x_0=0 +y_0=0 +a=6378137.000 +b=6356752.314245 +ellps=WGS84 +datum=WGS84 +units=m +no_defs
%%BeginObject PSL_Layer_1
0 setlinecap
0 setlinejoin
@@ -686,20 +683,6 @@ N 6000 0 M 0 -83 D S
N 6000 1495 M 0 83 D S
N 0 0 M -83 0 D S
N 6000 0 M 83 0 D S
-0 -167 M PSL_font_encode 0 get 0 eq {Standard+_Encoding /Helvetica /Helvetica PSL_reencode PSL_font_encode 0 1 put} if
-200 F0
-(0�) tc Z
-0 1662 M (0�) bc Z
-1500 -167 M (10�) tc Z
-1500 1662 M (10�) bc Z
-3000 -167 M (20�) tc Z
-3000 1662 M (20�) bc Z
-4500 -167 M (30�) tc Z
-4500 1662 M (30�) bc Z
-6000 -167 M (40�) tc Z
-6000 1662 M (40�) bc Z
--167 0 M (50�) mr Z
-6167 0 M (50�) ml Z
83 W
1 A
N -42 0 M 0 476 D S
@@ -780,6 +763,20 @@ N 6083 1495 M -6166 0 D S
N 6083 1578 M -6166 0 D S
N 0 1578 M 0 -1661 D S
N -83 1578 M 0 -1661 D S
+0 -167 M PSL_font_encode 0 get 0 eq {ISOLatin1+_Encoding /Helvetica /Helvetica PSL_reencode PSL_font_encode 0 1 put} if
+200 F0
+(0�) tc Z
+0 1662 M (0�) bc Z
+1500 -167 M (10�) tc Z
+1500 1662 M (10�) bc Z
+3000 -167 M (20�) tc Z
+3000 1662 M (20�) bc Z
+4500 -167 M (30�) tc Z
+4500 1662 M (30�) bc Z
+6000 -167 M (40�) tc Z
+6000 1662 M (40�) bc Z
+-167 0 M (50�) mr Z
+6167 0 M (50�) ml Z
25 W
{0.878 1 1 C} FS
O1
@@ -806,7 +803,7 @@ N 0 706 M 0 83 D S
N 2235 706 M 0 83 D S
2235 643 M (1000) tc Z
1118 922 M 267 F0
-(Scale at 53\312N) bc Z
+(Scale at 53\232N) bc Z
%%EndObject
0 A
FQ
@@ -814,8 +811,8 @@ O0
0 0 TM
% PostScript produced by:
-%%GMT: psbasemap -R0/40/50/56 -JM5i -O -K -LjBR+c53+w1000k+l+f -F+p1p+i+gwhite+c0.1i -Vd
-%%PROJ: merc 0.00000000 40.00000000 50.00000000 56.00000000 -2226389.816 2226389.816 6413524.594 7522963.241 +proj=merc +lon_0=20 +k=1 +x_0=0 +y_0=0 +a=6378137.000 +b=6356752.314245 +ellps=WGS84
+%@GMT: psbasemap -R0/40/50/56 -JM5i -O -K -LjBR+c53+w1000k+l+f -F+p1p+i+gwhite+c0.1i
+%@PROJ: merc 0.00000000 40.00000000 50.00000000 56.00000000 -2226389.816 2226389.816 6413524.594 7522963.241 +proj=merc +lon_0=20 +k=1 +x_0=0 +y_0=0 +a=6378137.000 +b=6356752.314245 +ellps=WGS84 +datum=WGS84 +units=m +no_defs
%%BeginObject PSL_Layer_2
0 setlinecap
0 setlinejoin
@@ -845,11 +842,11 @@ N 5553 21 M 0 62 D S
-41 447 5553 83 Sb
N 6000 21 M 0 62 D S
N 3765 0 M 0 83 D S
-3765 -62 M PSL_font_encode 0 get 0 eq {Standard+_Encoding /Helvetica /Helvetica PSL_reencode PSL_font_encode 0 1 put} if
+3765 -63 M PSL_font_encode 0 get 0 eq {ISOLatin1+_Encoding /Helvetica /Helvetica PSL_reencode PSL_font_encode 0 1 put} if
200 F0
(0) tc Z
N 6000 0 M 0 83 D S
-6000 -62 M (1000) tc Z
+6000 -63 M (1000) tc Z
4882 217 M 267 F0
(km) bc Z
%%EndObject
@@ -859,8 +856,8 @@ O0
0 0 TM
% PostScript produced by:
-%%GMT: psxy -R0/40/50/56 -JM5i -O -K -Wfaint -A -N
-%%PROJ: merc 0.00000000 40.00000000 50.00000000 56.00000000 -2226389.816 2226389.816 6413524.594 7522963.241 +proj=merc +lon_0=20 +k=1 +x_0=0 +y_0=0 +a=6378137.000 +b=6356752.314245 +ellps=WGS84
+%@GMT: psxy -R0/40/50/56 -JM5i -O -K -Wfaint -A -N
+%@PROJ: merc 0.00000000 40.00000000 50.00000000 56.00000000 -2226389.816 2226389.816 6413524.594 7522963.241 +proj=merc +lon_0=20 +k=1 +x_0=0 +y_0=0 +a=6378137.000 +b=6356752.314245 +ellps=WGS84 +datum=WGS84 +units=m +no_defs
%%BeginObject PSL_Layer_3
0 setlinecap
0 setlinejoin
@@ -879,8 +876,8 @@ O0
0 0 TM
% PostScript produced by:
-%%GMT: psxy -R0/40/50/56 -JM5i -O -T
-%%PROJ: merc 0.00000000 40.00000000 50.00000000 56.00000000 -2226389.816 2226389.816 6413524.594 7522963.241 +proj=merc +lon_0=20 +k=1 +x_0=0 +y_0=0 +a=6378137.000 +b=6356752.314245 +ellps=WGS84
+%@GMT: psxy -R0/40/50/56 -JM5i -O -T
+%@PROJ: merc 0.00000000 40.00000000 50.00000000 56.00000000 -2226389.816 2226389.816 6413524.594 7522963.241 +proj=merc +lon_0=20 +k=1 +x_0=0 +y_0=0 +a=6378137.000 +b=6356752.314245 +ellps=WGS84 +datum=WGS84 +units=m +no_defs
%%BeginObject PSL_Layer_4
0 setlinecap
0 setlinejoin
diff --git a/doc/tutorial/CMakeLists.txt b/doc/tutorial/CMakeLists.txt
index c6c471b..e52cc7a 100644
--- a/doc/tutorial/CMakeLists.txt
+++ b/doc/tutorial/CMakeLists.txt
@@ -1,7 +1,7 @@
#
# $I$
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index aee258c..edee0d9 100644
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -1,7 +1,7 @@
#
-# $Id: CMakeLists.txt 18128 2017-05-05 01:37:24Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/share/tools/CMakeLists.txt b/share/tools/CMakeLists.txt
index b49b617..b8fccad 100644
--- a/share/tools/CMakeLists.txt
+++ b/share/tools/CMakeLists.txt
@@ -1,7 +1,7 @@
#
-# $Id: CMakeLists.txt 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/share/tools/gmt5syntax.in b/share/tools/gmt5syntax.in
index f4c13c9..5846ad8 100755
--- a/share/tools/gmt5syntax.in
+++ b/share/tools/gmt5syntax.in
@@ -2,9 +2,9 @@
#! -*-perl-*-
eval 'exec perl -x -wS $0 ${1+"$@"}'
if 0;
-# $Id: gmt5syntax.in 18254 2017-05-28 19:46:56Z pwessel $
+# $Id: gmt5syntax.in 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo,
+# 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.
#
diff --git a/share/tools/gmt_aliases.csh b/share/tools/gmt_aliases.csh
index 9d72270..46c7b3b 100755
--- a/share/tools/gmt_aliases.csh
+++ b/share/tools/gmt_aliases.csh
@@ -1,6 +1,6 @@
-# $Id: gmt_aliases.csh 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: gmt_aliases.csh 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo,
+# 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.
#
diff --git a/share/tools/gmt_completion.bash b/share/tools/gmt_completion.bash
index 18a8935..6c1d0bf 100755
--- a/share/tools/gmt_completion.bash
+++ b/share/tools/gmt_completion.bash
@@ -1,6 +1,6 @@
-# $Id: gmt_completion.bash 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: gmt_completion.bash 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo,
+# 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.
#
diff --git a/share/tools/gmt_functions.sh b/share/tools/gmt_functions.sh
index 3413d31..8ab17c5 100755
--- a/share/tools/gmt_functions.sh
+++ b/share/tools/gmt_functions.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-# $Id: gmt_functions.sh 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: gmt_functions.sh 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo,
+# 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.
#
diff --git a/share/tools/gmt_links.sh b/share/tools/gmt_links.sh
index e648758..1910e89 100755
--- a/share/tools/gmt_links.sh
+++ b/share/tools/gmt_links.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-# $Id: gmt_links.sh 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: gmt_links.sh 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo,
+# 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.
#
diff --git a/share/tools/gmt_make_custom_code.sh b/share/tools/gmt_make_custom_code.sh
index 66e3269..95c2f31 100755
--- a/share/tools/gmt_make_custom_code.sh
+++ b/share/tools/gmt_make_custom_code.sh
@@ -2,7 +2,7 @@
#
# $Id: gmt_make_custom_code.sh 15301 2015-12-04 13:59:07Z fwobbe $
#
-# Copyright (c) 2012-2017
+# Copyright (c) 2012-2018
# by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
# See LICENSE.TXT file for copying and redistribution conditions.
#
diff --git a/share/tools/gmt_prepmex.sh b/share/tools/gmt_prepmex.sh
index e20aa43..0c7c40c 100755
--- a/share/tools/gmt_prepmex.sh
+++ b/share/tools/gmt_prepmex.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-# $Id: gmt_prepmex.sh 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: gmt_prepmex.sh 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo,
+# 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.
#
diff --git a/share/tools/gmt_uninstall.sh b/share/tools/gmt_uninstall.sh
index 8f8750f..21e32af 100755
--- a/share/tools/gmt_uninstall.sh
+++ b/share/tools/gmt_uninstall.sh
@@ -1,7 +1,7 @@
#!/bin/bash
-# $Id: gmt_uninstall.sh 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: gmt_uninstall.sh 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo,
+# 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.
#
diff --git a/share/tools/ncdeflate b/share/tools/ncdeflate
index a4897e1..861325a 100755
--- a/share/tools/ncdeflate
+++ b/share/tools/ncdeflate
@@ -1,8 +1,8 @@
#!/bin/bash
#
-# $Id: ncdeflate 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: ncdeflate 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo,
+# 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.
#
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 811ce4a..fdb9095 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,7 @@
#
-# $Id: CMakeLists.txt 18132 2017-05-05 03:05:46Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/src/block_subs.h b/src/block_subs.h
index ac586c5..1b54372 100644
--- a/src/block_subs.h
+++ b/src/block_subs.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: block_subs.h 17833 2017-04-01 05:52:50Z pwessel $
+ * $Id: block_subs.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/blockmean.c b/src/blockmean.c
index dfabdc6..bd54788 100644
--- a/src/blockmean.c
+++ b/src/blockmean.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: blockmean.c 18282 2017-05-30 01:57:05Z pwessel $
+ * $Id: blockmean.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/blockmedian.c b/src/blockmedian.c
index 9345e4e..2b6deb0 100644
--- a/src/blockmedian.c
+++ b/src/blockmedian.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: blockmedian.c 18282 2017-05-30 01:57:05Z pwessel $
+ * $Id: blockmedian.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/blockmode.c b/src/blockmode.c
index 8866610..9f14f44 100644
--- a/src/blockmode.c
+++ b/src/blockmode.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: blockmode.c 18282 2017-05-30 01:57:05Z pwessel $
+ * $Id: blockmode.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/common_byteswap.h b/src/common_byteswap.h
index a39e190..4613898 100644
--- a/src/common_byteswap.h
+++ b/src/common_byteswap.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: common_byteswap.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: common_byteswap.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/common_math.c b/src/common_math.c
index e9d38d3..32b1e20 100644
--- a/src/common_math.c
+++ b/src/common_math.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: common_math.c 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: common_math.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/common_math.h b/src/common_math.h
index eef848c..0548b3c 100644
--- a/src/common_math.h
+++ b/src/common_math.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: common_math.h 18342 2017-06-08 18:29:17Z pwessel $
+ * $Id: common_math.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/common_runpath.c b/src/common_runpath.c
index f4542ff..05a4b5b 100644
--- a/src/common_runpath.c
+++ b/src/common_runpath.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: common_runpath.c 17916 2017-04-13 15:44:29Z jluis $
+ * $Id: common_runpath.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/common_runpath.h b/src/common_runpath.h
index 8b46149..5990619 100644
--- a/src/common_runpath.h
+++ b/src/common_runpath.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: common_runpath.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: common_runpath.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/common_sighandler.c b/src/common_sighandler.c
index b72fdea..22a0ae8 100644
--- a/src/common_sighandler.c
+++ b/src/common_sighandler.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: common_sighandler.c 18448 2017-06-24 18:48:17Z pwessel $
+ * $Id: common_sighandler.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/common_sighandler.h b/src/common_sighandler.h
index 4e0d6ab..4f1eb2a 100644
--- a/src/common_sighandler.h
+++ b/src/common_sighandler.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: common_sighandler.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: common_sighandler.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/common_string.c b/src/common_string.c
index 782afef..ad5117e 100644
--- a/src/common_string.c
+++ b/src/common_string.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: common_string.c 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: common_string.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/common_string.h b/src/common_string.h
index 7b933ea..802b23f 100644
--- a/src/common_string.h
+++ b/src/common_string.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: common_string.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: common_string.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/compat/qsort.h b/src/compat/qsort.h
index 6f3f371..253fd7e 100644
--- a/src/compat/qsort.h
+++ b/src/compat/qsort.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: qsort.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: qsort.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/config.h.in b/src/config.h.in
index 1db6589..9bb2fe7 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -1,7 +1,7 @@
/*
- * $Id: config.h.in 18012 2017-04-20 23:56:41Z pwessel $
+ * $Id: config.h.in 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -65,10 +65,10 @@
#define PSL_LIB_NAME "@PSL_LIB_NAME@"
/* Name of DCW path */
-#define DCW_INSTALL_PATH "@DCW_ROOT@"
+#define DCW_INSTALL_PATH "@DCW_PATH@"
/* Name of GSHHG path */
-#define GSHHG_INSTALL_PATH "@GSHHG_ROOT@"
+#define GSHHG_INSTALL_PATH "@GSHHG_PATH@"
/* Default units (SI vs US) */
#define GMT_DEF_UNITS "@UNITS@"
diff --git a/src/declspec.h b/src/declspec.h
index de2fb16..b256510 100644
--- a/src/declspec.h
+++ b/src/declspec.h
@@ -1,8 +1,8 @@
/*--------------------------------------------------------------------
*
- * $Id: declspec.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: declspec.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo,
+ * Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo,
* F. Wobbe, and J. Luis
* See LICENSE.TXT file for copying and redistribution conditions.
*
diff --git a/src/filter1d.c b/src/filter1d.c
index 1d5d831..d1f0e31 100644
--- a/src/filter1d.c
+++ b/src/filter1d.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: filter1d.c 18404 2017-06-20 18:10:00Z pwessel $
+ * $Id: filter1d.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/fitcircle.c b/src/fitcircle.c
index 532a380..21205b6 100644
--- a/src/fitcircle.c
+++ b/src/fitcircle.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: fitcircle.c 18134 2017-05-05 08:34:43Z pwessel $
+ * $Id: fitcircle.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt-config.in b/src/gmt-config.in
index c26fa32..8f714e2 100755
--- a/src/gmt-config.in
+++ b/src/gmt-config.in
@@ -1,8 +1,8 @@
#!/bin/bash
#--------------------------------------------------------------------
-# $Id: gmt-config.in 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: gmt-config.in 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt.c b/src/gmt.c
index 4a13bee..1e6e64b 100644
--- a/src/gmt.c
+++ b/src/gmt.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt.c 18366 2017-06-12 01:57:16Z pwessel $
+ * $Id: gmt.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt.h b/src/gmt.h
index b18852f..5dee433 100644
--- a/src/gmt.h
+++ b/src/gmt.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt.h 18391 2017-06-17 21:24:36Z pwessel $
+ * $Id: gmt.h 19523 2017-12-27 23:20:32Z pwessel $
*
- * Copyright (c) 1991-2017
+ * Copyright (c) 1991-2018
* P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
* See LICENSE.TXT file for copying and redistribution conditions.
*
diff --git a/src/gmt2kml.c b/src/gmt2kml.c
index 460d9e7..29b890f 100644
--- a/src/gmt2kml.c
+++ b/src/gmt2kml.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt2kml.c 18134 2017-05-05 08:34:43Z pwessel $
+ * $Id: gmt2kml.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_agc_io.c b/src/gmt_agc_io.c
index 4de6457..888488c 100644
--- a/src/gmt_agc_io.c
+++ b/src/gmt_agc_io.c
@@ -1,6 +1,6 @@
-/* $Id: gmt_agc_io.c 17654 2017-03-13 04:22:52Z pwessel $
+/* $Id: gmt_agc_io.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_api.c b/src/gmt_api.c
index 6874cfa..24ea26f 100644
--- a/src/gmt_api.c
+++ b/src/gmt_api.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_api.c 18435 2017-06-22 04:01:50Z pwessel $
+ * $Id: gmt_api.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -934,8 +934,10 @@ unsigned int gmt_download_file_if_not_found (struct GMT_CTRL *GMT, const char* f
GMT_Report (GMT->parent, GMT_MSG_VERBOSE, "Downloading file %s ...\n", url);
if ((curl_err = curl_easy_perform (Curl))) { /* Failed, give error message */
GMT_Report (GMT->parent, GMT_MSG_NORMAL, "Libcurl Error: %s\n", curl_easy_strerror (curl_err));
- fclose (ftpfile.fp);
- ftpfile.fp = NULL;
+ if (ftpfile.fp != NULL) {
+ fclose (ftpfile.fp);
+ ftpfile.fp = NULL;
+ }
if (gmt_remove_file (GMT, local_path))
GMT_Report (GMT->parent, GMT_MSG_NORMAL, "Could not even remove file %s\n", local_path);
}
@@ -1946,6 +1948,9 @@ GMT_LOCAL int api_open_grd (struct GMT_CTRL *GMT, char *file, struct GMT_GRID *G
/* Seek past the grid header, unless there is none */
if (header && fseek (R->fp, (off_t)GMT_GRID_HEADER_SIZE, SEEK_SET)) return (GMT_GRDIO_SEEK_FAILED);
alloc = (fmt[1] != 'f'); /* Only need to allocate the v_row array if grid is not float */
+#ifdef DEBUG
+ R->pos = ftell (R->fp); /* Where we are */
+#endif
}
R->size = gmt_grd_data_size (GMT, G->header->type, &G->header->nan_value);
@@ -2413,6 +2418,9 @@ GMT_LOCAL void *api_pass_object (struct GMTAPI_CTRL *API, struct GMTAPI_DATA_OBJ
object->reset_pad = G->header->reset_pad = 1;
}
}
+ gmt_BC_init (API->GMT, G->header); /* Initialize grid interpolation and boundary condition parameters */
+ if (gmt_M_err_pass (API->GMT, gmt_grd_BC_set (API->GMT, G, GMT_IN), "Grid memory"))
+ return_null (API, GMT_GRID_BC_ERROR); /* Failed to set boundary conditions */
break;
case GMT_IS_IMAGE: /* Images need to update the grdtype setting, possibly rotate geographic grids, and maybe deal with subsets */
I = api_get_image_data (data); /* Get the right image pointer */
@@ -2441,6 +2449,9 @@ GMT_LOCAL void *api_pass_object (struct GMTAPI_CTRL *API, struct GMTAPI_DATA_OBJ
object->reset_pad = I->header->reset_pad = 1;
}
}
+ gmt_BC_init (API->GMT, I->header); /* Initialize image interpolation and boundary condition parameters */
+ if (gmt_M_err_pass (API->GMT, gmtlib_image_BC_set (API->GMT, I), "Image memory"))
+ return_null (API, GMT_IMAGE_BC_ERROR); /* Set boundary conditions */
break;
case GMT_IS_DATASET: /* Just make sure the min/max values are updated for tables and dataset */
D = api_get_dataset_data (data); /* Get the right dataset pointer */
@@ -7161,17 +7172,26 @@ int GMT_Write_Data (void *V_API, unsigned int family, unsigned int method, unsig
if (!API->object[out_item]->filename) API->object[out_item]->filename = strdup (output);
}
} /* else it is a regular file and we just register it and get the new out_ID needed below */
- else if ((out_ID = GMT_Register_IO (API, family, method, geometry, GMT_OUT, wesn, output)) == GMT_NOTSET) return_error (API, API->error);
+ else if ((out_ID = GMT_Register_IO (API, family, method, geometry, GMT_OUT, wesn, output)) == GMT_NOTSET) {
+ gmt_M_str_free (output); /* Done with this variable */
+ return_error (API, API->error);
+ }
}
else if (output == NULL && geometry) { /* Case 2: Save to stdout. Register stdout first. */
if (family == GMT_IS_GRID) return_error (API, GMT_STREAM_NOT_ALLOWED); /* Cannot write grids to stream */
if ((out_ID = GMT_Register_IO (API, family, GMT_IS_STREAM, geometry, GMT_OUT, wesn, API->GMT->session.std[GMT_OUT])) == GMT_NOTSET) return_error (API, API->error); /* Failure to register std??? */
}
else { /* Case 3: output == NULL && geometry == 0, so use the previously registered destination */
- if ((n_reg = gmtapi_count_objects (API, family, geometry, GMT_OUT, &out_ID)) != 1) return_error (API, GMT_NO_OUTPUT); /* There is no registered output */
+ if ((n_reg = gmtapi_count_objects (API, family, geometry, GMT_OUT, &out_ID)) != 1) {
+ gmt_M_str_free (output); /* Done with this variable */
+ return_error (API, GMT_NO_OUTPUT); /* There is no registered output */
+ }
}
/* With out_ID in hand we can now put the data where it should go */
- if (api_put_data (API, out_ID, mode, data) != GMT_OK) return_error (API, API->error);
+ if (api_put_data (API, out_ID, mode, data) != GMT_OK) {
+ gmt_M_str_free (output); /* Done with this variable */
+ return_error (API, API->error);
+ }
gmt_M_str_free (output); /* Done with this variable */
#ifdef DEBUG
@@ -7972,6 +7992,9 @@ int GMT_Get_Row (void *V_API, int row_no, struct GMT_GRID *G, float *row) {
for (col = 0; col < G->header->n_columns; col++)
row[col] = gmtlib_decode (GMT, R->v_row, col, fmt[1]); /* Convert whatever to float */
}
+#ifdef DEBUG
+ R->pos = ftell (R->fp); /* Update where we are */
+#endif
}
if (R->check) { /* Replace NaN-marker with actual NaN */
for (col = 0; col < G->header->n_columns; col++)
diff --git a/src/gmt_bcr.c b/src/gmt_bcr.c
index cc710df..8d428d0 100644
--- a/src/gmt_bcr.c
+++ b/src/gmt_bcr.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_bcr.c 17985 2017-04-18 14:37:51Z jluis $
+ * $Id: gmt_bcr.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_calclock.c b/src/gmt_calclock.c
index fc1f89d..c910db6 100644
--- a/src/gmt_calclock.c
+++ b/src/gmt_calclock.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_calclock.c 18312 2017-06-02 17:21:39Z pwessel $
+ * $Id: gmt_calclock.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_cdf.c b/src/gmt_cdf.c
index e2db105..5d03600 100644
--- a/src/gmt_cdf.c
+++ b/src/gmt_cdf.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_cdf.c 17508 2017-01-31 23:22:31Z pwessel $
+ * $Id: gmt_cdf.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_common.h b/src/gmt_common.h
index 5f1d0ed..ad1ffd2 100644
--- a/src/gmt_common.h
+++ b/src/gmt_common.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_common.h 18304 2017-06-02 04:58:28Z pwessel $
+ * $Id: gmt_common.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_compat.c b/src/gmt_compat.c
index d53fc62..d3a56d0 100644
--- a/src/gmt_compat.c
+++ b/src/gmt_compat.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_compat.c 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmt_compat.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_config.h.in b/src/gmt_config.h.in
index 4effbe4..cf30551 100644
--- a/src/gmt_config.h.in
+++ b/src/gmt_config.h.in
@@ -1,7 +1,7 @@
/*
- * $Id: gmt_config.h.in 18340 2017-06-08 02:50:06Z pwessel $
+ * $Id: gmt_config.h.in 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo,
+ * Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo,
* F. Wobbe, and J. Luis
* See LICENSE.TXT file for copying and redistribution conditions.
*
diff --git a/src/gmt_constants.h b/src/gmt_constants.h
index af7aa2b..0b8e419 100644
--- a/src/gmt_constants.h
+++ b/src/gmt_constants.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_constants.h 18304 2017-06-02 04:58:28Z pwessel $
+ * $Id: gmt_constants.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_contour.h b/src/gmt_contour.h
index 199bf25..6c0969d 100644
--- a/src/gmt_contour.h
+++ b/src/gmt_contour.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_contour.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmt_contour.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_core_module.c b/src/gmt_core_module.c
index a3affd3..ad5d4b2 100644
--- a/src/gmt_core_module.c
+++ b/src/gmt_core_module.c
@@ -1,6 +1,6 @@
-/* $Id: gmt_core_module.c 17846 2017-04-03 06:29:38Z pwessel $
+/* $Id: gmt_core_module.c 19523 2017-12-27 23:20:32Z pwessel $
*
- * Copyright (c) 2012-2017
+ * Copyright (c) 2012-2018
* by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
* See LICENSE.TXT file for copying and redistribution conditions.
*/
diff --git a/src/gmt_core_module.h b/src/gmt_core_module.h
index 13c0b24..4e1f91b 100644
--- a/src/gmt_core_module.h
+++ b/src/gmt_core_module.h
@@ -1,6 +1,6 @@
-/* $Id: gmt_core_module.h 17846 2017-04-03 06:29:38Z pwessel $
+/* $Id: gmt_core_module.h 19523 2017-12-27 23:20:32Z pwessel $
*
- * Copyright (c) 2012-2017
+ * Copyright (c) 2012-2018
* by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
* See LICENSE.TXT file for copying and redistribution conditions.
*/
diff --git a/src/gmt_customio.c b/src/gmt_customio.c
index 93af62f..262002a 100644
--- a/src/gmt_customio.c
+++ b/src/gmt_customio.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_customio.c 17950 2017-04-15 15:55:34Z jluis $
+ * $Id: gmt_customio.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_customio.h b/src/gmt_customio.h
index 1294150..009445d 100644
--- a/src/gmt_customio.h
+++ b/src/gmt_customio.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_customio.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmt_customio.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_dcw.c b/src/gmt_dcw.c
index 0b7e950..347b166 100644
--- a/src/gmt_dcw.c
+++ b/src/gmt_dcw.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_dcw.c 18363 2017-06-12 01:30:50Z pwessel $
+ * $Id: gmt_dcw.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_dcw.h b/src/gmt_dcw.h
index 4396ebc..8f2ef54 100644
--- a/src/gmt_dcw.h
+++ b/src/gmt_dcw.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_dcw.h 17489 2017-01-26 02:22:01Z pwessel $
+ * $Id: gmt_dcw.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_decorate.h b/src/gmt_decorate.h
index 1bdde26..ae5a913 100644
--- a/src/gmt_decorate.h
+++ b/src/gmt_decorate.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_decorate.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmt_decorate.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_defaults.h b/src/gmt_defaults.h
index c30fc0f..00f32e8 100644
--- a/src/gmt_defaults.h
+++ b/src/gmt_defaults.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_defaults.h 18404 2017-06-20 18:10:00Z pwessel $
+ * $Id: gmt_defaults.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_dev.h b/src/gmt_dev.h
index 10c9a88..7152fc5 100644
--- a/src/gmt_dev.h
+++ b/src/gmt_dev.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_dev.h 17865 2017-04-04 15:05:54Z jluis $
+ * $Id: gmt_dev.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_dimensions.h.in b/src/gmt_dimensions.h.in
index 64f57f1..9846f4b 100644
--- a/src/gmt_dimensions.h.in
+++ b/src/gmt_dimensions.h.in
@@ -1,7 +1,7 @@
/*
- * $Id: gmt_dimensions.h.in 18101 2017-05-01 07:09:55Z pwessel $
+ * $Id: gmt_dimensions.h.in 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo,
+ * Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo,
* F. Wobbe, and J. Luis
*
* See LICENSE.TXT file for copying and redistribution conditions.
diff --git a/src/gmt_error.c b/src/gmt_error.c
index c638834..0fb2be8 100644
--- a/src/gmt_error.c
+++ b/src/gmt_error.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_error.c 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmt_error.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_error.h b/src/gmt_error.h
index 71b903d..ecccc9b 100644
--- a/src/gmt_error.h
+++ b/src/gmt_error.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_error.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmt_error.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_error_codes.c b/src/gmt_error_codes.c
index 69ad9df..8981872 100644
--- a/src/gmt_error_codes.c
+++ b/src/gmt_error_codes.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_error_codes.c 17666 2017-03-14 04:01:43Z pwessel $
+ * $Id: gmt_error_codes.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_error_codes.h b/src/gmt_error_codes.h
index 78a8b90..f7a4f85 100644
--- a/src/gmt_error_codes.h
+++ b/src/gmt_error_codes.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_error_codes.h 17666 2017-03-14 04:01:43Z pwessel $
+ * $Id: gmt_error_codes.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_esri_io.c b/src/gmt_esri_io.c
index 6147193..f613076 100644
--- a/src/gmt_esri_io.c
+++ b/src/gmt_esri_io.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_esri_io.c 18123 2017-05-04 17:44:37Z jluis $
+ * $Id: gmt_esri_io.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_fft.c b/src/gmt_fft.c
index d859eaf..4092c35 100644
--- a/src/gmt_fft.c
+++ b/src/gmt_fft.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_fft.c 18041 2017-04-26 23:09:48Z pwessel $
+ * $Id: gmt_fft.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_fft.h b/src/gmt_fft.h
index 29cf625..d170941 100644
--- a/src/gmt_fft.h
+++ b/src/gmt_fft.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_fft.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmt_fft.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_gdal_librarified.c b/src/gmt_gdal_librarified.c
index c82f208..4706e97 100644
--- a/src/gmt_gdal_librarified.c
+++ b/src/gmt_gdal_librarified.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_gdal_librarified.c 18275 2017-05-30 00:23:34Z pwessel $
+ * $Id: gmt_gdal_librarified.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_gdalread.c b/src/gmt_gdalread.c
index 112faf3..f023636 100644
--- a/src/gmt_gdalread.c
+++ b/src/gmt_gdalread.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_gdalread.c 18325 2017-06-06 23:29:37Z pwessel $
+ * $Id: gmt_gdalread.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -37,6 +37,8 @@ GMT_LOCAL GDALDatasetH gdal_open (struct GMT_CTRL *GMT, char *gdal_filename) {
if (gmtlib_check_url_name (gdal_filename)) /* A vis*** URL, pass to GDAL as is */
//file = gdal_filename;
strcpy (path, gdal_filename);
+ else if (strchr(gdal_filename, ':')) /* Assume it is a SUBDATASET */
+ strncpy (path, gdal_filename, PATH_MAX-1);
else if ((file = gmt_getdatapath (GMT, gdal_filename, path, R_OK)) == NULL) { /* Local file not found */
GMT_Report (GMT->parent, GMT_MSG_NORMAL, "Unable to find %s.\n", gdal_filename);
return (NULL);
diff --git a/src/gmt_gdalread.h b/src/gmt_gdalread.h
index 9038b99..cddb7be 100644
--- a/src/gmt_gdalread.h
+++ b/src/gmt_gdalread.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_gdalread.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmt_gdalread.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_gdalwrite.c b/src/gmt_gdalwrite.c
index 7d08265..2f86686 100644
--- a/src/gmt_gdalwrite.c
+++ b/src/gmt_gdalwrite.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_gdalwrite.c 18223 2017-05-17 20:44:05Z remko $
+ * $Id: gmt_gdalwrite.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_glib.h b/src/gmt_glib.h
index 4095115..a190981 100644
--- a/src/gmt_glib.h
+++ b/src/gmt_glib.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_glib.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmt_glib.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_grd.h b/src/gmt_grd.h
index ff4340e..83639e9 100644
--- a/src/gmt_grd.h
+++ b/src/gmt_grd.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_grd.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmt_grd.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_grdio.c b/src/gmt_grdio.c
index 95aa4b9..56d6294 100644
--- a/src/gmt_grdio.c
+++ b/src/gmt_grdio.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_grdio.c 18273 2017-05-29 22:35:19Z pwessel $
+ * $Id: gmt_grdio.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -39,6 +39,7 @@
* gmt_update_grd_info : Update header in existing file (must be preceded by gmtlib_read_grd_info)
* gmtlib_write_grd_info : Write header to new file
* gmtlib_write_grd : Write header and data set to new file
+ * gmt_set_R_from_grd
* gmt_grd_coord :
* gmtlib_grd_real_interleave :
* gmt_grd_mux_demux :
@@ -722,6 +723,18 @@ void gmt_grd_dump (struct GMT_GRID_HEADER *header, float *grid, bool is_complex,
#endif
#endif
+void gmt_set_R_from_grd (struct GMT_CTRL *GMT, struct GMT_GRID_HEADER *header) {
+ gmt_M_memcpy (GMT->common.R.wesn, header->wesn, 4, double); /* Set -R from grid */
+ if (header->grdtype != GMT_GRID_GEOGRAPHIC_EXACT360_NOREPEAT) return; /* Nothing to do */
+ if (!gmt_M_360_range (GMT->common.R.wesn[XLO], GMT->common.R.wesn[XHI]) && fabs (header->n_columns * header->inc[GMT_X] - 360.0) < GMT_CONV4_LIMIT) { /* The w/e need to be complete 360 range */
+ GMT->common.R.wesn[XHI] = GMT->common.R.wesn[XLO] + 360.0;
+ }
+ if (!gmt_M_180_range (GMT->common.R.wesn[YLO], GMT->common.R.wesn[YHI]) && fabs (header->n_rows * header->inc[GMT_Y] - 180.0) < GMT_CONV4_LIMIT) { /* The s/n need to be complete 180 range */
+ GMT->common.R.wesn[YLO] = -90.0;
+ GMT->common.R.wesn[YHI] = +90.0;
+ }
+}
+
void gmtlib_grd_get_units (struct GMT_CTRL *GMT, struct GMT_GRID_HEADER *header) {
/* Set input data types for columns 0, 1 and 2 based on unit strings for
grid coordinates x, y and z.
@@ -1325,9 +1338,9 @@ int gmtlib_read_grd (struct GMT_CTRL *GMT, char *file, struct GMT_GRID_HEADER *h
if (expand) /* Must undo the region extension and reset n_columns, n_rows using original pad */
gmt_M_memcpy (header->wesn, wesn, 4, double);
- header->grdtype = gmtlib_get_grdtype (GMT, header); /* Since may change if a subset */
gmt_M_grd_setpad (GMT, header, pad); /* Copy the pad to the header */
gmt_set_grddim (GMT, header); /* Update all dimensions */
+ header->grdtype = gmtlib_get_grdtype (GMT, header); /* Since may change if a subset */
if (expand) gmt_grd_zminmax (GMT, header, grid); /* Reset min/max since current extrema includes the padded region */
grdio_pack_grid (GMT, header, grid, k_grd_unpack); /* revert scale and offset */
gmt_BC_init (GMT, header); /* Initialize grid interpolation and boundary condition parameters */
@@ -1834,47 +1847,51 @@ void gmt_grd_shift (struct GMT_CTRL *GMT, struct GMT_GRID *G, double shift) {
* This function will shift a grid by shift degrees.
* It is only called when we know the grid is geographic. */
- unsigned int col, row, width, n_warn = 0;
- int n_shift, actual_col;
+ unsigned int row, n_warn = 0;
+ int col, n_shift, width, actual_col;
bool gridline;
uint64_t ij;
float *tmp = NULL;
n_shift = irint (shift * G->header->r_inc[GMT_X]);
- width = urint (360.0 * G->header->r_inc[GMT_X]);
- if (width > G->header->n_columns) {
+ width = irint (360.0 * G->header->r_inc[GMT_X]);
+ if (width > (int)G->header->n_columns) {
GMT_Report (GMT->parent, GMT_MSG_NORMAL, "Error: Cannot rotate grid, width is too small\n");
return;
}
- gridline = (width < G->header->n_columns); /* Gridline-registrered grids will have width = n_columns-1, pixel grids have width = n_columns */
+
+ /* Shift boundaries */
+
+ G->header->wesn[XLO] += shift;
+ G->header->wesn[XHI] += shift;
+ if (G->header->wesn[XHI] < 0.0) {
+ G->header->wesn[XLO] += 360.0;
+ G->header->wesn[XHI] += 360.0;
+ }
+ else if (G->header->wesn[XHI] > 360.0) {
+ G->header->wesn[XLO] -= 360.0;
+ G->header->wesn[XHI] -= 360.0;
+ }
+
+ gridline = (width < (int)G->header->n_columns); /* Gridline-registrered grids will have width = n_columns-1, pixel grids have width = n_columns */
+
+ if (gridline) GMT_Report (GMT->parent, GMT_MSG_VERBOSE, "Repeating column now at %g/%g\n", G->header->wesn[XLO], G->header->wesn[XHI]);
tmp = gmt_M_memory (GMT, NULL, G->header->n_columns, float);
for (row = 0; row < G->header->n_rows; row++) {
ij = gmt_M_ijp (G->header, row, 0);
if (gridline && G->data[ij] != G->data[ij+width]) n_warn++;
- for (col = 0; col < G->header->n_columns; col++) {
+ for (col = 0; col < (int)G->header->n_columns; col++) {
actual_col = (col - n_shift) % width;
if (actual_col < 0) actual_col += width;
tmp[actual_col] = G->data[ij+col];
}
+ if (gridline) tmp[width] = tmp[0]; /* Set new repeating column */
gmt_M_memcpy (&G->data[ij], tmp, G->header->n_columns, float);
}
gmt_M_free (GMT, tmp);
- /* Shift boundaries */
-
- G->header->wesn[XLO] += shift;
- G->header->wesn[XHI] += shift;
- if (G->header->wesn[XHI] < 0.0) {
- G->header->wesn[XLO] += 360.0;
- G->header->wesn[XHI] += 360.0;
- }
- else if (G->header->wesn[XHI] > 360.0) {
- G->header->wesn[XLO] -= 360.0;
- G->header->wesn[XHI] -= 360.0;
- }
-
if (n_warn)
GMT_Report (GMT->parent, GMT_MSG_NORMAL, "Inconsistent values at repeated longitude nodes (%g and %g) for %d rows\n",
G->header->wesn[XLO], G->header->wesn[XHI], n_warn);
diff --git a/src/gmt_grdio.h b/src/gmt_grdio.h
index 41017a4..a95f087 100644
--- a/src/gmt_grdio.h
+++ b/src/gmt_grdio.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_grdio.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmt_grdio.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -111,6 +111,9 @@ struct GMT_GRID_ROWBYROW {
int fid; /* NetCDF file number [netcdf files only] */
size_t edge[2]; /* Dimension arrays [netcdf files only] */
size_t start[2]; /* Position arrays [netcdf files only] */
+#ifdef DEBUG
+ off_t pos; /* Current file pos for binary files */
+#endif
FILE *fp; /* File pointer [for native files] */
diff --git a/src/gmt_hash.h b/src/gmt_hash.h
index 3005950..65ed1cb 100644
--- a/src/gmt_hash.h
+++ b/src/gmt_hash.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_hash.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmt_hash.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_init.c b/src/gmt_init.c
index a5a568f..2546a1b 100644
--- a/src/gmt_init.c
+++ b/src/gmt_init.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_init.c 18453 2017-06-24 22:19:55Z pwessel $
+ * $Id: gmt_init.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -108,16 +108,20 @@
#define USER_MEDIA_OFFSET 1000
#define GMT_HISTORY_FILE "gmt.history"
-#define GMT_def(case_val) * GMT->session.u2u[GMT_INCH][gmtlib_unit_lookup(GMT, GMT->current.setting.given_unit[case_val], GMT->current.setting.proj_length_unit)], GMT->current.setting.given_unit[case_val]
+#define GMT_def(case_val) *GMT->session.u2u[GMT_INCH][gmtlib_unit_lookup(GMT, GMT->current.setting.given_unit[case_val], GMT->current.setting.proj_length_unit)], GMT->current.setting.given_unit[case_val]
#define GMT_more_than_once(GMT,active) (gmt_M_check_condition (GMT, active, "Warning: Option -%c given more than once\n", option))
#define GMT_COMPAT_INFO "Please see " GMT_TRAC_WIKI "doc/" GMT_PACKAGE_VERSION "/GMT_Docs.html#new-features-in-gmt-5 for more information.\n"
-
#define GMT_COMPAT_WARN GMT_Report (GMT->parent, GMT_MSG_COMPAT, "Warning: Parameter %s is deprecated.\n" GMT_COMPAT_INFO, GMT_keywords[case_val])
#define GMT_COMPAT_CHANGE(new_P) GMT_Report (GMT->parent, GMT_MSG_COMPAT, "Warning: Parameter %s is deprecated. Use %s instead.\n" GMT_COMPAT_INFO, GMT_keywords[case_val], new_P)
+#define GMT_COMPAT_TRANSLATE(new_P) error = (gmt_M_compat_check (GMT, 4) ? GMT_COMPAT_CHANGE (new_P) + gmtlib_setparameter (GMT, new_P, value, core) : gmtinit_badvalreport (GMT, keyword))
#define GMT_COMPAT_OPT(new_P) if (strchr (list, option)) { GMT_Report (GMT->parent, GMT_MSG_COMPAT, "Warning: Option -%c is deprecated. Use -%c instead.\n" GMT_COMPAT_INFO, option, new_P); option = new_P; }
+/* Leave a record that this keyword is no longer a default one
+ So far, only gmtset calls this function with core = true, but this is a too fragile solution */
+#define GMT_KEYWORD_UPDATE(val) if (core) GMT_keywords_updated[val] = true
+
EXTERN_MSC int gmtlib_geo_C_format (struct GMT_CTRL *GMT);
EXTERN_MSC void gmt_grdio_init (struct GMT_CTRL *GMT); /* Defined in gmt_customio.c and only used here */
EXTERN_MSC void gmt_fft_initialization (struct GMT_CTRL *GMT);
@@ -137,6 +141,7 @@ struct GMT5_params {
const char *name;
};
/* These are the active GMT5 keywords, containing no backwards-compatible variants.
+ * Also, some grouped keywords such as FONT and FONT_ANNOT are also not listed since they are not in gmt.conf.
* If new keywords are added they need to be added here as well as to gmt_keywords.txt. */
static struct GMT5_params GMT5_keywords[]= {
@@ -1772,7 +1777,7 @@ GMT_LOCAL double gmtinit_xy_cart_dist (struct GMT_CTRL *GMT, uint64_t col) {
}
/*! Parse the -n option for 2-D grid resampling parameters -n[b|c|l|n][+a][+t<BC>][+<threshold>] */
-GMT_LOCAL int gmtinit_parse_n_option (struct GMT_CTRL *GMT, char *item) {
+int gmtinit_parse_n_option (struct GMT_CTRL *GMT, char *item) {
unsigned int pos = 0, j, k = 1;
char p[GMT_LEN256] = {""};
@@ -3669,7 +3674,8 @@ GMT_LOCAL bool gmtinit_parse_J_option (struct GMT_CTRL *GMT, char *args) {
}
gmt_M_memset (l_pos, 3, int); gmt_M_memset (p_pos, 3, int);
gmt_M_memset (t_pos, 3, int); gmt_M_memset (d_pos, 3, int);
- GMT->current.proj.lon0 = GMT->current.proj.lat0 = GMT->session.d_NaN; /* Projection center, to be set via -J */
+ if (!GMT->common.J.active) /* Down want to clobber this during -Jz/Z after the horizontal part has been set */
+ GMT->current.proj.lon0 = GMT->current.proj.lat0 = GMT->session.d_NaN; /* Projection center, to be set via -J */
project = gmtinit_project_type (args, &i, &width_given);
if (project == GMT_NO_PROJ) return (true); /* No valid projection specified */
@@ -5012,8 +5018,14 @@ void gmtinit_conf (struct GMT_CTRL *GMT) {
GMT->current.setting.history = (k_history_read | k_history_write);
/* GMT_INTERPOLANT */
GMT->current.setting.interpolant = GMT_SPLINE_AKIMA;
+ /* GMT_LANGUAGE */
+ strcpy (GMT->current.setting.language, "us");
/* GMT_TRIANGULATE */
+#ifdef TRIANGLE_D
GMT->current.setting.triangulate = GMT_TRIANGLE_SHEWCHUK;
+#else
+ GMT->current.setting.triangulate = GMT_TRIANGLE_WATSON;
+#endif
/* GMT_VERBOSE (compat) */
error += gmtinit_parse_V_option (GMT, 'c');
@@ -5040,9 +5052,6 @@ void gmtinit_conf (struct GMT_CTRL *GMT) {
GMT->current.setting.time_is_interval = false;
/* TIME_INTERVAL_FRACTION */
GMT->current.setting.time_interval_fraction = 0.5;
- /* GMT_LANGUAGE */
- /* TIME_LANGUAGE --- SOME CONFUSION HERE. NO TIME_LANGUAGE IN gmt.conf */
- strcpy (GMT->current.setting.language, "us");
gmtinit_get_language (GMT); /* Load in names and abbreviations in chosen language */
/* TIME_REPORT */
GMT->current.setting.timer_mode = GMT_NO_TIMER;
@@ -7739,101 +7748,80 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
switch (case_val) {
/* FORMAT GROUP */
case GMTCASE_INPUT_CLOCK_FORMAT:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("FORMAT_CLOCK_IN");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("FORMAT_CLOCK_IN");
+ break;
case GMTCASE_FORMAT_CLOCK_IN:
strncpy (GMT->current.setting.format_clock_in, value, GMT_LEN64-1);
gmtlib_clock_C_format (GMT, GMT->current.setting.format_clock_in, &GMT->current.io.clock_input, 0);
break;
case GMTCASE_INPUT_DATE_FORMAT:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("FORMAT_DATE_IN");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("FORMAT_DATE_IN");
+ break;
case GMTCASE_FORMAT_DATE_IN:
strncpy (GMT->current.setting.format_date_in, value, GMT_LEN64-1);
gmtlib_date_C_format (GMT, GMT->current.setting.format_date_in, &GMT->current.io.date_input, 0);
break;
case GMTCASE_OUTPUT_CLOCK_FORMAT:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("FORMAT_CLOCK_OUT");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("FORMAT_CLOCK_OUT");
+ break;
case GMTCASE_FORMAT_CLOCK_OUT:
strncpy (GMT->current.setting.format_clock_out, value, GMT_LEN64-1);
gmtlib_clock_C_format (GMT, GMT->current.setting.format_clock_out, &GMT->current.io.clock_output, 1);
break;
case GMTCASE_OUTPUT_DATE_FORMAT:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("FORMAT_DATE_OUT");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("FORMAT_DATE_OUT");
+ break;
case GMTCASE_FORMAT_DATE_OUT:
strncpy (GMT->current.setting.format_date_out, value, GMT_LEN64-1);
gmtlib_date_C_format (GMT, GMT->current.setting.format_date_out, &GMT->current.io.date_output, 1);
break;
case GMTCASE_OUTPUT_DEGREE_FORMAT:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("FORMAT_GEO_OUT");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("FORMAT_GEO_OUT");
+ break;
case GMTCASE_FORMAT_GEO_OUT:
strncpy (GMT->current.setting.format_geo_out, value, GMT_LEN64-1);
gmtlib_geo_C_format (GMT); /* Can fail if FORMAT_FLOAT_OUT not yet set, but is repeated at the end of gmt_begin */
break;
case GMTCASE_PLOT_CLOCK_FORMAT:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("FORMAT_CLOCK_MAP");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("FORMAT_CLOCK_MAP");
+ break;
case GMTCASE_FORMAT_CLOCK_MAP:
strncpy (GMT->current.setting.format_clock_map, value, GMT_LEN64-1);
gmtlib_clock_C_format (GMT, GMT->current.setting.format_clock_map, &GMT->current.plot.calclock.clock, 2);
break;
case GMTCASE_PLOT_DATE_FORMAT:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("FORMAT_DATE_MAP");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("FORMAT_DATE_MAP");
+ break;
case GMTCASE_FORMAT_DATE_MAP:
strncpy (GMT->current.setting.format_date_map, value, GMT_LEN64-1);
gmtlib_date_C_format (GMT, GMT->current.setting.format_date_map, &GMT->current.plot.calclock.date, 2);
break;
case GMTCASE_PLOT_DEGREE_FORMAT:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("FORMAT_GEO_MAP");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("FORMAT_GEO_MAP");
+ break;
case GMTCASE_FORMAT_GEO_MAP:
strncpy (GMT->current.setting.format_geo_map, value, GMT_LEN64-1);
gmtlib_plot_C_format (GMT); /* Can fail if FORMAT_FLOAT_OUT not yet set, but is repeated at the end of gmt_begin */
break;
- case GMTCASE_TIME_FORMAT_PRIMARY:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("FORMAT_TIME_PRIMARY_MAP");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
case GMTCASE_FORMAT_TIME_MAP:
- /* With PRIMARY|SECONDARY not specified we will fall through (no break) to catch both cases: */
- strncpy (GMT->current.setting.format_time[GMT_SECONDARY], value, GMT_LEN64-1); /* Sets secondary */
+ error = gmtlib_setparameter (GMT, "FORMAT_TIME_PRIMARY_MAP", value, core) +
+ gmtlib_setparameter (GMT, "FORMAT_TIME_SECONDARY_MAP", value, core);
+ break;
+ case GMTCASE_TIME_FORMAT_PRIMARY:
+ GMT_COMPAT_TRANSLATE ("FORMAT_TIME_PRIMARY_MAP");
+ break;
case GMTCASE_FORMAT_TIME_PRIMARY_MAP:
strncpy (GMT->current.setting.format_time[GMT_PRIMARY], value, GMT_LEN64-1);
break;
case GMTCASE_TIME_FORMAT_SECONDARY:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("FORMAT_TIME_SECONDARY_MAP");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("FORMAT_TIME_SECONDARY_MAP");
+ break;
case GMTCASE_FORMAT_TIME_SECONDARY_MAP:
strncpy (GMT->current.setting.format_time[GMT_SECONDARY], value, GMT_LEN64-1);
break;
case GMTCASE_D_FORMAT:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("FORMAT_FLOAT_OUT");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("FORMAT_FLOAT_OUT");
+ break;
case GMTCASE_FORMAT_FLOAT_OUT:
gmtinit_parse_format_float_out (GMT, value);
break;
@@ -7841,10 +7829,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
strncpy (GMT->current.setting.format_float_map, value, GMT_LEN64-1);
break;
case GMTCASE_UNIX_TIME_FORMAT:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("FORMAT_TIME_STAMP");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("FORMAT_TIME_STAMP");
+ break;
case GMTCASE_FORMAT_TIME_STAMP:
strncpy (GMT->current.setting.format_time_stamp, value, GMT_LEN256-1);
break;
@@ -7852,20 +7838,19 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
/* FONT GROUP */
case GMTCASE_FONT: /* Special to set all fonts */
- if (gmt_getfont (GMT, value, &GMT->current.setting.font_annot[GMT_PRIMARY])) error = true;
- if (gmt_getfont (GMT, value, &GMT->current.setting.font_annot[GMT_SECONDARY])) error = true;
- if (gmt_getfont (GMT, value, &GMT->current.setting.font_title)) error = true;
- if (gmt_getfont (GMT, value, &GMT->current.setting.font_label)) error = true;
- /* if (gmt_getfont (GMT, value, &GMT->current.setting.font_logo)) error = true; */
+ error = gmtlib_setparameter (GMT, "FONT_ANNOT_PRIMARY", value, core) +
+ gmtlib_setparameter (GMT, "FONT_ANNOT_SECONDARY", value, core) +
+ gmtlib_setparameter (GMT, "FONT_TITLE", value, core) +
+ gmtlib_setparameter (GMT, "FONT_LABEL", value, core);
+ /* gmtlib_setparameter (GMT, "FONT_LOGO", value, core) (purposely skipped) */
break;
- case GMTCASE_ANNOT_FONT_PRIMARY:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("FONT_ANNOT_PRIMARY");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
case GMTCASE_FONT_ANNOT:
- /* With PRIMARY|SECONDARY not specified we will fall through (no break) to catch both cases: */
- if (gmt_getfont (GMT, value, &GMT->current.setting.font_annot[GMT_SECONDARY])) error = true;
+ error = gmtlib_setparameter (GMT, "FONT_ANNOT_PRIMARY", value, core) +
+ gmtlib_setparameter (GMT, "FONT_ANNOT_SECONDARY", value, core);
+ break;
+ case GMTCASE_ANNOT_FONT_PRIMARY:
+ GMT_COMPAT_TRANSLATE ("FONT_ANNOT_PRIMARY");
+ break;
case GMTCASE_FONT_ANNOT_PRIMARY:
if (value[0] == '+') {
/* When + is prepended, scale fonts, offsets and ticklengths relative to FONT_ANNOT_PRIMARY (except LOGO font) */
@@ -7912,26 +7897,19 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
if (gmt_getfont (GMT, value, &GMT->current.setting.font_annot[GMT_PRIMARY])) error = true;
break;
case GMTCASE_ANNOT_FONT_SECONDARY:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("FONT_ANNOT_SECONDARY");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("FONT_ANNOT_SECONDARY");
+ break;
case GMTCASE_FONT_ANNOT_SECONDARY:
if (gmt_getfont (GMT, value, &GMT->current.setting.font_annot[GMT_SECONDARY])) error = true;
break;
- case GMTCASE_HEADER_FONT:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("FONT_TITLE");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("FONT_TITLE");
+ break;
case GMTCASE_FONT_TITLE:
if (gmt_getfont (GMT, value, &GMT->current.setting.font_title)) error = true;
break;
case GMTCASE_LABEL_FONT:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("FONT_LABEL");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("FONT_LABEL");
+ break;
case GMTCASE_FONT_LABEL:
if (gmt_getfont (GMT, value, &GMT->current.setting.font_label)) error = true;
break;
@@ -7942,11 +7920,12 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
/* FONT GROUP ... obsolete options */
case GMTCASE_ANNOT_FONT_SIZE_PRIMARY:
- if (gmt_M_compat_check (GMT, 4)) { /* GMT4: Warn then fall through to other case */
+ if (gmt_M_compat_check (GMT, 4)) {
GMT_COMPAT_CHANGE ("FONT_ANNOT_PRIMARY");
dval = gmt_convert_units (GMT, value, GMT_PT, GMT_PT);
if (dval > 0.0)
GMT->current.setting.font_annot[GMT_PRIMARY].size = dval;
+ GMT_KEYWORD_UPDATE (GMTCASE_FONT_ANNOT_PRIMARY);
else
error = true;
}
@@ -7954,11 +7933,12 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
error = gmtinit_badvalreport (GMT, keyword);
break;
case GMTCASE_ANNOT_FONT_SIZE_SECONDARY:
- if (gmt_M_compat_check (GMT, 4)) { /* GMT4: Warn then fall through to other case */
+ if (gmt_M_compat_check (GMT, 4)) {
GMT_COMPAT_CHANGE ("FONT_ANNOT_SECONDARY");
dval = gmt_convert_units (GMT, value, GMT_PT, GMT_PT);
if (dval > 0.0)
GMT->current.setting.font_annot[GMT_SECONDARY].size = dval;
+ GMT_KEYWORD_UPDATE (GMTCASE_FONT_ANNOT_SECONDARY);
else
error = true;
}
@@ -7966,11 +7946,12 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
error = gmtinit_badvalreport (GMT, keyword);
break;
case GMTCASE_HEADER_FONT_SIZE:
- if (gmt_M_compat_check (GMT, 4)) { /* GMT4: Warn then fall through to other case */
+ if (gmt_M_compat_check (GMT, 4)) {
GMT_COMPAT_CHANGE ("FONT_TITLE");
dval = gmt_convert_units (GMT, value, GMT_PT, GMT_PT);
if (dval > 0.0)
GMT->current.setting.font_title.size = dval;
+ GMT_KEYWORD_UPDATE (GMTCASE_FONT_TITLE);
else
error = true;
}
@@ -7978,11 +7959,12 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
error = gmtinit_badvalreport (GMT, keyword);
break;
case GMTCASE_LABEL_FONT_SIZE:
- if (gmt_M_compat_check (GMT, 4)) { /* GMT4: Warn then fall through to other case */
+ if (gmt_M_compat_check (GMT, 4)) {
GMT_COMPAT_CHANGE ("FONT_LABEL");
dval = gmt_convert_units (GMT, value, GMT_PT, GMT_PT);
if (dval > 0.0)
GMT->current.setting.font_label.size = dval;
+ GMT_KEYWORD_UPDATE (GMTCASE_FONT_LABEL);
else
error = true;
}
@@ -7993,29 +7975,24 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
/* MAP GROUP */
case GMTCASE_ANNOT_OFFSET_PRIMARY:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_ANNOT_OFFSET_PRIMARY");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_ANNOT_OFFSET_PRIMARY");
+ break;
case GMTCASE_MAP_ANNOT_OFFSET:
- /* With PRIMARY|SECONDARY not specified we will fall through (no break) to catch both cases: */
- GMT->current.setting.map_annot_offset[GMT_SECONDARY] = gmt_M_to_inch (GMT, value);
+ error = gmtlib_setparameter (GMT, "MAP_ANNOT_OFFSET_PRIMARY", value, core) +
+ gmtlib_setparameter (GMT, "MAP_ANNOT_OFFSET_SECONDARY", value, core);
+ break;
case GMTCASE_MAP_ANNOT_OFFSET_PRIMARY:
GMT->current.setting.map_annot_offset[GMT_PRIMARY] = gmt_M_to_inch (GMT, value);
break;
case GMTCASE_ANNOT_OFFSET_SECONDARY:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_ANNOT_OFFSET_SECONDARY");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_ANNOT_OFFSET_SECONDARY");
+ break;
case GMTCASE_MAP_ANNOT_OFFSET_SECONDARY:
GMT->current.setting.map_annot_offset[GMT_SECONDARY] = gmt_M_to_inch (GMT, value);
break;
case GMTCASE_OBLIQUE_ANNOTATION:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_ANNOT_OBLIQUE");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_ANNOT_OBLIQUE");
+ break;
case GMTCASE_MAP_ANNOT_OBLIQUE:
ival = atoi (value);
if (ival >= 0 && ival < 64)
@@ -8024,10 +8001,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
error = true;
break;
case GMTCASE_ANNOT_MIN_ANGLE:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_ANNOT_MIN_ANGLE");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_ANNOT_MIN_ANGLE");
+ break;
case GMTCASE_MAP_ANNOT_MIN_ANGLE:
dval = atof (value);
if (dval < 0.0)
@@ -8036,10 +8011,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
GMT->current.setting.map_annot_min_angle = dval;
break;
case GMTCASE_ANNOT_MIN_SPACING:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_ANNOT_MIN_SPACING");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_ANNOT_MIN_SPACING");
+ break;
case GMTCASE_MAP_ANNOT_MIN_SPACING:
if (value[0] == '-') /* Negative */
error = true;
@@ -8047,12 +8020,14 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
GMT->current.setting.map_annot_min_spacing = gmt_M_to_inch (GMT, value);
break;
case GMTCASE_Y_AXIS_TYPE:
- if (gmt_M_compat_check (GMT, 4)) { /* GMT4: Warn then fall through to other case */
+ if (gmt_M_compat_check (GMT, 4)) {
GMT_COMPAT_CHANGE ("MAP_ANNOT_ORTHO");
if (!strcmp (lower_value, "ver_text"))
strncpy (GMT->current.setting.map_annot_ortho, "", 5U);
+ GMT_KEYWORD_UPDATE (GMTCASE_MAP_ANNOT_ORTHO);
else if (!strcmp (lower_value, "hor_text"))
strncpy (GMT->current.setting.map_annot_ortho, "we", 5U);
+ GMT_KEYWORD_UPDATE (GMTCASE_MAP_ANNOT_ORTHO);
else
error = true;
}
@@ -8063,10 +8038,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
strncpy (GMT->current.setting.map_annot_ortho, lower_value, 5U);
break;
case GMTCASE_DEGREE_SYMBOL:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_DEGREE_SYMBOL");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_DEGREE_SYMBOL");
+ break;
case GMTCASE_MAP_DEGREE_SYMBOL:
if (value[0] == '\0' || !strcmp (lower_value, "ring")) /* Default */
GMT->current.setting.map_degree_symbol = gmt_ring;
@@ -8080,10 +8053,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
error = true;
break;
case GMTCASE_BASEMAP_AXES:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_FRAME_AXES");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_FRAME_AXES");
+ break;
case GMTCASE_MAP_FRAME_AXES:
strncpy (GMT->current.setting.map_frame_axes, value, 5U);
for (i = 0; i < 5; i++) GMT->current.map.frame.side[i] = 0; /* Unset default settings */
@@ -8092,10 +8063,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
break;
case GMTCASE_BASEMAP_FRAME_RGB:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_DEFAULT_PEN");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_DEFAULT_PEN");
+ break;
case GMTCASE_MAP_DEFAULT_PEN:
i = (value[0] == '+') ? 1 : 0; /* If plus is added, copy color to MAP_*_PEN settings */
error = gmt_getpen (GMT, &value[i], &GMT->current.setting.map_default_pen);
@@ -8108,18 +8077,14 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
}
break;
case GMTCASE_FRAME_PEN:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_FRAME_PEN");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_FRAME_PEN");
+ break;
case GMTCASE_MAP_FRAME_PEN:
error = gmt_getpen (GMT, value, &GMT->current.setting.map_frame_pen);
break;
case GMTCASE_BASEMAP_TYPE:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_FRAME_TYPE");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_FRAME_TYPE");
+ break;
case GMTCASE_MAP_FRAME_TYPE:
if (!strcmp (lower_value, "plain"))
GMT->current.setting.map_frame_type = GMT_IS_PLAIN;
@@ -8135,10 +8100,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
error = true;
break;
case GMTCASE_FRAME_WIDTH:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_FRAME_WIDTH");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_FRAME_WIDTH");
+ break;
case GMTCASE_MAP_FRAME_WIDTH:
dval = gmt_M_to_inch (GMT, value);
if (dval > 0.0)
@@ -8147,10 +8110,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
error = true;
break;
case GMTCASE_GRID_CROSS_SIZE_PRIMARY:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_GRID_CROSS_SIZE_PRIMARY");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_GRID_CROSS_SIZE_PRIMARY");
+ break;
case GMTCASE_MAP_GRID_CROSS_SIZE:
dval = gmt_M_to_inch (GMT, value);
if (dval >= 0.0)
@@ -8166,10 +8127,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
error = true;
break;
case GMTCASE_GRID_CROSS_SIZE_SECONDARY:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_GRID_CROSS_SIZE_SECONDARY");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_GRID_CROSS_SIZE_SECONDARY");
+ break;
case GMTCASE_MAP_GRID_CROSS_SIZE_SECONDARY:
dval = gmt_M_to_inch (GMT, value);
if (dval >= 0.0)
@@ -8177,38 +8136,31 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
else
error = true;
break;
- case GMTCASE_GRID_PEN_PRIMARY:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_GRID_PEN_PRIMARY");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
case GMTCASE_MAP_GRID_PEN:
- /* With PRIMARY|SECONDARY not specified we will fall through (no break) to catch both cases: */
- error = gmt_getpen (GMT, value, &GMT->current.setting.map_grid_pen[GMT_SECONDARY]);
+ error = gmtlib_setparameter (GMT, "MAP_GRID_PEN_PRIMARY", value, core) +
+ gmtlib_setparameter (GMT, "MAP_GRID_PEN_SECONDARY", value, core);
+ break;
+ case GMTCASE_GRID_PEN_PRIMARY:
+ GMT_COMPAT_TRANSLATE ("MAP_GRID_PEN_PRIMARY");
+ break;
case GMTCASE_MAP_GRID_PEN_PRIMARY:
- error += gmt_getpen (GMT, value, &GMT->current.setting.map_grid_pen[GMT_PRIMARY]);
+ error = gmt_getpen (GMT, value, &GMT->current.setting.map_grid_pen[GMT_PRIMARY]);
break;
case GMTCASE_GRID_PEN_SECONDARY:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_GRID_PEN_SECONDARY");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_GRID_PEN_SECONDARY");
+ break;
case GMTCASE_MAP_GRID_PEN_SECONDARY:
error = gmt_getpen (GMT, value, &GMT->current.setting.map_grid_pen[GMT_SECONDARY]);
break;
case GMTCASE_LABEL_OFFSET:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_LABEL_OFFSET");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_LABEL_OFFSET");
+ break;
case GMTCASE_MAP_LABEL_OFFSET:
GMT->current.setting.map_label_offset = gmt_M_to_inch (GMT, value);
break;
case GMTCASE_LINE_STEP:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_LINE_STEP");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_LINE_STEP");
+ break;
case GMTCASE_MAP_LINE_STEP:
if ((GMT->current.setting.map_line_step = gmt_M_to_inch (GMT, value)) <= 0.0) {
GMT->current.setting.map_line_step = 0.01;
@@ -8216,18 +8168,14 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
}
break;
case GMTCASE_UNIX_TIME:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_LOGO");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_LOGO");
+ break;
case GMTCASE_MAP_LOGO:
error = gmtinit_true_false_or_error (lower_value, &GMT->current.setting.map_logo);
break;
case GMTCASE_UNIX_TIME_POS:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_LOGO_POS");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_LOGO_POS");
+ break;
case GMTCASE_MAP_LOGO_POS:
i = sscanf (value, "%[^/]/%[^/]/%s", txt_a, txt_b, txt_c);
if (i == 2) {
@@ -8243,26 +8191,20 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
error = true;
break;
case GMTCASE_X_ORIGIN:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_ORIGIN_X");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_ORIGIN_X");
+ break;
case GMTCASE_MAP_ORIGIN_X:
GMT->current.setting.map_origin[GMT_X] = gmt_M_to_inch (GMT, value);
break;
case GMTCASE_Y_ORIGIN:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_ORIGIN_Y");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_ORIGIN_Y");
+ break;
case GMTCASE_MAP_ORIGIN_Y:
GMT->current.setting.map_origin[GMT_Y] = gmt_M_to_inch (GMT, value);
break;
case GMTCASE_POLAR_CAP:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_POLAR_CAP");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_POLAR_CAP");
+ break;
case GMTCASE_MAP_POLAR_CAP:
if (!strcmp (lower_value, "none")) { /* Means reset to no cap -> lat = 90, dlon = 0 */
GMT->current.setting.map_polar_cap[0] = 90.0;
@@ -8293,15 +8235,16 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
GMT->current.setting.map_tick_length[GMT_TICK_UPPER] = 0.50 * GMT->current.setting.map_tick_length[GMT_ANNOT_UPPER];
GMT->current.setting.map_tick_length[GMT_ANNOT_LOWER] = 3.00 * GMT->current.setting.map_tick_length[GMT_ANNOT_UPPER];
GMT->current.setting.map_tick_length[GMT_TICK_LOWER] = 0.75 * GMT->current.setting.map_tick_length[GMT_ANNOT_UPPER];
+ GMT_KEYWORD_UPDATE (GMTCASE_MAP_TICK_LENGTH_PRIMARY);
+ GMT_KEYWORD_UPDATE (GMTCASE_MAP_TICK_LENGTH_SECONDARY);
}
else /* Not recognized so give error message */
error = gmtinit_badvalreport (GMT, keyword);
break;
case GMTCASE_MAP_TICK_LENGTH:
- /* With PRIMARY|SECONDARY not specified we will fall through (no break) to catch both cases: */
- i = sscanf (value, "%[^/]/%s", txt_a, txt_b);
- GMT->current.setting.map_tick_length[GMT_ANNOT_LOWER] = gmt_M_to_inch (GMT, txt_a);
- GMT->current.setting.map_tick_length[GMT_TICK_LOWER] = (i > 1) ? gmt_M_to_inch (GMT, txt_b) : 0.25 * GMT->current.setting.map_tick_length[GMT_ANNOT_LOWER];
+ error = gmtlib_setparameter (GMT, "MAP_TICK_LENGTH_PRIMARY", value, core) +
+ gmtlib_setparameter (GMT, "MAP_TICK_LENGTH_SECONDARY", value, core);
+ break;
case GMTCASE_MAP_TICK_LENGTH_PRIMARY:
i = sscanf (value, "%[^/]/%s", txt_a, txt_b);
GMT->current.setting.map_tick_length[GMT_ANNOT_UPPER] = gmt_M_to_inch (GMT, txt_a);
@@ -8313,36 +8256,27 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
GMT->current.setting.map_tick_length[GMT_TICK_LOWER] = (i > 1) ? gmt_M_to_inch (GMT, txt_b) : 0.25 * GMT->current.setting.map_tick_length[GMT_ANNOT_LOWER];
break;
case GMTCASE_TICK_PEN:
- if (gmt_M_compat_check (GMT, 4)) { /* GMT4: */
- GMT_COMPAT_CHANGE ("MAP_TICK_PEN");
- error = gmt_getpen (GMT, value, &GMT->current.setting.map_tick_pen[GMT_PRIMARY]);
- error += gmt_getpen (GMT, value, &GMT->current.setting.map_tick_pen[GMT_SECONDARY]);
- }
- else /* Not recognized so give error message */
- error = gmtinit_badvalreport (GMT, keyword);
+ GMT_COMPAT_TRANSLATE ("MAP_TICK_PEN");
break;
case GMTCASE_MAP_TICK_PEN:
- /* With PRIMARY|SECONDARY not specified we will fall through (no break) to catch both cases: */
- error = gmt_getpen (GMT, value, &GMT->current.setting.map_tick_pen[GMT_SECONDARY]);
+ error = gmtlib_setparameter (GMT, "MAP_TICK_PEN_PRIMARY", value, core) +
+ gmtlib_setparameter (GMT, "MAP_TICK_PEN_SECONDARY", value, core);
+ break;
case GMTCASE_MAP_TICK_PEN_PRIMARY:
- error += gmt_getpen (GMT, value, &GMT->current.setting.map_tick_pen[GMT_PRIMARY]);
+ error = gmt_getpen (GMT, value, &GMT->current.setting.map_tick_pen[GMT_PRIMARY]);
break;
case GMTCASE_MAP_TICK_PEN_SECONDARY:
error = gmt_getpen (GMT, value, &GMT->current.setting.map_tick_pen[GMT_SECONDARY]);
break;
case GMTCASE_HEADER_OFFSET:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_TITLE_OFFSET");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_TITLE_OFFSET");
+ break;
case GMTCASE_MAP_TITLE_OFFSET:
GMT->current.setting.map_title_offset = gmt_M_to_inch (GMT, value);
break;
case GMTCASE_VECTOR_SHAPE:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("MAP_VECTOR_SHAPE");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("MAP_VECTOR_SHAPE");
+ break;
case GMTCASE_MAP_VECTOR_SHAPE:
dval = atof (value);
if (dval < -2.0 || dval > 2.0)
@@ -8391,10 +8325,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
error = gmt_getrgb (GMT, value, GMT->current.setting.color_patch[GMT_NAN]);
break;
case GMTCASE_HSV_MIN_SATURATION:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("COLOR_HSV_MIN_S");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("COLOR_HSV_MIN_S");
+ break;
case GMTCASE_COLOR_HSV_MIN_S:
dval = atof (value);
if (dval < 0.0 || dval > 1.0)
@@ -8403,10 +8335,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
GMT->current.setting.color_hsv_min_s = dval;
break;
case GMTCASE_HSV_MAX_SATURATION:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("COLOR_HSV_MAX_S");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("COLOR_HSV_MAX_S");
+ break;
case GMTCASE_COLOR_HSV_MAX_S:
dval = atof (value);
if (dval < 0.0 || dval > 1.0)
@@ -8415,10 +8345,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
GMT->current.setting.color_hsv_max_s = dval;
break;
case GMTCASE_HSV_MIN_VALUE:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("COLOR_HSV_MIN_V");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("COLOR_HSV_MIN_V");
+ break;
case GMTCASE_COLOR_HSV_MIN_V:
dval = atof (value);
if (dval < 0.0 || dval > 1.0)
@@ -8427,10 +8355,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
GMT->current.setting.color_hsv_min_v = dval;
break;
case GMTCASE_HSV_MAX_VALUE:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("COLOR_HSV_MAX_V");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("COLOR_HSV_MAX_V");
+ break;
case GMTCASE_COLOR_HSV_MAX_V:
dval = atof (value);
if (dval < 0.0 || dval > 1.0)
@@ -8442,19 +8368,15 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
/* PS GROUP */
case GMTCASE_CHAR_ENCODING:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("PS_CHAR_ENCODING");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("PS_CHAR_ENCODING");
+ break;
case GMTCASE_PS_CHAR_ENCODING:
strncpy (GMT->current.setting.ps_encoding.name, value, GMT_LEN64-1);
gmtinit_load_encoding (GMT);
break;
case GMTCASE_PS_COLOR:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: Warn then fall through to other case */
- GMT_COMPAT_CHANGE ("PS_COLOR");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("PS_COLOR_MODEL");
+ break;
case GMTCASE_PS_COLOR_MODEL:
if (!strcmp (lower_value, "rgb"))
GMT->current.setting.ps_color_mode = PSL_RGB;
@@ -8548,20 +8470,14 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
error = true;
break;
case GMTCASE_PAGE_COLOR:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: */
- GMT_COMPAT_CHANGE ("PS_PAGE_COLOR");
- else { /* Not recognized so give error message */
- error = gmtinit_badvalreport (GMT, keyword);
- break;
- }
+ GMT_COMPAT_TRANSLATE ("PS_PAGE_COLOR");
+ break;
case GMTCASE_PS_PAGE_COLOR:
error = gmt_getrgb (GMT, value, GMT->current.setting.ps_page_rgb);
break;
case GMTCASE_PAGE_ORIENTATION:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: */
- GMT_COMPAT_CHANGE ("PS_PAGE_ORIENTATION");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("PS_PAGE_ORIENTATION");
+ break;
case GMTCASE_PS_PAGE_ORIENTATION:
if (!strcmp (lower_value, "landscape"))
GMT->current.setting.ps_orientation = PSL_LANDSCAPE;
@@ -8571,10 +8487,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
error = true;
break;
case GMTCASE_PAPER_MEDIA:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: */
- GMT_COMPAT_CHANGE ("PS_MEDIA");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("PS_MEDIA");
+ break;
case GMTCASE_PS_MEDIA:
manual = false;
len--;
@@ -8619,10 +8533,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
if (!error && manual) GMT->current.setting.ps_page_size[0] = -GMT->current.setting.ps_page_size[0];
break;
case GMTCASE_GLOBAL_X_SCALE:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: */
- GMT_COMPAT_CHANGE ("PS_SCALE_X");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("PS_SCALE_X");
+ break;
case GMTCASE_PS_SCALE_X:
dval = atof (value);
if (dval > 0.0)
@@ -8631,10 +8543,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
error = true;
break;
case GMTCASE_GLOBAL_Y_SCALE:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: */
- GMT_COMPAT_CHANGE ("PS_SCALE_Y");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("PS_SCALE_Y");
+ break;
case GMTCASE_PS_SCALE_Y:
dval = atof (value);
if (dval > 0.0)
@@ -8652,10 +8562,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
strncpy (GMT->current.setting.ps_transpmode, value, 15U);
break;
case GMTCASE_PS_VERBOSE:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: */
- GMT_COMPAT_CHANGE ("PS_COMMENTS");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
-
+ GMT_COMPAT_TRANSLATE ("PS_COMMENTS");
+ break;
case GMTCASE_PS_COMMENTS:
if (!GMT->PSL) return (0); /* Not using PSL in this session */
error = gmtinit_true_false_or_error (lower_value, &tf_answer);
@@ -8665,10 +8573,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
/* IO GROUP */
case GMTCASE_FIELD_DELIMITER:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: */
- GMT_COMPAT_CHANGE ("IO_COL_SEPARATOR");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("IO_COL_SEPARATOR");
+ break;
case GMTCASE_IO_COL_SEPARATOR:
if (value[0] == '\0' || !strcmp (lower_value, "tab")) /* DEFAULT */
strncpy (GMT->current.setting.io_col_separator, "\t", 8U);
@@ -8683,18 +8589,14 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
GMT->current.setting.io_col_separator[7] = 0; /* Just a precaution */
break;
case GMTCASE_GRIDFILE_FORMAT:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: */
- GMT_COMPAT_CHANGE ("IO_GRIDFILE_FORMAT");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("IO_GRIDFILE_FORMAT");
+ break;
case GMTCASE_IO_GRIDFILE_FORMAT:
strncpy (GMT->current.setting.io_gridfile_format, value, GMT_LEN64-1);
break;
case GMTCASE_GRIDFILE_SHORTHAND:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: */
- GMT_COMPAT_CHANGE ("IO_GRIDFILE_SHORTHAND");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("IO_GRIDFILE_SHORTHAND");
+ break;
case GMTCASE_IO_GRIDFILE_SHORTHAND:
error = gmtinit_true_false_or_error (lower_value, &GMT->current.setting.io_gridfile_shorthand);
break;
@@ -8703,10 +8605,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
GMT->current.setting.io_header[GMT_OUT] = GMT->current.setting.io_header[GMT_IN];
break;
case GMTCASE_N_HEADER_RECS:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: */
- GMT_COMPAT_CHANGE ("IO_N_HEADER_ITEMS");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("IO_N_HEADER_RECS");
+ break;
case GMTCASE_IO_N_HEADER_RECS:
ival = atoi (value);
if (ival < 0)
@@ -8715,10 +8615,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
GMT->current.setting.io_n_header_items = ival;
break;
case GMTCASE_NAN_RECORDS:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: */
- GMT_COMPAT_CHANGE ("IO_NAN_RECORDS");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("IO_NAN_RECORDS");
+ break;
case GMTCASE_IO_NAN_RECORDS:
if (!strcmp (lower_value, "pass"))
GMT->current.setting.io_nan_records = true;
@@ -8755,10 +8653,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
error = true;
break;
case GMTCASE_XY_TOGGLE:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: */
- GMT_COMPAT_CHANGE ("IO_LONLAT_TOGGLE");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("IO_LONLAT_TOGGLE");
+ break;
case GMTCASE_IO_LONLAT_TOGGLE:
if (!gmtinit_true_false_or_error (lower_value, &GMT->current.setting.io_lonlat_toggle[GMT_IN]))
/* We got false/f/0 or true/t/1. Set outgoing setting to the same as the ingoing. */
@@ -8843,10 +8739,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
break;
case GMTCASE_ELLIPSOID:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: */
- GMT_COMPAT_CHANGE ("PROJ_ELLIPSOID");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("PROJ_ELLIPSOID");
+ break;
case GMTCASE_PROJ_ELLIPSOID:
ival = gmt_get_ellipsoid (GMT, value);
if (ival < 0)
@@ -8870,10 +8764,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
break;
case GMTCASE_MEASURE_UNIT:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: */
- GMT_COMPAT_CHANGE ("PROJ_LENGTH_UNIT");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("PROJ_LENGTH_UNIT");
+ break;
case GMTCASE_PROJ_LENGTH_UNIT:
switch (lower_value[0]) {
case 'c': GMT->current.setting.proj_length_unit = GMT_CM; break;
@@ -8899,10 +8791,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
break;
case GMTCASE_MAP_SCALE_FACTOR:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: */
- GMT_COMPAT_CHANGE ("PROJ_SCALE_FACTOR");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("PROJ_SCALE_FACTOR");
+ break;
case GMTCASE_PROJ_SCALE_FACTOR:
if (!strncmp (value, "def", 3U)) /* Default scale for chosen projection */
GMT->current.setting.proj_scale_factor = -1.0;
@@ -9040,10 +8930,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
error = true;
break;
case GMTCASE_HISTORY:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: */
- GMT_COMPAT_CHANGE ("GMT_HISTORY");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("GMT_HISTORY");
+ break;
case GMTCASE_GMT_HISTORY:
if (strspn (lower_value, "1t"))
GMT->current.setting.history = (k_history_read | k_history_write);
@@ -9055,10 +8943,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
error = true;
break;
case GMTCASE_INTERPOLANT:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: */
- GMT_COMPAT_CHANGE ("GMT_INTERPOLANT");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("GMT_INTERPOLANT");
+ break;
case GMTCASE_GMT_INTERPOLANT:
if (!strcmp (lower_value, "linear"))
GMT->current.setting.interpolant = GMT_SPLINE_LINEAR;
@@ -9071,6 +8957,10 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
else
error = true;
break;
+ case GMTCASE_GMT_LANGUAGE:
+ strncpy (GMT->current.setting.language, lower_value, GMT_LEN64-1);
+ gmtinit_get_language (GMT); /* Load in names and abbreviations in chosen language */
+ break;
case GMTCASE_GMT_TRIANGULATE:
if (!strcmp (lower_value, "watson"))
GMT->current.setting.triangulate = GMT_TRIANGLE_WATSON;
@@ -9085,6 +8975,7 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
ival = atoi (value) + 2;
if (ival >= GMT_MSG_QUIET && ival <= GMT_MSG_DEBUG)
GMT->current.setting.verbose = ival;
+ GMT_KEYWORD_UPDATE (GMTCASE_GMT_VERBOSE);
else
error = true;
}
@@ -9170,17 +9061,12 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
case GMTCASE_TIME_INTERVAL_FRACTION:
GMT->current.setting.time_interval_fraction = atof (value);
break;
- case GMTCASE_GMT_LANGUAGE:
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
case GMTCASE_TIME_LANGUAGE:
- strncpy (GMT->current.setting.language, lower_value, GMT_LEN64-1);
- gmtinit_get_language (GMT); /* Load in names and abbreviations in chosen language */
+ GMT_COMPAT_TRANSLATE ("GMT_LANGUAGE");
break;
case GMTCASE_WANT_LEAP_SECONDS:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: */
- GMT_COMPAT_CHANGE ("TIME_LEAP_SECONDS");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("TIME_LEAP_SECONDS");
+ break;
case GMTCASE_TIME_LEAP_SECONDS:
error = gmtinit_true_false_or_error (lower_value, &GMT->current.setting.time_leap_seconds);
break;
@@ -9201,6 +9087,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
case GMTCASE_TIME_SYSTEM:
error = gmt_get_time_system (GMT, lower_value, &GMT->current.setting.time_system);
(void) gmt_init_time_system_structure (GMT, &GMT->current.setting.time_system);
+ GMT_KEYWORD_UPDATE (GMTCASE_TIME_UNIT);
+ GMT_KEYWORD_UPDATE (GMTCASE_TIME_EPOCH);
break;
case GMTCASE_TIME_WEEK_START:
ival = gmtinit_key_lookup (value, GMT_weekdays, 7);
@@ -9212,10 +9100,8 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
GMT->current.setting.time_week_start = ival;
break;
case GMTCASE_Y2K_OFFSET_YEAR:
- if (gmt_M_compat_check (GMT, 4)) /* GMT4: */
- GMT_COMPAT_CHANGE ("TIME_Y2K_OFFSET_YEAR");
- else { error = gmtinit_badvalreport (GMT, keyword); break; } /* Not recognized so give error message */
- /* Under compatibility mode we will fall through (no break) to next (correct) case: */
+ GMT_COMPAT_TRANSLATE ("TIME_Y2K_OFFSET_YEAR");
+ break;
case GMTCASE_TIME_Y2K_OFFSET_YEAR:
if ((ival = atoi (value)) < 0) error = true;
else GMT->current.setting.time_Y2K_offset_year = ival;
@@ -9233,9 +9119,10 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
case GMTCASE_Y_AXIS_LENGTH:
/* Setting ignored: x- and/or y scale are required inputs on -J option */
case GMTCASE_COLOR_IMAGE:
- GMT_COMPAT_WARN;
- /* Setting ignored, now always adobe image */
- if (!gmt_M_compat_check (GMT, 4)) error = gmtinit_badvalreport (GMT, keyword);
+ if (gmt_M_compat_check (GMT, 4)) /* GMT4: */
+ GMT_COMPAT_WARN;
+ else /* Not recognized so give error message */
+ error = gmtinit_badvalreport (GMT, keyword);
break;
case GMTCASE_DIR_TMP:
case GMTCASE_DIR_USER:
@@ -9250,12 +9137,14 @@ unsigned int gmtlib_setparameter (struct GMT_CTRL *GMT, const char *keyword, cha
}
/* Store possible unit. For most cases these are irrelevant as no unit is expected */
- if (len && case_val >= 0) GMT->current.setting.given_unit[case_val] = value[len-1];
+ if (case_val >= 0) {
+ if (len) GMT->current.setting.given_unit[case_val] = value[len-1];
- if (error && case_val >= 0)
- GMT_Report (GMT->parent, GMT_MSG_NORMAL, "Syntax error: %s given illegal value (%s)!\n", keyword, value);
- else if (core && case_val >= 0) /* So far, only gmtset calls this function with core = true, but this is a too fragile solution */
- GMT_keywords_updated[case_val] = true; /* Leave a record that this keyword is no longer a default one */
+ if (error)
+ GMT_Report (GMT->parent, GMT_MSG_NORMAL, "Syntax error: %s given illegal value (%s)!\n", keyword, value);
+ else
+ GMT_KEYWORD_UPDATE (case_val);
+ }
return ((error) ? 1 : 0);
}
@@ -10171,6 +10060,11 @@ char *gmtlib_putparameter (struct GMT_CTRL *GMT, const char *keyword) {
else
strcpy (value, "undefined");
break;
+ case GMTCASE_TIME_LANGUAGE:
+ case GMTCASE_GMT_LANGUAGE:
+ strncpy (value, GMT->current.setting.language, GMT_LEN64-1);
+ gmtinit_get_language (GMT); /* Load in names and abbreviations in chosen language */
+ break;
case GMTCASE_GMT_TRIANGULATE:
if (GMT->current.setting.triangulate == GMT_TRIANGLE_WATSON)
strcpy (value, "Watson");
@@ -10228,10 +10122,6 @@ char *gmtlib_putparameter (struct GMT_CTRL *GMT, const char *keyword) {
case GMTCASE_TIME_INTERVAL_FRACTION:
snprintf (value, GMT_LEN256, "%g", GMT->current.setting.time_interval_fraction);
break;
- case GMTCASE_GMT_LANGUAGE:
- case GMTCASE_TIME_LANGUAGE:
- strncpy (value, GMT->current.setting.language, GMT_LEN64-1);
- break;
case GMTCASE_WANT_LEAP_SECONDS:
if (gmt_M_compat_check (GMT, 4)) /* GMT4: */
GMT_COMPAT_WARN;
@@ -10791,10 +10681,12 @@ GMT_LOCAL struct GMT_CTRL *gmt_begin_module_sub (struct GMTAPI_CTRL *API, const
}
/*! Determine if the current module is a PostScript-producing module that writes PostScript */
-GMT_LOCAL bool gmtinit_is_PS_module (struct GMTAPI_CTRL *API, const char *name, const char *keys, struct GMT_OPTION *options) {
- struct GMT_OPTION *opt = NULL;
+GMT_LOCAL bool gmtinit_is_PS_module (struct GMTAPI_CTRL *API, const char *name, const char *keys, struct GMT_OPTION **in_options) {
+ struct GMT_OPTION *opt = NULL, *options = NULL;
if (strstr (keys, ">X}") == NULL) return false; /* Never produces PostScript */
+ if (in_options == NULL) return false; /* External module not ready yet */
+ options = *in_options;
/* Must do more specific checking since some of the PS producers take options that turns them into other things... */
if (!strncmp (name, "psbasemap", 9U)) { /* Check for -A option */
@@ -11169,7 +11061,7 @@ struct GMT_CTRL *gmt_init_module_OLD (struct GMTAPI_CTRL *API, const char *lib_n
return NULL;
}
- API->GMT->current.ps.active = gmtinit_is_PS_module (API, mod_name, keys, *options); /* true if module will produce PS */
+ API->GMT->current.ps.active = gmtinit_is_PS_module (API, mod_name, keys, options); /* true if module will produce PS */
if (API->GMT->current.ps.active) /* true if module will produce PS */
(void)gmt_set_psfilename (API->GMT); /* Sets API->GMT->current.ps.initialize=true if the expected (and hidden) PS plot file cannot be found */
}
@@ -11235,7 +11127,7 @@ struct GMT_CTRL *gmt_init_module (struct GMTAPI_CTRL *API, const char *lib_name,
struct GMT_OPTION *opt = NULL;
API->GMT->current.ps.initialize = false; /* Start from scratch */
- API->GMT->current.ps.active = gmtinit_is_PS_module (API, mod_name, keys, *options); /* true if module will produce PS */
+ API->GMT->current.ps.active = gmtinit_is_PS_module (API, mod_name, keys, options); /* true if module will produce PS */
if (API->GMT->hidden.func_level == 0) { /* The -R -J -O -K prohibition only applies to top-level module call */
/* 1. No -O allowed */
@@ -11796,8 +11688,6 @@ int gmt_parse_symbol_option (struct GMT_CTRL *GMT, char *text, struct GMT_SYMBOL
/* Gave old-style arrow dimensions; cannot exactly reproduce GMT 4 arrows since those were polygons */
p->v.status |= PSL_VEC_END; /* Default is head at end */
p->size_y = p->given_size_y = 0.0;
- GMT_Report (GMT->parent, GMT_MSG_COMPAT,
- "Warning: <size> = <vectorwidth/headlength/headwidth> is deprecated GMT3/4 syntax; see -S%c for GMT5 syntax.\n", text[0]);
one = (strchr ("bhstBHST", text[1])) ? 2 : 1;
sscanf (&text[one], "%[^/]/%[^/]/%s", txt_a, txt_b, txt_c);
p->v.v_width = (float)gmt_M_to_inch (GMT, txt_a);
@@ -13179,6 +13069,7 @@ unsigned int gmtlib_get_pos_of_filename (const char *url) {
pos--; /* Last character in name */
while (url[pos] && pos > 0 && url[pos] != '/') pos--; /* Wind to first slash */
if (url[pos] == '/') pos++; /* First letter after last slash */
+ if (url[pos] == '@') pos++; /* Step over leading @ for cache files */
return (unsigned int)pos;
}
diff --git a/src/gmt_internals.h b/src/gmt_internals.h
index dcc91db..af04011 100644
--- a/src/gmt_internals.h
+++ b/src/gmt_internals.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_internals.h 18041 2017-04-26 23:09:48Z pwessel $
+ * $Id: gmt_internals.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_io.c b/src/gmt_io.c
index c63dff3..688fff5 100644
--- a/src/gmt_io.c
+++ b/src/gmt_io.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_io.c 18273 2017-05-29 22:35:19Z pwessel $
+ * $Id: gmt_io.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -4214,7 +4214,8 @@ FILE * gmt_fopen (struct GMT_CTRL *GMT, const char *filename, const char *mode)
else { /* Maybe netCDF */
fd = gmt_nc_fopen (GMT, filename, mode);
if (!fd) {
- if ((c = gmt_getdatapath(GMT, filename, path, R_OK)) != NULL) fd = fopen(c, mode);
+ if ((c = gmt_getdatapath(GMT, filename, path, R_OK)) != NULL)
+ fd = fopen(c, mode);
}
return (fd);
}
@@ -4352,7 +4353,7 @@ int gmt_set_cols (struct GMT_CTRL *GMT, unsigned int direction, uint64_t expecte
if (GMT->common.b.active[direction]) { /* Must set uninitialized input/output pointers */
uint64_t col;
char type = (GMT->common.b.type[direction]) ? GMT->common.b.type[direction] : 'd';
- for (col = GMT->common.b.ncol[direction]; col < expected; col++) {
+ for (col = 0; col < expected; col++) {
if (!GMT->current.io.fmt[direction][col].io) {
GMT->current.io.fmt[direction][col].io = gmtlib_get_io_ptr (GMT, direction, GMT->common.b.swab[direction], type);
GMT->current.io.fmt[direction][col].type = gmt_get_io_type (GMT, type);
diff --git a/src/gmt_io.h b/src/gmt_io.h
index 43c3193..e5680e0 100644
--- a/src/gmt_io.h
+++ b/src/gmt_io.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_io.h 17840 2017-04-01 21:37:33Z pwessel $
+ * $Id: gmt_io.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_macros.h b/src/gmt_macros.h
index abb2ee8..5237d95 100644
--- a/src/gmt_macros.h
+++ b/src/gmt_macros.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_macros.h 18328 2017-06-07 04:43:45Z pwessel $
+ * $Id: gmt_macros.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_make_module_src.sh b/src/gmt_make_module_src.sh
index 09a5781..ff71272 100755
--- a/src/gmt_make_module_src.sh
+++ b/src/gmt_make_module_src.sh
@@ -2,7 +2,7 @@
#
# $Id: gmt_make_module_src.sh 16501 2016-06-04 18:21:29Z pwessel $
#
-# Copyright (c) 2012-2017
+# Copyright (c) 2012-2018
# by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
# See LICENSE.TXT file for copying and redistribution conditions.
#
diff --git a/src/gmt_map.c b/src/gmt_map.c
index d02d899..168ab3d 100644
--- a/src/gmt_map.c
+++ b/src/gmt_map.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_map.c 18426 2017-06-21 23:39:43Z pwessel $
+ * $Id: gmt_map.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_memory.c b/src/gmt_memory.c
index 6e9ad2b..85f212a 100644
--- a/src/gmt_memory.c
+++ b/src/gmt_memory.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_memory.c 17622 2017-03-06 00:07:57Z pwessel $
+ * $Id: gmt_memory.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_memory.h b/src/gmt_memory.h
index 7e07feb..9d2c69b 100644
--- a/src/gmt_memory.h
+++ b/src/gmt_memory.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_memory.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmt_memory.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_nan.h b/src/gmt_nan.h
index 11adabc..4812665 100644
--- a/src/gmt_nan.h
+++ b/src/gmt_nan.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_nan.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmt_nan.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_nc.c b/src/gmt_nc.c
index b0c5c94..9e3f650 100644
--- a/src/gmt_nc.c
+++ b/src/gmt_nc.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_nc.c 18286 2017-05-30 06:54:11Z pwessel $
+ * $Id: gmt_nc.c 19525 2017-12-28 00:55:59Z jluis $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -370,7 +370,7 @@ GMT_LOCAL void gmtnc_set_optimal_chunksize (struct GMT_CTRL *GMT, struct GMT_GRI
GMT_LOCAL int gmtnc_grd_info (struct GMT_CTRL *GMT, struct GMT_GRID_HEADER *header, char job) {
int j, err, has_vector;
- int old_fill_mode;
+ int old_fill_mode, status;
double dummy[2], *xy = NULL;
char dimname[GMT_GRID_UNIT_LEN80], coord[8];
nc_type z_type;
@@ -467,7 +467,9 @@ GMT_LOCAL int gmtnc_grd_info (struct GMT_CTRL *GMT, struct GMT_GRID_HEADER *head
/* Get the ids of the x and y (and depth and time) coordinate variables */
for (i = 0; i < ndims; i++) {
gmt_M_err_trap (nc_inq_dim (ncid, dims[i], dimname, &lens[i]));
- if (nc_inq_varid (ncid, dimname, &ids[i])) return (GMT_GRDIO_NC_NOT_COARDS);
+ if ((status = nc_inq_varid (ncid, dimname, &ids[i])) != NC_NOERR)
+ GMT_Report (GMT->parent, GMT_MSG_NORMAL, "\"%s\", %s\n\tIf something bad happens later, try importing via GDAL.\n",
+ dimname, nc_strerror(status));
}
header->xy_dim[0] = ndims-1;
header->xy_dim[1] = ndims-2;
diff --git a/src/gmt_notposix.c b/src/gmt_notposix.c
index c8f4448..10beb37 100644
--- a/src/gmt_notposix.c
+++ b/src/gmt_notposix.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_notposix.c 18340 2017-06-08 02:50:06Z pwessel $
+ * $Id: gmt_notposix.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_notposix.h b/src/gmt_notposix.h
index d9950cd..c7245c4 100644
--- a/src/gmt_notposix.h
+++ b/src/gmt_notposix.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_notposix.h 18459 2017-06-25 01:14:06Z pwessel $
+ * $Id: gmt_notposix.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -574,6 +574,10 @@
EXTERN_MSC double strtod(const char *nptr, char **endptr);
#endif
+#ifndef HAVE_STRNDUP
+ EXTERN_MSC char *strndup(const char *s, size_t chars);
+#endif
+
#ifndef HAVE_STRTOF_
static inline float strtof(const char *nptr, char **endptr) {
return (float)strtod(nptr, endptr);
diff --git a/src/gmt_parse.c b/src/gmt_parse.c
index b3d9d9b..e067c74 100644
--- a/src/gmt_parse.c
+++ b/src/gmt_parse.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_parse.c 18391 2017-06-17 21:24:36Z pwessel $
+ * $Id: gmt_parse.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -200,6 +200,12 @@ GMT_LOCAL int parse_check_b_options (struct GMT_CTRL *GMT, struct GMT_OPTION *op
return (-1); /* Error: Cannot be both */
}
+GMT_LOCAL unsigned int count_slashes (char *txt) {
+ unsigned int i, n;
+ for (i = n = 0; txt[i]; i++) if (txt[i] == '/') n++;
+ return (n);
+}
+
/*! . */
GMT_LOCAL unsigned int parse_check_extended_R (struct GMT_CTRL *GMT, struct GMT_OPTION *options) {
/* In order to use -R[L|C|R][B|M|T]<lon0>/<lat0>/<n_columns>/<ny> we need access
@@ -209,7 +215,7 @@ GMT_LOCAL unsigned int parse_check_extended_R (struct GMT_CTRL *GMT, struct GMT_
struct GMT_OPTION *opt = NULL;
bool got_extended_R = false;
for (opt = options; opt; opt = opt->next) {
- if (opt->option == 'R' && strlen (opt->arg) > 2 && strchr ("LCRlcr", opt->arg[0]) && strchr ("TMBtmb", opt->arg[1]))
+ if (opt->option == 'R' && count_slashes (opt->arg) == 3 && strchr ("LCRlcr", opt->arg[0]) && strchr ("TMBtmb", opt->arg[1]))
got_extended_R = true;
}
if (!got_extended_R) return 0; /* No such situation */
diff --git a/src/gmt_plot.c b/src/gmt_plot.c
index 1da5241..e086108 100644
--- a/src/gmt_plot.c
+++ b/src/gmt_plot.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_plot.c 18428 2017-06-21 23:51:36Z pwessel $
+ * $Id: gmt_plot.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_plot.h b/src/gmt_plot.h
index a8f76a9..da107ae 100644
--- a/src/gmt_plot.h
+++ b/src/gmt_plot.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_plot.h 17671 2017-03-14 16:14:46Z pwessel $
+ * $Id: gmt_plot.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_private.h b/src/gmt_private.h
index 5198c62..9c9d5b0 100644
--- a/src/gmt_private.h
+++ b/src/gmt_private.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_private.h 17911 2017-04-13 05:45:46Z pwessel $
+ * $Id: gmt_private.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_proj.c b/src/gmt_proj.c
index 19e4d44..3d5bd46 100644
--- a/src/gmt_proj.c
+++ b/src/gmt_proj.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_proj.c 18319 2017-06-04 00:57:38Z pwessel $
+ * $Id: gmt_proj.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -2236,7 +2236,7 @@ void gmt_iwinkel (struct GMT_CTRL *P, double *lon, double *lat, double x, double
y *= P->current.proj.i_EQ_RAD;
*lat = y / M_PI; /* Initial guesses for lon and lat */
*lon = x / M_PI;
- if (fabs (y) < GMT_PROJ_CONV_LIMIT) { /* On ~equator, C is ~zero so no division */
+ if (fabs (y) < GMT_PROJ_CONV_LIMIT && fabs (x) < GMT_PROJ_CONV_LIMIT) { /* At ~origin, C is ~zero so no division */
*lon *= R2D;
*lon += P->current.proj.central_meridian;
return;
diff --git a/src/gmt_project.h b/src/gmt_project.h
index 33b0f70..cf209d8 100644
--- a/src/gmt_project.h
+++ b/src/gmt_project.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_project.h 17529 2017-02-05 19:12:51Z jluis $
+ * $Id: gmt_project.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_prototypes.h b/src/gmt_prototypes.h
index 411e1d3..74de7da 100644
--- a/src/gmt_prototypes.h
+++ b/src/gmt_prototypes.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_prototypes.h 18404 2017-06-20 18:10:00Z pwessel $
+ * $Id: gmt_prototypes.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -130,6 +130,7 @@ EXTERN_MSC double gmt_fft_any_wave (uint64_t k, unsigned int mode, struct GMT_FF
/* gmt_grdio.c: */
+EXTERN_MSC void gmt_set_R_from_grd (struct GMT_CTRL *GMT, struct GMT_GRID_HEADER *header);
EXTERN_MSC void gmt_grd_info_syntax (struct GMT_CTRL *GMT, char option);
EXTERN_MSC void gmt_grd_detrend (struct GMT_CTRL *GMT, struct GMT_GRID *Grid, unsigned int mode, double *a);
EXTERN_MSC void gmt_grd_minmax (struct GMT_CTRL *GMT, struct GMT_GRID *Grid, double xyz[2][3]);
@@ -275,6 +276,7 @@ EXTERN_MSC bool gmt_this_alloc_level (struct GMT_CTRL *GMT, unsigned int alloc_l
/* gmt_support.c: */
+EXTERN_MSC bool gmt_is_cpt_master (struct GMT_CTRL *GMT, char *cpt);
EXTERN_MSC char *gmt_assign_text (struct GMT_CTRL *GMT, char *p);
EXTERN_MSC char *gmt_first_modifier (struct GMT_CTRL *GMT, char *string, const char *sep);
EXTERN_MSC unsigned int gmt_getmodopt (struct GMT_CTRL *GMT, const char option, const char *string, const char *sep, unsigned int *pos, char *token, unsigned int *err);
diff --git a/src/gmt_psl.h b/src/gmt_psl.h
index 672ff61..0ee79f5 100644
--- a/src/gmt_psl.h
+++ b/src/gmt_psl.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_psl.h 17813 2017-03-29 03:43:29Z pwessel $
+ * $Id: gmt_psl.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_regexp.c b/src/gmt_regexp.c
index 60652b3..fb1a93b 100644
--- a/src/gmt_regexp.c
+++ b/src/gmt_regexp.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_regexp.c 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmt_regexp.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_resources.h b/src/gmt_resources.h
index 5156491..5634eae 100644
--- a/src/gmt_resources.h
+++ b/src/gmt_resources.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_resources.h 18140 2017-05-05 22:21:02Z pwessel $
+ * $Id: gmt_resources.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2012-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * Copyright (c) 2012-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
* See LICENSE.TXT file for copying and redistribution conditions.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_sharedlibs.c b/src/gmt_sharedlibs.c
index e743eb1..3e21b63 100644
--- a/src/gmt_sharedlibs.c
+++ b/src/gmt_sharedlibs.c
@@ -1,6 +1,6 @@
-/* $Id: gmt_sharedlibs.c 17451 2017-01-16 21:36:06Z pwessel $
+/* $Id: gmt_sharedlibs.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2012-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * Copyright (c) 2012-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
* See LICENSE.TXT file for copying and redistribution conditions.
*/
diff --git a/src/gmt_sharedlibs.h b/src/gmt_sharedlibs.h
index 9796253..6449290 100644
--- a/src/gmt_sharedlibs.h
+++ b/src/gmt_sharedlibs.h
@@ -1,6 +1,6 @@
-/* $Id: gmt_sharedlibs.h 17451 2017-01-16 21:36:06Z pwessel $
+/* $Id: gmt_sharedlibs.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2012-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * Copyright (c) 2012-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
* by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
* See LICENSE.TXT file for copying and redistribution conditions.
*/
diff --git a/src/gmt_shore.c b/src/gmt_shore.c
index 7e72ab4..baccf5f 100644
--- a/src/gmt_shore.c
+++ b/src/gmt_shore.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_shore.c 17831 2017-03-31 22:28:43Z pwessel $
+ * $Id: gmt_shore.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_shore.h b/src/gmt_shore.h
index c94248d..9565155 100644
--- a/src/gmt_shore.h
+++ b/src/gmt_shore.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_shore.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmt_shore.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_sph.c b/src/gmt_sph.c
index 2127420..fedeffe 100644
--- a/src/gmt_sph.c
+++ b/src/gmt_sph.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_sph.c 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmt_sph.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2008-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * Copyright (c) 2008-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
* See LICENSE.TXT file for copying and redistribution conditions.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_sph.h b/src/gmt_sph.h
index c109aa7..812980d 100644
--- a/src/gmt_sph.h
+++ b/src/gmt_sph.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_sph.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmt_sph.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2008-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * Copyright (c) 2008-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
* See LICENSE.TXT file for copying and redistribution conditions.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_stat.c b/src/gmt_stat.c
index 03172f3..cb98dfb 100644
--- a/src/gmt_stat.c
+++ b/src/gmt_stat.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_stat.c 18174 2017-05-07 05:33:44Z pwessel $
+ * $Id: gmt_stat.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -31,7 +31,7 @@
* gmt_ker: : Kelvin-Bessel function ker(x)
* gmt_plm: : Legendre polynomial of degree L order M
* gmt_plm_bar: : Normalized Legendre polynomial of degree L order M
- * gmt_plm_bar_all :
+ * gmt_plm_bar_all :
* gmt_i0: : Modified Bessel function 1st kind order 0
* gmt_i1: : Modified Bessel function 1st kind order 1
* gmt_in: : Modified Bessel function 1st kind order N
@@ -1057,7 +1057,7 @@ double gmt_plm_bar (struct GMT_CTRL *GMT, int l, int m, double x, bool ortho) {
In case of geophysical conversion : multiply by sqrt(2-delta_0m) */
if (ortho)
- pmm *= 0.5 / d_sqrt(M_PI);
+ pmm *= 1.0 / d_sqrt(M_PI);
else if (m != 0)
pmm *= d_sqrt(2.0);
@@ -1210,8 +1210,8 @@ double gmt_sinc (struct GMT_CTRL *GMT, double x) {
/* gmt_factorial (n) calculates the factorial n! */
double gmt_factorial (struct GMT_CTRL *GMT, int n) {
- static int ntop = 8; /* Initial portion filled in below */
- static double a[33] = {1.0, 1.0, 2.0, 6.0, 24.0, 120.0, 720.0, 5040.0, 40320.0};
+ static int ntop = 10; /* Initial portion filled in below */
+ static double a[33] = {1.0, 1.0, 2.0, 6.0, 24.0, 120.0, 720.0, 5040.0, 40320.0, 362880.0, 3628800.0};
int i;
if (n < 0) {
@@ -1220,7 +1220,7 @@ double gmt_factorial (struct GMT_CTRL *GMT, int n) {
/* This could be set to return 0 without warning, to facilitate
sums over binomial coefficients, if desired. -whfs */
}
- if (n > 32) return (gmtstat_ln_gamma (GMT, n+1.0));
+ if (n > 32) return (exp(gmtstat_ln_gamma (GMT, n+1.0)));
while (ntop < n) {
i = ntop++;
a[ntop] = a[i] * ntop;
@@ -1342,7 +1342,7 @@ double gmt_erfinv (struct GMT_CTRL *GMT, double y) {
double gmt_f_pdf (struct GMT_CTRL *GMT, double F, uint64_t nu1, uint64_t nu2) {
/* Probability density distribution for F */
double y;
-
+
y = sqrt (pow (nu1 * F, (double)nu1) * pow ((double)nu2, (double)nu2) / pow (nu1 * F + nu2, (double)(nu1+nu2))) / (F * gmtstat_beta (GMT, 0.5*nu1, 0.5*nu2));
return (y);
}
@@ -1350,16 +1350,16 @@ double gmt_f_pdf (struct GMT_CTRL *GMT, double F, uint64_t nu1, uint64_t nu2) {
double gmt_f_cdf (struct GMT_CTRL *GMT, double F, uint64_t nu1, uint64_t nu2) {
/* Cumulative probability density distribution for F */
double y = 0.0;
-
+
gmtstat_inc_beta (GMT, 0.5*nu1, 0.5*nu2, F*nu1/(F*nu1+nu2), &y);
-
+
return (y);
}
double gmt_t_pdf (struct GMT_CTRL *GMT, double t, uint64_t nu) {
/* Probability density distribution for Student t */
double y, n = nu + 1.0, g1 = 0.0, g2 = 0.0;
-
+
gmtstat_ln_gamma_r (GMT, 0.5*n, &g1);
gmtstat_ln_gamma_r (GMT, 0.5*nu, &g2);
y = exp (g1 - g2) * pow (1.0 + t*t/nu, -0.5*n) / sqrt (M_PI * nu);
@@ -1495,7 +1495,7 @@ double gmt_tcrit (struct GMT_CTRL *GMT, double alpha, double nu) {
double gmt_chi2_pdf (struct GMT_CTRL *GMT, double c, uint64_t nu) {
/* Probability density distribution for chi-squared */
double g = 0.0, y;
-
+
gmtstat_ln_gamma_r (GMT, 0.5*nu, &g);
y = pow (c, 0.5*nu - 1.0) * exp (-0.5 * c - g) / pow (2.0, 0.5 * nu);
return (y);
@@ -1797,7 +1797,7 @@ double gmt_mean_weighted (struct GMT_CTRL *GMT, double *x, double *w, uint64_t n
/* Return the weighted mean of x given weights w */
uint64_t k;
double sum_xw = 0.0, sum_w = 0.0;
-
+
if (n == 0) return (GMT->session.d_NaN); /* No data, so no defined mean */
for (k = 0; k < n; k++) {
sum_w += w[k];
@@ -1857,7 +1857,7 @@ double gmt_mode_weighted (struct GMT_CTRL *GMT, struct GMT_OBSERVATION *data, ui
/* First check if any single point has 50% or more of the total weights; if so we are done */
for (i = 0; i < n; i++) if (data[i].weight >= wsum) return data[i].value;
-
+
/* Some more initializations */
top = p_max = 0.0;
mode = 0.5 * (data[0].value + data[n-1].value);
@@ -1897,7 +1897,7 @@ int gmt_mode (struct GMT_CTRL *GMT, double *x, uint64_t n, uint64_t j, bool sort
}
if (sort) gmt_sort_array (GMT, x, n, GMT_DOUBLE);
-
+ while (n && gmt_M_is_dnan (x[n-1])) n--; /* Skip any NaNs at end of sorted array */
istop = n - j;
multiplicity = 0;
@@ -2009,7 +2009,7 @@ void gmt_getmad (struct GMT_CTRL *GMT, double *x, uint64_t n, double location, d
*scale = 0.0;
return;
}
-
+
dev = gmt_M_memory (GMT, NULL, n, double);
for (i = 0; i < n; i++) dev[i] = fabs (x[i] - location);
gmt_sort_array (GMT, dev, n, GMT_DOUBLE);
@@ -2535,7 +2535,7 @@ double gmt_grd_median (struct GMT_CTRL *GMT, struct GMT_GRID *G, struct GMT_GRID
/* Non-destructive: Original grid left as is unless overwrite = true */
uint64_t node, n = 0;
double wmed;
-
+
if (W) { /* Weights provided */
unsigned int row, col;
struct GMT_OBSERVATION *pair = gmt_M_memory (GMT, NULL, G->header->nm, struct GMT_OBSERVATION);
@@ -2626,7 +2626,7 @@ double gmt_grd_mode (struct GMT_CTRL *GMT, struct GMT_GRID *G, struct GMT_GRID *
/* Non-destructive: Original grid left as is unless overwrite = true */
uint64_t node, n = 0;
double wmode;
-
+
if (W) { /* Weights provided */
unsigned int row, col;
struct GMT_OBSERVATION *pair = gmt_M_memory (GMT, NULL, G->header->nm, struct GMT_OBSERVATION);
diff --git a/src/gmt_supplements_module.c b/src/gmt_supplements_module.c
index b926634..5f83948 100644
--- a/src/gmt_supplements_module.c
+++ b/src/gmt_supplements_module.c
@@ -1,6 +1,6 @@
-/* $Id: gmt_supplements_module.c 17779 2017-03-25 19:56:38Z pwessel $
+/* $Id: gmt_supplements_module.c 19523 2017-12-27 23:20:32Z pwessel $
*
- * Copyright (c) 2012-2017
+ * Copyright (c) 2012-2018
* by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
* See LICENSE.TXT file for copying and redistribution conditions.
*/
diff --git a/src/gmt_supplements_module.h b/src/gmt_supplements_module.h
index 5fb9e9d..99287d3 100644
--- a/src/gmt_supplements_module.h
+++ b/src/gmt_supplements_module.h
@@ -1,6 +1,6 @@
-/* $Id: gmt_supplements_module.h 17597 2017-02-24 02:49:00Z pwessel $
+/* $Id: gmt_supplements_module.h 19523 2017-12-27 23:20:32Z pwessel $
*
- * Copyright (c) 2012-2017
+ * Copyright (c) 2012-2018
* by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
* See LICENSE.TXT file for copying and redistribution conditions.
*/
diff --git a/src/gmt_support.c b/src/gmt_support.c
index 49f76a7..baeb13d 100644
--- a/src/gmt_support.c
+++ b/src/gmt_support.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_support.c 18319 2017-06-04 00:57:38Z pwessel $
+ * $Id: gmt_support.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -1070,11 +1070,14 @@ GMT_LOCAL bool support_is_penstyle (char *word) {
int n;
/* Returns true if we are sure the word is a style string - else false.
- * style syntax is a|o|<pattern>:<phase>|<string made up of -|. only>[<unit>] */
+ * style syntax is a|o|<pattern>:<phase>|<string made up of -|. only>[<unit>]
+ * Also recognized "dashed" for -, "dotted" for . as well as "solid" */
n = (int)strlen (word);
if (n == 0) return (false);
+ if (!strncmp (word, "dashed", 6U) || !strncmp (word, "dotted", 6U) || !strncmp (word, "solid", 5U)) return (true);
+
n--;
if (strchr (GMT_DIM_UNITS, word[n])) n--; /* Reduce length by 1; the unit character */
if (n < 0) return (false); /* word only contained a unit character? */
@@ -1241,11 +1244,11 @@ GMT_LOCAL void support_truncate_cpt_slice (struct GMT_LUT *S, bool do_hsv, doubl
double f = (z_cut - S->z_low) * S->i_dz, hsv[4], rgb[4];
unsigned int k;
if (do_hsv) { /* Interpolation in HSV space */
- for (k = 0; k < 4; k++) hsv[k] = S->hsv_low[k] + (S->hsv_high[k] - S->hsv_low[k]) * f;
+ for (k = 0; k < 4; k++) hsv[k] = S->hsv_low[k] + S->hsv_diff[k] * f;
support_hsv_to_rgb (rgb, hsv);
}
else { /* Interpolation in RGB space */
- for (k = 0; k < 4; k++) rgb[k] = S->rgb_low[k] + (S->rgb_high[k] - S->rgb_low[k]) * f;
+ for (k = 0; k < 4; k++) rgb[k] = S->rgb_low[k] + S->rgb_diff[k] * f;
support_rgb_to_hsv (rgb, hsv);
}
if (side == -1) {
@@ -1258,7 +1261,11 @@ GMT_LOCAL void support_truncate_cpt_slice (struct GMT_LUT *S, bool do_hsv, doubl
gmt_M_memcpy (S->rgb_high, rgb, 4, double);
S->z_high = z_cut;
}
- S->i_dz = 1.0 / (S->z_high - S->z_low); /* Recompute inverse stepsize */
+ /* Recompute differences used in gmt_get_rgb_from_z */
+ for (k = 0; k < 4; k++) S->rgb_diff[k] = S->rgb_high[k] - S->rgb_low[k];
+ for (k = 0; k < 4; k++) S->hsv_diff[k] = S->hsv_high[k] - S->hsv_low[k];
+ /* Recompute inverse stepsize */
+ S->i_dz = 1.0 / (S->z_high - S->z_low);
}
/*! . */
@@ -4039,7 +4046,7 @@ GMT_LOCAL int support_getrose_old (struct GMT_CTRL *GMT, char option, char *text
* If -?m, optionally set annotation interval with +
*/
- if (!text) {
+ if (!text[0]) {
GMT_Report (GMT->parent, GMT_MSG_NORMAL, "Syntax error %c: No argument given\n", option);
GMT_exit (GMT, GMT_PARSE_ERROR); return GMT_PARSE_ERROR;
}
@@ -7354,6 +7361,17 @@ struct GMT_PALETTE * gmtlib_read_cpt (struct GMT_CTRL *GMT, void *source, unsign
return (X);
}
+bool gmt_is_cpt_master (struct GMT_CTRL *GMT, char *cpt) {
+ /* Return true if cpt is the name of a GMT CPT master table and not a local file */
+ char *c = NULL;
+ if (cpt == NULL) return true; /* No cpt given means use rainbow master */
+ if (gmt_M_file_is_memory (cpt)) return false; /* A CPT was given via memory location */
+ if ((c = gmt_first_modifier (GMT, cpt, "uUw")))
+ c[0] = '\0'; /* Must chop off modifiers for access to work */
+ if (cpt[0] && !access (cpt, R_OK)) return false; /* A CPT was given and exists */
+ return true; /* Acting as if it is a master table */
+}
+
/*! . */
struct GMT_PALETTE *gmt_get_cpt (struct GMT_CTRL *GMT, char *file, enum GMT_enum_cpt mode, double zmin, double zmax) {
/* Will read in a CPT. However, if file does not exist in the current directory we may provide
@@ -7361,7 +7379,7 @@ struct GMT_PALETTE *gmt_get_cpt (struct GMT_CTRL *GMT, char *file, enum GMT_enum
struct GMT_PALETTE *P = NULL;
unsigned int continuous = (file && strchr(file,','));
- char *c = NULL;
+ bool is_cpt_master;
if (mode == GMT_CPT_REQUIRED) { /* The calling function requires the CPT to be present; GMT_Read_Data will work or fail accordingly */
P = GMT_Read_Data (GMT->parent, GMT_IS_PALETTE, GMT_IS_FILE, GMT_IS_NONE, GMT_READ_NORMAL|continuous, NULL, file, NULL);
@@ -7376,13 +7394,9 @@ struct GMT_PALETTE *gmt_get_cpt (struct GMT_CTRL *GMT, char *file, enum GMT_enum
For 2 & 3 we take the master table and linearly stretch the z values to fit the range, or honor default range for dynamic CPTs.
*/
- if (file && (c = gmt_first_modifier (GMT, file, "uUw")))
- c[0] = '\0'; /* Must chop off modifiers for access to work */
- if (gmt_M_file_is_memory (file) || (file && file[0] && !access (file, R_OK))) { /* A CPT was given and exists or is memory location */
- if (c) c[0] = '+'; /* Restore the string */
- P = GMT_Read_Data (GMT->parent, GMT_IS_PALETTE, GMT_IS_FILE, GMT_IS_NONE, GMT_READ_NORMAL, NULL, file, NULL);
- }
- else { /* Take master cpt and stretch to fit data range using continuous colors */
+
+ is_cpt_master = gmt_is_cpt_master (GMT, file);
+ if (is_cpt_master) { /* Take master cpt and stretch to fit data range using continuous colors */
char *master = NULL;
double noise;
@@ -7406,6 +7420,9 @@ struct GMT_PALETTE *gmt_get_cpt (struct GMT_CTRL *GMT, char *file, enum GMT_enum
}
gmt_stretch_cpt (GMT, P, zmin, zmax);
}
+ else { /* Gave a file */
+ P = GMT_Read_Data (GMT->parent, GMT_IS_PALETTE, GMT_IS_FILE, GMT_IS_NONE, GMT_READ_NORMAL, NULL, file, NULL);
+ }
return (P);
}
@@ -10441,20 +10458,20 @@ int gmt_grd_BC_set (struct GMT_CTRL *GMT, struct GMT_GRID *G, unsigned int direc
/* d2/dx2 */ if (set[XLO]) G->data[jn + iwo1] = (float)(2.0 * G->data[jn + iw] - G->data[jn + iwi1]);
/* d2/dy2 */ if (set[YHI]) G->data[jno1 + iw] = (float)(2.0 * G->data[jn + iw] - G->data[jni1 + iw]);
- /* d2/dxdy */ if (set[XLO] && set[YHI]) G->data[jno1 + iwo1] = -(G->data[jno1 + iwi1] - G->data[jni1 + iwi1] + G->data[jni1 + iwo1]);
+ /* d2/dxdy */ if (set[XLO] && set[YHI]) G->data[jno1 + iwo1] = G->data[jn + iwo1] + G->data[jno1 + iw] - G->data[jn + iw];
/* d2/dx2 */ if (set[XHI]) G->data[jn + ieo1] = (float)(2.0 * G->data[jn + ie] - G->data[jn + iei1]);
/* d2/dy2 */ if (set[YHI]) G->data[jno1 + ie] = (float)(2.0 * G->data[jn + ie] - G->data[jni1 + ie]);
- /* d2/dxdy */ if (set[XHI] && set[YHI]) G->data[jno1 + ieo1] = -(G->data[jno1 + iei1] - G->data[jni1 + iei1] + G->data[jni1 + ieo1]);
+ /* d2/dxdy */ if (set[XHI] && set[YHI]) G->data[jno1 + ieo1] = G->data[jn + ieo1] + G->data[jno1 + ie] - G->data[jn + ie];
/* d2/dx2 */ if (set[XLO]) G->data[js + iwo1] = (float)(2.0 * G->data[js + iw] - G->data[js + iwi1]);
/* d2/dy2 */ if (set[YLO]) G->data[jso1 + iw] = (float)(2.0 * G->data[js + iw] - G->data[jsi1 + iw]);
- /* d2/dxdy */ if (set[XLO] && set[YLO]) G->data[jso1 + iwo1] = -(G->data[jso1 + iwi1] - G->data[jsi1 + iwi1] + G->data[jsi1 + iwo1]);
+ /* d2/dxdy */ if (set[XLO] && set[YLO]) G->data[jso1 + iwo1] = G->data[js + iwo1] + G->data[jso1 + iw] - G->data[js + iw];
/* d2/dx2 */ if (set[XHI]) G->data[js + ieo1] = (float)(2.0 * G->data[js + ie] - G->data[js + iei1]);
/* d2/dy2 */ if (set[YLO]) G->data[jso1 + ie] = (float)(2.0 * G->data[js + ie] - G->data[jsi1 + ie]);
- /* d2/dxdy */ if (set[XHI] && set[YLO]) G->data[jso1 + ieo1] = -(G->data[jso1 + iei1] - G->data[jsi1 + iei1] + G->data[jsi1 + ieo1]);
-
+ /* d2/dxdy */ if (set[XHI] && set[YLO]) G->data[jso1 + ieo1] = G->data[js + ieo1] + G->data[jso1 + ie] - G->data[js + ie];
+
/* Now set Laplacian = 0 on interior edge points, skipping corners: */
for (i = iwi1; i <= iei1; i++) {
if (set[YHI]) G->data[jno1 + i] = (float)(4.0 * G->data[jn + i]) - (G->data[jn + i - 1] + G->data[jn + i + 1] + G->data[jni1 + i]);
@@ -10856,19 +10873,19 @@ int gmtlib_image_BC_set (struct GMT_CTRL *GMT, struct GMT_IMAGE *G) {
for (b = 0; b < nb; b++) {
/* d2/dx2 */ if (set[XLO]) G->data[nb*(jn + iwo1)+b] = (unsigned char)lrint (2.0 * G->data[nb*(jn + iw)+b] - G->data[nb*(jn + iwi1)+b]);
/* d2/dy2 */ if (set[YHI]) G->data[nb*(jno1 + iw)+b] = (unsigned char)lrint (2.0 * G->data[nb*(jn + iw)+b] - G->data[nb*(jni1 + iw)+b]);
- /* d2/dxdy */ if (set[XLO] && set[YHI]) G->data[nb*(jno1 + iwo1)+b] = (unsigned char)lrint (-(G->data[nb*(jno1 + iwi1)+b] - G->data[nb*(jni1 + iwi1)+b] + G->data[nb*(jni1 + iwo1)+b]));
+ /* d2/dxdy */ if (set[XLO] && set[YHI]) G->data[nb*(jno1 + iwo1)+b] = (unsigned char)lrint (G->data[nb*(jn + iwo1)+b] + G->data[nb*(jno1 + iw)+b] - G->data[nb*(jn + iw)+b]);
/* d2/dx2 */ if (set[XHI]) G->data[nb*(jn + ieo1)+b] = (unsigned char)lrint (2.0 * G->data[nb*(jn + ie)+b] - G->data[nb*(jn + iei1)+b]);
/* d2/dy2 */ if (set[YHI]) G->data[nb*(jno1 + ie)+b] = (unsigned char)lrint (2.0 * G->data[nb*(jn + ie)+b] - G->data[nb*(jni1 + ie)+b]);
- /* d2/dxdy */ if (set[XHI] && set[YHI]) G->data[nb*(jno1 + ieo1)+b] = (unsigned char)lrint (-(G->data[nb*(jno1 + iei1)+b] - G->data[nb*(jni1 + iei1)+b] + G->data[nb*(jni1 + ieo1)+b]));
+ /* d2/dxdy */ if (set[XHI] && set[YHI]) G->data[nb*(jno1 + ieo1)+b] = (unsigned char)lrint (G->data[nb*(jn + ieo1)+b] + G->data[nb*(jno1 + ie)+b] - G->data[nb*(jn + ie)+b]);
/* d2/dx2 */ if (set[XLO]) G->data[nb*(js + iwo1)+b] = (unsigned char)lrint (2.0 * G->data[nb*(js + iw)+b] - G->data[nb*(js + iwi1)+b]);
/* d2/dy2 */ if (set[YLO]) G->data[nb*(jso1 + iw)+b] = (unsigned char)lrint (2.0 * G->data[nb*(js + iw)+b] - G->data[nb*(jsi1 + iw)+b]);
- /* d2/dxdy */ if (set[XLO] && set[YLO]) G->data[nb*(jso1 + iwo1)+b] = (unsigned char)lrint (-(G->data[nb*(jso1 + iwi1)+b] - G->data[nb*(jsi1 + iwi1)+b] + G->data[nb*(jsi1 + iwo1)+b]));
+ /* d2/dxdy */ if (set[XLO] && set[YLO]) G->data[nb*(jso1 + iwo1)+b] = (unsigned char)lrint (G->data[nb*(js + iwo1)+b] + G->data[nb*(jso1 + iw)+b] - G->data[nb*(js + iw)+b]);
/* d2/dx2 */ if (set[XHI]) G->data[nb*(js + ieo1)+b] = (unsigned char)lrint (2.0 * G->data[nb*(js + ie)+b] - G->data[nb*(js + iei1)+b]);
/* d2/dy2 */ if (set[YLO]) G->data[nb*(jso1 + ie)+b] = (unsigned char)lrint (2.0 * G->data[nb*(js + ie)+b] - G->data[nb*(jsi1 + ie)+b]);
- /* d2/dxdy */ if (set[XHI] && set[YLO]) G->data[nb*(jso1 + ieo1)+b] = (unsigned char)lrint (-(G->data[nb*(jso1 + iei1)+b] - G->data[nb*(jsi1 + iei1)+b] + G->data[nb*(jsi1 + ieo1)+b]));
+ /* d2/dxdy */ if (set[XHI] && set[YLO]) G->data[nb*(jso1 + ieo1)+b] = (unsigned char)lrint (G->data[nb*(js + ieo1)] + G->data[nb*(jso1 + ie)] - G->data[nb*(js + ie)+b]);
}
/* Now set Laplacian = 0 on interior edge points, skipping corners: */
diff --git a/src/gmt_symbol.h b/src/gmt_symbol.h
index 1db315e..e7395ef 100644
--- a/src/gmt_symbol.h
+++ b/src/gmt_symbol.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_symbol.h 18055 2017-04-28 17:46:38Z pwessel $
+ * $Id: gmt_symbol.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_synopsis.h b/src/gmt_synopsis.h
index 7f2c827..fb1b43d 100644
--- a/src/gmt_synopsis.h
+++ b/src/gmt_synopsis.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_synopsis.h 18304 2017-06-02 04:58:28Z pwessel $
+ * $Id: gmt_synopsis.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_texture.h b/src/gmt_texture.h
index 4e0a031..d0a9113 100644
--- a/src/gmt_texture.h
+++ b/src/gmt_texture.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_texture.h 18069 2017-04-29 22:43:25Z pwessel $
+ * $Id: gmt_texture.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_time.h b/src/gmt_time.h
index 946447f..5775bbe 100644
--- a/src/gmt_time.h
+++ b/src/gmt_time.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_time.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmt_time.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_types.h b/src/gmt_types.h
index e006c4f..c59239e 100644
--- a/src/gmt_types.h
+++ b/src/gmt_types.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_types.h 18041 2017-04-26 23:09:48Z pwessel $
+ * $Id: gmt_types.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_vector.c b/src/gmt_vector.c
index ed85760..005215d 100644
--- a/src/gmt_vector.c
+++ b/src/gmt_vector.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmt_vector.c 18396 2017-06-19 21:05:48Z pwessel $
+ * $Id: gmt_vector.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmt_version.h.in b/src/gmt_version.h.in
index c050fb3..8959a98 100644
--- a/src/gmt_version.h.in
+++ b/src/gmt_version.h.in
@@ -1,7 +1,7 @@
/*
- * $Id: gmt_version.h.in 17858 2017-04-03 22:11:08Z jluis $
+ * $Id: gmt_version.h.in 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo,
+ * Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo,
* F. Wobbe, and J. Luis
*
* See LICENSE.TXT file for copying and redistribution conditions.
diff --git a/src/gmtconnect.c b/src/gmtconnect.c
index ca8eca9..3c0395d 100644
--- a/src/gmtconnect.c
+++ b/src/gmtconnect.c
@@ -1,7 +1,7 @@
/*
- * $Id: gmtconnect.c 18134 2017-05-05 08:34:43Z pwessel $
+ * $Id: gmtconnect.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmtconvert.c b/src/gmtconvert.c
index 08ec98e..ba07a02 100644
--- a/src/gmtconvert.c
+++ b/src/gmtconvert.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmtconvert.c 18363 2017-06-12 01:30:50Z pwessel $
+ * $Id: gmtconvert.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmtdefaults.c b/src/gmtdefaults.c
index 57cf8c2..1382d3b 100644
--- a/src/gmtdefaults.c
+++ b/src/gmtdefaults.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmtdefaults.c 18018 2017-04-22 00:35:39Z pwessel $
+ * $Id: gmtdefaults.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmtget.c b/src/gmtget.c
index e5d5ddc..cab7b8e 100644
--- a/src/gmtget.c
+++ b/src/gmtget.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmtget.c 17798 2017-03-27 04:50:17Z pwessel $
+ * $Id: gmtget.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmtinfo.c b/src/gmtinfo.c
index c6081ce..7af80a3 100644
--- a/src/gmtinfo.c
+++ b/src/gmtinfo.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmtinfo.c 18269 2017-05-29 21:36:05Z pwessel $
+ * $Id: gmtinfo.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmtlogo.c b/src/gmtlogo.c
index 8d28c97..7c94a08 100644
--- a/src/gmtlogo.c
+++ b/src/gmtlogo.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmtlogo.c 18254 2017-05-28 19:46:56Z pwessel $
+ * $Id: gmtlogo.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmtmath.c b/src/gmtmath.c
index 1f0f4b7..2e6455e 100644
--- a/src/gmtmath.c
+++ b/src/gmtmath.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmtmath.c 18404 2017-06-20 18:10:00Z pwessel $
+ * $Id: gmtmath.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -3060,49 +3060,31 @@ GMT_LOCAL int table_MOD (struct GMT_CTRL *GMT, struct GMTMATH_INFO *info, struct
GMT_LOCAL int table_MODE (struct GMT_CTRL *GMT, struct GMTMATH_INFO *info, struct GMTMATH_STACK *S[], unsigned int last, unsigned int col) {
/*OPERATOR: MODE 1 1 Mode value (Least Median of Squares) of A. */
uint64_t s, row, k = 0;
- unsigned int prev;
- double wmed;
- struct GMT_DATATABLE *T = NULL, *T_prev = NULL;
- struct GMT_OBSERVATION *pair = NULL;
-
- if ((prev = gmt_assign_ptrs (GMT, last, S, &T, &T_prev)) == UINT_MAX) return -1; /* Set up pointers and prev; exit if running out of stack */
+ unsigned int gmt_mode_selection = 0, GMT_n_multiples = 0;
+ double wmed, *z = NULL;
+ struct GMT_DATATABLE *T = S[last]->D->table[0];
- if (S[prev]->constant) { /* Trivial case */
+ if (S[last]->constant) { /* Trivial case */
for (s = 0; s < info->T->n_segments; s++)
- for (row = 0; row < info->T->segment[s]->n_rows; row++) T_prev->segment[s]->data[col][row] = S[prev]->factor;
+ for (row = 0; row < info->T->segment[s]->n_rows; row++) T->segment[s]->data[col][row] = S[last]->factor;
return 0;
}
- pair = gmt_M_memory (GMT, NULL, info->T->n_records, struct GMT_OBSERVATION);
+ if (!info->local) z = gmt_M_memory (GMT, NULL, info->T->n_records, double);
for (s = k = 0; s < info->T->n_segments; s++) {
if (info->local) {
- for (row = k = 0; row < info->T->segment[s]->n_rows; row++) {
- if (gmt_M_is_dnan (T_prev->segment[s]->data[col][row])) continue;
- if (gmt_M_is_dnan (T->segment[s]->data[col][row])) continue;
- pair[k].value = (float)T_prev->segment[s]->data[col][row];
- pair[k].weight = (float)T->segment[s]->data[col][row];
- k++;
- }
- wmed = (float)gmt_mode_weighted (GMT, pair, k);
+ gmt_mode (GMT, T->segment[s]->data[col], info->T->segment[s]->n_rows, info->T->segment[s]->n_rows/2, true, gmt_mode_selection, &GMT_n_multiples, &wmed);
for (row = 0; row < info->T->segment[s]->n_rows; row++) T->segment[s]->data[col][row] = wmed;
}
else { /* Just accumulate the total table */
- for (row = 0; row < info->T->segment[s]->n_rows; row++) {
- if (gmt_M_is_dnan (T_prev->segment[s]->data[col][row])) continue;
- if (gmt_M_is_dnan (T->segment[s]->data[col][row])) continue;
- pair[k].value = (float)T_prev->segment[s]->data[col][row];
- pair[k].weight = (float)T->segment[s]->data[col][row];
- k++;
- }
+ gmt_M_memcpy (&z[k], T->segment[s]->data[col], info->T->segment[s]->n_rows, double);
+ k += info->T->segment[s]->n_rows;
}
}
- if (info->local) { /* Done with local */
- gmt_M_free (GMT, pair);
- return 0;
- }
- wmed = (float)gmt_mode_weighted (GMT, pair, k);
- gmt_M_free (GMT, pair);
+ if (info->local) return 0; /* Done with local */
+ gmt_mode (GMT, z, info->T->n_records, info->T->n_records/2, true, gmt_mode_selection, &GMT_n_multiples, &wmed);
+ gmt_M_free (GMT, z);
for (s = 0; s < info->T->n_segments; s++)
for (row = 0; row < info->T->segment[s]->n_rows; row++) T->segment[s]->data[col][row] = wmed;
diff --git a/src/gmtmath.h.in b/src/gmtmath.h.in
index 4caf869..2e95f10 100644
--- a/src/gmtmath.h.in
+++ b/src/gmtmath.h.in
@@ -1,8 +1,8 @@
/*--------------------------------------------------------------------
*
- * $Id: gmtmath.h.in 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmtmath.h.in 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo,
+ * Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo,
* F. Wobbe, and J. Luis
* See LICENSE.TXT file for copying and redistribution conditions.
*
diff --git a/src/gmtmath_explain.h.in b/src/gmtmath_explain.h.in
index 2ea6414..cf9d10a 100644
--- a/src/gmtmath_explain.h.in
+++ b/src/gmtmath_explain.h.in
@@ -1,8 +1,8 @@
/*--------------------------------------------------------------------
*
- * $Id: gmtmath_explain.h.in 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmtmath_explain.h.in 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo,
+ * Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo,
* F. Wobbe, and J. Luis
* See LICENSE.TXT file for copying and redistribution conditions.
*
diff --git a/src/gmtmath_op.h.in b/src/gmtmath_op.h.in
index 5e3c301..a1d88f6 100644
--- a/src/gmtmath_op.h.in
+++ b/src/gmtmath_op.h.in
@@ -1,8 +1,8 @@
/*--------------------------------------------------------------------
*
- * $Id: gmtmath_op.h.in 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gmtmath_op.h.in 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo,
+ * Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo,
* F. Wobbe, and J. Luis
* See LICENSE.TXT file for copying and redistribution conditions.
*
diff --git a/src/gmtread.c b/src/gmtread.c
index 8054cc6..f365355 100644
--- a/src/gmtread.c
+++ b/src/gmtread.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmtread.c 18236 2017-05-23 22:50:38Z jluis $
+ * $Id: gmtread.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -31,7 +31,7 @@
#define THIS_MODULE_PURPOSE "Read GMT objects into external API"
#define THIS_MODULE_KEYS "-T-,<?{,>?}"
#define THIS_MODULE_NEEDS ""
-#define THIS_MODULE_OPTIONS "->RVbf"
+#define THIS_MODULE_OPTIONS "->RVbfi"
/* Control structure for read */
diff --git a/src/gmtregress.c b/src/gmtregress.c
index d8c65dd..285778d 100644
--- a/src/gmtregress.c
+++ b/src/gmtregress.c
@@ -1,7 +1,7 @@
/*
- * $Id: gmtregress.c 18171 2017-05-07 02:37:02Z pwessel $
+ * $Id: gmtregress.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmtselect.c b/src/gmtselect.c
index 853d022..ff61436 100644
--- a/src/gmtselect.c
+++ b/src/gmtselect.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmtselect.c 18404 2017-06-20 18:10:00Z pwessel $
+ * $Id: gmtselect.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmtset.c b/src/gmtset.c
index d6acfd3..e0cefbd 100644
--- a/src/gmtset.c
+++ b/src/gmtset.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmtset.c 18018 2017-04-22 00:35:39Z pwessel $
+ * $Id: gmtset.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmtsimplify.c b/src/gmtsimplify.c
index 22b6e2d..bbe5292 100644
--- a/src/gmtsimplify.c
+++ b/src/gmtsimplify.c
@@ -1,7 +1,7 @@
/*
- * $Id: gmtsimplify.c 18134 2017-05-05 08:34:43Z pwessel $
+ * $Id: gmtsimplify.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmtspatial.c b/src/gmtspatial.c
index 43e8483..d122620 100644
--- a/src/gmtspatial.c
+++ b/src/gmtspatial.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
-* $Id: gmtspatial.c 18404 2017-06-20 18:10:00Z pwessel $
+* $Id: gmtspatial.c 19521 2017-12-27 22:38:24Z pwessel $
*
-* Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+* 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.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff --git a/src/gmtswitch b/src/gmtswitch
index 2757968..4a339aa 100755
--- a/src/gmtswitch
+++ b/src/gmtswitch
@@ -1,8 +1,8 @@
#!/bin/bash
#
-# $Id: gmtswitch 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: gmtswitch 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
@@ -76,7 +76,7 @@ home=`pwd`
if [ ! -f "$home/.gmtversions" ]; then # No .gmtversions exists yet, first do that part
cat << EOF >&2
-GMTSWITCH $Revision: 17451 $
+GMTSWITCH $Revision: 19521 $
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
diff --git a/src/gmtswitch.bat b/src/gmtswitch.bat
index a426914..fdd243b 100755
--- a/src/gmtswitch.bat
+++ b/src/gmtswitch.bat
@@ -1,8 +1,8 @@
@ECHO OFF
REM
-REM $Id: gmtswitch.bat 17451 2017-01-16 21:36:06Z pwessel $
+REM $Id: gmtswitch.bat 19521 2017-12-27 22:38:24Z pwessel $
REM
-REM Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+REM Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
REM See LICENSE.TXT file for copying and redistribution conditions.
REM
REM This program is free software; you can redistribute it and/or modify
diff --git a/src/gmtvector.c b/src/gmtvector.c
index 8a57279..0182991 100644
--- a/src/gmtvector.c
+++ b/src/gmtvector.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
-* $Id: gmtvector.c 18134 2017-05-05 08:34:43Z pwessel $
+* $Id: gmtvector.c 19521 2017-12-27 22:38:24Z pwessel $
*
-* Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+* 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.
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff --git a/src/gmtwhich.c b/src/gmtwhich.c
index daeb502..791c307 100644
--- a/src/gmtwhich.c
+++ b/src/gmtwhich.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmtwhich.c 18041 2017-04-26 23:09:48Z pwessel $
+ * $Id: gmtwhich.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gmtwrite.c b/src/gmtwrite.c
index a53ba16..abb1b82 100644
--- a/src/gmtwrite.c
+++ b/src/gmtwrite.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmtwrite.c 17798 2017-03-27 04:50:17Z pwessel $
+ * $Id: gmtwrite.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grd2cpt.c b/src/grd2cpt.c
index 61bd985..c19ee11 100644
--- a/src/grd2cpt.c
+++ b/src/grd2cpt.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grd2cpt.c 18110 2017-05-03 01:29:16Z pwessel $
+ * $Id: grd2cpt.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grd2rgb.c b/src/grd2rgb.c
index 4bcecb6..6d8057f 100644
--- a/src/grd2rgb.c
+++ b/src/grd2rgb.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grd2rgb.c 18282 2017-05-30 01:57:05Z pwessel $
+ * $Id: grd2rgb.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grd2sph.c.template b/src/grd2sph.c.template
index 424cd54..212f193 100644
--- a/src/grd2sph.c.template
+++ b/src/grd2sph.c.template
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grd2sph.c.template 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: grd2sph.c.template 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grd2xyz.c b/src/grd2xyz.c
index 262caa9..de56ca7 100644
--- a/src/grd2xyz.c
+++ b/src/grd2xyz.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grd2xyz.c 18190 2017-05-08 09:50:13Z pwessel $
+ * $Id: grd2xyz.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grdblend.c b/src/grdblend.c
index d9ca951..89a896e 100644
--- a/src/grdblend.c
+++ b/src/grdblend.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdblend.c 18282 2017-05-30 01:57:05Z pwessel $
+ * $Id: grdblend.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -90,6 +90,7 @@ struct GRDBLEND_INFO { /* Structure with info about each input grid file */
int in_j0, in_j1, out_j0, out_j1; /* Indices of outer and inner y-coordinates (in output grid coordinates) */
off_t offset; /* grid offset when the grid extends beyond north */
off_t skip; /* Byte offset to skip in native binary files */
+ off_t pos; /* Current byte offset for native binary files */
bool ignore; /* true if the grid is entirely outside desired region */
bool outside; /* true if the current output row is outside the range of this grid */
bool invert; /* true if weight was given as negative and we want to taper to zero INSIDE the grid region */
@@ -397,6 +398,8 @@ GMT_LOCAL int init_blend_job (struct GMT_CTRL *GMT, char **files, unsigned int n
else
B[n].skip = (off_t)(B[n].RbR->n_byte * abs (B[n].out_j0)); /* do the fseek when we are ready to read first row */
}
+ GMT_Report (GMT->parent, GMT_MSG_DEBUG, "Grid %s: out: %d/%d/%d/%d in: %d/%d/%d/%d skip: %d offset: %d\n",
+ B[n].file, B[n].out_i0, B[n].out_i1, B[n].out_j1, B[n].out_j0, B[n].in_i0, B[n].in_i1, B[n].in_j1, B[n].in_j0, (int)B[n].skip, (int)B[n].offset);
/* Allocate space for one entire row */
@@ -448,8 +451,19 @@ GMT_LOCAL int sync_input_rows (struct GMT_CTRL *GMT, int row, struct GRDBLEND_IN
if ((B[k].G = GMT_Read_Data (GMT->parent, GMT_IS_GRID, GMT_IS_FILE, GMT_IS_SURFACE, GMT_CONTAINER_ONLY|GMT_GRID_ROW_BY_ROW, NULL, B[k].file, NULL)) == NULL) {
GMT_exit (GMT, GMT_GRID_READ_ERROR); return GMT_GRID_READ_ERROR;
}
- if (B[k].skip) fseek (B[k].RbR->fp, B[k].skip, SEEK_CUR); /* Position for native binary files */
- B[k].RbR->start[0] += B[k].offset; /* Start position for netCDF files */
+ gmt_M_memcpy (B[k].RbR, B[k].G->extra, 1, struct GMT_GRID_ROWBYROW); /* Duplicate, since GMT_Destroy_Data will free the header->extra */
+ if (B[k].skip) { /* Position for native binary files */
+ if (fseek (B[k].RbR->fp, B[k].skip, SEEK_CUR)) { /* Position for native binary files */
+ GMT_exit (GMT, GMT_GRDIO_SEEK_FAILED); return GMT_GRDIO_SEEK_FAILED;
+ }
+#ifdef DEBUG
+ B[k].RbR->pos = ftell (B[k].RbR->fp);
+#endif
+ }
+ else { /* Set offsets for netCDF files */
+ B[k].RbR->start[0] += B[k].offset; /* Start position for netCDF files */
+ gmt_M_memcpy (B[k].G->extra, B[k].RbR, 1, struct GMT_GRID_ROWBYROW); /* Synchronize these two again */
+ }
B[k].open = true;
}
GMT_Get_Row (GMT->parent, 0, B[k].G, B[k].z); /* Get one row from this file */
diff --git a/src/grdclip.c b/src/grdclip.c
index 3580225..d88b2ec 100644
--- a/src/grdclip.c
+++ b/src/grdclip.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdclip.c 18110 2017-05-03 01:29:16Z pwessel $
+ * $Id: grdclip.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grdcontour.c b/src/grdcontour.c
index 580b2f8..6e07f67 100644
--- a/src/grdcontour.c
+++ b/src/grdcontour.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdcontour.c 18110 2017-05-03 01:29:16Z pwessel $
+ * $Id: grdcontour.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -435,7 +435,7 @@ GMT_LOCAL int parse (struct GMT_CTRL *GMT, struct GRDCONTOUR_CTRL *Ctrl, struct
A[0] = string[0]; Ctrl->T.txt[0] = strdup (A);
A[0] = string[1]; Ctrl->T.txt[1] = strdup (A);
}
- else if (strchr (&(opt->arg[j]), ',') && (n = sscanf (&(opt->arg[j]), "%[^,],%s", txt_a, txt_b)) == 2) { /* Found :<labellow>,<labelhigh> */
+ else if (strchr (string, ',') && (n = sscanf (string, "%[^,],%s", txt_a, txt_b)) == 2) { /* Found :<labellow>,<labelhigh> */
Ctrl->T.txt[0] = strdup (txt_a);
Ctrl->T.txt[1] = strdup (txt_b);
}
@@ -896,7 +896,8 @@ int GMT_grdcontour (void *V_API, int mode, void *args) {
/* Determine what wesn to pass to map_setup */
- if (!GMT->common.R.active[RSET]) gmt_M_memcpy (GMT->common.R.wesn, G->header->wesn, 4, double); /* -R was not set so we use the grid domain */
+ if (!GMT->common.R.active[RSET]) /* -R was not set so we use the grid domain */
+ gmt_set_R_from_grd (GMT, G->header);
if (need_proj && gmt_map_setup (GMT, GMT->common.R.wesn)) Return (GMT_PROJECTION_ERROR);
@@ -1092,6 +1093,10 @@ int GMT_grdcontour (void *V_API, int mode, void *args) {
if (!GMT->current.map.z_periodic && min < G->header->z_min) min += Ctrl->C.interval;
max = ceil (G->header->z_max / Ctrl->C.interval) * Ctrl->C.interval;
if (max > G->header->z_max) max -= Ctrl->C.interval;
+ if (Ctrl->A.interval > Ctrl->C.interval && fabs ((Ctrl->A.interval/Ctrl->C.interval) - irint (Ctrl->A.interval/Ctrl->C.interval)) > GMT_CONV4_LIMIT)
+ GMT_Report (API, GMT_MSG_VERBOSE, "Warning: Annotation interval is not a multiple of contour interval - no annotated contours will be drawn.\n");
+ else if (Ctrl->contour.annot && Ctrl->A.interval < Ctrl->C.interval)
+ GMT_Report (API, GMT_MSG_VERBOSE, "Warning: Annotation interval < contour interval - some/all annotated contours will not be drawn.\n");
for (c = irint (min/Ctrl->C.interval), n_contours = 0; c <= irint (max/Ctrl->C.interval); c++, n_contours++) {
if (n_contours == n_alloc) {
n_tmp = n_alloc;
diff --git a/src/grdconvert.c b/src/grdconvert.c
index ff5e453..f422354 100644
--- a/src/grdconvert.c
+++ b/src/grdconvert.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdconvert.c 18174 2017-05-07 05:33:44Z pwessel $
+ * $Id: grdconvert.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -231,9 +231,12 @@ int GMT_grdconvert (void *V_API, int mode, void *args) {
if (GMT->common.R.active[RSET]) { /* Specified a subset */
bool global = false;
+ double noise[2];
+ noise[GMT_X] = GMT_CONV4_LIMIT * Grid->header->inc[GMT_X]; /* Tolerate a bit of slop */
+ noise[GMT_Y] = GMT_CONV4_LIMIT * Grid->header->inc[GMT_Y];
global = gmt_M_grd_is_global (GMT, Grid->header);
- if (!global && (GMT->common.R.wesn[XLO] < Grid->header->wesn[XLO] || GMT->common.R.wesn[XHI] > Grid->header->wesn[XHI])) error++;
- if (GMT->common.R.wesn[YLO] < Grid->header->wesn[YLO] || GMT->common.R.wesn[YHI] > Grid->header->wesn[YHI]) error++;
+ if (!global && (GMT->common.R.wesn[XLO] < (Grid->header->wesn[XLO]-noise[GMT_X]) || GMT->common.R.wesn[XHI] > (Grid->header->wesn[XHI]+noise[GMT_X]))) error++;
+ if (GMT->common.R.wesn[YLO] < (Grid->header->wesn[YLO]-noise[GMT_Y]) || GMT->common.R.wesn[YHI] > (Grid->header->wesn[YHI]+noise[GMT_Y])) error++;
if (error) {
GMT_Report (API, GMT_MSG_NORMAL, "Subset exceeds data domain!\n");
Return (GMT_RUNTIME_ERROR);
diff --git a/src/grdcut.c b/src/grdcut.c
index 88a63fd..7758cdd 100644
--- a/src/grdcut.c
+++ b/src/grdcut.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdcut.c 18110 2017-05-03 01:29:16Z pwessel $
+ * $Id: grdcut.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grdedit.c b/src/grdedit.c
index 0e327bf..1cb83a5 100644
--- a/src/grdedit.c
+++ b/src/grdedit.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdedit.c 18174 2017-05-07 05:33:44Z pwessel $
+ * $Id: grdedit.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grdfft.c b/src/grdfft.c
index cf3ebcf..c82471b 100644
--- a/src/grdfft.c
+++ b/src/grdfft.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdfft.c 18110 2017-05-03 01:29:16Z pwessel $
+ * $Id: grdfft.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grdfill.c b/src/grdfill.c
index 575dda4..bede7e0 100644
--- a/src/grdfill.c
+++ b/src/grdfill.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdfill.c 18110 2017-05-03 01:29:16Z pwessel $
+ * $Id: grdfill.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grdfilter.c b/src/grdfilter.c
index 1ed21df..78fbb94 100644
--- a/src/grdfilter.c
+++ b/src/grdfilter.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdfilter.c 18282 2017-05-30 01:57:05Z pwessel $
+ * $Id: grdfilter.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grdfilter_mt.c b/src/grdfilter_mt.c
index 360988a..2c14788 100644
--- a/src/grdfilter_mt.c
+++ b/src/grdfilter_mt.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdfilter_mt.c 18282 2017-05-30 01:57:05Z pwessel $
+ * $Id: grdfilter_mt.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grdgradient.c b/src/grdgradient.c
index 53d3cab..c4e3525 100644
--- a/src/grdgradient.c
+++ b/src/grdgradient.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdgradient.c 18110 2017-05-03 01:29:16Z pwessel $
+ * $Id: grdgradient.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grdhisteq.c b/src/grdhisteq.c
index 20ffb29..173fd15 100644
--- a/src/grdhisteq.c
+++ b/src/grdhisteq.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdhisteq.c 18212 2017-05-09 23:16:30Z jluis $
+ * $Id: grdhisteq.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grdimage.c b/src/grdimage.c
index e7775b6..590df9c 100644
--- a/src/grdimage.c
+++ b/src/grdimage.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdimage.c 18257 2017-05-28 21:57:30Z pwessel $
+ * $Id: grdimage.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -196,6 +196,8 @@ GMT_LOCAL int usage (struct GMTAPI_CTRL *API, int level) {
return (GMT_MODULE_USAGE);
}
+EXTERN_MSC int gmtinit_parse_n_option (struct GMT_CTRL *GMT, char *item);
+
GMT_LOCAL int parse (struct GMT_CTRL *GMT, struct GRDIMAGE_CTRL *Ctrl, struct GMT_OPTION *options) {
/* This parses the options provided to grdimage and sets parameters in Ctrl.
* Note Ctrl has already been initialized and non-zero default values set.
@@ -373,6 +375,11 @@ GMT_LOCAL int parse (struct GMT_CTRL *GMT, struct GRDIMAGE_CTRL *Ctrl, struct GM
break;
}
}
+
+ if (!GMT->common.n.active && (!Ctrl->C.active || gmt_is_cpt_master (GMT, Ctrl->C.file)))
+ /* Unless user selected -n we want the default not to exceed data range on projection when we are auto-scaling a master table */
+ n_errors += gmtinit_parse_n_option (GMT, "b+c");
+
#if 0 /* Want this to be in modern mode only and done centrally instead */
if (!GMT->common.J.active) { /* When no projection specified, use fake linear projection */
gmt_parse_common_options (GMT, "J", 'J', "X15c");
@@ -617,7 +624,8 @@ int GMT_grdimage (void *V_API, int mode, void *args) {
/* Determine what wesn to pass to map_setup */
- if (!GMT->common.R.active[RSET] && n_grids) gmt_M_memcpy (GMT->common.R.wesn, Grid_orig[0]->header->wesn, 4, double);
+ if (!GMT->common.R.active[RSET] && n_grids) /* -R was not set so we use the grid domain */
+ gmt_set_R_from_grd (GMT, Grid_orig[0]->header);
if (gmt_M_err_pass (GMT, gmt_map_setup (GMT, GMT->common.R.wesn), "")) Return (GMT_PROJECTION_ERROR);
diff --git a/src/grdinfo.c b/src/grdinfo.c
index 80f8a0f..1bbc116 100644
--- a/src/grdinfo.c
+++ b/src/grdinfo.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdinfo.c 18172 2017-05-07 02:44:25Z pwessel $
+ * $Id: grdinfo.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grdlandmask.c b/src/grdlandmask.c
index c71d596..9457b6f 100644
--- a/src/grdlandmask.c
+++ b/src/grdlandmask.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdlandmask.c 18426 2017-06-21 23:39:43Z pwessel $
+ * $Id: grdlandmask.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grdmask.c b/src/grdmask.c
index 17c5133..56ae2c7 100644
--- a/src/grdmask.c
+++ b/src/grdmask.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdmask.c 18432 2017-06-22 00:20:07Z pwessel $
+ * $Id: grdmask.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grdmath.c b/src/grdmath.c
index 15fbfaf..2f981ba 100644
--- a/src/grdmath.c
+++ b/src/grdmath.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdmath.c 18391 2017-06-17 21:24:36Z pwessel $
+ * $Id: grdmath.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -4079,7 +4079,7 @@ GMT_LOCAL void grd_TPDF (struct GMT_CTRL *GMT, struct GRDMATH_INFO *info, struct
}
GMT_LOCAL void grd_TRIM (struct GMT_CTRL *GMT, struct GRDMATH_INFO *info, struct GRDMATH_STACK *stack[], unsigned int last)
-/*OPERATOR: TRIM 3 1 Alpha-trimming for %-left = A, %-right = B, and grid = C. */
+/*OPERATOR: TRIM 3 1 Alpha-trimming for %%-left = A, %%-right = B, and grid = C. */
{
/* Determine cumulative distribution and find left and right tail z cutoffs,
* then set grid values in the tails to NaN */
diff --git a/src/grdmath.h.in b/src/grdmath.h.in
index ac4dbff..4129782 100644
--- a/src/grdmath.h.in
+++ b/src/grdmath.h.in
@@ -1,8 +1,8 @@
/*--------------------------------------------------------------------
*
- * $Id: grdmath.h.in 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: grdmath.h.in 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo,
+ * Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo,
* F. Wobbe, and J. Luis
* See LICENSE.TXT file for copying and redistribution conditions.
*
diff --git a/src/grdmath_explain.h.in b/src/grdmath_explain.h.in
index 4fcb9b0..1289062 100644
--- a/src/grdmath_explain.h.in
+++ b/src/grdmath_explain.h.in
@@ -1,8 +1,8 @@
/*--------------------------------------------------------------------
*
- * $Id: grdmath_explain.h.in 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: grdmath_explain.h.in 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo,
+ * Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo,
* F. Wobbe, and J. Luis
* See LICENSE.TXT file for copying and redistribution conditions.
*
diff --git a/src/grdmath_op.h.in b/src/grdmath_op.h.in
index 6432416..7387951 100644
--- a/src/grdmath_op.h.in
+++ b/src/grdmath_op.h.in
@@ -1,8 +1,8 @@
/*--------------------------------------------------------------------
*
- * $Id: grdmath_op.h.in 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: grdmath_op.h.in 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo,
+ * Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo,
* F. Wobbe, and J. Luis
* See LICENSE.TXT file for copying and redistribution conditions.
*
diff --git a/src/grdpaste.c b/src/grdpaste.c
index f4f5e98..6efb743 100644
--- a/src/grdpaste.c
+++ b/src/grdpaste.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdpaste.c 18110 2017-05-03 01:29:16Z pwessel $
+ * $Id: grdpaste.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grdproject.c b/src/grdproject.c
index 4ca2ba0..fb69472 100644
--- a/src/grdproject.c
+++ b/src/grdproject.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdproject.c 18282 2017-05-30 01:57:05Z pwessel $
+ * $Id: grdproject.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -270,7 +270,7 @@ int GMT_grdproject (void *V_API, int mode, void *args) {
if (gmt_M_err_pass (GMT, gmt_map_setup (GMT, GMT->common.R.wesn), "")) Return (GMT_PROJECTION_ERROR);
}
else { /* Do inverse transformation */
- double x_c, y_c, lon_t, lat_t, xSW, ySW, xNW, yNW, xNE, yNE, xSE, ySE;
+ double x_c, y_c, lon_t, lat_t, xSW, ySW, xNW, yNW, xNE, yNE, xSE, ySE, x, y, xb, yT, yB, dx;
/* Obtain a first crude estimation of the good -R */
x_c = (wesn[XLO] + wesn[XHI]) / 2.0; /* mid point of projected coords */
y_c = (wesn[YLO] + wesn[YHI]) / 2.0;
@@ -325,7 +325,16 @@ int GMT_grdproject (void *V_API, int mode, void *args) {
gmt_xy_to_geo (GMT, &xNW, &yNW, wesn[XLO], wesn[YHI]); /* NW corner */
gmt_xy_to_geo (GMT, &xNE, &yNE, wesn[XHI], wesn[YHI]); /* NE corner */
gmt_xy_to_geo (GMT, &xSE, &ySE, wesn[XHI], wesn[YLO]); /* SE corner */
- sprintf (opt_R, "%.12f/%.12f/%.12f/%.12fr", MIN(xSW, xNW), MIN(ySW, ySE), MAX(xNE, xSE), MAX(yNW, yNE));
+ dx = (wesn[XHI] - wesn[XLO]) / 20;
+ yT = MAX(yNW, yNE); yB = MIN(ySW, ySE);
+ for (k = 0; k < 20; k++) { /* Run along the North and South boundary */
+ xb = wesn[XLO] + k * dx;
+ gmt_xy_to_geo (GMT, &x, &y, xb, wesn[YHI]);
+ yT = MAX(yT, y);
+ gmt_xy_to_geo (GMT, &x, &y, xb, wesn[YLO]);
+ yB = MIN(yB, y);
+ }
+ sprintf (opt_R, "%.12f/%.12f/%.12f/%.12fr", MIN(xSW, xNW), yB, MAX(xNE, xSE), yT);
if (gmt_M_is_verbose (GMT, GMT_MSG_VERBOSE)) GMT_Message (API, GMT_TIME_NONE, "Second opt_R\t %s\n", opt_R);
GMT->common.R.active[RSET] = false;
diff --git a/src/grdraster.c b/src/grdraster.c
index 64981ae..1352691 100644
--- a/src/grdraster.c
+++ b/src/grdraster.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdraster.c 18282 2017-05-30 01:57:05Z pwessel $
+ * $Id: grdraster.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grdsample.c b/src/grdsample.c
index 9c2fcd3..50a9fea 100644
--- a/src/grdsample.c
+++ b/src/grdsample.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdsample.c 18282 2017-05-30 01:57:05Z pwessel $
+ * $Id: grdsample.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grdtrack.c b/src/grdtrack.c
index fdf0c0e..351ff5f 100644
--- a/src/grdtrack.c
+++ b/src/grdtrack.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdtrack.c 18171 2017-05-07 02:37:02Z pwessel $
+ * $Id: grdtrack.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grdtrend.c b/src/grdtrend.c
index f1df0aa..d753490 100644
--- a/src/grdtrend.c
+++ b/src/grdtrend.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdtrend.c 18110 2017-05-03 01:29:16Z pwessel $
+ * $Id: grdtrend.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/grdvector.c b/src/grdvector.c
index 9f0f80a..d93f253 100644
--- a/src/grdvector.c
+++ b/src/grdvector.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdvector.c 18282 2017-05-30 01:57:05Z pwessel $
+ * $Id: grdvector.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -371,7 +371,8 @@ int GMT_grdvector (void *V_API, int mode, void *args) {
/* Determine what wesn to pass to map_setup */
- if (!GMT->common.R.active[RSET]) gmt_M_memcpy (GMT->common.R.wesn, Grid[0]->header->wesn, 4, double);
+ if (!GMT->common.R.active[RSET]) /* -R was not set so we use the grid domain */
+ gmt_set_R_from_grd (GMT, Grid[0]->header);
if (gmt_M_err_pass (GMT, gmt_map_setup (GMT, GMT->common.R.wesn), "")) Return (GMT_PROJECTION_ERROR);
diff --git a/src/grdview.c b/src/grdview.c
index 6c3a941..022dace 100644
--- a/src/grdview.c
+++ b/src/grdview.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdview.c 18257 2017-05-28 21:57:30Z pwessel $
+ * $Id: grdview.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -743,7 +743,9 @@ int GMT_grdview (void *V_API, int mode, void *args) {
/* Determine what wesn to pass to map_setup */
- if (!GMT->common.R.active[RSET]) gmt_M_memcpy (GMT->common.R.wesn, Topo->header->wesn, 4, double); /* No -R, use grid region */
+ if (!GMT->common.R.active[RSET]) /* No -R, use grid region */
+ gmt_set_R_from_grd (GMT, Topo->header);
+
gmt_M_memcpy (wesn, GMT->common.R.wesn, 4, double);
if (GMT->common.R.wesn[ZLO] == 0.0 && GMT->common.R.wesn[ZHI] == 0.0) {
diff --git a/src/grdvolume.c b/src/grdvolume.c
index 56f7ee8..18ae055 100644
--- a/src/grdvolume.c
+++ b/src/grdvolume.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdvolume.c 18174 2017-05-07 05:33:44Z pwessel $
+ * $Id: grdvolume.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/greenspline.c b/src/greenspline.c
index c855acb..b97ccab 100644
--- a/src/greenspline.c
+++ b/src/greenspline.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: greenspline.c 18404 2017-06-20 18:10:00Z pwessel $
+ * $Id: greenspline.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gshhg/CMakeLists.txt b/src/gshhg/CMakeLists.txt
index cb9bd51..8e24840 100644
--- a/src/gshhg/CMakeLists.txt
+++ b/src/gshhg/CMakeLists.txt
@@ -1,7 +1,7 @@
#
-# $Id: CMakeLists.txt 18131 2017-05-05 02:16:34Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/src/gshhg/gmt_gshhg.h b/src/gshhg/gmt_gshhg.h
index 4d9e03e..086f637 100644
--- a/src/gshhg/gmt_gshhg.h
+++ b/src/gshhg/gmt_gshhg.h
@@ -1,8 +1,8 @@
-/* $Id: gmt_gshhg.h 17451 2017-01-16 21:36:06Z pwessel $
+/* $Id: gmt_gshhg.h 19521 2017-12-27 22:38:24Z pwessel $
*
* Include file defining macros, functions and structures used in gshhg.c
*
- * Copyright (c) 1996-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * Copyright (c) 1996-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
* See LICENSE.TXT file for copying and redistribution conditions.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gshhg/gshhg.c b/src/gshhg/gshhg.c
index 5f34304..1f60314 100644
--- a/src/gshhg/gshhg.c
+++ b/src/gshhg/gshhg.c
@@ -1,6 +1,6 @@
-/* $Id: gshhg.c 18435 2017-06-22 04:01:50Z pwessel $
+/* $Id: gshhg.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1996-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * Copyright (c) 1996-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
* See LICENSE.TXT file for copying and redistribution conditions.
*
* PROGRAM: gshhg.c
diff --git a/src/gshhg/gshhg.h b/src/gshhg/gshhg.h
index 2e15e3c..83f35cf 100644
--- a/src/gshhg/gshhg.h
+++ b/src/gshhg/gshhg.h
@@ -1,8 +1,8 @@
-/* $Id: gshhg.h 18382 2017-06-15 20:50:02Z pwessel $
+/* $Id: gshhg.h 19521 2017-12-27 22:38:24Z pwessel $
*
* Include file defining structures used in the binary GSHHG files
*
- * Copyright (c) 1996-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * Copyright (c) 1996-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
* See LICENSE.TXT file for copying and redistribution conditions.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gshhg_version.c b/src/gshhg_version.c
index 3cb64df..7a66e13 100644
--- a/src/gshhg_version.c
+++ b/src/gshhg_version.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gshhg_version.c 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gshhg_version.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/gshhg_version.h b/src/gshhg_version.h
index 165b5b7..b8af3e0 100644
--- a/src/gshhg_version.h
+++ b/src/gshhg_version.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gshhg_version.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: gshhg_version.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/img/CMakeLists.txt b/src/img/CMakeLists.txt
index 4855bc6..9c3e2cd 100644
--- a/src/img/CMakeLists.txt
+++ b/src/img/CMakeLists.txt
@@ -1,7 +1,7 @@
#
-# $Id: CMakeLists.txt 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/src/img/img2google b/src/img/img2google
index ddc4591..13f61a4 100755
--- a/src/img/img2google
+++ b/src/img/img2google
@@ -1,8 +1,8 @@
#!/bin/bash
#
-# $Id: img2google 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: img2google 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 2009-2017 by David Sandwell and Paul Wessel
+# Copyright (c) 2009-2018 by David Sandwell and Paul Wessel
# Credit to Joaquim Luis for adding KML output from ps2raster
#
# Shell script that will generate a Google Earth png tile from
diff --git a/src/img/img2grd.c b/src/img/img2grd.c
index 6bf54c5..b0b8857 100644
--- a/src/img/img2grd.c
+++ b/src/img/img2grd.c
@@ -1,6 +1,6 @@
-/* $Id: img2grd.c 18435 2017-06-22 04:01:50Z pwessel $
+/* $Id: img2grd.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* img2grd.c
diff --git a/src/isogmt.in b/src/isogmt.in
index 59aa1f9..3fc49c2 100755
--- a/src/isogmt.in
+++ b/src/isogmt.in
@@ -1,8 +1,8 @@
#!/bin/bash
#--------------------------------------------------------------------
-# $Id: isogmt.in 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: isogmt.in 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/src/kml2gmt.c b/src/kml2gmt.c
index 206bb64..589b6a3 100644
--- a/src/kml2gmt.c
+++ b/src/kml2gmt.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: kml2gmt.c 17798 2017-03-27 04:50:17Z pwessel $
+ * $Id: kml2gmt.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/makecpt.c b/src/makecpt.c
index 8c5c900..97f2ad7 100644
--- a/src/makecpt.c
+++ b/src/makecpt.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: makecpt.c 18447 2017-06-24 16:25:54Z jluis $
+ * $Id: makecpt.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/mapproject.c b/src/mapproject.c
index 95b2699..e8dcd1e 100644
--- a/src/mapproject.c
+++ b/src/mapproject.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
-* $Id: mapproject.c 18404 2017-06-20 18:10:00Z pwessel $
+* $Id: mapproject.c 19521 2017-12-27 22:38:24Z pwessel $
*
-* Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+* 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/meca/CMakeLists.txt b/src/meca/CMakeLists.txt
index c1a84ba..869d893 100644
--- a/src/meca/CMakeLists.txt
+++ b/src/meca/CMakeLists.txt
@@ -1,7 +1,7 @@
#
-# $Id: CMakeLists.txt 18131 2017-05-05 02:16:34Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/src/meca/meca.h b/src/meca/meca.h
index 24245f7..c84df28 100644
--- a/src/meca/meca.h
+++ b/src/meca/meca.h
@@ -1,5 +1,6 @@
-/* $Id: meca.h 15178 2015-11-06 10:45:03Z fwobbe $
+/* $Id: meca.h 19523 2017-12-27 23:20:32Z pwessel $
* Copyright (c) 1996-2012 by G. Patau
+ * Copyright (c) 2013-2018 by the GMT project
* Donated to the GMT project by G. Patau upon her retirement from IGPG
* Distributed under the Lesser GNU Public Licence
* See README file for copying and redistribution conditions.
diff --git a/src/meca/pscoupe.c b/src/meca/pscoupe.c
index 037c5c9..f48b9b3 100644
--- a/src/meca/pscoupe.c
+++ b/src/meca/pscoupe.c
@@ -1,7 +1,8 @@
/*--------------------------------------------------------------------
- * $Id: pscoupe.c 18134 2017-05-05 08:34:43Z pwessel $
+ * $Id: pscoupe.c 19523 2017-12-27 23:20:32Z pwessel $
*
* Copyright (c) 1996-2012 by G. Patau
+ * Copyright (c) 2013-2018 by the GMT project
* Donated to the GMT project by G. Patau upon her retirement from IGPG
* Distributed under the Lesser GNU Public Licence
* See README file for copying and redistribution conditions.
diff --git a/src/meca/psmeca.c b/src/meca/psmeca.c
index 6653497..556a240 100644
--- a/src/meca/psmeca.c
+++ b/src/meca/psmeca.c
@@ -1,7 +1,8 @@
/*--------------------------------------------------------------------
- * $Id: psmeca.c 18134 2017-05-05 08:34:43Z pwessel $
+ * $Id: psmeca.c 19523 2017-12-27 23:20:32Z pwessel $
*
* Copyright (c) 1996-2012 by G. Patau
+ * Copyright (c) 2013-2018 by the GMT project
* Donated to the GMT project by G. Patau upon her retirement from IGPG
* Distributed under the Lesser GNU Public Licence
* See README file for copying and redistribution conditions.
@@ -773,6 +774,11 @@ int GMT_psmeca (void *V_API, int mode, void *args) {
moment.exponent = meca.moment.exponent;
size = (meca_computed_mw(moment, meca.magms) / 5.0) * Ctrl->S.scale;
+ if (size < 0.0) { /* Addressing Bug #1171 */
+ GMT_Report (API, GMT_MSG_VERBOSE, "Skipping negative symbol size %g for record # %d.\n", size, n_rec);
+ continue;
+ }
+
meca_get_trans (GMT, xy[GMT_X], xy[GMT_Y], &t11, &t12, &t21, &t22);
delaz = atan2d(t12,t11);
diff --git a/src/meca/pspolar.c b/src/meca/pspolar.c
index 25d09ad..ff7f7e9 100644
--- a/src/meca/pspolar.c
+++ b/src/meca/pspolar.c
@@ -1,7 +1,8 @@
/*--------------------------------------------------------------------
- * $Id: pspolar.c 18134 2017-05-05 08:34:43Z pwessel $
+ * $Id: pspolar.c 19523 2017-12-27 23:20:32Z pwessel $
*
* Copyright (c) 1996-2012 by G. Patau
+ * Copyright (c) 2013-2018 by the GMT project
* Donated to the GMT project by G. Patau upon her retirement from IGPG
* Distributed under the Lesser GNU Public Licence
* See README file for copying and redistribution conditions.
diff --git a/src/meca/pssac.c b/src/meca/pssac.c
index f61e0d3..89a28a5 100644
--- a/src/meca/pssac.c
+++ b/src/meca/pssac.c
@@ -1,6 +1,6 @@
/*--------------------------------------------------------------------
*
- * Copyright (c) 2016-2017 by Dongdong Tian
+ * Copyright (c) 2016-2018 by Dongdong Tian
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -727,10 +727,15 @@ int GMT_pssac (void *V_API, int mode, void *args) { /* High-level function that
}
/* Default to plot trace at station locations on geographic maps */
- if (!gmt_M_is_linear(GMT) && L[n].position == false) {
- L[n].position = true;
- gmt_geo_to_xy (GMT, hd.stlo, hd.stla, &L[n].x, &L[n].y);
+ if (!gmt_M_is_linear(GMT)) {
+ /* Default to plot trace at station locations on geographic maps */
+ if (L[n].position == false) {
+ L[n].position = true;
+ L[n].x = hd.stlo;
+ L[n].y = hd.stla;
+ }
GMT_Report (API, GMT_MSG_VERBOSE, "=> %s: Geographic location: (%g, %g)\n", L[n].file, hd.stlo, hd.stla);
+ gmt_geo_to_xy (GMT, L[n].x, L[n].y, &L[n].x, &L[n].y);
}
if (L[n].position) { /* position (X0,Y0) on plots */
diff --git a/src/meca/psvelo.c b/src/meca/psvelo.c
index 28d70d3..3cc00db 100644
--- a/src/meca/psvelo.c
+++ b/src/meca/psvelo.c
@@ -1,7 +1,8 @@
/*--------------------------------------------------------------------
- * $Id: psvelo.c 18134 2017-05-05 08:34:43Z pwessel $
+ * $Id: psvelo.c 19523 2017-12-27 23:20:32Z pwessel $
*
* Copyright (c) 1996-2012 by G. Patau
+ * Copyright (c) 2013-2018 by the GMT project
* Donated to the GMT project by G. Patau upon her retirement from IGPG
* Distributed under the Lesser GNU Public Licence
* See README file for copying and redistribution conditions.
diff --git a/src/meca/utilmeca.c b/src/meca/utilmeca.c
index ecae6d9..764df79 100644
--- a/src/meca/utilmeca.c
+++ b/src/meca/utilmeca.c
@@ -1,5 +1,6 @@
-/* $Id: utilmeca.c 18080 2017-04-30 20:31:30Z jluis $
+/* $Id: utilmeca.c 19523 2017-12-27 23:20:32Z pwessel $
* Copyright (c) 1996-2012 by G. Patau
+ * Copyright (c) 2013-2018 by the GMT project
* Donated to the GMT project by G. Patau upon her retirement from IGPG
* Distributed under the Lesser GNU Public Licence
* See README file for copying and redistribution conditions.
diff --git a/src/meca/utilmeca.h b/src/meca/utilmeca.h
index 0468aa8..9aa32c6 100644
--- a/src/meca/utilmeca.h
+++ b/src/meca/utilmeca.h
@@ -1,5 +1,6 @@
-/* $Id: utilmeca.h 16276 2016-04-17 01:12:22Z pwessel $
+/* $Id: utilmeca.h 19523 2017-12-27 23:20:32Z pwessel $
* Copyright (c) 1996-2012 by G. Patau
+ * Copyright (c) 2013-2018 by the GMT project
* Donated to the GMT project by G. Patau upon her retirement from IGPG
* Distributed under the Lesser GNU Public Licence
* See README file for copying and redistribution conditions.
diff --git a/src/mgd77/CMakeLists.txt b/src/mgd77/CMakeLists.txt
index 74e3bca..98f1402 100644
--- a/src/mgd77/CMakeLists.txt
+++ b/src/mgd77/CMakeLists.txt
@@ -1,7 +1,7 @@
#
-# $Id: CMakeLists.txt 18131 2017-05-05 02:16:34Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/src/mgd77/mgd77.c b/src/mgd77/mgd77.c
index fa0acdf..d209e7f 100644
--- a/src/mgd77/mgd77.c
+++ b/src/mgd77/mgd77.c
@@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------
- * $Id: mgd77.c 18435 2017-06-22 04:01:50Z pwessel $
+ * $Id: mgd77.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2005-2017 by P. Wessel
+ * Copyright (c) 2005-2018 by P. Wessel
* See README file for copying and redistribution conditions.
*
* File: mgd77.c
@@ -1512,7 +1512,7 @@ static int MGD77_Write_Data_Record_m77t (struct GMT_CTRL *GMT, struct MGD77_CONT
place_int (MGD77_TZ, "%d"); strcat (line, "\t");
place_int (MGD77_YEAR, "%04d"); place_int (MGD77_MONTH, "%02d"); place_int (MGD77_DAY, "%02d"); strcat (line, "\t");
r_time = 100.0 * MGD77Record->number[MGD77_HOUR] + MGD77Record->number[MGD77_MIN];
- if (!gmt_M_is_dnan (r_time)) { sprintf (buffer, "%.8g", r_time); fputs (buffer, F->fp); } strcat (line, "\t");
+ if (!gmt_M_is_dnan (r_time)) { sprintf (buffer, "%.8g", r_time); strcat (line, buffer); } strcat (line, "\t");
place_float (MGD77_LATITUDE, "%.8g"); strcat (line, "\t");
place_float (MGD77_LONGITUDE, "%.8g"); strcat (line, "\t");
place_int (MGD77_PTC, "%1d"); strcat (line, "\t");
@@ -3516,6 +3516,7 @@ int MGD77_Verify_Header (struct GMT_CTRL *GMT, struct MGD77_CONTROL *F, struct M
if (ref_field_code == 88) {
if (!strncmp(P->Magnetics_Ref_Field,"IGRF",4U)) {
for (k = 0; P->Magnetics_Ref_Field[k] != 'F'; k++);
+ k++;
if (P->Magnetics_Ref_Field[k] == '-' || P->Magnetics_Ref_Field[k] == ' ') k++;
y = atoi (&P->Magnetics_Ref_Field[k]);
if (y < MGD77_OLDEST_YY) /* 2-digit year, we assume 20xx */
@@ -3524,6 +3525,8 @@ int MGD77_Verify_Header (struct GMT_CTRL *GMT, struct MGD77_CONTROL *F, struct M
rfEnd = 1900 + y;
else /* 4-digit year given */
rfEnd = y;
+ /* IGRF is typically definitive up to the ref field code year (e.g., IGRF-85 is definitive to 1985), then predictive for five years */
+ rfEnd += 5;
rfStart = rfEnd - 5;
}
else {
@@ -4363,7 +4366,7 @@ int MGD77_Path_Expand (struct GMT_CTRL *GMT, struct MGD77_CONTROL *F, struct GMT
d_name = line;
#endif /* HAVE_DIRENT_H_ */
if (length && strncmp (d_name, this_arg, length)) continue;
- k = (unsigned int)strlen (d_name) - 1;
+ k = (unsigned int)(strlen (d_name) - 1);
while (k && d_name[k] != '.') k--; /* Strip off file extension */
if (n == n_alloc) L = gmt_M_memory (GMT, L, n_alloc += GMT_CHUNK, char *);
L[n] = gmt_M_memory (GMT, NULL, k + 1, char);
diff --git a/src/mgd77/mgd77.h b/src/mgd77/mgd77.h
index c97acca..5a728dd 100644
--- a/src/mgd77/mgd77.h
+++ b/src/mgd77/mgd77.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
- * $Id: mgd77.h 17497 2017-01-28 23:57:39Z pwessel $
+ * $Id: mgd77.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2005-2017 by P. Wessel
+ * Copyright (c) 2005-2018 by P. Wessel
* See README file for copying and redistribution conditions.
*
* File: mgd77.h
diff --git a/src/mgd77/mgd77_IGF_coeffs.h b/src/mgd77/mgd77_IGF_coeffs.h
index 86afa42..808ab4d 100644
--- a/src/mgd77/mgd77_IGF_coeffs.h
+++ b/src/mgd77/mgd77_IGF_coeffs.h
@@ -1,7 +1,7 @@
/*-------------------------------------------------------------------------
- * $Id: mgd77_IGF_coeffs.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: mgd77_IGF_coeffs.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2005-2017 by P. Wessel
+ * Copyright (c) 2005-2018 by P. Wessel
* See README file for copying and redistribution conditions.
*/
diff --git a/src/mgd77/mgd77_codes.h b/src/mgd77/mgd77_codes.h
index 389c561..9b4d4a9 100644
--- a/src/mgd77/mgd77_codes.h
+++ b/src/mgd77/mgd77_codes.h
@@ -1,9 +1,9 @@
-/* $Id: mgd77_codes.h 17451 2017-01-16 21:36:06Z pwessel $
+/* $Id: mgd77_codes.h 19521 2017-12-27 22:38:24Z pwessel $
*
* Code automatically generated by mgd77_codes.sh
* To be included by mgd77info.c
*
- * Copyright (c) 2005-2017 by P. Wessel
+ * Copyright (c) 2005-2018 by P. Wessel
* See README file for copying and redistribution conditions.
*/
diff --git a/src/mgd77/mgd77_e77.h b/src/mgd77/mgd77_e77.h
index efb975a..cb5093d 100644
--- a/src/mgd77/mgd77_e77.h
+++ b/src/mgd77/mgd77_e77.h
@@ -1,8 +1,8 @@
/* -------------------------------------------------------------------
- * $Id: mgd77_e77.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: mgd77_e77.h 19521 2017-12-27 22:38:24Z pwessel $
* See LICENSE.TXT file for copying and redistribution conditions.
*
- * Copyright (c) 2004-2017 by P. Wessel and M. T. Chandler
+ * Copyright (c) 2004-2018 by P. Wessel and M. T. Chandler
* File: mgd77_e77.h
*
* Include file for mgd77 programs
diff --git a/src/mgd77/mgd77_functions.c b/src/mgd77/mgd77_functions.c
index 9721525..ba4409e 100644
--- a/src/mgd77/mgd77_functions.c
+++ b/src/mgd77/mgd77_functions.c
@@ -1,8 +1,8 @@
-/* $Id: mgd77_functions.c 17451 2017-01-16 21:36:06Z pwessel $
+/* $Id: mgd77_functions.c 19521 2017-12-27 22:38:24Z pwessel $
*
* Code automatically generated by mgd77netcdfhelper.sh
*
- * Copyright (c) 2005-2017 by P. Wessel
+ * Copyright (c) 2005-2018 by P. Wessel
* See README file for copying and redistribution conditions.
*/
diff --git a/src/mgd77/mgd77_functions.h b/src/mgd77/mgd77_functions.h
index 0ebb9f0..731e2ae 100644
--- a/src/mgd77/mgd77_functions.h
+++ b/src/mgd77/mgd77_functions.h
@@ -1,9 +1,9 @@
-/* $Id: mgd77_functions.h 17451 2017-01-16 21:36:06Z pwessel $
+/* $Id: mgd77_functions.h 19521 2017-12-27 22:38:24Z pwessel $
*
* Code automatically generated by mgd77netcdfhelper.sh
* To be included by mgd77_functions.c
*
- * Copyright (c) 2005-2017 by P. Wessel
+ * Copyright (c) 2005-2018 by P. Wessel
* See README file for copying and redistribution conditions.
*/
diff --git a/src/mgd77/mgd77_init.h b/src/mgd77/mgd77_init.h
index 69e7d44..d46b567 100644
--- a/src/mgd77/mgd77_init.h
+++ b/src/mgd77/mgd77_init.h
@@ -1,7 +1,7 @@
/*---------------------------------------------------------------------------
- * $Id: mgd77_init.h 17497 2017-01-28 23:57:39Z pwessel $
+ * $Id: mgd77_init.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2005-2017 by P. Wessel
+ * Copyright (c) 2005-2018 by P. Wessel
* See README file for copying and redistribution conditions.
*
* File: mgd77_init.h
diff --git a/src/mgd77/mgd77_recalc.h b/src/mgd77/mgd77_recalc.h
index e2366a7..63c4e5e 100644
--- a/src/mgd77/mgd77_recalc.h
+++ b/src/mgd77/mgd77_recalc.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: mgd77_recalc.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: mgd77_recalc.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2004-2017 by P. Wessel
+ * Copyright (c) 2004-2018 by P. Wessel
* See README file for copying and redistribution conditions.
*--------------------------------------------------------------------*/
/* Here lies some defines and a structure of items that are used when we
diff --git a/src/mgd77/mgd77_rls_coeffs.h b/src/mgd77/mgd77_rls_coeffs.h
index 8135bb2..845182f 100644
--- a/src/mgd77/mgd77_rls_coeffs.h
+++ b/src/mgd77/mgd77_rls_coeffs.h
@@ -1,8 +1,8 @@
/* -------------------------------------------------------------------
- * $Id: mgd77_rls_coeffs.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: mgd77_rls_coeffs.h 19521 2017-12-27 22:38:24Z pwessel $
* See LICENSE.TXT file for copying and redistribution conditions.
*
- * Copyright (c) 2004-2017 by P. Wessel and M. T. Chandler
+ * Copyright (c) 2004-2018 by P. Wessel and M. T. Chandler
* File: mgd77_rls_coeffs.c
*
* Tables consisting of regression statistics for (in this order):
diff --git a/src/mgd77/mgd77convert.c b/src/mgd77/mgd77convert.c
index c144d69..7214522 100644
--- a/src/mgd77/mgd77convert.c
+++ b/src/mgd77/mgd77convert.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: mgd77convert.c 18435 2017-06-22 04:01:50Z pwessel $
+ * $Id: mgd77convert.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2005-2017 by P. Wessel
+ * Copyright (c) 2005-2018 by P. Wessel
* See README file for copying and redistribution conditions.
*--------------------------------------------------------------------*/
/*
diff --git a/src/mgd77/mgd77defaults.h b/src/mgd77/mgd77defaults.h
index 1477589..6d075e5 100644
--- a/src/mgd77/mgd77defaults.h
+++ b/src/mgd77/mgd77defaults.h
@@ -1,5 +1,5 @@
/* MGD-77 Data Record Field Defaults:
- * Copyright (c) 2005-2017 by P. Wessel and M. T. Chandler *
+ * Copyright (c) 2005-2018 by P. Wessel and M. T. Chandler *
* See LICENSE.TXT file for copying and redistribution conditions.
Name, Abbrev, Start, Length, FortranCode, Factor, readMGD77, order, printMGD77, printVALS, Not_given */
{ "Data Record Type", "drt", 1U, 1, "int", 1, "%1d", 1, "%1d", NULL, "9" },
diff --git a/src/mgd77/mgd77header.c b/src/mgd77/mgd77header.c
index 13fc59e..5633497 100644
--- a/src/mgd77/mgd77header.c
+++ b/src/mgd77/mgd77header.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: mgd77header.c 18435 2017-06-22 04:01:50Z pwessel $
+ * $Id: mgd77header.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2004-2017 by P. Wessel and Michael Chandler
+ * Copyright (c) 2004-2018 by P. Wessel and Michael Chandler
* See README file for copying and redistribution conditions.
*--------------------------------------------------------------------*/
/*
diff --git a/src/mgd77/mgd77info.c b/src/mgd77/mgd77info.c
index 4171146..47b3431 100644
--- a/src/mgd77/mgd77info.c
+++ b/src/mgd77/mgd77info.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: mgd77info.c 18435 2017-06-22 04:01:50Z pwessel $
+ * $Id: mgd77info.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2004-2017 by P. Wessel
+ * Copyright (c) 2004-2018 by P. Wessel
* See README file for copying and redistribution conditions.
*--------------------------------------------------------------------*/
/*
diff --git a/src/mgd77/mgd77list.c b/src/mgd77/mgd77list.c
index d0db2bd..88c29a9 100644
--- a/src/mgd77/mgd77list.c
+++ b/src/mgd77/mgd77list.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: mgd77list.c 18435 2017-06-22 04:01:50Z pwessel $
+ * $Id: mgd77list.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2004-2017 by P. Wessel
+ * Copyright (c) 2004-2018 by P. Wessel
* See README file for copying and redistribution conditions.
*--------------------------------------------------------------------*/
/*
diff --git a/src/mgd77/mgd77magref.c b/src/mgd77/mgd77magref.c
index 37fc11e..689ab34 100644
--- a/src/mgd77/mgd77magref.c
+++ b/src/mgd77/mgd77magref.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: mgd77magref.c 17798 2017-03-27 04:50:17Z pwessel $
+ * $Id: mgd77magref.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2009-2017 by J. Luis and P. Wessel
+ * Copyright (c) 2009-2018 by J. Luis and P. Wessel
* See README file for copying and redistribution conditions.
*--------------------------------------------------------------------*/
/*
diff --git a/src/mgd77/mgd77magref.h b/src/mgd77/mgd77magref.h
index 9fba86d..2e8d2d3 100644
--- a/src/mgd77/mgd77magref.h
+++ b/src/mgd77/mgd77magref.h
@@ -1,8 +1,8 @@
/* -------------------------------------------------------------------
- * $Id: mgd77magref.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: mgd77magref.h 19521 2017-12-27 22:38:24Z pwessel $
* See LICENSE.TXT file for copying and redistribution conditions.
*
- * Copyright (c) 2005-2017 by P. Wessel and M. T. Chandler
+ * Copyright (c) 2005-2018 by P. Wessel and M. T. Chandler
* File: mgd77magref.h
*
* MGD77 Magnetic Reference Fields for mgd77sniffer
diff --git a/src/mgd77/mgd77manage.c b/src/mgd77/mgd77manage.c
index 4e2da2c..b9d81d3 100644
--- a/src/mgd77/mgd77manage.c
+++ b/src/mgd77/mgd77manage.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: mgd77manage.c 18435 2017-06-22 04:01:50Z pwessel $
+ * $Id: mgd77manage.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2005-2017 by P. Wessel
+ * Copyright (c) 2005-2018 by P. Wessel
* mgd77manage is used to (1) remove data columns from mgd77+ files
* or (2) add a new data column to mgd77+ files. Data can be added
* from data tables, created from reference field formulas, or by
diff --git a/src/mgd77/mgd77netcdfhelper.sh b/src/mgd77/mgd77netcdfhelper.sh
index 46c9fee..d4d7f1b 100755
--- a/src/mgd77/mgd77netcdfhelper.sh
+++ b/src/mgd77/mgd77netcdfhelper.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# $Id: mgd77netcdfhelper.sh 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: mgd77netcdfhelper.sh 19521 2017-12-27 22:38:24Z pwessel $
#
# Author: P. Wessel
# Date: 2005-OCT-14
@@ -23,7 +23,7 @@ cat << EOF > mgd77_functions.h
* Code automatically generated by mgd77netcdfhelper.sh
* To be included by mgd77_functions.c
*
- * Copyright (c) 2005-2017 by P. Wessel
+ * Copyright (c) 2005-2018 by P. Wessel
* See README file for copying and redistribution conditions.
*/
@@ -52,7 +52,7 @@ cat << EOF > mgd77_functions.c
*
* Code automatically generated by mgd77netcdfhelper.sh
*
- * Copyright (c) 2005-2017 by P. Wessel
+ * Copyright (c) 2005-2018 by P. Wessel
* See README file for copying and redistribution conditions.
*/
diff --git a/src/mgd77/mgd77path.c b/src/mgd77/mgd77path.c
index 161dc1c..cb9b698 100644
--- a/src/mgd77/mgd77path.c
+++ b/src/mgd77/mgd77path.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: mgd77path.c 18435 2017-06-22 04:01:50Z pwessel $
+ * $Id: mgd77path.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2004-2017 by P. Wessel
+ * Copyright (c) 2004-2018 by P. Wessel
* See README file for copying and redistribution conditions.
*--------------------------------------------------------------------*/
/*
diff --git a/src/mgd77/mgd77sniffer.c b/src/mgd77/mgd77sniffer.c
index d3a74ef..e54e24d 100644
--- a/src/mgd77/mgd77sniffer.c
+++ b/src/mgd77/mgd77sniffer.c
@@ -1,8 +1,8 @@
/* -------------------------------------------------------------------
- * $Id: mgd77sniffer.c 18435 2017-06-22 04:01:50Z pwessel $
+ * $Id: mgd77sniffer.c 19521 2017-12-27 22:38:24Z pwessel $
* See LICENSE.TXT file for copying and redistribution conditions.
*
- * Copyright (c) 2004-2017 by P. Wessel and M. T. Chandler
+ * Copyright (c) 2004-2018 by P. Wessel and M. T. Chandler
* File: mgd77sniffer.c
*
* mgd77sniffer scans MGD77 files for errors in three ways: one, point-
@@ -1020,6 +1020,7 @@ int GMT_mgd77sniffer (void *V_API, int mode, void *args) {
gmt_M_fputs ("\n", GMT->session.std[GMT_OUT]);
}
}
+ MGD77_Path_Free (GMT, (uint64_t)n_paths, list);
Return (API->error);
}
@@ -1831,8 +1832,10 @@ int GMT_mgd77sniffer (void *V_API, int mode, void *args) {
old_anom = gmt_M_memory (GMT, old_anom, n_alloc, double);
}
new_anom[n] = D[i].number[MGD77_GOBS] - MGD77_Theoretical_Gravity (GMT, D[i].number[MGD77_LONGITUDE], D[i].number[MGD77_LATITUDE], 4);
+ new_anom[n] = (floor(10*new_anom[n]))/10.0; /* Force %.1f precision for regression analysis */
if (m == 1 && !gmt_M_is_dnan(D[i].number[MGD77_EOT])) new_anom[n] += D[i].number[MGD77_EOT];
old_anom[n] = D[i].number[MGD77_FAA];
+ old_anom[n] = (floor(10*old_anom[n]))/10.0; /* Force %.1f precision for regression analysis */
n++;
}
if (n < 2) {
@@ -1888,23 +1891,45 @@ int GMT_mgd77sniffer (void *V_API, int mode, void *args) {
(m == 1) ? sprintf (text,"+eot ") : sprintf (text," ");
if (stats[MGD77_RLS_SIG] == 1.0) {
if (((1.0 < (stats[MGD77_RLS_SLOPE]-range) || 1.0 > (stats[MGD77_RLS_SLOPE]+range)) || (0.0 < (stats[MGD77_RLS_ICEPT]-range2) || 0.0 > (stats[MGD77_RLS_ICEPT]+range2)))) {
- if (!strcmp(display,"E77"))
- fprintf (fpout, "%c-%c-%s-faa-%.02d: Anomaly differs from gobs-IGF80%s(m: %s b: %s rms: %s r: %s sig: %d dec: %d). [Recompute]\n",E77_REVIEW,E77_ERROR,M.NGDC_id,\
- (int)(E77_HDR_ANOM_FAA+(m*9)),text,fstats[MGD77_RLS_SLOPE],fstats[MGD77_RLS_ICEPT],fstats[MGD77_RLS_RMS],fstats[MGD77_RLS_CORR],(int)stats[MGD77_RLS_SIG],(int)decimated);
- else if (warn[SUMMARY_WARN]) {
- sprintf (buffer, "%s (faa) anomaly differs from gobs-IGF80%s(m: %s b: %s rms: %s r: %s sig: %d dec: %d)\n",M.NGDC_id,text,fstats[MGD77_RLS_SLOPE],\
- fstats[MGD77_RLS_ICEPT],fstats[MGD77_RLS_RMS],fstats[MGD77_RLS_CORR],(int)stats[MGD77_RLS_SIG],(int)decimated);
- gmt_M_fputs (buffer, GMT->session.std[GMT_OUT]);
+ if (m == 0) {
+ if (!strcmp(display,"E77"))
+ fprintf (fpout, "%c-%c-%s-faa-%.02d: Anomaly differs from gobs-IGF80%s(m: %s b: %s rms: %s r: %s sig: %d dec: %d). [Recompute]\n",E77_REVIEW,E77_ERROR,M.NGDC_id,\
+ (int)(E77_HDR_ANOM_FAA+(m*9)),text,fstats[MGD77_RLS_SLOPE],fstats[MGD77_RLS_ICEPT],fstats[MGD77_RLS_RMS],fstats[MGD77_RLS_CORR],(int)stats[MGD77_RLS_SIG],(int)decimated);
+ else if (warn[SUMMARY_WARN]) {
+ sprintf (buffer, "%s (faa) anomaly differs from gobs-IGF80%s(m: %s b: %s rms: %s r: %s sig: %d dec: %d)\n",M.NGDC_id,text,fstats[MGD77_RLS_SLOPE],\
+ fstats[MGD77_RLS_ICEPT],fstats[MGD77_RLS_RMS],fstats[MGD77_RLS_CORR],(int)stats[MGD77_RLS_SIG],(int)decimated);
+ gmt_M_fputs (buffer, GMT->session.std[GMT_OUT]);
+ }
+ } else {
+ if (!strcmp(display,"E77"))
+ fprintf (fpout, "%c-%c-%s-faa-%.02d: Anomaly differs from gobs-IGF80%s(m: %s b: %s rms: %s r: %s sig: %d dec: %d)\n",E77_APPLY,E77_INFO,M.NGDC_id,\
+ (int)(E77_HDR_ANOM_FAA+(m*9)),text,fstats[MGD77_RLS_SLOPE],fstats[MGD77_RLS_ICEPT],fstats[MGD77_RLS_RMS],fstats[MGD77_RLS_CORR],(int)stats[MGD77_RLS_SIG],(int)decimated);
+ else if (warn[SUMMARY_WARN]) {
+ sprintf (buffer, "%s (faa) anomaly differs from gobs-IGF80%s(m: %s b: %s rms: %s r: %s sig: %d dec: %d)\n",M.NGDC_id,text,\
+ fstats[MGD77_RLS_SLOPE],fstats[MGD77_RLS_ICEPT],fstats[MGD77_RLS_RMS],fstats[MGD77_RLS_CORR],(int)stats[MGD77_RLS_SIG],(int)decimated);
+ gmt_M_fputs (buffer, GMT->session.std[GMT_OUT]);
+ }
}
} else {
- if (!strcmp(display,"E77"))
- fprintf (fpout, "%c-%c-%s-faa-%.02d: Anomaly equivalent to gobs-IGF80%s(m: %s b: %s rms: %s r: %s sig: %d dec: %d)\n",E77_APPLY,E77_INFO,M.NGDC_id,\
- (int)(E77_HDR_ANOM_FAA+(m*9)),text,fstats[MGD77_RLS_SLOPE],fstats[MGD77_RLS_ICEPT],fstats[MGD77_RLS_RMS],fstats[MGD77_RLS_CORR],(int)stats[MGD77_RLS_SIG],(int)decimated);
- else if (warn[SUMMARY_WARN]) {
- sprintf (buffer, "%s (faa) anomaly statistically the same as gobs-IGF80%s(m: %s b: %s rms: %s r: %s sig: %d dec: %d)\n",M.NGDC_id,text,\
- fstats[MGD77_RLS_SLOPE],fstats[MGD77_RLS_ICEPT],fstats[MGD77_RLS_RMS],fstats[MGD77_RLS_CORR],(int)stats[MGD77_RLS_SIG],(int)decimated);
- gmt_M_fputs (buffer, GMT->session.std[GMT_OUT]);
- }
+ if (m == 0) {
+ if (!strcmp(display,"E77"))
+ fprintf (fpout, "%c-%c-%s-faa-%.02d: Anomaly equivalent to gobs-IGF80%s(m: %s b: %s rms: %s r: %s sig: %d dec: %d)\n",E77_APPLY,E77_INFO,M.NGDC_id,\
+ (int)(E77_HDR_ANOM_FAA+(m*9)),text,fstats[MGD77_RLS_SLOPE],fstats[MGD77_RLS_ICEPT],fstats[MGD77_RLS_RMS],fstats[MGD77_RLS_CORR],(int)stats[MGD77_RLS_SIG],(int)decimated);
+ else if (warn[SUMMARY_WARN]) {
+ sprintf (buffer, "%s (faa) anomaly statistically the same as gobs-IGF80%s(m: %s b: %s rms: %s r: %s sig: %d dec: %d)\n",M.NGDC_id,text,\
+ fstats[MGD77_RLS_SLOPE],fstats[MGD77_RLS_ICEPT],fstats[MGD77_RLS_RMS],fstats[MGD77_RLS_CORR],(int)stats[MGD77_RLS_SIG],(int)decimated);
+ gmt_M_fputs (buffer, GMT->session.std[GMT_OUT]);
+ }
+ } else {
+ if (!strcmp(display,"E77"))
+ fprintf (fpout, "%c-%c-%s-faa-%.02d: Anomaly equivalent to gobs-IGF80%s(m: %s b: %s rms: %s r: %s sig: %d dec: %d). [Recompute]\n",E77_REVIEW,E77_ERROR,M.NGDC_id,\
+ (int)(E77_HDR_ANOM_FAA+(m*9)),text,fstats[MGD77_RLS_SLOPE],fstats[MGD77_RLS_ICEPT],fstats[MGD77_RLS_RMS],fstats[MGD77_RLS_CORR],(int)stats[MGD77_RLS_SIG],(int)decimated);
+ else if (warn[SUMMARY_WARN]) {
+ sprintf (buffer, "%s (faa) anomaly equivalent to gobs-IGF80%s(m: %s b: %s rms: %s r: %s sig: %d dec: %d)\n",M.NGDC_id,text,fstats[MGD77_RLS_SLOPE],\
+ fstats[MGD77_RLS_ICEPT],fstats[MGD77_RLS_RMS],fstats[MGD77_RLS_CORR],(int)stats[MGD77_RLS_SIG],(int)decimated);
+ gmt_M_fputs (buffer, GMT->session.std[GMT_OUT]);
+ }
+ }
}
if (m == 1 && stats[MGD77_RLS_CORR] > lastCorr) {
if (!strcmp(display,"E77"))
@@ -1936,8 +1961,10 @@ int GMT_mgd77sniffer (void *V_API, int mode, void *args) {
for (i = n = 0; i < nvalues; i++) {
if (gmt_M_is_dnan(D[i].number[MGD77_GOBS]) || gmt_M_is_dnan(D[i].number[MGD77_FAA])) continue;
new_anom[n] = D[i].number[MGD77_GOBS] - MGD77_Theoretical_Gravity (GMT, (int)D[i].number[MGD77_LONGITUDE], (int)D[i].number[MGD77_LATITUDE], (int)m);
+ new_anom[n] = (floor(10.0*new_anom[n]))/10.0; /* Force %.1f precision for regression analysis */
if (stats[MGD77_RLS_CORR] > lastCorr && !gmt_M_is_dnan(D[i].number[MGD77_EOT])) new_anom[n] += D[i].number[MGD77_EOT];
old_anom[n] = D[i].number[MGD77_FAA];
+ old_anom[n] = (floor(10.0*old_anom[n]))/10.0; /* Force %.1f precision for regression analysis */
n++;
}
if (decimated) {
@@ -2044,12 +2071,14 @@ int GMT_mgd77sniffer (void *V_API, int mode, void *args) {
MGD77_gcal_from_dt (GMT, &M, D[i].time, &cal); /* No adjust for TZ; this is GMT UTC time */
n_days = (gmtlib_is_gleap (cal.year)) ? 366.0 : 365.0; /* Number of days in this year */
/* Get date as decimal year */
- date = cal.year + cal.day_y / n_days + (cal.hour * GMT_HR2SEC_I + cal.min * GMT_MIN2SEC_I + cal.sec) * GMT_SEC2DAY;
+ date = MGD77_cal_to_fyear (GMT, &cal); /* Get date as decimal year */
MGD77_igrf10syn (GMT, 0, date, 1, 0.0, D[i].number[MGD77_LONGITUDE], D[i].number[MGD77_LATITUDE], IGRF);
if (gmt_M_is_dnan(new_anom[n] = D[i].number[MGD77_MTF2-(int)mtf1] - IGRF[MGD77_IGRF_F])) continue;
if (!gmt_M_is_dnan(D[i].number[MGD77_DIUR]))
new_anom[n] += D[i].number[MGD77_DIUR];
+ new_anom[n] = (floor(10*new_anom[n]))/10.0; /* Force %.1f precision for regression analysis */
old_anom[n] = D[i].number[MGD77_MAG];
+ old_anom[n] = (floor(10*old_anom[n]))/10.0; /* Force %.1f precision for regression analysis */
n++;
}
if (n > 0) { /* must have time records for mag recalculation */
@@ -2113,7 +2142,7 @@ int GMT_mgd77sniffer (void *V_API, int mode, void *args) {
}
} else {
if (warn[SUMMARY_WARN]) {
- sprintf (buffer, "%s (mag) anomaly same as expected (m: %s b: %s rms: %s r: %s sig: %d dec: %d)\n",M.NGDC_id,fstats[MGD77_RLS_SLOPE],\
+ sprintf (buffer, "%s (mag) anomaly statistically the same as mtf%d-IGRF (m: %s b: %s rms: %s r: %s sig: %d dec: %d)\n",M.NGDC_id,2-(int)mtf1,fstats[MGD77_RLS_SLOPE],\
fstats[MGD77_RLS_ICEPT],fstats[MGD77_RLS_RMS],fstats[MGD77_RLS_CORR],(int)stats[MGD77_RLS_SIG],(int)decimated);
gmt_M_fputs (buffer, GMT->session.std[GMT_OUT]);
}
diff --git a/src/mgd77/mgd77sniffer.h b/src/mgd77/mgd77sniffer.h
index 86f0222..6f30005 100644
--- a/src/mgd77/mgd77sniffer.h
+++ b/src/mgd77/mgd77sniffer.h
@@ -1,8 +1,8 @@
/* -------------------------------------------------------------------
- * $Id: mgd77sniffer.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: mgd77sniffer.h 19521 2017-12-27 22:38:24Z pwessel $
* See LICENSE.TXT file for copying and redistribution conditions.
*
- * Copyright (c) 2004-2017 by P. Wessel and M. T. Chandler
+ * Copyright (c) 2004-2018 by P. Wessel and M. T. Chandler
* File: mgd77sniffer.h
*
* Include file for mgd77sniffer
diff --git a/src/mgd77/mgd77snifferdefaults.h b/src/mgd77/mgd77snifferdefaults.h
index f101cc9..ec04687 100644
--- a/src/mgd77/mgd77snifferdefaults.h
+++ b/src/mgd77/mgd77snifferdefaults.h
@@ -1,8 +1,8 @@
/* -------------------------------------------------------------------
- * $Id: mgd77snifferdefaults.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: mgd77snifferdefaults.h 19521 2017-12-27 22:38:24Z pwessel $
* See LICENSE.TXT file for copying and redistribution conditions.
*
- * Copyright (c) 2004-2017 by P. Wessel and M. T. Chandler
+ * Copyright (c) 2004-2018 by P. Wessel and M. T. Chandler
* File: mgd77snifferdefaults.h
*
* Include file for mgd77sniffer
diff --git a/src/mgd77/mgd77track.c b/src/mgd77/mgd77track.c
index 8aa640b..9e38a05 100644
--- a/src/mgd77/mgd77track.c
+++ b/src/mgd77/mgd77track.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: mgd77track.c 18435 2017-06-22 04:01:50Z pwessel $
+ * $Id: mgd77track.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2004-2017 by P. Wessel
+ * Copyright (c) 2004-2018 by P. Wessel
* See README file for copying and redistribution conditions.
*--------------------------------------------------------------------*/
/*
diff --git a/src/misc/CMakeLists.txt b/src/misc/CMakeLists.txt
index 4d1c574..fb27fde 100644
--- a/src/misc/CMakeLists.txt
+++ b/src/misc/CMakeLists.txt
@@ -1,7 +1,7 @@
#
-# $Id: CMakeLists.txt 18131 2017-05-05 02:16:34Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/src/nearneighbor.c b/src/nearneighbor.c
index a406cf8..34e9eea 100644
--- a/src/nearneighbor.c
+++ b/src/nearneighbor.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: nearneighbor.c 18432 2017-06-22 00:20:07Z pwessel $
+ * $Id: nearneighbor.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/postscriptlight.c b/src/postscriptlight.c
index 484d7eb..0a7b5cf 100644
--- a/src/postscriptlight.c
+++ b/src/postscriptlight.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: postscriptlight.c 18428 2017-06-21 23:51:36Z pwessel $
+ * $Id: postscriptlight.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2009-2017 by P. Wessel and R. Scharroo
+ * Copyright (c) 2009-2018 by P. Wessel and R. Scharroo
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff --git a/src/postscriptlight.h b/src/postscriptlight.h
index 2c1806d..8fd4c5d 100644
--- a/src/postscriptlight.h
+++ b/src/postscriptlight.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: postscriptlight.h 18428 2017-06-21 23:51:36Z pwessel $
+ * $Id: postscriptlight.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2009-2017 by P. Wessel and R. Scharroo
+ * Copyright (c) 2009-2018 by P. Wessel and R. Scharroo
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff --git a/src/postscriptlight_f77.c b/src/postscriptlight_f77.c
index f75f46b..1f524de 100644
--- a/src/postscriptlight_f77.c
+++ b/src/postscriptlight_f77.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: postscriptlight_f77.c 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: postscriptlight_f77.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2009-2017 by P. Wessel and R. Scharroo
+ * Copyright (c) 2009-2018 by P. Wessel and R. Scharroo
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff --git a/src/potential/CMakeLists.txt b/src/potential/CMakeLists.txt
index fad3d91..59d3e02 100644
--- a/src/potential/CMakeLists.txt
+++ b/src/potential/CMakeLists.txt
@@ -1,7 +1,7 @@
#
-# $Id: CMakeLists.txt 18131 2017-05-05 02:16:34Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/src/potential/gmtflexure.c b/src/potential/gmtflexure.c
index 9124289..53a9101 100644
--- a/src/potential/gmtflexure.c
+++ b/src/potential/gmtflexure.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmtflexure.c 18404 2017-06-20 18:10:00Z pwessel $
+ * $Id: gmtflexure.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/potential/gmtgravmag3d.c b/src/potential/gmtgravmag3d.c
index 913840b..825e97c 100644
--- a/src/potential/gmtgravmag3d.c
+++ b/src/potential/gmtgravmag3d.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmtgravmag3d.c 18435 2017-06-22 04:01:50Z pwessel $
+ * $Id: gmtgravmag3d.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/potential/gpsgridder.c b/src/potential/gpsgridder.c
index 98ed1ec..a3271ed 100644
--- a/src/potential/gpsgridder.c
+++ b/src/potential/gpsgridder.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gpsgridder.c 18404 2017-06-20 18:10:00Z pwessel $
+ * $Id: gpsgridder.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/potential/gravfft.c b/src/potential/gravfft.c
index 82a8693..ba417f3 100644
--- a/src/potential/gravfft.c
+++ b/src/potential/gravfft.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gravfft.c 18110 2017-05-03 01:29:16Z pwessel $
+ * $Id: gravfft.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/potential/grdflexure.c b/src/potential/grdflexure.c
index 3f56bb2..4a9d623 100644
--- a/src/potential/grdflexure.c
+++ b/src/potential/grdflexure.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdflexure.c 18110 2017-05-03 01:29:16Z pwessel $
+ * $Id: grdflexure.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/potential/grdgravmag3d.c b/src/potential/grdgravmag3d.c
index c467e47..2476ee0 100644
--- a/src/potential/grdgravmag3d.c
+++ b/src/potential/grdgravmag3d.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdgravmag3d.c 18110 2017-05-03 01:29:16Z pwessel $
+ * $Id: grdgravmag3d.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/potential/grdredpol.c b/src/potential/grdredpol.c
index 606f78c..865d61c 100644
--- a/src/potential/grdredpol.c
+++ b/src/potential/grdredpol.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdredpol.c 18334 2017-06-07 19:25:56Z pwessel $
+ * $Id: grdredpol.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/potential/grdseamount.c b/src/potential/grdseamount.c
index 11b0eef..924d215 100644
--- a/src/potential/grdseamount.c
+++ b/src/potential/grdseamount.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdseamount.c 18282 2017-05-30 01:57:05Z pwessel $
+ * $Id: grdseamount.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/potential/okbfuns.c b/src/potential/okbfuns.c
index d33b739..9d72e0b 100644
--- a/src/potential/okbfuns.c
+++ b/src/potential/okbfuns.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: okbfuns.c 17551 2017-02-15 01:40:14Z pwessel $
+ * $Id: okbfuns.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/potential/okbfuns.h b/src/potential/okbfuns.h
index 3618839..134ab2f 100644
--- a/src/potential/okbfuns.h
+++ b/src/potential/okbfuns.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: okbfuns.h 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: okbfuns.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/potential/talwani.h b/src/potential/talwani.h
index 3f6fcea..9747d74 100644
--- a/src/potential/talwani.h
+++ b/src/potential/talwani.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: talwani.h 17606 2017-03-04 03:28:42Z pwessel $
+ * $Id: talwani.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/potential/talwani2d.c b/src/potential/talwani2d.c
index 2651fad..c70d3ec 100644
--- a/src/potential/talwani2d.c
+++ b/src/potential/talwani2d.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: talwani2d.c 18404 2017-06-20 18:10:00Z pwessel $
+ * $Id: talwani2d.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/potential/talwani3d.c b/src/potential/talwani3d.c
index 94f46b7..091dd1e 100644
--- a/src/potential/talwani3d.c
+++ b/src/potential/talwani3d.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: talwani3d.c 18404 2017-06-20 18:10:00Z pwessel $
+ * $Id: talwani3d.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/project.c b/src/project.c
index f80620e..9893ecc 100644
--- a/src/project.c
+++ b/src/project.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: project.c 18134 2017-05-05 08:34:43Z pwessel $
+ * $Id: project.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -520,6 +520,11 @@ GMT_LOCAL int parse (struct GMT_CTRL *GMT, struct PROJECT_CTRL *Ctrl, struct GMT
}
}
+ if (!Ctrl->N.active && ((Ctrl->C.active && (Ctrl->C.x < -360 || Ctrl->C.x > 360) && (Ctrl->C.y < -90 || Ctrl->C.y > 90)) || (Ctrl->E.active && (Ctrl->E.x < -360 || Ctrl->E.x > 360) && (Ctrl->E.y < -90 || Ctrl->E.y > 90)))) {
+ GMT_Report (API, GMT_MSG_NORMAL, "Syntax error: Your -C or -E options suggest Cartesian coordinates. Please see -N\n");
+ n_errors++;
+ }
+
n_errors += gmt_M_check_condition (GMT, Ctrl->L.active && !Ctrl->L.constrain && Ctrl->L.min >= Ctrl->L.max,
"Syntax error -L option: w_min must be < w_max\n");
n_errors += gmt_M_check_condition (GMT, Ctrl->W.active && Ctrl->W.min >= Ctrl->W.max,
@@ -723,8 +728,8 @@ int GMT_project (void *V_API, int mode, void *args) {
}
if (Ctrl->G.active) { /* Hardwire 3 output columns and set their types */
P.n_outputs = 3;
- GMT->current.io.col_type[GMT_OUT][GMT_X] = GMT_IS_LON;
- GMT->current.io.col_type[GMT_OUT][GMT_Y] = GMT_IS_LAT;
+ GMT->current.io.col_type[GMT_OUT][GMT_X] = (Ctrl->N.active) ? GMT_IS_FLOAT : GMT_IS_LON;
+ GMT->current.io.col_type[GMT_OUT][GMT_Y] = (Ctrl->N.active) ? GMT_IS_FLOAT : (Ctrl->N.active) ? GMT_IS_FLOAT : GMT_IS_LAT;
GMT->current.io.col_type[GMT_OUT][GMT_Z] = GMT_IS_FLOAT;
}
else { /* Decode and set the various output column types */
diff --git a/src/psbasemap.c b/src/psbasemap.c
index 9c3c154..5416834 100644
--- a/src/psbasemap.c
+++ b/src/psbasemap.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: psbasemap.c 18304 2017-06-02 04:58:28Z pwessel $
+ * $Id: psbasemap.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/psclip.c b/src/psclip.c
index 0c39e1b..7fb8d72 100644
--- a/src/psclip.c
+++ b/src/psclip.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: psclip.c 18428 2017-06-21 23:51:36Z pwessel $
+ * $Id: psclip.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/pscoast.c b/src/pscoast.c
index e54d3ec..fdeb82a 100644
--- a/src/pscoast.c
+++ b/src/pscoast.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: pscoast.c 18244 2017-05-28 05:19:29Z pwessel $
+ * $Id: pscoast.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -649,11 +649,11 @@ GMT_LOCAL void recursive_path (struct GMT_CTRL *GMT, struct PSL_CTRL *PSL, int k
GMT_LOCAL int check_antipode_status (struct GMT_CTRL *GMT, struct GMT_SHORE *c, int inside, double clon, double clat, int status[]) {
/* For a global -JE map we need to know if the projection center and its antipode are on land, ocean, what,
* since it affects how donut-hell will behave */
- char old_J[GMT_LEN64] = {""};
+ char old_J[GMT_LEN128] = {""};
double alon = clon + 180.0;
if (alon >= 360.0) alon -= 360.0;
/* Switch to linear projection */
- strncpy (old_J, GMT->common.J.string, GMT_LEN64-1);
+ strncpy (old_J, GMT->common.J.string, GMT_LEN128-1);
GMT->common.J.active = false;
gmt_parse_common_options (GMT, "J", 'J', "x1i");
if (gmt_M_err_pass (GMT, gmt_map_setup (GMT, GMT->common.R.wesn), "")) return (-1);
diff --git a/src/pscontour.c b/src/pscontour.c
index ab1ee2a..570a18d 100644
--- a/src/pscontour.c
+++ b/src/pscontour.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: pscontour.c 18134 2017-05-05 08:34:43Z pwessel $
+ * $Id: pscontour.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -32,7 +32,7 @@
#define THIS_MODULE_PURPOSE "Contour table data by direct triangulation"
#define THIS_MODULE_KEYS "<D{,AT)=t,CC(,ED(,DDD,G?(=1,>X}"
#define THIS_MODULE_NEEDS "dJ"
-#define THIS_MODULE_OPTIONS "-:>BJKOPRUVXYbdehipstxy" GMT_OPT("EMmc")
+#define THIS_MODULE_OPTIONS "-:>BJKOPRUVXYbdehipstxy" GMT_OPT("Mmc")
struct PSCONTOUR_CTRL {
struct GMT_CONTOUR contour;
@@ -621,7 +621,7 @@ GMT_LOCAL int parse (struct GMT_CTRL *GMT, struct PSCONTOUR_CTRL *Ctrl, struct G
A[0] = string[0]; Ctrl->T.txt[0] = strdup (A);
A[0] = string[1]; Ctrl->T.txt[1] = strdup (A);
}
- else if (strchr (&(opt->arg[j]), ',') && (n = sscanf (&(opt->arg[j]), "%[^,],%s", txt_a, txt_b)) == 2) { /* Found :<labellow>,<labelhigh> */
+ else if (strchr (string, ',') && (n = sscanf (string, "%[^,],%s", txt_a, txt_b)) == 2) { /* Found :<labellow>,<labelhigh> */
Ctrl->T.txt[0] = strdup (txt_a);
Ctrl->T.txt[1] = strdup (txt_b);
}
@@ -751,7 +751,7 @@ int GMT_pscontour (void *V_API, int mode, void *args) {
struct SAVE *save = NULL;
struct PSCONTOUR_CTRL *Ctrl = NULL;
struct GMT_CTRL *GMT = NULL, *GMT_cpy = NULL; /* General GMT internal parameters */
- struct GMT_OPTION *options = NULL;
+ struct GMT_OPTION *options = NULL, *opt = NULL;
struct PSL_CTRL *PSL = NULL; /* General PSL internal parameters */
struct GMTAPI_CTRL *API = gmt_get_api_ptr (V_API); /* Cast from void to GMTAPI_CTRL pointer */
@@ -767,6 +767,13 @@ int GMT_pscontour (void *V_API, int mode, void *args) {
/* Parse the command-line arguments; return if errors are encountered */
if ((GMT = gmt_init_module (API, THIS_MODULE_LIB, THIS_MODULE_NAME, THIS_MODULE_KEYS, THIS_MODULE_NEEDS, &options, &GMT_cpy)) == NULL) bailout (API->error); /* Save current state */
+ /* Must intercept any old-style -Eaz/el here and change it to -p */
+ if ((opt = GMT_Find_Option (API, 'E', options)) && gmt_M_compat_check (GMT, 4)) { /* Got -E, check if given a file */
+ if (gmt_access (GMT, opt->arg, F_OK)) { /* Argument not a file we can open, so under compat mode we assume we got -Eaz/el */
+ GMT_Report (API, GMT_MSG_COMPAT, "Warning: Option -E<az/el>> is deprecated; use -p instead.\n");
+ opt->option = 'p';
+ }
+ }
if (GMT_Parse_Common (API, THIS_MODULE_OPTIONS, options)) Return (API->error);
Ctrl = New_Ctrl (GMT); /* Allocate and initialize a new control structure */
if ((error = parse (GMT, Ctrl, options)) != 0) Return (error);
diff --git a/src/psconvert.c b/src/psconvert.c
index 724a006..bf26ba9 100644
--- a/src/psconvert.c
+++ b/src/psconvert.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: psconvert.c 18435 2017-06-22 04:01:50Z pwessel $
+ * $Id: psconvert.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -1163,7 +1163,6 @@ GMT_LOCAL int pipe_ghost (struct GMTAPI_CTRL *API, struct PS2RASTER_CTRL *Ctrl,
I->type = GMT_CHAR;
I->header->n_columns = (uint32_t)dim[GMT_X]; I->header->n_rows = (uint32_t)dim[GMT_Y]; I->header->n_bands = (uint32_t)dim[GMT_Z];
I->header->registration = GMT_GRID_PIXEL_REG;
- gmt_M_memcpy (I->header->mem_layout, "TCBa", 4, char); /* Signal that data is Band interleaved */
gmt_M_grd_setpad (API->GMT, I->header, nopad); /* Copy the no pad to the header */
if (GMT_Write_Data (API, GMT_IS_IMAGE, GMT_IS_FILE, GMT_IS_SURFACE, GMT_CONTAINER_AND_DATA, NULL, Ctrl->F.file, I) != GMT_NOERROR)
return GMT_RUNTIME_ERROR;
diff --git a/src/pshistogram.c b/src/pshistogram.c
index 16f29fe..acbd150 100644
--- a/src/pshistogram.c
+++ b/src/pshistogram.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: pshistogram.c 18328 2017-06-07 04:43:45Z pwessel $
+ * $Id: pshistogram.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/psimage.c b/src/psimage.c
index 0fc146a..7b11c7f 100644
--- a/src/psimage.c
+++ b/src/psimage.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: psimage.c 18254 2017-05-28 19:46:56Z pwessel $
+ * $Id: psimage.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/psl_config.h.in b/src/psl_config.h.in
index 0ae5a17..94f8ee6 100644
--- a/src/psl_config.h.in
+++ b/src/psl_config.h.in
@@ -1,7 +1,7 @@
/*
- * $Id: psl_config.h.in 17614 2017-03-05 01:46:32Z pwessel $
+ * $Id: psl_config.h.in 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2009-2017 by P. Wessel and R. Scharroo
+ * Copyright (c) 2009-2018 by P. Wessel and R. Scharroo
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff --git a/src/psldemo.h.in b/src/psldemo.h.in
index ab01472..ba1129f 100644
--- a/src/psldemo.h.in
+++ b/src/psldemo.h.in
@@ -1,6 +1,6 @@
-/* $Id: psldemo.h.in 17451 2017-01-16 21:36:06Z pwessel $
+/* $Id: psldemo.h.in 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo,
+ * Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo,
* F. Wobbe, and J. Luis
* See LICENSE.TXT file for copying and redistribution conditions.
*
diff --git a/src/pslegend.c b/src/pslegend.c
index 227598a..dc03372 100644
--- a/src/pslegend.c
+++ b/src/pslegend.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: pslegend.c 18115 2017-05-03 22:34:10Z jluis $
+ * $Id: pslegend.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/psmask.c b/src/psmask.c
index d78cfa8..cd3aa19 100644
--- a/src/psmask.c
+++ b/src/psmask.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: psmask.c 18282 2017-05-30 01:57:05Z pwessel $
+ * $Id: psmask.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/psrose.c b/src/psrose.c
index 4036fe0..7d64419 100644
--- a/src/psrose.c
+++ b/src/psrose.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: psrose.c 18134 2017-05-05 08:34:43Z pwessel $
+ * $Id: psrose.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/psscale.c b/src/psscale.c
index 1a30ba7..79c5094 100644
--- a/src/psscale.c
+++ b/src/psscale.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: psscale.c 18420 2017-06-21 21:26:52Z pwessel $
+ * $Id: psscale.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -1420,7 +1420,7 @@ GMT_LOCAL void gmt_draw_colorbar (struct GMT_CTRL *GMT, struct PSSCALE_CTRL *Ctr
PSL_setorigin (PSL, -width, 0.0, -90.0, PSL_INV);
}
gmt_M_free (GMT, xpos);
- if (use_image || Ctrl->I.active) gmt_M_free (GMT, bar);
+ if (use_image || Ctrl->I.active || need_image) gmt_M_free (GMT, bar);
/* Reset back to original line cap and join */
PSL_setlinecap (PSL, cap);
PSL_setlinejoin (PSL, join);
diff --git a/src/pssolar.c b/src/pssolar.c
index f051421..33afd82 100644
--- a/src/pssolar.c
+++ b/src/pssolar.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: pssolar.c 18254 2017-05-28 19:46:56Z pwessel $
+ * $Id: pssolar.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/psternary.c b/src/psternary.c
index ed2410e..e7329fb 100644
--- a/src/psternary.c
+++ b/src/psternary.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: psternary.c 18391 2017-06-17 21:24:36Z pwessel $
+ * $Id: psternary.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/pstext.c b/src/pstext.c
index 8e4c7f1..3a9562a 100644
--- a/src/pstext.c
+++ b/src/pstext.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: pstext.c 18134 2017-05-05 08:34:43Z pwessel $
+ * $Id: pstext.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/pswiggle.c b/src/pswiggle.c
index 82c6013..6bdad17 100644
--- a/src/pswiggle.c
+++ b/src/pswiggle.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: pswiggle.c 18316 2017-06-03 04:57:26Z pwessel $
+ * $Id: pswiggle.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/psxy.c b/src/psxy.c
index 204f145..f28d7e4 100644
--- a/src/psxy.c
+++ b/src/psxy.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: psxy.c 18363 2017-06-12 01:30:50Z pwessel $
+ * $Id: psxy.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
@@ -984,7 +984,7 @@ int GMT_psxy (void *V_API, int mode, void *args) {
GMT->current.io.col_type[GMT_IN][pos2y] = GMT_IS_FLOAT; /* Just the users dy component, not length */
if (S.symbol == PSL_VECTOR || S.symbol == GMT_SYMBOL_GEOVECTOR || S.symbol == PSL_MARC ) { /* One of the vector symbols */
geovector = (S.symbol == GMT_SYMBOL_GEOVECTOR);
- if ((S.v.status & PSL_VEC_FILL) == 0) Ctrl->G.active = false; /* Want no fill so override -G*/
+ if ((S.v.status & PSL_VEC_FILL) == 0 && !S.v.parsed_v4) Ctrl->G.active = false; /* Want no fill so override -G */
if (S.v.status & PSL_VEC_FILL) S.v.fill = current_fill; /* Override -G<fill> (if set) with specified head fill */
}
bcol = (S.read_size) ? ex2 : ex1;
diff --git a/src/psxyz.c b/src/psxyz.c
index 1b15ce1..52a2a3c 100644
--- a/src/psxyz.c
+++ b/src/psxyz.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: psxyz.c 18134 2017-05-05 08:34:43Z pwessel $
+ * $Id: psxyz.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/sample1d.c b/src/sample1d.c
index d141db6..315a3fb 100644
--- a/src/sample1d.c
+++ b/src/sample1d.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: sample1d.c 18404 2017-06-20 18:10:00Z pwessel $
+ * $Id: sample1d.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/script2verbatim.c b/src/script2verbatim.c
index f1e424a..bc602b2 100644
--- a/src/script2verbatim.c
+++ b/src/script2verbatim.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: script2verbatim.c 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: script2verbatim.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/segy/CMakeLists.txt b/src/segy/CMakeLists.txt
index 34c081a..21d0693 100644
--- a/src/segy/CMakeLists.txt
+++ b/src/segy/CMakeLists.txt
@@ -1,7 +1,7 @@
#
-# $Id: CMakeLists.txt 18131 2017-05-05 02:16:34Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/src/segy/pssegy.c b/src/segy/pssegy.c
index 2313989..caa43c1 100644
--- a/src/segy/pssegy.c
+++ b/src/segy/pssegy.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: pssegy.c 17798 2017-03-27 04:50:17Z pwessel $
+ * $Id: pssegy.c 19523 2017-12-27 23:20:32Z pwessel $
*
- * Copyright (c) 1999-2017 by T. Henstock
+ * Copyright (c) 1999-2018 by T. Henstock
* See README file for copying and redistribution conditions.
*--------------------------------------------------------------------*/
/* pssegy program to plot segy files in postscript with variable trace spacing option
diff --git a/src/segy/pssegyz.c b/src/segy/pssegyz.c
index 8d08adc..cde9889 100644
--- a/src/segy/pssegyz.c
+++ b/src/segy/pssegyz.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: pssegyz.c 18018 2017-04-22 00:35:39Z pwessel $
+ * $Id: pssegyz.c 19523 2017-12-27 23:20:32Z pwessel $
*
- * Copyright (c) 1999-2017 by T. Henstock
+ * Copyright (c) 1999-2018 by T. Henstock
* See README file for copying and redistribution conditions.
*--------------------------------------------------------------------*/
/* pssegyzz program to plot segy files in 3d in postscript with variable trace spacing option
diff --git a/src/segy/segy2grd.c b/src/segy/segy2grd.c
index a1eda32..c3d306d 100644
--- a/src/segy/segy2grd.c
+++ b/src/segy/segy2grd.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: segy2grd.c 18282 2017-05-30 01:57:05Z pwessel $
+ * $Id: segy2grd.c 19523 2017-12-27 23:20:32Z pwessel $
*
- * Copyright (c) 1991-2017 by T. Henstock
+ * Copyright (c) 1991-2018 by T. Henstock
* See LICENSE.TXT file for copying and redistribution conditions.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/spectrum1d.c b/src/spectrum1d.c
index 12d944e..3fd3133 100644
--- a/src/spectrum1d.c
+++ b/src/spectrum1d.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: spectrum1d.c 18134 2017-05-05 08:34:43Z pwessel $
+ * $Id: spectrum1d.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/sph2grd.c b/src/sph2grd.c
index ea13e5f..76257ab 100644
--- a/src/sph2grd.c
+++ b/src/sph2grd.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: sph2grd.c 18282 2017-05-30 01:57:05Z pwessel $
+ * $Id: sph2grd.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/sphdistance.c b/src/sphdistance.c
index bbb762c..03625b3 100644
--- a/src/sphdistance.c
+++ b/src/sphdistance.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: sphdistance.c 18404 2017-06-20 18:10:00Z pwessel $
+ * $Id: sphdistance.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2008-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * Copyright (c) 2008-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
* See LICENSE.TXT file for copying and redistribution conditions.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/sphinterpolate.c b/src/sphinterpolate.c
index f0d2533..b87d657 100644
--- a/src/sphinterpolate.c
+++ b/src/sphinterpolate.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: sphinterpolate.c 18282 2017-05-30 01:57:05Z pwessel $
+ * $Id: sphinterpolate.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2008-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * Copyright (c) 2008-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
* See LICENSE.TXT file for copying and redistribution conditions.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/sphtriangulate.c b/src/sphtriangulate.c
index a48b773..8e92550 100644
--- a/src/sphtriangulate.c
+++ b/src/sphtriangulate.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: sphtriangulate.c 18134 2017-05-05 08:34:43Z pwessel $
+ * $Id: sphtriangulate.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2008-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * Copyright (c) 2008-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
* See LICENSE.TXT file for copying and redistribution conditions.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/splitxyz.c b/src/splitxyz.c
index 8d1b06c..140b569 100644
--- a/src/splitxyz.c
+++ b/src/splitxyz.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: splitxyz.c 18134 2017-05-05 08:34:43Z pwessel $
+ * $Id: splitxyz.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/spotter/CMakeLists.txt b/src/spotter/CMakeLists.txt
index 5f87bac..156a1c3 100644
--- a/src/spotter/CMakeLists.txt
+++ b/src/spotter/CMakeLists.txt
@@ -1,7 +1,7 @@
#
-# $Id: CMakeLists.txt 18131 2017-05-05 02:16:34Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/src/spotter/backtracker.c b/src/spotter/backtracker.c
index 0838c14..9c9e081 100644
--- a/src/spotter/backtracker.c
+++ b/src/spotter/backtracker.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: backtracker.c 18404 2017-06-20 18:10:00Z pwessel $
+ * $Id: backtracker.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1999-2017 by P. Wessel
+ * Copyright (c) 1999-2018 by P. Wessel
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff --git a/src/spotter/gmtpmodeler.c b/src/spotter/gmtpmodeler.c
index 36ad2fb..3ddfacc 100644
--- a/src/spotter/gmtpmodeler.c
+++ b/src/spotter/gmtpmodeler.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: gmtpmodeler.c 18404 2017-06-20 18:10:00Z pwessel $
+ * $Id: gmtpmodeler.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1999-2017 by P. Wessel
+ * Copyright (c) 1999-2018 by P. Wessel
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff --git a/src/spotter/grdpmodeler.c b/src/spotter/grdpmodeler.c
index a01815a..9c06c50 100644
--- a/src/spotter/grdpmodeler.c
+++ b/src/spotter/grdpmodeler.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdpmodeler.c 18110 2017-05-03 01:29:16Z pwessel $
+ * $Id: grdpmodeler.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1999-2017 by P. Wessel
+ * Copyright (c) 1999-2018 by P. Wessel
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff --git a/src/spotter/grdrotater.c b/src/spotter/grdrotater.c
index 83531ce..3ef8cbc 100644
--- a/src/spotter/grdrotater.c
+++ b/src/spotter/grdrotater.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdrotater.c 18110 2017-05-03 01:29:16Z pwessel $
+ * $Id: grdrotater.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1999-2017 by P. Wessel
+ * Copyright (c) 1999-2018 by P. Wessel
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff --git a/src/spotter/grdspotter.c b/src/spotter/grdspotter.c
index e0e7943..8b8ede9 100644
--- a/src/spotter/grdspotter.c
+++ b/src/spotter/grdspotter.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: grdspotter.c 18282 2017-05-30 01:57:05Z pwessel $
+ * $Id: grdspotter.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1999-2017 by P. Wessel
+ * Copyright (c) 1999-2018 by P. Wessel
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff --git a/src/spotter/hotspotter.c b/src/spotter/hotspotter.c
index d001e80..bb470e2 100644
--- a/src/spotter/hotspotter.c
+++ b/src/spotter/hotspotter.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: hotspotter.c 18282 2017-05-30 01:57:05Z pwessel $
+ * $Id: hotspotter.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1999-2017 by P. Wessel
+ * Copyright (c) 1999-2018 by P. Wessel
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff --git a/src/spotter/libspotter.c b/src/spotter/libspotter.c
index 8a7ac48..bb57514 100644
--- a/src/spotter/libspotter.c
+++ b/src/spotter/libspotter.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: libspotter.c 17780 2017-03-25 20:54:11Z pwessel $
+ * $Id: libspotter.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1999-2017 by P. Wessel
+ * Copyright (c) 1999-2018 by P. Wessel
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff --git a/src/spotter/originator.c b/src/spotter/originator.c
index 7144077..628a9af 100644
--- a/src/spotter/originator.c
+++ b/src/spotter/originator.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: originator.c 18134 2017-05-05 08:34:43Z pwessel $
+ * $Id: originator.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2000-2017 by P. Wessel
+ * Copyright (c) 2000-2018 by P. Wessel
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff --git a/src/spotter/rotconverter.c b/src/spotter/rotconverter.c
index fdb91b6..131277a 100644
--- a/src/spotter/rotconverter.c
+++ b/src/spotter/rotconverter.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: rotconverter.c 18435 2017-06-22 04:01:50Z pwessel $
+ * $Id: rotconverter.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1999-2017 by P. Wessel
+ * Copyright (c) 1999-2018 by P. Wessel
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff --git a/src/spotter/rotsmoother.c b/src/spotter/rotsmoother.c
index 7b3644c..2239c62 100644
--- a/src/spotter/rotsmoother.c
+++ b/src/spotter/rotsmoother.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: rotsmoother.c 18134 2017-05-05 08:34:43Z pwessel $
+ * $Id: rotsmoother.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 2016-2017 by P. Wessel
+ * Copyright (c) 2016-2018 by P. Wessel
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff --git a/src/spotter/spotter.h b/src/spotter/spotter.h
index 6d3ed37..359b855 100644
--- a/src/spotter/spotter.h
+++ b/src/spotter/spotter.h
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: spotter.h 17780 2017-03-25 20:54:11Z pwessel $
+ * $Id: spotter.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1999-2017 by P. Wessel
+ * Copyright (c) 1999-2018 by P. Wessel
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
diff --git a/src/surface.c b/src/surface.c
index ba404c3..ec92436 100644
--- a/src/surface.c
+++ b/src/surface.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: surface.c 18282 2017-05-30 01:57:05Z pwessel $
+ * $Id: surface.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/surface_mt.c b/src/surface_mt.c
index e26b3a7..67fed7a 100644
--- a/src/surface_mt.c
+++ b/src/surface_mt.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
* $Id: surface.c 15861 2016-03-10 04:17:28Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/testapi.c b/src/testapi.c
index ae25173..3afeaaa 100644
--- a/src/testapi.c
+++ b/src/testapi.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: testapi.c 17780 2017-03-25 20:54:11Z pwessel $
+ * $Id: testapi.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/testapiconv.c b/src/testapiconv.c
index 65d6599..ad794e4 100644
--- a/src/testapiconv.c
+++ b/src/testapiconv.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: testapiconv.c 18110 2017-05-03 01:29:16Z pwessel $
+ * $Id: testapiconv.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/testgmt5.c b/src/testgmt5.c
index 9dfae09..4a9de94 100644
--- a/src/testgmt5.c
+++ b/src/testgmt5.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: testgmt5.c 18110 2017-05-03 01:29:16Z pwessel $
+ * $Id: testgmt5.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/testgmtio.c b/src/testgmtio.c
index e63d399..fdd63e2 100644
--- a/src/testgmtio.c
+++ b/src/testgmtio.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: testgmtio.c 17780 2017-03-25 20:54:11Z pwessel $
+ * $Id: testgmtio.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/testgrdio.c b/src/testgrdio.c
index 5e24195..93b04ad 100644
--- a/src/testgrdio.c
+++ b/src/testgrdio.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: testgrdio.c 18110 2017-05-03 01:29:16Z pwessel $
+ * $Id: testgrdio.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/testio.c b/src/testio.c
index 3468d5f..67f4387 100644
--- a/src/testio.c
+++ b/src/testio.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: testio.c 17451 2017-01-16 21:36:06Z pwessel $
+ * $Id: testio.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/testpsl.c b/src/testpsl.c
index 9c3f9f3..4bb176a 100644
--- a/src/testpsl.c
+++ b/src/testpsl.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: testpsl.c 17931 2017-04-15 00:26:33Z pwessel $
+ * $Id: testpsl.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-$year by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/trend1d.c b/src/trend1d.c
index eb88e44..9856ae4 100644
--- a/src/trend1d.c
+++ b/src/trend1d.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: trend1d.c 18271 2017-05-29 22:16:55Z pwessel $
+ * $Id: trend1d.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/trend2d.c b/src/trend2d.c
index 93e7e6f..f5e89a9 100644
--- a/src/trend2d.c
+++ b/src/trend2d.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: trend2d.c 18171 2017-05-07 02:37:02Z pwessel $
+ * $Id: trend2d.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/triangulate.c b/src/triangulate.c
index 9d85734..a3c82a7 100644
--- a/src/triangulate.c
+++ b/src/triangulate.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: triangulate.c 18282 2017-05-30 01:57:05Z pwessel $
+ * $Id: triangulate.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/x2sys/CMakeLists.txt b/src/x2sys/CMakeLists.txt
index f6c8b7e..a60d9e2 100644
--- a/src/x2sys/CMakeLists.txt
+++ b/src/x2sys/CMakeLists.txt
@@ -1,7 +1,7 @@
#
-# $Id: CMakeLists.txt 18131 2017-05-05 02:16:34Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
#
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# 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.
#
# This program is free software; you can redistribute it and/or modify
diff --git a/src/x2sys/split_file4coes.m b/src/x2sys/split_file4coes.m
index 6f7bbe8..8c04324 100644
--- a/src/x2sys/split_file4coes.m
+++ b/src/x2sys/split_file4coes.m
@@ -21,9 +21,9 @@ function split_file4coes(fname, n_int)
% of 'cruzados_%d.txt', e.g. cruzados_5.txt
% -------------------------------------------------------------------------------------
-% $Id: split_file4coes.m 17451 2017-01-16 21:36:06Z pwessel $
+% $Id: split_file4coes.m 19523 2017-12-27 23:20:32Z pwessel $
%
-% Copyright (c) 1999-2017 by J. Luis
+% Copyright (c) 1999-2018 by J. Luis
% See LICENSE.TXT file for copying and redistribution conditions.
%
% This program is free software; you can redistribute it and/or modify
diff --git a/src/x2sys/x2sys.c b/src/x2sys/x2sys.c
index 53d626c..26c98fa 100644
--- a/src/x2sys/x2sys.c
+++ b/src/x2sys/x2sys.c
@@ -1,7 +1,7 @@
/*-----------------------------------------------------------------
- * $Id: x2sys.c 18435 2017-06-22 04:01:50Z pwessel $
+ * $Id: x2sys.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1999-2017 by P. Wessel
+ * Copyright (c) 1999-2018 by P. Wessel
* See LICENSE.TXT file for copying and redistribution conditions.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/x2sys/x2sys.h b/src/x2sys/x2sys.h
index 5fea664..3a422a6 100644
--- a/src/x2sys/x2sys.h
+++ b/src/x2sys/x2sys.h
@@ -1,7 +1,7 @@
/*-----------------------------------------------------------------
- * $Id: x2sys.h 17780 2017-03-25 20:54:11Z pwessel $
+ * $Id: x2sys.h 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1999-2017 by P. Wessel
+ * Copyright (c) 1999-2018 by P. Wessel
* See LICENSE.TXT file for copying and redistribution conditions.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/x2sys/x2sys_binlist.c b/src/x2sys/x2sys_binlist.c
index 3a4b684..d9e97ba 100644
--- a/src/x2sys/x2sys_binlist.c
+++ b/src/x2sys/x2sys_binlist.c
@@ -1,7 +1,7 @@
/*-----------------------------------------------------------------
- * $Id: x2sys_binlist.c 18435 2017-06-22 04:01:50Z pwessel $
+ * $Id: x2sys_binlist.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1999-2017 by P. Wessel
+ * Copyright (c) 1999-2018 by P. Wessel
* See LICENSE.TXT file for copying and redistribution conditions.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/x2sys/x2sys_cross.c b/src/x2sys/x2sys_cross.c
index 17bb67a..fdadaa1 100644
--- a/src/x2sys/x2sys_cross.c
+++ b/src/x2sys/x2sys_cross.c
@@ -1,7 +1,7 @@
/*-----------------------------------------------------------------
- * $Id: x2sys_cross.c 18435 2017-06-22 04:01:50Z pwessel $
+ * $Id: x2sys_cross.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1999-2017 by P. Wessel
+ * Copyright (c) 1999-2018 by P. Wessel
* See LICENSE.TXT file for copying and redistribution conditions.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/x2sys/x2sys_datalist.c b/src/x2sys/x2sys_datalist.c
index 8393747..181074d 100644
--- a/src/x2sys/x2sys_datalist.c
+++ b/src/x2sys/x2sys_datalist.c
@@ -1,7 +1,7 @@
/*-----------------------------------------------------------------
- * $Id: x2sys_datalist.c 18435 2017-06-22 04:01:50Z pwessel $
+ * $Id: x2sys_datalist.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1999-2017 by P. Wessel
+ * Copyright (c) 1999-2018 by P. Wessel
* See LICENSE.TXT file for copying and redistribution conditions.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/x2sys/x2sys_get.c b/src/x2sys/x2sys_get.c
index c11b845..bbe7264 100644
--- a/src/x2sys/x2sys_get.c
+++ b/src/x2sys/x2sys_get.c
@@ -1,7 +1,7 @@
/*-----------------------------------------------------------------
- * $Id: x2sys_get.c 17831 2017-03-31 22:28:43Z pwessel $
+ * $Id: x2sys_get.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1999-2017 by P. Wessel
+ * Copyright (c) 1999-2018 by P. Wessel
* See LICENSE.TXT file for copying and redistribution conditions.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/x2sys/x2sys_init.c b/src/x2sys/x2sys_init.c
index 36a79f2..c8ef77c 100644
--- a/src/x2sys/x2sys_init.c
+++ b/src/x2sys/x2sys_init.c
@@ -1,7 +1,7 @@
/*-----------------------------------------------------------------
- * $Id: x2sys_init.c 18051 2017-04-28 04:00:39Z pwessel $
+ * $Id: x2sys_init.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1999-2017 by P. Wessel
+ * Copyright (c) 1999-2018 by P. Wessel
* See LICENSE.TXT file for copying and redistribution conditions.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/x2sys/x2sys_list.c b/src/x2sys/x2sys_list.c
index a0c94c9..d9ea0ab 100644
--- a/src/x2sys/x2sys_list.c
+++ b/src/x2sys/x2sys_list.c
@@ -1,7 +1,7 @@
/*-----------------------------------------------------------------
- * $Id: x2sys_list.c 18083 2017-04-30 21:06:41Z jluis $
+ * $Id: x2sys_list.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1999-2017 by P. Wessel
+ * Copyright (c) 1999-2018 by P. Wessel
* See LICENSE.TXT file for copying and redistribution conditions.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/x2sys/x2sys_merge.c b/src/x2sys/x2sys_merge.c
index 2611477..3fd51bd 100644
--- a/src/x2sys/x2sys_merge.c
+++ b/src/x2sys/x2sys_merge.c
@@ -1,7 +1,7 @@
/*-----------------------------------------------------------------
- * $Id: x2sys_merge.c 17798 2017-03-27 04:50:17Z pwessel $
+ * $Id: x2sys_merge.c 19523 2017-12-27 23:20:32Z pwessel $
*
- * Copyright (c) 1999-2017 by J. Luis
+ * Copyright (c) 1999-2018 by J. Luis
* See LICENSE.TXT file for copying and redistribution conditions.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/x2sys/x2sys_put.c b/src/x2sys/x2sys_put.c
index 7f686c4..0ad65ad 100644
--- a/src/x2sys/x2sys_put.c
+++ b/src/x2sys/x2sys_put.c
@@ -1,7 +1,7 @@
/*-----------------------------------------------------------------
- * $Id: x2sys_put.c 18435 2017-06-22 04:01:50Z pwessel $
+ * $Id: x2sys_put.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1999-2017 by P. Wessel
+ * Copyright (c) 1999-2018 by P. Wessel
* See LICENSE.TXT file for copying and redistribution conditions.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/x2sys/x2sys_report.c b/src/x2sys/x2sys_report.c
index effcc57..a4a88a7 100644
--- a/src/x2sys/x2sys_report.c
+++ b/src/x2sys/x2sys_report.c
@@ -1,7 +1,7 @@
/*-----------------------------------------------------------------
- * $Id: x2sys_report.c 18435 2017-06-22 04:01:50Z pwessel $
+ * $Id: x2sys_report.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1999-2017 by P. Wessel
+ * Copyright (c) 1999-2018 by P. Wessel
* See LICENSE.TXT file for copying and redistribution conditions.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/x2sys/x2sys_solve.c b/src/x2sys/x2sys_solve.c
index 48c5f1f..3729f2f 100644
--- a/src/x2sys/x2sys_solve.c
+++ b/src/x2sys/x2sys_solve.c
@@ -1,7 +1,7 @@
/*-----------------------------------------------------------------
- * $Id: x2sys_solve.c 17798 2017-03-27 04:50:17Z pwessel $
+ * $Id: x2sys_solve.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1999-2017 by P. Wessel
+ * Copyright (c) 1999-2018 by P. Wessel
* See LICENSE.TXT file for copying and redistribution conditions.
*
* This program is free software; you can redistribute it and/or modify
diff --git a/src/xyz2grd.c b/src/xyz2grd.c
index dec15c9..8b28b73 100644
--- a/src/xyz2grd.c
+++ b/src/xyz2grd.c
@@ -1,7 +1,7 @@
/*--------------------------------------------------------------------
- * $Id: xyz2grd.c 18282 2017-05-30 01:57:05Z pwessel $
+ * $Id: xyz2grd.c 19521 2017-12-27 22:38:24Z pwessel $
*
- * Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+ * 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.
*
* This program is free software; you can redistribute it and/or modify
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gmt.git
More information about the Pkg-grass-devel
mailing list