X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.C;h=5c07e74c5670af0ccdb2fc37800ec3f9dcd0cd16;hb=b0babedcb7a9f4c737540d8ac7007b12ff5d979b;hp=72c56a221d5b803ba3629155fde134b3d426ee13;hpb=5e7275dabc36e1acb396c45ba27aecf8d8a0171e;p=lyx.git diff --git a/src/buffer.C b/src/buffer.C index 72c56a221d..5c07e74c56 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -20,7 +20,6 @@ #include "buffer.h" #include "bufferlist.h" -#include "counters.h" #include "LyXAction.h" #include "lyxrc.h" #include "lyxlex.h" @@ -73,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" @@ -146,24 +147,17 @@ extern BufferList bufferlist; namespace { -const int LYX_FORMAT = 220; +const int LYX_FORMAT = 221; } // namespace anon Buffer::Buffer(string const & file, bool ronly) : niceFile(true), lyx_clean(true), bak_clean(true), unnamed(false), dep_clean(0), read_only(ronly), - filename_(file), users(0), ctrs(new Counters) + filename_(file), users(0) { lyxerr[Debug::INFO] << "Buffer::Buffer()" << endl; -// filename = file; filepath_ = OnlyPath(file); -// 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(); @@ -205,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); @@ -282,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 @@ -319,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; @@ -406,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,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) @@ -529,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" @@ -600,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; @@ -617,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 @@ -643,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()); @@ -666,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(); @@ -729,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' " @@ -751,107 +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) { - 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") { @@ -932,13 +669,6 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, } 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) @@ -1174,26 +904,9 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, 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); @@ -1201,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"); @@ -1221,18 +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; } 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(); @@ -1244,9 +934,6 @@ Buffer::parseSingleLyXformat2Token(LyXLex & lex, Paragraph *& par, par->insertInset(pos, new_inset, LyXFont(LyXFont::ALL_INHERIT, params.language)); -#ifndef NO_COMPABILITY - } -#endif } return the_end_read; @@ -1408,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; @@ -1436,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(); @@ -1451,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 @@ -1466,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); @@ -1878,7 +1588,7 @@ string const Buffer::asciiParagraph(Paragraph const & par, } } buffer << word; - return buffer.str().c_str(); + return STRCONV(buffer.str()); } @@ -2065,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 << ']'; @@ -2345,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(); @@ -2491,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()); @@ -2559,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); } } @@ -2585,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; @@ -2594,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(); } @@ -2603,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: @@ -2620,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: @@ -2635,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(); } @@ -2645,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("!-- --"); @@ -2664,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; } @@ -2688,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(); @@ -3025,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"; @@ -3055,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(); } @@ -3069,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(); @@ -3083,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; @@ -3104,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; @@ -3140,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: @@ -3160,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]); } } @@ -3175,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; } @@ -3183,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; } @@ -3205,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: @@ -3213,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; } } @@ -3235,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 @@ -3440,26 +3118,6 @@ 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 & inc = static_cast(*it); - if (inc.isIncludeOnly()) { - if (!lst.empty()) - lst += delim; - lst += inc.getRelFileBaseName(); - } - } - } - lyxerr[Debug::INFO] << "Includeonly(" << lst << ')' << endl; - return lst; -} - - vector const Buffer::getLabelList() const { /// if this is a child document and the parent is already loaded @@ -3507,20 +3165,21 @@ vector > const Buffer::getBibkeyList() const } } + 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()); } } @@ -3627,12 +3286,6 @@ bool Buffer::isMultiLingual() } -Counters & Buffer::counters() const -{ - return *ctrs.get(); -} - - void Buffer::inset_iterator::setParagraph() { while (pit != pend) { @@ -3690,6 +3343,18 @@ 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) {