]> git.lyx.org Git - lyx.git/blobdiff - src/paragraph.C
Continue to improve GtkLengthEntry
[lyx.git] / src / paragraph.C
index 1779d7482a2d81bd161e50f4870bacb269ebd44b..227568b43f2067155a02c48d60358c590768753c 100644 (file)
-/* This file is part of
- * ======================================================
+/**
+ * \file paragraph.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Asger Alstrup
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author Angus Leeming
+ * \author John Levon
+ * \author André Pönitz
+ * \author Dekel Tsur
+ * \author Jürgen Vigna
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "paragraph.h"
 #include "paragraph_pimpl.h"
-#include "lyxrc.h"
-#include "layout.h"
-#include "language.h"
-#include "tex-strings.h"
+
 #include "buffer.h"
 #include "bufferparams.h"
-#include "debug.h"
-#include "texrow.h"
-#include "BufferView.h"
+#include "counters.h"
 #include "encoding.h"
-#include "ParameterStruct.h"
+#include "debug.h"
 #include "gettext.h"
+#include "language.h"
+#include "LaTeXFeatures.h"
+#include "lyxfont.h"
+#include "lyxrc.h"
+#include "lyxrow.h"
+#include "outputparams.h"
+#include "paragraph_funcs.h"
+#include "ParagraphList_fwd.h"
+#include "sgml.h"
+#include "texrow.h"
+#include "vspace.h"
 
-#include "insets/insetinclude.h"
-#include "insets/insetbib.h"
-#include "insets/insettext.h"
+#include "insets/insetbibitem.h"
 #include "insets/insetoptarg.h"
 
-#include "support/filetools.h"
 #include "support/lstrings.h"
-#include "support/lyxmanip.h"
-#include "support/FileInfo.h"
-#include "support/LAssert.h"
 #include "support/textutils.h"
+#include "support/convert.h"
 
-#include <algorithm>
-#include <fstream>
-#include <csignal>
+#include <boost/tuple/tuple.hpp>
+#include <boost/bind.hpp>
 
-using std::ostream;
-using std::endl;
-using std::fstream;
-using std::ios;
-using std::lower_bound;
-using std::upper_bound;
-using std::reverse;
+#include <algorithm>
+#include <list>
+#include <stack>
+#include <sstream>
 
 using lyx::pos_type;
 
-// this is a bad idea, but how can Paragraph find its buffer to get
-// parameters? (JMarc)
+using lyx::support::subst;
 
-extern string bibitemWidest(Buffer const *);
-
-// this is a minibuffer
-
-namespace {
-
-char minibuffer_char;
-LyXFont minibuffer_font;
-Inset * minibuffer_inset;
-
-} // namespace anon
+using std::distance;
+using std::endl;
+using std::list;
+using std::stack;
+using std::string;
+using std::ostream;
+using std::ostringstream;
 
 
-extern BufferView * current_view;
+ParagraphList::ParagraphList()
+{}
 
 
 Paragraph::Paragraph()
-       : pimpl_(new Paragraph::Pimpl(this))
+       : begin_of_body_(0), pimpl_(new Paragraph::Pimpl(this))
 {
-#ifndef NO_NEXT
-       next_ = 0;
-       previous_ = 0;
-#endif
-       enumdepth = 0;
        itemdepth = 0;
-       bibkey = 0; // ale970302
        params().clear();
 }
 
 
-#ifndef NO_NEXT
-// This constructor inserts the new paragraph in a list.
-Paragraph::Paragraph(Paragraph * par)
-       : pimpl_(new Paragraph::Pimpl(this))
+Paragraph::Paragraph(Paragraph const & par)
+       :       itemdepth(par.itemdepth), insetlist(par.insetlist),
+               dim_(par.dim_),
+               rows_(par.rows_), rowSignature_(par.rowSignature_), 
+               layout_(par.layout_),
+               text_(par.text_), begin_of_body_(par.begin_of_body_),
+         pimpl_(new Paragraph::Pimpl(*par.pimpl_, this))
 {
-       enumdepth = 0;
-       itemdepth = 0;
-
-       // double linked list begin
-       next_ = par->next_;
-       if (next_)
-               next_->previous_ = this;
-       previous_ = par;
-       previous_->next_ = this;
-       // end
-
-       bibkey = 0; // ale970302
-       params().clear();
+       //lyxerr << "Paragraph::Paragraph(Paragraph const&)" << endl;
+       InsetList::iterator it = insetlist.begin();
+       InsetList::iterator end = insetlist.end();
+       for (; it != end; ++it)
+               it->inset = it->inset->clone().release();
 }
-#endif
 
 
-Paragraph::Paragraph(Paragraph const & lp, bool same_ids)
-       : pimpl_(new Paragraph::Pimpl(*lp.pimpl_, this, same_ids))
+Paragraph & Paragraph::operator=(Paragraph const & par)
 {
-       enumdepth = 0;
-       itemdepth = 0;
-#ifndef NO_NEXT
-       next_     = 0;
-       previous_ = 0;
-#endif
-       // this is because of the dummy layout of the paragraphs that
-       // follow footnotes
-       layout_ = lp.layout();
-
-       // ale970302
-       if (lp.bibkey) {
-               bibkey = static_cast<InsetBibKey *>
-                       (lp.bibkey->clone(*current_view->buffer()));
-       } else {
-               bibkey = 0;
-       }
+       // needed as we will destroy the pimpl_ before copying it
+       if (&par != this) {
+               itemdepth = par.itemdepth;
 
-       // copy everything behind the break-position to the new paragraph
-       insetlist = lp.insetlist;
-       InsetList::iterator it = insetlist.begin();
-       InsetList::iterator end = insetlist.end();
-       for (; it != end; ++it) {
-               it.setInset(it.getInset()->clone(*current_view->buffer(),
-                                                same_ids));
-               // tell the new inset who is the boss now
-               it.getInset()->parOwner(this);
+               insetlist = par.insetlist;
+               InsetList::iterator it = insetlist.begin();
+               InsetList::iterator end = insetlist.end();
+               for (; it != end; ++it)
+                       it->inset = it->inset->clone().release();
+
+               rows_ = par.rows_;
+               dim_ = par.dim_;
+               rowSignature_ = par.rowSignature_;
+               layout_ = par.layout();
+               text_ = par.text_;
+               begin_of_body_ = par.begin_of_body_;
+
+               delete pimpl_;
+               pimpl_ = new Pimpl(*par.pimpl_, this);
        }
+       return *this;
 }
 
 
-// the destructor removes the new paragraph from the list
 Paragraph::~Paragraph()
 {
-#ifndef NO_NEXT
-       if (previous_)
-               previous_->next_ = next_;
-       if (next_)
-               next_->previous_ = previous_;
-#endif
-
-       // ale970302
-       delete bibkey;
-
        delete pimpl_;
        //
        //lyxerr << "Paragraph::paragraph_id = "
@@ -164,7 +129,7 @@ Paragraph::~Paragraph()
 }
 
 
-void Paragraph::write(Buffer const * buf, ostream & os,
+void Paragraph::write(Buffer const & buf, ostream & os,
                          BufferParams const & bparams,
                          depth_type & dth) const
 {
@@ -172,84 +137,33 @@ void Paragraph::write(Buffer const * buf, ostream & os,
        if (dth != params().depth()) {
                if (params().depth() > dth) {
                        while (params().depth() > dth) {
-                               os << "\n\\begin_deeper ";
+                               os << "\n\\begin_deeper";
                                ++dth;
                        }
                } else {
                        while (params().depth() < dth) {
-                               os << "\n\\end_deeper ";
+                               os << "\n\\end_deeper";
                                --dth;
                        }
                }
        }
 
        // First write the layout
-       os << "\n\\layout " << layout()->name() << "\n";
-
-       // Maybe some vertical spaces.
-       if (params().spaceTop().kind() != VSpace::NONE)
-               os << "\\added_space_top "
-                  << params().spaceTop().asLyXCommand() << " ";
-       if (params().spaceBottom().kind() != VSpace::NONE)
-               os << "\\added_space_bottom "
-                  << params().spaceBottom().asLyXCommand() << " ";
-
-       // Maybe the paragraph has special spacing
-       params().spacing().writeFile(os, true);
-
-       // The labelwidth string used in lists.
-       if (!params().labelWidthString().empty())
-               os << "\\labelwidthstring "
-                  << params().labelWidthString() << '\n';
-
-       // Lines above or below?
-       if (params().lineTop())
-               os << "\\line_top ";
-       if (params().lineBottom())
-               os << "\\line_bottom ";
-
-       // Pagebreaks above or below?
-       if (params().pagebreakTop())
-               os << "\\pagebreak_top ";
-       if (params().pagebreakBottom())
-               os << "\\pagebreak_bottom ";
-
-       // Start of appendix?
-       if (params().startOfAppendix())
-               os << "\\start_of_appendix ";
-
-       // Noindent?
-       if (params().noindent())
-               os << "\\noindent ";
+       os << "\n\\begin_layout " << layout()->name() << '\n';
 
-       // Do we have a manual left indent?
-       if (!params().leftIndent().zero())
-               os << "\\leftindent " << params().leftIndent().asString() << " ";
-
-       // Alignment?
-       if (params().align() != LYX_ALIGN_LAYOUT) {
-               int h = 0;
-               switch (params().align()) {
-               case LYX_ALIGN_LEFT: h = 1; break;
-               case LYX_ALIGN_RIGHT: h = 2; break;
-               case LYX_ALIGN_CENTER: h = 3; break;
-               default: h = 0; break;
-               }
-               os << "\\align " << string_align[h] << " ";
-       }
-
-       // bibitem  ale970302
-       if (bibkey)
-               bibkey->write(buf, os);
+       params().write(os);
 
        LyXFont font1(LyXFont::ALL_INHERIT, bparams.language);
 
+       Change running_change = Change(Change::UNCHANGED);
+       lyx::time_type const curtime(lyx::current_time());
+
        int column = 0;
        for (pos_type i = 0; i < size(); ++i) {
-               if (!i) {
-                       os << "\n";
-                       column = 0;
-               }
+
+               Change change = pimpl_->lookupChangeFull(i);
+               Changes::lyxMarkChange(os, column, curtime, running_change, change);
+               running_change = change;
 
                // Write font changes
                LyXFont font2 = getFontSettings(bparams, i);
@@ -263,7 +177,7 @@ void Paragraph::write(Buffer const * buf, ostream & os,
                switch (c) {
                case META_INSET:
                {
-                       Inset const * inset = getInset(i);
+                       InsetBase const * inset = getInset(i);
                        if (inset)
                                if (inset->directWrite()) {
                                        // international char, let it write
@@ -271,23 +185,17 @@ void Paragraph::write(Buffer const * buf, ostream & os,
                                        // the file
                                        inset->write(buf, os);
                                } else {
-                                       os << "\n\\begin_inset ";
+                                       if (i)
+                                               os << '\n';
+                                       os << "\\begin_inset ";
                                        inset->write(buf, os);
-                                       os << "\n\\end_inset \n\n";
+                                       os << "\n\\end_inset\n\n";
                                        column = 0;
                                }
                }
                break;
-               case META_NEWLINE:
-                       os << "\n\\newline \n";
-                       column = 0;
-                       break;
-               case META_HFILL:
-                       os << "\n\\hfill \n";
-                       column = 0;
-                       break;
                case '\\':
-                       os << "\n\\backslash \n";
+                       os << "\n\\backslash\n";
                        column = 0;
                        break;
                case '.':
@@ -295,12 +203,12 @@ void Paragraph::write(Buffer const * buf, ostream & os,
                                os << ".\n";
                                column = 0;
                        } else
-                               os << ".";
+                               os << '.';
                        break;
                default:
                        if ((column > 70 && c == ' ')
                            || column > 79) {
-                               os << "\n";
+                               os << '\n';
                                column = 0;
                        }
                        // this check is to amend a bug. LyX sometimes
@@ -314,166 +222,136 @@ void Paragraph::write(Buffer const * buf, ostream & os,
                        break;
                }
        }
-}
 
+       // to make reading work properly
+       if (!size()) {
+               running_change = pimpl_->lookupChange(0);
+               Changes::lyxMarkChange(os, column, curtime,
+                       Change(Change::UNCHANGED), running_change);
+       }
+       Changes::lyxMarkChange(os, column, curtime,
+               running_change, Change(Change::UNCHANGED));
 
-void Paragraph::validate(LaTeXFeatures & features) const
-{
-       pimpl_->validate(features, *layout());
+       os << "\n\\end_layout\n";
 }
 
 
-// First few functions needed for cut and paste and paragraph breaking.
-void Paragraph::copyIntoMinibuffer(Buffer const & buffer, pos_type pos) const
+void Paragraph::validate(LaTeXFeatures & features) const
 {
-       BufferParams bparams = buffer.params;
-
-       minibuffer_char = getChar(pos);
-       minibuffer_font = getFontSettings(bparams, pos);
-       minibuffer_inset = 0;
-       if (minibuffer_char == Paragraph::META_INSET) {
-               if (getInset(pos)) {
-                       minibuffer_inset = getInset(pos)->clone(buffer);
-               } else {
-                       minibuffer_inset = 0;
-                       minibuffer_char = ' ';
-                       // This reflects what GetInset() does (ARRae)
-               }
-       }
+       pimpl_->validate(features, *layout());
 }
 
 
-void Paragraph::cutIntoMinibuffer(BufferParams const & bparams, pos_type pos)
+void Paragraph::eraseIntern(lyx::pos_type pos)
 {
-       minibuffer_char = getChar(pos);
-       minibuffer_font = getFontSettings(bparams, pos);
-       minibuffer_inset = 0;
-       if (minibuffer_char == Paragraph::META_INSET) {
-               if (getInset(pos)) {
-                       // the inset is not in a paragraph anymore
-                       minibuffer_inset = insetlist.release(pos);
-                       minibuffer_inset->parOwner(0);
-               } else {
-                       minibuffer_inset = 0;
-                       minibuffer_char = ' ';
-                       // This reflects what GetInset() does (ARRae)
-               }
-
-       }
-
-       // Erase(pos); now the caller is responsible for that.
+       pimpl_->eraseIntern(pos);
 }
 
 
-bool Paragraph::insertFromMinibuffer(pos_type pos)
+bool Paragraph::erase(pos_type pos)
 {
-       if (minibuffer_char == Paragraph::META_INSET) {
-               if (!insetAllowed(minibuffer_inset->lyxCode())) {
-                       return false;
-               }
-               insertInset(pos, minibuffer_inset, minibuffer_font);
-       } else {
-               LyXFont f = minibuffer_font;
-               if (!checkInsertChar(f)) {
-                       return false;
-               }
-               insertChar(pos, minibuffer_char, f);
-       }
-       return true;
+       return pimpl_->erase(pos);
 }
 
-// end of minibuffer
-
 
-void Paragraph::erase(pos_type pos)
+int Paragraph::erase(pos_type start, pos_type end)
 {
-       pimpl_->erase(pos);
+       return pimpl_->erase(start, end);
 }
 
 
-bool Paragraph::checkInsertChar(LyXFont & font)
+void Paragraph::insert(pos_type start, string const & str,
+                      LyXFont const & font)
 {
-       if (pimpl_->inset_owner)
-               return pimpl_->inset_owner->checkInsertChar(font);
-       return true;
+       for (size_t i = 0, n = str.size(); i != n ; ++i)
+               insertChar(start + i, str[i], font);
 }
 
 
-void Paragraph::insertChar(pos_type pos, Paragraph::value_type c)
+void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
+                          Change change)
 {
-       LyXFont const f(LyXFont::ALL_INHERIT);
-       insertChar(pos, c, f);
+       pimpl_->insertChar(pos, c, change);
 }
 
 
 void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
-                          LyXFont const & font)
+                          LyXFont const & font, Change change)
 {
-       pimpl_->insertChar(pos, c, font);
+       pimpl_->insertChar(pos, c, change);
+       setFont(pos, font);
 }
 
 
-void Paragraph::insertInset(pos_type pos, Inset * inset)
+void Paragraph::insertInset(pos_type pos, InsetBase * inset, Change change)
 {
-       LyXFont const f(LyXFont::ALL_INHERIT);
-       insertInset(pos, inset, f);
+       pimpl_->insertInset(pos, inset, change);
 }
 
 
-void Paragraph::insertInset(pos_type pos, Inset * inset, LyXFont const & font)
+void Paragraph::insertInset(pos_type pos, InsetBase * inset,
+                           LyXFont const & font, Change change)
 {
-       pimpl_->insertInset(pos, inset, font);
+       pimpl_->insertInset(pos, inset, change);
+       setFont(pos, font);
 }
 
 
-bool Paragraph::insetAllowed(Inset::Code code)
+bool Paragraph::insetAllowed(InsetBase_code code)
 {
-       //lyxerr << "Paragraph::InsertInsetAllowed" << endl;
-
-       if (pimpl_->inset_owner)
-               return pimpl_->inset_owner->insetAllowed(code);
-       return true;
+       return !pimpl_->inset_owner || pimpl_->inset_owner->insetAllowed(code);
 }
 
 
-Inset * Paragraph::getInset(pos_type pos)
+// Gets uninstantiated font setting at position.
+LyXFont const Paragraph::getFontSettings(BufferParams const & bparams,
+                                        pos_type pos) const
 {
-       lyx::Assert(pos < size());
+       if (pos > size()) {
+               lyxerr << " pos: " << pos << " size: " << size() << endl;
+               BOOST_ASSERT(pos <= size());
+       }
 
-       return insetlist.get(pos);
-}
+       Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
+       Pimpl::FontList::const_iterator end = pimpl_->fontlist.end();
+       for (; cit != end; ++cit)
+               if (cit->pos() >= pos)
+                       break;
 
+       if (cit != end)
+               return cit->font();
 
-Inset const * Paragraph::getInset(pos_type pos) const
-{
-       lyx::Assert(pos < size());
+       if (pos == size() && !empty())
+               return getFontSettings(bparams, pos - 1);
 
-       return insetlist.get(pos);
+       return LyXFont(LyXFont::ALL_INHERIT, getParLanguage(bparams));
 }
 
 
-// Gets uninstantiated font setting at position.
-LyXFont const Paragraph::getFontSettings(BufferParams const & bparams,
-                                        pos_type pos) const
+FontSpan Paragraph::fontSpan(lyx::pos_type pos) const
 {
-       lyx::Assert(pos <= size());
+       BOOST_ASSERT(pos <= size());
+       lyx::pos_type start = 0;
 
        Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
        Pimpl::FontList::const_iterator end = pimpl_->fontlist.end();
        for (; cit != end; ++cit) {
-               if (cit->pos() >= pos)
-                       break;
+               if (cit->pos() >= pos) {
+                       if (pos >= beginOfBody())
+                               return FontSpan(std::max(start, beginOfBody()),
+                                               cit->pos());
+                       else
+                               return FontSpan(start, 
+                                               std::min(beginOfBody() - 1, 
+                                                        cit->pos()));
+               }
+               start = cit->pos() + 1;
        }
 
-       LyXFont retfont;
-       if (cit != end) {
-               retfont = cit->font();
-       } else if (pos == size() && !empty()) {
-               retfont = getFontSettings(bparams, pos - 1);
-       } else
-               retfont = LyXFont(LyXFont::ALL_INHERIT, getParLanguage(bparams));
-
-       return retfont;
+       // This should not happen, but if so, we take no chances.
+       //lyxerr << "Paragraph::getEndPosOfFontSpan: This should not happen!"
+       //      << endl;
+       return FontSpan(pos, pos);
 }
 
 
@@ -492,64 +370,61 @@ LyXFont const Paragraph::getFirstFontSettings() const
 // The difference is that this one is used for generating the LaTeX file,
 // and thus cosmetic "improvements" are disallowed: This has to deliver
 // the true picture of the buffer. (Asger)
-// If position is -1, we get the layout font of the paragraph.
-// If position is -2, we get the font of the manual label of the paragraph.
-LyXFont const Paragraph::getFont(BufferParams const & bparams,
-                                pos_type pos) const
+LyXFont const Paragraph::getFont(BufferParams const & bparams, pos_type pos,
+                                LyXFont const & outerfont) const
 {
-       lyx::Assert(pos >= 0);
+       BOOST_ASSERT(pos >= 0);
 
        LyXLayout_ptr const & lout = layout();
 
-       pos_type main_body = 0;
-       if (lout->labeltype == LABEL_MANUAL)
-               main_body = beginningOfMainBody();
+       pos_type const body_pos = beginOfBody();
 
        LyXFont layoutfont;
-       if (pos < main_body)
+       if (pos < body_pos)
                layoutfont = lout->labelfont;
        else
                layoutfont = lout->font;
 
-       LyXFont tmpfont = getFontSettings(bparams, pos);
-       tmpfont.realize(layoutfont);
+       LyXFont font = getFontSettings(bparams, pos);
+       font.realize(layoutfont);
+       font.realize(outerfont);
+       font.realize(bparams.getLyXTextClass().defaultfont());
 
-       return pimpl_->realizeFont(tmpfont, bparams);
+       return font;
 }
 
 
-LyXFont const Paragraph::getLabelFont(BufferParams const & bparams) const
+LyXFont const Paragraph::getLabelFont
+       (BufferParams const & bparams, LyXFont const & outerfont) const
 {
-       LyXLayout_ptr const & lout = layout();
-
-       LyXFont tmpfont = lout->labelfont;
+       LyXFont tmpfont = layout()->labelfont;
        tmpfont.setLanguage(getParLanguage(bparams));
-
-       return pimpl_->realizeFont(tmpfont, bparams);
+       tmpfont.realize(outerfont);
+       tmpfont.realize(bparams.getLyXTextClass().defaultfont());
+       return tmpfont;
 }
 
 
-LyXFont const Paragraph::getLayoutFont(BufferParams const & bparams) const
+LyXFont const Paragraph::getLayoutFont
+       (BufferParams const & bparams, LyXFont const & outerfont) const
 {
-       LyXLayout_ptr const & lout = layout();
-
-       LyXFont tmpfont = lout->font;
+       LyXFont tmpfont = layout()->font;
        tmpfont.setLanguage(getParLanguage(bparams));
-
-       return pimpl_->realizeFont(tmpfont, bparams);
+       tmpfont.realize(outerfont);
+       tmpfont.realize(bparams.getLyXTextClass().defaultfont());
+       return tmpfont;
 }
 
 
 /// Returns the height of the highest font in range
-LyXFont::FONT_SIZE
-Paragraph::highestFontInRange(pos_type startpos, pos_type endpos,
-                             LyXFont::FONT_SIZE const def_size) const
+LyXFont_size Paragraph::highestFontInRange
+       (pos_type startpos, pos_type endpos, LyXFont_size def_size) const
 {
        if (pimpl_->fontlist.empty())
                return def_size;
 
        Pimpl::FontList::const_iterator end_it = pimpl_->fontlist.begin();
-       Pimpl::FontList::const_iterator end = pimpl_->fontlist.end();
+       Pimpl::FontList::const_iterator const end = pimpl_->fontlist.end();
        for (; end_it != end; ++end_it) {
                if (end_it->pos() >= endpos)
                        break;
@@ -619,10 +494,10 @@ Paragraph::getUChar(BufferParams const & bparams, pos_type pos) const
 
 void Paragraph::setFont(pos_type pos, LyXFont const & font)
 {
-       lyx::Assert(pos <= size());
+       BOOST_ASSERT(pos <= size());
 
        // First, reduce font against layout/label font
-       // Update: The SetCharFont() routine in text2.C already
+       // Update: The setCharFont() routine in text2.C already
        // reduces font, so we don't need to do that here. (Asger)
        // No need to simplify this because it will disappear
        // in a new kernel. (Asger)
@@ -635,7 +510,7 @@ void Paragraph::setFont(pos_type pos, LyXFont const & font)
                if (it->pos() >= pos)
                        break;
        }
-       unsigned int i = std::distance(beg, it);
+       size_t const i = distance(beg, it);
        bool notfound = (it == endit);
 
        if (!notfound && pimpl_->fontlist[i].font() == font)
@@ -680,64 +555,23 @@ void Paragraph::setFont(pos_type pos, LyXFont const & font)
 }
 
 
-#ifndef NO_NEXT
-void Paragraph::next(Paragraph * p)
-{
-       next_ = p;
-}
-
-
-// This function is able to hide closed footnotes.
-Paragraph * Paragraph::next()
-{
-       return next_;
-}
-
-
-Paragraph const * Paragraph::next() const
-{
-       return next_;
-}
-
-
-void Paragraph::previous(Paragraph * p)
-{
-       previous_ = p;
-}
-
-
-// This function is able to hide closed footnotes.
-Paragraph * Paragraph::previous()
-{
-       return previous_;
-}
-
-
-// This function is able to hide closed footnotes.
-Paragraph const * Paragraph::previous() const
-{
-       return previous_;
-}
-#endif
-
-
-void Paragraph::makeSameLayout(Paragraph const * par)
+void Paragraph::makeSameLayout(Paragraph const & par)
 {
-       layout(par->layout());
+       layout(par.layout());
        // move to pimpl?
-       params() = par->params();
+       params() = par.params();
 }
 
 
 int Paragraph::stripLeadingSpaces()
 {
-       if (layout()->free_spacing ||
-           isFreeSpacing()) {
+       if (isFreeSpacing())
                return 0;
-       }
 
        int i = 0;
        while (!empty() && (isNewline(0) || isLineSeparator(0))) {
+               // Set Change::Type to Change::INSERTED to quietly remove it
+               setChange(0, Change::INSERTED);
                erase(0);
                ++i;
        }
@@ -746,40 +580,9 @@ int Paragraph::stripLeadingSpaces()
 }
 
 
-bool Paragraph::hasSameLayout(Paragraph const * par) const
-{
-       return
-               par->layout() == layout() &&
-               params().sameLayout(par->params());
-}
-
-
-int Paragraph::getEndLabel() const
+bool Paragraph::hasSameLayout(Paragraph const & par) const
 {
-       Paragraph const * par = this;
-       depth_type par_depth = getDepth();
-       while (par) {
-               LyXLayout_ptr const & layout = par->layout();
-               int const endlabeltype = layout->endlabeltype;
-
-               if (endlabeltype != END_LABEL_NO_LABEL) {
-                       if (!next_)
-                               return endlabeltype;
-
-                       depth_type const next_depth = next_->getDepth();
-                       if (par_depth > next_depth ||
-                           (par_depth == next_depth
-                            && layout != next_->layout()))
-                               return endlabeltype;
-                       break;
-               }
-               if (par_depth == 0)
-                       break;
-               par = par->outerHook();
-               if (par)
-                       par_depth = par->getDepth();
-       }
-       return END_LABEL_NO_LABEL;
+       return par.layout() == layout() && params().sameLayout(par.params());
 }
 
 
@@ -791,15 +594,13 @@ Paragraph::depth_type Paragraph::getDepth() const
 
 Paragraph::depth_type Paragraph::getMaxDepthAfter() const
 {
-       bool const isenv = layout()->isEnvironment();
-
-       if (isenv)
+       if (layout()->isEnvironment())
                return params().depth() + 1;
        else
                return params().depth();
-
 }
 
+
 char Paragraph::getAlign() const
 {
        return params().align();
@@ -833,423 +634,180 @@ void Paragraph::applyLayout(LyXLayout_ptr const & new_layout)
        layout(new_layout);
        params().labelWidthString(string());
        params().align(LYX_ALIGN_LAYOUT);
-       params().spaceTop(VSpace(VSpace::NONE));
-       params().spaceBottom(VSpace(VSpace::NONE));
        params().spacing(Spacing(Spacing::Default));
 }
 
 
-// if the layout of a paragraph contains a manual label, the beginning of the
-// main body is the beginning of the second word. This is what the par-
-// function returns. If the layout does not contain a label, the main
-// body always starts with position 0. This differentiation is necessary,
-// because there cannot be a newline or a blank <= the beginning of the
-// main body in TeX.
+pos_type Paragraph::beginOfBody() const
+{
+       return begin_of_body_;
+}
+
 
-int Paragraph::beginningOfMainBody() const
+void Paragraph::setBeginOfBody()
 {
+       if (layout()->labeltype != LABEL_MANUAL) {
+               begin_of_body_ = 0;
+               return;
+       }
+
        // Unroll the first two cycles of the loop
        // and remember the previous character to
-       // remove unnecessary GetChar() calls
+       // remove unnecessary getChar() calls
        pos_type i = 0;
-       if (i < size() && getChar(i) != Paragraph::META_NEWLINE) {
+       pos_type end = size();
+       if (i < end && !isNewline(i)) {
                ++i;
                char previous_char = 0;
                char temp = 0;
-               if (i < size()
-                   && (previous_char = getChar(i)) != Paragraph::META_NEWLINE) {
-                       // Yes, this  ^ is supposed to be "= " not "=="
-                       ++i;
-                       while (i < size()
-                              && previous_char != ' '
-                              && (temp = getChar(i)) != Paragraph::META_NEWLINE) {
+               if (i < end) {
+                       previous_char = text_[i];
+                       if (!isNewline(i)) {
                                ++i;
-                               previous_char = temp;
+                               while (i < end && previous_char != ' ') {
+                                       temp = text_[i];
+                                       if (isNewline(i))
+                                               break;
+                                       ++i;
+                                       previous_char = temp;
+                               }
                        }
                }
        }
 
-       return i;
+       begin_of_body_ = i;
 }
 
 
-Paragraph * Paragraph::depthHook(depth_type depth)
+// returns -1 if inset not found
+int Paragraph::getPositionOfInset(InsetBase const * inset) const
 {
-       Paragraph * newpar = this;
-
-       do {
-               newpar = newpar->previous();
-       } while (newpar && newpar->getDepth() > depth);
-
-       if (!newpar) {
-               if (previous() || getDepth())
-                       lyxerr << "ERROR (Paragraph::DepthHook): "
-                               "no hook." << endl;
-               newpar = this;
-       }
-
-       return newpar;
+       // Find the entry.
+       InsetList::const_iterator it = insetlist.begin();
+       InsetList::const_iterator end = insetlist.end();
+       for (; it != end; ++it)
+               if (it->inset == inset)
+                       return it->pos;
+       return -1;
 }
 
 
-Paragraph const * Paragraph::depthHook(depth_type depth) const
+InsetBibitem * Paragraph::bibitem() const
 {
-       Paragraph const * newpar = this;
-
-       do {
-               newpar = newpar->previous();
-       } while (newpar && newpar->getDepth() > depth);
-
-       if (!newpar) {
-               if (previous() || getDepth())
-                       lyxerr << "ERROR (Paragraph::DepthHook): "
-                               "no hook." << endl;
-               newpar = this;
+       if (!insetlist.empty()) {
+               InsetBase * inset = insetlist.begin()->inset;
+               if (inset->lyxCode() == InsetBase::BIBITEM_CODE)
+                       return static_cast<InsetBibitem *>(inset);
        }
-
-       return newpar;
+       return 0;
 }
 
 
-Paragraph * Paragraph::outerHook()
+bool Paragraph::forceDefaultParagraphs() const
 {
-       if (!getDepth())
-               return 0;
-       return depthHook(depth_type(getDepth() - 1));
+       return inInset() && inInset()->forceDefaultParagraphs(0);
 }
 
 
-Paragraph const * Paragraph::outerHook() const
-{
-       if (!getDepth())
-               return 0;
-       return depthHook(depth_type(getDepth() - 1));
-}
+namespace {
 
+// paragraphs inside floats need different alignment tags to avoid
+// unwanted space
 
-// returns -1 if inset not found
-int Paragraph::getPositionOfInset(Inset const * inset) const
+bool noTrivlistCentering(InsetBase::Code code)
 {
-       // Find the entry.
-       InsetList::iterator it = insetlist.begin();
-       InsetList::iterator end = insetlist.end();
-       for (; it != end; ++it) {
-               if (it.getInset() == inset) {
-                       return it.getPos();
-               }
-       }
-       if (inset == bibkey)
-               return 0;
-
-       return -1;
+       return code == InsetBase::FLOAT_CODE || code == InsetBase::WRAP_CODE;
 }
 
-namespace {
 
-InsetOptArg * optArgInset(Paragraph const & par)
+string correction(string const & orig)
 {
-       // Find the entry.
-       InsetList::iterator it = par.insetlist.begin();
-       InsetList::iterator end = par.insetlist.end();
-       for (; it != end; ++it) {
-               Inset * ins = it.getInset();
-               if (ins->lyxCode() == Inset::OPTARG_CODE) {
-                       return static_cast<InsetOptArg *>(ins);
-               }
-       }
-       return 0;
+       if (orig == "flushleft")
+               return "raggedright";
+       if (orig == "flushright")
+               return "raggedleft";
+       if (orig == "center")
+               return "centering";
+       return orig;
 }
 
-} // end namespace
 
-Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
-                                BufferParams const & bparams,
-                                ostream & os, TexRow & texrow,
-                                bool moving_arg)
+string const corrected_env(string const & suffix, string const & env,
+       InsetBase::Code code)
 {
-       lyxerr[Debug::LATEX] << "TeXOnePar...     " << this << endl;
-       Inset const * in = inInset();
-       bool further_blank_line = false;
-       LyXLayout_ptr style;
-
-       // well we have to check if we are in an inset with unlimited
-       // lenght (all in one row) if that is true then we don't allow
-       // any special options in the paragraph and also we don't allow
-       // any environment other then "Standard" to be valid!
-       if ((in == 0) || !in->forceDefaultParagraphs(in)) {
-               style = layout();
-
-               if (params().startOfAppendix()) {
-                       os << "\\appendix\n";
-                       texrow.newline();
-               }
-
-               if (!params().spacing().isDefault()
-                       && (!previous() || !previous()->hasSameLayout(this))) {
-                       os << params().spacing().writeEnvirBegin() << "\n";
-                       texrow.newline();
-               }
+       string output = suffix + "{";
+       if (noTrivlistCentering(code))
+               output += correction(env);
+       else
+               output += env;
+       return output + "}";
+}
 
-               if (style->isCommand()) {
-                       os << '\n';
-                       texrow.newline();
-               }
+} // namespace anon
 
-               if (params().pagebreakTop()) {
-                       os << "\\newpage";
-                       further_blank_line = true;
-               }
-               if (params().spaceTop().kind() != VSpace::NONE) {
-                       os << params().spaceTop().asLatexCommand(bparams);
-                       further_blank_line = true;
-               }
 
-               if (params().lineTop()) {
-                       os << "\\lyxline{\\" << getFont(bparams, 0).latexSize() << '}'
-                          << "\\vspace{-1\\parskip}";
-                       further_blank_line = true;
-               }
+// This could go to ParagraphParameters if we want to
+int Paragraph::startTeXParParams(BufferParams const & bparams,
+                                ostream & os, bool moving_arg) const
+{
+       int column = 0;
 
-               if (further_blank_line) {
-                       os << '\n';
-                       texrow.newline();
-               }
-       } else {
-               style = bparams.getLyXTextClass().defaultLayout();
+       if (params().noindent()) {
+               os << "\\noindent ";
+               column += 10;
        }
 
-       Language const * language = getParLanguage(bparams);
-       Language const * doc_language = bparams.language;
-       Language const * previous_language = previous()
-               ? previous()->getParLanguage(bparams) : doc_language;
-
-       if (language->babel() != previous_language->babel()
-           // check if we already put language command in TeXEnvironment()
-           && !(style->isEnvironment()
-                && (!previous() || previous()->layout() != layout() ||
-                        previous()->params().depth() != params().depth())))
-       {
-               if (!lyxrc.language_command_end.empty() &&
-                   previous_language->babel() != doc_language->babel())
-               {
-                       os << subst(lyxrc.language_command_end, "$$lang",
-                                   previous_language->babel())
-                          << endl;
-                       texrow.newline();
-               }
-
-               if (lyxrc.language_command_end.empty() ||
-                   language->babel() != doc_language->babel())
-               {
-                       os << subst(lyxrc.language_command_begin, "$$lang",
-                                   language->babel())
-                          << endl;
-                       texrow.newline();
+       switch (params().align()) {
+       case LYX_ALIGN_NONE:
+       case LYX_ALIGN_BLOCK:
+       case LYX_ALIGN_LAYOUT:
+       case LYX_ALIGN_SPECIAL:
+               break;
+       case LYX_ALIGN_LEFT:
+       case LYX_ALIGN_RIGHT:
+       case LYX_ALIGN_CENTER:
+               if (moving_arg) {
+                       os << "\\protect";
+                       column += 8;
                }
+               break;
        }
 
-       if (bparams.inputenc == "auto" &&
-           language->encoding() != previous_language->encoding()) {
-               os << "\\inputencoding{"
-                  << language->encoding()->LatexName()
-                  << "}" << endl;
-               texrow.newline();
-       }
-
-       switch (style->latextype) {
-       case LATEX_COMMAND:
-               os << '\\'
-                  << style->latexname();
-
-               // Separate handling of optional argument inset.
-               if (style->optionalargs == 1) {
-                       InsetOptArg * it = optArgInset(*this);
-                       if (it != 0)
-                               it->latexOptional(buf, os, false, false);
-               }
-               else
-                       os << style->latexparam();
+       switch (params().align()) {
+       case LYX_ALIGN_NONE:
+       case LYX_ALIGN_BLOCK:
+       case LYX_ALIGN_LAYOUT:
+       case LYX_ALIGN_SPECIAL:
                break;
-       case LATEX_ITEM_ENVIRONMENT:
-               if (bibkey) {
-                       bibkey->latex(buf, os, false, false);
-               } else
-                       os << "\\item ";
+       case LYX_ALIGN_LEFT: {
+               string output;
+               if (getParLanguage(bparams)->babel() != "hebrew")
+                       output = corrected_env("\\begin", "flushleft", ownerCode());
+               else
+                       output = corrected_env("\\begin", "flushright", ownerCode());
+               os << output;
+               column += output.size();
                break;
-       case LATEX_LIST_ENVIRONMENT:
-               os << "\\item ";
+       } case LYX_ALIGN_RIGHT: {
+               string output;
+               if (getParLanguage(bparams)->babel() != "hebrew")
+                       output = corrected_env("\\begin", "flushright", ownerCode());
+               else
+                       output = corrected_env("\\begin", "flushleft", ownerCode());
+               os << output;
+               column += output.size();
                break;
-       default:
+       } case LYX_ALIGN_CENTER: {
+               string output;
+               output = corrected_env("\\begin", "center", ownerCode());
+               os << output;
+               column += output.size();
                break;
        }
+       }
 
-       bool need_par = simpleTeXOnePar(buf, bparams, os, texrow, moving_arg);
-
-       // Make sure that \\par is done with the font of the last
-       // character if this has another size as the default.
-       // This is necessary because LaTeX (and LyX on the screen)
-       // calculates the space between the baselines according
-       // to this font. (Matthias)
-       //
-       // Is this really needed ? (Dekel)
-       // We do not need to use to change the font for the last paragraph
-       // or for a command.
-       LyXFont const font =
-               (empty()
-                ? getLayoutFont(bparams) : getFont(bparams, size() - 1));
-
-       bool is_command = style->isCommand();
-
-       if (style->resfont.size() != font.size() && next_ && !is_command) {
-               if (!need_par)
-                       os << "{";
-               os << "\\" << font.latexSize() << " \\par}";
-       } else if (need_par) {
-               os << "\\par}";
-       } else if (is_command)
-               os << "}";
-
-       switch (style->latextype) {
-       case LATEX_ITEM_ENVIRONMENT:
-       case LATEX_LIST_ENVIRONMENT:
-               if (next_ && (params().depth() < next_->params().depth())) {
-                       os << '\n';
-                       texrow.newline();
-               }
-               break;
-       case LATEX_ENVIRONMENT:
-               // if its the last paragraph of the current environment
-               // skip it otherwise fall through
-               if (next_
-                   && (next_->layout() != layout()
-                       || next_->params().depth() != params().depth()))
-                       break;
-               // fall through possible
-       default:
-               // we don't need it for the last paragraph!!!
-               if (next_) {
-                       os << '\n';
-                       texrow.newline();
-               }
-       }
-
-       if ((in == 0) || !in->forceDefaultParagraphs(in)) {
-               further_blank_line = false;
-               if (params().lineBottom()) {
-                       os << "\\lyxline{\\" << font.latexSize() << '}';
-                       further_blank_line = true;
-               }
-
-               if (params().spaceBottom().kind() != VSpace::NONE) {
-                       os << params().spaceBottom().asLatexCommand(bparams);
-                       further_blank_line = true;
-               }
-
-               if (params().pagebreakBottom()) {
-                       os << "\\newpage";
-                       further_blank_line = true;
-               }
-
-               if (further_blank_line) {
-                       os << '\n';
-                       texrow.newline();
-               }
-
-               if (!params().spacing().isDefault()
-                       && (!next_ || !next_->hasSameLayout(this))) {
-                       os << params().spacing().writeEnvirEnd() << "\n";
-                       texrow.newline();
-               }
-       }
-
-       // we don't need it for the last paragraph!!!
-       if (next_) {
-               os << '\n';
-               texrow.newline();
-       } else {
-               // Since \selectlanguage write the language to the aux file,
-               // we need to reset the language at the end of footnote or
-               // float.
-
-               if (language->babel() != doc_language->babel()) {
-                       if (lyxrc.language_command_end.empty())
-                               os << subst(lyxrc.language_command_begin,
-                                           "$$lang",
-                                           doc_language->babel())
-                                  << endl;
-                       else
-                               os << subst(lyxrc.language_command_end,
-                                           "$$lang",
-                                           language->babel())
-                                  << endl;
-                       texrow.newline();
-               }
-       }
-
-       lyxerr[Debug::LATEX] << "TeXOnePar...done " << next_ << endl;
-       return next_;
-}
-
-
-// This could go to ParagraphParameters if we want to
-int Paragraph::startTeXParParams(BufferParams const & bparams,
-                                ostream & os, bool moving_arg) const
-{
-       int column = 0;
-
-       if (params().noindent()) {
-               os << "\\noindent ";
-               column += 10;
-       }
-
-       switch (params().align()) {
-       case LYX_ALIGN_NONE:
-       case LYX_ALIGN_BLOCK:
-       case LYX_ALIGN_LAYOUT:
-       case LYX_ALIGN_SPECIAL:
-               break;
-       case LYX_ALIGN_LEFT:
-       case LYX_ALIGN_RIGHT:
-       case LYX_ALIGN_CENTER:
-               if (moving_arg) {
-                       os << "\\protect";
-                       column = 8;
-               }
-               break;
-       }
-
-       switch (params().align()) {
-       case LYX_ALIGN_NONE:
-       case LYX_ALIGN_BLOCK:
-       case LYX_ALIGN_LAYOUT:
-       case LYX_ALIGN_SPECIAL:
-               break;
-       case LYX_ALIGN_LEFT:
-               if (getParLanguage(bparams)->babel() != "hebrew") {
-                       os << "\\begin{flushleft}";
-                       column += 17;
-               } else {
-                       os << "\\begin{flushright}";
-                       column += 18;
-               }
-               break;
-       case LYX_ALIGN_RIGHT:
-               if (getParLanguage(bparams)->babel() != "hebrew") {
-                       os << "\\begin{flushright}";
-                       column += 18;
-               } else {
-                       os << "\\begin{flushleft}";
-                       column += 17;
-               }
-               break;
-       case LYX_ALIGN_CENTER:
-               os << "\\begin{center}";
-               column += 14;
-               break;
-       }
-
-       return column;
-}
+       return column;
+}
 
 
 // This could go to ParagraphParameters if we want to
@@ -1280,38 +838,43 @@ int Paragraph::endTeXParParams(BufferParams const & bparams,
        case LYX_ALIGN_LAYOUT:
        case LYX_ALIGN_SPECIAL:
                break;
-       case LYX_ALIGN_LEFT:
-               if (getParLanguage(bparams)->babel() != "hebrew") {
-                       os << "\\end{flushleft}";
-                       column = 15;
-               } else {
-                       os << "\\end{flushright}";
-                       column = 16;
-               }
+       case LYX_ALIGN_LEFT: {
+               string output;
+               if (getParLanguage(bparams)->babel() != "hebrew")
+                       output = corrected_env("\\par\\end", "flushleft", ownerCode());
+               else
+                       output = corrected_env("\\par\\end", "flushright", ownerCode());
+               os << output;
+               column += output.size();
                break;
-       case LYX_ALIGN_RIGHT:
-               if (getParLanguage(bparams)->babel() != "hebrew") {
-                       os << "\\end{flushright}";
-                       column+= 16;
-               } else {
-                       os << "\\end{flushleft}";
-                       column = 15;
-               }
+       } case LYX_ALIGN_RIGHT: {
+               string output;
+               if (getParLanguage(bparams)->babel() != "hebrew")
+                       output = corrected_env("\\par\\end", "flushright", ownerCode());
+               else
+                       output = corrected_env("\\par\\end", "flushleft", ownerCode());
+               os << output;
+               column += output.size();
                break;
-       case LYX_ALIGN_CENTER:
-               os << "\\end{center}";
-               column = 12;
+       } case LYX_ALIGN_CENTER: {
+               string output;
+               output = corrected_env("\\par\\end", "center", ownerCode());
+               os << output;
+               column += output.size();
                break;
        }
+       }
+
        return column;
 }
 
 
 // This one spits out the text of the paragraph
-bool Paragraph::simpleTeXOnePar(Buffer const * buf,
+bool Paragraph::simpleTeXOnePar(Buffer const & buf,
                                BufferParams const & bparams,
+                               LyXFont const & outerfont,
                                ostream & os, TexRow & texrow,
-                               bool moving_arg)
+                               OutputParams const & runparams) const
 {
        lyxerr[Debug::LATEX] << "SimpleTeXOnePar...     " << this << endl;
 
@@ -1320,11 +883,10 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
        LyXLayout_ptr style;
 
        // well we have to check if we are in an inset with unlimited
-       // lenght (all in one row) if that is true then we don't allow
+       // length (all in one row) if that is true then we don't allow
        // any special options in the paragraph and also we don't allow
        // any environment other then "Standard" to be valid!
-       bool asdefault =
-               (inInset() && inInset()->forceDefaultParagraphs(inInset()));
+       bool asdefault = forceDefaultParagraphs();
 
        if (asdefault) {
                style = bparams.getLyXTextClass().defaultLayout();
@@ -1334,31 +896,37 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 
        LyXFont basefont;
 
-       // Maybe we have to create a optional argument.
-       pos_type main_body;
-       if (style->labeltype != LABEL_MANUAL)
-               main_body = 0;
-       else
-               main_body = beginningOfMainBody();
+       LaTeXFeatures features(buf, bparams, runparams.nice);
 
-       int column = 0;
+       // output change tracking marks only if desired,
+       // if dvipost is installed,
+       // and with dvi/ps (other formats don't work)
+       bool const output = bparams.output_changes
+               && runparams.flavor == OutputParams::LATEX
+               && features.isAvailable("dvipost");
 
-       if (main_body > 0) {
-               os << '[';
-               ++column;
-               basefont = getLabelFont(bparams);
+       // Maybe we have to create a optional argument.
+       pos_type body_pos = beginOfBody();
+       unsigned int column = 0;
+
+       if (body_pos > 0) {
+               // the optional argument is kept in curly brackets in
+               // case it contains a ']'
+               os << "[{";
+               column += 2;
+               basefont = getLabelFont(bparams, outerfont);
        } else {
-               basefont = getLayoutFont(bparams);
+               basefont = getLayoutFont(bparams, outerfont);
        }
 
-       moving_arg |= style->needprotect;
-
        // Which font is currently active?
        LyXFont running_font(basefont);
        // Do we have an open font change?
        bool open_font = false;
 
-       texrow.start(this, 0);
+       Change::Type running_change = Change::UNCHANGED;
+
+       texrow.start(id(), 0);
 
        // if the paragraph is empty, the loop will not be entered at all
        if (empty()) {
@@ -1367,23 +935,23 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                        ++column;
                }
                if (!asdefault)
-                       column += startTeXParParams(bparams, os, moving_arg);
-
+                       column += startTeXParParams(bparams, os,
+                                                   runparams.moving_arg);
        }
 
        for (pos_type i = 0; i < size(); ++i) {
                ++column;
                // First char in paragraph or after label?
-               if (i == main_body) {
-                       if (main_body > 0) {
+               if (i == body_pos) {
+                       if (body_pos > 0) {
                                if (open_font) {
                                        column += running_font.latexWriteEndChanges(os, basefont, basefont);
                                        open_font = false;
                                }
-                               basefont = getLayoutFont(bparams);
+                               basefont = getLayoutFont(bparams, outerfont);
                                running_font = basefont;
-                               os << ']';
-                               ++column;
+                               os << "}] ";
+                               column +=3;
                        }
                        if (style->isCommand()) {
                                os << '{';
@@ -1392,13 +960,13 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 
                        if (!asdefault)
                                column += startTeXParParams(bparams, os,
-                                                           moving_arg);
+                                                           runparams.moving_arg);
                }
 
                value_type c = getChar(i);
 
                // Fully instantiated font
-               LyXFont font = getFont(bparams, i);
+               LyXFont font = getFont(bparams, i, outerfont);
 
                LyXFont const last_font = running_font;
 
@@ -1406,9 +974,8 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                // outside font change, i.e. we write "\textXX{text} "
                // rather than "\textXX{text }". (Asger)
                if (open_font && c == ' ' && i <= size() - 2) {
-                       LyXFont const & next_font = getFont(bparams, i + 1);
-                       if (next_font != running_font
-                           && next_font != font) {
+                       LyXFont const & next_font = getFont(bparams, i + 1, outerfont);
+                       if (next_font != running_font && next_font != font) {
                                font = next_font;
                        }
                }
@@ -1420,7 +987,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                {
                        column += running_font.latexWriteEndChanges(os,
                                                                    basefont,
-                                                                   (i == main_body-1) ? basefont : font);
+                                                                   (i == body_pos-1) ? basefont : font);
                        running_font = basefont;
                        open_font = false;
                }
@@ -1428,7 +995,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                // Blanks are printed before start of fontswitch
                if (c == ' ') {
                        // Do not print the separation of the optional argument
-                       if (i != main_body - 1) {
+                       if (i != body_pos - 1) {
                                pimpl_->simpleTeXBlanks(os, texrow, i,
                                                       column, font, *style);
                        }
@@ -1437,7 +1004,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                // Do we need to change font?
                if ((font != running_font ||
                     font.language() != running_font.language()) &&
-                       i != main_body - 1)
+                       i != body_pos - 1)
                {
                        column += font.latexWriteStartChanges(os, basefont,
                                                              last_font);
@@ -1445,39 +1012,31 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                        open_font = true;
                }
 
-               if (c == Paragraph::META_NEWLINE) {
-                       // newlines are handled differently here than
-                       // the default in SimpleTeXSpecialChars().
-                       if (!style->newline_allowed) {
-                               os << '\n';
-                       } else {
-                               if (open_font) {
-                                       column += running_font.latexWriteEndChanges(os, basefont, basefont);
-                                       open_font = false;
-                               }
-                               basefont = getLayoutFont(bparams);
-                               running_font = basefont;
-                               if (font.family() ==
-                                   LyXFont::TYPEWRITER_FAMILY) {
-                                       os << "~";
-                               }
-                               if (moving_arg)
-                                       os << "\\protect ";
+               Change::Type change = pimpl_->lookupChange(i);
 
-                               os << "\\\\\n";
-                       }
-                       texrow.newline();
-                       texrow.start(this, i + 1);
-                       column = 0;
-               } else {
+               column += Changes::latexMarkChange(os, running_change,
+                       change, output);
+               running_change = change;
+
+               // do not output text which is marked deleted
+               // if change tracking output is not desired
+               if (output || running_change != Change::DELETED) {
+                       OutputParams rp = runparams;
+                       rp.free_spacing = style->free_spacing;
+                       rp.local_font = &font;
+                       rp.intitle = style->intitle;
                        pimpl_->simpleTeXSpecialChars(buf, bparams,
-                                                     os, texrow, moving_arg,
-                                                     font, running_font,
-                                                     basefont, open_font,
-                                                     *style, i, column, c);
+                                               os, texrow, rp,
+                                               font, running_font,
+                                               basefont, outerfont, open_font,
+                                               running_change,
+                                               *style, i, column, c);
                }
        }
 
+       column += Changes::latexMarkChange(os,
+                       running_change, Change::UNCHANGED, output);
+
        // If we have an open font definition, we have to close it
        if (open_font) {
 #ifdef FIXED_LANGUAGE_END_DETECTION
@@ -1485,7 +1044,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                        running_font
                                .latexWriteEndChanges(os, basefont,
                                                      next_->getFont(bparams,
-                                                     0));
+                                                     0, outerfont));
                } else {
                        running_font.latexWriteEndChanges(os, basefont,
                                                          basefont);
@@ -1501,13 +1060,13 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
        }
 
        // Needed if there is an optional argument but no contents.
-       if (main_body > 0 && main_body == size()) {
-               os << "]~";
+       if (body_pos > 0 && body_pos == size()) {
+               os << "}]~";
                return_value = false;
        }
 
        if (!asdefault) {
-               column += endTeXParParams(bparams, os, moving_arg);
+               column += endTeXParParams(bparams, os, runparams.moving_arg);
        }
 
        lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl;
@@ -1515,129 +1074,398 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 }
 
 
-Paragraph * Paragraph::TeXEnvironment(Buffer const * buf,
-                                           BufferParams const & bparams,
-                                           ostream & os, TexRow & texrow)
+namespace {
+
+// checks, if newcol chars should be put into this line
+// writes newline, if necessary.
+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 {
+       PAR_NONE=0,
+       TT = 1,
+       SF = 2,
+       BF = 4,
+       IT = 8,
+       SL = 16,
+       EM = 32
+};
+
+
+string tag_name(PAR_TAG const & pt) {
+       switch (pt) {
+       case PAR_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)
 {
-       lyxerr[Debug::LATEX] << "TeXEnvironment...     " << this << endl;
+       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 Paragraph::simpleLinuxDocOnePar(Buffer const & buf,
+                                    ostream & os,
+                                    LyXFont const & outerfont,
+                                    OutputParams const & runparams,
+                                    lyx::depth_type /*depth*/) const
+{
        LyXLayout_ptr const & style = layout();
 
-       Language const * language = getParLanguage(bparams);
-       Language const * doc_language = bparams.language;
-       Language const * previous_language = previous_
-               ? previous_->getParLanguage(bparams) : doc_language;
-       if (language->babel() != previous_language->babel()) {
-
-               if (!lyxrc.language_command_end.empty() &&
-                   previous_language->babel() != doc_language->babel()) {
-                       os << subst(lyxrc.language_command_end, "$$lang",
-                                   previous_language->babel())
-                          << endl;
-                       texrow.newline();
+       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 < size(); ++i) {
+
+               PAR_TAG tag_close = PAR_NONE;
+               list < PAR_TAG > tag_open;
+
+               LyXFont const font = getFont(buf.params(), i, outerfont);
+
+               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) << '>';
+               }
+
+               value_type c = getChar(i);
+
+
+               if (c == Paragraph::META_INSET) {
+                       getInset(i)->linuxdoc(buf, os, runparams);
+                       font_old = font;
+                       continue;
                }
 
-               if (lyxrc.language_command_end.empty() ||
-                   language->babel() != doc_language->babel()) {
-                       os << subst(lyxrc.language_command_begin, "$$lang",
-                                   language->babel())
-                          << endl;
-                       texrow.newline();
+               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 && !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;
        }
 
-       bool leftindent_open = false;
-       if (!params().leftIndent().zero()) {
-               os << "\\begin{LyXParagraphLeftIndent}{" <<
-                       params().leftIndent().asLatexString() << "}\n";
-               texrow.newline();
-               leftindent_open = true;
+       while (!tag_state.empty()) {
+               os << "</" << tag_name(tag_state.top()) << '>';
+               tag_state.pop();
        }
 
-       if (style->isEnvironment()) {
-               if (style->latextype == LATEX_LIST_ENVIRONMENT) {
-                       os << "\\begin{" << style->latexname() << "}{"
-                          << params().labelWidthString() << "}\n";
-               } else if (style->labeltype == LABEL_BIBLIO) {
-                       // ale970405
-                       os << "\\begin{" << style->latexname() << "}{"
-                          <<  bibitemWidest(buf)
-                          << "}\n";
-               } else if (style->latextype == LATEX_ITEM_ENVIRONMENT) {
-                       os << "\\begin{" << style->latexname() << '}'
-                          << style->latexparam() << '\n';
-               } else
-                       os << "\\begin{" << style->latexname() << '}'
-                          << style->latexparam() << '\n';
-               texrow.newline();
+       // resets description flag correctly
+       if (desc_on) {
+               // <tag> not closed...
+               sgmlLineBreak(os, char_line_count, 6);
+               os << "</tag>";
        }
-       Paragraph * par = this;
-       do {
-               par = par->TeXOnePar(buf, bparams, os, texrow, false);
-
-               if (par && par->params().depth() > params().depth()) {
-                           if (par->layout()->isParagraph()) {
-
-                           // Thinko!
-                           // How to handle this? (Lgb)
-                           //&& !suffixIs(os, "\n\n")
-                                   //) {
-                               // There should be at least one '\n' already
-                               // but we need there to be two for Standard
-                               // paragraphs that are depth-increment'ed to be
-                               // output correctly.  However, tables can
-                               // also be paragraphs so don't adjust them.
-                               // ARRae
-                               // Thinkee:
-                               // Will it ever harm to have one '\n' too
-                               // many? i.e. that we sometimes will have
-                               // three in a row. (Lgb)
-                               os << '\n';
-                               texrow.newline();
+}
+
+
+bool Paragraph::emptyTag() const
+{
+       for (pos_type i = 0; i < size(); ++i) {
+               if (isInset(i)) {
+                       InsetBase const * inset = getInset(i);
+                       InsetBase::Code lyx_code = inset->lyxCode();
+                       if (lyx_code != InsetBase::TOC_CODE &&
+                           lyx_code != InsetBase::INCLUDE_CODE &&
+                           lyx_code != InsetBase::GRAPHICS_CODE &&
+                           lyx_code != InsetBase::ERT_CODE &&
+                           lyx_code != InsetBase::FLOAT_CODE &&
+                           lyx_code != InsetBase::TABULAR_CODE) {
+                               return false;
                        }
-                       par = par->pimpl_->TeXDeeper(buf, bparams, os, texrow);
+               } else {
+                       value_type c = getChar(i);
+                       if (c != ' ' && c != '\t')
+                               return false;
                }
-       } while (par
-                && par->layout() == layout()
-                && par->params().depth() == params().depth()
-                && par->params().leftIndent() == params().leftIndent());
-
-       if (style->isEnvironment()) {
-               os << "\\end{" << style->latexname() << "}\n";
-               texrow.newline();
        }
+       return true;
+}
 
-       if (leftindent_open) {
-               os << "\\end{LyXParagraphLeftIndent}\n";
-               texrow.newline();
-       }
 
-       lyxerr[Debug::LATEX] << "TeXEnvironment...done " << par << endl;
-       return par;  // ale970302
+string Paragraph::getID(Buffer const & buf, OutputParams const & runparams) const
+{
+       for (pos_type i = 0; i < size(); ++i) {
+               if (isInset(i)) {
+                       InsetBase const * inset = getInset(i);
+                       InsetBase::Code lyx_code = inset->lyxCode();
+                       if (lyx_code == InsetBase::LABEL_CODE) {
+                               string const id = static_cast<InsetCommand const *>(inset)->getContents();
+                               return "id=\"" + sgml::cleanID(buf, runparams, id) + "\"";
+                       }
+               }
+
+       }
+       return string();
 }
 
 
-bool Paragraph::isHfill(pos_type pos) const
+pos_type Paragraph::getFirstWord(Buffer const & buf, ostream & os, OutputParams const & runparams) const
 {
-       return IsHfillChar(getChar(pos));
+       pos_type i;
+       for (i = 0; i < size(); ++i) {
+               if (isInset(i)) {
+                       InsetBase const * inset = getInset(i);
+                       inset->docbook(buf, os, runparams);
+               } else {
+                       value_type c = getChar(i);
+                       if (c == ' ')
+                               break;
+                       bool ws;
+                       string str;
+                       boost::tie(ws, str) = sgml::escapeChar(c);
+
+                       os << str;
+               }
+       }
+       return i;
 }
 
 
-bool Paragraph::isInset(pos_type pos) const
+bool Paragraph::onlyText(Buffer const & buf, LyXFont const & outerfont, pos_type initial) const
 {
-       return IsInsetChar(getChar(pos));
+       LyXFont font_old;
+
+       for (pos_type i = initial; i < size(); ++i) {
+               LyXFont font = getFont(buf.params(), i, outerfont);
+               if (isInset(i))
+                       return false;
+               if (i != initial && font != font_old)
+                       return false;
+               font_old = font;
+       }
+
+       return true;
 }
 
 
-bool Paragraph::isNewline(pos_type pos) const
+void Paragraph::simpleDocBookOnePar(Buffer const & buf,
+                                   ostream & os,
+                                   OutputParams const & runparams,
+                                   LyXFont const & outerfont,
+                                   pos_type initial) const
 {
-       return pos >= 0 && IsNewlineChar(getChar(pos));
+       bool emph_flag = false;
+
+       LyXLayout_ptr const & style = layout();
+       LyXFont font_old =
+               style->labeltype == LABEL_MANUAL ? style->labelfont : style->font;
+
+       if (style->pass_thru && !onlyText(buf, outerfont, initial))
+               os << "]]>";
+
+       // parsing main loop
+       for (pos_type i = initial; i < size(); ++i) {
+               LyXFont font = getFont(buf.params(), i, outerfont);
+
+               // handle <emphasis> tag
+               if (font_old.emph() != font.emph()) {
+                       if (font.emph() == LyXFont::ON) {
+                               os << "<emphasis>";
+                               emph_flag = true;
+                       } else if (i != initial) {
+                               os << "</emphasis>";
+                               emph_flag = false;
+                       }
+               }
+
+               if (isInset(i)) {
+                       InsetBase const * inset = getInset(i);
+                       inset->docbook(buf, os, runparams);
+               } else {
+                       value_type c = getChar(i);
+                       bool ws;
+                       string str;
+                       boost::tie(ws, str) = sgml::escapeChar(c);
+
+                       if (style->pass_thru)
+                               os << c;
+                       else
+                               os << str;
+               }
+               font_old = font;
+       }
+
+       if (emph_flag) {
+               os << "</emphasis>";
+       }
+
+       if (style->free_spacing)
+               os << '\n';
+       if (style->pass_thru && !onlyText(buf, outerfont, initial))
+               os << "<![CDATA[";
 }
 
 
-bool Paragraph::isSeparator(pos_type pos) const
+bool Paragraph::isNewline(pos_type pos) const
 {
-       return IsSeparatorChar(getChar(pos));
+       return isInset(pos)
+               && getInset(pos)->lyxCode() == InsetBase::NEWLINE_CODE;
 }
 
 
@@ -1645,46 +1473,32 @@ bool Paragraph::isLineSeparator(pos_type pos) const
 {
        value_type const c = getChar(pos);
        return IsLineSeparatorChar(c)
-               || (IsInsetChar(c) && getInset(pos) &&
+               || (c == Paragraph::META_INSET && getInset(pos) &&
                getInset(pos)->isLineSeparator());
 }
 
 
-bool Paragraph::isKomma(pos_type pos) const
-{
-       return IsKommaChar(getChar(pos));
-}
-
-
 /// Used by the spellchecker
 bool Paragraph::isLetter(pos_type pos) const
 {
-       value_type const c = getChar(pos);
-       if (IsLetterChar(c))
-               return true;
        if (isInset(pos))
                return getInset(pos)->isLetter();
-       // We want to pass the ' and escape chars to ispell
-       string const extra = lyxrc.isp_esc_chars + '\'';
-       return contains(extra, c);
-}
-
-
-bool Paragraph::isWord(pos_type pos) const
-{
-       return IsWordChar(getChar(pos)) ;
+       else {
+               value_type const c = getChar(pos);
+               return IsLetterChar(c) || IsDigit(c);
+       }
 }
 
 
 Language const *
 Paragraph::getParLanguage(BufferParams const & bparams) const
 {
-       if (!empty()) {
+       if (!empty())
                return getFirstFontSettings().language();
-       } else if (previous_)
-               return previous_->getParLanguage(bparams);
-       else
-               return bparams.language;
+#ifdef WITH_WARNINGS
+#warning FIXME we should check the prev par as well (Lgb)
+#endif
+       return bparams.language;
 }
 
 
@@ -1692,13 +1506,12 @@ bool Paragraph::isRightToLeftPar(BufferParams const & bparams) const
 {
        return lyxrc.rtl_support
                && getParLanguage(bparams)->RightToLeft()
-               && !(inInset() && inInset()->owner() &&
-                    inInset()->owner()->lyxCode() == Inset::ERT_CODE);
+               && ownerCode() != InsetBase::ERT_CODE;
 }
 
 
 void Paragraph::changeLanguage(BufferParams const & bparams,
-                                 Language const * from, Language const * to)
+                              Language const * from, Language const * to)
 {
        for (pos_type i = 0; i < size(); ++i) {
                LyXFont font = getFontSettings(bparams, i);
@@ -1710,7 +1523,7 @@ void Paragraph::changeLanguage(BufferParams const & bparams,
 }
 
 
-bool Paragraph::isMultiLingual(BufferParams const & bparams)
+bool Paragraph::isMultiLingual(BufferParams const & bparams) const
 {
        Language const * doc_language = bparams.language;
        Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
@@ -1719,7 +1532,7 @@ bool Paragraph::isMultiLingual(BufferParams const & bparams)
        for (; cit != end; ++cit)
                if (cit->font().language() != ignore_language &&
                    cit->font().language() != latex_language &&
-                       cit->font().language() != doc_language)
+                   cit->font().language() != doc_language)
                        return true;
        return false;
 }
@@ -1727,105 +1540,150 @@ bool Paragraph::isMultiLingual(BufferParams const & bparams)
 
 // Convert the paragraph to a string.
 // Used for building the table of contents
-string const Paragraph::asString(Buffer const * buffer, bool label)
+string const Paragraph::asString(Buffer const & buffer, bool label) const
+{
+       OutputParams runparams;
+       return asString(buffer, runparams, label);
+}
+
+
+string const Paragraph::asString(Buffer const & buffer,
+                                OutputParams const & runparams,
+                                bool label) const
 {
-       BufferParams const & bparams = buffer->params;
+#if 0
        string s;
        if (label && !params().labelString().empty())
                s += params().labelString() + ' ';
-       string::size_type const len = s.size();
 
        for (pos_type i = 0; i < size(); ++i) {
                value_type c = getChar(i);
                if (IsPrintable(c))
                        s += c;
                else if (c == META_INSET &&
-                        getInset(i)->lyxCode() == Inset::MATH_CODE) {
-                       ostringstream ost;
-                       getInset(i)->ascii(buffer, ost);
-                       s += subst(ost.str().c_str(),'\n',' ');
+                        getInset(i)->lyxCode() == InsetBase::MATH_CODE) {
+                       ostringstream os;
+                       getInset(i)->plaintext(buffer, os, runparams);
+                       s += subst(STRCONV(os.str()),'\n',' ');
                }
        }
 
-       if (isRightToLeftPar(bparams))
-               reverse(s.begin() + len,s.end());
-
        return s;
+#else
+       // This should really be done by the caller and not here.
+       string ret = asString(buffer, runparams, 0, size(), label);
+       return subst(ret, '\n', ' ');
+#endif
+}
+
+
+string const Paragraph::asString(Buffer const & buffer,
+                                pos_type beg, pos_type end, bool label) const
+{
+
+       OutputParams const runparams;
+       return asString(buffer, runparams, beg, end, label);
 }
 
 
-string const Paragraph::asString(Buffer const * buffer,
-                                pos_type beg, pos_type end, bool label)
+string const Paragraph::asString(Buffer const & buffer,
+                                OutputParams const & runparams,
+                                pos_type beg, pos_type end, bool label) const
 {
-       ostringstream ost;
+       ostringstream os;
 
        if (beg == 0 && label && !params().labelString().empty())
-               ost << params().labelString() << ' ';
+               os << params().labelString() << ' ';
 
        for (pos_type i = beg; i < end; ++i) {
-               value_type const c = getUChar(buffer->params, i);
+               value_type const c = getUChar(buffer.params(), i);
                if (IsPrintable(c))
-                       ost << c;
-               else if (c == META_NEWLINE)
-                       ost << '\n';
-               else if (c == META_HFILL)
-                       ost << '\t';
-               else if (c == META_INSET) {
-                       getInset(i)->ascii(buffer, ost);
-               }
+                       os << c;
+               else if (c == META_INSET)
+                       getInset(i)->textString(buffer, os, runparams);
        }
 
-       return ost.str().c_str();
+       return os.str();
 }
 
 
-void Paragraph::setInsetOwner(Inset * i)
+void Paragraph::setInsetOwner(InsetBase * inset)
 {
-       pimpl_->inset_owner = i;
-       InsetList::iterator it = insetlist.begin();
-       InsetList::iterator end = insetlist.end();
-       for (; it != end; ++it) {
-               if (it.getInset())
-                       it.getInset()->setOwner(i);
-       }
+       pimpl_->inset_owner = inset;
 }
 
 
-void Paragraph::deleteInsetsLyXText(BufferView * bv)
+void Paragraph::setContentsFromPar(Paragraph const & par)
 {
-       // then the insets
-       insetlist.deleteInsetsLyXText(bv);
+       pimpl_->setContentsFromPar(par);
 }
 
 
-void Paragraph::resizeInsetsLyXText(BufferView * bv)
+void Paragraph::trackChanges(Change::Type type)
 {
-       // then the insets
-       insetlist.resizeInsetsLyXText(bv);
+       pimpl_->trackChanges(type);
 }
 
 
-void Paragraph::setContentsFromPar(Paragraph * par)
+void Paragraph::untrackChanges()
 {
-       pimpl_->setContentsFromPar(par);
+       pimpl_->untrackChanges();
+}
+
+
+void Paragraph::cleanChanges()
+{
+       pimpl_->cleanChanges();
+}
+
+
+Change::Type Paragraph::lookupChange(lyx::pos_type pos) const
+{
+       BOOST_ASSERT(empty() || pos < size());
+       return pimpl_->lookupChange(pos);
+}
+
+
+Change const Paragraph::lookupChangeFull(lyx::pos_type pos) const
+{
+       BOOST_ASSERT(empty() || pos < size());
+       return pimpl_->lookupChangeFull(pos);
+}
+
+
+bool Paragraph::isChanged(pos_type start, pos_type end) const
+{
+       return pimpl_->isChanged(start, end);
+}
+
+
+bool Paragraph::isChangeEdited(pos_type start, pos_type end) const
+{
+       return pimpl_->isChangeEdited(start, end);
+}
+
+
+void Paragraph::setChange(lyx::pos_type pos, Change::Type type)
+{
+       pimpl_->setChange(pos, type);
 }
 
 
-lyx::pos_type Paragraph::size() const
+void Paragraph::markErased(bool erased)
 {
-       return pimpl_->size();
+       pimpl_->markErased(erased);
 }
 
 
-bool Paragraph::empty() const
+void Paragraph::acceptChange(pos_type start, pos_type end)
 {
-       return pimpl_->empty();
+       return pimpl_->acceptChange(start, end);
 }
 
 
-Paragraph::value_type Paragraph::getChar(pos_type pos) const
+void Paragraph::rejectChange(pos_type start, pos_type end)
 {
-       return pimpl_->getChar(pos);
+       return pimpl_->rejectChange(start, end);
 }
 
 
@@ -1847,29 +1705,28 @@ void Paragraph::layout(LyXLayout_ptr const & new_layout)
 }
 
 
-bool Paragraph::isFirstInSequence() const
+InsetBase * Paragraph::inInset() const
 {
-       Paragraph const * dhook = depthHook(getDepth());
-       return (dhook == this
-               || dhook->layout() != layout()
-               || dhook->getDepth() != getDepth());
+       return pimpl_->inset_owner;
 }
 
 
-Inset * Paragraph::inInset() const
+InsetBase::Code Paragraph::ownerCode() const
 {
-       return pimpl_->inset_owner;
+       return pimpl_->inset_owner
+               ? pimpl_->inset_owner->lyxCode() : InsetBase::NO_CODE;
 }
 
 
 void Paragraph::clearContents()
 {
-       pimpl_->clear();
+       text_.clear();
 }
 
+
 void Paragraph::setChar(pos_type pos, value_type c)
 {
-       pimpl_->setChar(pos, c);
+       text_[pos] = c;
 }
 
 
@@ -1885,17 +1742,117 @@ ParagraphParameters const & Paragraph::params() const
 }
 
 
-Paragraph * Paragraph::getParFromID(int id) const
+bool Paragraph::isFreeSpacing() const
 {
-       return pimpl_->getParFromID(id);
+       if (layout()->free_spacing)
+               return true;
+
+       // for now we just need this, later should we need this in some
+       // other way we can always add a function to InsetBase too.
+       return ownerCode() == InsetBase::ERT_CODE;
 }
 
 
-bool Paragraph::isFreeSpacing() const
+bool Paragraph::allowEmpty() const
 {
-       // for now we just need this, later should we need this in some
-       // other way we can always add a function to Inset::() too.
-       if (pimpl_->inset_owner && pimpl_->inset_owner->owner())
-               return (pimpl_->inset_owner->owner()->lyxCode() == Inset::ERT_CODE);
-       return false;
+       if (layout()->keepempty)
+               return true;
+       return ownerCode() == InsetBase::ERT_CODE;
+}
+
+
+Row & Paragraph::getRow(pos_type pos, bool boundary)
+{
+       BOOST_ASSERT(!rows().empty());
+
+       // If boundary is set we should return the row on which
+       // the character before is inside.
+       if (pos > 0 && boundary)
+               --pos;
+
+       RowList::iterator rit = rows_.end();
+       RowList::iterator const begin = rows_.begin();
+
+       for (--rit; rit != begin && rit->pos() > pos; --rit)
+               ;
+
+       return *rit;
+}
+
+
+Row const & Paragraph::getRow(pos_type pos, bool boundary) const
+{
+       BOOST_ASSERT(!rows().empty());
+
+       // If boundary is set we should return the row on which
+       // the character before is inside.
+       if (pos > 0 && boundary)
+               --pos;
+
+       RowList::const_iterator rit = rows_.end();
+       RowList::const_iterator const begin = rows_.begin();
+
+       for (--rit; rit != begin && rit->pos() > pos; --rit)
+               ;
+
+       return *rit;
+}
+
+
+size_t Paragraph::pos2row(pos_type pos) const
+{
+       BOOST_ASSERT(!rows().empty());
+
+       RowList::const_iterator rit = rows_.end();
+       RowList::const_iterator const begin = rows_.begin();
+
+       for (--rit; rit != begin && rit->pos() > pos; --rit)
+               ;
+
+       return rit - begin;
+}
+
+
+unsigned char Paragraph::transformChar(unsigned char c, pos_type pos) const
+{
+       if (!Encodings::is_arabic(c))
+               if (lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 && IsDigit(c))
+                       return c + (0xb0 - '0');
+               else
+                       return c;
+
+       unsigned char const prev_char = pos > 0 ? getChar(pos - 1) : ' ';
+       unsigned char next_char = ' ';
+
+       for (pos_type i = pos + 1, end = size(); i < end; ++i) {
+               unsigned char const par_char = getChar(i);
+               if (!Encodings::IsComposeChar_arabic(par_char)) {
+                       next_char = par_char;
+                       break;
+               }
+       }
+
+       if (Encodings::is_arabic(next_char)) {
+               if (Encodings::is_arabic(prev_char) &&
+                       !Encodings::is_arabic_special(prev_char))
+                       return Encodings::TransformChar(c, Encodings::FORM_MEDIAL);
+               else
+                       return Encodings::TransformChar(c, Encodings::FORM_INITIAL);
+       } else {
+               if (Encodings::is_arabic(prev_char) &&
+                       !Encodings::is_arabic_special(prev_char))
+                       return Encodings::TransformChar(c, Encodings::FORM_FINAL);
+               else
+                       return Encodings::TransformChar(c, Encodings::FORM_ISOLATED);
+       }
+}
+
+
+void Paragraph::dump() const
+{
+       lyxerr << "Paragraph::dump: rows.size(): " << rows_.size() << endl;
+       for (size_t i = 0; i != rows_.size(); ++i) {
+               lyxerr << "  row " << i << ":   ";
+               rows_[i].dump();
+       }
 }