[Rivet-svn] rivet: 2 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/e1f00b01a403
branches:  release-2-4-x
changeset: 4930:e1f00b01a403
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Nov 13 12:57:47 2015 +0000
description:
More specific nullness testing

details:   https://rivet.hepforge.org/hg/rivet/rev/e7b75203eb74
branches:  release-2-4-x
changeset: 4931:e7b75203eb74
user:      Andy Buckley <andy at insectnation.org>
date:      Fri Nov 13 12:58:01 2015 +0000
description:
Add recursive kpathsea searching for pst LaTeX files

diffs (50 lines):

--- a/bin/rivet-cmphistos	Thu Nov 12 15:54:01 2015 +0000
+++ b/bin/rivet-cmphistos	Fri Nov 13 12:58:01 2015 +0000
@@ -211,10 +211,10 @@
     """
     output = ''
 
-    if plot:
+    if plot is not None:
         output += str(plot)
 
-    if special:
+    if special is not None:
         output += "\n"
         output += "# BEGIN SPECIAL %s\n" % h
         output += special
--- a/rivetenv.csh.in	Thu Nov 12 15:54:01 2015 +0000
+++ b/rivetenv.csh.in	Fri Nov 13 12:58:01 2015 +0000
@@ -41,15 +41,15 @@
 endif
 
 if ($?TEXINPUTS) then
-setenv TEXINPUTS "@datadir@/Rivet/texmf/tex:$TEXINPUTS"
+setenv TEXINPUTS "@datadir@/Rivet/texmf/tex//:$TEXINPUTS"
 else
-setenv TEXINPUTS "@datadir@/Rivet/texmf/tex:"
+setenv TEXINPUTS "@datadir@/Rivet/texmf/tex//:"
 endif
 
 if ($?LATEXINPUTS) then
-setenv LATEXINPUTS "@datadir@/Rivet/texmf/tex:$LATEXINPUTS"
+setenv LATEXINPUTS "@datadir@/Rivet/texmf/tex//:$LATEXINPUTS"
 else
-setenv LATEXINPUTS "@datadir@/Rivet/texmf/tex:"
+setenv LATEXINPUTS "@datadir@/Rivet/texmf/tex//:"
 endif
 
 unset YODA_PYTHONPATH
--- a/rivetenv.sh.in	Thu Nov 12 15:54:01 2015 +0000
+++ b/rivetenv.sh.in	Fri Nov 13 12:58:01 2015 +0000
@@ -15,8 +15,8 @@
 export TEXMFHOME="@datadir@/Rivet/texmf:$TEXMFHOME"
 export HOMETEXMF="@datadir@/Rivet/texmf:$HOMETEXMF"
 export TEXMFCNF="@datadir@/Rivet/texmf/cnf:$TEXMFCNF"
-export TEXINPUTS="@datadir@/Rivet/texmf/tex:$TEXINPUTS"
-export LATEXINPUTS="@datadir@/Rivet/texmf/tex:$LATEXINPUTS"
+export TEXINPUTS="@datadir@/Rivet/texmf/tex//:$TEXINPUTS"
+export LATEXINPUTS="@datadir@/Rivet/texmf/tex//:$LATEXINPUTS"
 
 if (complete &> /dev/null); then
     test -e "@datadir@/Rivet/rivet-completion" && source "@datadir@/Rivet/rivet-completion"