Revert part of c053a9394d1075ecad02ccce2f34c95f08c1f00f

[lyx.git] / src / Length.h

diff --git a/src/Length.h b/src/Length.h
index 435eea053576ab397c2d620edbee03102340e01d..2a8f0642108602fb70c8f01195f47fff31e4322d 100644 (file)
--- 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
@@ -87,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)
@@ -98,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_;
        ///