static docstring const changetracking_xcolor_ulem_base_def = from_ascii(
"%% Change tracking with ulem and xcolor: base macros\n"
- "\\DeclareRobustCommand{\\mklyxadded}[1]{\\bgroup\\color{lyxadded}{}#1\\egroup}\n"
- "\\DeclareRobustCommand{\\mklyxdeleted}[1]{\\bgroup\\color{lyxdeleted}\\mklyxsout{#1}\\egroup}\n"
+ "\\DeclareRobustCommand{\\mklyxadded}[1]{\\textcolor{lyxadded}\\bgroup#1\\egroup}\n"
+ "\\DeclareRobustCommand{\\mklyxdeleted}[1]{\\textcolor{lyxdeleted}\\bgroup\\mklyxsout{#1}\\egroup}\n"
"\\DeclareRobustCommand{\\mklyxsout}[1]{\\ifx\\\\#1\\else\\sout{#1}\\fi}\n");
static docstring const changetracking_xcolor_ulem_def = from_ascii(
static docstring const xfrac_def = from_ascii(
"\\usepackage{xfrac}\n");
+// https://tex.stackexchange.com/questions/720579/do-i-need-to-replace-declarecollectioninstance-after-recent-package-change/
static docstring const smallLetterFrac_def = from_ascii(
- "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{default}{text}\n"
+ "\\EditTemplateDefaults{xfrac}{text}\n"
" {phantom=c, scale-factor=1.0, slash-left-kern=-.05em}\n"
- "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{lmr}{text}\n"
- " {slash-symbol-font=ptm, phantom=c, scale-factor=1, slash-left-kern=-.05em}\n"
- "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{lmss}{text}\n"
- " {slash-symbol-font=ptm, phantom=c, scale-factor=1, slash-left-kern=-.05em}\n"
- "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{cmr}{text}\n"
- " {slash-symbol-font=ptm, phantom=c, scale-factor=1, slash-left-kern=-.05em}\n"
- "\\DeclareCollectionInstance{smallLetterFrac}{xfrac}{cmss}{text}\n"
- " {slash-symbol-font=ptm, phantom=c, scale-factor=1, slash-left-kern=-.05em}\n"
- "\\newcommand{\\smallLetterFrac}[2]{%\n"
- " {\\UseCollection{xfrac}{smallLetterFrac}\\sfrac{#1}{#2}}}\n");
+ "\\NewCommandCopy\\smallLetterFrac\\sfrac\n");
static docstring const lyxref_def = from_ascii(
"\\RS@ifundefined{subsecref}\n"
"}\n");
-docstring const lyxgreyedoutDef(bool const rtl, bool const ct, bool const lua, bool const babel)
+docstring const lyxgreyedoutDef(bool const ct)
{
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";
- }
+ 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();
}
}
+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)
"xskak",
"pict2e",
"drs",
- "environ",
"dsfont",
"hepparticles",
"hepnames"
<< "]{" << package << "}\n";
}
- // pdfcolmk must be loaded after color
- if (mustProvide("pdfcolmk"))
- colors << "\\usepackage{pdfcolmk}\n";
-
// the following 3 color commands must be set after color
// is loaded and before pdfpages, therefore add the command
// here define the set color
// 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
params_.use_package("undertilde") != BufferParams::package_off)
packages << "\\usepackage{undertilde}\n";
- // [x]color and pdfcolmk are handled in getColorOptions() above
+ // [x]color is handled in getColorOptions() above
// makeidx.sty
if (isRequired("makeidx") || isRequired("splitidx")) {
"\\usepackage{ulem}\n";
if (mustProvide("nomencl")) {
+ packages << "\\usepackage{nomencl}\n";
// Make it work with the new and old version of the package,
// but don't use the compatibility option since it is
// incompatible to other packages.
- packages << "\\usepackage{nomencl}\n"
- "% the following is useful when we have the old nomencl.sty package\n"
- "\\providecommand{\\printnomenclature}{\\printglossary}\n"
- "\\providecommand{\\makenomenclature}{\\makeglossary}\n"
- "\\makenomenclature\n";
+ if (!LaTeXFeatures::isAvailableAtLeastFrom("nomencl", 2005, 3, 31)) {
+ packages << "% Needed with nomencl < v4.1\n"
+ "\\providecommand{\\printnomenclature}{\\printglossary}\n"
+ "\\providecommand{\\makenomenclature}{\\makeglossary}\n";
+ }
+ packages << "\\makenomenclature\n";
}
// fixltx2e provides subscript
if (mustProvide("subscript") && !isRequired("fixltx2e")
- && !isAvailable("LaTeX-2005/12/01"))
+ && !isAvailableAtLeastFrom("LaTeX", 2005, 12))
packages << "\\usepackage{subscript}\n";
// footmisc must be loaded after setspace
// the color is specified in the routine
// getColorOptions() to avoid LaTeX-package clashes
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());
+ // We need different version with change tracking (#12025)
+ macros << lyxgreyedoutDef(mustProvide("ct-xcolor-ulem"));
if (mustProvide("lyxdot"))
macros << lyxdot_def << '\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