Account for old versions of Pygments

[lyx.git] / src / Length.h

diff --git a/src/Length.h b/src/Length.h
index 41033084c79e4ac40dbede9ebc992244d43bb55d..8f192f85c6730d05a68a2102b20b06b8f06371fb 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
@@ -56,6 +58,7 @@ public:
                PLW, //< Percent of LineWidth
                PTH, //< Percent of TextHeight          // Herbert 2002-05-16
                PPH, //< Percent of PaperHeight         // Herbert 2002-05-16
+               BLS, //< Percent of BaselineSkip        // uwestoehr 2017-04-01
                UNIT_NONE ///< no unit
        };
 
@@ -67,8 +70,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 +90,22 @@ 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 current inset width as
+        *  width and the EM value of the current font.
+        */
+       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,8 +114,8 @@ public:
        friend bool isValidLength(std::string const & data, Length * result);
 
 private:
-       /// This HSpace kind
-       HSpaceKind kind_;
+       /// Convert value to inch for text width and em width given in inch
+       double inInch(double text_width, double em_width) const;
        ///
        double val_;
        ///