Fix table rotate conversion to 2.0 format

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index f2c99db146a68b9558a0b3311fdc82dbc02abf79..312199d62c0f39405fb0aba242c9a9ac547ed960 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -53,6 +53,10 @@ enum OpenEncoding {
        CJK
 };
 
+// FIXME THREAD
+// There could easily be a conflict here, with the export process
+// setting this one way, and a View>Source process (possbily for
+// another Buffer) resetting it.
 static int open_encoding_ = none;
 static int cjk_inherited_ = 0;
 Language const * prev_env_language_ = 0;
@@ -351,22 +355,24 @@ void getArgInsets(otexstream & os, OutputParams const & runparams, Layout::LaTeX
                                string const name = prefix + convert<string>(i);
                                if ((*lait).first == name) {
                                        Layout::latexarg arg = (*lait).second;
+                                       docstring preset = arg.presetarg;
+                                       if (!arg.defaultarg.empty()) {
+                                               if (!preset.empty())
+                                                       preset += ",";
+                                               preset += arg.defaultarg;
+                                       }
                                        if (arg.mandatory) {
                                                docstring ldelim = arg.ldelim.empty() ?
                                                                from_ascii("{") : arg.ldelim;
                                                docstring rdelim = arg.rdelim.empty() ?
                                                                from_ascii("}") : arg.rdelim;
-                                               os << ldelim << arg.presetarg << rdelim;
-                                       } else if (!arg.presetarg.empty()) {
-                                               docstring ldelim = arg.mandatory ?
-                                                               from_ascii("{") : from_ascii("[");
-                                               docstring rdelim = arg.mandatory ?
-                                                               from_ascii("}") : from_ascii("]");
-                                               if (!arg.ldelim.empty())
-                                                       ldelim = arg.ldelim;
-                                               if (!arg.rdelim.empty())
-                                                       rdelim = arg.rdelim;
-                                               os << ldelim << arg.presetarg << rdelim;
+                                               os << ldelim << preset << rdelim;
+                                       } else if (!preset.empty()) {
+                                               docstring ldelim = arg.ldelim.empty() ?
+                                                               from_ascii("[") : arg.ldelim;
+                                               docstring rdelim = arg.rdelim.empty() ?
+                                                               from_ascii("]") : arg.rdelim;
+                                               os << ldelim << preset << rdelim;
                                        } else if (find(required.begin(), required.end(),
                                                   (*lait).first) != required.end()) {
                                                docstring ldelim = arg.ldelim.empty() ?
@@ -521,7 +527,8 @@ void TeXOnePar(Buffer const & buf,
               string const & everypar,
               int start_pos, int end_pos)
 {
-       BufferParams const & bparams = buf.params();
+       BufferParams const & bparams = runparams_in.is_child
+               ? buf.masterParams() : buf.params();
        ParagraphList const & paragraphs = text.paragraphs();
        Paragraph const & par = paragraphs.at(pit);
        // FIXME This check should not really be needed.
@@ -571,7 +578,6 @@ void TeXOnePar(Buffer const & buf,
 
        if (style.pass_thru) {
                Font const outerfont = text.outerFont(pit);
-               runparams.local_font = &par.getFirstFontSettings(bparams);
                parStartCommand(par, os, runparams, style);
 
                par.latex(bparams, outerfont, os, runparams, start_pos, end_pos);
@@ -585,7 +591,7 @@ void TeXOnePar(Buffer const & buf,
                        os << '\n';
                if (!style.parbreak_is_newline) {
                        os << '\n';
-               } else if (nextpar) {
+               } else if (nextpar && !style.isEnvironment()) {
                        Layout const nextstyle = text.inset().forcePlainLayout()
                                ? bparams.documentClass().plainLayout()
                                : nextpar->layout();
@@ -808,7 +814,6 @@ void TeXOnePar(Buffer const & buf,
                }
        }
 
-       runparams.local_font = &par.getFirstFontSettings(bparams);
        parStartCommand(par, os, runparams, style);
        Font const outerfont = text.outerFont(pit);
 
@@ -889,7 +894,7 @@ void TeXOnePar(Buffer const & buf,
                // not for ArabTeX
                && (par_language->lang() != "arabic_arabtex"
                    && outer_language->lang() != "arabic_arabtex")
-                    // have we opened and \L or \R environment?
+               // have we opened an \L or \R environment?
                && runparams.local_font != 0
                && runparams.local_font->isRightToLeft() != par_language->rightToLeft()
                // are we about to close the language?
@@ -1039,6 +1044,9 @@ void latexParagraphs(Buffer const & buf,
                     OutputParams const & runparams,
                     string const & everypar)
 {
+       LASSERT(runparams.par_begin <= runparams.par_end,
+               { os << "% LaTeX Output Error\n"; return; } );
+
        BufferParams const & bparams = buf.params();
 
        bool const maintext = text.isMainText();
@@ -1076,7 +1084,6 @@ void latexParagraphs(Buffer const & buf,
        }
 
        ParagraphList const & paragraphs = text.paragraphs();
-       LASSERT(runparams.par_begin <= runparams.par_end, /**/);
 
        if (runparams.par_begin == runparams.par_end) {
                // The full doc will be exported but it is easier to just rely on
@@ -1194,8 +1201,12 @@ pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
 {
        Encoding const & oldEnc = *runparams.encoding;
        bool moving_arg = runparams.moving_arg;
-       if (!force && ((bparams.inputenc != "auto" && bparams.inputenc != "default")
-               || moving_arg))
+       // If we switch from/to CJK, we need to switch anyway, despite custom inputenc
+       bool const from_to_cjk = 
+               (oldEnc.package() == Encoding::CJK && newEnc.package() != Encoding::CJK)
+               || (oldEnc.package() != Encoding::CJK && newEnc.package() == Encoding::CJK);
+       if (!force && !from_to_cjk
+           && ((bparams.inputenc != "auto" && bparams.inputenc != "default") || moving_arg))
                return make_pair(false, 0);
 
        // Do nothing if the encoding is unchanged.