X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=1a769cf0baf9369cdfc04eca2c72967e0fe225fc;hb=2f71fca7df3c7149542cadf577395ecedf82bbf5;hp=d5c5aaa51920803265a0b484e34b890356ce4487;hpb=48f9225e2703d398e71fd12618c8b9174f822bf3;p=lyx.git diff --git a/src/Buffer.cpp b/src/Buffer.cpp index d5c5aaa519..1a769cf0ba 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -25,7 +25,6 @@ #include "Converter.h" #include "Counters.h" #include "DocIterator.h" -#include "EmbeddedFiles.h" #include "Encoding.h" #include "ErrorList.h" #include "Exporter.h" @@ -51,7 +50,6 @@ #include "ParagraphParameters.h" #include "ParIterator.h" #include "PDFOptions.h" -#include "Session.h" #include "sgml.h" #include "TexRow.h" #include "TexStream.h" @@ -78,6 +76,7 @@ #include "graphics/Previews.h" +#include "support/lassert.h" #include "support/convert.h" #include "support/debug.h" #include "support/ExceptionMessage.h" @@ -94,7 +93,6 @@ #include "support/Path.h" #include "support/textutils.h" #include "support/types.h" -#include "support/FileZipListDir.h" #include #include @@ -117,7 +115,7 @@ namespace os = support::os; namespace { -int const LYX_FORMAT = 318; +int const LYX_FORMAT = 340; //jamatos: add plain layout typedef map DepClean; typedef map > RefCache; @@ -135,8 +133,9 @@ public: wa_->closeAll(); delete wa_; } + delete inset; } - + BufferParams params; LyXVC lyxvc; FileName temppath; @@ -178,7 +177,7 @@ public: /// which maps the macro definition position to the scope and the MacroData. NamePositionScopeMacroMap macros; bool macro_lock; - + /// positions of child buffers in the buffer typedef map BufferPositionMap; typedef pair ScopeBuffer; @@ -191,9 +190,6 @@ public: /// Container for all sort of Buffer dependant errors. map errorLists; - /// all embedded files of this buffer - EmbeddedFileList embedded_files; - /// timestamp and checksum used to test if the file has been externally /// modified. (Used to properly enable 'File->Revert to saved', bug 4114). time_t timestamp_; @@ -207,14 +203,26 @@ public: /// A cache for the bibfiles (including bibfiles of loaded child /// documents), needed for appropriate update of natbib labels. - mutable EmbeddedFileList bibfilesCache_; + mutable support::FileNameList bibfilesCache_; + + // FIXME The caching mechanism could be improved. At present, we have a + // cache for each Buffer, that caches all the bibliography info for that + // Buffer. A more efficient solution would be to have a global cache per + // file, and then to construct the Buffer's bibinfo from that. + /// A cache for bibliography info + mutable BiblioInfo bibinfo_; + /// whether the bibinfo cache is valid + bool bibinfoCacheValid_; + /// Cache of timestamps of .bib files + map bibfileStatus_; mutable RefCache ref_cache_; /// our Text that should be wrapped in an InsetText - InsetText inset; + InsetText * inset; }; + /// Creates the per buffer temporary directory static FileName createBufferTmpDir() { @@ -237,9 +245,8 @@ static FileName createBufferTmpDir() Buffer::Impl::Impl(Buffer & parent, FileName const & file, bool readonly_) : parent_buffer(0), lyx_clean(true), bak_clean(true), unnamed(false), read_only(readonly_), filename(file), file_fully_loaded(false), - toc_backend(&parent), macro_lock(false), - embedded_files(), timestamp_(0), checksum_(0), wa_(0), - undo_(parent) + toc_backend(&parent), macro_lock(false), timestamp_(0), + checksum_(0), wa_(0), undo_(parent), bibinfoCacheValid_(false) { temppath = createBufferTmpDir(); lyxvc.setBuffer(&parent); @@ -253,10 +260,9 @@ Buffer::Buffer(string const & file, bool readonly) { LYXERR(Debug::INFO, "Buffer::Buffer()"); - d->inset.setBuffer(*this); - d->inset.initParagraphs(*this); - d->inset.setAutoBreakRows(true); - d->inset.getText(0)->setMacrocontextPosition(par_iterator_begin()); + d->inset = new InsetText(*this); + d->inset->setAutoBreakRows(true); + d->inset->getText(0)->setMacrocontextPosition(par_iterator_begin()); } @@ -269,6 +275,13 @@ Buffer::~Buffer() // GuiView already destroyed gui_ = 0; + + // loop over children + Impl::BufferPositionMap::iterator it = d->children_positions.begin(); + Impl::BufferPositionMap::iterator end = d->children_positions.end(); + for (; it != end; ++it) + theBufferList().releaseChild(this, const_cast(it->first)); + // clear references to children in macro tables d->children_positions.clear(); d->position_to_children.clear(); @@ -280,7 +293,7 @@ Buffer::~Buffer() } // Remove any previewed LaTeX snippets associated with this buffer. - graphics::Previews::get().removeLoader(*this); + thePreviews().removeLoader(*this); delete d; } @@ -295,20 +308,20 @@ void Buffer::changed() const frontend::WorkAreaManager & Buffer::workAreaManager() const { - BOOST_ASSERT(d->wa_); + LASSERT(d->wa_, /**/); return *d->wa_; } Text & Buffer::text() const { - return const_cast(d->inset.text_); + return d->inset->text(); } Inset & Buffer::inset() const { - return const_cast(d->inset); + return *d->inset; } @@ -366,24 +379,6 @@ TocBackend & Buffer::tocBackend() const } -EmbeddedFileList & Buffer::embeddedFiles() -{ - return d->embedded_files; -} - - -EmbeddedFileList const & Buffer::embeddedFiles() const -{ - return d->embedded_files; -} - - -bool Buffer::embedded() const -{ - return params().embedded; -} - - Undo & Buffer::undo() { return d->undo_; @@ -461,6 +456,7 @@ int Buffer::readHeader(Lexer & lex) params().branchlist().clear(); params().preamble.erase(); params().options.erase(); + params().master.erase(); params().float_placement.erase(); params().paperwidth.erase(); params().paperheight.erase(); @@ -472,10 +468,12 @@ int Buffer::readHeader(Lexer & lex) params().headsep.erase(); params().footskip.erase(); params().columnsep.erase(); + params().fontsCJK.erase(); params().listings_params.clear(); params().clearLayoutModules(); + params().clearRemovedModules(); params().pdfoptions().clear(); - + for (int i = 0; i < 4; ++i) { params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i]; params().temp_bullet(i) = ITEMIZE_DEFAULTS[i]; @@ -484,8 +482,8 @@ int Buffer::readHeader(Lexer & lex) ErrorList & errorList = d->errorLists["Parse"]; while (lex.isOK()) { - lex.next(); - string const token = lex.getString(); + string token; + lex >> token; if (token.empty()) continue; @@ -502,8 +500,7 @@ int Buffer::readHeader(Lexer & lex) LYXERR(Debug::PARSER, "Handling document header token: `" << token << '\''); - string unknown = params().readToken(lex, token, d->filename.onlyPath(), - d->temppath); + string unknown = params().readToken(lex, token, d->filename.onlyPath()); if (!unknown.empty()) { if (unknown[0] != '\\' && token == "\\textclass") { Alert::warning(_("Unknown document class"), @@ -525,7 +522,7 @@ int Buffer::readHeader(Lexer & lex) errorList.push_back(ErrorItem(_("Document header error"), s, -1, 0, 0)); } - + params().makeDocumentClass(); return unknown_tokens; @@ -540,16 +537,14 @@ bool Buffer::readDocument(Lexer & lex) ErrorList & errorList = d->errorLists["Parse"]; errorList.clear(); - lex.next(); - string const token = lex.getString(); - if (token != "\\begin_document") { + if (!lex.checkFor("\\begin_document")) { docstring const s = _("\\begin_document is missing"); errorList.push_back(ErrorItem(_("Document header error"), s, -1, 0, 0)); } // we are reading in a brand new document - BOOST_ASSERT(paragraphs().empty()); + LASSERT(paragraphs().empty(), /**/); readHeader(lex); @@ -573,25 +568,18 @@ bool Buffer::readDocument(Lexer & lex) } } - // read main text - bool const res = text().read(*this, lex, errorList, &(d->inset)); - - // Enable embeded files, which will set temp path and move - // inconsistent inzip files if needed. - try { - embeddedFiles().validate(*this); - embeddedFiles().enable(params().embedded, *this, false); - } catch (ExceptionMessage const & message) { - Alert::error(message.title_, message.details_); - Alert::warning(_("Failed to read embedded files"), - _("Due to most likely a bug, LyX failed to locate all embedded " - "file. If you unzip the LyX file, you should be able to see and " - "open content.lyx which is your main text. You may also be able " - "to recover some embedded files. Please report this bug to the " - "lyx-devel mailing list.")); - return false; + if (!params().master.empty()) { + FileName const master_file = makeAbsPath(params().master, + onlyPath(absFileName())); + if (isLyXFilename(master_file.absFilename())) { + Buffer * master = checkAndLoadLyXFile(master_file); + d->parent_buffer = master; + } } + // read main text + bool const res = text().read(*this, lex, errorList, d->inset); + updateMacros(); updateMacroInstances(); return res; @@ -658,10 +646,10 @@ bool Buffer::readString(string const & s) // remove dummy empty par paragraphs().clear(); - Lexer lex(0, 0); + Lexer lex; istringstream is(s); lex.setStream(is); - FileName const name = FileName::tempName(); + FileName const name = FileName::tempName("Buffer_readString"); switch (readFile(lex, name, true)) { case failure: return false; @@ -683,30 +671,10 @@ bool Buffer::readString(string const & s) bool Buffer::readFile(FileName const & filename) { FileName fname(filename); - // Check if the file is compressed. - string format = filename.guessFormatFromContents(); - if (format == "zip") { - // decompress to a temp directory - LYXERR(Debug::FILES, filename << " is in zip format. Unzip to " << temppath()); - ::unzipToDir(filename.toFilesystemEncoding(), temppath()); - // - FileName lyxfile(addName(temppath(), "content.lyx")); - // if both manifest.txt and file.lyx exist, this is am embedded file - if (lyxfile.exists()) { - // if in bundled format, save checksum of the compressed file, not content.lyx - saveCheckSum(filename); - params().embedded = true; - fname = lyxfile; - } - } - // The embedded lyx file can also be compressed, for backward compatibility - format = fname.guessFormatFromContents(); - if (format == "gzip" || format == "zip" || format == "compress") - params().compressed = true; // remove dummy empty par paragraphs().clear(); - Lexer lex(0, 0); + Lexer lex; lex.setFile(fname); if (readFile(lex, fname) != success) return false; @@ -730,38 +698,21 @@ void Buffer::setFullyLoaded(bool value) Buffer::ReadStatus Buffer::readFile(Lexer & lex, FileName const & filename, bool fromstring) { - BOOST_ASSERT(!filename.empty()); - - if (!lex.isOK()) { - Alert::error(_("Document could not be read"), - bformat(_("%1$s could not be read."), from_utf8(filename.absFilename()))); - return failure; - } - - lex.next(); - string const token = lex.getString(); - - if (!lex) { - Alert::error(_("Document could not be read"), - bformat(_("%1$s could not be read."), from_utf8(filename.absFilename()))); - return failure; - } - - // the first token _must_ be... - if (token != "\\lyxformat") { - lyxerr << "Token: " << token << endl; + LASSERT(!filename.empty(), /**/); + // the first (non-comment) token _must_ be... + if (!lex.checkFor("\\lyxformat")) { Alert::error(_("Document format failure"), - bformat(_("%1$s is not a LyX document."), + bformat(_("%1$s is not a readable LyX document."), from_utf8(filename.absFilename()))); return failure; } - lex.next(); - string tmp_format = lex.getString(); + string tmp_format; + lex >> tmp_format; //lyxerr << "LyX Format: `" << tmp_format << '\'' << endl; // if present remove ".," from string. - string::size_type dot = tmp_format.find_first_of(".,"); + size_t dot = tmp_format.find_first_of(".,"); //lyxerr << " dot found at " << dot << endl; if (dot != string::npos) tmp_format.erase(dot, 1); @@ -787,7 +738,7 @@ Buffer::ReadStatus Buffer::readFile(Lexer & lex, FileName const & filename, // lyx2lyx would fail return wrongversion; - FileName const tmpfile = FileName::tempName(); + FileName const tmpfile = FileName::tempName("Buffer_readFile"); if (tmpfile.empty()) { Alert::error(_("Conversion failed"), bformat(_("%1$s is from a different" @@ -906,41 +857,25 @@ bool Buffer::writeFile(FileName const & fname) const bool retval = false; - FileName content; - if (params().embedded) - // first write the .lyx file to the temporary directory - content = FileName(addName(temppath(), "content.lyx")); - else - content = fname; - docstring const str = bformat(_("Saving document %1$s..."), - makeDisplayPath(content.absFilename())); + makeDisplayPath(fname.absFilename())); message(str); if (params().compressed) { - gz::ogzstream ofs(content.toFilesystemEncoding().c_str(), ios::out|ios::trunc); + gz::ogzstream ofs(fname.toFilesystemEncoding().c_str(), ios::out|ios::trunc); retval = ofs && write(ofs); } else { - ofstream ofs(content.toFilesystemEncoding().c_str(), ios::out|ios::trunc); + ofstream ofs(fname.toFilesystemEncoding().c_str(), ios::out|ios::trunc); retval = ofs && write(ofs); } if (!retval) { - message(str + _(" could not write file!.")); + message(str + _(" could not write file!")); return false; } removeAutosaveFile(d->filename.absFilename()); - if (params().embedded) { - message(str + _(" writing embedded files!.")); - // if embedding is enabled, write file.lyx and all the embedded files - // to the zip file fname. - if (!d->embedded_files.writeFile(fname, *this)) { - message(str + _(" could not write embedded files!.")); - return false; - } - } saveCheckSum(d->filename); message(str + _(" done.")); @@ -1050,7 +985,7 @@ bool Buffer::makeLaTeXFile(FileName const & fname, "representable in the chosen encoding.\n" "Changing the document encoding to utf8 could help."), e.par_id, e.pos, e.pos + 1)); - failed_export = true; + failed_export = true; } catch (iconv_codecvt_facet_exception & e) { errorList.push_back(ErrorItem(_("iconv conversion failed"), @@ -1064,7 +999,7 @@ bool Buffer::makeLaTeXFile(FileName const & fname, } catch (...) { lyxerr << "Caught some really weird exception..." << endl; - LyX::cref().exit(1); + lyx_exit(1); } ofs.close(); @@ -1104,6 +1039,16 @@ void Buffer::writeLaTeXSource(odocstream & os, d->texrow.newline(); } LYXERR(Debug::INFO, "lyx document header finished"); + + // Don't move this behind the parent_buffer=0 code below, + // because then the macros will not get the right "redefinition" + // flag as they don't see the parent macros which are output before. + updateMacros(); + + // fold macros if possible, still with parent buffer as the + // macros will be put in the prefix anyway. + updateMacroInstances(); + // 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 @@ -1134,38 +1079,39 @@ void Buffer::writeLaTeXSource(odocstream & os, d->texrow.newline(); } + // get parent macros (if this buffer has a parent) which will be + // written at the document begin further down. + MacroSet parentMacros; + listParentMacros(parentMacros, features); + // Write the preamble runparams.use_babel = params().writeLaTeX(os, features, d->texrow); + runparams.use_japanese = features.isRequired("japanese"); + if (!output_body) return; // make the body. os << "\\begin{document}\n"; d->texrow.newline(); + + // output the parent macros + MacroSet::iterator it = parentMacros.begin(); + MacroSet::iterator end = parentMacros.end(); + for (; it != end; ++it) + (*it)->write(os, true); } // output_preamble d->texrow.start(paragraphs().begin()->id(), 0); - - LYXERR(Debug::INFO, "preamble finished, now the body."); - - // Don't move this behind the parent_buffer=0 code below, - // because then the macros will not get the right "redefinition" - // flag as they don't see the parent macros which are output before. - updateMacros(); - // fold macros if possible, still with parent buffer as the - // macros will be put in the prefix anyway. - updateMacroInstances(); + LYXERR(Debug::INFO, "preamble finished, now the body."); // if we are doing a real file with body, even if this is the // child of some other buffer, let's cut the link here. // This happens for example if only a child document is printed. Buffer const * save_parent = 0; if (output_preamble) { - // output the macros visible for this buffer - writeParentMacros(os); - save_parent = d->parent_buffer; d->parent_buffer = 0; } @@ -1174,15 +1120,9 @@ void Buffer::writeLaTeXSource(odocstream & os, latexParagraphs(*this, text(), os, d->texrow, runparams); // Restore the parenthood if needed - if (output_preamble) { + if (output_preamble) d->parent_buffer = save_parent; - // restore macros with correct parent buffer (especially - // important for the redefinition flag which depends on the - // parent) - updateMacros(); - } - // add this just in case after all the paragraphs os << endl; d->texrow.newline(); @@ -1403,7 +1343,7 @@ void Buffer::updateBibfilesCache() const if (it->lyxCode() == BIBTEX_CODE) { InsetBibtex const & inset = static_cast(*it); - EmbeddedFileList const bibfiles = inset.embeddedFiles(); + support::FileNameList const bibfiles = inset.getBibFiles(); d->bibfilesCache_.insert(d->bibfilesCache_.end(), bibfiles.begin(), bibfiles.end()); @@ -1411,17 +1351,25 @@ void Buffer::updateBibfilesCache() const InsetInclude & inset = static_cast(*it); inset.updateBibfilesCache(); - EmbeddedFileList const & bibfiles = + support::FileNameList const & bibfiles = inset.getBibfilesCache(*this); d->bibfilesCache_.insert(d->bibfilesCache_.end(), bibfiles.begin(), bibfiles.end()); } } + // the bibinfo cache is now invalid + d->bibinfoCacheValid_ = false; +} + + +void Buffer::invalidateBibinfoCache() +{ + d->bibinfoCacheValid_ = false; } -EmbeddedFileList const & Buffer::getBibfilesCache() const +support::FileNameList const & Buffer::getBibfilesCache() const { // If this is a child document, use the parent's cache instead. if (d->parent_buffer) @@ -1435,6 +1383,45 @@ EmbeddedFileList const & Buffer::getBibfilesCache() const } +BiblioInfo const & Buffer::masterBibInfo() const +{ + // if this is a child document and the parent is already loaded + // use the parent's list instead [ale990412] + Buffer const * const tmp = masterBuffer(); + LASSERT(tmp, /**/); + if (tmp != this) + return tmp->masterBibInfo(); + return localBibInfo(); +} + + +BiblioInfo const & Buffer::localBibInfo() const +{ + if (d->bibinfoCacheValid_) { + support::FileNameList const & bibfilesCache = getBibfilesCache(); + // compare the cached timestamps with the actual ones. + support::FileNameList::const_iterator ei = bibfilesCache.begin(); + support::FileNameList::const_iterator en = bibfilesCache.end(); + for (; ei != en; ++ ei) { + time_t lastw = ei->lastModified(); + if (lastw != d->bibfileStatus_[*ei]) { + d->bibinfoCacheValid_ = false; + d->bibfileStatus_[*ei] = lastw; + break; + } + } + } + + if (!d->bibinfoCacheValid_) { + d->bibinfo_.clear(); + for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) + it->fillWithBibKeys(d->bibinfo_, it); + d->bibinfoCacheValid_ = true; + } + return d->bibinfo_; +} + + bool Buffer::isDepClean(string const & name) const { DepClean::const_iterator const it = d->dep_clean.find(name); @@ -1468,6 +1455,19 @@ bool Buffer::dispatch(FuncRequest const & func, bool * result) break; } + case LFUN_BRANCH_ACTIVATE: + case LFUN_BRANCH_DEACTIVATE: { + BranchList & branchList = params().branchlist(); + docstring const branchName = func.argument(); + Branch * branch = branchList.find(branchName); + if (!branch) + LYXERR0("Branch " << branchName << " does not exist."); + else + branch->setSelected(func.action == LFUN_BRANCH_ACTIVATE); + if (result) + *result = true; + } + default: dispatched = false; } @@ -1477,8 +1477,8 @@ bool Buffer::dispatch(FuncRequest const & func, bool * result) void Buffer::changeLanguage(Language const * from, Language const * to) { - BOOST_ASSERT(from); - BOOST_ASSERT(to); + LASSERT(from, /**/); + LASSERT(to, /**/); for_each(par_iterator_begin(), par_iterator_end(), @@ -1569,9 +1569,9 @@ bool Buffer::isBakClean() const bool Buffer::isExternallyModified(CheckMethod method) const { - BOOST_ASSERT(d->filename.exists()); + LASSERT(d->filename.exists(), /**/); // if method == timestamp, check timestamp before checksum - return (method == checksum_method + return (method == checksum_method || d->timestamp_ != d->filename.lastModified()) && d->checksum_ != d->filename.checksum(); } @@ -1679,11 +1679,17 @@ Buffer const * Buffer::masterBuffer() const { if (!d->parent_buffer) return this; - + return d->parent_buffer->masterBuffer(); } +bool Buffer::isChild(Buffer * child) const +{ + return d->children_positions.find(child) != d->children_positions.end(); +} + + template typename M::iterator greatest_below(M & m, typename M::key_type const & x) { @@ -1695,11 +1701,11 @@ typename M::iterator greatest_below(M & m, typename M::key_type const & x) return m.end(); it--; - return it; + return it; } -MacroData const * Buffer::getBufferMacro(docstring const & name, +MacroData const * Buffer::getBufferMacro(docstring const & name, DocIterator const & pos) const { LYXERR(Debug::MACROS, "Searching for " << to_ascii(name) << " at " << pos); @@ -1711,7 +1717,7 @@ MacroData const * Buffer::getBufferMacro(docstring const & name, // we haven't found anything yet DocIterator bestPos = par_iterator_begin(); MacroData const * bestData = 0; - + // find macro definitions for name Impl::NamePositionScopeMacroMap::iterator nameIt = d->macros.find(name); @@ -1730,7 +1736,7 @@ MacroData const * Buffer::getBufferMacro(docstring const & name, bestData = &it->second.second; break; } - + // try previous macro if there is one if (it == nameIt->second.begin()) break; @@ -1770,7 +1776,7 @@ MacroData const * Buffer::getBufferMacro(docstring const & name, break; --it; } - + // return the best macro we have found return bestData; } @@ -1780,7 +1786,7 @@ MacroData const * Buffer::getMacro(docstring const & name, DocIterator const & pos, bool global) const { if (d->macro_lock) - return 0; + return 0; // query buffer macros MacroData const * data = getBufferMacro(name, pos); @@ -1844,15 +1850,15 @@ void Buffer::updateMacros(DocIterator & it, DocIterator & scope) const InsetList::const_iterator end = insets.end(); for (; iit != end; ++iit) { it.pos() = iit->pos; - + // is it a nested text inset? if (iit->inset->asInsetText()) { // Inset needs its own scope? - InsetText const * itext + InsetText const * itext = iit->inset->asInsetText(); bool newScope = itext->isMacroScope(); - // scope which ends just behind the inset + // scope which ends just behind the inset DocIterator insetScope = it; ++insetScope.pos(); @@ -1862,25 +1868,25 @@ void Buffer::updateMacros(DocIterator & it, DocIterator & scope) const it.pop_back(); continue; } - + // is it an external file? if (iit->inset->lyxCode() == INCLUDE_CODE) { // get buffer of external file - InsetCommand const & inset + InsetCommand const & inset = static_cast(*iit->inset); InsetCommandParams const & ip = inset.params(); d->macro_lock = true; Buffer * child = loadIfNeeded(*this, ip); d->macro_lock = false; if (!child) - continue; + continue; // register its position, but only when it is // included first in the buffer if (d->children_positions.find(child) == d->children_positions.end()) d->children_positions[child] = it; - + // register child with its scope d->position_to_children[it] = Impl::ScopeBuffer(scope, child); continue; @@ -1888,7 +1894,7 @@ void Buffer::updateMacros(DocIterator & it, DocIterator & scope) const if (iit->inset->lyxCode() != MATHMACRO_CODE) continue; - + // get macro data MathMacroTemplate & macroTemplate = static_cast(*iit->inset); @@ -1971,7 +1977,7 @@ void Buffer::listMacroNames(MacroNameSet & macros) const return; d->macro_lock = true; - + // loop over macro names Impl::NamePositionScopeMacroMap::iterator nameIt = d->macros.begin(); Impl::NamePositionScopeMacroMap::iterator nameEnd = d->macros.end(); @@ -1988,28 +1994,34 @@ void Buffer::listMacroNames(MacroNameSet & macros) const if (d->parent_buffer) d->parent_buffer->listMacroNames(macros); - d->macro_lock = false; + d->macro_lock = false; } -void Buffer::writeParentMacros(odocstream & os) const +void Buffer::listParentMacros(MacroSet & macros, LaTeXFeatures & features) const { if (!d->parent_buffer) return; - // collect macro names MacroNameSet names; d->parent_buffer->listMacroNames(names); - // resolve and output them + // resolve macros MacroNameSet::iterator it = names.begin(); MacroNameSet::iterator end = names.end(); for (; it != end; ++it) { // defined? - MacroData const * data = + MacroData const * data = d->parent_buffer->getMacro(*it, *this, false); - if (data) - data->write(os, true); + if (data) { + macros.insert(data); + + // we cannot access the original MathMacroTemplate anymore + // here to calls validate method. So we do its work here manually. + // FIXME: somehow make the template accessible here. + if (data->optionals() > 0) + features.require("xargs"); + } } } @@ -2060,12 +2072,11 @@ void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to, InsetCode code) { //FIXME: This does not work for child documents yet. - BOOST_ASSERT(code == CITE_CODE); + LASSERT(code == CITE_CODE, /**/); // Check if the label 'from' appears more than once vector labels; string paramName; - BiblioInfo keys; - keys.fillWithBibKeys(this); + BiblioInfo const & keys = masterBibInfo(); BiblioInfo::const_iterator bit = keys.begin(); BiblioInfo::const_iterator bend = keys.end(); @@ -2215,7 +2226,7 @@ public: /// int start() { - command_ = to_utf8(bformat(_("Auto-saving %1$s"), + command_ = to_utf8(bformat(_("Auto-saving %1$s"), from_utf8(fname_.absFilename()))); return run(DontWait); } @@ -2304,6 +2315,8 @@ string Buffer::bufferFormat() const return "docbook"; if (isLiterate()) return "literate"; + if (params().encoding().package() == Encoding::japanese) + return "platex"; return "latex"; } @@ -2379,11 +2392,12 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir, string const error_type = (format == "program") ? "Build" : bufferFormat(); + ErrorList & error_list = d->errorLists[error_type]; string const ext = formats.extension(format); FileName const tmp_result_file(changeExtension(filename, ext)); bool const success = theConverters().convert(this, FileName(filename), tmp_result_file, FileName(absFileName()), backend_format, format, - errorList(error_type)); + error_list); // Emit the signal to show the error list. if (format != backend_format) errors(error_type); @@ -2606,4 +2620,5 @@ void Buffer::bufferErrors(TeXErrors const & terr, ErrorList & errorList) const } } + } // namespace lyx