X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fvspace.h;h=30aa427ab43ef66f5a5ac9d0e1860f83afa3c786;hb=dff2911bda426ad439e6475f62183cedd7044801;hp=f3c8f5072d04d239bcc7646d66bd2370a3cb4b0f;hpb=9a3176581dc3e9aee62d908faf8d48ddb43d4cc3;p=lyx.git

diff --git a/src/vspace.h b/src/vspace.h
index f3c8f5072d..30aa427ab4 100644
--- 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 {
@@ -239,7 +246,7 @@ 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;