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

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 9ab52ed01b..c4d3f97681 100644
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -19,8 +19,6 @@
 #include "FontEnums.h"
 #include "SpellChecker.h"
 
-#include "insets/InsetCode.h"
-
 #include "support/strfwd.h"
 #include "support/types.h"
 
@@ -77,12 +75,34 @@ public:
 	{
 		return first == s.first && last == s.last;
 	}
-	
-	inline bool inside(pos_type p) const
+
+	inline bool contains(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 (contains(f.first))
+			result.first = f.first;
+		else if (f.contains(first))
+			result.first = first;
+		else
+			return result;
+		if (contains(f.last))
+			result.last = f.last;
+		else if (f.contains(last))
+			result.last = last;
+		return result;
+	}
+	
 	inline bool empty() const
 	{
 		return first > last;
@@ -107,7 +127,8 @@ enum AsStringParameter
 	AS_STR_LABEL = 1, ///< Prefix with paragraph label.
 	AS_STR_INSETS = 2, ///< Go into insets.
 	AS_STR_NEWLINES = 4, ///< Get also newline characters.
-	AS_STR_SKIPDELETE = 8 ///< Skip deleted text in change tracking.
+	AS_STR_SKIPDELETE = 8, ///< Skip deleted text in change tracking.
+	AS_STR_PLAINTEXT = 16 ///< Don't export formatting when descending into insets.
 };
 
 
@@ -132,7 +153,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;
 	///
@@ -152,26 +174,25 @@ public:
 	///		asString(AS_STR_LABEL | AS_STR_INSETS)
 	///		asString(AS_STR_INSETS)
 	docstring asString(int options = AS_STR_NONE) const;
-	///
+
+	/// Convert the paragraph to a string.
+	/// \note If options includes AS_STR_PLAINTEXT, then runparams must be != 0
 	docstring asString(pos_type beg, pos_type end,
-		int options = AS_STR_NONE) const;
+			   int options = AS_STR_NONE,
+			   const OutputParams *runparams = 0) const;
 	///
-	void forToc(docstring &, size_t maxlen) const;
-
-	/// 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;
+	void forOutliner(docstring &, size_t maxlen) 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;
@@ -355,10 +376,6 @@ public:
 	///
 	void insertChar(pos_type pos, char_type c,
 			Font const &, Change const & change);
-	/// Insert \p inset at position \p pos with \p change traking status.
-	/// \return true if successful.
-	bool insertInset(pos_type pos, Inset * inset,
-			 Change const & change);
 	/// Insert \p inset at position \p pos with \p change traking status and
 	/// \p font.
 	/// \return true if successful.
@@ -387,6 +404,8 @@ public:
 	bool isInset(pos_type pos) const;
 	///
 	bool isNewline(pos_type pos) const;
+	///
+	bool isEnvSeparator(pos_type pos) const;
 	/// return true if the char is a word separator
 	bool isSeparator(pos_type pos) const;
 	///
@@ -398,6 +417,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)
@@ -409,12 +431,12 @@ public:
 	/// return true if we allow this par to stay empty
 	bool allowEmpty() const;
 	///
-	char_type transformChar(char_type c, pos_type pos) const;
-	///
 	ParagraphParameters & params();
 	///
 	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 +444,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.