]> git.lyx.org Git - lyx.git/blobdiff - src/Buffer.cpp
reorder initializers to avoid warning
[lyx.git] / src / Buffer.cpp
index 1c53b8a53b87168dea5360674a0dcc3cfd3e3824..3632af200c769a9bc53f8b3f1914ca27d26acb15 100644 (file)
@@ -66,7 +66,6 @@
 #include "WordLangTuple.h"
 #include "WordList.h"
 
-#include "insets/InsetBibitem.h"
 #include "insets/InsetBibtex.h"
 #include "insets/InsetBranch.h"
 #include "insets/InsetInclude.h"
 #include "mathed/MathMacroTemplate.h"
 #include "mathed/MathSupport.h"
 
+#include "graphics/PreviewLoader.h"
+
 #include "frontends/alert.h"
 #include "frontends/Delegates.h"
 #include "frontends/WorkAreaManager.h"
 
-#include "graphics/Previews.h"
-
 #include "support/lassert.h"
 #include "support/convert.h"
 #include "support/debug.h"
 
 using namespace std;
 using namespace lyx::support;
+using namespace lyx::graphics;
 
 namespace lyx {
 
@@ -128,7 +128,7 @@ namespace {
 
 // Do not remove the comment below, so we get merge conflict in
 // independent branches. Instead add your own.
-int const LYX_FORMAT = 404; // rgh: refstyle
+int const LYX_FORMAT = 413; // rgh: html_css_as_file
 
 typedef map<string, bool> DepClean;
 typedef map<docstring, pair<InsetLabel const *, Buffer::References> > RefCache;
@@ -151,6 +151,7 @@ public:
 
        ~Impl()
        {
+               delete preview_loader_;
                if (wa_) {
                        wa_->closeAll();
                        delete wa_;
@@ -189,7 +190,7 @@ public:
        /// is autosave needed?
        mutable bool bak_clean;
 
-       /// is this a unnamed file (New...)?
+       /// is this an unnamed file (New...)?
        bool unnamed;
 
        /// buffer is r/o
@@ -258,12 +259,19 @@ public:
        mutable bool bibfile_cache_valid_;
        /// Cache of timestamps of .bib files
        map<FileName, time_t> bibfile_status_;
+       /// Indicates whether the bibinfo has changed since the last time
+       /// we ran updateBuffer(), i.e., whether citation labels may need
+       /// to be updated.
+       mutable bool cite_labels_valid_;
 
        mutable RefCache ref_cache_;
 
        /// our Text that should be wrapped in an InsetText
        InsetText * inset;
 
+       ///
+       PreviewLoader * preview_loader_;
+
        /// This is here to force the test to be done whenever parent_buffer
        /// is accessed.
        Buffer const * parent() const { 
@@ -328,10 +336,11 @@ 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(owner), macro_lock(false), timestamp_(0),
-         checksum_(0), wa_(0), gui_(0), undo_(*owner), bibinfo_cache_valid_(false),
-               bibfile_cache_valid_(false), cloned_buffer_(cloned_buffer), 
-               doing_export(false), parent_buffer(0)
+         toc_backend(owner), macro_lock(false), timestamp_(0), checksum_(0),
+         wa_(0), gui_(0), undo_(*owner), bibinfo_cache_valid_(false), 
+         bibfile_cache_valid_(false), cite_labels_valid_(false), 
+         preview_loader_(0), cloned_buffer_(cloned_buffer),
+         doing_export(false), parent_buffer(0)
 {
        if (!cloned_buffer_) {
                temppath = createBufferTmpDir();
@@ -348,6 +357,7 @@ Buffer::Impl::Impl(Buffer * owner, FileName const & file, bool readonly_,
        bibinfo_cache_valid_ = cloned_buffer_->d->bibinfo_cache_valid_;
        bibfile_cache_valid_ = cloned_buffer_->d->bibfile_cache_valid_;
        bibfile_status_ = cloned_buffer_->d->bibfile_status_;
+       cite_labels_valid_ = cloned_buffer_->d->cite_labels_valid_;
 }
 
 
@@ -414,9 +424,8 @@ Buffer::~Buffer()
                        from_utf8(d->temppath.absFileName())));
        }
 
-       // Remove any previewed LaTeX snippets associated with this buffer.
        if (!isClone())
-               thePreviews().removeLoader(*this);
+               removePreviews();
 
        delete d;
 }
@@ -424,29 +433,50 @@ Buffer::~Buffer()
 
 Buffer * Buffer::clone() const
 {
+       BufferMap bufmap;
+       masterBuffer()->clone(bufmap);
+       BufferMap::iterator it = bufmap.find(this);
+       LASSERT(it != bufmap.end(), return 0);
+       return it->second;
+}
+
+
+void Buffer::clone(BufferMap & bufmap) const
+{
+       // have we already been cloned?
+       if (bufmap.find(this) != bufmap.end())
+               return;
+
        Buffer * buffer_clone = new Buffer(fileName().absFileName(), false, this);
+       bufmap[this] = buffer_clone;
        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();
+       Impl::PositionScopeBufferMap::iterator it = d->position_to_children.begin();
+       Impl::PositionScopeBufferMap::iterator end = d->position_to_children.end();
        for (; it != end; ++it) {
-               DocIterator dit = it->second.clone(buffer_clone);
+               DocIterator dit = it->first.clone(buffer_clone);
                dit.setBuffer(buffer_clone);
-               Buffer * child = const_cast<Buffer *>(it->first);
-               Buffer * child_clone = child->clone();
+               Buffer * child = const_cast<Buffer *>(it->second.second);
+
+               child->clone(bufmap);
+               BufferMap::iterator const bit = bufmap.find(child);
+               LASSERT(bit != bufmap.end(), continue);
+               Buffer * child_clone = bit->second;
+
                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);
+               // FIXME Do we need to do this now, or can we wait until we run updateMacros()?
                buffer_clone->setChild(dit, child_clone);
        }
        buffer_clone->d->macro_lock = false;
-       return buffer_clone;
+       return;
 }
 
 
@@ -599,7 +629,7 @@ string Buffer::logName(LogType * type) const
        FileName const bname(
                addName(path, onlyFileName(
                        changeExtension(filename,
-                                       formats.extension(bufferFormat()) + ".out"))));
+                                       formats.extension(params().bufferFormat()) + ".out"))));
 
        // Also consider the master buffer log file
        FileName masterfname = fname;
@@ -643,10 +673,11 @@ void Buffer::setReadonly(bool const flag)
 }
 
 
-void Buffer::setFileName(string const & newfile)
+void Buffer::setFileName(FileName const & fname)
 {
-       d->filename = makeAbsPath(newfile);
+       d->filename = fname;
        setReadonly(d->filename.isReadOnly());
+       saveCheckSum();
        updateTitles();
 }
 
@@ -673,7 +704,7 @@ int Buffer::readHeader(Lexer & lex)
        params().headsep.erase();
        params().footskip.erase();
        params().columnsep.erase();
-       params().fontsCJK.erase();
+       params().fonts_cjk.erase();
        params().listings_params.clear();
        params().clearLayoutModules();
        params().clearRemovedModules();
@@ -821,9 +852,17 @@ bool Buffer::readDocument(Lexer & lex)
        // read main text
        bool const res = text().read(lex, errorList, d->inset);
 
