X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph_pimpl.C;h=6e3c63cb5538af80d8be44c7e7ab40cbe96428db;hb=e94889a041628203c50b66b9a4add63210de6928;hp=260d5d801dedac578fb3eb28006a4e9e0c2b638d;hpb=468560431fafad23fedd6d952421c622fe7874b6;p=lyx.git

diff --git a/src/paragraph_pimpl.C b/src/paragraph_pimpl.C
index 260d5d801d..6e3c63cb55 100644
--- a/src/paragraph_pimpl.C
+++ b/src/paragraph_pimpl.C
@@ -1,35 +1,43 @@
-/* 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>
 
 #include "paragraph_pimpl.h"
-#include "LaTeXFeatures.h"
-#include "texrow.h"
-#include "language.h"
+#include "paragraph.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 "paragraph_funcs.h"
+#include "outputparams.h"
+#include "texrow.h"
 
-#include "support/LAssert.h"
+#include <boost/next_prior.hpp>
 
 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;
 // Initialization of the counter for the paragraph id's,
 unsigned int Paragraph::Pimpl::paragraph_id = 0;
 
@@ -61,32 +69,21 @@ 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)
 {
-	text = par.pimpl_->text;
+	owner_->text_ = par.text_;
 	if (par.pimpl_->tracking()) {
 		changes_.reset(new Changes(*(par.pimpl_->changes_.get())));
 	}
@@ -103,7 +100,7 @@ void Paragraph::Pimpl::trackChanges(Change::Type type)
 	lyxerr[Debug::CHANGES] << "track changes for par "
 		<< id_ << " type " << type << endl;
 	changes_.reset(new Changes(type));
-	changes_->set(type, 0, size());
+	changes_->set(type, 0, size() + 1);
 }
 
 
@@ -113,14 +110,22 @@ void Paragraph::Pimpl::untrackChanges()
 }
 
 
-void Paragraph::Pimpl::cleanChanges()
+void Paragraph::Pimpl::cleanChanges(Paragraph::ChangeTracking ct)
 {
-	// if we're not tracking, we don't want to reset...
-	if (!tracking())
+	// if the paragraph was not tracked and we don't know the buffer's
+	// change tracking state, we do nothing
+	if ((ct == Paragraph::trackingUnknown) && !tracking())
 		return;
 
+	// untrack everything if we are in a buffer where ct is disabled
+	else if (ct == Paragraph::trackingOff) {
+		untrackChanges();
+		return;
+	}
+	
+	// in a buffer where ct is enabled, set everything to INSERTED
 	changes_.reset(new Changes(Change::INSERTED));
-	changes_->set(Change::INSERTED, 0, size());
+	changes_->set(Change::INSERTED, 0, size() + 1);
 }
 
 
@@ -142,7 +147,7 @@ bool Paragraph::Pimpl::isChangeEdited(pos_type start, pos_type end) const
 }
 
 
-void Paragraph::Pimpl::setChange(pos_type pos, Change::Type type)
+void Paragraph::Pimpl::setChangeType(pos_type pos, Change::Type type)
 {
 	if (!tracking())
 		return;
@@ -151,33 +156,37 @@ void Paragraph::Pimpl::setChange(pos_type pos, Change::Type type)
 }
 
 
-Change::Type Paragraph::Pimpl::lookupChange(pos_type pos) const
+void Paragraph::Pimpl::setChange(pos_type pos, Change change)
 {
 	if (!tracking())
-		return Change::UNCHANGED;
+		return;
 
-	return changes_->lookup(pos);
+	changes_->set(change, pos);
 }
 
 
-Change const Paragraph::Pimpl::lookupChangeFull(pos_type pos) const
+Change const Paragraph::Pimpl::lookupChange(pos_type pos) const
 {
 	if (!tracking())
 		return Change(Change::UNCHANGED);
 
-	return changes_->lookupFull(pos);
+	return changes_->lookup(pos);
 }
 
 
-void Paragraph::Pimpl::markErased()
+void Paragraph::Pimpl::markErased(bool erased)
 {
-	lyx::Assert(tracking());
+	BOOST_ASSERT(tracking());
 
-	// FIXME: we should actually remove INSERTED chars.
-	// difficult because owning insettexts/tabulars need
-	// to update themselves when rows etc. change
-	changes_->set(Change::DELETED, 0, size());
-	changes_->reset(Change::DELETED);
+	if (erased) {
+		erase(0, size());
+	} else {
+		for (pos_type i = 0; i < size(); ++i) {
+			changes_->set(Change::UNCHANGED, i);
+			if (owner_->isInset(i))
+				owner_->getInset(i)->markErased(false);
+		}
+	}
 }
 
 
@@ -191,11 +200,11 @@ void Paragraph::Pimpl::acceptChange(pos_type start, pos_type end)
 		return;
 	}
 
-	lyxerr << "acceptchange" << endl;
+	lyxerr[Debug::CHANGES] << "acceptchange" << endl;
 	pos_type i = start;
 
 	for (; i < end; ++i) {
-		switch (lookupChange(i)) {
+		switch (lookupChange(i).type) {
 			case Change::UNCHANGED:
 				break;
 
@@ -204,15 +213,19 @@ void Paragraph::Pimpl::acceptChange(pos_type start, pos_type end)
 				break;
 
 			case Change::DELETED:
-				eraseIntern(i);
-				changes_->erase(i);
-				--end;
-				--i;
+				// Suppress access to nonexistent
+				// "end-of-paragraph char":
+				if (i < size()) {
+					eraseIntern(i);
+					changes_->erase(i);
+					--end;
+					--i;
+				}
 				break;
 		}
 	}
 
-	lyxerr << "endacceptchange" << endl;
+	lyxerr[Debug::CHANGES] << "endacceptchange" << endl;
 	changes_->reset(Change::UNCHANGED);
 }
 
@@ -230,19 +243,24 @@ void Paragraph::Pimpl::rejectChange(pos_type start, pos_type end)
 	pos_type i = start;
 
 	for (; i < end; ++i) {
-		switch (lookupChange(i)) {
+		switch (lookupChange(i).type) {
 			case Change::UNCHANGED:
 				break;
 
 			case Change::INSERTED:
-				eraseIntern(i);
-				changes_->erase(i);
-				--end;
-				--i;
+				if (i < size()) {
+					eraseIntern(i);
+					changes_->erase(i);
+					--end;
+					--i;
+				}
 				break;
 
 			case Change::DELETED:
 				changes_->set(Change::UNCHANGED, i);
+				// No real char at position size():
+				if (i < size() && owner_->isInset(i))
+					owner_->getInset(i)->markErased(false);
 				break;
 		}
 	}
@@ -252,38 +270,13 @@ 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)
+void Paragraph::Pimpl::insertChar(pos_type pos, value_type c, Change change)
 {
-	lyx::Assert(pos <= size());
+	BOOST_ASSERT(pos <= size());
 
 	if (tracking()) {
 		changes_->record(change, pos);
@@ -293,12 +286,11 @@ 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_->setFont(pos, font);
+		owner_->text_.push_back(c);
 		return;
 	}
 
-	text.insert(text.begin() + pos, c);
+	owner_->text_.insert(owner_->text_.begin() + pos, c);
 
 	// Update the font table.
 	FontTable search_font(pos, LyXFont());
@@ -312,37 +304,31 @@ void Paragraph::Pimpl::insertChar(pos_type pos, value_type c,
 
 	// Update the insets
 	owner_->insetlist.increasePosAfterPos(pos);
-
-	owner_->setFont(pos, font);
 }
 
 
 void Paragraph::Pimpl::insertInset(pos_type pos,
-				   Inset * inset, LyXFont const & font, Change change)
+				   InsetBase * inset, 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);
+	insertChar(pos, META_INSET, change);
+	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);
 }
 
 
 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());
@@ -381,36 +367,36 @@ 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));
+		Change::Type changetype(changes_->lookup(pos).type);
 		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();
-			}
+			if (pos < size() && owner_->isInset(pos))
+				owner_->getInset(pos)->markErased(true);
 			return false;
 		}
 	}
 
-	eraseIntern(pos);
-	return true;
+	// Don't physically access nonexistent end-of-paragraph char
+	if (pos < size()) {
+		eraseIntern(pos);
+		return true;
+	}
+
+	return false;
 }
 
 
 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;
 }
@@ -430,8 +416,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
@@ -461,7 +446,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;
 	}
 
@@ -479,11 +464,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,
-					     bool moving_arg,
+					     OutputParams const & runparams,
 					     LyXFont & font,
 					     LyXFont & running_font,
 					     LyXFont & basefont,
@@ -500,8 +485,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
 			if (c != '\0')
 				os << c;
 		} else {
-			Inset const * inset = owner_->getInset(i);
-			inset->ascii(buf, os, 0);
+			owner_->getInset(i)->plaintext(buf, os, runparams);
 		}
 		return;
 	}
@@ -511,14 +495,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);
+		InsetBase * 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() == InsetBase::NEWLINE_CODE) {
 			// newlines are handled differently here than
 			// the default in simpleTeXSpecialChars().
 			if (!style.newline_allowed) {
@@ -534,7 +518,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
 				if (font.family() == LyXFont::TYPEWRITER_FAMILY)
 					os << '~';
 
-				if (moving_arg)
+				if (runparams.moving_arg)
 					os << "\\protect ";
 
 				os << "\\\\\n";
@@ -545,18 +529,26 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
 			break;
 		}
 
-		if (inset->isTextInset()) {
+		// output change tracking marks only if desired,
+		// if dvipost is installed,
+		// and with dvi/ps (other formats don't work)
+		LaTeXFeatures features(buf, bparams, runparams);
+		bool const output = bparams.output_changes
+			&& runparams.flavor == OutputParams::LATEX
+			&& features.isAvailable("dvipost");
+
+		if (inset->canTrackChanges()) {
 			column += Changes::latexMarkChange(os, running_change,
-				Change::UNCHANGED);
+				Change::UNCHANGED, output);
 			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() == InsetBase::GRAPHICS_CODE
+		     || inset->lyxCode() == InsetBase::MATH_CODE
+		     || inset->lyxCode() == InsetBase::URL_CODE)
 		    && running_font.isRightToLeft()) {
 			os << "\\L{";
 			close = true;
@@ -579,8 +571,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
 			running_font = basefont;
 		}
 
-		int tmp = inset->latex(buf, os, moving_arg,
-				       style.free_spacing);
+		int tmp = inset->latex(buf, os, runparams);
 
 		if (close)
 			os << '}';
@@ -592,7 +583,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;
@@ -612,9 +603,9 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
 			if ((bparams.inputenc == "latin1" ||
 			     bparams.inputenc == "latin9") ||
 			    (bparams.inputenc == "auto" &&
-			     (font.language()->encoding()->LatexName()
+			     (font.language()->encoding()->latexName()
 			      == "latin1" ||
-			      font.language()->encoding()->LatexName()
+			      font.language()->encoding()->latexName()
 			      == "latin9"))) {
 				os << "\\ensuremath{"
 				   << c
@@ -708,7 +699,7 @@ void Paragraph::Pimpl::simpleTeXSpecialChars(Buffer const * buf,
 			column += 17;
 			break;
 
-		case '*': case '[': case ']':
+		case '*': case '[':
 			// avoid being mistaken for optional arguments
 			os << '{' << c << '}';
 			column += 2;
@@ -766,8 +757,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");
 
@@ -820,13 +809,13 @@ void Paragraph::Pimpl::validate(LaTeXFeatures & features,
 		features.require("ParagraphLeftIndent");
 
 	// then the insets
-	InsetList::iterator icit = owner_->insetlist.begin();
-	InsetList::iterator iend = owner_->insetlist.end();
+	InsetList::const_iterator icit = owner_->insetlist.begin();
+	InsetList::const_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() == InsetBase::FOOT_CODE)
 				features.require("NeedLyXFootnoteCode");
 		}
 	}