X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.C;h=ae7a8a0f04fb862204ad2c9aa1f961f1fcd9ba61;hb=98c966c64594611e469313314abd1e59524adb4a;hp=fbdeb4f36dd14b4c7a253514ad066cfd47996b42;hpb=4925a78eb2539649960056c104249d693b7b6e00;p=lyx.git

diff --git a/src/paragraph.C b/src/paragraph.C
index fbdeb4f36d..ae7a8a0f04 100644
--- a/src/paragraph.C
+++ b/src/paragraph.C
@@ -1,10 +1,10 @@
 /* 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.
  *
  * ====================================================== */
 
@@ -14,35 +14,37 @@
 #pragma implementation
 #endif
 
-#include <algorithm>
-#include <fstream>
-#include <csignal>
-
 #include "paragraph.h"
 #include "paragraph_pimpl.h"
-#include "support/textutils.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 "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"
+
 #include "support/filetools.h"
 #include "support/lstrings.h"
-#include "lyx_gui_misc.h"
-#include "texrow.h"
 #include "support/lyxmanip.h"
-#include "BufferView.h"
-#include "encoding.h"
-#include "ParameterStruct.h"
-#include "gettext.h"
+#include "support/FileInfo.h"
+#include "support/LAssert.h"
+#include "support/textutils.h"
+
+#include <algorithm>
+#include <fstream>
+#include <csignal>
 
 using std::ostream;
 using std::endl;
@@ -52,6 +54,8 @@ 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)
@@ -73,21 +77,22 @@ extern BufferView * current_view;
 
 
 Paragraph::Paragraph()
-		: pimpl_(new Paragraph::Pimpl(this))
+	: pimpl_(new Paragraph::Pimpl(this))
 {
-	for (int i = 0; i < 10; ++i) setCounter(i , 0);
+	for (int i = 0; i < 10; ++i)
+		setCounter(i, 0);
 	next_ = 0;
 	previous_ = 0;
 	enumdepth = 0;
 	itemdepth = 0;
-        bibkey = 0; // ale970302
-	clear();
+	bibkey = 0; // ale970302
+	params().clear();
 }
 
 
-// This konstruktor inserts the new paragraph in a list.
+// This constructor inserts the new paragraph in a list.
 Paragraph::Paragraph(Paragraph * par)
-		: pimpl_(new Paragraph::Pimpl(this))
+	: pimpl_(new Paragraph::Pimpl(this))
 {
 	for (int i = 0; i < 10; ++i)
 		setCounter(i, 0);
@@ -102,9 +107,8 @@ Paragraph::Paragraph(Paragraph * par)
 	previous_->next_ = this;
 	// end
 
-        bibkey = 0; // ale970302        
-    
-	clear();
+	bibkey = 0; // ale970302
+	params().clear();
 }
 
 
@@ -112,31 +116,32 @@ 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);
+		setCounter(i, 0);
 	enumdepth = 0;
 	itemdepth = 0;
-	next_ = 0;
+	next_     = 0;
 	previous_ = 0;
 
 	// this is because of the dummy layout of the paragraphs that
 	// follow footnotes
-	layout = lp.layout;
+	layout_ = lp.layout();
 
-        // ale970302
+	// ale970302
 	if (lp.bibkey) {
 		bibkey = static_cast<InsetBibKey *>
 			(lp.bibkey->clone(*current_view->buffer()));
 	} else {
 		bibkey = 0;
 	}
-	
-	// copy everything behind the break-position to the new paragraph
 
+	// 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);
 	}
 }
 
@@ -154,7 +159,7 @@ Paragraph::~Paragraph()
 		delete it->inset;
 	}
 
-        // ale970302
+	// ale970302
 	delete bibkey;
 
 	delete pimpl_;
@@ -165,8 +170,8 @@ Paragraph::~Paragraph()
 
 
 void Paragraph::writeFile(Buffer const * buf, ostream & os,
-                          BufferParams const & bparams,
-                          depth_type dth) const
+			  BufferParams const & bparams,
+			  depth_type dth) const
 {
 	// The beginning or end of a deeper (i.e. nested) area?
 	if (dth != params().depth()) {
@@ -182,12 +187,15 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os,
 			}
 		}
 	}
-	
+
 	// First write the layout
-	os << "\n\\layout "
-	   << textclasslist.NameOfLayout(bparams.textclass, layout)
-	   << "\n";
-	
+	string lay = layout();
+	if (lay.empty()) {
+		lay = textclasslist[bparams.textclass].defaultLayoutName();
+	}
+
+	os << "\n\\layout " << layout() << "\n";
+
 	// Maybe some vertical spaces.
 	if (params().spaceTop().kind() != VSpace::NONE)
 		os << "\\added_space_top "
@@ -195,35 +203,35 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os,
 	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;
@@ -235,20 +243,20 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os,
 		}
 		os << "\\align " << string_align[h] << " ";
 	}
-	
+
 	// bibitem  ale970302
 	if (bibkey)
 		bibkey->write(buf, os);
-	
+
 	LyXFont font1(LyXFont::ALL_INHERIT, bparams.language);
-	
+
 	int column = 0;
