From: Uwe Stöhr <uwestoehr@web.de>
Date: Mon, 7 Dec 2009 13:45:13 +0000 (+0000)
Subject: configure.py: fix #3349 also for Windows by using Inkscape.
X-Git-Tag: 2.0.0~4882
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=bf820ca57821669cd0086d95db4aa73e2b51efce;p=features.git

configure.py: fix #3349 also for Windows by using Inkscape.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32409 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/configure.py b/lib/configure.py
index daa4628d62..18b0fb929f 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -457,7 +457,7 @@ def checkFormatEntries(dtl_tools):
         rc_entry = [r'\Format fen        fen     FEN                    "" "%%"	"%%"	""'])
     #
     checkViewerEditor('a SVG viewer and editor', ['inkscape'],
-        rc_entry = [r'\Format svg        svg    "Scalable Vector Graphics" "" "%%" "%%"	"vector"'])
+        rc_entry = [r'\Format svg        svg     SVG                    "" "%%" "%%"	"vector"'])
     #
     path, iv = checkViewerNoRC('a raster image viewer', ['xv', 'kview', 'gimp-remote', 'gimp'],
         rc_entry = [r'''\Format bmp        bmp     BMP                    "" "%s"	"%s"	""
@@ -757,15 +757,15 @@ 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'],
+    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'],
         rc_entry = [ r'\converter svg        pdf        "%%"	""'])
     #
-    checkProg('a SVG -> EPS converter', ['rsvg-convert -f ps -o $$o $$i'],
+    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'],
         rc_entry = [ r'\converter svg        eps        "%%"	""'])
-    #
-    checkProg('a SVG -> PNG converter', ['rsvg-convert -f png -o $$o $$i'],
+    # 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        "%%"	""'])
-    #
+    
     #
     path, lilypond = checkProg('a LilyPond -> EPS/PDF/PNG converter', ['lilypond'])
     if (lilypond != ''):