X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.C;h=de2a6ac83bbeec15adb00b3a1c6fb8a3ba1bbedc;hb=76355ad10707d850f56574a4090dab43bfa366e8;hp=7c624aaecf726cb9e26f2c9f8565dee222d0037e;hpb=eb3d6435d11e5334522b2e3d61215f4496a3cb32;p=lyx.git diff --git a/src/buffer.C b/src/buffer.C index 7c624aaecf..de2a6ac83b 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -65,12 +65,14 @@ #include "support/FileInfo.h" #include "support/filetools.h" -#include "support/gzstream.h" +#ifdef USE_COMPRESSION +# include "support/gzstream.h" +#endif #include "support/lyxlib.h" #include "support/os.h" #include "support/path.h" #include "support/textutils.h" -#include "support/tostr.h" +#include "support/convert.h" #include @@ -79,13 +81,13 @@ #include #include #include +#include using lyx::pos_type; -using lyx::par_type; +using lyx::pit_type; using lyx::support::AddName; -using lyx::support::atoi; using lyx::support::bformat; using lyx::support::ChangeExtension; using lyx::support::cmd_ret; @@ -93,7 +95,7 @@ using lyx::support::createBufferTmpDir; using lyx::support::destroyDir; using lyx::support::FileInfo; using lyx::support::FileInfo; -using lyx::support::getExtFromContents; +using lyx::support::getFormatFromContents; using lyx::support::IsDirWriteable; using lyx::support::IsFileWriteable; using lyx::support::LibFileSearch; @@ -137,15 +139,16 @@ extern BufferList bufferlist; namespace { -const int LYX_FORMAT = 237; +int const LYX_FORMAT = 240; } // namespace anon typedef std::map DepClean; -struct Buffer::Impl +class Buffer::Impl { +public: Impl(Buffer & parent, string const & file, bool readonly); limited_stack undostack; @@ -320,7 +323,7 @@ TexRow const & Buffer::texrow() const } -string const Buffer::getLatexName(bool no_path) const +string const Buffer::getLatexName(bool const no_path) const { string const name = ChangeExtension(MakeLatexName(fileName()), ".tex"); return no_path ? OnlyFilename(name) : name; @@ -359,7 +362,7 @@ pair const Buffer::getLogName() const } -void Buffer::setReadonly(bool flag) +void Buffer::setReadonly(bool const flag) { if (pimpl_->read_only != flag) { pimpl_->read_only = flag; @@ -417,7 +420,7 @@ int Buffer::readHeader(LyXLex & lex) string unknown = params().readToken(lex, token); if (!unknown.empty()) { - if (unknown[0] != '\\' and token == "\\textclass") { + if (unknown[0] != '\\' && token == "\\textclass") { unknownClass(unknown); } else { ++unknown_tokens; @@ -474,8 +477,8 @@ bool Buffer::readDocument(LyXLex & lex) // needed to insert the selection void Buffer::insertStringAsLines(ParagraphList & pars, - par_type & par, pos_type & pos, - LyXFont const & fn, string const & str) + pit_type & par, pos_type & pos, + LyXFont const & fn, string const & str, bool autobreakrows) { LyXLayout_ptr const & layout = pars[par].layout(); @@ -484,7 +487,6 @@ void Buffer::insertStringAsLines(ParagraphList & pars, pars[par].checkInsertChar(font); // insert the string, don't insert doublespace bool space_inserted = true; - bool autobreakrows = pars[par].autoBreakRows(); for (string::const_iterator cit = str.begin(); cit != str.end(); ++cit) { if (*cit == '\n') { @@ -532,7 +534,7 @@ void Buffer::insertStringAsLines(ParagraphList & pars, bool Buffer::readFile(string const & filename) { // Check if the file is compressed. - string const format = getExtFromContents(filename); + string const format = getFormatFromContents(filename); if (format == "gzip" || format == "zip" || format == "compress") { params().compressed = true; } @@ -550,7 +552,7 @@ bool Buffer::readFile(string const & filename) } -bool Buffer::readFile(string const & filename, par_type pit) +bool Buffer::readFile(string const & filename, pit_type const pit) { LyXLex lex(0, 0); lex.setFile(filename); @@ -564,13 +566,13 @@ bool Buffer::fully_loaded() const } -void Buffer::fully_loaded(bool value) +void Buffer::fully_loaded(bool const value) { pimpl_->file_fully_loaded = value; } -bool Buffer::readFile(LyXLex & lex, string const & filename, par_type pit) +bool Buffer::readFile(LyXLex & lex, string const & filename, pit_type const pit) { BOOST_ASSERT(!filename.empty()); @@ -621,7 +623,8 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, par_type pit) filename)); return false; } - string command = LibFileSearch("lyx2lyx", "lyx2lyx"); + string command = + "python " + LibFileSearch("lyx2lyx", "lyx2lyx"); if (command.empty()) { Alert::error(_("Conversion script not found"), bformat(_("%1$s is from an earlier" @@ -632,7 +635,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, par_type pit) return false; } command += " -t" - + tostr(LYX_FORMAT) + + convert(LYX_FORMAT) + " -o " + tmpfile + ' ' + QuoteName(filename); lyxerr[Debug::INFO] << "Running '" @@ -683,7 +686,7 @@ bool Buffer::save() const s = fileName() + '~'; if (!lyxrc.backupdir_path.empty()) s = AddName(lyxrc.backupdir_path, - subst(os::slashify_path(s),'/','!')); + subst(os::internal_path(s),'/','!')); // Rename is the wrong way of making a backup, // this is the correct way. @@ -758,12 +761,15 @@ bool Buffer::writeFile(string const & fname) const bool retval = false; if (params().compressed) { +#ifdef USE_COMPRESSION gz::ogzstream ofs(fname.c_str()); if (!ofs) return false; retval = do_writeFile(ofs); - +#else + return false; +#endif } else { ofstream ofs(fname.c_str()); if (!ofs) @@ -848,7 +854,7 @@ void Buffer::makeLaTeXFile(string const & fname, void Buffer::makeLaTeXFile(ostream & os, string const & original_path, OutputParams const & runparams_in, - bool output_preamble, bool output_body) + bool const output_preamble, bool const output_body) { OutputParams runparams = runparams_in; @@ -1002,7 +1008,7 @@ bool Buffer::isSGML() const void Buffer::makeLinuxDocFile(string const & fname, OutputParams const & runparams, - bool body_only) + bool const body_only) { ofstream ofs; if (!openFileWrite(ofs, fname)) @@ -1015,7 +1021,7 @@ void Buffer::makeLinuxDocFile(string const & fname, LyXTextClass const & tclass = params().getLyXTextClass(); - string top_element = tclass.latexname(); + string const & top_element = tclass.latexname(); if (!body_only) { ofs << tclass.class_header(); @@ -1032,12 +1038,12 @@ void Buffer::makeLinuxDocFile(string const & fname, ofs << ">\n\n"; if (params().options.empty()) - sgml::openTag(ofs, 0, false, top_element); + sgml::openTag(ofs, top_element); else { string top = top_element; top += ' '; top += params().options; - sgml::openTag(ofs, 0, false, top); + sgml::openTag(ofs, top); } } @@ -1049,7 +1055,7 @@ void Buffer::makeLinuxDocFile(string const & fname, if (!body_only) { ofs << "\n\n"; - sgml::closeTag(ofs, 0, false, top_element); + sgml::closeTag(ofs, top_element); } ofs.close(); @@ -1060,7 +1066,7 @@ void Buffer::makeLinuxDocFile(string const & fname, void Buffer::makeDocBookFile(string const & fname, OutputParams const & runparams, - bool only_body) + bool const only_body) { ofstream ofs; if (!openFileWrite(ofs, fname)) @@ -1072,7 +1078,7 @@ void Buffer::makeDocBookFile(string const & fname, texrow().reset(); LyXTextClass const & tclass = params().getLyXTextClass(); - string top_element = tclass.latexname(); + string const & top_element = tclass.latexname(); if (!only_body) { if (runparams.flavor == OutputParams::XML) @@ -1095,7 +1101,7 @@ void Buffer::makeDocBookFile(string const & fname, preamble += "\n"; preamble += "\n"; } - + string const name = runparams.nice ? ChangeExtension(pimpl_->filename, ".sgml") : fname; preamble += features.getIncludedFiles(name); @@ -1126,10 +1132,10 @@ void Buffer::makeDocBookFile(string const & fname, params().getLyXTextClass().counters().reset(); - sgml::openTag(ofs, 0, false, top); + sgml::openTag(ofs, top); ofs << '\n'; docbookParagraphs(paragraphs(), *this, ofs, runparams); - sgml::closeTag(ofs, 0, false, top_element); + sgml::closeTag(ofs, top_element); ofs.close(); if (ofs.fail()) @@ -1159,7 +1165,7 @@ int Buffer::runChktex() TeXErrors terr; Chktex chktex(lyxrc.chktex_command, name, filePath()); - int res = chktex.run(terr); // run chktex + int const res = chktex.run(terr); // run chktex if (res == -1) { Alert::error(_("chktex failure"), @@ -1179,7 +1185,8 @@ void Buffer::validate(LaTeXFeatures & features) const { LyXTextClass const & tclass = params().getLyXTextClass(); - if (params().tracking_changes) { + if (features.isAvailable("dvipost") && params().tracking_changes + && params().output_changes) { features.require("dvipost"); features.require("color"); } @@ -1222,7 +1229,7 @@ void Buffer::validate(LaTeXFeatures & features) const } -void Buffer::getLabelList(std::vector & list) const +void Buffer::getLabelList(vector & list) const { /// if this is a child document and the parent is already loaded /// Use the parent's list instead [ale990407] @@ -1242,7 +1249,7 @@ void Buffer::getLabelList(std::vector & list) const // This is also a buffer property (ale) -void Buffer::fillWithBibKeys(std::vector > & keys) +void Buffer::fillWithBibKeys(vector > & keys) const { /// if this is a child document and the parent is already loaded @@ -1255,15 +1262,15 @@ void Buffer::fillWithBibKeys(std::vector > & keys) } for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) { - if (it->lyxCode() == InsetOld::BIBTEX_CODE) { + if (it->lyxCode() == InsetBase::BIBTEX_CODE) { InsetBibtex const & inset = dynamic_cast(*it); inset.fillWithBibKeys(*this, keys); - } else if (it->lyxCode() == InsetOld::INCLUDE_CODE) { + } else if (it->lyxCode() == InsetBase::INCLUDE_CODE) { InsetInclude const & inset = dynamic_cast(*it); inset.fillWithBibKeys(*this, keys); - } else if (it->lyxCode() == InsetOld::BIBITEM_CODE) { + } else if (it->lyxCode() == InsetBase::BIBITEM_CODE) { InsetBibitem const & inset = dynamic_cast(*it); string const key = inset.getContents(); @@ -1278,7 +1285,7 @@ void Buffer::fillWithBibKeys(std::vector > & keys) bool Buffer::isDepClean(string const & name) const { - DepClean::const_iterator it = pimpl_->dep_clean.find(name); + DepClean::const_iterator const it = pimpl_->dep_clean.find(name); if (it == pimpl_->dep_clean.end()) return true; return it->second; @@ -1318,19 +1325,24 @@ bool Buffer::dispatch(FuncRequest const & func, bool * result) void Buffer::changeLanguage(Language const * from, Language const * to) { + BOOST_ASSERT(from); + BOOST_ASSERT(to); + lyxerr << "Changing Language!" << endl; // Take care of l10n/i18n updateDocLang(to); - ParIterator end = par_iterator_end(); - for (ParIterator it = par_iterator_begin(); it != end; ++it) - it->changeLanguage(params(), from, to); + for_each(par_iterator_begin(), + par_iterator_end(), + bind(&Paragraph::changeLanguage, _1, params(), from, to)); } void Buffer::updateDocLang(Language const * nlang) { + BOOST_ASSERT(nlang); + pimpl_->messages.reset(new Messages(nlang->code())); } @@ -1346,10 +1358,10 @@ bool Buffer::isMultiLingual() const } -ParIterator Buffer::getParFromID(int id) const +ParIterator Buffer::getParFromID(int const id) const { ParConstIterator it = par_iterator_begin(); - ParConstIterator end = par_iterator_end(); + ParConstIterator const end = par_iterator_end(); if (id < 0) { // John says this is called with id == -1 from undo @@ -1365,22 +1377,10 @@ ParIterator Buffer::getParFromID(int id) const } -bool Buffer::hasParWithID(int id) const +bool Buffer::hasParWithID(int const id) const { - ParConstIterator it = par_iterator_begin(); - ParConstIterator end = par_iterator_end(); - - if (id < 0) { - // John says this is called with id == -1 from undo - lyxerr << "hasParWithID(), id: " << id << endl; - return 0; - } - - for (; it != end; ++it) - if (it->id() == id) - return true; - - return false; + ParConstIterator const it = getParFromID(id); + return it != par_iterator_end(); } @@ -1466,6 +1466,9 @@ bool Buffer::isUnnamed() const } +#ifdef WITH_WARNINGS +#warning this function should be moved to buffer_pimpl.C +#endif void Buffer::markDirty() { if (pimpl_->lyx_clean) {