Update tex2lyx tests

[lyx.git] / src / LaTeXFeatures.cpp

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index 146fddb2178643500a54c67948e853ba62d03360..c78e73573001bfbf36e48b33a808733e0e17e2a4 100644 (file)
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -65,6 +65,10 @@ namespace lyx {
 static docstring const lyx_def = from_ascii(
        "\\providecommand{\\LyX}{L\\kern-.1667em\\lower.25em\\hbox{Y}\\kern-.125emX\\@}");
 
+static docstring const lyx_rtl_def = from_ascii(
+       "\\let\\@@LyX\\LyX\n"
+       "\\def\\LyX{\\@ensure@LTR{\\@@LyX}}");
+
 static docstring const lyx_hyperref_def = from_ascii(
        "\\providecommand{\\LyX}{\\texorpdfstring%\n"
        "  {L\\kern-.1667em\\lower.25em\\hbox{Y}\\kern-.125emX\\@}\n"
@@ -258,7 +262,7 @@ static docstring const textcyr_T2A_def = from_ascii(
 static docstring const textcyr_def = from_ascii(
        "\\DeclareRobustCommand{\\cyrtext}{%\n"
        "  \\fontencoding{T2A}\\selectfont\\def\\encodingdefault{T2A}}\n"
-       "\\DeclareRobustCommand{\\textcyr}[1]{\\leavevmode{\\cyrtext #1}}\n");
+       "\\DeclareRobustCommand{\\textcyrillic}[1]{\\leavevmode{\\cyrtext #1}}\n");
 
 static docstring const lyxmathsym_def = from_ascii(
        "\\newcommand{\\lyxmathsym}[1]{\\ifmmode\\begingroup\\def\\b@ld{bold}\n"
@@ -544,6 +548,12 @@ void LaTeXFeatures::require(set<string> const & names)
 }
 
 
+void LaTeXFeatures::provide(string const & name)
+{
+       provides_.insert(name);
+}
+
+
 void LaTeXFeatures::useLayout(docstring const & layoutname)
 {
        useLayout(layoutname, 0);
@@ -609,6 +619,11 @@ bool LaTeXFeatures::isRequired(string const & name) const
 
 bool LaTeXFeatures::isProvided(string const & name) const
 {
+       // Currently, this is only features provided by babel languages
+       // (such as textgreek)
+       if (provides_.find(name) != provides_.end())
+               return true;
+
        if (params_.useNonTeXFonts)
                return params_.documentClass().provides(name);
 
@@ -634,9 +649,6 @@ bool LaTeXFeatures::isProvided(string const & name) const
                        from_ascii(params_.fontsMath())).provides(name, ot1,
                                                                       complete,
                                                                       nomath);
-       // TODO: "textbaltic" provided, if the font-encoding is "L7x"
-       //       "textgreek" provided, if a language with font-encoding LGR is used in the document
-       //       "textcyr" provided, if a language with font-encoding T2A is used in the document
 }
 
 
@@ -737,6 +749,9 @@ void LaTeXFeatures::useLanguage(Language const * lang)
                UsedLanguages_.insert(lang);
        if (!lang->requires().empty())
                require(lang->requires());
+       // currently only supported for Babel
+       if (!lang->provides().empty() && useBabel())
+               provide(lang->provides());
        // CJK languages do not have a babel name.
        // They use the CJK package
        if (lang->encoding()->package() == Encoding::CJK)
@@ -880,26 +895,38 @@ set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding) const
 }
 
 
-void LaTeXFeatures::getFontEncodings(vector<string> & encs) const
+void LaTeXFeatures::getFontEncodings(vector<string> & encs, bool const onlylangs) const
 {
-       // these must be loaded if glyphs of this script are used
-       // unless a language providing them is used in the document
-       if (mustProvide("textgreek")
-           && find(encs.begin(), encs.end(), "LGR") == encs.end())
-               encs.insert(encs.begin(), "LGR");
-       if (mustProvide("textcyr")
-           && find(encs.begin(), encs.end(), "T2A") == encs.end())
-               encs.insert(encs.begin(), "T2A");
+       if (!onlylangs) {
+               // these must be loaded if glyphs of this script are used
+               // unless a language providing them is used in the document
+               if (mustProvide("textgreek")
+                   && find(encs.begin(), encs.end(), "LGR") == encs.end())
+                       encs.insert(encs.begin(), "LGR");
+               if (mustProvide("textcyrillic")
+                   && find(encs.begin(), encs.end(), "T2A") == encs.end())
+                       encs.insert(encs.begin(), "T2A");
+       }
 
-       for (auto const & lang : UsedLanguages_)
-               if (!lang->fontenc().empty()
-                   && ascii_lowercase(lang->fontenc()) != "none") {
-                       vector<string> extraencs = getVectorFromString(lang->fontenc());
-                       for (auto const & extra : extraencs) {
-                               if (find(encs.begin(), encs.end(), extra) == encs.end())
-                                       encs.insert(encs.begin(), extra);
-                       }
+       for (auto const & lang : UsedLanguages_) {
+               vector<string> extraencs =
+                       getVectorFromString(lang->fontenc(buffer().masterParams()));
+               for (auto const & extra : extraencs) {
+                       if (extra != "none" && find(encs.begin(), encs.end(), extra) == encs.end())
+                               encs.insert(encs.begin(), extra);
                }
+       }
+}
+
+
+bool LaTeXFeatures::hasRTLLanguage() const
+{
+       if (params_.language->rightToLeft())
+               return true;
+       for (auto const & lang : UsedLanguages_)
+               if (lang->rightToLeft())
+                       return true;
+       return false;
 }
 
 namespace {
@@ -969,8 +996,10 @@ char const * simplefeatures[] = {
        "todonotes",
        "forest",
        "varwidth",
-       "footnote",
        "tablefootnote",
+       "afterpage",
+       "tabularx",
+       "xltabular"
 };
 
 char const * bibliofeatures[] = {
@@ -1093,6 +1122,22 @@ string const LaTeXFeatures::getPackages() const
        // The rest of these packages are somewhat more complicated
        // than those above.
 
+       if (mustProvide("footnote")) {
+               if (isRequired("hyperref"))
+                       packages << "\\usepackage{footnotehyper}\n";
+               else
+                       packages << "\\usepackage{footnote}\n";
+       }
+
+       // [pdf]lscape is used to rotate longtables
+       if (mustProvide("lscape")) {
+               if (runparams_.flavor == OutputParams::LATEX
+                   || runparams_.flavor == OutputParams::DVILUATEX)
+                       packages << "\\usepackage{lscape}\n";
+               else
+                       packages << "\\usepackage{pdflscape}\n";
+       }
+
        // The tipa package and its extensions (tipx, tone) must not
        // be loaded with non-TeX fonts, since fontspec includes the
        // respective macros
@@ -1339,6 +1384,8 @@ TexString LaTeXFeatures::getMacros() const
                        macros << lyx_hyperref_def << '\n';
                else
                        macros << lyx_def << '\n';
+               if (runparams_.use_polyglossia && hasRTLLanguage())
+                       macros << lyx_rtl_def << '\n';
        }
 
        if (mustProvide("noun"))
@@ -1357,7 +1404,7 @@ TexString LaTeXFeatures::getMacros() const
                macros << textgreek_def << '\n';
        }
 
-       if (!usePolyglossia() && mustProvide("textcyr")) {
+       if (!usePolyglossia() && mustProvide("textcyrillic")) {
                // ensure T2A font encoding is set up also if fontenc is not loaded by LyX
                if (params_.main_font_encoding() == "default")
                        macros << textcyr_T2A_def;