#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"
#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 {
InsetLine::InsetLine(Buffer * buf, InsetCommandParams const & p)
- : InsetCommand(buf, p)
+ : InsetCommand(buf, p), height_(0), offset_(0)
{}
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 = mi.base.inPixels(width);
// assure that the line inset is not outside of the window
// check that it doesn't exceed the outer boundary
// 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_ = mi.base.inPixels(height);
// 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_ = mi.base.inPixels(offset);
dim.asc = max(fm.maxAscent(), offset_ + height_);
dim.des = max(fm.maxDescent(), - offset_);
-
- // Cache the inset dimension
- setDimCache(mi, dim);
-}
-
-
-Dimension const InsetLine::dimension(BufferView const & bv) const
-{
- // We cannot use InsetCommand::dimension() as this returns the dimension
- // of the button, which is not used here.
- return Inset::dimension(bv);
}
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, float(height_));
+ pi.pain.fillRectangle(x, y - offset_ - height_, dim.wid, height_, line_color);
}
-int InsetLine::latex(otexstream & os, OutputParams const &) const
+void InsetLine::latex(otexstream & os, OutputParams const &) const
{
bool have_offset = true;
Length offset_len = Length(to_ascii(getParam("offset")));
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();
}