X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBox.cpp;h=ec113744964695eaa25f40d5ad45a07e40c795cf;hb=bfddee97e191a853f0576f4fab3f095c4e9ce0de;hp=ecf9f4fb94e4423686d2d76fa5bff81d7b7bafc3;hpb=5bf8df4fbc9a4117df3df957f83c23f6847ac185;p=lyx.git diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp index ecf9f4fb94..ec11374496 100644 --- a/src/insets/InsetBox.cpp +++ b/src/insets/InsetBox.cpp @@ -24,6 +24,7 @@ #include "LaTeXFeatures.h" #include "Lexer.h" #include "MetricsInfo.h" +#include "output_xhtml.h" #include "TextClass.h" #include "support/debug.h" @@ -96,30 +97,15 @@ BoxTranslatorLoc const & boxtranslator_loc() // ///////////////////////////////////////////////////////////////////////// -InsetBox::InsetBox(Buffer const & buffer, string const & label) +InsetBox::InsetBox(Buffer * buffer, string const & label) : InsetCollapsable(buffer), params_(label) {} -InsetBox::~InsetBox() -{ - hideDialogs("box", this); -} - - -docstring InsetBox::editMessage() const -{ - return _("Opened Box Inset"); -} - - -docstring InsetBox::name() const +docstring InsetBox::layoutName() const { // FIXME: UNICODE - string name = "Box"; - if (boxtranslator().find(params_.type) == Shaded) - name += ":Shaded"; - return from_ascii(name); + return from_ascii("Box:" + params_.type); } @@ -147,6 +133,8 @@ void InsetBox::setButtonLabel() if (params_.inner_box) { if (params_.use_parbox) inner = _("Parbox"); + else if (params_.use_makebox) + inner = _("Makebox"); else inner = _("Minipage"); } @@ -191,35 +179,26 @@ void InsetBox::metrics(MetricsInfo & m, Dimension & dim) const bool InsetBox::forcePlainLayout(idx_type) const { - return !params_.inner_box && params_.type != "Framed"; -} - - -bool InsetBox::showInsetDialog(BufferView * bv) const -{ - bv->showDialog("box", params2string(params_), - const_cast(this)); - return true; + return (!params_.inner_box || params_.use_makebox) + && params_.type != "Shaded" && params_.type != "Framed"; } void InsetBox::doDispatch(Cursor & cur, FuncRequest & cmd) { - switch (cmd.action) { + switch (cmd.action()) { case LFUN_INSET_MODIFY: { //lyxerr << "InsetBox::dispatch MODIFY" << endl; - if (cmd.getArg(0) == "changetype") + cur.recordUndoInset(ATOMIC_UNDO, this); + if (cmd.getArg(0) == "changetype") { params_.type = cmd.getArg(1); - else + } else string2params(to_utf8(cmd.argument()), params_); + setButtonLabel(); break; } - case LFUN_INSET_DIALOG_UPDATE: - cur.bv().updateDialog("box", params2string(params_)); - break; - default: InsetCollapsable::doDispatch(cur, cmd); break; @@ -230,7 +209,7 @@ void InsetBox::doDispatch(Cursor & cur, FuncRequest & cmd) bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & flag) const { - switch (cmd.action) { + switch (cmd.action()) { case LFUN_INSET_MODIFY: if (cmd.getArg(0) == "changetype") @@ -243,7 +222,8 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd, return true; case LFUN_BREAK_PARAGRAPH: - if (params_.inner_box || params_.type == "Framed") + if ((params_.inner_box && !params_.use_makebox) + || params_.type == "Shaded" || params_.type == "Framed") return InsetCollapsable::getStatus(cur, cmd, flag); flag.setEnabled(false); return true; @@ -254,7 +234,7 @@ bool InsetBox::getStatus(Cursor & cur, FuncRequest const & cmd, } -int InsetBox::latex(odocstream & os, OutputParams const & runparams) const +void InsetBox::latex(otexstream & os, OutputParams const & runparams) const { BoxType btype = boxtranslator().find(params_.type); @@ -288,8 +268,10 @@ int InsetBox::latex(odocstream & os, OutputParams const & runparams) const } } - int i = 0; - os << "%\n"; + os << safebreakln; + if (runparams.lastid != -1) + os.texrow().start(runparams.lastid, runparams.lastpos); + // Adapt to column/text width correctly also if paragraphs indented: if (stdwidth) os << "\\noindent"; @@ -299,12 +281,10 @@ int InsetBox::latex(odocstream & os, OutputParams const & runparams) const break; case Framed: os << "\\begin{framed}%\n"; - i += 1; break; case Boxed: os << "\\framebox"; if (!params_.inner_box) { - os << "{\\makebox"; // Special widths, see usrguide §3.5 // FIXME UNICODE if (params_.special != "none") { @@ -317,7 +297,6 @@ int InsetBox::latex(odocstream & os, OutputParams const & runparams) const if (params_.hor_pos != 'c') os << "[" << params_.hor_pos << "]"; } - os << "{"; break; case ovalbox: @@ -340,50 +319,66 @@ int InsetBox::latex(odocstream & os, OutputParams const & runparams) const if (params_.inner_box) { if (params_.use_parbox) os << "\\parbox"; + else if (params_.use_makebox) { + os << "\\makebox"; + // FIXME UNICODE + // output the width and horizontal position + if (params_.special != "none") { + os << "[" << params_.width.value() + << '\\' << from_utf8(params_.special) + << ']'; + } else + os << '[' << from_ascii(width_string) + << ']'; + if (params_.hor_pos != 'c') + os << "[" << params_.hor_pos << "]"; + os << "{"; + } else os << "\\begin{minipage}"; - os << "[" << params_.pos << "]"; - if (params_.height_special == "none") { - // FIXME UNICODE - os << "[" << from_ascii(params_.height.asLatexString()) << "]"; - } else { - // Special heights - // set no optional argument when the value is the default "1\height" - // (special units like \height are handled as "in") - // but when the user has chosen a non-default inner_pos, the height - // must be given: \minipage[pos][height][inner-pos]{width} - if ((params_.height != Length("1in") || - params_.height_special != "totalheight") || - params_.inner_pos != params_.pos) { + // output parameters for parbox and minipage + if (!params_.use_makebox) { + os << "[" << params_.pos << "]"; + if (params_.height_special == "none") { // FIXME UNICODE - os << "[" << params_.height.value() - << "\\" << from_utf8(params_.height_special) << "]"; + os << "[" << from_ascii(params_.height.asLatexString()) << "]"; + } else { + // Special heights + // set no optional argument when the value is the default "1\height" + // (special units like \height are handled as "in") + // but when the user has chosen a non-default inner_pos, the height + // must be given: \minipage[pos][height][inner-pos]{width} + if ((params_.height != Length("1in") || + params_.height_special != "totalheight") || + params_.inner_pos != params_.pos) { + // FIXME UNICODE + os << "[" << params_.height.value() + << "\\" << from_utf8(params_.height_special) << "]"; + } } + if (params_.inner_pos != params_.pos) + os << "[" << params_.inner_pos << "]"; + // FIXME UNICODE + os << '{' << from_ascii(width_string) << '}'; + if (params_.use_parbox) + os << "{"; } - if (params_.inner_pos != params_.pos) - os << "[" << params_.inner_pos << "]"; - - // FIXME UNICODE - os << '{' << from_ascii(width_string) << '}'; - if (params_.use_parbox) - os << "{"; os << "%\n"; - ++i; - } + } // end if inner_box + if (btype == Shaded) { os << "\\begin{shaded}%\n"; - ++i; } - i += InsetText::latex(os, runparams); + InsetText::latex(os, runparams); if (btype == Shaded) os << "\\end{shaded}"; if (params_.inner_box) { - if (params_.use_parbox) + if (params_.use_parbox || params_.use_makebox) os << "%\n}"; else os << "%\n\\end{minipage}"; @@ -396,8 +391,6 @@ int InsetBox::latex(odocstream & os, OutputParams const & runparams) const os << "\\end{framed}"; break; case Boxed: - if (!params_.inner_box) - os << "}"; // for makebox os << "}"; break; case ovalbox: @@ -410,10 +403,6 @@ int InsetBox::latex(odocstream & os, OutputParams const & runparams) const // already done break; } - - i += 2; - - return i; } @@ -484,24 +473,28 @@ int InsetBox::docbook(odocstream & os, OutputParams const & runparams) const } -docstring InsetBox::xhtml(odocstream &, OutputParams const & runparams) const +docstring InsetBox::xhtml(XHTMLStream & xs, OutputParams const & runparams) const { + // construct attributes + string attrs = "class='" + params_.type + "'"; string style; - if (!params_.width.empty()) - style += ("width: " + params_.width.asHTMLString() + ";"); - if (!params_.height.empty()) - style += ("height: " + params_.height.asHTMLString() + ";"); - - docstring retval = from_ascii("
> "inner_pos" >> inner_pos; lex >> "use_parbox" >> use_parbox; + lex >> "use_makebox" >> use_makebox; lex >> "width" >> width; lex >> "special" >> special; lex >> "height" >> height;