+       // inform parent buffer about local macros
+       if (parent()) {
+               Buffer const * pbuf = parent();
+               UserMacroSet::const_iterator cit = usermacros.begin();
+               UserMacroSet::const_iterator end = usermacros.end();
+               for (; cit != end; ++cit)
+                       pbuf->usermacros.insert(*cit);
+       }
        usermacros.clear();
        updateMacros();
-       updateMacroInstances();
+       updateMacroInstances(InternalUpdate);
        return res;
 }
 
@@ -861,7 +900,12 @@ Buffer::ReadStatus Buffer::readFile(FileName const & fn)
 {
        FileName fname(fn);
        Lexer lex;
-       lex.setFile(fname);
+       if (!lex.setFile(fname)) {
+               Alert::error(_("File Not Found"),
+                       bformat(_("Unable to open file `%1$s'."), 
+                               from_utf8(fn.absFileName())));
+               return ReadFileNotFound;
+       }
 
        int file_format;
        ReadStatus const ret_plf = parseLyXFormat(lex, fn, file_format);
@@ -876,6 +920,10 @@ Buffer::ReadStatus Buffer::readFile(FileName const & fn)
                return readFile(tmpFile);
        }
 
+       // FIXME: InsetInfo needs to know whether the file is under VCS 
+       // during the parse process, so this has to be done before.
+       lyxvc().file_found_hook(d->filename);
+
        if (readDocument(lex)) {
                Alert::error(_("Document format failure"),
                        bformat(_("%1$s ended unexpectedly, which means"
@@ -885,10 +933,8 @@ Buffer::ReadStatus Buffer::readFile(FileName const & fn)
        }
 
        d->file_fully_loaded = true;
-       // InsetInfo needs to know if file is under VCS
-       lyxvc().file_found_hook(fn);
-       d->read_only = !fname.isWritable();
-       params().compressed = fname.isZippedFile();
+       d->read_only = !d->filename.isWritable();
+       params().compressed = d->filename.isZippedFile();
        saveCheckSum();
        return ReadSuccess;
 }
@@ -906,6 +952,38 @@ void Buffer::setFullyLoaded(bool value)
 }
 
 
+PreviewLoader * Buffer::loader() const
+{
+       if (lyxrc.preview == LyXRC::PREVIEW_OFF)
+               return 0;
+       if (!d->preview_loader_)
+               d->preview_loader_ = new PreviewLoader(*this);
+       return d->preview_loader_;
+}
+
+
+void Buffer::removePreviews() const
+{
+       delete d->preview_loader_;
+       d->preview_loader_ = 0;
+}
+
+
+void Buffer::updatePreviews() const
+{
+       PreviewLoader * ploader = loader();
+       if (!ploader)
+               return;
+
+       InsetIterator it = inset_iterator_begin(*d->inset);
+       InsetIterator const end = inset_iterator_end(*d->inset);
+       for (; it != end; ++it)
+               it->addPreview(it, *ploader);
+
+       ploader->startLoading();
+}
+
+
 Buffer::ReadStatus Buffer::parseLyXFormat(Lexer & lex,
        FileName const & fn, int & file_format) const
 {
@@ -973,14 +1051,14 @@ Buffer::ReadStatus Buffer::convertLyXFormat(FileName const & fn,
                if (from_format < LYX_FORMAT) {
                        Alert::error(_("Conversion script failed"),
                                bformat(_("%1$s is from an older version"
-                                       " of LyX, but the lyx2lyx script"
+                                       " of LyX and the lyx2lyx script"
                                        " failed to convert it."),
                                        from_utf8(fn.absFileName())));
                        return LyX2LyXOlderFormat;
                } else {
                        Alert::error(_("Conversion script failed"),
-                               bformat(_("%1$s is from an newer version"
-                                       " of LyX, but the lyx2lyx script"
+                               bformat(_("%1$s is from a newer version"
+                                       " of LyX and the lyx2lyx script"
                                        " failed to convert it."),
                                        from_utf8(fn.absFileName())));
                        return LyX2LyXNewerFormat;
@@ -993,11 +1071,25 @@ Buffer::ReadStatus Buffer::convertLyXFormat(FileName const & fn,
 // Should probably be moved to somewhere else: BufferView? GuiView?
 bool Buffer::save() const
 {
+       docstring const file = makeDisplayPath(absFileName(), 20);
+       d->filename.refresh();
+
+       // check the read-only status before moving the file as a backup
+       if (d->filename.exists()) {
+               bool const read_only = !d->filename.isWritable();
+               if (read_only) {
+                       Alert::warning(_("File is read-only"),
+                               bformat(_("The file %1$s cannot be written because it "
+                               "is marked as read-only."), file));
+                       return false;
+               }
+       }
+
        // ask if the disk file has been externally modified (use checksum method)
        if (fileName().exists() && isExternallyModified(checksum_method)) {
-               docstring const file = makeDisplayPath(absFileName(), 20);
-               docstring text = bformat(_("Document %1$s has been externally modified. Are you sure "
-                                                            "you want to overwrite this file?"), file);
+               docstring text = 
+                       bformat(_("Document %1$s has been externally modified. "
+                               "Are you sure you want to overwrite this file?"), file);
                int const ret = Alert::prompt(_("Overwrite modified file?"),
                        text, 1, 1, _("&Overwrite"), _("&Cancel"));
                if (ret == 1)
@@ -1019,13 +1111,18 @@ bool Buffer::save() const
                        backupName = FileName(addName(lyxrc.backupdir_path,
                                                      mangledName));
                }
-               // do not copy because of #6587
-               if (fileName().moveTo(backupName)) {
-                       madeBackup = true;
-               } else {
+
+               // Except file is symlink do not copy because of #6587.
+               // Hard links have bad luck.
+               if (fileName().isSymLink())
+                       madeBackup = fileName().copyTo(backupName);
+               else
+                       madeBackup = fileName().moveTo(backupName);
+
+               if (!madeBackup) {
                        Alert::error(_("Backup failure"),
                                     bformat(_("Cannot create backup file %1$s.\n"
-                                              "Please check whether the directory exists and is writeable."),
+                                              "Please check whether the directory exists and is writable."),
                                             from_utf8(backupName.absFileName())));
                        //LYXERR(Debug::DEBUG, "Fs error: " << fe.what());
                }
@@ -1045,6 +1142,11 @@ bool Buffer::save() const
 
 bool Buffer::writeFile(FileName const & fname) const
 {
+       // FIXME Do we need to do these here? I don't think writing
+       // the LyX file depends upon it. (RGH)
+       // updateBuffer();
+       // updateMacroInstances();
+
        if (d->read_only && fname == d->filename)
                return false;
 
@@ -1098,24 +1200,24 @@ docstring Buffer::emergencyWrite()
                LYXERR0("  " << s);
                if (writeFile(FileName(s))) {
                        markClean();
-                       user_message += bformat(_("  Saved to %1$s. Phew.\n"), from_utf8(s));
+                       user_message += "  " + bformat(_("Saved to %1$s. Phew.\n"), from_utf8(s));
                        return user_message;
                } else {
-                       user_message += _("  Save failed! Trying again...\n");
+                       user_message += "  " + _("Save failed! Trying again...\n");
                }
        }
 
        // 2) In HOME directory.
-       string s = addName(package().home_dir().absFileName(), absFileName());
+       string s = addName(Package::get_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));
+               user_message += "  " + bformat(_("Saved to %1$s. Phew.\n"), from_utf8(s));
                return user_message;
        }
 
-       user_message += _("  Save failed! Trying yet again...\n");
+       user_message += "  " + _("Save failed! Trying yet again...\n");
 
        // 3) In "/tmp" directory.
        // MakeAbsPath to prepend the current
@@ -1125,11 +1227,11 @@ docstring Buffer::emergencyWrite()
        lyxerr << ' ' << s << endl;
        if (writeFile(FileName(s))) {
                markClean();
-               user_message += bformat(_("  Saved to %1$s. Phew.\n"), from_utf8(s));
+               user_message += "  " + bformat(_("Saved to %1$s. Phew.\n"), from_utf8(s));
                return user_message;
        }
 
-       user_message += _("  Save failed! Bummer. Document is lost.");
+       user_message += "  " + _("Save failed! Bummer. Document is lost.");
        // Don't try again.
        markClean();
        return user_message;
@@ -1146,7 +1248,7 @@ bool Buffer::write(ostream & ofs) const
        // The top of the file should not be written by params().
 
        // write out a comment in the top of the file
-       ofs << "#LyX " << lyx_version
+       ofs << "#LyX " << lyx_version_major << "." << lyx_version_minor
            << " created this file. For more info see http://www.lyx.org/\n"
            << "\\lyxformat " << LYX_FORMAT << "\n"
            << "\\begin_document\n";
@@ -1203,8 +1305,11 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
                           bool output_preamble, bool output_body) const
 {
        OutputParams runparams = runparams_in;
-       if (params().useXetex)
-               runparams.flavor = OutputParams::XETEX;
+
+       // This is necessary for LuaTeX/XeTeX with tex fonts.
+       // See FIXME in BufferParams::encoding()
+       if (runparams.isFullUnicode())
+               runparams.encoding = encodings.fromLyXName("utf8-plain");
 
        string const encoding = runparams.encoding->iconvName();
        LYXERR(Debug::LATEX, "makeLaTeXFile encoding: " << encoding << "...");
@@ -1225,9 +1330,18 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
        ErrorList & errorList = d->errorLists["Export"];
        errorList.clear();
        bool failed_export = false;
+       otexstream os(ofs, d->texrow);
+
+       // make sure we are ready to export
+       // this needs to be done before we validate
+       // FIXME Do we need to do this all the time? I.e., in children
+       // of a master we are exporting?
+       updateBuffer();
+       updateMacroInstances(OutputUpdate);
+
        try {
-               d->texrow.reset();
-               writeLaTeXSource(ofs, original_path,
+               os.texrow().reset();
+               writeLaTeXSource(os, original_path,
                      runparams, output_preamble, output_body);
        }
        catch (EncodingException & e) {
@@ -1270,7 +1384,7 @@ bool Buffer::makeLaTeXFile(FileName const & fname,
 }
 
 
-void Buffer::writeLaTeXSource(odocstream & os,
+void Buffer::writeLaTeXSource(otexstream & os,
                           string const & original_path,
                           OutputParams const & runparams_in,
                           bool const output_preamble, bool const output_body) const
@@ -1295,20 +1409,9 @@ void Buffer::writeLaTeXSource(odocstream & os,
                        "For more info, see http://www.lyx.org/.\n"
                        "%% Do not edit unless you really know what "
                        "you are doing.\n";
-               d->texrow.newline();
-               d->texrow.newline();
        }
        LYXERR(Debug::INFO, "lyx document header finished");
 
-       // Don't move this behind the parent_buffer=0 code below,
-       // because then the macros will not get the right "redefinition"
-       // flag as they don't see the parent macros which are output before.
-       updateMacros();
-
-       // fold macros if possible, still with parent buffer as the
-       // macros will be put in the prefix anyway.
-       updateMacroInstances();
-
        // There are a few differences between nice LaTeX and usual files:
        // usual is \batchmode and has a
        // special input@path to allow the including of figures
@@ -1322,9 +1425,7 @@ void Buffer::writeLaTeXSource(odocstream & os,
        if (output_preamble) {
                if (!runparams.nice) {
                        // code for usual, NOT nice-latex-file
-                       os << "\\batchmode\n"; // changed
-                       // from \nonstopmode
-                       d->texrow.newline();
+                       os << "\\batchmode\n"; // changed from \nonstopmode
                }
                if (!original_path.empty()) {
                        // FIXME UNICODE
@@ -1360,9 +1461,6 @@ void Buffer::writeLaTeXSource(odocstream & os,
                                   << "\\def\\input@path{{"
                                   << inputpath << "/}}\n"
                                   << "\\makeatother\n";
-                               d->texrow.newline();
-                               d->texrow.newline();
-                               d->texrow.newline();
                        }
                }
 
@@ -1371,9 +1469,9 @@ void Buffer::writeLaTeXSource(odocstream & os,
                MacroSet parentMacros;
                listParentMacros(parentMacros, features);
 
+               runparams.use_polyglossia = features.usePolyglossia();
                // Write the preamble
                runparams.use_babel = params().writeLaTeX(os, features,
-                                                         d->texrow,
                                                          d->filename.onlyPath());
 
                runparams.use_japanese = features.isRequired("japanese");
@@ -1383,19 +1481,18 @@ void Buffer::writeLaTeXSource(odocstream & os,
 
                // make the body.
                os << "\\begin{document}\n";
-               d->texrow.newline();
 
                // output the parent macros
                MacroSet::iterator it = parentMacros.begin();
                MacroSet::iterator end = parentMacros.end();
                for (; it != end; ++it) {
-                       int num_lines = (*it)->write(os, true);
-                       d->texrow.newlines(num_lines);
+                       int num_lines = (*it)->write(os.os(), true);
+                       os.texrow().newlines(num_lines);
                }
                
        } // output_preamble
 
-       d->texrow.start(paragraphs().begin()->id(), 0);
+       os.texrow().start(paragraphs().begin()->id(), 0);
 
        LYXERR(Debug::INFO, "preamble finished, now the body.");
 
@@ -1409,7 +1506,7 @@ void Buffer::writeLaTeXSource(odocstream & os,
        }
 
        // the real stuff
-       latexParagraphs(*this, text(), os, d->texrow, runparams);
+       latexParagraphs(*this, text(), os, runparams);
 
        // Restore the parenthood if needed
        if (output_preamble)
@@ -1417,11 +1514,9 @@ void Buffer::writeLaTeXSource(odocstream & os,
 
        // add this just in case after all the paragraphs
        os << endl;
-       d->texrow.newline();
 
        if (output_preamble) {
                os << "\\end{document}\n";
-               d->texrow.newline();
                LYXERR(Debug::LATEX, "makeLaTeXFile...done");
        } else {
                LYXERR(Debug::LATEX, "LaTeXFile for inclusion made.");
@@ -1429,7 +1524,7 @@ void Buffer::writeLaTeXSource(odocstream & os,
        runparams_in.encoding = runparams.encoding;
 
        // Just to be sure. (Asger)
-       d->texrow.newline();
+       os.texrow().newline();
 
        //for (int i = 0; i<d->texrow.rows(); i++) {
        // int id,pos;
@@ -1438,25 +1533,7 @@ void Buffer::writeLaTeXSource(odocstream & os,
        //}
 
        LYXERR(Debug::INFO, "Finished making LaTeX file.");
-       LYXERR(Debug::INFO, "Row count was " << d->texrow.rows() - 1 << '.');
-}
-
-
-bool Buffer::isLatex() const
-{
-       return params().documentClass().outputType() == LATEX;
-}
-
-
-bool Buffer::isLiterate() const
-{
-       return params().documentClass().outputType() == LITERATE;
-}
-
-
-bool Buffer::isDocBook() const
-{
-       return params().documentClass().outputType() == DOCBOOK;
+       LYXERR(Debug::INFO, "Row count was " << os.texrow().rows() - 1 << '.');
 }
 
 
@@ -1470,6 +1547,11 @@ void Buffer::makeDocBookFile(FileName const & fname,
        if (!openFileWrite(ofs, fname))
                return;
 
+       // make sure we are ready to export
+       // this needs to be done before we validate
+       updateBuffer();
+       updateMacroInstances(OutputUpdate);
+
        writeDocBookSource(ofs, fname.absFileName(), runparams, body_only);
 
        ofs.close();
@@ -1544,8 +1626,6 @@ void Buffer::writeDocBookSource(odocstream & os, string const & fname,
 
        params().documentClass().counters().reset();
 
-       updateMacros();
-
        sgml::openTag(os, top);
        os << '\n';
        docbookParagraphs(text(), *this, os, runparams);
@@ -1554,8 +1634,7 @@ void Buffer::writeDocBookSource(odocstream & os, string const & fname,
 
 
 void Buffer::makeLyXHTMLFile(FileName const & fname,
-                             OutputParams const & runparams,
-                             bool const body_only) const
+                             OutputParams const & runparams) const
 {
        LYXERR(Debug::LATEX, "makeLyXHTMLFile...");
 
@@ -1563,7 +1642,12 @@ void Buffer::makeLyXHTMLFile(FileName const & fname,
        if (!openFileWrite(ofs, fname))
                return;
 
-       writeLyXHTMLSource(ofs, runparams, body_only);
+       // make sure we are ready to export
+       // this has to be done before we validate
+       updateBuffer(UpdateMaster, OutputUpdate);
+       updateMacroInstances(OutputUpdate);
+
+       writeLyXHTMLSource(ofs, runparams);
 
        ofs.close();
        if (ofs.fail())
@@ -1577,10 +1661,7 @@ void Buffer::writeLyXHTMLSource(odocstream & os,
 {
        LaTeXFeatures features(*this, params(), runparams);
        validate(features);
-       updateBuffer(UpdateMaster, OutputUpdate);
        d->bibinfo_.makeCitationLabels(*this);
-       updateMacros();
-       updateMacroInstances();
 
        if (!only_body) {
                os << "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"
@@ -1599,7 +1680,7 @@ void Buffer::writeLyXHTMLSource(odocstream & os,
 
                os << "\n<!-- Text Class Preamble -->\n"
                   << features.getTClassHTMLPreamble()
-                  << "\n<!-- Premable Snippets -->\n"
+                  << "\n<!-- Preamble Snippets -->\n"
                   << from_utf8(features.getPreambleSnippets());
 
                os << "\n<!-- Layout-provided Styles -->\n";
@@ -1666,8 +1747,6 @@ void Buffer::validate(LaTeXFeatures & features) const
 {
        params().validate(features);
 
-       updateMacros();
-
        for_each(paragraphs().begin(), paragraphs().end(),
                 bind(&Paragraph::validate, _1, ref(features)));
 
@@ -1729,12 +1808,14 @@ void Buffer::updateBibfilesCache(UpdateScope scope) const
        }
        d->bibfile_cache_valid_ = true;
        d->bibinfo_cache_valid_ = false;
+       d->cite_labels_valid_ = false;
 }
 
 
 void Buffer::invalidateBibinfoCache() const
 {
        d->bibinfo_cache_valid_ = false;
+       d->cite_labels_valid_ = false;
        // also invalidate the cache for the parent buffer
        Buffer const * const pbuf = d->parent();
        if (pbuf)
@@ -1746,6 +1827,7 @@ void Buffer::invalidateBibfileCache() const
 {
        d->bibfile_cache_valid_ = false;
        d->bibinfo_cache_valid_ = false;
+       d->cite_labels_valid_ = false;
        // also invalidate the cache for the parent buffer
        Buffer const * const pbuf = d->parent();
        if (pbuf)
@@ -1777,43 +1859,78 @@ BiblioInfo const & Buffer::masterBibInfo() const
 }
 
 
-void Buffer::checkBibInfoCache() const 
+void Buffer::checkIfBibInfoCacheIsValid() const
 {
        // use the master's cache
        Buffer const * const tmp = masterBuffer();
        if (tmp != this) {
-               tmp->checkBibInfoCache();
+               tmp->checkIfBibInfoCacheIsValid();
                return;
        }
 
-       // this will also reload the cache if it is invalid 
-       support::FileNameList const & bibfiles_cache = getBibfilesCache();
-       
        // compare the cached timestamps with the actual ones.
-       support::FileNameList::const_iterator ei = bibfiles_cache.begin();
-       support::FileNameList::const_iterator en = bibfiles_cache.end();
+       FileNameList const & bibfiles_cache = getBibfilesCache();
+       FileNameList::const_iterator ei = bibfiles_cache.begin();
+       FileNameList::const_iterator en = bibfiles_cache.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->cite_labels_valid_ = false;
                        d->bibfile_status_[*ei] = lastw;
                }
        }
-       
-       // if not valid, then reload the info
-       if (!d->bibinfo_cache_valid_) {
-               d->bibinfo_.clear();
-               fillWithBibKeys(d->bibinfo_);
-               d->bibinfo_cache_valid_ = true;
+}
+
+
+void Buffer::reloadBibInfoCache() const
+{
+       // use the master's cache
+       Buffer const * const tmp = masterBuffer();
+       if (tmp != this) {
+               tmp->reloadBibInfoCache();
+               return;
        }
+
+       checkIfBibInfoCacheIsValid();
+       if (d->bibinfo_cache_valid_)
+               return;
+
+       d->bibinfo_.clear();
+       collectBibKeys();
+       d->bibinfo_cache_valid_ = true;
 }
 
 
-void Buffer::fillWithBibKeys(BiblioInfo & keys) const
+void Buffer::collectBibKeys() const
 {
        for (InsetIterator it = inset_iterator_begin(inset()); it; ++it)
-               it->fillWithBibKeys(keys, it);
+               it->collectBibKeys(it);
+}
+
+
+void Buffer::addBiblioInfo(BiblioInfo const & bi) const
+{
+       Buffer const * tmp = masterBuffer();
+       BiblioInfo & masterbi = (tmp == this) ?
+               d->bibinfo_ : tmp->d->bibinfo_;
+       masterbi.mergeBiblioInfo(bi);
+}
+
+
+void Buffer::addBibTeXInfo(docstring const & key, BibTeXInfo const & bi) const
+{
+       Buffer const * tmp = masterBuffer();
+       BiblioInfo & masterbi = (tmp == this) ?
+               d->bibinfo_ : tmp->d->bibinfo_;
+       masterbi[key] = bi;
+}
+
+
+bool Buffer::citeLabelsValid() const
+{
+       return masterBuffer()->d->cite_labels_valid_;
 }
 
 
@@ -1832,21 +1949,6 @@ void Buffer::markDepClean(string const & name)
 }
 
 
-bool Buffer::isExportableFormat(string const & format) const
-{
-               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::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 {
        if (isInternal()) {
@@ -1875,7 +1977,7 @@ bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag)
 
                case LFUN_BUFFER_EXPORT: {
                        docstring const arg = cmd.argument();
-                       enable = arg == "custom" || isExportable(to_utf8(arg));
+                       enable = arg == "custom" || params().isExportable(to_utf8(arg));
                        if (!enable)
                                flag.message(bformat(
                                        _("Don't know how to export to format: %1$s"), arg));
@@ -1883,11 +1985,11 @@ bool Buffer::getStatus(FuncRequest const & cmd, FuncStatus & flag)
                }
 
                case LFUN_BUFFER_CHKTEX:
-                       enable = isLatex() && !lyxrc.chktex_command.empty();
+                       enable = params().isLatex() && !lyxrc.chktex_command.empty();
                        break;
 
                case LFUN_BUILD_PROGRAM:
-                       enable = isExportable("program");
+                       enable = params().isExportable("program");
                        break;
 
                case LFUN_BRANCH_ACTIVATE: 
@@ -1998,7 +2100,7 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 
                // Execute the command in the background
                Systemcall call;
-               call.startscript(Systemcall::DontWait, command);
+               call.startscript(Systemcall::DontWait, command, filePath());
                break;
        }
 
@@ -2011,6 +2113,7 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
 
        case LFUN_BUFFER_AUTO_SAVE:
                autoSave();
+               resetAutosaveTimers();
                break;
 
        case LFUN_BRANCH_ADD: {
@@ -2175,7 +2278,8 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
                                command2 += quoteName(psname);
                                // First run dvips.
                                // If successful, then spool command
-                               res = one.startscript(Systemcall::Wait, command);
+                               res = one.startscript(Systemcall::Wait, command,
+                                                     filePath());
 
                                if (res == 0) {
                                        // If there's no GUI, we have to wait on this command. Otherwise,
@@ -2183,7 +2287,8 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
                                        // file, before it can be printed!!
                                        Systemcall::Starttype stype = use_gui ?
                                                Systemcall::DontWait : Systemcall::Wait;
-                                       res = one.startscript(stype, command2);
+                                       res = one.startscript(stype, command2,
+                                                             filePath());
                                }
                        } else {
                                // case 2: print directly to a printer
@@ -2192,7 +2297,8 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
                                // as above....
                                Systemcall::Starttype stype = use_gui ?
                                        Systemcall::DontWait : Systemcall::Wait;
-                               res = one.startscript(stype, command + quoteName(dviname));
+                               res = one.startscript(stype, command +
+                                               quoteName(dviname), filePath());
                        }
 
                } else {
@@ -2215,7 +2321,7 @@ void Buffer::dispatch(FuncRequest const & func, DispatchResult & dr)
                        // as above....
                        Systemcall::Starttype stype = use_gui ?
                                Systemcall::DontWait : Systemcall::Wait;
-                       res = one.startscript(stype, command);
+                       res = one.startscript(stype, command, filePath());
                }
 
                if (res == 0) 
@@ -2373,6 +2479,8 @@ bool Buffer::isExternallyModified(CheckMethod method) const
 void Buffer::saveCheckSum() const
 {
        FileName const & file = d->filename;
+
+       file.refresh();
        if (file.exists()) {
                d->timestamp_ = file.lastModified();
                d->checksum_ = file.checksum();
@@ -2477,7 +2585,7 @@ Buffer const * Buffer::parent() const
 ListOfBuffers Buffer::allRelatives() const
 {
        ListOfBuffers lb = masterBuffer()->getDescendents();
-       lb.push_front(const_cast<Buffer *>(this));
+       lb.push_front(const_cast<Buffer *>(masterBuffer()));
        return lb;
 }
 
@@ -2618,7 +2726,9 @@ MacroData const * Buffer::Impl::getBufferMacro(docstring const & name,
                        break;
 
                // scope ends behind pos?
-               if (pos < it->second.first) {
+               if (pos < it->second.first
+                       && (cloned_buffer_ ||
+                           theBufferList().isLoaded(it->second.second))) {
                        // look for macro in external file
                        macro_lock = true;
                        MacroData const * data
@@ -2852,7 +2962,7 @@ void Buffer::getUsedBranches(std::list<docstring> & result, bool const from_mast
 }
 
 
-void Buffer::updateMacroInstances() const
+void Buffer::updateMacroInstances(UpdateType utype) const
 {
        LYXERR(Debug::MACROS, "updateMacroInstances for "
                << d->filename.onlyFileName());
@@ -2870,7 +2980,7 @@ void Buffer::updateMacroInstances() const
                MacroContext mc = MacroContext(this, it);
                for (DocIterator::idx_type i = 0; i < n; ++i) {
                        MathData & data = minset->cell(i);
-                       data.updateMacros(0, mc);
+                       data.updateMacros(0, mc, utype);
                }
        }
 }
@@ -2980,22 +3090,23 @@ void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to,
 {
        //FIXME: This does not work for child documents yet.
        LASSERT(code == CITE_CODE, /**/);
+
+       reloadBibInfoCache();
+
        // 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();
+       vector<docstring> labels;
 
        for (; bit != bend; ++bit)
                // FIXME UNICODE
                labels.push_back(bit->first);
-       paramName = "key";
 
        if (count(labels.begin(), labels.end(), from) > 1)
                return;
 
+       string const paramName = "key";
        for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
                if (it->lyxCode() == code) {
                        InsetCommand * inset = it->asInsetCommand();
@@ -3009,13 +3120,13 @@ void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to,
 }
 
 
-void Buffer::getSourceCode(odocstream & os, pit_type par_begin,
-       pit_type par_end, bool full_source) const
+void Buffer::getSourceCode(odocstream & os, string const format,
+                          pit_type par_begin, pit_type par_end,
+                          bool full_source) const
 {
        OutputParams runparams(&params().encoding());
        runparams.nice = true;
-       runparams.flavor = params().useXetex ? 
-               OutputParams::XETEX : OutputParams::LATEX;
+       runparams.flavor = params().getOutputFlavor(format);
        runparams.linelen = lyxrc.plaintext_linelen;
        // No side effect of file copying and image conversion
        runparams.dryrun = true;
@@ -3025,11 +3136,15 @@ void Buffer::getSourceCode(odocstream & os, pit_type par_begin,
                d->texrow.reset();
                d->texrow.newline();
                d->texrow.newline();
-               if (isDocBook())
+               if (params().isDocBook())
                        writeDocBookSource(os, absFileName(), runparams, false);
-               else
+               else if (runparams.flavor == OutputParams::HTML)
+                       writeLyXHTMLSource(os, runparams, false);
+               else {
                        // latex or literate
-                       writeLaTeXSource(os, string(), runparams, true, true);
+                       otexstream ots(os, d->texrow);
+                       writeLaTeXSource(ots, string(), runparams, true, true);
+               }
        } else {
                runparams.par_begin = par_begin;
                runparams.par_end = par_end;
@@ -3049,23 +3164,23 @@ void Buffer::getSourceCode(odocstream & os, pit_type par_begin,
                texrow.newline();
                texrow.newline();
                // output paragraphs
-               if (isDocBook())
+               if (params().isDocBook())
                        docbookParagraphs(text(), *this, os, runparams);
-               else 
+               else if (runparams.flavor == OutputParams::HTML) {
+                       XHTMLStream xs(os);
+                       xhtmlParagraphs(text(), *this, xs, runparams);
+               } else {
                        // latex or literate
-                       latexParagraphs(*this, text(), os, texrow, runparams);
+                       otexstream ots(os, texrow);
+                       latexParagraphs(*this, text(), ots, runparams);
+               }
        }
 }
 
 
 ErrorList & Buffer::errorList(string const & type) const
 {
-       static ErrorList emptyErrorList;
-       map<string, ErrorList>::iterator it = d->errorLists.find(type);
-       if (it == d->errorLists.end())
-               return emptyErrorList;
-
-       return it->second;
+       return d->errorLists[type];
 }
 
 
@@ -3216,13 +3331,7 @@ int AutoSaveBuffer::generateChild()
 
 FileName Buffer::getEmergencyFileName() const
 {
-       return getEmergencyFileNameFor(d->filename);
-}
-
-
-FileName Buffer::getEmergencyFileNameFor(FileName const & fn) const
-{
-       return FileName(fn.absFileName() + ".emergency");
+       return FileName(d->filename.absFileName() + ".emergency");
 }
 
 
@@ -3238,15 +3347,9 @@ FileName Buffer::getAutosaveFileName() const
        if (!isUnnamed() || fpath.empty() || !FileName(fpath).exists())
                fpath = filePath();
 
-       string const fname = d->filename.onlyFileName();
-       return getAutosaveFileNameFor(makeAbsPath(fname, fpath));
-}
-
+       string const fname = "#" + d->filename.onlyFileName() + "#";
 
-FileName Buffer::getAutosaveFileNameFor(FileName const & fn) const
-{
-       string const fname = "#" + onlyFileName(fn.absFileName()) + "#";
-       return FileName(onlyPath(fn.absFileName()) + fname);
+       return makeAbsPath(fname, fpath);
 }
 
 
@@ -3268,56 +3371,36 @@ void Buffer::moveAutosaveFile(support::FileName const & oldauto) const
 }
 
 
-// Perfect target for a thread...
-void Buffer::autoSave() const
+bool Buffer::autoSave() const 
 {
-       if (d->bak_clean || isReadonly()) {
-               // We don't save now, but we'll try again later
-               resetAutosaveTimers();
-               return;
-       }
+       Buffer const * buf = d->cloned_buffer_ ? d->cloned_buffer_ : this;
+       if (buf->d->bak_clean || isReadonly())
+               return true;
 
-       // emit message signal.
        message(_("Autosaving current document..."));
-       AutoSaveBuffer autosave(*this, getAutosaveFileName());
-       autosave.start();
-
-       d->bak_clean = true;
-
-       resetAutosaveTimers();
-}
-
-
-string Buffer::bufferFormat() const
-{
-       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();
+       buf->d->bak_clean = true;
+       
+       FileName const fname = getAutosaveFileName();
+       if (d->cloned_buffer_) {
+               // If this buffer is cloned, we assume that
+               // we are running in a separate thread already.
+               FileName const tmp_ret = FileName::tempName("lyxauto");
+               if (!tmp_ret.empty()) {
+                       writeFile(tmp_ret);
+                       // assume successful write of tmp_ret
+                       if (tmp_ret.moveTo(fname))
+                               return true;
+               }
+               // failed to write/rename tmp_ret so try writing direct
+               return writeFile(fname);
+       } else {        
+               /// This function is deprecated as the frontend needs to take care
+               /// of cloning the buffer and autosaving it in another thread. It
+               /// is still here to allow (QT_VERSION < 0x040400).
+               AutoSaveBuffer autosave(*this, fname);
+               autosave.start();
+               return true;
        }
-       return lyxrc.default_view_format;
 }
 
 
@@ -3343,6 +3426,11 @@ namespace {
 void Buffer::setExportStatus(bool e) const
 {
        d->doing_export = e;    
+       ListOfBuffers clist = getDescendents();
+       ListOfBuffers::const_iterator cit = clist.begin();
+       ListOfBuffers::const_iterator const cen = clist.end();
+       for (; cit != cen; ++cit)
+               (*cit)->d->doing_export = e;
 }
 
 
@@ -3361,13 +3449,15 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
        runparams.flavor = OutputParams::LATEX;
        runparams.linelen = lyxrc.plaintext_linelen;
        runparams.includeall = includeall;
-       vector<string> backs = backends();
+       vector<string> backs = params().backends();
+       Converters converters = theConverters();
        if (find(backs.begin(), backs.end(), format) == backs.end()) {
                // Get shortest path to format
+               converters.buildGraph();
                Graph::EdgePath path;
                for (vector<string>::const_iterator it = backs.begin();
                     it != backs.end(); ++it) {
-                       Graph::EdgePath p = theConverters().getPath(*it, format);
+                       Graph::EdgePath p = converters.getPath(*it, format);
                        if (!p.empty() && (path.empty() || p.size() < path.size())) {
                                backend_format = *it;
                                path = p;
@@ -3383,13 +3473,17 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
                        }
                        return false;
                }
-               runparams.flavor = theConverters().getFlavor(path);
+               runparams.flavor = converters.getFlavor(path);
 
        } else {
                backend_format = format;
                // FIXME: Don't hardcode format names here, but use a flag
                if (backend_format == "pdflatex")
                        runparams.flavor = OutputParams::PDFLATEX;
+               else if (backend_format == "luatex")
+                       runparams.flavor = OutputParams::LUATEX;
+               else if (backend_format == "xetex")
+                       runparams.flavor = OutputParams::XETEX;
        }
 
        string filename = latexName(false);
@@ -3397,9 +3491,6 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
        filename = changeExtension(filename,
                                   formats.extension(backend_format));
 
-       // fix macros
-       updateMacroInstances();
-
        // Plain text backend
        if (backend_format == "text") {
                runparams.flavor = OutputParams::TEXT;
@@ -3420,22 +3511,26 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
                        break;
                case BufferParams::LaTeX:
                        runparams.math_flavor = OutputParams::MathAsLaTeX; 
-                       break;                                                                                  
+                       break;
                }
-               
                makeLyXHTMLFile(FileName(filename), runparams);
-       }       else if (backend_format == "lyx")
+       } else if (backend_format == "lyx")
                writeFile(FileName(filename));
        // Docbook backend
-       else if (isDocBook()) {
+       else if (params().isDocBook()) {
                runparams.nice = !put_in_tempdir;
                makeDocBookFile(FileName(filename), runparams);
        }
        // LaTeX backend
        else if (backend_format == format) {
                runparams.nice = true;
-               if (!makeLaTeXFile(FileName(filename), string(), runparams))
+               if (!makeLaTeXFile(FileName(filename), string(), runparams)) {
+                       if (d->cloned_buffer_) {
+                               d->cloned_buffer_->d->errorLists["Export"] =
+                                       d->errorLists["Export"];
+                       }
                        return false;
+               }
        } else if (!lyxrc.tex_allows_spaces
                   && contains(filePath(), ' ')) {
                Alert::error(_("File name error"),
@@ -3443,21 +3538,26 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
                return false;
        } else {
                runparams.nice = false;
-               if (!makeLaTeXFile(FileName(filename), filePath(), runparams))
+               if (!makeLaTeXFile(FileName(filename), filePath(), runparams)) {
+                       if (d->cloned_buffer_) {
+                               d->cloned_buffer_->d->errorLists["Export"] =
+                                       d->errorLists["Export"];
+                       }
                        return false;
+               }
        }
 
        string const error_type = (format == "program")
-               ? "Build" : bufferFormat();
+               ? "Build" : params().bufferFormat();
        ErrorList & error_list = d->errorLists[error_type];
        string const ext = formats.extension(format);
        FileName const tmp_result_file(changeExtension(filename, ext));
-       bool const success = theConverters().convert(this, FileName(filename),
+       bool const success = converters.convert(this, FileName(filename),
                tmp_result_file, FileName(absFileName()), backend_format, format,
                error_list);
 
        // Emit the signal to show the error list or copy it back to the
-       // cloned Buffer so that it cab be emitted afterwards.
+       // cloned Buffer so that it can be emitted afterwards.
        if (format != backend_format) {
                if (d->cloned_buffer_) {
                        d->cloned_buffer_->d->errorLists[error_type] = 
@@ -3470,6 +3570,10 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
                ListOfBuffers::const_iterator const cen = clist.end();
                for (; cit != cen; ++cit) {
                        if (d->cloned_buffer_) {
+                               // Enable reverse search by copying back the
+                               // texrow object to the cloned buffer.
+                               // FIXME: this is not thread safe.
+                               (*cit)->d->cloned_buffer_->d->texrow = (*cit)->d->texrow;
                                (*cit)->d->cloned_buffer_->d->errorLists[error_type] = 
                                        (*cit)->d->errorLists[error_type];
                        } else
@@ -3483,7 +3587,7 @@ bool Buffer::doExport(string const & format, bool put_in_tempdir,
                // 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;
-               string const error_type = bufferFormat();
+               string const error_type = params().bufferFormat();
                d->cloned_buffer_->d->errorLists[error_type] = d->errorLists[error_type];
        }
 
@@ -3565,65 +3669,25 @@ bool Buffer::preview(string const & format, bool includeall) const
 }
 
 
-bool Buffer::isExportable(string const & format) const
-{
-       vector<string> backs = backends();
-       for (vector<string>::const_iterator it = backs.begin();
-            it != backs.end(); ++it)
-               if (theConverters().isReachable(*it, format))
-                       return true;
-       return false;
-}
-
-
-vector<Format const *> Buffer::exportableFormats(bool only_viewable) const
-{
-       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;
-            it != backs.end(); ++it) {
-               vector<Format const *>  r =
-                       theConverters().getReachable(*it, only_viewable, false);
-               result.insert(result.end(), r.begin(), r.end());
-       }
-       return result;
-}
-
-
-vector<string> Buffer::backends() const
-{
-       vector<string> v;
-       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;
-}
-
-
-Buffer::ReadStatus Buffer::extractFromVC(FileName const & fn)
+Buffer::ReadStatus Buffer::extractFromVC()
 {
-       bool const found = LyXVC::file_not_found_hook(fn);
+       bool const found = LyXVC::file_not_found_hook(d->filename);
        if (!found)
                return ReadFileNotFound;
-       if (!fn.isReadableFile())
+       if (!d->filename.isReadableFile())
                return ReadVCError;
        return ReadSuccess;
 }
 
 
-Buffer::ReadStatus Buffer::loadEmergency(FileName const & fn)
+Buffer::ReadStatus Buffer::loadEmergency()
 {
-       FileName const emergencyFile = getEmergencyFileNameFor(fn);
+       FileName const emergencyFile = getEmergencyFileName();
        if (!emergencyFile.exists() 
-                 || emergencyFile.lastModified() <= fn.lastModified())
+                 || emergencyFile.lastModified() <= d->filename.lastModified())
                return ReadFileNotFound;
 
-       docstring const file = makeDisplayPath(fn.absFileName(), 20);
+       docstring const file = makeDisplayPath(d->filename.absFileName(), 20);
        docstring const text = bformat(_("An emergency save of the document "
                "%1$s exists.\n\nRecover emergency save?"), file);
        
@@ -3637,12 +3701,19 @@ Buffer::ReadStatus Buffer::loadEmergency(FileName const & fn)
                ReadStatus const ret_llf = loadThisLyXFile(emergencyFile);
                bool const success = (ret_llf == ReadSuccess);
                if (success) {
+                       if (isReadonly()) {
+                               Alert::warning(_("File is read-only"),
+                                       bformat(_("An emergency file is successfully loaded, "
+                                       "but the original file %1$s is marked read-only. "
+                                       "Please make sure to save the document as a different "
+                                       "file."), from_utf8(d->filename.absFileName())));
+                       }
                        markDirty();
                        str = _("Document was successfully recovered.");
                } else
                        str = _("Document was NOT successfully recovered.");
                str += "\n\n" + bformat(_("Remove emergency file now?\n(%1$s)"),
-                                       makeDisplayPath(emergencyFile.absFileName()));
+                       makeDisplayPath(emergencyFile.absFileName()));
 
                int const del_emerg = 
                        Alert::prompt(_("Delete emergency file?"), str, 1, 1,
@@ -3672,15 +3743,15 @@ Buffer::ReadStatus Buffer::loadEmergency(FileName const & fn)
 }
 
 
-Buffer::ReadStatus Buffer::loadAutosave(FileName const & fn)
+Buffer::ReadStatus Buffer::loadAutosave()
 {
        // Now check if autosave file is newer.
-       FileName const autosaveFile = getAutosaveFileNameFor(fn);
+       FileName const autosaveFile = getAutosaveFileName();
        if (!autosaveFile.exists() 
-                 || autosaveFile.lastModified() <= fn.lastModified()) 
+                 || autosaveFile.lastModified() <= d->filename.lastModified()) 
                return ReadFileNotFound;
 
-       docstring const file = makeDisplayPath(fn.absFileName(), 20);
+       docstring const file = makeDisplayPath(d->filename.absFileName(), 20);
        docstring const text = bformat(_("The backup of the document %1$s " 
                "is newer.\n\nLoad the backup instead?"), file);
        int const ret = Alert::prompt(_("Load backup?"), text, 0, 2,
@@ -3692,6 +3763,14 @@ Buffer::ReadStatus Buffer::loadAutosave(FileName const & fn)
                ReadStatus const ret_llf = loadThisLyXFile(autosaveFile);
                // the file is not saved if we load the autosave file.
                if (ret_llf == ReadSuccess) {
+                       if (isReadonly()) {
+                               Alert::warning(_("File is read-only"),
+                                       bformat(_("A backup file is successfully loaded, "
+                                       "but the original file %1$s is marked read-only. "
+                                       "Please make sure to save the document as a "
+                                       "different file."), 
+                                       from_utf8(d->filename.absFileName())));
+                       }
                        markDirty();
                        return ReadSuccess;
                }
@@ -3708,23 +3787,23 @@ Buffer::ReadStatus Buffer::loadAutosave(FileName const & fn)
 }
 
 
-Buffer::ReadStatus Buffer::loadLyXFile(FileName const & fn)
+Buffer::ReadStatus Buffer::loadLyXFile()
 {
-       if (!fn.isReadableFile()) {
-               ReadStatus const ret_rvc = extractFromVC(fn);
+       if (!d->filename.isReadableFile()) {
+               ReadStatus const ret_rvc = extractFromVC();
                if (ret_rvc != ReadSuccess)
                        return ret_rvc;
        }
 
-       ReadStatus const ret_re = loadEmergency(fn);
+       ReadStatus const ret_re = loadEmergency();
        if (ret_re == ReadSuccess || ret_re == ReadCancel)
                return ret_re;
        
-       ReadStatus const ret_ra = loadAutosave(fn);
+       ReadStatus const ret_ra = loadAutosave();
        if (ret_ra == ReadSuccess || ret_ra == ReadCancel)
                return ret_ra;
 
-       return loadThisLyXFile(fn);
+       return loadThisLyXFile(d->filename);
 }
 
 
@@ -3736,24 +3815,56 @@ Buffer::ReadStatus Buffer::loadThisLyXFile(FileName const & fn)
 
 void Buffer::bufferErrors(TeXErrors const & terr, ErrorList & errorList) const
 {
-       TeXErrors::Errors::const_iterator cit = terr.begin();
+       TeXErrors::Errors::const_iterator it = terr.begin();
        TeXErrors::Errors::const_iterator end = terr.end();
+       ListOfBuffers clist = getDescendents();
+       ListOfBuffers::const_iterator cen = clist.end();
 
-       for (; cit != end; ++cit) {
+       for (; it != end; ++it) {
                int id_start = -1;
                int pos_start = -1;
-               int errorRow = cit->error_in_line;
-               bool found = d->texrow.getIdFromRow(errorRow, id_start,
-                                                      pos_start);
+               int errorRow = it->error_in_line;
+               Buffer const * buf = 0;
+               Impl const * p = d;
+               if (it->child_name.empty())
+                   p->texrow.getIdFromRow(errorRow, id_start, pos_start);
+               else {
+                       // The error occurred in a child
+                       ListOfBuffers::const_iterator cit = clist.begin();
+                       for (; cit != cen; ++cit) {
+                               string const child_name =
+                                       DocFileName(changeExtension(
+                                               (*cit)->absFileName(), "tex")).
+                                                       mangledFileName();
+                               if (it->child_name != child_name)
+                                       continue;
+                               (*cit)->d->texrow.getIdFromRow(errorRow,
+                                                       id_start, pos_start);
+                               if (id_start != -1) {
+                                       buf = d->cloned_buffer_
+                                               ? (*cit)->d->cloned_buffer_->d->owner_
+                                               : (*cit)->d->owner_;
+                                       p = (*cit)->d;
+                                       break;
+                               }
+                       }
+               }
                int id_end = -1;
                int pos_end = -1;
+               bool found;
                do {
                        ++errorRow;
-                       found = d->texrow.getIdFromRow(errorRow, id_end, pos_end);
+                       found = p->texrow.getIdFromRow(errorRow, id_end, pos_end);
                } while (found && id_start == id_end && pos_start == pos_end);
 
-               errorList.push_back(ErrorItem(cit->error_desc,
-                       cit->error_text, id_start, pos_start, pos_end));
+               if (id_start != id_end) {
+                       // Next registered position is outside the inset where
+                       // the error occurred, so signal end-of-paragraph
+                       pos_end = 0;
+               }
+
+               errorList.push_back(ErrorItem(it->error_desc,
+                       it->error_text, id_start, pos_start, pos_end, buf));
        }
 }
 
@@ -3772,7 +3883,7 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
        
        // do this only if we are the top-level Buffer
        if (master == this)
-               checkBibInfoCache();
+               reloadBibInfoCache();
 
        // 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.
@@ -3816,6 +3927,8 @@ void Buffer::updateBuffer(UpdateScope scope, UpdateType utype) const
                // TocBackend update will be done later.
                return;
 
+       d->bibinfo_cache_valid_ = true;
+       d->cite_labels_valid_ = true;
        cbuf.tocBackend().update();
        if (scope == UpdateMaster)
                cbuf.structureChanged();
@@ -3911,10 +4024,12 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const
        // Compute the item depth of the paragraph
        par.itemdepth = getItemDepth(it);
 
-       if (layout.margintype == MARGIN_MANUAL
-           || layout.latextype == LATEX_BIB_ENVIRONMENT) {
+       if (layout.margintype == MARGIN_MANUAL) {
                if (par.params().labelWidthString().empty())
                        par.params().labelWidthString(par.expandLabel(layout, bp));
+       } else if (layout.latextype == LATEX_BIB_ENVIRONMENT) {
+               // we do not need to do anything here, since the empty case is
+               // handled during export.
        } else {
                par.params().labelWidthString(docstring());
        }
@@ -3922,11 +4037,11 @@ void Buffer::Impl::setLabel(ParIterator & it, UpdateType utype) const
        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));
+                     && (layout.latextype != LATEX_ENVIRONMENT
+                         || it.text()->isFirstInSequence(it.pit()))) {
+                       if (counters.hasCounter(layout.counter))
+                               counters.step(layout.counter, utype);
+                       par.params().labelString(par.expandLabel(layout, bp));
                } else
                        par.params().labelString(docstring());
                break;
@@ -4099,32 +4214,63 @@ int Buffer::spellCheck(DocIterator & from, DocIterator & to,
 Buffer::ReadStatus Buffer::reload()
 {
        setBusy(true);
-       // c.f. bug 6587
+       // c.f. bug http://www.lyx.org/trac/ticket/6587
        removeAutosaveFile();
        // e.g., read-only status could have changed due to version control
        d->filename.refresh();
        docstring const disp_fn = makeDisplayPath(d->filename.absFileName());
 
-       ReadStatus const status = loadLyXFile(d->filename);
+       ReadStatus const status = loadLyXFile();
        if (status == ReadSuccess) {
                updateBuffer();
                changed(true);
                updateTitles();
                markClean();
-               saveCheckSum();
                message(bformat(_("Document %1$s reloaded."), disp_fn));
+               d->undo_.clear();
        } else {
                message(bformat(_("Could not reload document %1$s."), disp_fn));
        }       
        setBusy(false);
-       thePreviews().removeLoader(*this);
-       if (graphics::Previews::status() != LyXRC::PREVIEW_OFF)
-               thePreviews().generateBufferPreviews(*this);
+       removePreviews();
+       updatePreviews();
        errors("Parse");
        return status;
 }
 
 
+bool Buffer::saveAs(FileName const & fn)
+{
+       FileName const old_name = fileName();
+       FileName const old_auto = getAutosaveFileName();
+       bool const old_unnamed = isUnnamed();
+
+       setFileName(fn);
+       markDirty();
+       setUnnamed(false);
+
+       if (save()) {
+               // bring the autosave file with us, just in case.
+               moveAutosaveFile(old_auto);
+               // validate version control data and
+               // correct buffer title
+               lyxvc().file_found_hook(fileName());
+               updateTitles();
+               // the file has now been saved to the new location.
+               // we need to check that the locations of child buffers
+               // are still valid.
+               checkChildBuffers();
+               return true;
+       } else {
+               // save failed
+               // reset the old filename and unnamed state
+               setFileName(old_name);
+               setUnnamed(old_unnamed);
+               return false;
+       }
+}
+
+
 // FIXME We could do better here, but it is complicated. What would be
 // nice is to offer either (a) to save the child buffer to an appropriate
 // location, so that it would "move with the master", or else (b) to update