X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.cpp;h=4f4d9ff5630454a6e255d9183443a39fdf8786b7;hb=1acedf11da79f509da706bc8d6d2f491c9676087;hp=81e295c84b62ba84908a02199b51cf8053add01f;hpb=e1a2703a797dbcf82788bcb44b093affa5dd7771;p=lyx.git

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 81e295c84b..4f4d9ff563 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -53,7 +53,6 @@
 #include "support/lstrings.h"
 #include "support/Messages.h"
 #include "support/textutils.h"
-#include "support/unicode.h"
 
 #include <sstream>
 #include <vector>
@@ -183,10 +182,6 @@ public:
 	///
 	ParagraphParameters params_;
 
-	/// position of the paragraph in the buffer. Only macros from
-	/// paragraphs strictly smaller are visible in this paragraph
-	unsigned int macrocontext_position_;
-	
 	/// for recording and looking up changes
 	Changes changes_;
 
@@ -232,7 +227,6 @@ Paragraph::Private::Private(Paragraph * owner)
 	: owner_(owner), inset_owner_(0), begin_of_body_(0)
 {
 	id_ = paragraph_id++;
-	macrocontext_position_ = 0;
 	text_.reserve(100);
 }
 
@@ -255,15 +249,13 @@ bool Paragraph::isChanged(pos_type start, pos_type end) const
 }
 
 
-bool Paragraph::isMergedOnEndOfParDeletion(bool trackChanges) const {
+bool Paragraph::isMergedOnEndOfParDeletion(bool trackChanges) const
+{
 	// keep the logic here in sync with the logic of eraseChars()
-
-	if (!trackChanges) {
+	if (!trackChanges)
 		return true;
-	}
-
-	Change change = d->changes_.lookup(size());
 
+	Change const change = d->changes_.lookup(size());
 	return change.type == Change::INSERTED && change.author == 0;
 }
 
@@ -297,22 +289,17 @@ void Paragraph::setChange(Change const & change)
 void Paragraph::setChange(pos_type pos, Change const & change)
 {
 	BOOST_ASSERT(pos >= 0 && pos <= size());
-
 	d->changes_.set(change, pos);
 
 	// see comment in setChange(Change const &) above
-
-	if (change.type != Change::DELETED &&
-	    pos < size() && isInset(pos)) {
+	if (change.type != Change::DELETED && pos < size() && isInset(pos))
 		getInset(pos)->setChange(change);
-	}
 }
 
 
 Change const & Paragraph::lookupChange(pos_type pos) const
 {
 	BOOST_ASSERT(pos >= 0 && pos <= size());
-
 	return d->changes_.lookup(pos);
 }
 
@@ -1004,6 +991,13 @@ void Paragraph::Private::validate(LaTeXFeatures & features,
 
 	// then the layouts
 	features.useLayout(layout.name());
+	if (!layout.requires().empty()) {
+		vector<string> req = layout.requires();
+		for (vector<string>::const_iterator it = req.begin();
+		     it != req.end(); ++it) {
+			features.require(*it);
+		}
+	}
 
 	// then the fonts
 	fontlist_.validate(features);
@@ -1163,11 +1157,9 @@ void Paragraph::write(Buffer const & buf, ostream & os,
 			}
 			// this check is to amend a bug. LyX sometimes
 			// inserts '\0' this could cause problems.
-			if (c != '\0') {
-				vector<char> tmp = ucs4_to_utf8(c);
-				tmp.push_back('\0');
-				os << &tmp[0];
-			} else
+			if (c != '\0')
+				os << to_utf8(docstring(1, c));
+			else
 				lyxerr << "ERROR (Paragraph::writeFile):"
 					" NULL char in structure." << endl;
 			++column;
@@ -1961,8 +1953,7 @@ bool Paragraph::latex(Buffer const & buf,
 		    runparams.encoding->package() == Encoding::none &&
 		    font.language()->encoding()->package() == Encoding::none) {
 			pair<bool, int> const enc_switch = switchEncoding(os, bparams,
-					runparams, *(runparams.encoding),
-					*(font.language()->encoding()));
+					runparams, *(font.language()->encoding()));
 			if (enc_switch.first) {
 				column += enc_switch.second;
 				runparams.encoding = font.language()->encoding();
@@ -2025,9 +2016,24 @@ bool Paragraph::latex(Buffer const & buf,
 					texrow, rp, running_font,
 					basefont, outerfont, open_font,
 					runningChange, *style, i, column);
-		else
-			d->latexSpecialChar(os, rp, running_font, runningChange,
-				*style, i, column);
+		else {
+			try {
+				d->latexSpecialChar(os, rp, running_font, runningChange,
+					*style, i, column);
+			} catch (EncodingException & e) {
+				if (runparams.dryrun) {
+					os << "<" << _("LyX Warning: ")
+					   << _("uncodable character") << " '";
+					os.put(c);
+					os << "'>";
+				} else {
+					// add location information and throw again.
+					e.par_id = id();
+					e.pos = i;
+					throw(e);
+				}
+			}
+		}
 
 		// Set the encoding to that returned from simpleTeXSpecialChars (see
 		// comment for encoding member in OutputParams.h)
@@ -2208,15 +2214,13 @@ void Paragraph::simpleDocBookOnePar(Buffer const & buf,
 
 bool Paragraph::isHfill(pos_type pos) const
 {
-	return isInset(pos)
-		&& getInset(pos)->lyxCode() == HFILL_CODE;
+	return isInset(pos) && getInset(pos)->lyxCode() == HFILL_CODE;
 }
 
 
 bool Paragraph::isNewline(pos_type pos) const
 {
-	return isInset(pos)
-		&& getInset(pos)->lyxCode() == NEWLINE_CODE;
+	return isInset(pos) && getInset(pos)->lyxCode() == NEWLINE_CODE;
 }
 
 
@@ -2234,10 +2238,8 @@ bool Paragraph::isLetter(pos_type pos) const
 {
 	if (isInset(pos))
 		return getInset(pos)->isLetter();
-	else {
-		char_type const c = d->text_[pos];
-		return isLetterChar(c) || isDigit(c);
-	}
+	char_type const c = d->text_[pos];
+	return isLetterChar(c) || isDigit(c);
 }
 
 
@@ -2350,8 +2352,7 @@ Inset * Paragraph::inInset() const
 
 InsetCode Paragraph::ownerCode() const
 {
-	return d->inset_owner_ ?
-		d->inset_owner_->lyxCode() : NO_CODE;
+	return d->inset_owner_ ? d->inset_owner_->lyxCode() : NO_CODE;
 }
 
 
@@ -2490,18 +2491,6 @@ int Paragraph::checkBiblio(bool track_changes)
 }
 
 
-unsigned int Paragraph::macrocontextPosition() const
-{
-	return d->macrocontext_position_;
-}
-
-
-void Paragraph::setMacrocontextPosition(unsigned int pos)
-{
-	d->macrocontext_position_ = pos;
-}
-
-
 void Paragraph::checkAuthors(AuthorList const & authorList)
 {
 	d->changes_.checkAuthors(authorList);