Some real easy ones.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@29985 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/HTML/HTML.notes b/development/HTML/HTML.notes
index b3c16df17aeca99e00548d0e8d1cc01baecca933..d44a5941fca39cd297faf66287f47790e4ebc7f7 100644 (file)
--- a/development/HTML/HTML.notes
+++ b/development/HTML/HTML.notes
@@ -13,8 +13,8 @@ These insets are basically done, though there are probably issues here and there
        Branch, Collapsable, Footnote, Hyperlink, Label, Line, Note, 
        Newline, Newpage, Quotes, Space, SpecialChar
 
-These insets probably do nothing:
-       OptArg, Phantom
+These insets do nothing for XHTML:
+       ERT, OptArg, Phantom
 
 These insets work but still need work:
        InsetBox: We need a Length::asHTML() method and the like, but it basically works.
@@ -33,8 +33,6 @@ These do not yet work and need some attention:
                Maybe for the beginning, we should just do everything numerically, but even
                that will need a bit of work. Validation is our friend, presumably.
        InsetCommand: By default does nothing. That may be right?
-       InsetERT: It's not entirely clear what it's best to do here. Maybe output it
-               verbatim. Perhaps wrapped in some CSS. (What else would one expect?)
        InsetExternal: I don't understand these so am not sure what to do.
        InsetFloat: This will need some work, again because I do not really understand
                what these are meant to do. Presumably, we'll just use a div or something, but

diff --git a/src/insets/InsetERT.cpp b/src/insets/InsetERT.cpp
index bd59d14072c7fea2e37af3b9ac9b5bac35797f04..5376c71f4d00c72b144086de32c462fa797085dc 100644 (file)
--- a/src/insets/InsetERT.cpp
+++ b/src/insets/InsetERT.cpp
@@ -81,6 +81,12 @@ int InsetERT::plaintext(odocstream &, OutputParams const &) const
 }
 
 
+int InsetERT::xhtml(odocstream &, OutputParams const &) const
+{
+       return 0; // do not output TeX code
+}
+
+
 int InsetERT::docbook(odocstream & os, OutputParams const &) const
 {
        // FIXME can we do the same thing here as for LaTeX?

diff --git a/src/insets/InsetERT.h b/src/insets/InsetERT.h
index 1015e2f8ce1f9da8597fe47c32e9f3669f27836e..5e7d2f14382bb2d1f80d1e98567af1fce888d68a 100644 (file)
--- a/src/insets/InsetERT.h
+++ b/src/insets/InsetERT.h
@@ -57,6 +57,8 @@ private:
        ///
        int docbook(odocstream &, OutputParams const &) const;
        ///
+       int xhtml(odocstream &, OutputParams const &) const;
+       ///
        void validate(LaTeXFeatures &) const {}
        ///
        bool showInsetDialog(BufferView *) const;

diff --git a/src/insets/InsetOptArg.cpp b/src/insets/InsetOptArg.cpp
index d6a08f0bb32f21883391d01a735270a64bf99f4d..879db43b6880996fe1c34b4dd053b88c82efe7d9 100644 (file)
--- a/src/insets/InsetOptArg.cpp
+++ b/src/insets/InsetOptArg.cpp
@@ -57,6 +57,12 @@ int InsetOptArg::docbook(odocstream &, OutputParams const &) const
 }
 
 
+int InsetOptArg::xhtml(odocstream &, OutputParams const &) const
+{
+       return 0;
+}
+
+
 int InsetOptArg::latexOptional(odocstream & os,
                               OutputParams const & runparams) const
 {

diff --git a/src/insets/InsetOptArg.h b/src/insets/InsetOptArg.h
index 740564c31ce16e3484881a2f1776139a5957ea87..3cbaf55f9a51f067878283343956cea4dabdd08a 100644 (file)
--- a/src/insets/InsetOptArg.h
+++ b/src/insets/InsetOptArg.h
@@ -47,6 +47,8 @@ private:
        int plaintext(odocstream &, OutputParams const &) const;
        /// Standard DocBook output -- short-circuited
        int docbook(odocstream &, OutputParams const &) const;
+       /// Standard XHTML output -- short-circuited
+       int xhtml(odocstream &, OutputParams const &) const;
        /// Write out to the .lyx file
        void write(std::ostream & os) const;
        /// should paragraph indendation be ommitted in any case?

diff --git a/src/insets/InsetPhantom.cpp b/src/insets/InsetPhantom.cpp
index c20217c1b444029f0849f933eb8335f8b6171e8c..abdc6c8de710ac44083d2287f782b0d6f0d81f0b 100644 (file)
--- a/src/insets/InsetPhantom.cpp
+++ b/src/insets/InsetPhantom.cpp
@@ -365,6 +365,12 @@ int InsetPhantom::docbook(odocstream & os, OutputParams const & runparams) const
 }
 
 
+int InsetPhantom::xhtml(odocstream &, OutputParams const &) const
+{
+       return 0; // makes no sense for HTML
+}
+
+
 docstring InsetPhantom::contextMenu(BufferView const &, int, int) const
 {
        return from_ascii("context-phantom");

diff --git a/src/insets/InsetPhantom.h b/src/insets/InsetPhantom.h
index a6ccaa7a4fa9a492b6e71794bd62d570e054077f..9d959092092f49a4bb40551fb20da74cb717e5c0 100644 (file)
--- a/src/insets/InsetPhantom.h
+++ b/src/insets/InsetPhantom.h
@@ -83,6 +83,8 @@ private:
        int plaintext(odocstream &, OutputParams const &) const;
        ///
        int docbook(odocstream &, OutputParams const &) const;
+       /// Does nothing.
+       int xhtml(odocstream &, OutputParams const &) const;
        ///
        bool getStatus(Cursor &, FuncRequest const &, FuncStatus &) const;
        ///