Request buffer update rather than do it.

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

diff --git a/src/insets/InsetCaptionable.cpp b/src/insets/InsetCaptionable.cpp
index f90776ab0408541f1dd672470239359efbd7ac97..467106fa43e3e10888b7d68e633a4ca03aa5e96a 100644 (file)
--- a/src/insets/InsetCaptionable.cpp
+++ b/src/insets/InsetCaptionable.cpp
@@ -15,13 +15,19 @@
 
 #include "InsetCaptionable.h"
 
+#include "InsetCaption.h"
+
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "FloatList.h"
+#include "InsetList.h"
+#include "output_xhtml.h"
 #include "TextClass.h"
 #include "TocBackend.h"
 
+#include "support/docstream.h"
+
 using namespace std;
 
 
@@ -40,23 +46,72 @@ docstring InsetCaptionable::floatName(string const & type) const
        BufferParams const & bp = buffer().params();
        FloatList const & floats = bp.documentClass().floats();
        FloatList::const_iterator it = floats[type];
-       // FIXME UNICODE
-       return (it == floats.end()) ? from_ascii(type) : bp.B_(it->second.name());
+       return (it == floats.end()) ? from_utf8(type) : bp.B_(it->second.name());
+}
+
+
+InsetCaption const * InsetCaptionable::getCaptionInset() const
+{
+       ParagraphList::const_iterator pit = paragraphs().begin();
+       for (; pit != paragraphs().end(); ++pit) {
+               InsetList::const_iterator it = pit->insetList().begin();
+               for (; it != pit->insetList().end(); ++it) {
+                       Inset & inset = *it->inset;
+                       if (inset.lyxCode() == CAPTION_CODE) {
+                               InsetCaption const * ins =
+                                       static_cast<InsetCaption const *>(it->inset);
+                               return ins;
+                       }
+               }
+       }
+       return 0;
+}
+
+
+docstring InsetCaptionable::getCaptionText(OutputParams const & runparams) const
+{
+       InsetCaption const * ins = getCaptionInset();
+       if (ins == 0)
+               return docstring();
+
+       odocstringstream ods;
+       ins->getCaptionAsPlaintext(ods, runparams);
+       return ods.str();
+}
+
+
+docstring InsetCaptionable::getCaptionHTML(OutputParams const & runparams) const
+{
+       InsetCaption const * ins = getCaptionInset();
+       if (ins == 0)
+               return docstring();
+
+       odocstringstream ods;
+       XHTMLStream xs(ods);
+       docstring def = ins->getCaptionAsHTML(xs, runparams);
+       if (!def.empty())
+               // should already have been escaped
+               xs << XHTMLStream::ESCAPE_NONE << def << '\n';
+       return ods.str();
 }
 
 
-void InsetCaptionable::addToToc(DocIterator const & cpit, bool output_active) const
+void InsetCaptionable::addToToc(DocIterator const & cpit, bool output_active,
+                                                               UpdateType utype, TocBackend & backend) const
 {
        DocIterator pit = cpit;
        pit.push_back(CursorSlice(const_cast<InsetCaptionable &>(*this)));
        docstring str;
-       int length = output_active ? INT_MAX : TOC_ENTRY_LENGTH;
-       text().forOutliner(str, length);
-       shared_ptr<TocBuilder> b = buffer().tocBackend().builder(caption_type_);
-       b->pushItem(pit, str, output_active);
+       // Leave str empty if we generate for output (e.g. xhtml lists of figures).
+       // This ensures that there is a caption if and only if the string is
+       // non-empty.
+       if (utype != OutputUpdate)
+               text().forOutliner(str, TOC_ENTRY_LENGTH);
+       TocBuilder & b = backend.builder(caption_type_);
+       b.pushItem(pit, str, output_active);
        // Proceed with the rest of the inset.
-       InsetCollapsable::addToToc(cpit, output_active);
-       b->pop();
+       InsetCollapsible::addToToc(cpit, output_active, utype, backend);
+       b.pop();
 }
 
 void InsetCaptionable::updateBuffer(ParIterator const & it, UpdateType utype)
@@ -76,7 +131,7 @@ void InsetCaptionable::updateBuffer(ParIterator const & it, UpdateType utype)
        // Tell captions what the current float is
        cnts.current_float(caption_type_);
        cnts.isSubfloat(subflt);
-       InsetCollapsable::updateBuffer(it, utype);
+       InsetCollapsible::updateBuffer(it, utype);
        // Restore counters
        cnts.current_float(saveflt);
        if (utype == OutputUpdate)
@@ -87,7 +142,7 @@ void InsetCaptionable::updateBuffer(ParIterator const & it, UpdateType utype)
 
 bool InsetCaptionable::insetAllowed(InsetCode c) const
 {
-       return (c == CAPTION_CODE) || InsetCollapsable::insetAllowed(c);
+       return (c == CAPTION_CODE) || InsetCollapsible::insetAllowed(c);
 }