]> git.lyx.org Git - lyx.git/blobdiff - src/paragraph.C
Fixed rowbreaking for "character"-insets and ignore all paragraph attributes
[lyx.git] / src / paragraph.C
index ca58a7546b283b4183113ddc38c3e20d0f3a7d82..2e3a09feb90743f57049f9464cc9308d89bdad66 100644 (file)
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team. 
+ *           Copyright 1995-2001 The LyX Team. 
  *
  * ====================================================== */
 
 #include <config.h>
 
 #ifdef __GNUG__
-#pragma implementation "lyxparagraph.h"
+#pragma implementation
 #endif
 
-#include <fstream>
-using std::fstream;
-using std::ios;
-
-#include "lyxparagraph.h"
-#include "support/textutils.h"
+#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 "support/FileInfo.h"
-#include "support/LAssert.h"
 #include "debug.h"
 #include "LaTeXFeatures.h"
-#include "insets/insetinclude.h"
-#include "insets/insetbib.h"
-#include "support/filetools.h"
 #include "lyx_gui_misc.h"
 #include "texrow.h"
+#include "BufferView.h"
+#include "encoding.h"
+#include "ParameterStruct.h"
+#include "gettext.h"
+#include "lyxtextclasslist.h"
 
+#include "insets/insetinclude.h"
+#include "insets/insetbib.h"
+#include "insets/insettext.h"
 
-#ifdef USE_OSTREAM_ONLY
+#include "support/filetools.h"
+#include "support/lstrings.h"
 #include "support/lyxmanip.h"
-#else
-extern void addNewlineAndDepth(string & file, int depth); // Jug 990923
-#endif
+#include "support/FileInfo.h"
+#include "support/LAssert.h"
+#include "support/textutils.h"
+
+#include <algorithm>
+#include <fstream>
+#include <csignal>
+
+using std::ostream;
+using std::endl;
+using std::fstream;
+using std::ios;
+using std::lower_bound;
+using std::upper_bound;
+using std::reverse;
+
+using lyx::pos_type;
+using lyx::layout_type;
+
 int tex_code_break_column = 72;  // needs non-zero initialization. set later.
-// this is a bad idea, but how can LyXParagraph find its buffer to get
+// this is a bad idea, but how can Paragraph find its buffer to get
 // parameters? (JMarc)
-extern BufferView * current_view;
-extern LyXRC * lyxrc;
 
-
-// ale970405
-extern string bibitemWidthest(Painter &);
+extern string bibitemWidest(Buffer const *);
 
 // this is a minibuffer
-static char minibuffer_char;
-static LyXFont minibuffer_font;
-static Inset * minibuffer_inset;
 
+namespace {
 
-// Initialization of the counter for the paragraph id's,
-// declared in lyxparagraph.h
-unsigned int LyXParagraph::paragraph_id = 0;
+char minibuffer_char;
+LyXFont minibuffer_font;
+Inset * minibuffer_inset;
 
+} // namespace anon
 
-LyXParagraph::LyXParagraph()
-{
-       text.reserve(500); // is this number too big?
 
-       for (int i = 0; i < 10; ++i) setCounter(i , 0);
-       appendix = false;
+extern BufferView * current_view;
+
+
+Paragraph::Paragraph()
+       : layout(0), pimpl_(new Paragraph::Pimpl(this))
+{
+       for (int i = 0; i < 10; ++i)
+               setCounter(i, 0);
+       next_ = 0;
+       previous_ = 0;
        enumdepth = 0;
        itemdepth = 0;
-       next = 0;
-       previous = 0;
-       footnoteflag = LyXParagraph::NO_FOOTNOTE;
-       footnotekind = LyXParagraph::FOOTNOTE; // should not be needed
-       
-       align = LYX_ALIGN_BLOCK;
-
-       /* table stuff -- begin*/ 
-       table = 0;
-       /* table stuff -- end*/ 
-       id_ = paragraph_id++;
-        bibkey = 0; // ale970302
-       Clear();
+       bibkey = 0; // ale970302
+       clear();
 }
 
 
-// This konstruktor inserts the new paragraph in a list.
-LyXParagraph::LyXParagraph(LyXParagraph * par)
+// This constructor inserts the new paragraph in a list.
+Paragraph::Paragraph(Paragraph * par)
+       : layout(0), pimpl_(new Paragraph::Pimpl(this))
 {
-       text.reserve(500);
-       par->text.resize(par->text.size());
-
-       for (int i = 0; i < 10; ++i) setCounter(i, 0);
-       appendix = false;
+       for (int i = 0; i < 10; ++i)
+               setCounter(i, 0);
        enumdepth = 0;
        itemdepth = 0;
+
        // double linked list begin
-       next = par->next;
-       if (next)
-               next->previous = this;
-       previous = par;
-       previous->next = this;
+       next_ = par->next_;
+       if (next_)
+               next_->previous_ = this;
+       previous_ = par;
+       previous_->next_ = this;
        // end
-       footnoteflag = LyXParagraph::NO_FOOTNOTE;
-       footnotekind = LyXParagraph::FOOTNOTE;
+
+       bibkey = 0; // ale970302        
+
+       clear();
+}
+
+
+Paragraph::Paragraph(Paragraph const & lp, bool same_ids)
+       : layout(0), pimpl_(new Paragraph::Pimpl(*lp.pimpl_, this, same_ids))
+{
+       for (int i = 0; i < 10; ++i)
+               setCounter(i, 0);
+       enumdepth = 0;
+       itemdepth = 0;
+       next_     = 0;
+       previous_ = 0;
+
+       // 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;
+       }
        
-       /* table stuff -- begin*/ 
-       table = 0;
-       /* table stuff -- end*/ 
-       id_ = paragraph_id++;
-
-        bibkey = 0; // ale970302        
-    
-       Clear();
+       // copy everything behind the break-position to the new paragraph
+       insetlist = lp.insetlist;
+       for (InsetList::iterator it = insetlist.begin();
+            it != insetlist.end(); ++it)
+       {
+               it->inset = it->inset->clone(*current_view->buffer(), same_ids);
+               // tell the new inset who is the boss now
+               it->inset->parOwner(this);
+       }
 }
 
 
