Added inset-select-all to emacs bindings

[lyx.git] / src / insets / InsetCaption.cpp

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 13ecb4bccd3c4deecf7c6b9246140347e8b3d4e5..8af9827b3ade32b94490b1641fbe4c67dbc6ab25 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -104,7 +104,7 @@ void InsetCaption::addToToc(DocIterator const & cpit, bool output_active) const
        Toc & toc = buffer().tocBackend().toc(floattype_);
        docstring str = full_label_;
        int length = output_active ? INT_MAX : TOC_ENTRY_LENGTH;
-       text().forToc(str, length);
+       text().forOutliner(str, length);
        toc.push_back(TocItem(pit, 0, str, output_active));
 
        // Proceed with the rest of the inset.
@@ -199,9 +199,7 @@ void InsetCaption::doDispatch(Cursor & cur, FuncRequest & cmd)
        switch (cmd.action()) {
 
        case LFUN_INSET_MODIFY: {
-               string const first_arg = cmd.getArg(0);
-               bool const change_type = first_arg == "changetype";
-               if (change_type) {
+               if (cmd.getArg(0) == "changetype") {
                        cur.recordUndoInset(ATOMIC_UNDO, this);
                        type_ = cmd.getArg(1);
                        cur.forceBufferUpdate();
@@ -229,8 +227,7 @@ bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd,
                        bool varia = type != "LongTableNoNumber";
                        // check if the immediate parent inset allows caption variation
                        if (cur.depth() > 1) {
-                               if (&cur[cur.depth() - 2].inset())
-                                       varia = cur[cur.depth() - 2].inset().allowsCaptionVariation(type);
+                               varia = cur[cur.depth() - 2].inset().allowsCaptionVariation(type);
                        }
                        status.setEnabled(varia
                                          && buffer().params().documentClass().hasInsetLayout(
@@ -267,9 +264,6 @@ void InsetCaption::latex(otexstream & os,
        // \caption{...}, later we will make it take advantage
        // of the one of the caption packages. (Lgb)
        OutputParams runparams = runparams_in;
-       // FIXME: actually, it is moving only when there is no
-       // optional argument.
-       runparams.moving_arg = !runparams.inTableCell;
        InsetText::latex(os, runparams);
        // Backwards compatibility: We always had a linebreak after
        // the caption (see #8514)
@@ -400,14 +394,19 @@ void InsetCaption::updateBuffer(ParIterator const & it, UpdateType utype)
                                       master.B_(tclass.floats().getType(type).name()));
                }
                docstring sec;
+               docstring const lstring = getLayout().labelstring();
+               docstring const labelstring = isAscii(lstring) ?
+                               master.B_(to_ascii(lstring)) : lstring;
                if (cnts.hasCounter(counter)) {
-                       cnts.step(counter, utype);
+                       // for longtables, we step the counter upstream
+                       if (!cnts.isLongtable())
+                               cnts.step(counter, utype);
                        sec = cnts.theCounter(counter, lang);
                }
-               if (getLayout().labelstring() != master.B_("standard")) {
+               if (labelstring != master.B_("standard")) {
                        if (!sec.empty())
                                sec += from_ascii(" ");
-                       sec += bformat(from_ascii("(%1$s)"), getLayout().labelstring());
+                       sec += bformat(from_ascii("(%1$s)"), labelstring);
                }
                if (!sec.empty())
                        full_label_ = bformat(from_ascii("%1$s %2$s:"), name, sec);