]> git.lyx.org Git - lyx.git/blobdiff - src/Buffer.cpp
Fix bug #2213 (part 1): GuiChanges lacks "Previous Change" button.
[lyx.git] / src / Buffer.cpp
index 434f56103ab63027f257b7ced4414aed19612e63..90ce575534cfa13f7ac00c5ad3c89f2c74014ea9 100644 (file)
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Stefan Schimanski
  *
  * Full author contact details are available in file CREDITS.
@@ -50,6 +50,7 @@
 #include "ParagraphParameters.h"
 #include "ParIterator.h"
 #include "PDFOptions.h"
+#include "SpellChecker.h"
 #include "sgml.h"
 #include "TexRow.h"
 #include "TexStream.h"
@@ -59,6 +60,7 @@
 #include "Undo.h"
 #include "VCBackend.h"
 #include "version.h"
+#include "WordLangTuple.h"
 #include "WordList.h"
 
 #include "insets/InsetBibitem.h"
@@ -79,6 +81,7 @@
 #include "support/lassert.h"
 #include "support/convert.h"
 #include "support/debug.h"
+#include "support/docstring_list.h"
 #include "support/ExceptionMessage.h"
 #include "support/FileName.h"
 #include "support/FileNameList.h"
 #include <fstream>
 #include <iomanip>
 #include <map>
+#include <set>
 #include <sstream>
 #include <stack>
 #include <vector>
@@ -115,13 +119,17 @@ namespace os = support::os;
 
 namespace {
 
-int const LYX_FORMAT = 340; //jamatos: add plain layout
+// Do not remove the comment below, so we get merge conflict in
+// independent branches. Instead add your own.
+int const LYX_FORMAT = 348;  // uwestoehr: add support for \*phantom
 
 typedef map<string, bool> DepClean;
 typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
 
 } // namespace anon
 
+class BufferSet : public std::set<Buffer const *> {};
+
 class Buffer::Impl
 {
 public:
@@ -140,7 +148,6 @@ public:
        LyXVC lyxvc;
        FileName temppath;
        mutable TexRow texrow;
-       Buffer const * parent_buffer;
 
        /// need to regenerate .tex?
        DepClean dep_clean;
@@ -220,6 +227,22 @@ public:
 
        /// our Text that should be wrapped in an InsetText
        InsetText * inset;
+
+       /// This is here to force the test to be done whenever parent_buffer
+       /// is accessed.
+       Buffer const * parent() const { 
+               // if parent_buffer is not loaded, then it has been unloaded,
+               // which means that parent_buffer is an invalid pointer. So we
+               // set it to null in that case.
+               if (!theBufferList().isLoaded(parent_buffer))
+                       parent_buffer = 0;
+               return parent_buffer; 
+       }
+       ///
+       void setParent(Buffer const * pb) { parent_buffer = pb; }
+private:
+       /// So we can force access via the accessors.
+       mutable Buffer const * parent_buffer;
 };
 
 
@@ -243,10 +266,11 @@ static FileName createBufferTmpDir()
 
 
 Buffer::Impl::Impl(Buffer & parent, FileName const & file, bool readonly_)
-       : parent_buffer(0), lyx_clean(true), bak_clean(true), unnamed(false),
+       : lyx_clean(true), bak_clean(true), unnamed(false),
          read_only(readonly_), filename(file), file_fully_loaded(false),
          toc_backend(&parent), macro_lock(false), timestamp_(0),
-         checksum_(0), wa_(0), undo_(parent), bibinfoCacheValid_(false)
+         checksum_(0), wa_(0), undo_(parent), bibinfoCacheValid_(false),
+         parent_buffer(0)
 {
        temppath = createBufferTmpDir();
        lyxvc.setBuffer(&parent);
@@ -275,12 +299,21 @@ Buffer::~Buffer()
        // GuiView already destroyed
        gui_ = 0;
 
+       if (d->unnamed && d->filename.extension() == "internal") {
+               // No need to do additional cleanups for internal buffer.
+               delete d;
+               return;
+       }
 
        // 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<Buffer *>(it->first));
+       for (; it != end; ++it) {
+               Buffer * child = const_cast<Buffer *>(it->first);
+               // The child buffer might have been closed already.
+               if (theBufferList().isLoaded(child))
+                       theBufferList().releaseChild(this, child);
+       }
 
        // clear references to children in macro tables
        d->children_positions.clear();
@@ -367,6 +400,12 @@ string const Buffer::temppath() const
 }
 
 
