"%% Because html converters don't know tabularnewline\n"
"\\providecommand{\\tabularnewline}{\\\\}\n");
-static docstring const lyxgreyedout_def = from_ascii(
- "%% The greyedout annotation environment\n"
- "\\newenvironment{lyxgreyedout}\n"
- " {\\textcolor{note_fontcolor}\\bgroup\\ignorespaces}\n"
- " {\\ignorespacesafterend\\egroup}\n");
-
-static docstring const lyxgreyedout_rtl_def = from_ascii(
- "%% The greyedout annotation environment (with RTL support)\n"
- "\\NewEnviron{lyxgreyedout}{%\n"
- "\\if@rl%\n"
- "\\everypar{\\textcolor{note_fontcolor}\\beginL\\ignorespaces}%\n"
- "\\BODY\\everypar{\\ignorespacesafterend\\endL}\n"
- "\\else%\n"
- "\\textcolor{note_fontcolor}\\bgroup\\ignorespaces%\n"
- "\\BODY\\ignorespacesafterend\\egroup\n"
- "\\fi}\n");
-
-static docstring const lyxgreyedout_luartl_def = from_ascii(
- "%% The greyedout annotation environment (with RTL support)\n"
- "\\NewEnviron{lyxgreyedout}{%\n"
- "\\if@RTL%\n"
- "\\everypar{\\color{note_fontcolor}\\pardir TRT \\textdir TRT\\ignorespaces}%\n"
- "\\BODY\\everypar{\\ignorespacesafterend}\n"
- "\\else%\n"
- "\\textcolor{note_fontcolor}\\bgroup\\ignorespaces%\n"
- "\\BODY\\ignorespacesafterend\\egroup\n"
- "\\fi}\n");
-
-static docstring const lyxgreyedout_luartl_babel_def = from_ascii(
- "%% The greyedout annotation environment (with RTL support)\n"
- "\\NewEnviron{lyxgreyedout}{%\n"
- "\\if@rl%\n"
- "\\everypar{\\color{note_fontcolor}\\pardir TRT \\textdir TRT\\ignorespaces}%\n"
- "\\BODY\\everypar{\\ignorespacesafterend}\n"
- "\\else%\n"
- "\\textcolor{note_fontcolor}\\bgroup\\ignorespaces%\n"
- "\\BODY\\ignorespacesafterend\\egroup\n"
- "\\fi}\n");
+static docstring const cellvarwidth_def = from_ascii(
+ "%% Variable width box for table cells\n"
+ "\\newenvironment{cellvarwidth}[1][t]\n"
+ " {\\begin{varwidth}[#1]{\\linewidth}}\n"
+ " {\\@finalstrut\\@arstrutbox\\end{varwidth}}\n");
// We want to omit the file extension for includegraphics, but this does not
// work when the filename contains other dots.
// split-level fractions
static docstring const xfrac_def = from_ascii(
"\\usepackage{xfrac}\n");
+
static docstring const smallLetterFrac_def = from_ascii(
"\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{default}{text}\n"
" {phantom=c, scale-factor=1.0, slash-left-kern=-.05em}\n"
"}\n");
+docstring const lyxgreyedoutDef(bool const rtl, bool const ct, bool const lua, bool const babel)
+{
+ odocstringstream ods;
+
+ if (rtl) {
+ ods << "%% The greyedout annotation environment (with RTL support)\n"
+ << "\\NewEnviron{lyxgreyedout}{%\n";
+ if (lua && !babel)
+ // luabidi uses this switch
+ ods << " \\if@RTL%\n";
+ else
+ ods << " \\if@rl%\n";
+ ods << " \\everypar{%\n";
+ if (lua)
+ ods << " \\pardir TRT \\textdir TRT\\normalfont\\normalsize\\textcolor{note_fontcolor}\\ignorespaces%\n";
+ else
+ ods << " \\normalfont\\normalsize\\textcolor{note_fontcolor}\\beginL\\ignorespaces%\n";
+ ods << " }%\n";
+ if (ct)
+ ods << " \\colorlet{lyxadded}{lyxadded!30}\\colorlet{lyxdeleted}{lyxdeleted!30}%\n";
+ if (lua)
+ ods << " \\BODY\\everypar{\\ignorespacesafterend}%\n";
+ else
+ ods << " \\BODY\\everypar{\\ignorespacesafterend\\endL}%\n";
+ ods << " \\else%\n";
+ if (ct)
+ ods << " \\colorlet{lyxadded}{lyxadded!30}\\colorlet{lyxdeleted}{lyxdeleted!30}%\n";
+ ods << " \\normalfont\\normalsize\\textcolor{note_fontcolor}\\bgroup\\ignorespaces%\n"
+ << " \\BODY\\ignorespacesafterend\\egroup%\n"
+ << " \\fi%\n"
+ << "}\n";
+ } else {
+ ods << "%% The greyedout annotation environment\n"
+ << "\\newenvironment{lyxgreyedout}\n"
+ << "{";
+ if (ct)
+ ods << "\\colorlet{lyxadded}{lyxadded!30}\\colorlet{lyxdeleted}{lyxdeleted!30}%\n ";
+ ods << "\\normalfont\\normalsize\\textcolor{note_fontcolor}\\bgroup\\ignorespaces}\n"
+ << "{\\ignorespacesafterend\\egroup}\n";
+ }
+
+ return ods.str();
+}
+
+
+
/////////////////////////////////////////////////////////////////////
//
// LyXHTML strings
if (params_.useNonTeXFonts)
return params_.documentClass().provides(name);
- bool const ot1 = (params_.main_font_encoding() == "default"
- || params_.main_font_encoding() == "OT1");
+ bool const ot1 = (runparams().main_fontenc == "default"
+ || runparams().main_fontenc == "OT1");
bool const complete = (params_.fontsSans() == "default"
&& params_.fontsTypewriter() == "default");
bool const nomath = (params_.fontsMath() == "default");
}
+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)
return ts.str == ts2.str;
})
)
- list.push_back(move(ts));
+ list.push_back(std::move(ts));
}
void LaTeXFeatures::addPreambleSnippet(TexString snippet, bool allow_dupes)
{
- addSnippet(preamble_snippets_, move(snippet), allow_dupes);
+ addSnippet(preamble_snippets_, std::move(snippet), allow_dupes);
}
"pict2e",
"drs",
"environ",
- "dsfont"
+ "dsfont",
+ "hepparticles",
+ "hepnames"
};
char const * bibliofeatures[] = {
// also unknown packages can be requested. They are silently
// swallowed now. We should change this eventually.
+ // Simple hooks to add things before or after a given "simple"
+ // feature. Useful if loading order matters.
+ map<string, string> before_simplefeature_;
+ map<string, string> after_simplefeature_;
+
+ // Babel languages with activated colon (such as French) break
+ // with prettyref. Work around that.
+ if (mustProvide("prettyref") && !runparams_.isFullUnicode()
+ && useBabel() && contains(getActiveChars(), ':')) {
+ before_simplefeature_["prettyref"] =
+ "% Make prettyref compatible with babel active colon\n"
+ "% (make ':' active in prettyref definitions)\n"
+ "\\edef\\lyxsavedcolcatcode{\\the\\catcode`\\:}\n"
+ "\\catcode`:=13\n";
+ after_simplefeature_["prettyref"] =
+ "% restore original catcode for :\n"
+ "\\catcode`\\:=\\lyxsavedcolcatcode\\relax\n";
+ }
+
// These are all the 'simple' includes. i.e
// packages which we just \usepackage{package}
+ // potentially preceded and followed by the hook code
for (char const * feature : simplefeatures) {
- if (mustProvide(feature))
+ if (mustProvide(feature)) {
+ if (before_simplefeature_.find(feature) != before_simplefeature_.end())
+ packages << before_simplefeature_[feature];
packages << "\\usepackage{" << feature << "}\n";
+ if (after_simplefeature_.find(feature) != after_simplefeature_.end())
+ packages << after_simplefeature_[feature];
+ }
}
// The rest of these packages are somewhat more complicated
// if fontspec or newtxmath is used, AMS packages have to be loaded
// before fontspec (in BufferParams)
string const amsPackages = loadAMSPackages();
- bool const ot1 = (params_.main_font_encoding() == "default"
- || params_.main_font_encoding() == "OT1");
+ bool const ot1 = (runparams().main_fontenc == "default"
+ || runparams().main_fontenc == "OT1");
bool const use_newtxmath =
theLaTeXFonts().getLaTeXFont(from_ascii(params_.fontsMath())).getUsedPackage(
ot1, false, false) == "newtxmath";
}
// 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
macros << lyxZWSP_def << '\n';
if (!usePolyglossia() && mustProvide("textgreek")) {
- // ensure LGR font encoding is defined also if fontenc is not loaded by LyX
- if (params_.main_font_encoding() == "default")
+ // ensure LGR font encoding is defined also if fontenc is not loaded by LyX
+ if (runparams().main_fontenc == "default")
macros << textgreek_LGR_def;
macros << textgreek_def << '\n';
}
if (!usePolyglossia() && mustProvide("textcyrillic")) {
// ensure T2A font encoding is set up also if fontenc is not loaded by LyX
- if (params_.main_font_encoding() == "default")
+ if (runparams().main_fontenc == "default")
macros << textcyr_T2A_def;
macros << textcyr_def << '\n';
}
if (mustProvide("NeedTabularnewline"))
macros << tabularnewline_def;
+ if (mustProvide("cellvarwidth"))
+ macros << cellvarwidth_def;
+
// greyed-out environment (note inset)
// the color is specified in the routine
// getColorOptions() to avoid LaTeX-package clashes
- if (mustProvide("lyxgreyedout")) {
- // We need different version for RTL (#8647)
- if (hasRTLLanguage()) {
- if (runparams_.flavor == Flavor::LuaTeX)
- if (useBabel())
- macros << lyxgreyedout_luartl_babel_def;
- else
- macros << lyxgreyedout_luartl_def;
- else
- macros << lyxgreyedout_rtl_def;
- } else
- macros << lyxgreyedout_def;
- }
+ if (mustProvide("lyxgreyedout"))
+ // We need different version for RTL (#8647), with change tracking (#12025)
+ // and for some specific engine/language package combinations
+ macros << lyxgreyedoutDef(hasRTLLanguage(), mustProvide("ct-xcolor-ulem"),
+ (runparams_.flavor == Flavor::LuaTeX), useBabel());
if (mustProvide("lyxdot"))
macros << lyxdot_def << '\n';
if (mustProvide("ct-xcolor-ulem")) {
streamsize const prec = macros.os().precision(2);
- RGBColor cadd = rgbFromHexName(lcolor.getX11HexName(Color_addedtext));
+ RGBColor cadd = rgbFromHexName(lcolor.getX11HexName(Color_addedtext_output));
macros << "\\providecolor{lyxadded}{rgb}{"
<< cadd.r / 255.0 << ',' << cadd.g / 255.0 << ',' << cadd.b / 255.0 << "}\n";
- RGBColor cdel = rgbFromHexName(lcolor.getX11HexName(Color_deletedtext));
+ RGBColor cdel = rgbFromHexName(lcolor.getX11HexName(Color_deletedtext_output));
macros << "\\providecolor{lyxdeleted}{rgb}{"
<< cdel.r / 255.0 << ',' << cdel.g / 255.0 << ',' << cdel.b / 255.0 << "}\n";
if (!mustProvide("ct-xcolor-ulem")) {
streamsize const prec = macros.os().precision(2);
- RGBColor cadd = rgbFromHexName(lcolor.getX11HexName(Color_addedtext));
+ RGBColor cadd = rgbFromHexName(lcolor.getX11HexName(Color_addedtext_output));
macros << "\\providecolor{lyxadded}{rgb}{"
<< cadd.r / 255.0 << ',' << cadd.g / 255.0 << ',' << cadd.b / 255.0 << "}\n";
- RGBColor cdel = rgbFromHexName(lcolor.getX11HexName(Color_deletedtext));
+ RGBColor cdel = rgbFromHexName(lcolor.getX11HexName(Color_deletedtext_output));
macros << "\\providecolor{lyxdeleted}{rgb}{"
<< cdel.r / 255.0 << ',' << cdel.g / 255.0 << ',' << cdel.b / 255.0 << "}\n";
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();
}
-docstring const LaTeXFeatures::getLyXSGMLEntities() const
-{
- // Definition of entities used in the document that are LyX related.
- odocstringstream entities;
-
- if (mustProvide("lyxarrow")) {
- entities << "<!ENTITY lyxarrow \"->\">" << '\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:"
projects / lyx.git / blobdiff