* insetert.[Ch]:

	* insetnewline.[Ch]:
	* insetline.[Ch]: fix plaintext()

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

diff --git a/src/insets/insetert.C b/src/insets/insetert.C
index 15e936c5d201310f9aa7f5b120d24ff2615ae09a..344a94569cb7228e74f2a5129cb0b37238042930 100644 (file)
--- a/src/insets/insetert.C
+++ b/src/insets/insetert.C
@@ -172,7 +172,7 @@ int InsetERT::latex(Buffer const &, odocstream & os,
 
 
 int InsetERT::plaintext(Buffer const &, odocstream &,
-                   OutputParams const & /*runparams*/) const
+                        OutputParams const &) const
 {
        return 0;
 }

diff --git a/src/insets/insetert.h b/src/insets/insetert.h
index 77f81aef220a049bcaf6f5d780c4770c5c28c2d8..a91330b72ba1f5481ddd55b4a51e304447339bac 100644 (file)
--- a/src/insets/insetert.h
+++ b/src/insets/insetert.h
@@ -56,10 +56,10 @@ public:
                  OutputParams const &) const;
        ///
        int plaintext(Buffer const &, odocstream &,
-                 OutputParams const & runparams) const;
+                     OutputParams const &) const;
        ///
        int docbook(Buffer const &, odocstream &,
-                   OutputParams const & runparams) const;
+                   OutputParams const &) const;
        ///
        void validate(LaTeXFeatures &) const {}
        ///

diff --git a/src/insets/insetline.C b/src/insets/insetline.C
index 9aa4d63e31e5c58440d2b51d985bd73e818d7643..73c8ed647dae02fe81122e85505552e840c9b5ca 100644 (file)
--- a/src/insets/insetline.C
+++ b/src/insets/insetline.C
@@ -61,7 +61,7 @@ void InsetLine::draw(PainterInfo & pi, int x, int y) const
 
 
 int InsetLine::latex(Buffer const &, odocstream & os,
-                       OutputParams const & runparams) const
+                     OutputParams const & runparams) const
 {
        os << "\\lyxline{\\"
           << from_ascii(runparams.local_font->latexSize()) << '}';
@@ -70,10 +70,10 @@ int InsetLine::latex(Buffer const &, odocstream & os,
 
 
 int InsetLine::plaintext(Buffer const &, odocstream & os,
-                    OutputParams const &) const
+                         OutputParams const & runparams) const
 {
-       os << "-------------------------------------------";
-       return 0;
+       os << "\n-------------------------------------------\n";
+       return runparams.linelen; // start with column 0 in new line
 }
 
 

diff --git a/src/insets/insetline.h b/src/insets/insetline.h
index 8e5f6a7d10cbbd940b6ca6c78f3755ae5cacfb4f..a383b3f0d231ed4144210b82ab8b539f777bcf0e 100644 (file)
--- a/src/insets/insetline.h
+++ b/src/insets/insetline.h
@@ -30,10 +30,10 @@ public:
        void draw(PainterInfo & pi, int x, int y) const;
 
        int latex(Buffer const &, odocstream &,
-                         OutputParams const &) const;
+                 OutputParams const &) const;
 
        int plaintext(Buffer const &, odocstream &,
-                 OutputParams const &) const;
+                     OutputParams const &) const;
 
        int docbook(Buffer const &, odocstream &,
                    OutputParams const &) const;

diff --git a/src/insets/insetnewline.C b/src/insets/insetnewline.C
index 302dda77690d1ddf2c260625c51bbd11e48653de..76c0ff3b642019eff96c5f3bb1cbd16b9ac40125 100644 (file)
--- a/src/insets/insetnewline.C
+++ b/src/insets/insetnewline.C
@@ -62,7 +62,7 @@ int InsetNewline::latex(Buffer const &, odocstream &,
 
 
 int InsetNewline::plaintext(Buffer const &, odocstream & os,
-                       OutputParams const &) const
+                            OutputParams const &) const
 {
        os << '\n';
        return 0;

diff --git a/src/insets/insetnewline.h b/src/insets/insetnewline.h
index aa6d2066dd0b503255aedf3d7ad553065eaaa1d3..d0b76b94caa421aad7e6c91d60dfb4a09a04bea7 100644 (file)
--- a/src/insets/insetnewline.h
+++ b/src/insets/insetnewline.h
@@ -29,14 +29,11 @@ public:
 
        virtual void draw(PainterInfo & pi, int x, int y) const;
 
-       virtual int latex(Buffer const &, odocstream &,
-                         OutputParams const &) const;
+       int latex(Buffer const &, odocstream &, OutputParams const &) const;
 
-       virtual int plaintext(Buffer const &, odocstream &,
-                         OutputParams const &) const;
+       int plaintext(Buffer const &, odocstream &, OutputParams const &) const;
 
-       virtual int docbook(Buffer const &, odocstream &,
-                           OutputParams const &) const;
+       int docbook(Buffer const &, odocstream &, OutputParams const &) const;
 
        virtual void read(Buffer const &, LyXLex & lex);