X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLength.h;h=8f192f85c6730d05a68a2102b20b06b8f06371fb;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=ef17bac760671d55c933f27e92451cc19064eee7;hpb=66fa801e74e1775b31008df548332436ce79e2e1;p=lyx.git diff --git a/src/Length.h b/src/Length.h index ef17bac760..8f192f85c6 100644 --- a/src/Length.h +++ b/src/Length.h @@ -58,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 }; @@ -96,12 +97,15 @@ public: * 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. + * 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) @@ -110,6 +114,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_; ///