Fix yet another thinko in the math grid paste code

[lyx.git] / src / LaTeXFonts.cpp

diff --git a/src/LaTeXFonts.cpp b/src/LaTeXFonts.cpp
index ad65439b942df50f738a225e63a8a79cdc76390f..12c0856c5db4c7bd1e16ef4b388bb070715d239b 100644 (file)
--- a/src/LaTeXFonts.cpp
+++ b/src/LaTeXFonts.cpp
@@ -48,12 +48,12 @@ bool LaTeXFont::available(bool ot1, bool nomath)
        else if (ot1 && !ot1font_.empty())
                return (ot1font_ == "none") ?
                        true : altFont(ot1font_).available(ot1, nomath);
-       else if (requires_.empty() && package_.empty())
+       else if (required_.empty() && package_.empty())
                return true;
-       else if (!requires_.empty()
-               && LaTeXFeatures::isAvailable(to_ascii(requires_)))
+       else if (!required_.empty()
+               && LaTeXFeatures::isAvailable(to_ascii(required_)))
                return true;
-       else if (requires_.empty() && !package_.empty()
+       else if (required_.empty() && !package_.empty()
                && LaTeXFeatures::isAvailable(to_ascii(package_)))
                return true;
        else if (!altfonts_.empty()) {
@@ -137,6 +137,21 @@ bool LaTeXFont::providesScale(bool ot1, bool complete, bool nomath)
        return (!scaleoption_.empty());
 }
 
+
+bool LaTeXFont::providesMoreOptions(bool ot1, bool complete, bool nomath)
+{
+       docstring const usedfont = getUsedFont(ot1, complete, nomath);
+
+       if (usedfont.empty())
+               return false;
+       else if (usedfont != name_)
+               return altFont(usedfont).providesMoreOptions(ot1, complete, nomath);
+       else if (!available(ot1, nomath))
+               return false;
+
+       return (moreopts_);
+}
+
 bool LaTeXFont::provides(std::string const & name, bool ot1, bool complete, bool nomath)
 {
        docstring const usedfont = getUsedFont(ot1, complete, nomath);
@@ -166,19 +181,19 @@ docstring const LaTeXFont::getUsedFont(bool ot1, bool complete, bool nomath)
                 && altFont(completefont_).available(ot1, nomath))
                        return completefont_;
        else if (switchdefault_) {
-               if (requires_.empty()
-                   || (!requires_.empty()
-                       && LaTeXFeatures::isAvailable(to_ascii(requires_))))
+               if (required_.empty()
+                   || (!required_.empty()
+                       && LaTeXFeatures::isAvailable(to_ascii(required_))))
                        return name_;
        }
-       else if (!requires_.empty()
-               && LaTeXFeatures::isAvailable(to_ascii(requires_)))
+       else if (!required_.empty()
+               && LaTeXFeatures::isAvailable(to_ascii(required_)))
                        return name_;
        else if (!package_.empty()
                && LaTeXFeatures::isAvailable(to_ascii(package_)))
                        return name_;
        else if (!preamble_.empty() && package_.empty()
-                && requires_.empty() && !switchdefault_
+                && required_.empty() && !switchdefault_
                 && altfonts_.empty()) {
                        return name_;
        }
@@ -209,7 +224,7 @@ string const LaTeXFont::getAvailablePackage(bool dryrun)
                return string();
 
        string const package = to_ascii(package_);
-       if (!requires_.empty() && LaTeXFeatures::isAvailable(to_ascii(requires_)))
+       if (!required_.empty() && LaTeXFeatures::isAvailable(to_ascii(required_)))
                return package;
        else if (LaTeXFeatures::isAvailable(package))
                return package;
@@ -217,7 +232,7 @@ string const LaTeXFont::getAvailablePackage(bool dryrun)
        else if (dryrun)
                return package;
 
-       docstring const req = requires_.empty() ? package_ : requires_;
+       docstring const req = required_.empty() ? package_ : required_;
        frontend::Alert::warning(_("Font not available"),
                        bformat(_("The LaTeX package `%1$s' needed for the font `%2$s'\n"
                                  "is not available on your system. LyX will fall back to the default font."),
@@ -228,15 +243,16 @@ string const LaTeXFont::getAvailablePackage(bool dryrun)
 
 
 string const LaTeXFont::getPackageOptions(bool ot1, bool complete, bool sc, bool osf,
-                                         int scale, bool nomath)
+                                         int scale, string const & extraopts, bool nomath)
 {
        ostringstream os;
        bool const needosfopt = (osf != osfdefault_);
        bool const has_osf = providesOSF(ot1, complete, nomath);
        bool const has_sc = providesSC(ot1, complete, nomath);
+       bool const moreopts = providesMoreOptions(ot1, complete, nomath);
 
-       if (!packageoption_.empty())
-               os << to_ascii(packageoption_);
+       if (!packageoptions_.empty())
+               os << to_ascii(packageoptions_);
 
        if (sc && needosfopt && has_osf && has_sc) {
                if (!os.str().empty())
@@ -263,12 +279,19 @@ string const LaTeXFont::getPackageOptions(bool ot1, bool complete, bool sc, bool
                os << subst(to_ascii(scaleoption_), "$$val",
                            convert<std::string>(float(scale) / 100));
        }
+
+       if (moreopts && !extraopts.empty()) {
+               if (!os.str().empty())
+                       os << ',';
+               os << extraopts;
+       }
        return os.str();
 }
 
 
 string const LaTeXFont::getLaTeXCode(bool dryrun, bool ot1, bool complete, bool sc,
-                                    bool osf, bool nomath, int const & scale)
+                                    bool osf, bool nomath, string const & extraopts,
+                                    int const & scale)
 {
        ostringstream os;
 
@@ -276,7 +299,8 @@ string const LaTeXFont::getLaTeXCode(bool dryrun, bool ot1, bool complete, bool
        if (usedfont.empty())
                return string();
        else if (usedfont != name_)
-               return altFont(usedfont).getLaTeXCode(dryrun, ot1, complete, sc, osf, nomath, scale);
+               return altFont(usedfont).getLaTeXCode(dryrun, ot1, complete, sc,
+                                                     osf, nomath, extraopts, scale);
 
        if (switchdefault_) {
                if (family_.empty()) {
@@ -290,18 +314,19 @@ string const LaTeXFont::getLaTeXCode(bool dryrun, bool ot1, bool complete, bool
                        frontend::Alert::warning(_("Font not available"),
                                        bformat(_("The LaTeX package `%1$s' needed for the font `%2$s'\n"
                                                  "is not available on your system. LyX will fall back to the default font."),
-                                               requires_, guiname_), true);
+                                               required_, guiname_), true);
        } else {
                string const package =
                        getAvailablePackage(dryrun);
-               string const packageopts = getPackageOptions(ot1, complete, sc, osf, scale, nomath);
+               string const packageopts = getPackageOptions(ot1, complete, sc, osf, scale, extraopts, nomath);
                if (packageopts.empty() && !package.empty())
                        os << "\\usepackage{" << package << "}\n";
                else if (!packageopts.empty() && !package.empty())
                        os << "\\usepackage[" << packageopts << "]{" << package << "}\n";
        }
        if (osf && providesOSF(ot1, complete, nomath) && !osffont_.empty())
-               os << altFont(osffont_).getLaTeXCode(dryrun, ot1, complete, sc, osf, nomath, scale);
+               os << altFont(osffont_).getLaTeXCode(dryrun, ot1, complete, sc, osf,
+                                                    nomath, extraopts, scale);
 
        if (!preamble_.empty())
                os << to_utf8(preamble_);
@@ -310,6 +335,16 @@ string const LaTeXFont::getLaTeXCode(bool dryrun, bool ot1, bool complete, bool
 }
 
 
+bool LaTeXFont::hasFontenc(string const & name) const
+{
+       for (auto const & fe : fontenc_) {
+               if (fe == name)
+                       return true;
+       }
+       return false;
+}
+
+
 bool LaTeXFont::readFont(Lexer & lex)
 {
        enum LaTeXFontTags {
@@ -317,6 +352,7 @@ bool LaTeXFont::readFont(Lexer & lex)
                LF_COMPLETE_FONT,
                LF_END,
                LF_FAMILY,
+               LF_FONTENC,
                LF_GUINAME,
                LF_NOMATHFONT,
                LF_OSFDEFAULT,
@@ -324,8 +360,9 @@ bool LaTeXFont::readFont(Lexer & lex)
                LF_OSFOPTION,
                LF_OSFSCOPTION,
                LF_OT1_FONT,
+               LF_MOREOPTS,
                LF_PACKAGE,
-               LF_PACKAGEOPTION,
+               LF_PACKAGEOPTIONS,
                LF_PREAMBLE,
                LF_PROVIDES,
                LF_REQUIRES,
@@ -340,7 +377,9 @@ bool LaTeXFont::readFont(Lexer & lex)
                { "completefont",         LF_COMPLETE_FONT },
                { "endfont",              LF_END },
                { "family",               LF_FAMILY },
+               { "fontencoding",         LF_FONTENC },
                { "guiname",              LF_GUINAME },
+               { "moreoptions",          LF_MOREOPTS },
                { "nomathfont",           LF_NOMATHFONT },
                { "osfdefault",           LF_OSFDEFAULT },
                { "osffont",              LF_OSFFONT },
@@ -348,7 +387,7 @@ bool LaTeXFont::readFont(Lexer & lex)
                { "osfscoption",          LF_OSFSCOPTION },
                { "ot1font",              LF_OT1_FONT },
                { "package",              LF_PACKAGE },
-               { "packageoption",        LF_PACKAGEOPTION },
+               { "packageoptions",       LF_PACKAGEOPTIONS },
                { "preamble",             LF_PREAMBLE },
                { "provides",             LF_PROVIDES },
                { "requires",             LF_REQUIRES },
@@ -395,6 +434,12 @@ bool LaTeXFont::readFont(Lexer & lex)
                case LF_GUINAME:
                        lex >> guiname_;
                        break;
+               case LF_FONTENC: {
+                       lex.eatLine();
+                       string fe = lex.getString();
+                       fontenc_ = getVectorFromString(fe);
+                       break;
+               }
                case LF_NOMATHFONT:
                        lex >> nomathfont_;
                        break;
@@ -416,8 +461,8 @@ bool LaTeXFont::readFont(Lexer & lex)
                case LF_PACKAGE:
                        lex >> package_;
                        break;
-               case LF_PACKAGEOPTION:
-                       lex >> packageoption_;
+               case LF_PACKAGEOPTIONS:
+                       lex >> packageoptions_;
                        break;
                case LF_PREAMBLE:
                        preamble_ = lex.getLongString(from_ascii("EndPreamble"));
@@ -429,7 +474,7 @@ bool LaTeXFont::readFont(Lexer & lex)
                        break;
                }
                case LF_REQUIRES:
-                       lex >> requires_;
+                       lex >> required_;
                        break;
                case LF_SCALEOPTION:
                        lex >> scaleoption_;
@@ -437,6 +482,9 @@ bool LaTeXFont::readFont(Lexer & lex)
                case LF_SCOPTION:
                        lex >> scoption_;
                        break;
+               case LF_MOREOPTS:
+                       lex >> moreopts_;
+                       break;
                case LF_SWITCHDEFAULT:
                        lex >> switchdefault_;
                        break;
@@ -455,6 +503,7 @@ bool LaTeXFont::read(Lexer & lex)
 {
        switchdefault_ = 0;
        osfdefault_ = 0;
+       moreopts_ = 0;
 
        if (!lex.next()) {
                lex.printError("No name given for LaTeX font: `$$Token'.");
@@ -468,6 +517,9 @@ bool LaTeXFont::read(Lexer & lex)
                return false;
        }
 
+       if (fontenc_.empty())
+               fontenc_.push_back("T1");
+
        return true;
 }