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

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index eef7f3d8fb..91d6777661 100644
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -1,35 +1,40 @@
-/* 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>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "paragraph_pimpl.h"
-#include "LaTeXFeatures.h"
-#include "texrow.h"
-#include "language.h"
+
 #include "bufferparams.h"
+#include "debug.h"
 #include "encoding.h"
+#include "language.h"
+#include "LaTeXFeatures.h"
+#include "LColor.h"
+#include "lyxlength.h"
 #include "lyxrc.h"
-#include "debug.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;
@@ -64,35 +69,23 @@ Paragraph::Pimpl::Pimpl(Paragraph * owner)
 }
 
 
-Paragraph::Pimpl::Pimpl(Pimpl const & p, Paragraph * owner, bool same_ids)
+Paragraph::Pimpl::Pimpl(Pimpl const & p, Paragraph * owner)
 	: params(p.params), owner_(owner)
 {
 	inset_owner = p.inset_owner;
-	text = p.text;
 	fontlist = p.fontlist;
-	if (same_ids)
-		id_ = p.id_;
-	else
-		id_ = paragraph_id++;
+	id_ = paragraph_id++;
 
 	if (p.tracking())
 		changes_.reset(new Changes(*p.changes_.get()));
 }
 
 
-void Paragraph::Pimpl::clear()
-{
-	text.clear();
-#warning changes ? 
-}
-
-
-void Paragraph::Pimpl::setContentsFromPar(Paragraph const * par)
+void Paragraph::Pimpl::setContentsFromPar(Paragraph const & par)
 {
-	lyx::Assert(par);
-	text = par->pimpl_->text;
-	if (par->pimpl_->tracking()) {
-		changes_.reset(new Changes(*(par->pimpl_->changes_.get())));
+	owner_->text_ = par.text_;
+	if (par.pimpl_->tracking()) {
+		changes_.reset(new Changes(*(par.pimpl_->changes_.get())));
 	}
 }
 
@@ -103,20 +96,20 @@ void Paragraph::Pimpl::trackChanges(Change::Type type)
 		lyxerr[Debug::CHANGES] << "already tracking for par " << id_ << endl;
 		return;
 	}
- 
+
 	lyxerr[Debug::CHANGES] << "track changes for par "
 		<< id_ << " type " << type << endl;
 	changes_.reset(new Changes(type));
 	changes_->set(type, 0, size());
 }
 
- 
+
 void Paragraph::Pimpl::untrackChanges()
 {
 	changes_.reset(0);
 }
 
- 
+
 void Paragraph::Pimpl::cleanChanges()
 {
 	// if we're not tracking, we don't want to reset...
@@ -127,7 +120,7 @@ void Paragraph::Pimpl::cleanChanges()
 	changes_->set(Change::INSERTED, 0, size());
 }
 
- 
+
 bool Paragraph::Pimpl::isChanged(pos_type start, pos_type end) const
 {
 	if (!tracking())
@@ -145,7 +138,7 @@ bool Paragraph::Pimpl::isChangeEdited(pos_type start, pos_type end) const
 	return changes_->isChangeEdited(start, end);
 }
 
- 
+
 void Paragraph::Pimpl::setChange(pos_type pos, Change::Type type)
 {
 	if (!tracking())
@@ -154,7 +147,7 @@ void Paragraph::Pimpl::setChange(pos_type pos, Change::Type type)
 	changes_->set(type, pos);
 }
 
- 
+
 Change::Type Paragraph::Pimpl::lookupChange(pos_type pos) const
 {
 	if (!tracking())
@@ -162,7 +155,7 @@ Change::Type Paragraph::Pimpl::lookupChange(pos_type pos) const
 
 	return changes_->lookup(pos);
 }
- 
+
 
 Change const Paragraph::Pimpl::lookupChangeFull(pos_type pos) const
 {
@@ -171,11 +164,11 @@ Change const Paragraph::Pimpl::lookupChangeFull(pos_type pos) const
 
 	return changes_->lookupFull(pos);
 }
- 
- 
+
+
 void Paragraph::Pimpl::markErased()
 {
-	lyx::Assert(tracking());
+	BOOST_ASSERT(tracking());
 
 	// FIXME: we should actually remove INSERTED chars.
 	// difficult because owning insettexts/tabulars need
@@ -184,18 +177,18 @@ void Paragraph::Pimpl::markErased()
 	changes_->reset(Change::DELETED);
 }
 
- 
+
 void Paragraph::Pimpl::acceptChange(pos_type start, pos_type end)
 {
 	if (!tracking())
 		return;
- 
+
 	if (!size()) {
 		changes_.reset(new Changes(Change::UNCHANGED));
 		return;
 	}
- 
-	lyxerr << "acceptchange" << endl; 
+
+	lyxerr << "acceptchange" << endl;
 	pos_type i = start;
 
 	for (; i < end; ++i) {
@@ -216,7 +209,7 @@ void Paragraph::Pimpl::acceptChange(pos_type start, pos_type end)
 		}
 	}
 
-	lyxerr << "endacceptchange" << endl; 
+	lyxerr << "endacceptchange" << endl;
 	changes_->reset(Change::UNCHANGED);
 }
 
@@ -225,12 +218,12 @@ void Paragraph::Pimpl::rejectChange(pos_type start, pos_type end)
 {
 	if (!tracking())
 		return;
- 
+
 	if (!size()) {
 		changes_.reset(new Changes(Change::UNCHANGED));
 		return;
 	}
- 
+
 	pos_type i = start;
 
 	for (; i < end; ++i) {
@@ -253,35 +246,17 @@ void Paragraph::Pimpl::rejectChange(pos_type start, pos_type end)
 	changes_->reset(Change::UNCHANGED);
 }
 
- 
-Paragraph::value_type Paragraph::Pimpl::getChar(pos_type pos) const
-{
-	// This is in the critical path for loading!
-	pos_type const siz = size();
-	lyx::Assert(pos <= siz);
-	// This is stronger, and I belive that this is the assertion
-	// that we should really use. (Lgb)
-	//Assert(pos < size());
-
-	// Then this has no meaning. (Lgb)
-	if (!siz || pos == siz)
-		return '\0';
-
-	return text[pos];
-}
-
 
-void Paragraph::Pimpl::setChar(pos_type pos, value_type c)
+Paragraph::value_type Paragraph::Pimpl::getChar(pos_type pos) const
 {
-#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);
@@ -291,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());
@@ -316,54 +291,30 @@ 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);
 }
 
 
-bool Paragraph::Pimpl::erasePos(pos_type pos)
-{
-	lyx::Assert(pos < size());
-
-	if (tracking()) {
-		Change::Type changetype(changes_->lookup(pos));
-		changes_->record(Change(Change::DELETED), 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();
-			}
-			return false;
-		}
-	}
-
-	eraseIntern(pos);
-	return true;
-}
-
- 
 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());
@@ -400,44 +351,54 @@ void Paragraph::Pimpl::eraseIntern(pos_type pos)
 }
 
 
-void Paragraph::Pimpl::erase(pos_type pos)
+bool Paragraph::Pimpl::erase(pos_type pos)
 {
-	erasePos(pos);
+	BOOST_ASSERT(pos < size());
+
+	if (tracking()) {
+		Change::Type changetype(changes_->lookup(pos));
+		changes_->record(Change(Change::DELETED), pos);
+
+		// only allow the actual removal if it was /new/ text
+		if (changetype != Change::INSERTED) {
+			if (owner_->text_[pos] == Paragraph::META_INSET) {
+				owner_->getInset(pos)->markErased();
+			}
+			return false;
+		}
+	}
+
+	eraseIntern(pos);
+	return true;
 }
 
- 
-bool Paragraph::Pimpl::erase(pos_type start, pos_type end)
+
+int Paragraph::Pimpl::erase(pos_type start, pos_type end)
 {
 	pos_type i = start;
-	pos_type count = end - start;
-	bool any_erased = false;
-
-	while (count) {
-		if (!erasePos(i)) {
+	for (pos_type count = end - start; count; --count) {
+		if (!erase(i))
 			++i;
-		} else {
-			any_erased = true;
-		} 
-		--count;
 	}
-	return any_erased;
+	return end - i;
 }
 
- 
+
 void Paragraph::Pimpl::simpleTeXBlanks(ostream & os, TexRow & texrow,
 				       pos_type const i,
 				       unsigned int & column,
 				       LyXFont const & font,
 				       LyXLayout const & style)
 {
-	if (style.pass_thru) return;
+	if (style.pass_thru)
+		return;
+
 	if (column > lyxrc.ascii_linelen
 	    && i
 	    && 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
@@ -447,7 +408,7 @@ void Paragraph::Pimpl::simpleTeXBlanks(ostream & os, TexRow & texrow,
 		     || getChar(i - 1) == '!'))) {
 		os << '\n';
 		texrow.newline();
-		texrow.start(owner_, i + 1);
+		texrow.start(owner_->id(), i + 1);
 		column = 0;
 	} else if (style.free_spacing) {
 		os << '~';
@@ -467,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;
 	}
 
@@ -484,15 +445,16 @@ bool Paragraph::Pimpl::isTextAt(string const & str, pos_type pos) const
 	return true;
 }
 
- 
-void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
+
+void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const & buf,
 					     BufferParams const & bparams,
 					     ostream & os,
 					     TexRow & texrow,
-					     bool moving_arg,
+					     OutputParams const & runparams,
 					     LyXFont & font,
 					     LyXFont & running_font,
 					     LyXFont & basefont,
+					     LyXFont const & outerfont,
 					     bool & open_font,
 					     Change::Type & running_change,
 					     LyXLayout const & style,
@@ -501,32 +463,67 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
 					     value_type const c)
 {
 	if (style.pass_thru) {
-		if (c != '\0') os << c;
+		if (c != Paragraph::META_INSET) {
+			if (c != '\0')
+				os << c;
+		} else {
+			InsetOld const * inset = owner_->getInset(i);
+			inset->plaintext(buf, os, runparams);
+		}
 		return;
 	}
+
 	// Two major modes:  LaTeX or plain
 	// Handle here those cases common to both modes
 	// and then split to handle the two modes separately.
 	switch (c) {
 	case 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() == InsetOld::NEWLINE_CODE) {
+			// newlines are handled differently here than
+			// the default in simpleTeXSpecialChars().
+			if (!style.newline_allowed) {
+				os << '\n';
+			} else {
+				if (open_font) {
+					column += running_font.latexWriteEndChanges(os, basefont, basefont);
+					open_font = false;
+				}
+				basefont = owner_->getLayoutFont(bparams, outerfont);
+				running_font = basefont;
+
+				if (font.family() == LyXFont::TYPEWRITER_FAMILY)
+					os << '~';
+
+				if (runparams.moving_arg)
+					os << "\\protect ";
+
+				os << "\\\\\n";
+			}
+			texrow.newline();
+			texrow.start(owner_->id(), i + 1);
+			column = 0;
+			break;
+		}
+
 		if (inset->isTextInset()) {
 			column += Changes::latexMarkChange(os, running_change,
 				Change::UNCHANGED);
 			running_change = Change::UNCHANGED;
 		}
- 
+
 		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;
@@ -545,12 +542,11 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
 						     basefont,
 						     basefont);
 			open_font = false;
-			basefont = owner_->getLayoutFont(bparams);
+			basefont = owner_->getLayoutFont(bparams, outerfont);
 			running_font = basefont;
 		}
 
-		int tmp = inset->latex(buf, os, moving_arg,
-				       style.free_spacing);
+		int tmp = inset->latex(buf, os, runparams);
 
 		if (close)
 			os << '}';
@@ -559,30 +555,14 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
 			for (int j = 0; j < tmp; ++j) {
 				texrow.newline();
 			}
-			texrow.start(owner_, i + 1);
+			texrow.start(owner_->id(), i + 1);
 			column = 0;
 		} else {
-			column += int(os.tellp()) - len;
+			column += os.tellp() - len;
 		}
 	}
 	break;
 
-	case Paragraph::META_NEWLINE:
-		if (open_font) {
-			column += running_font.latexWriteEndChanges(os,
-								    basefont,
-								    basefont);
-			open_font = false;
-		}
-		basefont = owner_->getLayoutFont(bparams);
-		running_font = basefont;
-		break;
-
-	case Paragraph::META_HFILL:
-		os << "\\hfill{}";
-		column += 7;
-		break;
-
 	default:
 		// And now for the special cases within each mode
 
@@ -746,37 +726,12 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
 }
 
 
-
-Paragraph * Paragraph::Pimpl::TeXDeeper(Buffer const * buf,
-					BufferParams const & bparams,
-					ostream & os, TexRow & texrow)
-{
-	lyxerr[Debug::LATEX] << "TeXDeeper...     " << this << endl;
-	Paragraph * par = owner_;
-
-	while (par && par->params().depth() == owner_->params().depth()) {
-		if (par->layout()->isEnvironment()) {
-			par = par->TeXEnvironment(buf, bparams,
-						  os, texrow);
-		} else {
-			par = par->TeXOnePar(buf, bparams,
-					     os, texrow, false);
-		}
-	}
-	lyxerr[Debug::LATEX] << "TeXDeeper...done " << par << endl;
-
-	return par;
-}
-
-
 void Paragraph::Pimpl::validate(LaTeXFeatures & features,
 				LyXLayout const & layout) const
 {
 	BufferParams const & bparams = features.bufferParams();
 
 	// check the params.
-	if (params.lineTop() || params.lineBottom())
-		features.require("lyxline");
 	if (!params.spacing().isDefault())
 		features.require("setspace");
 
@@ -832,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");
 		}
 	}
@@ -851,39 +806,3 @@ void Paragraph::Pimpl::validate(LaTeXFeatures & features,
 		}
 	}
 }
-
-
-Paragraph * Paragraph::Pimpl::getParFromID(int id) const
-{
-	InsetList::iterator cit = owner_->insetlist.begin();
-	InsetList::iterator lend = owner_->insetlist.end();
-	Paragraph * result;
-	for (; cit != lend; ++cit) {
-		if ((result = cit.getInset()->getParFromID(id)))
-			return result;
-	}
-	return 0;
-}
-
-
-LyXFont const Paragraph::Pimpl::realizeFont(LyXFont const & font,
-					    BufferParams const & bparams) const
-{
-	LyXFont tmpfont(font);
-
-	// check for environment font information
-	char par_depth = owner_->getDepth();
-	Paragraph const * par = owner_;
-	LyXTextClass const & tclass = bparams.getLyXTextClass();
-
-	while (par && par->getDepth() && !tmpfont.resolved()) {
-		par = par->outerHook();
-		if (par) {
-			tmpfont.realize(par->layout()->font);
-			par_depth = par->getDepth();
-		}
-	}
-
-	tmpfont.realize(tclass.defaultfont());
-	return tmpfont;
-}