From 744c35a6b414a988a84dee3a683fce4da2ea9ab6 Mon Sep 17 00:00:00 2001
From: Michael Schmitt <michael.schmitt@teststep.org>
Date: Thu, 8 Feb 2007 15:18:36 +0000
Subject: [PATCH] 	* src/bufferparams.[Ch]: remove more unneeded
 LaTeXFeatures objects

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17111 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/bufferparams.C | 14 +++++++-------
 src/bufferparams.h |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/bufferparams.C b/src/bufferparams.C
index a3af1079a8..03d3758a83 100644
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -829,7 +829,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
 
 	// font selection must be done before loading fontenc.sty
 	string const fonts =
-		loadFonts(features, fontsRoman, fontsSans,
+		loadFonts(fontsRoman, fontsSans,
 			  fontsTypewriter, fontsSC, fontsOSF,
 			  fontsSansScale, fontsTypewriterScale);
 	if (!fonts.empty()) {
@@ -1331,7 +1331,7 @@ string const BufferParams::babelCall(string const & lang_opts) const
 }
 
 
-string const BufferParams::loadFonts(LaTeXFeatures & features, string const & rm,
+string const BufferParams::loadFonts(string const & rm,
 				     string const & sf, string const & tt,
 				     bool const & sc, bool const & osf,
 				     int const & sfscale, int const & ttscale) const
@@ -1375,9 +1375,9 @@ string const BufferParams::loadFonts(LaTeXFeatures & features, string const & rm
 	// Times
 	else if (rm == "times") {
 		// try to load the best available package
-		if (features.isAvailable("mathptmx"))
+		if (LaTeXFeatures::isAvailable("mathptmx"))
 			os << "\\usepackage{mathptmx}\n";
-		else if (features.isAvailable("mathptm"))
+		else if (LaTeXFeatures::isAvailable("mathptm"))
 			os << "\\usepackage{mathptm}\n";
 		else
 			os << "\\usepackage{times}\n";
@@ -1385,7 +1385,7 @@ string const BufferParams::loadFonts(LaTeXFeatures & features, string const & rm
 	// Palatino
 	else if (rm == "palatino") {
 		// try to load the best available package
-		if (features.isAvailable("mathpazo")) {
+		if (LaTeXFeatures::isAvailable("mathpazo")) {
 			os << "\\usepackage";
 			if (osf || sc) {
 				os << '[';
@@ -1398,7 +1398,7 @@ string const BufferParams::loadFonts(LaTeXFeatures & features, string const & rm
 			}
 			os << "{mathpazo}\n";
 		}
-		else if (features.isAvailable("mathpple"))
+		else if (LaTeXFeatures::isAvailable("mathpple"))
 			os << "\\usepackage{mathpple}\n";
 		else
 			os << "\\usepackage{palatino}\n";
@@ -1407,7 +1407,7 @@ string const BufferParams::loadFonts(LaTeXFeatures & features, string const & rm
 	else if (rm == "utopia") {
 		// fourier supersedes utopia.sty, but does
 		// not work with OT1 encoding.
-		if (features.isAvailable("fourier")
+		if (LaTeXFeatures::isAvailable("fourier")
 		    && lyxrc.fontenc != "default") {
 			os << "\\usepackage";
 			if (osf || sc) {
diff --git a/src/bufferparams.h b/src/bufferparams.h
index 99d4007765..c05af76d54 100644
--- a/src/bufferparams.h
+++ b/src/bufferparams.h
@@ -271,7 +271,7 @@ public:
 	///
 	std::string const babelCall(std::string const & lang_opts) const;
 	/// set up the document fonts
-	std::string const loadFonts(LaTeXFeatures & features, std::string const & rm,
+	std::string const loadFonts(std::string const & rm,
 				     std::string const & sf, std::string const & tt,
 				     bool const & sc, bool const & osf,
 				     int const & sfscale, int const & ttscale) const;
-- 
2.39.5