X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph_pimpl.C;h=91d67776610bbff0ca207c5353890633543ae561;hb=69bee02a8901793b34ac5ca6d07e93910cef4005;hp=bb19f8af423e7df7c03cdbeb8bb4e6bec6c9f6fc;hpb=9aee8a07b059bf8b8a35c6531cd4081a0291cad4;p=lyx.git

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index bb19f8af42..91d6777661 100644
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -1,12 +1,15 @@
-/* This file is part of
- * ======================================================
+/**
+ * \file paragraph_pimpl.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
+ * \author Lars Gullik Bjønnes
+ * \author Jean-Marc Lasgouttes
+ * \author John Levon
+ * \author André Pönitz
  *
- *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The LyX Team.
- *
- * ====================================================== */
+ * Full author contact details are available in file CREDITS.
+ */
 
 #include <config.h>
 
@@ -17,18 +20,21 @@
 #include "encoding.h"
 #include "language.h"
 #include "LaTeXFeatures.h"
-#include "latexrunparams.h"
+#include "LColor.h"
+#include "lyxlength.h"
 #include "lyxrc.h"
-#include "paragraph_funcs.h"
+#include "outputparams.h"
 #include "texrow.h"
 
-#include "support/LAssert.h"
 
 using lyx::pos_type;
+
 using std::endl;
-using std::ostream;
 using std::upper_bound;
 using std::lower_bound;
+using std::string;
+using std::ostream;
+
 
 // Initialize static member.
 ShareContainer<LyXFont> Paragraph::Pimpl::FontTable::container;
@@ -67,7 +73,6 @@ Paragraph::Pimpl::Pimpl(Pimpl const & p, Paragraph * owner)
 	: params(p.params), owner_(owner)
 {
 	inset_owner = p.inset_owner;
-	text = p.text;
 	fontlist = p.fontlist;
 	id_ = paragraph_id++;
 
@@ -76,16 +81,9 @@ Paragraph::Pimpl::Pimpl(Pimpl const & p, Paragraph * owner)
 }
 
 
