X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLength.h;h=2a8f0642108602fb70c8f01195f47fff31e4322d;hb=89175ee0f10f75311e2a746dbd450fb23d6c2845;hp=3a7e87a91cde8e3e5a2e660242e28cdb07b2fc33;hpb=a00c355fb12c54b1922660c1b804061161e2a3ae;p=lyx.git

diff --git a/src/Length.h b/src/Length.h
index 3a7e87a91c..2a8f064210 100644
--- a/src/Length.h
+++ b/src/Length.h
@@ -20,6 +20,8 @@
 
 namespace lyx {
 
+class MetricsBase;
+
 // Solaris/x86 version 9 and earlier define these
 #undef PC
 #undef SP
@@ -50,12 +52,12 @@ public:
 		PC, ///< Pica = 12pt = 4.218mm
 		PT, ///< Point = 1/72.27in = 0.351mm
 		SP, ///< Scaled point (65536sp = 1pt) TeX's smallest unit.
+		PTW, //< Percent of TextWidth
 		PCW, //< Percent of ColumnWidth
-		PLW, //< Percent of LineWidth
-		PPH, //< Percent of PaperHeight		// Herbert 2002-05-16
 		PPW, //< Percent of PageWidth
-		PTH, //< Percent of TextHeight		// Herbert 2002-05-16
-		PTW, //< Percent of TextWidth
+		PLW, //< Percent of LineWidth
+		PTH, //< Percent of TextHeight          // Herbert 2002-05-16
+		PPH, //< Percent of PaperHeight         // Herbert 2002-05-16
 		UNIT_NONE ///< no unit
 	};
 
@@ -67,8 +69,6 @@ public:
 	/// "data" must be a decimal number, followed by a unit
 	explicit Length(std::string const & data);
 
-	///
-	void swap(Length & rhs);
 	///
 	double value() const;
 	///
@@ -89,9 +89,20 @@ public:
 	std::string const asLatexString() const;
 	/// return string representation for HTML
 	std::string const asHTMLString() const;
-	/// return the on-screen size of this length
+	/** return the on-screen size of this length.
+	 *
+	 *	If the second argument is not provided, then the unit EM will
+	 *	only be approximated. It is better if possible to use
+	 *	FontMetrics::em() to get this value.
+	 */
 	int inPixels(int text_width, int em_width = 0) const;
+	/** return the on-screen size of this length
+	 *
+	 *  This version of the function uses the right EM definition.
+	 */
+	int inPixels(MetricsBase const &) const;
 	/// return the value in Big Postscript points.
+	/// Caution: Inaccurate for em, ex, mu and percent units.
 	int inBP() const;
 
 	/// return the default unit (centimeter or inch)
@@ -100,6 +111,8 @@ public:
 	friend bool isValidLength(std::string const & data, Length * result);
 
 private:
+	/// Convert value to inch for text width and em width given in inch
+	double inInch(double text_width, double em_width) const;
 	///
 	double val_;
 	///