X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.C;h=5c07e74c5670af0ccdb2fc37800ec3f9dcd0cd16;hb=b0babedcb7a9f4c737540d8ac7007b12ff5d979b;hp=49de220f0fc61fb95e57465f5f5bceb4821ca8e8;hpb=b95e7efe2e41f2dcf42baa52458034c3f14b1099;p=lyx.git diff --git a/src/buffer.C b/src/buffer.C index 49de220f0f..5c07e74c56 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -20,7 +20,6 @@ #include "buffer.h" #include "bufferlist.h" -#include "lyx_main.h" #include "LyXAction.h" #include "lyxrc.h" #include "lyxlex.h" @@ -31,7 +30,6 @@ #include "version.h" #include "LaTeX.h" #include "Chktex.h" -#include "frontends/LyXView.h" #include "debug.h" #include "LaTeXFeatures.h" #include "lyxtext.h" @@ -45,6 +43,10 @@ #include "ParagraphParameters.h" #include "iterators.h" #include "lyxtextclasslist.h" +#include "sgml.h" +#include "paragraph_funcs.h" + +#include "frontends/LyXView.h" #include "mathed/formulamacro.h" #include "mathed/formula.h" @@ -70,8 +72,10 @@ #include "insets/insetgraphics.h" #include "insets/insetfoot.h" #include "insets/insetmarginal.h" +#include "insets/insetoptarg.h" #include "insets/insetminipage.h" #include "insets/insetfloat.h" +#include "insets/insetwrap.h" #include "insets/insettabular.h" #if 0 #include "insets/insettheorem.h" @@ -94,6 +98,9 @@ #include "support/lyxmanip.h" #include "support/lyxalgo.h" // for lyx::count +#include +#include + #include #include #include @@ -107,7 +114,6 @@ #include #include - #ifdef HAVE_LOCALE #include #endif @@ -131,6 +137,7 @@ using std::max; using std::set; using std::stack; using std::list; +using std::for_each; using lyx::pos_type; using lyx::textclass_type; @@ -138,32 +145,19 @@ using lyx::textclass_type; // all these externs should eventually be removed. extern BufferList bufferlist; -extern LyXAction lyxaction; - namespace { -const int LYX_FORMAT = 220; +const int LYX_FORMAT = 221; } // namespace anon -extern int tex_code_break_column; - - Buffer::Buffer(string const & file, bool ronly) - : paragraph(0), niceFile(true), lyx_clean(true), bak_clean(true), + : niceFile(true), lyx_clean(true), bak_clean(true), unnamed(false), dep_clean(0), read_only(ronly), filename_(file), users(0) { lyxerr[Debug::INFO] << "Buffer::Buffer()" << endl; -// filename = file; filepath_ = OnlyPath(file); -// paragraph = 0; -// lyx_clean = true; -// bak_clean = true; -// dep_clean = 0; -// read_only = ronly; -// unnamed = false; -// users = 0; lyxvc.buffer(this); if (read_only || lyxrc.use_tempdir) { tmppath = CreateBufferTmpDir(); @@ -188,14 +182,7 @@ Buffer::~Buffer() DestroyBufferTmpDir(tmppath); } - Paragraph * par = paragraph; - Paragraph * tmppar; - while (par) { - tmppar = par->next(); - delete par; - par = tmppar; - } - paragraph = 0; + paragraphs.clear(); // Remove any previewed LaTeX snippets assocoated with this buffer. grfx::Previews::get().removeLoader(this); @@ -212,7 +199,7 @@ string const Buffer::getLatexName(bool no_path) const } -pair const Buffer::getLogName(void) const +pair const Buffer::getLogName() const { string const filename = getLatexName(false); @@ -252,7 +239,7 @@ void Buffer::setReadonly(bool flag) if (read_only != flag) { read_only = flag; updateTitles(); - users->owner()->getDialogs()->updateBufferDependent(false); + users->owner()->getDialogs().updateBufferDependent(false); } } @@ -289,22 +276,6 @@ namespace { string last_inset_read; -#ifndef NO_COMPABILITY -struct ErtComp -{ - ErtComp() : active(false), fromlayout(false), in_tabular(false) { - } - string contents; - bool active; - bool fromlayout; - bool in_tabular; - LyXFont font; -}; - -std::stack ert_stack; -ErtComp ert_comp; -#endif - #ifdef WITH_WARNINGS #warning And _why_ is this here? (Lgb) #endif @@ -326,12 +297,7 @@ bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par) { unknown_layouts = 0; unknown_tokens = 0; -#ifndef NO_COMPABILITY - ert_comp.contents.erase(); - ert_comp.active = false; - ert_comp.fromlayout = false; - ert_comp.in_tabular = false; -#endif + int pos = 0; Paragraph::depth_type depth = 0; bool the_end_read = false; @@ -383,7 +349,7 @@ bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par) if (!first_par) first_par = par; - paragraph = first_par; + paragraphs.set(first_par); if (unknown_layouts > 0) { string s = _("Couldn't set the layout for "); @@ -413,65 +379,6 @@ bool Buffer::readLyXformat2(LyXLex & lex, Paragraph * par) } -#ifndef NO_COMPABILITY - -Inset * Buffer::isErtInset(Paragraph * par, int pos) const -{ - Inset * inset; - if ((par->getChar(pos) == Paragraph::META_INSET) && - (inset = par->getInset(pos)) && - (inset->lyxCode() == Inset::ERT_CODE)) - { - return inset; - } - return 0; -} - -void Buffer::insertErtContents(Paragraph * par, int & pos, bool set_inactive) -{ - if (ert_comp.contents.find_first_not_of(' ') != string::npos) { - // we only skip completely empty ERT (only spaces) otherwise - // we have to insert it as is. - string str(ert_comp.contents); - lyxerr[Debug::INSETS] << "ERT contents:\n'" - << str << "'" << endl; - // check if we have already an ert inset a position earlier - // if this is the case then we should insert the contents - // inside the other ertinset as it is stupid to have various - // ert in a row. - Inset * inset; - if ((pos > 0) && (inset=isErtInset(par, pos-1))) { - // get the last paragraph from the inset before - Paragraph * last = inset->firstParagraph(); - while(last->next()) - last = last->next(); - // create the new paragraph after the last one - Paragraph * par = new Paragraph(last); - par->layout(params.getLyXTextClass().defaultLayoutName()); - par->setInsetOwner(last->inInset()); - // set the contents - LyXFont font(LyXFont::ALL_INHERIT, params.language); - string::const_iterator cit = str.begin(); - string::const_iterator end = str.end(); - pos_type pos = 0; - for (; cit != end; ++cit) { - par->insertChar(pos++, *cit, font); - } - } else { - Inset * inset = - new InsetERT(params, params.language, str, true); - par->insertInset(pos++, inset, ert_comp.font); - } - } - ert_comp.contents.erase(); - ert_comp.fromlayout = false; - if (set_inactive) { - ert_comp.active = false; - } -} -#endif - - bool Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, Paragraph *& first_par, @@ -481,17 +388,6 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, ) { bool the_end_read = false; -#ifndef NO_COMPABILITY -#ifndef NO_PEXTRA_REALLY - // This is super temporary but is needed to get the compability - // mode for minipages work correctly together with new tabulars. - static int call_depth; - ++call_depth; - bool checkminipage = false; - static Paragraph * minipar = 0; - static Paragraph * parBeforeMinipage; -#endif -#endif // The order of the tags tested may seem unnatural, but this // has been done in order to reduce the number of string @@ -499,36 +395,12 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, // on large documents like UserGuide to a reduction of a // factor 5! (JMarc) if (token[0] != '\\') { -#ifndef NO_COMPABILITY - if (ert_comp.active) { - ert_comp.contents += token; - } else { -#endif for (string::const_iterator cit = token.begin(); cit != token.end(); ++cit) { par->insertChar(pos, (*cit), font); ++pos; } -#ifndef NO_COMPABILITY - } -#endif } else if (token == "\\layout") { -#ifndef NO_COMPABILITY - bool old_fromlayout = ert_comp.fromlayout; - bool create_new_par = true; - ert_comp.in_tabular = false; - // Do the insetert. - if (!par->size() && par->previous() && - (par->previous()->size() == 1) && - isErtInset(par->previous(), par->previous()->size()-1)) - { - int p = par->previous()->size(); - insertErtContents(par->previous(), p); - create_new_par = false; - } else { - insertErtContents(par, pos); - } -#endif // reset the font as we start a new layout and if the font is // not ALL_INHERIT,document_language then it will be set to the // right values after this tag (Jug 20020420) @@ -547,15 +419,6 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, if (layoutname.empty()) { layoutname = tclass.defaultLayoutName(); } -#ifndef NO_COMPABILITY - if (compare_ascii_no_case(layoutname, "latex") == 0) { - ert_comp.active = true; - ert_comp.fromlayout = true; - ert_comp.font = font; - if (old_fromlayout) - create_new_par = false; - } -#endif bool hasLayout = tclass.hasLayout(layoutname); if (!hasLayout) { lyxerr << "Layout '" << layoutname << "' does not" @@ -618,9 +481,6 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, par->InsertInset(pos, inset, font); ++pos; } else { -#endif -#ifndef NO_COMPABILITY - if (create_new_par) { #endif if (!first_par) first_par = par; @@ -635,19 +495,6 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, if (!layout->obsoleted_by().empty()) par->layout(params.getLyXTextClass()[layout->obsoleted_by()]); par->params().depth(depth); -#ifndef NO_COMPABILITY - } else { - // we duplicate code here because it's easier to remove - // the code then of NO_COMPATIBILITY - par->layout(layoutname); - // Test whether the layout is obsolete. - LyXLayout_ptr const & layout = - params.getLyXTextClass()[par->layout()]; - if (!layout->obsoleted_by().empty()) - par->layout(layout->obsoleted_by()); - par->params().depth(depth); - } -#endif #if USE_CAPTION } #endif @@ -661,17 +508,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, // But insets should read it, it is a part of // the inset isn't it? Lgb. } else if (token == "\\begin_inset") { -#ifndef NO_COMPABILITY - insertErtContents(par, pos, false); - ert_stack.push(ert_comp); - ert_comp = ErtComp(); -#endif readInset(lex, par, pos, font); -#ifndef NO_COMPABILITY - ert_comp = ert_stack.top(); - ert_stack.pop(); - insertErtContents(par, pos); -#endif } else if (token == "\\family") { lex.next(); font.setLyXFamily(lex.getString()); @@ -684,24 +521,6 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } else if (token == "\\size") { lex.next(); font.setLyXSize(lex.getString()); -#ifndef NO_COMPABILITY - } else if (token == "\\latex") { - lex.next(); - string const tok = lex.getString(); - if (tok == "no_latex") { - // Do the insetert. - insertErtContents(par, pos); - } else if (tok == "latex") { - ert_comp.active = true; - ert_comp.font = font; - } else if (tok == "default") { - // Do the insetert. - insertErtContents(par, pos); - } else { - lex.printError("Unknown LaTeX font flag " - "`$$Token'"); - } -#endif } else if (token == "\\lang") { lex.next(); string const tok = lex.getString(); @@ -747,8 +566,7 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, string next_token = lex.getString(); if (next_token == "\\-") { par->insertChar(pos, '-', font); - } else if (next_token == "\\protected_separator" - || next_token == "~") { + } else if (next_token == "~") { par->insertChar(pos, ' ', font); } else { lex.printError("Token `$$Token' " @@ -769,110 +587,8 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, par->insertInset(pos, inset, font); ++pos; } else if (token == "\\backslash") { -#ifndef NO_COMPABILITY - if (ert_comp.active) { - ert_comp.contents += "\\"; - } else { -#endif par->insertChar(pos, '\\', font); ++pos; -#ifndef NO_COMPABILITY - } -#endif -#ifndef NO_COMPABILITY - } else if (token == "\\begin_float") { - insertErtContents(par, pos); - //insertErtContents(par, pos, false); - //ert_stack.push(ert_comp); - //ert_comp = ErtComp(); - - // This is the compability reader. It can be removed in - // LyX version 1.3.0. (Lgb) - lex.next(); - string const tmptok = lex.getString(); - //lyxerr << "old float: " << tmptok << endl; - - Inset * inset = 0; - stringstream old_float; - - if (tmptok == "footnote") { - inset = new InsetFoot(params); - old_float << "collapsed true\n"; - } else if (tmptok == "margin") { - inset = new InsetMarginal(params); - old_float << "collapsed true\n"; - } else if (tmptok == "fig") { - inset = new InsetFloat(params, "figure"); - old_float << "wide false\n" - << "collapsed false\n"; - } else if (tmptok == "tab") { - inset = new InsetFloat(params, "table"); - old_float << "wide false\n" - << "collapsed false\n"; - } else if (tmptok == "alg") { - inset = new InsetFloat(params, "algorithm"); - old_float << "wide false\n" - << "collapsed false\n"; - } else if (tmptok == "wide-fig") { - inset = new InsetFloat(params, "figure"); - //InsetFloat * tmp = new InsetFloat("figure"); - //tmp->wide(true); - //inset = tmp; - old_float << "wide true\n" - << "collapsed false\n"; - } else if (tmptok == "wide-tab") { - inset = new InsetFloat(params, "table"); - //InsetFloat * tmp = new InsetFloat("table"); - //tmp->wide(true); - //inset = tmp; - old_float << "wide true\n" - << "collapsed false\n"; - } - - if (!inset) { -#ifndef NO_PEXTRA_REALLY - --call_depth; -#endif - return false; // no end read yet - } - - // Here we need to check for \end_deeper and handle that - // before we do the footnote parsing. - // This _is_ a hack! (Lgb) - while (true) { - lex.next(); - string const tmp = lex.getString(); - if (tmp == "\\end_deeper") { - //lyxerr << "\\end_deeper caught!" << endl; - if (!depth) { - lex.printError("\\end_deeper: " - "depth is already null"); - } else - --depth; - - } else { - old_float << tmp << ' '; - break; - } - } - - old_float << lex.getLongString("\\end_float") - << "\n\\end_inset\n"; - //lyxerr << "Float Body:\n" << old_float.str() << endl; - // That this does not work seems like a bug - // in stringstream. (Lgb) - istringstream istr(old_float.str()); - LyXLex nylex(0, 0); - nylex.setStream(istr); - inset->read(this, nylex); - par->insertInset(pos, inset, font); - ++pos; - insertErtContents(par, pos); - - // we have to reset the font as in the old format after a float - // the font was automatically reset! - font = LyXFont(LyXFont::ALL_INHERIT, params.language); -#endif } else if (token == "\\begin_deeper") { ++depth; } else if (token == "\\end_deeper") { @@ -948,48 +664,38 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, int tmpret = lex.findToken(string_paragraph_separation); if (tmpret == -1) ++tmpret; - if (tmpret != LYX_LAYOUT_DEFAULT) - params.paragraph_separation = - static_cast(tmpret); + params.paragraph_separation = + static_cast(tmpret); } else if (token == "\\defskip") { lex.nextToken(); params.defskip = VSpace(lex.getString()); -#ifndef NO_COMPABILITY - } else if (token == "\\epsfig") { // obsolete - // Indeed it is obsolete, but we HAVE to be backwards - // compatible until 0.14, because otherwise all figures - // in existing documents are irretrivably lost. (Asger) - params.readGraphicsDriver(lex); -#endif } else if (token == "\\quotes_language") { int tmpret = lex.findToken(string_quotes_language); if (tmpret == -1) ++tmpret; - if (tmpret != LYX_LAYOUT_DEFAULT) { - InsetQuotes::quote_language tmpl = - InsetQuotes::EnglishQ; - switch (tmpret) { - case 0: - tmpl = InsetQuotes::EnglishQ; - break; - case 1: - tmpl = InsetQuotes::SwedishQ; - break; - case 2: - tmpl = InsetQuotes::GermanQ; - break; - case 3: - tmpl = InsetQuotes::PolishQ; - break; - case 4: - tmpl = InsetQuotes::FrenchQ; - break; - case 5: - tmpl = InsetQuotes::DanishQ; - break; - } - params.quotes_language = tmpl; + InsetQuotes::quote_language tmpl = + InsetQuotes::EnglishQ; + switch (tmpret) { + case 0: + tmpl = InsetQuotes::EnglishQ; + break; + case 1: + tmpl = InsetQuotes::SwedishQ; + break; + case 2: + tmpl = InsetQuotes::GermanQ; + break; + case 3: + tmpl = InsetQuotes::PolishQ; + break; + case 4: + tmpl = InsetQuotes::FrenchQ; + break; + case 5: + tmpl = InsetQuotes::DanishQ; + break; } + params.quotes_language = tmpl; } else if (token == "\\quotes_times") { lex.nextToken(); switch (lex.getInteger()) { @@ -1029,8 +735,8 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, int tmpret = lex.findToken(string_orientation); if (tmpret == -1) ++tmpret; - if (tmpret != LYX_LAYOUT_DEFAULT) - params.orientation = static_cast(tmpret); + params.orientation = + static_cast(tmpret); } else if (token == "\\paperwidth") { lex.next(); params.paperwidth = lex.getString(); @@ -1173,11 +879,8 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } else if (token == "\\align") { int tmpret = lex.findToken(string_align); if (tmpret == -1) ++tmpret; - if (tmpret != LYX_LAYOUT_DEFAULT) { // tmpret != 99 ??? - int const tmpret2 = int(pow(2.0, tmpret)); - //lyxerr << "Tmpret2 = " << tmpret2 << endl; - par->params().align(LyXAlignment(tmpret2)); - } + int const tmpret2 = int(pow(2.0, tmpret)); + par->params().align(LyXAlignment(tmpret2)); } else if (token == "\\added_space_top") { lex.nextToken(); VSpace value = VSpace(lex.getString()); @@ -1196,53 +899,14 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, value.keep() || (value.kind() != VSpace::LENGTH)) par->params().spaceBottom(value); -#ifndef NO_COMPABILITY -#ifndef NO_PEXTRA_REALLY - } else if (token == "\\pextra_type") { - lex.nextToken(); - par->params().pextraType(lex.getInteger()); - } else if (token == "\\pextra_width") { - lex.nextToken(); - par->params().pextraWidth(lex.getString()); - } else if (token == "\\pextra_widthp") { - lex.nextToken(); - par->params().pextraWidthp(lex.getString()); - } else if (token == "\\pextra_alignment") { - lex.nextToken(); - par->params().pextraAlignment(lex.getInteger()); - } else if (token == "\\pextra_hfill") { - lex.nextToken(); - par->params().pextraHfill(lex.getInteger()); - } else if (token == "\\pextra_start_minipage") { - lex.nextToken(); - par->params().pextraStartMinipage(lex.getInteger()); -#endif -#endif } else if (token == "\\labelwidthstring") { lex.eatLine(); par->params().labelWidthString(lex.getString()); // do not delete this token, it is still needed! } else if (token == "\\newline") { -#ifndef NO_COMPABILITY - if (!ert_comp.in_tabular && ert_comp.active) { - ert_comp.contents += char(Paragraph::META_NEWLINE); - } else { - // Since we cannot know it this is only a regular - // newline or a tabular cell delimter we have to - // handle the ERT here. - insertErtContents(par, pos, false); - - par->insertChar(pos, Paragraph::META_NEWLINE, font); - ++pos; - } -#else par->insertChar(pos, Paragraph::META_NEWLINE, font); ++pos; -#endif } else if (token == "\\LyXTable") { -#ifndef NO_COMPABILITY - ert_comp.in_tabular = true; -#endif Inset * inset = new InsetTabular(*this); inset->read(this, lex); par->insertInset(pos, inset, font); @@ -1250,19 +914,6 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } else if (token == "\\hfill") { par->insertChar(pos, Paragraph::META_HFILL, font); ++pos; - } else if (token == "\\protected_separator") { // obsolete - // This is a backward compability thingie. (Lgb) - // Remove it later some time...introduced with fileformat - // 2.16. (Lgb) - LyXLayout_ptr const & layout = par->layout(); - - if (layout->free_spacing || par->isFreeSpacing()) { - par->insertChar(pos, ' ', font); - } else { - Inset * inset = new InsetSpecialChar(InsetSpecialChar::PROTECTED_SEPARATOR); - par->insertInset(pos, inset, font); - } - ++pos; } else if (token == "\\bibitem") { // ale970302 if (!par->bibkey) { InsetCommandParams p("bibitem", "dummy"); @@ -1270,25 +921,8 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } par->bibkey->read(this, lex); } else if (token == "\\the_end") { -#ifndef NO_COMPABILITY - // If we still have some ert active here we have to insert - // it so we don't loose it. (Lgb) - insertErtContents(par, pos); -#endif the_end_read = true; -#ifndef NO_COMPABILITY -#ifndef NO_PEXTRA_REALLY - if (minipar == par) - par = 0; - minipar = parBeforeMinipage = 0; -#endif -#endif } else { -#ifndef NO_COMPABILITY - if (ert_comp.active) { - ert_comp.contents += token; - } else { -#endif // This should be insurance for the future: (Asger) ++unknown_tokens; lex.eatLine(); @@ -1300,196 +934,8 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, par->insertInset(pos, new_inset, LyXFont(LyXFont::ALL_INHERIT, params.language)); -#ifndef NO_COMPABILITY - } -#endif } -#ifndef NO_COMPABILITY -#ifndef NO_PEXTRA_REALLY - // I wonder if we could use this blanket fix for all the - // checkminipage cases... - // don't forget about ert paragraphs and compatibility read for'em - if (par && (par->size() || !ert_comp.contents.empty())) { - // It is possible that this will check to often, - // but that should not be an correctness issue. - // Only a speed issue. - checkminipage = true; - } - - // now check if we have a minipage paragraph as at this - // point we already read all the necessary data! - // this cannot be done in layout because there we did - // not read yet the paragraph PEXTRA-params (Jug) - // - // BEGIN pextra_minipage compability - // This should be removed in 1.3.x (Lgb) - // I don't think we should remove this so fast (Jug) - - // This compability code is not perfect. In a couple - // of rand cases it fails. When the minipage par is - // the first par in the document, and when there are - // none or only one regular paragraphs after the - // minipage. Currently I am not investing any effort - // in fixing those cases. - -// lyxerr << "Call depth: " << call_depth << endl; -// lyxerr << "Checkminipage: " << checkminipage << endl; - - if (checkminipage && (call_depth == 1)) { - checkminipage = false; - if (minipar && (minipar != par) && - (par->params().pextraType() == Paragraph::PEXTRA_MINIPAGE)) { - lyxerr << "minipages in a row" << endl; - if (par->params().pextraStartMinipage()) { - lyxerr << "start new minipage" << endl; - // minipages in a row - par->previous()->next(0); - par->previous(0); - - Paragraph * tmp = minipar; - while (tmp) { - tmp->params().pextraType(0); - tmp->params().pextraWidth(string()); - tmp->params().pextraWidthp(string()); - tmp->params().pextraAlignment(0); - tmp->params().pextraHfill(false); - tmp->params().pextraStartMinipage(false); - tmp = tmp->next(); - } - // create a new paragraph to insert the - // minipages in the following case - if (par->params().pextraStartMinipage() && - !par->params().pextraHfill()) { - Paragraph * p = new Paragraph; - p->layout(params.getLyXTextClass().defaultLayoutName()); - - p->previous(parBeforeMinipage); - parBeforeMinipage->next(p); - p->next(0); - p->params().depth(parBeforeMinipage->params().depth()); - parBeforeMinipage = p; - } - InsetMinipage * mini = new InsetMinipage(params); - mini->pos(static_cast(par->params().pextraAlignment())); - mini->pageWidth(LyXLength(par->params().pextraWidth())); - if (!par->params().pextraWidthp().empty()) { - lyxerr << "WP:" << mini->pageWidth().asString() << endl; - mini->pageWidth(LyXLength((par->params().pextraWidthp())+"col%")); - } - Paragraph * op = mini->firstParagraph(); - mini->inset.paragraph(par); - // - // and free the old ones! - // - while(op) { - Paragraph * pp = op->next(); - delete op; - op = pp; - } - // Insert the minipage last in the - // previous paragraph. - if (par->params().pextraHfill()) { - parBeforeMinipage->insertChar - (parBeforeMinipage->size(), - Paragraph::META_HFILL, font); - } - parBeforeMinipage->insertInset - (parBeforeMinipage->size(), mini, font); - - minipar = par; - } else { - lyxerr << "new minipage par" << endl; - //nothing to do just continue reading - } - - } else if (minipar && (minipar != par)) { - lyxerr << "last minipage par read" << endl; - // The last paragraph read was not part of a - // minipage but the par linked list is... - // So we need to remove the last par from the - // rest - if (par->previous()) - par->previous()->next(0); - par->previous(parBeforeMinipage); - parBeforeMinipage->next(par); - Paragraph * tmp = minipar; - while (tmp) { - tmp->params().pextraType(0); - tmp->params().pextraWidth(string()); - tmp->params().pextraWidthp(string()); - tmp->params().pextraAlignment(0); - tmp->params().pextraHfill(false); - tmp->params().pextraStartMinipage(false); - tmp = tmp->next(); - } - depth = parBeforeMinipage->params().depth(); - // and set this depth on the par as it has not been set already - par->params().depth(depth); - minipar = parBeforeMinipage = 0; - } else if (!minipar && - (par->params().pextraType() == Paragraph::PEXTRA_MINIPAGE)) { - // par is the first paragraph in a minipage - lyxerr << "begin minipage" << endl; - // To minimize problems for - // the users we will insert - // the first minipage in - // a sequence of minipages - // in its own paragraph. - Paragraph * p = new Paragraph; - p->layout(params.getLyXTextClass().defaultLayoutName()); - p->previous(par->previous()); - p->next(0); - p->params().depth(depth); - par->params().depth(0); - depth = 0; - if (par->previous()) - par->previous()->next(p); - par->previous(0); - parBeforeMinipage = p; - minipar = par; - if (!first_par || (first_par == par)) - first_par = p; - - InsetMinipage * mini = new InsetMinipage(params); - mini->pos(static_cast(minipar->params().pextraAlignment())); - mini->pageWidth(LyXLength(minipar->params().pextraWidth())); - if (!par->params().pextraWidthp().empty()) { - lyxerr << "WP:" << mini->pageWidth().asString() << endl; - mini->pageWidth(LyXLength((par->params().pextraWidthp())+"col%")); - } - - Paragraph * op = mini->firstParagraph(); - mini->inset.paragraph(minipar); - // - // and free the old ones! - // - while(op) { - Paragraph * pp = op->next(); - delete op; - op = pp; - } - - // Insert the minipage last in the - // previous paragraph. - if (minipar->params().pextraHfill()) { - parBeforeMinipage->insertChar - (parBeforeMinipage->size(), - Paragraph::META_HFILL, font); - } - parBeforeMinipage->insertInset - (parBeforeMinipage->size(), mini, font); - } else if (par->params().pextraType() == Paragraph::PEXTRA_INDENT) { - par->params().leftIndent(LyXLength(par->params().pextraWidth())); - if (!par->params().pextraWidthp().empty()) { - par->params().leftIndent(LyXLength((par->params().pextraWidthp())+"col%")); - } - } - } - // End of pextra_minipage compability - --call_depth; -#endif -#endif return the_end_read; } @@ -1509,9 +955,9 @@ void Buffer::insertStringAsLines(Paragraph *& par, pos_type & pos, for(string::const_iterator cit = str.begin(); cit != str.end(); ++cit) { if (*cit == '\n') { - if (autobreakrows && (par->size() || layout->keepempty)) { - par->breakParagraph(params, pos, - layout->isEnvironment()); + if (autobreakrows && (!par->empty() || layout->keepempty)) { + breakParagraph(params, par, pos, + layout->isEnvironment()); par = par->next(); pos = 0; space_inserted = true; @@ -1649,12 +1095,18 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par, inset = new InsetFoot(params); } else if (tmptok == "Marginal") { inset = new InsetMarginal(params); + } else if (tmptok == "OptArg") { + inset = new InsetOptArg(params); } else if (tmptok == "Minipage") { inset = new InsetMinipage(params); } else if (tmptok == "Float") { lex.next(); string tmptok = lex.getString(); inset = new InsetFloat(params, tmptok); + } else if (tmptok == "Wrap") { + lex.next(); + string tmptok = lex.getString(); + inset = new InsetWrap(params, tmptok); #if 0 } else if (tmptok == "List") { inset = new InsetList; @@ -1677,7 +1129,7 @@ void Buffer::readInset(LyXLex & lex, Paragraph *& par, } -bool Buffer::readFile(LyXLex & lex, Paragraph * par) +bool Buffer::readFile(LyXLex & lex, string const & filename, Paragraph * par) { if (lex.isOK()) { lex.next(); @@ -1692,13 +1144,14 @@ bool Buffer::readFile(LyXLex & lex, Paragraph * par) if (dot != string::npos) tmp_format.erase(dot, 1); file_format = strToInt(tmp_format); + //lyxerr << "format: " << file_format << endl; if (file_format == LYX_FORMAT) { // current format } else if (file_format > LYX_FORMAT) { // future format Alert::alert(_("Warning!"), - _("LyX file format is newer that what"), - _("is supported in this LyX version. Expect some problems.")); + _("The file was created with a newer version of" + "LyX. This is likely to cause problems.")); } else if (file_format < LYX_FORMAT) { // old formats @@ -1707,20 +1160,36 @@ bool Buffer::readFile(LyXLex & lex, Paragraph * par) _("Old LyX file format found. " "Use LyX 0.10.x to read this!")); return false; - } else if (file_format < 220) { - string const command = "lyx2lyx " - + QuoteName(filename_); + } else if (!filename.empty()) { + string command = + LibFileSearch("lyx2lyx", "lyx2lyx"); + if (command.empty()) { + Alert::alert(_("ERROR!"), + _("Can't find conversion script.")); + return false; + } + command += " -t" + +tostr(LYX_FORMAT)+" " + + QuoteName(filename); + lyxerr[Debug::INFO] << "Running '" + << command << "'" << endl; cmd_ret const ret = RunCommand(command); if (ret.first) { Alert::alert(_("ERROR!"), - _("An error occured while " - "running the conversion script.")); + _("An error occured while " + "running the conversion script.")); return false; } - istringstream is(ret.second); + istringstream is(STRCONV(ret.second)); LyXLex tmplex(0, 0); tmplex.setStream(is); - return readFile(tmplex); + return readFile(tmplex, string()); + } else { + // This code is reached if lyx2lyx failed (for + // some reason) to change the file format of + // the file. + lyx::Assert(false); + return false; } } bool the_end = readLyXformat2(lex, par); @@ -1810,7 +1279,7 @@ bool Buffer::save() const } if (writeFile(fileName())) { - markLyxClean(); + markClean(); removeAutosaveFile(fileName()); } else { // Saving failed, so backup is not backup @@ -1858,7 +1327,10 @@ bool Buffer::writeFile(string const & fname) const // this will write out all the paragraphs // using recursive descent. - paragraph->writeFile(this, ofs, params, depth); + ParagraphList::iterator pit = paragraphs.begin(); + ParagraphList::iterator pend = paragraphs.end(); + for (; pit != pend; ++pit) + pit->write(this, ofs, params, depth); // Write marker that shows file is complete ofs << "\n\\the_end" << endl; @@ -1903,7 +1375,7 @@ pair const addDepth(int depth, int ldepth) } -string const Buffer::asciiParagraph(Paragraph const * par, +string const Buffer::asciiParagraph(Paragraph const & par, unsigned int linelen, bool noparbreak) const { @@ -1927,11 +1399,11 @@ string const Buffer::asciiParagraph(Paragraph const * par, } } #else - depth = par->params().depth(); + depth = par.params().depth(); #endif // First write the layout - string const & tmp = par->layout()->name(); + string const & tmp = par.layout()->name(); if (compare_no_case(tmp, "itemize") == 0) { ltype = 1; ltype_depth = depth + 1; @@ -1973,7 +1445,7 @@ string const Buffer::asciiParagraph(Paragraph const * par, // lyxerr << "Should this ever happen?" << endl; // } - // linelen <= 0 is special and means we don't have pargraph breaks + // linelen <= 0 is special and means we don't have paragraph breaks string::size_type currlinelen = 0; @@ -2020,7 +1492,7 @@ string const Buffer::asciiParagraph(Paragraph const * par, break; default: { - string const parlab = par->params().labelString(); + string const parlab = par.params().labelString(); buffer << parlab << " "; currlinelen += parlab.length() + 1; } @@ -2041,12 +1513,12 @@ string const Buffer::asciiParagraph(Paragraph const * par, string word; - for (pos_type i = 0; i < par->size(); ++i) { - char c = par->getUChar(params, i); + for (pos_type i = 0; i < par.size(); ++i) { + char c = par.getUChar(params, i); switch (c) { case Paragraph::META_INSET: { - Inset const * inset = par->getInset(i); + Inset const * inset = par.getInset(i); if (inset) { if (linelen > 0) { buffer << word; @@ -2116,7 +1588,7 @@ string const Buffer::asciiParagraph(Paragraph const * par, } } buffer << word; - return buffer.str().c_str(); + return STRCONV(buffer.str()); } @@ -2131,14 +1603,15 @@ void Buffer::writeFileAscii(string const & fname, int linelen) } -void Buffer::writeFileAscii(ostream & ofs, int linelen) +void Buffer::writeFileAscii(ostream & os, int linelen) { - Paragraph * par = paragraph; - while (par) { - ofs << asciiParagraph(par, linelen, par->previous() == 0); - par = par->next(); + ParagraphList::iterator beg = paragraphs.begin(); + ParagraphList::iterator end = paragraphs.end(); + ParagraphList::iterator it = beg; + for (; it != end; ++it) { + os << asciiParagraph(*it, linelen, it == beg); } - ofs << "\n"; + os << "\n"; } @@ -2172,8 +1645,6 @@ void Buffer::makeLaTeXFile(ostream & os, { niceFile = nice; // this will be used by Insetincludes. - tex_code_break_column = lyxrc.ascii_linelen; - // validate the buffer. lyxerr[Debug::LATEX] << " Validating buffer..." << endl; LaTeXFeatures features(params); @@ -2183,7 +1654,7 @@ void Buffer::makeLaTeXFile(ostream & os, texrow.reset(); // The starting paragraph of the coming rows is the // first paragraph of the document. (Asger) - texrow.start(paragraph, 0); + texrow.start(&*(paragraphs.begin()), 0); if (!only_body && nice) { os << "%% " << lyx_docversion << " created this file. " @@ -2198,9 +1669,7 @@ void Buffer::makeLaTeXFile(ostream & os, // usual is \batchmode and has a // special input@path to allow the including of figures // with either \input or \includegraphics (what figinsets do). - // batchmode is not set if there is a tex_code_break_column. - // In this case somebody is interested in the generated LaTeX, - // so this is OK. input@path is set when the actual parameter + // input@path is set when the actual parameter // original_path is set. This is done for usual tex-file, but not // for nice-latex-file. (Matthias 250696) if (!only_body) { @@ -2306,7 +1775,7 @@ void Buffer::makeLaTeXFile(ostream & os, options << params.options << ','; } - string strOptions(options.str().c_str()); + string strOptions(STRCONV(options.str())); if (!strOptions.empty()) { strOptions = rtrim(strOptions, ","); os << '[' << strOptions << ']'; @@ -2586,7 +2055,7 @@ void Buffer::makeLaTeXFile(ostream & os, if (!lyxrc.language_global_options && tmp == "\\usepackage{babel}") tmp = string("\\usepackage[") + - language_options.str().c_str() + + STRCONV(language_options.str()) + "]{babel}"; preamble += tmp + "\n"; preamble += features.getBabelOptions(); @@ -2612,7 +2081,7 @@ void Buffer::makeLaTeXFile(ostream & os, texrow.newline(); } - latexParagraphs(os, paragraph, 0, texrow); + latexParagraphs(os, &*(paragraphs.begin()), 0, texrow); // add this just in case after all the paragraphs os << endl; @@ -2638,12 +2107,6 @@ void Buffer::makeLaTeXFile(ostream & os, // Just to be sure. (Asger) texrow.newline(); - // tex_code_break_column's value is used to decide - // if we are in batchmode or not (within mathed_write() - // in math_write.C) so we must set it to a non-zero - // value when we leave otherwise we save incorrect .lyx files. - tex_code_break_column = lyxrc.ascii_linelen; - lyxerr[Debug::INFO] << "Finished making latex file." << endl; lyxerr[Debug::INFO] << "Row count was " << texrow.rows()-1 << "." << endl; @@ -2666,7 +2129,7 @@ void Buffer::latexParagraphs(ostream & ofs, Paragraph * par, while (par != endpar) { Inset * in = par->inInset(); // well we have to check if we are in an inset with unlimited - // lenght (all in one row) if that is true then we don't allow + // length (all in one row) if that is true then we don't allow // any special options in the paragraph and also we don't allow // any environment other then "Standard" to be valid! if ((in == 0) || !in->forceDefaultParagraphs(in)) { @@ -2738,38 +2201,6 @@ bool Buffer::isSGML() const } -int Buffer::sgmlOpenTag(ostream & os, Paragraph::depth_type depth, bool mixcont, - string const & latexname) const -{ - if (!latexname.empty() && latexname != "!-- --") { - if (!mixcont) - os << string(" ",depth); - os << "<" << latexname << ">"; - } - - if (!mixcont) - os << endl; - - return mixcont?0:1; -} - - -int Buffer::sgmlCloseTag(ostream & os, Paragraph::depth_type depth, bool mixcont, - string const & latexname) const -{ - if (!latexname.empty() && latexname != "!-- --") { - if (!mixcont) - os << endl << string(" ",depth); - os << ""; - } - - if (!mixcont) - os << endl; - - return mixcont?0:1; -} - - void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) { ofstream ofs(fname.c_str()); @@ -2806,12 +2237,12 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) ofs << ">\n\n"; if (params.options.empty()) - sgmlOpenTag(ofs, 0, false, top_element); + sgml::openTag(ofs, 0, false, top_element); else { string top = top_element; top += " "; top += params.options; - sgmlOpenTag(ofs, 0, false, top); + sgml::openTag(ofs, 0, false, top); } } @@ -2820,7 +2251,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) << " -->\n"; Paragraph::depth_type depth = 0; // paragraph depth - Paragraph * par = paragraph; + Paragraph * par = &*(paragraphs.begin()); string item_name; vector environment_stack(5); @@ -2832,7 +2263,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) Inset::Code lyx_code = inset->lyxCode(); if (lyx_code == Inset::TOC_CODE) { string const temp = "toc"; - sgmlOpenTag(ofs, depth, false, temp); + sgml::openTag(ofs, depth, false, temp); par = par->next(); continue; @@ -2841,7 +2272,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) // environment tag closing for (; depth > par->params().depth(); --depth) { - sgmlCloseTag(ofs, depth, false, environment_stack[depth]); + sgml::closeTag(ofs, depth, false, environment_stack[depth]); environment_stack[depth].erase(); } @@ -2850,14 +2281,14 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) case LATEX_PARAGRAPH: if (depth == par->params().depth() && !environment_stack[depth].empty()) { - sgmlCloseTag(ofs, depth, false, environment_stack[depth]); + sgml::closeTag(ofs, depth, false, environment_stack[depth]); environment_stack[depth].erase(); if (depth) --depth; else ofs << "

