InsetPhantom::latex(): use a switch

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

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index aaf06286f9abf3ee1f685b9b52ae5496d1f4e32b..ee0c3e0d1d24587325b226c43e2953456fff76ec 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -62,11 +62,9 @@ InsetCaption::InsetCaption(Buffer * buf, string const & type)
 void InsetCaption::write(ostream & os) const
 {
        os << "Caption";
-       if (!type_.empty()) {
-               os << " "
-                  << type_;
-       }
-       os << "\n";
+       if (!type_.empty())
+               os << ' ' << type_;
+       os << '\n';
        text().write(os);
 }
 
@@ -89,12 +87,7 @@ void InsetCaption::cursorPos(BufferView const & bv,
 
 void InsetCaption::setCustomLabel(docstring const & label)
 {
-       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;
-       else
-               custom_label_ = _(to_ascii(label));
+       custom_label_ = translateIfPossible(label);
 }
 
 
@@ -109,7 +102,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.
@@ -204,9 +197,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();
@@ -234,8 +225,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(
@@ -245,10 +235,6 @@ bool InsetCaption::getStatus(Cursor & cur, FuncRequest const & cmd,
                return InsetText::getStatus(cur, cmd, status);
        }
 
-       case LFUN_PARAGRAPH_BREAK:
-               status.setEnabled(false);
-               return true;
-
        case LFUN_INSET_TOGGLE:
                // pass back to owner
                cur.undispatched();
@@ -272,9 +258,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)
@@ -310,7 +293,7 @@ docstring InsetCaption::xhtml(XHTMLStream & xs, OutputParams const & rp) const
        if (rp.html_disable_captions)
                return docstring();
        InsetLayout const & il = getLayout();
-       string const tag = il.htmltag();
+       string const & tag = il.htmltag();
        string attr = il.htmlattr();
        if (!type_.empty()) {
                string const our_class = "float-caption-" + type_;
@@ -334,7 +317,7 @@ void InsetCaption::getArgument(otexstream & os,
 
        if (!il.leftdelim().empty())
                os << il.leftdelim();
-  
+ 
        OutputParams rp = runparams;
        if (isPassThru())
                rp.pass_thru = true;
@@ -367,7 +350,7 @@ docstring InsetCaption::getCaptionAsHTML(XHTMLStream & xs,
                        OutputParams const & runparams) const
 {
        xs << full_label_ << ' ';
-       InsetText::XHTMLOptions const opts = 
+       InsetText::XHTMLOptions const opts =
                InsetText::WriteLabel | InsetText::WriteInnerTag;
        return InsetText::insetAsXHTML(xs, runparams, opts);
 }
@@ -405,14 +388,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);