anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-18 13:40:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

better ert handling

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2218 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2001-07-10 22:36:25 +00:00
parent fa867bfd55
commit cf65aa62a6
1 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/buffer.C
View File

@ -282,9 +282,19 @@ void Buffer::setFileName(string const & newfile)
namespace { namespace {
string last_inset_read; string last_inset_read;
string inset_ert_contents;
bool ert_active = false; struct ErtComp
bool in_tabular = false; {
ErtComp() : active(false), in_tabular(false) {
}
string contents;
bool active;
bool in_tabular;
};
std::stack<ErtComp> ert_stack;
ErtComp ert_comp;
} // anon } // anon
@ -301,9 +311,9 @@ bool in_tabular = false;
bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par) bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par)
{ {
#ifdef NO_LATEX #ifdef NO_LATEX
inset_ert_contents.erase(); ert_comp.contents.erase();
ert_active = false; ert_comp.active = false;
in_tabular = false; ert_comp.in_tabular = false;
#endif #endif
int pos = 0; int pos = 0;
@ -362,15 +372,15 @@ bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par)
void Buffer::insertErtContents(Paragraph * par, int & pos, void Buffer::insertErtContents(Paragraph * par, int & pos,
LyXFont const & font, bool set_inactive) LyXFont const & font, bool set_inactive)
{ {
if (!inset_ert_contents.empty()) { if (!ert_comp.contents.empty()) {
lyxerr[Debug::INSETS] << "ERT contents:\n" lyxerr[Debug::INSETS] << "ERT contents:\n"
<< inset_ert_contents << endl; << ert_comp.contents << endl;
Inset * inset = new InsetERT(inset_ert_contents); Inset * inset = new InsetERT(ert_comp.contents);
par->insertInset(pos++, inset, font); par->insertInset(pos++, inset, font);
inset_ert_contents.erase(); ert_comp.contents.erase();
} }
if (set_inactive) { if (set_inactive) {
ert_active = false; ert_comp.active = false;
} }
} }
@ -396,8 +406,8 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
if (token[0] != '\\') { if (token[0] != '\\') {
#ifdef NO_LATEX #ifdef NO_LATEX
if (ert_active) { if (ert_comp.active) {
inset_ert_contents += token; ert_comp.contents += token;
} else { } else {
#endif #endif
for (string::const_iterator cit = token.begin(); for (string::const_iterator cit = token.begin();
@ -416,7 +426,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
++pos; ++pos;
} else if (token == "\\layout") { } else if (token == "\\layout") {
#ifdef NO_LATEX #ifdef NO_LATEX
in_tabular = false; ert_comp.in_tabular = false;
// Do the insetert. // Do the insetert.
insertErtContents(par, pos, font); insertErtContents(par, pos, font);
#endif #endif
@ -428,7 +438,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
#ifdef NO_LATEX #ifdef NO_LATEX
if (compare_no_case(layoutname, "latex") == 0) { if (compare_no_case(layoutname, "latex") == 0) {
ert_active = true; ert_comp.active = true;
} }
#endif #endif
#ifdef USE_CAPTION #ifdef USE_CAPTION
@ -912,7 +922,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
// Do the insetert. // Do the insetert.
insertErtContents(par, pos, font); insertErtContents(par, pos, font);
} else if (tok == "latex") { } else if (tok == "latex") {
ert_active = true; ert_comp.active = true;
} else if (tok == "default") { } else if (tok == "default") {
// Do the insetert. // Do the insetert.
insertErtContents(par, pos, font); insertErtContents(par, pos, font);
@ -1004,9 +1014,15 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
// the inset isn't it? Lgb. // the inset isn't it? Lgb.
} else if (token == "\\begin_inset") { } else if (token == "\\begin_inset") {
#ifdef NO_LATEX #ifdef NO_LATEX
insertErtContents(par, pos, font); insertErtContents(par, pos, font, false);
ert_stack.push(ert_comp);
ert_comp = ErtComp();
#endif #endif
readInset(lex, par, pos, font); readInset(lex, par, pos, font);
#ifdef NO_LATEX
ert_comp = ert_stack.top();
ert_stack.pop();
#endif
} else if (token == "\\SpecialChar") { } else if (token == "\\SpecialChar") {
LyXLayout const & layout = LyXLayout const & layout =
textclasslist.Style(params.textclass, textclasslist.Style(params.textclass,
@ -1038,8 +1054,8 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
} else if (token == "\\newline") { } else if (token == "\\newline") {
#ifdef NO_LATEX #ifdef NO_LATEX
if (!in_tabular && ert_active) { if (!ert_comp.in_tabular && ert_comp.active) {
inset_ert_contents += char(Paragraph::META_NEWLINE); ert_comp.contents += char(Paragraph::META_NEWLINE);
} else { } else {
// Since we cannot know it this is only a regular // Since we cannot know it this is only a regular
// newline or a tabular cell delimter we have to // newline or a tabular cell delimter we have to
@ -1055,7 +1071,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
#endif #endif
} else if (token == "\\LyXTable") { } else if (token == "\\LyXTable") {
#ifdef NO_LATEX #ifdef NO_LATEX
in_tabular = true; ert_comp.in_tabular = true;
#endif #endif
Inset * inset = new InsetTabular(*this); Inset * inset = new InsetTabular(*this);
inset->read(this, lex); inset->read(this, lex);
@ -1090,8 +1106,8 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
par->bibkey->read(this, lex); par->bibkey->read(this, lex);
} else if (token == "\\backslash") { } else if (token == "\\backslash") {
#ifdef NO_LATEX #ifdef NO_LATEX
if (ert_active) { if (ert_comp.active) {
inset_ert_contents += "\\"; ert_comp.contents += "\\";
} else { } else {
#endif #endif
par->insertChar(pos, '\\', font); par->insertChar(pos, '\\', font);
@ -1109,8 +1125,8 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par,
minipar = parBeforeMinipage = 0; minipar = parBeforeMinipage = 0;
} else { } else {
#ifdef NO_LATEX #ifdef NO_LATEX
if (ert_active) { if (ert_comp.active) {
inset_ert_contents += token; ert_comp.contents += token;
} else { } else {
#endif #endif
// This should be insurance for the future: (Asger) // This should be insurance for the future: (Asger)