Hi,
following the usual procedure now, I send to list the patch that is docbook
related.
I know that I have several issues merged under the same roof, but most of it
are one liners.
--
José Abílio
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.700
diff -u -p -r1.700 ChangeLog
--- src/ChangeLog 2 May 2002 12:45:27 -0000 1.700
+++ src/ChangeLog 2 May 2002 15:02:35 -0000
@@ -1,3 +1,10 @@
+2002-05-02 José Matos <[EMAIL PROTECTED]>
+ * 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-02 Juergen Vigna <[EMAIL PROTECTED]>
* text2.C (fixCursorAfterDelete): check to make sure we don't request
Index: src/buffer.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/buffer.C,v
retrieving revision 1.332
diff -u -p -r1.332 buffer.C
--- src/buffer.C 2 May 2002 12:21:41 -0000 1.332
+++ src/buffer.C 2 May 2002 15:02:35 -0000
@@ -3236,12 +3236,18 @@ void Buffer::makeDocBookFile(string cons
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 cons
}
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
// 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
}
if (emph_flag) {
+ if(style.latexparam() == "CDATA")
+ os << "]]>";
os << "</emphasis>";
+ if(style.latexparam() == "CDATA")
+ os << "<![CDATA[";
}
// resets description flag correctly
Index: src/tabular.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/tabular.C,v
retrieving revision 1.129
diff -u -p -r1.129 tabular.C
--- src/tabular.C 18 Apr 2002 12:14:26 -0000 1.129
+++ src/tabular.C 2 May 2002 15:02:36 -0000
@@ -2411,7 +2411,7 @@ int LyXTabular::docBook(Buffer const * b
ret += docbookRow(buf, os, i);
}
}
- os << "<thead>\n";
+ os << "</thead>\n";
++ret;
}
// output footer info
Index: src/insets/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/ChangeLog,v
retrieving revision 1.409
diff -u -p -r1.409 ChangeLog
--- src/insets/ChangeLog 1 May 2002 10:23:51 -0000 1.409
+++ src/insets/ChangeLog 2 May 2002 15:02:37 -0000
@@ -1,3 +1,7 @@
+2002-05-02 José Matos <[EMAIL PROTECTED]>
+
+ * insetgraphics.C (validate): acess params as everyone else.
+
2002-05-01 Angus Leeming <[EMAIL PROTECTED]>
* InsetgraphicsParams.[Ch]: whitespace.
Index: src/insets/insetgraphics.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetgraphics.C,v
retrieving revision 1.107
diff -u -p -r1.107 insetgraphics.C
--- src/insets/insetgraphics.C 29 Apr 2002 09:24:19 -0000 1.107
+++ src/insets/insetgraphics.C 2 May 2002 15:02:37 -0000
@@ -805,7 +805,7 @@ void InsetGraphics::validate(LaTeXFeatur
if (params().filename.empty())
return ;
- features.includeFile(graphic_label, RemoveExtension(params_.filename));
+ features.includeFile(graphic_label, RemoveExtension(params().filename));
features.require("graphicx");
