X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLength.cpp;h=bc8fb7ea550b0453d630cdafa26361ebfc5ccd73;hb=c1ee1bc0baf00a64734ec5eb345884c057e4d9c1;hp=35f6b0cb424060116e30511e127867e173227641;hpb=ccbac353eaea45f8480523caba9c0697cb3eacb2;p=lyx.git

diff --git a/src/Length.cpp b/src/Length.cpp
index 35f6b0cb42..bc8fb7ea55 100644
--- a/src/Length.cpp
+++ b/src/Length.cpp
@@ -21,8 +21,10 @@
 
 #include "frontends/FontMetrics.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/lstrings.h"
+#include "support/lyxlib.h"
 
 #include <sstream>
 #include <iomanip>
@@ -50,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;
 
@@ -75,7 +77,8 @@ docstring const Length::asDocstring() const
 {
 	odocstringstream os;
 	if (unit_ != UNIT_NONE)
-		os << formatFPNumber(val_) << unit_name[unit_]; // setw?
+		os << from_ascii(formatFPNumber(val_))
+		   << from_ascii(unit_name[unit_]); // setw?
 	return os.str();
 }
 
@@ -104,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:
@@ -144,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_) << '%';
@@ -214,7 +221,7 @@ int Length::inPixels(int text_width, int em_width_base) const
 
 	double const text_width_in = text_width / (zoom * dpi);
 	double const result = zoom * dpi * inInch(text_width_in, em_width_in);
-	return static_cast<int>(result + ((result >= 0) ? 0.5 : -0.5));
+	return support::iround(result);
 }
 
 
@@ -288,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;
@@ -298,7 +311,14 @@ double Length::inInch(double text_width, double em_width) const
 
 int Length::inPixels(MetricsBase const & base) const
 {
-	return inPixels(base.textwidth, theFontMetrics(base.font).em());
+	FontInfo fi = base.font;
+	if (unit_ == Length::MU)
+		// mu is 1/18th of an em in the math symbol font
+		fi.setFamily(SYMBOL_FAMILY);
+	else
+		// Math style is only taken into account in the case of mu
+		fi.setStyle(LM_ST_TEXT);
+	return inPixels(base.textwidth, theFontMetrics(fi).em());
 }
 
 
@@ -310,7 +330,7 @@ int Length::inBP() const
 	double const text_width_in = 210.0 / 2.54; // assume A4
 	double const em_width_in = 10.0 / 72.27;
 	double result = 72.0 * inInch(text_width_in, em_width_in);
-	return static_cast<int>(result + 0.5);
+	return support::iround(result);
 }
 
 
@@ -353,7 +373,8 @@ GlueLength::GlueLength(Length const & len, Length const & plus,
 
 GlueLength::GlueLength(string const & data)
 {
-	isValidGlueLength(data, this);
+	if (!isValidGlueLength(data, this))
+		LYXERR0("Invalid glue length " + data);
 }