X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetVSpace.cpp;h=4cdd1ba6edd37dfbdca46ea36db7e0770bbbefc8;hb=9762ba5d388e8a81a6e58c464b635ca4cf48cbfa;hp=e590929b7892f0248f4b02a1f84aa397b0b222f8;hpb=e7645f24391648fb08cf6b6d808fcabec76be744;p=lyx.git diff --git a/src/insets/InsetVSpace.cpp b/src/insets/InsetVSpace.cpp index e590929b78..4cdd1ba6ed 100644 --- a/src/insets/InsetVSpace.cpp +++ b/src/insets/InsetVSpace.cpp @@ -4,7 +4,7 @@ * Licence details can be found in the file COPYING. * * \author various - * \author André Pönitz + * \author André Pönitz * * Full author contact details are available in file CREDITS. */ @@ -21,12 +21,16 @@ #include "FuncRequest.h" #include "FuncStatus.h" #include "Lexer.h" -#include "Text.h" #include "MetricsInfo.h" #include "OutputParams.h" +#include "output_xhtml.h" +#include "texstream.h" +#include "Text.h" #include "support/debug.h" +#include "support/docstream.h" #include "support/gettext.h" +#include "support/lassert.h" #include "frontends/Application.h" #include "frontends/FontMetrics.h" @@ -42,35 +46,29 @@ namespace { int const ADD_TO_VSPACE_WIDTH = 5; -} // namespace anon +} // namespace InsetVSpace::InsetVSpace(VSpace const & space) - : space_(space) + : Inset(0), space_(space) {} -InsetVSpace::~InsetVSpace() -{ - hideDialogs("vspace", this); -} - - void InsetVSpace::doDispatch(Cursor & cur, FuncRequest & cmd) { - switch (cmd.action) { + switch (cmd.action()) { case LFUN_INSET_MODIFY: { - InsetVSpace::string2params(to_utf8(cmd.argument()), space_); + cur.recordUndo(); + string arg = to_utf8(cmd.argument()); + if (arg == "vspace custom") + arg = (space_.kind() == VSpace::LENGTH) + ? "vspace " + space_.length().asString() + : "vspace 1" + string(stringFromUnit(Length::defaultUnit())); + InsetVSpace::string2params(arg, space_); break; } - case LFUN_MOUSE_RELEASE: - if (!cur.selection() && cmd.button() == mouse_button::button1) - cur.bv().showDialog("vspace", params2string(space()), - const_cast(this)); - break; - default: Inset::doDispatch(cur, cmd); break; @@ -81,43 +79,36 @@ void InsetVSpace::doDispatch(Cursor & cur, FuncRequest & cmd) bool InsetVSpace::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & status) const { - switch (cmd.action) { + switch (cmd.action()) { // we handle these case LFUN_INSET_MODIFY: if (cmd.getArg(0) == "vspace") { VSpace vspace; - InsetVSpace::string2params(to_utf8(cmd.argument()), vspace); + string arg = to_utf8(cmd.argument()); + if (arg == "vspace custom") + arg = (space_.kind() == VSpace::LENGTH) + ? "vspace " + space_.length().asString() + : "vspace 1" + string(stringFromUnit(Length::defaultUnit())); + InsetVSpace::string2params(arg, vspace); status.setOnOff(vspace == space_); - } else { - status.enabled(true); } + status.setEnabled(true); return true; + default: return Inset::getStatus(cur, cmd, status); } } -void InsetVSpace::edit(Cursor & cur, bool, EntryDirection) -{ - cur.bv().showDialog("vspace", params2string(space()), - const_cast(this)); -} - - void InsetVSpace::read(Lexer & lex) { - BOOST_ASSERT(lex.isOK()); + LASSERT(lex.isOK(), return); string vsp; lex >> vsp; if (lex) space_ = VSpace(vsp); - - string end_token; - lex >> end_token; - if (end_token != "\\end_inset") - lex.printError("Missing \\end_inset at this point. " - "Read: `$$Token'"); + lex >> "\\end_inset"; } @@ -135,13 +126,13 @@ docstring const InsetVSpace::label() const namespace { -int const arrow_size = 4; +int const vspace_arrow_size = 4; } void InsetVSpace::metrics(MetricsInfo & mi, Dimension & dim) const { - int height = 3 * arrow_size; + int height = 3 * vspace_arrow_size; if (space_.length().len().value() >= 0.0) height = max(height, space_.inPixels(*mi.base.bv)); @@ -158,9 +149,7 @@ void InsetVSpace::metrics(MetricsInfo & mi, Dimension & dim) const dim.asc = height / 2 + (a - d) / 2; // align cursor with the dim.des = height - dim.asc; // label text - dim.wid = ADD_TO_VSPACE_WIDTH + 2 * arrow_size + 5 + w; - // Cache the inset dimension. - setDimCache(mi, dim); + dim.wid = ADD_TO_VSPACE_WIDTH + 2 * vspace_arrow_size + 5 + w; } @@ -183,14 +172,14 @@ void InsetVSpace::draw(PainterInfo & pi, int x, int y) const // adding or removing space bool const added = space_.kind() != VSpace::LENGTH || space_.length().len().value() >= 0.0; - ty1 = added ? (start + arrow_size) : start; - ty2 = added ? start : (start + arrow_size); - by1 = added ? (end - arrow_size) : end; - by2 = added ? end : (end - arrow_size); + ty1 = added ? (start + vspace_arrow_size) : start; + ty2 = added ? start : (start + vspace_arrow_size); + by1 = added ? (end - vspace_arrow_size) : end; + by2 = added ? end : (end - vspace_arrow_size); } - int const midx = x + arrow_size; - int const rightx = midx + arrow_size; + int const midx = x + vspace_arrow_size; + int const rightx = midx + vspace_arrow_size; // first the string int w = 0; @@ -204,7 +193,7 @@ void InsetVSpace::draw(PainterInfo & pi, int x, int y) const docstring const lab = label(); theFontMetrics(font).rectText(lab, w, a, d); - pi.pain.rectText(x + 2 * arrow_size + 5, + pi.pain.rectText(x + 2 * vspace_arrow_size + 5, start + (end - start) / 2 + (a - d) / 2, lab, font, Color_none, Color_none); @@ -221,14 +210,14 @@ void InsetVSpace::draw(PainterInfo & pi, int x, int y) const } -int InsetVSpace::latex(odocstream & os, OutputParams const &) const +void InsetVSpace::latex(otexstream & os, OutputParams const &) const { os << from_ascii(space_.asLatexCommand(buffer().params())) << '\n'; - return 1; } -int InsetVSpace::plaintext(odocstream & os, OutputParams const &) const +int InsetVSpace::plaintext(odocstringstream & os, + OutputParams const &, size_t) const { os << "\n\n"; return PLAINTEXT_NEWLINE; @@ -242,9 +231,18 @@ int InsetVSpace::docbook(odocstream & os, OutputParams const &) const } -docstring InsetVSpace::contextMenu(BufferView const &, int, int) const +docstring InsetVSpace::xhtml(XHTMLStream & os, OutputParams const &) const +{ + string const len = space_.asHTMLLength(); + string const attr = "style='height:" + (len.empty() ? "1em" : len) + "'"; + os << html::StartTag("div", attr, true) << html::EndTag("div"); + return docstring(); +} + + +string InsetVSpace::contextMenuName() const { - return from_ascii("context-vspace"); + return "context-vspace"; }