]> git.lyx.org Git - lyx.git/blobdiff - src/Buffer.cpp
Correct the mess introduced in r33250.
[lyx.git] / src / Buffer.cpp
index 2e60e5c43c5c9fc980c2be7182694a0b05952bf2..1b52e248d9d5cf2d01a48b5b5add6109d5d6c89d 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.
 #include "Chktex.h"
 #include "Converter.h"
 #include "Counters.h"
+#include "DispatchResult.h"
 #include "DocIterator.h"
 #include "Encoding.h"
 #include "ErrorList.h"
 #include "Exporter.h"
 #include "Format.h"
 #include "FuncRequest.h"
+#include "FuncStatus.h"
+#include "IndicesList.h"
 #include "InsetIterator.h"
 #include "InsetList.h"
 #include "Language.h"
 #include "Lexer.h"
 #include "LyXAction.h"
 #include "LyX.h"
+#include "LyXFunc.h"
 #include "LyXRC.h"
 #include "LyXVC.h"
 #include "output_docbook.h"
 #include "output.h"
 #include "output_latex.h"
+#include "output_xhtml.h"
 #include "output_plaintext.h"
-#include "paragraph_funcs.h"
 #include "Paragraph.h"
 #include "ParagraphParameters.h"
 #include "ParIterator.h"
 #include "PDFOptions.h"
+#include "SpellChecker.h"
 #include "sgml.h"
 #include "TexRow.h"
 #include "TexStream.h"
 #include "Undo.h"
 #include "VCBackend.h"
 #include "version.h"
+#include "WordLangTuple.h"
 #include "WordList.h"
 
 #include "insets/InsetBibitem.h"
 #include "insets/InsetBibtex.h"
+#include "insets/InsetBranch.h"
 #include "insets/InsetInclude.h"
 #include "insets/InsetText.h"
 
@@ -79,6 +86,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"
@@ -91,6 +99,7 @@
 #include "support/os.h"
 #include "support/Package.h"
 #include "support/Path.h"
+#include "support/Systemcall.h"
 #include "support/textutils.h"
 #include "support/types.h"
 
 #include <fstream>
 #include <iomanip>
 #include <map>
+#include <set>
 #include <sstream>
 #include <stack>
 #include <vector>
@@ -115,17 +125,29 @@ namespace os = support::os;
 
 namespace {
 
-int const LYX_FORMAT = 343;
+// Do not remove the comment below, so we get merge conflict in
+// independent branches. Instead add your own.
+int const LYX_FORMAT = 376; // jspitzm: support for unincluded file maintenance
 
 typedef map<string, bool> DepClean;
 typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
 
+void showPrintError(string const & name)
+{
+       docstring str = bformat(_("Could not print the document %1$s.\n"
+                                           "Check that your printer is set up correctly."),
+                            makeDisplayPath(name, 50));
+       Alert::error(_("Print document failed"), str);
+}
+
 } // namespace anon
 
+class BufferSet : public std::set<Buffer const *> {};
+
 class Buffer::Impl
 {
 public:
-       Impl(Buffer & parent, FileName const & file, bool readonly);
+       Impl(Buffer * owner, FileName const & file, bool readonly, Buffer const * cloned_buffer);
 
        ~Impl()
        {
@@ -136,11 +158,29 @@ public:
                delete inset;
        }
 
+       /// search for macro in local (buffer) table or in children
+       MacroData const * getBufferMacro(docstring const & name,
+               DocIterator const & pos) const;
+
+       /// Update macro table starting with position of it \param it in some
+       /// text inset.
+       void updateMacros(DocIterator & it, DocIterator & scope);
+       ///
+       void setLabel(ParIterator & it, UpdateType utype) const;
+       ///
+       void collectRelatives(BufferSet & bufs) const;
+
+       /** If we have branches that use the file suffix
+           feature, return the file name with suffix appended.
+       */
+       support::FileName exportFileName() const;
+
+       Buffer * owner_;
+
        BufferParams params;
        LyXVC lyxvc;
        FileName temppath;
        mutable TexRow texrow;
-       Buffer const * parent_buffer;
 
        /// need to regenerate .tex?
        DepClean dep_clean;
@@ -176,7 +216,8 @@ public:
        /// map from the macro name to the position map,
        /// which maps the macro definition position to the scope and the MacroData.
        NamePositionScopeMacroMap macros;
-       bool macro_lock;
+       /// This seem to change the way Buffer::getMacro() works
+       mutable bool macro_lock;
 
        /// positions of child buffers in the buffer
        typedef map<Buffer const * const, DocIterator> BufferPositionMap;
@@ -197,13 +238,15 @@ public:
 
        ///
        frontend::WorkAreaManager * wa_;
+       ///
+       frontend::GuiBufferDelegate * gui_;
 
        ///
        Undo undo_;
 
        /// A cache for the bibfiles (including bibfiles of loaded child
        /// documents), needed for appropriate update of natbib labels.
-       mutable support::FileNameList bibfilesCache_;
+       mutable support::FileNameList bibfiles_cache_;
 
        // FIXME The caching mechanism could be improved. At present, we have a
        // cache for each Buffer, that caches all the bibliography info for that
@@ -212,14 +255,43 @@ public:
        /// A cache for bibliography info
        mutable BiblioInfo bibinfo_;
        /// whether the bibinfo cache is valid
-       bool bibinfoCacheValid_;
+       bool bibinfo_cache_valid_;
        /// Cache of timestamps of .bib files
-       map<FileName, time_t> bibfileStatus_;
+       map<FileName, time_t> bibfile_status_;
 
        mutable RefCache ref_cache_;
 
        /// 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.
+               // however, the BufferList doesn't know about cloned buffers, so
+               // they will always be regarded as unloaded. in that case, we hope
+               // for the best.
+               if (!cloned_buffer_ && !theBufferList().isLoaded(parent_buffer))
+                       parent_buffer = 0;
+               return parent_buffer; 
+       }
+       ///
+       void setParent(Buffer const * pb) {
+               if (parent_buffer && pb && parent_buffer != pb)
+                       LYXERR0("Warning: a buffer should not have two parents!");
+               parent_buffer = pb;
+       }
+
+       /// If non zero, this buffer is a clone of existing buffer \p cloned_buffer_
+       /// This one is useful for preview detached in a thread.
+       Buffer const * cloned_buffer_;
+
+private:
+       /// So we can force access via the accessors.
+       mutable Buffer const * parent_buffer;
+
 };
 
 
@@ -242,25 +314,46 @@ static FileName createBufferTmpDir()
 }
 
 