+TexRow & Buffer::texrow()
+{
+       return d->texrow;
+}
+
+
 TexRow const & Buffer::texrow() const
 {
        return d->texrow;
@@ -531,7 +570,7 @@ int Buffer::readHeader(Lexer & lex)
 
 // Uwe C. Schroeder
 // changed to be public and have one parameter
-// Returns false if "\end_document" is not read (Asger)
+// Returns true if "\end_document" is not read (Asger)
 bool Buffer::readDocument(Lexer & lex)
 {
        ErrorList & errorList = d->errorLists["Parse"];
@@ -550,19 +589,19 @@ bool Buffer::readDocument(Lexer & lex)
 
        if (params().outputChanges) {
                bool dvipost    = LaTeXFeatures::isAvailable("dvipost");
-               bool xcolorsoul = LaTeXFeatures::isAvailable("soul") &&
+               bool xcolorulem = LaTeXFeatures::isAvailable("ulem") &&
                                  LaTeXFeatures::isAvailable("xcolor");
 
-               if (!dvipost && !xcolorsoul) {
+               if (!dvipost && !xcolorulem) {
                        Alert::warning(_("Changes not shown in LaTeX output"),
                                       _("Changes will not be highlighted in LaTeX output, "
-                                        "because neither dvipost nor xcolor/soul are installed.\n"
+                                        "because neither dvipost nor xcolor/ulem are installed.\n"
                                         "Please install these packages or redefine "
                                         "\\lyxadded and \\lyxdeleted in the LaTeX preamble."));
-               } else if (!xcolorsoul) {
+               } else if (!xcolorulem) {
                        Alert::warning(_("Changes not shown in LaTeX output"),
                                       _("Changes will not be highlighted in LaTeX output "
-                                        "when using pdflatex, because xcolor and soul are not installed.\n"
+                                        "when using pdflatex, because xcolor and ulem are not installed.\n"
                                         "Please install both packages or redefine "
                                         "\\lyxadded and \\lyxdeleted in the LaTeX preamble."));
                }
@@ -572,8 +611,29 @@ bool Buffer::readDocument(Lexer & lex)
                FileName const master_file = makeAbsPath(params().master,
                           onlyPath(absFileName()));
                if (isLyXFilename(master_file.absFilename())) {
-                       Buffer * master = checkAndLoadLyXFile(master_file);
-                       d->parent_buffer = master;
+                       Buffer * master = 
+                               checkAndLoadLyXFile(master_file, true);
+                       if (master) {
+                               // necessary e.g. after a reload
+                               // to re-register the child (bug 5873)
+                               // FIXME: clean up updateMacros (here, only
+                               // child registering is needed).
+                               master->updateMacros();
+                               // set master as master buffer, but only
+                               // if we are a real child
+                               if (master->isChild(this))
+                                       setParent(master);
+                               // if the master is not fully loaded
+                               // it is probably just loading this
+                               // child. No warning needed then.
+                               else if (master->isFullyLoaded())
+                                       LYXERR0("The master '"
+                                               << params().master
+                                               << "' assigned to this document ("
+                                               << absFileName()
+                                               << ") does not include "
+                                               "this document. Ignoring the master assignment.");
+                       }
                }
        }
 
@@ -619,11 +679,8 @@ void Buffer::insertStringAsLines(ParagraphList & pars,
                                ++pos;
                                space_inserted = true;
                        } else {
-                               const pos_type n = 8 - pos % 8;
-                               for (pos_type i = 0; i < n; ++i) {
-                                       par.insertChar(pos, ' ', font, params().trackChanges);
-                                       ++pos;
-                               }
+                               par.insertChar(pos, *cit, font, params().trackChanges);
+                               ++pos;
                                space_inserted = true;
                        }
                } else if (!isPrintable(*cit)) {
@@ -672,6 +729,8 @@ bool Buffer::readFile(FileName const & filename)
 {
        FileName fname(filename);
 
+       params().compressed = fname.isZippedFile();
+
        // remove dummy empty par
        paragraphs().clear();
        Lexer lex;
@@ -744,7 +803,7 @@ Buffer::ReadStatus Buffer::readFile(Lexer & lex, FileName const & filename,
                                     bformat(_("%1$s is from a different"
                                              " version of LyX, but a temporary"
                                              " file for converting it could"
-                                                           " not be created."),
+                                             " not be created."),
                                              from_utf8(filename.absFilename())));
                        return failure;
                }
@@ -754,7 +813,7 @@ Buffer::ReadStatus Buffer::readFile(Lexer & lex, FileName const & filename,
                                     bformat(_("%1$s is from a different"
                                               " version of LyX, but the"
                                               " conversion script lyx2lyx"
-                                                           " could not be found."),
+                                              " could not be found."),
                                               from_utf8(filename.absFilename())));
                        return failure;
                }
@@ -773,7 +832,7 @@ Buffer::ReadStatus Buffer::readFile(Lexer & lex, FileName const & filename,
                        Alert::error(_("Conversion script failed"),
                                     bformat(_("%1$s is from a different version"
                                              " of LyX, but the lyx2lyx script"
-                                                           " failed to convert it."),
+                                             " failed to convert it."),
                                              from_utf8(filename.absFilename())));
                        return failure;
                } else {
@@ -874,7 +933,7 @@ bool Buffer::writeFile(FileName const & fname) const
                return false;
        }
 
-       removeAutosaveFile(d->filename.absFilename());
+       removeAutosaveFile();
 
        saveCheckSum(d->filename);
        message(str + _(" done."));
