]> git.lyx.org Git - lyx.git/blobdiff - src/buffer.C
the convert patch
[lyx.git] / src / buffer.C
index 3e903d4a8f87f8c0c74e7b191551d486a323e0c0..1d6c5fa04fe9594f86d2f366deaee1c537861d5b 100644 (file)
 #include "buffer_funcs.h"
 #include "bufferlist.h"
 #include "bufferparams.h"
+#include "counters.h"
 #include "Bullet.h"
 #include "Chktex.h"
 #include "debug.h"
+#include "encoding.h"
 #include "errorlist.h"
 #include "exporter.h"
 #include "format.h"
 #include "funcrequest.h"
 #include "gettext.h"
-#include "iterators.h"
+#include "insetiterator.h"
 #include "language.h"
 #include "LaTeX.h"
 #include "LaTeXFeatures.h"
 #include "LyXAction.h"
 #include "lyxlex.h"
+#include "lyxtext.h"
 #include "lyxrc.h"
 #include "lyxvc.h"
+#include "lyx_main.h"
 #include "messages.h"
+#include "output.h"
+#include "output_docbook.h"
+#include "output_latex.h"
+#include "output_linuxdoc.h"
 #include "paragraph.h"
 #include "paragraph_funcs.h"
 #include "ParagraphParameters.h"
+#include "pariterator.h"
 #include "sgml.h"
 #include "texrow.h"
 #include "undo.h"
 #include "insets/insetinclude.h"
 #include "insets/insettext.h"
 
+#include "mathed/math_macrotemplate.h"
+#include "mathed/math_macrotable.h"
+#include "mathed/math_support.h"
+
 #include "frontends/Alert.h"
 
 #include "graphics/Previews.h"
 
 #include "support/FileInfo.h"
 #include "support/filetools.h"
-#include "support/gzstream.h"
+#ifdef USE_COMPRESSION
+# include "support/gzstream.h"
+#endif
 #include "support/lyxlib.h"
 #include "support/os.h"
 #include "support/path.h"
 #include "support/textutils.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 
 #include <boost/bind.hpp>
-#include <boost/tuple/tuple.hpp>
 
-#include "support/std_sstream.h"
+#include <utime.h>
 
 #include <iomanip>
 #include <stack>
+#include <sstream>
+#include <fstream>
 
-#include <utime.h>
-
-#ifdef HAVE_LOCALE
-#endif
 
 using lyx::pos_type;
+using lyx::pit_type;
 
 using lyx::support::AddName;
-using lyx::support::ascii_lowercase;
-using lyx::support::atoi;
 using lyx::support::bformat;
 using lyx::support::ChangeExtension;
 using lyx::support::cmd_ret;
-using lyx::support::compare_ascii_no_case;
-using lyx::support::compare_no_case;
-using lyx::support::contains;
-using lyx::support::CreateBufferTmpDir;
+using lyx::support::createBufferTmpDir;
 using lyx::support::destroyDir;
 using lyx::support::FileInfo;
 using lyx::support::FileInfo;
-using lyx::support::getExtFromContents;
+using lyx::support::getFormatFromContents;
 using lyx::support::IsDirWriteable;
 using lyx::support::IsFileWriteable;
 using lyx::support::LibFileSearch;
@@ -103,7 +111,6 @@ using lyx::support::removeAutosaveFile;
 using lyx::support::rename;
 using lyx::support::RunCommand;
 using lyx::support::split;
-using lyx::support::strToInt;
 using lyx::support::subst;
 using lyx::support::tempName;
 using lyx::support::trim;
@@ -115,8 +122,8 @@ using std::for_each;
 using std::make_pair;
 
 using std::ifstream;
-using std::list;
 using std::ios;
+using std::map;
 using std::ostream;
 using std::ostringstream;
 using std::ofstream;
@@ -131,49 +138,35 @@ extern BufferList bufferlist;
 
 namespace {
 
-const int LYX_FORMAT = 225;
-
-bool openFileWrite(ofstream & ofs, string const & fname)
-{
-       ofs.open(fname.c_str());
-       if (!ofs) {
-               string const file = MakeDisplayPath(fname, 50);
-               string text = bformat(_("Could not open the specified "
-                                       "document\n%1$s."), file);
-               Alert::error(_("Could not open file"), text);
-               return false;
-       }
-       return true;
-}
+int const LYX_FORMAT = 240;
 
 } // namespace anon
 
 
 typedef std::map<string, bool> DepClean;
 
-struct Buffer::Impl
+class Buffer::Impl
 {
+public:
        Impl(Buffer & parent, string const & file, bool readonly);
 
        limited_stack<Undo> undostack;
        limited_stack<Undo> redostack;
        BufferParams params;
-       ParagraphList paragraphs;
        LyXVC lyxvc;
        string temppath;
-       bool nicefile;
        TexRow texrow;
 
-       /// need to regenerate .tex ?
+       /// need to regenerate .tex?
        DepClean dep_clean;
 
-       /// is save needed
+       /// is save needed?
        mutable bool lyx_clean;
 
-       /// is autosave needed
+       /// is autosave needed?
        mutable bool bak_clean;
 
-       /// is this a unnamed file (New...)
+       /// is this a unnamed file (New...)?
        bool unnamed;
 
        /// buffer is r/o
@@ -187,22 +180,30 @@ struct Buffer::Impl
 
        boost::scoped_ptr<Messages> messages;
 
-       /** set to true only when the file is fully loaded.
+       /** Set to true only when the file is fully loaded.
         *  Used to prevent the premature generation of previews
         *  and by the citation inset.
         */
        bool file_fully_loaded;
+
+       /// our LyXText that should be wrapped in an InsetText
+       InsetText inset;
+
+       ///
+       MacroTable macros;
 };
 
 
 Buffer::Impl::Impl(Buffer & parent, string const & file, bool readonly_)
-       : nicefile(true),
-         lyx_clean(true), bak_clean(true), unnamed(false), read_only(readonly_),
-         filename(file), filepath(OnlyPath(file)), file_fully_loaded(false)
+       : lyx_clean(true), bak_clean(true), unnamed(false), read_only(readonly_),
+         filename(file), filepath(OnlyPath(file)), file_fully_loaded(false),
+               inset(params)
 {
        lyxvc.buffer(&parent);
-       if (readonly_ || lyxrc.use_tempdir)
-               temppath = CreateBufferTmpDir();
+       temppath = createBufferTmpDir();
+       // FIXME: And now do something if temppath == string(), because we
+       // assume from now on that temppath points to a valid temp dir.
+       // See http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg67406.html
 }
 
 
@@ -226,13 +227,23 @@ Buffer::~Buffer()
                        bformat(_("Could not remove the temporary directory %1$s"), temppath()));
        }
 
-       paragraphs().clear();
-
        // Remove any previewed LaTeX snippets associated with this buffer.
        lyx::graphics::Previews::get().removeLoader(*this);
 }
 
 
+LyXText & Buffer::text() const
+{
+       return const_cast<LyXText &>(pimpl_->inset.text_);
+}
+
+
+InsetBase & Buffer::inset() const
+{
+       return const_cast<InsetText &>(pimpl_->inset);
+}
+
+
 limited_stack<Undo> & Buffer::undostack()
 {
        return pimpl_->undostack;
@@ -271,13 +282,13 @@ BufferParams const & Buffer::params() const
 
 ParagraphList & Buffer::paragraphs()
 {
-       return pimpl_->paragraphs;
+       return text().paragraphs();
 }
 
 
 ParagraphList const & Buffer::paragraphs() const
 {
-       return pimpl_->paragraphs;
+       return text().paragraphs();
 }
 
 
@@ -299,18 +310,6 @@ string const & Buffer::temppath() const
 }
 
 
-bool & Buffer::niceFile()
-{
-       return pimpl_->nicefile;
-}
-
-
-bool Buffer::niceFile() const
-{
-       return pimpl_->nicefile;
-}
-
-
 TexRow & Buffer::texrow()
 {
        return pimpl_->texrow;
@@ -323,7 +322,7 @@ TexRow const & Buffer::texrow() const
 }
 
 
