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

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 4738c33f57..921c15ef78 100644
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -17,31 +17,43 @@
 #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"
 
 #include "support/filetools.h"
 
-#include "support/std_sstream.h"
+#include <sstream>
 
-using namespace lyx::support;
+using lyx::support::isSGMLFilename;
+using lyx::support::libFileSearch;
+using lyx::support::makeRelPath;
+using lyx::support::onlyPath;
 
 using std::endl;
 using std::find;
-
+using std::string;
 using std::list;
 using std::ostream;
 using std::ostringstream;
 using std::set;
 
+namespace biblio = lyx::biblio;
+
+
+LaTeXFeatures::PackagesList LaTeXFeatures::packages_;
 
-LaTeXFeatures::LaTeXFeatures(BufferParams const & p)
-	: params(p)
+
+LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p,
+			     OutputParams const & r)
+	: buffer_(&b), params_(p), runparams_(r)
 {}
 
 
@@ -58,7 +70,43 @@ void LaTeXFeatures::require(string const & name)
 	if (isRequired(name))
 		return;
 
-	features.push_back(name);
+	features_.push_back(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;
 }
 
 
@@ -74,11 +122,11 @@ void LaTeXFeatures::useLayout(string const & layoutname)
 		return;
 	}
 
-	LyXTextClass const & tclass = params.getLyXTextClass();
+	LyXTextClass const & tclass = params_.getLyXTextClass();
 	if (tclass.hasLayout(layoutname)) {
 		// Is this layout already in usedLayouts?
-		list<string>::const_iterator cit = usedLayouts.begin();
-		list<string>::const_iterator end = usedLayouts.end();
+		list<string>::const_iterator cit = usedLayouts_.begin();
+		list<string>::const_iterator end = usedLayouts_.end();
 		for (; cit != end; ++cit) {
 			if (layoutname == *cit)
 				return;
@@ -90,7 +138,7 @@ void LaTeXFeatures::useLayout(string const & layoutname)
 			useLayout(lyt->depends_on());
 			--level;
 		}
-		usedLayouts.push_back(layoutname);
+		usedLayouts_.push_back(layoutname);
 	} else {
 		lyxerr << "LaTeXFeatures::useLayout: layout `"
 		       << layoutname << "' does not exist in this class"
@@ -103,26 +151,34 @@ void LaTeXFeatures::useLayout(string const & layoutname)
 
 bool LaTeXFeatures::isRequired(string const & name) const
 {
-	return find(features.begin(), features.end(), name) != features.end();
+	return find(features_.begin(), features_.end(), name) != features_.end();
+}
+
+
+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();
-	FeaturesList::const_iterator end   = preamble_snippets.end();
+	FeaturesList::const_iterator begin = preamble_snippets_.begin();
+	FeaturesList::const_iterator end   = preamble_snippets_.end();
 	if (find(begin, end, preamble) == end)
-		preamble_snippets.push_back(preamble);
+		preamble_snippets_.push_back(preamble);
 }
 
 
 void LaTeXFeatures::useFloat(string const & name)
 {
-	usedFloats.insert(name);
+	usedFloats_.insert(name);
 	// We only need float.sty if we use non builtin floats, or if we
 	// use the "H" modifier. This includes modified table and
 	// figure floats. (Lgb)
-	Floating const & fl = params.getLyXTextClass().floats().getType(name);
+	Floating const & fl = params_.getLyXTextClass().floats().getType(name);
 	if (!fl.type().empty() && !fl.builtin()) {
 		require("float");
 	}
@@ -131,19 +187,19 @@ void LaTeXFeatures::useFloat(string const & name)
 
 void LaTeXFeatures::useLanguage(Language const * lang)
 {
-	UsedLanguages.insert(lang);
+	UsedLanguages_.insert(lang);
 }
 
 
 void LaTeXFeatures::includeFile(string const & key, string const & name)
 {
-	IncludedFiles[key] = name;
+	IncludedFiles_[key] = name;
 }
 
 
 bool LaTeXFeatures::hasLanguages() const
 {
-	return !UsedLanguages.empty();
+	return !UsedLanguages_.empty();
 }
 
 
@@ -152,23 +208,22 @@ string LaTeXFeatures::getLanguages() const
 	ostringstream languages;
 
 	for (LanguageList::const_iterator cit =
-		    UsedLanguages.begin();
-	     cit != UsedLanguages.end();
+		    UsedLanguages_.begin();
+	     cit != UsedLanguages_.end();
 	     ++cit)
 		languages << (*cit)->babel() << ',';
-
-	return STRCONV(languages.str());
+	return languages.str();
 }
 
 
 set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding) const
 {
 	set<string> encodings;
-	for (LanguageList::const_iterator it =
-		     UsedLanguages.begin();
-	     it != UsedLanguages.end(); ++it)
-		if ((*it)->encoding()->LatexName() != doc_encoding)
-			encodings.insert((*it)->encoding()->LatexName());
+	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());
 	return encodings;
 }
 
