X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.C;h=5fa662477800cf598057e9cc4304f2b75faef88e;hb=78046794ccfce3a20751e00b35295c290853afd6;hp=b7afa7c11a69504c38f2178cd4b89e22159cfea6;hpb=80d7f70dc340e8b1ab29d38284b8327d13757196;p=lyx.git diff --git a/src/buffer.C b/src/buffer.C index b7afa7c11a..5fa6624778 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -5,117 +5,133 @@ * * \author Lars Gullik Bjønnes * - * Full author contact details are available in file CREDITS + * Full author contact details are available in file CREDITS. */ #include #include "buffer.h" + +#include "author.h" #include "buffer_funcs.h" #include "bufferlist.h" -#include "LyXAction.h" -#include "lyxrc.h" -#include "lyxlex.h" -#include "tex-strings.h" -#include "layout.h" -#include "bufferview_funcs.h" -#include "lyxfont.h" -#include "version.h" -#include "LaTeX.h" +#include "bufferparams.h" +#include "Bullet.h" #include "Chktex.h" #include "debug.h" -#include "LaTeXFeatures.h" -#include "lyxtext.h" -#include "gettext.h" -#include "language.h" -#include "exporter.h" #include "errorlist.h" -#include "Lsstream.h" +#include "exporter.h" #include "format.h" -#include "ParagraphParameters.h" +#include "funcrequest.h" +#include "gettext.h" #include "iterators.h" -#include "lyxtextclasslist.h" -#include "sgml.h" -#include "paragraph_funcs.h" +#include "language.h" +#include "LaTeX.h" +#include "LaTeXFeatures.h" +#include "LyXAction.h" +#include "lyxlex.h" +#include "lyxrc.h" +#include "lyxvc.h" #include "messages.h" -#include "author.h" - -#include "frontends/LyXView.h" - -#include "mathed/formulamacro.h" -#include "mathed/formula.h" +#include "paragraph.h" +#include "paragraph_funcs.h" +#include "ParagraphParameters.h" +#include "sgml.h" +#include "texrow.h" +#include "undo.h" +#include "version.h" #include "insets/insetbibitem.h" #include "insets/insetbibtex.h" #include "insets/insetinclude.h" #include "insets/insettext.h" -#include "frontends/Dialogs.h" #include "frontends/Alert.h" #include "graphics/Previews.h" -#include "support/LAssert.h" -#include "support/textutils.h" +#include "support/FileInfo.h" #include "support/filetools.h" -#include "support/path.h" +#include "support/gzstream.h" +#include "support/lyxlib.h" #include "support/os.h" +#include "support/path.h" +#include "support/textutils.h" #include "support/tostr.h" -#include "support/lyxlib.h" -#include "support/FileInfo.h" -#include "support/lyxmanip.h" -#include "support/lyxtime.h" #include #include -#include +#include "support/std_sstream.h" + #include -#include #include -#include -#include -#include -#include -#include -#include #include #ifdef HAVE_LOCALE -#include #endif -using namespace lyx::support; +using lyx::pos_type; -#ifndef CXX_GLOBAL_CSTD -using std::pow; -#endif +using lyx::support::AddName; +using lyx::support::ascii_lowercase; +using lyx::support::atoi; +using lyx::support::bformat; +using lyx::support::ChangeExtension; +using lyx::support::cmd_ret; +using lyx::support::compare_ascii_no_case; +using lyx::support::compare_no_case; +using lyx::support::contains; +using lyx::support::CreateBufferTmpDir; +using lyx::support::destroyDir; +using lyx::support::FileInfo; +using lyx::support::FileInfo; +using lyx::support::getExtFromContents; +using lyx::support::IsDirWriteable; +using lyx::support::IsFileWriteable; +using lyx::support::LibFileSearch; +using lyx::support::ltrim; +using lyx::support::MakeAbsPath; +using lyx::support::MakeDisplayPath; +using lyx::support::MakeLatexName; +using lyx::support::OnlyFilename; +using lyx::support::OnlyPath; +using lyx::support::Path; +using lyx::support::QuoteName; +using lyx::support::removeAutosaveFile; +using lyx::support::rename; +using lyx::support::RunCommand; +using lyx::support::split; +using lyx::support::strToInt; +using lyx::support::subst; +using lyx::support::tempName; +using lyx::support::trim; + +namespace os = lyx::support::os; + +using std::endl; +using std::for_each; +using std::make_pair; -using std::ostream; -using std::ofstream; using std::ifstream; -using std::fstream; +using std::list; using std::ios; -using std::setw; -using std::endl; +using std::ostream; +using std::ostringstream; +using std::ofstream; using std::pair; -using std::make_pair; -using std::vector; -using std::map; using std::stack; -using std::list; -using std::for_each; +using std::vector; +using std::string; -using lyx::pos_type; -using lyx::textclass_type; // all these externs should eventually be removed. extern BufferList bufferlist; namespace { -const int LYX_FORMAT = 224; +const int LYX_FORMAT = 225; bool openFileWrite(ofstream & ofs, string const & fname) { @@ -130,25 +146,70 @@ bool openFileWrite(ofstream & ofs, string const & fname) return true; } - } // namespace anon + +typedef std::map DepClean; + +struct Buffer::Impl +{ + Impl(Buffer & parent, string const & file, bool readonly); + + limited_stack undostack; + limited_stack redostack; + BufferParams params; + ParagraphList paragraphs; + LyXVC lyxvc; + string temppath; + bool nicefile; + TexRow texrow; + + /// need to regenerate .tex ? + DepClean dep_clean; + + /// is save needed + mutable bool lyx_clean; + + /// is autosave needed + mutable bool bak_clean; + + /// is this a unnamed file (New...) + bool unnamed; + + /// buffer is r/o + bool read_only; + + /// name of the file the buffer is associated with. + string filename; + + /// The path to the document file. + string filepath; + + boost::scoped_ptr messages; + + /** set to true only when the file is fully loaded. + * Used to prevent the premature generation of previews + * and by the citation inset. + */ + bool file_fully_loaded; +}; + + +Buffer::Impl::Impl(Buffer & parent, string const & file, bool readonly_) + : nicefile(true), + lyx_clean(true), bak_clean(true), unnamed(false), read_only(readonly_), + filename(file), filepath(OnlyPath(file)), file_fully_loaded(false) +{ + lyxvc.buffer(&parent); + if (readonly_ || lyxrc.use_tempdir) + temppath = CreateBufferTmpDir(); +} + + Buffer::Buffer(string const & file, bool ronly) - : niceFile(true), lyx_clean(true), bak_clean(true), - unnamed(false), read_only(ronly), - filename_(file) + : pimpl_(new Impl(*this, file, ronly)) { lyxerr[Debug::INFO] << "Buffer::Buffer()" << endl; - filepath_ = OnlyPath(file); - lyxvc.buffer(this); - if (read_only || lyxrc.use_tempdir) { - tmppath = CreateBufferTmpDir(); - } else { - tmppath.erase(); - } - - // set initial author - authors().record(Author(lyxrc.user_name, lyxrc.user_email)); } @@ -160,15 +221,105 @@ Buffer::~Buffer() closing(); - if (!tmppath.empty() && destroyDir(tmppath) != 0) { + if (!temppath().empty() && destroyDir(temppath()) != 0) { Alert::warning(_("Could not remove temporary directory"), - bformat(_("Could not remove the temporary directory %1$s"), tmppath)); + bformat(_("Could not remove the temporary directory %1$s"), temppath())); } - paragraphs.clear(); + paragraphs().clear(); - // Remove any previewed LaTeX snippets assocoated with this buffer. - lyx::graphics::Previews::get().removeLoader(this); + // Remove any previewed LaTeX snippets associated with this buffer. + lyx::graphics::Previews::get().removeLoader(*this); +} + + +limited_stack & Buffer::undostack() +{ + return pimpl_->undostack; +} + + +limited_stack const & Buffer::undostack() const +{ + return pimpl_->undostack; +} + + +limited_stack & Buffer::redostack() +{ + return pimpl_->redostack; +} + + +limited_stack const & Buffer::redostack() const +{ + return pimpl_->redostack; +} + + +BufferParams & Buffer::params() +{ + return pimpl_->params; +} + + +BufferParams const & Buffer::params() const +{ + return pimpl_->params; +} + + +ParagraphList & Buffer::paragraphs() +{ + return pimpl_->paragraphs; +} + + +ParagraphList const & Buffer::paragraphs() const +{ + return pimpl_->paragraphs; +} + + +LyXVC & Buffer::lyxvc() +{ + return pimpl_->lyxvc; +} + + +LyXVC const & Buffer::lyxvc() const +{ + return pimpl_->lyxvc; +} + + +string const & Buffer::temppath() const +{ + return pimpl_->temppath; +} + + +bool & Buffer::niceFile() +{ + return pimpl_->nicefile; +} + + +bool Buffer::niceFile() const +{ + return pimpl_->nicefile; +} + + +TexRow & Buffer::texrow() +{ + return pimpl_->texrow; +} + + +TexRow const & Buffer::texrow() const +{ + return pimpl_->texrow; } @@ -189,7 +340,7 @@ pair const Buffer::getLogName() const string path = OnlyPath(filename); if (lyxrc.use_tempdir || !IsDirWriteable(path)) - path = tmppath; + path = temppath(); string const fname = AddName(path, OnlyFilename(ChangeExtension(filename, @@ -216,24 +367,18 @@ pair const Buffer::getLogName() const void Buffer::setReadonly(bool flag) { - if (read_only != flag) { - read_only = flag; + if (pimpl_->read_only != flag) { + pimpl_->read_only = flag; readonly(flag); } } -AuthorList & Buffer::authors() -{ - return params.authorlist; -} - - void Buffer::setFileName(string const & newfile) { - filename_ = MakeAbsPath(newfile); - filepath_ = OnlyPath(filename_); - setReadonly(IsFileWriteable(filename_) == 0); + pimpl_->filename = MakeAbsPath(newfile); + pimpl_->filepath = OnlyPath(pimpl_->filename); + setReadonly(IsFileWriteable(pimpl_->filename) == 0); updateTitles(); } @@ -245,7 +390,7 @@ void unknownClass(string const & unknown) { Alert::warning(_("Unknown document class"), bformat(_("Using the default document class, because the " - " class %1$s is unknown."), unknown)); + "class %1$s is unknown."), unknown)); } } // anon @@ -268,7 +413,7 @@ int Buffer::readHeader(LyXLex & lex) << token << '\'' << endl; - string unknown = params.readToken(lex, token); + string unknown = params().readToken(lex, token); if (!unknown.empty()) { if (unknown[0] != '\\') { unknownClass(unknown); @@ -294,20 +439,20 @@ int Buffer::readHeader(LyXLex & lex) // changed to be public and have one parameter // if par = 0 normal behavior // else insert behavior -// Returns false if "\the_end" is not read (Asger) +// Returns false if "\end_document" is not read (Asger) bool Buffer::readBody(LyXLex & lex, ParagraphList::iterator pit) { Paragraph::depth_type depth = 0; bool the_end_read = false; - if (paragraphs.empty()) { + if (paragraphs().empty()) { readHeader(lex); - if (!params.getLyXTextClass().load()) { - string theclass = params.getLyXTextClass().name(); + if (!params().getLyXTextClass().load()) { + string theclass = params().getLyXTextClass().name(); Alert::error(_("Can't load document class"), bformat( "Using the default document class, because the " " class %1$s could not be loaded.", theclass)); - params.textclass = 0; + params().textclass = 0; } } else { // We don't want to adopt the parameters from the @@ -328,12 +473,12 @@ bool Buffer::readBody(LyXLex & lex, ParagraphList::iterator pit) lyxerr[Debug::PARSER] << "Handling token: `" << token << '\'' << endl; - if (token == "\\the_end") { + if (token == "\\end_document") { the_end_read = true; continue; } - readParagraph(lex, token, paragraphs, pit, depth); + readParagraph(lex, token, paragraphs(), pit, depth); } return the_end_read; @@ -342,19 +487,19 @@ bool Buffer::readBody(LyXLex & lex, ParagraphList::iterator pit) int Buffer::readParagraph(LyXLex & lex, string const & token, ParagraphList & pars, ParagraphList::iterator & pit, - Paragraph::depth_type & depth) + lyx::depth_type & depth) { static Change current_change; int unknown = 0; - if (token == "\\layout") { + if (token == "\\begin_layout") { lex.pushToken(token); Paragraph par; par.params().depth(depth); - if (params.tracking_changes) + if (params().tracking_changes) par.trackChanges(); - LyXFont f(LyXFont::ALL_INHERIT, params.language); + LyXFont f(LyXFont::ALL_INHERIT, params().language); par.setFont(0, f); // insert after @@ -399,7 +544,7 @@ void Buffer::insertStringAsLines(ParagraphList::iterator & par, pos_type & pos, cit != str.end(); ++cit) { if (*cit == '\n') { if (autobreakrows && (!par->empty() || par->allowEmpty())) { - breakParagraph(params, paragraphs, par, pos, + breakParagraph(params(), paragraphs(), par, pos, layout->isEnvironment()); ++par; pos = 0; @@ -439,26 +584,48 @@ void Buffer::insertStringAsLines(ParagraphList::iterator & par, pos_type & pos, } -bool Buffer::readFile(LyXLex & lex, string const & filename) +bool Buffer::readFile(string const & filename) { - bool ret = readFile(lex, filename, paragraphs.begin()); + // Check if the file is compressed. + string const format = getExtFromContents(filename); + if (format == "gzip" || format == "zip" || format == "compress") { + params().compressed = true; + } + + bool ret = readFile(filename, paragraphs().begin()); // After we have read a file, we must ensure that the buffer // language is set and used in the gui. // If you know of a better place to put this, please tell me. (Lgb) - updateDocLang(params.language); + updateDocLang(params().language); return ret; } -// FIXME: all the below Alerts should give the filename.. +bool Buffer::readFile(string const & filename, ParagraphList::iterator pit) +{ + LyXLex lex(0, 0); + lex.setFile(filename); + + return readFile(lex, filename, pit); +} + + +bool Buffer::fully_loaded() const +{ + return pimpl_->file_fully_loaded; +} + + bool Buffer::readFile(LyXLex & lex, string const & filename, ParagraphList::iterator pit) { + BOOST_ASSERT(!filename.empty()); + if (!lex.isOK()) { Alert::error(_("Document could not be read"), - _("The specified document could not be read.")); + bformat(_("%1$s could not be read."), filename)); return false; } @@ -467,14 +634,17 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, if (!lex.isOK()) { Alert::error(_("Document could not be read"), - _("The specified document could not be read.")); + bformat(_("%1$s could not be read."), filename)); return false; } // the first token _must_ be... if (token != "\\lyxformat") { + lyxerr << "Token: " << token << endl; + Alert::error(_("Document format failure"), - _("The specified document is not a LyX document.")); + bformat(_("%1$s is not a LyX document."), + filename)); return false; } @@ -486,65 +656,60 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, //lyxerr << " dot found at " << dot << endl; if (dot != string::npos) tmp_format.erase(dot, 1); - file_format = strToInt(tmp_format); + int file_format = strToInt(tmp_format); //lyxerr << "format: " << file_format << endl; - if (file_format == LYX_FORMAT) { - // current format - } else if (file_format > LYX_FORMAT) { + + if (file_format > LYX_FORMAT) { Alert::warning(_("Document format failure"), - _("This document was created with a newer version of " - "LyX. This is likely to cause problems.")); + bformat(_("%1$s was created with a newer" + " version of LyX. This is likely to" + " cause problems."), + filename)); } else if (file_format < LYX_FORMAT) { - // old formats - if (file_format < 200) { - Alert::error(_("Document format failure"), - _("This LyX document is too old to be read " - "by this version of LyX. Try LyX 0.10.")); + string const tmpfile = tempName(); + string command = LibFileSearch("lyx2lyx", "lyx2lyx"); + if (command.empty()) { + Alert::error(_("Conversion script not found"), + bformat(_("%1$s is from an earlier" + " version of LyX, but the" + " conversion script lyx2lyx" + " could not be found."), + filename)); return false; - } else if (!filename.empty()) { - string command = - LibFileSearch("lyx2lyx", "lyx2lyx"); - if (command.empty()) { - Alert::error(_("Conversion script not found"), - _("The document is from an earlier version " - "of LyX, but the conversion script lyx2lyx " - "could not be found.")); - 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::error(_("Conversion script failed"), - _("The document is from an earlier version " - "of LyX, but the lyx2lyx script failed " - "to convert it.")); - return false; - } - istringstream is(STRCONV(ret.second)); - LyXLex tmplex(0, 0); - tmplex.setStream(is); - return readFile(tmplex, string(), pit); - } else { - // This code is reached if lyx2lyx failed (for - // some reason) to change the file format of - // the file. - Assert(false); + } + command += " -t" + + tostr(LYX_FORMAT) + + " -o " + tmpfile + ' ' + + QuoteName(filename); + lyxerr[Debug::INFO] << "Running '" + << command << '\'' + << endl; + cmd_ret const ret = RunCommand(command); + if (ret.first != 0) { + Alert::error(_("Conversion script failed"), + bformat(_("%1$s is from an earlier version" + " of LyX, but the lyx2lyx script" + " failed to convert it."), + filename)); return false; + } else { + bool ret = readFile(tmpfile, pit); + // Do stuff with tmpfile name and buffer name here. + return ret; } + } + bool the_end = readBody(lex, pit); - params.setPaperStuff(); + params().setPaperStuff(); if (!the_end) { Alert::error(_("Document format failure"), - _("The document ended unexpectedly, which means " - "that it is probably corrupted.")); + bformat(_("%1$s ended unexpectedly, which means" + " that it is probably corrupted."), + filename)); } + pimpl_->file_fully_loaded = true; return true; } @@ -627,7 +792,7 @@ bool Buffer::save() const bool Buffer::writeFile(string const & fname) const { - if (read_only && (fname == fileName())) { + if (pimpl_->read_only && (fname == fileName())) { return false; } @@ -636,24 +801,45 @@ bool Buffer::writeFile(string const & fname) const return false; } - ofstream ofs(fname.c_str()); - if (!ofs) - return false; + bool retval; + + if (params().compressed) { + gz::ogzstream ofs(fname.c_str()); + + if (!ofs) + return false; + + retval = do_writeFile(ofs); + + } else { + ofstream ofs(fname.c_str()); + if (!ofs) + return false; + + retval = do_writeFile(ofs); + } + + return retval; +} + + +bool Buffer::do_writeFile(ostream & ofs) const +{ #ifdef HAVE_LOCALE // Use the standard "C" locale for file output. ofs.imbue(std::locale::classic()); #endif - // The top of the file should not be written by params. + // The top of the file should not be written by params(). // write out a comment in the top of the file - ofs << '#' << lyx_docversion + ofs << "#LyX " << lyx_version << " created this file. For more info see http://www.lyx.org/\n" << "\\lyxformat " << LYX_FORMAT << "\n"; // now write out the buffer paramters. - params.writeFile(ofs); + params().writeFile(ofs); ofs << "\\end_header\n"; @@ -661,15 +847,16 @@ bool Buffer::writeFile(string const & fname) const // this will write out all the paragraphs // using recursive descent. - ParagraphList::const_iterator pit = paragraphs.begin(); - ParagraphList::const_iterator pend = paragraphs.end(); + ParagraphList::const_iterator pit = paragraphs().begin(); + ParagraphList::const_iterator pend = paragraphs().end(); for (; pit != pend; ++pit) - pit->write(this, ofs, params, depth); + pit->write(*this, ofs, params(), depth); // Write marker that shows file is complete - ofs << "\n\\the_end" << endl; + ofs << "\n\\end_document" << endl; - ofs.close(); + // Shouldn't really be needed.... + //ofs.close(); // how to check if close went ok? // Following is an attempt... (BE 20001011) @@ -828,7 +1015,7 @@ string const Buffer::asciiParagraph(Paragraph const & par, string word; for (pos_type i = 0; i < par.size(); ++i) { - char c = par.getUChar(params, i); + char c = par.getUChar(params(), i); switch (c) { case Paragraph::META_INSET: { @@ -839,7 +1026,7 @@ string const Buffer::asciiParagraph(Paragraph const & par, currlinelen += word.length(); word.erase(); } - if (inset->ascii(this, buffer, linelen)) { + if (inset->ascii(*this, buffer, linelen)) { // to be sure it breaks paragraph currlinelen += linelen; } @@ -883,7 +1070,7 @@ string const Buffer::asciiParagraph(Paragraph const & par, } } buffer << word; - return STRCONV(buffer.str()); + return buffer.str(); } @@ -898,8 +1085,8 @@ void Buffer::writeFileAscii(string const & fname, int linelen) void Buffer::writeFileAscii(ostream & os, int linelen) { - ParagraphList::iterator beg = paragraphs.begin(); - ParagraphList::iterator end = paragraphs.end(); + ParagraphList::iterator beg = paragraphs().begin(); + ParagraphList::iterator end = paragraphs().end(); ParagraphList::iterator it = beg; for (; it != end; ++it) { os << asciiParagraph(*it, linelen, it == beg); @@ -935,26 +1122,26 @@ void Buffer::makeLaTeXFile(ostream & os, bool output_preamble, bool output_body) { LatexRunParams runparams = runparams_in; - niceFile = runparams.nice; // this will be used by Insetincludes. + niceFile() = runparams.nice; // this will be used by Insetincludes. // validate the buffer. lyxerr[Debug::LATEX] << " Validating buffer..." << endl; - LaTeXFeatures features(params); + LaTeXFeatures features(*this, params()); validate(features); lyxerr[Debug::LATEX] << " Buffer validation done." << endl; - texrow.reset(); + texrow().reset(); // The starting paragraph of the coming rows is the // first paragraph of the document. (Asger) - texrow.start(paragraphs.begin()->id(), 0); + texrow().start(paragraphs().begin()->id(), 0); if (output_preamble && runparams.nice) { - os << "%% " << lyx_docversion << " created this file. " + os << "%% LyX " << lyx_version << " created this file. " "For more info, see http://www.lyx.org/.\n" "%% Do not edit unless you really know what " "you are doing.\n"; - texrow.newline(); - texrow.newline(); + texrow().newline(); + texrow().newline(); } lyxerr[Debug::INFO] << "lyx header finished" << endl; // There are a few differences between nice LaTeX and usual files: @@ -969,7 +1156,7 @@ void Buffer::makeLaTeXFile(ostream & os, // code for usual, NOT nice-latex-file os << "\\batchmode\n"; // changed // from \nonstopmode - texrow.newline(); + texrow().newline(); } if (!original_path.empty()) { string inputpath = os::external_path(original_path); @@ -978,46 +1165,46 @@ void Buffer::makeLaTeXFile(ostream & os, << "\\def\\input@path{{" << inputpath << "/}}\n" << "\\makeatother\n"; - texrow.newline(); - texrow.newline(); - texrow.newline(); + texrow().newline(); + texrow().newline(); + texrow().newline(); } // Write the preamble - runparams.use_babel = params.writeLaTeX(os, features, texrow); + runparams.use_babel = params().writeLaTeX(os, features, texrow()); if (!output_body) return; // make the body. os << "\\begin{document}\n"; - texrow.newline(); + texrow().newline(); } // output_preamble lyxerr[Debug::INFO] << "preamble finished, now the body." << endl; if (!lyxrc.language_auto_begin) { os << subst(lyxrc.language_command_begin, "$$lang", - params.language->babel()) + params().language->babel()) << endl; - texrow.newline(); + texrow().newline(); } - latexParagraphs(this, paragraphs, os, texrow, runparams); + latexParagraphs(*this, paragraphs(), os, texrow(), runparams); // add this just in case after all the paragraphs os << endl; - texrow.newline(); + texrow().newline(); if (!lyxrc.language_auto_end) { os << subst(lyxrc.language_command_end, "$$lang", - params.language->babel()) + params().language->babel()) << endl; - texrow.newline(); + texrow().newline(); } if (output_preamble) { os << "\\end{document}\n"; - texrow.newline(); + texrow().newline(); lyxerr[Debug::LATEX] << "makeLaTeXFile...done" << endl; } else { @@ -1026,44 +1213,44 @@ void Buffer::makeLaTeXFile(ostream & os, } // Just to be sure. (Asger) - texrow.newline(); + texrow().newline(); lyxerr[Debug::INFO] << "Finished making LaTeX file." << endl; - lyxerr[Debug::INFO] << "Row count was " << texrow.rows() - 1 + lyxerr[Debug::INFO] << "Row count was " << texrow().rows() - 1 << '.' << endl; // we want this to be true outside previews (for insetexternal) - niceFile = true; + niceFile() = true; } bool Buffer::isLatex() const { - return params.getLyXTextClass().outputType() == LATEX; + return params().getLyXTextClass().outputType() == LATEX; } bool Buffer::isLinuxDoc() const { - return params.getLyXTextClass().outputType() == LINUXDOC; + return params().getLyXTextClass().outputType() == LINUXDOC; } bool Buffer::isLiterate() const { - return params.getLyXTextClass().outputType() == LITERATE; + return params().getLyXTextClass().outputType() == LITERATE; } bool Buffer::isDocBook() const { - return params.getLyXTextClass().outputType() == DOCBOOK; + return params().getLyXTextClass().outputType() == DOCBOOK; } bool Buffer::isSGML() const { - LyXTextClass const & tclass = params.getLyXTextClass(); + LyXTextClass const & tclass = params().getLyXTextClass(); return tclass.outputType() == LINUXDOC || tclass.outputType() == DOCBOOK; @@ -1076,23 +1263,23 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) if (!::openFileWrite(ofs, fname)) return; - niceFile = nice; // this will be used by included files. + niceFile() = nice; // this will be used by included files. - LaTeXFeatures features(params); + LaTeXFeatures features(*this, params()); validate(features); - texrow.reset(); + texrow().reset(); - LyXTextClass const & tclass = params.getLyXTextClass(); + LyXTextClass const & tclass = params().getLyXTextClass(); string top_element = tclass.latexname(); if (!body_only) { ofs << "filename, ".sgml") : fname; preamble += features.getIncludedFiles(name); preamble += features.getLyXSGMLEntities(); @@ -1102,17 +1289,17 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) } ofs << ">\n\n"; - if (params.options.empty()) + if (params().options.empty()) sgml::openTag(ofs, 0, false, top_element); else { string top = top_element; top += ' '; - top += params.options; + top += params().options; sgml::openTag(ofs, 0, false, top); } } - ofs << "\n"; @@ -1120,8 +1307,8 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) string item_name; vector environment_stack(5); - ParagraphList::iterator pit = paragraphs.begin(); - ParagraphList::iterator pend = paragraphs.end(); + ParagraphList::iterator pit = paragraphs().begin(); + ParagraphList::iterator pend = paragraphs().end(); for (; pit != pend; ++pit) { LyXLayout_ptr const & style = pit->layout(); // treat as a special case for compatibility with old code @@ -1247,7 +1434,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only) // How to check for successful close // we want this to be true outside previews (for insetexternal) - niceFile = true; + niceFile() = true; } @@ -1309,7 +1496,7 @@ void reset(PAR_TAG & p1, PAR_TAG const & p2) // Handle internal paragraph parsing -- layout already processed. void Buffer::simpleLinuxDocOnePar(ostream & os, ParagraphList::iterator par, - Paragraph::depth_type /*depth*/) const + lyx::depth_type /*depth*/) const { LyXLayout_ptr const & style = par->layout(); @@ -1338,7 +1525,7 @@ void Buffer::simpleLinuxDocOnePar(ostream & os, PAR_TAG tag_close = NONE; list < PAR_TAG > tag_open; - LyXFont const font = par->getFont(params, i, outerFont(par, paragraphs)); + LyXFont const font = par->getFont(params(), i, outerFont(par, paragraphs())); if (font_old.family() != font.family()) { switch (family_type) { @@ -1451,7 +1638,7 @@ void Buffer::simpleLinuxDocOnePar(ostream & os, if (c == Paragraph::META_INSET) { InsetOld * inset = par->getInset(i); - inset->linuxdoc(this, os); + inset->linuxdoc(*this, os); font_old = font; continue; } @@ -1506,22 +1693,22 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) if (!::openFileWrite(ofs, fname)) return; - niceFile = nice; // this will be used by Insetincludes. + niceFile() = nice; // this will be used by Insetincludes. - LaTeXFeatures features(params); + LaTeXFeatures features(*this, params()); validate(features); - texrow.reset(); + texrow().reset(); - LyXTextClass const & tclass = params.getLyXTextClass(); + LyXTextClass const & tclass = params().getLyXTextClass(); string top_element = tclass.latexname(); if (!only_body) { ofs << "filename, ".sgml") : fname; preamble += features.getIncludedFiles(name); preamble += features.getLyXSGMLEntities(); @@ -1534,16 +1721,16 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) string top = top_element; top += " lang=\""; - top += params.language->code(); + top += params().language->code(); top += '"'; - if (!params.options.empty()) { + if (!params().options.empty()) { top += ' '; - top += params.options; + top += params().options; } sgml::openTag(ofs, 0, false, top); - ofs << "\n"; vector environment_stack(10); @@ -1559,8 +1746,8 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) string item_name; string command_name; - ParagraphList::iterator par = paragraphs.begin(); - ParagraphList::iterator pend = paragraphs.end(); + ParagraphList::iterator par = paragraphs().begin(); + ParagraphList::iterator pend = paragraphs().end(); for (; par != pend; ++par) { string sgmlparam; @@ -1773,13 +1960,13 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body) // How to check for successful close // we want this to be true outside previews (for insetexternal) - niceFile = true; + niceFile() = true; } void Buffer::simpleDocBookOnePar(ostream & os, ParagraphList::iterator par, int & desc_on, - Paragraph::depth_type depth) const + lyx::depth_type depth) const { bool emph_flag = false; @@ -1793,7 +1980,7 @@ void Buffer::simpleDocBookOnePar(ostream & os, // parsing main loop for (pos_type i = 0; i < par->size(); ++i) { - LyXFont font = par->getFont(params, i, outerFont(par, paragraphs)); + LyXFont font = par->getFont(params(), i, outerFont(par, paragraphs())); // handle tag if (font_old.emph() != font.emph()) { @@ -1821,7 +2008,7 @@ void Buffer::simpleDocBookOnePar(ostream & os, if (i || desc_on != 3) { if (style->latexparam() == "CDATA") os << "]]>"; - inset->docbook(this, os, false); + inset->docbook(*this, os, false); if (style->latexparam() == "CDATA") os << " & list) 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 const * tmp = bufferlist.getBuffer(params.parentname); + if (!params().parentname.empty() + && bufferlist.exists(params().parentname)) { + Buffer const * tmp = bufferlist.getBuffer(params().parentname); if (tmp) { tmp->getLabelList(list); return; @@ -1968,7 +2155,7 @@ void Buffer::getLabelList(std::vector & list) const for (inset_iterator it = inset_const_iterator_begin(); it != inset_const_iterator_end(); ++it) { - it->getLabelList(list); + it->getLabelList(*this, list); } } @@ -1978,8 +2165,9 @@ void Buffer::fillWithBibKeys(std::vector > & keys) con { /// if this is a child document and the parent is already loaded /// use the parent's list instead [ale990412] - if (!params.parentname.empty() && bufferlist.exists(params.parentname)) { - Buffer const * tmp = bufferlist.getBuffer(params.parentname); + if (!params().parentname.empty() && + bufferlist.exists(params().parentname)) { + Buffer const * tmp = bufferlist.getBuffer(params().parentname); if (tmp) { tmp->fillWithBibKeys(keys); return; @@ -1988,14 +2176,19 @@ void Buffer::fillWithBibKeys(std::vector > & keys) con for (inset_iterator it = inset_const_iterator_begin(); it != inset_const_iterator_end(); ++it) { - if (it->lyxCode() == InsetOld::BIBTEX_CODE) - static_cast(*it).fillWithBibKeys(this, keys); - else if (it->lyxCode() == InsetOld::INCLUDE_CODE) - static_cast(*it).fillWithBibKeys(keys); - else if (it->lyxCode() == InsetOld::BIBITEM_CODE) { - InsetBibitem & bib = static_cast(*it); - string const key = bib.getContents(); - string const opt = bib.getOptions(); + if (it->lyxCode() == InsetOld::BIBTEX_CODE) { + InsetBibtex const & inset = + dynamic_cast(*it); + inset.fillWithBibKeys(*this, keys); + } else if (it->lyxCode() == InsetOld::INCLUDE_CODE) { + InsetInclude const & inset = + dynamic_cast(*it); + inset.fillWithBibKeys(*this, keys); + } else if (it->lyxCode() == InsetOld::BIBITEM_CODE) { + InsetBibitem const & inset = + dynamic_cast(*it); + string const key = inset.getContents(); + string const opt = inset.getOptions(); string const ref; // = pit->asString(this, false); string const info = opt + "TheBibliographyRef" + ref; keys.push_back(pair(key, info)); @@ -2006,8 +2199,8 @@ void Buffer::fillWithBibKeys(std::vector > & keys) con bool Buffer::isDepClean(string const & name) const { - DepClean::const_iterator it = dep_clean_.find(name); - if (it == dep_clean_.end()) + DepClean::const_iterator it = pimpl_->dep_clean.find(name); + if (it == pimpl_->dep_clean.end()) return true; return it->second; } @@ -2015,28 +2208,23 @@ bool Buffer::isDepClean(string const & name) const void Buffer::markDepClean(string const & name) { - dep_clean_[name] = true; + pimpl_->dep_clean[name] = true; } bool Buffer::dispatch(string const & command, bool * result) { - // Split command string into command and argument - string cmd; - string line = ltrim(command); - string const arg = trim(split(line, cmd, ' ')); - - return dispatch(lyxaction.LookupFunc(cmd), arg, result); + return dispatch(lyxaction.lookupFunc(command), result); } -bool Buffer::dispatch(int action, string const & argument, bool * result) +bool Buffer::dispatch(FuncRequest const & func, bool * result) { bool dispatched = true; - switch (action) { + switch (func.action) { case LFUN_EXPORT: { - bool const tmp = Exporter::Export(this, argument, false); + bool const tmp = Exporter::Export(this, func.argument, false); if (result) *result = tmp; break; @@ -2058,13 +2246,13 @@ void Buffer::changeLanguage(Language const * from, Language const * to) ParIterator end = par_iterator_end(); for (ParIterator it = par_iterator_begin(); it != end; ++it) - it->changeLanguage(params, from, to); + it->changeLanguage(params(), from, to); } void Buffer::updateDocLang(Language const * nlang) { - messages_.reset(new Messages(nlang->code())); + pimpl_->messages.reset(new Messages(nlang->code())); } @@ -2072,7 +2260,7 @@ bool Buffer::isMultiLingual() { ParIterator end = par_iterator_end(); for (ParIterator it = par_iterator_begin(); it != end; ++it) - if (it->isMultiLingual(params)) + if (it->isMultiLingual(params())) return true; return false; @@ -2147,37 +2335,40 @@ bool Buffer::hasParWithID(int id) const ParIterator Buffer::par_iterator_begin() { - return ParIterator(paragraphs.begin(), paragraphs); + return ParIterator(paragraphs().begin(), paragraphs()); } ParIterator Buffer::par_iterator_end() { - return ParIterator(paragraphs.end(), paragraphs); + return ParIterator(paragraphs().end(), paragraphs()); } + ParConstIterator Buffer::par_iterator_begin() const { - return ParConstIterator(const_cast(paragraphs).begin(), paragraphs); + ParagraphList const & pars = paragraphs(); + return ParConstIterator(const_cast(pars).begin(), pars); } ParConstIterator Buffer::par_iterator_end() const { - return ParConstIterator(const_cast(paragraphs).end(), paragraphs); + ParagraphList const & pars = paragraphs(); + return ParConstIterator(const_cast(pars).end(), pars); } Language const * Buffer::getLanguage() const { - return params.language; + return params().language; } string const Buffer::B_(string const & l10n) const { - if (messages_.get()) { - return messages_->get(l10n); + if (pimpl_->messages.get()) { + return pimpl_->messages->get(l10n); } return _(l10n); @@ -2186,56 +2377,56 @@ string const Buffer::B_(string const & l10n) const bool Buffer::isClean() const { - return lyx_clean; + return pimpl_->lyx_clean; } bool Buffer::isBakClean() const { - return bak_clean; + return pimpl_->bak_clean; } void Buffer::markClean() const { - if (!lyx_clean) { - lyx_clean = true; + if (!pimpl_->lyx_clean) { + pimpl_->lyx_clean = true; updateTitles(); } // if the .lyx file has been saved, we don't need an // autosave - bak_clean = true; + pimpl_->bak_clean = true; } void Buffer::markBakClean() { - bak_clean = true; + pimpl_->bak_clean = true; } void Buffer::setUnnamed(bool flag) { - unnamed = flag; + pimpl_->unnamed = flag; } bool Buffer::isUnnamed() { - return unnamed; + return pimpl_->unnamed; } void Buffer::markDirty() { - if (lyx_clean) { - lyx_clean = false; + if (pimpl_->lyx_clean) { + pimpl_->lyx_clean = false; updateTitles(); } - bak_clean = false; + pimpl_->bak_clean = false; - DepClean::iterator it = dep_clean_.begin(); - DepClean::const_iterator const end = dep_clean_.end(); + DepClean::iterator it = pimpl_->dep_clean.begin(); + DepClean::const_iterator const end = pimpl_->dep_clean.end(); for (; it != end; ++it) { it->second = false; @@ -2245,25 +2436,25 @@ void Buffer::markDirty() string const & Buffer::fileName() const { - return filename_; + return pimpl_->filename; } string const & Buffer::filePath() const { - return filepath_; + return pimpl_->filepath; } bool Buffer::isReadonly() const { - return read_only; + return pimpl_->read_only; } void Buffer::setParentName(string const & name) { - params.parentname = name; + params().parentname = name; } @@ -2281,27 +2472,27 @@ Buffer::inset_iterator::inset_iterator(base_type p, base_type e) Buffer::inset_iterator Buffer::inset_iterator_begin() { - return inset_iterator(paragraphs.begin(), paragraphs.end()); + return inset_iterator(paragraphs().begin(), paragraphs().end()); } Buffer::inset_iterator Buffer::inset_iterator_end() { - return inset_iterator(paragraphs.end(), paragraphs.end()); + return inset_iterator(paragraphs().end(), paragraphs().end()); } Buffer::inset_iterator Buffer::inset_const_iterator_begin() const { - return inset_iterator(const_cast(paragraphs).begin(), - const_cast(paragraphs).end()); + ParagraphList & pars = const_cast(paragraphs()); + return inset_iterator(pars.begin(), pars.end()); } Buffer::inset_iterator Buffer::inset_const_iterator_end() const { - return inset_iterator(const_cast(paragraphs).end(), - const_cast(paragraphs).end()); + ParagraphList & pars = const_cast(paragraphs()); + return inset_iterator(pars.end(), pars.end()); }