@@ -952,7 +1011,7 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
        string const encoding = runparams.encoding->iconvName();
        LYXERR(Debug::LATEX, "makeLaTeXFile encoding: " << encoding << "...");
 
-       odocfstream ofs;
+       ofdocstream ofs;
        try { ofs.reset(encoding); }
        catch (iconv_codecvt_facet_exception & e) {
                lyxerr << "Caught iconv exception: " << e.what() << endl;
@@ -1115,8 +1174,8 @@ void Buffer::writeLaTeXSource(odocstream & os,
        // This happens for example if only a child document is printed.
        Buffer const * save_parent = 0;
        if (output_preamble) {
-               save_parent = d->parent_buffer;
-               d->parent_buffer = 0;
+               save_parent = d->parent();
+               d->setParent(0);
        }
 
        // the real stuff
@@ -1124,7 +1183,7 @@ void Buffer::writeLaTeXSource(odocstream & os,
 
        // Restore the parenthood if needed
        if (output_preamble)
-               d->parent_buffer = save_parent;
+               d->setParent(save_parent);
 
        // add this just in case after all the paragraphs
        os << endl;
@@ -1171,7 +1230,7 @@ void Buffer::makeDocBookFile(FileName const & fname,
 {
        LYXERR(Debug::LATEX, "makeDocBookFile...");
 
-       odocfstream ofs;
+       ofdocstream ofs;
        if (!openFileWrite(ofs, fname))
                return;
 
@@ -1317,8 +1376,9 @@ void Buffer::validate(LaTeXFeatures & features) const
 void Buffer::getLabelList(vector<docstring> & list) const
 {
        // If this is a child document, use the parent's list instead.
-       if (d->parent_buffer) {
-               d->parent_buffer->getLabelList(list);
+       Buffer const * const pbuf = d->parent();
+       if (pbuf) {
+               pbuf->getLabelList(list);
                return;
        }
 
@@ -1333,11 +1393,12 @@ void Buffer::getLabelList(vector<docstring> & list) const
 }
 
 
-void Buffer::updateBibfilesCache() const
+void Buffer::updateBibfilesCache(UpdateScope scope) const
 {
        // If this is a child document, use the parent's cache instead.
-       if (d->parent_buffer) {
-               d->parent_buffer->updateBibfilesCache();
+       Buffer const * const pbuf = d->parent();
+       if (pbuf && scope != UpdateChildOnly) {
+               pbuf->updateBibfilesCache();
                return;
        }
 
@@ -1355,7 +1416,7 @@ void Buffer::updateBibfilesCache() const
                                static_cast<InsetInclude &>(*it);
                        inset.updateBibfilesCache();
                        support::FileNameList const & bibfiles =
-                                       inset.getBibfilesCache(*this);
+                                       inset.getBibfilesCache();
                        d->bibfilesCache_.insert(d->bibfilesCache_.end(),
                                bibfiles.begin(),
                                bibfiles.end());
@@ -1372,15 +1433,16 @@ void Buffer::invalidateBibinfoCache()
 }
 
 
-support::FileNameList const & Buffer::getBibfilesCache() const
+support::FileNameList const & Buffer::getBibfilesCache(UpdateScope scope) const
 {
        // If this is a child document, use the parent's cache instead.
-       if (d->parent_buffer)
-               return d->parent_buffer->getBibfilesCache();
+       Buffer const * const pbuf = d->parent();
+       if (pbuf && scope != UpdateChildOnly)
+               return pbuf->getBibfilesCache();
 
        // We update the cache when first used instead of at loading time.
        if (d->bibfilesCache_.empty())
-               const_cast<Buffer *>(this)->updateBibfilesCache();
+               const_cast<Buffer *>(this)->updateBibfilesCache(scope);
 
        return d->bibfilesCache_;
 }
@@ -1462,6 +1524,11 @@ bool Buffer::dispatch(FuncRequest const & func, bool * result)
                case LFUN_BRANCH_DEACTIVATE: {
                        BranchList & branchList = params().branchlist();
                        docstring const branchName = func.argument();
+                       // the case without a branch name is handled elsewhere
+                       if (branchName.empty()) {
+                               dispatched = false;
+                               break;
+                       }
                        Branch * branch = branchList.find(branchName);
                        if (!branch)
                                LYXERR0("Branch " << branchName << " does not exist.");
@@ -1502,17 +1569,18 @@ bool Buffer::isMultiLingual() const
 
 DocIterator Buffer::getParFromID(int const id) const
 {
+       Buffer * buf = const_cast<Buffer *>(this);
        if (id < 0) {
                // John says this is called with id == -1 from undo
                lyxerr << "getParFromID(), id: " << id << endl;
-               return doc_iterator_end(inset());
+               return doc_iterator_end(buf);
        }
 
-       for (DocIterator it = doc_iterator_begin(inset()); !it.atEnd(); it.forwardPar())
+       for (DocIterator it = doc_iterator_begin(buf); !it.atEnd(); it.forwardPar())
                if (it.paragraph().id() == id)
                        return it;
 
-       return doc_iterator_end(inset());
+       return doc_iterator_end(buf);
 }
 
 
@@ -1524,25 +1592,25 @@ bool Buffer::hasParWithID(int const id) const
 
 ParIterator Buffer::par_iterator_begin()
 {
-       return ParIterator(doc_iterator_begin(inset()));
+       return ParIterator(doc_iterator_begin(this));
 }
 
 
 ParIterator Buffer::par_iterator_end()
 {
-       return ParIterator(doc_iterator_end(inset()));
+       return ParIterator(doc_iterator_end(this));
 }
 
 
 ParConstIterator Buffer::par_iterator_begin() const
 {
-       return lyx::par_const_iterator_begin(inset());
+       return ParConstIterator(doc_iterator_begin(this));
 }
 
 
 ParConstIterator Buffer::par_iterator_end() const
 {
-       return lyx::par_const_iterator_end(inset());
+       return ParConstIterator(doc_iterator_end(this));
 }
 
 
@@ -1667,23 +1735,50 @@ bool Buffer::isReadonly() const
 void Buffer::setParent(Buffer const * buffer)
 {
        // Avoids recursive include.
-       d->parent_buffer = buffer == this ? 0 : buffer;
+       d->setParent(buffer == this ? 0 : buffer);
        updateMacros();
 }
 
 
-Buffer const * Buffer::parent()
+Buffer const * Buffer::parent() const
 {
-       return d->parent_buffer;
+       return d->parent();
+}
+
+
+void Buffer::collectRelatives(BufferSet & bufs) const
+{
+       bufs.insert(this);
+       if (parent())
+               parent()->collectRelatives(bufs);
+
+       // loop over children
+       Impl::BufferPositionMap::iterator it = d->children_positions.begin();
+       Impl::BufferPositionMap::iterator end = d->children_positions.end();
+       for (; it != end; ++it)
+               bufs.insert(const_cast<Buffer *>(it->first));
+}
+
+
+std::vector<Buffer const *> Buffer::allRelatives() const
+{
+       BufferSet bufs;
+       collectRelatives(bufs);
+       BufferSet::iterator it = bufs.begin();
+       std::vector<Buffer const *> ret;
+       for (; it != bufs.end(); ++it)
+               ret.push_back(*it);
+       return ret;
 }
 
 
 Buffer const * Buffer::masterBuffer() const
 {
-       if (!d->parent_buffer)
+       Buffer const * const pbuf = d->parent();
+       if (!pbuf)
                return this;
 
-       return d->parent_buffer->masterBuffer();
+       return pbuf->masterBuffer();
 }
 
 
@@ -1693,6 +1788,35 @@ bool Buffer::isChild(Buffer * child) const
 }
 
 
+DocIterator Buffer::firstChildPosition(Buffer const * child)
+{
+       Impl::BufferPositionMap::iterator it;
+       it = d->children_positions.find(child);
+       if (it == d->children_positions.end())
+               return DocIterator(this);
+       return it->second;
+}
+
+
+std::vector<Buffer *> Buffer::getChildren() const
+{
+       std::vector<Buffer *> clist;
+       // loop over children
+       Impl::BufferPositionMap::iterator it = d->children_positions.begin();
+       Impl::BufferPositionMap::iterator end = d->children_positions.end();
+       for (; it != end; ++it) {
+               Buffer * child = const_cast<Buffer *>(it->first);
+               clist.push_back(child);
+               // there might be grandchildren
+               std::vector<Buffer *> glist = child->getChildren();
+               for (vector<Buffer *>::const_iterator git = glist.begin();
+                    git != glist.end(); ++git)
+                       clist.push_back(*git);
+       }
+       return clist;
+}
+
+
 template<typename M>
 typename M::iterator greatest_below(M & m, typename M::key_type const & x)
 {
@@ -1723,11 +1847,11 @@ MacroData const * Buffer::getBufferMacro(docstring const & name,
 
        // find macro definitions for name
        Impl::NamePositionScopeMacroMap::iterator nameIt
-       = d->macros.find(name);
+               = d->macros.find(name);
        if (nameIt != d->macros.end()) {
                // find last definition in front of pos or at pos itself
                Impl::PositionScopeMacroMap::const_iterator it
-               = greatest_below(nameIt->second, pos);
+                       = greatest_below(nameIt->second, pos);
                if (it != nameIt->second.end()) {
                        while (true) {
                                // scope ends behind pos?
@@ -1750,7 +1874,7 @@ MacroData const * Buffer::getBufferMacro(docstring const & name,
 
        // find macros in included files
        Impl::PositionScopeBufferMap::const_iterator it
-       = greatest_below(d->position_to_children, pos);
+               = greatest_below(d->position_to_children, pos);
        if (it == d->position_to_children.end())
                // no children before
                return bestData;
@@ -1797,9 +1921,10 @@ MacroData const * Buffer::getMacro(docstring const & name,
                return data;
 
        // If there is a master buffer, query that
-       if (d->parent_buffer) {
+       Buffer const * const pbuf = d->parent();
+       if (pbuf) {
                d->macro_lock = true;
-               MacroData const * macro = d->parent_buffer->getMacro(
+               MacroData const * macro = pbuf->getMacro(
                        name, *this, false);
                d->macro_lock = false;
                if (macro)
@@ -1857,8 +1982,7 @@ void Buffer::updateMacros(DocIterator & it, DocIterator & scope) const
                        // is it a nested text inset?
                        if (iit->inset->asInsetText()) {
                                // Inset needs its own scope?
-                               InsetText const * itext
-                               = iit->inset->asInsetText();
+                               InsetText const * itext = iit->inset->asInsetText();
                                bool newScope = itext->isMacroScope();
 
                                // scope which ends just behind the inset
@@ -1875,20 +1999,19 @@ void Buffer::updateMacros(DocIterator & it, DocIterator & scope) const
                        // is it an external file?
                        if (iit->inset->lyxCode() == INCLUDE_CODE) {
                                // get buffer of external file
-                               InsetCommand const & inset
-                                       = static_cast<InsetCommand const &>(*iit->inset);
-                               InsetCommandParams const & ip = inset.params();
+                               InsetInclude const & inset =
+                                       static_cast<InsetInclude const &>(*iit->inset);
                                d->macro_lock = true;
-                               Buffer * child = loadIfNeeded(*this, ip);
+                               Buffer * child = inset.getChildBuffer();
                                d->macro_lock = false;
                                if (!child)
                                        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;
+                               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);
@@ -1899,8 +2022,8 @@ void Buffer::updateMacros(DocIterator & it, DocIterator & scope) const
                                continue;
 
                        // get macro data
-                       MathMacroTemplate & macroTemplate
-                       = static_cast<MathMacroTemplate &>(*iit->inset);
+                       MathMacroTemplate & macroTemplate =
+                               static_cast<MathMacroTemplate &>(*iit->inset);
                        MacroContext mc(*this, it);
                        macroTemplate.updateToContext(mc);
 
@@ -1951,8 +2074,8 @@ void Buffer::updateMacroInstances() const
 {
        LYXERR(Debug::MACROS, "updateMacroInstances for "
                << d->filename.onlyFileName());
-       DocIterator it = doc_iterator_begin(inset());
-       DocIterator end = doc_iterator_end(inset());
+       DocIterator it = doc_iterator_begin(this);
+       DocIterator end = doc_iterator_end(this);
        for (; it != end; it.forwardPos()) {
                // look for MathData cells in InsetMathNest insets
                Inset * inset = it.nextInset();
@@ -1994,8 +2117,9 @@ void Buffer::listMacroNames(MacroNameSet & macros) const
                it->first->listMacroNames(macros);
 
        // call parent
-       if (d->parent_buffer)
-               d->parent_buffer->listMacroNames(macros);
+       Buffer const * const pbuf = d->parent();
+       if (pbuf)
+               pbuf->listMacroNames(macros);
 
        d->macro_lock = false;
 }
@@ -2003,11 +2127,12 @@ void Buffer::listMacroNames(MacroNameSet & macros) const
 
 void Buffer::listParentMacros(MacroSet & macros, LaTeXFeatures & features) const
 {
-       if (!d->parent_buffer)
+       Buffer const * const pbuf = d->parent();
+       if (!pbuf)
                return;
 
        MacroNameSet names;
-       d->parent_buffer->listMacroNames(names);
+       pbuf->listMacroNames(names);
 
        // resolve macros
        MacroNameSet::iterator it = names.begin();
@@ -2015,7 +2140,7 @@ void Buffer::listParentMacros(MacroSet & macros, LaTeXFeatures & features) const
        for (; it != end; ++it) {
                // defined?
                MacroData const * data =
-               d->parent_buffer->getMacro(*it, *this, false);
+               pbuf->getMacro(*it, *this, false);
                if (data) {
                        macros.insert(data);
 
@@ -2031,7 +2156,7 @@ void Buffer::listParentMacros(MacroSet & macros, LaTeXFeatures & features) const
 
 Buffer::References & Buffer::references(docstring const & label)
 {
-       if (d->parent_buffer)
+       if (d->parent())
                return const_cast<Buffer *>(masterBuffer())->references(label);
 
        RefCache::iterator it = d->ref_cache_.find(label);
@@ -2066,7 +2191,7 @@ InsetLabel const * Buffer::insetLabel(docstring const & label) const
 
 void Buffer::clearReferenceCache() const
 {
-       if (!d->parent_buffer)
+       if (!d->parent())
                d->ref_cache_.clear();
 }
 
@@ -2117,10 +2242,11 @@ void Buffer::getSourceCode(odocstream & os, pit_type par_begin,
                os << "% " << _("Preview source code") << "\n\n";
                d->texrow.newline();
                d->texrow.newline();
-               if (isLatex())
-                       writeLaTeXSource(os, filePath(), runparams, true, true);
-               else
+               if (isDocBook())
                        writeDocBookSource(os, absFileName(), runparams, false);
+               else
+                       // latex or literate
+                       writeLaTeXSource(os, string(), runparams, true, true);
        } else {
                runparams.par_begin = par_begin;
                runparams.par_end = par_end;
@@ -2138,11 +2264,11 @@ void Buffer::getSourceCode(odocstream & os, pit_type par_begin,
                d->texrow.newline();
                d->texrow.newline();
                // output paragraphs
-               if (isLatex())
-                       latexParagraphs(*this, text(), os, d->texrow, runparams);
-               else
-                       // DocBook
+               if (isDocBook())
                        docbookParagraphs(paragraphs(), *this, os, runparams);
+               else 
+                       // latex or literate
+                       latexParagraphs(*this, text(), os, d->texrow, runparams);
        }
 }
 
@@ -2215,6 +2341,12 @@ void Buffer::resetAutosaveTimers() const
 }
 
 
+bool Buffer::hasGuiDelegate() const
+{
+       return gui_;
+}
+
+
 void Buffer::setGuiDelegate(frontend::GuiBufferDelegate * gui)
 {
        gui_ = gui;
@@ -2294,6 +2426,22 @@ int AutoSaveBuffer::generateChild()
 } // namespace anon
 
 
+FileName Buffer::getAutosaveFilename() const
+{
+       string const fpath = isUnnamed() ? lyxrc.document_path : filePath();
+       string const fname = "#" + d->filename.onlyFileName() + "#";
+       return makeAbsPath(fname, fpath);
+}
+
+
+void Buffer::removeAutosaveFile() const
+{
+       FileName const f = getAutosaveFilename();
+       if (f.exists())
+               f.removeFile();
+}
+
+
 // Perfect target for a thread...
 void Buffer::autoSave() const
 {
@@ -2305,14 +2453,7 @@ void Buffer::autoSave() const
 
        // emit message signal.
        message(_("Autosaving current document..."));
-
-       // create autosave filename
-       string fname = filePath();
-       fname += '#';
-       fname += d->filename.onlyFileName();
-       fname += '#';
-
-       AutoSaveBuffer autosave(*this, FileName(fname));
+       AutoSaveBuffer autosave(*this, getAutosaveFilename());
        autosave.start();
 
        markBakClean();
@@ -2632,4 +2773,390 @@ void Buffer::bufferErrors(TeXErrors const & terr, ErrorList & errorList) const
 }
 
 
+void Buffer::setBuffersForInsets() const
+{
+       inset().setBuffer(const_cast<Buffer &>(*this)); 
+}
+
+
+void Buffer::updateLabels(UpdateScope scope) const
+{
+       // Use the master text class also for child documents
+       Buffer const * const master = masterBuffer();
+       DocumentClass const & textclass = master->params().documentClass();
+
+       // keep the buffers to be children in this set. If the call from the
+       // master comes back we can see which of them were actually seen (i.e.
+       // via an InsetInclude). The remaining ones in the set need still be updated.
+       static std::set<Buffer const *> bufToUpdate;
+       if (scope == UpdateMaster) {
+               // If this is a child document start with the master
+               if (master != this) {
+                       bufToUpdate.insert(this);
+                       master->updateLabels();
+                       // Do this here in case the master has no gui associated with it. Then, 
+                       // the TocModel is not updated and TocModel::toc_ is invalid (bug 5699).
+                       if (!master->gui_)
+                               structureChanged();     
+
+                       // was buf referenced from the master (i.e. not in bufToUpdate anymore)?
+                       if (bufToUpdate.find(this) == bufToUpdate.end())
+                               return;
+               }
+
+               // start over the counters in the master
+               textclass.counters().reset();
+       }
+
+       // update will be done below for this buffer
+       bufToUpdate.erase(this);
+
+       // update all caches
+       clearReferenceCache();
+       updateMacros();
+
+       Buffer & cbuf = const_cast<Buffer &>(*this);
+
+       LASSERT(!text().paragraphs().empty(), /**/);
+
+       // do the real work
+       ParIterator parit = cbuf.par_iterator_begin();
+       updateLabels(parit);
+
+       if (master != this)
+               // TocBackend update will be done later.
+               return;
+
+       cbuf.tocBackend().update();
+       if (scope == UpdateMaster)
+               cbuf.structureChanged();
+}
+
+
+static depth_type getDepth(DocIterator const & it)
+{
+       depth_type depth = 0;
+       for (size_t i = 0 ; i < it.depth() ; ++i)
+               if (!it[i].inset().inMathed())
+                       depth += it[i].paragraph().getDepth() + 1;
+       // remove 1 since the outer inset does not count
+       return depth - 1;
+}
+
+static depth_type getItemDepth(ParIterator const & it)
+{
+       Paragraph const & par = *it;
+       LabelType const labeltype = par.layout().labeltype;
+
+       if (labeltype != LABEL_ENUMERATE && labeltype != LABEL_ITEMIZE)
+               return 0;
+
+       // this will hold the lowest depth encountered up to now.
+       depth_type min_depth = getDepth(it);
+       ParIterator prev_it = it;
+       while (true) {
+               if (prev_it.pit())
+                       --prev_it.top().pit();
+               else {
+                       // start of nested inset: go to outer par
+                       prev_it.pop_back();
+                       if (prev_it.empty()) {
+                               // start of document: nothing to do
+                               return 0;
+                       }
+               }
+
+               // We search for the first paragraph with same label
+               // that is not more deeply nested.
+               Paragraph & prev_par = *prev_it;
+               depth_type const prev_depth = getDepth(prev_it);
+               if (labeltype == prev_par.layout().labeltype) {
+                       if (prev_depth < min_depth)
+                               return prev_par.itemdepth + 1;
+                       if (prev_depth == min_depth)
+                               return prev_par.itemdepth;
+               }
+               min_depth = min(min_depth, prev_depth);
+               // small optimization: if we are at depth 0, we won't
+               // find anything else
+               if (prev_depth == 0)
+                       return 0;
+       }
+}
+
+
+static bool needEnumCounterReset(ParIterator const & it)
+{
+       Paragraph const & par = *it;
+       LASSERT(par.layout().labeltype == LABEL_ENUMERATE, /**/);
+       depth_type const cur_depth = par.getDepth();
+       ParIterator prev_it = it;
+       while (prev_it.pit()) {
+               --prev_it.top().pit();
+               Paragraph const & prev_par = *prev_it;
+               if (prev_par.getDepth() <= cur_depth)
+                       return  prev_par.layout().labeltype != LABEL_ENUMERATE;
+       }
+       // start of nested inset: reset
+       return true;
+}
+
+
+// set the label of a paragraph. This includes the counters.
+static void setLabel(Buffer const & buf, ParIterator & it)
+{
+       BufferParams const & bp = buf.masterBuffer()->params();
+       DocumentClass const & textclass = bp.documentClass();
+       Paragraph & par = it.paragraph();
+       Layout const & layout = par.layout();
+       Counters & counters = textclass.counters();
+
+       if (par.params().startOfAppendix()) {
+               // FIXME: only the counter corresponding to toplevel
+               // sectionning should be reset
+               counters.reset();
+               counters.appendix(true);
+       }
+       par.params().appendix(counters.appendix());
+
+       // Compute the item depth of the paragraph
+       par.itemdepth = getItemDepth(it);
+
+       if (layout.margintype == MARGIN_MANUAL) {
+               if (par.params().labelWidthString().empty())
+                       par.params().labelWidthString(par.translateIfPossible(layout.labelstring(), bp));
+       } else {
+               par.params().labelWidthString(docstring());
+       }
+
+       switch(layout.labeltype) {
+       case LABEL_COUNTER:
+               if (layout.toclevel <= bp.secnumdepth
+                   && (layout.latextype != LATEX_ENVIRONMENT
+                       || isFirstInSequence(it.pit(), it.plist()))) {
+                       counters.step(layout.counter);
+                       par.params().labelString(
+                               par.expandLabel(layout, bp));
+               } else
+                       par.params().labelString(docstring());
+               break;
+
+       case LABEL_ITEMIZE: {
+               // At some point of time we should do something more
+               // clever here, like:
+               //   par.params().labelString(
+               //    bp.user_defined_bullet(par.itemdepth).getText());
+               // for now, use a simple hardcoded label
+               docstring itemlabel;
+               switch (par.itemdepth) {
+               case 0:
+                       itemlabel = char_type(0x2022);
+                       break;
+               case 1:
+                       itemlabel = char_type(0x2013);
+                       break;
+               case 2:
+                       itemlabel = char_type(0x2217);
+                       break;
+               case 3:
+                       itemlabel = char_type(0x2219); // or 0x00b7
+                       break;
+               }
+               par.params().labelString(itemlabel);
+               break;
+       }
+
+       case LABEL_ENUMERATE: {
+               // FIXME: Yes I know this is a really, really! bad solution
+               // (Lgb)
+               docstring enumcounter = from_ascii("enum");
+
+               switch (par.itemdepth) {
+               case 2:
+                       enumcounter += 'i';
+               case 1:
+                       enumcounter += 'i';
+               case 0:
+                       enumcounter += 'i';
+                       break;
+               case 3:
+                       enumcounter += "iv";
+                       break;
+               default:
+                       // not a valid enumdepth...
+                       break;
+               }
+
+               // Maybe we have to reset the enumeration counter.
+               if (needEnumCounterReset(it))
+                       counters.reset(enumcounter);
+
+               counters.step(enumcounter);
+
+               string format;
+
+               switch (par.itemdepth) {
+               case 0:
+                       format = N_("\\arabic{enumi}.");
+                       break;
+               case 1:
+                       format = N_("(\\alph{enumii})");
+                       break;
+               case 2:
+                       format = N_("\\roman{enumiii}.");
+                       break;
+               case 3:
+                       format = N_("\\Alph{enumiv}.");
+                       break;
+               default:
+                       // not a valid enumdepth...
+                       break;
+               }
+
+               par.params().labelString(counters.counterLabel(
+                       par.translateIfPossible(from_ascii(format), bp)));
+
+               break;
+       }
+
+       case LABEL_SENSITIVE: {
+               string const & type = counters.current_float();
+               docstring full_label;
+               if (type.empty())
+                       full_label = buf.B_("Senseless!!! ");
+               else {
+                       docstring name = buf.B_(textclass.floats().getType(type).name());
+                       if (counters.hasCounter(from_utf8(type))) {
+                               counters.step(from_utf8(type));
+                               full_label = bformat(from_ascii("%1$s %2$s:"), 
+                                                    name, 
+                                                    counters.theCounter(from_utf8(type)));
+                       } else
+                               full_label = bformat(from_ascii("%1$s #:"), name);      
+               }
+               par.params().labelString(full_label);   
+               break;
+       }
+
+       case LABEL_NO_LABEL:
+               par.params().labelString(docstring());
+               break;
+
+       case LABEL_MANUAL:
+       case LABEL_TOP_ENVIRONMENT:
+       case LABEL_CENTERED_TOP_ENVIRONMENT:
+       case LABEL_STATIC:      
+       case LABEL_BIBLIO:
+               par.params().labelString(
+                       par.translateIfPossible(layout.labelstring(), bp));
+               break;
+       }
+}
+
+
+void Buffer::updateLabels(ParIterator & parit) const
+{
+       LASSERT(parit.pit() == 0, /**/);
+
+       // set the position of the text in the buffer to be able
+       // to resolve macros in it. This has nothing to do with
+       // labels, but by putting it here we avoid implementing
+       // a whole bunch of traversal routines just for this call.
+       parit.text()->setMacrocontextPosition(parit);
+
+       depth_type maxdepth = 0;
+       pit_type const lastpit = parit.lastpit();
+       for ( ; parit.pit() <= lastpit ; ++parit.pit()) {
+               // reduce depth if necessary
+               parit->params().depth(min(parit->params().depth(), maxdepth));
+               maxdepth = parit->getMaxDepthAfter();
+
+               // set the counter for this paragraph
+               setLabel(*this, parit);
+
+               // Now the insets
+               InsetList::const_iterator iit = parit->insetList().begin();
+               InsetList::const_iterator end = parit->insetList().end();
+               for (; iit != end; ++iit) {
+                       parit.pos() = iit->pos;
+                       iit->inset->updateLabels(parit);
+               }
+       }
+}
+
+
+bool Buffer::nextWord(DocIterator & from, DocIterator & to,
+       docstring & word) const
+{
+       bool inword = false;
+       bool ignoreword = false;
+       string lang_code;
+       // Go backward a bit if needed in order to return the word currently
+       // pointed by 'from'.
+       while (from && from.pos() && isLetter(from))
+               from.backwardPos();
+       // OK, we start from here.
+       to = from;
+       while (to.depth()) {
+               if (isLetter(to)) {
+                       if (!inword) {
+                               inword = true;
+                               ignoreword = false;
+                               from = to;
+                               word.clear();
+                               lang_code = to.paragraph().getFontSettings(params(),
+                                       to.pos()).language()->code();
+                       }
+                       // Insets like optional hyphens and ligature
+                       // break are part of a word.
+                       if (!to.paragraph().isInset(to.pos())) {
+                               char_type const c = to.paragraph().getChar(to.pos());
+                               word += c;
+                               if (isDigit(c))
+                                       ignoreword = true;
+                       }
+               } else { // !isLetter(cur)
+                       if (inword && !word.empty() && !ignoreword)
+                               return true;
+                       inword = false;
+               }
+               to.forwardPos();
+       }
+       from = to;
+       word.clear();
+       return false;
+}
+
+
+int Buffer::spellCheck(DocIterator & from, DocIterator & to,
+       WordLangTuple & word_lang, docstring_list & suggestions) const
+{
+       int progress = 0;
+       SpellChecker::Result res = SpellChecker::OK;
+       SpellChecker * speller = theSpellChecker();
+       suggestions.clear();
+       docstring word;
+       while (nextWord(from, to, word)) {
+               ++progress;
+               string lang_code = lyxrc.spellchecker_use_alt_lang
+                     ? lyxrc.spellchecker_alt_lang
+                     : from.paragraph().getFontSettings(params(), from.pos()).language()->code();
+               WordLangTuple wl(word, lang_code);
+               res = speller->check(wl);
+               // ... just bail out if the spellchecker reports an error.
+               if (!speller->error().empty()) {
+                       throw ExceptionMessage(WarningException,
+                               _("The spellchecker has failed."), speller->error());
+               }
+               if (res != SpellChecker::OK && res != SpellChecker::IGNORED_WORD) {
+                       word_lang = wl;
+                       break;
+               }
+               from = to;
+       }
+       while (!(word = speller->nextMiss()).empty())
+               suggestions.push_back(word);
+       return progress;
+}
+
 } // namespace lyx