* 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

diff --git a/src/insets/insetbase.h b/src/insets/insetbase.h
index ae6ac1cf9b8b8c5a874b3abc28a649ab91283b44..8e6786b67b647e09327f0e6c4185b734fbd47425 100644 (file)
--- 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 1bb0bd3713d3cddf3f7c071a977232fe503b2075..13495a6018ede88ac12da75d1645b592a069070f 100644 (file)
--- 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 0f39abdcf34dfdca62f7b33055a5254f49ecb37b..3c28c079c6eef8958169aa9422c62cb036c9163f 100644 (file)
--- 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 2a4fea822cfed6487bae4b6a13cf9c856ed8d46b..2da9e8b4a02ca0716b60aab6cffde10623ff2266 100644 (file)
--- 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 c97f85c320dba2239257ffcc908644429d26c8fc..53926417e0ba4f313a4fe9235508f82d718acb06 100644 (file)
--- 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 ef0efd842f8657fb44d48f59b082a29364acb0d4..0832d4be70eff8b0776027e9ba965c826d9a91b1 100644 (file)
--- 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 694287ff20f176d21d14f3ce670c5a8e6c4c3fc0..b4be20c9989978852d4e86f21852d87a7022f8bc 100644 (file)
--- 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 fb66694054262da1f93d1f180b38c6bf116900a0..e4d448220a6823b34f5282f8f8325398e42788f2 100644 (file)
--- 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 f2d7c3c7650cfed1650e40df1dbf97f3e465d5b5..103f90c1dc4bd13481d4743f5643078c35f62f18 100644 (file)
--- 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 73c8ed647dae02fe81122e85505552e840c9b5ca..a42472fbc5d0b60fda73afaff8bec47149a93d03 100644 (file)
--- 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 0b7c2945d8666b250a04294f0c8920fe72504999..160d8b6d2c08d7fe6a1be003557cf491795fd58d 100644 (file)
--- 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 f75ed7d056538b6a9e7643a155de2a444d0296e4..adb97edc1a691bcd8ebcaabdc9264cdaa1ffc2f1 100644 (file)
--- 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 d1a575639d132f373aef2c5960ccf7475407afd0..d0b9365c6713af05c9c433a3bc43774801406e8b 100644 (file)
--- 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 7391a0806f961c1b58a5a0ad6e4ad20e40457756..6b06f940e5ebaaa89c1ff9a7a04c4ae9e2934a8b 100644 (file)
--- 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 2da47e7480d9e5ded78ece1d1d620bf1b4286a4c..218f92394ca3d996a5ec2ff1bc4792549a4f3490 100644 (file)
--- 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 dcc5a7adc91542c77c03e7763fb5a6cb9d74248c..9b7426c643e8580853a835d74cae7bca4953c623 100644 (file)
--- 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 3634ad751ba2eb63e8255f4a8db0e74539e5bfcc..8682c97b0fe6dad4d3394e41b66b7e2b76ad41d2 100644 (file)
--- 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 c9f4a5abf16709e73e6f3a734ae442b20562b929..454ba829bafe9b729235457e005c4840bec9a4c0 100644 (file)
--- 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 942d393723ecc6cf48c7bdc856527ad3a61a33b7..8bfec5a9101658d183d5e54b79297deff67ccdf5 100644 (file)
--- 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
 }