]> git.lyx.org Git - lyx.git/blobdiff - src/Buffer.cpp
* gcc does not like missing characters in keywords
[lyx.git] / src / Buffer.cpp
index 1135b18ef0f00d1566bbc75e1a69992ba0d8d1fd..192113da7dafdbf1163bb8efc9019c024a464757 100644 (file)
 #include "buffer_funcs.h"
 #include "BufferList.h"
 #include "BufferParams.h"
-#include "Counters.h"
 #include "Bullet.h"
 #include "Chktex.h"
+#include "Converter.h"
+#include "Counters.h"
 #include "debug.h"
 #include "DocIterator.h"
+#include "EmbeddedFiles.h"
 #include "Encoding.h"
 #include "ErrorList.h"
 #include "Exporter.h"
 #include "FuncRequest.h"
 #include "gettext.h"
 #include "InsetIterator.h"
+#include "InsetList.h"
 #include "Language.h"
-#include "LaTeX.h"
 #include "LaTeXFeatures.h"
+#include "LaTeX.h"
 #include "Layout.h"
-#include "LyXAction.h"
 #include "Lexer.h"
-#include "Text.h"
+#include "LyXAction.h"
 #include "LyX.h"
 #include "LyXRC.h"
 #include "LyXVC.h"
 #include "Messages.h"
-#include "output.h"
 #include "output_docbook.h"
+#include "output.h"
 #include "output_latex.h"
-#include "Paragraph.h"
+#include "output_plaintext.h"
 #include "paragraph_funcs.h"
+#include "Paragraph.h"
 #include "ParagraphParameters.h"
 #include "ParIterator.h"
+#include "PDFOptions.h"
 #include "Session.h"
 #include "sgml.h"
 #include "TexRow.h"
-#include "TextClassList.h"
 #include "TexStream.h"
+#include "TextClassList.h"
+#include "Text.h"
 #include "TocBackend.h"
 #include "Undo.h"
+#include "VCBackend.h"
 #include "version.h"
-#include "EmbeddedFiles.h"
-#include "PDFOptions.h"
 
 #include "insets/InsetBibitem.h"
 #include "insets/InsetBibtex.h"
@@ -126,9 +130,7 @@ using support::bformat;
 using support::changeExtension;
 using support::cmd_ret;
 using support::createBufferTmpDir;
-using support::destroyDir;
 using support::FileName;
-using support::getFormatFromContents;
 using support::libFileSearch;
 using support::latex_path;
 using support::ltrim;
@@ -154,7 +156,7 @@ namespace fs = boost::filesystem;
 
 namespace {
 
-int const LYX_FORMAT = 295; //Uwe: htmlurl, href
+int const LYX_FORMAT = 297; //Uwe: Albanian, lower Sorbian
 
 } // namespace anon
 
@@ -165,9 +167,7 @@ class Buffer::Impl
 {
 public:
        Impl(Buffer & parent, FileName const & file, bool readonly);
-
-       limited_stack<Undo> undostack;
-       limited_stack<Undo> redostack;
+       
        BufferParams params;
        LyXVC lyxvc;
        string temppath;
@@ -219,6 +219,9 @@ public:
 
        ///
        frontend::WorkAreaManager * wa_;
+
+       ///
+       Undo undo_;
 };
 
 
@@ -226,10 +229,10 @@ Buffer::Impl::Impl(Buffer & parent, FileName const & file, bool readonly_)
        : lyx_clean(true), bak_clean(true), unnamed(false), read_only(readonly_),
          filename(file), file_fully_loaded(false), inset(params),
          toc_backend(&parent), embedded_files(&parent), timestamp_(0),