-void Paragraph::Pimpl::clear()
-{
-	text.clear();
-#warning changes ?
-}
-
-
 void Paragraph::Pimpl::setContentsFromPar(Paragraph const & par)
 {
-	text = par.pimpl_->text;
+	owner_->text_ = par.text_;
 	if (par.pimpl_->tracking()) {
 		changes_.reset(new Changes(*(par.pimpl_->changes_.get())));
 	}
@@ -170,7 +168,7 @@ Change const Paragraph::Pimpl::lookupChangeFull(pos_type pos) const
 
 void Paragraph::Pimpl::markErased()
 {
-	lyx::Assert(tracking());
+	BOOST_ASSERT(tracking());
 
 	// FIXME: we should actually remove INSERTED chars.
 	// difficult because owning insettexts/tabulars need
@@ -251,38 +249,14 @@ void Paragraph::Pimpl::rejectChange(pos_type start, pos_type end)
 
 Paragraph::value_type Paragraph::Pimpl::getChar(pos_type pos) const
 {
-#if 1
-	// This is in the critical path for loading!
-	pos_type const siz = size();
-
-	lyx::Assert(pos <= siz);
-
-	if (pos == siz) {
-		lyxerr << "getChar() on pos " << pos << " in par id "
-		       << owner_->id() << " of size " << siz
-		       << "  is a bit silly !" << endl;
-		return '\0';
-	}
-
-	return text[pos];
-#else
-	lyx::Assert(pos < size());
-	return text[pos];
-#endif
-}
-
-
-void Paragraph::Pimpl::setChar(pos_type pos, value_type c)
-{
-#warning changes
-	text[pos] = c;
+	return owner_->getChar(pos);
 }
 
 
 void Paragraph::Pimpl::insertChar(pos_type pos, value_type c,
 				  LyXFont const & font, Change change)
 {
-	lyx::Assert(pos <= size());
+	BOOST_ASSERT(pos <= size());
 
 	if (tracking()) {
 		changes_->record(change, pos);
@@ -292,12 +266,12 @@ void Paragraph::Pimpl::insertChar(pos_type pos, value_type c,
 	// maybe inserting ascii text)
 	if (pos == size()) {
 		// when appending characters, no need to update tables
-		text.push_back(c);
+		owner_->text_.push_back(c);
 		owner_->setFont(pos, font);
 		return;
 	}
 
-	text.insert(text.begin() + pos, c);
+	owner_->text_.insert(owner_->text_.begin() + pos, c);
 
 	// Update the font table.
 	FontTable search_font(pos, LyXFont());
@@ -317,17 +291,16 @@ void Paragraph::Pimpl::insertChar(pos_type pos, value_type c,
 
 
 void Paragraph::Pimpl::insertInset(pos_type pos,
-				   Inset * inset, LyXFont const & font, Change change)
+				   InsetOld * inset, LyXFont const & font, Change change)
 {
-	lyx::Assert(inset);
-	lyx::Assert(pos <= size());
+	BOOST_ASSERT(inset);
+	BOOST_ASSERT(pos <= size());
 
 	insertChar(pos, META_INSET, font, change);
-	lyx::Assert(text[pos] == META_INSET);
+	BOOST_ASSERT(owner_->text_[pos] == META_INSET);
 
 	// Add a new entry in the insetlist.
 	owner_->insetlist.insert(inset, pos);
-	inset->parOwner(owner_);
 
 	if (inset_owner)
 		inset->setOwner(inset_owner);
@@ -337,11 +310,11 @@ void Paragraph::Pimpl::insertInset(pos_type pos,
 void Paragraph::Pimpl::eraseIntern(pos_type pos)
 {
 	// if it is an inset, delete the inset entry
-	if (text[pos] == Paragraph::META_INSET) {
+	if (owner_->text_[pos] == Paragraph::META_INSET) {
 		owner_->insetlist.erase(pos);
 	}
 
-	text.erase(text.begin() + pos);
+	owner_->text_.erase(owner_->text_.begin() + pos);
 
 	// Erase entries in the tables.
 	FontTable search_font(pos, LyXFont());
@@ -380,7 +353,7 @@ void Paragraph::Pimpl::eraseIntern(pos_type pos)
 
 bool Paragraph::Pimpl::erase(pos_type pos)
 {
-	lyx::Assert(pos < size());
+	BOOST_ASSERT(pos < size());
 
 	if (tracking()) {
 		Change::Type changetype(changes_->lookup(pos));
@@ -388,9 +361,8 @@ bool Paragraph::Pimpl::erase(pos_type pos)
 
 		// only allow the actual removal if it was /new/ text
 		if (changetype != Change::INSERTED) {
-			if (text[pos] == Paragraph::META_INSET) {
-				Inset * i(owner_->getInset(pos));
-				i->markErased();
+			if (owner_->text_[pos] == Paragraph::META_INSET) {
+				owner_->getInset(pos)->markErased();
 			}
 			return false;
 		}
@@ -404,12 +376,9 @@ bool Paragraph::Pimpl::erase(pos_type pos)
 int Paragraph::Pimpl::erase(pos_type start, pos_type end)
 {
 	pos_type i = start;
-	pos_type count = end - start;
-	while (count) {
-		if (!erase(i)) {
+	for (pos_type count = end - start; count; --count) {
+		if (!erase(i))
 			++i;
-		}
-		--count;
 	}
 	return end - i;
 }
@@ -429,8 +398,7 @@ void Paragraph::Pimpl::simpleTeXBlanks(ostream & os, TexRow & texrow,
 	    && getChar(i - 1) != ' '
 	    && (i < size() - 1)
 	    // same in FreeSpacing mode
-	    && !style.free_spacing
-		&& !owner_->isFreeSpacing()
+	    && !owner_->isFreeSpacing()
 	    // In typewriter mode, we want to avoid
 	    // ! . ? : at the end of a line
 	    && !(font.family() == LyXFont::TYPEWRITER_FAMILY
@@ -460,7 +428,7 @@ bool Paragraph::Pimpl::isTextAt(string const & str, pos_type pos) const
 
 	// does the wanted text start at point?
 	for (string::size_type i = 0; i < str.length(); ++i) {
-		if (str[i] != text[pos + i])
+		if (str[i] != owner_->text_[pos + i])
 			return false;
 	}
 
@@ -478,11 +446,11 @@ bool Paragraph::Pimpl::isTextAt(string const & str, pos_type pos) const
 }
 
 
-void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
+void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
 					     BufferParams const & bparams,
 					     ostream & os,
 					     TexRow & texrow,
-					     LatexRunParams const & runparams,
+					     OutputParams const & runparams,
 					     LyXFont & font,
 					     LyXFont & running_font,
 					     LyXFont & basefont,
@@ -499,8 +467,8 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
 			if (c != '\0')
 				os << c;
 		} else {
-			Inset const * inset = owner_->getInset(i);
-			inset->ascii(buf, os, 0);
+			InsetOld const * inset = owner_->getInset(i);
+			inset->plaintext(buf, os, runparams);
 		}
 		return;
 	}
@@ -510,14 +478,14 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
 	// and then split to handle the two modes separately.
 	switch (c) {
 	case Paragraph::META_INSET: {
-		Inset * inset = owner_->getInset(i);
+		InsetOld * inset = owner_->getInset(i);
 
 		// FIXME: remove this check
 		if (!inset)
 			break;
 
 		// FIXME: move this to InsetNewline::latex
-		if (inset->lyxCode() == Inset::NEWLINE_CODE) {
+		if (inset->lyxCode() == InsetOld::NEWLINE_CODE) {
 			// newlines are handled differently here than
 			// the default in simpleTeXSpecialChars().
 			if (!style.newline_allowed) {
@@ -551,11 +519,11 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
 		}
 
 		bool close = false;
-		int const len = os.tellp();
-		//ostream::pos_type const len = os.tellp();
-		if ((inset->lyxCode() == Inset::GRAPHICS_CODE
-		     || inset->lyxCode() == Inset::MATH_CODE
-		     || inset->lyxCode() == Inset::URL_CODE)
+		ostream::pos_type const len = os.tellp();
+
+		if ((inset->lyxCode() == InsetOld::GRAPHICS_CODE
+		     || inset->lyxCode() == InsetOld::MATH_CODE
+		     || inset->lyxCode() == InsetOld::URL_CODE)
 		    && running_font.isRightToLeft()) {
 			os << "\\L{";
 			close = true;
@@ -590,7 +558,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
 			texrow.start(owner_->id(), i + 1);
 			column = 0;
 		} else {
-			column += int(os.tellp()) - len;
+			column += os.tellp() - len;
 		}
 	}
 	break;
@@ -764,8 +732,6 @@ void Paragraph::Pimpl::validate(LaTeXFeatures & features,
 	BufferParams const & bparams = features.bufferParams();
 
 	// check the params.
-	if (params.lineTop() || params.lineBottom())
-		features.require("lyxline");
 	if (!params.spacing().isDefault())
 		features.require("setspace");
 
@@ -821,10 +787,10 @@ void Paragraph::Pimpl::validate(LaTeXFeatures & features,
 	InsetList::iterator icit = owner_->insetlist.begin();
 	InsetList::iterator iend = owner_->insetlist.end();
 	for (; icit != iend; ++icit) {
-		if (icit.getInset()) {
-			icit.getInset()->validate(features);
+		if (icit->inset) {
+			icit->inset->validate(features);
 			if (layout.needprotect &&
-			    icit.getInset()->lyxCode() == Inset::FOOT_CODE)
+			    icit->inset->lyxCode() == InsetOld::FOOT_CODE)
 				features.require("NeedLyXFootnoteCode");
 		}
 	}