From 3157f17825548073795fa09117da226a5b9f0d08 Mon Sep 17 00:00:00 2001
From: Michael Schmitt <michael.schmitt@teststep.org>
Date: Tue, 20 Feb 2007 17:52:41 +0000
Subject: [PATCH] 	* inset*.C: 	* insetbase.h: introduce new enum
 PLAINTEXT_NEWLINE and use 	it instead of runparams.linelen for plaintex()
 return values

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17275 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/insets/insetbase.h      | 8 ++++++--
 src/insets/insetbox.C       | 2 +-
 src/insets/insetbranch.C    | 2 +-
 src/insets/insetcaption.C   | 2 +-
 src/insets/insetenv.C       | 2 +-
 src/insets/insetexternal.C  | 2 +-
 src/insets/insetfloat.C     | 2 +-
 src/insets/insetfloatlist.C | 2 +-
 src/insets/insetfoot.C      | 2 +-
 src/insets/insetline.C      | 2 +-
 src/insets/insetmarginal.C  | 2 +-
 src/insets/insetnewline.C   | 2 +-
 src/insets/insetnote.C      | 2 +-
 src/insets/insetpagebreak.C | 2 +-
 src/insets/insettabular.C   | 2 +-
 src/insets/insettext.C      | 6 +++---
 src/insets/insettoc.C       | 2 +-
 src/insets/insetvspace.C    | 2 +-
 src/insets/insetwrap.C      | 2 +-
 19 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/insets/insetbase.h b/src/insets/insetbase.h
index ae6ac1cf9b..8e6786b67b 100644
--- a/src/insets/insetbase.h
+++ b/src/insets/insetbase.h
@@ -200,9 +200,13 @@ public:
 	/// describe content if cursor behind
 	virtual void infoize2(odocstream &) const {}
 
+	enum {
+		PLAINTEXT_NEWLINE = 10000
+	};
+
 	/// plain text output in ucs4 encoding
-	/// return the number of characters, in case of multiple lines of
-	/// output, add runparams.linelen to the number of chars in the last line
+	/// return the number of characters; in case of multiple lines of
+	/// output, add PLAINTEXT_NEWLINE to the number of chars in the last line
 	virtual int plaintext(Buffer const &, odocstream &,
 	                      OutputParams const &) const = 0;
 	/// docbook output
diff --git a/src/insets/insetbox.C b/src/insets/insetbox.C
index 1bb0bd3713..13495a6018 100644
--- a/src/insets/insetbox.C
+++ b/src/insets/insetbox.C
@@ -415,7 +415,7 @@ int InsetBox::plaintext(Buffer const & buf, odocstream & os,
 		case Doublebox: os << "\n]]"; len = 2; break;
 	}
 
-	return len + runparams.linelen; // len chars on a separate line
+	return PLAINTEXT_NEWLINE + len; // len chars on a separate line
 }
 
 
diff --git a/src/insets/insetbranch.C b/src/insets/insetbranch.C
index 0f39abdcf3..3c28c079c6 100644
--- a/src/insets/insetbranch.C
+++ b/src/insets/insetbranch.C
@@ -240,7 +240,7 @@ int InsetBranch::plaintext(Buffer const & buf, odocstream & os,
 	InsetText::plaintext(buf, os, runparams);
 	os << "\n]";
 
-	return 1 + runparams.linelen; // one char on a separate line
+	return PLAINTEXT_NEWLINE + 1; // one char on a separate line
 }
 
 
diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C
index 2a4fea822c..2da9e8b4a0 100644
--- a/src/insets/insetcaption.C
+++ b/src/insets/insetcaption.C
@@ -254,7 +254,7 @@ int InsetCaption::plaintext(Buffer const & buf, odocstream & os,
 	InsetText::plaintext(buf, os, runparams);
 	os << "\n]";
 
-	return 1 + runparams.linelen; // one char on a separate line
+	return PLAINTEXT_NEWLINE + 1; // one char on a separate line
 }
 
 
diff --git a/src/insets/insetenv.C b/src/insets/insetenv.C
index c97f85c320..53926417e0 100644
--- a/src/insets/insetenv.C
+++ b/src/insets/insetenv.C
@@ -88,7 +88,7 @@ int InsetEnvironment::plaintext(Buffer const & buf, odocstream & os,
 	InsetText::plaintext(buf, os, runparams);
 	os << "\n]";
 
-	return 1 + runparams.linelen; // one char on a separate line
+	return PLAINTEXT_NEWLINE + 1; // one char on a separate line
 }
 
 
