* BufferParams:

[lyx.git] / src / insets / insetcaption.C

diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C
index 23882afa08e6826f5435bc78d5d4b8b81c3a36b8..8fcbcc498719642386eeab326a63294f8cf00e61 100644 (file)
--- a/src/insets/insetcaption.C
+++ b/src/insets/insetcaption.C
@@ -27,7 +27,9 @@
 #include "LColor.h"
 #include "metricsinfo.h"
 #include "output_latex.h"
+#include "outputparams.h"
 #include "paragraph.h"
+#include "paragraph_funcs.h"
 #include "TocBackend.h"
 
 #include "frontends/FontMetrics.h"
@@ -121,15 +123,14 @@ void InsetCaption::addToToc(TocList & toclist, Buffer const & buf) const
 
 bool InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       mi.base.textwidth -= 2 * TEXT_TO_INSET_OFFSET;
-       if (type_.empty())
-               full_label_ = _("Senseless!!! ");
-       else {
-               docstring const number = convert<docstring>(counter_);
-               docstring label = custom_label_.empty()? _(type_): custom_label_;
-               full_label_ = bformat(from_ascii("%1$s %2$s:"), label, number);
-       }
+       int const width_offset = TEXT_TO_INSET_OFFSET / 2;
+       mi.base.textwidth -= width_offset;
+
+       computeFullLabel();
+
        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);
@@ -141,8 +142,8 @@ bool InsetCaption::metrics(MetricsInfo & mi, Dimension & dim) const
        dim.wid += textdim.wid;
        dim.asc += TEXT_TO_INSET_OFFSET;
        dim.des += TEXT_TO_INSET_OFFSET;
-       dim.wid += 2 * TEXT_TO_INSET_OFFSET;
-       mi.base.textwidth += 2 * TEXT_TO_INSET_OFFSET;
+       dim.wid += width_offset;
+       mi.base.textwidth += width_offset;
        bool const changed = dim_ != dim;
        dim_ = dim;
        return changed;
@@ -160,11 +161,19 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
        // Answer: the text inset (in buffer_funcs.C: 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;
        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);
+}
+
+
 void InsetCaption::edit(LCursor & cur, bool left)
 {
        cur.push(*this);
@@ -179,34 +188,36 @@ InsetBase * InsetCaption::editXY(LCursor & cur, int x, int y)
 }
 
 
+bool InsetCaption::insetAllowed(InsetBase::Code code) const
+{
+       switch (code) {
+       case FLOAT_CODE:
+       case TABULAR_CODE:
+       case WRAP_CODE:
+       case CAPTION_CODE:
+       case PAGEBREAK_CODE:
+               return false;
+       default:
+               return InsetText::insetAllowed(code);
+       }
+}
+
+
 bool InsetCaption::getStatus(LCursor & cur, FuncRequest const & cmd,
        FuncStatus & status) const
 {
        switch (cmd.action) {
 
-       case LFUN_CAPTION_INSERT:
-       case LFUN_FLOAT_INSERT:
-       case LFUN_FLOAT_WIDE_INSERT:
-       case LFUN_WRAP_INSERT:
-       case LFUN_PARAGRAPH_MOVE_UP:
-       case LFUN_PARAGRAPH_MOVE_DOWN:
        case LFUN_BREAK_PARAGRAPH:
        case LFUN_BREAK_PARAGRAPH_KEEP_LAYOUT:
        case LFUN_BREAK_PARAGRAPH_SKIP:
-       case LFUN_PARAGRAPH_SPACING:
-       case LFUN_PAGEBREAK_INSERT:
-       case LFUN_TABULAR_INSERT:
                status.enabled(false);
                return true;
 
-       case LFUN_INSET_INSERT: {
-               string const name = cmd.getArg(0);
-               if (name == "graphics"
-                       || name == "include") {
-               status.enabled(false);
+       case LFUN_OPTIONAL_INSERT:
+               status.enabled(numberOfOptArgs(cur.paragraph()) == 0);
                return true;
-               }
-       }
+
        default:
                return InsetText::getStatus(cur, cmd, status);
        }
@@ -214,32 +225,42 @@ bool InsetCaption::getStatus(LCursor & cur, FuncRequest const & cmd,
 
 
 int InsetCaption::latex(Buffer const & buf, odocstream & os,
-                       OutputParams const & runparams) const
+                        OutputParams const & runparams_in) const
 {
        // 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
        // \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 = true;
        os << "\\caption";
        int l = latexOptArgInsets(buf, paragraphs()[0], os, runparams, 1);
        os << '{';
        l += InsetText::latex(buf, os, runparams);
        os << "}\n";
+       runparams_in.encoding = runparams.encoding;
        return l + 1;
 }
 
 
 int InsetCaption::plaintext(Buffer const & buf, odocstream & os,
-               OutputParams const & runparams) const
+                            OutputParams const & runparams) const
 {
-       os << full_label_ << ' ';
-       return InsetText::plaintext(buf, os, runparams);
+       computeFullLabel();
+
+       os << '[' << full_label_ << "\n";
+       InsetText::plaintext(buf, os, runparams);
+       os << "\n]";
+
+       return PLAINTEXT_NEWLINE + 1; // one char on a separate line
 }
 
 
 int InsetCaption::docbook(Buffer const & buf, odocstream & os,
-                         OutputParams const & runparams) const
+                          OutputParams const & runparams) const
 {
        int ret;
        os << "<title>";
@@ -249,6 +270,18 @@ int InsetCaption::docbook(Buffer const & buf, odocstream & os,
 }
 
 
+void InsetCaption::computeFullLabel() const
+{
+       if (type_.empty())
+               full_label_ = _("Senseless!!! ");
+       else {
+               docstring const number = convert<docstring>(counter_);
+               docstring label = custom_label_.empty()? _(type_): custom_label_;
+               full_label_ = bformat(from_ascii("%1$s %2$s:"), label, number);
+       }
+}
+
+
 auto_ptr<InsetBase> InsetCaption::doClone() const
 {
        return auto_ptr<InsetBase>(new InsetCaption(*this));