* Doxy: fix \vars

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 95714af9cdf617d021294da994e3a895a58e416f..94338898d9097521375dfce93acfe5875b3aa2cc 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -283,7 +283,7 @@ TeXOnePar(Buffer const & buf,
        LayoutPtr style;
 
        if (runparams_in.verbatim) {
-               int const dist = std::distance(paragraphs.begin(), pit);
+               int const dist = distance(paragraphs.begin(), pit);
                Font const outerfont = outerFont(dist, paragraphs);
 
                // No newline if only one paragraph in this lyxtext
@@ -455,7 +455,7 @@ TeXOnePar(Buffer const & buf,
                                OutputParams tmp_rp = runparams;
                                runparams.moving_arg = false;
                                pair<bool, int> enc_switch = switchEncoding(os, bparams, runparams,
-                                       *(runparams.encoding), *encoding);
+                                       *encoding);
                                runparams = tmp_rp;
                                // the following is necessary after a CJK environment in a multilingual
                                // context (nesting issue).
@@ -491,6 +491,7 @@ TeXOnePar(Buffer const & buf,
 
        // In an inset with unlimited length (all in one row),
        // don't allow any special options in the paragraph
+       bool const useSetSpace = bparams.getTextClass().provides("SetSpace");
        if (!pit->forceDefaultParagraphs()) {
                if (pit->params().startOfAppendix()) {
                        os << "\\appendix\n";
@@ -501,7 +502,7 @@ TeXOnePar(Buffer const & buf,
                        && (pit == paragraphs.begin()
                            || !boost::prior(pit)->hasSameLayout(*pit)))
                {
-                       os << from_ascii(pit->params().spacing().writeEnvirBegin())
+                       os << from_ascii(pit->params().spacing().writeEnvirBegin(useSetSpace))
                            << '\n';
                        texrow.newline();
                }
@@ -540,7 +541,7 @@ TeXOnePar(Buffer const & buf,
        }
 
        Font const outerfont =
-               outerFont(std::distance(paragraphs.begin(), pit),
+               outerFont(distance(paragraphs.begin(), pit),
                          paragraphs);
 
        // FIXME UNICODE
@@ -611,7 +612,7 @@ TeXOnePar(Buffer const & buf,
                                os << '\n';
                                texrow.newline();
                        }
-                       os << from_ascii(pit->params().spacing().writeEnvirEnd());
+                       os << from_ascii(pit->params().spacing().writeEnvirEnd(useSetSpace));
                        pending_newline = true;
                }
        }
@@ -834,7 +835,7 @@ void latexParagraphs(Buffer const & buf,
                        par = TeXOnePar(buf, paragraphs, par, os, texrow,
                                        runparams, everypar);
                }
-               if (std::distance(lastpar, par) >= std::distance(lastpar, endpar))
+               if (distance(lastpar, par) >= distance(lastpar, endpar))
                        break;
        }
        // It might be that we only have a title in this document
@@ -865,9 +866,9 @@ void latexParagraphs(Buffer const & buf,
 
 
 pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
-                  OutputParams const & runparams, Encoding const & oldEnc,
-                  Encoding const & newEnc)
+                  OutputParams const & runparams, Encoding const & newEnc)
 {
+       Encoding const oldEnc = *runparams.encoding;
        bool moving_arg = runparams.moving_arg;
        if ((bparams.inputenc != "auto" && bparams.inputenc != "default")
                || moving_arg)