]> git.lyx.org Git - lyx.git/blobdiff - src/paragraph.C
hopefully fix tex2lyx linking.
[lyx.git] / src / paragraph.C
index a637f98abeec94cc502283046865a552d0943da8..c0c53c3e524220eed2aefacf3aef80680facef39 100644 (file)
@@ -1,12 +1,19 @@
-/* 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>
 
 
 #include "buffer.h"
 #include "bufferparams.h"
-#include "BufferView.h"
-#include "changes.h"
+#include "counters.h"
 #include "encoding.h"
 #include "debug.h"
 #include "gettext.h"
 #include "language.h"
-#include "latexrunparams.h"
-#include "layout.h"
+#include "LaTeXFeatures.h"
+#include "lyxfont.h"
 #include "lyxrc.h"
+#include "lyxrow.h"
+#include "outputparams.h"
 #include "paragraph_funcs.h"
-#include "ParameterStruct.h"
+#include "ParagraphList_fwd.h"
+#include "sgml.h"
 #include "texrow.h"
-
-#include "Lsstream.h"
+#include "vspace.h"
 
 #include "insets/insetbibitem.h"
 #include "insets/insetoptarg.h"
-#include "insets/insetenv.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 "support/unicode.h"
 
-#include <algorithm>
-#include <fstream>
-#include <csignal>
-#include <ctime>
-
-using namespace lyx::support;
+#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 lyx::pos_type;
+#include <algorithm>
+#include <list>
+#include <stack>
+#include <sstream>
 
 
-// this is a minibuffer
+namespace lyx {
 
-namespace {
+using support::subst;
 
-char minibuffer_char;
-LyXFont minibuffer_font;
-InsetOld * 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;
 
 
 Paragraph::Paragraph()
-       : pimpl_(new Paragraph::Pimpl(this))
+       : begin_of_body_(0), pimpl_(new Paragraph::Pimpl(this))
 {
-       enumdepth = 0;
        itemdepth = 0;
        params().clear();
 }
 
 
-Paragraph::Paragraph(Paragraph const & lp)
-       : pimpl_(new Paragraph::Pimpl(*lp.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;
-       // this is because of the dummy layout of the paragraphs that
-       // follow footnotes
-       layout_ = lp.layout();
-
-       // copy everything behind the break-position to the new paragraph
-       insetlist = lp.insetlist;
+       //lyxerr << "Paragraph::Paragraph(Paragraph const&)" << endl;
        InsetList::iterator it = insetlist.begin();
        InsetList::iterator end = insetlist.end();
-       for (; it != end; ++it) {
-               // currently we hold Inset*, not InsetBase*
-               it->inset = static_cast<InsetOld*>(it->inset->clone().release());
-               // tell the new inset who is the boss now
-               it->inset->parOwner(this);
-       }
+       for (; it != end; ++it)
+               it->inset = it->inset->clone().release();
 }
 
 
-void Paragraph::operator=(Paragraph const & lp)
+Paragraph & Paragraph::operator=(Paragraph const & par)
 {
        // needed as we will destroy the pimpl_ before copying it
-       if (&lp != this)
-               return;
-       lyxerr << "Paragraph::operator=()\n";
-       delete pimpl_;
-       pimpl_ = new Pimpl(*lp.pimpl_, this);
-
-       enumdepth = lp.enumdepth;
-       itemdepth = lp.itemdepth;
-       // this is because of the dummy layout of the paragraphs that
-       // follow footnotes
-       layout_ = lp.layout();
-
-       // 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->inset = static_cast<InsetOld*>(it->inset->clone().release());
-               // tell the new inset who is the boss now
-               it->inset->parOwner(this);
+       if (&par != this) {
+               itemdepth = par.itemdepth;
+
+               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()
 {
        delete pimpl_;
@@ -136,7 +126,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
 {
@@ -144,38 +134,36 @@ 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';
+       os << "\n\\begin_layout " << layout()->name() << '\n';
 
        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;
-               }
+       for (pos_type i = 0; i <= size(); ++i) {
 
-               Change change = pimpl_->lookupChangeFull(i);
-               Changes::lyxMarkChange(os, column, curtime, running_change, change);
+               Change change = pimpl_->lookupChange(i);
+               Changes::lyxMarkChange(os, column, running_change, change);
                running_change = change;
 
+               if (i == size())
+                       break;
+
                // Write font changes
                LyXFont font2 = getFontSettings(bparams, i);
                if (font2 != font1) {
@@ -188,7 +176,7 @@ void Paragraph::write(Buffer const * buf, ostream & os,
                switch (c) {
                case META_INSET:
                {
-                       InsetOld const * inset = getInset(i);
+                       InsetBase const * inset = getInset(i);
                        if (inset)
                                if (inset->directWrite()) {
                                        // international char, let it write
@@ -196,15 +184,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 '\\':
-                       os << "\n\\backslash \n";
+                       os << "\n\\backslash\n";
                        column = 0;
                        break;
                case '.':
@@ -222,9 +212,11 @@ void Paragraph::write(Buffer const * buf, ostream & os,
                        }
                        // this check is to amend a bug. LyX sometimes
                        // inserts '\0' this could cause problems.
-                       if (c != '\0')
-                               os << c;
-                       else
+                       if (c != '\0') {
+                               std::vector<char> tmp = ucs4_to_utf8(c);
+                               tmp.push_back('\0');
+                               os << &tmp[0];
+                       } else
                                lyxerr << "ERROR (Paragraph::writeFile):"
                                        " NULL char in structure." << endl;
                        ++column;
@@ -232,15 +224,6 @@ void Paragraph::write(Buffer const * buf, ostream & os,
                }
        }
 
-       // 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));
-
        os << "\n\\end_layout\n";
 }
 
@@ -251,141 +234,69 @@ void Paragraph::validate(LaTeXFeatures & features) const
 }
 
 
-// First few functions needed for cut and paste and paragraph breaking.
-void Paragraph::copyIntoMinibuffer(Buffer const & buffer, pos_type pos) 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 = static_cast<InsetOld *>(getInset(pos)->clone().release());
-               } else {
-                       minibuffer_inset = 0;
-                       minibuffer_char = ' ';
-                       // This reflects what GetInset() does (ARRae)
-               }
-       }
-}
-
-
-void Paragraph::cutIntoMinibuffer(BufferParams const & bparams, pos_type pos)
+bool Paragraph::eraseChar(pos_type pos, bool trackChanges)
 {
-       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.
-}
-
-
-bool Paragraph::insertFromMinibuffer(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;
-}
-
-// end of minibuffer
-
-
-void Paragraph::eraseIntern(lyx::pos_type pos)
-{
-       pimpl_->eraseIntern(pos);
+       return pimpl_->eraseChar(pos, trackChanges);
 }
 
 
-bool Paragraph::erase(pos_type pos)
+int Paragraph::eraseChars(pos_type start, pos_type end, bool trackChanges)
 {
-       return pimpl_->erase(pos);
+       return pimpl_->eraseChars(start, end, trackChanges);
 }
 
 
-int Paragraph::erase(pos_type start, pos_type end)
+void Paragraph::insert(pos_type start, docstring const & str,
+                       LyXFont const & font, Change const & change)
 {
-       return pimpl_->erase(start, end);
-}
-
-
-bool Paragraph::checkInsertChar(LyXFont & font)
-{
-       if (pimpl_->inset_owner)
-               return pimpl_->inset_owner->checkInsertChar(font);
-       return true;
-}
-
-
-void Paragraph::insertChar(pos_type pos, Paragraph::value_type c)
-{
-       LyXFont const f(LyXFont::ALL_INHERIT);
-       insertChar(pos, c, f);
+       for (size_t i = 0, n = str.size(); i != n ; ++i)
+               insertChar(start + i, str[i], font, change);
 }
 
 
 void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
-                          LyXFont const & font, Change change)
+                           bool trackChanges)
 {
-       pimpl_->insertChar(pos, c, font, change);
+       pimpl_->insertChar(pos, c, Change(trackChanges ?
+                          Change::INSERTED : Change::UNCHANGED));
 }
 
 
-void Paragraph::insertInset(pos_type pos, InsetOld * inset)
+void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
+                           LyXFont const & font, bool trackChanges)
 {
-       LyXFont const f(LyXFont::ALL_INHERIT);
-       insertInset(pos, inset, f);
+       pimpl_->insertChar(pos, c, Change(trackChanges ?
+                          Change::INSERTED : Change::UNCHANGED));
+       setFont(pos, font);
 }
 
 
-void Paragraph::insertInset(pos_type pos, InsetOld * inset, LyXFont const & font, Change change)
+void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
+                           LyXFont const & font, Change const & change)
 {
-       pimpl_->insertInset(pos, inset, font, change);
+       pimpl_->insertChar(pos, c, change);
+       setFont(pos, font);
 }
 
 
-bool Paragraph::insetAllowed(InsetOld::Code code)
+void Paragraph::insertInset(pos_type pos, InsetBase * inset,
+                            Change const & change)
 {
-       //lyxerr << "Paragraph::InsertInsetAllowed" << endl;
-       if (pimpl_->inset_owner)
-               return pimpl_->inset_owner->insetAllowed(code);
-       return true;
+       pimpl_->insertInset(pos, inset, change);
 }
 
 
-InsetOld * Paragraph::getInset(pos_type pos)
+void Paragraph::insertInset(pos_type pos, InsetBase * inset,
+                            LyXFont const & font, Change const & change)
 {
-       Assert(pos < size());
-       return insetlist.get(pos);
+       pimpl_->insertInset(pos, inset, change);
+       setFont(pos, font);
 }
 
 
-InsetOld const * Paragraph::getInset(pos_type pos) const
+bool Paragraph::insetAllowed(InsetBase_code code)
 {
-       Assert(pos < size());
-       return insetlist.get(pos);
+       return !pimpl_->inset_owner || pimpl_->inset_owner->insetAllowed(code);
 }
 
 
@@ -393,49 +304,61 @@ InsetOld const * Paragraph::getInset(pos_type pos) const
 LyXFont const Paragraph::getFontSettings(BufferParams const & bparams,
                                         pos_type pos) const
 {
-       Assert(pos <= size());
+       if (pos > size()) {
+               lyxerr << " pos: " << pos << " size: " << size() << endl;
+               BOOST_ASSERT(pos <= size());
+       }
 
        Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
        Pimpl::FontList::const_iterator end = pimpl_->fontlist.end();
-       for (; cit != end; ++cit) {
+       for (; cit != end; ++cit)
                if (cit->pos() >= pos)
                        break;
-       }
 
-       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 cit->font();
+
+       if (pos == size() && !empty())
+               return getFontSettings(bparams, pos - 1);
 
-       return retfont;
+       return LyXFont(LyXFont::ALL_INHERIT, getParLanguage(bparams));
 }
 
-lyx::pos_type 
-Paragraph::getEndPosOfFontSpan(lyx::pos_type pos) const 
+
+FontSpan Paragraph::fontSpan(pos_type pos) const
 {
-       Assert(pos <= size());
+       BOOST_ASSERT(pos <= size());
+       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)
-                       return cit->pos();
+               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;
        }
+
        // This should not happen, but if so, we take no chances.
-       return pos;
+       //lyxerr << "Paragraph::getEndPosOfFontSpan: This should not happen!"
+       //      << endl;
+       return FontSpan(pos, pos);
 }
 
 
 // Gets uninstantiated font setting at position 0
-LyXFont const Paragraph::getFirstFontSettings() const
+LyXFont const Paragraph::getFirstFontSettings(BufferParams const & bparams) const
 {
        if (!empty() && !pimpl_->fontlist.empty())
                return pimpl_->fontlist[0].font();
 
-       return LyXFont(LyXFont::ALL_INHERIT);
+       return LyXFont(LyXFont::ALL_INHERIT, bparams.language);
 }
 
 
@@ -447,11 +370,11 @@ LyXFont const Paragraph::getFirstFontSettings() const
 LyXFont const Paragraph::getFont(BufferParams const & bparams, pos_type pos,
                                 LyXFont const & outerfont) const
 {
-       Assert(pos >= 0);
+       BOOST_ASSERT(pos >= 0);
 
        LyXLayout_ptr const & lout = layout();
 
-       pos_type const body_pos = beginningOfBody();
+       pos_type const body_pos = beginOfBody();
 
        LyXFont layoutfont;
        if (pos < body_pos)
@@ -459,53 +382,46 @@ LyXFont const Paragraph::getFont(BufferParams const & bparams, pos_type pos,
        else
                layoutfont = lout->font;
 
-       LyXFont tmpfont = getFontSettings(bparams, pos);
-       tmpfont.realize(layoutfont);
-       tmpfont.realize(outerfont);
-       tmpfont.realize(bparams.getLyXTextClass().defaultfont());
+       LyXFont font = getFontSettings(bparams, pos);
+       font.realize(layoutfont);
+       font.realize(outerfont);
+       font.realize(bparams.getFont());
 
-       return tmpfont;
+       return font;
 }
 
 
-LyXFont const Paragraph::getLabelFont(BufferParams const & bparams,
-                                     LyXFont const & outerfont) 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));
        tmpfont.realize(outerfont);
-       tmpfont.realize(bparams.getLyXTextClass().defaultfont());
-
+       tmpfont.realize(bparams.getFont());
        return tmpfont;
 }
 
 
-LyXFont const Paragraph::getLayoutFont(BufferParams const & bparams,
-                                      LyXFont const & outerfont) 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));
        tmpfont.realize(outerfont);
-       tmpfont.realize(bparams.getLyXTextClass().defaultfont());
-
+       tmpfont.realize(bparams.getFont());
        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;
@@ -575,10 +491,10 @@ Paragraph::getUChar(BufferParams const & bparams, pos_type pos) const
 
 void Paragraph::setFont(pos_type pos, LyXFont const & font)
 {
-       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)
@@ -591,7 +507,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)
@@ -650,8 +566,9 @@ int Paragraph::stripLeadingSpaces()
                return 0;
 
        int i = 0;
-       while (!empty() && (isNewline(0) || isLineSeparator(0))) {
-               pimpl_->eraseIntern(0);
+       while (!empty() && (isNewline(0) || isLineSeparator(0))
+               && !isDeleted(0)) {
+               eraseChar(0, false); // no change tracking here
                ++i;
        }
 
@@ -661,19 +578,17 @@ int Paragraph::stripLeadingSpaces()
 
 bool Paragraph::hasSameLayout(Paragraph const & par) const
 {
-       return
-               par.layout() == layout() &&
-               params().sameLayout(par.params());
+       return par.layout() == layout() && params().sameLayout(par.params());
 }
 
 
-Paragraph::depth_type Paragraph::getDepth() const
+depth_type Paragraph::getDepth() const
 {
        return params().depth();
 }
 
 
-Paragraph::depth_type Paragraph::getMaxDepthAfter() const
+depth_type Paragraph::getMaxDepthAfter() const
 {
        if (layout()->isEnvironment())
                return params().depth() + 1;
@@ -688,14 +603,14 @@ char Paragraph::getAlign() const
 }
 
 
-string const & Paragraph::getLabelstring() const
+docstring const & Paragraph::getLabelstring() const
 {
        return params().labelString();
 }
 
 
 // the next two functions are for the manual labels
-string const Paragraph::getLabelWidthString() const
+docstring const Paragraph::getLabelWidthString() const
 {
        if (!params().labelWidthString().empty())
                return params().labelWidthString();
@@ -704,7 +619,7 @@ string const Paragraph::getLabelWidthString() const
 }
 
 
-void Paragraph::setLabelWidthString(string const & s)
+void Paragraph::setLabelWidthString(docstring const & s)
 {
        params().labelWidthString(s);
 }
@@ -713,36 +628,42 @@ void Paragraph::setLabelWidthString(string const & s)
 void Paragraph::applyLayout(LyXLayout_ptr const & new_layout)
 {
        layout(new_layout);
-       params().labelWidthString(string());
+       params().labelWidthString(docstring());
        params().align(LYX_ALIGN_LAYOUT);
-       params().spaceTop(VSpace(VSpace::NONE));
-       params().spaceBottom(VSpace(VSpace::NONE));
        params().spacing(Spacing(Spacing::Default));
 }
 
 
-int Paragraph::beginningOfBody() const
+pos_type Paragraph::beginOfBody() const
 {
-       if (layout()->labeltype != LABEL_MANUAL)
-               return 0;
+       return begin_of_body_;
+}
+
+
+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() && !isNewline(i)) {
+       pos_type end = size();
+       if (i < end && !isNewline(i)) {
                ++i;
-               char previous_char = 0;
-               char temp = 0;
-               if (i < size()) {
-                       previous_char = getChar(i);
+               char_type previous_char = 0;
+               char_type temp = 0;
+               if (i < end) {
+                       previous_char = text_[i];
                        if (!isNewline(i)) {
                                ++i;
-                               while (i < size() && previous_char != ' ') {
-                                       temp = getChar(i);
+                               while (i < end && previous_char != ' ') {
+                                       temp = text_[i];
                                        if (isNewline(i))
                                                break;
-
                                        ++i;
                                        previous_char = temp;
                                }
@@ -750,12 +671,12 @@ int Paragraph::beginningOfBody() const
                }
        }
 
-       return i;
+       begin_of_body_ = i;
 }
 
 
 // returns -1 if inset not found
-int Paragraph::getPositionOfInset(InsetOld const * inset) const
+int Paragraph::getPositionOfInset(InsetBase const * inset) const
 {
        // Find the entry.
        InsetList::const_iterator it = insetlist.begin();
@@ -769,17 +690,61 @@ int Paragraph::getPositionOfInset(InsetOld const * inset) const
 
 InsetBibitem * Paragraph::bibitem() const
 {
-       InsetList::const_iterator it = insetlist.begin();
-       if (it != insetlist.end() && it->inset->lyxCode() == InsetOld::BIBTEX_CODE)
-               return static_cast<InsetBibitem *>(it->inset);
+       if (!insetlist.empty()) {
+               InsetBase * inset = insetlist.begin()->inset;
+               if (inset->lyxCode() == InsetBase::BIBITEM_CODE)
+                       return static_cast<InsetBibitem *>(inset);
+       }
        return 0;
 }
 
 
+bool Paragraph::forceDefaultParagraphs() const
+{
+       return inInset() && inInset()->forceDefaultParagraphs(0);
+}
+
+
+namespace {
+
+// paragraphs inside floats need different alignment tags to avoid
+// unwanted space
+
+bool noTrivlistCentering(InsetBase::Code code)
+{
+       return code == InsetBase::FLOAT_CODE || code == InsetBase::WRAP_CODE;
+}
+
+
+string correction(string const & orig)
+{
+       if (orig == "flushleft")
+               return "raggedright";
+       if (orig == "flushright")
+               return "raggedleft";
+       if (orig == "center")
+               return "centering";
+       return orig;
+}
+
+
+string const corrected_env(string const & suffix, string const & env,
+       InsetBase::Code code)
+{
+       string output = suffix + "{";
+       if (noTrivlistCentering(code))
+               output += correction(env);
+       else
+               output += env;
+       return output + "}";
+}
+
+} // namespace anon
+
 
 // This could go to ParagraphParameters if we want to
 int Paragraph::startTeXParParams(BufferParams const & bparams,
-                                ostream & os, bool moving_arg) const
+                                odocstream & os, bool moving_arg) const
 {
        int column = 0;
 
@@ -799,7 +764,7 @@ int Paragraph::startTeXParParams(BufferParams const & bparams,
        case LYX_ALIGN_CENTER:
                if (moving_arg) {
                        os << "\\protect";
-                       column = 8;
+                       column += 8;
                }
                break;
        }
@@ -810,29 +775,32 @@ int Paragraph::startTeXParParams(BufferParams const & bparams,
        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;
-               }
+       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 << from_ascii(output);
+               column += output.size();
                break;
-       case LYX_ALIGN_RIGHT:
-               if (getParLanguage(bparams)->babel() != "hebrew") {
-                       os << "\\begin{flushright}";
-                       column += 18;
-               } else {
-                       os << "\\begin{flushleft}";
-                       column += 17;
-               }
+       } 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 << from_ascii(output);
+               column += output.size();
                break;
-       case LYX_ALIGN_CENTER:
-               os << "\\begin{center}";
-               column += 14;
+       } case LYX_ALIGN_CENTER: {
+               string output;
+               output = corrected_env("\\begin", "center", ownerCode());
+               os << from_ascii(output);
+               column += output.size();
                break;
        }
+       }
 
        return column;
 }
@@ -840,7 +808,7 @@ int Paragraph::startTeXParParams(BufferParams const & bparams,
 
 // This could go to ParagraphParameters if we want to
 int Paragraph::endTeXParParams(BufferParams const & bparams,
-                              ostream & os, bool moving_arg) const
+                              odocstream & os, bool moving_arg) const
 {
        int column = 0;
 
@@ -866,39 +834,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 << from_ascii(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 << from_ascii(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 << from_ascii(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,
-                               LatexRunParams const & runparams)
+                               odocstream & os, TexRow & texrow,
+                               OutputParams const & runparams) const
 {
        lyxerr[Debug::LATEX] << "SimpleTeXOnePar...     " << this << endl;
 
@@ -907,11 +879,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();
@@ -921,36 +892,35 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 
        LyXFont basefont;
 
-       // Maybe we have to create a optional argument.
-       pos_type body_pos;
+       LaTeXFeatures features(buf, bparams, runparams);
 
-       // FIXME: can we actually skip this check and just call
-       // beginningOfBody() ??
-       if (style->labeltype != LABEL_MANUAL) {
-               body_pos = 0;
-       } else {
-               body_pos = beginningOfBody();
-       }
+       // output change tracking marks only if desired,
+       // if dvipost is installed,
+       // and with dvi/ps (other formats don't work)
+       bool const output = bparams.outputChanges
+               && runparams.flavor == OutputParams::LATEX
+               && features.isAvailable("dvipost");
 
+       // Maybe we have to create a optional argument.
+       pos_type body_pos = beginOfBody();
        unsigned int column = 0;
 
        if (body_pos > 0) {
-               os << '[';
-               ++column;
+               // the optional argument is kept in curly brackets in
+               // case it contains a ']'
+               os << "[{";
+               column += 2;
                basefont = getLabelFont(bparams, outerfont);
        } else {
                basefont = getLayoutFont(bparams, outerfont);
        }
 
-       bool moving_arg = runparams.moving_arg;
-       moving_arg |= style->needprotect;
-
        // Which font is currently active?
        LyXFont running_font(basefont);
        // Do we have an open font change?
        bool open_font = false;
 
-       Change::Type running_change = Change::UNCHANGED;
+       Change::Type runningChangeType = Change::UNCHANGED;
 
        texrow.start(id(), 0);
 
@@ -961,8 +931,8 @@ 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) {
@@ -976,8 +946,8 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                                }
                                basefont = getLayoutFont(bparams, outerfont);
                                running_font = basefont;
-                               os << ']';
-                               ++column;
+                               os << "}] ";
+                               column +=3;
                        }
                        if (style->isCommand()) {
                                os << '{';
@@ -986,7 +956,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 
                        if (!asdefault)
                                column += startTeXParParams(bparams, os,
-                                                           moving_arg);
+                                                           runparams.moving_arg);
                }
 
                value_type c = getChar(i);
@@ -1001,8 +971,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                // rather than "\textXX{text }". (Asger)
                if (open_font && c == ' ' && i <= size() - 2) {
                        LyXFont const & next_font = getFont(bparams, i + 1, outerfont);
-                       if (next_font != running_font
-                           && next_font != font) {
+                       if (next_font != running_font && next_font != font) {
                                font = next_font;
                        }
                }
@@ -1039,24 +1008,30 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
                        open_font = true;
                }
 
-               Change::Type change = pimpl_->lookupChange(i);
-
-               column += Changes::latexMarkChange(os, running_change, change);
-               running_change = change;
-
-               LatexRunParams rp = runparams;
-               rp.moving_arg = moving_arg;
-               rp.free_spacing = style->free_spacing;
-               pimpl_->simpleTeXSpecialChars(buf, bparams,
-                                             os, texrow, runparams,
-                                             font, running_font,
-                                             basefont, outerfont, open_font,
-                                             running_change,
-                                             *style, i, column, c);
+               Change::Type changeType = pimpl_->lookupChange(i).type;
+
+               column += Changes::latexMarkChange(os, runningChangeType,
+                       changeType, output);
+               runningChangeType = changeType;
+
+               // do not output text which is marked deleted
+               // if change tracking output is not desired
+               if (output || runningChangeType != 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, rp,
+                                               font, running_font,
+                                               basefont, outerfont, open_font,
+                                               runningChangeType,
+                                               *style, i, column, c);
+               }
        }
 
        column += Changes::latexMarkChange(os,
-                       running_change, Change::UNCHANGED);
+                       runningChangeType, Change::UNCHANGED, output);
 
        // If we have an open font definition, we have to close it
        if (open_font) {
@@ -1082,12 +1057,12 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 
        // Needed if there is an optional argument but no contents.
        if (body_pos > 0 && body_pos == size()) {
-               os << "]~";
+               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;
@@ -1095,66 +1070,217 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 }
 
 
+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 "";
+}
 
 
-bool Paragraph::isHfill(pos_type pos) const
+inline
+void operator|=(PAR_TAG & p1, PAR_TAG const & p2)
 {
-       return IsInsetChar(getChar(pos))
-              && getInset(pos)->lyxCode() == InsetOld::HFILL_CODE;
+       p1 = static_cast<PAR_TAG>(p1 | p2);
 }
 
 
-bool Paragraph::isInset(pos_type pos) const
+inline
+void reset(PAR_TAG & p1, PAR_TAG const & p2)
 {
-       return IsInsetChar(getChar(pos));
+       p1 = static_cast<PAR_TAG>(p1 & ~p2);
 }
 
+} // anon
 
-bool Paragraph::isNewline(pos_type pos) const
+
+bool Paragraph::emptyTag() const
 {
-       return IsInsetChar(getChar(pos))
-              && getInset(pos)->lyxCode() == InsetOld::NEWLINE_CODE;
+       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;
+                       }
+               } else {
+                       value_type c = getChar(i);
+                       if (c != ' ' && c != '\t')
+                               return false;
+               }
+       }
+       return true;
 }
 
 
-bool Paragraph::isSeparator(pos_type pos) const
+string Paragraph::getID(Buffer const & buf, OutputParams const & runparams) const
 {
-       return IsSeparatorChar(getChar(pos));
+       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='" + to_utf8(sgml::cleanID(buf, runparams, from_utf8(id))) + "'";
+                       }
+               }
+
+       }
+       return string();
 }
 
 
-bool Paragraph::isLineSeparator(pos_type pos) const
+pos_type Paragraph::getFirstWord(Buffer const & buf, odocstream & os, OutputParams const & runparams) const
 {
-       value_type const c = getChar(pos);
-       return IsLineSeparatorChar(c)
-               || (IsInsetChar(c) && getInset(pos) &&
-               getInset(pos)->isLineSeparator());
+       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;
+                       os << sgml::escapeChar(c);
+               }
+       }
+       return i;
 }
 
 
-bool Paragraph::isKomma(pos_type pos) const
+bool Paragraph::onlyText(Buffer const & buf, LyXFont const & outerfont, pos_type initial) const
 {
-       return IsKommaChar(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;
 }
 
 
-/// Used by the spellchecker
-bool Paragraph::isLetter(pos_type pos) const
+void Paragraph::simpleDocBookOnePar(Buffer const & buf,
+                                   odocstream & os,
+                                   OutputParams const & runparams,
+                                   LyXFont const & outerfont,
+                                   pos_type initial) const
+{
+       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);
+
+                       if (style->pass_thru)
+                                os.put(c);
+                       else
+                                os << sgml::escapeChar(c);
+               }
+               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::isNewline(pos_type pos) const
+{
+       return isInset(pos)
+               && getInset(pos)->lyxCode() == InsetBase::NEWLINE_CODE;
+}
+
+
+bool Paragraph::isLineSeparator(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);
+       return isLineSeparatorChar(c)
+               || (c == Paragraph::META_INSET && getInset(pos) &&
+               getInset(pos)->isLineSeparator());
 }
 
 
-bool Paragraph::isWord(pos_type pos) const
+/// Used by the spellchecker
+bool Paragraph::isLetter(pos_type pos) const
 {
-       return IsWordChar(getChar(pos)) ;
+       if (isInset(pos))
+               return getInset(pos)->isLetter();
+       else {
+               value_type const c = getChar(pos);
+               return isLetterChar(c) || isDigit(c);
+       }
 }
 
 
@@ -1162,8 +1288,10 @@ Language const *
 Paragraph::getParLanguage(BufferParams const & bparams) const
 {
        if (!empty())
-               return getFirstFontSettings().language();
+               return getFirstFontSettings(bparams).language();
+#ifdef WITH_WARNINGS
 #warning FIXME we should check the prev par as well (Lgb)
+#endif
        return bparams.language;
 }
 
@@ -1171,16 +1299,16 @@ Paragraph::getParLanguage(BufferParams const & bparams) const
 bool Paragraph::isRightToLeftPar(BufferParams const & bparams) const
 {
        return lyxrc.rtl_support
-               && getParLanguage(bparams)->RightToLeft()
-               && !(inInset() && inInset()->owner() &&
-                    inInset()->owner()->lyxCode() == InsetOld::ERT_CODE);
+               && getParLanguage(bparams)->rightToLeft()
+               && ownerCode() != InsetBase::ERT_CODE;
 }
 
 
 void Paragraph::changeLanguage(BufferParams const & bparams,
                               Language const * from, Language const * to)
 {
-       for (pos_type i = 0; i < size(); ++i) {
+       // change language including dummy font change at the end
+       for (pos_type i = 0; i <= size(); ++i) {
                LyXFont font = getFontSettings(bparams, i);
                if (font.language() == from) {
                        font.setLanguage(to);
@@ -1190,7 +1318,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();
@@ -1199,7 +1327,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;
 }
@@ -1207,7 +1335,16 @@ 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) const
+docstring const Paragraph::asString(Buffer const & buffer, bool label) const
+{
+       OutputParams runparams;
+       return asString(buffer, runparams, label);
+}
+
+
+docstring const Paragraph::asString(Buffer const & buffer,
+                                OutputParams const & runparams,
+                                bool label) const
 {
 #if 0
        string s;
@@ -1216,244 +1353,294 @@ string const Paragraph::asString(Buffer const * buffer, bool label) const
 
        for (pos_type i = 0; i < size(); ++i) {
                value_type c = getChar(i);
-               if (IsPrintable(c))
+               if (isPrintable(c))
                        s += c;
                else if (c == META_INSET &&
-                        getInset(i)->lyxCode() == InsetOld::MATH_CODE) {
-                       ostringstream ost;
-                       getInset(i)->ascii(buffer, ost);
-                       s += subst(STRCONV(ost.str()),'\n',' ');
+                        getInset(i)->lyxCode() == InsetBase::MATH_CODE) {
+                       ostringstream os;
+                       getInset(i)->plaintext(buffer, os, runparams);
+                       s += subst(STRCONV(os.str()),'\n',' ');
                }
        }
 
        return s;
 #else
        // This should really be done by the caller and not here.
-       string ret(asString(buffer, 0, size(), label));
+       docstring ret = asString(buffer, runparams, 0, size(), label);
        return subst(ret, '\n', ' ');
 #endif
 }
 
 
-string const Paragraph::asString(Buffer const * buffer,
+docstring 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);
+}
+
+
+docstring const Paragraph::asString(Buffer const & buffer,
+                                OutputParams const & runparams,
                                 pos_type beg, pos_type end, bool label) const
 {
-       ostringstream os;
+       lyx::odocstringstream os;
 
        if (beg == 0 && label && !params().labelString().empty())
                os << params().labelString() << ' ';
 
        for (pos_type i = beg; i < end; ++i) {
-               value_type const c = getUChar(buffer->params, i);
-               if (IsPrintable(c))
-                       os << c;
+               value_type const c = getUChar(buffer.params(), i);
+               if (isPrintable(c))
+                       os.put(c);
                else if (c == META_INSET)
-                       getInset(i)->ascii(buffer, os);
+                       getInset(i)->textString(buffer, os, runparams);
        }
 
-       return STRCONV(os.str());
+       return os.str();
 }
 
 
-void Paragraph::setInsetOwner(UpdatableInset * inset)
+void Paragraph::setInsetOwner(InsetBase * inset)
 {
        pimpl_->inset_owner = inset;
-       InsetList::iterator it = insetlist.begin();
-       InsetList::iterator end = insetlist.end();
-       for (; it != end; ++it)
-               if (it->inset)
-                       it->inset->setOwner(inset);
 }
 
 
-void Paragraph::deleteInsetsLyXText(BufferView * bv)
+Change const Paragraph::lookupChange(pos_type pos) const
 {
-       insetlist.deleteInsetsLyXText(bv);
+       BOOST_ASSERT(pos <= size());
+       return pimpl_->lookupChange(pos);
 }
 
 
-void Paragraph::resizeInsetsLyXText(BufferView * bv)
+bool Paragraph::isChanged(pos_type start, pos_type end) const
 {
-       insetlist.resizeInsetsLyXText(bv);
+       return pimpl_->isChanged(start, end);
 }
 
 
-void Paragraph::setContentsFromPar(Paragraph const & par)
+void Paragraph::setChange(Change const & change)
 {
-       pimpl_->setContentsFromPar(par);
+       pimpl_->setChange(change);
 }
 
 
-void Paragraph::trackChanges(Change::Type type)
+void Paragraph::setChange(pos_type pos, Change const & change)
 {
-       pimpl_->trackChanges(type);
+       pimpl_->setChange(pos, change);
 }
 
 
-void Paragraph::untrackChanges()
+void Paragraph::acceptChanges(pos_type start, pos_type end)
 {
-       pimpl_->untrackChanges();
+       return pimpl_->acceptChanges(start, end);
 }
 
 
-void Paragraph::cleanChanges()
+void Paragraph::rejectChanges(pos_type start, pos_type end)
 {
-       pimpl_->cleanChanges();
+       return pimpl_->rejectChanges(start, end);
 }
 
 
-Change::Type Paragraph::lookupChange(lyx::pos_type pos) const
+int Paragraph::id() const
 {
-       Assert(!size() || pos < size());
-       return pimpl_->lookupChange(pos);
+       return pimpl_->id_;
 }
 
 
-Change const Paragraph::lookupChangeFull(lyx::pos_type pos) const
+LyXLayout_ptr const & Paragraph::layout() const
 {
-       Assert(!size() || pos < size());
-       return pimpl_->lookupChangeFull(pos);
+       return layout_;
 }
 
 
-bool Paragraph::isChanged(pos_type start, pos_type end) const
+void Paragraph::layout(LyXLayout_ptr const & new_layout)
 {
-       return pimpl_->isChanged(start, end);
+       layout_ = new_layout;
 }
 
 
-bool Paragraph::isChangeEdited(pos_type start, pos_type end) const
+InsetBase * Paragraph::inInset() const
 {
-       return pimpl_->isChangeEdited(start, end);
+       return pimpl_->inset_owner;
 }
 
 
-void Paragraph::setChange(lyx::pos_type pos, Change::Type type)
+InsetBase::Code Paragraph::ownerCode() const
 {
-       pimpl_->setChange(pos, type);
-
+       return pimpl_->inset_owner
+               ? pimpl_->inset_owner->lyxCode() : InsetBase::NO_CODE;
 }
 
 
-void Paragraph::markErased()
+void Paragraph::clearContents()
 {
-       pimpl_->markErased();
+       text_.clear();
 }
 
 
-void Paragraph::acceptChange(pos_type start, pos_type end)
+ParagraphParameters & Paragraph::params()
 {
-       return pimpl_->acceptChange(start, end);
+       return pimpl_->params;
 }
 
 
-void Paragraph::rejectChange(pos_type start, pos_type end)
+ParagraphParameters const & Paragraph::params() const
 {
-       return pimpl_->rejectChange(start, end);
+       return pimpl_->params;
 }
 
 
-lyx::pos_type Paragraph::size() const
+bool Paragraph::isFreeSpacing() const
 {
-       return pimpl_->size();
+       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::empty() const
+bool Paragraph::allowEmpty() const
 {
-       return pimpl_->empty();
+       if (layout()->keepempty)
+               return true;
+       return ownerCode() == InsetBase::ERT_CODE;
 }
 
 
-Paragraph::value_type Paragraph::getChar(pos_type pos) const
+Row & Paragraph::getRow(pos_type pos, bool boundary)
 {
-       return pimpl_->getChar(pos);
-}
+       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;
 
-int Paragraph::id() const
-{
-       return pimpl_->id_;
-}
+       RowList::iterator rit = rows_.end();
+       RowList::iterator const begin = rows_.begin();
 
+       for (--rit; rit != begin && rit->pos() > pos; --rit)
+               ;
 
-void Paragraph::id(int i)
-{
-       pimpl_->id_ = i;
+       return *rit;
 }
 
 
-LyXLayout_ptr const & Paragraph::layout() const
+Row const & Paragraph::getRow(pos_type pos, bool boundary) const
 {
-/*
-       InsetOld * inset = inInset();
-       if (inset && inset->lyxCode() == InsetOld::ENVIRONMENT_CODE)
-               return static_cast<InsetEnvironment*>(inset)->layout();
-*/
-       return layout_;
-}
+       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;
 
