X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.h;h=f5d6a23b26f9b18f20f47542ab3a6c2cdf870c62;hb=837869452ad8d917615aa4bca77402dc49ba094e;hp=9ab52ed01b0f0f8b8b77fd47483224c69d8b31ed;hpb=5eed97b56b9a90a493e57061b8cf75d49f8d5d33;p=lyx.git

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 9ab52ed01b..f5d6a23b26 100644
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -77,12 +77,34 @@ public:
 	{
 		return first == s.first && last == s.last;
 	}
-	
+
 	inline bool inside(pos_type p) const
 	{
 		return first <= p && p <= last;
 	}
 
+	inline size_t size() const
+	{
+		return empty() ? 0 : last - first;
+	}
+	
+
+	inline FontSpan intersect(FontSpan const & f) const
+	{
+		FontSpan result = FontSpan();
+		if (inside(f.first))
+			result.first = f.first;
+		else if (f.inside(first))
+			result.first = first;
+		else
+			return result;
+		if (inside(f.last))
+			result.last = f.last;
+		else if (f.inside(last))
+			result.last = last;
+		return result;
+	}
+	
 	inline bool empty() const
 	{
 		return first > last;
@@ -170,8 +192,8 @@ public:
 
 	/// \param force means: output even if layout.inpreamble is true.
 	void latex(BufferParams const &, Font const & outerfont, otexstream &,
-		   TexRow & texrow, OutputParams const &,
-		   int start_pos = 0, int end_pos = -1, bool force = false) const;
+		   OutputParams const &, int start_pos = 0, int end_pos = -1,
+		   bool force = false) const;
 
 	/// Can we drop the standard paragraph wrapper?
 	bool emptyTag() const;
@@ -398,6 +420,9 @@ public:
 	bool isChar(pos_type pos) const;
 	/// True if the element at this point is a space
 	bool isSpace(pos_type pos) const;
+	/// True if the element at this point is a hard hyphen or a apostrophe
+	/// If it is enclosed by spaces return false
+	bool isHardHyphenOrApostrophe(pos_type pos) const;
 
 	/// returns true if at least one line break or line separator has been deleted
 	/// at the beginning of the paragraph (either physically or logically)