X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.cpp;h=256b0d858bf9d79cb5c1e10baf31de24276bbb55;hb=780d9a5f4cc553797ec95e49300cf06325ff1341;hp=fd16b2803554c3406dd1a20341fd7749e9440d7d;hpb=a450797b2ab160f5953922d59298e6ff6472f8e4;p=lyx.git

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index fd16b28035..256b0d858b 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -717,7 +717,7 @@ void LaTeXFeatures::useLayout(docstring const & layoutname, int level)
 			return;
 
 		Layout const & layout = tclass[layoutname];
-		require(layout.requires());
+		require(layout.required());
 
 		if (!layout.depends_on().empty()) {
 			useLayout(layout.depends_on(), level + 1);
@@ -744,7 +744,7 @@ void LaTeXFeatures::useInsetLayout(InsetLayout const & lay)
 			!= usedInsetLayouts_.end())
 		return;
 
-	require(lay.requires());
+	require(lay.required());
 	usedInsetLayouts_.push_back(lname);
 }
 
@@ -878,9 +878,9 @@ void LaTeXFeatures::useFloat(string const & name, bool subfloat)
 	if (!fl.floattype().empty()) {
 		if (fl.usesFloatPkg())
 			require("float");
-		if (!fl.requires().empty()) {
-			vector<string> reqs = getVectorFromString(fl.requires());
-			for (auto const req : reqs)
+		if (!fl.required().empty()) {
+			vector<string> reqs = getVectorFromString(fl.required());
+			for (auto const & req : reqs)
 				require(req);
 		}
 	}
@@ -891,8 +891,8 @@ void LaTeXFeatures::useLanguage(Language const * lang)
 {
 	if (!lang->babel().empty() || !lang->polyglossia().empty())
 		UsedLanguages_.insert(lang);
-	if (!lang->requires().empty())
-		require(lang->requires());
+	if (!lang->required().empty())
+		require(lang->required());
 	// currently only supported for Babel
 	if (!lang->provides().empty() && useBabel())
 		provide(lang->provides());
@@ -1150,7 +1150,6 @@ char const * simplefeatures[] = {
 	"todonotes",
 	"forest",
 	"varwidth",
-	"tablefootnote",
 	"afterpage",
 	"tabularx",
 	"tikz",
@@ -1159,7 +1158,8 @@ char const * simplefeatures[] = {
 	"xskak",
 	"pict2e",
 	"drs",
-	"environ"
+	"environ",
+	"dsfont"
 };
 
 char const * bibliofeatures[] = {
@@ -1396,6 +1396,9 @@ string const LaTeXFeatures::getPackages() const
 		packages << "\\usepackage{rotating}\n";
 	if (mustProvide("rotfloat"))
 		packages << "\\usepackage{rotfloat}\n";
+	// and this must be loaded after rotating
+	if (mustProvide("tablefootnote"))
+		packages << "\\usepackage{tablefootnote}\n";
 
 	// lyxskak.sty --- newer chess support based on skak.sty
 	if (mustProvide("chess"))