X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbuffer.C;h=429907f18ac17076db2828ad70f51d5e4f806cce;hb=2486c96b8d9086471299bf207b85b1ce848246aa;hp=f33c70bbf6dcb629e2bf0dc2b853095f42864342;hpb=f6c4e1a9eb99f5760439fef82af6d1c6548201e3;p=lyx.git diff --git a/src/buffer.C b/src/buffer.C index f33c70bbf6..429907f18a 100644 --- a/src/buffer.C +++ b/src/buffer.C @@ -64,6 +64,7 @@ #include "graphics/Previews.h" +#include "support/lyxalgo.h" #include "support/filetools.h" #include "support/fs_extras.h" #ifdef USE_COMPRESSION @@ -78,7 +79,11 @@ #include #include -#include +#if defined (HAVE_UTIME_H) +# include +#elif defined (HAVE_SYS_UTIME_H) +# include +#endif #include #include @@ -98,6 +103,7 @@ using lyx::support::destroyDir; using lyx::support::getFormatFromContents; using lyx::support::IsDirWriteable; using lyx::support::LibFileSearch; +using lyx::support::latex_path; using lyx::support::ltrim; using lyx::support::MakeAbsPath; using lyx::support::MakeDisplayPath; @@ -138,7 +144,7 @@ extern BufferList bufferlist; namespace { -int const LYX_FORMAT = 241; +int const LYX_FORMAT = 245; } // namespace anon @@ -208,8 +214,8 @@ Buffer::Impl::Impl(Buffer & parent, string const & file, bool readonly_) } -Buffer::Buffer(string const & file, bool ronly) - : pimpl_(new Impl(*this, file, ronly)) +Buffer::Buffer(string const & file, bool readonly) + : pimpl_(new Impl(*this, file, readonly)) { lyxerr[Debug::INFO] << "Buffer::Buffer()" << endl; } @@ -426,7 +432,7 @@ int Buffer::readHeader(LyXLex & lex) continue; } - lyxerr[Debug::PARSER] << "Handling header token: `" + lyxerr[Debug::PARSER] << "Handling document header token: `" << token << '\'' << endl; string unknown = params().readToken(lex, token); @@ -439,14 +445,14 @@ int Buffer::readHeader(LyXLex & lex) "%1$s %2$s\n"), token, lex.getString()); - error(ErrorItem(_("Header error"), s, + error(ErrorItem(_("Document header error"), s, -1, 0, 0)); } } } if (begin_header_line) { string const s = _("\\begin_header is missing"); - error(ErrorItem(_("Header error"), s, -1, 0, 0)); + error(ErrorItem(_("Document header error"), s, -1, 0, 0)); } return unknown_tokens; } @@ -461,28 +467,26 @@ bool Buffer::readDocument(LyXLex & lex) string const token = lex.getString(); if (token != "\\begin_document") { string const s = _("\\begin_document is missing"); - error(ErrorItem(_("Header error"), s, -1, 0, 0)); + error(ErrorItem(_("Document header error"), s, -1, 0, 0)); } - if (paragraphs().empty()) { - readHeader(lex); - 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; - } - } else { - // We don't want to adopt the parameters from the - // document we insert, so read them into a temporary buffer - // and then discard it + // we are reading in a brand new document + BOOST_ASSERT(paragraphs().empty()); - Buffer tmpbuf("", false); - tmpbuf.readHeader(lex); + readHeader(lex); + 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; } - return text().read(*this, lex); + bool const res = text().read(*this, lex); + for_each(text().paragraphs().begin(), + text().paragraphs().end(), + bind(&Paragraph::setInsetOwner, _1, &inset())); + return res; } @@ -493,7 +497,6 @@ void Buffer::insertStringAsLines(ParagraphList & pars, { LyXFont font = fn; - pars[pit].checkInsertChar(font); // insert the string, don't insert doublespace bool space_inserted = true; for (string::const_iterator cit = str.begin(); @@ -551,7 +554,9 @@ bool Buffer::readFile(string const & filename) // remove dummy empty par paragraphs().clear(); - bool ret = readFile(filename, paragraphs().size()); + LyXLex lex(0, 0); + lex.setFile(filename); + bool ret = readFile(lex, filename); // After we have read a file, we must ensure that the buffer // language is set and used in the gui. @@ -562,14 +567,6 @@ bool Buffer::readFile(string const & filename) } -bool Buffer::readFile(string const & filename, pit_type const pit) -{ - LyXLex lex(0, 0); - lex.setFile(filename); - return readFile(lex, filename, pit); -} - - bool Buffer::fully_loaded() const { return pimpl_->file_fully_loaded; @@ -582,7 +579,7 @@ void Buffer::fully_loaded(bool const value) } -bool Buffer::readFile(LyXLex & lex, string const & filename, pit_type const pit) +bool Buffer::readFile(LyXLex & lex, string const & filename) { BOOST_ASSERT(!filename.empty()); @@ -633,9 +630,8 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, pit_type const pit) filename)); return false; } - string command = - "python " + LibFileSearch("lyx2lyx", "lyx2lyx"); - if (command.empty()) { + string const lyx2lyx = LibFileSearch("lyx2lyx", "lyx2lyx"); + if (lyx2lyx.empty()) { Alert::error(_("Conversion script not found"), bformat(_("%1$s is from an earlier" " version of LyX, but the" @@ -644,14 +640,18 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, pit_type const pit) filename)); return false; } - command += " -t" - + convert(LYX_FORMAT) - + " -o " + tmpfile + ' ' - + QuoteName(filename); + ostringstream command; + command << "python " << QuoteName(lyx2lyx) + << " -t " << convert(LYX_FORMAT) + << " -o " << QuoteName(tmpfile) << ' ' + << QuoteName(filename); + string const command_str = command.str(); + lyxerr[Debug::INFO] << "Running '" - << command << '\'' + << command_str << '\'' << endl; - cmd_ret const ret = RunCommand(command); + + cmd_ret const ret = RunCommand(command_str); if (ret.first != 0) { Alert::error(_("Conversion script failed"), bformat(_("%1$s is from an earlier version" @@ -660,7 +660,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, pit_type const pit) filename)); return false; } else { - bool const ret = readFile(tmpfile, pit); + bool const ret = readFile(tmpfile); // Do stuff with tmpfile name and buffer name here. return ret; } @@ -677,7 +677,6 @@ bool Buffer::readFile(LyXLex & lex, string const & filename, pit_type const pit) //lyxerr << "removing " << MacroTable::localMacros().size() // << " temporary macro entries" << endl; //MacroTable::localMacros().clear(); - params().setPaperStuff(); pimpl_->file_fully_loaded = true; return true; @@ -702,7 +701,7 @@ bool Buffer::save() const // good enough. (Lgb) // But to use this we need fs::copy_file to actually do a copy, // even when the target file exists. (Lgb) - if (fs::exists(fileName())) { + if (fs::exists(fileName()) && fs::is_writable(fs::path(fileName()).branch_path())) { //try { fs::copy_file(fileName(), s, false); //} @@ -851,7 +850,7 @@ void Buffer::makeLaTeXFile(ostream & os, texrow().newline(); texrow().newline(); } - lyxerr[Debug::INFO] << "lyx header finished" << endl; + lyxerr[Debug::INFO] << "lyx document header finished" << endl; // There are a few differences between nice LaTeX and usual files: // usual is \batchmode and has a // special input@path to allow the including of figures @@ -870,10 +869,7 @@ void Buffer::makeLaTeXFile(ostream & os, texrow().newline(); } if (!original_path.empty()) { - string inputpath = os::external_path(original_path); - subst(inputpath, "~", "\\string~"); - if (inputpath.find(' ') != string::npos) - inputpath = '"' + inputpath + '"'; + string const inputpath = latex_path(original_path); os << "\\makeatletter\n" << "\\def\\input@path{{" << inputpath << "/}}\n" @@ -1523,19 +1519,58 @@ void Buffer::buildMacros() pimpl_->macros = MacroTable::globalMacros(); // Now add our own. - ParagraphList & pars = text().paragraphs(); + ParagraphList const & pars = text().paragraphs(); for (size_t i = 0, n = pars.size(); i != n; ++i) { //lyxerr << "searching main par " << i // << " for macro definitions" << std::endl; - InsetList::iterator it = pars[i].insetlist.begin(); - InsetList::iterator end = pars[i].insetlist.end(); + InsetList const & insets = pars[i].insetlist; + InsetList::const_iterator it = insets.begin(); + InsetList::const_iterator end = insets.end(); for ( ; it != end; ++it) { //lyxerr << "found inset code " << it->inset->lyxCode() << std::endl; if (it->inset->lyxCode() == InsetBase::MATHMACRO_CODE) { - MathMacroTemplate & mac - = static_cast(*it->inset); + MathMacroTemplate const & mac + = static_cast(*it->inset); insertMacro(mac.name(), mac.asMacroData()); } } } } + + +void Buffer::saveCursor(StableDocIterator cur, StableDocIterator anc) +{ + cursor_ = cur; + anchor_ = anc; +} + + +void Buffer::changeRefsIfUnique(string const & from, string const & to) +{ + // Check if the label 'from' appears more than once + vector labels; + getLabelList(labels); + + if (lyx::count(labels.begin(), labels.end(), from) > 1) + return; + + InsetBase::Code code = InsetBase::REF_CODE; + + ParIterator it = par_iterator_begin(); + ParIterator end = par_iterator_end(); + for ( ; it != end; ++it) { + bool changed_inset = false; + for (InsetList::iterator it2 = it->insetlist.begin(); + it2 != it->insetlist.end(); ++it2) { + if (it2->inset->lyxCode() == code) { + InsetCommand * inset = static_cast(it2->inset); + if (inset->getContents() == from) { + inset->setContents(to); + //inset->setButtonLabel(); + changed_inset = true; + } + } + } + } +} +