BufferParams.cpp: fix bug 3568:

[lyx.git] / src / Cursor.cpp

diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index 9d2f03b906f58096bf7a25e98aa4789ee4ecae68..fd6bb6e7d8512e6a6dfb46993af2f5660a069e77 100644 (file)
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -245,6 +245,16 @@ namespace {
                return true;
        }
 
+       docstring parbreak(Paragraph const & par)
+       {
+               odocstringstream ods;
+               ods << '\n';
+               // only add blank line if we're not in an ERT inset
+               if (par.ownerCode() != Inset::ERT_CODE)
+                       ods << '\n';
+               return ods.str();
+       }
+
 } // namespace anon
 
 
@@ -1178,12 +1188,14 @@ docstring Cursor::selectionAsString(bool label) const
 
                // First paragraph in selection
                docstring result = pars[startpit].
-                       asString(buffer, startpos, pars[startpit].size(), label) + "\n\n";
+                       asString(buffer, startpos, pars[startpit].size(), label)
+                                + parbreak(pars[startpit]);
 
                // The paragraphs in between (if any)
                for (pit_type pit = startpit + 1; pit != endpit; ++pit) {
                        Paragraph const & par = pars[pit];
-                       result += par.asString(buffer, 0, par.size(), label) + "\n\n";
+                       result += par.asString(buffer, 0, par.size(), label)
+                                 + parbreak(pars[pit]);
                }
 
                // Last paragraph in selection
@@ -1329,10 +1341,7 @@ void Cursor::fixIfBroken()
 
 bool Cursor::isRTL() const
 {
-       if (inMathed())
-               return innerParagraph().isRightToLeftPar(bv().buffer()->params());
-
-       return top().paragraph().isRightToLeftPar(bv().buffer()->params());
+       return innerParagraph().isRightToLeftPar(bv().buffer()->params());
 }