X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCaption.cpp;h=b1c4e08d1a4b1a9c0b51763c16c95db3ff32ff61;hb=dbb1ac30e9a87007af7c53f0f93ec9e21826f90b;hp=db95f060b98095494b7b86f53ec886dba7607a4f;hpb=2b9e44cb0110201ca4d6320266e6550160ee99b3;p=lyx.git diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp index db95f060b9..b1c4e08d1a 100644 --- a/src/insets/InsetCaption.cpp +++ b/src/insets/InsetCaption.cpp @@ -28,9 +28,11 @@ #include "Language.h" #include "MetricsInfo.h" #include "output_latex.h" +#include "output_xhtml.h" #include "OutputParams.h" #include "Paragraph.h" #include "TextClass.h" +#include "TextMetrics.h" #include "TocBackend.h" #include "frontends/FontMetrics.h" @@ -47,12 +49,12 @@ using namespace lyx::support; namespace lyx { -InsetCaption::InsetCaption(Buffer const & buf) +InsetCaption::InsetCaption(Buffer * buf) : InsetText(buf, InsetText::PlainLayout) { setAutoBreakRows(true); setDrawFrame(true); - setFrameColor(Color_captionframe); + setFrameColor(Color_collapsableframe); } @@ -63,15 +65,11 @@ void InsetCaption::write(ostream & os) const } -void InsetCaption::read(Lexer & lex) +docstring InsetCaption::layoutName() const { -#if 0 - // We will enably this check again when the compability - // code is removed from Buffer::Read (Lgb) - lex.setContext("InsetCaption::Read: consistency check"); - lex >> "Caption"; -#endif - InsetText::read(lex); + if (type_.empty()) + return from_ascii("Caption"); + return from_utf8("Caption:" + type_); } @@ -94,16 +92,17 @@ void InsetCaption::setCustomLabel(docstring const & label) } -void InsetCaption::addToToc(DocIterator const & cpit) +void InsetCaption::addToToc(DocIterator const & cpit) const { if (type_.empty()) return; DocIterator pit = cpit; - pit.push_back(CursorSlice(*this)); + pit.push_back(CursorSlice(const_cast(*this))); Toc & toc = buffer().tocBackend().toc(type_); - docstring const str = full_label_ + ". " + text().getPar(0).asString(); + docstring str = full_label_ + ". "; + text().forToc(str, TOC_ENTRY_LENGTH); toc.push_back(TocItem(pit, 0, str)); // Proceed with the rest of the inset. @@ -131,6 +130,15 @@ void InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const } +void InsetCaption::drawBackground(PainterInfo & pi, int x, int y) const +{ + TextMetrics & tm = pi.base.bv->textMetrics(&text()); + int const h = tm.height() + 2 * TEXT_TO_INSET_OFFSET; + int const yy = y - TEXT_TO_INSET_OFFSET - tm.ascent(); + pi.pain.fillRectangle(x, yy, labelwidth_, h, pi.backgroundColor(this)); +} + + void InsetCaption::draw(PainterInfo & pi, int x, int y) const { // We must draw the label, we should get the label string @@ -143,7 +151,9 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const FontInfo tmpfont = pi.base.font; pi.base.font = pi.base.bv->buffer().params().getFont().fontInfo(); - pi.pain.text(x, y, full_label_, pi.base.font); + pi.base.font.setColor(pi.textColor(pi.base.font.color()).baseColor); + int const xx = x + TEXT_TO_INSET_OFFSET; + pi.pain.text(xx, y, full_label_, pi.base.font); InsetText::draw(pi, x + labelwidth_, y); pi.base.font = tmpfont; } @@ -166,12 +176,15 @@ Inset * InsetCaption::editXY(Cursor & cur, int x, int y) bool InsetCaption::insetAllowed(InsetCode code) const { switch (code) { - case FLOAT_CODE: - case TABULAR_CODE: - case WRAP_CODE: + // code that is not allowed in a caption case CAPTION_CODE: + case FLOAT_CODE: + case FOOT_CODE: case NEWPAGE_CODE: + case MARGIN_CODE: case MATHMACRO_CODE: + case TABULAR_CODE: + case WRAP_CODE: return false; default: return InsetText::insetAllowed(code); @@ -182,14 +195,14 @@ bool InsetCaption::insetAllowed(InsetCode code) const bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd, FuncStatus & status) const { - switch (cmd.action) { + switch (cmd.action()) { - case LFUN_BREAK_PARAGRAPH: + case LFUN_PARAGRAPH_BREAK: status.setEnabled(false); return true; - case LFUN_OPTIONAL_INSERT: - status.setEnabled(cur.paragraph().insetList().find(OPTARG_CODE) == -1); + case LFUN_ARGUMENT_INSERT: + status.setEnabled(cur.paragraph().insetList().find(ARG_CODE) == -1); return true; case LFUN_INSET_TOGGLE: @@ -203,12 +216,12 @@ bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd, } -int InsetCaption::latex(odocstream & os, - OutputParams const & runparams_in) const +void InsetCaption::latex(otexstream & os, + OutputParams const & runparams_in) const { if (runparams_in.inFloat == OutputParams::SUBFLOAT) // caption is output as an optional argument - return 0; + return; // This is a bit too simplistic to take advantage of // caption options we must add more later. (Lgb) // This code is currently only able to handle the simple @@ -219,12 +232,11 @@ int InsetCaption::latex(odocstream & os, // optional argument. runparams.moving_arg = true; os << "\\caption"; - int l = latexOptArgInsets(paragraphs()[0], os, runparams, 1); + latexArgInsets(paragraphs()[0], os, runparams, 0, 1); os << '{'; - l += InsetText::latex(os, runparams); + InsetText::latex(os, runparams); os << "}\n"; runparams_in.encoding = runparams.encoding; - return l + 1; } @@ -250,28 +262,32 @@ int InsetCaption::docbook(odocstream & os, } -docstring InsetCaption::xhtml(odocstream & os, - OutputParams const & rp) const +docstring InsetCaption::xhtml(XHTMLStream & xs, OutputParams const & rp) const { - if (rp.disable_captions) + if (rp.html_disable_captions) return docstring(); - os << "
\n"; - docstring def = getCaptionAsHTML(os, rp); - os << "
\n"; + string attr = "class='float-caption"; + if (!type_.empty()) + attr += " float-caption-" + type_; + attr += "'"; + xs << html::StartTag("div", attr); + docstring def = getCaptionAsHTML(xs, rp); + xs << html::EndTag("div"); return def; } -int InsetCaption::getArgument(odocstream & os, + +void InsetCaption::getArgument(otexstream & os, OutputParams const & runparams) const { - return InsetText::latex(os, runparams); + InsetText::latex(os, runparams); } -int InsetCaption::getOptArg(odocstream & os, +void InsetCaption::getOptArg(otexstream & os, OutputParams const & runparams) const { - return latexOptArgInsets(paragraphs()[0], os, runparams, 1); + latexArgInsets(paragraphs()[0], os, runparams, 0, 1); } @@ -283,21 +299,27 @@ int InsetCaption::getCaptionAsPlaintext(odocstream & os, } -docstring InsetCaption::getCaptionAsHTML(odocstream & os, +docstring InsetCaption::getCaptionAsHTML(XHTMLStream & xs, OutputParams const & runparams) const { - os << full_label_ << ' '; - return InsetText::xhtml(os, runparams); + xs << full_label_ << ' '; + InsetText::XHTMLOptions const opts = + InsetText::WriteLabel | InsetText::WriteInnerTag; + return InsetText::insetAsXHTML(xs, runparams, opts); } -void InsetCaption::updateLabels(ParIterator const & it) +void InsetCaption::updateBuffer(ParIterator const & it, UpdateType utype) { Buffer const & master = *buffer().masterBuffer(); DocumentClass const & tclass = master.params().documentClass(); string const & lang = it.paragraph().getParLanguage(master.params())->code(); Counters & cnts = tclass.counters(); string const & type = cnts.current_float(); + if (utype == OutputUpdate) { + // counters are local to the caption + cnts.saveLastCounter(); + } // Memorize type for addToToc(). type_ = type; if (type.empty()) @@ -317,7 +339,7 @@ void InsetCaption::updateLabels(ParIterator const & it) master.B_(tclass.floats().getType(type).name())); } if (cnts.hasCounter(counter)) { - cnts.step(counter); + cnts.step(counter, utype); full_label_ = bformat(from_ascii("%1$s %2$s:"), name, cnts.theCounter(counter, lang)); @@ -326,7 +348,9 @@ void InsetCaption::updateLabels(ParIterator const & it) } // Do the real work now. - InsetText::updateLabels(it); + InsetText::updateBuffer(it, utype); + if (utype == OutputUpdate) + cnts.restoreLastCounter(); }