Fix bookmarks-goto inside insets.

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index c5306d74ac13e4e2a59326b3eb22bee113a0e88a..4589b3795b1368a10c90d8f92e4b8abf0e90fcae 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -1455,12 +1455,7 @@ void TeXOnePar(Buffer const & buf,
        // Note from JMarc: we will re-add a \n explicitly in
        // TeXEnvironment, because it is needed in this case
        if (nextpar && !os.afterParbreak() && !last_was_separator) {
-               if (runparams.isNonLong)
-                       // This is to allow parbreak in multirow
-                       // It could also be used for other non-long
-                       // contexts
-                       os << "\\endgraf";
-               else if (!text.inset().getLayout().parbreakIgnored() && !merged_par)
+               if (!text.inset().getLayout().parbreakIgnored() && !merged_par)
                        // Make sure to start a new line
                        os << breakln;
                // A newline '\n' is always output before a command,
@@ -1507,8 +1502,15 @@ void TeXOnePar(Buffer const & buf,
                                && tclass.isDefaultLayout(next_layout))) {
                                // and omit paragraph break if it has been deleted with ct
                                // and changes are not shown in output
-                               if (!merged_par)
-                                       os << '\n';
+                               if (!merged_par) {
+                                       if (runparams.isNonLong)
+                                               // This is to allow parbreak in multirow
+                                               // It could also be used for other non-long
+                                               // contexts
+                                               os << "\\endgraf\n";
+                                       else
+                                               os << '\n';
+                               }
                        }
                }
        }