diff --git a/src/insets/insetexternal.C b/src/insets/insetexternal.C
index ef0efd842f..0832d4be70 100644
--- a/src/insets/insetexternal.C
+++ b/src/insets/insetexternal.C
@@ -726,7 +726,7 @@ int InsetExternal::plaintext(Buffer const & buf, odocstream & os,
 	external::writeExternal(params_, "Ascii", buf, os,
 	                        *(runparams.exportdata), false,
 	                        runparams.dryrun || runparams.inComment);
-	return runparams.linelen; // start with column 0 in new line
+	return PLAINTEXT_NEWLINE;
 }
 
 
diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C
index 694287ff20..b4be20c998 100644
--- a/src/insets/insetfloat.C
+++ b/src/insets/insetfloat.C
@@ -335,7 +335,7 @@ int InsetFloat::plaintext(Buffer const & buf, odocstream & os,
 	InsetText::plaintext(buf, os, runparams);
 	os << "\n]";
 
-	return 1 + runparams.linelen; // one char on a separate line
+	return PLAINTEXT_NEWLINE + 1; // one char on a separate line
 }
 
 
diff --git a/src/insets/insetfloatlist.C b/src/insets/insetfloatlist.C
index fb66694054..e4d448220a 100644
--- a/src/insets/insetfloatlist.C
+++ b/src/insets/insetfloatlist.C
@@ -135,7 +135,7 @@ int InsetFloatList::plaintext(Buffer const & buffer, odocstream & os,
 
 	buffer.tocBackend().writePlaintextTocList(to_ascii(getParam("type")), os);
 
-	return runparams.linelen; // start with column 0 in new line
+	return PLAINTEXT_NEWLINE;
 }
 
 
diff --git a/src/insets/insetfoot.C b/src/insets/insetfoot.C
index f2d7c3c765..103f90c1dc 100644
--- a/src/insets/insetfoot.C
+++ b/src/insets/insetfoot.C
@@ -87,7 +87,7 @@ int InsetFoot::plaintext(Buffer const & buf, odocstream & os,
 	InsetText::plaintext(buf, os, runparams);
 	os << "\n]";
 
-	return 1 + runparams.linelen; // one char on a separate line
+	return PLAINTEXT_NEWLINE + 1; // one char on a separate line
 }
 
 
diff --git a/src/insets/insetline.C b/src/insets/insetline.C
index 73c8ed647d..a42472fbc5 100644
--- a/src/insets/insetline.C
+++ b/src/insets/insetline.C
@@ -73,7 +73,7 @@ int InsetLine::plaintext(Buffer const &, odocstream & os,
                          OutputParams const & runparams) const
 {
 	os << "\n-------------------------------------------\n";
-	return runparams.linelen; // start with column 0 in new line
+	return PLAINTEXT_NEWLINE;
 }
 
 
diff --git a/src/insets/insetmarginal.C b/src/insets/insetmarginal.C
index 0b7c2945d8..160d8b6d2c 100644
--- a/src/insets/insetmarginal.C
+++ b/src/insets/insetmarginal.C
@@ -72,7 +72,7 @@ int InsetMarginal::plaintext(Buffer const & buf, odocstream & os,
 	InsetText::plaintext(buf, os, runparams);
 	os << "\n]";
 
-	return 1 + runparams.linelen; // one char on a separate line
+	return PLAINTEXT_NEWLINE + 1; // one char on a separate line
 }
 
 
diff --git a/src/insets/insetnewline.C b/src/insets/insetnewline.C
index f75ed7d056..adb97edc1a 100644
--- a/src/insets/insetnewline.C
+++ b/src/insets/insetnewline.C
@@ -66,7 +66,7 @@ int InsetNewline::plaintext(Buffer const &, odocstream & os,
                             OutputParams const & runparams) const
 {
 	os << '\n';
-	return runparams.linelen; // start with column 0 in new line
+	return PLAINTEXT_NEWLINE;
 }
 
 
