Get rid of xmlize, bringing no advantage over escapeString.

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

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index 3f1aebf99e103c923260159f5e32912ce8b70874..029162563af3ea888f04c855cea090d303aa69ac 100644 (file)
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -25,7 +25,9 @@
 #include "FuncStatus.h"
 #include "InsetList.h"
 #include "Language.h"
+#include "LyXRC.h"
 #include "MetricsInfo.h"
+#include "xml.h"
 #include "output_latex.h"
 #include "output_xhtml.h"
 #include "OutputParams.h"
@@ -152,7 +154,7 @@ void InsetCaption::draw(PainterInfo & pi, int x, int y) const
        pi.base.font.setColor(pi.textColor(pi.base.font.color()).baseColor);
        if (is_deleted_)
                pi.base.font.setStrikeout(FONT_ON);
-       else if (isChanged())
+       else if (isChanged() && lyxrc.ct_additions_underlined)
                pi.base.font.setUnderbar(FONT_ON);
        int const xx = x + leftOffset(pi.base.bv);
        pi.pain.text(xx, y, full_label_, pi.base.font);
@@ -290,18 +292,13 @@ int InsetCaption::plaintext(odocstringstream & os,
 }
 
 
-int InsetCaption::docbook(odocstream & os,
-                         OutputParams const & runparams) const
+void InsetCaption::docbook(XMLStream &, OutputParams const &) const
 {
-       int ret;
-       os << "<title>";
-       ret = InsetText::docbook(os, runparams);
-       os << "</title>\n";
-       return ret;
+       // This function should never be called (rather InsetFloat::docbook, the titles should be skipped in floats).
 }
 
 
-docstring InsetCaption::xhtml(XHTMLStream & xs, OutputParams const & rp) const
+docstring InsetCaption::xhtml(XMLStream & xs, OutputParams const & rp) const
 {
        if (rp.html_disable_captions)
                return docstring();
@@ -316,9 +313,9 @@ docstring InsetCaption::xhtml(XHTMLStream & xs, OutputParams const & rp) const
                else
                        attr = attr + " class='" + our_class + "'";
        }
-       xs << html::StartTag(tag, attr);
+       xs << xml::StartTag(tag, attr);
        docstring def = getCaptionAsHTML(xs, rp);
-       xs << html::EndTag(tag);
+       xs << xml::EndTag(tag);
        return def;
 }
 
@@ -363,7 +360,20 @@ int InsetCaption::getCaptionAsPlaintext(odocstream & os,
 }
 
 
-docstring InsetCaption::getCaptionAsHTML(XHTMLStream & xs,
+void InsetCaption::getCaptionAsDocBook(XMLStream & xs,
+                                                                                OutputParams const & runparams) const
+{
+       if (runparams.docbook_in_float)
+               return;
+
+       // Ignore full_label_, as the DocBook processor will deal with the numbering.
+       InsetText::XHTMLOptions const opts =
+                       InsetText::WriteLabel | InsetText::WriteInnerTag;
+       InsetText::docbook(xs, runparams, opts);
+}
+
+
+docstring InsetCaption::getCaptionAsHTML(XMLStream & xs,
                        OutputParams const & runparams) const
 {
        xs << full_label_ << ' ';