From: Scott Kostyshak <skostysh@lyx.org>
Date: Wed, 4 Jun 2014 17:52:42 +0000 (-0400)
Subject: Fix a regression reported at #9146
X-Git-Tag: 2.2.0alpha1~1865
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ab67ce3757d76ab4df718f3f085b42420922e480;p=lyx.git

Fix a regression reported at #9146

This regression was introduced by me at 8b66f9ce. I did not take
into account that a call to a python script containing $$s is embedded
within a separate python script. Thus, when commandPrep() is called it
only sees the call to the outer python script, and does not see the
$$s contained in that python script. It therefore did not substitute
for it. This fix simply calls commandPrep() directly before writing
the embedded command.
---

diff --git a/src/graphics/GraphicsConverter.cpp b/src/graphics/GraphicsConverter.cpp
index 98580bd1eb..263c91eab9 100644
--- a/src/graphics/GraphicsConverter.cpp
+++ b/src/graphics/GraphicsConverter.cpp
@@ -324,7 +324,7 @@ static void build_script(string const & from_file,
 
 		ostringstream os;
 		os << os::python() << ' '
-		   << "$$s/scripts/convertDefault.py" << ' ';
+		   << commandPrep("$$s/scripts/convertDefault.py") << ' ';
 		if (!from_format.empty())
 			os << strip_digit(from_format) << ':';
 		// The extra " quotes around infile and outfile are needed