Let tm be a reference here as elsewhere

[lyx.git] / src / TextMetrics.h

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index ae99490955f948a180dcbd24c6a74ed0dd98cade..a4a1e23740871b933367a3efaf3cecf1f0f9d26c 100644 (file)
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -55,7 +55,8 @@ public:
 
 
        /// compute text metrics.
-       bool metrics(MetricsInfo & mi, Dimension & dim, int min_width = 0);
+       bool metrics(MetricsInfo & mi, Dimension & dim, int min_width = 0,
+                    bool const expand_on_multipars = true);
 
        ///
        void newParMetricsDown();
@@ -96,7 +97,7 @@ public:
        /// Rebreaks the given paragraph.
        /// \retval true if a full screen redraw is needed.
        /// \retval false if a single paragraph redraw is enough.
-       bool redoParagraph(pit_type const pit);
+       bool redoParagraph(pit_type const pit, bool align_rows = true);
        /// Clear cache of paragraph metrics
        void clear() { par_metrics_.clear(); }
        /// Is cache of paragraph metrics empty ?
@@ -144,11 +145,10 @@ private:
        /// \return true when another row is required (after a newline)
        bool breakRow(Row & row, int right_margin) const;
 
-       // Expand the alignment of row \param row in paragraph \param par
+       // Expands the alignment of row \param row in paragraph \param par
        LyXAlignment getAlign(Paragraph const & par, Row const & row) const;
-       /** this calculates the specified parameters. needed when setting
-        * the cursor and when creating a visible row */
-       void computeRowMetrics(Row & row, int width) const;
+       /// Aligns properly the row contents (computes spaces and fills)
+       void setRowAlignment(Row & row, int width) const;
 
        /// Set the height of the row (without space above/below paragraph)
        void setRowHeight(Row & row) const;
@@ -158,7 +158,7 @@ private:
        int parBottomSpacing(pit_type pit) const;
 
        // Helper function for the other checkInsetHit method.
-       InsetList::InsetTable * checkInsetHit(pit_type pit, int x, int y);
+       InsetList::Element * checkInsetHit(pit_type pit, int x, int y);
 
 
 // Temporary public: