X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFloat.cpp;h=021b7f3b17e805d6e05e5e72d1ab9cf5c102f875;hb=9762ba5d388e8a81a6e58c464b635ca4cf48cbfa;hp=99175fd64b57797cf0a1c6ed8d38906619899536;hpb=52bd0268a3bd24fdeb277655d8fcedb6b52f6045;p=lyx.git diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp index 99175fd64b..021b7f3b17 100644 --- a/src/insets/InsetFloat.cpp +++ b/src/insets/InsetFloat.cpp @@ -29,6 +29,8 @@ #include "Lexer.h" #include "output_xhtml.h" #include "ParIterator.h" +#include "TexRow.h" +#include "texstream.h" #include "TextClass.h" #include "support/debug.h" @@ -39,6 +41,7 @@ #include "frontends/Application.h" using namespace std; +using namespace lyx::support; namespace lyx { @@ -111,24 +114,37 @@ namespace lyx { // Lgb //FIXME: why do we set in stone the type here? -InsetFloat::InsetFloat(Buffer * buf, string const & type) - : InsetCollapsable(buf), name_(from_utf8(type)) +InsetFloat::InsetFloat(Buffer * buf, string params_str) + : InsetCaptionable(buf) { - setLabel(_("float: ") + floatName(type)); - params_.type = type; + string2params(params_str, params_); + setCaptionType(params_.type); } -docstring InsetFloat::name() const -{ - return "Float:" + name_; +// Enforce equality of float type and caption type. +void InsetFloat::setCaptionType(std::string const & type) +{ + InsetCaptionable::setCaptionType(type); + params_.type = captionType(); + // check if the float type exists + if (buffer().params().documentClass().floats().typeExist(params_.type)) + setNewLabel(); + else + setLabel(bformat(_("ERROR: Unknown float type: %1$s"), from_utf8(params_.type))); +} + + +docstring InsetFloat::layoutName() const +{ + return "Float:" + from_utf8(params_.type); } docstring InsetFloat::toolTip(BufferView const & bv, int x, int y) const { - if (InsetCollapsable::toolTip(bv, x, y).empty() || isOpen(bv)) - return docstring(); + if (isOpen(bv)) + return InsetCaptionable::toolTip(bv, x, y); OutputParams rp(&buffer().params().encoding()); return getCaptionText(rp); @@ -137,11 +153,12 @@ docstring InsetFloat::toolTip(BufferView const & bv, int x, int y) const void InsetFloat::doDispatch(Cursor & cur, FuncRequest & cmd) { - switch (cmd.action) { + switch (cmd.action()) { case LFUN_INSET_MODIFY: { InsetFloatParams params; string2params(to_utf8(cmd.argument()), params); + cur.recordUndoInset(this); // placement, wide and sideways are not used for subfloats if (!params_.subfloat) { @@ -149,8 +166,12 @@ void InsetFloat::doDispatch(Cursor & cur, FuncRequest & cmd) params_.wide = params.wide; params_.sideways = params.sideways; } - setNewLabel(); + if (params_.type != params.type) + setCaptionType(params.type); + // what we really want here is a TOC update, but that means + // a full buffer update + cur.forceBufferUpdate(); break; } @@ -160,7 +181,7 @@ void InsetFloat::doDispatch(Cursor & cur, FuncRequest & cmd) } default: - InsetCollapsable::doDispatch(cur, cmd); + InsetCaptionable::doDispatch(cur, cmd); break; } } @@ -169,7 +190,7 @@ void InsetFloat::doDispatch(Cursor & cur, FuncRequest & cmd) bool InsetFloat::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & flag) const { - switch (cmd.action) { + switch (cmd.action()) { case LFUN_INSET_MODIFY: case LFUN_INSET_DIALOG_UPDATE: @@ -177,53 +198,40 @@ bool InsetFloat::getStatus(Cursor & cur, FuncRequest const & cmd, return true; case LFUN_INSET_SETTINGS: - if (InsetCollapsable::getStatus(cur, cmd, flag)) { + if (InsetCaptionable::getStatus(cur, cmd, flag)) { flag.setEnabled(flag.enabled() && !params_.subfloat); return true; } else return false; + case LFUN_NEWLINE_INSERT: + if (params_.subfloat) { + flag.setEnabled(false); + return true; + } + // no subfloat: + // fall through + default: - return InsetCollapsable::getStatus(cur, cmd, flag); + return InsetCaptionable::getStatus(cur, cmd, flag); } } -void InsetFloat::updateLabels(ParIterator const & it, UpdateType utype) +bool InsetFloat::hasSubCaptions(ParIterator const & it) const { - Counters & cnts = - buffer().masterBuffer()->params().documentClass().counters(); - if (utype == OutputUpdate) { - // counters are local to the float - cnts.saveLastCounter(); - } - string const saveflt = cnts.current_float(); - bool const savesubflt = cnts.isSubfloat(); - - bool const subflt = (it.innerInsetOfType(FLOAT_CODE) - || it.innerInsetOfType(WRAP_CODE)); - // floats can only embed subfloats of their own kind - if (subflt) - params_.type = saveflt; - setSubfloat(subflt); - - // Tell to captions what the current float is - cnts.current_float(params().type); - cnts.isSubfloat(subflt); - - InsetCollapsable::updateLabels(it, utype); - - //reset afterwards - cnts.current_float(saveflt); - if (utype == OutputUpdate) - cnts.restoreLastCounter(); - cnts.isSubfloat(savesubflt); + return (it.innerInsetOfType(FLOAT_CODE) || it.innerInsetOfType(WRAP_CODE)); } void InsetFloatParams::write(ostream & os) const { - os << type << '\n'; + if (type.empty()) { + // Better this than creating a parse error. This in fact happens in the + // parameters dialog via InsetFloatParams::params2string. + os << "senseless" << '\n'; + } else + os << type << '\n'; if (!placement.empty()) os << "placement " << placement << "\n"; @@ -243,6 +251,7 @@ void InsetFloatParams::write(ostream & os) const void InsetFloatParams::read(Lexer & lex) { lex.setContext("InsetFloatParams::read"); + lex >> type; if (lex.checkFor("placement")) lex >> placement; lex >> "wide" >> wide; @@ -254,14 +263,15 @@ void InsetFloat::write(ostream & os) const { os << "Float "; params_.write(os); - InsetCollapsable::write(os); + InsetCaptionable::write(os); } void InsetFloat::read(Lexer & lex) { params_.read(lex); - InsetCollapsable::read(lex); + InsetCaptionable::read(lex); + setCaptionType(params_.type); } @@ -278,7 +288,7 @@ void InsetFloat::validate(LaTeXFeatures & features) const features.useFloat(params_.type, features.inFloat()); features.inFloat(true); - InsetCollapsable::validate(features); + InsetCaptionable::validate(features); features.inFloat(false); } @@ -293,98 +303,113 @@ docstring InsetFloat::xhtml(XHTMLStream & xs, OutputParams const & rp) const odocstringstream ods; XHTMLStream newxs(ods); newxs << html::StartTag(htmltype, attr); - InsetText::XHTMLOptions const opts = + InsetText::XHTMLOptions const opts = InsetText::WriteLabel | InsetText::WriteInnerTag; docstring deferred = InsetText::insetAsXHTML(newxs, rp, opts); newxs << html::EndTag(htmltype); - if (rp.inFloat == OutputParams::NONFLOAT) + if (rp.inFloat == OutputParams::NONFLOAT) { // In this case, this float needs to be deferred, but we'll put it // before anything the text itself deferred. deferred = ods.str() + '\n' + deferred; - else + } else { // In this case, the whole thing is already being deferred, so // we can write to the stream. - // Note that things will already have been escaped, so we do not + // Note that things will already have been escaped, so we do not // want to escape them again. - xs << XHTMLStream::NextRaw() << ods.str(); + xs << XHTMLStream::ESCAPE_NONE << ods.str(); + } return deferred; } -int InsetFloat::latex(odocstream & os, OutputParams const & runparams_in) const +void InsetFloat::latex(otexstream & os, OutputParams const & runparams_in) const { if (runparams_in.inFloat != OutputParams::NONFLOAT) { + if (!paragraphs().empty() && !runparams_in.nice) + // improve TexRow precision in non-nice mode + os << safebreakln; + if (runparams_in.moving_arg) os << "\\protect"; os << "\\subfloat"; - + OutputParams rp = runparams_in; - docstring const caption = getCaption(rp); - if (!caption.empty()) { - os << caption; - } + rp.moving_arg = true; + os << getCaption(rp); os << '{'; + // The main argument is the contents of the float. This is not a moving argument. + rp.moving_arg = false; rp.inFloat = OutputParams::SUBFLOAT; - int const i = InsetText::latex(os, rp); + InsetText::latex(os, rp); os << "}"; - - return i + 1; + + return; } OutputParams runparams(runparams_in); runparams.inFloat = OutputParams::MAINFLOAT; FloatList const & floats = buffer().params().documentClass().floats(); string tmptype = params_.type; - if (params_.sideways) + if (params_.sideways && floats.allowsSideways(params_.type)) tmptype = "sideways" + params_.type; - if (params_.wide && (!params_.sideways || - params_.type == "figure" || - params_.type == "table")) + if (params_.wide && floats.allowsWide(params_.type) + && (!params_.sideways || + params_.type == "figure" || + params_.type == "table")) tmptype += "*"; // Figure out the float placement to use. // From lowest to highest: // - float default placement // - document wide default placement // - specific float placement - string placement; + string tmpplacement; string const buf_placement = buffer().params().float_placement; string const def_placement = floats.defaultPlacement(params_.type); if (!params_.placement.empty() && params_.placement != def_placement) { - placement = params_.placement; + tmpplacement = params_.placement; } else if (params_.placement.empty() && !buf_placement.empty() && buf_placement != def_placement) { - placement = buf_placement; + tmpplacement = buf_placement; } - // The \n is used to force \begin{} to appear in a new line. - // The % is needed to prevent two consecutive \n chars in the case - // when the current output line is empty. - os << "%\n\\begin{" << from_ascii(tmptype) << '}'; + // Check if placement is allowed by this float + string const allowed_placement = + floats.allowedPlacement(params_.type); + string placement; + string::const_iterator lit = tmpplacement.begin(); + string::const_iterator end = tmpplacement.end(); + for (; lit != end; ++lit) { + if (contains(allowed_placement, *lit)) + placement += *lit; + } + + // Force \begin{} to appear in a new line. + os << breakln << "\\begin{" << from_ascii(tmptype) << '}'; + if (runparams.lastid != -1) + os.texrow().start(runparams.lastid, runparams.lastpos); // We only output placement if different from the def_placement. - // sidewaysfloats always use their own page - if (!placement.empty() && !params_.sideways) { + // sidewaysfloats always use their own page, + // therefore don't output the p option that is always set + if (!placement.empty() + && (!params_.sideways || (params_.sideways && from_ascii(placement) != "p"))) os << '[' << from_ascii(placement) << ']'; - } os << '\n'; - int const i = InsetText::latex(os, runparams); - - // The \n is used to force \end{} to appear in a new line. - // In this case, we do not case if the current output line is empty. - os << "\n\\end{" << from_ascii(tmptype) << "}\n"; + InsetText::latex(os, runparams); - return i + 4; + // Force \end{} to appear in a new line. + os << breakln << "\\end{" << from_ascii(tmptype) << "}\n"; } -int InsetFloat::plaintext(odocstream & os, OutputParams const & runparams) const +int InsetFloat::plaintext(odocstringstream & os, OutputParams const & runparams, size_t max_length) const { os << '[' << buffer().B_("float") << ' ' << floatName(params_.type) << ":\n"; - InsetText::plaintext(os, runparams); + InsetText::plaintext(os, runparams, max_length); os << "\n]"; return PLAINTEXT_NEWLINE + 1; // one char on a separate line @@ -405,7 +430,7 @@ int InsetFloat::docbook(odocstream & os, OutputParams const & runparams) const bool InsetFloat::insetAllowed(InsetCode code) const { - // The case that code == FLOAT_CODE is handled in Text3.cpp, + // The case that code == FLOAT_CODE is handled in Text3.cpp, // because we need to know what type of float is meant. switch(code) { case WRAP_CODE: @@ -413,22 +438,17 @@ bool InsetFloat::insetAllowed(InsetCode code) const case MARGIN_CODE: return false; default: - return InsetCollapsable::insetAllowed(code); + return InsetCaptionable::insetAllowed(code); } } -bool InsetFloat::showInsetDialog(BufferView * bv) const -{ - if (!InsetText::showInsetDialog(bv)) - bv->showDialog("float"); - return true; -} - - void InsetFloat::setWide(bool w, bool update_label) { - params_.wide = w; + if (!buffer().params().documentClass().floats().allowsWide(params_.type)) + params_.wide = false; + else + params_.wide = w; if (update_label) setNewLabel(); } @@ -436,7 +456,10 @@ void InsetFloat::setWide(bool w, bool update_label) void InsetFloat::setSideways(bool s, bool update_label) { - params_.sideways = s; + if (!buffer().params().documentClass().floats().allowsSideways(params_.type)) + params_.sideways = false; + else + params_.sideways = s; if (update_label) setNewLabel(); } @@ -459,31 +482,49 @@ void InsetFloat::setNewLabel() lab += floatName(params_.type); - if (params_.wide) + FloatList const & floats = buffer().params().documentClass().floats(); + + if (params_.wide && floats.allowsWide(params_.type)) lab += '*'; - if (params_.sideways) + if (params_.sideways && floats.allowsSideways(params_.type)) lab += _(" (sideways)"); setLabel(lab); } -docstring InsetFloat::getCaption(OutputParams const & runparams) const +bool InsetFloat::allowsCaptionVariation(std::string const & newtype) const { - if (paragraphs().empty()) - return docstring(); + return !params_.subfloat && newtype != "Unnumbered"; +} + +TexString InsetFloat::getCaption(OutputParams const & runparams) const +{ InsetCaption const * ins = getCaptionInset(); if (ins == 0) - return docstring(); - - odocstringstream ods; - ins->getOptArg(ods, runparams); - ods << '['; - ins->getArgument(ods, runparams); - ods << ']'; - return ods.str(); + return TexString(); + + otexstringstream os; + ins->getArgs(os, runparams); + + if (!runparams.nice) + // increase TexRow precision in non-nice mode + os << safebreakln; + os << '['; + otexstringstream os2; + ins->getArgument(os2, runparams); + TexString ts = os2.release(); + docstring & arg = ts.str; + // Protect ']' + if (arg.find(']') != docstring::npos) + arg = '{' + arg + '}'; + os << move(ts); + os << ']'; + if (!runparams.nice) + os << safebreakln; + return os.release(); } @@ -497,7 +538,6 @@ void InsetFloat::string2params(string const & in, InsetFloatParams & params) Lexer lex; lex.setStream(data); lex.setContext("InsetFloat::string2params"); - lex >> params.type; // We have to read the type here! params.read(lex); }