drop linuxdoc support (part 1)

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

diff --git a/src/insets/ExternalSupport.C b/src/insets/ExternalSupport.C
index ac6de16921da4a95069f171a4dec6386ef13165b..7018d37db4e66076ca2dd65ff6e27f89154bed3f 100644 (file)
--- a/src/insets/ExternalSupport.C
+++ b/src/insets/ExternalSupport.C
@@ -485,8 +485,6 @@ string const substituteOption(InsetExternalParams const & params,
                return sanitizeLatexOption(opt);
        if (format == "DocBook")
                return sanitizeDocBookOption(opt);
-       if (format == "LinuxDoc")
-               return sanitizeLinuxDocOption(opt);
        return opt;
 }
 

diff --git a/src/insets/ExternalTransforms.C b/src/insets/ExternalTransforms.C
index 43b69eece17870fd81558d4d0ef30a87cfc722bb..adc9cfa989b19686561267a438211ed4e8819301 100644 (file)
--- a/src/insets/ExternalTransforms.C
+++ b/src/insets/ExternalTransforms.C
@@ -325,12 +325,6 @@ string const sanitizeLatexOption(string const & input)
 }
 
 
-string const sanitizeLinuxDocOption(string const & input)
-{
-       return input;
-}
-
-
 namespace {
 
 template <typename Factory, typename Data, typename Transformer>

diff --git a/src/insets/ExternalTransforms.h b/src/insets/ExternalTransforms.h
index ce2c86ad44e0712fcc024e286509ba7e65c1c874..9658a759d1f39e89abe54a4a0c512bae6814445d 100644 (file)
--- a/src/insets/ExternalTransforms.h
+++ b/src/insets/ExternalTransforms.h
@@ -302,7 +302,6 @@ private:
  */
 std::string const sanitizeLatexOption(std::string const & input);
 std::string const sanitizeDocBookOption(std::string const & input);
-std::string const sanitizeLinuxDocOption(std::string const & input);
 
 
 enum TransformID {

diff --git a/src/insets/insetbase.C b/src/insets/insetbase.C
index 29fd67754d60dfe8bab1abd732369cad4f574d48..eb7a818ed1f52f73a28f8c17e90157d13015ffa2 100644 (file)
--- a/src/insets/insetbase.C
+++ b/src/insets/insetbase.C
@@ -227,13 +227,6 @@ int InsetBase::plaintext(Buffer const &,
 }
 
 
-int InsetBase::linuxdoc(Buffer const &,
-       std::ostream &, OutputParams const &) const
-{
-       return 0;
-}
-
-
 int InsetBase::docbook(Buffer const &,
        std::ostream &, OutputParams const &) const
 {

diff --git a/src/insets/insetbase.h b/src/insets/insetbase.h
index d36655597cd5b9d7869d8a03ea2962f39dfcca46..8bd5ec5304fe2db170f095fdc1dee17f7f6b1dd7 100644 (file)
--- a/src/insets/insetbase.h
+++ b/src/insets/insetbase.h
@@ -187,9 +187,6 @@ public:
        /// plain ascii output
        virtual int plaintext(Buffer const &, std::ostream & os,
                OutputParams const &) const;
-       /// linuxdoc output
-       virtual int linuxdoc(Buffer const &, std::ostream & os,
-               OutputParams const &) const;
        /// docbook output
        virtual int docbook(Buffer const &, std::ostream & os,
                OutputParams const &) const;

diff --git a/src/insets/insetbox.C b/src/insets/insetbox.C
index ed231625578cb527944354bd70b8f2fe50877daa..3ff49e7e85593b2f86835110e43eae147802b4d5 100644 (file)
--- a/src/insets/insetbox.C
+++ b/src/insets/insetbox.C
@@ -365,13 +365,6 @@ int InsetBox::latex(Buffer const & buf, ostream & os,
 }
 
 
-int InsetBox::linuxdoc(Buffer const & buf, std::ostream & os,
-                      OutputParams const & runparams) const
-{
-       return InsetText::linuxdoc(buf, os, runparams);
-}
-
-
 int InsetBox::docbook(Buffer const & buf, std::ostream & os,
                      OutputParams const & runparams) const
 {

diff --git a/src/insets/insetbox.h b/src/insets/insetbox.h
index 3e0df69ebb2f205fe8d488a135ad264d8d9ba8be..f61d240548b39e39516b818c2b9d26fcb863393f 100644 (file)
--- a/src/insets/insetbox.h
+++ b/src/insets/insetbox.h
@@ -85,9 +85,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/insetbranch.C b/src/insets/insetbranch.C
index a18bf41d4f8693cc3b5aeefbd99dc70c628cc570..13130aa3712c6fb86b02bb1b82e3c5abb81472fa 100644 (file)
--- a/src/insets/insetbranch.C
+++ b/src/insets/insetbranch.C
@@ -225,14 +225,6 @@ int InsetBranch::latex(Buffer const & buf, ostream & os,
 }
 
 
-int InsetBranch::linuxdoc(Buffer const & buf, std::ostream & os,
-                         OutputParams const & runparams) const
-{
-       return isBranchSelected(buf) ?
-               InsetText::linuxdoc(buf, os, runparams) : 0;
-}
-
-
 int InsetBranch::docbook(Buffer const & buf, std::ostream & os,
                         OutputParams const & runparams) const
 {

diff --git a/src/insets/insetbranch.h b/src/insets/insetbranch.h
index 44c2786627e10030892709bf67169ed134492a77..c70d2f2bf2295d9a9e14ed34c55fef24eaeb401d 100644 (file)
--- a/src/insets/insetbranch.h
+++ b/src/insets/insetbranch.h
@@ -56,9 +56,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 & runparams) const;
        ///

diff --git a/src/insets/insetcharstyle.C b/src/insets/insetcharstyle.C
index 9d34f5f64274a1051c18852808156ffd5a5dc149..e2b0a65098c6b64e1bbd27f1fa12cb63cb67a41f 100644 (file)
--- a/src/insets/insetcharstyle.C
+++ b/src/insets/insetcharstyle.C
@@ -285,18 +285,6 @@ int InsetCharStyle::latex(Buffer const & buf, ostream & os,
 }
 
 
-int InsetCharStyle::linuxdoc(Buffer const & buf, ostream & os,
-                            OutputParams const & runparams) const
-{
-       if (!undefined())
-               sgml::openTag(os, params_.latexname, params_.latexparam);
-       int i = InsetText::linuxdoc(buf, os, runparams);
-       if (!undefined())
-               sgml::closeTag(os, params_.latexname);
-       return i;
-}
-
-
 int InsetCharStyle::docbook(Buffer const & buf, ostream & os,
                            OutputParams const & runparams) const
 {

diff --git a/src/insets/insetcharstyle.h b/src/insets/insetcharstyle.h
index 375a5c84a0bfd7e934a59385f5aa40e4f57846ed..de785ed71c575d67fbf24eb979a502b593917f97 100644 (file)
--- a/src/insets/insetcharstyle.h
+++ b/src/insets/insetcharstyle.h
@@ -74,9 +74,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/insetcommand.C b/src/insets/insetcommand.C
index 7f47611bb3065359416297226c6d9082d7a48579..428625c097897b07ddddccd5e2ede3f7ccf40d68 100644 (file)
--- a/src/insets/insetcommand.C
+++ b/src/insets/insetcommand.C
@@ -85,13 +85,6 @@ int InsetCommand::plaintext(Buffer const &, ostream &,
 }
 
 
-int InsetCommand::linuxdoc(Buffer const &, ostream &,
-                          OutputParams const &) const
-{
-       return 0;
-}
-
-
 int InsetCommand::docbook(Buffer const &, ostream &,
                          OutputParams const &) const
 {

diff --git a/src/insets/insetcommand.h b/src/insets/insetcommand.h
index 305e5b9657bd911c4097df209ec4f2c594fd7a73..61f6bb80c1bd87396a4c0d86d709157d833a2422 100644 (file)
--- a/src/insets/insetcommand.h
+++ b/src/insets/insetcommand.h
@@ -53,9 +53,6 @@ public:
        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 & runparams) const;
        ///

diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index ed5bf5a44ea1b98ea4c9d0c272cbaa8ef1257054..1b33011b8d72707e923f4a8c04c68f85fb6b15b7 100644 (file)
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -177,28 +177,6 @@ int InsetERT::plaintext(Buffer const &, ostream &,
 }
 
 
-int InsetERT::linuxdoc(Buffer const &, ostream & os,
-                      OutputParams const &) const
-{
-       ParagraphList::const_iterator par = paragraphs().begin();
-       ParagraphList::const_iterator end = paragraphs().end();
-
-       int lines = 0;
-       while (par != end) {
-               pos_type siz = par->size();
-               for (pos_type i = 0; i < siz; ++i)
-                       os << par->getChar(i);
-               ++par;
-               if (par != end) {
-                       os << "\n";
-                       lines ++;
-               }
-       }
-
-       return lines;
-}
-
-
 int InsetERT::docbook(Buffer const &, ostream & os,
                      OutputParams const &) const
 {

diff --git a/src/insets/insetert.h b/src/insets/insetert.h
index 5efe845e402afb4e2bdf4fc0be6987085a3f6244..0fe7b2d2a127b335ec4932db6d6c0e7199834e13 100644 (file)
--- a/src/insets/insetert.h
+++ b/src/insets/insetert.h
@@ -55,9 +55,6 @@ public:
        int plaintext(Buffer const &, std::ostream &,
                  OutputParams const & runparams) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const;
-       ///
        int docbook(Buffer const &, std::ostream &,
                    OutputParams const & runparams) const;
        ///

diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C
index c8faf6f0d0fa3c67e390bb2649f38614915bf3f1..5353b0c5ac5f347370eb1a69563a6d7a8c0b4470 100644 (file)
--- a/src/insets/insetexternal.C
+++ b/src/insets/insetexternal.C
@@ -724,15 +724,6 @@ int InsetExternal::plaintext(Buffer const & buf, ostream & os,
 }
 
 
-int InsetExternal::linuxdoc(Buffer const & buf, ostream & os,
-                           OutputParams const & runparams) const
-{
-       return external::writeExternal(params_, "LinuxDoc", buf, os,
-                                      *(runparams.exportdata), false,
-                                      runparams.inComment);
-}
-
-
 int InsetExternal::docbook(Buffer const & buf, ostream & os,
                           OutputParams const & runparams) const
 {

diff --git a/src/insets/insetexternal.h b/src/insets/insetexternal.h
index 1f09b82fe6133405cdfdbbd4754129e84cd5b07a..7937b0c0f67c336b72000c0bf7553b79fbfed6d9 100644 (file)
--- a/src/insets/insetexternal.h
+++ b/src/insets/insetexternal.h
@@ -129,9 +129,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/insetfloat.C b/src/insets/insetfloat.C
index f5fdae343e10df185e1bd9fc5a3d9a46bc92ec7c..0df3637e9de068a26bbebbe9ab5e84b1795fcc10 100644 (file)
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -341,44 +341,6 @@ int InsetFloat::latex(Buffer const & buf, ostream & os,
 }
 
 
-int InsetFloat::linuxdoc(Buffer const & buf, ostream & os,
-                        OutputParams const & runparams) const
-{
-       FloatList const & floats = buf.params().getLyXTextClass().floats();
-       string const tmptype =  params_.type;
-       // Figure out the float placement to use.
-       // From lowest to highest:
-       // - float default placement
-       // - document wide default placement
-       // - specific float placement
-       // This is the same as latex, as linuxdoc is modeled after latex.
-
-       string placement;
-       string const buf_placement = buf.params().float_placement;
-       string const def_placement = floats.defaultPlacement(params_.type);
-       if (!params_.placement.empty()
-           && params_.placement != def_placement) {
-               placement = params_.placement;
-       } else if (params_.placement.empty()
-                  && !buf_placement.empty()
-                  && buf_placement != def_placement) {
-               placement = buf_placement;
-       }
-
-       os << "\n<" << tmptype ;
-       // We only output placement if different from the def_placement.
-       if (!placement.empty()) {
-               os << " loc=\"" << placement << '"';
-       }
-       os << ">";
-
-       int const i = InsetText::linuxdoc(buf, os, runparams);
-       os << "</" << tmptype << ">\n";
-
-       return i;
-}
-
-
 int InsetFloat::docbook(Buffer const & buf, ostream & os,
                        OutputParams const & runparams) const
 {

diff --git a/src/insets/insetfloat.h b/src/insets/insetfloat.h
index 26458a6e48bb66f365f482ebcff807de038bdf42..622adbaaef45b91c08894082b91a16a7af317465 100644 (file)
--- a/src/insets/insetfloat.h
+++ b/src/insets/insetfloat.h
@@ -57,9 +57,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/insetfloatlist.h b/src/insets/insetfloatlist.h
index 4a7aaa317de2cf16ddea2a6bd968d667d28a18a4..ffb0622552881c0d56e991f6bd5bc0177d8c27be 100644 (file)
--- a/src/insets/insetfloatlist.h
+++ b/src/insets/insetfloatlist.h
@@ -39,9 +39,6 @@ public:
        int latex(Buffer const &, std::ostream &,
                  OutputParams const &) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const { return 0; }
-       ///
        int docbook(Buffer const &, std::ostream &,
                    OutputParams const &) const { return 0; }
        ///

diff --git a/src/insets/insetgraphics.C b/src/insets/insetgraphics.C
index f4e01ea3e0a4a3297df6d19428b27695a0d4c040..03a05aa2c90c18a5f23acf26c66ff2fb9e9f0175 100644 (file)
--- a/src/insets/insetgraphics.C
+++ b/src/insets/insetgraphics.C
@@ -816,21 +816,6 @@ int InsetGraphics::plaintext(Buffer const &, ostream & os,
 }
 
 
-int InsetGraphics::linuxdoc(Buffer const & buf, ostream & os,
-                           OutputParams const & runparams) const
-{
-       string const file_name = runparams.nice ?
-                               params().filename.relFilename(buf.filePath()):
-                               params().filename.absFilename();
-
-       runparams.exportdata->addExternalFile("linuxdoc",
-                                             params().filename.absFilename());
-       os << "<eps file=\"" << file_name << "\">\n";
-       os << "<img src=\"" << file_name << "\">";
-       return 0;
-}
-
-
 namespace {
 
 int writeImageObject(char * format, ostream& os, OutputParams const & runparams,

diff --git a/src/insets/insetgraphics.h b/src/insets/insetgraphics.h
index 140a1f9d217d3a72a14d93026c553a160097fde3..23d8eaa96b8f8bcf3586f4914c5bb823e96dccbe 100644 (file)
--- a/src/insets/insetgraphics.h
+++ b/src/insets/insetgraphics.h
@@ -49,9 +49,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/insethfill.C b/src/insets/insethfill.C
index 32e4bb40bdc9446a451deb26914559d11daeb599..21f9e79e709523b49be4801512e187c229a6a63b 100644 (file)
--- a/src/insets/insethfill.C
+++ b/src/insets/insethfill.C
@@ -59,14 +59,6 @@ int InsetHFill::plaintext(Buffer const &, ostream & os,
 }
 
 
-int InsetHFill::linuxdoc(Buffer const &, std::ostream & os,
-                        OutputParams const &) const
-{
-       os << '\n';
-       return 0;
-}
-
-
 int InsetHFill::docbook(Buffer const &, std::ostream & os,
                        OutputParams const &) const
 {

diff --git a/src/insets/insethfill.h b/src/insets/insethfill.h
index c0a26174d6277fe6731b9592e44142dd1bd19215..2aaff5240839f7263432b2fa0b69767fc6b1c93f 100644 (file)
--- a/src/insets/insethfill.h
+++ b/src/insets/insethfill.h
@@ -32,9 +32,6 @@ public:
        int plaintext(Buffer const &, std::ostream &,
                  OutputParams const & runparams) const;
        ///
-       int linuxdoc(Buffer const &, std::ostream &,
-                    OutputParams const &) const;
-       ///
        int docbook(Buffer const &, std::ostream &,
                    OutputParams const & runparams) const;
        ///

diff --git a/src/insets/insetinclude.C b/src/insets/insetinclude.C
index fc39245febd0f42d4a05efeb4fa5ca782816fe44..878605fbd3d361c68d81e2cc93be141209756e06 100644 (file)
--- a/src/insets/insetinclude.C
+++ b/src/insets/insetinclude.C
@@ -466,50 +466,6 @@ int InsetInclude::plaintext(Buffer const & buffer, ostream & os,
 }
 
 
-int InsetInclude::linuxdoc(Buffer const & buffer, ostream & os,
-                          OutputParams const & runparams) const
-{
-       string incfile(params_.getContents());
-
-       // Do nothing if no file name has been specified
-       if (incfile.empty())
-               return 0;
-
-       string const included_file = includedFilename(buffer, params_);
-
-       // write it to a file (so far the complete file)
-       string const exportfile = changeExtension(incfile, ".sgml");
-       string writefile = changeExtension(included_file, ".sgml");
-
-       if (loadIfNeeded(buffer, params_)) {
-               Buffer * tmp = bufferlist.getBuffer(included_file);
-
-               writefile = makeAbsPath(FileName(writefile).mangledFilename(),
-                                       buffer.getMasterBuffer()->temppath());
-               if (!runparams.nice)
-                       incfile = writefile;
-
-               lyxerr[Debug::LATEX] << "incfile:" << incfile << endl;
-               lyxerr[Debug::LATEX] << "exportfile:" << exportfile << endl;
-               lyxerr[Debug::LATEX] << "writefile:" << writefile << endl;
-
-               tmp->makeLinuxDocFile(writefile, runparams, true);
-       }
-
-       if (isVerbatim(params_)) {
-               os << "<![CDATA["
-                  << getFileContents(included_file)
-                  << "]]>";
-       } else {
-               runparams.exportdata->addExternalFile("linuxdoc", writefile,
-                                                     exportfile);
-               os << '&' << include_label << ';';
-       }
-
-       return 0;
-}
-
-
 int InsetInclude::docbook(Buffer const & buffer, ostream & os,
                          OutputParams const & runparams) const
 {

diff --git a/src/insets/insetinclude.h b/src/insets/insetinclude.h
index 0f2e3255d34ad07bf4578bc156bab53c993dca2c..06b944b8cb1212d21f4e320d5a86fa4ecd01efed 100644 (file)
--- a/src/insets/insetinclude.h
+++ b/src/insets/insetinclude.h
@@ -81,9 +81,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;
        ///