Rename XHTMLStream to XMLStream, move it to another file, and prepare for DocBook...

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

diff --git a/src/insets/InsetCaptionable.cpp b/src/insets/InsetCaptionable.cpp
index 94326f4c352a6755a18b6a98fd45d2bd38fdda76..61c9acc3b8ac492aa97ad84f2c3339d741fab7a3 100644 (file)
--- a/src/insets/InsetCaptionable.cpp
+++ b/src/insets/InsetCaptionable.cpp
@@ -87,17 +87,17 @@ docstring InsetCaptionable::getCaptionHTML(OutputParams const & runparams) const
                return docstring();
 
        odocstringstream ods;
-       XHTMLStream xs(ods);
+       XMLStream xs(ods);
        docstring def = ins->getCaptionAsHTML(xs, runparams);
        if (!def.empty())
                // should already have been escaped
-               xs << XHTMLStream::ESCAPE_NONE << def << '\n';
+               xs << XMLStream::ESCAPE_NONE << def << '\n';
        return ods.str();
 }
 
 
 void InsetCaptionable::addToToc(DocIterator const & cpit, bool output_active,
-                                                               UpdateType utype) const
+                                                               UpdateType utype, TocBackend & backend) const
 {
        DocIterator pit = cpit;
        pit.push_back(CursorSlice(const_cast<InsetCaptionable &>(*this)));
@@ -107,14 +107,14 @@ void InsetCaptionable::addToToc(DocIterator const & cpit, bool output_active,
        // non-empty.
        if (utype != OutputUpdate)
                text().forOutliner(str, TOC_ENTRY_LENGTH);
-       TocBuilder & b = buffer().tocBackend().builder(caption_type_);
+       TocBuilder & b = backend.builder(caption_type_);
        b.pushItem(pit, str, output_active);
        // Proceed with the rest of the inset.
-       InsetCollapsable::addToToc(cpit, output_active, utype);
+       InsetCollapsible::addToToc(cpit, output_active, utype, backend);
        b.pop();
 }
 
-void InsetCaptionable::updateBuffer(ParIterator const & it, UpdateType utype)
+void InsetCaptionable::updateBuffer(ParIterator const & it, UpdateType utype, bool const deleted)
 {
        Counters & cnts =
                buffer().masterBuffer()->params().documentClass().counters();
@@ -131,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, deleted);
        // Restore counters
        cnts.current_float(saveflt);
        if (utype == OutputUpdate)
@@ -142,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);
 }