-void LyXParagraph::writeFile(ostream & os, BufferParams const & params,
-                            char footflag, char dth) const
+// the destructor removes the new paragraph from the list
+Paragraph::~Paragraph()
 {
-       LyXFont font1, font2;
-       int column = 0;
-       int h = 0;
-       char c = 0;
+       if (previous_)
+               previous_->next_ = next_;
+       if (next_)
+               next_->previous_ = previous_;
 
-       if (footnoteflag != LyXParagraph::NO_FOOTNOTE
-           || !previous
-           || previous->footnoteflag == LyXParagraph::NO_FOOTNOTE){
-               
-               // The beginning or the end of a footnote environment?
-               if (footflag != footnoteflag) {
-                       footflag = footnoteflag;
-                       if (footflag) {
-                               os << "\n\\begin_float "
-                                  << string_footnotekinds[footnotekind]
-                                  << " ";
-                       } else {
-                               os << "\n\\end_float ";
-                       }
-               }
+       for (InsetList::iterator it = insetlist.begin();
+            it != insetlist.end(); ++it) {
+               delete it->inset;
+       }
 
-               // The beginning or end of a deeper (i.e. nested) area?
-               if (dth != depth) {
-                       if (depth > dth) {
-                               while (depth > dth) {
-                                       os << "\n\\begin_deeper ";
-                                       ++dth;
-                               }
-                       } else {
-                               while (depth < dth) {
-                                       os << "\n\\end_deeper ";
-                                       --dth;
-                               }
-                       }
-               }
+       // ale970302
+       delete bibkey;
 
-               // First write the layout
-               os << "\n\\layout "
-                  << textclasslist.NameOfLayout(params.textclass, layout)
-                  << "\n";
-
-               // Maybe some vertical spaces.
-               if (added_space_top.kind() != VSpace::NONE)
-                       os << "\\added_space_top "
-                          << added_space_top.asLyXCommand() << " ";
-               if (added_space_bottom.kind() != VSpace::NONE)
-                       os << "\\added_space_bottom "
-                          << added_space_bottom.asLyXCommand() << " ";
-                       
-               // The labelwidth string used in lists.
-               if (!labelwidthstring.empty())
-                       os << "\\labelwidthstring "
-                          << labelwidthstring << '\n';
-
-               // Lines above or below?
-               if (line_top)
-                       os << "\\line_top ";
-               if (line_bottom)
-                       os << "\\line_bottom ";
-
-               // Pagebreaks above or below?
-               if (pagebreak_top)
-                       os << "\\pagebreak_top ";
-               if (pagebreak_bottom)
-                       os << "\\pagebreak_bottom ";
-                       
-               // Start of appendix?
-               if (start_of_appendix)
-                       os << "\\start_of_appendix ";
+       delete pimpl_;
+       //
+       //lyxerr << "Paragraph::paragraph_id = "
+       //       << Paragraph::paragraph_id << endl;
+}
 
-               // Noindent?
-               if (noindent)
-                       os << "\\noindent ";
-                       
-               // Alignment?
-               if (align != LYX_ALIGN_LAYOUT) {
-                       switch (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;
+
+void Paragraph::writeFile(Buffer const * buf, ostream & os,
+                          BufferParams const & bparams,
+                          depth_type dth) const
+{
+       // The beginning or end of a deeper (i.e. nested) area?
+       if (dth != params().depth()) {
+               if (params().depth() > dth) {
+                       while (params().depth() > dth) {
+                               os << "\n\\begin_deeper ";
+                               ++dth;
+                       }
+               } else {
+                       while (params().depth() < dth) {
+                               os << "\n\\end_deeper ";
+                               --dth;
                        }
-                       os << "\\align " << string_align[h] << " ";
                }
-                if (pextra_type != PEXTRA_NONE) {
-                        os << "\\pextra_type " << pextra_type;
-                        if (pextra_type == PEXTRA_MINIPAGE) {
-                               os << " \\pextra_alignment "
-                                  << pextra_alignment;
-                               if (pextra_hfill)
-                                       os << " \\pextra_hfill "
-                                          << pextra_hfill;
-                               if (pextra_start_minipage)
-                                       os << " \\pextra_start_minipage "
-                                          << pextra_start_minipage;
-                        }
-                        if (!pextra_width.empty()) {
-                               os << " \\pextra_width "
-                                  << VSpace(pextra_width).asLyXCommand();
-                        } else if (!pextra_widthp.empty()) {
-                               os << " \\pextra_widthp "
-                                  << pextra_widthp;
-                        }
-                       os << '\n';
-                }
-       } else {
-               // Dummy layout. This means that a footnote ended.
-               os << "\n\\end_float ";
-               footflag = LyXParagraph::NO_FOOTNOTE;
        }
-               
-       // It might be a table.
-       if (table){
-               os << "\\LyXTable\n";
-               table->Write(os);
+       
+       // First write the layout
+       os << "\n\\layout "
+          << textclasslist.NameOfLayout(bparams.textclass, layout)
+          << "\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 ";
+       
+       // 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(os);
-
-       font1 = LyXFont(LyXFont::ALL_INHERIT);
-
-       column = 0;
-       for (size_type i = 0; i < size(); ++i) {
+               bibkey->write(buf, os);
+       
+       LyXFont font1(LyXFont::ALL_INHERIT, bparams.language);
+       
+       int column = 0;
+       for (pos_type i = 0; i < size(); ++i) {
                if (!i) {
                        os << "\n";
                        column = 0;
                }
                
                // Write font changes
-               font2 = GetFontSettings(i);
+               LyXFont font2 = getFontSettings(bparams, i);
                if (font2 != font1) {
+#ifndef INHERIT_LANGUAGE
                        font2.lyxWriteChanges(font1, os);
+#else
+                       font2.lyxWriteChanges(font1, bparams.language, os);
+#endif
                        column = 0;
                        font1 = font2;
                }
-
-               c = GetChar(i);
+               
+               value_type const c = getChar(i);
                switch (c) {
                case META_INSET:
                {
-                       Inset const * inset = GetInset(i);
+                       Inset const * inset = getInset(i);
                        if (inset)
-                               if (inset->DirectWrite()) {
+                               if (inset->directWrite()) {
                                        // international char, let it write
                                        // code directly so it's shorter in
                                        // the file
-                                       inset->Write(os);
+                                       inset->write(buf, os);
                                } else {
                                        os << "\n\\begin_inset ";
-                                       inset->Write(os);
+                                       inset->write(buf, os);
                                        os << "\n\\end_inset \n\n";
                                        column = 0;
                                }
@@ -284,18 +296,12 @@ void LyXParagraph::writeFile(ostream & os, BufferParams const & params,
                        os << "\n\\hfill \n";
                        column = 0;
                        break;
-#if 0
-               case META_PROTECTED_SEPARATOR: 
-                       os << "\n\\protected_separator \n";
-                       column = 0;
-                       break;
-#endif
                case '\\':
                        os << "\n\\backslash \n";
                        column = 0;
                        break;
                case '.':
-                       if (i + 1 < size() && GetChar(i + 1) == ' ') {
+                       if (i + 1 < size() && getChar(i + 1) == ' ') {
                                os << ".\n";
                                column = 0;
                        } else
@@ -312,93 +318,103 @@ void LyXParagraph::writeFile(ostream & os, BufferParams const & params,
                        if (c != '\0')
                                os << c;
                        else
-                               lyxerr << "ERROR (LyXParagraph::writeFile):"
+                               lyxerr << "ERROR (Paragraph::writeFile):"
                                        " NULL char in structure." << endl;
                        ++column;
                        break;
                }
        }
-
+       
        // now write the next paragraph
-       if (next)
-               next->writeFile(os, params, footflag, dth);
+       if (next_)
+               next_->writeFile(buf, os, bparams, dth);
 }
 
 
-void LyXParagraph::validate(LaTeXFeatures & features) const
+void Paragraph::validate(LaTeXFeatures & features) const
 {
-       // this will be useful later
-       LyXLayout const & layout =
-               textclasslist.Style(current_view->buffer()->params.textclass, 
-                                   GetLayout());
-       
+       BufferParams const & bparams = features.bufferParams();
+
        // check the params.
-       if (line_top || line_bottom)
-               features.lyxline = true;
+       if (params().lineTop() || params().lineBottom())
+               features.require("lyxline");
+       if (!params().spacing().isDefault())
+               features.require("setspace");
        
        // then the layouts
-       features.layout[GetLayout()] = true;
+       features.useLayout(getLayout());
 
        // then the fonts
-       for (FontList::const_iterator cit = fontlist.begin();
-            cit != fontlist.end(); ++cit) {
-               if ((*cit).font.noun() == LyXFont::ON) {
+       Language const * doc_language = bparams.language;
+       
+       for (Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
+            cit != pimpl_->fontlist.end(); ++cit) {
+               if (cit->font().noun() == LyXFont::ON) {
                        lyxerr[Debug::LATEX] << "font.noun: "
-                                            << (*cit).font.noun()
+                                            << cit->font().noun()
                                             << endl;
-                       features.noun = true;
+                       features.require("noun");
                        lyxerr[Debug::LATEX] << "Noun enabled. Font: "
-                                            << (*cit).font.stateText()
+                                            << cit->font().stateText(0)
                                             << endl;
                }
-               switch ((*cit).font.color()) {
+               switch (cit->font().color()) {
                case LColor::none:
                case LColor::inherit:
                case LColor::ignore:
+                       // probably we should put here all interface colors used for
+                       // font displaying! For now I just add this ones I know of (Jug)
+               case LColor::latex:
+               case LColor::note:
                        break;
                default:
-                       features.color = true;
+                       features.require("color");
                        lyxerr[Debug::LATEX] << "Color enabled. Font: "
-                                            << (*cit).font.stateText()
+                                            << cit->font().stateText(0)
                                             << endl;
                }
+
+               Language const * language = cit->font().language();
+               if (language->babel() != doc_language->babel() &&
+                   language != ignore_language &&
+#ifdef INHERIT_LANGUAGE
+                   language != inherit_language &&
+#endif
+                   language != latex_language)
+               {
+                       features.useLanguage(language);
+                       lyxerr[Debug::LATEX] << "Found language "
+                                            << language->babel() << endl;
+               }
        }
 
        // then the insets
+       LyXLayout const & layout =
+             textclasslist.Style(bparams.textclass, getLayout());
+
        for (InsetList::const_iterator cit = insetlist.begin();
             cit != insetlist.end(); ++cit) {
-               if ((*cit).inset)
-                       (*cit).inset->Validate(features);
+               if (cit->inset) {
+                       cit->inset->validate(features);
+                       if (layout.needprotect &&
+                           cit->inset->lyxCode() == Inset::FOOT_CODE)
+                               features.require("NeedLyXFootnoteCode");
+               }
        }
-
-        if (table && table->IsLongTable())
-               features.longtable = true;
-        if (pextra_type == PEXTRA_INDENT)
-                features.LyXParagraphIndent = true;
-        if (pextra_type == PEXTRA_FLOATFLT)
-                features.floatflt = true;
-        if (layout.needprotect 
-           && next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
-               features.NeedLyXFootnoteCode = true;
-        if ((current_view->buffer()->params.paragraph_separation == BufferParams::PARSEP_INDENT) &&
-            (pextra_type == LyXParagraph::PEXTRA_MINIPAGE))
-               features.NeedLyXMinipageIndent = true;
-        if (table && table->NeedRotating())
-               features.rotating = true;
-       if (footnoteflag != NO_FOOTNOTE && footnotekind == ALGORITHM)
-               features.algorithm = true;
 }
 
 
 // First few functions needed for cut and paste and paragraph breaking.
-void LyXParagraph::CopyIntoMinibuffer(LyXParagraph::size_type pos) const
+void Paragraph::copyIntoMinibuffer(Buffer const & buffer, pos_type pos) const
 {
-       minibuffer_char = GetChar(pos);
-       minibuffer_font = GetFontSettings(pos);
+       BufferParams bparams = buffer.params;
+
+       minibuffer_char = getChar(pos);
+       minibuffer_font = getFontSettings(bparams, pos);
        minibuffer_inset = 0;
-       if (minibuffer_char == LyXParagraph::META_INSET) {
-               if (GetInset(pos)) {
-                       minibuffer_inset = GetInset(pos)->Clone();
+       if (minibuffer_char == Paragraph::META_INSET) {
+               if (getInset(pos)) {
+                       minibuffer_inset = getInset(pos)->clone(buffer);
                } else {
                        minibuffer_inset = 0;
                        minibuffer_char = ' ';
@@ -408,26 +424,27 @@ void LyXParagraph::CopyIntoMinibuffer(LyXParagraph::size_type pos) const
 }
 
 
-void LyXParagraph::CutIntoMinibuffer(LyXParagraph::size_type pos)
+void Paragraph::cutIntoMinibuffer(BufferParams const & bparams, pos_type pos)
 {
-       minibuffer_char = GetChar(pos);
-       minibuffer_font = GetFontSettings(pos);
+       minibuffer_char = getChar(pos);
+       minibuffer_font = getFontSettings(bparams, pos);
        minibuffer_inset = 0;
-       if (minibuffer_char == LyXParagraph::META_INSET) {
-               if (GetInset(pos)) {
-                       minibuffer_inset = GetInset(pos);
+       if (minibuffer_char == Paragraph::META_INSET) {
+               if (getInset(pos)) {
+                       minibuffer_inset = getInset(pos);
                        // This is a little hack since I want exactly
                        // the inset, not just a clone. Otherwise
                        // the inset would be deleted when calling Erase(pos)
                        // find the entry
-                       for (InsetList::iterator it = insetlist.begin();
-                            it != insetlist.end(); ++it) {
-                               if ((*it).pos == pos) {
-                                       (*it).inset = 0;
-                                       break;
-                               }
-                                       
-                       }
+                       InsetTable search_elem(pos, 0);
+                       InsetList::iterator it =
+                               lower_bound(insetlist.begin(),
+                                           insetlist.end(),
+                                           search_elem, Pimpl::matchIT());
+                       if (it != insetlist.end() && it->pos == pos)
+                               it->inset = 0;
+                       // the inset is not in a paragraph anymore
+                       minibuffer_inset->parOwner(0);
                } else {
                        minibuffer_inset = 0;
                        minibuffer_char = ' ';
@@ -440,221 +457,104 @@ void LyXParagraph::CutIntoMinibuffer(LyXParagraph::size_type pos)
 }
 
 
-void LyXParagraph::InsertFromMinibuffer(LyXParagraph::size_type pos)
+bool Paragraph::insertFromMinibuffer(pos_type pos)
 {
-       InsertChar(pos, minibuffer_char);
-       SetFont(pos, minibuffer_font);
-       if (minibuffer_char == LyXParagraph::META_INSET)
-               InsertInset(pos, minibuffer_inset);
+       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 LyXParagraph::Clear()
+void Paragraph::clear()
 {
-       line_top = false;
-       line_bottom = false;
-   
-       pagebreak_top = false;
-       pagebreak_bottom = false;
-
-       added_space_top = VSpace(VSpace::NONE);
-       added_space_bottom = VSpace(VSpace::NONE);
-
-       align = LYX_ALIGN_LAYOUT;
-       depth = 0;
-       noindent = false;
-
-        pextra_type = PEXTRA_NONE;
-        pextra_width.clear();
-        pextra_widthp.clear();
-        pextra_alignment = MINIPAGE_ALIGN_TOP;
-        pextra_hfill = false;
-        pextra_start_minipage = false;
-
-        labelstring.clear();
-       labelwidthstring.clear();
+       params().clear();
+       
        layout = 0;
        bibkey = 0;
-       
-       start_of_appendix = false;
 }
 
 
-// the destructor removes the new paragraph from the list
-LyXParagraph::~LyXParagraph()
+void Paragraph::erase(pos_type pos)
 {
-       if (previous)
-               previous->next = next;
-       if (next)
-               next->previous = previous;
-
-       for (InsetList::iterator it = insetlist.begin();
-            it != insetlist.end(); ++it) {
-               delete (*it).inset;
-       }
+       pimpl_->erase(pos);
+}
 
-       /* table stuff -- begin*/ 
-       delete table;
-       /* table stuff -- end*/ 
 
-        // ale970302
-       delete bibkey;
+bool Paragraph::checkInsertChar(LyXFont & font)
+{
+       if (pimpl_->inset_owner)
+               return pimpl_->inset_owner->checkInsertChar(font);
+       return true;
 }
 
 
-void LyXParagraph::Erase(LyXParagraph::size_type pos)
+void Paragraph::insertChar(pos_type pos, Paragraph::value_type c)
 {
-       // > because last is the next unused position, and you can 
-       // use it if you want
-       if (pos > size()) {
-               if (next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) 
-                       NextAfterFootnote()->Erase(pos - text.size() - 1);
-               else 
-                       lyxerr.debug() << "ERROR (LyXParagraph::Erase): "
-                               "position does not exist." << endl;
-               return;
-       }
-       if (pos < size()) { // last is free for insertation, but should be empty
-               // if it is an inset, delete the inset entry 
-               if (text[pos] == LyXParagraph::META_INSET) {
-                       // find the entry
-                       for (InsetList::iterator it = insetlist.begin();
-                            it != insetlist.end(); ++it) {
-                               if ((*it).pos == pos) {
-                                       delete (*it).inset;
-                                       insetlist.erase(it);
-                                       break;
-                               }
-                       }
-               }
-               text.erase(text.begin() + pos);
-               // Erase entries in the tables.
-               for (FontList::iterator it = fontlist.begin();
-                    it != fontlist.end(); ++it) {
-                       if (pos >= (*it).pos && pos <= (*it).pos_end) {
-                               if ((*it).pos == (*it).pos_end) {
-                                       // If it is a multi-character font
-                                       // entry, we just make it smaller
-                                       // (see update below), otherwise we
-                                       // should delete it.
-                                       fontlist.erase(it);
-                                       break;
-                               }
-                       }
-               }
-               // Update all other entries.
-               for (FontList::iterator it = fontlist.begin();
-                    it != fontlist.end(); ++it) {
-                       if ((*it).pos > pos)
-                               (*it).pos--;
-                       if ((*it).pos_end >= pos)
-                               (*it).pos_end--;
-               }
+       LyXFont const f(LyXFont::ALL_INHERIT);
+       insertChar(pos, c, f);
+}
 
-               // Update the inset table.
-               for (InsetList::iterator it = insetlist.begin();
-                    it != insetlist.end(); ++it) {
-                       if ((*it).pos > pos)
-                               (*it).pos--;
-               }
-       } else {
-               lyxerr << "ERROR (LyXParagraph::Erase): "
-                       "can't erase non-existant char." << endl;
-       }
+
+void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
+                           LyXFont const & font)
+{
+       pimpl_->insertChar(pos, c, font);
 }
 
 
-void LyXParagraph::InsertChar(LyXParagraph::size_type pos, char c)
+void Paragraph::insertInset(pos_type pos, Inset * inset)
 {
-       // > because last is the next unused position, and you can 
-       // use it if you want
-       if (pos > size()) {
-               if (next
-                   && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) 
-                       NextAfterFootnote()->InsertChar(pos - text.size() - 1,
-                                                       c);
-               else 
-                       lyxerr.debug() << "ERROR (LyXParagraph::InsertChar): "
-                               "position does not exist." << endl;
-               return;
-       }
-       text.insert(text.begin() + pos, c);
-       // Update the font table.
-       for (FontList::iterator it = fontlist.begin();
-            it != fontlist.end(); ++it) {
-               if ((*it).pos >= pos)
-                       (*it).pos++;
-               if ((*it).pos_end >= pos)
-                       (*it).pos_end++;
-       }
-   
-       // Update the inset table.
-       for (InsetList::iterator it = insetlist.begin();
-            it != insetlist.end(); ++it) {
-               if ((*it).pos >= pos)
-                       (*it).pos++;
-       }
+       LyXFont const f(LyXFont::ALL_INHERIT);
+       insertInset(pos, inset, f);
 }
 
 
-void LyXParagraph::InsertInset(LyXParagraph::size_type pos,
-                              Inset * inset)
+void Paragraph::insertInset(pos_type pos, Inset * inset, LyXFont const & font)
 {
-       // > because last is the next unused position, and you can 
-       // use it if you want
-       if (pos > size()) {
-               if (next
-                   && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) 
-                       NextAfterFootnote()
-                               ->InsertInset(pos - text.size() - 1, inset);
-               else 
-                       lyxerr << "ERROR (LyXParagraph::InsertInset): " 
-                               "position does not exist: " << pos << endl;
-               return;
-       }
-       if (text[pos] != LyXParagraph::META_INSET) {
-               lyxerr << "ERROR (LyXParagraph::InsertInset): "
-                       "there is no LyXParagraph::META_INSET" << endl;
-               return;
-       }
+       pimpl_->insertInset(pos, inset, font);
+}
 
-       if (inset) {
-               // Add a new entry in the inset table.
-               InsetList::iterator it =
-                       insetlist.insert(insetlist.begin(), InsetTable());
-               (*it).inset = inset;
-               (*it).pos = pos;
-       }
+
+bool Paragraph::insetAllowed(Inset::Code code)
+{
+       //lyxerr << "Paragraph::InsertInsetAllowed" << endl;
+       
+       if (pimpl_->inset_owner)
+               return pimpl_->inset_owner->insetAllowed(code);
+       return true;
 }
 
 
-Inset * LyXParagraph::GetInset(LyXParagraph::size_type pos)
+Inset * Paragraph::getInset(pos_type pos)
 {
-       if (pos >= size()) {
-               if (next
-                   && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) 
-                       return NextAfterFootnote()
-                               ->GetInset(pos - text.size() - 1);
-               else { 
-                       lyxerr << "ERROR (LyXParagraph::GetInset): "
-                               "position does not exist: "
-                              << pos << endl;
-               }
-               return 0;
-       }
+       lyx::Assert(pos < size());
+
        // Find the inset.
-       for (InsetList::iterator it = insetlist.begin();
-            it != insetlist.end(); ++it) {
-               if ((*it).pos == pos) {
-                       return (*it).inset;
-               }
-       }
-       lyxerr << "ERROR (LyXParagraph::GetInset): "
+       InsetTable search_inset(pos, 0);
+       InsetList::iterator it = lower_bound(insetlist.begin(),
+                                            insetlist.end(),
+                                            search_inset, Pimpl::matchIT());
+       if (it != insetlist.end() && it->pos == pos)
+               return it->inset;
+
+       lyxerr << "ERROR (Paragraph::getInset): "
                "Inset does not exist: " << pos << endl;
-       text[pos] = ' '; // WHY!!! does this set the pos to ' '????
+       //::raise(SIGSTOP);
+       
+       // text[pos] = ' '; // WHY!!! does this set the pos to ' '????
        // Did this commenting out introduce a bug? So far I have not
        // see any, please enlighten me. (Lgb)
        // My guess is that since the inset does not exist, we might
@@ -663,29 +563,21 @@ Inset * LyXParagraph::GetInset(LyXParagraph::size_type pos)
 }
 
 
-Inset const * LyXParagraph::GetInset(LyXParagraph::size_type pos) const
+Inset const * Paragraph::getInset(pos_type pos) const
 {
-       if (pos >= size()) {
-               if (next
-                   && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) 
-                       return NextAfterFootnote()
-                               ->GetInset(pos - text.size() - 1);
-               else { 
-                       lyxerr << "ERROR (LyXParagraph::GetInset): "
-                               "position does not exist: "
-                              << pos << endl;
-               }
-               return 0;
-       }
+       lyx::Assert(pos < size());
+
        // Find the inset.
-       for (InsetList::const_iterator cit = insetlist.begin();
-            cit != insetlist.end(); ++cit) {
-               if ((*cit).pos == pos) {
-                       return (*cit).inset;
-               }
-       }
-       lyxerr << "ERROR (LyXParagraph::GetInset): "
+       InsetTable search_inset(pos, 0);
+       InsetList::const_iterator cit = lower_bound(insetlist.begin(),
+                                                   insetlist.end(),
+                                                   search_inset, Pimpl::matchIT());
+       if (cit != insetlist.end() && cit->pos == pos)
+               return cit->inset;
+
+       lyxerr << "ERROR (Paragraph::GetInset): "
                "Inset does not exist: " << pos << endl;
+       //::raise(SIGSTOP);
        //text[pos] = ' '; // WHY!!! does this set the pos to ' '????
        // Did this commenting out introduce a bug? So far I have not
        // see any, please enlighten me. (Lgb)
@@ -696,37 +588,37 @@ Inset const * LyXParagraph::GetInset(LyXParagraph::size_type pos) const
 
 
 // Gets uninstantiated font setting at position.
-// Optimized after profiling. (Asger)
-LyXFont LyXParagraph::GetFontSettings(LyXParagraph::size_type pos) const
+LyXFont const Paragraph::getFontSettings(BufferParams const & bparams,
+                                         pos_type pos) const
 {
-       if (pos < size()) {
-               for (FontList::const_iterator cit = fontlist.begin();
-                    cit != fontlist.end(); ++cit) {
-                       if (pos >= (*cit).pos && pos <= (*cit).pos_end)
-                               return (*cit).font;
-               }
-       }
-       // > because last is the next unused position, and you can 
-       // use it if you want
-       else if (pos > size()) {
-               if (next
-                   && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) 
-                       return NextAfterFootnote()
-                               ->GetFontSettings(pos - text.size() - 1);
-               else {
-                       // Why is it an error to ask for the font of a
-                       // position that does not exist? Would it be
-                       // enough for this to be enabled on debug?
-                       // We want strict error checking, but it's ok to only
-                       // have it when debugging. (Asger)
-                       lyxerr << "ERROR (LyXParagraph::GetFontSettings): "
-                               "position does not exist. "
-                              << pos << " (" << static_cast<int>(pos)
-                              << ")" << endl;
-               }
-       } else if (pos) {
-               return GetFontSettings(pos - 1);
-       }
+       lyx::Assert(pos <= size());
+       
+       Pimpl::FontTable search_font(pos, LyXFont());
+       Pimpl::FontList::const_iterator cit = lower_bound(pimpl_->fontlist.begin(),
+                                                  pimpl_->fontlist.end(),
+                                                  search_font, Pimpl::matchFT());
+       LyXFont retfont;
+       if (cit != pimpl_->fontlist.end()) {
+               retfont = cit->font();
+       } else if (pos == size() && size()) {
+               retfont = getFontSettings(bparams, pos - 1);
+       } else
+               retfont = LyXFont(LyXFont::ALL_INHERIT, getParLanguage(bparams));
+#ifdef INHERIT_LANGUAGE
+       if (retfont.language() == inherit_language)
+               retfont.setLanguage(bparams.language);
+#endif
+
+       return retfont;
+}
+
+
+// Gets uninstantiated font setting at position 0
+LyXFont const Paragraph::getFirstFontSettings() const
+{
+       if (size() > 0 && !pimpl_->fontlist.empty())
+               return pimpl_->fontlist[0].font();
+       
        return LyXFont(LyXFont::ALL_INHERIT);
 }
 
@@ -738,284 +630,138 @@ LyXFont LyXParagraph::GetFontSettings(LyXParagraph::size_type pos) const
 // 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 LyXParagraph::getFont(LyXParagraph::size_type pos) const
+LyXFont const Paragraph::getFont(BufferParams const & bparams,
+                                pos_type pos) const
 {
-       LyXFont tmpfont;
+       lyx::Assert(pos >= 0);
+       
        LyXLayout const & layout =
-               textclasslist.Style(current_view->buffer()->params.textclass, 
-                                   GetLayout());
-       LyXParagraph::size_type main_body = 0;
+               textclasslist.Style(bparams.textclass, 
+                                   getLayout());
+       pos_type main_body = 0;
        if (layout.labeltype == LABEL_MANUAL)
-               main_body = BeginningOfMainBody();
-
-       if (pos >= 0){
-               LyXFont layoutfont;
-               if (pos < main_body)
-                       layoutfont = layout.labelfont;
-               else
-                       layoutfont = layout.font;
-               tmpfont = GetFontSettings(pos);
-               tmpfont.realize(layoutfont);
-       } else {
-               // process layoutfont for pos == -1 and labelfont for pos < -1
-               if (pos == -1)
-                       tmpfont = layout.font;
-               else
-                       tmpfont = layout.labelfont;
-               if (getParDirection() == LYX_DIR_RIGHT_TO_LEFT)
-                       tmpfont.setDirection(LyXFont::RTL_DIR);
-       }
+               main_body = beginningOfMainBody();
 
-       // check for environment font information
-       char par_depth = GetDepth();
-       LyXParagraph const * par = this;
-       while (par && par_depth && !tmpfont.resolved()) {
-               par = par->DepthHook(par_depth - 1);
-               if (par) {
-                       tmpfont.realize(textclasslist.
-                                       Style(current_view->buffer()->params.textclass,
-                                             par->GetLayout()).font);
-                       par_depth = par->GetDepth();
-               }
-       }
+       LyXFont layoutfont;
+       if (pos < main_body)
+               layoutfont = layout.labelfont;
+       else
+               layoutfont = layout.font;
+       
+       LyXFont tmpfont = getFontSettings(bparams, pos);
+#ifndef INHERIT_LANGUAGE
+       tmpfont.realize(layoutfont);
+#else
+       tmpfont.realize(layoutfont, bparams.language);
+#endif
 
-       tmpfont.realize(textclasslist
-                       .TextClass(current_view->buffer()->params.textclass)
-                       .defaultfont());
-       return tmpfont;
+       return pimpl_->realizeFont(tmpfont, bparams);
 }
 
 
-/// Returns the height of the highest font in range
-LyXFont::FONT_SIZE
-LyXParagraph::HighestFontInRange(LyXParagraph::size_type startpos,
-                                LyXParagraph::size_type endpos) const
+LyXFont const Paragraph::getLabelFont(BufferParams const & bparams) const
 {
-       LyXFont::FONT_SIZE maxsize = LyXFont::SIZE_TINY;
-       for (FontList::const_iterator cit = fontlist.begin();
-            cit != fontlist.end(); ++cit) {
-               if (startpos <= (*cit).pos_end && endpos >= (*cit).pos) {
-                       LyXFont::FONT_SIZE size = (*cit).font.size();
-                       if (size > maxsize && size <= LyXFont::SIZE_HUGER)
-                               maxsize = size;
-               }
-       }
-       return maxsize;
+       LyXLayout const & layout =
+               textclasslist.Style(bparams.textclass, getLayout());
+       
+       LyXFont tmpfont = layout.labelfont;
+       tmpfont.setLanguage(getParLanguage(bparams));
+
+       return pimpl_->realizeFont(tmpfont, bparams);
 }
 
 
-char LyXParagraph::GetChar(LyXParagraph::size_type pos)
+LyXFont const Paragraph::getLayoutFont(BufferParams const & bparams) const
 {
-       Assert(pos >= 0);
+       LyXLayout const & layout =
+               textclasslist.Style(bparams.textclass, 
+                                   getLayout());
 
-       if (pos < size()) {
-               return text[pos];
-       }
-       // > because last is the next unused position, and you can 
-       // use it if you want
-       else if (pos > size()) {
-               if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE) 
-                       return NextAfterFootnote()
-                               ->GetChar(pos - text.size() - 1);
-               else {
-                       lyxerr << "ERROR (LyXParagraph::GetChar): "
-                               "position does not exist."
-                              << pos << " (" << static_cast<int>(pos)
-                              << ")\n";
-                       // Assert(false); // This triggers sometimes...
-                       // Why?
-               }
-               return '\0';
-       } else {
-               // We should have a footnote environment.
-               if (!next || next->footnoteflag == LyXParagraph::NO_FOOTNOTE) {
-                       // Notice that LyX does request the
-                       // last char from time to time. (Asger)
-                       //lyxerr << "ERROR (LyXParagraph::GetChar): "
-                       //      "expected footnote." << endl;
-                       return '\0';
-               }
-               switch (next->footnotekind) {
-               case LyXParagraph::FOOTNOTE:
-                       return LyXParagraph::META_FOOTNOTE;
-               case LyXParagraph::MARGIN:
-                       return LyXParagraph::META_MARGIN;
-               case LyXParagraph::FIG:
-               case LyXParagraph::WIDE_FIG:
-                       return LyXParagraph::META_FIG;
-               case LyXParagraph::TAB:
-               case LyXParagraph::WIDE_TAB:
-                       return LyXParagraph::META_TAB;
-               case LyXParagraph::ALGORITHM:
-                       return LyXParagraph::META_ALGORITHM;
-               }
-               return '\0'; // to shut up gcc
-       }
+       LyXFont tmpfont = layout.font;
+       tmpfont.setLanguage(getParLanguage(bparams));
+
+       return pimpl_->realizeFont(tmpfont, bparams);
 }
 
 
-char LyXParagraph::GetChar(LyXParagraph::size_type pos) const
+/// 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
 {
-       Assert(pos >= 0);
+       if (pimpl_->fontlist.empty())
+               return def_size;
 
-       if (pos < size()) {
-               return text[pos];
-       }
-       // > because last is the next unused position, and you can 
-       // use it if you want
-       else if (pos > size()) {
-               if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE) 
-                       return NextAfterFootnote()
-                               ->GetChar(pos - text.size() - 1);
-               else {
-                       lyxerr << "ERROR (LyXParagraph::GetChar const): "
-                               "position does not exist."
-                              << pos << " (" << static_cast<int>(pos)
-                              << ")\n";
-                       Assert(false);
-               }
-               return '\0';
-       } else {
-               // We should have a footnote environment.
-               if (!next || next->footnoteflag == LyXParagraph::NO_FOOTNOTE) {
-                       // Notice that LyX does request the
-                       // last char from time to time. (Asger)
-                       //lyxerr << "ERROR (LyXParagraph::GetChar): "
-                       //      "expected footnote." << endl;
-                       return '\0';
-               }
-               switch (next->footnotekind) {
-               case LyXParagraph::FOOTNOTE:
-                       return LyXParagraph::META_FOOTNOTE;
-               case LyXParagraph::MARGIN:
-                       return LyXParagraph::META_MARGIN;
-               case LyXParagraph::FIG:
-               case LyXParagraph::WIDE_FIG:
-                       return LyXParagraph::META_FIG;
-               case LyXParagraph::TAB:
-               case LyXParagraph::WIDE_TAB:
-                       return LyXParagraph::META_TAB;
-               case LyXParagraph::ALGORITHM:
-                       return LyXParagraph::META_ALGORITHM;
-               }
-               return '\0'; // to shut up gcc
+       LyXFont::FONT_SIZE maxsize = LyXFont::SIZE_TINY;
+       Pimpl::FontTable end_search(endpos, LyXFont());
+       Pimpl::FontList::const_iterator end_it =
+               lower_bound(pimpl_->fontlist.begin(),
+                           pimpl_->fontlist.end(),
+                           end_search, Pimpl::matchFT());
+       if (end_it != pimpl_->fontlist.end())
+               ++end_it;
+
+       Pimpl::FontTable start_search(startpos, LyXFont());
+       Pimpl::FontList::const_iterator cit =
+               lower_bound(pimpl_->fontlist.begin(),
+                           pimpl_->fontlist.end(),
+                           start_search, Pimpl::matchFT());
+       
+       for (; cit != end_it; ++cit) {
+               LyXFont::FONT_SIZE size = cit->font().size();
+               if (size == LyXFont::INHERIT_SIZE)
+                       size = def_size;
+               if (size > maxsize && size <= LyXFont::SIZE_HUGER)
+                       maxsize = size;
        }
+       return maxsize;
 }
 
 
-// return an string of the current word, and the end of the word in lastpos.
-string LyXParagraph::GetWord(LyXParagraph::size_type & lastpos) const
+Paragraph::value_type
+Paragraph::getUChar(BufferParams const & bparams, pos_type pos) const
 {
-       Assert(lastpos>=0);
-
-       // the current word is defined as starting at the first character
-       // from the immediate left of lastpospos which meets the definition
-       // of IsLetter(), continuing to the last character to the right
-       // of this meeting IsLetter.
+       value_type c = getChar(pos);
+       if (!lyxrc.rtl_support)
+               return c;
 
-       string theword;
-
-       // grab a word
-               
-       // move back until we have a letter
+       value_type uc = c;
+       switch (c) {
+       case '(':
+               uc = ')';
+               break;
+       case ')':
+               uc = '(';
+               break;
+       case '[':
+               uc = ']';
+               break;
+       case ']':
+               uc = '[';
+               break;
+       case '{':
+               uc = '}';
+               break;
+       case '}':
+               uc = '{';
+               break;
+       case '<':
+               uc = '>';
+               break;
+       case '>':
+               uc = '<';
+               break;
+       }
+       if (uc != c && getFontSettings(bparams, pos).isRightToLeft())
+               return uc;
+       else
+               return c;
+}
 
-       //there's no real reason to have firstpos & lastpos as
-       //separate variables as this is written, but maybe someon
-       // will want to return firstpos in the future.
 
-       //since someone might have typed a punctuation first
-       int firstpos = lastpos;
-       
-       while ((firstpos >= 0) && !IsLetter(firstpos))
-               --firstpos;
-
-       // now find the beginning by looking for a nonletter
-       
-       while ((firstpos>= 0) && IsLetter(firstpos))
-               --firstpos;
-
-       // the above is now pointing to the preceeding non-letter
-       ++firstpos;
-       lastpos = firstpos;
-
-       // so copy characters into theword  until we get a nonletter
-       // note that this can easily exceed lastpos, wich means
-       // that if used in the middle of a word, the whole word
-       // is included
-
-       while (IsLetter(lastpos)) theword += GetChar(lastpos++);
-       
-       return theword;
-
-}
-
-LyXParagraph::size_type LyXParagraph::Last() const
-{
-       if (next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
-               return text.size() + NextAfterFootnote()->Last() + 1;
-       // the 1 is the symbol
-       // for the footnote
-       else
-               return text.size();
-}
-
-
-LyXParagraph * LyXParagraph::ParFromPos(LyXParagraph::size_type pos)
-{
-       // > because last is the next unused position, and you can 
-       // use it if you want
-       if (pos > size()) {
-               if (next
-                   && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) 
-                       return NextAfterFootnote()
-                               ->ParFromPos(pos - text.size() - 1);
-               else 
-                       lyxerr << "ERROR (LyXParagraph::ParFromPos): "
-                               "position does not exist." << endl;
-               return this;
-       } else
-               return this;
-}
-
-
-int LyXParagraph::PositionInParFromPos(LyXParagraph::size_type pos) const
-{
-       // > because last is the next unused position, and you can 
-       // use it if you want
-       if (pos > size()) {
-               if (next
-                   && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) 
-                       return NextAfterFootnote()
-                               ->PositionInParFromPos(pos - text.size() - 1);
-               else 
-                       lyxerr <<
-                               "ERROR (LyXParagraph::PositionInParFromPos): "
-                               "position does not exist." << endl;
-               return pos;
-       }
-       else
-               return pos;
-}
-
-
-void LyXParagraph::SetFont(LyXParagraph::size_type pos,
-                          LyXFont const & font)
-{
-       // > because last is the next unused position, and you can 
-       // use it if you want
-       if (pos > size()) {
-               if (next &&
-                   next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
-                       NextAfterFootnote()->SetFont(pos - text.size() - 1,
-                                                    font);
-               } else {
-                       lyxerr << "ERROR (LyXParagraph::SetFont): "
-                               "position does not exist." << endl;
-               }
-               return;
-       }
-       LyXFont patternfont(LyXFont::ALL_INHERIT);
+void Paragraph::setFont(pos_type pos, LyXFont const & font)
+{
+       lyx::Assert(pos <= size());
 
        // First, reduce font against layout/label font
        // Update: The SetCharFont() routine in text2.C already
@@ -1023,695 +769,339 @@ void LyXParagraph::SetFont(LyXParagraph::size_type pos,
        // No need to simplify this because it will disappear
        // in a new kernel. (Asger)
        // Next search font table
-       FontList::iterator tmp = fontlist.begin();
-       for (; tmp != fontlist.end(); ++tmp) {
-               if (pos >= (*tmp).pos && pos <= (*tmp).pos_end) {
-                       break;
-               }
-       }
-       if (tmp == fontlist.end()) { // !found
-               // if we did not find a font entry, but if the font at hand
-               // is the same as default, we just forget it
-               if (font == patternfont) return;
-
-               // ok, we did not find a font entry. But maybe there is exactly
-               // the needed font ientry one position left
-               FontList::iterator tmp2 = fontlist.begin();
-               for (; tmp2 != fontlist.end(); ++tmp2) {
-                       if (pos - 1 >= (*tmp2).pos
-                           && pos - 1 <= (*tmp2).pos_end)
-                               break;
-               }
-               if (tmp2 != fontlist.end()) {
-                       // ok there is one, maybe it is exactly
-                       // the needed font
-                       if ((*tmp2).font == font) {
-                               // put the position under the font
-                               (*tmp2).pos_end++;
-                               return;
-                       }
-               }
-               // Add a new entry in the
-               // fontlist for the position
-               FontTable ft;
-               ft.pos = pos;
-               ft.pos_end = pos;
-               ft.font = font; // or patternfont
-               // It seems that using font instead of patternfont here
-               // fixes all the problems. This also surfaces a "bug" in
-               // the old code.
-               fontlist.insert(fontlist.begin(), ft);
-       } else if ((*tmp).pos != (*tmp).pos_end) { // we found a font entry. maybe we have to split it and create a new one.
-
-// more than one character
-               if (pos == (*tmp).pos) {
-                       // maybe we should enlarge the left fonttable
-                       FontList::iterator tmp2 = fontlist.begin();
-                       for (; tmp2 != fontlist.end(); ++tmp2) {
-                               if (pos - 1 >= (*tmp2).pos
-                                   && pos - 1 <= (*tmp2).pos_end)
-                                       break;
-                       }
-                       // Is there is one, and is it exactly
-                       // the needed font?
-                       if (tmp2 != fontlist.end() &&
-                           (*tmp2).font == font) {
-                               // Put the position under the font
-                               (*tmp2).pos_end++;
-                               (*tmp).pos++;
-                               return;
-                       }
-
-                       // Add a new entry in the
-                       // fontlist for the position
-                       FontTable ft;
-                       ft.pos = pos + 1;
-                       ft.pos_end = (*tmp).pos_end;
-                       ft.font = (*tmp).font;
-                       (*tmp).pos_end = pos;
-                       (*tmp).font = font;
-                       fontlist.insert(fontlist.begin(), ft);
-               } else if (pos == (*tmp).pos_end) {
-                       // Add a new entry in the
-                       // fontlist for the position
-                       FontTable ft;
-                       ft.pos = (*tmp).pos;
-                       ft.pos_end = (*tmp).pos_end - 1;
-                       ft.font = (*tmp).font;
-                       (*tmp).pos = (*tmp).pos_end;
-                       (*tmp).font = font;
-                       fontlist.insert(fontlist.begin(), ft);
-               } else {
-                       // Add a new entry in the
-                       // fontlist for the position
-                       FontTable ft;
-                       ft.pos = (*tmp).pos;
-                       ft.pos_end = pos - 1;
-                       ft.font = (*tmp).font;
-                       
-                       FontTable ft2;
-                       ft2.pos = pos + 1;
-                       ft2.pos_end = (*tmp).pos_end;
-                       ft2.font = (*tmp).font;
-                       
-                       (*tmp).pos = pos;
-                       (*tmp).pos_end = pos;
-                       (*tmp).font = font;
-                       
-                       fontlist.insert(fontlist.begin(), ft);
-                       fontlist.insert(fontlist.begin(), ft2);
-               }
-       } else {
-               (*tmp).font = font;
-       }
-}
 
-   
-// This function is able to hide closed footnotes.
-LyXParagraph * LyXParagraph::Next()
-{
-       if (next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
-               LyXParagraph * tmp = next;
-               while (tmp
-                      && tmp->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
-                       tmp = tmp->next;
-               if (tmp && tmp->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE) 
-                       return tmp->Next(); /* there can be more than one
-                                              footnote in a logical
-                                              paragraph */
-               else
-                       return next;  // This should never happen!
-       } else
-               return next;
-}
+       Pimpl::FontTable search_font(pos, LyXFont());
+       Pimpl::FontList::iterator it = lower_bound(pimpl_->fontlist.begin(),
+                                           pimpl_->fontlist.end(),
+                                           search_font, Pimpl::matchFT());
+       unsigned int i = it - pimpl_->fontlist.begin();
+       bool notfound = it == pimpl_->fontlist.end();
 
+       if (!notfound && pimpl_->fontlist[i].font() == font)
+               return;
 
-LyXParagraph * LyXParagraph::NextAfterFootnote()
-{
-       if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
-               LyXParagraph * tmp = next;
-               while (tmp && tmp->footnoteflag != LyXParagraph::NO_FOOTNOTE)
-                       tmp = tmp->next;
-               if (tmp && tmp->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE) 
-                       return tmp;   /* there can be more than one footnote
-                                        in a logical paragraph */
+       bool begin = pos == 0 || notfound ||
+               (i > 0 && pimpl_->fontlist[i-1].pos() == pos - 1);
+       // Is position pos is a beginning of a font block?
+       bool end = !notfound && pimpl_->fontlist[i].pos() == pos;
+       // Is position pos is the end of a font block?
+       if (begin && end) { // A single char block
+               if (i + 1 < pimpl_->fontlist.size() &&
+                   pimpl_->fontlist[i + 1].font() == font) {
+                       // Merge the singleton block with the next block
+                       pimpl_->fontlist.erase(pimpl_->fontlist.begin() + i);
+                       if (i > 0 && pimpl_->fontlist[i - 1].font() == font)
+                               pimpl_->fontlist.erase(pimpl_->fontlist.begin() + i-1);
+               } else if (i > 0 && pimpl_->fontlist[i - 1].font() == font) {
+                       // Merge the singleton block with the previous block
+                       pimpl_->fontlist[i - 1].pos(pos);
+                       pimpl_->fontlist.erase(pimpl_->fontlist.begin() + i);
+               } else
+                       pimpl_->fontlist[i].font(font);
+       } else if (begin) {
+               if (i > 0 && pimpl_->fontlist[i - 1].font() == font)
+                       pimpl_->fontlist[i - 1].pos(pos);
                else
-                       return next;  // This should never happen!
-       } else
-               return next;
+                       pimpl_->fontlist.insert(pimpl_->fontlist.begin() + i,
+                                       Pimpl::FontTable(pos, font));
+       } else if (end) {
+               pimpl_->fontlist[i].pos(pos - 1);
+               if (!(i + 1 < pimpl_->fontlist.size() &&
+                     pimpl_->fontlist[i + 1].font() == font))
+                       pimpl_->fontlist.insert(pimpl_->fontlist.begin() + i + 1,
+                                       Pimpl::FontTable(pos, font));
+       } else { // The general case. The block is splitted into 3 blocks
+               pimpl_->fontlist.insert(pimpl_->fontlist.begin() + i, 
+                               Pimpl::FontTable(pos - 1, pimpl_->fontlist[i].font()));
+               pimpl_->fontlist.insert(pimpl_->fontlist.begin() + i + 1,
+                               Pimpl::FontTable(pos, font));
+       }
 }
 
 
-LyXParagraph const * LyXParagraph::NextAfterFootnote() const
-{
-       if (next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
-               LyXParagraph * tmp = next;
-               while (tmp && tmp->footnoteflag != LyXParagraph::NO_FOOTNOTE)
-                       tmp = tmp->next;
-               if (tmp && tmp->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE) 
-                       return tmp;   /* there can be more than one footnote
-                                        in a logical paragraph */
-               else
-                       return next;  // This should never happen!
-       } else
-               return next;
-}
-
 
-LyXParagraph * LyXParagraph::PreviousBeforeFootnote()
+void Paragraph::next(Paragraph * p)
 {
-       LyXParagraph * tmp;
-       if (previous && previous->footnoteflag != LyXParagraph::NO_FOOTNOTE) {
-               tmp = next;
-               while (tmp && tmp->footnoteflag != LyXParagraph::NO_FOOTNOTE)
-                       tmp = tmp->previous;
-               if (tmp && tmp->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE) 
-                       return tmp;    /* there can be more than one footnote
-                                         in a logical paragraph */
-               else
-                       return previous;  // This should never happen!
-       } else
-               return previous;
+       next_ = p;
 }
 
 
-LyXParagraph * LyXParagraph::LastPhysicalPar()
+// This function is able to hide closed footnotes.
+Paragraph * Paragraph::next()
 {
-       if (footnoteflag != LyXParagraph::NO_FOOTNOTE)
-               return this;
-   
-       LyXParagraph * tmp = this;
-       while (tmp->next
-              && tmp->next->footnoteflag != LyXParagraph::NO_FOOTNOTE)
-               tmp = tmp->NextAfterFootnote();
-   
-       return tmp;
-   
+       return next_;
 }
 
 
-LyXParagraph * LyXParagraph::FirstPhysicalPar()
+Paragraph const * Paragraph::next() const
 {
-       if (!IsDummy())
-               return this;
-       LyXParagraph * tmppar = this;
-
-       while (tmppar &&
-              (tmppar->IsDummy()
-               || tmppar->footnoteflag != LyXParagraph::NO_FOOTNOTE))
-               tmppar = tmppar->previous;
-   
-       if (!tmppar) {
-               return this;
-       } else
-               return tmppar;
+       return next_;
 }
 
 
-LyXParagraph const * LyXParagraph::FirstPhysicalPar() const
+void Paragraph::previous(Paragraph * p)
 {
-       if (!IsDummy())
-               return this;
-       LyXParagraph const * tmppar = this;
-
-       while (tmppar &&
-              (tmppar->IsDummy()
-               || tmppar->footnoteflag != LyXParagraph::NO_FOOTNOTE))
-               tmppar = tmppar->previous;
-   
-       if (!tmppar) {
-               return this;
-       } else
-               return tmppar;
+       previous_ = p;
 }
 
 
 // This function is able to hide closed footnotes.
-LyXParagraph * LyXParagraph::Previous()
+Paragraph * Paragraph::previous()
 {
-       LyXParagraph * tmp = previous;
-       if (!tmp)
-               return tmp;
-   
-       if (tmp->previous
-           && tmp->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
-               tmp = tmp->previous;
-               while (tmp
-                      && tmp->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
-                       tmp = tmp->previous;
-               if (tmp && tmp->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE) 
-                       return tmp->next->Previous();   
-
-               else
-                       return previous; 
-       } else
-               return previous;
+       return previous_;
 }
 
 
 // This function is able to hide closed footnotes.
-LyXParagraph const * LyXParagraph::Previous() const
+Paragraph const * Paragraph::previous() const
 {
-       LyXParagraph * tmp = previous;
-       if (!tmp)
-               return tmp;
-   
-       if (tmp->previous
-           && tmp->previous->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
-               tmp = tmp->previous;
-               while (tmp
-                      && tmp->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE)
-                       tmp = tmp->previous;
-               if (tmp && tmp->footnoteflag != LyXParagraph::CLOSED_FOOTNOTE) 
-                       return tmp->next->Previous();   
-
-               else
-                       return previous; 
-       } else
-               return previous;
+       return previous_;
 }
 
 
-void LyXParagraph::BreakParagraph(LyXParagraph::size_type pos,
+void Paragraph::breakParagraph(BufferParams const & bparams,
+                                 pos_type pos,
                                  int flag)
 {
-       size_type i, pos_end, pos_first;
        // create a new paragraph
-       LyXParagraph * par = ParFromPos(pos);
-       LyXParagraph * firstpar = FirstPhysicalPar();
-   
-       LyXParagraph * tmp = new LyXParagraph(par);
+       Paragraph * tmp = new Paragraph(this);
+       // remember to set the inset_owner
+       tmp->setInsetOwner(inInset());
        
-       tmp->footnoteflag = footnoteflag;
-       tmp->footnotekind = footnotekind;
-   
        // this is an idea for a more userfriendly layout handling, I will
        // see what the users say
-   
+       
        // layout stays the same with latex-environments
        if (flag) {
-               tmp->SetOnlyLayout(firstpar->layout);
-               tmp->SetLabelWidthString(firstpar->labelwidthstring);
+               tmp->setOnlyLayout(layout);
+               tmp->setLabelWidthString(params().labelWidthString());
        }
-
-       if (Last() > pos || !Last() || flag == 2) {
-               tmp->SetOnlyLayout(firstpar->layout);
-               tmp->align = firstpar->align;
-               tmp->SetLabelWidthString(firstpar->labelwidthstring);
-      
-               tmp->line_bottom = firstpar->line_bottom;
-               firstpar->line_bottom = false;
-               tmp->pagebreak_bottom = firstpar->pagebreak_bottom;
-               firstpar->pagebreak_bottom = false;
-               tmp->added_space_bottom = firstpar->added_space_bottom;
-               firstpar->added_space_bottom = VSpace(VSpace::NONE);
-      
-               tmp->depth = firstpar->depth;
-               tmp->noindent = firstpar->noindent;
-   
+       
+       if (size() > pos || !size() || flag == 2) {
+               tmp->setOnlyLayout(layout);
+               tmp->params().align(params().align());
+               tmp->setLabelWidthString(params().labelWidthString());
+               
+               tmp->params().lineBottom(params().lineBottom());
+               params().lineBottom(false);
+               tmp->params().pagebreakBottom(params().pagebreakBottom());
+               params().pagebreakBottom(false);
+               tmp->params().spaceBottom(params().spaceBottom());
+               params().spaceBottom(VSpace(VSpace::NONE));
+               
+               tmp->params().depth(params().depth());
+               tmp->params().noindent(params().noindent());
+               
                // copy everything behind the break-position
                // to the new paragraph
-               pos_first = 0;
-               while (ParFromPos(pos_first) != par)
-                       ++pos_first;
-
-               pos_end = pos_first + par->text.size() - 1;
-               // The constructor has already reserved 500 elements
-               //if (pos_end > pos)
-               //      tmp->text.reserve(pos_end - pos);
-
-               for (i = pos; i <= pos_end; ++i) {
-                       par->CutIntoMinibuffer(i - pos_first);
-                       tmp->InsertFromMinibuffer(i - pos);
+               pos_type pos_end = pimpl_->size() - 1;
+               pos_type i = pos;
+               pos_type j = pos;
+               for (; i <= pos_end; ++i) {
+                       cutIntoMinibuffer(bparams, i);
+                       if (tmp->insertFromMinibuffer(j - pos))
+                               ++j;
+               }
+               for (i = pos_end; i >= pos; --i) {
+                       erase(i);
                }
-               tmp->text.resize(tmp->text.size());
-               for (i = pos_end; i >= pos; --i)
-                       par->Erase(i - pos_first);
-
-               par->text.resize(par->text.size());
        }
-
+       
        // just an idea of me
        if (!pos) {
-               tmp->line_top = firstpar->line_top;
-               tmp->pagebreak_top = firstpar->pagebreak_top;
-               tmp->added_space_top = firstpar->added_space_top;
-               tmp->bibkey = firstpar->bibkey;
-               firstpar->Clear();
+               tmp->params().lineTop(params().lineTop());
+               tmp->params().pagebreakTop(params().pagebreakTop());
+               tmp->params().spaceTop(params().spaceTop());
+               tmp->bibkey = bibkey;
+               clear();
                // layout stays the same with latex-environments
                if (flag) {
-                       firstpar->SetOnlyLayout(tmp->layout);
-                       firstpar->SetLabelWidthString(tmp->labelwidthstring);
-                       firstpar->depth = tmp->depth;
+                       setOnlyLayout(tmp->layout);
+                       setLabelWidthString(tmp->params().labelWidthString());
+                       params().depth(tmp->params().depth());
                }
        }
 }
+       
 
-
-void LyXParagraph::MakeSameLayout(LyXParagraph const * par)
+void Paragraph::makeSameLayout(Paragraph const * par)
 {
-       par = par->FirstPhysicalPar();
-       footnoteflag = par->footnoteflag;
-       footnotekind = par->footnotekind;
-
        layout = par->layout;
-       align = par-> align;
-       SetLabelWidthString(par->labelwidthstring);
-
-       line_bottom = par->line_bottom;
-       pagebreak_bottom = par->pagebreak_bottom;
-       added_space_bottom = par->added_space_bottom;
-
-       line_top = par->line_top;
-       pagebreak_top = par->pagebreak_top;
-       added_space_top = par->added_space_top;
-
-        pextra_type = par->pextra_type;
-        pextra_width = par->pextra_width;
-        pextra_widthp = par->pextra_widthp;
-        pextra_alignment = par->pextra_alignment;
-        pextra_hfill = par->pextra_hfill;
-        pextra_start_minipage = par->pextra_start_minipage;
-
-       noindent = par->noindent;
-       depth = par->depth;
+       // move to pimpl?
+       params() = par->params();
 }
 
 
-LyXParagraph * LyXParagraph::FirstSelfrowPar()
+int Paragraph::stripLeadingSpaces(lyx::textclass_type tclass) 
 {
-       LyXParagraph * tmppar = this;
-       while (tmppar && (
-               (tmppar->IsDummy()
-                && tmppar->previous->footnoteflag == 
-                LyXParagraph::CLOSED_FOOTNOTE)
-               || tmppar->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE))
-               tmppar = tmppar->previous;
-   
-       if (!tmppar)
-               return this;  // This should never happen!
-       else
-               return tmppar;
-}
-
-
-LyXParagraph * LyXParagraph::Clone() const
-{
-       // create a new paragraph
-       LyXParagraph * result = new LyXParagraph;
-   
-       result->MakeSameLayout(this);
-
-       // this is because of the dummy layout of the paragraphs that
-       // follow footnotes
-       result->layout = layout;
-   
-       /* table stuff -- begin*/ 
-       if (table)
-               result->table = table->Clone();
-       else
-               result->table = 0;
-       /* table stuff -- end*/ 
-   
-        // ale970302
-        result->bibkey = (bibkey) ? new InsetBibKey(bibkey): 0;
-               
-    
-       // copy everything behind the break-position to the new paragraph
-   
-       for (size_type i = 0; i < size(); ++i) {
-               CopyIntoMinibuffer(i);
-               result->InsertFromMinibuffer(i);
+       if (textclasslist.Style(tclass, getLayout()).free_spacing ||
+               isFreeSpacing())
+       {
+               return 0;
+       }
+       
+       int i = 0;
+       while (size() && (isNewline(0) || isLineSeparator(0))) {
+               erase(0);
+               ++i;
        }
-       result->text.resize(result->text.size());
-       return result;
+
+       return i;
 }
 
 
-bool LyXParagraph::HasSameLayout(LyXParagraph const * par) const
+bool Paragraph::hasSameLayout(Paragraph const * par) const
 {
-       par = par->FirstPhysicalPar();
-
-       return (
-               par->footnoteflag == footnoteflag &&
-               par->footnotekind == footnotekind &&
-
+       return 
                par->layout == layout &&
-
-               par->align == align &&
-
-               par->line_bottom == line_bottom &&
-               par->pagebreak_bottom == pagebreak_bottom &&
-               par->added_space_bottom == added_space_bottom &&
-
-               par->line_top == line_top &&
-               par->pagebreak_top == pagebreak_top &&
-               par->added_space_top == added_space_top &&
-
-                par->pextra_type == pextra_type &&
-                par->pextra_width == pextra_width && 
-                par->pextra_widthp == pextra_widthp && 
-                par->pextra_alignment == pextra_alignment && 
-                par->pextra_hfill == pextra_hfill && 
-                par->pextra_start_minipage == pextra_start_minipage && 
-
-               par->table == table && // what means: NO TABLE AT ALL 
-
-               par->noindent == noindent &&
-               par->depth == depth);
+               params().sameLayout(par->params());
 }
 
 
-void LyXParagraph::BreakParagraphConservative(LyXParagraph::size_type pos)
+void Paragraph::breakParagraphConservative(BufferParams const & bparams,
+                                          pos_type pos)
 {
        // create a new paragraph
-       LyXParagraph * par = ParFromPos(pos);
+       Paragraph * tmp = new Paragraph(this);
+       tmp->makeSameLayout(this);
 
-       LyXParagraph * tmp = new LyXParagraph(par);
-   
-       tmp->MakeSameLayout(par);
-
-       // When can pos < Last()?
+       // When can pos > Last()?
        // I guess pos == Last() is possible.
-       if (Last() > pos) {
+       if (size() > pos) {
                // copy everything behind the break-position to the new
                // paragraph
-               size_type pos_first = 0;
-               while (ParFromPos(pos_first) != par)
-                       ++pos_first;
-               size_type pos_end = pos_first + par->text.size() - 1;
-               // make sure there is enough memory for the now larger
-               // paragraph. This is not neccessary, because
-               // InsertFromMinibuffer will enlarge the memory (it uses
-               // InsertChar of course). But doing it by hand
-               // is MUCH faster! (only one time, not thousend times!!)
-               // Not needed since the constructor aleady have
-               // reserved 500 elements in text.
-               //if (pos_end > pos)
-               //      tmp->text.reserve(pos_end - pos);
-
-               for (size_type i = pos; i <= pos_end; ++i) {
-                       par->CutIntoMinibuffer(i - pos_first);
-                       tmp->InsertFromMinibuffer(i - pos);
-               }
-               tmp->text.resize(tmp->text.size());
-               for (size_type i = pos_end; i >= pos; --i)
-                       par->Erase(i - pos_first);
+               pos_type pos_end = pimpl_->size() - 1;
 
-               par->text.resize(par->text.size());
+               //pos_type i = pos;
+               //pos_type j = pos;
+               for (pos_type i = pos, j = pos; i <= pos_end; ++i) {
+                       cutIntoMinibuffer(bparams, i);
+                       if (tmp->insertFromMinibuffer(j - pos))
+                               ++j;
+               }
+               
+               for (pos_type k = pos_end; k >= pos; --k) {
+                       erase(k);
+               }
        }
 }
-   
+
 
 // Be carefull, this does not make any check at all.
-void LyXParagraph::PasteParagraph()
+// This method has wrong name, it combined this par with the next par.
+// In that sense it is the reverse of break paragraph. (Lgb)
+void Paragraph::pasteParagraph(BufferParams const & bparams)
 {
        // copy the next paragraph to this one
-       LyXParagraph * the_next = Next();
-   
-       LyXParagraph * firstpar = FirstPhysicalPar();
-   
+       Paragraph * the_next = next();
+
        // first the DTP-stuff
-       firstpar->line_bottom = the_next->line_bottom;
-       firstpar->added_space_bottom = the_next->added_space_bottom;
-       firstpar->pagebreak_bottom = the_next->pagebreak_bottom;
+       params().lineBottom(the_next->params().lineBottom());
+       params().spaceBottom(the_next->params().spaceBottom());
+       params().pagebreakBottom(the_next->params().pagebreakBottom());
 
-       size_type pos_end = the_next->text.size() - 1;
-       size_type pos_insert = Last();
+       pos_type pos_end = the_next->pimpl_->size() - 1;
+       pos_type pos_insert = size();
 
        // ok, now copy the paragraph
-       for (size_type i = 0; i <= pos_end; ++i) {
-               the_next->CutIntoMinibuffer(i);
-               InsertFromMinibuffer(pos_insert + i);
+       for (pos_type i = 0, j = 0; i <= pos_end; ++i) {
+               the_next->cutIntoMinibuffer(bparams, i);
+               if (insertFromMinibuffer(pos_insert + j))
+                       ++j;
        }
-   
+
        // delete the next paragraph
+       Paragraph * ppar = the_next->previous_;
+       Paragraph * npar = the_next->next_;
        delete the_next;
+       ppar->next(npar);
 }
 
 
-void LyXParagraph::OpenFootnote(LyXParagraph::size_type pos)
+int Paragraph::getEndLabel(BufferParams const & bparams) const
 {
-       LyXParagraph * par = ParFromPos(pos);
-       par = par->next;
-       while (par && par->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
-               par->footnoteflag = LyXParagraph::OPEN_FOOTNOTE;
-               par = par->next;
-       }
-}
+       Paragraph const * par = this;
+       depth_type par_depth = getDepth();
+       while (par) {
+               layout_type layout = par->getLayout();
+               int const endlabeltype =
+                       textclasslist.Style(bparams.textclass,
+                                           layout).endlabeltype;
+               if (endlabeltype != END_LABEL_NO_LABEL) {
+                       if (!next_)
+                               return endlabeltype;
 
-
-void LyXParagraph::CloseFootnote(LyXParagraph::size_type pos)
-{
-       LyXParagraph * par = ParFromPos(pos);
-       par = par->next;
-       while (par && par->footnoteflag == LyXParagraph::OPEN_FOOTNOTE) {
-               par->footnoteflag = LyXParagraph::CLOSED_FOOTNOTE;
-               par = par->next;
+                       depth_type const next_depth = next_->getDepth();
+                       if (par_depth > next_depth ||
+                           (par_depth == next_depth
+                            && layout != next_->getLayout()))
+                               return endlabeltype;
+                       break;
+               }
+               if (par_depth == 0)
+                       break;
+               par = par->outerHook();
+               if (par)
+                       par_depth = par->getDepth();
        }
+       return END_LABEL_NO_LABEL;
 }
 
 
-LyXTextClass::size_type LyXParagraph::GetLayout() const
-{
-       return FirstPhysicalPar()->layout;
-}
-
-
-char LyXParagraph::GetDepth() const
+Paragraph::depth_type Paragraph::getDepth() const
 {
-       return FirstPhysicalPar()->depth;
+       return params().depth();
 }
 
 
-char LyXParagraph::GetAlign() const
+char Paragraph::getAlign() const
 {
-       return FirstPhysicalPar()->align;
+       return params().align();
 }
 
 
-string LyXParagraph::GetLabestring() const
+string const & Paragraph::getLabelstring() const
 {
-       return FirstPhysicalPar()->labelstring;
+       return params().labelString();
 }
 
 
-int LyXParagraph::GetFirstCounter(int i) const
+int Paragraph::getFirstCounter(int i) const
 {
-       return FirstPhysicalPar()->counter_[i];
+       return pimpl_->counter_[i];
 }
 
 
 // the next two functions are for the manual labels
-string LyXParagraph::GetLabelWidthString() const
+string const Paragraph::getLabelWidthString() const
 {
-       if (!FirstPhysicalPar()->labelwidthstring.empty())
-               return FirstPhysicalPar()->labelwidthstring;
+       if (!params().labelWidthString().empty())
+               return params().labelWidthString();
        else
                return _("Senseless with this layout!");
 }
 
 
-void LyXParagraph::SetLabelWidthString(string const & s)
+void Paragraph::setLabelWidthString(string const & s)
 {
-       LyXParagraph * par = FirstPhysicalPar();
-
-       par->labelwidthstring = s;
+       params().labelWidthString(s);
 }
 
 
-void LyXParagraph::SetOnlyLayout(LyXTextClass::size_type new_layout)
+void Paragraph::setOnlyLayout(layout_type new_layout)
 {
-       LyXParagraph * par = FirstPhysicalPar();
-       LyXParagraph * ppar = 0;
-       LyXParagraph * npar = 0;
-
-       par->layout = new_layout;
-       /* table stuff -- begin*/ 
-       if (table) 
-               par->layout = 0;
-       /* table stuff -- end*/ 
-        if (par->pextra_type == PEXTRA_NONE) {
-                if (par->Previous()) {
-                        ppar = par->Previous()->FirstPhysicalPar();
-                        while(ppar
-                             && ppar->Previous()
-                             && (ppar->depth > par->depth))
-                                ppar = ppar->Previous()->FirstPhysicalPar();
-                }
-                if (par->Next()) {
-                        npar = par->Next()->NextAfterFootnote();
-                        while(npar
-                             && npar->Next()
-                             && (npar->depth > par->depth))
-                                npar = npar->Next()->NextAfterFootnote();
-                }
-                if (ppar && (ppar->pextra_type != PEXTRA_NONE)) {
-                        string
-                                p1 = ppar->pextra_width,
-                                p2 = ppar->pextra_widthp;
-                        ppar->SetPExtraType(ppar->pextra_type,
-                                            p1.c_str(), p2.c_str());
-                }
-                if ((par->pextra_type == PEXTRA_NONE) &&
-                    npar && (npar->pextra_type != PEXTRA_NONE)) {
-                        string
-                                p1 = npar->pextra_width,
-                                p2 = npar->pextra_widthp;
-                        npar->SetPExtraType(npar->pextra_type,
-                                            p1.c_str(), p2.c_str());
-                }
-        }
+       layout = new_layout;
 }
 
 
-void LyXParagraph::SetLayout(LyXTextClass::size_type new_layout)
+void Paragraph::setLayout(layout_type new_layout)
 {
-       LyXParagraph
-               * par = FirstPhysicalPar(),
-               * ppar = 0,
-               * npar = 0;
-
-        par->layout = new_layout;
-       par->labelwidthstring.clear();
-       par->align = LYX_ALIGN_LAYOUT;
-       par->added_space_top = VSpace(VSpace::NONE);
-       par->added_space_bottom = VSpace(VSpace::NONE);
-       /* table stuff -- begin*/ 
-       if (table) 
-               par->layout = 0;
-       /* table stuff -- end*/
-        if (par->pextra_type == PEXTRA_NONE) {
-                if (par->Previous()) {
-                        ppar = par->Previous()->FirstPhysicalPar();
-                        while(ppar
-                             && ppar->Previous()
-                             && (ppar->depth > par->depth))
-                                ppar = ppar->Previous()->FirstPhysicalPar();
-                }
-                if (par->Next()) {
-                        npar = par->Next()->NextAfterFootnote();
-                        while(npar
-                             && npar->Next()
-                             && (npar->depth > par->depth))
-                                npar = npar->Next()->NextAfterFootnote();
-                }
-                if (ppar && (ppar->pextra_type != PEXTRA_NONE)) {
-                        string
-                                p1 = ppar->pextra_width,
-                                p2 = ppar->pextra_widthp;
-                        ppar->SetPExtraType(ppar->pextra_type,
-                                            p1.c_str(), p2.c_str());
-                }
-                if ((par->pextra_type == PEXTRA_NONE) &&
-                    npar && (npar->pextra_type != PEXTRA_NONE)) {
-                        string
-                                p1 = npar->pextra_width,
-                                p2 = npar->pextra_widthp;
-                        npar->SetPExtraType(npar->pextra_type,
-                                            p1.c_str(), p2.c_str());
-                }
-        }
+       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));
 }
 
 
@@ -1722,211 +1112,207 @@ void LyXParagraph::SetLayout(LyXTextClass::size_type new_layout)
 // because there cannot be a newline or a blank <= the beginning of the 
 // main body in TeX.
 
-int LyXParagraph::BeginningOfMainBody() const
+int Paragraph::beginningOfMainBody() const
 {
-       if (FirstPhysicalPar() != this)
-               return -1;
-   
        // Unroll the first two cycles of the loop
        // and remember the previous character to
        // remove unnecessary GetChar() calls
-       size_type i = 0;
+       pos_type i = 0;
        if (i < size()
-           && GetChar(i) != LyXParagraph::META_NEWLINE
-               ) {
+           && getChar(i) != Paragraph::META_NEWLINE) {
                ++i;
-               char previous_char = 0, temp = 0; 
+               char previous_char = 0;
+               char temp = 0; 
                if (i < size()
-                   && (previous_char = GetChar(i)) != LyXParagraph::META_NEWLINE) {
+                   && (previous_char = getChar(i)) != Paragraph::META_NEWLINE) {
                        // Yes, this  ^ is supposed to be "= " not "=="
                        ++i;
                        while (i < size()
                               && previous_char != ' '
-                              && (temp = GetChar(i)) != LyXParagraph::META_NEWLINE) {
+                              && (temp = getChar(i)) != Paragraph::META_NEWLINE) {
                                ++i;
                                previous_char = temp;
                        }
                }
        }
 
-       if (i == 0 && i == size() &&
-           !(footnoteflag == LyXParagraph::NO_FOOTNOTE
-             && next && next->footnoteflag != LyXParagraph::NO_FOOTNOTE))
-               ++i;                           /* the cursor should not jump  
-                                               * to the main body if there
-                                               * is nothing in! */
        return i;
 }
 
 
-LyXParagraph * LyXParagraph::DepthHook(int deth)
+Paragraph * Paragraph::depthHook(depth_type depth)
 {
-       LyXParagraph * newpar = this;
-       if (deth < 0)
-               return 0;
-   
+       Paragraph * newpar = this;
+
        do {
-               newpar = newpar->FirstPhysicalPar()->Previous();
-       } while (newpar && newpar->GetDepth() > deth
-                && newpar->footnoteflag == footnoteflag);
-   
+               newpar = newpar->previous();
+       } while (newpar && newpar->getDepth() > depth);
+
        if (!newpar) {
-               if (Previous() || GetDepth())
-                       lyxerr << "ERROR (LyXParagraph::DepthHook): "
+               if (previous() || getDepth())
+                       lyxerr << "ERROR (Paragraph::DepthHook): "
                                "no hook." << endl;
                newpar = this;
        }
-       return newpar->FirstPhysicalPar();
+
+       return newpar;
 }
 
 
-LyXParagraph const * LyXParagraph::DepthHook(int deth) const
+Paragraph const * Paragraph::depthHook(depth_type depth) const
 {
-       LyXParagraph const * newpar = this;
-       if (deth < 0)
-               return 0;
-   
+       Paragraph const * newpar = this;
+
        do {
-               newpar = newpar->FirstPhysicalPar()->Previous();
-       } while (newpar && newpar->GetDepth() > deth
-                && newpar->footnoteflag == footnoteflag);
-   
+               newpar = newpar->previous();
+       } while (newpar && newpar->getDepth() > depth);
+
        if (!newpar) {
-               if (Previous() || GetDepth())
-                       lyxerr << "ERROR (LyXParagraph::DepthHook): "
+               if (previous() || getDepth())
+                       lyxerr << "ERROR (Paragraph::DepthHook): "
                                "no hook." << endl;
                newpar = this;
        }
-       return newpar->FirstPhysicalPar();
+
+       return newpar;
 }
 
+Paragraph * Paragraph::outerHook()
+{
+       if(!getDepth())
+               return 0;
+       return depthHook(depth_type(getDepth() - 1));
+}
 
-int LyXParagraph::AutoDeleteInsets()
+Paragraph const * Paragraph::outerHook() const
 {
-       vector<size_type> tmpvec;
-       int i = 0;
-       for (InsetList::iterator it = insetlist.begin();
-            it != insetlist.end(); ++it) {
-               if ((*it).inset && (*it).inset->AutoDelete()) {
-                       tmpvec.push_back((*it).pos);
-                       ++i;
-               }
-       }
-       for (vector<size_type>::const_iterator cit = tmpvec.begin();
-            cit != tmpvec.end(); ++cit) {
-               Erase((*cit));
-       }
-       return i;
+       if(!getDepth())
+               return 0;
+       return depthHook(depth_type(getDepth() - 1));
 }
 
 
-Inset * LyXParagraph::ReturnNextInsetPointer(LyXParagraph::size_type & pos)
+Paragraph::inset_iterator
+Paragraph::InsetIterator(pos_type pos)
 {
-       InsetList::iterator it2 = insetlist.end();
-       for (InsetList::iterator it = insetlist.begin();
-            it != insetlist.end(); ++it) {
-               if ((*it).pos >= pos) {
-                       if (it2 == insetlist.end() || (*it).pos < (*it2).pos)
-                               it2 = it;
-               }
-       }
-       if (it2 != insetlist.end()) {
-               pos = (*it2).pos;
-               return (*it2).inset;
-       }
-       return 0;
+       InsetTable search_inset(pos, 0);
+       InsetList::iterator it = lower_bound(insetlist.begin(),
+                                            insetlist.end(),
+                                            search_inset, Pimpl::matchIT());
+       return inset_iterator(it);
 }
 
 
 // returns -1 if inset not found
-int LyXParagraph::GetPositionOfInset(Inset * inset) const
+int Paragraph::getPositionOfInset(Inset const * inset) const
 {
        // Find the entry.
        for (InsetList::const_iterator cit = insetlist.begin();
             cit != insetlist.end(); ++cit) {
-               if ((*cit).inset == inset) {
-                       return (*cit).pos;
+               if (cit->inset == inset) {
+                       return cit->pos;
                }
        }
-       // Think about footnotes.
-       if (footnoteflag == LyXParagraph::NO_FOOTNOTE 
-           && next && next->footnoteflag == LyXParagraph::CLOSED_FOOTNOTE) {
-               int further = 
-                       NextAfterFootnote()->GetPositionOfInset(inset);
-               if (further != -1)
-                       return text.size() + 1 + further;
-       }
-       return -1;
-}
-
+       if (inset == bibkey)
+               return 0;
 
-void LyXParagraph::readSimpleWholeFile(istream & is)
-{
-       is.seekg(0);
-       char c = 0;
-       while(!is.eof()) {
-               is.get(c);
-               InsertChar(text.size(), c);
-       };
+       return -1;
 }
 
 
-#ifdef USE_OSTREAM_ONLY
-LyXParagraph * LyXParagraph::TeXOnePar(ostream & os, TexRow & texrow,
-                                      ostream & foot, TexRow & foot_texrow,
-                                      int & foot_count)
+Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
+                                 BufferParams const & bparams,
+                                 ostream & os, TexRow & texrow,
+                                 bool moving_arg)
 {
        lyxerr[Debug::LATEX] << "TeXOnePar...     " << this << endl;
-       LyXParagraph * par = next;
-       LyXLayout const & style =
-               textclasslist.Style(current_view->buffer()->params.textclass,
-                                   layout);
-
+       Inset const * in = inInset();
        bool further_blank_line = false;
-       if (IsDummy())
-               lyxerr << "ERROR (LyXParagraph::TeXOnePar) is dummy." << endl;
+       LyXLayout 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 = textclasslist.Style(bparams.textclass, layout);
+
+               if (params().startOfAppendix()) {
+                       os << "\\appendix\n";
+                       texrow.newline();
+               }
 
-       if (start_of_appendix) {
-               os << "\\appendix\n";
-               texrow.newline();
-       }
+               if (!params().spacing().isDefault()
+                       && (!previous() || !previous()->hasSameLayout(this))) {
+                       os << params().spacing().writeEnvirBegin() << "\n";
+                       texrow.newline();
+               }
+       
+               if (tex_code_break_column && style.isCommand()){
+                       os << '\n';
+                       texrow.newline();
+               }
 
-       if (tex_code_break_column && style.isCommand()){
-               os << '\n';
-               texrow.newline();
-       }
+               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 (pagebreak_top) {
-               os << "\\newpage";
-               further_blank_line = true;
-       }
-       if (added_space_top.kind() != VSpace::NONE) {
-               os << added_space_top.asLatexCommand(current_view->buffer()->params);
-               further_blank_line = true;
-       }
-      
-       if (line_top) {
-               os << "\\lyxline{\\" << getFont(0).latexSize() << '}'
-                  << "\\vspace{-1\\parskip}";
-               further_blank_line = true;
-       }
+               if (params().lineTop()) {
+                       os << "\\lyxline{\\" << getFont(bparams, 0).latexSize() << '}'
+                          << "\\vspace{-1\\parskip}";
+                       further_blank_line = true;
+               }
 
-       if (further_blank_line){
-               os << '\n';
-               texrow.newline();
+               if (further_blank_line){
+                       os << '\n';
+                       texrow.newline();
+               }
+       } else {
+               style = textclasslist.Style(bparams.textclass, 0);
+       }
+
+       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();
+               }
        }
 
-       LyXDirection direction = getParDirection();
-       LyXDirection global_direction =
-               current_view->buffer()->params.getDocumentDirection();
-       if (direction != global_direction) {
-               if (direction == LYX_DIR_LEFT_TO_RIGHT)
-                       os << "\\unsethebrew\n";
-               else
-                       os << "\\sethebrew\n";
+       if (bparams.inputenc == "auto" &&
+           language->encoding() != previous_language->encoding()) {
+               os << "\\inputencoding{"
+                  << language->encoding()->LatexName()
+                  << "}" << endl;
                texrow.newline();
        }
-       
 
        switch (style.latextype) {
        case LATEX_COMMAND:
@@ -1936,7 +1322,7 @@ LyXParagraph * LyXParagraph::TeXOnePar(ostream & os, TexRow & texrow,
                break;
        case LATEX_ITEM_ENVIRONMENT:
                if (bibkey) {
-                       bibkey->Latex(os, false);
+                       bibkey->latex(buf, os, false, false);
                } else
                        os << "\\item ";
                break;
@@ -1947,354 +1333,166 @@ LyXParagraph * LyXParagraph::TeXOnePar(ostream & os, TexRow & texrow,
                break;
        }
 
-       bool need_par = SimpleTeXOnePar(os, texrow);
+       bool need_par = simpleTeXOnePar(buf, bparams, os, texrow, moving_arg);
  
-       // Spit out footnotes
-       while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE
-              && par->footnoteflag != footnoteflag) {
-               par = par->TeXFootnote(os, texrow,
-                                      foot, foot_texrow, foot_count,
-                                      direction);
-               par->SimpleTeXOnePar(os, texrow);
-               par = par->next;
-       }
-
        // 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)
-       LyXFont font = getFont(Last() - 1);
-       if (need_par) {
-               if (style.resfont.size() != font.size()) {
-                       os << '\\'
-                          << font.latexSize()
-                          << ' ';
-               }
+       //
+       // 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 =
+               (size() == 0
+                ? 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 (textclasslist.Style(current_view->buffer()->params.textclass,
-                                      GetLayout()).isCommand()){
-               if (style.resfont.size() != font.size()) {
-                       os << '\\'
-                          << font.latexSize()
-                          << ' ';
-               }
-               os << '}';
-       } else if (style.resfont.size() != font.size()){
-               os << "{\\" << font.latexSize() << " \\par}";
-       }
+       } else if (is_command)
+               os << "}";
 
-       if (direction != global_direction)
-               if (direction == LYX_DIR_LEFT_TO_RIGHT)
-                       os << "\\sethebrew";
-               else
-                       os << "\\unsethebrew";
-       
        switch (style.latextype) {
        case LATEX_ITEM_ENVIRONMENT:
        case LATEX_LIST_ENVIRONMENT:
-                if (par && (depth < par->depth)) {
-                        os << '\n';
-                        texrow.newline();
-                }
+               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 (par
-                   && (par->layout != layout
-                       || par->depth != depth
-                       || par->pextra_type != pextra_type))
+               if (next_
+                   && (next_->layout != layout
+                       || next_->params().depth() != params().depth()))
                        break;
+               // fall through possible
        default:
-               if (!(footnoteflag != LyXParagraph::NO_FOOTNOTE
-                     && footnotekind != LyXParagraph::FOOTNOTE
-                     && footnotekind != LyXParagraph::MARGIN
-                     && (table
-                         || (par
-                             && par->table)))) {
-                       // don't insert this if we would be adding it
-                       // before or after a table in a float.  This 
-                       // little trick is needed in order to allow
-                       // use of tables in \subfigures or \subtables.
+               // we don't need it for the last paragraph!!!
+               if (next_) {
                        os << '\n';
                        texrow.newline();
                }
        }
        
-       further_blank_line = false;
-       if (line_bottom) {
-               os << "\\lyxline{\\" << getFont(Last() - 1).latexSize() << '}';
-               further_blank_line = true;
-       }
+       if ((in == 0) || !in->forceDefaultParagraphs(in)) {
+               further_blank_line = false;
+               if (params().lineBottom()) {
+                       os << "\\lyxline{\\" << font.latexSize() << '}';
+                       further_blank_line = true;
+               }
 
-       if (added_space_bottom.kind() != VSpace::NONE) {
-               os << added_space_bottom.asLatexCommand(current_view->buffer()->params);
-               further_blank_line = true;
-       }
-      
-       if (pagebreak_bottom) {
-               os << "\\newpage";
-               further_blank_line = true;
-       }
+               if (params().spaceBottom().kind() != VSpace::NONE) {
+                       os << params().spaceBottom().asLatexCommand(bparams);
+                       further_blank_line = true;
+               }
 
-       if (further_blank_line){
-               os << '\n';
-               texrow.newline();
-       }
+               if (params().pagebreakBottom()) {
+                       os << "\\newpage";
+                       further_blank_line = true;
+               }
+
+               if (further_blank_line){
+                       os << '\n';
+                       texrow.newline();
+               }
 
-       if (!(footnoteflag != LyXParagraph::NO_FOOTNOTE && par &&
-              par->footnoteflag == LyXParagraph::NO_FOOTNOTE)) {
+               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 " << par << endl;
-       return par;
+       lyxerr[Debug::LATEX] << "TeXOnePar...done " << next_ << endl;
+       return next_;
 }
-#else
-LyXParagraph * LyXParagraph::TeXOnePar(string & file, TexRow & texrow,
-                                      string & foot, TexRow & foot_texrow,
-                                      int & foot_count)
-{
-       lyxerr[Debug::LATEX] << "TeXOnePar...     " << this << endl;
-       LyXParagraph * par = next;
-       LyXLayout const & style =
-               textclasslist.Style(current_view->buffer()->params.textclass,
-                                   layout);
 
-       bool further_blank_line = false;
-       if (IsDummy())
-               lyxerr << "ERROR (LyXParagraph::TeXOnePar) is dummy." << endl;
 
-       if (start_of_appendix) {
-               file += "\\appendix\n";
-               texrow.newline();
-       }
+// This one spits out the text of the paragraph
+bool Paragraph::simpleTeXOnePar(Buffer const * buf,
+                                BufferParams const & bparams,
+                                ostream & os, TexRow & texrow,
+                                bool moving_arg)
+{
+       lyxerr[Debug::LATEX] << "SimpleTeXOnePar...     " << this << endl;
 
-       if (tex_code_break_column && style.isCommand()){
-               file += '\n';
-               texrow.newline();
-       }
+       bool return_value = false;
 
-       if (pagebreak_top) {
-               file += "\\newpage";
-               further_blank_line = true;
-       }
-       if (added_space_top.kind() != VSpace::NONE) {
-               file += added_space_top.asLatexCommand(current_view->buffer()->params);
-               further_blank_line = true;
-       }
-      
-       if (line_top) {
-               file += "\\lyxline{\\" + getFont(0).latexSize() + '}';
-               file += "\\vspace{-1\\parskip}";
-               further_blank_line = true;
+       LyXLayout 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!
+       bool asdefault =
+               (inInset() && inInset()->forceDefaultParagraphs(inInset()));
+
+       if (asdefault) {
+               style = textclasslist.Style(bparams.textclass, 0);
+       } else {
+               style = textclasslist.Style(bparams.textclass, layout);
        }
-
-       if (further_blank_line){
-               file += '\n';
-               texrow.newline();
-       }
-
-       LyXDirection direction = getParDirection();
-       LyXDirection global_direction =
-               current_view->buffer()->params.getDocumentDirection();
-       if (direction != global_direction) {
-               if (direction == LYX_DIR_LEFT_TO_RIGHT)
-                       file += "\\unsethebrew\n";
-               else
-                       file += "\\sethebrew\n";
-               texrow.newline();
-       }
-       
-
-       switch (style.latextype) {
-       case LATEX_COMMAND:
-               file += '\\';
-               file += style.latexname();
-               file += style.latexparam();
-               break;
-       case LATEX_ITEM_ENVIRONMENT:
-               if (bibkey) {
-#ifdef USE_OSTREAM_ONLY
-#ifdef HAVE_SSTREAM
-                       ostringstream ost;
-                       bibkey->Latex(ost, false);
-                       file += ost.str().c_str();
-#else
-                       ostrstream ost;
-                       bibkey->Latex(ost, false);
-                       ost << '\0';
-                       char * tmp = ost.str();
-                       file += tmp;
-                       delete [] tmp;
-#endif
-#else
-                       bibkey->Latex(file, false);
-#endif
-               } else
-                       file += "\\item ";
-               break;
-       case LATEX_LIST_ENVIRONMENT:
-               file += "\\item ";
-               break;
-       default:
-               break;
-       }
-
-       bool need_par = SimpleTeXOnePar(file, texrow);
-       // Spit out footnotes
-       while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE
-              && par->footnoteflag != footnoteflag) {
-               par = par->TeXFootnote(file, texrow,
-                                      foot, foot_texrow, foot_count,
-                                      direction);
-               par->SimpleTeXOnePar(file, texrow);
-               par = par->next;
-       }
-
-       // 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)
-       LyXFont font = getFont(Last()-1);
-       if (need_par) {
-               if (style.resfont.size() != font.size()) {
-                       file += '\\';
-                       file += font.latexSize();
-                       file += ' ';
-               }
-               file += "\\par}";
-       } else if (textclasslist.Style(current_view->buffer()->params.textclass,
-                                      GetLayout()).isCommand()){
-               if (style.resfont.size() != font.size()) {
-                       file += '\\';
-                       file += font.latexSize();
-                       file += ' ';
-               }
-               file += '}';
-       } else if (style.resfont.size() != font.size()){
-               file += "{\\" + font.latexSize() + " \\par}";
-       }
-
-       if (direction != global_direction)
-               if (direction == LYX_DIR_LEFT_TO_RIGHT)
-                       file += "\\sethebrew";
-               else
-                       file += "\\unsethebrew";
-       
-       switch (style.latextype) {
-       case LATEX_ITEM_ENVIRONMENT:
-       case LATEX_LIST_ENVIRONMENT:
-                if (par && (depth < par->depth)) {
-                        file += '\n';
-                        texrow.newline();
-                }
-               break;
-       case LATEX_ENVIRONMENT:
-               // if its the last paragraph of the current environment
-               // skip it otherwise fall through
-               if (par
-                   && (par->layout != layout
-                       || par->depth != depth
-                       || par->pextra_type != pextra_type))
-                       break;
-       default:
-               if (!(footnoteflag != LyXParagraph::NO_FOOTNOTE
-                     && footnotekind != LyXParagraph::FOOTNOTE
-                     && footnotekind != LyXParagraph::MARGIN
-                     && (table
-                         || (par
-                             && par->table)))) {
-                       // don't insert this if we would be adding it
-                       // before or after a table in a float.  This 
-                       // little trick is needed in order to allow
-                       // use of tables in \subfigures or \subtables.
-                       file += '\n';
-                       texrow.newline();
-               }
-       }
-       
-       further_blank_line = false;
-       if (line_bottom) {
-               file += "\\lyxline{\\" + getFont(Last()-1).latexSize() + '}';
-               further_blank_line = true;
-       }
-
-       if (added_space_bottom.kind() != VSpace::NONE) {
-               file += added_space_bottom.asLatexCommand(current_view->buffer()->params);
-               further_blank_line = true;
-       }
-      
-       if (pagebreak_bottom) {
-               file += "\\newpage";
-               further_blank_line = true;
-       }
-
-       if (further_blank_line){
-               file += '\n';
-               texrow.newline();
-       }
-
-       if (!(footnoteflag != LyXParagraph::NO_FOOTNOTE && par &&
-              par->footnoteflag == LyXParagraph::NO_FOOTNOTE)) {
-               file += '\n';
-               texrow.newline();
-       }
-
-       lyxerr[Debug::LATEX] << "TeXOnePar...done " << par << endl;
-       return par;
-}
-#endif
-
-
-// This one spits out the text of the paragraph
-#ifdef USE_OSTREAM_ONLY
-bool LyXParagraph::SimpleTeXOnePar(ostream & os, TexRow & texrow)
-{
-       lyxerr[Debug::LATEX] << "SimpleTeXOnePar...     " << this << endl;
-
-       if (table)
-               return SimpleTeXOneTablePar(os, texrow);
-
-       bool return_value = false;
-
-       LyXLayout const & style =
-               textclasslist.Style(current_view->buffer()->params.textclass,
-                                   GetLayout());
-       LyXFont basefont, last_font;
+       
+       LyXFont basefont;
 
        // Maybe we have to create a optional argument.
-       size_type main_body;
+       pos_type main_body;
        if (style.labeltype != LABEL_MANUAL)
                main_body = 0;
        else
-               main_body = BeginningOfMainBody();
+               main_body = beginningOfMainBody();
+
+       int column = 0;
 
        if (main_body > 0) {
                os << '[';
-               basefont = getFont(-2); // Get label font
+               ++column;
+               basefont = getLabelFont(bparams);
        } else {
-               basefont = getFont(-1); // Get layout font
+               basefont = getLayoutFont(bparams);
        }
 
-       int column = 0;
-
-       if (main_body >= 0
-           && !text.size()
-           && !IsDummy()) {
+       if (main_body >= 0 && !pimpl_->size()) {
                if (style.isCommand()) {
                        os << '{';
                        ++column;
-               } else if (align != LYX_ALIGN_LAYOUT) {
-                       os << '{';
-                       ++column;
-                       return_value = true;
                }
        }
+
+       moving_arg |= style.needprotect;
  
        // Which font is currently active?
        LyXFont running_font(basefont);
@@ -2303,16 +1501,16 @@ bool LyXParagraph::SimpleTeXOnePar(ostream & os, TexRow & texrow)
 
        texrow.start(this, 0);
 
-       for (size_type i = 0; i < size(); ++i) {
+       for (pos_type i = 0; i < size(); ++i) {
                ++column;
                // First char in paragraph or after label?
-               if (i == main_body && !IsDummy()) {
+               if (i == main_body) {
                        if (main_body > 0) {
                                if (open_font) {
                                        column += running_font.latexWriteEndChanges(os, basefont, basefont);
                                        open_font = false;
                                }
-                               basefont = getFont(-1); // Now use the layout font
+                               basefont = getLayoutFont(bparams);
                                running_font = basefont;
                                os << ']';
                                ++column;
@@ -2320,52 +1518,66 @@ bool LyXParagraph::SimpleTeXOnePar(ostream & os, TexRow & texrow)
                        if (style.isCommand()) {
                                os << '{';
                                ++column;
-                       } else if (align != LYX_ALIGN_LAYOUT) {
-                               os << "{\\par";
-                               column += 4;
-                               return_value = true;
                        }
 
-                       if (noindent) {
-                               os << "\\noindent ";
-                               column += 10;
+                       if (!asdefault) {
+                               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:
+                                       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;
+                               }
                        }
-                       switch (align) {
-                       case LYX_ALIGN_NONE:
-                       case LYX_ALIGN_BLOCK:
-                       case LYX_ALIGN_LAYOUT:
-                       case LYX_ALIGN_SPECIAL: break;
-                       case LYX_ALIGN_LEFT:
-                               os << "\\raggedright ";
-                               column+= 13;
-                               break;
-                       case LYX_ALIGN_RIGHT:
-                               os << "\\raggedleft ";
-                               column+= 12;
-                               break;
-                       case LYX_ALIGN_CENTER:
-                               os << "\\centering ";
-                               column+= 11;
-                               break;
-                       }        
                }
 
-               int c = GetChar(i);
+               value_type c = getChar(i);
 
                // Fully instantiated font
-               LyXFont font = getFont(i);
-               last_font = running_font;
+               LyXFont font = getFont(bparams, i);
+
+               LyXFont const last_font = running_font;
 
                // Spaces at end of font change are simulated to be
                // outside font change, i.e. we write "\textXX{text} "
                // rather than "\textXX{text }". (Asger)
-               if (open_font && c == ' ' && i <= size() - 2 
-                   && !getFont(i+1).equalExceptLatex(running_font) 
-                   && !getFont(i+1).equalExceptLatex(font)) {
-                       font = getFont(i + 1);
+               if (open_font && c == ' ' && i <= size() - 2) {
+                       LyXFont const next_font = getFont(bparams, i + 1);
+                       if (next_font != running_font
+                           && next_font != font) {
+                               font = next_font;
+                       }
                }
+               
                // We end font definition before blanks
-               if (!font.equalExceptLatex(running_font) && open_font) {
+               if (font != running_font && open_font) {
                        column += running_font.latexWriteEndChanges(os,
                                                                    basefont,
                                                                    (i == main_body-1) ? basefont : font);
@@ -2374,55 +1586,74 @@ bool LyXParagraph::SimpleTeXOnePar(ostream & os, TexRow & texrow)
                }
 
                // Blanks are printed before start of fontswitch
-               if (c == ' '){
+               if (c == ' ') {
                        // Do not print the separation of the optional argument
                        if (i != main_body - 1) {
-                               SimpleTeXBlanks(os, texrow, i,
-                                               column, font, style);
+                               pimpl_->simpleTeXBlanks(os, texrow, i,
+                                                      column, font, style);
                        }
                }
 
                // Do we need to change font?
-               if (!font.equalExceptLatex(running_font)
-                   && i != main_body-1) {
+               if (font != running_font && i != main_body - 1) {
                        column += font.latexWriteStartChanges(os, basefont,
                                                              last_font);
                        running_font = font;
                        open_font = true;
                }
 
-               if (c == LyXParagraph::META_NEWLINE) {
+               if (c == Paragraph::META_NEWLINE) {
                        // newlines are handled differently here than
                        // the default in SimpleTeXSpecialChars().
-                       if (!style.newline_allowed
-                           || font.latex() == LyXFont::ON) {
+                       if (!style.newline_allowed) {
                                os << '\n';
                        } else {
                                if (open_font) {
                                        column += running_font.latexWriteEndChanges(os, basefont, basefont);
                                        open_font = false;
                                }
-                               basefont = getFont(-1);
+                               basefont = getLayoutFont(bparams);
                                running_font = basefont;
                                if (font.family() == 
                                    LyXFont::TYPEWRITER_FAMILY) {
                                        os << "~";
                                }
+                               if (moving_arg)
+                                       os << "\\protect ";
                                os << "\\\\\n";
                        }
                        texrow.newline();
                        texrow.start(this, i + 1);
                        column = 0;
                } else {
-                       SimpleTeXSpecialChars(os, texrow,
-                                             font, running_font, basefont,
-                                             open_font, style, i, column, c);
+                       pimpl_->simpleTeXSpecialChars(buf, bparams,
+                                                     os, texrow, moving_arg,
+                                                     font, running_font, 
+                                                     basefont, open_font, 
+                                                     style, i, column, c);
                }
        }
 
        // If we have an open font definition, we have to close it
        if (open_font) {
-               running_font.latexWriteEndChanges(os, basefont, basefont);
+#ifdef FIXED_LANGUAGE_END_DETECTION
+               if (next_) {
+                       running_font
+                               .latexWriteEndChanges(os, basefont,
+                                                     next_->getFont(bparams,
+                                                     0));
+               } else {
+                       running_font.latexWriteEndChanges(os, basefont,
+                                                         basefont);
+               }
+#else
+#ifdef WITH_WARNINGS
+//#warning For now we ALWAYS have to close the foreign font settings if they are
+//#warning there as we start another \selectlanguage with the next paragraph if
+//#warning we are in need of this. This should be fixed sometime (Jug)
+#endif
+               running_font.latexWriteEndChanges(os, basefont,  basefont);
+#endif
        }
 
        // Needed if there is an optional argument but no contents.
@@ -2431,3534 +1662,526 @@ bool LyXParagraph::SimpleTeXOnePar(ostream & os, TexRow & texrow)
                return_value = false;
        }
 
+       if (!asdefault) {
+               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 << "\\end{flushleft}";
+                               column+= 15;
+                       } else {
+                               os << "\\end{flushright}";
+                               column+= 16;
+                       }
+                       break;
+               case LYX_ALIGN_RIGHT:
+                       if (getParLanguage(bparams)->babel() != "hebrew") {
+                               os << "\\end{flushright}";
+                               column+= 16;
+                       } else {
+                               os << "\\end{flushleft}";
+                               column+= 15;
+                       }
+                       break;
+               case LYX_ALIGN_CENTER:
+                       os << "\\end{center}";
+                       column+= 12;
+                       break;
+               }
+       }
+
        lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl;
        return return_value;
 }
-#else
-bool LyXParagraph::SimpleTeXOnePar(string & file, TexRow & texrow)
+
+
+bool Paragraph::sgmlConvertChar(char c, string & sgml_string)
 {
-       lyxerr[Debug::LATEX] << "SimpleTeXOnePar...     " << this << endl;
+       bool retval = false;
+       switch (c) {
+       case Paragraph::META_HFILL:
+               sgml_string.erase();
+               break;
+       case Paragraph::META_NEWLINE:
+               sgml_string = '\n';
+               break;
+       case '&': 
+               sgml_string = "&amp;";
+               break;
+       case '<': 
+               sgml_string = "&lt;"; 
+               break;
+       case '>':
+               sgml_string = "&gt;"; 
+               break;
+       case '$': 
+               sgml_string = "&dollar;"; 
+               break;
+       case '#': 
+               sgml_string = "&num;";
+               break;
+       case '%': 
+               sgml_string = "&percnt;";
+               break;
+       case '[': 
+               sgml_string = "&lsqb;";
+               break;
+       case ']': 
+               sgml_string = "&rsqb;";
+               break;
+       case '{': 
+               sgml_string = "&lcub;";
+               break;
+       case '}': 
+               sgml_string = "&rcub;";
+               break;
+       case '~': 
+               sgml_string = "&tilde;";
+               break;
+       case '"': 
+               sgml_string = "&quot;";
+               break;
+       case '\\': 
+               sgml_string = "&bsol;";
+               break;
+       case ' ':
+               retval = true;
+               sgml_string = ' ';
+               break;
+       case '\0': // Ignore :-)
+               sgml_string.erase();
+               break;
+       default:
+               sgml_string = c;
+               break;
+       }
+       return retval;
+}
 
-       if (table)
-               return SimpleTeXOneTablePar(file, texrow);
 
-       bool return_value = false;
+Paragraph * Paragraph::TeXEnvironment(Buffer const * buf,
+                                           BufferParams const & bparams,
+                                           ostream & os, TexRow & texrow)
+{
+       lyxerr[Debug::LATEX] << "TeXEnvironment...     " << this << endl;
 
        LyXLayout const & style =
-               textclasslist.Style(current_view->buffer()->params.textclass,
-                                   GetLayout());
-       LyXFont basefont, last_font;
+               textclasslist.Style(bparams.textclass,
+                                   layout);
 
-       // Maybe we have to create a optional argument.
-       size_type main_body;
-       if (style.labeltype != LABEL_MANUAL)
-               main_body = 0;
-       else
-               main_body = BeginningOfMainBody();
+       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();
+               }
 
-       if (main_body > 0) {
-               file += '[';
-               basefont = getFont(-2); // Get label font
-       } else {
-               basefont = getFont(-1); // Get layout font
+               if (lyxrc.language_command_end.empty() ||
+                   language->babel() != doc_language->babel()) {
+                       os << subst(lyxrc.language_command_begin, "$$lang",
+                                   language->babel())
+                          << endl;
+                       texrow.newline();
+               }
        }
 
-       int column = 0;
+       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();
+       }
+       Paragraph * par = this;
+       do {
+               par = par->TeXOnePar(buf, bparams, os, texrow, false);
 
-       if (main_body >= 0
-           && !text.size()
-           && !IsDummy()) {
-               if (style.isCommand()) {
-                       file += '{';
-                       ++column;
-               } else if (align != LYX_ALIGN_LAYOUT) {
-                       file += '{';
-                       ++column;
-                       return_value = true;
+               if (par && par->params().depth() > params().depth()) {
+                       if (textclasslist.Style(bparams.textclass,
+                                               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();
+                       }
+                       par = par->pimpl_->TeXDeeper(buf, bparams, os, texrow);
                }
-       }
+       } while (par
+                && par->layout == layout
+                && par->params().depth() == params().depth());
  
-       // Which font is currently active?
-       LyXFont running_font = basefont;
-       // Do we have an open font change?
-       bool open_font = false;
+       if (style.isEnvironment()) {
+               os << "\\end{" << style.latexname() << "}\n";
+               texrow.newline();
+       }
 
-       texrow.start(this, 0);
+       lyxerr[Debug::LATEX] << "TeXEnvironment...done " << par << endl;
+       return par;  // ale970302
+}
 
-       for (size_type i = 0; i < size(); ++i) {
-               ++column;
-               // First char in paragraph or after label?
-               if (i == main_body && !IsDummy()) {
-                       if (main_body > 0) {
-                               if (open_font) {
-                                       column += running_font.latexWriteEndChanges(file, basefont, basefont);
-                                       open_font = false;
-                               }
-                               basefont = getFont(-1); // Now use the layout font
-                               running_font = basefont;
-                               file += ']';
-                               ++column;
-                       }
-                       if (style.isCommand()) {
-                               file += '{';
-                               ++column;
-                       } else if (align != LYX_ALIGN_LAYOUT) {
-                               file += "{\\par";
-                               column += 4;
-                               return_value = true;
-                       }
-
-                       if (noindent) {
-                               file += "\\noindent ";
-                               column += 10;
-                       }
-                       switch (align) {
-                       case LYX_ALIGN_NONE:
-                       case LYX_ALIGN_BLOCK:
-                       case LYX_ALIGN_LAYOUT:
-                       case LYX_ALIGN_SPECIAL: break;
-                       case LYX_ALIGN_LEFT:
-                               file += "\\raggedright ";
-                               column+= 13;
-                               break;
-                       case LYX_ALIGN_RIGHT:
-                               file += "\\raggedleft ";
-                               column+= 12;
-                               break;
-                       case LYX_ALIGN_CENTER:
-                               file += "\\centering ";
-                               column+= 11;
-                               break;
-                       }        
-               }
-
-               int c = GetChar(i);
-
-               // Fully instantiated font
-               LyXFont font = getFont(i);
-               last_font = running_font;
-
-               // Spaces at end of font change are simulated to be
-               // outside font change, i.e. we write "\textXX{text} "
-               // rather than "\textXX{text }". (Asger)
-               if (open_font && c == ' ' && i <= size() - 2 
-                   && !getFont(i+1).equalExceptLatex(running_font) 
-                   && !getFont(i+1).equalExceptLatex(font)) {
-                       font = getFont(i + 1);
-               }
-               // We end font definition before blanks
-               if (!font.equalExceptLatex(running_font) && open_font) {
-                       column += running_font.latexWriteEndChanges(file,
-                                                                   basefont,
-                                                                   (i == main_body-1) ? basefont : font);
-                       running_font = basefont;
-                       open_font = false;
-               }
-
-               // Blanks are printed before start of fontswitch
-               if (c == ' '){
-                       // Do not print the separation of the optional argument
-                       if (i != main_body - 1) {
-                               SimpleTeXBlanks(file, texrow, i,
-                                               column, font, style);
-                       }
-               }
-
-               // Do we need to change font?
-               if (!font.equalExceptLatex(running_font)
-                   && i != main_body-1) {
-                       column += font.latexWriteStartChanges(file, basefont, last_font);
-                       running_font = font;
-                       open_font = true;
-               }
-
-               if (c == LyXParagraph::META_NEWLINE) {
-                       // newlines are handled differently here than
-                       // the default in SimpleTeXSpecialChars().
-                       if (!style.newline_allowed
-                           || font.latex() == LyXFont::ON) {
-                               file += '\n';
-                       } else {
-                               if (open_font) {
-                                       column += running_font.latexWriteEndChanges(file, basefont, basefont);
-                                       open_font = false;
-                               }
-                               basefont = getFont(-1);
-                               running_font = basefont;
-                               if (font.family() == 
-                                   LyXFont::TYPEWRITER_FAMILY) {
-                                       file += "~";
-                               }
-                               file += "\\\\\n";
-                       }
-                       texrow.newline();
-                       texrow.start(this, i + 1);
-                       column = 0;
-               } else {
-                       SimpleTeXSpecialChars(file, texrow,
-                                             font, running_font, basefont,
-                                             open_font, style, i, column, c);
-               }
-       }
-
-       // If we have an open font definition, we have to close it
-       if (open_font) {
-               running_font.latexWriteEndChanges(file, basefont, basefont);
-       }
-
-       // Needed if there is an optional argument but no contents.
-       if (main_body > 0 && main_body == size()) {
-               file += "]~";
-               return_value = false;
-       }
-
-       lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl;
-       return return_value;
-}
-#endif
-
-
-#ifdef USE_OSTREAM_ONLY
-// This one spits out the text of a table paragraph
-bool LyXParagraph::SimpleTeXOneTablePar(ostream & os, TexRow & texrow)
-{
-       lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar...     " << this << endl;
-   
-       bool return_value = false;
-
-       LyXLayout const & style = 
-               textclasslist.Style(current_view->buffer()->params.textclass,
-                                   GetLayout());
-       int column = 0;
-       if (!IsDummy()) { // it is dummy if it is in a float!!!
-               if (style.isCommand()) {
-                       os << '{';
-                       ++column;
-               } else if (align != LYX_ALIGN_LAYOUT) {
-                       os << '{';
-                       ++column;
-                       return_value = true;
-               }
-               if (noindent) {
-                       os << "\\noindent ";
-                       column += 10;
-               }
-               switch (align) {
-               case LYX_ALIGN_NONE:
-               case LYX_ALIGN_BLOCK:
-               case LYX_ALIGN_LAYOUT:
-               case LYX_ALIGN_SPECIAL: break;
-               case LYX_ALIGN_LEFT:
-                       os << "\\raggedright ";
-                       column+= 13;
-                       break;
-               case LYX_ALIGN_RIGHT:
-                       os << "\\raggedleft ";
-                       column+= 12;
-                       break;
-               case LYX_ALIGN_CENTER:
-                       os << "\\centering ";
-                       column+= 11;
-                       break;
-               }
-       }
-
-       LyXFont basefont = getFont(-1); // Get layout font
-       // Which font is currently active?
-       LyXFont running_font = basefont;
-       LyXFont last_font;
-       // Do we have an open font change?
-       bool open_font = false;
-       int current_cell_number = -1;
-       int tmp = table->TexEndOfCell(os, current_cell_number);
-       for (; tmp > 0 ; --tmp)
-               texrow.newline();
-       
-       texrow.start(this, 0);
-
-       for (size_type i = 0; i < size(); ++i) {
-               char c = GetChar(i);
-               if (table->IsContRow(current_cell_number + 1)) {
-                       if (c == LyXParagraph::META_NEWLINE)
-                               ++current_cell_number;
-                       continue;
-               }
-               ++column;
-               
-               // Fully instantiated font
-               LyXFont font = getFont(i);
-               last_font = running_font;
-
-               // Spaces at end of font change are simulated to be
-               // outside font change.
-               // i.e. we write "\textXX{text} " rather than
-               // "\textXX{text }". (Asger)
-               if (open_font && c == ' ' && i <= size() - 2
-                   && getFont(i + 1) != running_font
-                   && getFont(i + 1) != font) {
-                       font = getFont(i + 1);
-               }
-
-               // We end font definition before blanks
-               if (font != running_font && open_font) {
-                       column += running_font.latexWriteEndChanges(os,
-                                                                   basefont,
-                                                                   font);
-                       running_font = basefont;
-                       open_font = false;
-               }
-               // Blanks are printed before start of fontswitch
-               if (c == ' '){
-                       SimpleTeXBlanks(os, texrow, i, column, font, style);
-               }
-               // Do we need to change font?
-               if (font != running_font) {
-                       column += font.latexWriteStartChanges(os, basefont,
-                                                             last_font);
-                       running_font = font;
-                       open_font = true;
-               }
-               // Do we need to turn on LaTeX mode?
-               if (font.latex() != running_font.latex()) {
-                       if (font.latex() == LyXFont::ON
-                           && style.needprotect) {
-                               os << "\\protect ";
-                               column += 9;
-                       }
-               }
-               if (c == LyXParagraph::META_NEWLINE) {
-                       // special case for inside a table
-                       // different from default case in
-                       // SimpleTeXSpecialChars()
-                       if (open_font) {
-                               column += running_font
-                                       .latexWriteEndChanges(os, basefont,
-                                                             basefont);
-                               open_font = false;
-                       }
-                       basefont = getFont(-1);
-                       running_font = basefont;
-                       ++current_cell_number;
-                       if (table->CellHasContRow(current_cell_number) >= 0) {
-                               TeXContTableRows(os, i + 1,
-                                                current_cell_number,
-                                                column, texrow);
-                       }
-                       // if this cell follow only ContRows till end don't
-                       // put the EndOfCell because it is put after the
-                       // for(...)
-                       if (table->ShouldBeVeryLastCell(current_cell_number)) {
-                               --current_cell_number;
-                               break;
-                       }
-                       int tmp = table->TexEndOfCell(os,
-                                                     current_cell_number);
-                       if (tmp > 0) {
-                               column = 0;
-                       } else if (tmp < 0) {
-                               tmp = -tmp;
-                       }
-                       for (; tmp--;) {
-                               texrow.newline();
-                       }
-                       texrow.start(this, i + 1);
-               } else {
-                       SimpleTeXSpecialChars(os, texrow,
-                                             font, running_font, basefont,
-                                             open_font, style, i, column, c);
-               }
-       }
-
-       // If we have an open font definition, we have to close it
-       if (open_font) {
-               running_font.latexWriteEndChanges(os, basefont, basefont);
-       }
-       ++current_cell_number;
-       tmp = table->TexEndOfCell(os, current_cell_number);
-       for (; tmp > 0; --tmp)
-               texrow.newline();
-       lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar...done " << this << endl;
-       return return_value;
-}
-#else
-// This one spits out the text of a table paragraph
-bool LyXParagraph::SimpleTeXOneTablePar(string & file, TexRow & texrow)
-{
-       lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar...     " << this << endl;
-   
-       bool return_value = false;
-
-       LyXLayout const & style = 
-               textclasslist.Style(current_view->buffer()->params.textclass,
-                                   GetLayout());
-       int column = 0;
-       if (!IsDummy()) { // it is dummy if it is in a float!!!
-               if (style.isCommand()) {
-                       file += '{';
-                       ++column;
-               } else if (align != LYX_ALIGN_LAYOUT) {
-                       file += '{';
-                       ++column;
-                       return_value = true;
-               }
-               if (noindent) {
-                       file += "\\noindent ";
-                       column += 10;
-               }
-               switch (align) {
-               case LYX_ALIGN_NONE:
-               case LYX_ALIGN_BLOCK:
-               case LYX_ALIGN_LAYOUT:
-               case LYX_ALIGN_SPECIAL: break;
-               case LYX_ALIGN_LEFT:
-                       file += "\\raggedright ";
-                       column+= 13;
-                       break;
-               case LYX_ALIGN_RIGHT:
-                       file += "\\raggedleft ";
-                       column+= 12;
-                       break;
-               case LYX_ALIGN_CENTER:
-                       file += "\\centering ";
-                       column+= 11;
-                       break;
-               }
-       }
-
-       LyXFont basefont = getFont(-1); // Get layout font
-       // Which font is currently active?
-       LyXFont running_font = basefont;
-       LyXFont last_font;
-       // Do we have an open font change?
-       bool open_font = false;
-       int current_cell_number = -1;
-       int tmp = table->TexEndOfCell(file, current_cell_number);
-       for (; tmp > 0 ; --tmp)
-               texrow.newline();
-       
-       texrow.start(this, 0);
-
-       for (size_type i = 0; i < size(); ++i) {
-               char c = GetChar(i);
-               if (table->IsContRow(current_cell_number + 1)) {
-                       if (c == LyXParagraph::META_NEWLINE)
-                               ++current_cell_number;
-                       continue;
-               }
-               ++column;
-               
-               // Fully instantiated font
-               LyXFont font = getFont(i);
-               last_font = running_font;
-
-               // Spaces at end of font change are simulated to be
-               // outside font change.
-               // i.e. we write "\textXX{text} " rather than
-               // "\textXX{text }". (Asger)
-               if (open_font && c == ' ' && i <= size() - 2
-                   && getFont(i+1) != running_font && getFont(i+1) != font) {
-                       font = getFont(i+1);
-               }
-
-               // We end font definition before blanks
-               if (font != running_font && open_font) {
-                       column += running_font.latexWriteEndChanges(file,
-                                                                   basefont, font);
-                       running_font = basefont;
-                       open_font = false;
-               }
-               // Blanks are printed before start of fontswitch
-               if (c == ' '){
-                       SimpleTeXBlanks(file, texrow, i, column, font, style);
-               }
-               // Do we need to change font?
-               if (font != running_font) {
-                       column += font.latexWriteStartChanges(file, basefont, last_font);
-                       running_font = font;
-                       open_font = true;
-               }
-               // Do we need to turn on LaTeX mode?
-               if (font.latex() != running_font.latex()) {
-                       if (font.latex() == LyXFont::ON
-                           && style.needprotect) {
-                               file += "\\protect ";
-                               column += 9;
-                       }
-               }
-               if (c == LyXParagraph::META_NEWLINE) {
-                       // special case for inside a table
-                       // different from default case in
-                       // SimpleTeXSpecialChars()
-                       if (open_font) {
-                               column += running_font
-                                       .latexWriteEndChanges(file, basefont, basefont);
-                               open_font = false;
-                       }
-                       basefont = getFont(-1);
-                       running_font = basefont;
-                       ++current_cell_number;
-                       if (table->CellHasContRow(current_cell_number) >= 0) {
-                               TeXContTableRows(file, i + 1,
-                                                current_cell_number,
-                                                column, texrow);
-                       }
-                       // if this cell follow only ContRows till end don't
-                       // put the EndOfCell because it is put after the
-                       // for(...)
-                       if (table->ShouldBeVeryLastCell(current_cell_number)) {
-                               --current_cell_number;
-                               break;
-                       }
-                       int tmp = table->TexEndOfCell(file,
-                                                     current_cell_number);
-                       if (tmp > 0) {
-                               column = 0;
-                       } else if (tmp < 0) {
-                               tmp = -tmp;
-                       }
-                       for (; tmp--;) {
-                               texrow.newline();
-                       }
-                       texrow.start(this, i + 1);
-               } else {
-                       SimpleTeXSpecialChars(file, texrow,
-                                             font, running_font, basefont,
-                                             open_font, style, i, column, c);
-               }
-       }
-
-       // If we have an open font definition, we have to close it
-       if (open_font) {
-               running_font.latexWriteEndChanges(file, basefont, basefont);
-       }
-       ++current_cell_number;
-       tmp = table->TexEndOfCell(file, current_cell_number);
-       for (; tmp > 0; --tmp)
-               texrow.newline();
-       lyxerr[Debug::LATEX] << "SimpleTeXOneTablePar...done " << this << endl;
-       return return_value;
-}
-#endif
-
-
-#ifdef USE_OSTREAM_ONLY
-// This one spits out the text off ContRows in tables
-bool LyXParagraph::TeXContTableRows(ostream & os,
-                                   LyXParagraph::size_type i,
-                                   int current_cell_number,
-                                   int & column, TexRow & texrow)
-{
-       lyxerr[Debug::LATEX] << "TeXContTableRows...     " << this << endl;
-       if (!table)
-               return false;
-    
-       char c;
-   
-       bool return_value = false;
-       LyXLayout const & style =
-               textclasslist.Style(current_view->buffer()->params.textclass,
-                                   GetLayout());
-       LyXFont basefont = getFont(-1); // Get layout font
-       LyXFont last_font;
-       // Which font is currently active?
-       LyXFont running_font = basefont;
-       // Do we have an open font change?
-       bool open_font = false;
-
-       size_type lastpos = i;
-       int cell = table->CellHasContRow(current_cell_number);
-       ++current_cell_number;
-       while(cell >= 0) {
-               // first find the right position
-               i = lastpos;
-               for (; (i < size()) && (current_cell_number<cell); ++i) {
-                       c = GetChar(i);
-                       if (c == LyXParagraph::META_NEWLINE)
-                               ++current_cell_number;
-               }
-               lastpos = i;
-               c = GetChar(i);
-               if (table->Linebreaks(table->FirstVirtualCell(cell))) {
-                       os << " \\\\\n";
-                       texrow.newline();
-                       column = 0;
-               } else if ((c != ' ') && (c != LyXParagraph::META_NEWLINE)) {
-                       os << ' ';
-               }
-
-               for (; i < size()
-                            && (c = GetChar(i)) != LyXParagraph::META_NEWLINE;
-                    ++i) {
-                       ++column;
-
-                       // Fully instantiated font
-                       LyXFont font = getFont(i);
-                       last_font = running_font;
-
-                       // Spaces at end of font change are simulated to
-                       // be outside font change. i.e. we write
-                       // "\textXX{text} " rather than "\textXX{text }".
-                       // (Asger)
-                       if (open_font && c == ' ' && i <= size() - 2 
-                           && getFont(i + 1) != running_font
-                           && getFont(i + 1) != font) {
-                               font = getFont(i + 1);
-                       }
-
-                       // We end font definition before blanks
-                       if (font != running_font && open_font) {
-                               column += running_font.latexWriteEndChanges(os, basefont, font);
-                               running_font = basefont;
-                               open_font = false;
-                       }
-                       // Blanks are printed before start of fontswitch
-                       if (c == ' '){
-                               SimpleTeXBlanks(os, texrow, i,
-                                               column, font, style);
-                       }
-                       // Do we need to change font?
-                       if (font != running_font) {
-                               column +=
-                                       font.latexWriteStartChanges(os,
-                                                                   basefont,
-                                                                   last_font);
-                               running_font = font;
-                               open_font = true;
-                       }
-                       // Do we need to turn on LaTeX mode?
-                       if (font.latex() != running_font.latex()) {
-                               if (font.latex() == LyXFont::ON
-                                   && style.needprotect) {
-                                       os << "\\protect ";
-                                       column += 9;
-                               }
-                       }
-                       SimpleTeXSpecialChars(os, texrow, font,
-                                             running_font, basefont,
-                                             open_font, style, i, column, c);
-               }
-               // If we have an open font definition, we have to close it
-               if (open_font) {
-                       running_font.latexWriteEndChanges(os, basefont,
-                                                         basefont);
-                       open_font = false;
-               }
-               basefont = getFont(-1);
-               running_font = basefont;
-               cell = table->CellHasContRow(current_cell_number);
-       }
-       lyxerr[Debug::LATEX] << "TeXContTableRows...done " << this << endl;
-       return return_value;
-}
-#else
-// This one spits out the text off ContRows in tables
-bool LyXParagraph::TeXContTableRows(string & file,
-                                   LyXParagraph::size_type i,
-                                   int current_cell_number,
-                                   int & column, TexRow & texrow)
-{
-       lyxerr[Debug::LATEX] << "TeXContTableRows...     " << this << endl;
-       if (!table)
-               return false;
-    
-       char c;
-   
-       bool return_value = false;
-       LyXLayout const & style =
-               textclasslist.Style(current_view->buffer()->params.textclass,
-                                   GetLayout());
-       LyXFont basefont = getFont(-1); // Get layout font
-       LyXFont last_font;
-       // Which font is currently active?
-       LyXFont running_font = basefont;
-       // Do we have an open font change?
-       bool open_font = false;
-
-       size_type lastpos = i;
-       int cell = table->CellHasContRow(current_cell_number);
-       ++current_cell_number;
-       while(cell >= 0) {
-               // first find the right position
-               i = lastpos;
-               for (; (i < size()) && (current_cell_number<cell); ++i) {
-                       c = GetChar(i);
-                       if (c == LyXParagraph::META_NEWLINE)
-                               ++current_cell_number;
-               }
-               lastpos = i;
-               c = GetChar(i);
-               if (table->Linebreaks(table->FirstVirtualCell(cell))) {
-                       file += " \\\\\n";
-                       texrow.newline();
-                       column = 0;
-               } else if ((c != ' ') && (c != LyXParagraph::META_NEWLINE)) {
-                       file += ' ';
-               }
-
-               for (; i < size()
-                            && (c = GetChar(i)) != LyXParagraph::META_NEWLINE;
-                    ++i) {
-                       ++column;
-
-                       // Fully instantiated font
-                       LyXFont font = getFont(i);
-                       last_font = running_font;
-
-                       // Spaces at end of font change are simulated to
-                       // be outside font change. i.e. we write
-                       // "\textXX{text} " rather than "\textXX{text }".
-                       // (Asger)
-                       if (open_font && c == ' ' && i <= size() - 2 
-                           && getFont(i + 1) != running_font
-                           && getFont(i + 1) != font) {
-                               font = getFont(i + 1);
-                       }
-
-                       // We end font definition before blanks
-                       if (font != running_font && open_font) {
-                               column += running_font.latexWriteEndChanges(file, basefont, font);
-                               running_font = basefont;
-                               open_font = false;
-                       }
-                       // Blanks are printed before start of fontswitch
-                       if (c == ' '){
-                               SimpleTeXBlanks(file, texrow, i,
-                                               column, font, style);
-                       }
-                       // Do we need to change font?
-                       if (font != running_font) {
-                               column +=
-                                       font.latexWriteStartChanges(file,
-                                                                   basefont, last_font);
-                               running_font = font;
-                               open_font = true;
-                       }
-                       // Do we need to turn on LaTeX mode?
-                       if (font.latex() != running_font.latex()) {
-                               if (font.latex() == LyXFont::ON
-                                   && style.needprotect)
-                                       {
-                                               file += "\\protect ";
-                                               column += 9;
-                                       }
-                       }
-                       SimpleTeXSpecialChars(file, texrow, font,
-                                             running_font, basefont,
-                                             open_font, style, i, column, c);
-               }
-               // If we have an open font definition, we have to close it
-               if (open_font) {
-                       running_font.latexWriteEndChanges(file, basefont, basefont);
-                       open_font = false;
-               }
-               basefont = getFont(-1);
-               running_font = basefont;
-               cell = table->CellHasContRow(current_cell_number);
-       }
-       lyxerr[Debug::LATEX] << "TeXContTableRows...done " << this << endl;
-       return return_value;
-}
-#endif
-
-
-bool LyXParagraph::linuxDocConvertChar(char c, string & sgml_string)
-{
-       bool retval = false;
-       switch (c) {
-       case LyXParagraph::META_HFILL:
-               sgml_string.clear();
-               break;
-#if 0
-       case LyXParagraph::META_PROTECTED_SEPARATOR: 
-               sgml_string = ' ';
-               break;
-#endif
-       case LyXParagraph::META_NEWLINE:
-               sgml_string = '\n';
-               break;
-       case '&': 
-               sgml_string = "&amp;";
-               break;
-       case '<': 
-               sgml_string = "&lt;"; 
-               break;
-       case '>':
-               sgml_string = "&gt;"; 
-               break;
-       case '$': 
-               sgml_string = "&dollar;"; 
-               break;
-       case '#': 
-               sgml_string = "&num;";
-               break;
-       case '%': 
-               sgml_string = "&percnt;";
-               break;
-       case '[': 
-               sgml_string = "&lsqb;";
-               break;
-       case ']': 
-               sgml_string = "&rsqb;";
-               break;
-       case '{': 
-               sgml_string = "&lcub;";
-               break;
-       case '}': 
-               sgml_string = "&rcub;";
-               break;
-       case '~': 
-               sgml_string = "&tilde;";
-               break;
-       case '"': 
-               sgml_string = "&quot;";
-               break;
-       case '\\': 
-               sgml_string = "&bsol;";
-               break;
-       case ' ':
-               retval = true;
-               sgml_string = ' ';
-               break;
-       case '\0': // Ignore :-)
-               sgml_string.clear();
-               break;
-       default:
-               sgml_string = c;
-               break;
-       }
-       return retval;
-}
-
-
-#ifdef USE_OSTREAM_ONLY
-void LyXParagraph::SimpleDocBookOneTablePar(ostream & os, string & extra,
-                                           int & desc_on, int depth) 
-{
-       if (!table) return;
-       lyxerr[Debug::LATEX] << "SimpleDocbookOneTablePar... " << this << endl;
-       int column = 0;
-       LyXFont font1, font2;
-       char c;
-       Inset * inset;
-       size_type main_body;
-       bool emph_flag = false;
-       
-       LyXLayout const & style =
-               textclasslist.Style(current_view->buffer()->params.textclass,
-                                   GetLayout());
-       
-       if (style.labeltype != LABEL_MANUAL)
-               main_body = 0;
-       else
-               main_body = BeginningOfMainBody();
-       
-       // Gets paragraph main font.
-       if (main_body > 0)
-               font1 = style.labelfont;
-       else
-               font1 = style.font;
-       
-       int char_line_count = depth;
-       os << newlineAndDepth(depth);
-       if (footnoteflag == LyXParagraph::NO_FOOTNOTE) {
-               os << "<INFORMALTABLE>"
-                  << newlineAndDepth(++depth);
-       }
-       int current_cell_number = -1;
-       int tmp = table->DocBookEndOfCell(os, current_cell_number, depth);
-       
-       // Parsing main loop.
-       for (size_type i = 0; i < size(); ++i) {
-               c = GetChar(i);
-               if (table->IsContRow(current_cell_number+1)) {
-                       if (c == LyXParagraph::META_NEWLINE)
-                               ++current_cell_number;
-                       continue;
-               }
-               ++column;
-               
-               // Fully instantiated font
-               font2 = getFont(i);
-               
-               // Handle <emphasis> tag.
-               if (font1.emph() != font2.emph() && i) {
-                       if (font2.emph() == LyXFont::ON) {
-                               os << "<emphasis>";
-                               emph_flag= true;
-                       } else if (emph_flag) {
-                               os << "</emphasis>";
-                               emph_flag= false;
-                       }
-               }
-               if (c == LyXParagraph::META_NEWLINE) {
-                       // We have only to control for emphasis open here!
-                       if (emph_flag) {
-                               os << "</emphasis>";
-                               emph_flag= false;
-                       }
-                       font1 = font2 = getFont(-1);
-                       ++current_cell_number;
-                       if (table->CellHasContRow(current_cell_number) >= 0) {
-                               DocBookContTableRows(os, extra, desc_on, i + 1,
-                                                    current_cell_number,
-                                                    column);
-                       }
-                       // if this cell follow only ContRows till end don't
-                       // put the EndOfCell because it is put after the
-                       // for(...)
-                       if (table->ShouldBeVeryLastCell(current_cell_number)) {
-                               --current_cell_number;
-                               break;
-                       }
-                       tmp = table->DocBookEndOfCell(os,
-                                                     current_cell_number,
-                                                     depth);
-                       
-                       if (tmp > 0)
-                               column = 0;
-               } else if (c == LyXParagraph::META_INSET) {
-                       inset = GetInset(i);
-#ifdef HAVE_SSTREAM
-                       ostringstream ost;
-                       inset->DocBook(ost);
-                       string tmp_out = ost.str().c_str();
-#else
-                       ostrstream ost;
-                       inset->DocBook(ost);
-                       ost << '\0';
-                       char * ctmp = ost.str();
-                       string tmp_out(ctmp);
-                       delete [] ctmp;
-#endif
-                       //
-                       // This code needs some explanation:
-                       // Two insets are treated specially
-                       //   label if it is the first element in a
-                       //   command paragraph
-                       //         desc_on == 3
-                       //   graphics inside tables or figure floats
-                       //   can't go on
-                       //   title (the equivalente in latex for this
-                       //   case is caption
-                       //   and title should come first
-                       //         desc_on == 4
-                       //
-                       if(desc_on != 3 || i != 0) {
-                               if(tmp_out[0] == '@') {
-                                       if(desc_on == 4)
-                                               extra += frontStrip(tmp_out,
-                                                                   '@');
-                                       else
-                                               os << frontStrip(tmp_out,
-                                                                '@');
-                               } else
-                                       os << tmp_out;
-                       }
-               } else if (font2.latex() == LyXFont::ON) {
-                       // "TeX"-Mode on == > SGML-Mode on.
-                       if (c != '\0')
-                               os << c;
-                       ++char_line_count;
-               } else {
-                       string sgml_string;
-                       if (linuxDocConvertChar(c, sgml_string) 
-                           && !style.free_spacing) {
-                               // in freespacing mode, spaces are
-                               // non-breaking characters
-                               // char is ' '
-                               if (desc_on == 1) {
-                                       ++char_line_count;
-                                       os << '\n'
-                                          << "</term><listitem><para>";
-                                       desc_on = 2;
-                               } else  {
-                                       os << c;
-                               }
-                       } else {
-                               os << sgml_string;
-                       }
-               }
-               font1 = font2;
-       }
-       
-       // Needed if there is an optional argument but no contents.
-       if (main_body > 0 && main_body == size()) {
-               font1 = style.font;
-       }
-
-       if (emph_flag) {
-               os << "</emphasis>";
-       }
-       
-       ++current_cell_number;
-       tmp = table->DocBookEndOfCell(os, current_cell_number, depth);
-       // Resets description flag correctly.
-       switch(desc_on){
-       case 1:
-               // <term> not closed...
-               os << "</term>";
-               break;
-       }
-       if (footnoteflag == LyXParagraph::NO_FOOTNOTE)
-               os << "</INFORMALTABLE>";
-       os << '\n';
-       lyxerr[Debug::LATEX] << "SimpleDocbookOneTablePar...done "
-                            << this << endl;
-}
-#else
-void LyXParagraph::SimpleDocBookOneTablePar(string & file, string & extra,
-                                           int & desc_on, int depth) 
-{
-       if (!table) return;
-       lyxerr[Debug::LATEX] << "SimpleDocbookOneTablePar... " << this << endl;
-       int column = 0;
-       LyXFont font1, font2;
-       char c;
-       Inset * inset;
-       size_type main_body;
-       bool emph_flag = false;
-       
-       LyXLayout const & style =
-               textclasslist.Style(current_view->buffer()->params.textclass,
-                                   GetLayout());
-       
-       if (style.labeltype != LABEL_MANUAL)
-               main_body = 0;
-       else
-               main_body = BeginningOfMainBody();
-       
-       // Gets paragraph main font.
-       if (main_body > 0)
-               font1 = style.labelfont;
-       else
-               font1 = style.font;
-       
-       int char_line_count = depth;
-       addNewlineAndDepth(file, depth);
-       if (footnoteflag == LyXParagraph::NO_FOOTNOTE) {
-               file += "<INFORMALTABLE>";
-               addNewlineAndDepth(file, ++depth);
-       }
-       int current_cell_number = -1;
-       int tmp = table->DocBookEndOfCell(file, current_cell_number, depth);
-       
-       // Parsing main loop.
-       for (size_type i = 0; i < size(); ++i) {
-               c = GetChar(i);
-               if (table->IsContRow(current_cell_number+1)) {
-                       if (c == LyXParagraph::META_NEWLINE)
-                               ++current_cell_number;
-                       continue;
-               }
-               ++column;
-               
-               // Fully instantiated font
-               font2 = getFont(i);
-               
-               // Handle <emphasis> tag.
-               if (font1.emph() != font2.emph() && i) {
-                       if (font2.emph() == LyXFont::ON) {
-                               file += "<emphasis>";
-                               emph_flag= true;
-                       } else if (emph_flag) {
-                               file += "</emphasis>";
-                               emph_flag= false;
-                       }
-               }
-               if (c == LyXParagraph::META_NEWLINE) {
-                       // We have only to control for emphasis open here!
-                       if (emph_flag) {
-                               file += "</emphasis>";
-                               emph_flag= false;
-                       }
-                       font1 = font2 = getFont(-1);
-                       ++current_cell_number;
-                       if (table->CellHasContRow(current_cell_number) >= 0) {
-                               DocBookContTableRows(file, extra, desc_on, i+1,
-                                                    current_cell_number,
-                                                    column);
-                       }
-                       // if this cell follow only ContRows till end don't
-                       // put the EndOfCell because it is put after the
-                       // for(...)
-                       if (table->ShouldBeVeryLastCell(current_cell_number)) {
-                               --current_cell_number;
-                               break;
-                       }
-                       tmp = table->DocBookEndOfCell(file,
-                                                     current_cell_number,
-                                                     depth);
-                       
-                       if (tmp > 0)
-                               column = 0;
-               } else if (c == LyXParagraph::META_INSET) {
-                       inset = GetInset(i);
-#ifdef USE_OSTREAM_ONLY
-#ifdef HAVE_SSTREAM
-                       ostringstream ost;
-                       inset->DocBook(ost);
-                       string tmp_out = ost.str().c_str();
-#else
-                       ostrstream ost;
-                       inset->DocBook(ost);
-                       ost << '\0';
-                       char * ctmp = ost.str();
-                       string tmp_out(ctmp);
-                       delete [] ctmp;
-#endif
-#else
-                       string tmp_out;
-                       inset->DocBook(tmp_out);
-#endif
-                       //
-                       // This code needs some explanation:
-                       // Two insets are treated specially
-                       //   label if it is the first element in a
-                       //   command paragraph
-                       //         desc_on == 3
-                       //   graphics inside tables or figure floats
-                       //   can't go on
-                       //   title (the equivalente in latex for this
-                       //   case is caption
-                       //   and title should come first
-                       //         desc_on == 4
-                       //
-                       if(desc_on != 3 || i != 0) {
-                               if(tmp_out[0] == '@') {
-                                       if(desc_on == 4)
-                                               extra += frontStrip(tmp_out,
-                                                                   '@');
-                                       else
-                                               file += frontStrip(tmp_out,
-                                                                  '@');
-                               } else
-                                       file += tmp_out;
-                       }
-               } else if (font2.latex() == LyXFont::ON) {
-                       // "TeX"-Mode on == > SGML-Mode on.
-                       if (c != '\0')
-                               file += c;
-                       ++char_line_count;
-               } else {
-                       string sgml_string;
-                       if (linuxDocConvertChar(c, sgml_string) 
-                           && !style.free_spacing) {
-                               // in freespacing mode, spaces are
-                               // non-breaking characters
-                               // char is ' '
-                               if (desc_on == 1) {
-                                       ++char_line_count;
-                                       file += '\n';
-                                       file += "</term><listitem><para>";
-                                       desc_on = 2;
-                               } else  {
-                                       file += c;
-                               }
-                       } else {
-                               file += sgml_string;
-                       }
-               }
-               font1 = font2;
-       }
-       
-       // Needed if there is an optional argument but no contents.
-       if (main_body > 0 && main_body == size()) {
-               font1 = style.font;
-       }
-
-       if (emph_flag) {
-               file += "</emphasis>";
-       }
-       
-       ++current_cell_number;
-       tmp = table->DocBookEndOfCell(file, current_cell_number, depth);
-       // Resets description flag correctly.
-       switch(desc_on){
-       case 1:
-               // <term> not closed...
-               file += "</term>";
-               break;
-       }
-       if (footnoteflag == LyXParagraph::NO_FOOTNOTE)
-               file += "</INFORMALTABLE>";
-       file += '\n';
-       lyxerr[Debug::LATEX] << "SimpleDocbookOneTablePar...done "
-                            << this << endl;
-}
-#endif
-
-
-#ifdef USE_OSTREAM_ONLY
-void LyXParagraph::DocBookContTableRows(ostream & os, string & extra,
-                                        int & desc_on,
-                                       LyXParagraph::size_type i,
-                                        int current_cell_number, int &column) 
-
-{
-       if (!table) return;
-       
-       lyxerr[Debug::LATEX] << "DocBookContTableRows... " << this << endl;
-
-       LyXFont font2;
-       char c;
-       Inset * inset;
-       //string emph = "emphasis";
-       bool emph_flag = false;
-       int char_line_count = 0;
-       
-       LyXLayout const & style =
-               textclasslist.Style(current_view->buffer()->params.textclass,
-                                   GetLayout());
-       
-       size_type main_body;
-       if (style.labeltype != LABEL_MANUAL)
-               main_body = 0;
-       else
-               main_body = BeginningOfMainBody();
-       
-       // Gets paragraph main font.
-       LyXFont font1;
-       if (main_body > 0)
-               font1 = style.labelfont;
-       else
-               font1 = style.font;
-       
-       size_type lastpos = i;
-       int cell = table->CellHasContRow(current_cell_number);
-       ++current_cell_number;
-       while(cell >= 0) {
-               // first find the right position
-               i = lastpos;
-               for (; i < size() && current_cell_number < cell; ++i) {
-                       c = GetChar(i);
-                       if (c == LyXParagraph::META_NEWLINE)
-                               ++current_cell_number;
-               }
-               lastpos = i;
-               c = GetChar(i);
-               // I don't know how to handle this so I comment it
-                // for the moment (Jug)
-//             if (table->Linebreaks(table->FirstVirtualCell(cell))) {
-//                     file += " \\\\\n";
-//                     column = 0;
-//             } else
-               if ((c != ' ') && (c != LyXParagraph::META_NEWLINE)) {
-                       os << ' ';
-               }
-
-               for (; i < size()
-                            && (c = GetChar(i)) != LyXParagraph::META_NEWLINE;
-                    ++i) {
-                       ++column;
-                       
-                       // Fully instantiated font
-                       font2 = getFont(i);
-                       
-                       // Handle <emphasis> tag.
-                       if (font1.emph() != font2.emph() && i) {
-                               if (font2.emph() == LyXFont::ON) {
-                                       os << "<emphasis>";
-                                       emph_flag= true;
-                               } else if (emph_flag) {
-                                       os << "</emphasis>";
-                                       emph_flag= false;
-                               }
-                       }
-                       if (c == LyXParagraph::META_INSET) {
-                               inset = GetInset(i);
-#ifdef HAVE_SSTREAM
-                               ostringstream ost;
-                               inset->DocBook(ost);
-                               string tmp_out = ost.str().c_str();
-#else
-                               ostrstream ost;
-                               inset->DocBook(ost);
-                               ost << '\0';
-                               char * ctmp = ost.str();
-                               string tmp_out(ctmp);
-                               delete [] ctmp;
-#endif
-                               //
-                               // This code needs some explanation:
-                               // Two insets are treated specially
-                               //   label if it is the first element in a
-                               //   command paragraph
-                               //       desc_on == 3
-                               //   graphics inside tables or figure floats
-                               //   can't go on title (the equivalente in
-                               //   latex for this case is caption and title
-                               //   should come first
-                               //       desc_on == 4
-                               //
-                               if(desc_on != 3 || i != 0) {
-                                       if(tmp_out[0] == '@') {
-                                               if(desc_on == 4)
-                                                       extra += frontStrip(tmp_out, '@');
-                                               else
-                                                       os << frontStrip(tmp_out, '@');
-                                       } else
-                                               os << tmp_out;
-                               }
-                       } else if (font2.latex() == LyXFont::ON) {
-                               // "TeX"-Mode on == > SGML-Mode on.
-                               if (c!= '\0')
-                                       os << c;
-                               ++char_line_count;
-                       } else {
-                               string sgml_string;
-                               if (linuxDocConvertChar(c, sgml_string) 
-                                   && !style.free_spacing) {
-                                       // in freespacing mode, spaces are
-                                       // non-breaking characters
-                                       // char is ' '
-                                       if (desc_on == 1) {
-                                               ++char_line_count;
-                                               os << '\n'
-                                                  << "</term><listitem><para>";
-                                               desc_on = 2;
-                                       } else  {
-                                               os << c;
-                                       }
-                               } else {
-                                       os << sgml_string;
-                               }
-                       }
-               }
-               // we have only to control for emphasis open here!
-               if (emph_flag) {
-                       os << "</emphasis>";
-                       emph_flag= false;
-               }
-               font1 = font2 = getFont(-1);
-               cell = table->CellHasContRow(current_cell_number);
-       }
-       lyxerr[Debug::LATEX] << "DocBookContTableRows...done " << this << endl;
-}
-#else
-void LyXParagraph::DocBookContTableRows(string & file, string & extra,
-                                        int & desc_on,
-                                       LyXParagraph::size_type i,
-                                        int current_cell_number, int &column) 
-
-{
-       if (!table) return;
-       
-       lyxerr[Debug::LATEX] << "DocBookContTableRows... " << this << endl;
-
-       LyXFont font2;
-       char c;
-       Inset * inset;
-       //string emph = "emphasis";
-       bool emph_flag= false;
-       int char_line_count= 0;
-       
-       LyXLayout const & style =
-               textclasslist.Style(current_view->buffer()->params.textclass,
-                                   GetLayout());
-       
-       size_type main_body;
-       if (style.labeltype != LABEL_MANUAL)
-               main_body = 0;
-       else
-               main_body = BeginningOfMainBody();
-       
-       // Gets paragraph main font.
-       LyXFont font1;
-       if (main_body > 0)
-               font1 = style.labelfont;
-       else
-               font1 = style.font;
-       
-       size_type lastpos = i;
-       int cell = table->CellHasContRow(current_cell_number);
-       ++current_cell_number;
-       while(cell >= 0) {
-               // first find the right position
-               i = lastpos;
-               for (; i < size() && current_cell_number < cell; ++i) {
-                       c = GetChar(i);
-                       if (c == LyXParagraph::META_NEWLINE)
-                               ++current_cell_number;
-               }
-               lastpos = i;
-               c = GetChar(i);
-               // I don't know how to handle this so I comment it
-                // for the moment (Jug)
-//             if (table->Linebreaks(table->FirstVirtualCell(cell))) {
-//                     file += " \\\\\n";
-//                     column = 0;
-//             } else
-               if ((c != ' ') && (c != LyXParagraph::META_NEWLINE)) {
-                       file += ' ';
-               }
-
-               for (; i < size()
-                            && (c = GetChar(i)) != LyXParagraph::META_NEWLINE;
-                    ++i) {
-                       ++column;
-                       
-                       // Fully instantiated font
-                       font2 = getFont(i);
-                       
-                       // Handle <emphasis> tag.
-                       if (font1.emph() != font2.emph() && i) {
-                               if (font2.emph() == LyXFont::ON) {
-                                       file += "<emphasis>";
-                                       emph_flag= true;
-                               } else if (emph_flag) {
-                                       file += "</emphasis>";
-                                       emph_flag= false;
-                               }
-                       }
-                       if (c == LyXParagraph::META_INSET) {
-                               inset = GetInset(i);
-#ifdef USE_OSTREAM_ONLY
-#ifdef HAVE_SSTREAM
-                               ostringstream ost;
-                               inset->DocBook(ost);
-                               string tmp_out = ost.str().c_str();
-#else
-                               ostrstream ost;
-                               inset->DocBook(ost);
-                               ost << '\0';
-                               char * ctmp = ost.str();
-                               string tmp_out(ctmp);
-                               delete [] ctmp;
-#endif
-#else
-                               string tmp_out;
-                               inset->DocBook(tmp_out);
-#endif
-                               //
-                               // This code needs some explanation:
-                               // Two insets are treated specially
-                               //   label if it is the first element in a
-                               //   command paragraph
-                               //       desc_on == 3
-                               //   graphics inside tables or figure floats
-                               //   can't go on title (the equivalente in
-                               //   latex for this case is caption and title
-                               //   should come first
-                               //       desc_on == 4
-                               //
-                               if(desc_on != 3 || i != 0) {
-                                       if(tmp_out[0] == '@') {
-                                               if(desc_on == 4)
-                                                       extra += frontStrip(tmp_out, '@');
-                                               else
-                                                       file += frontStrip(tmp_out, '@');
-                                       } else
-                                               file += tmp_out;
-                               }
-                       } else if (font2.latex() == LyXFont::ON) {
-                               // "TeX"-Mode on == > SGML-Mode on.
-                               if (c!= '\0')
-                                       file += c;
-                               ++char_line_count;
-                       } else {
-                               string sgml_string;
-                               if (linuxDocConvertChar(c, sgml_string) 
-                                   && !style.free_spacing) {
-                                       // in freespacing mode, spaces are
-                                       // non-breaking characters
-                                       // char is ' '
-                                       if (desc_on == 1) {
-                                               ++char_line_count;
-                                               file += '\n';
-                                               file += "</term><listitem><para>";
-                                               desc_on = 2;
-                                       } else  {
-                                               file += c;
-                                       }
-                               } else {
-                                       file += sgml_string;
-                               }
-                       }
-               }
-               // we have only to control for emphasis open here!
-               if (emph_flag) {
-                       file += "</emphasis>";
-                       emph_flag= false;
-               }
-               font1 = font2 = getFont(-1);
-               cell = table->CellHasContRow(current_cell_number);
-       }
-       lyxerr[Debug::LATEX] << "DocBookContTableRows...done " << this << endl;
-}
-#endif
-
-
-#ifdef USE_OSTREAM_ONLY
-void LyXParagraph::SimpleTeXBlanks(ostream & os, TexRow & texrow,
-                                  LyXParagraph::size_type const i,
-                                  int & column, LyXFont const & font,
-                                  LyXLayout const & style)
-{
-       if (column > tex_code_break_column
-           && i 
-           && GetChar(i - 1) != ' '
-           && (i < size() - 1)
-           // In LaTeX mode, we don't want to
-           // break lines since some commands
-           // do not like this
-           && ! (font.latex() == LyXFont::ON)
-           // same in FreeSpacing mode
-           && !style.free_spacing
-           // In typewriter mode, we want to avoid 
-           // ! . ? : at the end of a line
-           && !(font.family() == LyXFont::TYPEWRITER_FAMILY
-                && (GetChar(i-1) == '.'
-                    || GetChar(i-1) == '?' 
-                    || GetChar(i-1) == ':'
-                    || GetChar(i-1) == '!'))) {
-               if (tex_code_break_column == 0) {
-                       // in batchmode we need LaTeX to still
-                       // see it as a space not as an extra '\n'
-                       os << " %\n";
-               } else {
-                       os << '\n';
-               }
-               texrow.newline();
-               texrow.start(this, i + 1);
-               column = 0;
-       } else if (font.latex() == LyXFont::OFF) {
-               if (style.free_spacing) {
-                       os << '~';
-               } else {
-                       os << ' ';
-               }
-       }
-}
-#else
-void LyXParagraph::SimpleTeXBlanks(string & file, TexRow & texrow,
-                                  LyXParagraph::size_type const i,
-                                  int & column, LyXFont const & font,
-                                  LyXLayout const & style)
-{
-       if (column > tex_code_break_column
-           && i 
-           && GetChar(i - 1) != ' '
-           && (i < size() - 1)
-           // In LaTeX mode, we don't want to
-           // break lines since some commands
-           // do not like this
-           && ! (font.latex() == LyXFont::ON)
-           // same in FreeSpacing mode
-           && !style.free_spacing
-           // In typewriter mode, we want to avoid 
-           // ! . ? : at the end of a line
-           && !(font.family() == LyXFont::TYPEWRITER_FAMILY
-                && (GetChar(i-1) == '.'
-                    || GetChar(i-1) == '?' 
-                    || GetChar(i-1) == ':'
-                    || GetChar(i-1) == '!'))) {
-               if (tex_code_break_column == 0) {
-                       // in batchmode we need LaTeX to still
-                       // see it as a space not as an extra '\n'
-                       file += " %\n";
-               } else {
-                       file += '\n';
-               }
-               texrow.newline();
-               texrow.start(this, i+1);
-               column = 0;
-       } else if (font.latex() == LyXFont::OFF) {
-               if (style.free_spacing) {
-                       file += '~';
-               } else {
-                       file += ' ';
-               }
-       }
-}
-#endif
-
-
-#ifdef USE_OSTREAM_ONLY
-void LyXParagraph::SimpleTeXSpecialChars(ostream & os, TexRow & texrow,
-                                        LyXFont & font,
-                                        LyXFont & running_font,
-                                        LyXFont & basefont,
-                                        bool & open_font,
-                                        LyXLayout const & style,
-                                        LyXParagraph::size_type & i,
-                                        int & column, char const c)
-{
-       // Two major modes:  LaTeX or plain
-       // Handle here those cases common to both modes
-       // and then split to handle the two modes separately.
-       switch (c) {
-       case LyXParagraph::META_INSET: {
-               Inset * inset = GetInset(i);
-               if (inset) {
-                       bool close = false;
-                       int len = os.tellp();
-                       if ((inset->LyxCode() == Inset::GRAPHICS_CODE
-                            || inset->LyxCode() == Inset::MATH_CODE
-                            || inset->LyxCode() == Inset::URL_CODE)
-                           && running_font.getFontDirection()
-                           == LYX_DIR_RIGHT_TO_LEFT) {
-                               os << "\\L{";
-                               close = true;
-                       }
-
-                       int tmp = inset->Latex(os, style.isCommand());
-
-                       if (close)
-                               os << "}";
-                       
-                       if (tmp) {
-                               column = 0;
-                       } else {
-                               column += os.tellp() - len;
-                       }
-                       for (; tmp--;) {
-                               texrow.newline();
-                       }
-               }
-       }
-       break;
-
-       case LyXParagraph::META_NEWLINE:
-               if (open_font) {
-                       column += running_font.latexWriteEndChanges(os,
-                                                                   basefont,
-                                                                   basefont);
-                       open_font = false;
-               }
-               basefont = getFont(-1);
-               running_font = basefont;
-               break;
-
-       case LyXParagraph::META_HFILL: 
-               os << "\\hfill{}";
-               column += 7;
-               break;
-
-       default:
-               // And now for the special cases within each mode
-               // Are we in LaTeX mode?
-               if (font.latex() == LyXFont::ON) {
-                       // at present we only have one option
-                       // but I'll leave it as a switch statement
-                       // so its simpler to extend. (ARRae)
-                       switch (c) {
-#if 0
-                       case LyXParagraph::META_PROTECTED_SEPARATOR: 
-                               os << ' ';
-                               break;
-#endif
-                       default:
-                               // make sure that we will not print
-                               // error generating chars to the tex
-                               // file. This test would not be needed
-                               // if it were done in the buffer
-                               // itself.
-                               if (c != '\0') {
-                                       os << c;
-                               }
-                               break;
-                       }
-               } else {
-                       // Plain mode (i.e. not LaTeX)
-                       switch (c) {
-#if 0
-                       case LyXParagraph::META_PROTECTED_SEPARATOR: 
-                               os << '~';
-                               break;
-#endif
-                       case '\\': 
-                               os << "\\textbackslash{}";
-                               column += 15;
-                               break;
-               
-                       case '°': case '±': case '²': case '³':  
-                       case '×': case '÷': case '¹': case 'ª':
-                       case 'º': case '¬': case 'µ':
-                               if (current_view->buffer()->params.inputenc == "latin1") {
-                                       os << "\\ensuremath{"
-                                          << c
-                                          << '}';
-                                       column += 13;
-                               } else {
-                                       os << c;
-                               }
-                               break;
-
-                       case '|': case '<': case '>':
-                               // In T1 encoding, these characters exist
-                               if (lyxrc->fontenc == "T1") {
-                                       os << c;
-                                       //... but we should avoid ligatures
-                                       if ((c == '>' || c == '<')
-                                           && i <= size() - 2
-                                           && GetChar(i + 1) == c){
-                                               os << "\\textcompwordmark{}";
-                                               column += 19;
-                                       }
-                                       break;
-                               }
-                               // Typewriter font also has them
-                               if (font.family() == LyXFont::TYPEWRITER_FAMILY) {
-                                       os << c;
-                                       break;
-                               } 
-                               // Otherwise, we use what LaTeX
-                               // provides us.
-                               switch(c) {
-                               case '<':
-                                       os << "\\textless{}";
-                                       column += 10;
-                                       break;
-                               case '>':
-                                       os << "\\textgreater{}";
-                                       column += 13;
-                                       break;
-                               case '|':
-                                       os << "\\textbar{}";
-                                       column += 9;
-                                       break;
-                               }
-                               break;
-
-                       case '-': // "--" in Typewriter mode -> "-{}-"
-                               if (i <= size() - 2
-                                   && GetChar(i + 1) == '-'
-                                   && font.family() == LyXFont::TYPEWRITER_FAMILY) {
-                                       os << "-{}";
-                                       column += 2;
-                               } else {
-                                       os << '-';
-                               }
-                               break;
-
-                       case '\"': 
-                               os << "\\char`\\\"{}";
-                               column += 9;
-                               break;
 
-                       case '£':
-                               if (current_view->buffer()->params.inputenc == "default") {
-                                       os << "\\pounds{}";
-                                       column += 8;
-                               } else {
-                                       os << c;
-                               }
-                               break;
-
-                       case '$': case '&':
-                       case '%': case '#': case '{':
-                       case '}': case '_':
-                               os << '\\' << c;
-                               column += 1;
-                               break;
-
-                       case '~':
-                               os << "\\textasciitilde{}";
-                               column += 16;
-                               break;
-
-                       case '^':
-                               os << "\\textasciicircum{}";
-                               column += 17;
-                               break;
-
-                       case '*': case '[': case ']':
-                               // avoid being mistaken for optional arguments
-                               os << '{' << c << '}';
-                               column += 2;
-                               break;
-
-                       case ' ':
-                               // Blanks are printed before font switching.
-                               // Sure? I am not! (try nice-latex)
-                               // I am sure it's correct. LyX might be smarter
-                               // in the future, but for now, nothing wrong is
-                               // written. (Asger)
-                               break;
-
-                       default:
-                               /* idea for labels --- begin*/
-                               // Check for "LyX"
-                               if (c ==  'L'
-                                   && i <= size() - 3
-                                   && font.family() != LyXFont::TYPEWRITER_FAMILY
-                                   && GetChar(i + 1) == 'y'
-                                   && GetChar(i + 2) == 'X') {
-                                       os << "\\LyX{}";
-                                       i += 2;
-                                       column += 5;
-                               }
-                               // Check for "TeX"
-                               else if (c == 'T'
-                                        && i <= size() - 3
-                                        && font.family() != LyXFont::TYPEWRITER_FAMILY
-                                        && GetChar(i + 1) == 'e'
-                                        && GetChar(i + 2) == 'X') {
-                                       os << "\\TeX{}";
-                                       i += 2;
-                                       column += 5;
-                               }
-                               // Check for "LaTeX2e"
-                               else if (c == 'L'
-                                        && i <= size() - 7
-                                        && font.family() != LyXFont::TYPEWRITER_FAMILY
-                                        && GetChar(i + 1) == 'a'
-                                        && GetChar(i + 2) == 'T'
-                                        && GetChar(i + 3) == 'e'
-                                        && GetChar(i + 4) == 'X'
-                                        && GetChar(i + 5) == '2'
-                                        && GetChar(i + 6) == 'e') {
-                                       os << "\\LaTeXe{}";
-                                       i += 6;
-                                       column += 8;
-                               }
-                               // Check for "LaTeX"
-                               else if (c == 'L'
-                                        && i <= size() - 5
-                                        && font.family() != LyXFont::TYPEWRITER_FAMILY
-                                        && GetChar(i + 1) == 'a'
-                                        && GetChar(i + 2) == 'T'
-                                        && GetChar(i + 3) == 'e'
-                                        && GetChar(i + 4) == 'X') {
-                                       os << "\\LaTeX{}";
-                                       i += 4;
-                                       column += 7;
-                                       /* idea for labels --- end*/ 
-                               } else if (c != '\0') {
-                                       os << c;
-                               }
-                               break;
-                       }
-               }
-       }
-}
-#else
-void LyXParagraph::SimpleTeXSpecialChars(string & file, TexRow & texrow,
-                                        LyXFont & font,
-                                        LyXFont & running_font,
-                                        LyXFont & basefont,
-                                        bool & open_font,
-                                        LyXLayout const & style,
-                                        LyXParagraph::size_type & i,
-                                        int & column, char const c)
+bool Paragraph::isHfill(pos_type pos) const
 {
-       // Two major modes:  LaTeX or plain
-       // Handle here those cases common to both modes
-       // and then split to handle the two modes separately.
-       switch (c) {
-       case LyXParagraph::META_INSET: {
-               Inset * inset = GetInset(i);
-               if (inset) {
-                       bool close = false;
-                       int len = file.length();
-                       if ((inset->LyxCode() == Inset::GRAPHICS_CODE
-                            || inset->LyxCode() == Inset::MATH_CODE
-                            || inset->LyxCode() == Inset::URL_CODE)
-                           && running_font.getFontDirection()
-                           == LYX_DIR_RIGHT_TO_LEFT) {
-                               file += "\\L{";
-                               close = true;
-                       }
-#ifdef USE_OSTREAM_ONLY
-#ifdef HAVE_SSTREAM
-                       ostringstream ost;
-                       int tmp = inset->Latex(ost, style.isCommand());
-                       file += ost.str().c_str();
-#else
-                       ostrstream ost;
-                       int tmp = inset->Latex(ost, style.isCommand());
-                       ost << '\0';
-                       char * chtmp = ost.str();
-                       file += chtmp;
-                       delete [] chtmp;
-#endif         
-#else
-                       int tmp = inset->Latex(file, style.isCommand());
-#endif
-                       if (close)
-                               file += "}";
-                       
-                       if (tmp) {
-                               column = 0;
-                       } else {
-                               column += file.length() - len;
-                       }
-                       for (; tmp--;) {
-                               texrow.newline();
-                       }
-               }
-       }
-       break;
-
-       case LyXParagraph::META_NEWLINE:
-               if (open_font) {
-                       column += running_font.latexWriteEndChanges(file,
-                                                                   basefont, basefont);
-                       open_font = false;
-               }
-               basefont = getFont(-1);
-               running_font = basefont;
-               break;
-
-       case LyXParagraph::META_HFILL: 
-               file += "\\hfill{}";
-               column += 7;
-               break;
-
-       default:
-               // And now for the special cases within each mode
-               // Are we in LaTeX mode?
-               if (font.latex() == LyXFont::ON) {
-                       // at present we only have one option
-                       // but I'll leave it as a switch statement
-                       // so its simpler to extend. (ARRae)
-                       switch (c) {
-#if 0
-                       case LyXParagraph::META_PROTECTED_SEPARATOR: 
-                               file += ' ';
-                               break;
-#endif
-                       default:
-                               // make sure that we will not print
-                               // error generating chars to the tex
-                               // file. This test would not be needed
-                               // if it were done in the buffer
-                               // itself.
-                               if (c != '\0') {
-                                       file += c;
-                               }
-                               break;
-                       }
-               } else {
-                       // Plain mode (i.e. not LaTeX)
-                       switch (c) {
-#if 0
-                       case LyXParagraph::META_PROTECTED_SEPARATOR: 
-                               file += '~';
-                               break;
-#endif
-                       case '\\': 
-                               file += "\\textbackslash{}";
-                               column += 15;
-                               break;
-               
-                       case '°': case '±': case '²': case '³':  
-                       case '×': case '÷': case '¹': case 'ª':
-                       case 'º': case '¬': case 'µ':
-                               if (current_view->buffer()->params.inputenc == "latin1") {
-                                       file += "\\ensuremath{";
-                                       file += c;
-                                       file += '}';
-                                       column += 13;
-                               } else {
-                                       file += c;
-                               }
-                               break;
-
-                       case '|': case '<': case '>':
-                               // In T1 encoding, these characters exist
-                               if (lyxrc->fontenc == "T1") {
-                                       file += c;
-                                       //... but we should avoid ligatures
-                                       if ((c == '>' || c == '<')
-                                           && i <= size() - 2
-                                           && GetChar(i+1) == c){
-                                               file += "\\textcompwordmark{}";
-                                               column += 19;
-                                       }
-                                       break;
-                               }
-                               // Typewriter font also has them
-                               if (font.family() == LyXFont::TYPEWRITER_FAMILY) {
-                                       file += c;
-                                       break;
-                               } 
-                               // Otherwise, we use what LaTeX
-                               // provides us.
-                               switch(c) {
-                               case '<':
-                                       file += "\\textless{}";
-                                       column += 10;
-                                       break;
-                               case '>':
-                                       file += "\\textgreater{}";
-                                       column += 13;
-                                       break;
-                               case '|':
-                                       file += "\\textbar{}";
-                                       column += 9;
-                                       break;
-                               }
-                               break;
-
-                       case '-': // "--" in Typewriter mode -> "-{}-"
-                               if (i <= size() - 2
-                                   && GetChar(i + 1) == '-'
-                                   && font.family() == LyXFont::TYPEWRITER_FAMILY) {
-                                       file += "-{}";
-                                       column += 2;
-                               } else {
-                                       file += '-';
-                               }
-                               break;
-
-                       case '\"': 
-                               file += "\\char`\\\"{}";
-                               column += 9;
-                               break;
-
-                       case '£':
-                               if (current_view->buffer()->params.inputenc == "default") {
-                                       file += "\\pounds{}";
-                                       column += 8;
-                               } else {
-                                       file += c;
-                               }
-                               break;
-
-                       case '$': case '&':
-                       case '%': case '#': case '{':
-                       case '}': case '_':
-                               file += '\\';
-                               file += c;
-                               column += 1;
-                               break;
-
-                       case '~':
-                               file += "\\textasciitilde{}";
-                               column += 16;
-                               break;
-
-                       case '^':
-                               file += "\\textasciicircum{}";
-                               column += 17;
-                               break;
-
-                       case '*': case '[': case ']':
-                               // avoid being mistaken for optional arguments
-                               file += '{';
-                               file += c;
-                               file += '}';
-                               column += 2;
-                               break;
-
-                       case ' ':
-                               // Blanks are printed before font switching.
-                               // Sure? I am not! (try nice-latex)
-                               // I am sure it's correct. LyX might be smarter
-                               // in the future, but for now, nothing wrong is
-                               // written. (Asger)
-                               break;
-
-                       default:
-                               /* idea for labels --- begin*/
-                               // Check for "LyX"
-                               if (c ==  'L'
-                                   && i <= size() - 3
-                                   && font.family() != LyXFont::TYPEWRITER_FAMILY
-                                   && GetChar(i + 1) == 'y'
-                                   && GetChar(i + 2) == 'X') {
-                                       file += "\\LyX{}";
-                                       i += 2;
-                                       column += 5;
-                               }
-                               // Check for "TeX"
-                               else if (c == 'T'
-                                        && i <= size() - 3
-                                        && font.family() != LyXFont::TYPEWRITER_FAMILY
-                                        && GetChar(i + 1) == 'e'
-                                        && GetChar(i + 2) == 'X') {
-                                       file += "\\TeX{}";
-                                       i += 2;
-                                       column += 5;
-                               }
-                               // Check for "LaTeX2e"
-                               else if (c == 'L'
-                                        && i <= size() - 7
-                                        && font.family() != LyXFont::TYPEWRITER_FAMILY
-                                        && GetChar(i + 1) == 'a'
-                                        && GetChar(i + 2) == 'T'
-                                        && GetChar(i + 3) == 'e'
-                                        && GetChar(i + 4) == 'X'
-                                        && GetChar(i + 5) == '2'
-                                        && GetChar(i + 6) == 'e') {
-                                       file += "\\LaTeXe{}";
-                                       i += 6;
-                                       column += 8;
-                               }
-                               // Check for "LaTeX"
-                               else if (c == 'L'
-                                        && i <= size() - 5
-                                        && font.family() != LyXFont::TYPEWRITER_FAMILY
-                                        && GetChar(i + 1) == 'a'
-                                        && GetChar(i + 2) == 'T'
-                                        && GetChar(i + 3) == 'e'
-                                        && GetChar(i + 4) == 'X') {
-                                       file += "\\LaTeX{}";
-                                       i += 4;
-                                       column += 7;
-                                       /* idea for labels --- end*/ 
-                               } else if (c != '\0') {
-                                       file += c;
-                               }
-                               break;
-                       }
-               }
-       }
+       return IsHfillChar(getChar(pos));
 }
-#endif
 
 
-#if 0
-bool LyXParagraph::RoffContTableRows(ostream & os,
-                                    LyXParagraph::size_type i,
-                                    int actcell)
+bool Paragraph::isInset(pos_type pos) const
 {
-       if (!table)
-               return false;
-
-       LyXFont font1(LyXFont::ALL_INHERIT);
-       LyXFont font2;
-       Inset * inset;
-       char c;
-
-       string fname2 = TmpFileName(string(), "RAT2");
-       int lastpos = i;
-       int cell = table->CellHasContRow(actcell);
-       ++actcell;
-       while(cell >= 0) {
-               // first find the right position
-               i = lastpos;
-               for (; i < size() && actcell < cell; ++i) {
-                       c = GetChar(i);
-                       if (c == LyXParagraph::META_NEWLINE)
-                               ++actcell;
-               }
-               lastpos = i;
-               c = GetChar(i);
-               if ((c != ' ') && (c != LyXParagraph::META_NEWLINE))
-                       os << " ";
-               for (; i < size()
-                            && (c = GetChar(i)) != LyXParagraph::META_NEWLINE;
-                    ++i) {
-                       font2 = GetFontSettings(i);
-                       if (font1.latex() != font2.latex()) {
-                               if (font2.latex() != LyXFont::OFF)
-                                       continue;
-                       }
-                       c = GetChar(i);
-                       switch (c) {
-                       case LyXParagraph::META_INSET:
-                               if ((inset = GetInset(i))) {
-#if 1
-#ifdef HAVE_SSTREAM
-                                       stringstream ss(ios::in | ios::out);
-                                       inset->Latex(ss, -1);
-                                       ss.seekp(0);
-                                       ss.get(c);
-                                       while (!ss) {
-                                               if (c == '\\')
-                                                       os << "\\\\";
-                                               else
-                                                       os << c;
-                                               ss.get(c);
-                                       }
-#else
-                                       strstream ss;
-                                       inset->Latex(ss, -1);
-                                       ss.seekp(0);
-                                       ss.get(c);
-                                       while (!ss) {
-                                               if (c == '\\')
-                                                       os << "\\\\";
-                                               else
-                                                       os << c;
-                                               ss.get(c);
-                                       }
-                                       delete [] ss.str();
-#endif
-#else
-                                       fstream fs(fname2.c_str(),
-                                                  ios::in|ios::out);
-                                       if (!fs) {
-                                               WriteAlert(_("LYX_ERROR:"),
-                                                          _("Cannot open temporary file:"),
-                                                          fname2);
-                                               return false;
-                                       }
-                                       inset->Latex(fs, -1);
-                                       fs.seekp(0);
-                                       fs.get(c);
-                                       while (!fs) {
-                                               if (c == '\\')
-                                                       os << "\\\\";
-                                               else
-                                                       os << c;
-                                               fs.get(c);
-                                       }
-                                       fs.close();
-#endif
-                               }
-                               break;
-                       case LyXParagraph::META_NEWLINE:
-                               break;
-                       case LyXParagraph::META_HFILL: 
-                               break;
-#if 0
-                       case LyXParagraph::META_PROTECTED_SEPARATOR:
-                               break;
-#endif
-                       case '\\': 
-                               os << "\\\\";
-                               break;
-                       default:
-                               if (c != '\0')
-                                       os << c;
-                               else
-                                       lyxerr.debug() << "RoffAsciiTable: "
-                                               "NULL char in structure."
-                                                      << endl;
-                               break;
-                       }
-               }
-               cell = table->CellHasContRow(actcell);
-       }
-       return true;
+       return IsInsetChar(getChar(pos));
 }
-#endif
-
 
-#ifdef USE_OSTREAM_ONLY
-LyXParagraph * LyXParagraph::TeXDeeper(ostream & os, TexRow & texrow,
-                                      ostream & foot, TexRow & foot_texrow,
-                                      int & foot_count)
-{
-       lyxerr[Debug::LATEX] << "TeXDeeper...     " << this << endl;
-       LyXParagraph * par = this;
-
-       while (par && par->depth == depth) {
-               if (par->IsDummy())
-                       lyxerr << "ERROR (LyXParagraph::TeXDeeper)" << endl;
-               if (textclasslist.Style(current_view->buffer()->params.textclass, 
-                                       par->layout).isEnvironment()
-                   || par->pextra_type != PEXTRA_NONE) {
-                       par = par->TeXEnvironment(os, texrow,
-                                                 foot, foot_texrow,
-                                                 foot_count);
-               } else {
-                       par = par->TeXOnePar(os, texrow,
-                                            foot, foot_texrow,
-                                            foot_count);
-               }
-       }
-       lyxerr[Debug::LATEX] << "TeXDeeper...done " << par << endl;
 
-       return par;
-}
-#else
-LyXParagraph * LyXParagraph::TeXDeeper(string & file, TexRow & texrow,
-                                      string & foot, TexRow & foot_texrow,
-                                      int & foot_count)
+bool Paragraph::isNewline(pos_type pos) const
 {
-       lyxerr[Debug::LATEX] << "TeXDeeper...     " << this << endl;
-       LyXParagraph * par = this;
-
-       while (par && par->depth == depth) {
-               if (par->IsDummy())
-                       lyxerr << "ERROR (LyXParagraph::TeXDeeper)" << endl;
-               if (textclasslist.Style(current_view->buffer()->params.textclass, 
-                                       par->layout).isEnvironment()
-                   || par->pextra_type != PEXTRA_NONE) 
-                       {
-                               par = par->TeXEnvironment(file, texrow,
-                                                         foot, foot_texrow,
-                                                         foot_count);
-                       } else {
-                               par = par->TeXOnePar(file, texrow,
-                                                    foot, foot_texrow,
-                                                    foot_count);
-                       }
-       }
-       lyxerr[Debug::LATEX] << "TeXDeeper...done " << par << endl;
-
-       return par;
+       return pos >= 0 && IsNewlineChar(getChar(pos));
 }
-#endif
 
 
-#ifdef USE_OSTREAM_ONLY
-LyXParagraph * LyXParagraph::TeXEnvironment(ostream & os, TexRow & texrow,
-                                           ostream & foot,
-                                           TexRow & foot_texrow,
-                                           int & foot_count)
+bool Paragraph::isSeparator(pos_type pos) const
 {
-       bool eindent_open = false;
-       bool foot_this_level = false;
-       // flags when footnotetext should be appended to file.
-        static bool minipage_open = false;
-        static int minipage_open_depth = 0;
-       char par_sep = current_view->buffer()->params.paragraph_separation;
-    
-       lyxerr[Debug::LATEX] << "TeXEnvironment...     " << this << endl;
-       if (IsDummy())
-               lyxerr << "ERROR (LyXParagraph::TeXEnvironment)" << endl;
-
-       LyXLayout const & style =
-               textclasslist.Style(current_view->buffer()->params.textclass,
-                                   layout);
-       
-       if (pextra_type == PEXTRA_INDENT) {
-               if (!pextra_width.empty()) {
-                       os << "\\begin{LyXParagraphIndent}{"
-                          << pextra_width << "}\n";
-               } else {
-                       //float ib = atof(pextra_widthp.c_str())/100;
-                       // string can't handle floats at present (971109)
-                       // so I'll do a conversion by hand knowing that
-                       // the limits are 0.0 to 1.0. ARRae.
-                       os << "\\begin{LyXParagraphIndent}{";
-                       switch (pextra_widthp.length()) {
-                       case 3:
-                               os << "1.00";
-                               break;
-                       case 2:
-                               os << "0."
-                                  << pextra_widthp;
-                               break;
-                       case 1:
-                               os << "0.0"
-                                  << pextra_widthp;
-                       }
-                       os << "\\columnwidth}\n";
-               }
-               texrow.newline();
-               eindent_open = true;
-       }
-       if ((pextra_type == PEXTRA_MINIPAGE) && !minipage_open) {
-               if (pextra_hfill && Previous() &&
-                   (Previous()->pextra_type == PEXTRA_MINIPAGE)) {
-                       os << "\\hfill{}\n";
-                       texrow.newline();
-               }
-               if (par_sep == BufferParams::PARSEP_INDENT) {
-                       os << "{\\setlength\\parindent{0pt}\n";
-                       texrow.newline();
-               }
-               os << "\\begin{minipage}";
-               switch(pextra_alignment) {
-               case MINIPAGE_ALIGN_TOP:
-                       os << "[t]";
-                       break;
-               case MINIPAGE_ALIGN_MIDDLE:
-                       os << "[m]";
-                       break;
-               case MINIPAGE_ALIGN_BOTTOM:
-                       os << "[b]";
-                       break;
-               }
-               if (!pextra_width.empty()) {
-                       os << '{' << pextra_width << "}\n";
-               } else {
-                       //float ib = atof(par->pextra_width.c_str())/100;
-                       // string can't handle floats at present
-                       // so I'll do a conversion by hand knowing that
-                       // the limits are 0.0 to 1.0. ARRae.
-                       os << '{';
-                       switch (pextra_widthp.length()) {
-                       case 3:
-                               os << "1.00";
-                               break;
-                       case 2:
-                               os << "0."
-                                  << pextra_widthp;
-                               break;
-                       case 1:
-                               os << "0.0"
-                                  << pextra_widthp;
-                       }
-                       os << "\\columnwidth}\n";
-               }
-               texrow.newline();
-               if (par_sep == BufferParams::PARSEP_INDENT) {
-                       os << "\\setlength\\parindent{\\LyXMinipageIndent}\n";
-                       texrow.newline();
-               }
-               minipage_open = true;
-                minipage_open_depth = depth;
-       }
-
-#ifdef WITH_WARNINGS
-#warning Define FANCY_FOOTNOTE_CODE to re-enable Allan footnote code
-       //I disabled it because it breaks when lists span on several
-       //pages (JMarc)
-#endif
-       if (style.isEnvironment()){
-               if (style.latextype == LATEX_LIST_ENVIRONMENT) {
-#ifdef FANCY_FOOTNOTE_CODE
-                       if (foot_count < 0) {
-                               // flag that footnote[mark][text] should be
-                               // used for any footnotes from now on
-                               foot_count = 0;
-                               foot_this_level = true;
-                       }
-#endif
-                       os << "\\begin{" << style.latexname() << "}{"
-                          << labelwidthstring << "}\n";
-               } else if (style.labeltype == LABEL_BIBLIO) {
-                       // ale970405
-                       os << "\\begin{" << style.latexname() << "}{"
-                          << bibitemWidthest(current_view->painter())
-                          << "}\n";
-               } else if (style.latextype == LATEX_ITEM_ENVIRONMENT) {
-#ifdef FANCY_FOOTNOTE_CODE
-                       if (foot_count < 0) {
-                               // flag that footnote[mark][text] should be
-                               // used for any footnotes from now on
-                               foot_count = 0;
-                               foot_this_level = true;
-                       }
-#endif
-                       os << "\\begin{" << style.latexname() << '}'
-                          << style.latexparam() << '\n';
-               } else 
-                       os << "\\begin{" << style.latexname() << '}'
-                          << style.latexparam() << '\n';
-               texrow.newline();
-       }
-       LyXParagraph * par = this;
-       do {
-               par = par->TeXOnePar(os, texrow,
-                                    foot, foot_texrow, foot_count);
-
-                if (minipage_open && par && !style.isEnvironment() &&
-                    (par->pextra_type == PEXTRA_MINIPAGE) &&
-                    par->pextra_start_minipage) {
-                       os << "\\end{minipage}\n";
-                       texrow.newline();
-                       if (par_sep == BufferParams::PARSEP_INDENT) {
-                               os << "}\n";
-                               texrow.newline();
-                       }
-                       minipage_open = false;
-                }
-               if (par && par->depth > depth) {
-                       if (textclasslist.Style(current_view->buffer()->params.textclass,
-                                               par->layout).isParagraph()
-                           && !par->table
-                           // 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();
-                       }
-                       par = par->TeXDeeper(os, texrow,
-                                            foot, foot_texrow, foot_count);
-               }
-               if (par && par->layout == layout && par->depth == depth &&
-                   (par->pextra_type == PEXTRA_MINIPAGE) && !minipage_open) {
-                       if (par->pextra_hfill && par->Previous() &&
-                           (par->Previous()->pextra_type == PEXTRA_MINIPAGE)){
-                               os << "\\hfill{}\n";
-                                texrow.newline();
-                        }
-                       if (par_sep == BufferParams::PARSEP_INDENT) {
-                               os << "{\\setlength\\parindent{0pt}\n";
-                               texrow.newline();
-                       }
-                       os << "\\begin{minipage}";
-                       switch(par->pextra_alignment) {
-                       case MINIPAGE_ALIGN_TOP:
-                               os << "[t]";
-                               break;
-                       case MINIPAGE_ALIGN_MIDDLE:
-                               os << "[m]";
-                               break;
-                       case MINIPAGE_ALIGN_BOTTOM:
-                               os << "[b]";
-                               break;
-                       }
-                       if (!par->pextra_width.empty()) {
-                               os << '{' << par->pextra_width << "}\n";
-                       } else {
-                               //float ib = atof(par->pextra_widthp.c_str())/100;
-                               // string can't handle floats at present
-                               // so I'll do a conversion by hand knowing that
-                               // the limits are 0.0 to 1.0. ARRae.
-                               os << '{';
-                               switch (par->pextra_widthp.length()) {
-                               case 3:
-                                       os << "1.00";
-                                       break;
-                               case 2:
-                                       os << "0." << par->pextra_widthp;
-                                       break;
-                               case 1:
-                                       os << "0.0" << par->pextra_widthp;
-                               }
-                               os << "\\columnwidth}\n";
-                       }
-                       texrow.newline();
-                       if (par_sep == BufferParams::PARSEP_INDENT) {
-                               os << "\\setlength\\parindent{\\LyXMinipageIndent}\n";
-                               texrow.newline();
-                       }
-                       minipage_open = true;
-                        minipage_open_depth = par->depth;
-               }
-       } while (par
-                && par->layout == layout
-                && par->depth == depth
-                && par->pextra_type == pextra_type);
-       if (style.isEnvironment()) {
-               os << "\\end{" << style.latexname() << '}';
-               // maybe this should go after the minipage closes?
-               if (foot_this_level) {
-                       if (foot_count >= 1) {
-                               if (foot_count > 1) {
-                                       os << "\\addtocounter{footnote}{-"
-                                          << foot_count - 1
-                                          << '}';
-                               }
-                               os << foot;
-                               texrow += foot_texrow;
-                               foot.clear();
-                               foot_texrow.reset();
-                               foot_count = 0;
-                       }
-               }
-       }
-        if (minipage_open && (minipage_open_depth == depth) &&
-            (!par || par->pextra_start_minipage ||
-             par->pextra_type != PEXTRA_MINIPAGE)) {
-                os << "\\end{minipage}\n";
-               texrow.newline();
-                if (par_sep == BufferParams::PARSEP_INDENT) {
-                        os << "}\n";
-                       texrow.newline();
-                }
-                if (par && par->pextra_type != PEXTRA_MINIPAGE) {
-                        os << "\\medskip\n\n";
-                       texrow.newline();
-                       texrow.newline();
-                }
-                minipage_open = false;
-        }
-       if (eindent_open) {
-               os << "\\end{LyXParagraphIndent}\n";
-               texrow.newline();
-       }
-        if (!(par && (par->pextra_type == PEXTRA_MINIPAGE) 
-             && par->pextra_hfill)) {
-                os << '\n';
-               texrow.newline();
-       }
-       lyxerr[Debug::LATEX] << "TeXEnvironment...done " << par << endl;
-       return par;  // ale970302
+       return IsSeparatorChar(getChar(pos));
 }
-#else
-LyXParagraph * LyXParagraph::TeXEnvironment(string & file, TexRow & texrow,
-                                           string & foot,
-                                           TexRow & foot_texrow,
-                                           int & foot_count)
-{
-       bool eindent_open = false;
-       bool foot_this_level = false;
-       // flags when footnotetext should be appended to file.
-        static bool minipage_open = false;
-        static int minipage_open_depth = 0;
-       char par_sep = current_view->buffer()->params.paragraph_separation;
-    
-       lyxerr[Debug::LATEX] << "TeXEnvironment...     " << this << endl;
-       if (IsDummy())
-               lyxerr << "ERROR (LyXParagraph::TeXEnvironment)" << endl;
-
-       LyXLayout const & style =
-               textclasslist.Style(current_view->buffer()->params.textclass,
-                                   layout);
-       
-       if (pextra_type == PEXTRA_INDENT) {
-               if (!pextra_width.empty()) {
-                       file += "\\begin{LyXParagraphIndent}{"
-                               + pextra_width + "}\n";
-               } else {
-                       //float ib = atof(pextra_widthp.c_str())/100;
-                       // string can't handle floats at present (971109)
-                       // so I'll do a conversion by hand knowing that
-                       // the limits are 0.0 to 1.0. ARRae.
-                       file += "\\begin{LyXParagraphIndent}{";
-                       switch (pextra_widthp.length()) {
-                       case 3:
-                               file += "1.00";
-                               break;
-                       case 2:
-                               file += "0.";
-                               file += pextra_widthp;
-                               break;
-                       case 1:
-                               file += "0.0";
-                               file += pextra_widthp;
-                       }
-                       file += "\\columnwidth}\n";
-               }
-               texrow.newline();
-               eindent_open = true;
-       }
-       if ((pextra_type == PEXTRA_MINIPAGE) && !minipage_open) {
-               if (pextra_hfill && Previous() &&
-                   (Previous()->pextra_type == PEXTRA_MINIPAGE)) {
-                       file += "\\hfill{}\n";
-                       texrow.newline();
-               }
-               if (par_sep == BufferParams::PARSEP_INDENT) {
-                       file += "{\\setlength\\parindent{0pt}\n";
-                       texrow.newline();
-               }
-               file += "\\begin{minipage}";
-               switch(pextra_alignment) {
-               case MINIPAGE_ALIGN_TOP:
-                       file += "[t]";
-                       break;
-               case MINIPAGE_ALIGN_MIDDLE:
-                       file += "[m]";
-                       break;
-               case MINIPAGE_ALIGN_BOTTOM:
-                       file += "[b]";
-                       break;
-               }
-               if (!pextra_width.empty()) {
-                       file += '{';
-                       file += pextra_width + "}\n";
-               } else {
-                       //float ib = atof(par->pextra_width.c_str())/100;
-                       // string can't handle floats at present
-                       // so I'll do a conversion by hand knowing that
-                       // the limits are 0.0 to 1.0. ARRae.
-                       file += '{';
-                       switch (pextra_widthp.length()) {
-                       case 3:
-                               file += "1.00";
-                               break;
-                       case 2:
-                               file += "0.";
-                               file += pextra_widthp;
-                               break;
-                       case 1:
-                               file += "0.0";
-                               file += pextra_widthp;
-                       }
-                       file += "\\columnwidth}\n";
-               }
-               texrow.newline();
-               if (par_sep == BufferParams::PARSEP_INDENT) {
-                       file += "\\setlength\\parindent{\\LyXMinipageIndent}\n";
-                       texrow.newline();
-               }
-               minipage_open = true;
-                minipage_open_depth = depth;
-       }
 
-#ifdef WITH_WARNINGS
-#warning Define FANCY_FOOTNOTE_CODE to re-enable Allan footnote code
-       //I disabled it because it breaks when lists span on several
-       //pages (JMarc)
-#endif
-       if (style.isEnvironment()){
-               if (style.latextype == LATEX_LIST_ENVIRONMENT) {
-#ifdef FANCY_FOOTNOTE_CODE
-                       if (foot_count < 0) {
-                               // flag that footnote[mark][text] should be
-                               // used for any footnotes from now on
-                               foot_count = 0;
-                               foot_this_level = true;
-                       }
-#endif
-                       file += "\\begin{" + style.latexname() + "}{"
-                               + labelwidthstring + "}\n";
-               } else if (style.labeltype == LABEL_BIBLIO) {
-                       // ale970405
-                       file += "\\begin{" + style.latexname() + "}{"
-                               + bibitemWidthest(current_view->painter())
-                               + "}\n";
-               } else if (style.latextype == LATEX_ITEM_ENVIRONMENT) {
-#ifdef FANCY_FOOTNOTE_CODE
-                       if (foot_count < 0) {
-                               // flag that footnote[mark][text] should be
-                               // used for any footnotes from now on
-                               foot_count = 0;
-                               foot_this_level = true;
-                       }
-#endif
-                       file += "\\begin{" + style.latexname() + '}'
-                               + style.latexparam() + '\n';
-               } else 
-                       file += "\\begin{" + style.latexname() + '}'
-                               + style.latexparam() + '\n';
-               texrow.newline();
-       }
-       LyXParagraph * par = this;
-       do {
-               par = par->TeXOnePar(file, texrow,
-                                    foot, foot_texrow, foot_count);
 
-                if (minipage_open && par && !style.isEnvironment() &&
-                    (par->pextra_type == PEXTRA_MINIPAGE) &&
-                    par->pextra_start_minipage) {
-                       file += "\\end{minipage}\n";
-                       texrow.newline();
-                       if (par_sep == BufferParams::PARSEP_INDENT) {
-                               file += "}\n";
-                               texrow.newline();
-                       }
-                       minipage_open = false;
-                }
-               if (par && par->depth > depth) {
-                       if (textclasslist.Style(current_view->buffer()->params.textclass,
-                                               par->layout).isParagraph()
-                           && !par->table
-                           && !suffixIs(file, "\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
-                               file += '\n';
-                               texrow.newline();
-                       }
-                       par = par->TeXDeeper(file, texrow,
-                                            foot, foot_texrow, foot_count);
-               }
-               if (par && par->layout == layout && par->depth == depth &&
-                   (par->pextra_type == PEXTRA_MINIPAGE) && !minipage_open) {
-                       if (par->pextra_hfill && par->Previous() &&
-                           (par->Previous()->pextra_type == PEXTRA_MINIPAGE)){
-                               file += "\\hfill{}\n";
-                                texrow.newline();
-                        }
-                       if (par_sep == BufferParams::PARSEP_INDENT) {
-                               file += "{\\setlength\\parindent{0pt}\n";
-                               texrow.newline();
-                       }
-                       file += "\\begin{minipage}";
-                       switch(par->pextra_alignment) {
-                       case MINIPAGE_ALIGN_TOP:
-                               file += "[t]";
-                               break;
-                       case MINIPAGE_ALIGN_MIDDLE:
-                               file += "[m]";
-                               break;
-                       case MINIPAGE_ALIGN_BOTTOM:
-                               file += "[b]";
-                               break;
-                       }
-                       if (!par->pextra_width.empty()) {
-                               file += '{';
-                               file += par->pextra_width;
-                               file += "}\n";
-                       } else {
-                               //float ib = atof(par->pextra_widthp.c_str())/100;
-                               // string can't handle floats at present
-                               // so I'll do a conversion by hand knowing that
-                               // the limits are 0.0 to 1.0. ARRae.
-                               file += '{';
-                               switch (par->pextra_widthp.length()) {
-                               case 3:
-                                       file += "1.00";
-                                       break;
-                               case 2:
-                                       file += "0.";
-                                       file += par->pextra_widthp;
-                                       break;
-                               case 1:
-                                       file += "0.0";
-                                       file += par->pextra_widthp;
-                               }
-                               file += "\\columnwidth}\n";
-                       }
-                       texrow.newline();
-                       if (par_sep == BufferParams::PARSEP_INDENT) {
-                               file += "\\setlength\\parindent{\\LyXMinipageIndent}\n";
-                               texrow.newline();
-                       }
-                       minipage_open = true;
-                        minipage_open_depth = par->depth;
-               }
-       } while (par
-                && par->layout == layout
-                && par->depth == depth
-                && par->pextra_type == pextra_type);
-       if (style.isEnvironment()) {
-               file += "\\end{" + style.latexname() + '}';
-               // maybe this should go after the minipage closes?
-               if (foot_this_level) {
-                       if (foot_count >= 1) {
-                               if (foot_count > 1) {
-                                       file += "\\addtocounter{footnote}{-";
-                                       file += tostr(foot_count - 1);
-                                       file += '}';
-                               }
-                               file += foot;
-                               texrow += foot_texrow;
-                               foot.clear();
-                               foot_texrow.reset();
-                               foot_count = 0;
-                       }
-               }
-       }
-        if (minipage_open && (minipage_open_depth == depth) &&
-            (!par || par->pextra_start_minipage ||
-             par->pextra_type != PEXTRA_MINIPAGE)) {
-                file += "\\end{minipage}\n";
-               texrow.newline();
-                if (par_sep == BufferParams::PARSEP_INDENT) {
-                        file += "}\n";
-                       texrow.newline();
-                }
-                if (par && par->pextra_type != PEXTRA_MINIPAGE) {
-                        file += "\\medskip\n\n";
-                       texrow.newline();
-                       texrow.newline();
-                }
-                minipage_open = false;
-        }
-       if (eindent_open) {
-               file += "\\end{LyXParagraphIndent}\n";
-               texrow.newline();
-       }
-        if (!(par && (par->pextra_type == PEXTRA_MINIPAGE) 
-             && par->pextra_hfill)) {
-                file += '\n';
-               texrow.newline();
-       }
-       lyxerr[Debug::LATEX] << "TeXEnvironment...done " << par << endl;
-       return par;  // ale970302
+bool Paragraph::isLineSeparator(pos_type pos) const
+{
+       return IsLineSeparatorChar(getChar(pos));
 }
-#endif
 
 
-#ifdef USE_OSTREAM_ONLY
-LyXParagraph * LyXParagraph::TeXFootnote(ostream & os, TexRow & texrow,
-                                        ostream & foot, TexRow & foot_texrow,
-                                        int & foot_count,
-                                        LyXDirection par_direction)
+bool Paragraph::isKomma(pos_type pos) const
 {
-       lyxerr[Debug::LATEX] << "TeXFootnote...  " << this << endl;
-       if (footnoteflag == LyXParagraph::NO_FOOTNOTE)
-               lyxerr << "ERROR (LyXParagraph::TeXFootnote): "
-                       "No footnote!" << endl;
+       return IsKommaChar(getChar(pos));
+}
 
-       LyXParagraph * par = this;
-       LyXLayout const & style =
-               textclasslist.Style(current_view->buffer()->params.textclass, 
-                                   previous->GetLayout());
-       
-       if (style.needprotect && footnotekind != LyXParagraph::FOOTNOTE){
-               lyxerr << "ERROR (LyXParagraph::TeXFootnote): "
-                       "Float other than footnote in command"
-                       " with moving argument is illegal" << endl;
-       }
 
-       if (footnotekind != LyXParagraph::FOOTNOTE
-           && footnotekind != LyXParagraph::MARGIN
-           && os.tellp()
-           // Thinko
-           // How to solve this?
-           //&& !suffixIs(file, '\n')
-               ) {
-               // we need to ensure that real floats like tables and figures
-               // have their \begin{} on a new line otherwise we can get
-               // incorrect results when using the endfloat.sty package
-               // especially if two floats follow one another.  ARRae 981022
-               // NOTE: if the file is length 0 it must have just been
-               //       written out so we assume it ended with a '\n'
-               // Thinkee:
-               // As far as I can see there is never any harm in writing
-               // a '\n' too much. Please tell me if I am wrong. (Lgb)
-               os << '\n';
-               texrow.newline();
-       }
-       
-       BufferParams * params = &current_view->buffer()->params;
-       bool footer_in_body = true;
-       switch (footnotekind) {
-       case LyXParagraph::FOOTNOTE:
-               if (style.intitle) {
-                       os << "\\thanks{\n";
-                       footer_in_body = false;
-               } else {
-                       if (foot_count == -1) {
-                               // we're at depth 0 so we can use:
-                               os << "\\footnote{%\n";
-                               footer_in_body = false;
-                       } else {
-                               os << "\\footnotemark{}%\n";
-                               if (foot_count) {
-                                       // we only need this when there are
-                                       // multiple footnotes
-                                       os << "\\stepcounter{footnote}";
-                               }
-                               os << "\\footnotetext{%\n";
-                               foot_texrow.start(this, 0);
-                               foot_texrow.newline();
-                               ++foot_count;
-                       }
-               }
-               break;
-       case LyXParagraph::MARGIN:
-               os << "\\marginpar{\n";
-               break;
-       case LyXParagraph::FIG:
-               if (pextra_type == PEXTRA_FLOATFLT
-                   && (!pextra_width.empty()
-                       || !pextra_widthp.empty())) {
-                       if (!pextra_width.empty())
-                               os << "\\begin{floatingfigure}{"
-                                  << pextra_width << "}\n";
-                       else
-                               os << "\\begin{floatingfigure}{"
-                                  << atoi(pextra_widthp.c_str())/100.0
-                                  << "\\textwidth}\n";
-               } else {
-                       os << "\\begin{figure}";
-                       if (!params->float_placement.empty()) { 
-                               os << '[' << params->float_placement << "]\n";
-                       } else {
-                               os << '\n';
-                       }
-               }
-               break;
-       case LyXParagraph::TAB:
-               os << "\\begin{table}";
-               if (!params->float_placement.empty()) { 
-                       os << '[' << params->float_placement << "]\n";
-               } else {
-                       os << '\n';
-               }
-               break;
-       case LyXParagraph::WIDE_FIG:
-               os << "\\begin{figure*}";
-               if (!params->float_placement.empty()) { 
-                       os << '[' << params->float_placement << "]\n";
-               } else {
-                       os << '\n';
-               }
-               break;
-       case LyXParagraph::WIDE_TAB:
-               os << "\\begin{table*}";
-               if (!params->float_placement.empty()) { 
-                       os << '[' << params->float_placement << "]\n";
-               } else {
-                       os << '\n';
-               }
-               break;
-       case LyXParagraph::ALGORITHM:
-               os << "\\begin{algorithm}\n";
-               break;
-       }
-       texrow.newline();
-   
+/// 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);
+}
  
-       LyXDirection direction = getParDirection();
-       if (direction != par_direction) {
-               if (direction == LYX_DIR_LEFT_TO_RIGHT)
-                       os << "\\unsethebrew\n";
-               else
-                       os << "\\sethebrew\n";
-               texrow.newline();
-       }
-
-       if (footnotekind != LyXParagraph::FOOTNOTE
-           || !footer_in_body) {
-               // Process text for all floats except footnotes in body
-               do {
-                       LyXLayout const & style =
-                               textclasslist
-                               .Style(current_view->buffer()->params
-                                      .textclass,
-                                      par->layout);
-                       if (par->IsDummy())
-                               lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
-                                      << endl;
-                       if (style.isEnvironment()
-                           || par->pextra_type == PEXTRA_MINIPAGE) { /* && !minipage_open ?? */
-                               // Allows the use of minipages within float
-                               // environments. Shouldn't be circular because
-                               // we don't support footnotes inside
-                               // floats (yet). ARRae
-                               par = par->TeXEnvironment(os, texrow,
-                                                         foot, foot_texrow,
-                                                         foot_count);
-                       } else {
-                               par = par->TeXOnePar(os, texrow,
-                                                    foot, foot_texrow,
-                                                    foot_count);
-                       }
-                       
-                       if (par && !par->IsDummy() && par->depth > depth) {
-                               par = par->TeXDeeper(os, texrow,
-                                                    foot, foot_texrow,
-                                                    foot_count);
-                       }
-               } while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE);
-       } else {
-               // process footnotes > depth 0 or in environments separately
-               // NOTE: Currently don't support footnotes within footnotes
-               //       even though that is possible using the \footnotemark
-#ifdef HAVE_SSTREAM
-               ostringstream dummy;
+bool Paragraph::isWord(pos_type pos ) const
+{
+       return IsWordChar(getChar(pos)) ;
+}
+
+
+Language const *
+Paragraph::getParLanguage(BufferParams const & bparams) const 
+{
+       if (size() > 0) {
+#ifndef INHERIT_LANGUAGE
+               return getFirstFontSettings().language();
 #else
-               ostrstream dummy;
+               Language const * lang = getFirstFontSettings().language();
+#warning We should make this somewhat better, any ideas? (Jug)
+               if (lang == inherit_language || lang == ignore_language)
+                       lang = bparams.language;
+               return lang;
 #endif
-               TexRow dummy_texrow;
-               int dummy_count = 0;
-               do {
-                       LyXLayout const & style =
-                               textclasslist
-                               .Style(current_view->buffer()->params
-                                      .textclass,
-                                      par->layout);
-                       if (par->IsDummy())
-                               lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
-                                      << endl;
-                       if (style.isEnvironment()
-                           || par->pextra_type == PEXTRA_MINIPAGE) { /* && !minipage_open ?? */
-                               // Allows the use of minipages within float
-                               // environments. Shouldn't be circular because
-                               // we don't support footnotes inside
-                               // floats (yet). ARRae
-                               par = par->TeXEnvironment(foot, foot_texrow,
-                                                         dummy, dummy_texrow,
-                                                         dummy_count);
-                       } else {
-                               par = par->TeXOnePar(foot, foot_texrow,
-                                                    dummy, dummy_texrow,
-                                                    dummy_count);
-                       }
+       } else if (previous_)
+               return previous_->getParLanguage(bparams);
+       else
+               return bparams.language;
+}
 
-                       if (par && !par->IsDummy() && par->depth > depth) {
-                               par = par->TeXDeeper(foot, foot_texrow,
-                                                    dummy, dummy_texrow,
-                                                    dummy_count);
-                       }
-               } while (par
-                        && par->footnoteflag != LyXParagraph::NO_FOOTNOTE);
-               if (dummy_count) {
-                       lyxerr << "ERROR (LyXParagraph::TeXFootnote): "
-                               "Footnote in a Footnote -- not supported"
-                              << endl;
+
+bool Paragraph::isRightToLeftPar(BufferParams const & bparams) const
+{
+       return lyxrc.rtl_support
+               && getParLanguage(bparams)->RightToLeft();
+}
+
+
+void Paragraph::changeLanguage(BufferParams const & bparams,
+                                 Language const * from, Language const * to)
+{
+       for (pos_type i = 0; i < size(); ++i) {
+               LyXFont font = getFontSettings(bparams, i);
+               if (font.language() == from) {
+                       font.setLanguage(to);
+                       setFont(i, font);
                }
-#ifndef HAVE_OSTREAM
-               delete [] dummy.str();
-#endif
        }
+}
 
-       switch (footnotekind) {
-       case LyXParagraph::FOOTNOTE:
-               if (footer_in_body) {
-                       // This helps tell which of the multiple
-                       // footnotetexts an error was in.
-                       foot << "}%\n";
-                       foot_texrow.newline();
-               } else {
-                       os << '}';
+
+bool Paragraph::isMultiLingual(BufferParams const & bparams)
+{
+       Language const * doc_language = bparams.language;
+       for (Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
+            cit != pimpl_->fontlist.end(); ++cit)
+               if (cit->font().language() != ignore_language &&
+                   cit->font().language() != latex_language &&
+#ifdef INHERIT_LANGUAGE
+                       cit->font().language() != inherit_language &&
+#endif
+                       cit->font().language() != doc_language)
+                       return true;
+       return false;
+}
+
+
+// Convert the paragraph to a string.
+// Used for building the table of contents
+string const Paragraph::asString(Buffer const * buffer, bool label)
+{
+       BufferParams const & bparams = buffer->params;
+       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',' ');
                }
-               break;
-       case LyXParagraph::MARGIN:
-               os << '}';
-               break;
-       case LyXParagraph::FIG:
-               if (pextra_type == PEXTRA_FLOATFLT
-                   && (!pextra_width.empty()
-                       || !pextra_widthp.empty()))
-                       os << "\\end{floatingfigure}";
-               else
-                       os << "\\end{figure}";
-               break;
-       case LyXParagraph::TAB:
-               os << "\\end{table}";
-               break;
-       case LyXParagraph::WIDE_FIG:
-               os << "\\end{figure*}";
-               break;
-       case LyXParagraph::WIDE_TAB:
-               os << "\\end{table*}";
-               break;
-       case LyXParagraph::ALGORITHM:
-               os << "\\end{algorithm}";
-               break;
        }
 
-       if (footnotekind != LyXParagraph::FOOTNOTE
-           && footnotekind != LyXParagraph::MARGIN) {
-               // we need to ensure that real floats like tables and figures
-               // have their \end{} on a line of their own otherwise we can
-               // get incorrect results when using the endfloat.sty package.
-               os << "\n";
-               texrow.newline();
-       }
+       if (isRightToLeftPar(bparams))
+               reverse(s.begin() + len,s.end());
 
-       lyxerr[Debug::LATEX] << "TeXFootnote...done " << par->next << endl;
-       return par;
+       return s;
 }
-#else
-LyXParagraph * LyXParagraph::TeXFootnote(string & file, TexRow & texrow,
-                                        string & foot, TexRow & foot_texrow,
-                                        int & foot_count,
-                                        LyXDirection par_direction)
+
+
+string const Paragraph::asString(Buffer const * buffer, 
+                                pos_type beg, pos_type end, bool label)
 {
-       lyxerr[Debug::LATEX] << "TeXFootnote...  " << this << endl;
-       if (footnoteflag == LyXParagraph::NO_FOOTNOTE)
-               lyxerr << "ERROR (LyXParagraph::TeXFootnote): "
-                       "No footnote!" << endl;
+       ostringstream ost;
 
-       LyXParagraph * par = this;
-       LyXLayout const & style =
-               textclasslist.Style(current_view->buffer()->params.textclass, 
-                                   previous->GetLayout());
-       
-       if (style.needprotect && footnotekind != LyXParagraph::FOOTNOTE){
-               lyxerr << "ERROR (LyXParagraph::TeXFootnote): "
-                       "Float other than footnote in command"
-                       " with moving argument is illegal" << endl;
-       }
+       if (beg == 0 && label && !params().labelString().empty())
+               ost << params().labelString() << ' ';
 
-       if (footnotekind != LyXParagraph::FOOTNOTE
-           && footnotekind != LyXParagraph::MARGIN
-           && file.length()
-           && !suffixIs(file, '\n')) {
-               // we need to ensure that real floats like tables and figures
-               // have their \begin{} on a new line otherwise we can get
-               // incorrect results when using the endfloat.sty package
-               // especially if two floats follow one another.  ARRae 981022
-               // NOTE: if the file is length 0 it must have just been
-               //       written out so we assume it ended with a '\n'
-               file += '\n';
-               texrow.newline();
-       }
-       
-       BufferParams * params = &current_view->buffer()->params;
-       bool footer_in_body = true;
-       switch (footnotekind) {
-       case LyXParagraph::FOOTNOTE:
-               if (style.intitle) {
-                       file += "\\thanks{\n";
-                       footer_in_body = false;
-               } else {
-                       if (foot_count == -1) {
-                               // we're at depth 0 so we can use:
-                               file += "\\footnote{%\n";
-                               footer_in_body = false;
-                       } else {
-                               file += "\\footnotemark{}%\n";
-                               if (foot_count) {
-                                       // we only need this when there are
-                                       // multiple footnotes
-                                       foot += "\\stepcounter{footnote}";
-                               }
-                               foot += "\\footnotetext{%\n";
-                               foot_texrow.start(this, 0);
-                               foot_texrow.newline();
-                               ++foot_count;
-                       }
-               }
-               break;
-       case LyXParagraph::MARGIN:
-               file += "\\marginpar{\n";
-               break;
-       case LyXParagraph::FIG:
-               if (pextra_type == PEXTRA_FLOATFLT
-                   && (!pextra_width.empty()
-                       || !pextra_widthp.empty())) {
-                       char bufr[80];
-                       if (!pextra_width.empty())
-                               sprintf(bufr,
-                                       "\\begin{floatingfigure}{%s}\n",
-                                       pextra_width.c_str());
-                       else
-                               sprintf(bufr,
-                                       "\\begin{floatingfigure}{%f\\textwidth}\n",
-                                       atoi(pextra_widthp.c_str())/100.0);
-                       file += bufr;
-               } else {
-                       file += "\\begin{figure}";
-                       if (!params->float_placement.empty()) { 
-                               file += '[';
-                               file += params->float_placement;
-                               file += "]\n";
-                       } else {
-                               file += '\n';
-                       }
-               }
-               break;
-       case LyXParagraph::TAB:
-               file += "\\begin{table}";
-               if (!params->float_placement.empty()) { 
-                       file += '[';
-                       file += params->float_placement;
-                       file += "]\n";
-               } else {
-                       file += '\n';
+       for (pos_type i = beg; i < end; ++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);
                }
-               break;
-       case LyXParagraph::WIDE_FIG:
-               file += "\\begin{figure*}";
-               if (!params->float_placement.empty()) { 
-                       file += '[';
-                       file += params->float_placement;
-                       file += "]\n";
-               } else {
-                       file += '\n';
-               }
-               break;
-       case LyXParagraph::WIDE_TAB:
-               file += "\\begin{table*}";
-               if (!params->float_placement.empty()) { 
-                       file += '[';
-                       file += params->float_placement;
-                       file += "]\n";
-               } else {
-                       file += '\n';
-               }
-               break;
-       case LyXParagraph::ALGORITHM:
-               file += "\\begin{algorithm}\n";
-               break;
        }
-       texrow.newline();
-   
-       LyXDirection direction = getParDirection();
-       if (direction != par_direction) {
-               if (direction == LYX_DIR_LEFT_TO_RIGHT)
-                       file += "\\unsethebrew\n";
-               else
-                       file += "\\sethebrew\n";
-               texrow.newline();
-       }
-
-       if (footnotekind != LyXParagraph::FOOTNOTE
-           || !footer_in_body) {
-               // Process text for all floats except footnotes in body
-               do {
-                       LyXLayout const & style =
-                               textclasslist
-                               .Style(current_view->buffer()->params
-                                      .textclass,
-                                      par->layout);
-                       if (par->IsDummy())
-                               lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
-                                      << endl;
-                       if (style.isEnvironment()
-                           || par->pextra_type == PEXTRA_MINIPAGE) { /* && !minipage_open ?? */
-                               // Allows the use of minipages within float
-                               // environments. Shouldn't be circular because
-                               // we don't support footnotes inside
-                               // floats (yet). ARRae
-                               par = par->TeXEnvironment(file, texrow,
-                                                         foot, foot_texrow,
-                                                         foot_count);
-                       } else {
-                               par = par->TeXOnePar(file, texrow,
-                                                    foot, foot_texrow,
-                                                    foot_count);
-                       }
-                       
-                       if (par && !par->IsDummy() && par->depth > depth) {
-                               par = par->TeXDeeper(file, texrow,
-                                                    foot, foot_texrow,
-                                                    foot_count);
-                       }
-               } while (par && par->footnoteflag != LyXParagraph::NO_FOOTNOTE);
-       } else {
-               // process footnotes > depth 0 or in environments separately
-               // NOTE: Currently don't support footnotes within footnotes
-               //       even though that is possible using the \footnotemark
-               string dummy;
-               TexRow dummy_texrow;
-               int dummy_count = 0;
-               do {
-                       LyXLayout const & style =
-                               textclasslist
-                               .Style(current_view->buffer()->params
-                                      .textclass,
-                                      par->layout);
-                       if (par->IsDummy())
-                               lyxerr << "ERROR (LyXParagraph::TeXFootnote)"
-                                      << endl;
-                       if (style.isEnvironment()
-                           || par->pextra_type == PEXTRA_MINIPAGE) { /* && !minipage_open ?? */
-                               // Allows the use of minipages within float
-                               // environments. Shouldn't be circular because
-                               // we don't support footnotes inside
-                               // floats (yet). ARRae
-                               par = par->TeXEnvironment(foot, foot_texrow,
-                                                         dummy, dummy_texrow,
-                                                         dummy_count);
-                       } else {
-                               par = par->TeXOnePar(foot, foot_texrow,
-                                                    dummy, dummy_texrow,
-                                                    dummy_count);
-                       }
 
-                       if (par && !par->IsDummy() && par->depth > depth) {
-                               par = par->TeXDeeper(foot, foot_texrow,
-                                                    dummy, dummy_texrow,
-                                                    dummy_count);
-                       }
-               } while (par
-                        && par->footnoteflag != LyXParagraph::NO_FOOTNOTE);
-               if (dummy_count) {
-                       lyxerr << "ERROR (LyXParagraph::TeXFootnote): "
-                               "Footnote in a Footnote -- not supported"
-                              << endl;
-               }
-       }
+       return ost.str().c_str();
+}
 
-       switch (footnotekind) {
-       case LyXParagraph::FOOTNOTE:
-               if (footer_in_body) {
-                       // This helps tell which of the multiple
-                       // footnotetexts an error was in.
-                       foot += "}%\n";
-                       foot_texrow.newline();
-               } else {
-                       file += '}';
-               }
-               break;
-       case LyXParagraph::MARGIN:
-               file += '}';
-               break;
-       case LyXParagraph::FIG:
-               if (pextra_type == PEXTRA_FLOATFLT
-                   && (!pextra_width.empty()
-                       || !pextra_widthp.empty()))
-                       file += "\\end{floatingfigure}";
-               else
-                       file += "\\end{figure}";
-               break;
-       case LyXParagraph::TAB:
-               file += "\\end{table}";
-               break;
-       case LyXParagraph::WIDE_FIG:
-               file += "\\end{figure*}";
-               break;
-       case LyXParagraph::WIDE_TAB:
-               file += "\\end{table*}";
-               break;
-       case LyXParagraph::ALGORITHM:
-               file += "\\end{algorithm}";
-               break;
-       }
 
-       if (footnotekind != LyXParagraph::FOOTNOTE
-           && footnotekind != LyXParagraph::MARGIN) {
-               // we need to ensure that real floats like tables and figures
-               // have their \end{} on a line of their own otherwise we can
-               // get incorrect results when using the endfloat.sty package.
-               file += "\n";
-               texrow.newline();
+void Paragraph::setInsetOwner(Inset * i)
+{
+       pimpl_->inset_owner = i;
+       for (InsetList::const_iterator cit = insetlist.begin();
+            cit != insetlist.end(); ++cit) {
+               if (cit->inset)
+                       cit->inset->setOwner(i);
        }
-
-       lyxerr[Debug::LATEX] << "TeXFootnote...done " << par->next << endl;
-       return par;
 }
-#endif
 
 
-void LyXParagraph::SetPExtraType(int type, char const * width,
-                                char const * widthp)
+void Paragraph::deleteInsetsLyXText(BufferView * bv)
 {
-       pextra_type = type;
-       pextra_width = width;
-       pextra_widthp = widthp;
-
-       if (textclasslist.Style(current_view->buffer()->params.textclass, 
-                               layout).isEnvironment()) {
-               LyXParagraph
-                       * par = this,
-                       * ppar = par;
-
-               while (par && (par->layout == layout)
-                      && (par->depth == depth)) {
-                       ppar = par;
-                       par = par->Previous();
-                       if (par)
-                               par = par->FirstPhysicalPar();
-                       while (par && par->depth > depth) {
-                               par = par->Previous();
-                               if (par)
-                                       par = par->FirstPhysicalPar();
+       // then the insets
+       for (InsetList::const_iterator cit = insetlist.begin();
+            cit != insetlist.end(); ++cit) {
+               if (cit->inset) {
+                       if (cit->inset->isTextInset()) {
+                               static_cast<UpdatableInset *>
+                                       (cit->inset)->deleteLyXText(bv, true);
                        }
                }
-               par = ppar;
-               while (par && (par->layout == layout)
-                      && (par->depth == depth)) {
-                       par->pextra_type = type;
-                       par->pextra_width = width;
-                       par->pextra_widthp = widthp;
-                       par = par->NextAfterFootnote();
-                       if (par && (par->depth > depth))
-                               par->SetPExtraType(type, width, widthp);
-                       while (par && ((par->depth > depth) || par->IsDummy()))
-                               par = par->NextAfterFootnote();
-               }
        }
 }
 
 
-void LyXParagraph::UnsetPExtraType()
+void Paragraph::resizeInsetsLyXText(BufferView * bv)
 {
-       if (pextra_type == PEXTRA_NONE)
-               return;
-    
-       pextra_type = PEXTRA_NONE;
-       pextra_width.clear();
-       pextra_widthp.clear();
-
-       if (textclasslist.Style(current_view->buffer()->params.textclass, 
-                               layout).isEnvironment()) {
-               LyXParagraph
-                       * par = this,
-                       * ppar = par;
-
-               while (par && (par->layout == layout)
-                      && (par->depth == depth)) {
-                       ppar = par;
-                       par = par->Previous();
-                       if (par)
-                               par = par->FirstPhysicalPar();
-                       while (par && par->depth > depth) {
-                               par = par->Previous();
-                               if (par)
-                                       par = par->FirstPhysicalPar();
+       // then the insets
+       for (InsetList::const_iterator cit = insetlist.begin();
+            cit != insetlist.end(); ++cit)
+       {
+               if (cit->inset) {
+                       if (cit->inset->isTextInset()) {
+                               static_cast<UpdatableInset *>
+                                       (cit->inset)->resizeLyXText(bv, true);
                        }
                }
-               par = ppar;
-               while (par && (par->layout == layout)
-                      && (par->depth == depth)) {
-                       par->pextra_type = PEXTRA_NONE;
-                       par->pextra_width.clear();
-                       par->pextra_widthp.clear();
-                       par = par->NextAfterFootnote();
-                       if (par && (par->depth > depth))
-                               par->UnsetPExtraType();
-                       while (par && ((par->depth > depth) || par->IsDummy()))
-                               par = par->NextAfterFootnote();
-               }
        }
 }
 
 
-bool LyXParagraph::IsHfill(size_type pos) const
+void Paragraph::setContentsFromPar(Paragraph * par)
 {
-       return IsHfillChar(GetChar(pos));
+       pimpl_->setContentsFromPar(par);
 }
 
 
-bool LyXParagraph::IsInset(size_type pos) const
+lyx::pos_type Paragraph::size() const
 {
-       return IsInsetChar(GetChar(pos));
+       return pimpl_->size();
 }
 
 
-bool LyXParagraph::IsFloat(size_type pos) const
+Paragraph::value_type Paragraph::getChar(pos_type pos) const
 {
-       return IsFloatChar(GetChar(pos));
+       return pimpl_->getChar(pos);
 }
 
 
-bool LyXParagraph::IsNewline(size_type pos) const
+int Paragraph::id() const
 {
-       bool tmp = false;
-       if (pos >= 0)
-               tmp = IsNewlineChar(GetChar(pos));
-       return tmp;
+       return pimpl_->id_;
 }
 
 
-bool LyXParagraph::IsSeparator(size_type pos) const
+void  Paragraph::id(int id_arg)
 {
-       return IsSeparatorChar(GetChar(pos));
+       pimpl_->id_ = id_arg;
 }
 
 
-bool LyXParagraph::IsLineSeparator(size_type pos) const
+layout_type Paragraph::getLayout() const
 {
-       return IsLineSeparatorChar(GetChar(pos));
+       return layout;
 }
 
 
-bool LyXParagraph::IsKomma(size_type pos) const
+bool Paragraph::isFirstInSequence() const
 {
-       return IsKommaChar(GetChar(pos));
+       Paragraph const * dhook = depthHook(getDepth());
+       return (dhook == this
+               || dhook->getLayout() != getLayout()
+               || dhook->getDepth() != getDepth());
 }
 
 
-/// Used by the spellchecker
-bool LyXParagraph::IsLetter(LyXParagraph::size_type pos) const
+Inset * Paragraph::inInset() const
 {
-       unsigned char c = GetChar(pos);
-       if (IsLetterChar(c))
-               return true;
-       // '\0' is not a letter, allthough every string contains "" (below)
-       if( c == '\0')
-               return false;
-       // We want to pass the ' and escape chars to ispell
-       string extra = lyxrc->isp_esc_chars + '\'';
-       char ch[2];
-       ch[0] = c;
-       ch[1] = 0;
-       return contains(extra, ch);
+       return pimpl_->inset_owner;
 }
-bool LyXParagraph::IsWord(size_type pos ) const
+
+
+void Paragraph::clearContents()
 {
-       return IsWordChar(GetChar(pos)) ;
+       pimpl_->clear();
 }
 
 
-LyXDirection LyXParagraph::getParDirection() const
+void Paragraph::setCounter(int i, int v)
 {
-       if (!lyxrc->rtl_support || table)
-               return LYX_DIR_LEFT_TO_RIGHT;
+       pimpl_->counter_[i] = v;
+}
 
-       if (size() > 0)
-               return (getFont(0).direction() ==  LyXFont::RTL_DIR)
-                       ? LYX_DIR_RIGHT_TO_LEFT : LYX_DIR_LEFT_TO_RIGHT;
-       else
-               return current_view->buffer()->params.getDocumentDirection();
+
+int Paragraph::getCounter(int i) const
+{
+       return pimpl_->counter_[i];
 }
 
 
-LyXDirection
-LyXParagraph::getLetterDirection(LyXParagraph::size_type pos) const
+void Paragraph::incCounter(int i)
 {
-       if (!lyxrc->rtl_support)
-               return LYX_DIR_LEFT_TO_RIGHT;
-
-       LyXDirection direction = getFont(pos).getFontDirection();
-       if (IsLineSeparator(pos) && 0 < pos && pos < Last() - 1
-           && !IsLineSeparator(pos + 1)
-           && !(table && IsNewline(pos + 1))
-           && (getFont(pos - 1).getFontDirection() != direction
-               || getFont(pos + 1).getFontDirection() != direction))
-               return getParDirection();
-       else
-               return direction;
+       pimpl_->counter_[i]++;
+}
+
+
+void Paragraph::setChar(pos_type pos, value_type c)
+{
+       pimpl_->setChar(pos, c);
+}
+
+
+Paragraph::inset_iterator::inset_iterator(Paragraph::InsetList::iterator const & iter)
+ : it(iter) 
+{}
+
+
+Paragraph::inset_iterator Paragraph::inset_iterator_begin()
+{
+       return inset_iterator(insetlist.begin());
+}
+
+
+Paragraph::inset_iterator Paragraph::inset_iterator_end()
+{
+       return inset_iterator(insetlist.end());
+}
+
+
+ParagraphParameters & Paragraph::params()
+{
+       return pimpl_->params;
+}
+
+
+ParagraphParameters const & Paragraph::params() const
+{
+       return pimpl_->params;
+}
+
+
+Paragraph * Paragraph::getParFromID(int id) const
+{
+       return pimpl_->getParFromID(id);
+}
+
+
+bool Paragraph::isFreeSpacing() 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;
 }