[Rivet-svn] rivet: 4 new changesets

[Rivet Mercurial]

details:   https://rivet.hepforge.org/hg/rivet/rev/7db573cf5904
branches:  release-2-4-x
changeset: 5280:7db573cf5904
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Jun 21 14:19:47 2016 +0100
description:
fixed pandoc no-wrap detection

details:   https://rivet.hepforge.org/hg/rivet/rev/0f50295670b8
branches:  
changeset: 5281:0f50295670b8
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Tue Jun 21 14:21:07 2016 +0100
description:
merged from 2.4

details:   https://rivet.hepforge.org/hg/rivet/rev/3a8fa6875fa6
branches:  
changeset: 5282:3a8fa6875fa6
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Mon Jun 27 11:42:37 2016 +0100
description:
merged

details:   https://rivet.hepforge.org/hg/rivet/rev/9c4919a7f6a4
branches:  release-2-4-x
changeset: 5283:9c4919a7f6a4
user:      David Grellscheid <david.grellscheid at durham.ac.uk>
date:      Mon Jun 27 11:43:02 2016 +0100
description:
merged

diffs (18 lines):

--- a/.hgtags	Tue Jun 21 13:42:00 2016 +0100
+++ b/.hgtags	Mon Jun 27 11:43:02 2016 +0100
@@ -60,3 +60,4 @@
 c77ff1b297a71e9ec14440cd2e549fb1c4924148 rivet-2.4.0
 6bec638a1eb96ff0b1e18b4f6d62ef96bff40888 rivet-2.4.1
 c91d27b41c5a7084f79ede52ae03588a72529c4b rivet-2.4.2
+c91d27b41c5a7084f79ede52ae03588a72529c4b rivet-2.4.2
--- a/pyext/rivet/util.py	Tue Jun 21 13:42:00 2016 +0100
+++ b/pyext/rivet/util.py	Mon Jun 27 11:43:02 2016 +0100
@@ -185,7 +185,7 @@
     nowrap_flags = "--wrap=none"
     x = subprocess.Popen(["pandoc", nowrap_flags, "/dev/null"], stdout=subprocess.PIPE).wait()
     if x != 0:
-        nowrap_flags = "--wrap=none"
+        nowrap_flags = "--no-wrap"
     p = subprocess.Popen(shlex.split("pandoc -f latex -t plain " + nowrap_flags),
                          stdin=subprocess.PIPE, stdout=subprocess.PIPE)
     texbody = tex if type(tex) is str else "@@".join(tex)