-void Paragraph::layout(LyXLayout_ptr const & new_layout)
-{
-       layout_ = new_layout;
-}
+       RowList::const_iterator rit = rows_.end();
+       RowList::const_iterator const begin = rows_.begin();
 
+       for (--rit; rit != begin && rit->pos() > pos; --rit)
+               ;
 
-UpdatableInset * Paragraph::inInset() const
-{
-       return pimpl_->inset_owner;
+       return *rit;
 }
 
 
-void Paragraph::clearContents()
+size_t Paragraph::pos2row(pos_type pos) const
 {
-       pimpl_->clear();
-}
+       BOOST_ASSERT(!rows().empty());
 
-void Paragraph::setChar(pos_type pos, value_type c)
-{
-       pimpl_->setChar(pos, c);
+       RowList::const_iterator rit = rows_.end();
+       RowList::const_iterator const begin = rows_.begin();
+
+       for (--rit; rit != begin && rit->pos() > pos; --rit)
+               ;
+
+       return rit - begin;
 }
 
 
-ParagraphParameters & Paragraph::params()
+char_type Paragraph::transformChar(char_type c, pos_type pos) const
 {
-       return pimpl_->params;
+       if (!Encodings::is_arabic(c))
+               if (lyxrc.font_norm_type == LyXRC::ISO_8859_6_8 && isDigit(c))
+                       // FIXME UNICODE What does this do?
+                       return c + (0xb0 - '0');
+               else
+                       return c;
+
+       value_type const prev_char = pos > 0 ? getChar(pos - 1) : ' ';
+       value_type next_char = ' ';
+
+       for (pos_type i = pos + 1, end = size(); i < end; ++i) {
+               value_type 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);
+       }
 }
 
 
