From: Julien Rioux <jrioux@lyx.org>
Date: Sat, 11 Jun 2011 15:24:19 +0000 (+0000)
Subject: Fix bug #7608 (Wrong path separator used for Inkscape on Windows)
X-Git-Tag: 2.0.1~231
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=11c191a9333209741b880e9d60c074d5b3359881;p=features.git

Fix bug #7608 (Wrong path separator used for Inkscape on Windows)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39003 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/configure.py b/lib/configure.py
index c14bf0b04a..99b04e5531 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -835,12 +835,12 @@ def checkConverterEntries():
     checkProg('a Dia -> EPS converter', ['dia -e $$o -t eps $$i'],
         rc_entry = [ r'\converter dia        eps        "%%"	""'])
     #
-    checkProg('a SVG -> PDF converter', ['rsvg-convert -f pdf -o $$o $$i', 'inkscape --file=$$p/$$i --export-area-drawing --without-gui --export-pdf=$$p/$$o'],
+    checkProg('a SVG -> PDF converter', ['rsvg-convert -f pdf -o $$o $$i', 'inkscape --file=$$i --export-area-drawing --without-gui --export-pdf=$$o'],
         rc_entry = [ r'\converter svg        pdf        "%%"	""'])
     #
-    checkProg('a SVG -> EPS converter', ['rsvg-convert -f ps -o $$o $$i', 'inkscape --file=$$p/$$i --export-area-drawing --without-gui --export-eps=$$p/$$o'],
+    checkProg('a SVG -> EPS converter', ['rsvg-convert -f ps -o $$o $$i', 'inkscape --file=$$i --export-area-drawing --without-gui --export-eps=$$o'],
         rc_entry = [ r'\converter svg        eps        "%%"	""'])
-    # the PNG export via Inkscape must not have the full path ($$p) for the file
+    #
     checkProg('a SVG -> PNG converter', ['rsvg-convert -f png -o $$o $$i', 'inkscape --without-gui --file=$$i --export-png=$$o'],
         rc_entry = [ r'\converter svg        png        "%%"	""'])
     
diff --git a/status.20x b/status.20x
index 820e993ea9..45b385bd15 100644
--- a/status.20x
+++ b/status.20x
@@ -114,6 +114,8 @@ What's new
 
 - Fixed problem with display of Buffer load errors (bug 7622).
 
+- Fixed the call to the svg converter on Windows (bug 7608).
+
 - Show the correct label after adding a line to an AMS Multline formula (bug
   7511).