-         checksum_(0), wa_(0)
+         checksum_(0), wa_(0), undo_(parent)
 {
        inset.setAutoBreakRows(true);
-       lyxvc.buffer(&parent);
+       lyxvc.setBuffer(&parent);
        temppath = createBufferTmpDir();
        params.filepath = onlyPath(file.absFilename());
        // FIXME: And now do something if temppath == string(), because we
@@ -254,14 +257,14 @@ Buffer::~Buffer()
        // here the buffer should take care that it is
        // saved properly, before it goes into the void.
 
-       Buffer * master = getMasterBuffer();
+       Buffer * master = masterBuffer();
        if (master != this && use_gui)
                // We are closing buf which was a child document so we
                // must update the labels and section numbering of its master
                // Buffer.
                updateLabels(*master);
 
-       if (!temppath().empty() && !destroyDir(FileName(temppath()))) {
+       if (!temppath().empty() && !FileName(temppath()).destroyDirectory()) {
                Alert::warning(_("Could not remove temporary directory"),
                        bformat(_("Could not remove the temporary directory %1$s"),
                        from_utf8(temppath())));
@@ -304,30 +307,6 @@ Inset & Buffer::inset() const
 }
 
 
-limited_stack<Undo> & Buffer::undostack()
-{
-       return pimpl_->undostack;
-}
-
-
-limited_stack<Undo> const & Buffer::undostack() const
-{
-       return pimpl_->undostack;
-}
-
-
-limited_stack<Undo> & Buffer::redostack()
-{
-       return pimpl_->redostack;
-}
-
-
-limited_stack<Undo> const & Buffer::redostack() const
-{
-       return pimpl_->redostack;
-}
-
-
 BufferParams & Buffer::params()
 {
        return pimpl_->params;
@@ -406,16 +385,22 @@ EmbeddedFiles const & Buffer::embeddedFiles() const
 }
 
 
-string const Buffer::getLatexName(bool const no_path) const
+Undo & Buffer::undo()
+{
+       return pimpl_->undo_;
+}
+
+
+string Buffer::latexName(bool const no_path) const
 {
-       string const name = changeExtension(makeLatexName(fileName()), ".tex");
+       string const name = changeExtension(makeLatexName(absFileName()), ".tex");
        return no_path ? onlyFilename(name) : name;
 }
 
 
-pair<Buffer::LogType, string> const Buffer::getLogName() const
+pair<Buffer::LogType, string> Buffer::logName() const
 {
-       string const filename = getLatexName(false);
+       string const filename = latexName(false);
 
        if (filename.empty())
                return make_pair(Buffer::latexlog, string());
@@ -432,9 +417,8 @@ pair<Buffer::LogType, string> const Buffer::getLogName() const
 
        // If no Latex log or Build log is newer, show Build log
 
-       if (fs::exists(bname.toFilesystemEncoding()) &&
-           (!fs::exists(fname.toFilesystemEncoding()) ||
-            fs::last_write_time(fname.toFilesystemEncoding()) < fs::last_write_time(bname.toFilesystemEncoding()))) {
+       if (bname.exists() &&
+           (!fname.exists() || fname.lastModified() < bname.lastModified())) {
                LYXERR(Debug::FILES) << "Log name calculated as: " << bname << endl;
                return make_pair(Buffer::buildlog, bname.absFilename());
        }
@@ -447,7 +431,7 @@ void Buffer::setReadonly(bool const flag)
 {
        if (pimpl_->read_only != flag) {
                pimpl_->read_only = flag;
-               readonly(flag);
+               setReadOnly(flag);
        }
 }
 
@@ -456,24 +440,11 @@ void Buffer::setFileName(string const & newfile)
 {
        pimpl_->filename = makeAbsPath(newfile);
        params().filepath = onlyPath(pimpl_->filename.absFilename());
-       setReadonly(fs::is_readonly(pimpl_->filename.toFilesystemEncoding()));
+       setReadonly(pimpl_->filename.isReadOnly());
        updateTitles();
 }
 
 
-// We'll remove this later. (Lgb)
-namespace {
-
-void unknownClass(string const & unknown)
-{
-       Alert::warning(_("Unknown document class"),
-                      bformat(_("Using the default document class, because the "
-                                             "class %1$s is unknown."), from_utf8(unknown)));
-}
-
-} // anon
-
-
 int Buffer::readHeader(Lexer & lex)
 {
        int unknown_tokens = 0;
@@ -527,7 +498,9 @@ int Buffer::readHeader(Lexer & lex)
                string unknown = params().readToken(lex, token);
                if (!unknown.empty()) {
                        if (unknown[0] != '\\' && token == "\\textclass") {
-                               unknownClass(unknown);
+                               Alert::warning(_("Unknown document class"),
+                      bformat(_("Using the default document class, because the "
+                                             "class %1$s is unknown."), from_utf8(unknown)));
                        } else {
                                ++unknown_tokens;
                                docstring const s = bformat(_("Unknown token: "
@@ -597,8 +570,6 @@ bool Buffer::readDocument(Lexer & lex)
                                         "\\lyxadded and \\lyxdeleted in the LaTeX preamble."));
                }
        }
-       // read manifest after header
-       embeddedFiles().readManifest(lex, errorList);   
 
        // read main text
        bool const res = text().read(*this, lex, errorList);
@@ -696,7 +667,7 @@ bool Buffer::readFile(FileName const & filename)
 {
        FileName fname(filename);
        // Check if the file is compressed.
-       string format = getFormatFromContents(filename);
+       string format = filename.guessFormatFromContents();
        if (format == "zip") {
                // decompress to a temp directory
                LYXERR(Debug::FILES) << filename << " is in zip format. Unzip to " << temppath() << endl;
@@ -704,16 +675,15 @@ bool Buffer::readFile(FileName const & filename)
                //
                FileName lyxfile(addName(temppath(), "content.lyx"));
                // if both manifest.txt and file.lyx exist, this is am embedded file
-               if (fs::exists(lyxfile.toFilesystemEncoding())) {
+               if (lyxfile.exists()) {
                        params().embedded = true;
                        fname = lyxfile;
                }
        }
        // The embedded lyx file can also be compressed, for backward compatibility
-       format = getFormatFromContents(fname);
-       if (format == "gzip" || format == "zip" || format == "compress") {
+       format = fname.guessFormatFromContents();
+       if (format == "gzip" || format == "zip" || format == "compress")
                params().compressed = true;
-       }
 
        // remove dummy empty par
        paragraphs().clear();
@@ -726,13 +696,13 @@ bool Buffer::readFile(FileName const & filename)
 }
 
 
-bool Buffer::fully_loaded() const
+bool Buffer::isFullyLoaded() const
 {
        return pimpl_->file_fully_loaded;
 }
 
 
-void Buffer::fully_loaded(bool const value)
+void Buffer::setFullyLoaded(bool value)
 {
        pimpl_->file_fully_loaded = value;
 }
@@ -789,7 +759,7 @@ Buffer::ReadStatus Buffer::readFile(Lexer & lex, FileName const & filename,
                string diskfile = filename.toFilesystemEncoding();
                if (suffixIs(diskfile, ".emergency"))
                        diskfile = diskfile.substr(0, diskfile.size() - 10);
-               saveCheckSum(diskfile);
+               saveCheckSum(FileName(diskfile));
        }
 
        if (file_format != LYX_FORMAT) {
@@ -875,11 +845,14 @@ bool Buffer::save() const
 
        // make a backup if the file already exists
        if (lyxrc.make_backup && fs::exists(encodedFilename)) {
-               backupName = FileName(fileName() + '~');
-               if (!lyxrc.backupdir_path.empty())
+               backupName = FileName(absFileName() + '~');
+               if (!lyxrc.backupdir_path.empty()) {
+                       string const mangledName =
+                               subst(subst(os::internal_path(
+                               backupName.absFilename()), '/', '!'), ':', '!');
                        backupName = FileName(addName(lyxrc.backupdir_path,
-                                             subst(os::internal_path(backupName.absFilename()), '/', '!')));
-
+                                                     mangledName));
+               }
                try {
                        fs::copy_file(encodedFilename, backupName.toFilesystemEncoding(), false);
                        madeBackup = true;
@@ -894,7 +867,7 @@ bool Buffer::save() const
 
        // ask if the disk file has been externally modified (use checksum method)
        if (fs::exists(encodedFilename) && isExternallyModified(checksum_method)) {
-               docstring const file = makeDisplayPath(fileName(), 20);
+               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);
                int const ret = Alert::prompt(_("Overwrite modified file?"),
@@ -905,8 +878,8 @@ bool Buffer::save() const
 
        if (writeFile(pimpl_->filename)) {
                markClean();
-               removeAutosaveFile(fileName());
-               saveCheckSum(pimpl_->filename.toFilesystemEncoding());
+               removeAutosaveFile(absFileName());
+               saveCheckSum(pimpl_->filename);
                return true;
        } else {
                // Saving failed, so backup is not backup
@@ -987,12 +960,6 @@ bool Buffer::write(ostream & ofs) const
        params().writeFile(ofs);
        ofs << "\\end_header\n";
 
-       // write the manifest after header
-       ofs << "\n\\begin_manifest\n";
-       pimpl_->embedded_files.update();
-       embeddedFiles().writeManifest(ofs);
-       ofs << "\\end_manifest\n";
-
        // write the text
        ofs << "\n\\begin_body\n";
        text().write(*this, ofs);
@@ -1172,7 +1139,7 @@ void Buffer::writeLaTeXSource(odocstream & os,
                params().parentname.erase();
        }
 
-       loadChildDocuments(*this);
+       loadChildDocuments();
 
        // the real stuff
        latexParagraphs(*this, paragraphs(), os, texrow(), runparams);
@@ -1295,8 +1262,8 @@ void Buffer::writeDocBookSource(odocstream & os, string const & fname,
                        preamble += "<!ENTITY % output.print.bmp \"IGNORE\">\n";
                }
 
-               string const name = runparams.nice ? changeExtension(fileName(), ".sgml")
-                        : fname;
+               string const name = runparams.nice
+                       ? changeExtension(absFileName(), ".sgml") : fname;
                preamble += features.getIncludedFiles(name);
                preamble += features.getLyXSGMLEntities();
 
@@ -1325,7 +1292,7 @@ void Buffer::writeDocBookSource(odocstream & os, string const & fname,
 
        params().getTextClass().counters().reset();
 
-       loadChildDocuments(*this);
+       loadChildDocuments();
 
        sgml::openTag(os, top);
        os << '\n';
@@ -1338,11 +1305,11 @@ void Buffer::writeDocBookSource(odocstream & os, string const & fname,
 // Other flags: -wall -v0 -x
 int Buffer::runChktex()
 {
-       busy(true);
+       setBusy(true);
 
        // get LaTeX-Filename
        FileName const path(temppath());
-       string const name = addName(path.absFilename(), getLatexName());
+       string const name = addName(path.absFilename(), latexName());
        string const org_path = filePath();
 
        support::Path p(path); // path to LaTeX file
@@ -1362,14 +1329,12 @@ int Buffer::runChktex()
                Alert::error(_("chktex failure"),
                             _("Could not run chktex successfully."));
        } else if (res > 0) {
-               ErrorList & errorList = pimpl_->errorLists["ChkTeX"];
-               // Clear out old errors
-               errorList.clear();
-               // Fill-in the error list with the TeX errors
-               bufferErrors(*this, terr, errorList);
+               ErrorList & errlist = pimpl_->errorLists["ChkTeX"];
+               errlist.clear();
+               bufferErrors(terr, errlist);
        }
 
-       busy(false);
+       setBusy(false);
 
        errors("ChkTeX");
 
@@ -1416,7 +1381,7 @@ void Buffer::validate(LaTeXFeatures & features) const
        if (params().use_esint == BufferParams::package_on)
                features.require("esint");
 
-       loadChildDocuments(*this);
+       loadChildDocuments();
 
        for_each(paragraphs().begin(), paragraphs().end(),
                 boost::bind(&Paragraph::validate, _1, boost::ref(features)));
@@ -1455,9 +1420,9 @@ void Buffer::getLabelList(vector<docstring> & list) const
 {
        /// if this is a child document and the parent is already loaded
        /// Use the parent's list instead  [ale990407]
-       Buffer const * tmp = getMasterBuffer();
+       Buffer const * tmp = masterBuffer();
        if (!tmp) {
-               lyxerr << "getMasterBuffer() failed!" << endl;
+               lyxerr << "masterBuffer() failed!" << endl;
                BOOST_ASSERT(tmp);
        }
        if (tmp != this) {
@@ -1465,7 +1430,7 @@ void Buffer::getLabelList(vector<docstring> & list) const
                return;
        }
 
-       loadChildDocuments(*this);
+       loadChildDocuments();
 
        for (InsetIterator it = inset_iterator_begin(inset()); it; ++it)
                it.nextInset()->getLabelList(*this, list);
@@ -1476,7 +1441,7 @@ void Buffer::updateBibfilesCache()
 {
        // if this is a child document and the parent is already loaded
        // update the parent's cache instead
-       Buffer * tmp = getMasterBuffer();
+       Buffer * tmp = masterBuffer();
        BOOST_ASSERT(tmp);
        if (tmp != this) {
                tmp->updateBibfilesCache();
@@ -1510,7 +1475,7 @@ vector<FileName> const & Buffer::getBibfilesCache() const
 {
        // if this is a child document and the parent is already loaded
        // use the parent's cache instead
-       Buffer const * tmp = getMasterBuffer();
+       Buffer const * tmp = masterBuffer();
        BOOST_ASSERT(tmp);
        if (tmp != this)
                return tmp->getBibfilesCache();
@@ -1550,7 +1515,7 @@ bool Buffer::dispatch(FuncRequest const & func, bool * result)
 
        switch (func.action) {
                case LFUN_BUFFER_EXPORT: {
-                       bool const tmp = Exporter::Export(this, to_utf8(func.argument()), false);
+                       bool const tmp = doExport(to_utf8(func.argument()), false);
                        if (result)
                                *result = tmp;
                        break;
@@ -1635,7 +1600,7 @@ ParConstIterator Buffer::par_iterator_end() const
 }
 
 
-Language const * Buffer::getLanguage() const
+Language const * Buffer::language() const
 {
        return params().language;
 }
@@ -1661,19 +1626,19 @@ bool Buffer::isBakClean() const
 
 bool Buffer::isExternallyModified(CheckMethod method) const
 {
-       BOOST_ASSERT(fs::exists(pimpl_->filename.toFilesystemEncoding()));
+       BOOST_ASSERT(pimpl_->filename.exists());
        // if method == timestamp, check timestamp before checksum
        return (method == checksum_method 
-               || pimpl_->timestamp_ != fs::last_write_time(pimpl_->filename.toFilesystemEncoding()))
+               || pimpl_->timestamp_ != pimpl_->filename.lastModified())
                && pimpl_->checksum_ != sum(pimpl_->filename);
 }
 
 
-void Buffer::saveCheckSum(string const & file) const
+void Buffer::saveCheckSum(FileName const & file) const
 {
-       if (fs::exists(file)) {
-               pimpl_->timestamp_ = fs::last_write_time(file);
-               pimpl_->checksum_ = sum(FileName(file));
+       if (file.exists()) {
+               pimpl_->timestamp_ = file.lastModified();
+               pimpl_->checksum_ = sum(file);
        } else {
                // in the case of save to a new file.
                pimpl_->timestamp_ = 0;
@@ -1729,7 +1694,7 @@ void Buffer::markDirty()
 }
 
 
-string const Buffer::fileName() const
+string Buffer::absFileName() const
 {
        return pimpl_->filename.absFilename();
 }
@@ -1757,7 +1722,7 @@ void Buffer::setParentName(string const & name)
 }
 
 
-Buffer const * Buffer::getMasterBuffer() const
+Buffer const * Buffer::masterBuffer() const
 {
        if (!params().parentname.empty()
            && theBufferList().exists(params().parentname)) {
@@ -1766,14 +1731,14 @@ Buffer const * Buffer::getMasterBuffer() const
                //FIXME RECURSIVE INCLUDE
                //This is not sufficient, since recursive includes could be downstream.
                if (buf && buf != this)
-                       return buf->getMasterBuffer();
+                       return buf->masterBuffer();
        }
 
        return this;
 }
 
 
-Buffer * Buffer::getMasterBuffer()
+Buffer * Buffer::masterBuffer()
 {
        if (!params().parentname.empty()
            && theBufferList().exists(params().parentname)) {
@@ -1782,7 +1747,7 @@ Buffer * Buffer::getMasterBuffer()
                //FIXME RECURSIVE INCLUDE
                //This is not sufficient, since recursive includes could be downstream.
                if (buf && buf != this)
-                       return buf->getMasterBuffer();
+                       return buf->masterBuffer();
        }
 
        return this;
@@ -1818,7 +1783,7 @@ void Buffer::buildMacros()
        for (size_t i = 0, n = pars.size(); i != n; ++i) {
                //lyxerr << "searching main par " << i
                //      << " for macro definitions" << std::endl;
-               InsetList const & insets = pars[i].insetlist;
+               InsetList const & insets = pars[i].insetList();
                InsetList::const_iterator it = insets.begin();
                InsetList::const_iterator end = insets.end();
                for ( ; it != end; ++it) {
@@ -1841,6 +1806,7 @@ void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to,
        // Check if the label 'from' appears more than once
        vector<docstring> labels;
 
+       string paramName;
        if (code == CITE_CODE) {
                BiblioInfo keys;
                keys.fillWithBibKeys(this);
@@ -1850,8 +1816,11 @@ void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to,
                for (; bit != bend; ++bit)
                        // FIXME UNICODE
                        labels.push_back(bit->first);
-       } else
+               paramName = "key";
+       } else {
                getLabelList(labels);
+               paramName = "reference";
+       }
 
        if (std::count(labels.begin(), labels.end(), from) > 1)
                return;
@@ -1859,7 +1828,9 @@ void Buffer::changeRefsIfUnique(docstring const & from, docstring const & to,
        for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
                if (it->lyxCode() == code) {
                        InsetCommand & inset = static_cast<InsetCommand &>(*it);
-                       inset.replaceContents(to_utf8(from), to_utf8(to));
+                       docstring const oldValue = inset.getParam(paramName);
+                       if (oldValue == from)
+                               inset.setParam(paramName, to);
                }
        }
 }
@@ -1883,7 +1854,7 @@ void Buffer::getSourceCode(odocstream & os, pit_type par_begin,
                if (isLatex())
                        writeLaTeXSource(os, filePath(), runparams, true, true);
                else {
-                       writeDocBookSource(os, fileName(), runparams, false);
+                       writeDocBookSource(os, absFileName(), runparams, false);
                }
        } else {
                runparams.par_begin = par_begin;
@@ -1935,13 +1906,6 @@ void Buffer::structureChanged() const
 }
 
 
-void Buffer::embeddingChanged() const
-{
-       if (gui_)
-               gui_->embeddingChanged();
-}
-
-
 void Buffer::errors(std::string const & err) const
 {
        if (gui_)
@@ -1956,17 +1920,17 @@ void Buffer::message(docstring const & msg) const
 }
 
 
-void Buffer::busy(bool on) const
+void Buffer::setBusy(bool on) const
 {
        if (gui_)
-               gui_->busy(on);
+               gui_->setBusy(on);
 }
 
 
-void Buffer::readonly(bool on) const
+void Buffer::setReadOnly(bool on) const
 {
        if (gui_)
-               gui_->readonly(on);
+               gui_->setReadOnly(on);
 }
 
 
@@ -2086,7 +2050,7 @@ void Buffer::autoSave() const
        // create autosave filename
        string fname = filePath();
        fname += '#';
-       fname += onlyFilename(fileName());
+       fname += onlyFilename(absFileName());
        fname += '#';
 
        AutoSaveBuffer autosave(*this, FileName(fname));
@@ -2113,18 +2077,16 @@ void Buffer::autoSave() const
 
 bool Buffer::writeAs(string const & newname)
 {
-       string fname = fileName();
+       string fname = absFileName();
        string const oldname = fname;
 
        if (newname.empty()) {  /// No argument? Ask user through dialog
 
                // FIXME UNICODE
-               FileDialog fileDlg(_("Choose a filename to save document as"),
-                                  LFUN_BUFFER_WRITE_AS,
-                                  make_pair(_("Documents|#o#O"), 
-                                            from_utf8(lyxrc.document_path)),
-                                  make_pair(_("Templates|#T#t"), 
-                                            from_utf8(lyxrc.template_path)));
+               FileDialog dlg(_("Choose a filename to save document as"),
+                                  LFUN_BUFFER_WRITE_AS);
+               dlg.setButton1(_("Documents|#o#O"), from_utf8(lyxrc.document_path));
+               dlg.setButton2(_("Templates|#T#t"), from_utf8(lyxrc.template_path));
 
                if (!support::isLyXFilename(fname))
                        fname += ".lyx";
@@ -2132,7 +2094,7 @@ bool Buffer::writeAs(string const & newname)
                support::FileFilterList const filter(_("LyX Documents (*.lyx)"));
 
                FileDialog::Result result =
-                       fileDlg.save(from_utf8(onlyPath(fname)),
+                       dlg.save(from_utf8(onlyPath(fname)),
                                     filter,
                                     from_utf8(onlyFilename(fname)));
 
@@ -2152,7 +2114,7 @@ bool Buffer::writeAs(string const & newname)
        } else 
                fname = makeAbsPath(newname, onlyPath(oldname)).absFilename();
 
-       if (fs::exists(FileName(fname).toFilesystemEncoding())) {
+       if (FileName(fname).exists()) {
                docstring const file = makeDisplayPath(fname, 30);
                docstring text = bformat(_("The document %1$s already "
                                           "exists.\n\nDo you want to "
@@ -2170,12 +2132,12 @@ bool Buffer::writeAs(string const & newname)
        markDirty();
        bool unnamed = isUnnamed();
        setUnnamed(false);
-       saveCheckSum(fname);
+       saveCheckSum(FileName(fname));
 
        if (!menuWrite()) {
                setFileName(oldname);
                setUnnamed(unnamed);
-               saveCheckSum(oldname);
+               saveCheckSum(FileName(oldname));
                return false;
        }
 
@@ -2187,13 +2149,13 @@ bool Buffer::writeAs(string const & newname)
 bool Buffer::menuWrite()
 {
        if (save()) {
-               LyX::ref().session().lastFiles().add(FileName(fileName()));
+               LyX::ref().session().lastFiles().add(FileName(absFileName()));
                return true;
        }
 
        // FIXME: we don't tell the user *WHY* the save failed !!
 
-       docstring const file = makeDisplayPath(fileName(), 30);
+       docstring const file = makeDisplayPath(absFileName(), 30);
 
        docstring text = bformat(_("The document %1$s could not be saved.\n\n"
                                   "Do you want to rename the document and "
@@ -2208,4 +2170,330 @@ bool Buffer::menuWrite()
 }
 
 
+void Buffer::loadChildDocuments() const
+{
+       bool parse_error = false;
+               
+       for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
+               if (it->lyxCode() != INCLUDE_CODE)
+                       continue;
+               InsetCommand const & inset = static_cast<InsetCommand const &>(*it);
+               InsetCommandParams const & ip = inset.params();
+               Buffer * child = loadIfNeeded(*this, ip);
+               if (!child)
+                       continue;
+               parse_error |= !child->errorList("Parse").empty();
+               child->loadChildDocuments();
+       }
+
+       if (use_gui && masterBuffer() == this)
+               updateLabels(*this);
+}
+
+
+string Buffer::bufferFormat() const
+{
+       if (isDocBook())
+               return "docbook";
+       if (isLiterate())
+               return "literate";
+       return "latex";
+}
+
+
+bool Buffer::doExport(string const & format, bool put_in_tempdir,
+       string & result_file)
+{
+       string backend_format;
+       OutputParams runparams(&params().encoding());
+       runparams.flavor = OutputParams::LATEX;
+       runparams.linelen = lyxrc.plaintext_linelen;
+       vector<string> backs = backends();
+       if (find(backs.begin(), backs.end(), format) == backs.end()) {
+               // Get shortest path to format
+               Graph::EdgePath path;
+               for (vector<string>::const_iterator it = backs.begin();
+                    it != backs.end(); ++it) {
+                       Graph::EdgePath p = theConverters().getPath(*it, format);
+                       if (!p.empty() && (path.empty() || p.size() < path.size())) {
+                               backend_format = *it;
+                               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)));
+                       return false;
+               }
+       } else {
+               backend_format = format;
+               // FIXME: Don't hardcode format names here, but use a flag
+               if (backend_format == "pdflatex")
+                       runparams.flavor = OutputParams::PDFLATEX;
+       }
+
+       string filename = latexName(false);
+       filename = addName(temppath(), filename);
+       filename = changeExtension(filename,
+                                  formats.extension(backend_format));
+
+       // Plain text backend
+       if (backend_format == "text")
+               writePlaintextFile(*this, FileName(filename), runparams);
+       // no backend
+       else if (backend_format == "lyx")
+               writeFile(FileName(filename));
+       // Docbook backend
+       else if (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))
+                       return false;
+       } else if (!lyxrc.tex_allows_spaces
+                  && support::contains(filePath(), ' ')) {
+               Alert::error(_("File name error"),
+                          _("The directory path to the document cannot contain spaces."));
+               return false;
+       } else {
+               runparams.nice = false;
+               if (!makeLaTeXFile(FileName(filename), filePath(), runparams))
+                       return false;
+       }
+
+       string const error_type = (format == "program")
+               ? "Build" : bufferFormat();
+       string const ext = formats.extension(format);
+       FileName const tmp_result_file(changeExtension(filename, ext));
+       bool const success = theConverters().convert(this, FileName(filename),
+               tmp_result_file, FileName(absFileName()), backend_format, format,
+               errorList(error_type));
+       // Emit the signal to show the error list.
+       if (format != backend_format)
+               errors(error_type);
+       if (!success)
+               return false;
+
+       if (put_in_tempdir)
+               result_file = tmp_result_file.absFilename();
+       else {
+               result_file = changeExtension(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) {
+                       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()) {
+                       // Finally copy the main file
+                       status = copyFile(format, tmp_result_file,
+                                         FileName(result_file), result_file,
+                                         status == FORCE);
+                       message(bformat(_("Document exported as %1$s "
+                                                              "to file `%2$s'"),
+                                               formats.prettyName(format),
+                                               makeDisplayPath(result_file)));
+               } else {
+                       // This must be a dummy converter like fax (bug 1888)
+                       message(bformat(_("Document exported as %1$s"),
+                                               formats.prettyName(format)));
+               }
+       }
+
+       return true;
+}
+
+
+bool Buffer::doExport(string const & format, bool put_in_tempdir)
+{
+       string result_file;
+       return doExport(format, put_in_tempdir, result_file);
+}
+
+
+bool Buffer::preview(string const & format)
+{
+       string result_file;
+       if (!doExport(format, true, result_file))
+               return false;
+       return formats.view(*this, FileName(result_file), format);
+}
+
+
+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> 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;
+       if (params().getTextClass().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("text");
+       v.push_back("lyx");
+       return v;
+}
+
+
+bool Buffer::readFileHelper(FileName const & s)
+{
+       // File information about normal file
+       if (!s.exists()) {
+               docstring const file = makeDisplayPath(s.absFilename(), 50);
+               docstring text = bformat(_("The specified document\n%1$s"
+                                                    "\ncould not be read."), file);
+               Alert::error(_("Could not read document"), text);
+               return false;
+       }
+
+       // Check if emergency save file exists and is newer.
+       FileName const e(s.absFilename() + ".emergency");
+
+       if (e.exists() && s.exists() && e.lastModified() > s.lastModified()) {
+               docstring const file = makeDisplayPath(s.absFilename(), 20);
+               docstring const text =
+                       bformat(_("An emergency save of the document "
+                                 "%1$s exists.\n\n"
+                                              "Recover emergency save?"), file);
+               switch (Alert::prompt(_("Load emergency save?"), text, 0, 2,
+                                     _("&Recover"),  _("&Load Original"),
+                                     _("&Cancel")))
+               {
+               case 0:
+                       // the file is not saved if we load the emergency file.
+                       markDirty();
+                       return readFile(e);
+               case 1:
+                       break;
+               default:
+                       return false;
+               }
+       }
+
+       // Now check if autosave file is newer.
+       FileName const a(onlyPath(s.absFilename()) + '#' + onlyFilename(s.absFilename()) + '#');
+
+       if (a.exists() && s.exists() && a.lastModified() > s.lastModified()) {
+               docstring const file = makeDisplayPath(s.absFilename(), 20);
+               docstring const text =
+                       bformat(_("The backup of the document "
+                                 "%1$s is newer.\n\nLoad the "
+                                              "backup instead?"), file);
+               switch (Alert::prompt(_("Load backup?"), text, 0, 2,
+                                     _("&Load backup"), _("Load &original"),
+                                     _("&Cancel") ))
+               {
+               case 0:
+                       // the file is not saved if we load the autosave file.
+                       markDirty();
+                       return readFile(a);
+               case 1:
+                       // Here we delete the autosave
+                       unlink(a);
+                       break;
+               default:
+                       return false;
+               }
+       }
+       return readFile(s);
+}
+
+
+bool Buffer::loadLyXFile(FileName const & s)
+{
+       if (s.isReadable()) {
+               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);
+                       }
+               }
+       }
+       return false;
+}
+
+
+void Buffer::bufferErrors(TeXErrors const & terr, ErrorList & errorList) const
+{
+       TeXErrors::Errors::const_iterator cit = terr.begin();
+       TeXErrors::Errors::const_iterator end = terr.end();
+
+       for (; cit != end; ++cit) {
+               int id_start = -1;
+               int pos_start = -1;
+               int errorRow = cit->error_in_line;
+               bool found = texrow().getIdFromRow(errorRow, id_start,
+                                                      pos_start);
+               int id_end = -1;
+               int pos_end = -1;
+               do {
+                       ++errorRow;
+                       found = 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));
+       }
+}
+
 } // namespace lyx