* src/insets/insetnewline.C:

	* src/insets/insetpagebreak.C:
	* src/insets/insetvspace.C: fix/comment on plaintext() return value
	* src/insets/insetvspace.h: WS changes

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

diff --git a/src/insets/insetnewline.C b/src/insets/insetnewline.C
index b875680390d227811b29787658bdebe9c06b4026..f75ed7d056538b6a9e7643a155de2a444d0296e4 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;
+       return runparams.linelen; // start with column 0 in new line
 }
 
 

diff --git a/src/insets/insetpagebreak.C b/src/insets/insetpagebreak.C
index a606cefc5cd0046da9230e92a42ffd6a498fbaef..7391a0806f961c1b58a5a0ad6e4ad20e40457756 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; 
+       return runparams.linelen; // start with column 0 in new line
 }
 
 

diff --git a/src/insets/insetvspace.C b/src/insets/insetvspace.C
index afb221aff28cc25295def2fab9f87d1cf48b3e06..c9f4a5abf16709e73e6f3a734ae442b20562b929 100644 (file)
--- a/src/insets/insetvspace.C
+++ b/src/insets/insetvspace.C
@@ -22,6 +22,7 @@
 #include "lyxlex.h"
 #include "lyxtext.h"
 #include "metricsinfo.h"
+#include "outputparams.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
@@ -202,7 +203,7 @@ void InsetVSpace::draw(PainterInfo & pi, int x, int y) const
 
 
 int InsetVSpace::latex(Buffer const & buf, odocstream & os,
-                         OutputParams const &) const
+                       OutputParams const &) const
 {
        os << from_ascii(space_.asLatexCommand(buf.params())) << '\n';
        return 1;
@@ -210,15 +211,15 @@ int InsetVSpace::latex(Buffer const & buf, odocstream & os,
 
 
 int InsetVSpace::plaintext(Buffer const &, odocstream & os,
-                          OutputParams const &) const
+                           OutputParams const & runparams) const
 {
        os << "\n\n";
-       return 2;
+       return runparams.linelen; // start with column 0 in new line
 }
 
 
 int InsetVSpace::docbook(Buffer const &, odocstream & os,
-                        OutputParams const &) const
+                         OutputParams const &) const
 {
        os << '\n';
        return 1;

diff --git a/src/insets/insetvspace.h b/src/insets/insetvspace.h
index eb3a409c5588a3d094256e7535d94b323c8d5207..abe49948094ac7bb7f3a76e06301c7491fc11dda 100644 (file)
--- a/src/insets/insetvspace.h
+++ b/src/insets/insetvspace.h
@@ -34,13 +34,13 @@ 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;
+                   OutputParams const &) const;
        ///
        void read(Buffer const &, LyXLex & lex);
        ///