"; } - sgmlOpenTag(ofs, depth, false, style->latexname()); + sgml::openTag(ofs, depth, false, style->latexname()); break; case LATEX_COMMAND: @@ -2867,12 +2298,12 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) " LatexType Command.\n")); if (!environment_stack[depth].empty()) { - sgmlCloseTag(ofs, depth, false, environment_stack[depth]); + sgml::closeTag(ofs, depth, false, environment_stack[depth]); ofs << "

"; } environment_stack[depth].erase(); - sgmlOpenTag(ofs, depth, false, style->latexname()); + sgml::openTag(ofs, depth, false, style->latexname()); break; case LATEX_ENVIRONMENT: @@ -2882,7 +2313,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) if (depth == par->params().depth() && environment_stack[depth] != latexname) { - sgmlCloseTag(ofs, depth, false, + sgml::closeTag(ofs, depth, false, environment_stack[depth]); environment_stack[depth].erase(); } @@ -2892,9 +2323,9 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) } if (environment_stack[depth] != latexname) { if (depth == 0) { - sgmlOpenTag(ofs, depth, false, "p"); + sgml::openTag(ofs, depth, false, "p"); } - sgmlOpenTag(ofs, depth, false, latexname); + sgml::openTag(ofs, depth, false, latexname); if (environment_stack.size() == depth + 1) environment_stack.push_back("!-- --"); @@ -2911,12 +2342,12 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) else item_name = "item"; - sgmlOpenTag(ofs, depth + 1, false, item_name); + sgml::openTag(ofs, depth + 1, false, item_name); } break; default: - sgmlOpenTag(ofs, depth, false, style->latexname()); + sgml::openTag(ofs, depth, false, style->latexname()); break; } @@ -2935,18 +2366,18 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) ofs << "]]>"; break; default: - sgmlCloseTag(ofs, depth, false, style->latexname()); + sgml::closeTag(ofs, depth, false, style->latexname()); break; } } // Close open tags for (int i = depth; i >= 0; --i) - sgmlCloseTag(ofs, depth, false, environment_stack[i]); + sgml::closeTag(ofs, depth, false, environment_stack[i]); if (!body_only) { ofs << "\n\n"; - sgmlCloseTag(ofs, 0, false, top_element); + sgml::closeTag(ofs, 0, false, top_element); } ofs.close(); @@ -3168,10 +2599,10 @@ void Buffer::simpleLinuxDocOnePar(ostream & os, os << c; ++char_line_count; } else { - string sgml_string; - if (par->sgmlConvertChar(c, sgml_string) - && !style->free_spacing && !par->isFreeSpacing()) - { + bool ws; + string str; + boost::tie(ws, str) = sgml::escapeChar(c); + if (ws && !style->free_spacing && !par->isFreeSpacing()) { // in freespacing mode, spaces are // non-breaking characters if (desc_on) {// if char is ' ' then... @@ -3185,8 +2616,8 @@ void Buffer::simpleLinuxDocOnePar(ostream & os, os << c; } } else { - os << sgml_string; - char_line_count += sgml_string.length(); + os << str; + char_line_count += str.length(); } } font_old = font; @@ -3235,7 +2666,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) return; } - Paragraph * par = paragraph; + Paragraph * par = &*(paragraphs.begin()); niceFile = nice; // this will be used by Insetincludes. @@ -3272,7 +2703,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) top += " "; top += params.options; } - sgmlOpenTag(ofs, 0, false, top); + sgml::openTag(ofs, 0, false, top); ofs << "\n"; @@ -3302,11 +2733,11 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) for (; depth > par->params().depth(); --depth) { if (environment_inner[depth] != "!-- --") { item_name = "listitem"; - sgmlCloseTag(ofs, command_depth + depth, false, item_name); + sgml::closeTag(ofs, command_depth + depth, false, item_name); if (environment_inner[depth] == "varlistentry") - sgmlCloseTag(ofs, depth+command_depth, false, environment_inner[depth]); + sgml::closeTag(ofs, depth+command_depth, false, environment_inner[depth]); } - sgmlCloseTag(ofs, depth + command_depth, false, environment_stack[depth]); + sgml::closeTag(ofs, depth + command_depth, false, environment_stack[depth]); environment_stack[depth].erase(); environment_inner[depth].erase(); } @@ -3316,12 +2747,12 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) && !environment_stack[depth].empty()) { if (environment_inner[depth] != "!-- --") { item_name= "listitem"; - sgmlCloseTag(ofs, command_depth+depth, false, item_name); + sgml::closeTag(ofs, command_depth+depth, false, item_name); if (environment_inner[depth] == "varlistentry") - sgmlCloseTag(ofs, depth + command_depth, false, environment_inner[depth]); + sgml::closeTag(ofs, depth + command_depth, false, environment_inner[depth]); } - sgmlCloseTag(ofs, depth + command_depth, false, environment_stack[depth]); + sgml::closeTag(ofs, depth + command_depth, false, environment_stack[depth]); environment_stack[depth].erase(); environment_inner[depth].erase(); @@ -3330,7 +2761,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) // Write opening SGML tags. switch (style->latextype) { case LATEX_PARAGRAPH: - sgmlOpenTag(ofs, depth + command_depth, + sgml::openTag(ofs, depth + command_depth, false, style->latexname()); break; @@ -3351,14 +2782,14 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) if (cmd_depth < command_base) { for (Paragraph::depth_type j = command_depth; j >= command_base; --j) { - sgmlCloseTag(ofs, j, false, command_stack[j]); + sgml::closeTag(ofs, j, false, 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) { - sgmlCloseTag(ofs, j, false, command_stack[j]); + sgml::closeTag(ofs, j, false, command_stack[j]); ofs << endl; } command_depth = cmd_depth; @@ -3387,10 +2818,10 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) } } - sgmlOpenTag(ofs, depth + command_depth, false, command_name); + sgml::openTag(ofs, depth + command_depth, false, command_name); item_name = c_params.empty()?"title":c_params; - sgmlOpenTag(ofs, depth + 1 + command_depth, false, item_name); + sgml::openTag(ofs, depth + 1 + command_depth, false, item_name); break; case LATEX_ENVIRONMENT: @@ -3407,13 +2838,13 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) } environment_stack[depth] = style->latexname(); environment_inner[depth] = "!-- --"; - sgmlOpenTag(ofs, depth + command_depth, false, environment_stack[depth]); + sgml::openTag(ofs, depth + command_depth, false, environment_stack[depth]); } else { if (environment_inner[depth] != "!-- --") { item_name= "listitem"; - sgmlCloseTag(ofs, command_depth + depth, false, item_name); + sgml::closeTag(ofs, command_depth + depth, false, item_name); if (environment_inner[depth] == "varlistentry") - sgmlCloseTag(ofs, depth + command_depth, false, environment_inner[depth]); + sgml::closeTag(ofs, depth + command_depth, false, environment_inner[depth]); } } @@ -3422,7 +2853,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) if (style->latexparam() == "CDATA") ofs << "latexparam()); + sgml::openTag(ofs, depth + command_depth, false, style->latexparam()); } break; } @@ -3430,15 +2861,15 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) desc_on = (style->labeltype == LABEL_MANUAL); environment_inner[depth] = desc_on ? "varlistentry" : "listitem"; - sgmlOpenTag(ofs, depth + 1 + command_depth, + sgml::openTag(ofs, depth + 1 + command_depth, false, environment_inner[depth]); item_name = desc_on ? "term" : "para"; - sgmlOpenTag(ofs, depth + 1 + command_depth, + sgml::openTag(ofs, depth + 1 + command_depth, false, item_name); break; default: - sgmlOpenTag(ofs, depth + command_depth, + sgml::openTag(ofs, depth + command_depth, false, style->latexname()); break; } @@ -3452,7 +2883,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) switch (style->latextype) { case LATEX_COMMAND: end_tag = c_params.empty() ? "title" : c_params; - sgmlCloseTag(ofs, depth + command_depth, + sgml::closeTag(ofs, depth + command_depth, false, end_tag); break; case LATEX_ENVIRONMENT: @@ -3460,19 +2891,19 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) if (style->latexparam() == "CDATA") ofs << "]]>"; else - sgmlCloseTag(ofs, depth + command_depth, false, style->latexparam()); + sgml::closeTag(ofs, depth + command_depth, false, style->latexparam()); } break; case LATEX_ITEM_ENVIRONMENT: if (desc_on == 1) break; end_tag= "para"; - sgmlCloseTag(ofs, depth + 1 + command_depth, false, end_tag); + sgml::closeTag(ofs, depth + 1 + command_depth, false, end_tag); break; case LATEX_PARAGRAPH: - sgmlCloseTag(ofs, depth + command_depth, false, style->latexname()); + sgml::closeTag(ofs, depth + command_depth, false, style->latexname()); break; default: - sgmlCloseTag(ofs, depth + command_depth, false, style->latexname()); + sgml::closeTag(ofs, depth + command_depth, false, style->latexname()); break; } } @@ -3482,23 +2913,23 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) if (!environment_stack[depth].empty()) { if (environment_inner[depth] != "!-- --") { item_name = "listitem"; - sgmlCloseTag(ofs, command_depth + depth, false, item_name); + sgml::closeTag(ofs, command_depth + depth, false, item_name); if (environment_inner[depth] == "varlistentry") - sgmlCloseTag(ofs, depth + command_depth, false, environment_inner[depth]); + sgml::closeTag(ofs, depth + command_depth, false, environment_inner[depth]); } - sgmlCloseTag(ofs, depth + command_depth, false, environment_stack[depth]); + sgml::closeTag(ofs, depth + command_depth, false, environment_stack[depth]); } } for (int j = command_depth; j >= 0 ; --j) if (!command_stack[j].empty()) { - sgmlCloseTag(ofs, j, false, command_stack[j]); + sgml::closeTag(ofs, j, false, command_stack[j]); ofs << endl; } ofs << "\n\n"; - sgmlCloseTag(ofs, 0, false, top_element); + sgml::closeTag(ofs, 0, false, top_element); ofs.close(); // How to check for successful close @@ -3558,13 +2989,14 @@ void Buffer::simpleDocBookOnePar(ostream & os, } } else { char c = par->getChar(i); - string sgml_string; - par->sgmlConvertChar(c, sgml_string); + bool ws; + string str; + boost::tie(ws, str) = sgml::escapeChar(c); if (style->pass_thru) { os << c; } else if (style->free_spacing || par->isFreeSpacing() || c != ' ') { - os << sgml_string; + os << str; } else if (desc_on ==1) { ++char_line_count; os << "\n"; @@ -3647,25 +3079,14 @@ int Buffer::runChktex() void Buffer::validate(LaTeXFeatures & features) const { - Paragraph * par = paragraph; LyXTextClass const & tclass = params.getLyXTextClass(); // AMS Style is at document level if (params.use_amsmath || tclass.provides(LyXTextClass::amsmath)) features.require("amsmath"); - while (par) { - // We don't use "lyxerr.debug" because of speed. (Asger) - if (lyxerr.debugging(Debug::LATEX)) - lyxerr << "Paragraph: " << par << endl; - - // Now just follow the list of paragraphs and run - // validate on each of them. - par->validate(features); - - // and then the next paragraph - par = par->next(); - } + for_each(paragraphs.begin(), paragraphs.end(), + boost::bind(&Paragraph::validate, _1, boost::ref(features))); // the bullet shapes are buffer level not paragraph level // so they are tested here @@ -3697,42 +3118,21 @@ void Buffer::validate(LaTeXFeatures & features) const } -// This function should be in Buffer because it's a buffer's property (ale) -string const Buffer::getIncludeonlyList(char delim) -{ - string lst; - for (inset_iterator it = inset_iterator_begin(); - it != inset_iterator_end(); ++it) { - if ((*it)->lyxCode() == Inset::INCLUDE_CODE) { - InsetInclude * insetinc = - static_cast(*it); - if (insetinc->isIncludeOnly()) { - if (!lst.empty()) - lst += delim; - lst += insetinc->getRelFileBaseName(); - } - } - } - lyxerr[Debug::INFO] << "Includeonly(" << lst << ')' << endl; - return lst; -} - - -vector const Buffer::getLabelList() +vector const Buffer::getLabelList() const { /// if this is a child document and the parent is already loaded /// Use the parent's list instead [ale990407] if (!params.parentname.empty() && bufferlist.exists(params.parentname)) { - Buffer * tmp = bufferlist.getBuffer(params.parentname); + Buffer const * tmp = bufferlist.getBuffer(params.parentname); if (tmp) return tmp->getLabelList(); } vector label_list; - for (inset_iterator it = inset_iterator_begin(); - it != inset_iterator_end(); ++it) { - vector const l = (*it)->getLabelList(); + for (inset_iterator it = inset_const_iterator_begin(); + it != inset_const_iterator_end(); ++it) { + vector const l = it->getLabelList(); label_list.insert(label_list.end(), l.begin(), l.end()); } return label_list; @@ -3752,33 +3152,34 @@ vector > const Buffer::getBibkeyList() const } vector keys; - Paragraph * par = paragraph; - while (par) { - if (par->bibkey) { - string const key = par->bibkey->getContents(); - string const opt = par->bibkey->getOptions(); - string const ref = par->asString(this, false); + ParagraphList::iterator pit = paragraphs.begin(); + ParagraphList::iterator pend = paragraphs.end(); + for (; pit != pend; ++pit) { + if (pit->bibkey) { + string const key = pit->bibkey->getContents(); + string const opt = pit->bibkey->getOptions(); + string const ref = pit->asString(this, false); string const info = opt + "TheBibliographyRef" + ref; keys.push_back(StringPair(key, info)); } - par = par->next(); } + if (!keys.empty()) + return keys; + // Might be either using bibtex or a child has bibliography - if (keys.empty()) { - for (inset_iterator it = inset_const_iterator_begin(); - it != inset_const_iterator_end(); ++it) { - // Search for Bibtex or Include inset - if ((*it)->lyxCode() == Inset::BIBTEX_CODE) { - vector tmp = - static_cast(*it)->getKeys(this); - keys.insert(keys.end(), tmp.begin(), tmp.end()); - } else if ((*it)->lyxCode() == Inset::INCLUDE_CODE) { - vector const tmp = - static_cast(*it)->getKeys(); - keys.insert(keys.end(), tmp.begin(), tmp.end()); - } + for (inset_iterator it = inset_const_iterator_begin(); + it != inset_const_iterator_end(); ++it) { + // Search for Bibtex or Include inset + if (it->lyxCode() == Inset::BIBTEX_CODE) { + vector tmp = + static_cast(*it).getKeys(this); + keys.insert(keys.end(), tmp.begin(), tmp.end()); + } else if (it->lyxCode() == Inset::INCLUDE_CODE) { + vector const tmp = + static_cast(*it).getKeys(); + keys.insert(keys.end(), tmp.begin(), tmp.end()); } } @@ -3852,10 +3253,8 @@ bool Buffer::dispatch(int action, string const & argument, bool * result) void Buffer::resizeInsets(BufferView * bv) { /// then remove all LyXText in text-insets - Paragraph * par = paragraph; - for (; par; par = par->next()) { - par->resizeInsetsLyXText(bv); - } + for_each(paragraphs.begin(), paragraphs.end(), + boost::bind(&Paragraph::resizeInsetsLyXText, _1, bv)); } @@ -3887,27 +3286,14 @@ bool Buffer::isMultiLingual() } -Buffer::inset_iterator::inset_iterator(Paragraph * paragraph, pos_type pos) - : par(paragraph) -{ - it = par->InsetIterator(pos); - if (it == par->inset_iterator_end()) { - par = par->next(); - setParagraph(); - } -} - - void Buffer::inset_iterator::setParagraph() { - while (par) { - it = par->inset_iterator_begin(); - if (it != par->inset_iterator_end()) + while (pit != pend) { + it = pit->insetlist.begin(); + if (it != pit->insetlist.end()) return; - par = par->next(); + ++pit; } - //it = 0; - // We maintain an invariant that whenever par = 0 then it = 0 } @@ -3916,9 +3302,9 @@ Inset * Buffer::getInsetFromID(int id_arg) const for (inset_iterator it = inset_const_iterator_begin(); it != inset_const_iterator_end(); ++it) { - if ((*it)->id() == id_arg) - return *it; - Inset * in = (*it)->getInsetFromID(id_arg); + if (it->id() == id_arg) + return &(*it); + Inset * in = it->getInsetFromID(id_arg); if (in) return in; } @@ -3928,17 +3314,19 @@ Inset * Buffer::getInsetFromID(int id_arg) const Paragraph * Buffer::getParFromID(int id) const { - if (id < 0) return 0; - Paragraph * par = paragraph; - while (par) { - if (par->id() == id) { - return par; + if (id < 0) + return 0; + + ParagraphList::iterator it = paragraphs.begin(); + ParagraphList::iterator end = paragraphs.end(); + for (; it != end; ++it) { + if (it->id() == id) { + return &*it; } - Paragraph * tmp = par->getParFromID(id); + Paragraph * tmp = it->getParFromID(id); if (tmp) { return tmp; } - par = par->next(); } return 0; } @@ -3946,7 +3334,7 @@ Paragraph * Buffer::getParFromID(int id) const ParIterator Buffer::par_iterator_begin() { - return ParIterator(paragraph); + return ParIterator(&*(paragraphs.begin())); } @@ -3954,3 +3342,192 @@ ParIterator Buffer::par_iterator_end() { return ParIterator(); } + +ParConstIterator Buffer::par_iterator_begin() const +{ + return ParConstIterator(&*(paragraphs.begin())); +} + + +ParConstIterator Buffer::par_iterator_end() const +{ + return ParConstIterator(); +} + + + +void Buffer::addUser(BufferView * u) +{ + users = u; +} + + +void Buffer::delUser(BufferView *) +{ + users = 0; +} + + +Language const * Buffer::getLanguage() const +{ + return params.language; +} + + +bool Buffer::isClean() const +{ + return lyx_clean; +} + + +bool Buffer::isBakClean() const +{ + return bak_clean; +} + + +void Buffer::markClean() const +{ + if (!lyx_clean) { + lyx_clean = true; + updateTitles(); + } + // if the .lyx file has been saved, we don't need an + // autosave + bak_clean = true; +} + + +void Buffer::markBakClean() +{ + bak_clean = true; +} + + +void Buffer::setUnnamed(bool flag) +{ + unnamed = flag; +} + + +bool Buffer::isUnnamed() +{ + return unnamed; +} + + +void Buffer::markDirty() +{ + if (lyx_clean) { + lyx_clean = false; + updateTitles(); + } + bak_clean = false; + DEPCLEAN * tmp = dep_clean; + while (tmp) { + tmp->clean = false; + tmp = tmp->next; + } +} + + +string const & Buffer::fileName() const +{ + return filename_; +} + + +string const & Buffer::filePath() const +{ + return filepath_; +} + + +bool Buffer::isReadonly() const +{ + return read_only; +} + + +BufferView * Buffer::getUser() const +{ + return users; +} + + +void Buffer::setParentName(string const & name) +{ + params.parentname = name; +} + + +Buffer::inset_iterator::inset_iterator() + : pit(0), pend(0) +{} + + +Buffer::inset_iterator::inset_iterator(base_type p, base_type e) + : pit(p), pend(e) +{ + setParagraph(); +} + + +Buffer::inset_iterator & Buffer::inset_iterator::operator++() +{ + if (pit != pend) { + ++it; + if (it == pit->insetlist.end()) { + ++pit; + setParagraph(); + } + } + return *this; +} + + +Buffer::inset_iterator Buffer::inset_iterator::operator++(int) +{ + inset_iterator tmp = *this; + ++*this; + return tmp; +} + + +Buffer::inset_iterator::reference Buffer::inset_iterator::operator*() +{ + return *it.getInset(); +} + + +Buffer::inset_iterator::pointer Buffer::inset_iterator::operator->() +{ + return it.getInset(); +} + + +Paragraph * Buffer::inset_iterator::getPar() +{ + return &(*pit); +} + + +lyx::pos_type Buffer::inset_iterator::getPos() const +{ + return it.getPos(); +} + + +bool operator==(Buffer::inset_iterator const & iter1, + Buffer::inset_iterator const & iter2) +{ + return iter1.pit == iter2.pit + && (iter1.pit == iter1.pend || iter1.it == iter2.it); +} + + +bool operator!=(Buffer::inset_iterator const & iter1, + Buffer::inset_iterator const & iter2) +{ + return !(iter1 == iter2); +}