X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeXFeatures.cpp;h=364a4921e1ac13799cd76ab7853de9fa41f32ef0;hb=2abde5d16254e8aac29e344442b09e6272000f13;hp=f321799103e43c6634fb88f37dd680bd7c31aaa7;hpb=c2f2ba57f1275cdf37e38da7e45ce5bb9ee124b9;p=lyx.git

diff --git a/src/LaTeXFeatures.cpp b/src/LaTeXFeatures.cpp
index f321799103..364a4921e1 100644
--- a/src/LaTeXFeatures.cpp
+++ b/src/LaTeXFeatures.cpp
@@ -560,9 +560,9 @@ docstring const lyxgreyedoutDef(bool const rtl, bool const ct, bool const lua, b
 			ods << "  \\if@rl%\n";
 		ods << "    \\everypar{%\n";
 		if (lua)
-			ods << "      \\pardir TRT \\textdir TRT\\textcolor{note_fontcolor}\\ignorespaces%\n";
+			ods << "      \\pardir TRT \\textdir TRT\\normalfont\\normalsize\\textcolor{note_fontcolor}\\ignorespaces%\n";
 		else
-			ods << "      \\textcolor{note_fontcolor}\\beginL\\ignorespaces%\n";
+			ods << "      \\normalfont\\normalsize\\textcolor{note_fontcolor}\\beginL\\ignorespaces%\n";
 		ods << "    }%\n";
 		if (ct)
 			ods << "    \\colorlet{lyxadded}{lyxadded!30}\\colorlet{lyxdeleted}{lyxdeleted!30}%\n";
@@ -573,7 +573,7 @@ docstring const lyxgreyedoutDef(bool const rtl, bool const ct, bool const lua, b
 		ods << "  \\else%\n";
 		if (ct)
 			ods << "    \\colorlet{lyxadded}{lyxadded!30}\\colorlet{lyxdeleted}{lyxdeleted!30}%\n";
-		ods << "    \\textcolor{note_fontcolor}\\bgroup\\ignorespaces%\n"
+		ods << "    \\normalfont\\normalsize\\textcolor{note_fontcolor}\\bgroup\\ignorespaces%\n"
 		    << "    \\BODY\\ignorespacesafterend\\egroup%\n"
 		    << "  \\fi%\n"
 		    << "}\n";
@@ -583,7 +583,7 @@ docstring const lyxgreyedoutDef(bool const rtl, bool const ct, bool const lua, b
 		    << "{";
 		if (ct)
 			ods << "\\colorlet{lyxadded}{lyxadded!30}\\colorlet{lyxdeleted}{lyxdeleted!30}%\n ";
-		ods << "\\textcolor{note_fontcolor}\\bgroup\\ignorespaces}\n"
+		ods << "\\normalfont\\normalsize\\textcolor{note_fontcolor}\\bgroup\\ignorespaces}\n"
 		    << "{\\ignorespacesafterend\\egroup}\n";
 	}
 
@@ -827,6 +827,12 @@ bool LaTeXFeatures::isAvailable(string const & name)
 }
 
 
+bool LaTeXFeatures::isAvailableAtLeastFrom(string const & name, int const y, int const m, int const d)
+{
+	return LaTeXPackages::isAvailableAtLeastFrom(name, y, m, d);
+}
+
+
 namespace {
 
 void addSnippet(std::list<TexString> & list, TexString ts, bool allow_dupes)
@@ -837,7 +843,7 @@ void addSnippet(std::list<TexString> & list, TexString ts, bool allow_dupes)
 			    return ts.str == ts2.str;
 		    })
 	    )
-		list.push_back(move(ts));
+		list.push_back(std::move(ts));
 }
 
 
@@ -854,7 +860,7 @@ TexString getSnippets(std::list<TexString> const & list)
 
 void LaTeXFeatures::addPreambleSnippet(TexString snippet, bool allow_dupes)
 {
-	addSnippet(preamble_snippets_, move(snippet), allow_dupes);
+	addSnippet(preamble_snippets_, std::move(snippet), allow_dupes);
 }
 
 
@@ -1161,7 +1167,9 @@ char const * simplefeatures[] = {
 	"pict2e",
 	"drs",
 	"environ",
-	"dsfont"
+	"dsfont",
+	"hepparticles",
+	"hepnames"
 };
 
 char const * bibliofeatures[] = {
@@ -1511,7 +1519,8 @@ string const LaTeXFeatures::getPackages() const
 	}
 
 	// fixltx2e provides subscript
-	if (mustProvide("subscript") && !isRequired("fixltx2e"))
+	if (mustProvide("subscript") && !isRequired("fixltx2e")
+	    && !isAvailableAtLeastFrom("LaTeX", 2005, 12))
 		packages << "\\usepackage{subscript}\n";
 
 	// footmisc must be loaded after setspace
@@ -1924,16 +1933,12 @@ docstring const LaTeXFeatures::getTClassHTMLStyles() const
 
 	tcpreamble << tclass.htmlstyles();
 
-	list<docstring>::const_iterator cit = usedLayouts_.begin();
-	list<docstring>::const_iterator end = usedLayouts_.end();
-	for (; cit != end; ++cit)
-		tcpreamble << tclass[*cit].htmlstyle();
+	for (auto const & c : usedLayouts_)
+		tcpreamble << tclass[c].htmlstyle();
 
-	cit = usedInsetLayouts_.begin();
-	end = usedInsetLayouts_.end();
 	TextClass::InsetLayouts const & ils = tclass.insetLayouts();
-	for (; cit != end; ++cit) {
-		TextClass::InsetLayouts::const_iterator it = ils.find(*cit);
+	for (auto const & c : usedInsetLayouts_) {
+		TextClass::InsetLayouts::const_iterator it = ils.find(c);
 		if (it == ils.end())
 			continue;
 		tcpreamble << it->second.htmlstyle();
@@ -2159,37 +2164,6 @@ docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel,
 }
 
 
-docstring const LaTeXFeatures::getLyXSGMLEntities() const
-{
-	// Definition of entities used in the document that are LyX related.
-	odocstringstream entities;
-
-	if (mustProvide("lyxarrow")) {
-		entities << "<!ENTITY lyxarrow \"-&gt;\">" << '\n';
-	}
-
-	return entities.str();
-}
-
-
-docstring const LaTeXFeatures::getIncludedFiles(string const & fname) const
-{
-	odocstringstream sgmlpreamble;
-	// FIXME UNICODE
-	docstring const basename(from_utf8(onlyPath(fname)));
-
-	FileMap::const_iterator end = IncludedFiles_.end();
-	for (FileMap::const_iterator fi = IncludedFiles_.begin();
-	     fi != end; ++fi)
-		// FIXME UNICODE
-		sgmlpreamble << "\n<!ENTITY " << fi->first
-			     << (isSGMLFileName(fi->second) ? " SYSTEM \"" : " \"")
-			     << makeRelPath(from_utf8(fi->second), basename) << "\">";
-
-	return sgmlpreamble.str();
-}
-
-
 void LaTeXFeatures::showStruct() const
 {
 	lyxerr << "LyX needs the following commands when LaTeXing:"