X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetFloat.cpp;h=c160daa4ab5476df899bfc8f7b59fe098e68adc6;hb=e5c79a43ee78192f45a9ab34873f8bb426b5f37e;hp=5d966af31ff992ee3208e17be0cd5ad6c90c4c94;hpb=f3256ee2cddabbe8d763013525c3e27f6ad0b3dc;p=lyx.git diff --git a/src/insets/InsetFloat.cpp b/src/insets/InsetFloat.cpp index 5d966af31f..c160daa4ab 100644 --- a/src/insets/InsetFloat.cpp +++ b/src/insets/InsetFloat.cpp @@ -125,18 +125,18 @@ InsetFloat::InsetFloat(Buffer * buf, string params_str) // Enforce equality of float type and caption type. void InsetFloat::setCaptionType(std::string const & type) { - InsetCaptionable::setCaptionType(type); + InsetCaptionable::setCaptionType(type); params_.type = captionType(); // check if the float type exists if (buffer().params().documentClass().floats().typeExist(params_.type)) - setLabel(_("float: ") + floatName(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); } @@ -166,6 +166,7 @@ void InsetFloat::doDispatch(Cursor & cur, FuncRequest & cmd) params_.wide = params.wide; params_.sideways = params.sideways; } + params_.alignment = params.alignment; setNewLabel(); if (params_.type != params.type) setCaptionType(params.type); @@ -203,12 +204,14 @@ bool InsetFloat::getStatus(Cursor & cur, FuncRequest const & cmd, return true; } else return false; - + case LFUN_NEWLINE_INSERT: if (params_.subfloat) { flag.setEnabled(false); return true; } + // no subfloat: + // fall through default: return InsetCaptionable::getStatus(cur, cmd, flag); @@ -222,6 +225,37 @@ bool InsetFloat::hasSubCaptions(ParIterator const & it) const } +string InsetFloat::getAlignment() const +{ + string alignment; + string const buf_alignment = buffer().params().float_alignment; + if (params_.alignment == "document" + && !buf_alignment.empty()) { + alignment = buf_alignment; + } else if (!params_.alignment.empty() + && params_.alignment != "class" + && params_.alignment != "document") { + alignment = params_.alignment; + } + return alignment; +} + + +LyXAlignment InsetFloat::contentAlignment() const +{ + LyXAlignment align = LYX_ALIGN_NONE; + string alignment = getAlignment(); + if (alignment == "left") + align = LYX_ALIGN_LEFT; + else if (alignment == "center") + align = LYX_ALIGN_CENTER; + else if (alignment == "right") + align = LYX_ALIGN_RIGHT; + + return align; +} + + void InsetFloatParams::write(ostream & os) const { if (type.empty()) { @@ -233,6 +267,8 @@ void InsetFloatParams::write(ostream & os) const if (!placement.empty()) os << "placement " << placement << "\n"; + if (!alignment.empty()) + os << "alignment " << alignment << "\n"; if (wide) os << "wide true\n"; @@ -252,6 +288,8 @@ void InsetFloatParams::read(Lexer & lex) lex >> type; if (lex.checkFor("placement")) lex >> placement; + if (lex.checkFor("alignment")) + lex >> alignment; lex >> "wide" >> wide; lex >> "sideways" >> sideways; } @@ -301,7 +339,7 @@ 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); @@ -313,7 +351,7 @@ docstring InsetFloat::xhtml(XHTMLStream & xs, OutputParams const & rp) const } 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::ESCAPE_NONE << ods.str(); } @@ -324,17 +362,19 @@ docstring InsetFloat::xhtml(XHTMLStream & xs, OutputParams const & rp) 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; rp.moving_arg = true; - getCaption(os, rp); + os << getCaption(rp); os << '{'; // The main argument is the contents of the float. This is not a moving argument. - if (!paragraphs().empty()) - os.texrow().forceStart(paragraphs()[0].id(), 0); rp.moving_arg = false; rp.inFloat = OutputParams::SUBFLOAT; InsetText::latex(os, rp); @@ -362,13 +402,14 @@ void InsetFloat::latex(otexstream & os, OutputParams const & runparams_in) const 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) { - tmpplacement = params_.placement; - } else if (params_.placement.empty() - && !buf_placement.empty() - && buf_placement != def_placement) { + if (params_.placement == "document" + && !buf_placement.empty() + && buf_placement != def_placement) { tmpplacement = buf_placement; + } else if (!params_.placement.empty() + && params_.placement != "document" + && params_.placement != def_placement) { + tmpplacement = params_.placement; } // Check if placement is allowed by this float @@ -387,15 +428,29 @@ void InsetFloat::latex(otexstream & os, OutputParams const & runparams_in) const 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'; + string alignment = getAlignment(); + if (alignment == "left") + os << "\\raggedright" << breakln; + else if (alignment == "center") + os << "\\centering" << breakln; + else if (alignment == "right") + os << "\\raggedleft" << breakln; + InsetText::latex(os, runparams); // Force \end{} to appear in a new line. os << breakln << "\\end{" << from_ascii(tmptype) << "}\n"; + + // A new paragraph is always started after a float. Hence, simulate a + // blank line so that os.afterParbreak() returns true (see bug 11174). + os.lastChar('\n'); } @@ -424,7 +479,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: @@ -494,27 +549,18 @@ bool InsetFloat::allowsCaptionVariation(std::string const & newtype) const } -docstring InsetFloat::getCaption(OutputParams const & runparams) const -{ - odocstringstream ods; - otexstream os(ods); - getCaption(os, runparams); - return ods.str(); -} - - -void InsetFloat::getCaption(otexstream & os, - OutputParams const & runparams) const +TexString InsetFloat::getCaption(OutputParams const & runparams) const { - if (paragraphs().empty()) - return; - InsetCaption const * ins = getCaptionInset(); if (ins == 0) - return; + 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); @@ -525,6 +571,9 @@ void InsetFloat::getCaption(otexstream & os, arg = '{' + arg + '}'; os << move(ts); os << ']'; + if (!runparams.nice) + os << safebreakln; + return os.release(); }