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

diff --git a/src/paragraph.h b/src/paragraph.h
index c12aaac66c..6a15392438 100644
--- a/src/paragraph.h
+++ b/src/paragraph.h
@@ -57,53 +57,11 @@ public:
 	pos_type first, last;
 };
 
-/// Helper class for Paragraph Metrics.
-/// \todo FIXME: this class deserves its own .[Ch] files.
-/// Then, the storage of such object should be done in \c BufferView 
-/// (most probably in the \c CoordCache class along \c Point objects).
-class ParagraphMetrics  {
-public:
-	///
-	Row & getRow(pos_type pos, bool boundary);
-	///
-	Row const & getRow(pos_type pos, bool boundary) const;
-	///
-	size_t pos2row(pos_type pos) const;
-
-	/// LyXText::redoParagraph updates this
-	Dimension & dim() { return dim_; }
-	/// total height of paragraph
-	unsigned int height() const { return dim_.height(); }
-	/// total width of paragraph, may differ from workwidth
-	unsigned int width() const { return dim_.width(); }
-	/// ascend of paragraph above baseline
-	unsigned int ascent() const { return dim_.ascent(); }
-	/// descend of paragraph below baseline
-	unsigned int descent() const { return dim_.descent(); }
-	/// LyXText updates the rows using this access point
-	RowList & rows() { return rows_; }
-	/// The painter and others use this
-	RowList const & rows() const { return rows_; }
-	///
-	RowSignature & rowSignature() const { return rowSignature_; }
-
-	/// dump some information to lyxerr
-	void dump() const;
-
-private:
-	///
-	mutable RowList rows_;
-	///
-	mutable RowSignature rowSignature_;
-	/// cached dimensions of paragraph
-	Dimension dim_;
-};
-
 
 /// A Paragraph holds all text, attributes and insets in a text paragraph
 /// \todo FIXME: any reference to ParagraphMetrics (including inheritance)
 /// should go in order to complete the Model/View separation of this class.
-class Paragraph: public ParagraphMetrics  {
+class Paragraph  {
 public:
 	///
 	enum {
@@ -142,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;
 	///
@@ -153,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 &,
@@ -220,8 +168,6 @@ public:
 	pos_type size() const { return text_.size(); }
 	///
 	bool empty() const { return text_.empty(); }
-	///
-	void clearContents();
 
 	///
 	LyXLayout_ptr const & layout() const;
@@ -235,7 +181,7 @@ public:
 	InsetBibitem * bibitem() const;  // ale970302
 
 	/// look up change at given pos
-	Change const lookupChange(pos_type pos) const;
+	Change const & lookupChange(pos_type pos) const;
 
 	/// is there a change within the given range ?
 	bool isChanged(pos_type start, pos_type end) const;
@@ -263,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
@@ -282,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
@@ -387,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;
@@ -404,6 +357,10 @@ public:
 	///
 	bool hfillExpansion(Row const & row, pos_type pos) const;
 
+	/// Check if we are in a Biblio environment.
+	/// \retval true if the cursor needs to be moved right.
+	bool checkBiblio(bool track_changes);
+
 public:
 	///
 	InsetList insetlist;