Account for old versions of Pygments

[lyx.git] / src / TextMetrics.h

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index 507213a5ab98f4679155e139b7800a041191a9a7..0518231a8da9212f1bed27274bd9888278f36d9d 100644 (file)
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -94,6 +94,8 @@ public:
        bool redoParagraph(pit_type const pit);
        /// Clear cache of paragraph metrics
        void clear() { par_metrics_.clear(); }
+       /// Is cache of paragraph metrics empty ?
+       bool empty() const { return par_metrics_.empty(); }
 
        ///
        int ascent() const { return dim_.asc; }
@@ -104,9 +106,6 @@ public:
        /// current text height.
        int height() const { return dim_.height(); }
 
-       ///
-       int maxWidth() const { return max_width_; }
-
        ///
        int rightMargin(ParagraphMetrics const & pm) const;
        int rightMargin(pit_type const pit) const;
@@ -116,31 +115,33 @@ public:
 
        void drawParagraph(PainterInfo & pi, pit_type pit, int x, int y) const;
 
-       /// Returns the height of the row (width member is set to 0).
-       /// If \c topBottomSpace is true, extra space is added for the
-       /// top and bottom row.
-       void setRowHeight(Row & row, pit_type const pit,
-                         bool topBottomSpace = true) const;
-
 private:
        ///
        ParagraphMetrics & parMetrics(pit_type, bool redo_paragraph);
 
        /// the minimum space a manual label needs on the screen in pixels
-       int labelFill(pit_type const pit, Row const & row) const;
+       int labelFill(Row const & row) const;
 
        /// FIXME??
        int labelEnd(pit_type const pit) const;
 
        /// sets row.end to the pos value *after* which a row should break.
        /// for example, the pos after which isNewLine(pos) == true
-       void breakRow(Row & row, int right_margin, pit_type const pit) const;
+       /// \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
        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(pit_type pit, Row & row, int width) const;
+       void computeRowMetrics(Row & row, int width) const;
+
+       /// Set the height of the row (without space above/below paragraph)
+       void setRowHeight(Row & row) const;
+       // Compute the space on top of a paragraph
+       int parTopSpacing(pit_type pit) const;
+       // Compute the space below a a paragraph
+       int parBottomSpacing(pit_type pit) const;
 
        // Helper function for the other checkInsetHit method.
        InsetList::InsetTable * checkInsetHit(pit_type pit, int x, int y);
@@ -180,7 +181,9 @@ public:
            that is completely visible
        \param up whether we are going up or down (only used when
            assert_in_view is true
-       \retval inset is non-null if the cursor is positionned inside
+       \retval inset is null if the cursor is positioned over normal
+              text in the current Text object. Otherwise it is the inset
+              that the cursor points to, like for Inset::editXY.
        */
        /// FIXME: cleanup to use BufferView::getCoveringInset() and
        /// setCursorFromCoordinates() instead of checkInsetHit().
@@ -191,12 +194,6 @@ public:
        /// x,y are screen coordinates
        void setCursorFromCoordinates(Cursor & cur, int x, int y);
 
-       /// Helper function: find row element that contains pos, and
-       /// compute x offset.
-       Row::const_iterator const
-       findRowElement(Row const & row, pos_type const pos,
-                   bool const boundary, double & x) const;
-
        ///
        int cursorX(CursorSlice const & cursor, bool boundary) const;
        ///
@@ -210,9 +207,9 @@ public:
        void deleteLineForward(Cursor & cur);
 
        /// is this row the last in the text?
-       bool isLastRow(pit_type pit, Row const & row) const;
+       bool isLastRow(Row const & row) const;
        /// is this row the first in the text?
-       bool isFirstRow(pit_type pit, Row const & row) const;
+       bool isFirstRow(Row const & row) const;
 
        /// Returns an inset if inset was hit, or 0 if not.
        /// \warning This method is not recursive! It will return the