X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCaption.cpp;h=bd891f6b4bc56ff01e182662a89b89bf61705b39;hb=2c357c1d23b7b83839a9beb8225d4f1ae4f793b4;hp=831032b039b31a79bd351a5cf40eb7b0d6ba396a;hpb=d3e30f8d9b68d51141290c7f4888040e9cfbaffa;p=lyx.git diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp index 831032b039..bd891f6b4b 100644 --- a/src/insets/InsetCaption.cpp +++ b/src/insets/InsetCaption.cpp @@ -16,55 +16,55 @@ #include "Buffer.h" #include "BufferParams.h" +#include "BufferView.h" #include "Counters.h" #include "Cursor.h" -#include "BufferView.h" +#include "Dimension.h" #include "Floating.h" #include "FloatList.h" #include "FuncRequest.h" #include "FuncStatus.h" -#include "gettext.h" -#include "Color.h" +#include "support/gettext.h" +#include "InsetList.h" #include "MetricsInfo.h" #include "output_latex.h" #include "OutputParams.h" #include "Paragraph.h" #include "paragraph_funcs.h" +#include "TextClass.h" #include "TocBackend.h" #include "frontends/FontMetrics.h" #include "frontends/Painter.h" #include "support/lstrings.h" -#include "support/convert.h" #include - -using std::auto_ptr; -using std::endl; -using std::string; -using std::ostream; - +using namespace std; +using namespace lyx::support; namespace lyx { -using support::bformat; InsetCaption::InsetCaption(InsetCaption const & ic) : InsetText(ic), textclass_(ic.textclass_) { setAutoBreakRows(true); setDrawFrame(true); - setFrameColor(Color::captionframe); + setFrameColor(Color_captionframe); } + InsetCaption::InsetCaption(BufferParams const & bp) : InsetText(bp), textclass_(bp.getTextClass()) { setAutoBreakRows(true); setDrawFrame(true); - setFrameColor(Color::captionframe); + setFrameColor(Color_captionframe); + //FIXME Do we need to set all paragraphs here? or will there + //always only be one? + paragraphs().back().layout(bp.getTextClass().emptyLayout()); } @@ -106,7 +106,7 @@ void InsetCaption::cursorPos(BufferView const & bv, void InsetCaption::setCustomLabel(docstring const & label) { - if (!support::isAscii(label) || label.empty()) + if (!isAscii(label) || label.empty()) // This must be a user defined layout. We cannot translate // this, since gettext accepts only ascii keys. custom_label_ = label; @@ -115,46 +115,38 @@ void InsetCaption::setCustomLabel(docstring const & label) } -void InsetCaption::addToToc(TocList & toclist, Buffer const & buf, ParConstIterator &) const +void InsetCaption::addToToc(Buffer const & buf, + ParConstIterator const & cpit) const { if (type_.empty()) return; - ParConstIterator pit = par_const_iterator_begin(*this); + ParConstIterator pit = cpit; + pit.push_back(*this); - Toc & toc = toclist[type_]; - docstring const str = convert(counter_) - + ". " + pit->asString(buf, false); + Toc & toc = buf.tocBackend().toc(type_); + docstring const str = full_label_ + ". " + pit->asString(buf, false); toc.push_back(TocItem(pit, 0, str)); } -bool InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const +void InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const { - int const width_offset = TEXT_TO_INSET_OFFSET / 2; - mi.base.textwidth -= width_offset; - - computeFullLabel(*mi.base.bv->buffer()); - + FontInfo tmpfont = mi.base.font; + mi.base.font = mi.base.bv->buffer().params().getFont().fontInfo(); labelwidth_ = theFontMetrics(mi.base.font).width(full_label_); // add some space to separate the label from the inset text labelwidth_ += 2 * TEXT_TO_INSET_OFFSET; dim.wid = labelwidth_; Dimension textdim; - InsetText::metrics(mi, textdim); - // Correct for button width, and re-fit + // Correct for button and label width mi.base.textwidth -= dim.wid; InsetText::metrics(mi, textdim); - dim.des = std::max(dim.des - textdim.asc + dim.asc, textdim.des); + mi.base.font = tmpfont; + mi.base.textwidth += dim.wid; + dim.des = max(dim.des - textdim.asc + dim.asc, textdim.des); dim.asc = textdim.asc; dim.wid += textdim.wid; - dim.asc += TEXT_TO_INSET_OFFSET; - dim.des += TEXT_TO_INSET_OFFSET; - dim.wid += width_offset; - mi.base.textwidth += width_offset; - bool const changed = dim_ != dim; - dim_ = dim; - return changed; } @@ -168,24 +160,18 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const // Answer: the text inset (in buffer_funcs.cpp: setCaption). - labelwidth_ = pi.pain.text(x, y, full_label_, pi.base.font); - // add some space to separate the label from the inset text - labelwidth_ += 2 * TEXT_TO_INSET_OFFSET; + 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); InsetText::draw(pi, x + labelwidth_, y); - setPosCache(pi, x, y); -} - - -void InsetCaption::drawSelection(PainterInfo & pi, int x, int y) const -{ - InsetText::drawSelection(pi, x + labelwidth_, y); + pi.base.font = tmpfont; } -void InsetCaption::edit(Cursor & cur, bool left) +void InsetCaption::edit(Cursor & cur, bool front, EntryDirection entry_from) { cur.push(*this); - InsetText::edit(cur, left); + InsetText::edit(cur, front, entry_from); } @@ -196,14 +182,15 @@ Inset * InsetCaption::editXY(Cursor & cur, int x, int y) } -bool InsetCaption::insetAllowed(Inset::Code code) const +bool InsetCaption::insetAllowed(InsetCode code) const { switch (code) { case FLOAT_CODE: case TABULAR_CODE: case WRAP_CODE: case CAPTION_CODE: - case PAGEBREAK_CODE: + case NEWPAGE_CODE: + case MATHMACRO_CODE: return false; default: return InsetText::insetAllowed(code); @@ -217,13 +204,12 @@ bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd, switch (cmd.action) { case LFUN_BREAK_PARAGRAPH: - case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT: case LFUN_BREAK_PARAGRAPH_SKIP: status.enabled(false); return true; case LFUN_OPTIONAL_INSERT: - status.enabled(numberOfOptArgs(cur.paragraph()) == 0); + status.enabled(cur.paragraph().insetList().find(OPTARG_CODE) == -1); return true; default: @@ -257,8 +243,6 @@ int InsetCaption::latex(Buffer const & buf, odocstream & os, int InsetCaption::plaintext(Buffer const & buf, odocstream & os, OutputParams const & runparams) const { - computeFullLabel(buf); - os << '[' << full_label_ << "\n"; InsetText::plaintext(buf, os, runparams); os << "\n]"; @@ -292,21 +276,40 @@ int InsetCaption::getOptArg(Buffer const & buf, odocstream & os, } -void InsetCaption::computeFullLabel(Buffer const & buf) const +void InsetCaption::updateLabels(Buffer const & buf, ParIterator const & it) { - if (type_.empty()) + TextClass const & tclass = buf.params().getTextClass(); + Counters & cnts = tclass.counters(); + string const & type = cnts.current_float(); + // Memorize type for addToToc(). + type_ = type; + if (type.empty()) full_label_ = buf.B_("Senseless!!! "); else { - docstring const number = convert(counter_); - docstring label = custom_label_.empty()? buf.B_(type_): custom_label_; - full_label_ = bformat(from_ascii("%1$s %2$s:"), label, number); + // FIXME: life would be _much_ simpler if listings was + // listed in Floating. + docstring name; + if (type == "listing") + name = buf.B_("Listing"); + else + name = buf.B_(tclass.floats().getType(type).name()); + if (cnts.hasCounter(from_utf8(type))) { + cnts.step(from_utf8(type)); + full_label_ = bformat(from_ascii("%1$s %2$s:"), + name, + cnts.theCounter(from_utf8(type))); + } else + full_label_ = bformat(from_ascii("%1$s #:"), name); } + + // Do the real work now. + InsetText::updateLabels(buf, it); } -auto_ptr InsetCaption::doClone() const +Inset * InsetCaption::clone() const { - return auto_ptr(new InsetCaption(*this)); + return new InsetCaption(*this); }