@@ -186,8 +241,13 @@ char const * simplefeatures[] = {
 	"varioref",
 	"prettyref",
 	"float",
-	"wasy",
-	"dvipost"
+	"booktabs",
+	"dvipost",
+	"fancybox",
+	"calc",
+	"nicefrac",
+	"tipa",
+	"framed",
 };
 
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
@@ -198,7 +258,7 @@ int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
 string const LaTeXFeatures::getPackages() const
 {
 	ostringstream packages;
-	LyXTextClass const & tclass = params.getLyXTextClass();
+	LyXTextClass const & tclass = params_.getLyXTextClass();
 
 	//
 	//  These are all the 'simple' includes.  i.e
@@ -217,37 +277,47 @@ string const LaTeXFeatures::getPackages() const
 
 	if (isRequired("amsmath")
 	    && !tclass.provides(LyXTextClass::amsmath)
-	    && params.use_amsmath != BufferParams::AMS_OFF) {
+	    && params_.use_amsmath != BufferParams::AMS_OFF) {
 		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";
+		if (params_.graphicsDriver == "default")
+			packages << "\\usepackage{color}\n";
 		else
 			packages << "\\usepackage["
-				 << params.graphicsDriver
-				 << ",usenames"
+				 << params_.graphicsDriver
 				 << "]{color}\n";
 	}
 
 	// makeidx.sty
 	if (isRequired("makeidx")) {
-		if (! tclass.provides(LyXTextClass::makeidx))
+		if (!tclass.provides(LyXTextClass::makeidx))
 			packages << "\\usepackage{makeidx}\n";
 		packages << "\\makeindex\n";
 	}
 
 	// graphicx.sty
-	if (isRequired("graphicx") && params.graphicsDriver != "none") {
-		if (params.graphicsDriver == "default")
+	if (isRequired("graphicx") && params_.graphicsDriver != "none") {
+		if (params_.graphicsDriver == "default")
 			packages << "\\usepackage{graphicx}\n";
 		else
 			packages << "\\usepackage["
-				 << params.graphicsDriver
+				 << 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";
@@ -259,12 +329,12 @@ string const LaTeXFeatures::getPackages() const
 	}
 
 	// setspace.sty
-	if ((params.spacing.getSpace() != Spacing::Single
-	     && !params.spacing.isDefault())
+	if ((params_.spacing().getSpace() != Spacing::Single
+	     && !params_.spacing().isDefault())
 	    || isRequired("setspace")) {
 		packages << "\\usepackage{setspace}\n";
 	}
-	switch (params.spacing.getSpace()) {
+	switch (params_.spacing().getSpace()) {
 	case Spacing::Default:
 	case Spacing::Single:
 		// we dont use setspace.sty so dont print anything
@@ -278,12 +348,12 @@ string const LaTeXFeatures::getPackages() const
 		break;
 	case Spacing::Other:
 		packages << "\\setstretch{"
-			 << params.spacing.getValue() << "}\n";
+			 << params_.spacing().getValue() << "}\n";
 		break;
 	}
 
 	// amssymb.sty
-	if (isRequired("amssymb") || params.use_amsmath == BufferParams::AMS_ON)
+	if (isRequired("amssymb") || params_.use_amsmath == BufferParams::AMS_ON)
 		packages << "\\usepackage{amssymb}\n";
 	// url.sty
 	if (isRequired("url") && ! tclass.provides(LyXTextClass::url))
@@ -294,7 +364,7 @@ string const LaTeXFeatures::getPackages() const
 	// natbib.sty
 	if (isRequired("natbib") && ! tclass.provides(LyXTextClass::natbib)) {
 		packages << "\\usepackage[";
-		if (params.use_numerical_citations) {
+		if (params_.cite_engine == biblio::ENGINE_NATBIB_NUMERICAL) {
 			packages << "numbers";
 		} else {
 			packages << "authoryear";
@@ -302,7 +372,18 @@ string const LaTeXFeatures::getPackages() const
 		packages << "]{natbib}\n";
 	}
 
-	return STRCONV(packages.str());
+	// jurabib -- we need version 0.6 at least.
+	if (isRequired("jurabib")) {
+		packages << "\\usepackage{jurabib}[2004/01/25]\n";
+	}
+
+	// bibtopic -- the dot provides the aux file naming which
+	// LyX can detect.
+	if (isRequired("bibtopic")) {
+		packages << "\\usepackage[dot]{bibtopic}\n";
+	}
+
+	return packages.str();
 }
 
 
@@ -310,10 +391,10 @@ string const LaTeXFeatures::getMacros() const
 {
 	ostringstream macros;
 
-	if (!preamble_snippets.empty())
+	if (!preamble_snippets_.empty())
 		macros << '\n';
-	FeaturesList::const_iterator pit  = preamble_snippets.begin();
-	FeaturesList::const_iterator pend = preamble_snippets.end();
+	FeaturesList::const_iterator pit  = preamble_snippets_.begin();
+	FeaturesList::const_iterator pend = preamble_snippets_.end();
 	for (; pit != pend; ++pit) {
 		macros << *pit << '\n';
 	}
@@ -353,8 +434,6 @@ string const LaTeXFeatures::getMacros() const
 		macros << mathcircumflex_def << '\n';
 
 	// other
-	if (isRequired("NeedLyXMinipageIndent"))
-		macros << minipageindent_def;
 	if (isRequired("ParagraphLeftIndent"))
 		macros << paragraphleftindent_def;
 	if (isRequired("NeedLyXFootnoteCode"))
@@ -368,10 +447,13 @@ string const LaTeXFeatures::getMacros() const
 	if (isRequired("lyxgreyedout"))
 		macros << lyxgreyedout_def;
 
+	if (isRequired("lyxdot"))
+		macros << lyxdot_def << '\n';
+
 	// floats
 	getFloatDefinitions(macros);
 
-	return STRCONV(macros.str());
+	return macros.str();
 }
 
 
@@ -379,32 +461,40 @@ string const LaTeXFeatures::getBabelOptions() const
 {
 	ostringstream tmp;
 
-	for (LanguageList::const_iterator cit = UsedLanguages.begin();
-	     cit != UsedLanguages.end(); ++cit)
-		if (!(*cit)->latex_options().empty())
-			tmp << (*cit)->latex_options() << '\n';
-	if (!params.language->latex_options().empty())
-		tmp << params.language->latex_options() << '\n';
+	LanguageList::const_iterator it  = UsedLanguages_.begin();
+	LanguageList::const_iterator end =  UsedLanguages_.end();
+	for (; it != end; ++it)
+		if (!(*it)->latex_options().empty())
+			tmp << (*it)->latex_options() << '\n';
+	if (!params_.language->latex_options().empty())
+		tmp << params_.language->latex_options() << '\n';
 
-	return STRCONV(tmp.str());
+	return tmp.str();
 }
 
 
 string const LaTeXFeatures::getTClassPreamble() const
 {
 	// the text class specific preamble
-	LyXTextClass const & tclass = params.getLyXTextClass();
+	LyXTextClass const & tclass = params_.getLyXTextClass();
 	ostringstream tcpreamble;
 
 	tcpreamble << tclass.preamble();
 
-	list<string>::const_iterator cit = usedLayouts.begin();
-	list<string>::const_iterator end = usedLayouts.end();
+	list<string>::const_iterator cit = usedLayouts_.begin();
+	list<string>::const_iterator end = usedLayouts_.end();
 	for (; cit != end; ++cit) {
 		tcpreamble << tclass[*cit]->preamble();
 	}
 
-	return STRCONV(tcpreamble.str());
+	CharStyles::iterator cs = tclass.charstyles().begin();
+	CharStyles::iterator csend = tclass.charstyles().end();
+	for (; cs != csend; ++cs) {
+		if (isRequired(cs->name))
+			tcpreamble << cs->preamble;
+	}
+
+	return tcpreamble.str();
 }
 
 
@@ -417,23 +507,23 @@ string const LaTeXFeatures::getLyXSGMLEntities() const
 		entities << "<!ENTITY lyxarrow \"-&gt;\">" << '\n';
 	}
 
-	return STRCONV(entities.str());
+	return entities.str();
 }
 
 
 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();
+	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 STRCONV(sgmlpreamble.str());
+	return sgmlpreamble.str();
 }
 
 
@@ -446,23 +536,35 @@ void LaTeXFeatures::showStruct() const {
 }
 
 
+Buffer const & LaTeXFeatures::buffer() const
+{
+	return *buffer_;
+}
+
+
+void LaTeXFeatures::setBuffer(Buffer const & buffer)
+{
+	buffer_ = &buffer;
+}
+
+
 BufferParams const & LaTeXFeatures::bufferParams() const
 {
-	return params;
+	return params_;
 }
 
 
 void LaTeXFeatures::getFloatDefinitions(ostream & os) const
 {
-	FloatList const & floats = params.getLyXTextClass().floats();
+	FloatList const & floats = params_.getLyXTextClass().floats();
 
 	// Here we will output the code to create the needed float styles.
 	// We will try to do this as minimal as possible.
 	// \floatstyle{ruled}
 	// \newfloat{algorithm}{htbp}{loa}
 	// \floatname{algorithm}{Algorithm}
-	UsedFloats::const_iterator cit = usedFloats.begin();
-	UsedFloats::const_iterator end = usedFloats.end();
+	UsedFloats::const_iterator cit = usedFloats_.begin();
+	UsedFloats::const_iterator end = usedFloats_.end();
 	// ostringstream floats;
 	for (; cit != end; ++cit) {
 		Floating const & fl = floats.getType((*cit));