#include "InsetLine.h"
#include "Buffer.h"
+#include "Cursor.h"
#include "Dimension.h"
#include "DispatchResult.h"
#include "FuncRequest.h"
#include "MetricsInfo.h"
#include "OutputParams.h"
#include "output_xhtml.h"
+#include "texstream.h"
#include "Text.h"
#include "frontends/FontMetrics.h"
#include "support/gettext.h"
#include "support/lstrings.h"
+#include <cstdlib>
+
using namespace std;
namespace lyx {
InsetLine::InsetLine(Buffer * buf, InsetCommandParams const & p)
- : InsetCommand(buf, p, "line")
+ : InsetCommand(buf, p), height_(0), offset_(0)
{}
cur.noScreenUpdate();
break;
}
+ cur.recordUndo();
setParams(p);
break;
}
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 = width.inPixels(mi.base);
// 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_ = height.inPixels(mi.base);
// 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_ = offset.inPixels(mi.base);
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);
}
y - offset_ - height_/2,
x + dim.wid - height_/2 - 2,
y - offset_ - height_/2,
- Line_color, Painter::line_solid, float(height_));
+ Line_color, Painter::line_solid, height_);
}
-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")));
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;
docstring InsetLine::xhtml(XHTMLStream & xs, OutputParams const &) const
{
- xs << html::CompTag("hr");
- xs.cr();
+ xs << html::CompTag("hr") << html::CR();
return docstring();
}