From: Michael Schmitt <michael.schmitt@teststep.org>
Date: Wed, 23 Aug 2006 10:47:11 +0000 (+0000)
Subject: drop linuxdoc support (part 2)
X-Git-Tag: 1.6.10~12710
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=609889cb354f3bbaaddd8a3f6841b2c9453160e4;p=lyx.git

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 9d1264dbe0..e98e5fc444 100644
--- 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 d76859c82b..112fed3222 100644
--- 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 9f9d03c92f..c880b967a2 100644
--- 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 5fb848120c..6e7e0ca234 100644
--- 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 62d7242142..f65d1ab70c 100644
--- 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 c9751a31a1..75f1475981 100644
--- 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 239e2c2fd4..26695b9356 100644
--- 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 bd6988e9cc..5122bbe4d9 100644
--- 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 0fec72f0d0..17ce3425e4 100644
--- 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 da0aef1f1a..555c41f991 100644
--- 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 6c2a5ce434..2954dbe648 100644
--- 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 5521a56f4f..c49d78fc48 100644
--- 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 ff11d0f367..e620c76ec0 100644
--- 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 02e26948f2..95b0ec5bf5 100644
--- 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 4eaee5b506..3b0f10eaa7 100644
--- 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 c8e8e8caa1..f7daaf7324 100644
--- 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 52f529d04d..706a7dc2b8 100644
--- 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 be19e7bd87..1909a2e264 100644
--- 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 d97ad6602f..c97a3ebb08 100644
--- 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 0c594c9bda..76ec3c95c1 100644
--- 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 eecfe288f2..665c0dc923 100644
--- 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 bb88fbe9ab..8923bbdc2f 100644
--- 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 25dc58b664..b26086d8ec 100644
--- 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 a5bb27a6af..afaa49c310 100644
--- 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 1c69cb7d1c..b770460620 100644
--- 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 ecf7e0d431..10274a8b3c 100644
--- 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 512c9e96d7..8efd2929ed 100644
--- 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 c30cf2f777..6f321f4624 100644
--- 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 4802f14eed..e376f42545 100644
--- 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 6536be76e0..1aba7e51e3 100644
--- 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 d9c9772ff0..72f5a77dfa 100644
--- 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 1d63291a61..0aaf68e736 100644
--- 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;
 	///