X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.C;h=921c15ef782823be4ede8470e4be22ea591b40dc;hb=8ebf862adbe377d032f888a82d88d4393aebc929;hp=1741883794c9b94a4522f92dceaf60665d60eb16;hpb=7c15014ec2884e50a17559c1269747658c924eb3;p=lyx.git

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 1741883794..921c15ef78 100644
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -17,11 +17,14 @@
 #include "LaTeXFeatures.h"
 
 #include "bufferparams.h"
+#include "Color.h"
 #include "debug.h"
 #include "encoding.h"
 #include "Floating.h"
 #include "FloatList.h"
+#include "LColor.h"
 #include "language.h"
+#include "lyxlex.h"
 #include "lyx_sty.h"
 #include "lyxrc.h"
 
@@ -29,9 +32,10 @@
 
 #include <sstream>
 
-using lyx::support::IsSGMLFilename;
-using lyx::support::MakeRelPath;
-using lyx::support::OnlyPath;
+using lyx::support::isSGMLFilename;
+using lyx::support::libFileSearch;
+using lyx::support::makeRelPath;
+using lyx::support::onlyPath;
 
 using std::endl;
 using std::find;
@@ -44,8 +48,12 @@ using std::set;
 namespace biblio = lyx::biblio;
 
 
-LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p, bool n)
-	: buffer_(&b), params_(p), nice_(n)
+LaTeXFeatures::PackagesList LaTeXFeatures::packages_;
+
+
+LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p,
+			     OutputParams const & r)
+	: buffer_(&b), params_(p), runparams_(r)
 {}
 
 
@@ -66,6 +74,42 @@ void LaTeXFeatures::require(string const & name)
 }
 
 
+void LaTeXFeatures::getAvailable()
+{
+	LyXLex lex(0, 0);
+	string real_file = libFileSearch("", "packages.lst");
+
+	if (real_file.empty())
+		return;
+
+	lex.setFile(real_file);
+
+	if (!lex.isOK())
+		return;
+
+	// Make sure that we are clean
+	packages_.clear();
+
+	bool finished = false;
+	// Parse config-file
+	while (lex.isOK() && !finished) {
+		switch (lex.lex()) {
+		case LyXLex::LEX_FEOF:
+			finished = true;
+			break;
+		default:
+			string const name = lex.getString();
+			PackagesList::const_iterator begin = packages_.begin();
+			PackagesList::const_iterator end   = packages_.end();
+			if (find(begin, end, name) == end)
+				packages_.push_back(name);
+		}
+	}
+
+	return;
+}
+
+
 void LaTeXFeatures::useLayout(string const & layoutname)
 {
 	// Some code to avoid loops in dependency definition
@@ -111,6 +155,14 @@ bool LaTeXFeatures::isRequired(string const & name) const
 }
 
 
+bool LaTeXFeatures::isAvailable(string const & name) const
+{
+	if (packages_.empty())
+		getAvailable();
+	return find(packages_.begin(), packages_.end(), name) != packages_.end();
+}
+
+
 void LaTeXFeatures::addExternalPreamble(string const & preamble)
 {
 	FeaturesList::const_iterator begin = preamble_snippets_.begin();
@@ -160,7 +212,6 @@ string LaTeXFeatures::getLanguages() const
 	     cit != UsedLanguages_.end();
 	     ++cit)
 		languages << (*cit)->babel() << ',';
-
 	return languages.str();
 }
 
@@ -171,8 +222,8 @@ set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding) const
 	LanguageList::const_iterator it  = UsedLanguages_.begin();
 	LanguageList::const_iterator end = UsedLanguages_.end();
 	for (; it != end; ++it)
-		if ((*it)->encoding()->LatexName() != doc_encoding)
-			encodings.insert((*it)->encoding()->LatexName());
+		if ((*it)->encoding()->latexName() != doc_encoding)
+			encodings.insert((*it)->encoding()->latexName());
 	return encodings;
 }
 
@@ -190,10 +241,13 @@ char const * simplefeatures[] = {
 	"varioref",
 	"prettyref",
 	"float",
-	"wasy",
+	"booktabs",
 	"dvipost",
 	"fancybox",
 	"calc",
+	"nicefrac",
+	"tipa",
+	"framed",
 };
 
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
@@ -227,20 +281,24 @@ string const LaTeXFeatures::getPackages() const
 		packages << "\\usepackage{amsmath}\n";
 	}
 
+	// wasysym is a simple feature, but it must be after amsmath if both
+	// are used
+	if (isRequired("wasysym"))
+		packages << "\\usepackage{wasysym}\n";
+
 	// color.sty
 	if (isRequired("color")) {
 		if (params_.graphicsDriver == "default")
-			packages << "\\usepackage[usenames]{color}\n";
+			packages << "\\usepackage{color}\n";
 		else
 			packages << "\\usepackage["
 				 << params_.graphicsDriver
-				 << ",usenames"
 				 << "]{color}\n";
 	}
 
 	// makeidx.sty
 	if (isRequired("makeidx")) {
-		if (! tclass.provides(LyXTextClass::makeidx))
+		if (!tclass.provides(LyXTextClass::makeidx))
 			packages << "\\usepackage{makeidx}\n";
 		packages << "\\makeindex\n";
 	}
@@ -254,6 +312,12 @@ string const LaTeXFeatures::getPackages() const
 				 << params_.graphicsDriver
 				 << "]{graphicx}\n";
 	}
+	// shadecolor for shaded
+	if (isRequired("framed")) {
+	lyx::RGBColor c = lyx::RGBColor(lcolor.getX11Name(LColor::shadedbg));
+		packages << "\\definecolor{shadecolor}{rgb}{" 
+			<< c.r/255 << ',' << c.g/255 << ',' << c.b/255 << "}\n";
+	}
 
 	//if (algorithm) {
 	//	packages << "\\usepackage{algorithm}\n";
@@ -310,7 +374,7 @@ string const LaTeXFeatures::getPackages() const
 
 	// jurabib -- we need version 0.6 at least.
 	if (isRequired("jurabib")) {
-		packages << "\\RequirePackage{jurabib}[2004/01/25]\n";
+		packages << "\\usepackage{jurabib}[2004/01/25]\n";
 	}
 
 	// bibtopic -- the dot provides the aux file naming which
@@ -450,14 +514,14 @@ string const LaTeXFeatures::getLyXSGMLEntities() const
 string const LaTeXFeatures::getIncludedFiles(string const & fname) const
 {
 	ostringstream sgmlpreamble;
-	string const basename = OnlyPath(fname);
+	string const basename = onlyPath(fname);
 
 	FileMap::const_iterator end = IncludedFiles_.end();
 	for (FileMap::const_iterator fi = IncludedFiles_.begin();
 	     fi != end; ++fi)
 		sgmlpreamble << "\n<!ENTITY " << fi->first
-			     << (IsSGMLFilename(fi->second) ? " SYSTEM \"" : " \"")
-			     << MakeRelPath(fi->second, basename) << "\">";
+			     << (isSGMLFilename(fi->second) ? " SYSTEM \"" : " \"")
+			     << makeRelPath(fi->second, basename) << "\">";
 
 	return sgmlpreamble.str();
 }