From 89aa915ad7b0d5465051cff3b5e9b5eead3717b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Matox?= <jamatos@lyx.org>
Date: Tue, 5 Oct 2004 13:38:31 +0000
Subject: [PATCH] Small adjustments for graphics export in docbook (Andreas
 Vox).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9051 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/insets/ChangeLog       | 6 ++++++
 src/insets/insetgraphics.C | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 4a18c01314..11db1ce162 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,4 +1,10 @@
+2004-10-05  Andreas Vox  <vox@isp.uni-luebeck.de>
+
+	* insetgraphics.C (docbook) : using mediaobject for XML;
+	correcting bug with SGML output (now '>' instead of '/>')
+
 2004-10-05  José Matos  <jamatos@lyx.org>
+
 	* insetfloatlist.C (read):
 	* insetquotes.C (read):
 	* insetspace.C (read):
diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index 66f0dbeb32..57a7988ef1 100644
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -800,11 +800,13 @@ int InsetGraphics::docbook(Buffer const &, ostream & os,
 	if (runparams.flavor == OutputParams::XML) {
 		runparams.exportdata->addExternalFile("docbook-xml",
 						      params().filename.absFilename());
-		os << "<inlinegraphic fileref=\"&" << graphic_label << ";\" " + createDocBookAttributes() + "/>";
+		os << "<inlinemediaobject><imageobject><imagedata fileref=\"&" 
+			<< graphic_label << ";\" " << createDocBookAttributes() 
+			<<  "/></imageobject></inlinemediaobject>";
 	} else {
 		runparams.exportdata->addExternalFile("docbook",
 						      params().filename.absFilename());
-		os << "<inlinegraphic fileref=\"&" << graphic_label << ";\" " + createDocBookAttributes() + "/>";
+		os << "<inlinegraphic fileref=\"&" << graphic_label << ";\" " + createDocBookAttributes() + ">";
 	}
 	return 0;
 }