X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.C;h=3fd615848002e728ae19946b1a33c2901dd1ebfb;hb=b99a5acc7f18c3f885856fa962c0f0a63a0ca5ad;hp=143bbdfa3876918b470c9df533cfc1ad9b021f54;hpb=313ab401fe79b7b5841afaec432848385a0061fd;p=lyx.git

diff --git a/src/LaTeXFeatures.C b/src/LaTeXFeatures.C
index 143bbdfa38..3fd6158480 100644
--- a/src/LaTeXFeatures.C
+++ b/src/LaTeXFeatures.C
@@ -10,10 +10,6 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "LaTeXFeatures.h"
 #include "debug.h"
 #include "lyx_sty.h"
@@ -61,8 +57,8 @@ void LaTeXFeatures::useLayout(string const & layoutname)
 		       << layoutname << endl;
 		return;
 	}
-	
-	LyXTextClass 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();
@@ -71,8 +67,8 @@ void LaTeXFeatures::useLayout(string const & layoutname)
 			if (layoutname == *cit)
 				return;
 		}
-		
-		LyXLayout_ptr lyt = tclass[layoutname];
+
+		LyXLayout_ptr const & lyt = tclass[layoutname];
 		if (!lyt->depends_on().empty()) {
 			++level;
 			useLayout(lyt->depends_on());
@@ -82,19 +78,16 @@ void LaTeXFeatures::useLayout(string const & layoutname)
 	} else {
 		lyxerr << "LaTeXFeatures::useLayout: layout `"
 		       << layoutname << "' does not exist in this class"
-		       << endl; 
+		       << endl;
 	}
-	
+
 	--level;
 }
 
 
 bool LaTeXFeatures::isRequired(string const & name) const
 {
-	FeaturesList::const_iterator i = find(features.begin(),
-					      features.end(),
-					      name);
-	return i != features.end();
+	return find(features.begin(), features.end(), name) != features.end();
 }
 
 
@@ -110,7 +103,7 @@ void LaTeXFeatures::useFloat(string const & 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 = floatList.getType(name);
+	Floating const & fl = params.getLyXTextClass().floats().getType(name);
 	if (!fl.type().empty() && !fl.builtin()) {
 		require("float");
 	}
@@ -129,7 +122,7 @@ void LaTeXFeatures::includeFile(string const & key, string const & name)
 }
 
 
-bool LaTeXFeatures::hasLanguages()
+bool LaTeXFeatures::hasLanguages() const
 {
 	return !UsedLanguages.empty();
 }
@@ -145,11 +138,11 @@ string LaTeXFeatures::getLanguages() const
 	     ++cit)
 		languages << (*cit)->babel() << ',';
 
-	return languages.str().c_str();
+	return STRCONV(languages.str());
 }
 
 
-set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding)
+set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding) const
 {
 	set<string> encodings;
 	for (LanguageList::const_iterator it =
@@ -174,10 +167,11 @@ char const * simplefeatures[] = {
 	"varioref",
 	"prettyref",
 	"float",
-	"wasy"
+	"wasy",
+	"dvipost"
 };
 
-const int nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
+int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
 
 }
 
@@ -194,7 +188,7 @@ string const LaTeXFeatures::getPackages() const
 	for (int i = 0; i < nb_simplefeatures; ++i) {
 		if (isRequired(simplefeatures[i]))
 			packages << "\\usepackage{"
-			         << simplefeatures[i] << "}\n";
+				 << simplefeatures[i] << "}\n";
 	}
 
 	//
@@ -210,10 +204,11 @@ string const LaTeXFeatures::getPackages() const
 	// color.sty
 	if (isRequired("color")) {
 		if (params.graphicsDriver == "default")
-			packages << "\\usepackage{color}\n";
+			packages << "\\usepackage[usenames]{color}\n";
 		else
 			packages << "\\usepackage["
 				 << params.graphicsDriver
+				 << ",usenames"
 				 << "]{color}\n";
 	}
 
@@ -289,7 +284,7 @@ string const LaTeXFeatures::getPackages() const
 
 	packages << externalPreambles;
 
-	return packages.str().c_str();
+	return STRCONV(packages.str());
 }
 
 
@@ -339,10 +334,14 @@ string const LaTeXFeatures::getMacros() const
 	if (isRequired("NeedLyXFootnoteCode"))
 		macros << floatingfootnote_def;
 
+	// some problems with tex->html converters
+	if (isRequired("NeedTabularnewline"))
+		macros << tabularnewline_def;
+
 	// floats
 	getFloatDefinitions(macros);
 
-	return macros.str().c_str();
+	return STRCONV(macros.str());
 }
 
 
@@ -357,7 +356,7 @@ string const LaTeXFeatures::getBabelOptions() const
 	if (!params.language->latex_options().empty())
 		tmp << params.language->latex_options() << '\n';
 
-	return tmp.str().c_str();
+	return STRCONV(tmp.str());
 }
 
 
@@ -375,7 +374,7 @@ string const LaTeXFeatures::getTClassPreamble() const
 		tcpreamble << tclass[*cit]->preamble();
 	}
 
-	return tcpreamble.str().c_str();
+	return STRCONV(tcpreamble.str());
 }
 
 
@@ -388,7 +387,7 @@ string const LaTeXFeatures::getLyXSGMLEntities() const
 		entities << "<!ENTITY lyxarrow \"-&gt;\">" << '\n';
 	}
 
-	return entities.str().c_str();
+	return STRCONV(entities.str());
 }
 
 
@@ -404,7 +403,7 @@ string const LaTeXFeatures::getIncludedFiles(string const & fname) const
 			     << (IsSGMLFilename(fi->second) ? " SYSTEM \"" : " \"")
 			     << MakeRelPath(fi->second, basename) << "\">";
 
-	return sgmlpreamble.str().c_str();
+	return STRCONV(sgmlpreamble.str());
 }
 
 
@@ -425,6 +424,8 @@ BufferParams const & LaTeXFeatures::bufferParams() const
 
 void LaTeXFeatures::getFloatDefinitions(ostream & os) const
 {
+	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}
@@ -434,7 +435,7 @@ void LaTeXFeatures::getFloatDefinitions(ostream & os) const
 	UsedFloats::const_iterator end = usedFloats.end();
 	// ostringstream floats;
 	for (; cit != end; ++cit) {
-		Floating const & fl = floatList.getType((*cit));
+		Floating const & fl = floats.getType((*cit));
 
 		// For builtin floats we do nothing.
 		if (fl.builtin()) continue;
@@ -467,10 +468,10 @@ void LaTeXFeatures::getFloatDefinitions(ostream & os) const
 			string const name = fl.name();
 			os << "\\floatstyle{" << style << "}\n"
 			   << "\\newfloat{" << type << "}{" << placement
-			   << "}{" << ext << "}";
+			   << "}{" << ext << '}';
 			if (!within.empty())
-				os << "[" << within << "]";
-			os << "\n"
+				os << '[' << within << ']';
+			os << '\n'
 			   << "\\floatname{" << type << "}{"
 			   << name << "}\n";