-Buffer::Impl::Impl(Buffer & parent, FileName const & file, bool readonly_)
-       : parent_buffer(0), lyx_clean(true), bak_clean(true), unnamed(false),
+Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_,
+       Buffer const * cloned_buffer)
+       : owner_(owner), 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)
-{
-       temppath = createBufferTmpDir();
-       lyxvc.setBuffer(&parent);
-       if (use_gui)
-               wa_ = new frontend::WorkAreaManager;
+         toc_backend(owner), macro_lock(false), timestamp_(0),
+         checksum_(0), wa_(0), gui_(0), undo_(*owner), bibinfo_cache_valid_(false),
+         cloned_buffer_(cloned_buffer), parent_buffer(0)
+{
+       if (!cloned_buffer_) {
+               temppath = createBufferTmpDir();
+               lyxvc.setBuffer(owner_);
+               if (use_gui)
+                       wa_ = new frontend::WorkAreaManager;
+               return;
+       }
+       temppath = cloned_buffer_->d->temppath;
+       file_fully_loaded = true;
+       params = cloned_buffer_->d->params;
+       bibfiles_cache_ = cloned_buffer_->d->bibfiles_cache_;
+       bibinfo_ = cloned_buffer_->d->bibinfo_;
+       bibinfo_cache_valid_ = cloned_buffer_->d->bibinfo_cache_valid_;
+       bibfile_status_ = cloned_buffer_->d->bibfile_status_;
 }
 
 
-Buffer::Buffer(string const & file, bool readonly)
-       : d(new Impl(*this, FileName(file), readonly)), gui_(0)
+Buffer::Buffer(string const & file, bool readonly, Buffer const * cloned_buffer)
+       : d(new Impl(this, FileName(file), readonly, cloned_buffer))
 {
        LYXERR(Debug::INFO, "Buffer::Buffer()");
-
-       d->inset = new InsetText(*this);
+       if (cloned_buffer) {
+               d->inset = new InsetText(*cloned_buffer->d->inset);
+               d->inset->setBuffer(*this);
+               // FIXME: optimize this loop somewhat, maybe by creating a new
+               // general recursive Inset::setId().
+               DocIterator it = doc_iterator_begin(this);
+               DocIterator cloned_it = doc_iterator_begin(cloned_buffer);
+               for (; !it.atEnd(); it.forwardPar(), cloned_it.forwardPar())
+                       it.paragraph().setId(cloned_it.paragraph().id());
+       } else
+               d->inset = new InsetText(this);
        d->inset->setAutoBreakRows(true);
        d->inset->getText(0)->setMacrocontextPosition(par_iterator_begin());
 }
@@ -273,20 +366,37 @@ Buffer::~Buffer()
        // saved properly, before it goes into the void.
 
        // GuiView already destroyed
-       gui_ = 0;
+       d->gui_ = 0;
 
+       if (isInternal()) {
+               // 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);
+               if (d->cloned_buffer_)
+                       delete child;
+               // The child buffer might have been closed already.
+               else if (theBufferList().isLoaded(child))
+                       theBufferList().releaseChild(this, child);
+       }
 
+       if (!isClean()) {
+               docstring msg = _("LyX attempted to close a document that had unsaved changes!\n");
+               msg += emergencyWrite();
+               Alert::warning(_("Attempting to close changed document!"), msg);
+       }
+               
        // clear references to children in macro tables
        d->children_positions.clear();
        d->position_to_children.clear();
 
-       if (!d->temppath.destroyDirectory()) {
+       if (!d->cloned_buffer_ && !d->temppath.destroyDirectory()) {
                Alert::warning(_("Could not remove temporary directory"),
                        bformat(_("Could not remove the temporary directory %1$s"),
                        from_utf8(d->temppath.absFilename())));
@@ -299,10 +409,44 @@ Buffer::~Buffer()
 }
 
 
-void Buffer::changed() const
+Buffer * Buffer::clone() const
+{
+       Buffer * buffer_clone = new Buffer(fileName().absFilename(), false, this);
+       buffer_clone->d->macro_lock = true;
+       buffer_clone->d->children_positions.clear();
+       // FIXME (Abdel 09/01/2010): this is too complicated. The whole children_positions and
+       // math macro caches need to be rethought and simplified.
+       // I am not sure wether we should handle Buffer cloning here or in BufferList.
+       // Right now BufferList knows nothing about buffer clones.
+       Impl::BufferPositionMap::iterator it = d->children_positions.begin();
+       Impl::BufferPositionMap::iterator end = d->children_positions.end();
+       for (; it != end; ++it) {
+               DocIterator dit = it->second.clone(buffer_clone);
+               dit.setBuffer(buffer_clone);
+               Buffer * child = const_cast<Buffer *>(it->first);
+               Buffer * child_clone = child->clone();
+               Inset * inset = dit.nextInset();
+               LASSERT(inset && inset->lyxCode() == INCLUDE_CODE, continue);
+               InsetInclude * inset_inc = static_cast<InsetInclude *>(inset);
+               inset_inc->setChildBuffer(child_clone);
+               child_clone->d->setParent(buffer_clone);
+               buffer_clone->setChild(dit, child_clone);
+       }
+       buffer_clone->d->macro_lock = false;
+       return buffer_clone;
+}
+
+
+bool Buffer::isClone() const
+{
+       return d->cloned_buffer_;
+}
+
+
+void Buffer::changed(bool update_metrics) const
 {
        if (d->wa_)
-               d->wa_->redrawAll();
+               d->wa_->redrawAll(update_metrics);
 }
 
 
@@ -367,6 +511,12 @@ string const Buffer::temppath() const
 }
 
 
+TexRow & Buffer::texrow()
+{
+       return d->texrow;
+}
+
+
 TexRow const & Buffer::texrow() const
 {
        return d->texrow;
@@ -385,14 +535,37 @@ Undo & Buffer::undo()
 }
 
 
+void Buffer::setChild(DocIterator const & dit, Buffer * child)
+{
+       d->children_positions[child] = dit;
+}
+
+
 string Buffer::latexName(bool const no_path) const
 {
-       FileName latex_name = makeLatexName(d->filename);
+       FileName latex_name =
+               makeLatexName(d->exportFileName());
        return no_path ? latex_name.onlyFileName()
                : latex_name.absFilename();
 }
 
 
+FileName Buffer::Impl::exportFileName() const
+{
+       docstring const branch_suffix =
+               params.branchlist().getFilenameSuffix();
+       if (branch_suffix.empty())
+               return filename;
+
+       string const name = filename.onlyFileNameWithoutExt()
+               + to_utf8(branch_suffix);
+       FileName res(filename.onlyPath().absFilename() + "/" + name);
+       res.changeExtension(filename.extension());
+
+       return res;
+}
+
+
 string Buffer::logName(LogType * type) const
 {
        string const filename = latexName(false);
@@ -408,19 +581,38 @@ string Buffer::logName(LogType * type) const
        FileName const fname(addName(temppath(),
                                     onlyFilename(changeExtension(filename,
                                                                  ".log"))));
+
+       // FIXME: how do we know this is the name of the build log?
        FileName const bname(
                addName(path, onlyFilename(
                        changeExtension(filename,
-                                       formats.extension("literate") + ".out"))));
+                                       formats.extension(bufferFormat()) + ".out"))));
 
-       // If no Latex log or Build log is newer, show Build log
+       // Also consider the master buffer log file
+       FileName masterfname = fname;
+       LogType mtype;
+       if (masterBuffer() != this) {
+               string const mlogfile = masterBuffer()->logName(&mtype);
+               masterfname = FileName(mlogfile);
+       }
 
+       // If no Latex log or Build log is newer, show Build log
        if (bname.exists() &&
-           (!fname.exists() || fname.lastModified() < bname.lastModified())) {
+           ((!fname.exists() && !masterfname.exists())
+            || (fname.lastModified() < bname.lastModified()
+                && masterfname.lastModified() < bname.lastModified()))) {
                LYXERR(Debug::FILES, "Log name calculated as: " << bname);
                if (type)
                        *type = buildlog;
                return bname.absFilename();
+       // If we have a newer master file log or only a master log, show this
+       } else if (fname != masterfname
+                  && (!fname.exists() && (masterfname.exists()
+                  || fname.lastModified() < masterfname.lastModified()))) {
+               LYXERR(Debug::FILES, "Log name calculated as: " << masterfname);
+               if (type)
+                       *type = mtype;
+               return masterfname.absFilename();
        }
        LYXERR(Debug::FILES, "Log name calculated as: " << fname);
        if (type)
@@ -433,7 +625,7 @@ void Buffer::setReadonly(bool const flag)
 {
        if (d->read_only != flag) {
                d->read_only = flag;
-               setReadOnly(flag);
+               changed(false);
        }
 }
 
@@ -472,7 +664,10 @@ int Buffer::readHeader(Lexer & lex)
        params().listings_params.clear();
        params().clearLayoutModules();
        params().clearRemovedModules();
+       params().clearIncludedChildren();
        params().pdfoptions().clear();
+       params().indiceslist().clear();
+       params().backgroundcolor = lyx::rgbFromHexName("#ffffff");
 
        for (int i = 0; i < 4; ++i) {
                params().user_defined_bullet(i) = ITEMIZE_DEFAULTS[i];
@@ -531,7 +726,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 +745,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,71 +767,45 @@ 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.");
+                       }
                }
        }
+       
+       // assure we have a default index
+       params().indiceslist().addDefault(B_("Index"));
 
        // read main text
-       bool const res = text().read(*this, lex, errorList, d->inset);
+       bool const res = text().read(lex, errorList, d->inset);
 
+       usermacros.clear();
        updateMacros();
        updateMacroInstances();
        return res;
 }
 
 
-// needed to insert the selection
-void Buffer::insertStringAsLines(ParagraphList & pars,
-       pit_type & pit, pos_type & pos,
-       Font const & fn, docstring const & str, bool autobreakrows)
-{
-       Font font = fn;
-
-       // insert the string, don't insert doublespace
-       bool space_inserted = true;
-       for (docstring::const_iterator cit = str.begin();
-           cit != str.end(); ++cit) {
-               Paragraph & par = pars[pit];
-               if (*cit == '\n') {
-                       if (autobreakrows && (!par.empty() || par.allowEmpty())) {
-                               breakParagraph(params(), pars, pit, pos,
-                                              par.layout().isEnvironment());
-                               ++pit;
-                               pos = 0;
-                               space_inserted = true;
-                       } else {
-                               continue;
-                       }
-                       // do not insert consecutive spaces if !free_spacing
-               } else if ((*cit == ' ' || *cit == '\t') &&
-                          space_inserted && !par.isFreeSpacing()) {
-                       continue;
-               } else if (*cit == '\t') {
-                       if (!par.isFreeSpacing()) {
-                               // tabs are like spaces here
-                               par.insertChar(pos, ' ', font, params().trackChanges);
-                               ++pos;
-                               space_inserted = true;
-                       } else {
-                               par.insertChar(pos, *cit, font, params().trackChanges);
-                               ++pos;
-                               space_inserted = true;
-                       }
-               } else if (!isPrintable(*cit)) {
-                       // Ignore unprintables
-                       continue;
-               } else {
-                       // just insert the character
-                       par.insertChar(pos, *cit, font, params().trackChanges);
-                       ++pos;
-                       space_inserted = (*cit == ' ');
-               }
-
-       }
-}
-
-
 bool Buffer::readString(string const & s)
 {
        params().compressed = false;
@@ -669,6 +838,8 @@ bool Buffer::readFile(FileName const & filename)
 {
        FileName fname(filename);
 
+       params().compressed = fname.isZippedFile();
+
        // remove dummy empty par
        paragraphs().clear();
        Lexer lex;
@@ -741,7 +912,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;
                }
@@ -751,7 +922,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;
                }
