Update it.po

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 90af09a5dc5d2e247c33444e1d2b16e46ed2731e..c83ad3bd02aae170c4cf4bf8048360c88327e9e9 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -83,8 +83,12 @@ TeXDeeper(Buffer const & buf,
        ParagraphList const & paragraphs = text.paragraphs();
 
        while (par != paragraphs.end() &&
-                    par->params().depth() == pit->params().depth()) {
-               if (par->layout().isEnvironment()) {
+                                       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);
                } else {
@@ -109,6 +113,8 @@ TeXEnvironment(Buffer const & buf,
 
        BufferParams const & bparams = buf.params();
 
+       // FIXME This test should not be necessary.
+       // We should perhaps issue an error if it is.
        Layout const & style = pit->forcePlainLayout() ?
                bparams.documentClass().plainLayout() : pit->layout();
 
@@ -287,12 +293,10 @@ TeXOnePar(Buffer const & buf,
        BufferParams const & bparams = buf.params();
        ParagraphList const & paragraphs = text.paragraphs();
 
-       ParagraphList::const_iterator priorpit = pit;
-       if (priorpit != paragraphs.begin())
-               --priorpit;
-       ParagraphList::const_iterator nextpit = pit;
-       if (nextpit != paragraphs.end())
-               ++nextpit;
+       ParagraphList::const_iterator const priorpit = 
+               pit == paragraphs.begin() ? pit : boost::prior(pit);
+       ParagraphList::const_iterator const nextpit = 
+               pit == paragraphs.end() ? pit : boost::next(pit);
 
        OutputParams runparams = runparams_in;
        runparams.isLastPar = nextpit == paragraphs.end();
@@ -312,6 +316,8 @@ TeXOnePar(Buffer const & buf,
                return nextpit;
        }
 
+       // FIXME This check should not really be needed.
+       // Perhaps we should issue an error if it is.
        Layout const style = pit->forcePlainLayout() ?
                bparams.documentClass().plainLayout() : pit->layout();
 
@@ -553,7 +559,7 @@ TeXOnePar(Buffer const & buf,
                 ? pit->getLayoutFont(bparams, outerfont)
                 : pit->getFont(bparams, pit->size() - 1, outerfont);
 
-       bool is_command = style.isCommand();
+       bool const is_command = style.isCommand();
 
        if (style.resfont.size() != font.fontInfo().size()
            && nextpit != paragraphs.end()
@@ -577,10 +583,9 @@ TeXOnePar(Buffer const & buf,
        case LATEX_ENVIRONMENT: {
                // if its the last paragraph of the current environment
                // skip it otherwise fall through
-               ParagraphList::const_iterator next = nextpit;
-
-               if (next != paragraphs.end() && (next->layout() != pit->layout()
-                       || next->params().depth() != pit->params().depth()))
+               if (nextpit != paragraphs.end() && 
+                   (nextpit->layout() != pit->layout()
+                    || nextpit->params().depth() != pit->params().depth()))
                        break;
        }
 
@@ -617,9 +622,9 @@ TeXOnePar(Buffer const & buf,
                // are we about to close the language?
                ((nextpit != paragraphs.end() &&
                  par_language->babel() !=
-                       (nextpit->getParLanguage(bparams))->babel()) ||
-                (nextpit == paragraphs.end() &&
-                 par_language->babel() != outer_language->babel()));
+                   (nextpit->getParLanguage(bparams))->babel()) ||
+                 (nextpit == paragraphs.end() &&
+                   par_language->babel() != outer_language->babel()));
 
        if (closing_rtl_ltr_environment || (nextpit == paragraphs.end()
            && par_language->babel() != outer_language->babel())) {
@@ -715,13 +720,22 @@ TeXOnePar(Buffer const & buf,
                runparams_in.encoding = runparams.encoding;
 
 
-       // we don't need it for the last paragraph!!!
-       // Note from JMarc: we will re-add a \n explicitely in
+       // we don't need a newline for the last paragraph!!!
+       // Note from JMarc: we will re-add a \n explicitly in
        // 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();
                }
@@ -792,6 +806,8 @@ void latexParagraphs(Buffer const & buf,
        // if only_body
        while (par != endpar) {
                lastpar = par;
+               // FIXME This check should not be needed. We should
+               // perhaps issue an error if it is.
                Layout const & layout = par->forcePlainLayout() ?
                                tclass.plainLayout() :
                                par->layout();