X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLine.cpp;h=515efbba4f50931ec144fbeb11a7285435e811c6;hb=bfddee97e191a853f0576f4fab3f095c4e9ce0de;hp=405e2be7dcc6cf805e7820f8332bd019acfe485d;hpb=31c75d260e46b1e8bbeb0e9d7eab4f3b473dcdac;p=lyx.git

diff --git a/src/insets/InsetLine.cpp b/src/insets/InsetLine.cpp
index 405e2be7dc..515efbba4f 100644
--- a/src/insets/InsetLine.cpp
+++ b/src/insets/InsetLine.cpp
@@ -3,6 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
+ * \author Abdelrazak Younes
  * \author André Pönitz
  * \author Uwe Stöhr
  *
@@ -14,6 +15,7 @@
 #include "InsetLine.h"
 
 #include "Buffer.h"
+#include "Cursor.h"
 #include "Dimension.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
@@ -41,7 +43,7 @@ using frontend::Painter;
 
 
 InsetLine::InsetLine(Buffer * buf, InsetCommandParams const & p)
-	: InsetCommand(buf, p, "line")
+	: InsetCommand(buf, p)
 {}
 
 
@@ -70,12 +72,12 @@ void InsetLine::doDispatch(Cursor & cur, FuncRequest & cmd)
 	case LFUN_INSET_MODIFY: {
 		InsetCommandParams p(LINE_CODE);
 		// FIXME UNICODE
-		InsetCommand::string2params("line",
-			to_utf8(cmd.argument()), p);
+		InsetCommand::string2params(to_utf8(cmd.argument()), p);
 		if (p.getCmdName().empty()) {
 			cur.noScreenUpdate();
 			break;
 		}
+		cur.recordUndo();
 		setParams(p);
 		break;
 	}
@@ -125,8 +127,8 @@ void InsetLine::metrics(MetricsInfo & mi, Dimension & dim) const
 	Length offset = Length(to_ascii(getParam("offset")));
 	offset_ = offset.inPixels(max_width, fm.width(char_type('M')));
 
-	dim.asc = max(fm.maxAscent(), offset_ + height_/2);
-	dim.des = max(fm.maxDescent(), height_/2 - offset_);
+	dim.asc = max(fm.maxAscent(), offset_ + height_);
+	dim.des = max(fm.maxDescent(), - offset_);
 
 	// Cache the inset dimension
 	setDimCache(mi, dim);
@@ -159,7 +161,7 @@ void InsetLine::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-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")));
@@ -178,8 +180,6 @@ int InsetLine::latex(odocstream & os, OutputParams const &) const
 	if (have_offset)
 		os	<< "[" << from_ascii(offset) << "]";
 	os << "{" << from_ascii(width) << "}{" << from_ascii(height) << '}';
-
-	return 0;
 }
 
 
@@ -199,8 +199,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();
 }