further xetex disambiguation: use the flavor where the flavor is apt.

This introduces an isFullUnicode() function to OutputParams that currently only contains XETEX, but later can also contain other fully unicode-aware backends (LUATEX for instance).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36445 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index b5254822b12095ad1b51b4992e8820171002c181..66df42b545dd9adeb952ec073fb338fc50533095 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1359,9 +1359,9 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
        // set font encoding
        // for arabic_arabi and farsi we also need to load the LAE and
        // LFE encoding
-       // XeTeX works without fontenc
+       // XeTeX (isFullUnicode() flavor) works without fontenc
        if (font_encoding() != "default" && language->lang() != "japanese"
-           && !useXetex && !tclass.provides("fontenc")) {
+           && !features.runparams().isFullUnicode() && !tclass.provides("fontenc")) {
                size_t fars = language_options.str().find("farsi");
                size_t arab = language_options.str().find("arabic");
                if (language->lang() == "arabic_arabi"
@@ -1892,7 +1892,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
        // these packages (xunicode, for that matter) need to be loaded at least
        // after amsmath, amssymb, esint and the other packages that provide 
        // special glyphs
-       if (useXetex) {
+       if (features.runparams().flavor == OutputParams::XETEX) {
                os << "\\usepackage{xunicode}\n";
                texrow.newline();
                os << "\\usepackage{xltxtra}\n";
@@ -2456,7 +2456,8 @@ docstring BufferParams::getGraphicsDriver(string const & package) const
 void BufferParams::writeEncodingPreamble(odocstream & os,
                LaTeXFeatures & features, TexRow & texrow) const
 {
-       if (useXetex)
+       // fully unicode-aware backends (such as XeTeX) do not need this
+       if (features.runparams().isFullUnicode())
                return;
        if (inputenc == "auto") {
                string const doc_encoding =

diff --git a/src/OutputParams.cpp b/src/OutputParams.cpp
index b575a2915a2cffcc8eeba5a433147e71921727b0..44eec4b89f34b3731d14e81483417049c97438cd 100644 (file)
--- a/src/OutputParams.cpp
+++ b/src/OutputParams.cpp
@@ -48,4 +48,10 @@ bool OutputParams::isLaTeX() const
        return flavor == LATEX || flavor == PDFLATEX || flavor == XETEX; 
 }
 
+
+bool OutputParams::isFullUnicode() const
+{
+       return flavor == XETEX; 
+}
+
 } // namespace lyx

diff --git a/src/OutputParams.h b/src/OutputParams.h
index 6653a41a0fd4b12d68ca2c051395317a9446c8e1..2cd96944633b069c2565af0da149655fc0e92845 100644 (file)
--- a/src/OutputParams.h
+++ b/src/OutputParams.h
@@ -65,6 +65,8 @@ public:
        FLAVOR flavor;
        /// is it some flavor of LaTeX?
        bool isLaTeX() const;
+       /// does this flavour support full unicode?
+       bool isFullUnicode() const;
        
        /// Same, but for math output, which only matter is XHTML output.
        MathFlavor math_flavor;

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 19caf375469bbe1ead73ff99c67802b633558248..8845054b0c131f688ef2fd0e5a27d0158b0ca760 100644 (file)
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -2516,7 +2516,7 @@ void Paragraph::latex(BufferParams const & bparams,
        if (allowcust && d->endTeXParParams(bparams, os, texrow, runparams)
            && runparams.encoding != prev_encoding) {
                runparams.encoding = prev_encoding;
-               if (!bparams.useXetex)
+               if (!runparams.isFullUnicode())
                        os << setEncoding(prev_encoding->iconvName());
        }
 

diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index 8276f4301b75f657c5545335b8842050ad4bbc6c..ad274434d76c85ef58e24c735c485a8083e9b18f 100644 (file)
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -143,11 +143,12 @@ int InsetListings::latex(odocstream & os, OutputParams const & runparams) const
        bool encoding_switched = false;
        Encoding const * const save_enc = runparams.encoding;
 
-       if (runparams.flavor != OutputParams::XETEX
+       if (!runparams.isFullUnicode()
            && !runparams.encoding->hasFixedWidth()) {
                // We need to switch to a singlebyte encoding, since the
                // listings package cannot deal with multi-byte-encoded
-               // glyphs (not needed with XeTeX).
+               // glyphs (not needed with full-unicode aware backends
+               // such as XeTeX).
                Language const * const outer_language =
                        (runparams.local_font != 0) ?
                                runparams.local_font->language()

diff --git a/src/output_latex.cpp b/src/output_latex.cpp
index c52cff0878a2eb8e395c1fe192a3b803928ce3a5..a2013706df538275156e1b602a949254ded6d027 100644 (file)
--- a/src/output_latex.cpp
+++ b/src/output_latex.cpp
@@ -283,7 +283,7 @@ TeXEnvironment(Buffer const & buf,
                prev_env_language_ = par_language;
                if (runparams.encoding != prev_encoding) {
                        runparams.encoding = prev_encoding;
-                       if (!bparams.useXetex)
+                       if (!runparams.isFullUnicode())
                                os << setEncoding(prev_encoding->iconvName());
                }
        }
@@ -294,7 +294,7 @@ TeXEnvironment(Buffer const & buf,
                prev_env_language_ = par_language;
                if (runparams.encoding != prev_encoding) {
                        runparams.encoding = prev_encoding;
-                       if (!bparams.useXetex)
+                       if (!runparams.isFullUnicode())
                                os << setEncoding(prev_encoding->iconvName());
                }
        }
@@ -712,7 +712,7 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
                os << '}';
                if (runparams.encoding != prev_encoding) {
                        runparams.encoding = prev_encoding;
-                       if (!bparams.useXetex)
+                       if (!runparams.isFullUnicode())
                                os << setEncoding(prev_encoding->iconvName());
                }
        }
@@ -865,11 +865,12 @@ ParagraphList::const_iterator TeXOnePar(Buffer const & buf,
        // If this is the last paragraph, and a local_font was set upon entering
        // the inset, and we're using "auto" or "default" encoding, the encoding
        // should be set back to that local_font's encoding.
-       // However, do not change the encoding when XeTeX is used.
+       // However, do not change the encoding when a fully unicode aware backend
+       // such as XeTeX is used.
        if (nextpit == paragraphs.end() && runparams_in.local_font != 0
            && runparams_in.encoding != runparams_in.local_font->language()->encoding()
            && (bparams.inputenc == "auto" || bparams.inputenc == "default")
-           && (!bparams.useXetex)) {
+           && (!runparams.isFullUnicode())) {
                runparams_in.encoding = runparams_in.local_font->language()->encoding();
                os << setEncoding(runparams_in.encoding->iconvName());
        }