X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph_pimpl.h;h=3b8e0b0fab6f61c497caa39f47298994a20b69a5;hb=52eb91c94fb70d58dceef430659c8781de2eccda;hp=dba3035174a565674f1ebb6bbac69050eb3ab6ad;hpb=62ef9250a2a81ce258ebb04e0431a21bd1824575;p=lyx.git

diff --git a/src/paragraph_pimpl.h b/src/paragraph_pimpl.h
index dba3035174..3b8e0b0fab 100644
--- a/src/paragraph_pimpl.h
+++ b/src/paragraph_pimpl.h
@@ -26,6 +26,7 @@
 
 namespace lyx {
 
+class Encoding;
 class LyXLayout;
 
 
@@ -40,7 +41,7 @@ public:
 	// Change tracking
 	//
 	/// look up change at given pos
-	Change const lookupChange(pos_type pos) const;
+	Change const & lookupChange(pos_type pos) const;
 	/// is there a change within the given range ?
 	bool isChanged(pos_type start, pos_type end) const;
 	/// will the paragraph be physically merged with the next
@@ -51,9 +52,9 @@ public:
 	/// set change at given pos
 	void setChange(pos_type pos, Change const & change);
 	/// accept changes within the given range
-	void acceptChanges(pos_type start, pos_type end);
+	void acceptChanges(BufferParams const & bparams, pos_type start, pos_type end);
 	/// reject changes within the given range
-	void rejectChanges(pos_type start, pos_type end);
+	void rejectChanges(BufferParams const & bparams, pos_type start, pos_type end);
 
 	///
 	value_type getChar(pos_type pos) const;
@@ -123,16 +124,23 @@ public:
 	///
 	FontList fontlist;
 
-	///
-	void simpleTeXBlanks(odocstream &, TexRow & texrow,
-			     pos_type const i,
+	/// Output the surrogate pair formed by \p c and \p next to \p os.
+	/// \return the number of characters written.
+	int latexSurrogatePair(odocstream & os, value_type c, value_type next,
+	                       Encoding const &);
+	/// Output a space in appropriate formatting (or a surrogate pair
+	/// if the next character is a combining character).
+	/// \return whether a surrogate pair was output.
+	bool simpleTeXBlanks(BufferParams const &, Encoding const &,
+	                     odocstream &, TexRow & texrow,
+			     pos_type & i,
 			     unsigned int & column,
 			     LyXFont const & font,
 			     LyXLayout const & style);
 	///
 	void simpleTeXSpecialChars(Buffer const &, BufferParams const &,
-				   odocstream &, TexRow & texrow,
-				   OutputParams const &,
+	                           Encoding const &, odocstream &,
+	                           TexRow & texrow, OutputParams const &,
 				   LyXFont & font, LyXFont & running_font,
 				   LyXFont & basefont,
 				   LyXFont const & outerfont,