X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.cpp;h=2cfc1ce6e2275940c4cb69f7f97f0eb3b11634f9;hb=da03e5b1c4a21edf63a2ba73397cb46b59123f4b;hp=b47cab129c6dc175b40a1eb60c1bbb4acdd6e6cf;hpb=3518419a336b6ef00215678d3f1a750f6c779dba;p=lyx.git

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index b47cab129c..2cfc1ce6e2 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -60,6 +60,11 @@ namespace lyx {
 static docstring const lyx_def = from_ascii(
 	"\\providecommand{\\LyX}{L\\kern-.1667em\\lower.25em\\hbox{Y}\\kern-.125emX\\@}");
 
+static docstring const lyx_hyperref_def = from_ascii(
+	"\\providecommand{\\LyX}{\\texorpdfstring%\n"
+	"  {L\\kern-.1667em\\lower.25em\\hbox{Y}\\kern-.125emX\\@}\n"
+        "  {LyX}}");
+
 static docstring const noun_def = from_ascii(
 	"\\newcommand{\\noun}[1]{\\textsc{#1}}");
 
@@ -158,7 +163,9 @@ static docstring const tabularnewline_def = from_ascii(
 	
 static docstring const lyxgreyedout_def = from_ascii(
 	"%% The greyedout annotation environment\n"
-	"\\newenvironment{lyxgreyedout}{\\textcolor{note_fontcolor}\\bgroup}{\\egroup}\n");
+	"\\newenvironment{lyxgreyedout}\n"
+	"  {\\textcolor{note_fontcolor}\\bgroup\\ignorespaces}\n"
+	"  {\\ignorespacesafterend\\egroup}\n");
 
 // We want to omit the file extension for includegraphics, but this does not
 // work when the filename contains other dots.
@@ -287,19 +294,31 @@ bool LaTeXFeatures::useBabel() const
 {
 	if (usePolyglossia())
 		return false;
-	return (lyxrc.language_package_selection != LyXRC::LP_NONE)
-	        || (bufferParams().language->lang() != lyxrc.default_language
-	            && !bufferParams().language->babel().empty())
-	        || this->hasLanguages();
+	if (bufferParams().lang_package == "default")
+		return (lyxrc.language_package_selection != LyXRC::LP_NONE)
+			|| (bufferParams().language->lang() != lyxrc.default_language
+			    && !bufferParams().language->babel().empty())
+			|| this->hasLanguages();
+	return (bufferParams().lang_package != "none")
+		|| (bufferParams().language->lang() != lyxrc.default_language
+		    && !bufferParams().language->babel().empty())
+		|| this->hasLanguages();
 }
 
 
 bool LaTeXFeatures::usePolyglossia() const
 {
-	return (lyxrc.language_package_selection == LyXRC::LP_AUTO)
-	        && isRequired("polyglossia")
-	        && isAvailable("polyglossia")
-	        && this->hasPolyglossiaLanguages();
+	if (bufferParams().lang_package == "default")
+		return (lyxrc.language_package_selection == LyXRC::LP_AUTO)
+			&& isRequired("polyglossia")
+			&& isAvailable("polyglossia")
+			&& !params_.documentClass().provides("babel")
+			&& this->hasPolyglossiaLanguages();
+	return (bufferParams().lang_package == "auto")
+		&& isRequired("polyglossia")
+		&& isAvailable("polyglossia")
+		&& !params_.documentClass().provides("babel")
+		&& this->hasPolyglossiaLanguages();
 }
 
 
@@ -451,7 +470,7 @@ void LaTeXFeatures::useFloat(string const & name, bool subfloat)
 	// use the "H" modifier. This includes modified table and
 	// figure floats. (Lgb)
 	Floating const & fl = params_.documentClass().floats().getType(name);
-	if (!fl.floattype().empty() && fl.needsFloatPkg()) {
+	if (!fl.floattype().empty() && fl.usesFloatPkg()) {
 		require("float");
 	}
 }
@@ -575,7 +594,6 @@ char const * simplefeatures[] = {
 	"framed",
 	"soul",
 	"textcomp",
-	"fixltx2e",
 	"pmboxdraw",
 	"bbding",
 	"ifsym",
@@ -588,6 +606,7 @@ char const * simplefeatures[] = {
 	"csquotes",
 	"enumitem",
 	"endnotes",
+	"hhline",
 	"ifthen",
 	// listings is handled in BufferParams.cpp
 	"bm",
@@ -595,7 +614,8 @@ char const * simplefeatures[] = {
 	"amscd",
 	"slashed",
 	"multirow",
-	"tfrupee"
+	"tfrupee",
+	"undertilde",
 };
 
 int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
@@ -694,6 +714,12 @@ string const LaTeXFeatures::getPackages() const
 	if (!params_.useNonTeXFonts && !loadAMSPackages().empty())
 		packages << loadAMSPackages();
 
+	// fixltx2e must be loaded after amsthm, since amsthm produces an error with
+	// the redefined \[ command (bug 7233). Load is as early as possible, since
+	// other packages might profit from it.
+	if (mustProvide("fixltx2e"))
+		packages << "\\usepackage{fixltx2e}\n";
+
 	// wasysym is a simple feature, but it must be after amsmath if both
 	// are used
 	// wasysym redefines some integrals (e.g. iint) from amsmath. That
@@ -842,8 +868,12 @@ docstring const LaTeXFeatures::getMacros() const
 			macros << papersizepdf_def << '\n';
 	}
 
-	if (mustProvide("LyX"))
-		macros << lyx_def << '\n';
+	if (mustProvide("LyX")) {
+		if (isRequired("hyperref"))
+			macros << lyx_hyperref_def << '\n';
+		else
+			macros << lyx_def << '\n';
+	}
 
 	if (mustProvide("noun"))
 		macros << noun_def << '\n';
@@ -1168,26 +1198,37 @@ docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel, bool use_po
 		UsedFloats::const_iterator fend = usedFloats_.end();
 		for (; fit != fend; ++fit) {
 			Floating const & fl = floats.getType(fit->first);
+			// we assume builtin floats are translated 
+			if (fl.isPredefined())
+				continue;
 			docstring const type = from_ascii(fl.floattype());
 			docstring const flname = from_utf8(fl.name());
-			docstring name = translateIfPossible(flname,
-				buffer().language()->code());
-			if (use_polyglossia)
+			docstring name = buffer().language()->translateLayout(fl.name());
+			// only request translation if we have a real translation
+			// (that differs from the source)
+			if (use_polyglossia && flname != name)
 				snippets.insert(getFloatI18nPreamble(
 					type, name,
 					from_ascii(buffer().language()->polyglossia())));
-			else
+			else if (flname != name)
 				snippets.insert(getFloatI18nPreamble(
 					type, name,
 					from_ascii(buffer().language()->babel())));
 			for (lang_it lit = lbeg; lit != lend; ++lit) {
-				name = translateIfPossible(flname,
-					(*lit)->code());
-				if (use_polyglossia)
+				string const code = (*lit)->code();
+				name = (*lit)->translateLayout(fl.name());
+				// we assume we have a suitable translation if
+				// either the language is English (we need to
+				// translate into English if English is a secondary
+				// language) or if translateIfPossible returns
+				// something different to the English source.
+				bool const have_translation =
+					(flname != name || contains(code, "en"));
+				if (use_polyglossia && have_translation)
 					snippets.insert(getFloatI18nPreamble(
 						type, name,
 						from_ascii((*lit)->polyglossia())));
-				else
+				else if (have_translation)
 					snippets.insert(getFloatI18nPreamble(
 						type, name,
 						from_ascii((*lit)->babel())));
@@ -1279,7 +1320,7 @@ void LaTeXFeatures::getFloatDefinitions(odocstream & os) const
 		Floating const & fl = floats.getType(cit->first);
 
 		// For builtin floats we do nothing.
-		if (!fl.needsFloatPkg()) 
+		if (fl.isPredefined())
 			continue;
 
 		// We have to special case "table" and "figure"
@@ -1307,9 +1348,8 @@ void LaTeXFeatures::getFloatDefinitions(odocstream & os) const
 			docstring const ext = from_ascii(fl.ext());
 			docstring const within = from_ascii(fl.within());
 			docstring const style = from_ascii(fl.style());
-			docstring const name = translateIfPossible(
-					from_utf8(fl.name()),
-					buffer().language()->code());
+			docstring const name =
+				buffer().language()->translateLayout(fl.name());
 			os << "\\floatstyle{" << style << "}\n"
 			   << "\\newfloat{" << type << "}{" << placement
 			   << "}{" << ext << '}';