X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLine.cpp;h=087dba7df2cc8a8fa429d4aaae2f4fec39d2f7dd;hb=667560114752e668fbd59123faf9d454da632fb0;hp=a91a31ed5e88da95f9ade9f90cc444c32ec12eb5;hpb=838af80834ac38c231ff080acc3a6d60ad664ede;p=lyx.git

diff --git a/src/insets/InsetLine.cpp b/src/insets/InsetLine.cpp
index a91a31ed5e..087dba7df2 100644
--- a/src/insets/InsetLine.cpp
+++ b/src/insets/InsetLine.cpp
@@ -35,6 +35,8 @@
 #include "support/gettext.h"
 #include "support/lstrings.h"
 
+#include <cstdlib>
+
 using namespace std;
 
 namespace lyx {
@@ -43,7 +45,7 @@ using frontend::Painter;
 
 
 InsetLine::InsetLine(Buffer * buf, InsetCommandParams const & p)
-	: InsetCommand(buf, p)
+	: InsetCommand(buf, p), height_(0), offset_(0)
 {}
 
 
@@ -109,7 +111,7 @@ void InsetLine::metrics(MetricsInfo & mi, Dimension & dim) const
 	int const max_width = mi.base.textwidth;
 
 	Length const width(to_ascii(getParam("width")));
-	dim.wid = width.inPixels(max_width, fm.width(char_type('M')));
+	dim.wid = width.inPixels(mi.base);
 
 	// assure that the line inset is not outside of the window
 	// check that it doesn't exceed the outer boundary
@@ -118,14 +120,14 @@ void InsetLine::metrics(MetricsInfo & mi, Dimension & dim) const
 
 	// set a minimal width
 	int const minw = (dim.wid < 0) ? 24 : 4;
-	dim.wid = max(minw, max(dim.wid, -dim.wid));
+	dim.wid = max(minw, abs(dim.wid));
 
 	Length height = Length(to_ascii(getParam("height")));
-	height_ = height.inPixels(dim.height(), fm.width(char_type('M')));
+	height_ = height.inPixels(mi.base);
 
 	// get the length of the parameters in pixels
 	Length offset = Length(to_ascii(getParam("offset")));
-	offset_ = offset.inPixels(max_width, fm.width(char_type('M')));
+	offset_ = offset.inPixels(mi.base);
 
 	dim.asc = max(fm.maxAscent(), offset_ + height_);
 	dim.des = max(fm.maxDescent(), - offset_);
@@ -157,11 +159,11 @@ void InsetLine::draw(PainterInfo & pi, int x, int y) const
 		     y - offset_ - height_/2,
 		     x + dim.wid - height_/2 - 2,
 		     y - offset_ - height_/2,
-		     Line_color, Painter::line_solid, float(height_));
+		     Line_color, Painter::line_solid, height_);
 }
 
 
-int InsetLine::latex(odocstream & os, OutputParams const &) const
+void InsetLine::latex(otexstream & os, OutputParams const &) const
 {
 	bool have_offset = true;
 	Length offset_len = Length(to_ascii(getParam("offset")));
@@ -180,12 +182,11 @@ int InsetLine::latex(odocstream & os, OutputParams const &) const
 	if (have_offset)
 		os	<< "[" << from_ascii(offset) << "]";
 	os << "{" << from_ascii(width) << "}{" << from_ascii(height) << '}';
-
-	return 0;
 }
 
 
-int InsetLine::plaintext(odocstream & os, OutputParams const &) const
+int InsetLine::plaintext(odocstringstream & os,
+        OutputParams const &, size_t) const
 {
 	os << "\n-------------------------------------------\n";
 	return PLAINTEXT_NEWLINE;
@@ -201,8 +202,7 @@ int InsetLine::docbook(odocstream & os, OutputParams const &) const
 
 docstring InsetLine::xhtml(XHTMLStream & xs, OutputParams const &) const
 {
-	xs << html::CompTag("hr");
-	xs.cr();
+	xs << html::CompTag("hr") << html::CR();
 	return docstring();
 }