-ParagraphParameters const & Paragraph::params() const
+void Paragraph::dump() const
 {
-       return pimpl_->params;
+       lyxerr << "Paragraph::dump: rows.size(): " << rows_.size() << endl;
+       for (size_t i = 0; i != rows_.size(); ++i) {
+               lyxerr << "  row " << i << ":   ";
+               rows_[i].dump();
+       }
 }
 
 
-bool Paragraph::isFreeSpacing() const
+bool Paragraph::hfillExpansion(Row const & row, pos_type pos) const
 {
-       if (layout()->free_spacing)
+       if (!isHfill(pos))
+               return false;
+
+       // at the end of a row it does not count
+       // unless another hfill exists on the line
+       if (pos >= row.endpos()) {
+               for (pos_type i = row.pos(); i < pos && !isHfill(i); ++i)
+                       return false;
+       }
+
+       // at the beginning of a row it does not count, if it is not
+       // the first row of a paragaph
+       if (row.pos() == 0)
                return true;
 
-       // for now we just need this, later should we need this in some
-       // other way we can always add a function to InsetOld::() too.
-       if (pimpl_->inset_owner && pimpl_->inset_owner->owner())
-               return (pimpl_->inset_owner->owner()->lyxCode() == InsetOld::ERT_CODE);
-       return false;
-}
+       // in some labels it does not count
+       if (layout()->margintype != MARGIN_MANUAL && pos < beginOfBody())
+               return false;
 
+       // if there is anything between the first char of the row and
+       // the specified position that is not a newline and not a hfill,
+       // the hfill will count, otherwise not
+       pos_type i = row.pos();
+       while (i < pos && (isNewline(i) || isHfill(i)))
+               ++i;
 
-bool Paragraph::allowEmpty() const
-{
-       if (layout()->keepempty)
-               return true;
-       if (pimpl_->inset_owner && pimpl_->inset_owner->owner())
-               return (pimpl_->inset_owner->owner()->lyxCode() == InsetOld::ERT_CODE);
-       return false;
+       return i != pos;
 }
 
 
-bool operator==(Paragraph const & lhs, Paragraph const & rhs)
-{
-#warning FIXME this implementatoin must be completely wrong...
-       return &lhs == &rhs;
-}
+} // namespace lyx