-	for (size_type i = 0; i < size(); ++i) {
+	for (pos_type i = 0; i < size(); ++i) {
 		if (!i) {
 			os << "\n";
 			column = 0;
 		}
-		
+
 		// Write font changes
 		LyXFont font2 = getFontSettings(bparams, i);
 		if (font2 != font1) {
@@ -260,7 +268,7 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os,
 			column = 0;
 			font1 = font2;
 		}
-		
+
 		value_type const c = getChar(i);
 		switch (c) {
 		case META_INSET:
@@ -280,11 +288,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;
@@ -316,7 +324,7 @@ void Paragraph::writeFile(Buffer const * buf, ostream & os,
 			break;
 		}
 	}
-	
+
 	// now write the next paragraph
 	if (next_)
 		next_->writeFile(buf, os, bparams, dth);
@@ -329,28 +337,29 @@ void Paragraph::validate(LaTeXFeatures & features) const
 
 	// check the params.
 	if (params().lineTop() || params().lineBottom())
-		features.lyxline = true;
+		features.require("lyxline");
 	if (!params().spacing().isDefault())
-		features.setspace = true;
-	
+		features.require("setspace");
+
 	// then the layouts
-	features.layout[getLayout()] = true;
+	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) {
+
+	Pimpl::FontList::const_iterator fcit = pimpl_->fontlist.begin();
+	Pimpl::FontList::const_iterator fend = pimpl_->fontlist.end();
+	for (; fcit != fend; ++fcit) {
+		if (fcit->font().noun() == LyXFont::ON) {
 			lyxerr[Debug::LATEX] << "font.noun: "
-					     << cit->font().noun()
+					     << fcit->font().noun()
 					     << endl;
-			features.noun = true;
+			features.require("noun");
 			lyxerr[Debug::LATEX] << "Noun enabled. Font: "
-					     << cit->font().stateText(0)
+					     << fcit->font().stateText(0)
 					     << endl;
 		}
-		switch (cit->font().color()) {
+		switch (fcit->font().color()) {
 		case LColor::none:
 		case LColor::inherit:
 		case LColor::ignore:
@@ -360,13 +369,13 @@ void Paragraph::validate(LaTeXFeatures & features) const
 		case LColor::note:
 			break;
 		default:
-			features.color = true;
+			features.require("color");
 			lyxerr[Debug::LATEX] << "Color enabled. Font: "
-					     << cit->font().stateText(0)
+					     << fcit->font().stateText(0)
 					     << endl;
 		}
 
-		Language const * language = cit->font().language();
+		Language const * language = fcit->font().language();
 		if (language->babel() != doc_language->babel() &&
 		    language != ignore_language &&
 #ifdef INHERIT_LANGUAGE
@@ -374,32 +383,30 @@ void Paragraph::validate(LaTeXFeatures & features) const
 #endif
 		    language != latex_language)
 		{
-			features.UsedLanguages.insert(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 (layout.needprotect &&
-			    cit->inset->lyxCode() == Inset::FOOT_CODE)
-				features.NeedLyXFootnoteCode = true;
+	LyXLayout const & lout = textclasslist[bparams.textclass][layout()];
+
+	InsetList::const_iterator icit = insetlist.begin();
+	InsetList::const_iterator iend = insetlist.end();
+	for (; icit != iend; ++icit) {
+		if (icit->inset) {
+			icit->inset->validate(features);
+			if (lout.needprotect &&
+			    icit->inset->lyxCode() == Inset::FOOT_CODE)
+				features.require("NeedLyXFootnoteCode");
 		}
 	}
 }
 
 
 // First few functions needed for cut and paste and paragraph breaking.
-void Paragraph::copyIntoMinibuffer(Buffer const & buffer,
-				      Paragraph::size_type pos) const
+void Paragraph::copyIntoMinibuffer(Buffer const & buffer, pos_type pos) const
 {
 	BufferParams bparams = buffer.params;
 
@@ -418,8 +425,7 @@ void Paragraph::copyIntoMinibuffer(Buffer const & buffer,
 }
 
 
-void Paragraph::cutIntoMinibuffer(BufferParams const & bparams,
-				     Paragraph::size_type pos)
+void Paragraph::cutIntoMinibuffer(BufferParams const & bparams, pos_type pos)
 {
 	minibuffer_char = getChar(pos);
 	minibuffer_font = getFontSettings(bparams, pos);
@@ -431,13 +437,17 @@ void Paragraph::cutIntoMinibuffer(BufferParams const & bparams,
 			// 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)
+			InsetList::iterator it = insetlist.begin();
+			InsetList::iterator end = insetlist.end();
+			for (; it != end; ++it) {
+				if (it->pos == pos)
+					break;
+			}
+
+			if (it != 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 = ' ';
@@ -450,17 +460,19 @@ void Paragraph::cutIntoMinibuffer(BufferParams const & bparams,
 }
 
 
-bool Paragraph::insertFromMinibuffer(Paragraph::size_type pos)
+bool Paragraph::insertFromMinibuffer(pos_type pos)
 {
-	if ((minibuffer_char == Paragraph::META_INSET) &&
-	    !insetAllowed(minibuffer_inset->lyxCode()))
-		return false;
-	if (minibuffer_char == Paragraph::META_INSET)
+	if (minibuffer_char == Paragraph::META_INSET) {
+		if (!insetAllowed(minibuffer_inset->lyxCode())) {
+			return false;
+		}
 		insertInset(pos, minibuffer_inset, minibuffer_font);
-	else {
+	} else {
 		LyXFont f = minibuffer_font;
-		if (checkInsertChar(f))
-			insertChar(pos, minibuffer_char, f);
+		if (!checkInsertChar(f)) {
+			return false;
+		}
+		insertChar(pos, minibuffer_char, f);
 	}
 	return true;
 }
@@ -468,17 +480,7 @@ bool Paragraph::insertFromMinibuffer(Paragraph::size_type pos)
 // end of minibuffer
 
 
-
-void Paragraph::clear()
-{
-	params().clear();
-	
-	layout = 0;
-	bibkey = 0;
-}
-
-
-void Paragraph::erase(Paragraph::size_type pos)
+void Paragraph::erase(pos_type pos)
 {
 	pimpl_->erase(pos);
 }
@@ -492,29 +494,28 @@ bool Paragraph::checkInsertChar(LyXFont & font)
 }
 
 
-void Paragraph::insertChar(Paragraph::size_type pos, Paragraph::value_type c)
+void Paragraph::insertChar(pos_type pos, Paragraph::value_type c)
 {
 	LyXFont const f(LyXFont::ALL_INHERIT);
 	insertChar(pos, c, f);
 }
 
 
-void Paragraph::insertChar(Paragraph::size_type pos, Paragraph::value_type c,
-                           LyXFont const & font)
+void Paragraph::insertChar(pos_type pos, Paragraph::value_type c,
+			   LyXFont const & font)
 {
 	pimpl_->insertChar(pos, c, font);
 }
 
 
-void Paragraph::insertInset(Paragraph::size_type pos, Inset * inset)
+void Paragraph::insertInset(pos_type pos, Inset * inset)
 {
 	LyXFont const f(LyXFont::ALL_INHERIT);
 	insertInset(pos, inset, f);
 }
 
 
-void Paragraph::insertInset(Paragraph::size_type pos, Inset * inset,
-                            LyXFont const & font)
+void Paragraph::insertInset(pos_type pos, Inset * inset, LyXFont const & font)
 {
 	pimpl_->insertInset(pos, inset, font);
 }
@@ -523,29 +524,32 @@ void Paragraph::insertInset(Paragraph::size_type pos, Inset * inset,
 bool Paragraph::insetAllowed(Inset::Code code)
 {
 	//lyxerr << "Paragraph::InsertInsetAllowed" << endl;
-	
+
 	if (pimpl_->inset_owner)
 		return pimpl_->inset_owner->insetAllowed(code);
 	return true;
 }
 
 
-Inset * Paragraph::getInset(Paragraph::size_type pos)
+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)
+	InsetList::iterator it = insetlist.begin();
+	InsetList::iterator end = insetlist.end();
+	for (; it != end; ++it) {
+		if (it->pos == pos)
+			break;
+	}
+
+	if (it != end && it->pos == pos)
 		return it->inset;
 
 	lyxerr << "ERROR (Paragraph::getInset): "
-		"Inset does not exist: " << pos << endl;
+	       << "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)
@@ -555,20 +559,23 @@ Inset * Paragraph::getInset(Paragraph::size_type pos)
 }
 
 
-Inset const * Paragraph::getInset(Paragraph::size_type pos) const
+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)
+	InsetList::const_iterator cit = insetlist.begin();
+	InsetList::const_iterator end = insetlist.end();
+	for (; cit != end; ++cit) {
+		if (cit->pos == pos)
+			break;
+	}
+
+	if (cit != end && cit->pos == pos)
 		return cit->inset;
 
-	lyxerr << "ERROR (Paragraph::GetInset): "
-		"Inset does not exist: " << pos << endl;
+	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
@@ -581,16 +588,19 @@ Inset const * Paragraph::getInset(Paragraph::size_type pos) const
 
 // Gets uninstantiated font setting at position.
 LyXFont const Paragraph::getFontSettings(BufferParams const & bparams,
-                                         Paragraph::size_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()) {
 		retfont = getFontSettings(bparams, pos - 1);
@@ -608,11 +618,9 @@ LyXFont const Paragraph::getFontSettings(BufferParams const & bparams,
 // Gets uninstantiated font setting at position 0
 LyXFont const Paragraph::getFirstFontSettings() const
 {
-	if (size() > 0) {
-		if (!pimpl_->fontlist.empty())
-			return pimpl_->fontlist[0].font();
-	}
-	
+	if (size() > 0 && !pimpl_->fontlist.empty())
+		return pimpl_->fontlist[0].font();
+
 	return LyXFont(LyXFont::ALL_INHERIT);
 }
 
@@ -625,23 +633,22 @@ LyXFont const Paragraph::getFirstFontSettings() const
 // If position is -1, we get the layout font of the paragraph.
 // If position is -2, we get the font of the manual label of the paragraph.
 LyXFont const Paragraph::getFont(BufferParams const & bparams,
-				 Paragraph::size_type pos) const
+				 pos_type pos) const
 {
 	lyx::Assert(pos >= 0);
-	
-	LyXLayout const & layout =
-		textclasslist.Style(bparams.textclass, 
-				    getLayout());
-	Paragraph::size_type main_body = 0;
-	if (layout.labeltype == LABEL_MANUAL)
+
+	LyXLayout const & lout =
+		textclasslist[bparams.textclass][layout()];
+	pos_type main_body = 0;
+	if (lout.labeltype == LABEL_MANUAL)
 		main_body = beginningOfMainBody();
 
 	LyXFont layoutfont;
 	if (pos < main_body)
-		layoutfont = layout.labelfont;
+		layoutfont = lout.labelfont;
 	else
-		layoutfont = layout.font;
-	
+		layoutfont = lout.font;
+
 	LyXFont tmpfont = getFontSettings(bparams, pos);
 #ifndef INHERIT_LANGUAGE
 	tmpfont.realize(layoutfont);
@@ -655,10 +662,10 @@ LyXFont const Paragraph::getFont(BufferParams const & bparams,
 
 LyXFont const Paragraph::getLabelFont(BufferParams const & bparams) const
 {
-	LyXLayout const & layout =
-		textclasslist.Style(bparams.textclass, getLayout());
-	
-	LyXFont tmpfont = layout.labelfont;
+	LyXLayout const & lout =
+		textclasslist[bparams.textclass][layout()];
+
+	LyXFont tmpfont = lout.labelfont;
 	tmpfont.setLanguage(getParLanguage(bparams));
 
 	return pimpl_->realizeFont(tmpfont, bparams);
@@ -667,11 +674,10 @@ LyXFont const Paragraph::getLabelFont(BufferParams const & bparams) const
 
 LyXFont const Paragraph::getLayoutFont(BufferParams const & bparams) const
 {
-	LyXLayout const & layout =
-		textclasslist.Style(bparams.textclass, 
-				    getLayout());
+	LyXLayout const & lout =
+		textclasslist[bparams.textclass][layout()];
 
-	LyXFont tmpfont = layout.font;
+	LyXFont tmpfont = lout.font;
 	tmpfont.setLanguage(getParLanguage(bparams));
 
 	return pimpl_->realizeFont(tmpfont, bparams);
@@ -680,28 +686,29 @@ LyXFont const Paragraph::getLayoutFont(BufferParams const & bparams) const
 
 /// Returns the height of the highest font in range
 LyXFont::FONT_SIZE
-Paragraph::highestFontInRange(Paragraph::size_type startpos,
-                              Paragraph::size_type endpos,
+Paragraph::highestFontInRange(pos_type startpos, pos_type endpos,
 			      LyXFont::FONT_SIZE const def_size) const
 {
 	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)
@@ -714,8 +721,7 @@ Paragraph::highestFontInRange(Paragraph::size_type startpos,
 
 
 Paragraph::value_type
-Paragraph::getUChar(BufferParams const & bparams,
-		       Paragraph::size_type pos) const
+Paragraph::getUChar(BufferParams const & bparams, pos_type pos) const
 {
 	value_type c = getChar(pos);
 	if (!lyxrc.rtl_support)
@@ -755,8 +761,7 @@ Paragraph::getUChar(BufferParams const & bparams,
 }
 
 
-void Paragraph::setFont(Paragraph::size_type pos,
-			   LyXFont const & font)
+void Paragraph::setFont(pos_type pos, LyXFont const & font)
 {
 	lyx::Assert(pos <= size());
 
@@ -767,18 +772,21 @@ void Paragraph::setFont(Paragraph::size_type pos,
 	// 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?
@@ -808,7 +816,7 @@ void Paragraph::setFont(Paragraph::size_type pos,
 			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));
@@ -857,43 +865,45 @@ Paragraph const * Paragraph::previous() const
 
 
 void Paragraph::breakParagraph(BufferParams const & bparams,
-				  Paragraph::size_type pos,
+				  pos_type pos,
 				  int flag)
 {
 	// create a new paragraph
 	Paragraph * tmp = new Paragraph(this);
+	tmp->layout(textclasslist[bparams.textclass].defaultLayoutName());
+
 	// 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->setOnlyLayout(layout);
+		tmp->layout(layout());
 		tmp->setLabelWidthString(params().labelWidthString());
 	}
-	
+
 	if (size() > pos || !size() || flag == 2) {
-		tmp->setOnlyLayout(layout);
+		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
-		size_type pos_end = pimpl_->size() - 1;
-		size_type i = pos;
-		size_type j = pos;
+		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))
@@ -903,40 +913,45 @@ void Paragraph::breakParagraph(BufferParams const & bparams,
 			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;
-		clear();
+
+		bibkey = 0;
+		params().clear();
+		layout(textclasslist[bparams.textclass].defaultLayoutName());
+
 		// layout stays the same with latex-environments
 		if (flag) {
-			setOnlyLayout(tmp->layout);
+			layout(tmp->layout());
 			setLabelWidthString(tmp->params().labelWidthString());
 			params().depth(tmp->params().depth());
 		}
 	}
 }
-	
+
 
 void Paragraph::makeSameLayout(Paragraph const * par)
 {
-	layout = par->layout;
+	layout(par->layout());
 	// move to pimpl?
 	params() = par->params();
 }
 
 
-int Paragraph::stripLeadingSpaces(LyXTextClassList::size_type tclass) 
+int Paragraph::stripLeadingSpaces(lyx::textclass_type tclass)
 {
-	if (textclasslist.Style(tclass, getLayout()).free_spacing)
+	if (textclasslist[tclass][layout()].free_spacing ||
+	    isFreeSpacing()) {
 		return 0;
-	
+	}
+
 	int i = 0;
-	while (size()
-	       && (isNewline(0) || isLineSeparator(0))){
+	while (size() && (isNewline(0) || isLineSeparator(0))) {
 		erase(0);
 		++i;
 	}
@@ -947,14 +962,14 @@ int Paragraph::stripLeadingSpaces(LyXTextClassList::size_type tclass)
 
 bool Paragraph::hasSameLayout(Paragraph const * par) const
 {
-	return 
-		par->layout == layout &&
+	return
+		par->layout() == layout() &&
 		params().sameLayout(par->params());
 }
 
 
 void Paragraph::breakParagraphConservative(BufferParams const & bparams,
-					   Paragraph::size_type pos)
+					   pos_type pos)
 {
 	// create a new paragraph
 	Paragraph * tmp = new Paragraph(this);
@@ -965,22 +980,22 @@ void Paragraph::breakParagraphConservative(BufferParams const & bparams,
 	if (size() > pos) {
 		// copy everything behind the break-position to the new
 		// paragraph
-		size_type pos_end = pimpl_->size() - 1;
+		pos_type pos_end = size() - 1;
 
-		//size_type i = pos;
-		//size_type j = pos;
-		for (size_type i = pos, j = pos; i <= pos_end; ++i) {
+		//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 (size_type k = pos_end; k >= pos; --k) {
+
+		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.
@@ -989,22 +1004,22 @@ 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());
 
-	size_type pos_end = the_next->pimpl_->size() - 1;
-	size_type pos_insert = size();
+	pos_type pos_end = the_next->pimpl_->size() - 1;
+	pos_type pos_insert = size();
 
 	// ok, now copy the paragraph
-	for (size_type i = 0, j = 0; i <= pos_end; ++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_;
@@ -1018,10 +1033,9 @@ int Paragraph::getEndLabel(BufferParams const & bparams) const
 	Paragraph const * par = this;
 	depth_type par_depth = getDepth();
 	while (par) {
-		LyXTextClass::LayoutList::size_type layout = par->getLayout();
+		string const & layout = par->layout();
 		int const endlabeltype =
-			textclasslist.Style(bparams.textclass,
-					    layout).endlabeltype;
+			textclasslist[bparams.textclass][layout].endlabeltype;
 		if (endlabeltype != END_LABEL_NO_LABEL) {
 			if (!next_)
 				return endlabeltype;
@@ -1029,7 +1043,7 @@ int Paragraph::getEndLabel(BufferParams const & bparams) const
 			depth_type const next_depth = next_->getDepth();
 			if (par_depth > next_depth ||
 			    (par_depth == next_depth
-			     && layout != next_->getLayout()))
+			     && layout != next_->layout()))
 				return endlabeltype;
 			break;
 		}
@@ -1049,6 +1063,17 @@ Paragraph::depth_type Paragraph::getDepth() const
 }
 
 
+Paragraph::depth_type Paragraph::getMaxDepthAfter(Buffer const * buffer) const
+{
+	bool const isenv = textclasslist[buffer->params.textclass][layout()].isEnvironment();
+
+	if (isenv)
+		return params().depth() + 1;
+	else
+		return params().depth();
+
+}
+
 char Paragraph::getAlign() const
 {
 	return params().align();
@@ -1083,15 +1108,9 @@ void Paragraph::setLabelWidthString(string const & s)
 }
 
 
-void Paragraph::setOnlyLayout(LyXTextClass::size_type new_layout)
-{
-	layout = new_layout;
-}
-
-
-void Paragraph::setLayout(LyXTextClass::size_type new_layout)
+void Paragraph::applyLayout(string const & new_layout)
 {
-        layout = new_layout;
+	layout(new_layout);
 	params().labelWidthString(string());
 	params().align(LYX_ALIGN_LAYOUT);
 	params().spaceTop(VSpace(VSpace::NONE));
@@ -1100,11 +1119,11 @@ void Paragraph::setLayout(LyXTextClass::size_type 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
@@ -1112,12 +1131,12 @@ int Paragraph::beginningOfMainBody() const
 	// 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) != 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 "=="
@@ -1138,11 +1157,11 @@ int Paragraph::beginningOfMainBody() const
 Paragraph * Paragraph::depthHook(depth_type depth)
 {
 	Paragraph * newpar = this;
-  
+
 	do {
 		newpar = newpar->previous();
 	} while (newpar && newpar->getDepth() > depth);
-   
+
 	if (!newpar) {
 		if (previous() || getDepth())
 			lyxerr << "ERROR (Paragraph::DepthHook): "
@@ -1157,11 +1176,11 @@ Paragraph * Paragraph::depthHook(depth_type depth)
 Paragraph const * Paragraph::depthHook(depth_type depth) const
 {
 	Paragraph const * newpar = this;
-   
+
 	do {
 		newpar = newpar->previous();
 	} while (newpar && newpar->getDepth() > depth);
-   
+
 	if (!newpar) {
 		if (previous() || getDepth())
 			lyxerr << "ERROR (Paragraph::DepthHook): "
@@ -1174,52 +1193,40 @@ Paragraph const * Paragraph::depthHook(depth_type depth) const
 
 Paragraph * Paragraph::outerHook()
 {
-	if(!getDepth())
+	if (!getDepth())
 		return 0;
 	return depthHook(depth_type(getDepth() - 1));
 }
 
 Paragraph const * Paragraph::outerHook() const
 {
-	if(!getDepth())
+	if (!getDepth())
 		return 0;
 	return depthHook(depth_type(getDepth() - 1));
 }
 
-int Paragraph::autoDeleteInsets()
-{
-	int count = 0;
-	InsetList::size_type index = 0;
-	while (index < insetlist.size()) {
-		if (insetlist[index].inset && insetlist[index].inset->autoDelete()) {
-			erase(insetlist[index].pos); 
-			// Erase() calls to insetlist.erase(&insetlist[index])
-			// so index shouldn't be increased.
-			++count;
-		} else
-			++index;
-	}
-	return count;
-}
-
 
 Paragraph::inset_iterator
-Paragraph::InsetIterator(Paragraph::size_type pos)
+Paragraph::InsetIterator(pos_type pos)
 {
-	InsetTable search_inset(pos, 0);
-	InsetList::iterator it = lower_bound(insetlist.begin(),
-					     insetlist.end(),
-					     search_inset, Pimpl::matchIT());
+	InsetList::iterator it = insetlist.begin();
+	InsetList::iterator end = insetlist.end();
+	for (; it != end; ++it) {
+		if (it->pos == pos)
+			break;
+	}
+
 	return inset_iterator(it);
 }
 
 
 // returns -1 if inset not found
-int Paragraph::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) {
+	InsetList::const_iterator cit = insetlist.begin();
+	InsetList::const_iterator end = insetlist.end();
+	for (; cit != end; ++cit) {
 		if (cit->inset == inset) {
 			return cit->pos;
 		}
@@ -1232,51 +1239,59 @@ int Paragraph::getPositionOfInset(Inset * inset) const
 
 
 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;
-	LyXLayout const & style =
-		textclasslist.Style(bparams.textclass,
-				    layout);
-
+	Inset const * in = inInset();
 	bool further_blank_line = false;
+	LyXLayout style;
 
-	if (params().startOfAppendix()) {
-		os << "\\appendix\n";
-		texrow.newline();
-	}
+	// 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()];
 
-	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 (params().startOfAppendix()) {
+			os << "\\appendix\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 (params().lineTop()) {
-		os << "\\lyxline{\\" << getFont(bparams, 0).latexSize() << '}'
-		   << "\\vspace{-1\\parskip}";
-		further_blank_line = true;
-	}
+		if (!params().spacing().isDefault()
+			&& (!previous() || !previous()->hasSameLayout(this))) {
+			os << params().spacing().writeEnvirBegin() << "\n";
+			texrow.newline();
+		}
 
-	if (further_blank_line){
-		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 (params().lineTop()) {
+			os << "\\lyxline{\\" << getFont(bparams, 0).latexSize() << '}'
+			   << "\\vspace{-1\\parskip}";
+			further_blank_line = true;
+		}
+
+		if (further_blank_line) {
+			os << '\n';
+			texrow.newline();
+		}
+	} else {
+		style = textclasslist[bparams.textclass].defaultLayout();
 	}
 
 	Language const * language = getParLanguage(bparams);
@@ -1286,12 +1301,13 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
 
 	if (language->babel() != previous_language->babel()
 	    // check if we already put language command in TeXEnvironment()
-	    && !(textclasslist.Style(bparams.textclass, layout).isEnvironment()
-		 && (!previous() || previous()->layout != layout ||
-		     previous()->params().depth() != params().depth()))) {
-
+	    && !(style.isEnvironment()
+		 && (!previous() || previous()->layout() != layout() ||
+			 previous()->params().depth() != params().depth())))
+	{
 		if (!lyxrc.language_command_end.empty() &&
-		    previous_language->babel() != doc_language->babel()) {
+		    previous_language->babel() != doc_language->babel())
+		{
 			os << subst(lyxrc.language_command_end, "$$lang",
 				    previous_language->babel())
 			   << endl;
@@ -1299,7 +1315,8 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
 		}
 
 		if (lyxrc.language_command_end.empty() ||
-		    language->babel() != doc_language->babel()) {
+		    language->babel() != doc_language->babel())
+		{
 			os << subst(lyxrc.language_command_begin, "$$lang",
 				    language->babel())
 			   << endl;
@@ -1322,7 +1339,7 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
 		   << style.latexparam();
 		break;
 	case LATEX_ITEM_ENVIRONMENT:
-	        if (bibkey) {
+		if (bibkey) {
 			bibkey->latex(buf, os, false, false);
 		} else
 			os << "\\item ";
@@ -1335,7 +1352,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)
@@ -1347,11 +1364,10 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
 	// or for a command.
 	LyXFont const font =
 		(size() == 0
-		 ? getLayoutFont(bparams)
-		 : getFont(bparams, size() - 1));
+		 ? getLayoutFont(bparams) : getFont(bparams, size() - 1));
+
+	bool is_command = style.isCommand();
 
-	bool is_command = textclasslist.Style(bparams.textclass,
-					      getLayout()).isCommand();
 	if (style.resfont.size() != font.size() && next_ && !is_command) {
 		if (!need_par)
 			os << "{";
@@ -1364,56 +1380,56 @@ Paragraph * Paragraph::TeXOnePar(Buffer const * buf,
 	switch (style.latextype) {
 	case LATEX_ITEM_ENVIRONMENT:
 	case LATEX_LIST_ENVIRONMENT:
-                if (next_ && (params().depth() < next_->params().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 (next_
-		    && (next_->layout != layout
+		    && (next_->layout() != layout()
 			|| next_->params().depth() != params().depth()))
 			break;
+		// fall through possible
 	default:
 		// we don't need it for the last paragraph!!!
-		// or for tables in floats
-		//   -- effectively creates a \par where there isn't one which
-		//      breaks a \subfigure or \subtable.
 		if (next_) {
 			os << '\n';
 			texrow.newline();
 		}
 	}
-	
-	further_blank_line = false;
-	if (params().lineBottom()) {
-		os << "\\lyxline{\\" << font.latexSize() << '}';
-		further_blank_line = true;
-	}
 
-	if (params().spaceBottom().kind() != VSpace::NONE) {
-		os << params().spaceBottom().asLatexCommand(bparams);
-		further_blank_line = true;
-	}
-      
-	if (params().pagebreakBottom()) {
-		os << "\\newpage";
-		further_blank_line = true;
-	}
+	if ((in == 0) || !in->forceDefaultParagraphs(in)) {
+		further_blank_line = false;
+		if (params().lineBottom()) {
+			os << "\\lyxline{\\" << font.latexSize() << '}';
+			further_blank_line = true;
+		}
 
-	if (further_blank_line){
-		os << '\n';
-		texrow.newline();
-	}
+		if (params().spaceBottom().kind() != VSpace::NONE) {
+			os << params().spaceBottom().asLatexCommand(bparams);
+			further_blank_line = true;
+		}
 
-	if (!params().spacing().isDefault()
-	    && (!next_ || !next_->hasSameLayout(this))) {
-		os << params().spacing().writeEnvirEnd() << "\n";
-		texrow.newline();
+		if (params().pagebreakBottom()) {
+			os << "\\newpage";
+			further_blank_line = true;
+		}
+
+		if (further_blank_line) {
+			os << '\n';
+			texrow.newline();
+		}
+
+		if (!params().spacing().isDefault()
+			&& (!next_ || !next_->hasSameLayout(this))) {
+			os << params().spacing().writeEnvirEnd() << "\n";
+			texrow.newline();
+		}
 	}
-	
+
 	// we don't need it for the last paragraph!!!
 	if (next_) {
 		os << '\n';
@@ -1442,24 +1458,118 @@ 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
+{
+	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:
+		if (getParLanguage(bparams)->babel() != "hebrew") {
+			os << "\\begin{flushleft}";
+			column += 17;
+		} else {
+			os << "\\begin{flushright}";
+			column += 18;
+		}
+		break;
+	case LYX_ALIGN_RIGHT:
+		if (getParLanguage(bparams)->babel() != "hebrew") {
+			os << "\\begin{flushright}";
+			column += 18;
+		} else {
+			os << "\\begin{flushleft}";
+			column += 17;
+		}
+		break;
+	case LYX_ALIGN_CENTER:
+		os << "\\begin{center}";
+		column += 14;
+		break;
+	}
+
+	return column;
+}
+
+// This could go to ParagraphParameters if we want to
+int Paragraph::endTeXParParams(BufferParams const & bparams,
+			       ostream & os) 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:
+		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;
+	}
+	return column;
+}
+
 
 // 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 const & style =
-		textclasslist.Style(bparams.textclass,
-				    getLayout());
+	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[bparams.textclass].defaultLayout();
+	} else {
+		style = textclasslist[bparams.textclass][layout()];
+	}
+
 	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
@@ -1475,16 +1585,8 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 		basefont = getLayoutFont(bparams);
 	}
 
-	if (main_body >= 0
-	    && !pimpl_->size()) {
-		if (style.isCommand()) {
-			os << '{';
-			++column;
-		}
-	}
-
 	moving_arg |= style.needprotect;
- 
+
 	// Which font is currently active?
 	LyXFont running_font(basefont);
 	// Do we have an open font change?
@@ -1492,7 +1594,18 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 
 	texrow.start(this, 0);
 
-	for (size_type i = 0; i < size(); ++i) {
+	// if the paragraph is empty, the loop will not be entered at all
+	if (!size()) {
+		if (style.isCommand()) {
+			os << '{';
+			++column;
+		}
+		if (!asdefault)
+			column += startTeXParParams(bparams, os);
+
+	}
+
+	for (pos_type i = 0; i < size(); ++i) {
 		++column;
 		// First char in paragraph or after label?
 		if (i == main_body) {
@@ -1511,39 +1624,8 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 				++column;
 			}
 
-			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;
-			}	 
+			if (!asdefault)
+				column += startTeXParParams(bparams, os);
 		}
 
 		value_type c = getChar(i);
@@ -1551,19 +1633,19 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 		// 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} "
 		// rather than "\textXX{text }". (Asger)
 		if (open_font && c == ' ' && i <= size() - 2) {
-			LyXFont const next_font = getFont(bparams, i + 1);
+			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 != running_font && open_font) {
 			column += running_font.latexWriteEndChanges(os,
@@ -1602,7 +1684,7 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 				}
 				basefont = getLayoutFont(bparams);
 				running_font = basefont;
-				if (font.family() == 
+				if (font.family() ==
 				    LyXFont::TYPEWRITER_FAMILY) {
 					os << "~";
 				}
@@ -1616,8 +1698,8 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 		} else {
 			pimpl_->simpleTeXSpecialChars(buf, bparams,
 						      os, texrow, moving_arg,
-						      font, running_font, 
-						      basefont, open_font, 
+						      font, running_font,
+						      basefont, open_font,
 						      style, i, column, c);
 		}
 	}
@@ -1628,11 +1710,11 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 		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
@@ -1650,42 +1732,16 @@ bool Paragraph::simpleTeXOnePar(Buffer const * buf,
 		return_value = false;
 	}
 
-	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;
-	}	 
+	if (!asdefault) {
+		column += endTeXParParams(bparams, os);
+	}
 
 	lyxerr[Debug::LATEX] << "SimpleTeXOnePar...done " << this << endl;
 	return return_value;
 }
 
 
-bool Paragraph::linuxDocConvertChar(char c, string & sgml_string)
+bool Paragraph::sgmlConvertChar(char c, string & sgml_string)
 {
 	bool retval = false;
 	switch (c) {
@@ -1695,43 +1751,43 @@ bool Paragraph::linuxDocConvertChar(char c, string & sgml_string)
 	case Paragraph::META_NEWLINE:
 		sgml_string = '\n';
 		break;
-	case '&': 
+	case '&':
 		sgml_string = "&amp;";
 		break;
-	case '<': 
-		sgml_string = "&lt;"; 
+	case '<':
+		sgml_string = "&lt;";
 		break;
 	case '>':
-		sgml_string = "&gt;"; 
+		sgml_string = "&gt;";
 		break;
-	case '$': 
-		sgml_string = "&dollar;"; 
+	case '$':
+		sgml_string = "&dollar;";
 		break;
-	case '#': 
+	case '#':
 		sgml_string = "&num;";
 		break;
-	case '%': 
+	case '%':
 		sgml_string = "&percnt;";
 		break;
-	case '[': 
+	case '[':
 		sgml_string = "&lsqb;";
 		break;
-	case ']': 
+	case ']':
 		sgml_string = "&rsqb;";
 		break;
-	case '{': 
+	case '{':
 		sgml_string = "&lcub;";
 		break;
-	case '}': 
+	case '}':
 		sgml_string = "&rcub;";
 		break;
-	case '~': 
+	case '~':
 		sgml_string = "&tilde;";
 		break;
-	case '"': 
+	case '"':
 		sgml_string = "&quot;";
 		break;
-	case '\\': 
+	case '\\':
 		sgml_string = "&bsol;";
 		break;
 	case ' ':
@@ -1756,8 +1812,7 @@ Paragraph * Paragraph::TeXEnvironment(Buffer const * buf,
 	lyxerr[Debug::LATEX] << "TeXEnvironment...     " << this << endl;
 
 	LyXLayout const & style =
-		textclasslist.Style(bparams.textclass,
-				    layout);
+		textclasslist[bparams.textclass][layout()];
 
 	Language const * language = getParLanguage(bparams);
 	Language const * doc_language = bparams.language;
@@ -1782,7 +1837,7 @@ Paragraph * Paragraph::TeXEnvironment(Buffer const * buf,
 		}
 	}
 
-	if (style.isEnvironment()){
+	if (style.isEnvironment()) {
 		if (style.latextype == LATEX_LIST_ENVIRONMENT) {
 			os << "\\begin{" << style.latexname() << "}{"
 			   << params().labelWidthString() << "}\n";
@@ -1794,25 +1849,23 @@ Paragraph * Paragraph::TeXEnvironment(Buffer const * buf,
 		} else if (style.latextype == LATEX_ITEM_ENVIRONMENT) {
 			os << "\\begin{" << style.latexname() << '}'
 			   << style.latexparam() << '\n';
-		} else 
+		} else
 			os << "\\begin{" << style.latexname() << '}'
 			   << style.latexparam() << '\n';
 		texrow.newline();
 	}
 	Paragraph * par = this;
 	do {
-		par = par->TeXOnePar(buf, bparams,
-				     os, texrow, false);
+		par = par->TeXOnePar(buf, bparams, os, texrow, false);
 
 		if (par && par->params().depth() > params().depth()) {
-			if (textclasslist.Style(bparams.textclass,
-						par->layout).isParagraph()
+			if (textclasslist[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 
+				// 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.
@@ -1827,11 +1880,12 @@ Paragraph * Paragraph::TeXEnvironment(Buffer const * buf,
 			par = par->pimpl_->TeXDeeper(buf, bparams, os, texrow);
 		}
 	} while (par
-		 && par->layout == layout
+		 && par->layout() == layout()
 		 && par->params().depth() == params().depth());
- 
+
 	if (style.isEnvironment()) {
 		os << "\\end{" << style.latexname() << "}\n";
+		texrow.newline();
 	}
 
 	lyxerr[Debug::LATEX] << "TeXEnvironment...done " << par << endl;
@@ -1839,73 +1893,76 @@ Paragraph * Paragraph::TeXEnvironment(Buffer const * buf,
 }
 
 
-bool Paragraph::isHfill(size_type pos) const
+bool Paragraph::isHfill(pos_type pos) const
 {
 	return IsHfillChar(getChar(pos));
 }
 
 
-bool Paragraph::isInset(size_type pos) const
+bool Paragraph::isInset(pos_type pos) const
 {
 	return IsInsetChar(getChar(pos));
 }
 
 
-bool Paragraph::isNewline(size_type pos) const
+bool Paragraph::isNewline(pos_type pos) const
 {
 	return pos >= 0 && IsNewlineChar(getChar(pos));
 }
 
 
-bool Paragraph::isSeparator(size_type pos) const
+bool Paragraph::isSeparator(pos_type pos) const
 {
 	return IsSeparatorChar(getChar(pos));
 }
 
 
-bool Paragraph::isLineSeparator(size_type pos) const
+bool Paragraph::isLineSeparator(pos_type pos) const
 {
-	return IsLineSeparatorChar(getChar(pos));
+	value_type const c = getChar(pos);
+	return IsLineSeparatorChar(c)
+		|| (IsInsetChar(c) && getInset(pos) &&
+		getInset(pos)->isLineSeparator());
 }
 
 
-bool Paragraph::isKomma(size_type pos) const
+bool Paragraph::isKomma(pos_type pos) const
 {
 	return IsKommaChar(getChar(pos));
 }
 
 
 /// Used by the spellchecker
-bool Paragraph::isLetter(Paragraph::size_type pos) const
+bool Paragraph::isLetter(pos_type pos) const
 {
 	value_type const c = getChar(pos);
 	if (IsLetterChar(c))
 		return true;
-	// '\0' is not a letter, allthough every string contains "" (below)
-	if (c == '\0')
-		return false;
+	if (isInset(pos))
+		return getInset(pos)->isLetter();
 	// We want to pass the ' and escape chars to ispell
 	string const extra = lyxrc.isp_esc_chars + '\'';
-	char ch[2] = { c, 0 };
-	return contains(extra, ch);
+	return contains(extra, c);
 }
- 
- 
-bool Paragraph::isWord(size_type pos ) const
+
+
+bool Paragraph::isWord(pos_type pos) const
 {
 	return IsWordChar(getChar(pos)) ;
 }
 
 
 Language const *
-Paragraph::getParLanguage(BufferParams const & bparams) const 
+Paragraph::getParLanguage(BufferParams const & bparams) const
 {
 	if (size() > 0) {
 #ifndef INHERIT_LANGUAGE
 		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;
@@ -1927,7 +1984,7 @@ bool Paragraph::isRightToLeftPar(BufferParams const & bparams) const
 void Paragraph::changeLanguage(BufferParams const & bparams,
 				  Language const * from, Language const * to)
 {
-	for (size_type i = 0; i < size(); ++i) {
+	for (pos_type i = 0; i < size(); ++i) {
 		LyXFont font = getFontSettings(bparams, i);
 		if (font.language() == from) {
 			font.setLanguage(to);
@@ -1940,8 +1997,10 @@ 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
@@ -1963,7 +2022,7 @@ string const Paragraph::asString(Buffer const * buffer, bool label)
 		s += params().labelString() + ' ';
 	string::size_type const len = s.size();
 
-	for (Paragraph::size_type i = 0; i < size(); ++i) {
+	for (pos_type i = 0; i < size(); ++i) {
 		value_type c = getChar(i);
 		if (IsPrintable(c))
 			s += c;
@@ -1982,24 +2041,22 @@ string const Paragraph::asString(Buffer const * buffer, bool label)
 }
 
 
-string const Paragraph::asString(Buffer const * buffer, 
-				 Paragraph::size_type beg,
-				 Paragraph::size_type end,
-				 bool label)
+string const Paragraph::asString(Buffer const * buffer,
+				 pos_type beg, pos_type end, bool label)
 {
 	ostringstream ost;
 
 	if (beg == 0 && label && !params().labelString().empty())
 		ost << params().labelString() << ' ';
 
-	for (Paragraph::size_type i = beg; i < end; ++i) {
+	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'; 
+			ost << '\t';
 		else if (c == META_INSET) {
 			getInset(i)->ascii(buffer, ost);
 		}
@@ -2012,8 +2069,9 @@ string const Paragraph::asString(Buffer const * buffer,
 void Paragraph::setInsetOwner(Inset * i)
 {
 	pimpl_->inset_owner = i;
-	for (InsetList::const_iterator cit = insetlist.begin();
-	     cit != insetlist.end(); ++cit) {
+	InsetList::const_iterator cit = insetlist.begin();
+	InsetList::const_iterator end = insetlist.end();
+	for (; cit != end; ++cit) {
 		if (cit->inset)
 			cit->inset->setOwner(i);
 	}
@@ -2023,13 +2081,12 @@ 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::const_iterator cit = insetlist.begin();
+	InsetList::const_iterator end = insetlist.end();
+	for (; cit != end; ++cit) {
+		if (cit->inset && cit->inset->isTextInset()) {
+			static_cast<UpdatableInset *>
+				(cit->inset)->deleteLyXText(bv, true);
 		}
 	}
 }
@@ -2038,9 +2095,9 @@ void Paragraph::deleteInsetsLyXText(BufferView * bv)
 void Paragraph::resizeInsetsLyXText(BufferView * bv)
 {
 	// then the insets
-	for (InsetList::const_iterator cit = insetlist.begin();
-	     cit != insetlist.end(); ++cit)
-	{
+	InsetList::const_iterator cit = insetlist.begin();
+	InsetList::const_iterator end = insetlist.end();
+	for (; cit != end; ++cit) {
 		if (cit->inset) {
 			if (cit->inset->isTextInset()) {
 				static_cast<UpdatableInset *>
@@ -2057,14 +2114,13 @@ void Paragraph::setContentsFromPar(Paragraph * par)
 }
 
 
-Paragraph::size_type Paragraph::size() const
+lyx::pos_type Paragraph::size() const
 {
 	return pimpl_->size();
 }
 
 
-Paragraph::value_type
-Paragraph::getChar(Paragraph::size_type pos) const
+Paragraph::value_type Paragraph::getChar(pos_type pos) const
 {
 	return pimpl_->getChar(pos);
 }
@@ -2082,9 +2138,17 @@ void  Paragraph::id(int id_arg)
 }
 
 
-LyXTextClass::LayoutList::size_type Paragraph::getLayout() const
+string const & Paragraph::layout() const
 {
-	return layout;
+	return layout_;
+}
+
+
+void Paragraph::layout(string const & new_layout)
+{
+	lyx::Assert(!new_layout.empty());
+
+	layout_ = new_layout;
 }
 
 
@@ -2092,7 +2156,7 @@ bool Paragraph::isFirstInSequence() const
 {
 	Paragraph const * dhook = depthHook(getDepth());
 	return (dhook == this
-		|| dhook->getLayout() != getLayout()
+		|| dhook->layout() != layout()
 		|| dhook->getDepth() != getDepth());
 }
 
@@ -2127,14 +2191,14 @@ void Paragraph::incCounter(int i)
 }
 
 
-void Paragraph::setChar(size_type pos, value_type c)
+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) 
+ : it(iter)
 {}
 
 
@@ -2166,3 +2230,13 @@ 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;
+}