Remove hardcoded values

[lyx.git] / src / Row.h

diff --git a/src/Row.h b/src/Row.h
index f0c5b72ca1125aaef0c6ee784c7747ac0866fb4c..7ae9c11b1e3850adc16ccaddf129edd7b382e5cd 100644 (file)
--- a/src/Row.h
+++ b/src/Row.h
@@ -61,11 +61,22 @@ public:
                        : type(t), pos(p), endpos(p + 1), inset(0),
                          extra(0), font(f), change(ch), final(false) {}
 
-               // Return total width of element, including separator overhead
-               double full_width() const { return dim.wid + extra * countSeparators(); }
                // Return the number of separator in the element (only STRING type)
                int countSeparators() const;
 
+               // Return total width of element, including separator overhead
+               // FIXME: Cache this value or the number of expanders?
+               double full_width() const { return dim.wid + extra * countExpanders(); }
+               // Return the number of expanding characters in the element (only STRING
+               // type).
+               int countExpanders() const;
+               // Return the amount of expansion: the number of expanding characters
+               // that get stretched during justification, times the em of the font
+               // (only STRING type).
+               int expansionAmount() const;
+               // set extra proportionally to the font em value.
+               void setExtra(double extra_per_em);
+
                /** Return position in pixels (from the left) of position
                 * \param i in the row element.
                 */
@@ -144,6 +155,10 @@ public:
        void setSelectionAndMargins(DocIterator const & beg,
                DocIterator const & end) const;
 
+       ///
+       void pit(pit_type p) { pit_ = p; }
+       ///
+       pit_type pit() const { return pit_; }
        ///
        void pos(pos_type p) { pos_ = p; }
        ///
@@ -177,8 +192,10 @@ public:
 
        // Return the number of separators in the row
        int countSeparators() const;
-       // Set the extra spacing for every separator in STRING elements
-       void setSeparatorExtraWidth(double w);
+       // Set the extra spacing for every expanding character in STRING-type
+       // elements.  \param w is the total amount of extra width for the row to be
+       // distributed among expanders.  \return false if the justification fails.
+       bool setExtraWidth(int w);
 
        ///
        void add(pos_type pos, Inset const * ins, Dimension const & dim,
@@ -286,6 +303,8 @@ private:
        mutable bool changed_;
        /// CRC of row contents.
        mutable size_type crc_;
+       /// Index of the paragraph that contains this row
+       pit_type pit_;
        /// first pos covered by this row
        pos_type pos_;
        /// one behind last pos covered by this row