From d95129aaa786a7851044e5431b5b59ec065dade4 Mon Sep 17 00:00:00 2001
From: Juergen Spitzmueller <spitz@lyx.org>
Date: Wed, 17 Jul 2019 21:16:05 +0200
Subject: [PATCH] Amend 91ff5c41986

---
 src/LaTeXFonts.cpp | 6 +++---
 src/LaTeXFonts.h   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/LaTeXFonts.cpp b/src/LaTeXFonts.cpp
index 2c98845b3a..b61c4c7fc5 100644
--- 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 50ec71ad90..5150a9a306 100644
--- 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_;
 	///
-- 
2.39.5