X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fparagraph.h;h=6a1539243899fbacaa879485512afe351c020ce5;hb=e7f4618bcce770369cf46335c2c7f0164b4b8857;hp=fdafeb2e6f479a8615c828ca196406e287e7ad83;hpb=bc7d9340ae54b87622ffc2b01d68552b72ca8082;p=lyx.git

diff --git a/src/paragraph.h b/src/paragraph.h
index fdafeb2e6f..6a15392438 100644
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -100,10 +100,6 @@ public:
 	///
 	bool isMultiLingual(BufferParams const &) const;
 
-	///
-	docstring const asString(Buffer const &,
-				   OutputParams const & runparams,
-				   bool label) const;
 	///
 	docstring const asString(Buffer const &, bool label) const;
 	///
@@ -111,12 +107,6 @@ public:
 				   pos_type beg,
 				   pos_type end,
 				   bool label) const;
-	///
-	docstring const asString(Buffer const &,
-				   OutputParams const & runparams,
-				   pos_type beg,
-				   pos_type end,
-				   bool label) const;
 
 	///
 	void write(Buffer const &, std::ostream &, BufferParams const &,
@@ -178,8 +168,6 @@ public:
 	pos_type size() const { return text_.size(); }
 	///
 	bool empty() const { return text_.empty(); }
-	///
-	void clearContents();
 
 	///
 	LyXLayout_ptr const & layout() const;
@@ -221,10 +209,10 @@ public:
 	void setChange(pos_type pos, Change const & change);
 
 	/// accept changes within the given range
-	void acceptChanges(pos_type start, pos_type end);
+	void acceptChanges(BufferParams const & bparams, pos_type start, pos_type end);
 
 	/// reject changes within the given range
-	void rejectChanges(pos_type start, pos_type end);
+	void rejectChanges(BufferParams const & bparams, pos_type start, pos_type end);
 
 	/// Paragraphs can contain "manual labels", for example, Description
 	/// environment. The text for this user-editable label is stored in
@@ -240,8 +228,14 @@ public:
 
 	/// the next two functions are for the manual labels
 	docstring const getLabelWidthString() const;
-	///
+	/// Set label width string.
 	void setLabelWidthString(docstring const & s);
+	/// translate \p label to the paragraph language if possible.
+	docstring const translateIfPossible(docstring const & label,
+		BufferParams const & bparams) const;
+	/// Expand the counters for the labelstring of \c layout
+	docstring expandLabel(LyXLayout_ptr const &, BufferParams const &,
+		bool process_appendix = true) const;
 	/// Actual paragraph alignment used
 	char getAlign() const;
 	/// The nesting depth of a paragraph
@@ -345,8 +339,9 @@ public:
 	/// returns -1 if inset not found
 	int getPositionOfInset(InsetBase const * inset) const;
 
-	/// Returns the number of line breaks and white-space stripped at the start
-	int stripLeadingSpaces();
+	/// returns true if at least one line break or line separator has been deleted 
+	/// at the beginning of the paragraph (either physically or logically)
+	bool stripLeadingSpaces(bool trackChanges);
 
 	/// return true if we allow multiple spaces
 	bool isFreeSpacing() const;