Restore XHTML output for InsetListings.

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

diff --git a/src/insets/InsetOptArg.cpp b/src/insets/InsetOptArg.cpp
index d6a85574bb3e74c21f5b0486036159416c7f7aa8..544b213aae429c09962ba4722de736badd0db1af 100644 (file)
--- a/src/insets/InsetOptArg.cpp
+++ b/src/insets/InsetOptArg.cpp
@@ -12,87 +12,55 @@
 
 #include "InsetOptArg.h"
 
-#include "debug.h"
-#include "gettext.h"
-#include "Color.h"
-#include "Paragraph.h"
-
-#include <sstream>
+#include "support/debug.h"
+#include "support/docstream.h"
+#include "support/gettext.h"
 
+using namespace std;
 
 namespace lyx {
 
-using std::string;
-using std::auto_ptr;
-using std::ostream;
-using std::ostringstream;
-
-
-InsetOptArg::InsetOptArg(BufferParams const & ins)
-       : InsetCollapsable(ins)
-{
-       LyXFont font(LyXFont::ALL_SANE);
-       font.setColor(Color::collapsable);
-       setLabelFont(font);
-       setLabel(_("opt"));
-}
-
 
-InsetOptArg::InsetOptArg(InsetOptArg const & in)
-       : InsetCollapsable(in)
-{
-       LyXFont font(LyXFont::ALL_SANE);
-       font.setColor(Color::collapsable);
-       setLabelFont(font);
-       setLabel(_("opt"));
-}
+InsetOptArg::InsetOptArg(Buffer * buf)
+       : InsetCollapsable(buf)
+{}
 
 
-auto_ptr<InsetBase> InsetOptArg::doClone() const
-{
-       return auto_ptr<InsetBase>(new InsetOptArg(*this));
-}
-
-
-docstring const InsetOptArg::editMessage() const
-{
-       return _("Opened Optional Argument Inset");
-}
-
-
-void InsetOptArg::write(Buffer const & buf, ostream & os) const
+void InsetOptArg::write(ostream & os) const
 {
        os << "OptArg" << "\n";
-       InsetCollapsable::write(buf, os);
+       InsetCollapsable::write(os);
 }
 
 
-int InsetOptArg::latex(Buffer const &, odocstream &,
-                       OutputParams const &) const
+int InsetOptArg::latex(odocstream &, OutputParams const &) const
 {
        return 0;
 }
 
 
-int InsetOptArg::plaintext(Buffer const &, odocstream &,
-                           OutputParams const &) const
+int InsetOptArg::plaintext(odocstream &, OutputParams const &) const
 {
        return 0; // do not output optional arguments
 }
 
 
-int InsetOptArg::docbook(Buffer const &, odocstream &,
-                         OutputParams const &) const
+int InsetOptArg::docbook(odocstream &, OutputParams const &) const
 {
        return 0;
 }
 
 
-int InsetOptArg::latexOptional(Buffer const & buf, odocstream & os,
+docstring InsetOptArg::xhtml(XHTMLStream &, OutputParams const &) const
+{
+       return docstring();
+}
+
+int InsetOptArg::latexOptional(odocstream & os,
                               OutputParams const & runparams) const
 {
        odocstringstream ss;
-       int ret = InsetText::latex(buf, ss, runparams);
+       int ret = InsetText::latex(ss, runparams);
        docstring str = ss.str();
        if (str.find(']') != docstring::npos)
                str = '{' + str + '}';