InsetIndex: revamp IndexEntry to handle both legacy and modern index insets; simplify...

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

diff --git a/src/insets/InsetLine.cpp b/src/insets/InsetLine.cpp
index c1c890c2ed8b7ffe81bd023f18ad997b0d8e313f..70469be37a653028aa0f67696ded24e954e811a2 100644 (file)
--- a/src/insets/InsetLine.cpp
+++ b/src/insets/InsetLine.cpp
@@ -21,9 +21,8 @@
 #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"
@@ -34,6 +33,7 @@
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
+#include "support/Length.h"
 #include "support/lstrings.h"
 
 #include <cstdlib>
@@ -140,16 +140,10 @@ void InsetLine::draw(PainterInfo & pi, int x, int y) const
        Dimension const dim = dimension(*pi.base.bv);
 
        // get the surrounding text color
-       Color Line_color = pi.base.font.realColor();
+       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_);
+       pi.pain.fillRectangle(x, y - offset_ - height_, dim.wid, height_, line_color);
 }
 
 
@@ -183,16 +177,15 @@ int InsetLine::plaintext(odocstringstream & os,
 }
 
 
-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") << html::CR();
+       xs << xml::CompTag("hr") << xml::CR();
        return docstring();
 }