X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph_funcs.C;h=76c99d685f8c0fdbbe3ccac026f747d7c50dae6f;hb=1567e4ad84c4eafeba9d42d30626b46e713599db;hp=07c9703dc1f6abd3279ed68cdd96436446ac3dd8;hpb=ec4ab8ce18418999b547368d1d2bbf546bec1e7b;p=lyx.git

diff --git a/src/paragraph_funcs.C b/src/paragraph_funcs.C
index 07c9703dc1..76c99d685f 100644
--- a/src/paragraph_funcs.C
+++ b/src/paragraph_funcs.C
@@ -12,546 +12,289 @@
 
 #include "paragraph_funcs.h"
 
-#include "buffer.h"
 #include "bufferparams.h"
-
 #include "debug.h"
-#include "encoding.h"
-#include "errorlist.h"
-#include "factory.h"
-#include "gettext.h"
-#include "iterators.h"
-#include "language.h"
-#include "lyxlex.h"
-#include "lyxrc.h"
-#include "outputparams.h"
-#include "paragraph_pimpl.h"
-#include "sgml.h"
-#include "texrow.h"
-#include "vspace.h"
-
-#include "insets/insetbibitem.h"
-#include "insets/insethfill.h"
-#include "insets/insetlatexaccent.h"
-#include "insets/insetline.h"
-#include "insets/insetnewline.h"
-#include "insets/insetpagebreak.h"
-#include "insets/insetoptarg.h"
-#include "insets/insetspace.h"
-#include "insets/insetspecialchar.h"
-#include "insets/insettabular.h"
-
-#include "support/filetools.h"
-#include "support/lstrings.h"
-#include "support/lyxlib.h"
-#include "support/std_sstream.h"
-
-#include <vector>
-
-using lyx::pos_type;
-
-using lyx::support::ascii_lowercase;
-using lyx::support::atoi;
-using lyx::support::bformat;
-using lyx::support::compare_ascii_no_case;
-using lyx::support::compare_no_case;
-using lyx::support::contains;
-using lyx::support::split;
-using lyx::support::subst;
-
-using std::auto_ptr;
-using std::endl;
-using std::string;
-using std::vector;
-using std::istringstream;
-using std::ostream;
-using std::pair;
+#include "lyxtext.h"
+#include "paragraph.h"
+#include "ParagraphParameters.h"
 
 
-namespace {
+namespace lyx {
+
+using std::string;
+using std::endl;
+
 
-bool moveItem(Paragraph & from, Paragraph & to,
-	BufferParams const & params, pos_type i, pos_type j)
+static bool moveItem(Paragraph & fromPar, pos_type fromPos,
+	Paragraph & toPar, pos_type toPos, BufferParams const & params)
 {
-	char const tmpchar = from.getChar(i);
-	LyXFont tmpfont = from.getFontSettings(params, i);
-
-	if (tmpchar == Paragraph::META_INSET) {
-		InsetBase * tmpinset = 0;
-		if (from.getInset(i)) {
-			// the inset is not in a paragraph anymore
-			tmpinset = from.insetlist.release(i);
+	// Note: moveItem() does not honour change tracking!
+	// Therefore, it should only be used for breaking and merging paragraphs
+
+	Paragraph::value_type const tmpChar = fromPar.getChar(fromPos);
+	LyXFont const tmpFont = fromPar.getFontSettings(params, fromPos);
+	Change const tmpChange = fromPar.lookupChange(fromPos);
+
+	if (tmpChar == Paragraph::META_INSET) {
+		InsetBase * tmpInset = 0;
+		if (fromPar.getInset(fromPos)) {
+			// the inset is not in the paragraph any more
+			tmpInset = fromPar.insetlist.release(fromPos);
 		}
 
-		if (!to.insetAllowed(tmpinset->lyxCode()))
+		fromPar.eraseChar(fromPos, false);
+
+		if (!toPar.insetAllowed(tmpInset->lyxCode())) {
+			delete tmpInset;
 			return false;
-		to.insertInset(j, tmpinset, tmpfont);
+		}
+
+		toPar.insertInset(toPos, tmpInset, tmpFont, tmpChange);
 	} else {
-		if (!to.checkInsertChar(tmpfont))
-			return false;
-		to.insertChar(j, tmpchar, tmpfont);
+		fromPar.eraseChar(fromPos, false);
+		toPar.insertChar(toPos, tmpChar, tmpFont, tmpChange);
 	}
-	return true;
-}
 
+	return true;
 }
 
 
 void breakParagraph(BufferParams const & bparams,
-		    ParagraphList & paragraphs,
-		    ParagraphList::iterator par,
-		    pos_type pos,
-		    int flag)
+	ParagraphList & pars, pit_type par_offset, pos_type pos, int flag)
 {
 	// create a new paragraph, and insert into the list
-	ParagraphList::iterator tmp = paragraphs.insert(boost::next(par),
-							Paragraph());
+	ParagraphList::iterator tmp =
+		pars.insert(boost::next(pars.begin(), par_offset + 1),
+			    Paragraph());
+
+	Paragraph & par = pars[par_offset];
 
 	// without doing that we get a crash when typing <Return> at the
 	// end of a paragraph
 	tmp->layout(bparams.getLyXTextClass().defaultLayout());
 	// remember to set the inset_owner
-	tmp->setInsetOwner(par->inInset());
-
-	if (bparams.tracking_changes)
-		tmp->trackChanges();
-
-	// this is an idea for a more userfriendly layout handling, I will
-	// see what the users say
+	tmp->setInsetOwner(par.inInset());
 
 	// layout stays the same with latex-environments
 	if (flag) {
-		tmp->layout(par->layout());
-		tmp->setLabelWidthString(par->params().labelWidthString());
+		tmp->layout(par.layout());
+		tmp->setLabelWidthString(par.params().labelWidthString());
+		tmp->params().depth(par.params().depth());
+	} else if (par.params().depth() > 0) {
+		Paragraph const & hook = pars[outerHook(par_offset, pars)];
+		tmp->layout(hook.layout());
+		// not sure the line below is useful
+		tmp->setLabelWidthString(par.params().labelWidthString());
+		tmp->params().depth(hook.params().depth());
 	}
 
-	bool const isempty = (par->allowEmpty() && par->empty());
+	bool const isempty = (par.allowEmpty() && par.empty());
 
-	if (!isempty && (par->size() > pos || par->empty() || flag == 2)) {
-		tmp->layout(par->layout());
-		tmp->params().align(par->params().align());
-		tmp->setLabelWidthString(par->params().labelWidthString());
+	if (!isempty && (par.size() > pos || par.empty() || flag == 2)) {
+		tmp->layout(par.layout());
+		tmp->params().align(par.params().align());
+		tmp->setLabelWidthString(par.params().labelWidthString());
 
-		tmp->params().depth(par->params().depth());
-		tmp->params().noindent(par->params().noindent());
+		tmp->params().depth(par.params().depth());
+		tmp->params().noindent(par.params().noindent());
 
-		// copy everything behind the break-position
+		// move everything behind the break position
 		// to the new paragraph
 
-#ifdef WITH_WARNINGS
-#warning this seems wrong
-#endif
-		/* FIXME: if !keepempty, empty() == true, then we reach
-		 * here with size() == 0. So pos_end becomes - 1. Why
-		 * doesn't this cause problems ???
+		/* Note: if !keepempty, empty() == true, then we reach
+		 * here with size() == 0. So pos_end becomes - 1. This
+		 * doesn't cause problems because both loops below
+		 * enforce pos <= pos_end and 0 <= pos
 		 */
-		pos_type pos_end = par->size() - 1;
-		pos_type i = pos;
-		pos_type j = pos;
-
-		for (; i <= pos_end; ++i) {
-			Change::Type change = par->lookupChange(i);
-			if (moveItem(*par, *tmp, bparams, i, j - pos)) {
-				tmp->setChange(j - pos, change);
+		pos_type pos_end = par.size() - 1;
+
+		for (pos_type i = pos, j = 0; i <= pos_end; ++i) {
+			if (moveItem(par, pos, *tmp, j, bparams)) {
 				++j;
 			}
 		}
-
-		for (i = pos_end; i >= pos; --i)
-			par->eraseIntern(i);
 	}
 
-	if (pos)
-		return;
+	// Move over the end-of-par change information
+	tmp->setChange(tmp->size(), par.lookupChange(par.size()));
+	par.setChange(par.size(), Change(bparams.trackChanges ?
+		                           Change::INSERTED : Change::UNCHANGED));
+
+	if (pos) {
+		// Make sure that we keep the language when
+		// breaking paragraph.
+		if (tmp->empty()) {
+			LyXFont changed = tmp->getFirstFontSettings(bparams);
+			LyXFont old = par.getFontSettings(bparams, par.size());
+			changed.setLanguage(old.language());
+			tmp->setFont(0, changed);
+		}
 
-	par->params().clear();
+		return;
+	}
 
-	par->layout(bparams.getLyXTextClass().defaultLayout());
+	if (!isempty) {
+		par.params().clear();
+		par.layout(bparams.getLyXTextClass().defaultLayout());
+	}
 
 	// layout stays the same with latex-environments
 	if (flag) {
-		par->layout(tmp->layout());
-		par->setLabelWidthString(tmp->params().labelWidthString());
-		par->params().depth(tmp->params().depth());
-	}
-
-	// subtle, but needed to get empty pars working right
-	if (bparams.tracking_changes) {
-		if (!par->size()) {
-			par->cleanChanges();
-		} else if (!tmp->size()) {
-			tmp->cleanChanges();
-		}
+		par.layout(tmp->layout());
+		par.setLabelWidthString(tmp->params().labelWidthString());
+		par.params().depth(tmp->params().depth());
 	}
 }
 
 
 void breakParagraphConservative(BufferParams const & bparams,
-				ParagraphList & paragraphs,
-				ParagraphList::iterator par,
-				pos_type pos)
+	ParagraphList & pars, pit_type par_offset, pos_type pos)
 {
 	// create a new paragraph
-	ParagraphList::iterator tmp = paragraphs.insert(boost::next(par),
-							Paragraph());
-	tmp->makeSameLayout(*par);
-
-	// When can pos > size()?
-	// I guess pos == size() is possible.
-	if (par->size() > pos) {
-		// copy everything behind the break-position to the new
-		// paragraph
-		pos_type pos_end = par->size() - 1;
-
-		for (pos_type i = pos, j = pos; i <= pos_end; ++i)
-			if (moveItem(*par, *tmp, bparams, i, j - pos))
-				++j;
+	Paragraph & tmp = *pars.insert(boost::next(pars.begin(), par_offset + 1),
+				       Paragraph());
+	Paragraph & par = pars[par_offset];
+
+	tmp.makeSameLayout(par);
+
+	BOOST_ASSERT(pos <= par.size());
 
-		for (pos_type k = pos_end; k >= pos; --k)
-			par->erase(k);
+	if (pos < par.size()) {
+		// move everything behind the break position to the new paragraph
+		pos_type pos_end = par.size() - 1;
+
+		for (pos_type i = pos, j = 0; i <= pos_end; ++i) {
+			if (moveItem(par, pos, tmp, j, bparams)) {
+				++j;
+			}
+		}
+		// Move over the end-of-par change information
+		tmp.setChange(tmp.size(), par.lookupChange(par.size()));
+		par.setChange(par.size(), Change(bparams.trackChanges ?
+		                           Change::INSERTED : Change::UNCHANGED));
 	}
 }
 
 
 void mergeParagraph(BufferParams const & bparams,
-		    ParagraphList & paragraphs,
-		    ParagraphList::iterator par)
+	ParagraphList & pars, pit_type par_offset)
 {
-	ParagraphList::iterator the_next = boost::next(par);
+	Paragraph & next = pars[par_offset + 1];
+	Paragraph & par = pars[par_offset];
+
+	pos_type pos_end = next.size() - 1;
+	pos_type pos_insert = par.size();
+
+	// the imaginary end-of-paragraph character (at par.size()) has to be
+	// marked as unmodified. Otherwise, its change is adopted by the first
+	// character of the next paragraph.
+	if (par.lookupChange(par.size()).type != Change::UNCHANGED) {
+		LYXERR(Debug::CHANGES) <<
+		   "merging par with inserted/deleted end-of-par character" << endl;
+		par.setChange(par.size(), Change(Change::UNCHANGED));
+	}
 
-	pos_type pos_end = the_next->size() - 1;
-	pos_type pos_insert = par->size();
+	Change change = next.lookupChange(next.size());
 
-	// ok, now copy the paragraph
-	for (pos_type i = 0, j = 0; i <= pos_end; ++i)
-		if (moveItem(*the_next, *par, bparams, i, pos_insert + j))
+	// move the content of the second paragraph to the end of the first one
+	for (pos_type i = 0, j = pos_insert; i <= pos_end; ++i) {
+		if (moveItem(next, 0, par, j, bparams)) {
 			++j;
+		}
+	}
+
+	// move the change of the end-of-paragraph character
+	par.setChange(par.size(), change);
 
-	paragraphs.erase(the_next);
+	pars.erase(boost::next(pars.begin(), par_offset + 1));
 }
 
 
-ParagraphList::iterator depthHook(ParagraphList::iterator pit,
-				  ParagraphList const & plist,
-				  Paragraph::depth_type depth)
+pit_type depthHook(pit_type pit, ParagraphList const & pars, depth_type depth)
 {
-	ParagraphList::iterator newpit = pit;
-	ParagraphList::iterator beg = const_cast<ParagraphList&>(plist).begin();
+	pit_type newpit = pit;
 
-	if (newpit != beg)
+	if (newpit != 0)
 		--newpit;
 
-	while (newpit != beg && newpit->getDepth() > depth) {
+	while (newpit != 0 && pars[newpit].getDepth() > depth)
 		--newpit;
-	}
 
-	if (newpit->getDepth() > depth)
+	if (pars[newpit].getDepth() > depth)
 		return pit;
 
 	return newpit;
 }
 
 
-ParagraphList::iterator outerHook(ParagraphList::iterator pit,
-				  ParagraphList const & plist)
+pit_type outerHook(pit_type par_offset, ParagraphList const & pars)
 {
-	if (!pit->getDepth())
-		return const_cast<ParagraphList&>(plist).end();
-	return depthHook(pit, plist,
-			 Paragraph::depth_type(pit->getDepth() - 1));
+	Paragraph const & par = pars[par_offset];
+
+	if (par.getDepth() == 0)
+		return pars.size();
+	return depthHook(par_offset, pars, depth_type(par.getDepth() - 1));
 }
 
 
-bool isFirstInSequence(ParagraphList::iterator pit,
-		       ParagraphList const & plist)
+bool isFirstInSequence(pit_type par_offset, ParagraphList const & pars)
 {
-	ParagraphList::iterator dhook = depthHook(pit, plist, pit->getDepth());
-	return (dhook == pit
-		|| dhook->layout() != pit->layout()
-		|| dhook->getDepth() != pit->getDepth());
+	Paragraph const & par = pars[par_offset];
+
+	pit_type dhook_offset = depthHook(par_offset, pars, par.getDepth());
+
+	if (dhook_offset == par_offset)
+		return true;
+
+	Paragraph const & dhook = pars[dhook_offset];
+
+	return dhook.layout() != par.layout()
+		|| dhook.getDepth() != par.getDepth();
 }
 
 
-int getEndLabel(ParagraphList::iterator p, ParagraphList const & plist)
+int getEndLabel(pit_type p, ParagraphList const & pars)
 {
-	ParagraphList::iterator pit = p;
-	Paragraph::depth_type par_depth = p->getDepth();
-	while (pit != const_cast<ParagraphList&>(plist).end()) {
-		LyXLayout_ptr const & layout = pit->layout();
+	pit_type pit = p;
+	depth_type par_depth = pars[p].getDepth();
+	while (pit != pit_type(pars.size())) {
+		LyXLayout_ptr const & layout = pars[pit].layout();
 		int const endlabeltype = layout->endlabeltype;
 
 		if (endlabeltype != END_LABEL_NO_LABEL) {
-			if (boost::next(p) == const_cast<ParagraphList&>(plist).end())
+			if (p + 1 == pit_type(pars.size()))
 				return endlabeltype;
 
-			Paragraph::depth_type const next_depth = boost::next(p)->getDepth();
+			depth_type const next_depth =
+				pars[p + 1].getDepth();
 			if (par_depth > next_depth ||
-			    (par_depth == next_depth &&
-			     layout != boost::next(p)->layout()))
+			    (par_depth == next_depth && layout != pars[p + 1].layout()))
 				return endlabeltype;
 			break;
 		}
 		if (par_depth == 0)
 			break;
-		pit = outerHook(pit, plist);
-		if (pit != const_cast<ParagraphList&>(plist).end())
-			par_depth = pit->getDepth();
+		pit = outerHook(pit, pars);
+		if (pit != pit_type(pars.size()))
+			par_depth = pars[pit].getDepth();
 	}
 	return END_LABEL_NO_LABEL;
 }
 
 
-namespace {
-
-int readParToken(Buffer const & buf, Paragraph & par, LyXLex & lex,
-	string const & token)
-{
-	static LyXFont font;
-	static Change change;
-
-	BufferParams const & bp = buf.params();
-
-	if (token[0] != '\\') {
-		string::const_iterator cit = token.begin();
-		for (; cit != token.end(); ++cit) {
-			par.insertChar(par.size(), (*cit), font, change);
-		}
-	} else if (token == "\\begin_layout") {
-		lex.eatLine();
-		string layoutname = lex.getString();
-
-		font = LyXFont(LyXFont::ALL_INHERIT, bp.language);
-		change = Change();
-
-		LyXTextClass const & tclass = bp.getLyXTextClass();
-
-		if (layoutname.empty()) {
-			layoutname = tclass.defaultLayoutName();
-		}
-
-		bool hasLayout = tclass.hasLayout(layoutname);
-
-		if (!hasLayout) {
-			lyxerr << "Layout '" << layoutname << "' does not"
-			       << " exist in textclass '" << tclass.name()
-			       << "'." << endl;
-			lyxerr << "Trying to use default layout instead."
-			       << endl;
-			layoutname = tclass.defaultLayoutName();
-		}
-
-		par.layout(bp.getLyXTextClass()[layoutname]);
-
-		// Test whether the layout is obsolete.
-		LyXLayout_ptr const & layout = par.layout();
-		if (!layout->obsoleted_by().empty())
-			par.layout(bp.getLyXTextClass()[layout->obsoleted_by()]);
-
-		par.params().read(lex);
-
-	} else if (token == "\\end_layout") {
-		lyxerr << "Solitary \\end_layout in line " << lex.getLineNo() << "\n"
-		       << "Missing \\begin_layout?.\n";
-	} else if (token == "\\end_inset") {
-		lyxerr << "Solitary \\end_inset in line " << lex.getLineNo() << "\n"
-		       << "Missing \\begin_inset?.\n";
-	} else if (token == "\\begin_inset") {
-		InsetBase * inset = readInset(lex, buf);
-		if (inset)
-			par.insertInset(par.size(), inset, font, change);
-		else {
-			lex.eatLine();
-			string line = lex.getString();
-			buf.error(ErrorItem(_("Unknown Inset"), line,
-					    par.id(), 0, par.size()));
-			return 1;
-		}
-	} else if (token == "\\family") {
-		lex.next();
-		font.setLyXFamily(lex.getString());
-	} else if (token == "\\series") {
-		lex.next();
-		font.setLyXSeries(lex.getString());
-	} else if (token == "\\shape") {
-		lex.next();
-		font.setLyXShape(lex.getString());
-	} else if (token == "\\size") {
-		lex.next();
-		font.setLyXSize(lex.getString());
-	} else if (token == "\\lang") {
-		lex.next();
-		string const tok = lex.getString();
-		Language const * lang = languages.getLanguage(tok);
-		if (lang) {
-			font.setLanguage(lang);
-		} else {
-			font.setLanguage(bp.language);
-			lex.printError("Unknown language `$$Token'");
-		}
-	} else if (token == "\\numeric") {
-		lex.next();
-		font.setNumber(font.setLyXMisc(lex.getString()));
-	} else if (token == "\\emph") {
-		lex.next();
-		font.setEmph(font.setLyXMisc(lex.getString()));
-	} else if (token == "\\bar") {
-		lex.next();
-		string const tok = lex.getString();
-
-		if (tok == "under")
-			font.setUnderbar(LyXFont::ON);
-		else if (tok == "no")
-			font.setUnderbar(LyXFont::OFF);
-		else if (tok == "default")
-			font.setUnderbar(LyXFont::INHERIT);
-		else
-			lex.printError("Unknown bar font flag "
-				       "`$$Token'");
-	} else if (token == "\\noun") {
-		lex.next();
-		font.setNoun(font.setLyXMisc(lex.getString()));
-	} else if (token == "\\color") {
-		lex.next();
-		font.setLyXColor(lex.getString());
-	} else if (token == "\\InsetSpace" || token == "\\SpecialChar") {
-
-		// Insets don't make sense in a free-spacing context! ---Kayvan
-		if (par.isFreeSpacing()) {
-			if (token == "\\InsetSpace")
-				par.insertChar(par.size(), ' ', font, change);
-			else if (lex.isOK()) {
-				lex.next();
-				string const next_token = lex.getString();
-				if (next_token == "\\-")
-					par.insertChar(par.size(), '-', font, change);
-				else {
-					lex.printError("Token `$$Token' "
-						       "is in free space "
-						       "paragraph layout!");
-				}
-			}
-		} else {
-			auto_ptr<InsetBase> inset;
-			if (token == "\\SpecialChar" )
-				inset.reset(new InsetSpecialChar);
-			else
-				inset.reset(new InsetSpace);
-			inset->read(buf, lex);
-			par.insertInset(par.size(), inset.release(),
-					font, change);
-		}
-	} else if (token == "\\i") {
-		auto_ptr<InsetBase> inset(new InsetLatexAccent);
-		inset->read(buf, lex);
-		par.insertInset(par.size(), inset.release(), font, change);
-	} else if (token == "\\backslash") {
-		par.insertChar(par.size(), '\\', font, change);
-	} else if (token == "\\newline") {
-		auto_ptr<InsetBase> inset(new InsetNewline);
-		inset->read(buf, lex);
-		par.insertInset(par.size(), inset.release(), font, change);
-	} else if (token == "\\LyXTable") {
-		auto_ptr<InsetBase> inset(new InsetTabular(buf));
-		inset->read(buf, lex);
-		par.insertInset(par.size(), inset.release(), font, change);
-	} else if (token == "\\bibitem") {
-		InsetCommandParams p("bibitem", "dummy");
-		auto_ptr<InsetBibitem> inset(new InsetBibitem(p));
-		inset->read(buf, lex);
-		par.insertInset(par.size(), inset.release(), font, change);
-	} else if (token == "\\hfill") {
-		par.insertInset(par.size(), new InsetHFill, font, change);
-	} else if (token == "\\lyxline") {
-		par.insertInset(par.size(), new InsetLine, font, change);
-	} else if (token == "\\newpage") {
-		par.insertInset(par.size(), new InsetPagebreak, font, change);
-	} else if (token == "\\change_unchanged") {
-		// Hack ! Needed for empty paragraphs :/
-		// FIXME: is it still ??
-		if (!par.size())
-			par.cleanChanges();
-		change = Change(Change::UNCHANGED);
-	} else if (token == "\\change_inserted") {
-		lex.nextToken();
-		istringstream is(lex.getString());
-		int aid;
-		lyx::time_type ct;
-		is >> aid >> ct;
-		change = Change(Change::INSERTED, bp.author_map[aid], ct);
-	} else if (token == "\\change_deleted") {
-		lex.nextToken();
-		istringstream is(lex.getString());
-		int aid;
-		lyx::time_type ct;
-		is >> aid >> ct;
-		change = Change(Change::DELETED, bp.author_map[aid], ct);
-	} else {
-		lex.eatLine();
-		string const s = bformat(_("Unknown token: %1$s %2$s\n"),
-			token, lex.getString());
-
-		buf.error(ErrorItem(_("Unknown token"), s,
-				    par.id(), 0, par.size()));
-		return 1;
-	}
-	return 0;
-}
-
-}
-
-
-int readParagraph(Buffer const & buf, Paragraph & par, LyXLex & lex)
-{
-	int unknown = 0;
-
-	lex.nextToken();
-	string token = lex.getString();
-
-	while (lex.isOK()) {
-
-		unknown += readParToken(buf, par, lex, token);
-
-		lex.nextToken();
-		token = lex.getString();
-
-		if (token.empty())
-			continue;
-
-		if (token == "\\end_layout") {
-			//Ok, paragraph finished
-			break;
-		}
-
-		lyxerr[Debug::PARSER] << "Handling paragraph token: `"
-				      << token << '\'' << endl;
-		if (token == "\\begin_layout" || token == "\\end_document"
-		    || token == "\\end_inset" || token == "\\begin_deeper"
-		    || token == "\\end_deeper") {
-			lex.pushToken(token);
-			lyxerr << "Paragraph ended in line "
-			       << lex.getLineNo() << "\n"
-			       << "Missing \\end_layout.\n";
-			break;
-		}
-	}
-
-	return unknown;
-}
-
-
-LyXFont const outerFont(ParagraphList::iterator pit,
-			ParagraphList const & plist)
+LyXFont const outerFont(pit_type par_offset, ParagraphList const & pars)
 {
-	Paragraph::depth_type par_depth = pit->getDepth();
+	depth_type par_depth = pars[par_offset].getDepth();
 	LyXFont tmpfont(LyXFont::ALL_INHERIT);
 
 	// Resolve against environment font information
-	while (pit != const_cast<ParagraphList&>(plist).end() &&
-	       par_depth && !tmpfont.resolved()) {
-		pit = outerHook(pit, plist);
-		if (pit != const_cast<ParagraphList&>(plist).end()) {
-			tmpfont.realize(pit->layout()->font);
-			par_depth = pit->getDepth();
+	while (par_offset != pit_type(pars.size())
+	       && par_depth
+	       && !tmpfont.resolved()) {
+		par_offset = outerHook(par_offset, pars);
+		if (par_offset != pit_type(pars.size())) {
+			tmpfont.realize(pars[par_offset].layout()->font);
+			par_depth = pars[par_offset].getDepth();
 		}
 	}
 
@@ -559,68 +302,19 @@ LyXFont const outerFont(ParagraphList::iterator pit,
 }
 
 
-ParagraphList::iterator outerPar(Buffer const & buf, InsetBase const * inset)
+/// return the number of InsetOptArg in a paragraph
+int numberOfOptArgs(Paragraph const & par)
 {
-	ParIterator pit = const_cast<Buffer &>(buf).par_iterator_begin();
-	ParIterator end = const_cast<Buffer &>(buf).par_iterator_end();
-	for ( ; pit != end; ++pit) {
-		LyXText * text;
-		// the second '=' below is intentional
-		for (int i = 0; (text = inset->getText(i)); ++i)
-			if (&text->paragraphs() == &pit.plist())
-				return pit.outerPar();
-
-		InsetList::iterator ii = pit->insetlist.begin();
-		InsetList::iterator iend = pit->insetlist.end();
-		for ( ; ii != iend; ++ii)
-			if (ii->inset == inset)
-				return pit.outerPar();
-	}
-	lyxerr << "outerPar: should not happen" << endl;
-	BOOST_ASSERT(false);
-	return const_cast<Buffer &>(buf).paragraphs().end(); // shut up compiler
-}
-
+	int num = 0;
 
-Paragraph const & ownerPar(Buffer const & buf, InsetBase const * inset)
-{
-	ParConstIterator pit = buf.par_iterator_begin();
-	ParConstIterator end = buf.par_iterator_end();
-	for ( ; pit != end; ++pit) {
-		LyXText * text;
-		// the second '=' below is intentional
-		for (int i = 0; (text = inset->getText(i)); ++i)
-			if (&text->paragraphs() == &pit.plist())
-				return *pit.pit();
-
-		InsetList::const_iterator ii = pit->insetlist.begin();
-		InsetList::const_iterator iend = pit->insetlist.end();
-		for ( ; ii != iend; ++ii)
-			if (ii->inset == inset)
-				return *pit.pit();
+	InsetList::const_iterator it = par.insetlist.begin();
+	InsetList::const_iterator end = par.insetlist.end();
+	for (; it != end ; ++it) {
+		if (it->inset->lyxCode() == InsetBase::OPTARG_CODE)
+			++num;
 	}
-	lyxerr << "ownerPar: should not happen" << endl;
-	BOOST_ASSERT(false);
-	return buf.paragraphs().front(); // shut up compiler
+	return num;
 }
 
 
-/// return the range of pars [beg, end[ owning the range of y [ystart, yend] 
-void getParsInRange(ParagraphList & pl,
-				int ystart, int yend,
-				ParagraphList::iterator & beg,
-				ParagraphList::iterator & end)
-{
-	ParagraphList::iterator const endpar = pl.end();
-	ParagraphList::iterator const begpar = pl.begin();
-
-	BOOST_ASSERT(begpar != endpar);
-
-	beg = endpar;
-	for (--beg; beg != begpar && beg->y > ystart; --beg)
-		;
-
-	for (end = beg ; end != endpar && end->y <= yend; ++end)
-		;
-}
-
+} // namespace lyx