@@ -767,10 +938,17 @@ Buffer::ReadStatus Buffer::readFile(Lexer & lex, FileName const & filename,
 
                cmd_ret const ret = runCommand(command_str);
                if (ret.first != 0) {
-                       Alert::error(_("Conversion script failed"),
-                                    bformat(_("%1$s is from a different version"
+                       if (file_format < LYX_FORMAT)
+                               Alert::error(_("Conversion script failed"),
+                                    bformat(_("%1$s is from an older version"
                                              " of LyX, but the lyx2lyx script"
-                                                           " failed to convert it."),
+                                             " failed to convert it."),
+                                             from_utf8(filename.absFilename())));
+                       else
+                               Alert::error(_("Conversion script failed"),
+                                    bformat(_("%1$s is from a newer version"
+                                             " of LyX and cannot be converted by the"
+                                                               " lyx2lyx script."),
                                              from_utf8(filename.absFilename())));
                        return failure;
                } else {
@@ -871,7 +1049,7 @@ bool Buffer::writeFile(FileName const & fname) const
                return false;
        }
 
-       removeAutosaveFile(d->filename.absFilename());
+       removeAutosaveFile();
 
        saveCheckSum(d->filename);
        message(str + _(" done."));
@@ -880,6 +1058,63 @@ bool Buffer::writeFile(FileName const & fname) const
 }
 
 
+docstring Buffer::emergencyWrite()
+{
+       // No need to save if the buffer has not changed.
+       if (isClean())
+               return docstring();
+
+       string const doc = isUnnamed() ? onlyFilename(absFileName()) : absFileName();
+
+       docstring user_message = bformat(
+               _("LyX: Attempting to save document %1$s\n"), from_utf8(doc));
+
+       // We try to save three places:
+       // 1) Same place as document. Unless it is an unnamed doc.
+       if (!isUnnamed()) {
+               string s = absFileName();
+               s += ".emergency";
+               LYXERR0("  " << s);
+               if (writeFile(FileName(s))) {
+                       markClean();
+                       user_message += bformat(_("  Saved to %1$s. Phew.\n"), from_utf8(s));
+                       return user_message;
+               } else {
+                       user_message += _("  Save failed! Trying again...\n");
+               }
+       }
+
+       // 2) In HOME directory.
+       string s = addName(package().home_dir().absFilename(), absFileName());
+       s += ".emergency";
+       lyxerr << ' ' << s << endl;
+       if (writeFile(FileName(s))) {
+               markClean();
+               user_message += bformat(_("  Saved to %1$s. Phew.\n"), from_utf8(s));
+               return user_message;
+       }
+
+       user_message += _("  Save failed! Trying yet again...\n");
+
+       // 3) In "/tmp" directory.
+       // MakeAbsPath to prepend the current
+       // drive letter on OS/2
+       s = addName(package().temp_dir().absFilename(), absFileName());
+       s += ".emergency";
+       lyxerr << ' ' << s << endl;
+       if (writeFile(FileName(s))) {
+               markClean();
+               user_message += bformat(_("  Saved to %1$s. Phew.\n"), from_utf8(s));
+               return user_message;
+       }
+
+       user_message += _("  Save failed! Bummer. Document is lost.");
+       // Don't try again.
+       markClean();
+       return user_message;
+}
+
+
 bool Buffer::write(ostream & ofs) const
 {
 #ifdef HAVE_LOCALE
@@ -900,7 +1135,7 @@ bool Buffer::write(ostream & ofs) const
        AuthorList::Authors::const_iterator a_it = params().authors().begin();
        AuthorList::Authors::const_iterator a_end = params().authors().end();
        for (; a_it != a_end; ++a_it)
-               a_it->second.setUsed(false);
+               a_it->setUsed(false);
 
        ParIterator const end = const_cast<Buffer *>(this)->par_iterator_end();
        ParIterator it = const_cast<Buffer *>(this)->par_iterator_begin();
@@ -914,7 +1149,7 @@ bool Buffer::write(ostream & ofs) const
 
        // write the text
        ofs << "\n\\begin_body\n";
-       text().write(*this, ofs);
+       text().write(ofs);
        ofs << "\n\\end_body\n";
 
        // Write marker that shows file is complete
@@ -943,13 +1178,17 @@ bool Buffer::write(ostream & ofs) const
 
 bool Buffer::makeLaTeXFile(FileName const & fname,
                           string const & original_path,
-                          OutputParams const & runparams,
+                          OutputParams const & runparams_in,
                           bool output_preamble, bool output_body) const
 {
+       OutputParams runparams = runparams_in;
+       if (params().useXetex)
+               runparams.flavor = OutputParams::XETEX;
+
        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;
@@ -1085,7 +1324,9 @@ void Buffer::writeLaTeXSource(odocstream & os,
                listParentMacros(parentMacros, features);
 
                // Write the preamble
-               runparams.use_babel = params().writeLaTeX(os, features, d->texrow);
+               runparams.use_babel = params().writeLaTeX(os, features,
+                                                         d->texrow,
+                                                         d->filename.onlyPath());
 
                runparams.use_japanese = features.isRequired("japanese");
 
@@ -1112,8 +1353,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
@@ -1121,7 +1362,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;
@@ -1168,7 +1409,7 @@ void Buffer::makeDocBookFile(FileName const & fname,
 {
        LYXERR(Debug::LATEX, "makeDocBookFile...");
 
-       odocfstream ofs;
+       ofdocstream ofs;
        if (!openFileWrite(ofs, fname))
                return;
 
@@ -1250,11 +1491,74 @@ void Buffer::writeDocBookSource(odocstream & os, string const & fname,
 
        sgml::openTag(os, top);
        os << '\n';
-       docbookParagraphs(paragraphs(), *this, os, runparams);
+       docbookParagraphs(text(), *this, os, runparams);
        sgml::closeTag(os, top_element);
 }
 
 
+void Buffer::makeLyXHTMLFile(FileName const & fname,
+                             OutputParams const & runparams,
+                             bool const body_only) const
+{
+       LYXERR(Debug::LATEX, "makeLyXHTMLFile...");
+
+       ofdocstream ofs;
+       if (!openFileWrite(ofs, fname))
+               return;
+
+       writeLyXHTMLSource(ofs, runparams, body_only);
+
+       ofs.close();
+       if (ofs.fail())
+               lyxerr << "File '" << fname << "' was not closed properly." << endl;
+}
+
+
+void Buffer::writeLyXHTMLSource(odocstream & os,
+                            OutputParams const & runparams,
+                            bool const only_body) const
+{
+       LaTeXFeatures features(*this, params(), runparams);
+       validate(features);
+       updateLabels(UpdateMaster, OutputUpdate);
+       checkBibInfoCache();
+       d->bibinfo_.makeCitationLabels(*this);
+       updateMacros();
+       updateMacroInstances();
+
+       if (!only_body) {
+               os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+               os << "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN\" \"http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd\">\n";
+               // FIXME Language should be set properly.
+               os << "<html xmlns=\"http://www.w3.org/1999/xhtml\">\n";
+               os << "<head>\n";
+               // FIXME Presumably need to set this right
+               os << "<meta http-equiv=\"Content-type\" content=\"text/html;charset=UTF-8\" />\n";
+               os << "<title>" << features.htmlTitle() << "</title>\n";
+
+               os << "\n<!-- Text Class Preamble -->\n"
+                       << features.getTClassHTMLPreamble()
+                       << "\n<!-- Premable Snippets -->\n"
+                       << from_utf8(features.getPreambleSnippets());
+
+               os << "\n<!-- Layout-provided Styles -->\n";
+               docstring const styleinfo = features.getTClassHTMLStyles();
+               if (!styleinfo.empty()) {
+                       os << "<style type='text/css'>\n"
+                               << styleinfo
+                               << "</style>\n";
+               }
+               os << "</head>\n<body>\n";
+       }
+
+       XHTMLStream xs(os);
+       params().documentClass().counters().reset();
+       xhtmlParagraphs(text(), *this, xs, runparams);
+       if (!only_body)
+               os << "</body>\n</html>\n";
+}
+
+
 // chktex should be run with these flags disabled: 3, 22, 25, 30, 38(?)
 // Other flags: -wall -v0 -x
 int Buffer::runChktex()
@@ -1314,8 +1618,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;
        }
 
@@ -1330,21 +1635,22 @@ 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;
        }
 
-       d->bibfilesCache_.clear();
+       d->bibfiles_cache_.clear();
        for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
                if (it->lyxCode() == BIBTEX_CODE) {
                        InsetBibtex const & inset =
                                static_cast<InsetBibtex const &>(*it);
                        support::FileNameList const bibfiles = inset.getBibFiles();
-                       d->bibfilesCache_.insert(d->bibfilesCache_.end(),
+                       d->bibfiles_cache_.insert(d->bibfiles_cache_.end(),
                                bibfiles.begin(),
                                bibfiles.end());
                } else if (it->lyxCode() == INCLUDE_CODE) {
@@ -1352,34 +1658,35 @@ void Buffer::updateBibfilesCache() const
                                static_cast<InsetInclude &>(*it);
                        inset.updateBibfilesCache();
                        support::FileNameList const & bibfiles =
-                                       inset.getBibfilesCache(*this);
-                       d->bibfilesCache_.insert(d->bibfilesCache_.end(),
+                                       inset.getBibfilesCache();
+                       d->bibfiles_cache_.insert(d->bibfiles_cache_.end(),
                                bibfiles.begin(),
                                bibfiles.end());
                }
        }
        // the bibinfo cache is now invalid
-       d->bibinfoCacheValid_ = false;
+       d->bibinfo_cache_valid_ = false;
 }
 
 
 void Buffer::invalidateBibinfoCache()
 {
-       d->bibinfoCacheValid_ = false;
+       d->bibinfo_cache_valid_ = false;
 }
 
 
-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();
+       if (d->bibfiles_cache_.empty())
+               const_cast<Buffer *>(this)->updateBibfilesCache(scope);
 
-       return d->bibfilesCache_;
+       return d->bibfiles_cache_;
 }
 
 
@@ -1397,28 +1704,31 @@ BiblioInfo const & Buffer::masterBibInfo() const
 
 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;
-                       }
+       return d->bibinfo_;
+}
+
+
+void Buffer::checkBibInfoCache() const 
+{
+       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();
+               time_t prevw = d->bibfile_status_[*ei];
+               if (lastw != prevw) {
+                       d->bibinfo_cache_valid_ = false;
+                       d->bibfile_status_[*ei] = lastw;
                }
        }
 
-       if (!d->bibinfoCacheValid_) {
+       if (!d->bibinfo_cache_valid_) {
                d->bibinfo_.clear();
                for (InsetIterator it = inset_iterator_begin(inset()); it; ++it)
                        it->fillWithBibKeys(d->bibinfo_, it);
-               d->bibinfoCacheValid_ = true;
-       }
-       return d->bibinfo_;
+               d->bibinfo_cache_valid_ = true;
+       }       
 }
 
 
@@ -1437,134 +1747,493 @@ void Buffer::markDepClean(string const & name)
 }
 
 
