From: José Matox <jamatos@lyx.org>
Date: Fri, 13 Aug 2004 13:07:02 +0000 (+0000)
Subject: Fix bug 1147.
X-Git-Tag: 1.6.10~15097
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=d2f9e0a569dacf464faadbedb49ab0c0616f3544;p=features.git

Fix bug 1147.


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

diff --git a/src/ChangeLog b/src/ChangeLog
index 9da3aa7317..ea87c4538c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,6 @@
+2004-08-13  José Matos  <jamatos@lyx.org>
+
+	* tabular.C (docbook): close empty tags in XML. Fix bug 1147.
 
 2004-08-13  André Pönitz  <poenitz@gmx.net>
 
diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index dc0334bfdc..77bcf614de 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-13  José Matos  <jamatos@lyx.org>
+
+	* insetgraphics.C (docbook): close empty tags in XML. Fix bug 1147.
+
 2004-08-04  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
 	* insetfoot.C (latex): use OutputParams::intitle instead of
diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index fe29faf3ba..2314504c7c 100644
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -703,11 +703,15 @@ int InsetGraphics::docbook(Buffer const &, ostream & os,
 	// In DocBook v5.0, the graphic tag will be eliminated from DocBook, will
 	// need to switch to MediaObject. However, for now this is sufficient and
 	// easier to use.
-	runparams.exportdata->addExternalFile("docbook",
-	                                      params().filename.absFilename());
-	runparams.exportdata->addExternalFile("docbook-xml",
-	                                      params().filename.absFilename());
-	os << "<graphic fileref=\"&" << graphic_label << ";\">";
+	if (runparams.flavor == OutputParams::XML) {
+		runparams.exportdata->addExternalFile("docbook-xml",
+						      params().filename.absFilename());
+		os << "<graphic fileref=\"&" << graphic_label << ";\"/>";
+	} else {
+		runparams.exportdata->addExternalFile("docbook",
+						      params().filename.absFilename());
+		os << "<graphic fileref=\"&" << graphic_label << ";\">";
+	}
 	return 0;
 }
 
diff --git a/src/tabular.C b/src/tabular.C
index 98411af660..c3da317f2c 100644
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -2250,7 +2250,10 @@ int LyXTabular::docbook(Buffer const & buf, ostream & os,
 			os << "center";
 			break;
 		}
-		os << "\">\n";
+		os << '"';
+		if (runparams.flavor == OutputParams::XML)
+			os << '/';
+		os << ">\n";
 		++ret;
 	}