UNIT_NONE
};
- //@Man: constructors
- //@{
///
LyXLength() : val(0), uni(LyXLength::PT) {}
+ ///
LyXLength(float v, LyXLength::UNIT u) : val(v), uni(u) {}
/** "data" must be a decimal number, followed by a unit. */
explicit
LyXLength(string const & data);
- //@}
- //@Man: selectors
- //@{
///
float value() const { return val; };
///
LyXLength::UNIT unit() const { return uni; };
- //@}
-
- ///
- bool operator== (LyXLength const &) const;
/// conversion
virtual string asString() const;
LyXLength::UNIT uni;
};
+///
+inline
+bool operator==(LyXLength const & l1, LyXLength const & l2)
+{
+ return l1.value() == l2.value()
+ && l1.unit() == l2.unit();
+}
+
+///
extern LyXLength::UNIT unitFromString (string const & data);
+///
extern bool isValidLength(string const & data, LyXLength * result);
/// LyXGlueLength class
class LyXGlueLength : public LyXLength {
public:
- //@Man: constructors
- //@{
///
LyXGlueLength(float v,
LyXLength::UNIT u,
4cm plus 10pt minus 10pt */
explicit
LyXGlueLength(string const & data);
- //@}
- //@Man: selectors
- //@{
///
float plusValue() const { return plus_val; };
///
float minusValue() const { return minus_val; };
///
LyXLength::UNIT minusUnit() const { return minus_uni; };
- //@}
-
- ///
- bool operator == (LyXGlueLength const &) const;
/// conversion
virtual string asString() const;
LyXLength::UNIT plus_uni, minus_uni;
};
+///
+inline
+bool operator==(LyXGlueLength const & l1, LyXGlueLength const & l2)
+{
+ return l1.value() == l2.value()
+ && l1.unit() == l2.unit()
+ && l1.plusValue() == l2.plusValue()
+ && l1.plusUnit() == l2.plusUnit()
+ && l1.minusValue() == l2.minusValue()
+ && l1.minusUnit() == l2.minusUnit();
+}
+
+
+///
extern bool isValidGlueLength(string const & data, LyXGlueLength * result);
/// VSpace class
class VSpace {
public:
///
- enum vspace_kind { NONE, DEFSKIP,
- SMALLSKIP, MEDSKIP, BIGSKIP,
- VFILL, LENGTH };
+ enum vspace_kind {
+ ///
+ NONE,
+ ///
+ DEFSKIP,
+ ///
+ SMALLSKIP,
+ ///
+ MEDSKIP,
+ ///
+ BIGSKIP,
+ ///
+ VFILL,
+ ///
+ LENGTH
+ };
/// constructors
VSpace() :
kin (NONE),
len (l),
kp (false) {}
+ ///
+ explicit
VSpace(float v, LyXLength::UNIT u) :
kin (LENGTH),
len (v, u),