]> git.lyx.org Git - features.git/blobdiff - src/buffer.C
Introducing a number of tags parametrizing various
[features.git] / src / buffer.C
index f1e59aef48902953a66f744adec332c85c964d1a..ce10f735432be8abe1ecbaf78612e02074510c01 100644 (file)
 
 #include "buffer.h"
 
+#include "author.h"
 #include "buffer_funcs.h"
 #include "bufferlist.h"
 #include "bufferparams.h"
+#include "counters.h"
+#include "Bullet.h"
 #include "Chktex.h"
 #include "debug.h"
 #include "errorlist.h"
 #include "exporter.h"
 #include "format.h"
+#include "funcrequest.h"
 #include "gettext.h"
 #include "iterators.h"
 #include "language.h"
 #include "lyxrc.h"
 #include "lyxvc.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 "PosIterator.h"
 #include "sgml.h"
 #include "texrow.h"
 #include "undo.h"
@@ -49,7 +59,6 @@
 #include "support/FileInfo.h"
 #include "support/filetools.h"
 #include "support/gzstream.h"
-#include "support/LAssert.h"
 #include "support/lyxlib.h"
 #include "support/os.h"
 #include "support/path.h"
@@ -57,7 +66,6 @@
 #include "support/tostr.h"
 
 #include <boost/bind.hpp>
-#include <boost/tuple/tuple.hpp>
 
 #include "support/std_sstream.h"
 
 #ifdef HAVE_LOCALE
 #endif
 
-using namespace lyx::support;
+using lyx::pos_type;
+
+using lyx::support::AddName;
+using lyx::support::atoi;
+using lyx::support::bformat;
+using lyx::support::ChangeExtension;
+using lyx::support::cmd_ret;
+using lyx::support::CreateBufferTmpDir;
+using lyx::support::destroyDir;
+using lyx::support::FileInfo;
+using lyx::support::FileInfo;
+using lyx::support::getExtFromContents;
+using lyx::support::IsDirWriteable;
+using lyx::support::IsFileWriteable;
+using lyx::support::LibFileSearch;
+using lyx::support::ltrim;
+using lyx::support::MakeAbsPath;
+using lyx::support::MakeDisplayPath;
+using lyx::support::MakeLatexName;
+using lyx::support::OnlyFilename;
+using lyx::support::OnlyPath;
+using lyx::support::Path;
+using lyx::support::QuoteName;
+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;
+
+namespace os = lyx::support::os;
 
 using std::endl;
 using std::for_each;
 using std::make_pair;
 
 using std::ifstream;
-using std::list;
 using std::ios;
 using std::ostream;
 using std::ostringstream;
@@ -84,8 +123,7 @@ using std::ofstream;
 using std::pair;
 using std::stack;
 using std::vector;
-
-using lyx::pos_type;
+using std::string;
 
 
 // all these externs should eventually be removed.
@@ -95,25 +133,12 @@ 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;
-}
-
 } // namespace anon
 
 
 typedef std::map<string, bool> DepClean;
 
