Embedding: saving inzip name to .lyx file so that embedded files can always be found...

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index e953d91d9de82e7cdc7426eab72ec4f8864e6c54..069ad92565efa65bd5c56a8f69d94dd68d382082 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -35,15 +35,10 @@
 
 #include <boost/next_prior.hpp>
 
-namespace lyx {
-
-using support::subst;
-
-using std::endl;
-using std::string;
-using std::pair;
-using std::make_pair;
+using namespace std;
+using namespace lyx::support;
 
+namespace lyx {
 
 namespace {
 
@@ -288,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
@@ -460,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).
@@ -545,7 +540,7 @@ TeXOnePar(Buffer const & buf,
        }
 
        Font const outerfont =
-               outerFont(std::distance(paragraphs.begin(), pit),
+               outerFont(distance(paragraphs.begin(), pit),
                          paragraphs);
 
        // FIXME UNICODE
@@ -839,7 +834,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
@@ -870,9 +865,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)