From a743bb8db8826e67f64413406d21ed20d7357d6f Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Matox?= <jamatos@lyx.org>
Date: Fri, 3 May 2002 11:56:49 +0000
Subject: [PATCH] Docbook related stuff:   * Fixed several typos.   * Protected
 emphasis inside code.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4125 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/ChangeLog              |  7 +++++++
 src/buffer.C               | 26 +++++++++++++++++++++++---
 src/insets/ChangeLog       |  4 ++++
 src/insets/insetgraphics.C |  2 +-
 src/tabular.C              |  2 +-
 5 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/src/ChangeLog b/src/ChangeLog
index 4c8e694191..a6cdc22708 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2002-05-02  José Matos  <jamatos@fep.up.pt>
+	* buffer.C (makeDocBookFile): white space changes, add newline to
+	command styles.
+	(simpleDocBookOnePar): protect <emphasis> inside a CDATA section.
+
+	* tabular.C (docBook): fix typo.
+
 2002-05-03  Juergen Vigna  <jug@sad.it>
 
 	* screen.C (drawFromTo): recalculate the rowpointer if we had a
diff --git a/src/buffer.C b/src/buffer.C
index 271ea50000..97ad27e6d8 100644
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -3236,12 +3236,18 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
 
 			if (command_flag) {
 				if (cmd_depth < command_base) {
-					for (Paragraph::depth_type j = command_depth; j >= command_base; --j)
+					for (Paragraph::depth_type j = command_depth;
+					     j >= command_base; --j) {
 						sgmlCloseTag(ofs, j, command_stack[j]);
+						ofs << endl;
+					}
 					command_depth = command_base = cmd_depth;
 				} else if (cmd_depth <= command_depth) {
-					for (int j = command_depth; j >= int(cmd_depth); --j)
+					for (int j = command_depth;
+					     j >= int(cmd_depth); --j) {
 						sgmlCloseTag(ofs, j, command_stack[j]);
+						ofs << endl;
+					}
 					command_depth = cmd_depth;
 				} else
 					command_depth = cmd_depth;
@@ -3396,8 +3402,10 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
 	}
 
 	for (int j = command_depth; j >= 0 ; --j)
-		if (!command_stack[j].empty())
+		if (!command_stack[j].empty()) {
 			sgmlCloseTag(ofs, j, command_stack[j]);
+			ofs << endl;
+		}
 
 	ofs << "\n\n";
 	sgmlCloseTag(ofs, 0, top_element);
@@ -3432,10 +3440,18 @@ void Buffer::simpleDocBookOnePar(ostream & os,
 		// handle <emphasis> tag
 		if (font_old.emph() != font.emph()) {
 			if (font.emph() == LyXFont::ON) {
+				if(style.latexparam() == "CDATA")
+					os << "]]>";
 				os << "<emphasis>";
+				if(style.latexparam() == "CDATA")
+					os << "<![CDATA[";
 				emph_flag = true;
 			} else if (i) {
+				if(style.latexparam() == "CDATA")
+					os << "]]>";
 				os << "</emphasis>";
+				if(style.latexparam() == "CDATA")
+					os << "<![CDATA[";
 				emph_flag = false;
 			}
 		}
@@ -3472,7 +3488,11 @@ void Buffer::simpleDocBookOnePar(ostream & os,
 	}
 
 	if (emph_flag) {
+		if(style.latexparam() == "CDATA")
+			os << "]]>";
 		os << "</emphasis>";
+		if(style.latexparam() == "CDATA")
+			os << "<![CDATA[";
 	}
 
 	// resets description flag correctly
diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 60ed29946e..b47c3f7277 100644
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-02  José Matos  <jamatos@fep.up.pt>
+
+	* insetgraphics.C (validate): acess params as everyone else.
+
 2002-05-03  Juergen Vigna  <jug@sad.it>
 
 	* insettabular.C (fitInsetCursor): recalculate the cursor position
diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index 1bdc1c7ba7..7c3a9783e0 100644
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -805,7 +805,7 @@ void InsetGraphics::validate(LaTeXFeatures & features) const
 	if (params().filename.empty())
 		return ;
 
-	features.includeFile(graphic_label, RemoveExtension(params_.filename));
+	features.includeFile(graphic_label, RemoveExtension(params().filename));
 
 	features.require("graphicx");
 
diff --git a/src/tabular.C b/src/tabular.C
index 6d26b3a4c1..fbeae9e5c5 100644
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -2411,7 +2411,7 @@ int LyXTabular::docBook(Buffer const * buf, ostream & os) const
 				ret += docbookRow(buf, os, i);
 			}
 		}
-		os << "<thead>\n";
+		os << "</thead>\n";
 		++ret;
 	}
 	// output footer info
-- 
2.39.2