-bool Buffer::dispatch(string const & command, bool * result)
+bool Buffer::isExportableFormat(string const & format) const
 {
-       return dispatch(lyxaction.lookupFunc(command), result);
+               typedef vector<Format const *> Formats;
+               Formats formats;
+               formats = exportableFormats(true);
+               Formats::const_iterator fit = formats.begin();
+               Formats::const_iterator end = formats.end();
+               for (; fit != end ; ++fit) {
+                       if ((*fit)->name() == format)
+                               return true;
+               }
+               return false;
 }
 
 
-bool Buffer::dispatch(FuncRequest const & func, bool * result)
+bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 {
-       bool dispatched = true;
+       if (isInternal()) {
+               // FIXME? if there is an Buffer LFUN that can be dispatched even
+               // if internal, put a switch '(cmd.action)' here.
+               return false;
+       }
 
-       switch (func.action) {
-               case LFUN_BUFFER_EXPORT: {
-                       bool const tmp = doExport(to_utf8(func.argument()), false);
-                       if (result)
-                               *result = tmp;
-                       break;
-               }
+       bool enable = true;
 
-               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;
-               }
+       switch (cmd.action) {
 
-               default:
-                       dispatched = false;
-       }
-       return dispatched;
-}
+               case LFUN_BUFFER_TOGGLE_READ_ONLY:
+                       flag.setOnOff(isReadonly());
+                       break;
 
+               // FIXME: There is need for a command-line import.
+               //case LFUN_BUFFER_IMPORT:
 
-void Buffer::changeLanguage(Language const * from, Language const * to)
-{
-       LASSERT(from, /**/);
-       LASSERT(to, /**/);
+               case LFUN_BUFFER_AUTO_SAVE:
+                       break;
 
-       for_each(par_iterator_begin(),
-                par_iterator_end(),
-                bind(&Paragraph::changeLanguage, _1, params(), from, to));
-}
+               case LFUN_BUFFER_EXPORT_CUSTOM:
+                       // FIXME: Nothing to check here?
+                       break;
 
+               case LFUN_BUFFER_EXPORT: {
+                       docstring const arg = cmd.argument();
+                       enable = arg == "custom" || isExportable(to_utf8(arg));
+                       if (!enable)
+                               flag.message(bformat(
+                                       _("Don't know how to export to format: %1$s"), arg));
+                       break;
+               }
 
-bool Buffer::isMultiLingual() const
-{
-       ParConstIterator end = par_iterator_end();
-       for (ParConstIterator it = par_iterator_begin(); it != end; ++it)
-               if (it->isMultiLingual(params()))
-                       return true;
+               case LFUN_BUFFER_CHKTEX:
+                       enable = isLatex() && !lyxrc.chktex_command.empty();
+                       break;
 
-       return false;
-}
+               case LFUN_BUILD_PROGRAM:
+                       enable = isExportable("program");
+                       break;
 
+               case LFUN_BRANCH_ACTIVATE: 
+               case LFUN_BRANCH_DEACTIVATE: {
+                       BranchList const & branchList = params().branchlist();
+                       docstring const branchName = cmd.argument();
+                       enable = !branchName.empty() && branchList.find(branchName);
+                       break;
+               }
 
-DocIterator Buffer::getParFromID(int const id) const
-{
-       if (id < 0) {
-               // John says this is called with id == -1 from undo
-               lyxerr << "getParFromID(), id: " << id << endl;
-               return doc_iterator_end(inset());
-       }
+               case LFUN_BRANCH_ADD:
+               case LFUN_BRANCHES_RENAME:
+               case LFUN_BUFFER_PRINT:
+                       // if no Buffer is present, then of course we won't be called!
+                       break;
 
-       for (DocIterator it = doc_iterator_begin(inset()); !it.atEnd(); it.forwardPar())
-               if (it.paragraph().id() == id)
-                       return it;
+               case LFUN_BUFFER_LANGUAGE:
+                       enable = !isReadonly();
+                       break;
 
-       return doc_iterator_end(inset());
+               default:
+                       return false;
+       }
+       flag.setEnabled(enable);
+       return true;
 }
 
 
-bool Buffer::hasParWithID(int const id) const
+void Buffer::dispatch(string const & command, DispatchResult & result)
 {
-       return !getParFromID(id).atEnd();
+       return dispatch(lyxaction.lookupFunc(command), result);
 }
 
 
-ParIterator Buffer::par_iterator_begin()
+// NOTE We can end up here even if we have no GUI, because we are called
+// by LyX::exec to handled command-line requests. So we may need to check 
+// whether we have a GUI or not. The boolean use_gui holds this information.
+void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 {
-       return ParIterator(doc_iterator_begin(inset()));
-}
-
+       if (isInternal()) {
+               // FIXME? if there is an Buffer LFUN that can be dispatched even
+               // if internal, put a switch '(cmd.action)' here.
+               dr.dispatched(false);
+               return;
+       }
+       string const argument = to_utf8(func.argument());
+       // We'll set this back to false if need be.
+       bool dispatched = true;
+       undo().beginUndoGroup();
 