-string const Buffer::getLatexName(bool no_path) const
+string const Buffer::getLatexName(bool const no_path) const
 {
        string const name = ChangeExtension(MakeLatexName(fileName()), ".tex");
        return no_path ? OnlyFilename(name) : name;
@@ -337,10 +336,7 @@ pair<Buffer::LogType, string> const Buffer::getLogName() const
        if (filename.empty())
                return make_pair(Buffer::latexlog, string());
 
-       string path = OnlyPath(filename);
-
-       if (lyxrc.use_tempdir || !IsDirWriteable(path))
-               path = temppath();
+       string const path = temppath();
 
        string const fname = AddName(path,
                                     OnlyFilename(ChangeExtension(filename,
@@ -365,7 +361,7 @@ pair<Buffer::LogType, string> const Buffer::getLogName() const
 }
 
 
-void Buffer::setReadonly(bool flag)
+void Buffer::setReadonly(bool const flag)
 {
        if (pimpl_->read_only != flag) {
                pimpl_->read_only = flag;
@@ -395,12 +391,15 @@ void unknownClass(string const & unknown)
 
 } // anon
 
+
 int Buffer::readHeader(LyXLex & lex)
 {
        int unknown_tokens = 0;
+       int line = -1;
+       int begin_header_line = -1;
 
        while (lex.isOK()) {
-               lex.nextToken();
+               lex.next();
                string const token = lex.getString();
 
                if (token.empty())
@@ -409,13 +408,18 @@ int Buffer::readHeader(LyXLex & lex)
                if (token == "\\end_header")
                        break;
 
+               ++line;
+               if (token == "\\begin_header") {
+                       begin_header_line = line;
+                       continue;
+               }
+
                lyxerr[Debug::PARSER] << "Handling header token: `"
                                      << token << '\'' << endl;
 
-
                string unknown = params().readToken(lex, token);
                if (!unknown.empty()) {
-                       if (unknown[0] != '\\') {
+                       if (unknown[0] != '\\' && token == "\\textclass") {
                                unknownClass(unknown);
                        } else {
                                ++unknown_tokens;
@@ -428,22 +432,25 @@ int Buffer::readHeader(LyXLex & lex)
                        }
                }
        }
+       if (begin_header_line) {
+               string const s = _("\\begin_header is missing");
+               error(ErrorItem(_("Header error"), s, -1, 0, 0));
+       }
        return unknown_tokens;
 }
 
 
-// candidate for move to BufferView
-// (at least some parts in the beginning of the func)
-//
 // Uwe C. Schroeder
 // changed to be public and have one parameter
-// if par = 0 normal behavior
-// else insert behavior
 // Returns false if "\end_document" is not read (Asger)
-bool Buffer::readBody(LyXLex & lex, ParagraphList::iterator pit)
+bool Buffer::readDocument(LyXLex & lex)
 {
-       Paragraph::depth_type depth = 0;
-       bool the_end_read = false;
+       lex.next();
+       string const token = lex.getString();
+       if (token != "\\begin_document") {
+               string const s = _("\\begin_document is missing");
+               error(ErrorItem(_("Header error"), s, -1, 0, 0));
+       }
 
        if (paragraphs().empty()) {
                readHeader(lex);
@@ -463,87 +470,26 @@ bool Buffer::readBody(LyXLex & lex, ParagraphList::iterator pit)
                tmpbuf.readHeader(lex);
        }
 
-       while (lex.isOK()) {
-               lex.nextToken();
-               string const token = lex.getString();
-
-               if (token.empty())
-                       continue;
-
-               lyxerr[Debug::PARSER] << "Handling token: `"
-                                     << token << '\'' << endl;
-
-               if (token == "\\end_document") {
-                       the_end_read = true;
-                       continue;
-               }
-
-               readParagraph(lex, token, paragraphs(), pit, depth);
-       }
-
-       return the_end_read;
-}
-
-
-int Buffer::readParagraph(LyXLex & lex, string const & token,
-                         ParagraphList & pars, ParagraphList::iterator & pit,
-                         lyx::depth_type & depth)
-{
-       static Change current_change;
-       int unknown = 0;
-
-       if (token == "\\begin_layout") {
-               lex.pushToken(token);
-
-               Paragraph par;
-               par.params().depth(depth);
-               if (params().tracking_changes)
-                       par.trackChanges();
-               LyXFont f(LyXFont::ALL_INHERIT, params().language);
-               par.setFont(0, f);
-
-               // insert after
-               if (pit != pars.end())
-                       ++pit;
-
-               pit = pars.insert(pit, par);
-
-               // FIXME: goddamn InsetTabular makes us pass a Buffer
-               // not BufferParams
-               ::readParagraph(*this, *pit, lex);
-
-       } else if (token == "\\begin_deeper") {
-               ++depth;
-       } else if (token == "\\end_deeper") {
-               if (!depth) {
-                       lex.printError("\\end_deeper: " "depth is already null");
-               } else {
-                       --depth;
-               }
-       } else {
-               ++unknown;
-       }
-       return unknown;
+       return text().read(*this, lex);
 }
 
 
 // needed to insert the selection
-void Buffer::insertStringAsLines(ParagraphList::iterator & par, pos_type & pos,
-                                LyXFont const & fn,string const & str)
+void Buffer::insertStringAsLines(ParagraphList & pars,
+       pit_type & par, pos_type & pos,
+       LyXFont const & fn, string const & str, bool autobreakrows)
 {
-       LyXLayout_ptr const & layout = par->layout();
+       LyXLayout_ptr const & layout = pars[par].layout();
 
        LyXFont font = fn;
 
-       par->checkInsertChar(font);
+       pars[par].checkInsertChar(font);
        // insert the string, don't insert doublespace
        bool space_inserted = true;
-       bool autobreakrows = !par->inInset() ||
-               static_cast<InsetText *>(par->inInset())->getAutoBreakRows();
-       for(string::const_iterator cit = str.begin();
+       for (string::const_iterator cit = str.begin();
            cit != str.end(); ++cit) {
                if (*cit == '\n') {
-                       if (autobreakrows && (!par->empty() || par->allowEmpty())) {
+                       if (autobreakrows && (!pars[par].empty() || pars[par].allowEmpty())) {
                                breakParagraph(params(), paragraphs(), par, pos,
                                               layout->isEnvironment());
                                ++par;
@@ -554,18 +500,18 @@ void Buffer::insertStringAsLines(ParagraphList::iterator & par, pos_type & pos,
                        }
                        // do not insert consecutive spaces if !free_spacing
                } else if ((*cit == ' ' || *cit == '\t') &&
-                          space_inserted && !par->isFreeSpacing()) {
+                          space_inserted && !pars[par].isFreeSpacing()) {
                        continue;
                } else if (*cit == '\t') {
-                       if (!par->isFreeSpacing()) {
+                       if (!pars[par].isFreeSpacing()) {
                                // tabs are like spaces here
-                               par->insertChar(pos, ' ', font);
+                               pars[par].insertChar(pos, ' ', font);
                                ++pos;
                                space_inserted = true;
                        } else {
-                               const pos_type nb = 8 - pos % 8;
-                               for (pos_type a = 0; a < nb ; ++a) {
-                                       par->insertChar(pos, ' ', font);
+                               const pos_type n = 8 - pos % 8;
+                               for (pos_type i = 0; i < n; ++i) {
+                                       pars[par].insertChar(pos, ' ', font);
                                        ++pos;
                                }
                                space_inserted = true;
@@ -575,7 +521,7 @@ void Buffer::insertStringAsLines(ParagraphList::iterator & par, pos_type & pos,
                        continue;
                } else {
                        // just insert the character
-                       par->insertChar(pos, *cit, font);
+                       pars[par].insertChar(pos, *cit, font);
                        ++pos;
                        space_inserted = (*cit == ' ');
                }
@@ -587,12 +533,14 @@ void Buffer::insertStringAsLines(ParagraphList::iterator & par, pos_type & pos,
 bool Buffer::readFile(string const & filename)
 {
        // Check if the file is compressed.
-       string const format = getExtFromContents(filename);
+       string const format = getFormatFromContents(filename);
        if (format == "gzip" || format == "zip" || format == "compress") {
                params().compressed = true;
        }
 
-       bool ret = readFile(filename, paragraphs().begin());
+       // remove dummy empty par
+       paragraphs().clear();
+       bool ret = readFile(filename, paragraphs().size());
 
        // After we have read a file, we must ensure that the buffer
        // language is set and used in the gui.
@@ -603,11 +551,10 @@ bool Buffer::readFile(string const & filename)
 }
 
 
-bool Buffer::readFile(string const & filename, ParagraphList::iterator pit)
+bool Buffer::readFile(string const & filename, pit_type const pit)
 {
        LyXLex lex(0, 0);
        lex.setFile(filename);
-
        return readFile(lex, filename, pit);
 }
 
@@ -618,14 +565,13 @@ bool Buffer::fully_loaded() const
 }
 
 
-void Buffer::fully_loaded(bool value)
+void Buffer::fully_loaded(bool const value)
 {
        pimpl_->file_fully_loaded = value;
 }
 
 
-bool Buffer::readFile(LyXLex & lex, string const & filename,
-                     ParagraphList::iterator pit)
+bool Buffer::readFile(LyXLex & lex, string const & filename, pit_type const pit)
 {
        BOOST_ASSERT(!filename.empty());
 
@@ -654,7 +600,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename,
                return false;
        }
 
-       lex.eatLine();
+       lex.next();
        string tmp_format = lex.getString();
        //lyxerr << "LyX Format: `" << tmp_format << '\'' << endl;
        // if present remove ".," from string.
@@ -662,18 +608,22 @@ bool Buffer::readFile(LyXLex & lex, string const & filename,
        //lyxerr << "           dot found at " << dot << endl;
        if (dot != string::npos)
                        tmp_format.erase(dot, 1);
-       int file_format = strToInt(tmp_format);
+       int const file_format = convert<int>(tmp_format);
        //lyxerr << "format: " << file_format << endl;
 
-       if (file_format > LYX_FORMAT) {
-               Alert::warning(_("Document format failure"),
-                              bformat(_("%1$s was created with a newer"
-                                        " version of LyX. This is likely to"
-                                        " cause problems."),
-                                        filename));
-       } else if (file_format < LYX_FORMAT) {
+       if (file_format != LYX_FORMAT) {
                string const tmpfile = tempName();
-               string command = LibFileSearch("lyx2lyx", "lyx2lyx");
+               if (tmpfile.empty()) {
+                       Alert::error(_("Conversion failed"),
+                                    bformat(_("%1$s is from an earlier"
+                                             " version of LyX, but a temporary"
+                                             " file for converting it could"
+                                             " not be created."),
+                                             filename));
+                       return false;
+               }
+               string command =
+                       "python " + LibFileSearch("lyx2lyx", "lyx2lyx");
                if (command.empty()) {
                        Alert::error(_("Conversion script not found"),
                                     bformat(_("%1$s is from an earlier"
@@ -684,7 +634,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename,
                        return false;
                }
                command += " -t"
-                       + tostr(LYX_FORMAT)
+                       + convert<string>(LYX_FORMAT)
                        + " -o " + tmpfile + ' '
                        + QuoteName(filename);
                lyxerr[Debug::INFO] << "Running '"
@@ -699,22 +649,25 @@ bool Buffer::readFile(LyXLex & lex, string const & filename,
                                              filename));
                        return false;
                } else {
-                       bool ret = readFile(tmpfile, pit);
+                       bool const ret = readFile(tmpfile, pit);
                        // Do stuff with tmpfile name and buffer name here.
                        return ret;
                }
 
        }
 
-       bool the_end = readBody(lex, pit);
-       params().setPaperStuff();
-
-       if (!the_end) {
+       if (readDocument(lex)) {
                Alert::error(_("Document format failure"),
                             bformat(_("%1$s ended unexpectedly, which means"
                                       " that it is probably corrupted."),
                                       filename));
        }
+
+       //lyxerr << "removing " << MacroTable::localMacros().size()
+       //      << " temporary macro entries" << endl;
+       //MacroTable::localMacros().clear();
+       params().setPaperStuff();
+
        pimpl_->file_fully_loaded = true;
        return true;
 }
@@ -732,7 +685,7 @@ bool Buffer::save() const
                s = fileName() + '~';
                if (!lyxrc.backupdir_path.empty())
                        s = AddName(lyxrc.backupdir_path,
-                                   subst(os::slashify_path(s),'/','!'));
+                                   subst(os::internal_path(s),'/','!'));
 
                // Rename is the wrong way of making a backup,
                // this is the correct way.
@@ -787,9 +740,8 @@ bool Buffer::save() const
                removeAutosaveFile(fileName());
        } else {
                // Saving failed, so backup is not backup
-               if (lyxrc.make_backup) {
+               if (lyxrc.make_backup)
                        rename(s, fileName());
-               }
                return false;
        }
        return true;
@@ -798,25 +750,25 @@ bool Buffer::save() const
 
 bool Buffer::writeFile(string const & fname) const
 {
-       if (pimpl_->read_only && (fname == fileName())) {
+       if (pimpl_->read_only && fname == fileName())
                return false;
-       }
 
        FileInfo finfo(fname);
-       if (finfo.exist() && !finfo.writable()) {
+       if (finfo.exist() && !finfo.writable())
                return false;
-       }
 
-       bool retval;
+       bool retval = false;
 
        if (params().compressed) {
+#ifdef USE_COMPRESSION
                gz::ogzstream ofs(fname.c_str());
-
                if (!ofs)
                        return false;
 
                retval = do_writeFile(ofs);
-
+#else
+               return false;
+#endif
        } else {
                ofstream ofs(fname.c_str());
                if (!ofs)
@@ -831,7 +783,6 @@ bool Buffer::writeFile(string const & fname) const
 
 bool Buffer::do_writeFile(ostream & ofs) const
 {
-
 #ifdef HAVE_LOCALE
        // Use the standard "C" locale for file output.
        ofs.imbue(std::locale::classic());
@@ -842,24 +793,21 @@ bool Buffer::do_writeFile(ostream & ofs) const
        // write out a comment in the top of the file
        ofs << "#LyX " << lyx_version
            << " created this file. For more info see http://www.lyx.org/\n"
-           << "\\lyxformat " << LYX_FORMAT << "\n";
+           << "\\lyxformat " << LYX_FORMAT << "\n"
+           << "\\begin_document\n";
 
-       // now write out the buffer paramters.
+       // now write out the buffer parameters.
+       ofs << "\\begin_header\n";
        params().writeFile(ofs);
-
        ofs << "\\end_header\n";
 
-       Paragraph::depth_type depth = 0;
-
-       // this will write out all the paragraphs
-       // using recursive descent.
-       ParagraphList::const_iterator pit = paragraphs().begin();
-       ParagraphList::const_iterator pend = paragraphs().end();
-       for (; pit != pend; ++pit)
-               pit->write(*this, ofs, params(), depth);
+       // write the text
+       ofs << "\n\\begin_body\n";
+       text().write(*this, ofs);
+       ofs << "\n\\end_body\n";
 
        // Write marker that shows file is complete
-       ofs << "\n\\end_document" << endl;
+       ofs << "\\end_document" << endl;
 
        // Shouldn't really be needed....
        //ofs.close();
@@ -873,270 +821,50 @@ bool Buffer::do_writeFile(ostream & ofs) const
        //        which should include file system full errors.
 
        bool status = true;
-       if (!ofs.good()) {
+       if (!ofs) {
                status = false;
-#if 0
-               if (ofs.bad()) {
-                       lyxerr << "Buffer::writeFile: BAD ERROR!" << endl;
-               } else {
-                       lyxerr << "Buffer::writeFile: NOT SO BAD ERROR!"
-                              << endl;
-               }
-#endif
+               lyxerr << "File was not closed properly." << endl;
        }
 
        return status;
 }
 
 
-namespace {
-
-pair<int, string> const addDepth(int depth, int ldepth)
-{
-       int d = depth * 2;
-       if (ldepth > depth)
-               d += (ldepth - depth) * 2;
-       return make_pair(d, string(d, ' '));
-}
-
-}
-
-
-string const Buffer::asciiParagraph(Paragraph const & par,
-                                   unsigned int linelen,
-                                   bool noparbreak) const
-{
-       ostringstream buffer;
-       int ltype = 0;
-       Paragraph::depth_type ltype_depth = 0;
-       bool ref_printed = false;
-       Paragraph::depth_type depth = par.params().depth();
-
-       // First write the layout
-       string const & tmp = par.layout()->name();
-       if (compare_no_case(tmp, "itemize") == 0) {
-               ltype = 1;
-               ltype_depth = depth + 1;
-       } else if (compare_ascii_no_case(tmp, "enumerate") == 0) {
-               ltype = 2;
-               ltype_depth = depth + 1;
-       } else if (contains(ascii_lowercase(tmp), "ection")) {
-               ltype = 3;
-               ltype_depth = depth + 1;
-       } else if (contains(ascii_lowercase(tmp), "aragraph")) {
-               ltype = 4;
-               ltype_depth = depth + 1;
-       } else if (compare_ascii_no_case(tmp, "description") == 0) {
-               ltype = 5;
-               ltype_depth = depth + 1;
-       } else if (compare_ascii_no_case(tmp, "abstract") == 0) {
-               ltype = 6;
-               ltype_depth = 0;
-       } else if (compare_ascii_no_case(tmp, "bibliography") == 0) {
-               ltype = 7;
-               ltype_depth = 0;
-       } else {
-               ltype = 0;
-               ltype_depth = 0;
-       }
-
-       /* maybe some vertical spaces */
-
-       /* the labelwidthstring used in lists */
-
-       /* some lines? */
-
-       /* some pagebreaks? */
-
-       /* noindent ? */
-
-       /* what about the alignment */
-
-       // linelen <= 0 is special and means we don't have paragraph breaks
-
-       string::size_type currlinelen = 0;
-
-       if (!noparbreak) {
-               if (linelen > 0)
-                       buffer << "\n\n";
-
-               buffer << string(depth * 2, ' ');
-               currlinelen += depth * 2;
-
-               //--
-               // we should probably change to the paragraph language in the
-               // gettext here (if possible) so that strings are outputted in
-               // the correct language! (20012712 Jug)
-               //--
-               switch (ltype) {
-               case 0: // Standard
-               case 4: // (Sub)Paragraph
-               case 5: // Description
-                       break;
-               case 6: // Abstract
-                       if (linelen > 0) {
-                               buffer << _("Abstract") << "\n\n";
-                               currlinelen = 0;
-                       } else {
-                               string const abst = _("Abstract: ");
-                               buffer << abst;
-                               currlinelen += abst.length();
-                       }
-                       break;
-               case 7: // Bibliography
-                       if (!ref_printed) {
-                               if (linelen > 0) {
-                                       buffer << _("References") << "\n\n";
-                                       currlinelen = 0;
-                               } else {
-                                       string const refs = _("References: ");
-                                       buffer << refs;
-                                       currlinelen += refs.length();
-                               }
-
-                               ref_printed = true;
-                       }
-                       break;
-               default:
-               {
-                       string const parlab = par.params().labelString();
-                       buffer << parlab << ' ';
-                       currlinelen += parlab.length() + 1;
-               }
-               break;
-
-               }
-       }
-
-       if (!currlinelen) {
-               pair<int, string> p = addDepth(depth, ltype_depth);
-               buffer << p.second;
-               currlinelen += p.first;
-       }
-
-       // this is to change the linebreak to do it by word a bit more
-       // intelligent hopefully! (only in the case where we have a
-       // max linelength!) (Jug)
-
-       string word;
-
-       for (pos_type i = 0; i < par.size(); ++i) {
-               char c = par.getUChar(params(), i);
-               switch (c) {
-               case Paragraph::META_INSET:
-               {
-                       InsetOld const * inset = par.getInset(i);
-                       if (inset) {
-                               if (linelen > 0) {
-                                       buffer << word;
-                                       currlinelen += word.length();
-                                       word.erase();
-                               }
-                               if (inset->ascii(*this, buffer, linelen)) {
-                                       // to be sure it breaks paragraph
-                                       currlinelen += linelen;
-                               }
-                       }
-               }
-               break;
-
-               default:
-                       if (c == ' ') {
-                               if (linelen > 0 &&
-                                   currlinelen + word.length() > linelen - 10) {
-                                       buffer << "\n";
-                                       pair<int, string> p = addDepth(depth, ltype_depth);
-                                       buffer << p.second;
-                                       currlinelen = p.first;
-                               }
-
-                               buffer << word << ' ';
-                               currlinelen += word.length() + 1;
-                               word.erase();
-
-                       } else {
-                               if (c != '\0') {
-                                       word += c;
-                               } else {
-                                       lyxerr[Debug::INFO] <<
-                                               "writeAsciiFile: NULL char in structure." << endl;
-                               }
-                               if ((linelen > 0) &&
-                                       (currlinelen + word.length()) > linelen)
-                               {
-                                       buffer << "\n";
-
-                                       pair<int, string> p =
-                                               addDepth(depth, ltype_depth);
-                                       buffer << p.second;
-                                       currlinelen = p.first;
-                               }
-                       }
-                       break;
-               }
-       }
-       buffer << word;
-       return buffer.str();
-}
-
-
-void Buffer::writeFileAscii(string const & fname, int linelen)
-{
-       ofstream ofs;
-       if (!::openFileWrite(ofs, fname))
-               return;
-       writeFileAscii(ofs, linelen);
-}
-
-
-void Buffer::writeFileAscii(ostream & os, int linelen)
-{
-       ParagraphList::iterator beg = paragraphs().begin();
-       ParagraphList::iterator end = paragraphs().end();
-       ParagraphList::iterator it = beg;
-       for (; it != end; ++it) {
-               os << asciiParagraph(*it, linelen, it == beg);
-       }
-       os << "\n";
-}
-
-
 void Buffer::makeLaTeXFile(string const & fname,
                           string const & original_path,
-                          LatexRunParams const & runparams,
+                          OutputParams const & runparams,
                           bool output_preamble, bool output_body)
 {
        lyxerr[Debug::LATEX] << "makeLaTeXFile..." << endl;
 
        ofstream ofs;
-       if (!::openFileWrite(ofs, fname))
+       if (!openFileWrite(ofs, fname))
                return;
 
        makeLaTeXFile(ofs, original_path,
                      runparams, output_preamble, output_body);
 
        ofs.close();
-       if (ofs.fail()) {
-               lyxerr << "File was not closed properly." << endl;
-       }
+       if (ofs.fail())
+               lyxerr << "File '" << fname << "' was not closed properly." << endl;
 }
 
 
 void Buffer::makeLaTeXFile(ostream & os,
                           string const & original_path,
-                          LatexRunParams const & runparams_in,
-                          bool output_preamble, bool output_body)
+                          OutputParams const & runparams_in,
+                          bool const output_preamble, bool const output_body)
 {
-       LatexRunParams runparams = runparams_in;
-       niceFile() = runparams.nice; // this will be used by Insetincludes.
+       OutputParams runparams = runparams_in;
 
        // validate the buffer.
        lyxerr[Debug::LATEX] << "  Validating buffer..." << endl;
-       LaTeXFeatures features(*this, params());
+       LaTeXFeatures features(*this, params(), runparams.nice);
        validate(features);
        lyxerr[Debug::LATEX] << "  Buffer validation done." << endl;
 
        texrow().reset();
+
        // The starting paragraph of the coming rows is the
        // first paragraph of the document. (Asger)
        texrow().start(paragraphs().begin()->id(), 0);
@@ -1157,6 +885,9 @@ void Buffer::makeLaTeXFile(ostream & os,
        // input@path is set when the actual parameter
        // original_path is set. This is done for usual tex-file, but not
        // for nice-latex-file. (Matthias 250696)
+       // Note that input@path is only needed for something the user does
+       // in the preamble, included .tex files or ERT, files included by
+       // LyX work without it.
        if (output_preamble) {
                if (!runparams.nice) {
                        // code for usual, NOT nice-latex-file
@@ -1195,8 +926,22 @@ void Buffer::makeLaTeXFile(ostream & os,
                texrow().newline();
        }
 
+       // if we are doing a real file with body, even if this is the
+       // child of some other buffer, let's cut the link here.
+       // This happens for example if only a child document is printed.
+       string save_parentname;
+       if (output_preamble) {
+               save_parentname = params().parentname;
+               params().parentname.erase();
+       }
+
+       // the real stuff
        latexParagraphs(*this, paragraphs(), os, texrow(), runparams);
 
+       // Restore the parenthood if needed
+       if (output_preamble)
+               params().parentname = save_parentname;
+
        // add this just in case after all the paragraphs
        os << endl;
        texrow().newline();
@@ -1224,9 +969,6 @@ void Buffer::makeLaTeXFile(ostream & os,
        lyxerr[Debug::INFO] << "Finished making LaTeX file." << endl;
        lyxerr[Debug::INFO] << "Row count was " << texrow().rows() - 1
                            << '.' << endl;
-
-       // we want this to be true outside previews (for insetexternal)
-       niceFile() = true;
 }
 
 
@@ -1263,29 +1005,28 @@ bool Buffer::isSGML() const
 }
 
 
-void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
+void Buffer::makeLinuxDocFile(string const & fname,
+                             OutputParams const & runparams,
+                             bool const body_only)
 {
        ofstream ofs;
-       if (!::openFileWrite(ofs, fname))
+       if (!openFileWrite(ofs, fname))
                return;
 
-       niceFile() = nice; // this will be used by included files.
-
-       LaTeXFeatures features(*this, params());
-
+       LaTeXFeatures features(*this, params(), runparams.nice);
        validate(features);
 
        texrow().reset();
 
        LyXTextClass const & tclass = params().getLyXTextClass();
 
-       string top_element = tclass.latexname();
+       string const & top_element = tclass.latexname();
 
        if (!body_only) {
-               ofs << "<!doctype linuxdoc system";
+               ofs << tclass.class_header();
 
                string preamble = params().preamble;
-               string const name = nice ? ChangeExtension(pimpl_->filename, ".sgml")
+               string const name = runparams.nice ? ChangeExtension(pimpl_->filename, ".sgml")
                         : fname;
                preamble += features.getIncludedFiles(name);
                preamble += features.getLyXSGMLEntities();
@@ -1296,12 +1037,12 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
                ofs << ">\n\n";
 
                if (params().options.empty())
-                       sgml::openTag(ofs, 0, false, top_element);
+                       sgml::openTag(ofs, top_element);
                else {
                        string top = top_element;
                        top += ' ';
                        top += params().options;
-                       sgml::openTag(ofs, 0, false, top);
+                       sgml::openTag(ofs, top);
                }
        }
 
@@ -1309,412 +1050,58 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
            << " created this file. For more info see http://www.lyx.org/"
            << " -->\n";
 
-       Paragraph::depth_type depth = 0; // paragraph depth
-       string item_name;
-       vector<string> environment_stack(5);
-
-       ParagraphList::iterator pit = paragraphs().begin();
-       ParagraphList::iterator pend = paragraphs().end();
-       for (; pit != pend; ++pit) {
-               LyXLayout_ptr const & style = pit->layout();
-               // treat <toc> as a special case for compatibility with old code
-               if (pit->isInset(0)) {
-                       InsetOld * inset = pit->getInset(0);
-                       InsetOld::Code lyx_code = inset->lyxCode();
-                       if (lyx_code == InsetOld::TOC_CODE) {
-                               string const temp = "toc";
-                               sgml::openTag(ofs, depth, false, temp);
-                               continue;
-                       }
-               }
-
-               // environment tag closing
-               for (; depth > pit->params().depth(); --depth) {
-                       sgml::closeTag(ofs, depth, false, environment_stack[depth]);
-                       environment_stack[depth].erase();
-               }
-
-               // write opening SGML tags
-               switch (style->latextype) {
-               case LATEX_PARAGRAPH:
-                       if (depth == pit->params().depth()
-                          && !environment_stack[depth].empty()) {
-                               sgml::closeTag(ofs, depth, false, environment_stack[depth]);
-                               environment_stack[depth].erase();
-                               if (depth)
-                                       --depth;
-                               else
-                                       ofs << "</p>";
-                       }
-                       sgml::openTag(ofs, depth, false, style->latexname());
-                       break;
-
-               case LATEX_COMMAND:
-                       if (depth != 0)
-                               error(ErrorItem(_("Error:"), _("Wrong depth for LatexType Command.\n"), pit->id(), 0, pit->size()));
-
-                       if (!environment_stack[depth].empty()) {
-                               sgml::closeTag(ofs, depth, false, environment_stack[depth]);
-                               ofs << "</p>";
-                       }
-
-                       environment_stack[depth].erase();
-                       sgml::openTag(ofs, depth, false, style->latexname());
-                       break;
-
-               case LATEX_ENVIRONMENT:
-               case LATEX_ITEM_ENVIRONMENT:
-               case LATEX_BIB_ENVIRONMENT:
-               {
-                       string const & latexname = style->latexname();
-
-                       if (depth == pit->params().depth()
-                           && environment_stack[depth] != latexname) {
-                               sgml::closeTag(ofs, depth, false,
-                                            environment_stack[depth]);
-                               environment_stack[depth].erase();
-                       }
-                       if (depth < pit->params().depth()) {
-                              depth = pit->params().depth();
-                              environment_stack[depth].erase();
-                       }
-                       if (environment_stack[depth] != latexname) {
-                               if (depth == 0) {
-                                       sgml::openTag(ofs, depth, false, "p");
-                               }
-                               sgml::openTag(ofs, depth, false, latexname);
-
-                               if (environment_stack.size() == depth + 1)
-                                       environment_stack.push_back("!-- --");
-                               environment_stack[depth] = latexname;
-                       }
-
-                       if (style->latexparam() == "CDATA")
-                               ofs << "<![CDATA[";
-
-                       if (style->latextype == LATEX_ENVIRONMENT) break;
-
-                       if (style->labeltype == LABEL_MANUAL)
-                               item_name = "tag";
-                       else
-                               item_name = "item";
-
-                       sgml::openTag(ofs, depth + 1, false, item_name);
-               }
-               break;
-
-               default:
-                       sgml::openTag(ofs, depth, false, style->latexname());
-                       break;
-               }
-
-               simpleLinuxDocOnePar(ofs, pit, depth);
-
-               ofs << "\n";
-               // write closing SGML tags
-               switch (style->latextype) {
-               case LATEX_COMMAND:
-                       break;
-               case LATEX_ENVIRONMENT:
-               case LATEX_ITEM_ENVIRONMENT:
-               case LATEX_BIB_ENVIRONMENT:
-                       if (style->latexparam() == "CDATA")
-                               ofs << "]]>";
-                       break;
-               default:
-                       sgml::closeTag(ofs, depth, false, style->latexname());
-                       break;
-               }
-       }
-
-       // Close open tags
-       for (int i = depth; i >= 0; --i)
-               sgml::closeTag(ofs, depth, false, environment_stack[i]);
+       linuxdocParagraphs(*this, paragraphs(), ofs, runparams);
 
        if (!body_only) {
                ofs << "\n\n";
-               sgml::closeTag(ofs, 0, false, top_element);
+               sgml::closeTag(ofs, top_element);
        }
 
        ofs.close();
-       // How to check for successful close
-
-       // we want this to be true outside previews (for insetexternal)
-       niceFile() = true;
+       if (ofs.fail())
+               lyxerr << "File '" << fname << "' was not closed properly." << endl;
 }
 
 
-// checks, if newcol chars should be put into this line
-// writes newline, if necessary.
-namespace {
-
-void sgmlLineBreak(ostream & os, string::size_type & colcount,
-                         string::size_type newcol)
-{
-       colcount += newcol;
-       if (colcount > lyxrc.ascii_linelen) {
-               os << "\n";
-               colcount = newcol; // assume write after this call
-       }
-}
-
-enum PAR_TAG {
-       NONE=0,
-       TT = 1,
-       SF = 2,
-       BF = 4,
-       IT = 8,
-       SL = 16,
-       EM = 32
-};
-
-
-string tag_name(PAR_TAG const & pt) {
-       switch (pt) {
-       case NONE: return "!-- --";
-       case TT: return "tt";
-       case SF: return "sf";
-       case BF: return "bf";
-       case IT: return "it";
-       case SL: return "sl";
-       case EM: return "em";
-       }
-       return "";
-}
-
-
-inline
-void operator|=(PAR_TAG & p1, PAR_TAG const & p2)
-{
-       p1 = static_cast<PAR_TAG>(p1 | p2);
-}
-
-
-inline
-void reset(PAR_TAG & p1, PAR_TAG const & p2)
-{
-       p1 = static_cast<PAR_TAG>(p1 & ~p2);
-}
-
-} // anon
-
-
-// Handle internal paragraph parsing -- layout already processed.
-void Buffer::simpleLinuxDocOnePar(ostream & os,
-       ParagraphList::iterator par,
-       lyx::depth_type /*depth*/) const
-{
-       LyXLayout_ptr const & style = par->layout();
-
-       string::size_type char_line_count = 5;     // Heuristic choice ;-)
-
-       // gets paragraph main font
-       LyXFont font_old;
-       bool desc_on;
-       if (style->labeltype == LABEL_MANUAL) {
-               font_old = style->labelfont;
-               desc_on = true;
-       } else {
-               font_old = style->font;
-               desc_on = false;
-       }
-
-       LyXFont::FONT_FAMILY family_type = LyXFont::ROMAN_FAMILY;
-       LyXFont::FONT_SERIES series_type = LyXFont::MEDIUM_SERIES;
-       LyXFont::FONT_SHAPE  shape_type  = LyXFont::UP_SHAPE;
-       bool is_em = false;
-
-       stack<PAR_TAG> tag_state;
-       // parsing main loop
-       for (pos_type i = 0; i < par->size(); ++i) {
-
-               PAR_TAG tag_close = NONE;
-               list < PAR_TAG > tag_open;
-
-               LyXFont const font = par->getFont(params(), i, outerFont(par, paragraphs()));
-
-               if (font_old.family() != font.family()) {
-                       switch (family_type) {
-                       case LyXFont::SANS_FAMILY:
-                               tag_close |= SF;
-                               break;
-                       case LyXFont::TYPEWRITER_FAMILY:
-                               tag_close |= TT;
-                               break;
-                       default:
-                               break;
-                       }
-
-                       family_type = font.family();
-
-                       switch (family_type) {
-                       case LyXFont::SANS_FAMILY:
-                               tag_open.push_back(SF);
-                               break;
-                       case LyXFont::TYPEWRITER_FAMILY:
-                               tag_open.push_back(TT);
-                               break;
-                       default:
-                               break;
-                       }
-               }
-
-               if (font_old.series() != font.series()) {
-                       switch (series_type) {
-                       case LyXFont::BOLD_SERIES:
-                               tag_close |= BF;
-                               break;
-                       default:
-                               break;
-                       }
-
-                       series_type = font.series();
-
-                       switch (series_type) {
-                       case LyXFont::BOLD_SERIES:
-                               tag_open.push_back(BF);
-                               break;
-                       default:
-                               break;
-                       }
-
-               }
-
-               if (font_old.shape() != font.shape()) {
-                       switch (shape_type) {
-                       case LyXFont::ITALIC_SHAPE:
-                               tag_close |= IT;
-                               break;
-                       case LyXFont::SLANTED_SHAPE:
-                               tag_close |= SL;
-                               break;
-                       default:
-                               break;
-                       }
-
-                       shape_type = font.shape();
-
-                       switch (shape_type) {
-                       case LyXFont::ITALIC_SHAPE:
-                               tag_open.push_back(IT);
-                               break;
-                       case LyXFont::SLANTED_SHAPE:
-                               tag_open.push_back(SL);
-                               break;
-                       default:
-                               break;
-                       }
-               }
-               // handle <em> tag
-               if (font_old.emph() != font.emph()) {
-                       if (font.emph() == LyXFont::ON) {
-                               tag_open.push_back(EM);
-                               is_em = true;
-                       }
-                       else if (is_em) {
-                               tag_close |= EM;
-                               is_em = false;
-                       }
-               }
-
-               list < PAR_TAG > temp;
-               while (!tag_state.empty() && tag_close) {
-                       PAR_TAG k =  tag_state.top();
-                       tag_state.pop();
-                       os << "</" << tag_name(k) << '>';
-                       if (tag_close & k)
-                               reset(tag_close,k);
-                       else
-                               temp.push_back(k);
-               }
-
-               for(list< PAR_TAG >::const_iterator j = temp.begin();
-                   j != temp.end(); ++j) {
-                       tag_state.push(*j);
-                       os << '<' << tag_name(*j) << '>';
-               }
-
-               for(list< PAR_TAG >::const_iterator j = tag_open.begin();
-                   j != tag_open.end(); ++j) {
-                       tag_state.push(*j);
-                       os << '<' << tag_name(*j) << '>';
-               }
-
-               char c = par->getChar(i);
-
-               if (c == Paragraph::META_INSET) {
-                       InsetOld * inset = par->getInset(i);
-                       inset->linuxdoc(*this, os);
-                       font_old = font;
-                       continue;
-               }
-
-               if (style->latexparam() == "CDATA") {
-                       // "TeX"-Mode on == > SGML-Mode on.
-                       if (c != '\0')
-                               os << c;
-                       ++char_line_count;
-               } else {
-                       bool ws;
-                       string str;
-                       boost::tie(ws, str) = sgml::escapeChar(c);
-                       if (ws && !par->isFreeSpacing()) {
-                               // in freespacing mode, spaces are
-                               // non-breaking characters
-                               if (desc_on) {// if char is ' ' then...
-
-                                       ++char_line_count;
-                                       sgmlLineBreak(os, char_line_count, 6);
-                                       os << "</tag>";
-                                       desc_on = false;
-                               } else  {
-                                       sgmlLineBreak(os, char_line_count, 1);
-                                       os << c;
-                               }
-                       } else {
-                               os << str;
-                               char_line_count += str.length();
-                       }
-               }
-               font_old = font;
-       }
-
-       while (!tag_state.empty()) {
-               os << "</" << tag_name(tag_state.top()) << '>';
-               tag_state.pop();
-       }
-
-       // resets description flag correctly
-       if (desc_on) {
-               // <tag> not closed...
-               sgmlLineBreak(os, char_line_count, 6);
-               os << "</tag>";
-       }
-}
-
-
-void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
+void Buffer::makeDocBookFile(string const & fname,
+                            OutputParams const & runparams,
+                            bool const only_body)
 {
        ofstream ofs;
-       if (!::openFileWrite(ofs, fname))
+       if (!openFileWrite(ofs, fname))
                return;
 
-       niceFile() = nice; // this will be used by Insetincludes.
-
-       LaTeXFeatures features(*this, params());
+       LaTeXFeatures features(*this, params(), runparams.nice);
        validate(features);
 
        texrow().reset();
 
        LyXTextClass const & tclass = params().getLyXTextClass();
-       string top_element = tclass.latexname();
+       string const & top_element = tclass.latexname();
 
        if (!only_body) {
-               ofs << "<!DOCTYPE " << top_element
-                   << "  PUBLIC \"-//OASIS//DTD DocBook V4.1//EN\"";
+               if (runparams.flavor == OutputParams::XML)
+                       ofs << "<?xml version=\"1.0\" encoding=\""
+                           << params().language->encoding()->Name() << "\"?>\n";
+
+               ofs << "<!DOCTYPE " << top_element << " ";
+
+               if (! tclass.class_header().empty()) ofs << tclass.class_header();
+               else if (runparams.flavor == OutputParams::XML)
+                       ofs << "PUBLIC \"-//OASIS//DTD DocBook XML//EN\" "
+                           << "\"http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd\"";
+               else
+                       ofs << " PUBLIC \"-//OASIS//DTD DocBook V4.2//EN\"";
 
                string preamble = params().preamble;
-               string const name = nice ? ChangeExtension(pimpl_->filename, ".sgml")
+               if (runparams.flavor != OutputParams::XML ) {
+                       preamble += "<!ENTITY % output.print.png \"IGNORE\">\n";
+                       preamble += "<!ENTITY % output.print.pdf \"IGNORE\">\n";
+                       preamble += "<!ENTITY % output.print.eps \"IGNORE\">\n";
+                       preamble += "<!ENTITY % output.print.bmp \"IGNORE\">\n";
+               }
+
+               string const name = runparams.nice ? ChangeExtension(pimpl_->filename, ".sgml")
                         : fname;
                preamble += features.getIncludedFiles(name);
                preamble += features.getLyXSGMLEntities();
@@ -1727,315 +1114,31 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
 
        string top = top_element;
        top += " lang=\"";
-       top += params().language->code();
+       if (runparams.flavor == OutputParams::XML)
+               top += params().language->code();
+       else
+               top += params().language->code().substr(0,2);
        top += '"';
 
        if (!params().options.empty()) {
                top += ' ';
                top += params().options;
        }
-       sgml::openTag(ofs, 0, false, top);
 
-       ofs << "<!-- DocBook file was created by LyX " << lyx_version
+       ofs << "<!-- " << ((runparams.flavor == OutputParams::XML)? "XML" : "SGML")
+           << " file was created by LyX " << lyx_version
            << "\n  See http://www.lyx.org/ for more information -->\n";
 
-       vector<string> environment_stack(10);
-       vector<string> environment_inner(10);
-       vector<string> command_stack(10);
-
-       bool command_flag = false;
-       Paragraph::depth_type command_depth = 0;
-       Paragraph::depth_type command_base = 0;
-       Paragraph::depth_type cmd_depth = 0;
-       Paragraph::depth_type depth = 0; // paragraph depth
-
-       string item_name;
-       string command_name;
-
-       ParagraphList::iterator par = paragraphs().begin();
-       ParagraphList::iterator pend = paragraphs().end();
-
-       for (; par != pend; ++par) {
-               string sgmlparam;
-               string c_depth;
-               string c_params;
-               int desc_on = 0; // description mode
-
-               LyXLayout_ptr const & style = par->layout();
-
-               // environment tag closing
-               for (; depth > par->params().depth(); --depth) {
-                       if (!environment_inner[depth].empty())
-                       sgml::closeEnvTags(ofs, false, environment_inner[depth],
-                                       command_depth + depth);
-                       sgml::closeTag(ofs, depth + command_depth, false, environment_stack[depth]);
-                       environment_stack[depth].erase();
-                       environment_inner[depth].erase();
-               }
-
-               if (depth == par->params().depth()
-                  && environment_stack[depth] != style->latexname()
-                  && !environment_stack[depth].empty()) {
-                               sgml::closeEnvTags(ofs, false, environment_inner[depth],
-                                       command_depth + depth);
-                       sgml::closeTag(ofs, depth + command_depth, false, environment_stack[depth]);
-
-                       environment_stack[depth].erase();
-                       environment_inner[depth].erase();
-               }
-
-               // Write opening SGML tags.
-               switch (style->latextype) {
-               case LATEX_PARAGRAPH:
-                       sgml::openTag(ofs, depth + command_depth,
-                                   false, style->latexname());
-                       break;
-
-               case LATEX_COMMAND:
-                       if (depth != 0)
-                               error(ErrorItem(_("Error"), _("Wrong depth for LatexType Command."), par->id(), 0, par->size()));
-
-                       command_name = style->latexname();
-
-                       sgmlparam = style->latexparam();
-                       c_params = split(sgmlparam, c_depth,'|');
-
-                       cmd_depth = atoi(c_depth);
-
-                       if (command_flag) {
-                               if (cmd_depth < command_base) {
-                                       for (Paragraph::depth_type j = command_depth;
-                                            j >= command_base; --j) {
-                                               sgml::closeTag(ofs, j, false, command_stack[j]);
-                                               ofs << endl;
-                                       }
-                                       command_depth = command_base = cmd_depth;
-                               } else if (cmd_depth <= command_depth) {
-                                       for (int j = command_depth;
-                                            j >= int(cmd_depth); --j) {
-                                               sgml::closeTag(ofs, j, false, command_stack[j]);
-                                               ofs << endl;
-                                       }
-                                       command_depth = cmd_depth;
-                               } else
-                                       command_depth = cmd_depth;
-                       } else {
-                               command_depth = command_base = cmd_depth;
-                               command_flag = true;
-                       }
-                       if (command_stack.size() == command_depth + 1)
-                               command_stack.push_back(string());
-                       command_stack[command_depth] = command_name;
-
-                       // treat label as a special case for
-                       // more WYSIWYM handling.
-                       // This is a hack while paragraphs can't have
-                       // attributes, like id in this case.
-                       if (par->isInset(0)) {
-                               InsetOld * inset = par->getInset(0);
-                               InsetOld::Code lyx_code = inset->lyxCode();
-                               if (lyx_code == InsetOld::LABEL_CODE) {
-                                       command_name += " id=\"";
-                                       command_name += (static_cast<InsetCommand *>(inset))->getContents();
-                                       command_name += '"';
-                                       desc_on = 3;
-                               }
-                       }
-
-                       sgml::openTag(ofs, depth + command_depth, false, command_name);
-
-                       item_name = c_params.empty() ? "title" : c_params;
-                       sgml::openTag(ofs, depth + 1 + command_depth, false, item_name);
-                       break;
-
-               case LATEX_ENVIRONMENT:
-               case LATEX_ITEM_ENVIRONMENT:
-                       if (depth < par->params().depth()) {
-                               depth = par->params().depth();
-                               environment_stack[depth].erase();
-                       }
-
-                       if (environment_stack[depth] != style->latexname()) {
-                               if (environment_stack.size() == depth + 1) {
-                                       environment_stack.push_back("!-- --");
-                                       environment_inner.push_back("!-- --");
-                               }
-                               environment_stack[depth] = style->latexname();
-                               environment_inner[depth] = "!-- --";
-                               sgml::openTag(ofs, depth + command_depth, false, environment_stack[depth]);
-                       } else {
-                                       sgml::closeEnvTags(ofs, false, environment_inner[depth],
-                                               command_depth + depth);
-                       }
-
-                       if (style->latextype == LATEX_ENVIRONMENT) {
-                               if (!style->latexparam().empty()) {
-                                       if (style->latexparam() == "CDATA")
-                                               ofs << "<![CDATA[";
-                                       else
-                                               sgml::openTag(ofs, depth + command_depth, false, style->latexparam());
-                               }
-                               break;
-                       }
-
-                       desc_on = (style->labeltype == LABEL_MANUAL);
-
-                       environment_inner[depth] = desc_on ? "varlistentry" : "listitem";
-                       sgml::openTag(ofs, depth + 1 + command_depth,
-                                   false, environment_inner[depth]);
-
-                       item_name = desc_on ? "term" : "para";
-                       sgml::openTag(ofs, depth + 1 + command_depth,
-                                   false, item_name);
-                       break;
-               default:
-                       sgml::openTag(ofs, depth + command_depth,
-                                   false, style->latexname());
-                       break;
-               }
-
-               simpleDocBookOnePar(ofs, par, desc_on,
-                                   depth + 1 + command_depth);
-
-               string end_tag;
-               // write closing SGML tags
-               switch (style->latextype) {
-               case LATEX_COMMAND:
-                       end_tag = c_params.empty() ? "title" : c_params;
-                       sgml::closeTag(ofs, depth + command_depth,
-                                    false, end_tag);
-                       break;
-               case LATEX_ENVIRONMENT:
-                       if (!style->latexparam().empty()) {
-                               if (style->latexparam() == "CDATA")
-                                       ofs << "]]>";
-                               else
-                                       sgml::closeTag(ofs, depth + command_depth, false, style->latexparam());
-                       }
-                       break;
-               case LATEX_ITEM_ENVIRONMENT:
-                       if (desc_on == 1) break;
-                       end_tag = "para";
-                       sgml::closeTag(ofs, depth + 1 + command_depth, false, end_tag);
-                       break;
-               case LATEX_PARAGRAPH:
-                       sgml::closeTag(ofs, depth + command_depth, false, style->latexname());
-                       break;
-               default:
-                       sgml::closeTag(ofs, depth + command_depth, false, style->latexname());
-                       break;
-               }
-       }
-
-       // Close open tags
-       for (int d = depth; d >= 0; --d) {
-               if (!environment_stack[depth].empty()) {
-                               sgml::closeEnvTags(ofs, false, environment_inner[depth],
-                                       command_depth + depth);
-               }
-       }
+       params().getLyXTextClass().counters().reset();
 
-       for (int j = command_depth; j >= 0 ; --j)
-               if (!command_stack[j].empty()) {
-                       sgml::closeTag(ofs, j, false, command_stack[j]);
-                       ofs << endl;
-               }
-
-       ofs << "\n\n";
-       sgml::closeTag(ofs, 0, false, top_element);
+       sgml::openTag(ofs, top);
+       ofs << '\n';
+       docbookParagraphs(paragraphs(), *this, ofs, runparams);
+       sgml::closeTag(ofs, top_element);
 
        ofs.close();
-       // How to check for successful close
-
-       // we want this to be true outside previews (for insetexternal)
-       niceFile() = true;
-}
-
-
-void Buffer::simpleDocBookOnePar(ostream & os,
-                                ParagraphList::iterator par, int & desc_on,
-                                lyx::depth_type depth) const
-{
-       bool emph_flag = false;
-
-       LyXLayout_ptr const & style = par->layout();
-
-       LyXFont font_old = (style->labeltype == LABEL_MANUAL ? style->labelfont : style->font);
-
-       int char_line_count = depth;
-       //if (!style.free_spacing)
-       //      os << string(depth,' ');
-
-       // parsing main loop
-       for (pos_type i = 0; i < par->size(); ++i) {
-               LyXFont font = par->getFont(params(), i, outerFont(par, paragraphs()));
-
-               // handle <emphasis> tag
-               if (font_old.emph() != font.emph()) {
-                       if (font.emph() == LyXFont::ON) {
-                               if (style->latexparam() == "CDATA")
-                                       os << "]]>";
-                               os << "<emphasis>";
-                               if (style->latexparam() == "CDATA")
-                                       os << "<![CDATA[";
-                               emph_flag = true;
-                       } else if (i) {
-                               if (style->latexparam() == "CDATA")
-                                       os << "]]>";
-                               os << "</emphasis>";
-                               if (style->latexparam() == "CDATA")
-                                       os << "<![CDATA[";
-                               emph_flag = false;
-                       }
-               }
-
-
-               if (par->isInset(i)) {
-                       InsetOld * inset = par->getInset(i);
-                       // don't print the inset in position 0 if desc_on == 3 (label)
-                       if (i || desc_on != 3) {
-                               if (style->latexparam() == "CDATA")
-                                       os << "]]>";
-                               inset->docbook(*this, os, false);
-                               if (style->latexparam() == "CDATA")
-                                       os << "<![CDATA[";
-                       }
-               } else {
-                       char c = par->getChar(i);
-                       bool ws;
-                       string str;
-                       boost::tie(ws, str) = sgml::escapeChar(c);
-
-                       if (style->pass_thru) {
-                               os << c;
-                       } else if (par->isFreeSpacing() || c != ' ') {
-                                       os << str;
-                       } else if (desc_on == 1) {
-                               ++char_line_count;
-                               os << "\n</term><listitem><para>";
-                               desc_on = 2;
-                       } else {
-                               os << ' ';
-                       }
-               }
-               font_old = font;
-       }
-
-       if (emph_flag) {
-               if (style->latexparam() == "CDATA")
-                       os << "]]>";
-               os << "</emphasis>";
-               if (style->latexparam() == "CDATA")
-                       os << "<![CDATA[";
-       }
-
-       // resets description flag correctly
-       if (desc_on == 1) {
-               // <term> not closed...
-               os << "</term>\n<listitem><para>&nbsp;</para>";
-       }
-       if (style->free_spacing)
-               os << '\n';
+       if (ofs.fail())
+               lyxerr << "File '" << fname << "' was not closed properly." << endl;
 }
 
 
@@ -2047,25 +1150,21 @@ int Buffer::runChktex()
 
        // get LaTeX-Filename
        string const name = getLatexName();
-       string path = filePath();
-
-       string const org_path = path;
-       if (lyxrc.use_tempdir || !IsDirWriteable(path)) {
-               path = temppath();
-       }
+       string const path = temppath();
+       string const org_path = filePath();
 
        Path p(path); // path to LaTeX file
        message(_("Running chktex..."));
 
        // Generate the LaTeX file if neccessary
-       LatexRunParams runparams;
-       runparams.flavor = LatexRunParams::LATEX;
+       OutputParams runparams;
+       runparams.flavor = OutputParams::LATEX;
        runparams.nice = false;
        makeLaTeXFile(name, org_path, runparams);
 
        TeXErrors terr;
        Chktex chktex(lyxrc.chktex_command, name, filePath());
-       int res = chktex.run(terr); // run chktex
+       int const res = chktex.run(terr); // run chktex
 
        if (res == -1) {
                Alert::error(_("chktex failure"),
@@ -2085,7 +1184,8 @@ void Buffer::validate(LaTeXFeatures & features) const
 {
        LyXTextClass const & tclass = params().getLyXTextClass();
 
-       if (params().tracking_changes) {
+       if (features.isAvailable("dvipost") && params().tracking_changes
+               && params().output_changes) {
                features.require("dvipost");
                features.require("color");
        }
@@ -2128,51 +1228,48 @@ void Buffer::validate(LaTeXFeatures & features) const
 }
 
 
-void Buffer::getLabelList(std::vector<string> & list) const
+void Buffer::getLabelList(vector<string> & list) const
 {
        /// if this is a child document and the parent is already loaded
        /// Use the parent's list instead  [ale990407]
-       if (!params().parentname.empty()
-           && bufferlist.exists(params().parentname)) {
-               Buffer const * tmp = bufferlist.getBuffer(params().parentname);
-               if (tmp) {
-                       tmp->getLabelList(list);
-                       return;
-               }
+       Buffer const * tmp = getMasterBuffer();
+       if (!tmp) {
+               lyxerr << "getMasterBuffer() failed!" << endl;
+               BOOST_ASSERT(tmp);
        }
-
-       for (inset_iterator it = inset_const_iterator_begin();
-            it != inset_const_iterator_end(); ++it) {
-               it->getLabelList(*this, list);
+       if (tmp != this) {
+               tmp->getLabelList(list);
+               return;
        }
+
+       for (InsetIterator it = inset_iterator_begin(inset()); it; ++it)
+               it.nextInset()->getLabelList(*this, list);
 }
 
 
 // This is also a buffer property (ale)
-void Buffer::fillWithBibKeys(std::vector<std::pair<string, string> > & keys) const
+void Buffer::fillWithBibKeys(vector<pair<string, string> > & keys)
+       const
 {
        /// if this is a child document and the parent is already loaded
        /// use the parent's list instead  [ale990412]
-       if (!params().parentname.empty() &&
-           bufferlist.exists(params().parentname)) {
-               Buffer const * tmp = bufferlist.getBuffer(params().parentname);
-               if (tmp) {
-                       tmp->fillWithBibKeys(keys);
-                       return;
-               }
+       Buffer const * tmp = getMasterBuffer();
+       BOOST_ASSERT(tmp);
+       if (tmp != this) {
+               tmp->fillWithBibKeys(keys);
+               return;
        }
 
-       for (inset_iterator it = inset_const_iterator_begin();
-               it != inset_const_iterator_end(); ++it) {
-               if (it->lyxCode() == InsetOld::BIBTEX_CODE) {
+       for (InsetIterator it = inset_iterator_begin(inset()); it; ++it) {
+               if (it->lyxCode() == InsetBase::BIBTEX_CODE) {
                        InsetBibtex const & inset =
                                dynamic_cast<InsetBibtex const &>(*it);
                        inset.fillWithBibKeys(*this, keys);
-               } else if (it->lyxCode() == InsetOld::INCLUDE_CODE) {
+               } else if (it->lyxCode() == InsetBase::INCLUDE_CODE) {
                        InsetInclude const & inset =
                                dynamic_cast<InsetInclude const &>(*it);
                        inset.fillWithBibKeys(*this, keys);
-               } else if (it->lyxCode() == InsetOld::BIBITEM_CODE) {
+               } else if (it->lyxCode() == InsetBase::BIBITEM_CODE) {
                        InsetBibitem const & inset =
                                dynamic_cast<InsetBibitem const &>(*it);
                        string const key = inset.getContents();
@@ -2187,7 +1284,7 @@ void Buffer::fillWithBibKeys(std::vector<std::pair<string, string> > & keys) con
 
 bool Buffer::isDepClean(string const & name) const
 {
-       DepClean::const_iterator it = pimpl_->dep_clean.find(name);
+       DepClean::const_iterator const it = pimpl_->dep_clean.find(name);
        if (it == pimpl_->dep_clean.end())
                return true;
        return it->second;
@@ -2227,27 +1324,32 @@ bool Buffer::dispatch(FuncRequest const & func, bool * result)
 
 void Buffer::changeLanguage(Language const * from, Language const * to)
 {
+       BOOST_ASSERT(from);
+       BOOST_ASSERT(to);
+
        lyxerr << "Changing Language!" << endl;
 
        // Take care of l10n/i18n
        updateDocLang(to);
 
-       ParIterator end = par_iterator_end();
-       for (ParIterator it = par_iterator_begin(); it != end; ++it)
-               it->changeLanguage(params(), from, to);
+       for_each(par_iterator_begin(),
+                par_iterator_end(),
+                bind(&Paragraph::changeLanguage, _1, params(), from, to));
 }
 
 
 void Buffer::updateDocLang(Language const * nlang)
 {
+       BOOST_ASSERT(nlang);
+
        pimpl_->messages.reset(new Messages(nlang->code()));
 }
 
 
-bool Buffer::isMultiLingual()
+bool Buffer::isMultiLingual() const
 {
-       ParIterator end = par_iterator_end();
-       for (ParIterator it = par_iterator_begin(); it != end; ++it)
+       ParConstIterator end = par_iterator_end();
+       for (ParConstIterator it = par_iterator_begin(); it != end; ++it)
                if (it->isMultiLingual(params()))
                        return true;
 
@@ -2255,39 +1357,11 @@ bool Buffer::isMultiLingual()
 }
 
 
-void Buffer::inset_iterator::setParagraph()
-{
-       while (pit != pend) {
-               it = pit->insetlist.begin();
-               if (it != pit->insetlist.end())
-                       return;
-               ++pit;
-       }
-}
-
-
-InsetOld * Buffer::getInsetFromID(int id_arg) const
-{
-       for (inset_iterator it = inset_const_iterator_begin();
-                it != inset_const_iterator_end(); ++it)
-       {
-               if (it->id() == id_arg)
-                       return &(*it);
-               InsetOld * in = it->getInsetFromID(id_arg);
-               if (in)
-                       return in;
-       }
-       return 0;
-}
-
-
-ParIterator Buffer::getParFromID(int id) const
+ParIterator Buffer::getParFromID(int const id) const
 {
-#warning FIXME: const correctness! (Andre)
-       ParIterator it = const_cast<Buffer*>(this)->par_iterator_begin();
-       ParIterator end = const_cast<Buffer*>(this)->par_iterator_end();
+       ParConstIterator it = par_iterator_begin();
+       ParConstIterator const end = par_iterator_end();
 
-#warning FIXME, perhaps this func should return a ParIterator? (Lgb)
        if (id < 0) {
                // John says this is called with id == -1 from undo
                lyxerr << "getParFromID(), id: " << id << endl;
@@ -2302,48 +1376,34 @@ ParIterator Buffer::getParFromID(int id) const
 }
 
 
-bool Buffer::hasParWithID(int id) const
+bool Buffer::hasParWithID(int const id) const
 {
-       ParConstIterator it = par_iterator_begin();
-       ParConstIterator end = par_iterator_end();
-
-       if (id < 0) {
-               // John says this is called with id == -1 from undo
-               lyxerr << "hasParWithID(), id: " << id << endl;
-               return 0;
-       }
-
-       for (; it != end; ++it)
-               if (it->id() == id)
-                       return true;
-
-       return false;
+       ParConstIterator const it = getParFromID(id);
+       return it != par_iterator_end();
 }
 
 
 ParIterator Buffer::par_iterator_begin()
 {
-       return ParIterator(paragraphs().begin(), paragraphs());
+       return ::par_iterator_begin(inset());
 }
 
 
 ParIterator Buffer::par_iterator_end()
 {
-       return ParIterator(paragraphs().end(), paragraphs());
+       return ::par_iterator_end(inset());
 }
 
 
 ParConstIterator Buffer::par_iterator_begin() const
 {
-       ParagraphList const & pars = paragraphs();
-       return ParConstIterator(const_cast<ParagraphList&>(pars).begin(), pars);
+       return ::par_const_iterator_begin(inset());
 }
 
 
 ParConstIterator Buffer::par_iterator_end() const
 {
-       ParagraphList const & pars = paragraphs();
-       return ParConstIterator(const_cast<ParagraphList&>(pars).end(), pars);
+       return ::par_const_iterator_end(inset());
 }
 
 
@@ -2399,12 +1459,15 @@ void Buffer::setUnnamed(bool flag)
 }
 
 
-bool Buffer::isUnnamed()
+bool Buffer::isUnnamed() const
 {
        return pimpl_->unnamed;
 }
 
 
+#ifdef WITH_WARNINGS
+#warning this function should be moved to buffer_pimpl.C
+#endif
 void Buffer::markDirty()
 {
        if (pimpl_->lyx_clean) {
@@ -2446,99 +1509,57 @@ void Buffer::setParentName(string const & name)
 }
 
 
-Buffer::inset_iterator::inset_iterator()
-       : pit(), pend()
-{}
-
-
-Buffer::inset_iterator::inset_iterator(base_type p, base_type e)
-       : pit(p), pend(e)
-{
-       setParagraph();
-}
-
-
-Buffer::inset_iterator Buffer::inset_iterator_begin()
-{
-       return inset_iterator(paragraphs().begin(), paragraphs().end());
-}
-
-
-Buffer::inset_iterator Buffer::inset_iterator_end()
-{
-       return inset_iterator(paragraphs().end(), paragraphs().end());
-}
-
-
-Buffer::inset_iterator Buffer::inset_const_iterator_begin() const
-{
-       ParagraphList & pars = const_cast<ParagraphList&>(paragraphs());
-       return inset_iterator(pars.begin(), pars.end());
-}
-
-
-Buffer::inset_iterator Buffer::inset_const_iterator_end() const
+Buffer const * Buffer::getMasterBuffer() const
 {
-       ParagraphList & pars = const_cast<ParagraphList&>(paragraphs());
-       return inset_iterator(pars.end(), pars.end());
-}
-
-
-Buffer::inset_iterator & Buffer::inset_iterator::operator++()
-{
-       if (pit != pend) {
-               ++it;
-               if (it == pit->insetlist.end()) {
-                       ++pit;
-                       setParagraph();
-               }
+       if (!params().parentname.empty()
+           && bufferlist.exists(params().parentname)) {
+               Buffer const * buf = bufferlist.getBuffer(params().parentname);
+               if (buf)
+                       return buf->getMasterBuffer();
        }
-       return *this;
-}
-
 
-Buffer::inset_iterator Buffer::inset_iterator::operator++(int)
-{
-       inset_iterator tmp = *this;
-       ++*this;
-       return tmp;
+       return this;
 }
 
 
-Buffer::inset_iterator::reference Buffer::inset_iterator::operator*()
+MacroData const & Buffer::getMacro(std::string const & name) const
 {
-       return *it->inset;
+       return pimpl_->macros.get(name);
 }
 
 
-Buffer::inset_iterator::pointer Buffer::inset_iterator::operator->()
+bool Buffer::hasMacro(string const & name) const
 {
-       return it->inset;
+       return pimpl_->macros.has(name);
 }
 
 
-ParagraphList::iterator Buffer::inset_iterator::getPar() const
+void Buffer::insertMacro(string const & name, MacroData const & data)
 {
-       return pit;
+       MacroTable::globalMacros().insert(name, data);
+       pimpl_->macros.insert(name, data);
 }
 
 
-lyx::pos_type Buffer::inset_iterator::getPos() const
+void Buffer::buildMacros()
 {
-       return it->pos;
-}
+       // Start with global table.
+       pimpl_->macros = MacroTable::globalMacros();
 
-
-bool operator==(Buffer::inset_iterator const & iter1,
-               Buffer::inset_iterator const & iter2)
-{
-       return iter1.pit == iter2.pit
-               && (iter1.pit == iter1.pend || iter1.it == iter2.it);
-}
-
-
-bool operator!=(Buffer::inset_iterator const & iter1,
-               Buffer::inset_iterator const & iter2)
-{
-       return !(iter1 == iter2);
+       // Now add our own.
+       ParagraphList & pars = text().paragraphs();
+       for (size_t i = 0, n = pars.size(); i != n; ++i) {
+               //lyxerr << "searching main par " << i
+               //      << " for macro definitions" << std::endl;
+               InsetList::iterator it = pars[i].insetlist.begin();
+               InsetList::iterator end = pars[i].insetlist.end();
+               for ( ; it != end; ++it) {
+                       //lyxerr << "found inset code " << it->inset->lyxCode() << std::endl;
+                       if (it->inset->lyxCode() == InsetBase::MATHMACRO_CODE) {
+                               MathMacroTemplate & mac
+                                       = static_cast<MathMacroTemplate &>(*it->inset);
+                               insertMacro(mac.name(), mac.asMacroData());
+                       }
+               }
+       }
 }