Further to r26743, add CustomPars and ForcePlain layout tags to InsetLayout,

[lyx.git] / src / output_latex.cpp

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index 89e0b3f8ca77ddf124df5a88a8d470d9babfc769..646e836480751b3c6323d1ea1cd8ce3888f36b2e 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -109,8 +109,8 @@ TeXEnvironment(Buffer const & buf,
 
        BufferParams const & bparams = buf.params();
 
-       Layout const & style = pit->forceEmptyLayout() ?
-               bparams.documentClass().emptyLayout() : pit->layout();
+       Layout const & style = pit->forcePlainLayout() ?
+               bparams.documentClass().plainLayout() : pit->layout();
 
        ParagraphList const & paragraphs = text.paragraphs();
 
@@ -294,7 +294,10 @@ TeXOnePar(Buffer const & buf,
        if (nextpit != paragraphs.end())
                ++nextpit;
 
-       if (runparams_in.verbatim) {
+       OutputParams runparams = runparams_in;
+       runparams.isLastPar = nextpit == paragraphs.end();
+
+       if (runparams.verbatim) {
                int const dist = distance(paragraphs.begin(), pit);
                Font const outerfont = outerFont(dist, paragraphs);
 
@@ -305,14 +308,13 @@ TeXOnePar(Buffer const & buf,
                }
 
                /*bool need_par = */ pit->latex(bparams, outerfont,
-                       os, texrow, runparams_in);
+                       os, texrow, runparams);
                return nextpit;
        }
 
-       Layout const style = pit->forceEmptyLayout() ?
-               bparams.documentClass().emptyLayout() : pit->layout();
+       Layout const style = pit->forcePlainLayout() ?
+               bparams.documentClass().plainLayout() : pit->layout();
 
-       OutputParams runparams = runparams_in;
        runparams.moving_arg |= style.needprotect;
 
        bool const maintext = text.isMainText(buf);
@@ -700,10 +702,10 @@ TeXOnePar(Buffer const & buf,
        // the inset, and we're using "auto" or "default" encoding, the encoding
        // should be set back to that local_font's encoding.
        if (nextpit == paragraphs.end() && runparams_in.local_font != 0
+           && runparams_in.encoding != runparams_in.local_font->language()->encoding()
            && (bparams.inputenc == "auto" || bparams.inputenc == "default")) {
                runparams_in.encoding = runparams_in.local_font->language()->encoding();
                os << setEncoding(runparams_in.encoding->iconvName());
-
        }
        // Otherwise, the current encoding should be set for the next paragraph.
        else
@@ -784,8 +786,8 @@ void latexParagraphs(Buffer const & buf,
        // if only_body
        while (par != endpar) {
                lastpar = par;
-               Layout const & layout = par->forceEmptyLayout() ?
-                               tclass.emptyLayout() :
+               Layout const & layout = par->forcePlainLayout() ?
+                               tclass.plainLayout() :
                                par->layout();
 
                if (layout.intitle) {
@@ -870,12 +872,13 @@ void latexParagraphs(Buffer const & buf,
 
 
 pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
-                  OutputParams const & runparams, Encoding const & newEnc)
+                  OutputParams const & runparams, Encoding const & newEnc,
+                  bool force)
 {
        Encoding const oldEnc = *runparams.encoding;
        bool moving_arg = runparams.moving_arg;
-       if ((bparams.inputenc != "auto" && bparams.inputenc != "default")
-               || moving_arg)
+       if (!force && ((bparams.inputenc != "auto" && bparams.inputenc != "default")
+               || moving_arg))
                return make_pair(false, 0);
 
        // Do nothing if the encoding is unchanged.
@@ -900,6 +903,7 @@ pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
        docstring const inputenc_arg(from_ascii(newEnc.latexName()));
        switch (newEnc.package()) {
                case Encoding::none:
+               case Encoding::japanese:
                        // shouldn't ever reach here, see above
                        return make_pair(true, 0);
                case Encoding::inputenc: {
@@ -916,13 +920,18 @@ pair<bool, int> switchEncoding(odocstream & os, BufferParams const & bparams,
                                open_encoding_ = none;
                                count += 7;
                        }
-                       if (runparams.local_font != 0 && oldEnc.package() == Encoding::CJK) {
-                               // within insets, \inputenc switches need to be 
-                               // embraced within \bgroup ... \egroup; else CJK fails.
+                       if (runparams.local_font != 0
+                           && oldEnc.package() == Encoding::CJK) {
+                               // within insets, \inputenc switches need
+                               // to be embraced within \bgroup...\egroup;
+                               // else CJK fails.
                                os << "\\bgroup";
                                count += 7;
                                open_encoding_ = inputenc;
                        }
+                       // with the japanese option, inputenc is omitted.
+                       if (runparams.use_japanese)
+                               return make_pair(true, count);
                        os << "\\inputencoding{" << inputenc_arg << '}';
                        return make_pair(true, count + 16);
                }