From: Richard Heck <rgheck@lyx.org>
Date: Sun, 31 Jul 2016 04:52:22 +0000 (-0400)
Subject: Allow XHTML export of Dia diagrams.
X-Git-Tag: 2.2.2~94
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=5555661bf6558e1d0f3f5abb68c1aaba559a453d;p=features.git

Allow XHTML export of Dia diagrams.

(cherry picked from commit 3f1199d56ad45d5da46dd0d7e30a45f506cabf96)
---

diff --git a/lib/configure.py b/lib/configure.py
index 8b0c563228..6e27ac15c7 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -968,11 +968,13 @@ def checkConverterEntries():
             r'''\converter dot        eps        "dot -Teps $$i -o $$o"	""
 \converter dot        png        "dot -Tpng $$i -o $$o"	""'''])
     #
-    checkProg('a Dia -> PNG converter', ['dia -e $$o -t png $$i'],
-        rc_entry = [ r'\converter dia        png        "%%"	""'])
+    path, dia = checkProg('a Dia -> Image converter', ['dia'])
+    if dia == 'dia':
+        addToRC(r'''\converter dia        png        "dia -e $$o -t png $$i"	""
+\converter dia        eps        "dia -e $$o -t eps $$i"	""'
+\converter dia        svg        "dia -e $$o -t svg $$i"	""''')
+
     #
-    checkProg('a Dia -> EPS converter', ['dia -e $$o -t eps $$i'],
-        rc_entry = [ r'\converter dia        eps        "%%"	""'])
     # Actually, this produces EPS, but with a wrong bounding box (usually A4 or letter).
     # The eps2->eps converter then fixes the bounding box by cropping.
     # Although unoconv can convert to png and pdf as well, do not define
diff --git a/lib/external_templates b/lib/external_templates
index 54b6dbde0b..ec2193483b 100644
--- a/lib/external_templates
+++ b/lib/external_templates
@@ -493,5 +493,11 @@ Template Dia
 		ReferencedFile docbook     "$$AbsPath$$Basename.eps"
 		ReferencedFile docbook-xml "$$AbsPath$$Basename.eps"
 	FormatEnd
+	Format XHTML
+		Product "<img src=\"$$AbsOrRelPathMaster$$Basename.svg\" />"
+		UpdateFormat svg
+		UpdateResult "$$AbsPath$$Basename.svg"
+		ReferencedFile xhtml "$$AbsPath$$Basename.svg"
+	FormatEnd
 TemplateEnd