Load "textcomp" and "pmboxdraw" before "(lua)inputenc" to fix #11454.

Prevents wrong or missing characters with LuaTeX and 8-bit fonts.

Also "uninvert" the corresponding test case and two other
no longer failing "unicodesymbols" exports.

diff --git a/autotests/export/latex/luainputenc-utf8.lyx b/autotests/export/latex/luainputenc-utf8.lyx
index 4c37198e384a21c6a8f42a65d75a21880b4d497c..0fe696bd9fda14692e608c29ab58920808c54ef9 100644 (file)
--- a/autotests/export/latex/luainputenc-utf8.lyx
+++ b/autotests/export/latex/luainputenc-utf8.lyx
@@ -182,7 +182,7 @@ literal "false"
 \begin_layout Standard
 \begin_inset CommandInset include
 LatexCommand input
-filename "unicodesymbols/009-cyrillic-russian.lyx"
+filename "unicodesymbols/009-cyrillic_ru.lyx"
 literal "false"
 
 \end_inset

diff --git a/development/autotests/invertedTests b/development/autotests/invertedTests
index 7e667462c6ac52a975bf3e0f0dead8f001358337..a0237f99efb10b132a35fc79268ebd4e64215733 100644 (file)
--- a/development/autotests/invertedTests
+++ b/development/autotests/invertedTests
@@ -105,9 +105,7 @@ export/export/latex/unicodesymbols/074-76-letterlike-numberforms-arrows_cp862_pd
 # Arabic:
 export/export/latex/unicodesymbols/005-7-ipa-modifiers-combining_cp1256_pdf2
 export/export/latex/unicodesymbols/008-greek-and-coptic-with-textalpha_cp1256_pdf2
-export/export/latex/unicodesymbols/008-greek-and-coptic_cp1256_pdf2
 export/export/latex/unicodesymbols/069-greek-extended-textalpha_cp1256_pdf2
-export/export/latex/unicodesymbols/069-greek-extended_cp1256_pdf2
 export/export/latex/unicodesymbols/070-72-general-punctuation-sub-super-currency_cp1256_pdf2
 export/export/latex/unicodesymbols/074-76-letterlike-numberforms-arrows_cp1256_pdf2
 
@@ -187,11 +185,9 @@ export/export/WrongDfnTagHandling_xhtml
 # contains underscores etc.
 export/export/latex/LongestLabelWithUnderscore.*
 
-#11454 luainputenc must be loaded after textcomp
-export/export/latex/luainputenc-utf8_pdf5_texF
-# (The version with Unicode fonts fails because some symbols are missing
-# in LatinModern as well as DejaVu. This shows that there are use cases
-# for traditional 8-bit fonts.)
+# Common Unicode fonts don't support all characters supported by
+# lib/unicodesymbols. (This shows that there are use cases for 8-bit fonts
+# or GUI support for selecting more than one system font.)
 export/export/latex/luainputenc-utf8_pdf5_systemF
 
 #11455 "Unable to process argument!" with multiple 1.6.x roundtrips

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 011009693b5727375b960e1281a751ee5243af15..c194aedd784f489cf602523e6300eb66af3b9dbc 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -1779,6 +1779,12 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
                }
        }
 
+       // TODO: load textcomp and pmboxdraw before (lua)inputenc (#11454)
+       if (features.mustProvide("textcomp"))
+               os << "\\usepackage{textcomp}\n";
+       if (features.mustProvide("pmboxdraw"))
+               os << "\\usepackage{pmboxdraw}\n";
+
        // handle inputenc etc.
        writeEncodingPreamble(os, features);
 

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 875bbe2394d342dae6b74861ef3dbd774a51603a..76dc31c0eca247e8e4f29809e6886267f7371710 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -958,9 +958,7 @@ char const * simplefeatures[] = {
        "units",
        "framed",
        "soul",
-       "textcomp",
        "dingbat",
-       "pmboxdraw",
        "bbding",
        "ifsym",
        "txfonts",