X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.C;h=a38fe6e8c6b6bc507920ba0b0732800e0a56c46f;hb=69cf3b62043861ccad5f8ad7ffb4981fe50b078d;hp=6cd8122d489c94bdc5bd64e55b7b6bf85f07fefa;hpb=660732d74a5c56d20112e18a1d89da1a84e05cc0;p=lyx.git

diff --git a/src/paragraph.C b/src/paragraph.C
index 6cd8122d48..a38fe6e8c6 100644
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -1,19 +1,15 @@
 /* This file is part of
- * ====================================================== 
- * 
+ * ======================================================
+ *
  *           LyX, The Document Processor
- * 	 
+ *
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team. 
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "paragraph.h"
 #include "paragraph_pimpl.h"
 #include "lyxrc.h"
@@ -23,17 +19,15 @@
 #include "buffer.h"
 #include "bufferparams.h"
 #include "debug.h"
-#include "LaTeXFeatures.h"
 #include "texrow.h"
 #include "BufferView.h"
 #include "encoding.h"
 #include "ParameterStruct.h"
 #include "gettext.h"
-#include "lyxtextclasslist.h"
+#include "changes.h"
 
-#include "insets/insetinclude.h"
 #include "insets/insetbib.h"
-#include "insets/insettext.h"
+#include "insets/insetoptarg.h"
 
 #include "support/filetools.h"
 #include "support/lstrings.h"
@@ -45,6 +39,7 @@
 #include <algorithm>
 #include <fstream>
 #include <csignal>
+#include <ctime>
 
 using std::ostream;
 using std::endl;
@@ -52,11 +47,9 @@ using std::fstream;
 using std::ios;
 using std::lower_bound;
 using std::upper_bound;
-using std::reverse;
 
 using lyx::pos_type;
 
-int tex_code_break_column = 72;  // needs non-zero initialization. set later.
 // this is a bad idea, but how can Paragraph find its buffer to get
 // parameters? (JMarc)
 
@@ -79,22 +72,22 @@ extern BufferView * current_view;
 Paragraph::Paragraph()
 	: pimpl_(new Paragraph::Pimpl(this))
 {
-	for (int i = 0; i < 10; ++i)
-		setCounter(i, 0);
+#ifndef NO_NEXT
 	next_ = 0;
 	previous_ = 0;
+#endif
 	enumdepth = 0;
 	itemdepth = 0;
 	bibkey = 0; // ale970302
+	params().clear();
 }
 
 
+#ifndef NO_NEXT
 // This constructor inserts the new paragraph in a list.
 Paragraph::Paragraph(Paragraph * par)
 	: pimpl_(new Paragraph::Pimpl(this))
 {
-	for (int i = 0; i < 10; ++i)
-		setCounter(i, 0);
 	enumdepth = 0;
 	itemdepth = 0;
 
@@ -106,20 +99,21 @@ Paragraph::Paragraph(Paragraph * par)
 	previous_->next_ = this;
 	// end
 
-	bibkey = 0; // ale970302        
+	bibkey = 0; // ale970302
+	params().clear();
 }
+#endif
 
 
 Paragraph::Paragraph(Paragraph const & lp, bool same_ids)
 	: pimpl_(new Paragraph::Pimpl(*lp.pimpl_, this, same_ids))
 {
-	for (int i = 0; i < 10; ++i)
-		setCounter(i, 0);
 	enumdepth = 0;
 	itemdepth = 0;
+#ifndef NO_NEXT
 	next_     = 0;
 	previous_ = 0;
-
+#endif
 	// this is because of the dummy layout of the paragraphs that
 	// follow footnotes
 	layout_ = lp.layout();
@@ -131,15 +125,16 @@ Paragraph::Paragraph(Paragraph const & lp, bool same_ids)
 	} else {
 		bibkey = 0;
 	}
-	
+
 	// 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);
+	InsetList::iterator it = insetlist.begin();
+	InsetList::iterator end = insetlist.end();
+	for (; it != end; ++it) {
+		it.setInset(it.getInset()->clone(*current_view->buffer(),
+						 same_ids));
 		// tell the new inset who is the boss now
-		it->inset->parOwner(this);
+		it.getInset()->parOwner(this);
 	}
 }
 
@@ -147,15 +142,12 @@ Paragraph::Paragraph(Paragraph const & lp, bool same_ids)
 // the destructor removes the new paragraph from the list
 Paragraph::~Paragraph()
 {
+#ifndef NO_NEXT
 	if (previous_)
 		previous_->next_ = next_;
 	if (next_)
 		next_->previous_ = previous_;
-
-	for (InsetList::iterator it = insetlist.begin();
-	     it != insetlist.end(); ++it) {
-		delete it->inset;
-	}
+#endif
 
 	// ale970302
 	delete bibkey;
@@ -167,9 +159,9 @@ Paragraph::~Paragraph()
 }
 
 
-void Paragraph::writeFile(Buffer const * buf, ostream & os,
-                          BufferParams const & bparams,
-                          depth_type dth) const
+void Paragraph::write(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()) {
@@ -185,51 +177,51 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os,
 			}
 		}
 	}
-	
+
 	// First write the layout
-	string lay = layout();
-	if (lay.empty()) {
-		lay = textclasslist[bparams.textclass].defaultLayoutName();
-	}
-	
-	os << "\n\\layout " << layout() << "\n";
-	
+	os << "\n\\layout " << layout()->name() << '\n';
+
 	// Maybe some vertical spaces.
 	if (params().spaceTop().kind() != VSpace::NONE)
 		os << "\\added_space_top "
-		   << params().spaceTop().asLyXCommand() << " ";
+		   << params().spaceTop().asLyXCommand() << ' ';
 	if (params().spaceBottom().kind() != VSpace::NONE)
 		os << "\\added_space_bottom "
-		   << params().spaceBottom().asLyXCommand() << " ";
-	
+		   << 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 ";
-	
+
+	// Do we have a manual left indent?
+	if (!params().leftIndent().zero())
+		os << "\\leftindent " << params().leftIndent().asString()
+		   << ' ';
+
 	// Alignment?
 	if (params().align() != LYX_ALIGN_LAYOUT) {
 		int h = 0;
@@ -239,34 +231,37 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os,
 		case LYX_ALIGN_CENTER: h = 3; break;
 		default: h = 0; break;
 		}
-		os << "\\align " << string_align[h] << " ";
+		os << "\\align " << string_align[h] << ' ';
 	}
-	
+
 	// bibitem  ale970302
 	if (bibkey)
 		bibkey->write(buf, os);
-	
+
 	LyXFont font1(LyXFont::ALL_INHERIT, bparams.language);
-	
+
+	Change running_change = Change(Change::UNCHANGED);
+	lyx::time_type const curtime(lyx::current_time());
+ 
 	int column = 0;
 	for (pos_type i = 0; i < size(); ++i) {
 		if (!i) {
-			os << "\n";
+			os << '\n';
 			column = 0;
 		}
-		
+
+		Change change = pimpl_->lookupChangeFull(i);
+		Changes::lyxMarkChange(os, column, curtime, running_change, change);
+		running_change = change;
+ 
 		// Write font changes
 		LyXFont font2 = getFontSettings(bparams, i);
 		if (font2 != font1) {
-#ifndef INHERIT_LANGUAGE
 			font2.lyxWriteChanges(font1, os);
-#else
-			font2.lyxWriteChanges(font1, bparams.language, os);
-#endif
 			column = 0;
 			font1 = font2;
 		}
-		
+
 		value_type const c = getChar(i);
 		switch (c) {
 		case META_INSET:
@@ -286,11 +281,11 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os,
 				}
 		}
 		break;
-		case META_NEWLINE: 
+		case META_NEWLINE:
 			os << "\n\\newline \n";
 			column = 0;
 			break;
-		case META_HFILL: 
+		case META_HFILL:
 			os << "\n\\hfill \n";
 			column = 0;
 			break;
@@ -303,12 +298,12 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os,
 				os << ".\n";
 				column = 0;
 			} else
-				os << ".";
+				os << '.';
 			break;
 		default:
 			if ((column > 70 && c == ' ')
 			    || column > 79) {
-				os << "\n";
+				os << '\n';
 				column = 0;
 			}
 			// this check is to amend a bug. LyX sometimes
@@ -322,82 +317,21 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os,
 			break;
 		}
 	}
-	
-	// now write the next paragraph
-	if (next_)
-		next_->writeFile(buf, os, bparams, dth);
+
+	// to make reading work properly
+	if (!size()) {
+		running_change = pimpl_->lookupChange(0);
+		Changes::lyxMarkChange(os, column, curtime,
+			Change(Change::UNCHANGED), running_change);
+	}
+	Changes::lyxMarkChange(os, column, curtime,
+		running_change, Change(Change::UNCHANGED)); 
 }
 
 
 void Paragraph::validate(LaTeXFeatures & features) const
 {
-	BufferParams const & bparams = features.bufferParams();
-
-	// check the params.
-	if (params().lineTop() || params().lineBottom())
-		features.require("lyxline");
-	if (!params().spacing().isDefault())
-		features.require("setspace");
-	
-	// then the layouts
-	features.useLayout(layout());
-
-	// then the fonts
-	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()
-					     << endl;
-			features.require("noun");
-			lyxerr[Debug::LATEX] << "Noun enabled. Font: "
-					     << cit->font().stateText(0)
-					     << endl;
-		}
-		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.require("color");
-			lyxerr[Debug::LATEX] << "Color enabled. Font: "
-					     << 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 & lout = textclasslist[bparams.textclass][layout()];
-
-	for (InsetList::const_iterator cit = insetlist.begin();
-	     cit != insetlist.end(); ++cit) {
-		if (cit->inset) {
-			cit->inset->validate(features);
-			if (lout.needprotect &&
-			    cit->inset->lyxCode() == Inset::FOOT_CODE)
-				features.require("NeedLyXFootnoteCode");
-		}
-	}
+	pimpl_->validate(features, *layout());
 }
 
 
@@ -428,19 +362,8 @@ void Paragraph::cutIntoMinibuffer(BufferParams const & bparams, pos_type pos)
 	minibuffer_inset = 0;
 	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
-			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 = insetlist.release(pos);
 			minibuffer_inset->parOwner(0);
 		} else {
 			minibuffer_inset = 0;
@@ -480,6 +403,12 @@ void Paragraph::erase(pos_type pos)
 }
 
 
+bool Paragraph::erase(pos_type start, pos_type end)
+{
+	return pimpl_->erase(start, end);
+}
+
+ 
 bool Paragraph::checkInsertChar(LyXFont & font)
 {
 	if (pimpl_->inset_owner)
@@ -496,9 +425,9 @@ void Paragraph::insertChar(pos_type pos, Paragraph::value_type c)
 
 
 void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
-                           LyXFont const & font)
+			   LyXFont const & font, Change change)
 {
-	pimpl_->insertChar(pos, c, font);
+	pimpl_->insertChar(pos, c, font, change);
 }
 
 
@@ -509,16 +438,16 @@ void Paragraph::insertInset(pos_type pos, Inset * inset)
 }
 
 
-void Paragraph::insertInset(pos_type pos, Inset * inset, LyXFont const & font)
+void Paragraph::insertInset(pos_type pos, Inset * inset, LyXFont const & font, Change change)
 {
-	pimpl_->insertInset(pos, inset, font);
+	pimpl_->insertInset(pos, inset, font, change);
 }
 
 
 bool Paragraph::insetAllowed(Inset::Code code)
 {
 	//lyxerr << "Paragraph::InsertInsetAllowed" << endl;
-	
+
 	if (pimpl_->inset_owner)
 		return pimpl_->inset_owner->insetAllowed(code);
 	return true;
@@ -529,24 +458,7 @@ Inset * Paragraph::getInset(pos_type pos)
 {
 	lyx::Assert(pos < size());
 
-	// Find the inset.
-	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;
-	//::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
-	// as well replace it with a space to prevent craches. (Asger)
-	return 0;
+	return insetlist.get(pos);
 }
 
 
@@ -554,47 +466,30 @@ Inset const * Paragraph::getInset(pos_type pos) const
 {
 	lyx::Assert(pos < size());
 
-	// Find the inset.
-	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)
-	// My guess is that since the inset does not exist, we might
-	// as well replace it with a space to prevent craches. (Asger)
-	return 0;
+	return insetlist.get(pos);
 }
 
 
 // Gets uninstantiated font setting at position.
 LyXFont const Paragraph::getFontSettings(BufferParams const & bparams,
-                                         pos_type pos) const
+					 pos_type pos) const
 {
 	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());
+
+	Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
+	Pimpl::FontList::const_iterator end = pimpl_->fontlist.end();
+	for (; cit != end; ++cit) {
+		if (cit->pos() >= pos)
+			break;
+	}
+
 	LyXFont retfont;
-	if (cit != pimpl_->fontlist.end()) {
+	if (cit != end) {
 		retfont = cit->font();
-	} else if (pos == size() && size()) {
+	} else if (pos == size() && !empty()) {
 		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;
 }
@@ -603,9 +498,9 @@ LyXFont const Paragraph::getFontSettings(BufferParams const & bparams,
 // Gets uninstantiated font setting at position 0
 LyXFont const Paragraph::getFirstFontSettings() const
 {
-	if (size() > 0 && !pimpl_->fontlist.empty())
+	if (!empty() && !pimpl_->fontlist.empty())
 		return pimpl_->fontlist[0].font();
-	
+
 	return LyXFont(LyXFont::ALL_INHERIT);
 }
 
@@ -621,25 +516,19 @@ LyXFont const Paragraph::getFont(BufferParams const & bparams,
 				 pos_type pos) const
 {
 	lyx::Assert(pos >= 0);
-	
-	LyXLayout const & lout =
-		textclasslist[bparams.textclass][layout()];
-	pos_type main_body = 0;
-	if (lout.labeltype == LABEL_MANUAL)
-		main_body = beginningOfMainBody();
+
+	LyXLayout_ptr const & lout = layout();
+
+	pos_type const main_body = beginningOfMainBody();
 
 	LyXFont layoutfont;
 	if (pos < main_body)
-		layoutfont = lout.labelfont;
+		layoutfont = lout->labelfont;
 	else
-		layoutfont = lout.font;
-	
+		layoutfont = lout->font;
+
 	LyXFont tmpfont = getFontSettings(bparams, pos);
-#ifndef INHERIT_LANGUAGE
 	tmpfont.realize(layoutfont);
-#else
-	tmpfont.realize(layoutfont, bparams.language);
-#endif
 
 	return pimpl_->realizeFont(tmpfont, bparams);
 }
@@ -647,10 +536,9 @@ LyXFont const Paragraph::getFont(BufferParams const & bparams,
 
 LyXFont const Paragraph::getLabelFont(BufferParams const & bparams) const
 {
-	LyXLayout const & lout =
-		textclasslist[bparams.textclass][layout()];
-	
-	LyXFont tmpfont = lout.labelfont;
+	LyXLayout_ptr const & lout = layout();
+
+	LyXFont tmpfont = lout->labelfont;
 	tmpfont.setLanguage(getParLanguage(bparams));
 
 	return pimpl_->realizeFont(tmpfont, bparams);
@@ -659,10 +547,9 @@ LyXFont const Paragraph::getLabelFont(BufferParams const & bparams) const
 
 LyXFont const Paragraph::getLayoutFont(BufferParams const & bparams) const
 {
-	LyXLayout const & lout =
-		textclasslist[bparams.textclass][layout()];
+	LyXLayout_ptr const & lout = layout();
 
-	LyXFont tmpfont = lout.font;
+	LyXFont tmpfont = lout->font;
 	tmpfont.setLanguage(getParLanguage(bparams));
 
 	return pimpl_->realizeFont(tmpfont, bparams);
@@ -677,21 +564,23 @@ Paragraph::highestFontInRange(pos_type startpos, pos_type endpos,
 	if (pimpl_->fontlist.empty())
 		return def_size;
 
-	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())
+	Pimpl::FontList::const_iterator end_it = pimpl_->fontlist.begin();
+	Pimpl::FontList::const_iterator end = pimpl_->fontlist.end();
+	for (; end_it != end; ++end_it) {
+		if (end_it->pos() >= endpos)
+			break;
+	}
+
+	if (end_it != 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());
-	
+	Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
+	for (; cit != end; ++cit) {
+		if (cit->pos() >= startpos)
+			break;
+	}
+
+	LyXFont::FONT_SIZE maxsize = LyXFont::SIZE_TINY;
 	for (; cit != end_it; ++cit) {
 		LyXFont::FONT_SIZE size = cit->font().size();
 		if (size == LyXFont::INHERIT_SIZE)
@@ -755,18 +644,21 @@ void Paragraph::setFont(pos_type pos, LyXFont const & font)
 	// in a new kernel. (Asger)
 	// Next search font table
 
-	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();
+	Pimpl::FontList::iterator beg = pimpl_->fontlist.begin();
+	Pimpl::FontList::iterator it = beg;
+	Pimpl::FontList::iterator endit = pimpl_->fontlist.end();
+	for (; it != endit; ++it) {
+		if (it->pos() >= pos)
+			break;
+	}
+	unsigned int i = std::distance(beg, it);
+	bool notfound = (it == endit);
 
 	if (!notfound && pimpl_->fontlist[i].font() == font)
 		return;
 
 	bool begin = pos == 0 || notfound ||
-		(i > 0 && pimpl_->fontlist[i-1].pos() == pos - 1);
+		(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?
@@ -776,7 +668,7 @@ void Paragraph::setFont(pos_type pos, LyXFont const & 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);
+				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);
@@ -796,7 +688,7 @@ void Paragraph::setFont(pos_type pos, LyXFont const & 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_->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));
@@ -804,7 +696,7 @@ void Paragraph::setFont(pos_type pos, LyXFont const & font)
 }
 
 
-
+#ifndef NO_NEXT
 void Paragraph::next(Paragraph * p)
 {
 	next_ = p;
@@ -842,79 +734,9 @@ Paragraph const * Paragraph::previous() const
 {
 	return previous_;
 }
+#endif
 
 
-void Paragraph::breakParagraph(BufferParams const & bparams,
-				  pos_type pos,
-				  int flag)
-{
-	// create a new paragraph
-	Paragraph * tmp = new Paragraph(this);
-	tmp->layout(layout());
-	
-	// remember to set the inset_owner
-	tmp->setInsetOwner(inInset());
-	
-	// 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->layout(layout());
-		tmp->setLabelWidthString(params().labelWidthString());
-	}
-	
-	if (size() > pos || !size() || flag == 2) {
-		tmp->layout(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_type pos_end = 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);
-		}
-	}
-	
-	// just an idea of me
-	if (!pos) {
-		tmp->params().lineTop(params().lineTop());
-		tmp->params().pagebreakTop(params().pagebreakTop());
-		tmp->params().spaceTop(params().spaceTop());
-		tmp->bibkey = bibkey;
-
-		bibkey = 0;
-		params().clear();
-		layout(textclasslist[bparams.textclass].defaultLayoutName());
-		
-		// layout stays the same with latex-environments
-		if (flag) {
-			layout(tmp->layout());
-			setLabelWidthString(tmp->params().labelWidthString());
-			params().depth(tmp->params().depth());
-		}
-	}
-}
-	
-
 void Paragraph::makeSameLayout(Paragraph const * par)
 {
 	layout(par->layout());
@@ -923,16 +745,16 @@ void Paragraph::makeSameLayout(Paragraph const * par)
 }
 
 
-int Paragraph::stripLeadingSpaces(lyx::textclass_type tclass) 
+int Paragraph::stripLeadingSpaces()
 {
-	if (textclasslist[tclass][layout()].free_spacing ||
+	if (layout()->free_spacing ||
 	    isFreeSpacing()) {
 		return 0;
 	}
-	
+
 	int i = 0;
-	while (size() && (isNewline(0) || isLineSeparator(0))) {
-		erase(0);
+	while (!empty() && (isNewline(0) || isLineSeparator(0))) {
+		pimpl_->eraseIntern(0);
 		++i;
 	}
 
@@ -942,80 +764,20 @@ int Paragraph::stripLeadingSpaces(lyx::textclass_type tclass)
 
 bool Paragraph::hasSameLayout(Paragraph const * par) const
 {
-	return 
+	return
 		par->layout() == layout() &&
 		params().sameLayout(par->params());
 }
 
 
-void Paragraph::breakParagraphConservative(BufferParams const & bparams,
-					   pos_type pos)
-{
-	// create a new paragraph
-	Paragraph * tmp = new Paragraph(this);
-	tmp->makeSameLayout(this);
-
-	// When can pos > Last()?
-	// I guess pos == Last() is possible.
-	if (size() > pos) {
-		// copy everything behind the break-position to the new
-		// paragraph
-		pos_type pos_end = size() - 1;
-
-		//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.
-// 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
-	Paragraph * the_next = next();
-
-	// first the DTP-stuff
-	params().lineBottom(the_next->params().lineBottom());
-	params().spaceBottom(the_next->params().spaceBottom());
-	params().pagebreakBottom(the_next->params().pagebreakBottom());
-
-	pos_type pos_end = the_next->pimpl_->size() - 1;
-	pos_type pos_insert = size();
-
-	// ok, now copy the paragraph
-	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);
-}
-
-
-int Paragraph::getEndLabel(BufferParams const & bparams) const
+int Paragraph::getEndLabel() const
 {
 	Paragraph const * par = this;
 	depth_type par_depth = getDepth();
 	while (par) {
-		string const & layout = par->layout();
-		int const endlabeltype =
-			textclasslist[bparams.textclass][layout].endlabeltype;
+		LyXLayout_ptr const & layout = par->layout();
+		int const endlabeltype = layout->endlabeltype;
+
 		if (endlabeltype != END_LABEL_NO_LABEL) {
 			if (!next_)
 				return endlabeltype;
@@ -1043,9 +805,9 @@ Paragraph::depth_type Paragraph::getDepth() const
 }
 
 
-Paragraph::depth_type Paragraph::getMaxDepthAfter(Buffer const * buffer) const
+Paragraph::depth_type Paragraph::getMaxDepthAfter() const
 {
-	bool const isenv = textclasslist[buffer->params.textclass][layout()].isEnvironment();
+	bool const isenv = layout()->isEnvironment();
 
 	if (isenv)
 		return params().depth() + 1;
@@ -1066,12 +828,6 @@ string const & Paragraph::getLabelstring() const
 }
 
 
-int Paragraph::getFirstCounter(int i) const
-{
-	return pimpl_->counter_[i];
-}
-
-
 // the next two functions are for the manual labels
 string const Paragraph::getLabelWidthString() const
 {
@@ -1088,7 +844,7 @@ void Paragraph::setLabelWidthString(string const & s)
 }
 
 
-void Paragraph::applyLayout(string const & new_layout)
+void Paragraph::applyLayout(LyXLayout_ptr const & new_layout)
 {
 	layout(new_layout);
 	params().labelWidthString(string());
@@ -1099,24 +855,26 @@ void Paragraph::applyLayout(string const & new_layout)
 }
 
 
-// if the layout of a paragraph contains a manual label, the beginning of the 
+// if the layout of a paragraph contains a manual label, the beginning of the
 // main body is the beginning of the second word. This is what the par-
 // function returns. If the layout does not contain a label, the main
 // body always starts with position 0. This differentiation is necessary,
-// because there cannot be a newline or a blank <= the beginning of the 
+// because there cannot be a newline or a blank <= the beginning of the
 // main body in TeX.
 
 int Paragraph::beginningOfMainBody() const
 {
+	if (layout()->labeltype != LABEL_MANUAL)
+		return 0;
+
 	// Unroll the first two cycles of the loop
 	// and remember the previous character to
 	// remove unnecessary GetChar() calls
 	pos_type i = 0;
-	if (i < size()
-	    && getChar(i) != Paragraph::META_NEWLINE) {
+	if (i < size() && getChar(i) != Paragraph::META_NEWLINE) {
 		++i;
 		char previous_char = 0;
-		char temp = 0; 
+		char temp = 0;
 		if (i < size()
 		    && (previous_char = getChar(i)) != Paragraph::META_NEWLINE) {
 			// Yes, this  ^ is supposed to be "= " not "=="
@@ -1171,6 +929,7 @@ Paragraph const * Paragraph::depthHook(depth_type depth) const
 	return newpar;
 }
 
+
 Paragraph * Paragraph::outerHook()
 {
 	if (!getDepth())
@@ -1178,6 +937,7 @@ Paragraph * Paragraph::outerHook()
 	return depthHook(depth_type(getDepth() - 1));
 }
 
+
 Paragraph const * Paragraph::outerHook() const
 {
 	if (!getDepth())
@@ -1186,25 +946,15 @@ Paragraph const * Paragraph::outerHook() const
 }
 
 
-Paragraph::inset_iterator
-Paragraph::InsetIterator(pos_type pos)
-{
-	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 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;
+	InsetList::iterator it = insetlist.begin();
+	InsetList::iterator end = insetlist.end();
+	for (; it != end; ++it) {
+		if (it.getInset() == inset) {
+			return it.getPos();
 		}
 	}
 	if (inset == bibkey)
@@ -1213,23 +963,40 @@ int Paragraph::getPositionOfInset(Inset const * inset) const
 	return -1;
 }
 
+namespace {
+
+InsetOptArg * optArgInset(Paragraph const & par)
+{
+	// Find the entry.
+	InsetList::iterator it = par.insetlist.begin();
+	InsetList::iterator end = par.insetlist.end();
+	for (; it != end; ++it) {
+		Inset * ins = it.getInset();
+		if (ins->lyxCode() == Inset::OPTARG_CODE) {
+			return static_cast<InsetOptArg *>(ins);
+		}
+	}
+	return 0;
+}
+
+} // end namespace
 
 Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
-                                 BufferParams const & bparams,
-                                 ostream & os, TexRow & texrow,
-                                 bool moving_arg)
+				 BufferParams const & bparams,
+				 ostream & os, TexRow & texrow,
+				 bool moving_arg)
 {
 	lyxerr[Debug::LATEX] << "TeXOnePar...     " << this << endl;
 	Inset const * in = inInset();
 	bool further_blank_line = false;
-	LyXLayout style;
-	
+	LyXLayout_ptr style;
+
 	// well we have to check if we are in an inset with unlimited
 	// lenght (all in one row) if that is true then we don't allow
 	// any special options in the paragraph and also we don't allow
 	// any environment other then "Standard" to be valid!
 	if ((in == 0) || !in->forceDefaultParagraphs(in)) {
-		style = textclasslist[bparams.textclass][layout()];
+		style = layout();
 
 		if (params().startOfAppendix()) {
 			os << "\\appendix\n";
@@ -1238,11 +1005,11 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
 
 		if (!params().spacing().isDefault()
 			&& (!previous() || !previous()->hasSameLayout(this))) {
-			os << params().spacing().writeEnvirBegin() << "\n";
+			os << params().spacing().writeEnvirBegin() << '\n';
 			texrow.newline();
 		}
-	
-		if (tex_code_break_column && style.isCommand()) {
+
+		if (style->isCommand()) {
 			os << '\n';
 			texrow.newline();
 		}
@@ -1267,7 +1034,7 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
 			texrow.newline();
 		}
 	} else {
-		style = textclasslist[bparams.textclass].defaultLayout();
+		style = bparams.getLyXTextClass().defaultLayout();
 	}
 
 	Language const * language = getParLanguage(bparams);
@@ -1277,15 +1044,17 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
 
 	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())))
+	    && !(style->isEnvironment()
+		 && (!previous() ||
+		     (previous()->layout() != layout() &&
+		      previous()->getDepth() <= getDepth())
+		     || previous()->getDepth() < getDepth())))
 	{
 		if (!lyxrc.language_command_end.empty() &&
 		    previous_language->babel() != doc_language->babel())
 		{
 			os << subst(lyxrc.language_command_end, "$$lang",
-			            previous_language->babel())
+				    previous_language->babel())
 			   << endl;
 			texrow.newline();
 		}
@@ -1294,7 +1063,7 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
 		    language->babel() != doc_language->babel())
 		{
 			os << subst(lyxrc.language_command_begin, "$$lang",
-			            language->babel())
+				    language->babel())
 			   << endl;
 			texrow.newline();
 		}
@@ -1304,18 +1073,26 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
 	    language->encoding() != previous_language->encoding()) {
 		os << "\\inputencoding{"
 		   << language->encoding()->LatexName()
-		   << "}" << endl;
+		   << "}\n";
 		texrow.newline();
 	}
 
-	switch (style.latextype) {
+	switch (style->latextype) {
 	case LATEX_COMMAND:
 		os << '\\'
-		   << style.latexname()
-		   << style.latexparam();
+		   << style->latexname();
+
+		// Separate handling of optional argument inset.
+		if (style->optionalargs == 1) {
+			InsetOptArg * it = optArgInset(*this);
+			if (it != 0)
+				it->latexOptional(buf, os, false, false);
+		}
+		else
+			os << style->latexparam();
 		break;
 	case LATEX_ITEM_ENVIRONMENT:
-	        if (bibkey) {
+		if (bibkey) {
 			bibkey->latex(buf, os, false, false);
 		} else
 			os << "\\item ";
@@ -1328,7 +1105,7 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
 	}
 
 	bool need_par = simpleTeXOnePar(buf, bparams, os, texrow, moving_arg);
- 
+
 	// Make sure that \\par is done with the font of the last
 	// character if this has another size as the default.
 	// This is necessary because LaTeX (and LyX on the screen)
@@ -1339,21 +1116,21 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
 	// We do not need to use to change the font for the last paragraph
 	// or for a command.
 	LyXFont const font =
-		(size() == 0
+		(empty()
 		 ? getLayoutFont(bparams) : getFont(bparams, size() - 1));
 
-	bool is_command = style.isCommand();
-	
-	if (style.resfont.size() != font.size() && next_ && !is_command) {
+	bool is_command = style->isCommand();
+
+	if (style->resfont.size() != font.size() && next_ && !is_command) {
 		if (!need_par)
-			os << "{";
+			os << '{';
 		os << "\\" << font.latexSize() << " \\par}";
 	} else if (need_par) {
 		os << "\\par}";
 	} else if (is_command)
-		os << "}";
+		os << '}';
 
-	switch (style.latextype) {
+	switch (style->latextype) {
 	case LATEX_ITEM_ENVIRONMENT:
 	case LATEX_LIST_ENVIRONMENT:
 		if (next_ && (params().depth() < next_->params().depth())) {
@@ -1376,7 +1153,7 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
 			texrow.newline();
 		}
 	}
-	
+
 	if ((in == 0) || !in->forceDefaultParagraphs(in)) {
 		further_blank_line = false;
 		if (params().lineBottom()) {
@@ -1401,11 +1178,11 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
 
 		if (!params().spacing().isDefault()
 			&& (!next_ || !next_->hasSameLayout(this))) {
-			os << params().spacing().writeEnvirEnd() << "\n";
+			os << params().spacing().writeEnvirEnd() << '\n';
 			texrow.newline();
 		}
 	}
-	
+
 	// we don't need it for the last paragraph!!!
 	if (next_) {
 		os << '\n';
@@ -1434,17 +1211,34 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
 	return next_;
 }
 
+
 // This could go to ParagraphParameters if we want to
 int Paragraph::startTeXParParams(BufferParams const & bparams,
-				 ostream & os) const
+				 ostream & os, bool moving_arg) const
 {
 	int column = 0;
-	
+
 	if (params().noindent()) {
 		os << "\\noindent ";
 		column += 10;
 	}
-			
+
+	switch (params().align()) {
+	case LYX_ALIGN_NONE:
+	case LYX_ALIGN_BLOCK:
+	case LYX_ALIGN_LAYOUT:
+	case LYX_ALIGN_SPECIAL:
+		break;
+	case LYX_ALIGN_LEFT:
+	case LYX_ALIGN_RIGHT:
+	case LYX_ALIGN_CENTER:
+		if (moving_arg) {
+			os << "\\protect";
+			column = 8;
+		}
+		break;
+	}
+
 	switch (params().align()) {
 	case LYX_ALIGN_NONE:
 	case LYX_ALIGN_BLOCK:
@@ -1474,16 +1268,33 @@ int Paragraph::startTeXParParams(BufferParams const & bparams,
 		column += 14;
 		break;
 	}
-	
+
 	return column;
 }
 
+
 // This could go to ParagraphParameters if we want to
 int Paragraph::endTeXParParams(BufferParams const & bparams,
-			       ostream & os) const
+			       ostream & os, bool moving_arg) const
 {
 	int column = 0;
-	
+
+	switch (params().align()) {
+	case LYX_ALIGN_NONE:
+	case LYX_ALIGN_BLOCK:
+	case LYX_ALIGN_LAYOUT:
+	case LYX_ALIGN_SPECIAL:
+		break;
+	case LYX_ALIGN_LEFT:
+	case LYX_ALIGN_RIGHT:
+	case LYX_ALIGN_CENTER:
+		if (moving_arg) {
+			os << "\\protect";
+			column = 8;
+		}
+		break;
+	}
+
 	switch (params().align()) {
 	case LYX_ALIGN_NONE:
 	case LYX_ALIGN_BLOCK:
@@ -1519,16 +1330,16 @@ int Paragraph::endTeXParParams(BufferParams const & bparams,
 
 // 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)
+				BufferParams const & bparams,
+				ostream & os, TexRow & texrow,
+				bool moving_arg)
 {
 	lyxerr[Debug::LATEX] << "SimpleTeXOnePar...     " << this << endl;
 
 	bool return_value = false;
 
-	LyXLayout style;
-	
+	LyXLayout_ptr style;
+
 	// well we have to check if we are in an inset with unlimited
 	// lenght (all in one row) if that is true then we don't allow
 	// any special options in the paragraph and also we don't allow
@@ -1537,21 +1348,25 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 		(inInset() && inInset()->forceDefaultParagraphs(inInset()));
 
 	if (asdefault) {
-		style = textclasslist[bparams.textclass].defaultLayout();
+		style = bparams.getLyXTextClass().defaultLayout();
 	} else {
-		style = textclasslist[bparams.textclass][layout()];
+		style = layout();
 	}
-	
+
 	LyXFont basefont;
 
 	// Maybe we have to create a optional argument.
 	pos_type main_body;
-	if (style.labeltype != LABEL_MANUAL)
+
+	// FIXME: can we actually skip this check and just call
+	// beginningOfMainBody() ??
+	if (style->labeltype != LABEL_MANUAL) {
 		main_body = 0;
-	else
+	} else {
 		main_body = beginningOfMainBody();
+	}
 
-	int column = 0;
+	unsigned int column = 0;
 
 	if (main_body > 0) {
 		os << '[';
@@ -1561,23 +1376,25 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 		basefont = getLayoutFont(bparams);
 	}
 
-	moving_arg |= style.needprotect;
- 
+	moving_arg |= style->needprotect;
+
 	// Which font is currently active?
 	LyXFont running_font(basefont);
 	// Do we have an open font change?
 	bool open_font = false;
 
+	Change::Type running_change = Change::UNCHANGED;
+ 
 	texrow.start(this, 0);
 
 	// if the paragraph is empty, the loop will not be entered at all
-	if (!size()) {
-		if (style.isCommand()) {
+	if (empty()) {
+		if (style->isCommand()) {
 			os << '{';
 			++column;
 		}
 		if (!asdefault)
-			column += startTeXParParams(bparams, os);
+			column += startTeXParParams(bparams, os, moving_arg);
 
 	}
 
@@ -1595,21 +1412,22 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 				os << ']';
 				++column;
 			}
-			if (style.isCommand()) {
+			if (style->isCommand()) {
 				os << '{';
 				++column;
 			}
-			
+
 			if (!asdefault)
-				column += startTeXParParams(bparams, os);
+				column += startTeXParParams(bparams, os,
+							    moving_arg);
 		}
-		
+
 		value_type c = getChar(i);
 
 		// Fully instantiated font
 		LyXFont font = getFont(bparams, i);
 
-		LyXFont const & last_font = running_font;
+		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} "
@@ -1621,9 +1439,12 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 				font = next_font;
 			}
 		}
-		
+
 		// We end font definition before blanks
-		if (font != running_font && open_font) {
+		if (open_font &&
+		    (font != running_font ||
+		     font.language() != running_font.language()))
+		{
 			column += running_font.latexWriteEndChanges(os,
 								    basefont,
 								    (i == main_body-1) ? basefont : font);
@@ -1636,22 +1457,30 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 			// Do not print the separation of the optional argument
 			if (i != main_body - 1) {
 				pimpl_->simpleTeXBlanks(os, texrow, i,
-						       column, font, style);
+						       column, font, *style);
 			}
 		}
 
 		// Do we need to change font?
-		if (font != running_font && i != main_body - 1) {
+		if ((font != running_font ||
+		     font.language() != running_font.language()) &&
+			i != main_body - 1)
+		{
 			column += font.latexWriteStartChanges(os, basefont,
 							      last_font);
 			running_font = font;
 			open_font = true;
 		}
-
+ 
+		Change::Type change = pimpl_->lookupChange(i);
+ 
+		column += Changes::latexMarkChange(os, running_change, change);
+		running_change = change;
+ 
 		if (c == Paragraph::META_NEWLINE) {
 			// newlines are handled differently here than
 			// the default in SimpleTeXSpecialChars().
-			if (!style.newline_allowed) {
+			if (!style->newline_allowed) {
 				os << '\n';
 			} else {
 				if (open_font) {
@@ -1660,12 +1489,13 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 				}
 				basefont = getLayoutFont(bparams);
 				running_font = basefont;
-				if (font.family() == 
+				if (font.family() ==
 				    LyXFont::TYPEWRITER_FAMILY) {
-					os << "~";
+					os << '~';
 				}
 				if (moving_arg)
 					os << "\\protect ";
+
 				os << "\\\\\n";
 			}
 			texrow.newline();
@@ -1674,23 +1504,27 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 		} else {
 			pimpl_->simpleTeXSpecialChars(buf, bparams,
 						      os, texrow, moving_arg,
-						      font, running_font, 
-						      basefont, open_font, 
-						      style, i, column, c);
+						      font, running_font,
+						      basefont, open_font,
+						      running_change,
+						      *style, i, column, c);
 		}
 	}
 
+	column += Changes::latexMarkChange(os,
+			running_change, Change::UNCHANGED);
+ 
 	// If we have an open font definition, we have to close it
 	if (open_font) {
 #ifdef FIXED_LANGUAGE_END_DETECTION
 		if (next_) {
 			running_font
 				.latexWriteEndChanges(os, basefont,
-				                      next_->getFont(bparams,
-				                      0));
+						      next_->getFont(bparams,
+						      0));
 		} else {
 			running_font.latexWriteEndChanges(os, basefont,
-			                                  basefont);
+							  basefont);
 		}
 #else
 #ifdef WITH_WARNINGS
@@ -1709,7 +1543,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 	}
 
 	if (!asdefault) {
-		column += endTeXParParams(bparams, os);
+		column += endTeXParParams(bparams, os, moving_arg);
 	}
 
 	lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl;
@@ -1717,78 +1551,13 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 }
 
 
-bool Paragraph::sgmlConvertChar(char c, string & sgml_string)
-{
-	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;
-}
-
-
 Paragraph * Paragraph::TeXEnvironment(Buffer const * buf,
 					    BufferParams const & bparams,
 					    ostream & os, TexRow & texrow)
 {
 	lyxerr[Debug::LATEX] << "TeXEnvironment...     " << this << endl;
 
-	LyXLayout const & style =
-		textclasslist[bparams.textclass][layout()];
+	LyXLayout_ptr const & style = layout();
 
 	Language const * language = getParLanguage(bparams);
 	Language const * doc_language = bparams.language;
@@ -1813,21 +1582,29 @@ Paragraph * Paragraph::TeXEnvironment(Buffer const * buf,
 		}
 	}
 
-	if (style.isEnvironment()) {
-		if (style.latextype == LATEX_LIST_ENVIRONMENT) {
-			os << "\\begin{" << style.latexname() << "}{"
+	bool leftindent_open = false;
+	if (!params().leftIndent().zero()) {
+		os << "\\begin{LyXParagraphLeftIndent}{" <<
+			params().leftIndent().asLatexString() << "}\n";
+		texrow.newline();
+		leftindent_open = true;
+	}
+
+	if (style->isEnvironment()) {
+		if (style->latextype == LATEX_LIST_ENVIRONMENT) {
+			os << "\\begin{" << style->latexname() << "}{"
 			   << params().labelWidthString() << "}\n";
-		} else if (style.labeltype == LABEL_BIBLIO) {
+		} else if (style->labeltype == LABEL_BIBLIO) {
 			// ale970405
-			os << "\\begin{" << style.latexname() << "}{"
+			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';
+		} 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;
@@ -1835,13 +1612,14 @@ Paragraph * Paragraph::TeXEnvironment(Buffer const * buf,
 		par = par->TeXOnePar(buf, bparams, os, texrow, false);
 
 		if (par && par->params().depth() > params().depth()) {
-			if (textclasslist[bparams.textclass][par->layout()].isParagraph()
+			    if (par->layout()->isParagraph()) {
+
 			    // Thinko!
 			    // How to handle this? (Lgb)
 			    //&& !suffixIs(os, "\n\n")
-				) {
+				    //) {
 				// There should be at least one '\n' already
-				// but we need there to be two for Standard 
+				// 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.
@@ -1857,10 +1635,16 @@ Paragraph * Paragraph::TeXEnvironment(Buffer const * buf,
 		}
 	} while (par
 		 && par->layout() == layout()
-		 && par->params().depth() == params().depth());
- 
-	if (style.isEnvironment()) {
-		os << "\\end{" << style.latexname() << "}\n";
+		 && par->params().depth() == params().depth()
+		 && par->params().leftIndent() == params().leftIndent());
+
+	if (style->isEnvironment()) {
+		os << "\\end{" << style->latexname() << "}\n";
+		texrow.newline();
+	}
+
+	if (leftindent_open) {
+		os << "\\end{LyXParagraphLeftIndent}\n";
 		texrow.newline();
 	}
 
@@ -1897,7 +1681,8 @@ bool Paragraph::isLineSeparator(pos_type pos) const
 {
 	value_type const c = getChar(pos);
 	return IsLineSeparatorChar(c)
-		|| (IsInsetChar(c) && getInset(pos)->isLineSeparator());
+		|| (IsInsetChar(c) && getInset(pos) &&
+		getInset(pos)->isLineSeparator());
 }
 
 
@@ -1913,14 +1698,14 @@ bool Paragraph::isLetter(pos_type pos) const
 	value_type const c = getChar(pos);
 	if (IsLetterChar(c))
 		return true;
-	if (isInset(pos)) 
+	if (isInset(pos))
 		return getInset(pos)->isLetter();
 	// We want to pass the ' and escape chars to ispell
 	string const extra = lyxrc.isp_esc_chars + '\'';
 	return contains(extra, c);
 }
- 
- 
+
+
 bool Paragraph::isWord(pos_type pos) const
 {
 	return IsWordChar(getChar(pos)) ;
@@ -1928,20 +1713,10 @@ bool Paragraph::isWord(pos_type pos) const
 
 
 Language const *
-Paragraph::getParLanguage(BufferParams const & bparams) const 
+Paragraph::getParLanguage(BufferParams const & bparams) const
 {
-	if (size() > 0) {
-#ifndef INHERIT_LANGUAGE
+	if (!empty()) {
 		return getFirstFontSettings().language();
-#else
-		Language const * lang = getFirstFontSettings().language();
-#ifdef WITH_WARNINGS
-#warning We should make this somewhat better, any ideas? (Jug)
-#endif
-		if (lang == inherit_language || lang == ignore_language)
-			lang = bparams.language;
-		return lang;
-#endif
 	} else if (previous_)
 		return previous_->getParLanguage(bparams);
 	else
@@ -1952,7 +1727,9 @@ Paragraph::getParLanguage(BufferParams const & bparams) const
 bool Paragraph::isRightToLeftPar(BufferParams const & bparams) const
 {
 	return lyxrc.rtl_support
-		&& getParLanguage(bparams)->RightToLeft();
+		&& getParLanguage(bparams)->RightToLeft()
+		&& !(inInset() && inInset()->owner() &&
+		     inInset()->owner()->lyxCode() == Inset::ERT_CODE);
 }
 
 
@@ -1972,13 +1749,12 @@ void Paragraph::changeLanguage(BufferParams const & bparams,
 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)
+	Pimpl::FontList::const_iterator cit = pimpl_->fontlist.begin();
+	Pimpl::FontList::const_iterator end = pimpl_->fontlist.end();
+
+	for (; cit != 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;
@@ -1987,13 +1763,11 @@ bool Paragraph::isMultiLingual(BufferParams const & bparams)
 
 // Convert the paragraph to a string.
 // Used for building the table of contents
-string const Paragraph::asString(Buffer const * buffer, bool label)
+string const Paragraph::asString(Buffer const * buffer, bool label) const
 {
-	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);
@@ -2003,19 +1777,16 @@ string const Paragraph::asString(Buffer const * buffer, bool label)
 			 getInset(i)->lyxCode() == Inset::MATH_CODE) {
 			ostringstream ost;
 			getInset(i)->ascii(buffer, ost);
-			s += subst(ost.str().c_str(),'\n',' ');
+			s += subst(STRCONV(ost.str()),'\n',' ');
 		}
 	}
 
-	if (isRightToLeftPar(bparams))
-		reverse(s.begin() + len,s.end());
-
 	return s;
 }
 
 
-string const Paragraph::asString(Buffer const * buffer, 
-				 pos_type beg, pos_type end, bool label)
+string const Paragraph::asString(Buffer const * buffer,
+				 pos_type beg, pos_type end, bool label) const
 {
 	ostringstream ost;
 
@@ -2029,23 +1800,24 @@ string const Paragraph::asString(Buffer const * buffer,
 		else if (c == META_NEWLINE)
 			ost << '\n';
 		else if (c == META_HFILL)
-			ost << '\t'; 
+			ost << '\t';
 		else if (c == META_INSET) {
 			getInset(i)->ascii(buffer, ost);
 		}
 	}
 
-	return ost.str().c_str();
+	return STRCONV(ost.str());
 }
 
 
 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);
+	InsetList::iterator it = insetlist.begin();
+	InsetList::iterator end = insetlist.end();
+	for (; it != end; ++it) {
+		if (it.getInset())
+			it.getInset()->setOwner(i);
 	}
 }
 
@@ -2053,31 +1825,14 @@ void Paragraph::setInsetOwner(Inset * i)
 void Paragraph::deleteInsetsLyXText(BufferView * bv)
 {
 	// 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);
-			}
-		}
-	}
+	insetlist.deleteInsetsLyXText(bv);
 }
 
 
 void Paragraph::resizeInsetsLyXText(BufferView * bv)
 {
 	// 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);
-			}
-		}
-	}
+	insetlist.resizeInsetsLyXText(bv);
 }
 
 
@@ -2087,103 +1842,127 @@ void Paragraph::setContentsFromPar(Paragraph * par)
 }
 
 
-lyx::pos_type Paragraph::size() const
+void Paragraph::trackChanges(Change::Type type)
 {
-	return pimpl_->size();
+	pimpl_->trackChanges(type);
 }
 
-
-Paragraph::value_type Paragraph::getChar(pos_type pos) const
+ 
+void Paragraph::untrackChanges()
 {
-	return pimpl_->getChar(pos);
+	pimpl_->untrackChanges();
 }
 
 
-int Paragraph::id() const
+void Paragraph::cleanChanges()
 {
-	return pimpl_->id_;
+	pimpl_->cleanChanges();
 }
 
-
-void  Paragraph::id(int id_arg)
+ 
+Change::Type Paragraph::lookupChange(lyx::pos_type pos) const
 {
-	pimpl_->id_ = id_arg;
+	lyx::Assert(!size() || pos < size());
+	return pimpl_->lookupChange(pos);
 }
 
+ 
+Change const Paragraph::lookupChangeFull(lyx::pos_type pos) const
+{
+	lyx::Assert(!size() || pos < size());
+	return pimpl_->lookupChangeFull(pos);
+}
 
-string const & Paragraph::layout() const
+ 
+bool Paragraph::isChanged(pos_type start, pos_type end) const
 {
-	return layout_;
+	return pimpl_->isChanged(start, end);
 }
 
 
-void Paragraph::layout(string const & new_layout)
+bool Paragraph::isChangeEdited(pos_type start, pos_type end) const
 {
-	lyx::Assert(!new_layout.empty());
-	
-	layout_ = new_layout;
+	return pimpl_->isChangeEdited(start, end);
 }
 
+ 
+void Paragraph::markErased()
+{
+	pimpl_->markErased();
+}
 
-bool Paragraph::isFirstInSequence() const
+ 
+void Paragraph::acceptChange(pos_type start, pos_type end)
 {
-	Paragraph const * dhook = depthHook(getDepth());
-	return (dhook == this
-		|| dhook->layout() != layout()
-		|| dhook->getDepth() != getDepth());
+	return pimpl_->acceptChange(start, end);
 }
 
+ 
+void Paragraph::rejectChange(pos_type start, pos_type end)
+{
+	return pimpl_->rejectChange(start, end);
+}
 
-Inset * Paragraph::inInset() const
+ 
+lyx::pos_type Paragraph::size() const
 {
-	return pimpl_->inset_owner;
+	return pimpl_->size();
 }
 
 
-void Paragraph::clearContents()
+bool Paragraph::empty() const
 {
-	pimpl_->clear();
+	return pimpl_->empty();
 }
 
 
-void Paragraph::setCounter(int i, int v)
+Paragraph::value_type Paragraph::getChar(pos_type pos) const
 {
-	pimpl_->counter_[i] = v;
+	return pimpl_->getChar(pos);
 }
 
 
-int Paragraph::getCounter(int i) const
+int Paragraph::id() const
 {
-	return pimpl_->counter_[i];
+	return pimpl_->id_;
 }
 
 
-void Paragraph::incCounter(int i)
+LyXLayout_ptr const & Paragraph::layout() const
 {
-	pimpl_->counter_[i]++;
+	return layout_;
 }
 
 
-void Paragraph::setChar(pos_type pos, value_type c)
+void Paragraph::layout(LyXLayout_ptr const & new_layout)
 {
-	pimpl_->setChar(pos, c);
+	layout_ = new_layout;
 }
 
 
-Paragraph::inset_iterator::inset_iterator(Paragraph::InsetList::iterator const & iter)
- : it(iter) 
-{}
+bool Paragraph::isFirstInSequence() const
+{
+	Paragraph const * dhook = depthHook(getDepth());
+	return (dhook == this
+		|| dhook->layout() != layout()
+		|| dhook->getDepth() != getDepth());
+}
 
 
-Paragraph::inset_iterator Paragraph::inset_iterator_begin()
+Inset * Paragraph::inInset() const
 {
-	return inset_iterator(insetlist.begin());
+	return pimpl_->inset_owner;
 }
 
 
-Paragraph::inset_iterator Paragraph::inset_iterator_end()
+void Paragraph::clearContents()
 {
-	return inset_iterator(insetlist.end());
+	pimpl_->clear();
+}
+
+void Paragraph::setChar(pos_type pos, value_type c)
+{
+	pimpl_->setChar(pos, c);
 }