-struct Buffer::Impl 
+struct Buffer::Impl
 {
        Impl(Buffer & parent, string const & file, bool readonly);
 
@@ -148,13 +173,19 @@ struct Buffer::Impl
        string filepath;
 
        boost::scoped_ptr<Messages> messages;
+
+       /** 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;
 };
 
 
 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))
+         filename(file), filepath(OnlyPath(file)), file_fully_loaded(false)
 {
        lyxvc.buffer(&parent);
        if (readonly_ || lyxrc.use_tempdir)
@@ -166,9 +197,6 @@ Buffer::Buffer(string const & file, bool ronly)
        : pimpl_(new Impl(*this, file, ronly))
 {
        lyxerr[Debug::INFO] << "Buffer::Buffer()" << endl;
-
-       // set initial author
-       authors().record(Author(lyxrc.user_name, lyxrc.user_email));
 }
 
 
@@ -333,12 +361,6 @@ void Buffer::setReadonly(bool flag)
 }
 
 
-AuthorList & Buffer::authors()
-{
-       return params().authorlist;
-}
-
-
 void Buffer::setFileName(string const & newfile)
 {
        pimpl_->filename = MakeAbsPath(newfile);
@@ -452,7 +474,7 @@ bool Buffer::readBody(LyXLex & lex, ParagraphList::iterator pit)
 
 int Buffer::readParagraph(LyXLex & lex, string const & token,
                          ParagraphList & pars, ParagraphList::iterator & pit,
-                         Paragraph::depth_type & depth)
+                         lyx::depth_type & depth)
 {
        static Change current_change;
        int unknown = 0;
@@ -577,10 +599,22 @@ bool Buffer::readFile(string const & filename, ParagraphList::iterator pit)
 }
 
 
+bool Buffer::fully_loaded() const
+{
+       return pimpl_->file_fully_loaded;
+}
+
+
+void Buffer::fully_loaded(bool value)
+{
+       pimpl_->file_fully_loaded = value;
+}
+
+
 bool Buffer::readFile(LyXLex & lex, string const & filename,
                      ParagraphList::iterator pit)
 {
-       Assert(!filename.empty());
+       BOOST_ASSERT(!filename.empty());
 
        if (!lex.isOK()) {
                Alert::error(_("Document could not be read"),
@@ -668,6 +702,7 @@ bool Buffer::readFile(LyXLex & lex, string const & filename,
                                       " that it is probably corrupted."),
                                       filename));
        }
+       pimpl_->file_fully_loaded = true;
        return true;
 }
 
@@ -841,227 +876,15 @@ bool Buffer::do_writeFile(ostream & ofs) const
 }
 
 
-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 STRCONV(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,
@@ -1076,15 +899,15 @@ void Buffer::makeLaTeXFile(string const & fname,
 
 void Buffer::makeLaTeXFile(ostream & os,
                           string const & original_path,
-                          LatexRunParams const & runparams_in,
+                          OutputParams const & runparams_in,
                           bool output_preamble, bool output_body)
 {
-       LatexRunParams runparams = runparams_in;
+       OutputParams runparams = runparams_in;
        niceFile() = runparams.nice; // this will be used by Insetincludes.
 
        // validate the buffer.
        lyxerr[Debug::LATEX] << "  Validating buffer..." << endl;
-       LaTeXFeatures features(params());
+       LaTeXFeatures features(*this, params());
        validate(features);
        lyxerr[Debug::LATEX] << "  Buffer validation done." << endl;
 
@@ -1215,15 +1038,17 @@ 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 body_only )
 {
        ofstream ofs;
-       if (!::openFileWrite(ofs, fname))
+       if (!openFileWrite(ofs, fname))
                return;
 
-       niceFile() = nice; // this will be used by included files.
+       niceFile() = runparams.nice; // this will be used by included files.
 
-       LaTeXFeatures features(params());
+       LaTeXFeatures features(*this, params());
 
        validate(features);
 
@@ -1237,7 +1062,7 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
                ofs << "<!doctype linuxdoc system";
 
                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();
@@ -1261,127 +1086,7 @@ 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";
@@ -1396,264 +1101,17 @@ void Buffer::makeLinuxDocFile(string const & fname, bool nice, bool body_only)
 }
 
 
-// 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,
-       Paragraph::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 only_body)
 {
        ofstream ofs;
-       if (!::openFileWrite(ofs, fname))
+       if (!openFileWrite(ofs, fname))
                return;
 
-       niceFile() = nice; // this will be used by Insetincludes.
+       niceFile() = runparams.nice; // this will be used by Insetincludes.
 
-       LaTeXFeatures features(params());
+       LaTeXFeatures features(*this, params());
        validate(features);
 
        texrow().reset();
@@ -1666,7 +1124,7 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
                    << "  PUBLIC \"-//OASIS//DTD DocBook V4.1//EN\"";
 
                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();
@@ -1691,225 +1149,8 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
        ofs << "<!-- DocBook 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] != "!-- --" && !environment_inner[depth].empty()) {
-                               item_name = "listitem";
-                               sgml::closeTag(ofs, command_depth + depth, false, item_name);
-                               if (environment_inner[depth] == "varlistentry")
-                                       sgml::closeTag(ofs, depth+command_depth, false, environment_inner[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()) {
-                       if (environment_inner[depth] != "!-- --") {
-                               item_name= "listitem";
-                               sgml::closeTag(ofs, command_depth+depth, false, item_name);
-                               if (environment_inner[depth] == "varlistentry")
-                                       sgml::closeTag(ofs, depth + command_depth, false, environment_inner[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 {
-                               if (environment_inner[depth] != "!-- --") {
-                                       item_name= "listitem";
-                                       sgml::closeTag(ofs, command_depth + depth, false, item_name);
-                                       if (environment_inner[depth] == "varlistentry")
-                                               sgml::closeTag(ofs, depth + command_depth, false, environment_inner[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()) {
-                       if (environment_inner[depth] != "!-- --") {
-                               item_name = "listitem";
-                               sgml::closeTag(ofs, command_depth + depth, false, item_name);
-                              if (environment_inner[depth] == "varlistentry")
-                                      sgml::closeTag(ofs, depth + command_depth, false, environment_inner[depth]);
-                       }
-
-                       sgml::closeTag(ofs, depth + command_depth, false, environment_stack[depth]);
-               }
-       }
-
-       for (int j = command_depth; j >= 0 ; --j)
-               if (!command_stack[j].empty()) {
-                       sgml::closeTag(ofs, j, false, command_stack[j]);
-                       ofs << endl;
-               }
+       params().getLyXTextClass().counters().reset();
+       docbookParagraphs(*this, paragraphs(), ofs, runparams);
 
        ofs << "\n\n";
        sgml::closeTag(ofs, 0, false, top_element);
@@ -1922,93 +1163,6 @@ void Buffer::makeDocBookFile(string const & fname, bool nice, bool only_body)
 }
 
 
-void Buffer::simpleDocBookOnePar(ostream & os,
-                                ParagraphList::iterator par, int & desc_on,
-                                Paragraph::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';
-}
-
-
 // chktex should be run with these flags disabled: 3, 22, 25, 30, 38(?)
 // Other flags: -wall -v0 -x
 int Buffer::runChktex()
@@ -2028,8 +1182,8 @@ int Buffer::runChktex()
        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);
 
@@ -2071,11 +1225,11 @@ void Buffer::validate(LaTeXFeatures & features) const
        // the bullet shapes are buffer level not paragraph level
        // so they are tested here
        for (int i = 0; i < 4; ++i) {
-               if (params().user_defined_bullets[i] != ITEMIZE_DEFAULTS[i]) {
-                       int const font = params().user_defined_bullets[i].getFont();
+               if (params().user_defined_bullet(i) != ITEMIZE_DEFAULTS[i]) {
+                       int const font = params().user_defined_bullet(i).getFont();
                        if (font == 0) {
                                int const c = params()
-                                       .user_defined_bullets[i]
+                                       .user_defined_bullet(i)
                                        .getCharacter();
                                if (c == 16
                                   || c == 17
@@ -2113,7 +1267,7 @@ void Buffer::getLabelList(std::vector<string> & list) const
 
        for (inset_iterator it = inset_const_iterator_begin();
             it != inset_const_iterator_end(); ++it) {
-               it->getLabelList(list);
+               it->getLabelList(*this, list);
        }
 }
 
@@ -2134,14 +1288,19 @@ void Buffer::fillWithBibKeys(std::vector<std::pair<string, string> > & keys) con
 
        for (inset_iterator it = inset_const_iterator_begin();
                it != inset_const_iterator_end(); ++it) {
-               if (it->lyxCode() == InsetOld::BIBTEX_CODE)
-                       static_cast<InsetBibtex &>(*it).fillWithBibKeys(*this, keys);
-               else if (it->lyxCode() == InsetOld::INCLUDE_CODE)
-                       static_cast<InsetInclude &>(*it).fillWithBibKeys(keys);
-               else if (it->lyxCode() == InsetOld::BIBITEM_CODE) {
-                       InsetBibitem & bib = static_cast<InsetBibitem &>(*it);
-                       string const key = bib.getContents();
-                       string const opt = bib.getOptions();
+               if (it->lyxCode() == InsetOld::BIBTEX_CODE) {
+                       InsetBibtex const & inset =
+                               dynamic_cast<InsetBibtex const &>(*it);
+                       inset.fillWithBibKeys(*this, keys);
+               } else if (it->lyxCode() == InsetOld::INCLUDE_CODE) {
+                       InsetInclude const & inset =
+                               dynamic_cast<InsetInclude const &>(*it);
+                       inset.fillWithBibKeys(*this, keys);
+               } else if (it->lyxCode() == InsetOld::BIBITEM_CODE) {
+                       InsetBibitem const & inset =
+                               dynamic_cast<InsetBibitem const &>(*it);
+                       string const key = inset.getContents();
+                       string const opt = inset.getOptions();
                        string const ref; // = pit->asString(this, false);
                        string const info = opt + "TheBibliographyRef" + ref;
                        keys.push_back(pair<string, string>(key, info));
@@ -2167,22 +1326,17 @@ void Buffer::markDepClean(string const & name)
 
 bool Buffer::dispatch(string const & command, bool * result)
 {
-       // Split command string into command and argument
-       string cmd;
-       string line = ltrim(command);
-       string const arg = trim(split(line, cmd, ' '));
-
-       return dispatch(lyxaction.LookupFunc(cmd), arg, result);
+       return dispatch(lyxaction.lookupFunc(command), result);
 }
 
 
-bool Buffer::dispatch(int action, string const & argument, bool * result)
+bool Buffer::dispatch(FuncRequest const & func, bool * result)
 {
        bool dispatched = true;
 
-       switch (action) {
+       switch (func.action) {
                case LFUN_EXPORT: {
-                       bool const tmp = Exporter::Export(this, argument, false);
+                       bool const tmp = Exporter::Export(this, func.argument, false);
                        if (result)
                                *result = tmp;
                        break;
@@ -2236,21 +1390,6 @@ void Buffer::inset_iterator::setParagraph()
 }
 
 
-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
 {
 #warning FIXME: const correctness! (Andre)
@@ -2291,6 +1430,18 @@ bool Buffer::hasParWithID(int id) const
 }
 
 
+PosIterator Buffer::pos_iterator_begin()
+{
+       return PosIterator(&paragraphs(), paragraphs().begin(), 0);
+}
+
+
+PosIterator Buffer::pos_iterator_end()
+{
+       return PosIterator(&paragraphs(), paragraphs().end(), 0);
+}
+
+
 ParIterator Buffer::par_iterator_begin()
 {
        return ParIterator(paragraphs().begin(), paragraphs());