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

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 9ab52ed01b..641cf27a59 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;
@@ -132,7 +154,8 @@ public:
 	void setId(int id);
 
 	///
-	void addChangesToToc(DocIterator const & cdit, Buffer const & buf) const;
+	void addChangesToToc(DocIterator const & cdit, Buffer const & buf,
+	        bool output_active) const;
 	///
 	Language const * getParLanguage(BufferParams const &) const;
 	///
@@ -160,18 +183,19 @@ public:
 
 	/// Extract only the explicitly visible text (without any formatting),
 	/// descending into insets
-	docstring stringify(pos_type beg, pos_type end, int options, OutputParams & runparams) const;
+	docstring stringify(pos_type beg, pos_type end, int options,
+		OutputParams const & runparams) const;
 
 	///
 	void write(std::ostream &, BufferParams const &,
-		   depth_type & depth) const;
+		depth_type & depth) const;
 	///
 	void validate(LaTeXFeatures &) const;
 
 	/// \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 +422,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)
@@ -415,6 +442,8 @@ public:
 	///
 	ParagraphParameters const & params() const;
 
+	/// Check whether a call to fixBiblio is needed.
+	bool brokenBiblio() const;
 	/// Check if we are in a Biblio environment and insert or
 	/// delete InsetBibitems as necessary.
 	/// \retval int 1, if we had to add an inset, in which case
@@ -422,7 +451,7 @@ public:
 	/// an inset, in which case pos is the position from which the inset
 	/// was deleted, and the cursor will need to be moved back one if it
 	/// was previously past that position. Return 0 otherwise.
-	int checkBiblio(Buffer const & buffer);
+	int fixBiblio(Buffer const & buffer);
 
 	/// For each author, set 'used' to true if there is a change
 	/// by this author in the paragraph.