anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Docbook related stuff:

Browse Source 
* Fixed several typos.
  * Protected emphasis inside code.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4125 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
José Matox 2002-05-03 11:56:49 +00:00
parent 520de7ddc6
commit a743bb8db8
5 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -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

26
src/buffer.C
View File

@ -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

4
src/insets/ChangeLog
View File

@ -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

2
src/insets/insetgraphics.C
View File

@ -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");

2
src/tabular.C
View File

@ -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