X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.C;h=15102ef3c20b6e580f05b90086f8f3ad327fa036;hb=9dafe9b9a5cb12e19e0f3a1a9669d81dc140b0e3;hp=cb28134d432034f442f6318caccdf850e197464d;hpb=a02a2714dca81c8641013aaf22d01dc7a32cee60;p=lyx.git

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index cb28134d43..15102ef3c2 100644
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -33,6 +33,10 @@ using lyx::textclass_type;
 
 using std::endl;
 using std::set;
+using std::vector;
+using std::find;
+using std::ostream;
+
 
 LaTeXFeatures::LaTeXFeatures(BufferParams const & p, layout_type n)
 	: layout(n, false), params(p)
@@ -44,16 +48,11 @@ void LaTeXFeatures::require(string const & name)
 	if (isRequired(name))
 		return;
 	
-	// INSET_GRAPHICS: remove this when InsetFig is thrown.
-	if (name == "graphics") {
-		features.push_back("graphicx");
-		features.push_back("graphics");
-	} else
-		features.push_back(name);
+	features.push_back(name);
 }
 
 
-void LaTeXFeatures::useLayout(std::vector<bool>::size_type const & idx)
+void LaTeXFeatures::useLayout(vector<bool>::size_type const & idx)
 {
 	layout[idx] = true;
 }
@@ -61,9 +60,9 @@ void LaTeXFeatures::useLayout(std::vector<bool>::size_type const & idx)
 
 bool LaTeXFeatures::isRequired(string const & name) const
 {
-	FeaturesList::const_iterator i = std::find(features.begin(), 
-						   features.end(),
-						   name);
+	FeaturesList::const_iterator i = find(features.begin(), 
+					      features.end(),
+					      name);
 	return i != features.end();
 }
 
@@ -205,17 +204,6 @@ string const LaTeXFeatures::getPackages() const
 				 << "]{graphicx}\n";
 	}
 
-	// INSET_GRAPHICS: remove this when InsetFig is thrown.
-	// graphics.sty
-	if (isRequired("graphics") && params.graphicsDriver != "none") {
-		if (params.graphicsDriver == "default")
-			packages << "\\usepackage{graphics}\n";
-		else
-			packages << "\\usepackage[" 
-				 << params.graphicsDriver
-				 << "]{graphics}\n";
-	}
-
 	//if (algorithm) {
 	//	packages << "\\usepackage{algorithm}\n";
 	//}
@@ -339,12 +327,12 @@ string const LaTeXFeatures::getTClassPreamble() const
 	// the text class specific preamble 
 	LyXTextClass const & tclass = textclasslist.TextClass(params.textclass);
 	ostringstream tcpreamble;
-	
+
 	tcpreamble << tclass.preamble();
 
 	for (layout_type i = 0; i < tclass.numLayouts(); ++i) {
 		if (layout[i]) {
-			tcpreamble  << tclass[i].preamble();
+			tcpreamble << tclass[i].preamble();
 		}
 	}
 
@@ -374,7 +362,7 @@ string const LaTeXFeatures::getIncludedFiles(string const & fname) const
 	for (FileMap::const_iterator fi = IncludedFiles.begin();
 	     fi != end; ++fi)
 		sgmlpreamble << "\n<!ENTITY " << fi->first
-			     << (IsSGMLFilename(fi->second) ? " SYSTEM \"" : " \"" )
+			     << (IsSGMLFilename(fi->second) ? " SYSTEM \"" : " \"")
 			     << MakeRelPath(fi->second, basename) << "\">";
 
 	return sgmlpreamble.str().c_str();
@@ -395,7 +383,7 @@ BufferParams const & LaTeXFeatures::bufferParams() const
 	return params;
 }
 
-void LaTeXFeatures::getFloatDefinitions(std::ostream & os) const
+void LaTeXFeatures::getFloatDefinitions(ostream & os) const
 {
 	// Here we will output the code to create the needed float styles.
 	// We will try to do this as minimal as possible.