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

Removed obsolete code.

Browse Source 
Replaced linuxdoc by sgml in two sgml helper functions.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2982 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
José Matox 2001-11-08 11:32:18 +00:00
parent 9479428522
commit a1a47b2255
4 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ChangeLog
View File

@ -1,3 +1,11 @@
2001-11-08 José Matos <jamatos@fep.up.pt>
* buffer.C (sgmlLineBreak): renamed from linux_doc_line_break.
(simpleDocBookOnePar): removed code made obsolete by the new inset code.
* paragraph.h:
* paragraph.C (sgmlConvertChar): renamed from linuxDocConvertChar.
2001-11-07 José Matos <jamatos@fep.up.pt>
* buffer.h:

37
src/buffer.C
View File

@ -2708,7 +2708,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
// writes newline, if necessary.
namespace {
void linux_doc_line_break(ostream & os, string::size_type & colcount,
void sgmlLineBreak(ostream & os, string::size_type & colcount,
string::size_type newcol)
{
colcount += newcol;
@ -2916,18 +2916,18 @@ void Buffer::simpleLinuxDocOnePar(ostream & os,
++char_line_count;
} else {
string sgml_string;
if (par->linuxDocConvertChar(c, sgml_string)
if (par->sgmlConvertChar(c, sgml_string)
&& !style.free_spacing) {
// in freespacing mode, spaces are
// non-breaking characters
if (desc_on) {// if char is ' ' then...
++char_line_count;
linux_doc_line_break(os, char_line_count, 6);
sgmlLineBreak(os, char_line_count, 6);
os << "</tag>";
desc_on = false;
} else {
linux_doc_line_break(os, char_line_count, 1);
sgmlLineBreak(os, char_line_count, 1);
os << c;
}
} else {
@ -2946,7 +2946,7 @@ void Buffer::simpleLinuxDocOnePar(ostream & os,
// resets description flag correctly
if (desc_on) {
// <tag> not closed...
linux_doc_line_break(os, char_line_count, 6);
sgmlLineBreak(os, char_line_count, 6);
os << "</tag>";
}
}
@ -3299,33 +3299,10 @@ void Buffer::simpleDocBookOnePar(ostream & os, string & extra,
if (c == Paragraph::META_INSET) {
Inset * inset = par->getInset(i);
ostringstream ost;
inset->docbook(this, ost);
string tmp_out = ost.str().c_str();
//
// This code needs some explanation:
// Two insets are treated specially
// label if it is the first element in a command paragraph
// desc_on == 3
// graphics inside tables or figure floats can't go on
// title (the equivalente in latex for this case is caption
// and title should come first
// desc_on == 4
//
if (desc_on!= 3 || i!= 0) {
if (!tmp_out.empty() && tmp_out[0] == '@') {
if (desc_on == 4)
extra += frontStrip(tmp_out, '@');
else
os << frontStrip(tmp_out, '@');
}
else
os << tmp_out;
}
inset->docbook(this, os);
} else {
string sgml_string;
par->linuxDocConvertChar(c, sgml_string);
par->sgmlConvertChar(c, sgml_string);
if (style.pass_thru) {
os << c;

2
src/paragraph.C
View File

@ -1685,7 +1685,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
}
bool Paragraph::linuxDocConvertChar(char c, string & sgml_string)
bool Paragraph::sgmlConvertChar(char c, string & sgml_string)
{
bool retval = false;
switch (c) {

2
src/paragraph.h
View File

@ -341,7 +341,7 @@ public:
void unsetPExtraType(BufferParams const &);
#endif
///
bool linuxDocConvertChar(char c, string & sgml_string);
bool sgmlConvertChar(char c, string & sgml_string);
ParagraphParameters & params();
ParagraphParameters const & params() const;