drop linuxdoc support (part 2)

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

diff --git a/src/insets/insetlabel.C b/src/insets/insetlabel.C
index 9d1264dbe0b955da8f64f76fad7a334c9805317a..e98e5fc4449075d4c92726ba0977ce0a4930491c 100644 (file)
--- a/src/insets/insetlabel.C
+++ b/src/insets/insetlabel.C
@@ -99,14 +99,6 @@ int InsetLabel::plaintext(Buffer const &, ostream & os,
 }
 
 
-int InsetLabel::linuxdoc(Buffer const & buf, ostream & os,
-                        OutputParams const & runparams) const
-{
-       os << "<label id=\"" << sgml::cleanID(buf, runparams, getContents()) << "\" >";
-       return 0;
-}
-
-
 int InsetLabel::docbook(Buffer const & buf, ostream & os,
                        OutputParams const & runparams) const
 {

diff --git a/src/insets/insetlabel.h b/src/insets/insetlabel.h
index d76859c82b53beb22df9fb9d30fa026ec74eb4d4..112fed3222c6e01d2680586a0b4060aa08daab7e 100644 (file)
--- a/src/insets/insetlabel.h
+++ b/src/insets/insetlabel.h
@@ -33,9 +33,6 @@ public:
        int plaintext(Buffer const &, std::ostream &,
                  OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const;
-       ///
        int docbook(Buffer const &, std::ostream &,
                    OutputParams const &) const;
 protected:

diff --git a/src/insets/insetlatexaccent.C b/src/insets/insetlatexaccent.C
index 9f9d03c92f9ccadcca5b901f944a080fe5d9a3d6..c880b967a20afe8c533bffcc912cb04b20fc1d87 100644 (file)
--- a/src/insets/insetlatexaccent.C
+++ b/src/insets/insetlatexaccent.C
@@ -593,14 +593,6 @@ int InsetLatexAccent::plaintext(Buffer const &, ostream & os,
 }
 
 
-int InsetLatexAccent::linuxdoc(Buffer const &, ostream & os,
-                              OutputParams const &) const
-{
-       os << contents;
-       return 0;
-}
-
-
 int InsetLatexAccent::docbook(Buffer const &, ostream & os,
                              OutputParams const &) const
 {

diff --git a/src/insets/insetlatexaccent.h b/src/insets/insetlatexaccent.h
index 5fb848120c9a584a2bfa12c21db33e7f5b77518c..6e7e0ca2347fc2aa3d8e0cdf456b4c798622ba28 100644 (file)
--- a/src/insets/insetlatexaccent.h
+++ b/src/insets/insetlatexaccent.h
@@ -53,9 +53,6 @@ public:
        int plaintext(Buffer const &, std::ostream &,
                  OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const;
-       ///
        int docbook(Buffer const &, std::ostream &,
                    OutputParams const &) const;
        /// the string that is passed to the TOC

diff --git a/src/insets/insetline.C b/src/insets/insetline.C
index 62d724214272064657674f99e6ad33170734af6c..f65d1ab70caa94780b608d7687135a557c576d71 100644 (file)
--- a/src/insets/insetline.C
+++ b/src/insets/insetline.C
@@ -71,14 +71,6 @@ int InsetLine::plaintext(Buffer const &, ostream & os,
 }
 
 
-int InsetLine::linuxdoc(Buffer const &, std::ostream & os,
-                       OutputParams const &) const
-{
-       os << '\n';
-       return 0;
-}
-
-
 int InsetLine::docbook(Buffer const &, std::ostream & os,
                       OutputParams const &) const
 {

diff --git a/src/insets/insetline.h b/src/insets/insetline.h
index c9751a31a1f89d5b242833c38d4bc76adad6e886..75f1475981c1d3e8d76f937062f2b3fc4389cfa6 100644 (file)
--- a/src/insets/insetline.h
+++ b/src/insets/insetline.h
@@ -32,9 +32,6 @@ public:
        int plaintext(Buffer const &, std::ostream &,
                  OutputParams const &) const;
 
-       int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const;
-
        int docbook(Buffer const &, std::ostream &,
                    OutputParams const &) const;
 

diff --git a/src/insets/insetnewline.C b/src/insets/insetnewline.C
index 239e2c2fd484cee51e0083341d7e5e29054d7163..26695b9356333f35a71971b6f1a20ba3a420ac23 100644 (file)
--- a/src/insets/insetnewline.C
+++ b/src/insets/insetnewline.C
@@ -65,14 +65,6 @@ int InsetNewline::plaintext(Buffer const &, ostream & os,
 }
 
 
-int InsetNewline::linuxdoc(Buffer const &, std::ostream & os,
-                          OutputParams const &) const
-{
-       os << '\n';
-       return 0;
-}
-
-
 int InsetNewline::docbook(Buffer const &, std::ostream & os,
                          OutputParams const &) const
 {

diff --git a/src/insets/insetnewline.h b/src/insets/insetnewline.h
index bd6988e9cc2569f4a15facdc0311a4eebdfdc9fb..5122bbe4d9bddef081afda762f7c3a0f3e9ecb01 100644 (file)
--- a/src/insets/insetnewline.h
+++ b/src/insets/insetnewline.h
@@ -32,9 +32,6 @@ public:
        virtual int plaintext(Buffer const &, std::ostream &,
                          OutputParams const &) const;
 
-       virtual int linuxdoc(Buffer const &, std::ostream &,
-                            OutputParams const &) const;
-
        virtual int docbook(Buffer const &, std::ostream &,
                            OutputParams const &) const;
 

diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C
index 0fec72f0d0101eea3af0c03428672d0bfddfa1ed..17ce3425e452bb44f829ce91ae171079f6ddaddf 100644 (file)
--- a/src/insets/insetnote.C
+++ b/src/insets/insetnote.C
@@ -287,33 +287,6 @@ int InsetNote::latex(Buffer const & buf, ostream & os,
 }
 
 
-int InsetNote::linuxdoc(Buffer const & buf, std::ostream & os,
-                       OutputParams const & runparams_in) const
-{
-       if (params_.type == InsetNoteParams::Note)
-               return 0;
-
-       OutputParams runparams(runparams_in);
-       ostringstream ss;
-       if (params_.type == InsetNoteParams::Comment) {
-               ss << "<comment>\n";
-               runparams.inComment = true;
-               // Ignore files that are exported inside a comment
-               runparams.exportdata.reset(new ExportData);
-       }
-
-       InsetText::linuxdoc(buf, ss, runparams);
-
-       if (params_.type == InsetNoteParams::Comment)
-               ss << "\n</comment>\n";
-
-       string const str = ss.str();
-       os << str;
-       // Return how many newlines we issued.
-       return int(lyx::count(str.begin(), str.end(),'\n'));
-}
-
-
 int InsetNote::docbook(Buffer const & buf, std::ostream & os,
                       OutputParams const & runparams_in) const
 {

diff --git a/src/insets/insetnote.h b/src/insets/insetnote.h
index da0aef1f1a07ad0ddbd4592d0a680e38a8a30597..555c41f991896df7b2b65da4de62d20d96a1e4ee 100644 (file)
--- a/src/insets/insetnote.h
+++ b/src/insets/insetnote.h
@@ -60,9 +60,6 @@ public:
        int latex(Buffer const &, std::ostream &,
               OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &,
-              OutputParams const &) const;
-       ///
        int docbook(Buffer const &, std::ostream &,
               OutputParams const &) const;
        ///

diff --git a/src/insets/insetoptarg.C b/src/insets/insetoptarg.C
index 6c2a5ce434d2b6d5d1bc2ab1e0b9d57fd35fe3f9..2954dbe64808a36481939fd8aaf721783b39ce3e 100644 (file)
--- a/src/insets/insetoptarg.C
+++ b/src/insets/insetoptarg.C
@@ -70,12 +70,6 @@ int InsetOptArg::latex(Buffer const &, ostream &,
        return 0;
 }
 
-int InsetOptArg::linuxdoc(Buffer const &, ostream &,
-                      OutputParams const &) const
-{
-       return 0;
-}
-
 int InsetOptArg::docbook(Buffer const &, ostream &,
                       OutputParams const &) const
 {

diff --git a/src/insets/insetoptarg.h b/src/insets/insetoptarg.h
index 5521a56f4feda2643420961a28d265b4fe120b86..c49d78fc48d97c07839a0d9662cad1848685643c 100644 (file)
--- a/src/insets/insetoptarg.h
+++ b/src/insets/insetoptarg.h
@@ -35,9 +35,6 @@ public:
        /// Standard DocBook output -- short-circuited
        int docbook(Buffer const &, std::ostream &,
                  OutputParams const &) const;
-       /// Standard LinuxDoc output -- short-circuited
-       int linuxdoc(Buffer const &, std::ostream &,
-                 OutputParams const &) const;
 
        /// Standard plain text output -- short-circuited
        int plaintext(Buffer const &, std::ostream &,

diff --git a/src/insets/insetpagebreak.C b/src/insets/insetpagebreak.C
index ff11d0f367b28bcaae7ecf76e404fa297a003831..e620c76ec0bcce54b21a1877275f2e30a3b54e74 100644 (file)
--- a/src/insets/insetpagebreak.C
+++ b/src/insets/insetpagebreak.C
@@ -92,14 +92,6 @@ int InsetPagebreak::plaintext(Buffer const &, ostream & os,
 }
 
 
-int InsetPagebreak::linuxdoc(Buffer const &, std::ostream & os,
-                            OutputParams const &) const
-{
-       os << '\n';
-       return 0;
-}
-
-
 int InsetPagebreak::docbook(Buffer const &, std::ostream & os,
                            OutputParams const &) const
 {

diff --git a/src/insets/insetpagebreak.h b/src/insets/insetpagebreak.h
index 02e26948f28330d0645cf0b057ad88cf8b7a3d43..95b0ec5bf5364eedf7d13dde8fb97e60763206d2 100644 (file)
--- a/src/insets/insetpagebreak.h
+++ b/src/insets/insetpagebreak.h
@@ -32,9 +32,6 @@ public:
        int plaintext(Buffer const &, std::ostream &,
                  OutputParams const &) const;
 
-       int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const;
-
        int docbook(Buffer const &, std::ostream &,
                    OutputParams const &) const;
 

diff --git a/src/insets/insetquotes.C b/src/insets/insetquotes.C
index 4eaee5b506e6d9f64ea52806eb509a2920d94df7..3b0f10eaa7988c0c3b3917f5f203297872c4c91a 100644 (file)
--- a/src/insets/insetquotes.C
+++ b/src/insets/insetquotes.C
@@ -306,14 +306,6 @@ int InsetQuotes::plaintext(Buffer const &, ostream & os,
 }
 
 
-int InsetQuotes::linuxdoc(Buffer const &, ostream & os,
-                         OutputParams const &) const
-{
-       os << '"';
-       return 0;
-}
-
-
 int InsetQuotes::docbook(Buffer const &, ostream & os,
                         OutputParams const &) const
 {

diff --git a/src/insets/insetquotes.h b/src/insets/insetquotes.h
index c8e8e8caa14a551a79c330905b856c17c7a2e5df..f7daaf73245e61c79cf0530a119636b7f524c574 100644 (file)
--- a/src/insets/insetquotes.h
+++ b/src/insets/insetquotes.h
@@ -88,9 +88,6 @@ public:
        int plaintext(Buffer const &, std::ostream &,
                  OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const;
-       ///
        int docbook(Buffer const &, std::ostream &,
                    OutputParams const &) const;
 

diff --git a/src/insets/insetref.C b/src/insets/insetref.C
index 52f529d04dd7a86e7ec4a675e2fb8ab9066c92f1..706a7dc2b8b63aeb38f5d1d63bcbf2c64dbdca70 100644 (file)
--- a/src/insets/insetref.C
+++ b/src/insets/insetref.C
@@ -104,15 +104,6 @@ int InsetRef::plaintext(Buffer const &, ostream & os,
 }
 
 
-int InsetRef::linuxdoc(Buffer const & buf, ostream & os,
-                      OutputParams const & runparams) const
-{
-       os << "<ref id=\"" << sgml::cleanID(buf, runparams, getContents())
-          << "\" name=\"" << getOptions() << "\" >";
-       return 0;
-}
-
-
 int InsetRef::docbook(Buffer const & buf, ostream & os,
                      OutputParams const & runparams) const
 {

diff --git a/src/insets/insetref.h b/src/insets/insetref.h
index be19e7bd8713c9e069925afcc2f652f13e37bdc6..1909a2e2640cd4bac82699ca50c487e9b64b1c2b 100644 (file)
--- a/src/insets/insetref.h
+++ b/src/insets/insetref.h
@@ -50,9 +50,6 @@ public:
        int plaintext(Buffer const &, std::ostream &,
                  OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const;
-       ///
        int docbook(Buffer const &, std::ostream &,
                    OutputParams const &) const;
        /// the string that is passed to the TOC

diff --git a/src/insets/insetspace.C b/src/insets/insetspace.C
index d97ad6602fffb4820761359bbc24f387ad25ea41..c97a3ebb08b49ae8eed002498a9a6a9f1e4c57af 100644 (file)
--- a/src/insets/insetspace.C
+++ b/src/insets/insetspace.C
@@ -212,27 +212,6 @@ int InsetSpace::plaintext(Buffer const &, ostream & os,
 }
 
 
-int InsetSpace::linuxdoc(Buffer const &, ostream & os,
-                        OutputParams const &) const
-{
-       switch (kind_) {
-       case NORMAL:
-       case QUAD:
-       case QQUAD:
-       case ENSKIP:
-               os << " ";
-               break;
-       case PROTECTED:
-       case ENSPACE:
-       case THIN:
-       case NEGTHIN:
-               os << "&nbsp;";
-               break;
-       }
-       return 0;
-}
-
-
 int InsetSpace::docbook(Buffer const &, ostream & os,
                        OutputParams const &) const
 {

diff --git a/src/insets/insetspace.h b/src/insets/insetspace.h
index 0c594c9bda5672b0daf0245ca2e661edfac49f36..76ec3c95c187f19de53b9b96199560d7a025d9c8 100644 (file)
--- a/src/insets/insetspace.h
+++ b/src/insets/insetspace.h
@@ -67,9 +67,6 @@ public:
        int plaintext(Buffer const &, std::ostream &,
                  OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const;
-       ///
        int docbook(Buffer const &, std::ostream &,
                    OutputParams const &) const;
        /// the string that is passed to the TOC

diff --git a/src/insets/insetspecialchar.C b/src/insets/insetspecialchar.C
index eecfe288f253bd99cfb27c86719dbd3a70c0ed44..665c0dc923e2203b05cbfa6187ff8ebf6f725984 100644 (file)
--- a/src/insets/insetspecialchar.C
+++ b/src/insets/insetspecialchar.C
@@ -205,27 +205,6 @@ int InsetSpecialChar::plaintext(Buffer const &, ostream & os,
 }
 
 
-int InsetSpecialChar::linuxdoc(Buffer const &, ostream & os,
-                              OutputParams const &) const
-{
-       switch (kind_) {
-       case HYPHENATION:
-       case LIGATURE_BREAK:
-               break;
-       case END_OF_SENTENCE:
-               os << '.';
-               break;
-       case LDOTS:
-               os << "...";
-               break;
-       case MENU_SEPARATOR:
-               os << "&lyxarrow;";
-               break;
-       }
-       return 0;
-}
-
-
 int InsetSpecialChar::docbook(Buffer const &, ostream & os,
                              OutputParams const &) const
 {

diff --git a/src/insets/insetspecialchar.h b/src/insets/insetspecialchar.h
index bb88fbe9ab35dbee6570b6502b44b28b8db3478e..8923bbdc2fd32abcb0091b7641f7744d98e51934 100644 (file)
--- a/src/insets/insetspecialchar.h
+++ b/src/insets/insetspecialchar.h
@@ -59,9 +59,6 @@ public:
        int plaintext(Buffer const &, std::ostream &,
                  OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const;
-       ///
        int docbook(Buffer const &, std::ostream &,
                    OutputParams const &) const;
        /// the string that is passed to the TOC

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 25dc58b66458cc7eed6e4ee8463a91ac2f0ea261..b26086d8ec4d6ccdff2ada9a7502c395585ee56c 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -1070,13 +1070,6 @@ int InsetTabular::plaintext(Buffer const & buf, ostream & os,
 }
 
 
-int InsetTabular::linuxdoc(Buffer const & buf, ostream & os,
-                          OutputParams const & runparams) const
-{
-       return tabular.linuxdoc(buf,os, runparams);
-}
-
-
 int InsetTabular::docbook(Buffer const & buf, ostream & os,
                          OutputParams const & runparams) const
 {

diff --git a/src/insets/insettabular.h b/src/insets/insettabular.h
index a5bb27a6af29c850d92e4424ee662386346003d3..afaa49c3104e5a76a93dd14a12dee4dcd2ec48f3 100644 (file)
--- a/src/insets/insettabular.h
+++ b/src/insets/insettabular.h
@@ -90,9 +90,6 @@ public:
        int plaintext(Buffer const &, std::ostream &,
                  OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const;
-       ///
        int docbook(Buffer const &, std::ostream &,
                    OutputParams const &) const;
        ///

diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index 1c69cb7d1c8f0313946495210a24ff9e8f95926e..b770460620988af6d7a5c6d15d719de663c22b71 100644 (file)
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -33,7 +33,6 @@
 #include "metricsinfo.h"
 #include "output_docbook.h"
 #include "output_latex.h"
-#include "output_linuxdoc.h"
 #include "output_plaintext.h"
 #include "paragraph.h"
 #include "paragraph_funcs.h"
@@ -336,14 +335,6 @@ int InsetText::plaintext(Buffer const & buf, ostream & os,
 }
 
 
-int InsetText::linuxdoc(Buffer const & buf, ostream & os,
-                       OutputParams const & runparams) const
-{
-       linuxdocParagraphs(buf, paragraphs(), os, runparams);
-       return 0;
-}
-
-
 int InsetText::docbook(Buffer const & buf, ostream & os,
                       OutputParams const & runparams) const
 {

diff --git a/src/insets/insettext.h b/src/insets/insettext.h
index ecf7e0d431dc0b52a93d58a7860badb8b0867e53..10274a8b3c46c1f9bd1b597f8ca0d3169beaf5ac 100644 (file)
--- a/src/insets/insettext.h
+++ b/src/insets/insettext.h
@@ -67,9 +67,6 @@ public:
        int plaintext(Buffer const &, std::ostream &,
                  OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const;
-       ///
        int docbook(Buffer const &, std::ostream &,
                    OutputParams const &) const;
        ///

diff --git a/src/insets/insettoc.C b/src/insets/insettoc.C
index 512c9e96d7e17868f9a4407ea377e0ca0c0533dd..8efd2929ed26d35362fb32757d863b1e33b8f12c 100644 (file)
--- a/src/insets/insettoc.C
+++ b/src/insets/insettoc.C
@@ -64,15 +64,6 @@ int InsetTOC::plaintext(Buffer const & buffer, ostream & os,
 }
 
 
-int InsetTOC::linuxdoc(Buffer const &, ostream & os,
-                      OutputParams const &) const
-{
-       if (getCmdName() == "tableofcontents")
-               os << "<toc>";
-       return 0;
-}
-
-
 int InsetTOC::docbook(Buffer const &, ostream & os,
                      OutputParams const &) const
 {

diff --git a/src/insets/insettoc.h b/src/insets/insettoc.h
index c30cf2f777e01f17cdfa9c5c27a5b39ba0cc8d40..6f321f462436f75812f7688471959d4048f3bb09 100644 (file)
--- a/src/insets/insettoc.h
+++ b/src/insets/insettoc.h
@@ -32,9 +32,6 @@ public:
        int plaintext(Buffer const &, std::ostream &,
                  OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const;
-       ///
        int docbook(Buffer const &, std::ostream &,
                    OutputParams const &) const;
 private:

diff --git a/src/insets/inseturl.C b/src/insets/inseturl.C
index 4802f14eedd1f979fe2031c3df6ad4663f6603f9..e376f42545b92cc549b19ea68884054b22efabda 100644 (file)
--- a/src/insets/inseturl.C
+++ b/src/insets/inseturl.C
@@ -80,17 +80,6 @@ int InsetUrl::plaintext(Buffer const &, ostream & os,
 }
 
 
-int InsetUrl::linuxdoc(Buffer const &, ostream & os,
-                      OutputParams const &) const
-{
-       os << '<' << getCmdName()
-          << " url=\""  << getContents() << "\""
-          << " name=\"" << getOptions() << "\">";
-
-       return 0;
-}
-
-
 int InsetUrl::docbook(Buffer const &, ostream & os,
                      OutputParams const &) const
 {

diff --git a/src/insets/inseturl.h b/src/insets/inseturl.h
index 6536be76e06c064f67165d1a0d598625bc2a493f..1aba7e51e3cc24754a3076ead0ec5b8331a9eea1 100644 (file)
--- a/src/insets/inseturl.h
+++ b/src/insets/inseturl.h
@@ -41,9 +41,6 @@ public:
        int plaintext(Buffer const &, std::ostream &,
                  OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const;
-       ///
        int docbook(Buffer const &, std::ostream &,
                    OutputParams const &) const;
        /// the string that is passed to the TOC

diff --git a/src/insets/insetvspace.C b/src/insets/insetvspace.C
index d9c9772ff0a3821587a49bba51bebb7940a0e4ce..72f5a77dfa80d8f940a143285c484cc0044fbcbc 100644 (file)
--- a/src/insets/insetvspace.C
+++ b/src/insets/insetvspace.C
@@ -218,14 +218,6 @@ int InsetVSpace::plaintext(Buffer const &, ostream & os,
 }
 
 
-int InsetVSpace::linuxdoc(Buffer const &, std::ostream & os,
-                         OutputParams const &) const
-{
-       os << '\n';
-       return 1;
-}
-
-
 int InsetVSpace::docbook(Buffer const &, std::ostream & os,
                         OutputParams const &) const
 {

diff --git a/src/insets/insetvspace.h b/src/insets/insetvspace.h
index 1d63291a61e187d8e66dfd7b10d1fa142491cd25..0aaf68e736cdf51d34c1fdaf40f8627bfc57e8a6 100644 (file)
--- a/src/insets/insetvspace.h
+++ b/src/insets/insetvspace.h
@@ -36,9 +36,6 @@ public:
        int plaintext(Buffer const &, std::ostream &,
                      OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const;
-       ///
        int docbook(Buffer const &, std::ostream &,
                    OutputParams const &) const;
        ///