Amend 207eaeee9071cb

[lyx.git] / src / TextMetrics.h

diff --git a/src/TextMetrics.h b/src/TextMetrics.h
index 3ff11617da068b0ef732fd893fb2e7615c93fadd..d5606b610a396661046fd56f1a89d5d71acf895f 100644 (file)
--- a/src/TextMetrics.h
+++ b/src/TextMetrics.h
@@ -46,6 +46,8 @@ public:
        ///
        bool contains(pit_type pit) const;
        ///
+       void forget(pit_type pit);
+       ///
        std::pair<pit_type, ParagraphMetrics const *> first() const;
        ///
        std::pair<pit_type, ParagraphMetrics const *> last() const;
@@ -71,6 +73,10 @@ public:
        ///
        void newParMetricsUp();
 
+       /// Update metrics up to \c bv_height. Only usable for main text (for now).
+       void updateMetrics(pit_type const anchor_pit, int const anchor_ypos,
+                       int const bv_height);
+
        /// compute text metrics.
        bool metrics(MetricsInfo const & mi, Dimension & dim, int min_width = 0);
 
@@ -79,13 +85,19 @@ public:
        /// cache. Related to BufferView::updatePosCache.
        void updatePosCache(pit_type pit) const;
 
-       /// Gets the fully instantiated font at a given position in a paragraph
+       /// Gets the fully instantiated font at a given position in a paragraph.
        /// Basically the same routine as Paragraph::getFont() in Paragraph.cpp.
        /// The difference is that this one is used for displaying, and thus we
        /// are allowed to make cosmetic improvements. For instance make footnotes
        /// smaller. (Asger)
        Font displayFont(pit_type pit, pos_type pos) const;
 
+       /// Gets the fully instantiated label font of a paragraph.
+       /// Basically the same routine as displayFont, but specialized for
+       /// a layout font.
+       Font labelDisplayFont(pit_type pit) const;
+
+
        /// There are currently two font mechanisms in LyX:
        /// 1. The font attributes in a lyxtext, and
        /// 2. The inset-specific font properties, defined in an inset's
@@ -148,18 +160,12 @@ private:
        /// the minimum space a manual label needs on the screen in pixels
        int labelFill(Row const & row) const;
 
-       /// FIXME??
-       int labelEnd(pit_type const pit) const;
-
+       // Turn paragraph oh index \c pit into a single row
        Row tokenizeParagraph(pit_type pit) const;
 
+       // Break the row produced by tokenizeParagraph() into a list of rows.
        RowList breakParagraph(Row const & row) const;
 
-       /// sets row.end to the pos value *after* which a row should break.
-       /// for example, the pos after which isNewLine(pos) == true
-       /// \return true when another row is required (after a newline)
-       bool breakRow(Row & row, int right_margin) const;
-
        // Expands the alignment of row \param row in paragraph \param par
        LyXAlignment getAlign(Paragraph const & par, Row const & row) const;
        /// Aligns properly the row contents (computes spaces and fills)