From 2ca15c641aa4d73561672cf834eb66f3059b655e Mon Sep 17 00:00:00 2001
From: Michael Schmitt <michael.schmitt@teststep.org>
Date: Thu, 15 Feb 2007 22:59:06 +0000
Subject: [PATCH] 	* src/insets/insetbox.[Ch]: 	*
 src/insets/insetnote.[Ch]: fix plaintext()

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17207 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/insets/insetbox.C  | 43 +++++++++++++++++++++---------------------
 src/insets/insetbox.h  |  5 ++---
 src/insets/insetnote.C | 43 +++++++++++++++++++++---------------------
 src/insets/insetnote.h |  4 ++--
 4 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/src/insets/insetbox.C b/src/insets/insetbox.C
index 2af61d15e5..1bb0bd3713 100644
--- a/src/insets/insetbox.C
+++ b/src/insets/insetbox.C
@@ -253,7 +253,7 @@ bool InsetBox::getStatus(LCursor & cur, FuncRequest const & cmd,
 
 
 int InsetBox::latex(Buffer const & buf, odocstream & os,
-				OutputParams const & runparams) const
+                    OutputParams const & runparams) const
 {
 	BoxType btype = boxtranslator().find(params_.type);
 
@@ -389,39 +389,40 @@ int InsetBox::latex(Buffer const & buf, odocstream & os,
 }
 
 
-int InsetBox::docbook(Buffer const & buf, odocstream & os,
-		      OutputParams const & runparams) const
-{
-	return InsetText::docbook(buf, os, runparams);
-}
-
-
 int InsetBox::plaintext(Buffer const & buf, odocstream & os,
-		    OutputParams const & runparams) const
+                        OutputParams const & runparams) const
 {
 	BoxType const btype = boxtranslator().find(params_.type);
 
 	switch (btype) {
 		case Frameless: break;
-		case Boxed:     os << "[";  break;
-		case ovalbox:   os << "(";  break;
-		case Ovalbox:   os << "(("; break;
-		case Shadowbox: os << "[";  break;
-		case Doublebox: os << "[["; break;
+		case Boxed:     os << "[\n";  break;
+		case ovalbox:   os << "(\n";  break;
+		case Ovalbox:   os << "((\n"; break;
+		case Shadowbox: os << "[/\n"; break;
+		case Doublebox: os << "[[\n"; break;
 	}
 
-	int i = InsetText::plaintext(buf, os, runparams);
+	InsetText::plaintext(buf, os, runparams);
 
+	int len = 0;
 	switch (btype) {
 		case Frameless: break;
-		case Boxed:     os << "]";  break;
-		case ovalbox:   os << ")";  break;
-		case Ovalbox:   os << "))"; break;
-		case Shadowbox: os << "]/"; break;
-		case Doublebox: os << "]]"; break;
+		case Boxed:     os << "\n]";  len = 1; break;
+		case ovalbox:   os << "\n)";  len = 1; break;
+		case Ovalbox:   os << "\n))"; len = 2; break;
+		case Shadowbox: os << "\n/]"; len = 2; break;
+		case Doublebox: os << "\n]]"; len = 2; break;
 	}
 
-	return i;
+	return len + runparams.linelen; // len chars on a separate line
+}
+
+
+int InsetBox::docbook(Buffer const & buf, odocstream & os,
+                      OutputParams const & runparams) const
+{
+	return InsetText::docbook(buf, os, runparams);
 }
 
 
diff --git a/src/insets/insetbox.h b/src/insets/insetbox.h
index 8786c1c649..77f1d3354a 100644
--- a/src/insets/insetbox.h
+++ b/src/insets/insetbox.h
@@ -86,10 +86,9 @@ public:
 	///
 	int latex(Buffer const &, odocstream &, OutputParams const &) const;
 	///
-	int docbook(Buffer const &, odocstream &, OutputParams const &) const;
+	int plaintext(Buffer const &, odocstream &, OutputParams const &) const;
 	///
-	int plaintext(Buffer const &, odocstream &,
-		  OutputParams const & runparams) const;
+	int docbook(Buffer const &, odocstream &, OutputParams const &) const;
 	///
 	void validate(LaTeXFeatures &) const;
 	///
diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C
index b840955032..d1a575639d 100644
--- a/src/insets/insetnote.C
+++ b/src/insets/insetnote.C
@@ -295,8 +295,28 @@ int InsetNote::latex(Buffer const & buf, odocstream & os,
 }
 
 
+int InsetNote::plaintext(Buffer const & buf, odocstream & os,
+                         OutputParams const & runparams_in) const
+{
+	if (params_.type == InsetNoteParams::Note)
+		return 0;
+
+	OutputParams runparams(runparams_in);
+	if (params_.type == InsetNoteParams::Comment) {
+		runparams.inComment = true;
+		// Ignore files that are exported inside a comment
+		runparams.exportdata.reset(new ExportData);
+	}
+	os << '[' << _("note") << ":\n";
+	InsetText::plaintext(buf, os, runparams);
+	os << "\n]";
+
+	return 1 + runparams.linelen; // one char on a separate line
+}
+
+
 int InsetNote::docbook(Buffer const & buf, odocstream & os,
-		       OutputParams const & runparams_in) const
+                       OutputParams const & runparams_in) const
 {
 	if (params_.type == InsetNoteParams::Note)
 		return 0;
@@ -320,27 +340,6 @@ int InsetNote::docbook(Buffer const & buf, odocstream & os,
 }
 
 
-int InsetNote::plaintext(Buffer const & buf, odocstream & os,
-			 OutputParams const & runparams_in) const
-{
-	if (params_.type == InsetNoteParams::Note)
-		return 0;
-
-	OutputParams runparams(runparams_in);
-	if (params_.type == InsetNoteParams::Comment) {
-		runparams.inComment = true;
-		// Ignore files that are exported inside a comment
-		runparams.exportdata.reset(new ExportData);
-	}
-	os << "[";
-	int const nlines = InsetText::plaintext(buf, os, runparams);
-	os << "]";
-
-	// Return how many newlines we issued.
-	return nlines;
-}
-
-
 void InsetNote::validate(LaTeXFeatures & features) const
 {
 	if (params_.type == InsetNoteParams::Comment)
diff --git a/src/insets/insetnote.h b/src/insets/insetnote.h
index 034f81158b..f241725a66 100644
--- a/src/insets/insetnote.h
+++ b/src/insets/insetnote.h
@@ -62,10 +62,10 @@ public:
 	///
 	int latex(Buffer const &, odocstream &, OutputParams const &) const;
 	///
-	int docbook(Buffer const &, odocstream &, OutputParams const &) const;
-	///
 	int plaintext(Buffer const &, odocstream &, OutputParams const &) const;
 	///
+	int docbook(Buffer const &, odocstream &, OutputParams const &) const;
+	///
 	void validate(LaTeXFeatures &) const;
 	///
 	InsetNoteParams const & params() const { return params_; }