]> git.lyx.org Git - lyx.git/blobdiff - src/output_latex.cpp
Update it.po
[lyx.git] / src / output_latex.cpp
index cacd6b2046fc48660f342f591c4ccaf17d3f8463..c83ad3bd02aae170c4cf4bf8048360c88327e9e9 100644 (file)
@@ -82,13 +82,12 @@ TeXDeeper(Buffer const & buf,
 
        ParagraphList const & paragraphs = text.paragraphs();
 
-       // FIXME This test should not be necessary.
-       // We should perhaps issue an error if it is.
-       Layout const & style = par->forcePlainLayout() ?
-               buf.params().documentClass().plainLayout() : par->layout();
-
        while (par != paragraphs.end() &&
-                    par->params().depth() == pit->params().depth()) {
+                                       par->params().depth() == pit->params().depth()) {
+               // FIXME This test should not be necessary.
+               // We should perhaps issue an error if it is.
+               Layout const & style = par->forcePlainLayout() ?
+                       buf.params().documentClass().plainLayout() : par->layout();
                if (style.isEnvironment()) {
                        par = TeXEnvironment(buf, text, par,
                                             os, texrow, runparams);
@@ -726,8 +725,17 @@ TeXOnePar(Buffer const & buf,
        // TeXEnvironment, because it is needed in this case
        if (nextpit != paragraphs.end()) {
                Layout const & next_layout = nextpit->layout();
-               // no blank lines before environments!
-               if (!next_layout.isEnvironment() || style == next_layout) {
+               if (style == next_layout
+                   // no blank lines before environments!
+                   || !next_layout.isEnvironment()
+                   // unless there's a depth change
+                   // FIXME What we really want to do here is put every \begin and \end
+                   // tag on a new line (which was not the case with nested environments).
+                   // But in the present state of play, we don't have access to the
+                   // information whether the current TeX row is empty or not.
+                   // For some ideas about how to fix this, see this thread:
+                   // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg145787.html
+                   || nextpit->params().depth() != pit->params().depth()) {
                        os << '\n';
                        texrow.newline();
                }