[LyX/master] Replace $${python} directly in the converter constructor

José Matos jamatos at lyx.org
Thu Jan 27 18:01:57 UTC 2022


commit 79a2ac575cd40291e8cc7e8c4a3f4072670367b7
Author: José Matos <jamatos at lyx.org>
Date:   Thu Jan 27 18:32:57 2022 +0000

    Replace $${python} directly in the converter constructor
---
 src/Converter.cpp |    6 ++++++
 src/Converter.h   |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Converter.cpp b/src/Converter.cpp
index c00941d..7bb998d 100644
--- a/src/Converter.cpp
+++ b/src/Converter.cpp
@@ -148,6 +148,12 @@ void Converter::readFlags()
 }
 
 
+void Converter::setCommand(std::string const & command)
+{
+	command_ = subst(command, token_python, os::python());
+}
+
+
 Converter const * Converters::getConverter(string const & from,
 					    string const & to) const
 {
diff --git a/src/Converter.h b/src/Converter.h
index 5197e34..091dbcd 100644
--- a/src/Converter.h
+++ b/src/Converter.h
@@ -58,7 +58,7 @@ public:
 	///
 	std::string const command() const { return command_; }
 	///
-	void setCommand(std::string const & command) { command_ = command; }
+	void setCommand(std::string const & command);
 	///
 	std::string const flags() const { return flags_; }
 	///
@@ -144,7 +144,7 @@ public:
 		FAILURE = 1,
 		KILLED  = 1000
 	};
-	
+
 	///
 	Converter const & get(int i) const { return converterlist_[i]; }
 	///


More information about the lyx-cvs mailing list