-ParIterator Buffer::par_iterator_end()
-{
-       return ParIterator(doc_iterator_end(inset()));
-}
+       switch (func.action) {
+       case LFUN_BUFFER_TOGGLE_READ_ONLY:
+               if (lyxvc().inUse())
+                       lyxvc().toggleReadOnly();
+               else
+                       setReadonly(!isReadonly());
+               break;
 
+       case LFUN_BUFFER_EXPORT: {
+               bool success = doExport(argument, false, false);
+               dr.setError(success);
+               if (!success)
+                       dr.setMessage(bformat(_("Error exporting to format: %1$s."), 
+                                             func.argument()));
+               break;
+       }
 
-ParConstIterator Buffer::par_iterator_begin() const
-{
-       return lyx::par_const_iterator_begin(inset());
-}
+       case LFUN_BUILD_PROGRAM:
+               doExport("program", true, false);
+               break;
 
+       case LFUN_BUFFER_CHKTEX:
+               runChktex();
+               break;
 
-ParConstIterator Buffer::par_iterator_end() const
-{
-       return lyx::par_const_iterator_end(inset());
-}
+       case LFUN_BUFFER_EXPORT_CUSTOM: {
+               string format_name;
+               string command = split(argument, format_name, ' ');
+               Format const * format = formats.getFormat(format_name);
+               if (!format) {
+                       lyxerr << "Format \"" << format_name
+                               << "\" not recognized!"
+                               << endl;
+                       break;
+               }
 
+               // The name of the file created by the conversion process
+               string filename;
 
-Language const * Buffer::language() const
-{
-       return params().language;
-}
+               // Output to filename
+               if (format->name() == "lyx") {
+                       string const latexname = latexName(false);
+                       filename = changeExtension(latexname,
+                               format->extension());
+                       filename = addName(temppath(), filename);
 
+                       if (!writeFile(FileName(filename)))
+                               break;
 
-docstring const Buffer::B_(string const & l10n) const
-{
-       return params().B_(l10n);
-}
+               } else {
+                       doExport(format_name, true, false, filename);
+               }
 
+               // Substitute $$FName for filename
+               if (!contains(command, "$$FName"))
+                       command = "( " + command + " ) < $$FName";
+               command = subst(command, "$$FName", filename);
 
-bool Buffer::isClean() const
-{
-       return d->lyx_clean;
-}
+               // Execute the command in the background
+               Systemcall call;
+               call.startscript(Systemcall::DontWait, command);
+               break;
+       }
 
+       // FIXME: There is need for a command-line import.
+       /*
+       case LFUN_BUFFER_IMPORT:
+               doImport(argument);
+               break;
+       */
 
-bool Buffer::isBakClean() const
-{
-       return d->bak_clean;
-}
+       case LFUN_BUFFER_AUTO_SAVE:
+               autoSave();
+               break;
+
+       case LFUN_BRANCH_ADD: {
+               docstring const branch_name = func.argument();
+               if (branch_name.empty()) {
+                       dispatched = false;
+                       break;
+               }
+               BranchList & branch_list = params().branchlist();
+               Branch * branch = branch_list.find(branch_name);
+               if (branch) {
+                       LYXERR0("Branch " << branch_name << " already exists.");
+                       dr.setError(true);
+                       docstring const msg = 
+                               bformat(_("Branch \"%1$s\" already exists."), branch_name);
+                       dr.setMessage(msg);
+               } else {
+                       branch_list.add(branch_name);
+                       branch = branch_list.find(branch_name);
+                       string const x11hexname = X11hexname(branch->color());
+                       docstring const str = branch_name + ' ' + from_ascii(x11hexname);
+                       lyx::dispatch(FuncRequest(LFUN_SET_COLOR, str));        
+                       dr.setError(false);
+                       dr.update(Update::Force);
+               }
+               break;
+       }
+
+       case LFUN_BRANCH_ACTIVATE:
+       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.");
+                       dr.setError(true);
+                       docstring const msg = 
+                               bformat(_("Branch \"%1$s\" does not exist."), branchName);
+                       dr.setMessage(msg);
+               } else {
+                       branch->setSelected(func.action == LFUN_BRANCH_ACTIVATE);
+                       dr.setError(false);
+                       dr.update(Update::Force);
+               }
+               break;
+       }
+
+       case LFUN_BRANCHES_RENAME: {
+               if (func.argument().empty())
+                       break;
+
+               docstring const oldname = from_utf8(func.getArg(0));
+               docstring const newname = from_utf8(func.getArg(1));
+               InsetIterator it  = inset_iterator_begin(inset());
+               InsetIterator const end = inset_iterator_end(inset());
+               bool success = false;
+               for (; it != end; ++it) {
+                       if (it->lyxCode() == BRANCH_CODE) {
+                               InsetBranch & ins = static_cast<InsetBranch &>(*it);
+                               if (ins.branch() == oldname) {
+                                       undo().recordUndo(it);
+                                       ins.rename(newname);
+                                       success = true;
+                                       continue;
+                               }
+                       }
+                       if (it->lyxCode() == INCLUDE_CODE) {
+                               // get buffer of external file
+                               InsetInclude const & ins =
+                                       static_cast<InsetInclude const &>(*it);
+                               Buffer * child = ins.getChildBuffer();
+                               if (!child)
+                                       continue;
+                               child->dispatch(func, dr);
+                       }
+               }
+
+               if (success)
+                       dr.update(Update::Force);
+               break;
+       }
+
+       case LFUN_BUFFER_PRINT: {
+               // we'll assume there's a problem until we succeed
+               dr.setError(true); 
+               string target = func.getArg(0);
+               string target_name = func.getArg(1);
+               string command = func.getArg(2);
+
+               if (target.empty()
+                   || target_name.empty()
+                   || command.empty()) {
+                       LYXERR0("Unable to parse " << func.argument());
+                       docstring const msg = 
+                               bformat(_("Unable to parse \"%1$s\""), func.argument());
+                       dr.setMessage(msg);
+                       break;
+               }
+               if (target != "printer" && target != "file") {
+                       LYXERR0("Unrecognized target \"" << target << '"');
+                       docstring const msg = 
+                               bformat(_("Unrecognized target \"%1$s\""), from_utf8(target));
+                       dr.setMessage(msg);
+                       break;
+               }
+
+               bool const update_unincluded =
+                               params().maintain_unincluded_children
+                               && !params().getIncludedChildren().empty();
+               if (!doExport("dvi", true, update_unincluded)) {
+                       showPrintError(absFileName());
+                       dr.setMessage(_("Error exporting to DVI."));
+                       break;
+               }
+
+               // Push directory path.
+               string const path = temppath();
+               // Prevent the compiler from optimizing away p
+               FileName pp(path);
+               PathChanger p(pp);
+
+               // there are three cases here:
+               // 1. we print to a file
+               // 2. we print directly to a printer
+               // 3. we print using a spool command (print to file first)
+               Systemcall one;
+               int res = 0;
+               string const dviname = changeExtension(latexName(true), "dvi");
+
+               if (target == "printer") {
+                       if (!lyxrc.print_spool_command.empty()) {
+                               // case 3: print using a spool
+                               string const psname = changeExtension(dviname,".ps");
+                               command += ' ' + lyxrc.print_to_file
+                                       + quoteName(psname)
+                                       + ' '
+                                       + quoteName(dviname);
+
+                               string command2 = lyxrc.print_spool_command + ' ';
+                               if (target_name != "default") {
+                                       command2 += lyxrc.print_spool_printerprefix
+                                               + target_name
+                                               + ' ';
+                               }
+                               command2 += quoteName(psname);
+                               // First run dvips.
+                               // If successful, then spool command
+                               res = one.startscript(Systemcall::Wait, command);
+
+                               if (res == 0) {
+                                       // If there's no GUI, we have to wait on this command. Otherwise,
+                                       // LyX deletes the temporary directory, and with it the spooled
+                                       // file, before it can be printed!!
+                                       Systemcall::Starttype stype = use_gui ?
+                                               Systemcall::DontWait : Systemcall::Wait;
+                                       res = one.startscript(stype, command2);
+                               }
+                       } else {
+                               // case 2: print directly to a printer
+                               if (target_name != "default")
+                                       command += ' ' + lyxrc.print_to_printer + target_name + ' ';
+                               // as above....
+                               Systemcall::Starttype stype = use_gui ?
+                                       Systemcall::DontWait : Systemcall::Wait;
+                               res = one.startscript(stype, command + quoteName(dviname));
+                       }
+
+               } else {
+                       // case 1: print to a file
+                       FileName const filename(makeAbsPath(target_name, filePath()));
+                       FileName const dvifile(makeAbsPath(dviname, path));
+                       if (filename.exists()) {
+                               docstring text = bformat(
+                                       _("The file %1$s already exists.\n\n"
+                                         "Do you want to overwrite that file?"),
+                                       makeDisplayPath(filename.absFilename()));
+                               if (Alert::prompt(_("Overwrite file?"),
+                                                 text, 0, 1, _("&Overwrite"), _("&Cancel")) != 0)
+                                       break;
+                       }
+                       command += ' ' + lyxrc.print_to_file
+                               + quoteName(filename.toFilesystemEncoding())
+                               + ' '
+                               + quoteName(dvifile.toFilesystemEncoding());
+                       // as above....
+                       Systemcall::Starttype stype = use_gui ?
+                               Systemcall::DontWait : Systemcall::Wait;
+                       res = one.startscript(stype, command);
+               }
+
+               if (res == 0) 
+                       dr.setError(false);
+               else {
+                       dr.setMessage(_("Error running external commands."));
+                       showPrintError(absFileName());
+               }
+               break;
+       }
+
+       case LFUN_BUFFER_LANGUAGE: {
+               Language const * oldL = params().language;
+               Language const * newL = languages.getLanguage(argument);
+               if (!newL || oldL == newL)
+                       break;
+               if (oldL->rightToLeft() == newL->rightToLeft() && !isMultiLingual())
+                       changeLanguage(oldL, newL);
+               break;
+       }
+
+       default:
+               dispatched = false;
+               break;
+       }
+       dr.dispatched(dispatched);
+       undo().endUndoGroup();
+}
+
+
+void Buffer::changeLanguage(Language const * from, Language const * to)
+{
+       LASSERT(from, /**/);
+       LASSERT(to, /**/);
+
+       for_each(par_iterator_begin(),
+                par_iterator_end(),
+                bind(&Paragraph::changeLanguage, _1, params(), from, to));
+}
+
+
+bool Buffer::isMultiLingual() const
+{
+       ParConstIterator end = par_iterator_end();
+       for (ParConstIterator it = par_iterator_begin(); it != end; ++it)
+               if (it->isMultiLingual(params()))
+                       return true;
+
+       return false;
+}
+
+
+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(buf);
+       }
+
+       for (DocIterator it = doc_iterator_begin(buf); !it.atEnd(); it.forwardPar())
+               if (it.paragraph().id() == id)
+                       return it;
+
+       return doc_iterator_end(buf);
+}
+
+
+bool Buffer::hasParWithID(int const id) const
+{
+       return !getParFromID(id).atEnd();
+}
+
+
+ParIterator Buffer::par_iterator_begin()
+{
+       return ParIterator(doc_iterator_begin(this));
+}
+
+
+ParIterator Buffer::par_iterator_end()
+{
+       return ParIterator(doc_iterator_end(this));
+}
+
+
+ParConstIterator Buffer::par_iterator_begin() const
+{
+       return ParConstIterator(doc_iterator_begin(this));
+}
+
+
+ParConstIterator Buffer::par_iterator_end() const
+{
+       return ParConstIterator(doc_iterator_end(this));
+}
+
+
+Language const * Buffer::language() const
+{
+       return params().language;
+}
+
+
+docstring const Buffer::B_(string const & l10n) const
+{
+       return params().B_(l10n);
+}
+
+
+bool Buffer::isClean() const
+{
+       return d->lyx_clean;
+}
 
 
 bool Buffer::isExternallyModified(CheckMethod method) const
@@ -1602,12 +2271,6 @@ void Buffer::markClean() const
 }
 
 
-void Buffer::markBakClean() const
-{
-       d->bak_clean = true;
-}
-
-
 void Buffer::setUnnamed(bool flag)
 {
        d->unnamed = flag;
@@ -1620,7 +2283,17 @@ bool Buffer::isUnnamed() const
 }
 
 
-// FIXME: this function should be moved to buffer_pimpl.C
+/// \note
+/// Don't check unnamed, here: isInternal() is used in
+/// newBuffer(), where the unnamed flag has not been set by anyone
+/// yet. Also, for an internal buffer, there should be no need for
+/// retrieving fileName() nor for checking if it is unnamed or not.
+bool Buffer::isInternal() const
+{
+       return fileName().extension() == "internal";
+}
+
+
 void Buffer::markDirty()
 {
        if (d->lyx_clean) {
@@ -1664,23 +2337,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();
+}
+
+
+void Buffer::Impl::collectRelatives(BufferSet & bufs) const
+{
+       bufs.insert(owner_);
+       if (parent())
+               parent()->d->collectRelatives(bufs);
+
+       // loop over children
+       BufferPositionMap::const_iterator it = children_positions.begin();
+       BufferPositionMap::const_iterator end = children_positions.end();
+       for (; it != end; ++it)
+               bufs.insert(const_cast<Buffer *>(it->first));
+}
+
+
+std::vector<Buffer const *> Buffer::allRelatives() const
 {
-       return d->parent_buffer;
+       BufferSet bufs;
+       d->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();
 }
 
 
@@ -1690,13 +2390,50 @@ 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;
+}
+
+
+void Buffer::getChildren(std::vector<Buffer *> & clist, bool grand_children) const
+{
+       // 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);
+               if (grand_children) {
+                       // 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);
+               }
+       }
+}
+
+
+std::vector<Buffer *> Buffer::getChildren(bool grand_children) const
+{
+       std::vector<Buffer *> v;
+       getChildren(v, grand_children);
+       return v;
+}
+
+
 template<typename M>
-typename M::iterator greatest_below(M & m, typename M::key_type const & x)
+typename M::const_iterator greatest_below(M & m, typename M::key_type const & x)
 {
        if (m.empty())
                return m.end();
 
-       typename M::iterator it = m.lower_bound(x);
+       typename M::const_iterator it = m.lower_bound(x);
        if (it == m.begin())
                return m.end();
 
@@ -1705,7 +2442,7 @@ typename M::iterator greatest_below(M & m, typename M::key_type const & x)
 }
 
 
