Amend 91ff5c41986

diff --git a/src/LaTeXFonts.cpp b/src/LaTeXFonts.cpp
index 2c98845b3a805b7e78edeae9de95c6ec8f6dce04..b61c4c7fc509fbadbaf94f235f9fda56bf9104f6 100644 (file)
--- a/src/LaTeXFonts.cpp
+++ b/src/LaTeXFonts.cpp
@@ -251,8 +251,8 @@ string const LaTeXFont::getPackageOptions(bool ot1, bool complete, bool sc, bool
        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())
@@ -462,7 +462,7 @@ bool LaTeXFont::readFont(Lexer & lex)
                        lex >> package_;
                        break;
                case LF_PACKAGEOPTIONS:
-                       lex >> packageoption_;
+                       lex >> packageoptions_;
                        break;
                case LF_PREAMBLE:
                        preamble_ = lex.getLongString(from_ascii("EndPreamble"));

diff --git a/src/LaTeXFonts.h b/src/LaTeXFonts.h
index 50ec71ad907dc04d13671eddc9cc2a45c78a41f3..5150a9a306aba59515072d7f26edf43c07e0dc57 100644 (file)
--- a/src/LaTeXFonts.h
+++ b/src/LaTeXFonts.h
@@ -49,7 +49,7 @@ public:
        /// A font that provides Old Style Figures for this type face
        docstring const & osffont() { return osffont_; }
        /// A package option needed to load this font
-       docstring const & packageoption() { return packageoption_; }
+       docstring const & packageoptions() { return packageoptions_; }
        /// A package option for Old Style Figures
        docstring const & osfoption() { return osfoption_; }
        /// A package option for true SmallCaps
@@ -130,7 +130,7 @@ private:
        ///
        docstring osffont_;
        ///
-       docstring packageoption_;
+       docstring packageoptions_;
        ///
        docstring osfoption_;
        ///