Less expensive OP first as this might be called often.

[lyx.git] / src / insets / InsetLine.cpp

diff --git a/src/insets/InsetLine.cpp b/src/insets/InsetLine.cpp
index 60fb29995e3700344c8d63f6e7cae942eb31d2d4..70469be37a653028aa0f67696ded24e954e811a2 100644 (file)
--- 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,15 +15,16 @@
 #include "InsetLine.h"
 
 #include "Buffer.h"
+#include "Cursor.h"
 #include "Dimension.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "LaTeXFeatures.h"
-#include "Length.h"
 #include "MetricsInfo.h"
-#include "OutputParams.h"
+#include "output_docbook.h"
 #include "output_xhtml.h"
+#include "texstream.h"
 #include "Text.h"
 
 #include "frontends/FontMetrics.h"
@@ -31,8 +33,11 @@
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
+#include "support/Length.h"
 #include "support/lstrings.h"
 
+#include <cstdlib>
+
 using namespace std;
 
 namespace lyx {
@@ -41,7 +46,7 @@ using frontend::Painter;
 
 
 InsetLine::InsetLine(Buffer * buf, InsetCommandParams const & p)
-       : InsetCommand(buf, p, "line")
+       : InsetCommand(buf, p), height_(0), offset_(0)
 {}
 
 
@@ -70,12 +75,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;
        }
@@ -104,25 +109,29 @@ bool InsetLine::getStatus(Cursor & cur, FuncRequest const & cmd,
 void InsetLine::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        frontend::FontMetrics const & fm = theFontMetrics(mi.base.font);
-       dim.asc = fm.maxAscent();
-       dim.des = fm.maxDescent();
+       int const max_width = mi.base.textwidth;
 
-       Length width = Length(to_ascii(getParam("width")));
-       int w =
-               width.inPixels(mi.base.textwidth,
-               fm.width(char_type('M')));
+       Length const width(to_ascii(getParam("width")));
+       dim.wid = mi.base.inPixels(width);
 
        // assure that the line inset is not outside of the window
        // check that it doesn't exceed the outer boundary
-       if (w > mi.base.textwidth)
-               w = mi.base.textwidth;
+       if (dim.wid > max_width)
+               dim.wid = max_width;
 
        // set a minimal width
-       int const minw = (w < 0) ? 3 * 8 : 4;
-       dim.wid = max(minw, max(w, -w));
+       int const minw = (dim.wid < 0) ? 24 : 4;
+       dim.wid = max(minw, abs(dim.wid));
+
+       Length height = Length(to_ascii(getParam("height")));
+       height_ = mi.base.inPixels(height);
 
-       // Cache the inset dimension
-       setDimCache(mi, dim);
+       // get the length of the parameters in pixels
+       Length offset = Length(to_ascii(getParam("offset")));
+       offset_ = mi.base.inPixels(offset);
+
+       dim.asc = max(fm.maxAscent(), offset_ + height_);
+       dim.des = max(fm.maxDescent(), - offset_);
 }
 
 
@@ -130,41 +139,15 @@ void InsetLine::draw(PainterInfo & pi, int x, int y) const
 {
        Dimension const dim = dimension(*pi.base.bv);
 
-       frontend::FontMetrics const & fm = theFontMetrics(pi.base.font);
-
-       // get the length of the parameters in pixels
-       Length offset = Length(to_ascii(getParam("offset")));
-       int o =
-               offset.inPixels(pi.base.textwidth,
-               fm.width(char_type('M')));
-       Length width = Length(to_ascii(getParam("width")));
-       int w =
-               width.inPixels(pi.base.textwidth,
-               fm.width(char_type('M')));
-       Length height = Length(to_ascii(getParam("height")));
-       int h =
-               height.inPixels(pi.base.textwidth,
-               fm.width(char_type('M')));
-
        // get the surrounding text color
-       FontInfo f = pi.base.font;
-       Color Line_color = f.realColor();
-
-       // assure that the drawn line is not outside of the window
-       // check that it doesn't exceed the outer boundary
-       if (x + w - h/2 - 2 > pi.base.textwidth)
-               w = pi.base.textwidth - x + h/2 + 2;
-       // check that it doesn't exceed the upper boundary
-       if (y - o - h/2 < 0)
-               o = y - h/2 - 2;
+       Color line_color = pi.base.font.realColor();
 
        // the offset is a vertical one
-       pi.pain.line(x + h/2 + 1, y - o - h/2, x + w - h/2 - 2, y - o - h/2,
-               Line_color, Painter::line_solid, float(h));
+       pi.pain.fillRectangle(x, y - offset_ - height_, dim.wid, height_, line_color);
 }
 
 
-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")));
@@ -183,29 +166,26 @@ 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;
 }
 
 
-int InsetLine::docbook(odocstream & os, OutputParams const &) const
+void InsetLine::docbook(XMLStream & xs, OutputParams const &) const
 {
-       os << '\n';
-       return 0;
+       xs << xml::CR();
 }
 
 
-docstring InsetLine::xhtml(XHTMLStream & xs, OutputParams const &) const
+docstring InsetLine::xhtml(XMLStream & xs, OutputParams const &) const
 {
-       xs << html::CompTag("hr");
-       xs.cr();
+       xs << xml::CompTag("hr") << xml::CR();
        return docstring();
 }