diff --git a/src/insets/insetnote.C b/src/insets/insetnote.C
index d1a575639d..d0b9365c67 100644
--- a/src/insets/insetnote.C
+++ b/src/insets/insetnote.C
@@ -311,7 +311,7 @@ int InsetNote::plaintext(Buffer const & buf, odocstream & os,
 	InsetText::plaintext(buf, os, runparams);
 	os << "\n]";
 
-	return 1 + runparams.linelen; // one char on a separate line
+	return PLAINTEXT_NEWLINE + 1; // one char on a separate line
 }
 
 
diff --git a/src/insets/insetpagebreak.C b/src/insets/insetpagebreak.C
index 7391a0806f..6b06f940e5 100644
--- a/src/insets/insetpagebreak.C
+++ b/src/insets/insetpagebreak.C
@@ -91,7 +91,7 @@ int InsetPagebreak::plaintext(Buffer const &, odocstream & os,
                               OutputParams const & runparams) const
 {
 	os << '\n';
-	return runparams.linelen; // start with column 0 in new line
+	return PLAINTEXT_NEWLINE;
 }
 
 
diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 2da47e7480..218f92394c 100644
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -1105,7 +1105,7 @@ int InsetTabular::plaintext(Buffer const & buf, odocstream & os,
 	os << '\n'; // output table on a new line
 	int const dp = runparams.linelen > 0 ? runparams.depth : 0;
 	tabular.plaintext(buf, os, runparams, dp, false, 0);
-	return runparams.linelen; // start with column 0 in new line
+	return PLAINTEXT_NEWLINE;
 }
 
 
diff --git a/src/insets/insettext.C b/src/insets/insettext.C
index dcc5a7adc9..9b7426c643 100644
--- a/src/insets/insettext.C
+++ b/src/insets/insettext.C
@@ -291,7 +291,7 @@ void InsetText::rejectChanges(BufferParams const & bparams)
 
 
 int InsetText::latex(Buffer const & buf, odocstream & os,
-		     OutputParams const & runparams) const
+                     OutputParams const & runparams) const
 {
 	TexRow texrow;
 	latexParagraphs(buf, paragraphs(), os, texrow, runparams);
@@ -300,7 +300,7 @@ int InsetText::latex(Buffer const & buf, odocstream & os,
 
 
 int InsetText::plaintext(Buffer const & buf, odocstream & os,
-		     OutputParams const & runparams) const
+                         OutputParams const & runparams) const
 {
 	ParagraphList::const_iterator beg = paragraphs().begin();
 	ParagraphList::const_iterator end = paragraphs().end();
@@ -327,7 +327,7 @@ int InsetText::plaintext(Buffer const & buf, odocstream & os,
 
 
 int InsetText::docbook(Buffer const & buf, odocstream & os,
-		       OutputParams const & runparams) const
+                       OutputParams const & runparams) const
 {
 	docbookParagraphs(paragraphs(), buf, os, runparams);
 	return 0;
diff --git a/src/insets/insettoc.C b/src/insets/insettoc.C
index 3634ad751b..8682c97b0f 100644
--- a/src/insets/insettoc.C
+++ b/src/insets/insettoc.C
@@ -63,7 +63,7 @@ int InsetTOC::plaintext(Buffer const & buffer, odocstream & os,
 
 	buffer.tocBackend().writePlaintextTocList(getCmdName(), os);
 
-	return runparams.linelen; // start with column 0 in new line
+	return PLAINTEXT_NEWLINE;
 }
 
 
diff --git a/src/insets/insetvspace.C b/src/insets/insetvspace.C
index c9f4a5abf1..454ba829ba 100644
--- a/src/insets/insetvspace.C
+++ b/src/insets/insetvspace.C
@@ -214,7 +214,7 @@ int InsetVSpace::plaintext(Buffer const &, odocstream & os,
                            OutputParams const & runparams) const
 {
 	os << "\n\n";
-	return runparams.linelen; // start with column 0 in new line
+	return PLAINTEXT_NEWLINE;
 }
 
 
diff --git a/src/insets/insetwrap.C b/src/insets/insetwrap.C
index 942d393723..8bfec5a910 100644
--- a/src/insets/insetwrap.C
+++ b/src/insets/insetwrap.C
@@ -199,7 +199,7 @@ int InsetWrap::plaintext(Buffer const & buf, odocstream & os,
 	InsetText::plaintext(buf, os, runparams);
 	os << "\n]";
 
-	return 1 + runparams.linelen; // one char on a separate line
+	return PLAINTEXT_NEWLINE + 1; // one char on a separate line
 }
 
 
-- 
2.39.2