-MacroData const * Buffer::getBufferMacro(docstring const & name,
+MacroData const * Buffer::Impl::getBufferMacro(docstring const & name,
                                         DocIterator const & pos) const
 {
        LYXERR(Debug::MACROS, "Searching for " << to_ascii(name) << " at " << pos);
@@ -1715,16 +2452,15 @@ MacroData const * Buffer::getBufferMacro(docstring const & name,
                return 0;
 
        // we haven't found anything yet
-       DocIterator bestPos = par_iterator_begin();
+       DocIterator bestPos = owner_->par_iterator_begin();
        MacroData const * bestData = 0;
 
        // find macro definitions for name
-       Impl::NamePositionScopeMacroMap::iterator nameIt
-       = d->macros.find(name);
-       if (nameIt != d->macros.end()) {
+       NamePositionScopeMacroMap::const_iterator nameIt = macros.find(name);
+       if (nameIt != macros.end()) {
                // find last definition in front of pos or at pos itself
-               Impl::PositionScopeMacroMap::const_iterator it
-               = greatest_below(nameIt->second, pos);
+               PositionScopeMacroMap::const_iterator it
+                       = greatest_below(nameIt->second, pos);
                if (it != nameIt->second.end()) {
                        while (true) {
                                // scope ends behind pos?
@@ -1746,9 +2482,9 @@ MacroData const * Buffer::getBufferMacro(docstring const & name,
        }
 
        // find macros in included files
-       Impl::PositionScopeBufferMap::const_iterator it
-       = greatest_below(d->position_to_children, pos);
-       if (it == d->position_to_children.end())
+       PositionScopeBufferMap::const_iterator it
+               = greatest_below(position_to_children, pos);
+       if (it == position_to_children.end())
                // no children before
                return bestData;
 
@@ -1760,10 +2496,10 @@ MacroData const * Buffer::getBufferMacro(docstring const & name,
                // scope ends behind pos?
                if (pos < it->second.first) {
                        // look for macro in external file
-                       d->macro_lock = true;
+                       macro_lock = true;
                        MacroData const * data
-                       = it->second.second->getMacro(name, false);
-                       d->macro_lock = false;
+                               = it->second.second->getMacro(name, false);
+                       macro_lock = false;
                        if (data) {
                                bestPos = it->first;
                                bestData = data;
@@ -1772,7 +2508,7 @@ MacroData const * Buffer::getBufferMacro(docstring const & name,
                }
 
                // try previous file if there is one
-               if (it == d->position_to_children.begin())
+               if (it == position_to_children.begin())
                        break;
                --it;
        }
@@ -1789,14 +2525,15 @@ MacroData const * Buffer::getMacro(docstring const & name,
                return 0;
 
        // query buffer macros
-       MacroData const * data = getBufferMacro(name, pos);
+       MacroData const * data = d->getBufferMacro(name, pos);
        if (data != 0)
                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)
@@ -1836,9 +2573,9 @@ MacroData const * Buffer::getMacro(docstring const & name,
 }
 
 
-void Buffer::updateMacros(DocIterator & it, DocIterator & scope) const
+void Buffer::Impl::updateMacros(DocIterator & it, DocIterator & scope)
 {
-       pit_type lastpit = it.lastpit();
+       pit_type const lastpit = it.lastpit();
 
        // look for macros in each paragraph
        while (it.pit() <= lastpit) {
@@ -1854,8 +2591,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
@@ -1872,23 +2608,22 @@ 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();
-                               d->macro_lock = true;
-                               Buffer * child = loadIfNeeded(*this, ip);
-                               d->macro_lock = false;
+                               InsetInclude const & inset =
+                                       static_cast<InsetInclude const &>(*iit->inset);
+                               macro_lock = true;
+                               Buffer * child = inset.getChildBuffer();
+                               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 (children_positions.find(child) ==
+                                       children_positions.end())
+                                               children_positions[child] = it;
 
                                // register child with its scope
-                               d->position_to_children[it] = Impl::ScopeBuffer(scope, child);
+                               position_to_children[it] = Impl::ScopeBuffer(scope, child);
                                continue;
                        }
 
@@ -1896,9 +2631,9 @@ void Buffer::updateMacros(DocIterator & it, DocIterator & scope) const
                                continue;
 
                        // get macro data
-                       MathMacroTemplate & macroTemplate
-                       = static_cast<MathMacroTemplate &>(*iit->inset);
-                       MacroContext mc(*this, it);
+                       MathMacroTemplate & macroTemplate =
+                               static_cast<MathMacroTemplate &>(*iit->inset);
+                       MacroContext mc(owner_, it);
                        macroTemplate.updateToContext(mc);
 
                        // valid?
@@ -1910,8 +2645,10 @@ void Buffer::updateMacros(DocIterator & it, DocIterator & scope) const
                                continue;
 
                        // register macro
-                       d->macros[macroTemplate.name()][it] =
-                               Impl::ScopeMacro(scope, MacroData(*this, it));
+                       // FIXME (Abdel), I don't understandt why we pass 'it' here
+                       // instead of 'macroTemplate' defined above... is this correct?
+                       macros[macroTemplate.name()][it] =
+                               Impl::ScopeMacro(scope, MacroData(const_cast<Buffer *>(owner_), it));
                }
 
                // next paragraph
@@ -1940,7 +2677,36 @@ void Buffer::updateMacros() const
        DocIterator it = par_iterator_begin();
        DocIterator outerScope = it;
        outerScope.pit() = outerScope.lastpit() + 2;
-       updateMacros(it, outerScope);
+       d->updateMacros(it, outerScope);
+}
+
+
+void Buffer::getUsedBranches(std::list<docstring> & result, bool const from_master) const
+{
+       InsetIterator it  = inset_iterator_begin(inset());
+       InsetIterator const end = inset_iterator_end(inset());
+       for (; it != end; ++it) {
+               if (it->lyxCode() == BRANCH_CODE) {
+                       InsetBranch & br = static_cast<InsetBranch &>(*it);
+                       docstring const name = br.branch();
+                       if (!from_master && !params().branchlist().find(name))
+                               result.push_back(name);
+                       else if (from_master && !masterBuffer()->params().branchlist().find(name))
+                               result.push_back(name);
+                       continue;
+               }
+               if (it->lyxCode() == INCLUDE_CODE) {
+                       // get buffer of external file
+                       InsetInclude const & ins =
+                               static_cast<InsetInclude const &>(*it);
+                       Buffer * child = ins.getChildBuffer();
+                       if (!child)
+                               continue;
+                       child->getUsedBranches(result, true);
+               }
+       }
+       // remove duplicates
+       result.unique();
 }
 
 
@@ -1948,21 +2714,18 @@ void Buffer::updateMacroInstances() const
 {
        LYXERR(Debug::MACROS, "updateMacroInstances for "
                << d->filename.onlyFileName());
-       DocIterator it = doc_iterator_begin(inset());
-       DocIterator end = doc_iterator_end(inset());
-       for (; it != end; it.forwardPos()) {
-               // look for MathData cells in InsetMathNest insets
-               Inset * inset = it.nextInset();
-               if (!inset)
-                       continue;
-
-               InsetMath * minset = inset->asInsetMath();
+       DocIterator it = doc_iterator_begin(this);
+       it.forwardInset();
+       DocIterator const end = doc_iterator_end(this);
+       for (; it != end; it.forwardInset()) {
+               // look for MathData cells in InsetMathNest insets
+               InsetMath * minset = it.nextInset()->asInsetMath();
                if (!minset)
                        continue;
 
                // update macro in all cells of the InsetMathNest
                DocIterator::idx_type n = minset->nargs();
-               MacroContext mc = MacroContext(*this, it);
+               MacroContext mc = MacroContext(this, it);
                for (DocIterator::idx_type i = 0; i < n; ++i) {
                        MathData & data = minset->cell(i);
                        data.updateMacros(0, mc);
@@ -1991,8 +2754,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;
 }
@@ -2000,11 +2764,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();
@@ -2012,7 +2777,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);
 
@@ -2028,7 +2793,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);
@@ -2063,7 +2828,7 @@ InsetLabel const * Buffer::insetLabel(docstring const & label) const
 
 void Buffer::clearReferenceCache() const
 {
-       if (!d->parent_buffer)
+       if (!d->parent())
                d->ref_cache_.clear();
 }
 
@@ -2076,6 +2841,7 @@ void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to,
        // Check if the label 'from' appears more than once
        vector<docstring> labels;
        string paramName;
+       checkBibInfoCache();
        BiblioInfo const & keys = masterBibInfo();
        BiblioInfo::const_iterator bit  = keys.begin();
        BiblioInfo::const_iterator bend = keys.end();
@@ -2104,20 +2870,22 @@ void Buffer::getSourceCode(odocstream & os, pit_type par_begin,
 {
        OutputParams runparams(&params().encoding());
        runparams.nice = true;
-       runparams.flavor = OutputParams::LATEX;
+       runparams.flavor = params().useXetex ? 
+               OutputParams::XETEX : OutputParams::LATEX;
        runparams.linelen = lyxrc.plaintext_linelen;
        // No side effect of file copying and image conversion
        runparams.dryrun = true;
 
-       d->texrow.reset();
        if (full_source) {
                os << "% " << _("Preview source code") << "\n\n";
+               d->texrow.reset();
                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;
@@ -2132,14 +2900,16 @@ void Buffer::getSourceCode(odocstream & os, pit_type par_begin,
                                        convert<docstring>(par_end - 1))
                           << "\n\n";
                }
-               d->texrow.newline();
-               d->texrow.newline();
+               TexRow texrow;
+               texrow.reset();
+               texrow.newline();
+               texrow.newline();
                // output paragraphs
-               if (isLatex())
-                       latexParagraphs(*this, text(), os, d->texrow, runparams);
-               else
-                       // DocBook
-                       docbookParagraphs(paragraphs(), *this, os, runparams);
+               if (isDocBook())
+                       docbookParagraphs(text(), *this, os, runparams);
+               else 
+                       // latex or literate
+                       latexParagraphs(*this, text(), os, texrow, runparams);
        }
 }
 
@@ -2158,63 +2928,62 @@ ErrorList & Buffer::errorList(string const & type) const
 void Buffer::updateTocItem(std::string const & type,
        DocIterator const & dit) const
 {
-       if (gui_)
-               gui_->updateTocItem(type, dit);
+       if (d->gui_)
+               d->gui_->updateTocItem(type, dit);
 }
 
 
 void Buffer::structureChanged() const
 {
-       if (gui_)
-               gui_->structureChanged();
+       if (d->gui_)
+               d->gui_->structureChanged();
 }
 
 
-void Buffer::errors(string const & err) const
+void Buffer::errors(string const & err, bool from_master) const
 {
-       if (gui_)
-               gui_->errors(err);
+       if (d->gui_)
+               d->gui_->errors(err, from_master);
 }
 
 
 void Buffer::message(docstring const & msg) const
 {
-       if (gui_)
-               gui_->message(msg);
+       if (d->gui_)
+               d->gui_->message(msg);
 }
 
 
 void Buffer::setBusy(bool on) const
 {
-       if (gui_)
-               gui_->setBusy(on);
+       if (d->gui_)
+               d->gui_->setBusy(on);
 }
 
 
-void Buffer::setReadOnly(bool on) const
+void Buffer::updateTitles() const
 {
        if (d->wa_)
-               d->wa_->setReadOnly(on);
+               d->wa_->updateTitles();
 }
 
 
-void Buffer::updateTitles() const
+void Buffer::resetAutosaveTimers() const
 {
-       if (d->wa_)
-               d->wa_->updateTitles();
+       if (d->gui_)
+               d->gui_->resetAutosaveTimers();
 }
 
 
-void Buffer::resetAutosaveTimers() const
+bool Buffer::hasGuiDelegate() const
 {
-       if (gui_)
-               gui_->resetAutosaveTimers();
+       return d->gui_;
 }
 
 
 void Buffer::setGuiDelegate(frontend::GuiBufferDelegate * gui)
 {
-       gui_ = gui;
+       d->gui_ = gui;
 }
 
 
@@ -2249,6 +3018,15 @@ private:
 
 int AutoSaveBuffer::generateChild()
 {
+#if defined(__APPLE__)
+       /* FIXME fork() is not usable for autosave on Mac OS X 10.6 (snow leopard) 
+        *   We should use something else like threads.
+        *
+        * Since I do not know how to determine at run time what is the OS X
+        * version, I just disable forking altogether for now (JMarc)
+        */
+       pid_t const pid = -1;
+#else
        // tmp_ret will be located (usually) in /tmp
        // will that be a problem?
        // Note that this calls ForkedCalls::fork(), so it's
@@ -2258,6 +3036,7 @@ int AutoSaveBuffer::generateChild()
        // you should set pid to -1, and comment out the fork.
        if (pid != 0 && pid != -1)
                return pid;
+#endif
 
        // pid = -1 signifies that lyx was unable
        // to fork. But we will do the save
@@ -2291,10 +3070,43 @@ int AutoSaveBuffer::generateChild()
 } // namespace anon
 
 
+FileName Buffer::getAutosaveFilename() const
+{
+       // if the document is unnamed try to save in the backup dir, else
+       // in the default document path, and as a last try in the filePath, 
+       // which will most often be the temporary directory
+       string fpath;
+       if (isUnnamed())
+               fpath = lyxrc.backupdir_path.empty() ? lyxrc.document_path
+                       : lyxrc.backupdir_path;
+       if (!isUnnamed() || fpath.empty() || !FileName(fpath).exists())
+               fpath = filePath();
+
+       string const fname = "#" + d->filename.onlyFileName() + "#";
+       return makeAbsPath(fname, fpath);
+}
+
+
+void Buffer::removeAutosaveFile() const
+{
+       FileName const f = getAutosaveFilename();
+       if (f.exists())
+               f.removeFile();
+}
+
+
+void Buffer::moveAutosaveFile(support::FileName const & oldauto) const
+{
+       FileName const newauto = getAutosaveFilename();
+       if (!(oldauto == newauto || oldauto.moveTo(newauto)))
+               LYXERR0("Unable to remove autosave file `" << oldauto << "'!");
+}
+
+
 // Perfect target for a thread...
 void Buffer::autoSave() const
 {
-       if (isBakClean() || isReadonly()) {
+       if (d->bak_clean || isReadonly()) {
                // We don't save now, but we'll try again later
                resetAutosaveTimers();
                return;
@@ -2302,40 +3114,57 @@ 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();
+       d->bak_clean = true;
+
        resetAutosaveTimers();
 }
 
 
 string Buffer::bufferFormat() const
 {
-       if (isDocBook())
-               return "docbook";
-       if (isLiterate())
-               return "literate";
-       if (params().encoding().package() == Encoding::japanese)
-               return "platex";
-       return "latex";
+       string format = params().documentClass().outputFormat();
+       if (format == "latex") {
+               if (params().useXetex)
+                       return "xetex";
+               if (params().encoding().package() == Encoding::japanese)
+                       return "platex";
+       }
+       return format;
 }
 
 
+string Buffer::getDefaultOutputFormat() const
+{
+       if (!params().defaultOutputFormat.empty()
+           && params().defaultOutputFormat != "default")
+               return params().defaultOutputFormat;
+       typedef vector<Format const *> Formats;
+       Formats formats = exportableFormats(true);
+       if (isDocBook()
+           || isLiterate()
+           || params().useXetex
+           || params().encoding().package() == Encoding::japanese) {
+               if (formats.empty())
+                       return string();
+               // return the first we find
+               return formats.front()->name();
+       }
+       return lyxrc.default_view_format;
+}
+
+
+
 bool Buffer::doExport(string const & format, bool put_in_tempdir,
-       string & result_file) const
+       bool includeall, string & result_file) const
 {
        string backend_format;
        OutputParams runparams(&params().encoding());
        runparams.flavor = OutputParams::LATEX;
        runparams.linelen = lyxrc.plaintext_linelen;
+       runparams.includeall = includeall;
        vector<string> backs = backends();
        if (find(backs.begin(), backs.end(), format) == backs.end()) {
                // Get shortest path to format
@@ -2348,14 +3177,18 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
                                path = p;
                        }
                }
-               if (!path.empty())
-                       runparams.flavor = theConverters().getFlavor(path);
-               else {
-                       Alert::error(_("Couldn't export file"),
-                               bformat(_("No information for exporting the format %1$s."),
-                                  formats.prettyName(format)));
+               if (path.empty()) {
+                       if (!put_in_tempdir) {
+                               // Only show this alert if this is an export to a non-temporary
+                               // file (not for previewing).
+                               Alert::error(_("Couldn't export file"), bformat(
+                                       _("No information for exporting the format %1$s."),
+                                       formats.prettyName(format)));
+                       }
                        return false;
                }
+               runparams.flavor = theConverters().getFlavor(path);
+
        } else {
                backend_format = format;
                // FIXME: Don't hardcode format names here, but use a flag
@@ -2372,10 +3205,15 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
        updateMacroInstances();
 
        // Plain text backend
-       if (backend_format == "text")
+       if (backend_format == "text") {
+               runparams.flavor = OutputParams::TEXT;
                writePlaintextFile(*this, FileName(filename), runparams);
-       // no backend
-       else if (backend_format == "lyx")
+       }
+       // HTML backend
+       else if (backend_format == "xhtml") {
+               runparams.flavor = OutputParams::HTML;
+               makeLyXHTMLFile(FileName(filename), runparams);
+       }       else if (backend_format == "lyx")
                writeFile(FileName(filename));
        // Docbook backend
        else if (isDocBook()) {
@@ -2407,30 +3245,47 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
                tmp_result_file, FileName(absFileName()), backend_format, format,
                error_list);
        // Emit the signal to show the error list.
-       if (format != backend_format)
+       if (format != backend_format) {
                errors(error_type);
+               // also to the children, in case of master-buffer-view
+               std::vector<Buffer *> clist = getChildren();
+               for (vector<Buffer *>::const_iterator cit = clist.begin();
+                    cit != clist.end(); ++cit)
+                       (*cit)->errors(error_type, true);
+       }
        if (!success)
                return false;
 
+       if (d->cloned_buffer_) {
+               // Enable reverse dvi or pdf to work by copying back the texrow
+               // object to the cloned buffer.
+               // FIXME: There is a possibility of concurrent access to texrow
+               // here from the main GUI thread that should be securized.
+               d->cloned_buffer_->d->texrow = d->texrow;
+       }
+
        if (put_in_tempdir) {
                result_file = tmp_result_file.absFilename();
                return true;
        }
 
-       result_file = changeExtension(absFileName(), ext);
+       result_file = changeExtension(d->exportFileName().absFilename(), ext);
        // We need to copy referenced files (e. g. included graphics
        // if format == "dvi") to the result dir.
        vector<ExportedFile> const files =
                runparams.exportdata->externalFiles(format);
        string const dest = onlyPath(result_file);
        CopyStatus status = SUCCESS;
-       for (vector<ExportedFile>::const_iterator it = files.begin();
-               it != files.end() && status != CANCEL; ++it) {
+       
+       vector<ExportedFile>::const_iterator it = files.begin();
+       vector<ExportedFile>::const_iterator const en = files.end();
+       for (; it != en && status != CANCEL; ++it) {
                string const fmt = formats.getFormatFromFile(it->sourceName);
                status = copyFile(fmt, it->sourceName,
                        makeAbsPath(it->exportName, dest),
                        it->exportName, status == FORCE);
        }
+
        if (status == CANCEL) {
                message(_("Document export cancelled."));
        } else if (tmp_result_file.exists()) {
@@ -2452,17 +3307,26 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
 }
 
 
-bool Buffer::doExport(string const & format, bool put_in_tempdir) const
+bool Buffer::doExport(string const & format, bool put_in_tempdir,
+                     bool includeall) const
 {
        string result_file;
-       return doExport(format, put_in_tempdir, result_file);
+       // (1) export with all included children (omit \includeonly)
+       if (includeall && !doExport(format, put_in_tempdir, true, result_file))
+               return false;
+       // (2) export with included children only
+       return doExport(format, put_in_tempdir, false, result_file);
 }
 
 
-bool Buffer::preview(string const & format) const
+bool Buffer::preview(string const & format, bool includeall) const
 {
        string result_file;
-       if (!doExport(format, true, result_file))
+       // (1) export with all included children (omit \includeonly)
+       if (includeall && !doExport(format, true, true))
+               return false;
+       // (2) export with included children only
+       if (!doExport(format, true, false, result_file))
                return false;
        return formats.view(*this, FileName(result_file), format);
 }
@@ -2481,7 +3345,7 @@ bool Buffer::isExportable(string const & format) const
 
 vector<Format const *> Buffer::exportableFormats(bool only_viewable) const
 {
-       vector<string> backs = backends();
+       vector<string> const backs = backends();
        vector<Format const *> result =
                theConverters().getReachable(backs[0], only_viewable, true);
        for (vector<string>::const_iterator it = backs.begin() + 1;
@@ -2497,12 +3361,11 @@ vector<Format const *> Buffer::exportableFormats(bool only_viewable) const
 vector<string> Buffer::backends() const
 {
        vector<string> v;
-       if (params().baseClass()->isTeXClassAvailable()) {
-               v.push_back(bufferFormat());
-               // FIXME: Don't hardcode format names here, but use a flag
-               if (v.back() == "latex")
-                       v.push_back("pdflatex");
-       }
+       v.push_back(bufferFormat());
+       // FIXME: Don't hardcode format names here, but use a flag
+       if (v.back() == "latex")
+               v.push_back("pdflatex");
+       v.push_back("xhtml");
        v.push_back("text");
        v.push_back("lyx");
        return v;
@@ -2533,11 +3396,33 @@ bool Buffer::readFileHelper(FileName const & s)
                                      _("&Recover"),  _("&Load Original"),
                                      _("&Cancel")))
                {
-               case 0:
+               case 0: {
                        // the file is not saved if we load the emergency file.
                        markDirty();
-                       return readFile(e);
+                       docstring str;
+                       bool res;
+
+                       if ((res = readFile(e)) == success)
+                               str = _("Document was successfully recovered.");
+                       else
+                               str = _("Document was NOT successfully recovered.");
+                       str += "\n\n" + bformat(_("Remove emergency file now?\n(%1$s)"),
+                                               from_utf8(e.absFilename()));
+
+                       if (!Alert::prompt(_("Delete emergency file?"), str, 1, 1,
+                                       _("&Remove"), _("&Keep it"))) {
+                               e.removeFile();
+                               if (res == success)
+                                       Alert::warning(_("Emergency file deleted"),
+                                               _("Do not forget to save your file now!"), true);
+                               }
+                       return res;
+               }
                case 1:
+                       if (!Alert::prompt(_("Delete emergency file?"),
+                                       _("Remove emergency file now?"), 1, 1,
+                                       _("&Remove"), _("&Keep it")))
+                               e.removeFile();
                        break;
                default:
                        return false;
@@ -2575,31 +3460,17 @@ bool Buffer::readFileHelper(FileName const & s)
 
 bool Buffer::loadLyXFile(FileName const & s)
 {
-       if (s.isReadableFile()) {
-               if (readFileHelper(s)) {
-                       lyxvc().file_found_hook(s);
-                       if (!s.isWritable())
-                               setReadonly(true);
-                       return true;
-               }
-       } else {
-               docstring const file = makeDisplayPath(s.absFilename(), 20);
-               // Here we probably should run
-               if (LyXVC::file_not_found_hook(s)) {
-                       docstring const text =
-                               bformat(_("Do you want to retrieve the document"
-                                                      " %1$s from version control?"), file);
-                       int const ret = Alert::prompt(_("Retrieve from version control?"),
-                               text, 0, 1, _("&Retrieve"), _("&Cancel"));
-
-                       if (ret == 0) {
-                               // How can we know _how_ to do the checkout?
-                               // With the current VC support it has to be,
-                               // a RCS file since CVS do not have special ,v files.
-                               RCS::retrieve(s);
-                               return loadLyXFile(s);
-                       }
-               }
+       // If the file is not readable, we try to
+       // retrieve the file from version control.
+       if (!s.isReadableFile()
+                 && !LyXVC::file_not_found_hook(s))
+               return false;
+       
+       if (s.isReadableFile()
+                 && readFileHelper(s)) {
+               lyxvc().file_found_hook(s);
+               setReadonly(!s.isWritable());
+               return true;
        }
        return false;
 }
@@ -2629,4 +3500,364 @@ void Buffer::bufferErrors(TeXErrors const & terr, ErrorList & errorList) const
 }
 
 
+void Buffer::setBuffersForInsets() const
+{
+       inset().setBuffer(const_cast<Buffer &>(*this)); 
+}
+
+
+void Buffer::updateLabels(UpdateScope scope, UpdateType utype) const
+{
+       // Use the master text class also for child documents
+       Buffer const * const master = masterBuffer();
+       DocumentClass const & textclass = master->params().documentClass();
+       
+       // do this only if we are the top-level Buffer
+       if (scope != UpdateMaster || master == this)
+               checkBibInfoCache();
+
+       // 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(UpdateMaster, utype);
+                       // 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->d->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, utype);
+
+       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.
+void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const
+{
+       BufferParams const & bp = owner_->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
+               // sectioning 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
+           || layout.latextype == LATEX_BIB_ENVIRONMENT) {
+               if (par.params().labelWidthString().empty())
+                       par.params().labelWidthString(par.expandLabel(layout, bp));
+       } else {
+               par.params().labelWidthString(docstring());
+       }
+
+       switch(layout.labeltype) {
+       case LABEL_COUNTER:
+               if (layout.toclevel <= bp.secnumdepth
+                   && (layout.latextype != LATEX_ENVIRONMENT
+                       || it.text()->isFirstInSequence(it.pit()))) {
+                       counters.step(layout.counter, utype);
+                       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: {
+               docstring enumcounter = layout.counter.empty() ? from_ascii("enum") : layout.counter;
+
+               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, utype);
+
+               string const & lang = par.getParLanguage(bp)->code();
+               par.params().labelString(counters.theCounter(enumcounter, lang));
+
+               break;
+       }
+
+       case LABEL_SENSITIVE: {
+               string const & type = counters.current_float();
+               docstring full_label;
+               if (type.empty())
+                       full_label = owner_->B_("Senseless!!! ");
+               else {
+                       docstring name = owner_->B_(textclass.floats().getType(type).name());
+                       if (counters.hasCounter(from_utf8(type))) {
+                               string const & lang = par.getParLanguage(bp)->code();
+                               counters.step(from_utf8(type), utype);
+                               full_label = bformat(from_ascii("%1$s %2$s:"), 
+                                                    name, 
+                                                    counters.theCounter(from_utf8(type), lang));
+                       } 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.expandLabel(layout, bp));
+               break;
+       }
+}
+
+
+void Buffer::updateLabels(ParIterator & parit, UpdateType utype) 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();
+
+               if (utype == OutputUpdate) {
+                       // track the active counters
+                       // we have to do this for the master buffer, since the local
+                       // buffer isn't tracking anything.
+                       masterBuffer()->params().documentClass().counters().
+                                       setActiveLayout(parit->layout());
+               }
+               
+               // set the counter for this paragraph
+               d->setLabel(parit, utype);
+
+               // 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, utype);
+               }
+       }
+}
+
+
+int Buffer::spellCheck(DocIterator & from, DocIterator & to,
+       WordLangTuple & word_lang, docstring_list & suggestions) const
+{
+       int progress = 0;
+       WordLangTuple wl;
+       suggestions.clear();
+       word_lang = WordLangTuple();
+       // OK, we start from here.
+       DocIterator const end = doc_iterator_end(this);
+       for (; from != end; from.forwardPos()) {
+               // We are only interested in text so remove the math CursorSlice.
+               while (from.inMathed()) {
+                       from.pop_back();
+                       from.pos()++;
+               }
+               // If from is at the end of the document (which is possible
+               // when leaving the mathed) LyX will crash later.
+               if (from == end)
+                       break;
+               to = from;
+               if (from.paragraph().spellCheck(from.pos(), to.pos(), wl, suggestions)) {
+                       word_lang = wl;
+                       break;
+               }
+
+               // Do not increase progress when from == to, otherwise the word
+               // count will be wrong.
+               if (from != to) {
+                       from = to;
+                       ++progress;
+               }
+       }
+       return progress;
+}
+
+
+bool Buffer::reload()
+{
+       setBusy(true);
+       // e.g., read-only status could have changed due to version control
+       d->filename.refresh();
+       docstring const disp_fn = makeDisplayPath(d->filename.absFilename());
+
+       bool const success = loadLyXFile(d->filename);
+       if (success) {
+               updateLabels();
+               changed(true);
+               markClean();
+               message(bformat(_("Document %1$s reloaded."), disp_fn));
+       } else {
+               message(bformat(_("Could not reload document %1$s."), disp_fn));
+       }       
+       setBusy(false);
+       errors("Parse");
+       return success;
+}
+
+
 } // namespace lyx