X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetLine.cpp;h=dc75aa42516a0e8b6597864d5d09e37f5a2cadd3;hb=4859a1f6bb834aa5efa4a32e7619cc7a3347dc0c;hp=0d6b79a842e5cda0568e8b2cc4e2446ec34a7cdd;hpb=bbafadcbf362fb1b6394c4b3d6ef49aa6d197029;p=lyx.git

diff --git a/src/insets/InsetLine.cpp b/src/insets/InsetLine.cpp
index 0d6b79a842..dc75aa4251 100644
--- a/src/insets/InsetLine.cpp
+++ b/src/insets/InsetLine.cpp
@@ -3,7 +3,9 @@
  * 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
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -12,20 +14,29 @@
 
 #include "InsetLine.h"
 
+#include "Buffer.h"
+#include "Cursor.h"
 #include "Dimension.h"
-#include "Font.h"
+#include "DispatchResult.h"
+#include "FuncRequest.h"
+#include "FuncStatus.h"
 #include "LaTeXFeatures.h"
+#include "Length.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
 #include "output_xhtml.h"
+#include "texstream.h"
 #include "Text.h"
 
+#include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
 #include "support/debug.h"
 #include "support/docstream.h"
+#include "support/gettext.h"
+#include "support/lstrings.h"
 
-
+#include <cstdlib>
 
 using namespace std;
 
@@ -34,45 +45,138 @@ namespace lyx {
 using frontend::Painter;
 
 
-void InsetLine::read(Lexer &)
+InsetLine::InsetLine(Buffer * buf, InsetCommandParams const & p)
+	: InsetCommand(buf, p), height_(0), offset_(0)
+{}
+
+
+ParamInfo const & InsetLine::findInfo(string const & /* cmdName */)
+{
+	static ParamInfo param_info_;
+	if (param_info_.empty()) {
+		param_info_.add("offset", ParamInfo::LYX_INTERNAL);
+		param_info_.add("width", ParamInfo::LYX_INTERNAL);
+		param_info_.add("height", ParamInfo::LYX_INTERNAL);
+	}
+	return param_info_;
+}
+
+
+docstring InsetLine::screenLabel() const
+{
+	return _("Horizontal line");
+}
+
+
+void InsetLine::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-	/* Nothing to read */
+	switch (cmd.action()) {
+
+	case LFUN_INSET_MODIFY: {
+		InsetCommandParams p(LINE_CODE);
+		// FIXME UNICODE
+		InsetCommand::string2params(to_utf8(cmd.argument()), p);
+		if (p.getCmdName().empty()) {
+			cur.noScreenUpdate();
+			break;
+		}
+		cur.recordUndo();
+		setParams(p);
+		break;
+	}
+
+	default:
+		InsetCommand::doDispatch(cur, cmd);
+		break;
+	}
 }
 
 
-void InsetLine::write(ostream & os) const
+bool InsetLine::getStatus(Cursor & cur, FuncRequest const & cmd,
+	FuncStatus & status) const
 {
-	os << "\n\\lyxline\n";
+	switch (cmd.action()) {
+	case LFUN_INSET_DIALOG_UPDATE:
+	case LFUN_INSET_MODIFY:
+		status.setEnabled(true);
+		return true;
+	default:
+		return InsetCommand::getStatus(cur, cmd, status);
+	}
 }
 
 
 void InsetLine::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	dim.asc = 3;
-	dim.des = 3;
-	dim.wid = mi.base.textwidth;
-	// Cache the inset dimension. 
-	setDimCache(mi, dim);
+	frontend::FontMetrics const & fm = theFontMetrics(mi.base.font);
+	int const max_width = mi.base.textwidth;
+
+	Length const width(to_ascii(getParam("width")));
+	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
+	if (dim.wid > max_width)
+		dim.wid = max_width;
+
+	// set a minimal width
+	int const minw = (dim.wid < 0) ? 24 : 4;
+	dim.wid = max(minw, abs(dim.wid));
+
+	Length height = Length(to_ascii(getParam("height")));
+	height_ = height.inPixels(mi.base);
+
+	// get the length of the parameters in pixels
+	Length offset = Length(to_ascii(getParam("offset")));
+	offset_ = offset.inPixels(mi.base);
+
+	dim.asc = max(fm.maxAscent(), offset_ + height_);
+	dim.des = max(fm.maxDescent(), - offset_);
 }
 
 
 void InsetLine::draw(PainterInfo & pi, int x, int y) const
 {
 	Dimension const dim = dimension(*pi.base.bv);
-	pi.pain.line(x, y, x + dim.wid, y, Color_foreground,
-		Painter::line_solid, 1);
+
+	// get the surrounding text color
+	Color Line_color = pi.base.font.realColor();
+
+	// the offset is a vertical one
+	// the horizontal dimension must be corrected with the heigth because
+	// of left and right border of the painted line for big heigth.
+	pi.pain.line(x + height_/2 + 1,
+		     y - offset_ - height_/2,
+		     x + dim.wid - height_/2 - 2,
+		     y - offset_ - height_/2,
+		     Line_color, Painter::line_solid, height_);
 }
 
 
-int InsetLine::latex(odocstream & os, OutputParams const & runparams) const
+void InsetLine::latex(otexstream & os, OutputParams const &) const
 {
-	os << "\\lyxline{\\"
-	   << from_ascii(runparams.local_font->latexSize()) << '}';
-	return 0;
+	bool have_offset = true;
+	Length offset_len = Length(to_ascii(getParam("offset")));
+	if (offset_len.value() == 0)
+		have_offset = false;
+
+	string const offset =
+		Length(to_ascii(getParam("offset"))).asLatexString();
+	string const width =
+		Length(to_ascii(getParam("width"))).asLatexString();
+	string const height =
+		Length(to_ascii(getParam("height"))).asLatexString();
+
+	os << "\\rule";
+	// only output the optional parameter if the offset is not 0
+	if (have_offset)
+		os	<< "[" << from_ascii(offset) << "]";
+	os << "{" << from_ascii(width) << "}{" << from_ascii(height) << '}';
 }
 
 
-int InsetLine::plaintext(odocstream & os, OutputParams const &) const
+int InsetLine::plaintext(odocstringstream & os,
+        OutputParams const &, size_t) const
 {
 	os << "\n-------------------------------------------\n";
 	return PLAINTEXT_NEWLINE;
@@ -88,16 +192,9 @@ 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();
 }
 
 
-void InsetLine::validate(LaTeXFeatures & features) const
-{
-	features.require("lyxline");
-}
-
-
 } // namespace lyx