write \mathrm{x}\mathrm{y} as \mathrm{xy} again

[lyx.git] / src / vspace.h

diff --git a/src/vspace.h b/src/vspace.h
index 9c02974e4b6a3ef0e89ee7f31fdee6c88915e262..30aa427ab43ef66f5a5ac9d0e1860f83afa3c786 100644 (file)
--- a/src/vspace.h
+++ b/src/vspace.h
@@ -5,7 +5,7 @@
  *           LyX, The Document Processor
  *      
  *           Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The LyX Team.
+ *           Copyright 1995-2001 The LyX Team.
  *
  * ====================================================== */
 
@@ -50,6 +50,13 @@ public:
                EM,
                /// Math unit (18mu = 1em) for positioning in math mode
                MU,
+               /// Percent of columnwidth both "%" or "%c"
+               PW,
+               PE,
+               /// Percent of pagewidth
+               PP,
+               /// Percent of linewidth
+               PL,
                /// no unit
                UNIT_NONE
        };
@@ -71,9 +78,7 @@ public:
        /// conversion
        virtual string const asString() const;
        ///
-       virtual string const asLatexString() const {
-               return this->asString();
-       }
+       virtual string const asLatexString() const;
 
        /** If "data" is valid, the length represented by it is
          stored into "result", if that is not 0. */
@@ -99,6 +104,8 @@ bool operator==(LyXLength const & l1, LyXLength const & l2)
 extern LyXLength::UNIT unitFromString (string const & data);
 ///
 extern bool isValidLength(string const & data, LyXLength * result);
+///
+extern const char * stringFromUnit(int unit);
 
 /// LyXGlueLength class
 class LyXGlueLength : public LyXLength {
@@ -173,7 +180,7 @@ extern bool isValidGlueLength(string const & data, LyXGlueLength * result);
 ///  VSpace class
 class VSpace {
 public:
-       ///
+       /// The different kinds of spaces.
        enum vspace_kind {
                ///
                NONE,
@@ -190,37 +197,37 @@ public:
                ///
                LENGTH
        };
-       /// constructors
+       /// Constructor
        VSpace() : 
                kin (NONE), 
                len(0.0, LyXLength::PT),
                 kp (false) {}
-       ///
+       /// Constructor
        explicit
-       VSpace(vspace_kind k) : 
+       VSpace(vspace_kind k) :
                kin (k), 
                len (0.0, LyXLength::PT),
                kp (false) {}
-       ///
+       /// Constructor
        explicit
        VSpace(LyXGlueLength l) :
                kin (LENGTH),
                len (l),
                kp (false) {}
 
-       ///
+       /// Constructor
        explicit
        VSpace(float v, LyXLength::UNIT u) : 
                kin (LENGTH), 
                len (v, u),
                kp (false) {}
 
-       /// this constructor is for reading from a .lyx file
+       /// Constructor for reading from a .lyx file
        explicit
        VSpace(string const & data);
        
-       // access functions
-       vspace_kind kind() const  { return  kin; }
+       /// access functions
+       vspace_kind kind() const { return  kin; }
        ///
        LyXGlueLength   length() const { return len; }
 
@@ -239,9 +246,9 @@ public:
        ///
        int inPixels(BufferView * bv) const;
        ///
-       int inPixels(int default_height, int default_skip) const;
+       int inPixels(int default_height, int default_skip, int default_width=0) const;
 private:
-       ///
+       /// This VSpace kind
        vspace_kind kin;
        ///
        LyXGlueLength len;