X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FParagraph.h;h=58b276226356b0464b7a857f0fdce83fef4c110e;hb=ac46456b288c35a05f716a9e3bbf022f60b2cd9f;hp=dbf7f2a51cda8a1d01261c460dbd49ce4a768ad5;hpb=b6f0c1de3d31b33452ad87a3a416731907e3c52e;p=lyx.git

diff --git a/src/Paragraph.h b/src/Paragraph.h
index dbf7f2a51c..58b2762263 100644
--- a/src/Paragraph.h
+++ b/src/Paragraph.h
@@ -50,9 +50,12 @@ class PainterInfo;
 class ParagraphParameters;
 class TocBackend;
 class WordLangTuple;
-class XHTMLStream;
+class XMLStream;
 class otexstream;
 
+/// Inset identifier (above 0x10ffff, for ucs-4)
+char_type const META_INSET = 0x200001;
+
 class FontSpan {
 public:
 	/// Invalid font span containing no character
@@ -153,10 +156,6 @@ public:
 	///
 	void addChangesToToc(DocIterator const & cdit, Buffer const & buf,
 	                     bool output_active, TocBackend & backend) const;
-	/// set the buffer flag if there are changes in the paragraph
-	void addChangesToBuffer(Buffer const & buf) const;
-	///
-	bool isChangeUpdateRequired() const;
 	///
 	Language const * getParLanguage(BufferParams const &) const;
 	///
@@ -204,26 +203,29 @@ public:
 	std::string getID(Buffer const & buf, OutputParams const & runparams) const;
 
 	/// Output the first word of a paragraph, return the position where it left.
-	pos_type firstWordDocBook(odocstream & os, OutputParams const & runparams) const;
+	pos_type firstWordDocBook(XMLStream & xs, OutputParams const & runparams) const;
 
 	/// Output the first word of a paragraph, return the position where it left.
-	pos_type firstWordLyXHTML(XHTMLStream & xs, OutputParams const & runparams) const;
+	pos_type firstWordLyXHTML(XMLStream & xs, OutputParams const & runparams) const;
 
-	/// Writes to stream the docbook representation
+	/// Writes to stream the DocBook representation
 	void simpleDocBookOnePar(Buffer const & buf,
-				 odocstream &,
-				 OutputParams const & runparams,
-				 Font const & outerfont,
-				 pos_type initial = 0) const;
+							 XMLStream &,
+							 OutputParams const & runparams,
+							 Font const & outerfont,
+							 bool start_paragraph = true,
+							 bool close_paragraph = true,
+							 pos_type initial = 0) const;
+
 	/// \return any material that has had to be deferred until after the
 	/// paragraph has closed.
 	docstring simpleLyXHTMLOnePar(Buffer const & buf,
-				 XHTMLStream & xs,
-				 OutputParams const & runparams,
-				 Font const & outerfont,
-				 bool start_paragraph = true,
-				 bool close_paragraph = true,
-				 pos_type initial = 0) const;
+								  XMLStream & xs,
+								  OutputParams const & runparams,
+								  Font const & outerfont,
+								  bool start_paragraph = true,
+								  bool close_paragraph = true,
+								  pos_type initial = 0) const;
 
 	///
 	bool hasSameLayout(Paragraph const & par) const;
@@ -266,8 +268,12 @@ public:
 	/// is there a change within the given range (does not
 	/// check contained paragraphs)
 	bool isChanged(pos_type start, pos_type end) const;
+	/// Are there insets containing changes in the range?
+	bool hasChangedInsets(pos_type start, pos_type end) const;
 	/// is there an unchanged char at the given pos ?
 	bool isChanged(pos_type pos) const;
+	/// is there a change in the paragraph ?
+	bool isChanged() const;
 
 	/// is there an insertion at the given pos ?
 	bool isInserted(pos_type pos) const;
@@ -279,6 +285,8 @@ public:
 	/// will the paragraph be physically merged with the next
 	/// one if the imaginary end-of-par character is logically deleted?
 	bool isMergedOnEndOfParDeletion(bool trackChanges) const;
+	/// Return Change form of paragraph break
+	Change parEndChange() const;
 
 	/// set change for the entire par
 	void setChange(Change const & change);
@@ -304,8 +312,6 @@ public:
 	///
 	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;
@@ -339,12 +345,8 @@ public:
 	///
 	Font const & getFirstFontSettings(BufferParams const &) const;
 
-	/** Get fully instantiated font. If pos == -1, use the layout
-	    font attached to this paragraph.
-	    If pos == -2, use the label font of the layout attached here.
-	    In all cases, the font is instantiated, i.e. does not have any
-	    attributes with values FONT_INHERIT, FONT_IGNORE or
-	    FONT_TOGGLE.
+	/** Get fully instantiated font, i.e., one that does not have any
+	    attributes with values FONT_INHERIT, FONT_IGNORE or FONT_TOGGLE.
 	*/
 	Font const getFont(BufferParams const &, pos_type pos,
 			      Font const & outerfont) const;
@@ -421,7 +423,7 @@ public:
 	bool isLineSeparator(pos_type pos) const;
 	/// True if the character/inset at this point is a word separator.
 	/// Note that digits in particular are not considered as word separator.
-	bool isWordSeparator(pos_type pos) const;
+	bool isWordSeparator(pos_type pos, bool const ignore_deleted = false) const;
 	/// True if the element at this point is a character that is not a letter.
 	bool isChar(pos_type pos) const;
 	/// True if the element at this point is a space
@@ -478,7 +480,7 @@ public:
 		bool del = true) const;
 
 	void locateWord(pos_type & from, pos_type & to,
-		word_location const loc) const;
+		word_location const loc, bool const ignore_deleted = false) const;
 	///
 	void updateWords();