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

diff --git a/src/Paragraph.h b/src/Paragraph.h
index 485e239b66..641cf27a59 100644
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -17,13 +17,15 @@
 #define PARAGRAPH_H
 
 #include "FontEnums.h"
-#include "Layout.h"
+#include "SpellChecker.h"
 
 #include "insets/InsetCode.h"
 
 #include "support/strfwd.h"
 #include "support/types.h"
 
+#include <set>
+
 namespace lyx {
 
 class AuthorList;
@@ -42,6 +44,7 @@ class LaTeXFeatures;
 class Inset_code;
 class InsetList;
 class Language;
+class Layout;
 class Font;
 class Font_size;
 class MetricsInfo;
@@ -52,6 +55,7 @@ class TexRow;
 class Toc;
 class WordLangTuple;
 class XHTMLStream;
+class otexstream;
 
 class FontSpan {
 public:
@@ -63,6 +67,48 @@ public:
 public:
 	/// Range including first and last.
 	pos_type first, last;
+
+	inline bool operator<(FontSpan const & s) const
+	{
+		return first < s.first;
+	}
+	
+	inline bool operator==(FontSpan const & s) const
+	{
+		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;
+	}
 };
 
 ///
@@ -82,7 +128,8 @@ enum AsStringParameter
 	AS_STR_NONE = 0, ///< No option, only printable characters.
 	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_NEWLINES = 4, ///< Get also newline characters.
+	AS_STR_SKIPDELETE = 8 ///< Skip deleted text in change tracking.
 };
 
 
@@ -92,7 +139,7 @@ class Paragraph
 public:
 	///
 	Paragraph();
-	///
+	/// Copy constructor.
 	Paragraph(Paragraph const &);
 	/// Partial copy constructor.
 	/// Copy the Paragraph contents from \p beg to \p end (without end).
@@ -103,9 +150,12 @@ public:
 	~Paragraph();
 	///
 	int id() const;
+	///
+	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;
 	///
@@ -115,6 +165,8 @@ public:
 			    Language const * from, Language const * to);
 	///
 	bool isMultiLingual(BufferParams const &) const;
+	///
+	void getLanguages(std::set<Language const *> &) const;
 
 	/// Convert the paragraph to a string.
 	/// \param AsStringParameter options. This can contain any combination of
@@ -126,21 +178,24 @@ public:
 	///
 	docstring asString(pos_type beg, pos_type end,
 		int options = AS_STR_NONE) 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;
+	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;
 
-	///
-	bool latex(BufferParams const &, Font const & outerfont, odocstream &,
-		   TexRow & texrow, OutputParams const &,
-		   int start_pos = 0, int end_pos = -1) const;
+	/// \param force means: output even if layout.inpreamble is true.
+	void latex(BufferParams const &, Font const & outerfont, otexstream &,
+		OutputParams const &, int start_pos = 0, int end_pos = -1,
+		bool force = false) const;
 
 	/// Can we drop the standard paragraph wrapper?
 	bool emptyTag() const;
@@ -166,7 +221,6 @@ public:
 				 XHTMLStream & xs,
 				 OutputParams const & runparams,
 				 Font const & outerfont,
-         bool fortoc = false,
 				 pos_type initial = 0) const;
 
 	///
@@ -184,6 +238,8 @@ public:
 	///
 	bool usePlainLayout() const;
 	///
+	bool isPassThru() const;
+	///
 	pos_type size() const;
 	///
 	bool empty() const;
@@ -241,16 +297,16 @@ public:
 	/// recompute this value
 	void setBeginOfBody();
 
+	///
+	docstring expandLabel(Layout const &, BufferParams const &) const;
+	///
+	docstring expandDocBookLabel(Layout const &, BufferParams const &) const;
 	///
 	docstring const & labelString() const;
-
 	/// the next two functions are for the manual labels
 	docstring const getLabelWidthString() const;
 	/// Set label width string.
 	void setLabelWidthString(docstring const & s);
-	/// Expand the counters for the labelstring of \c layout
-	docstring expandLabel(Layout const &, BufferParams const &,
-		bool process_appendix = true) const;
 	/// Actual paragraph alignment used
 	char getAlign() const;
 	/// The nesting depth of a paragraph
@@ -366,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)
@@ -383,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
@@ -390,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.
@@ -401,9 +462,10 @@ public:
 		pos_type & right, TextCase action);
 
 	/// find \param str string inside Paragraph.
-	/// \return true if the specified string is at the specified position
+	/// \return non-zero if the specified string is at the specified
+	///	position; returned value is the actual match length in positions
 	/// \param del specifies whether deleted strings in ct mode will be considered
-	bool find(
+	int find(
 		docstring const & str, ///< string to search
 		bool cs, ///<
 		bool mw, ///<
@@ -417,18 +479,40 @@ public:
 
 	/// Spellcheck word at position \p from and fill in found misspelled word
 	/// and \p suggestions if \p do_suggestion is true.
-	/// \return true if pointed word is misspelled.
-	bool spellCheck(pos_type & from, pos_type & to, WordLangTuple & wl,
-		docstring_list & suggestions, bool do_suggestion =  true) const;
+	/// \return result from spell checker, SpellChecker::UNKNOWN_WORD when misspelled.
+	SpellChecker::Result spellCheck(pos_type & from, pos_type & to, WordLangTuple & wl,
+		docstring_list & suggestions, bool do_suggestion =  true,
+		bool check_learned = false) const;
+
+	/// Spell checker status at position \p pos.
+	/// If \p check_boundary is true the status of position immediately
+	/// before \p pos is tested too if it is at word boundary.
+	/// \return true if one of the tested positions is misspelled.
+	bool isMisspelled(pos_type pos, bool check_boundary = false) const;
+
+	/// \return true if both positions are inside the same
+	/// spell range - i.e. the same word.
+	/// use it for positions inside misspelled range only.
+	bool isSameSpellRange(pos_type pos1, pos_type pos2) const;
+
+	/// spell check of whole paragraph
+	/// remember results until call of requestSpellCheck()
+	void spellCheck() const;
+
+	/// query state of spell checker results
+	bool needsSpellCheck() const;
+	/// mark position of text manipulation to inform the spell checker
+	/// default value -1 marks the whole paragraph to be checked (again)
+	void requestSpellCheck(pos_type pos = -1);
 
-	/// Spellcheck word at position \p pos.
-	/// \return true if pointed word is misspelled.
-	bool isMisspelled(pos_type pos) const;
 	/// an automatically generated identifying label for this paragraph.
 	/// presently used only in the XHTML output routines.
 	std::string magicLabel() const;
 
 private:
+	/// Expand the counters for the labelstring of \c layout
+	docstring expandParagraphLabel(Layout const &, BufferParams const &,
+		bool process_appendix) const;
 	///
 	void deregisterWords();
 	///