Fix default for xpm2gmx tick-mark spacings

Inadvertently broken ages ago in 027ae34187f8

Fixes #3881

diff --git a/docs/release-notes/2021/major/bugs-fixed.rst b/docs/release-notes/2021/major/bugs-fixed.rst
index 9f1ea3365b56caf2c0ab98f0edfee511b7926846..c9ee60641784b93209db15b2bc02384333c24b3f 100644 (file)
--- a/docs/release-notes/2021/major/bugs-fixed.rst
+++ b/docs/release-notes/2021/major/bugs-fixed.rst
@@ -63,6 +63,15 @@ given in the reference manual.
 
 :issue:`3751`
 
+Fixed default for tick-mark spacing in gmx xpm2ps
+"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
+
+This was inadvertently changed many years ago, leading to the intended
+default of automatic tick-mark spacing being replaced with an
+unsuitable fixed value.
+
+:issue:`3881`
+
 Fixed LJ Ewald exclusions when used with cut-off electrostatics
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 

diff --git a/src/gromacs/gmxana/gmx_xpm2ps.cpp b/src/gromacs/gmxana/gmx_xpm2ps.cpp
index e0e24fea33722508c4cb7b1cb05da1f7d95b2085..41dcdaf8421bb71b26c99fbe156e8431b1a4b0bf 100644 (file)
--- a/src/gromacs/gmxana/gmx_xpm2ps.cpp
+++ b/src/gromacs/gmxana/gmx_xpm2ps.cpp
@@ -4,7 +4,7 @@
  * Copyright (c) 1991-2000, University of Groningen, The Netherlands.
  * Copyright (c) 2001-2004, The GROMACS development team.
  * Copyright (c) 2013,2014,2015,2016,2017 by the GROMACS development team.
- * Copyright (c) 2018,2019,2020, by the GROMACS development team, led by
+ * Copyright (c) 2018,2019,2020,2021, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -171,8 +171,8 @@ static void get_params(const char* mpin, const char* mpout, t_psrec* psr)
     psr->ticklinewidth  = get_ereal(&inp, "ticklinewidth", psr->linewidth, wi);
     psr->zerolinewidth  = get_ereal(&inp, "zerolinewidth", psr->ticklinewidth, wi);
     psr->X.lineatzero   = get_eenum(&inp, "x-lineat0value", colors);
-    psr->X.major        = get_ereal(&inp, "x-major", 1, wi);
-    psr->X.minor        = get_ereal(&inp, "x-minor", 1, wi);
+    psr->X.major        = get_ereal(&inp, "x-major", -1, wi);
+    psr->X.minor        = get_ereal(&inp, "x-minor", -1, wi);
     psr->X.offset       = get_ereal(&inp, "x-firstmajor", 0.0, wi);
     psr->X.first        = (get_eenum(&inp, "x-majorat0", gmx_bools) != 0);
     psr->X.majorticklen = get_ereal(&inp, "x-majorticklen", 8.0, wi);