When a row is shortened, reset its flushed() attribute.

[lyx.git] / src / Length.cpp

diff --git a/src/Length.cpp b/src/Length.cpp
index 3aa610f659eeaf3c4b5f070fe2e0012631eaa6ee..42188d8929e444387efbaec46668283ee49fbad7 100644 (file)
--- a/src/Length.cpp
+++ b/src/Length.cpp
@@ -52,7 +52,7 @@ Length::Length(double v, Length::UNIT u)
 
 
 Length::Length(string const & data)
-       : val_(0), unit_(Length::PT)
+       : val_(0), unit_(Length::UNIT_NONE)
 {
        Length tmp;
 
@@ -107,6 +107,9 @@ string const Length::asLatexString() const
        case PPH:
                os << formatFPNumber(val_ / 100.0) << "\\paperheight";
                break;
+       case BLS:
+               os << formatFPNumber(val_ / 100.0) << "\\baselineskip";
+               break;
        case UNIT_NONE:
                break;
        default:
@@ -147,6 +150,7 @@ string const Length::asHTMLString() const
        case PCW:
        case PTH:
        case PPH:
+       case BLS:
                // what it's a percentage of probably won't make sense for HTML,
                // so we'll assume people have chosen these appropriately
                os << formatFPNumber(val_) << '%';
@@ -198,7 +202,7 @@ bool Length::empty() const
 int Length::inPixels(int text_width, int em_width_base) const
 {
        // Zoom factor specified by user in percent
-       double const zoom = lyxrc.zoom / 100.0; // [percent]
+       double const zoom = lyxrc.currentZoom / 100.0; // [percent]
 
        // DPI setting for monitor: pixels/inch
        double const dpi = lyxrc.dpi; // screen resolution [pixels/inch]
@@ -291,6 +295,12 @@ double Length::inInch(double text_width, double em_width) const
        case Length::PPH:
                result = val_ * text_width * 2.2 / 100;
                break;
+       case Length::BLS:
+               // baselineskip is approximately 1.2 times the font size for the cmr fonts
+               // The value actually depends on the current paragraph (see TextMetrics::setRowHeight),
+               // but we do not have this information here.
+               result = val_ * em_width * 1.2 / 100;
+               break;
        case Length::UNIT_NONE:
                result = 0;  // this cannot happen
                break;