From 4d5c24e80d585fe6559f1e2a7f1f67c0f013215c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
Date: Fri, 18 Dec 2009 12:20:22 +0000
Subject: [PATCH] Ticket 6266 Quoting Problem with QProcess: don't think we
 need any quotes (at least on Linux)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32579 a592a061-630c-0410-9148-cb99ea01b6c8
---
 lib/configure.py           | 8 ++++----
 src/support/Systemcall.cpp | 9 +++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/lib/configure.py b/lib/configure.py
index 5342fbd861..9ece0e7541 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -647,9 +647,9 @@ def checkConverterEntries():
         addToRC(r'''\copier    html       "python -tt $$s/scripts/ext_copy.py $$i $$o"''')
 
     # On SuSE the scripts have a .sh suffix, and on debian they are in /usr/share/tex4ht/
-    path, htmlconv = checkProg('a LaTeX -> MS Word converter', ["htlatex $$i 'html,word' 'symbol/!' '-cvalidate'", \
-        "htlatex.sh $$i 'html,word' 'symbol/!' '-cvalidate'", \
-        "/usr/share/tex4ht/htlatex $$i 'html,word' 'symbol/!' '-cvalidate'"],
+    path, htmlconv = checkProg('a LaTeX -> MS Word converter', ["htlatex $$i html,word symbol/! -cvalidate", \
+        "htlatex.sh $$i html,word symbol/! -cvalidate", \
+        "/usr/share/tex4ht/htlatex $$i html,word symbol/! -cvalidate"],
         rc_entry = [ r'\converter latex      wordhtml   "%%"	"needaux"' ])
     if htmlconv.find('htlatex') >= 0:
       addToRC(r'''\copier    wordhtml       "python -tt $$s/scripts/ext_copy.py -e html,png,css $$i $$o"''')
@@ -667,7 +667,7 @@ def checkConverterEntries():
     # Both SuSE and debian have oolatex
     checkProg('a LaTeX -> Open Document converter', [
         'oolatex $$i', 'mk4ht oolatex $$i', 'oolatex.sh $$i', '/usr/share/tex4ht/oolatex $$i',
-        'htlatex $$i \'xhtml,ooffice\' \'ooffice/! -cmozhtf\' \'-coo\' \'-cvalidate\''],
+        'htlatex $$i xhtml,ooffice ooffice/! -cmozhtf -coo -cvalidate'],
         rc_entry = [ r'\converter latex      odt        "%%"	"needaux"' ])
     # On windows it is called latex2rt.exe
     checkProg('a LaTeX -> RTF converter', ['latex2rtf -p -S -o $$o $$i', 'latex2rt -p -S -o $$o $$i'],
diff --git a/src/support/Systemcall.cpp b/src/support/Systemcall.cpp
index 04d7ab9f72..c5ac165bef 100644
--- a/src/support/Systemcall.cpp
+++ b/src/support/Systemcall.cpp
@@ -82,7 +82,7 @@ string const parsecmd(string const & cmd, string & outfile)
 
 	for (size_t i = 0; i < cmd.length(); ++i) {
 		char c = cmd[i];
-		if (c == '"' && !escaped)
+                if ((c == '"' || c == '\'') && !escaped)
 			inquote = !inquote;
 		else if (c == '\\' && !escaped)
 			escaped = !escaped;
@@ -103,7 +103,12 @@ string const parsecmd(string const & cmd, string & outfile)
 int Systemcall::startscript(Starttype how, string const & what, bool process_events)
 {
 	string outfile;
-	QString cmd = toqstr(parsecmd(what, outfile));
+        QString cmd = toqstr(parsecmd(what, outfile));
+        if (cmd.contains("'")) {
+            LYXERR0("Systemcall: '" << cmd << "' contains single quotes ', please check configuration, ' will be replaced by \"");
+            cmd = cmd.replace("'","\"");
+        }
+
 	SystemcallPrivate d(outfile);
 
 
-- 
2.39.2