#include "LaTeXFonts.h"
#include "LaTeXPackages.h"
#include "Layout.h"
-#include "Lexer.h"
#include "LyXRC.h"
+#include "OutputParams.h"
#include "TextClass.h"
#include "TexRow.h"
#include "texstream.h"
#include "support/debug.h"
#include "support/docstream.h"
-#include "support/FileName.h"
+#include "support/docstring.h"
#include "support/filetools.h"
-#include "support/gettext.h"
#include "support/lstrings.h"
-#include "support/regex.h"
#include <algorithm>
+#include <regex>
using namespace std;
"{\\leavevmode\\,$\\triangleleft$\\,\\allowbreak}\n"
"{\\leavevmode\\,$\\triangleright$\\,\\allowbreak}}");
+static docstring const aastex_case_def = from_ascii(
+ "\\providecommand\\case[2]{\\mbox{$\\frac{#1}{#2}$}}%");
+// Copied from https://github.com/AASJournals/AASTeX60/blob/master/cls/aastex63.cls#L1645
+// Adapted to providecommand for compatibility reasons.
+
// ZERO WIDTH SPACE (ZWSP) is actually not a space character
// but marks a line break opportunity. Several commands provide a
// line break opportunity. They differ in side-effects:
} // namespace
-void LaTeXFeatures::addPreambleSnippet(TexString ts, bool allow_dupes)
+void LaTeXFeatures::addPreambleSnippet(TexString snippet, bool allow_dupes)
{
- addSnippet(preamble_snippets_, move(ts), allow_dupes);
+ addSnippet(preamble_snippets_, move(snippet), allow_dupes);
}
-void LaTeXFeatures::addPreambleSnippet(docstring const & str, bool allow_dupes)
+void LaTeXFeatures::addPreambleSnippet(docstring const & snippet, bool allow_dupes)
{
- addSnippet(preamble_snippets_, TexString(str), allow_dupes);
+ addSnippet(preamble_snippets_, TexString(snippet), allow_dupes);
}
require("float");
if (!fl.required().empty()) {
vector<string> reqs = getVectorFromString(fl.required());
- for (auto const req : reqs)
+ for (auto const & req : reqs)
require(req);
}
}
if (params_.language->polyglossia().empty())
return false;
// now the secondary languages
- LanguageList::const_iterator const begin = UsedLanguages_.begin();
- for (LanguageList::const_iterator cit = begin;
- cit != UsedLanguages_.end();
- ++cit) {
- if ((*cit)->polyglossia().empty())
+ for (auto const & lang : UsedLanguages_)
+ {
+ if (lang->polyglossia().empty())
return false;
}
return true;
if (params_.language->isPolyglossiaExclusive())
return true;
// now the secondary languages
- LanguageList::const_iterator const begin = UsedLanguages_.begin();
- for (LanguageList::const_iterator cit = begin;
- cit != UsedLanguages_.end();
- ++cit) {
- if ((*cit)->isPolyglossiaExclusive())
+ for (auto const & lang : UsedLanguages_)
+ {
+ if (lang->isPolyglossiaExclusive())
return true;
}
return false;
if (params_.language->isPolyglossiaExclusive())
result.push_back(params_.language->display());
// now the secondary languages
- LanguageList::const_iterator const begin = UsedLanguages_.begin();
- for (LanguageList::const_iterator cit = begin;
- cit != UsedLanguages_.end();
- ++cit) {
- if ((*cit)->isPolyglossiaExclusive())
- result.push_back((*cit)->display());
+ for (auto const & lang : UsedLanguages_)
+ {
+ if (lang->isPolyglossiaExclusive())
+ result.push_back(lang->display());
}
return result;
}
if (params_.language->isBabelExclusive())
result.push_back(params_.language->display());
// now the secondary languages
- LanguageList::const_iterator const begin = UsedLanguages_.begin();
- for (LanguageList::const_iterator cit = begin;
- cit != UsedLanguages_.end();
- ++cit) {
- if ((*cit)->isBabelExclusive())
- result.push_back((*cit)->display());
+ for (auto const & lang : UsedLanguages_)
+ {
+ if (lang->isBabelExclusive())
+ result.push_back(lang->display());
}
return result;
}
string LaTeXFeatures::getBabelLanguages() const
{
- ostringstream langs;
-
- bool first = true;
- LanguageList::const_iterator const begin = UsedLanguages_.begin();
- for (LanguageList::const_iterator cit = begin;
- cit != UsedLanguages_.end();
- ++cit) {
- if ((*cit)->babel().empty())
- continue;
- if (!first)
- langs << ',';
- else
- first = false;
- langs << (*cit)->babel();
+ vector<string> blangs;
+ for (auto const & lang : UsedLanguages_) {
+ if (!lang->babel().empty())
+ blangs.push_back(lang->babel());
}
- return langs.str();
+
+ // Sort alphabetically to assure consistent order
+ // (the order itself does not matter apart from
+ // some exceptions, e.g. hebrew must come after
+ // arabic and farsi)
+ sort(blangs.begin(), blangs.end());
+
+ return getStringFromVector(blangs);
}
{
set<string> langs;
- LanguageList::const_iterator const begin = UsedLanguages_.begin();
- for (LanguageList::const_iterator cit = begin;
- cit != UsedLanguages_.end();
- ++cit) {
+ for (auto const & lang : UsedLanguages_)
// We do not need the variants here
- langs.insert((*cit)->polyglossia());
- }
+ langs.insert(lang->polyglossia());
return langs;
}
// first the main language
res += params_.language->activeChars();
// now the secondary languages
- LanguageList::const_iterator const begin = UsedLanguages_.begin();
- for (LanguageList::const_iterator cit = begin;
- cit != UsedLanguages_.end(); ++cit)
- res += ((*cit)->activeChars());
+ for (auto const & lang : UsedLanguages_)
+ res += (lang->activeChars());
return res;
}
encs.insert(encs.begin(), "T2A");
}
- for (auto const & lang : UsedLanguages_) {
+ for (auto const & lang : UsedLanguages_)
+ {
vector<string> extraencs =
getVectorFromString(lang->fontenc(buffer().masterParams()));
for (auto const & extra : extraencs) {
"todonotes",
"forest",
"varwidth",
- "tablefootnote",
"afterpage",
"tabularx",
"tikz",
"xskak",
"pict2e",
"drs",
- "environ"
+ "environ",
+ "dsfont"
};
char const * bibliofeatures[] = {
"named"
};
-int const nb_bibliofeatures = sizeof(bibliofeatures) / sizeof(char const *);
-
-int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
-
} // namespace
{
ostringstream packageopts;
// Output all the package option stuff we have been asked to do.
- map<string, string>::const_iterator it =
- params_.documentClass().packageOptions().begin();
- map<string, string>::const_iterator en =
- params_.documentClass().packageOptions().end();
- for (; it != en; ++it)
- if (mustProvide(it->first))
- packageopts << "\\PassOptionsToPackage{" << it->second << "}"
- << "{" << it->first << "}\n";
+ for (auto const & p : params_.documentClass().packageOptions())
+ if (mustProvide(p.first))
+ packageopts << "\\PassOptionsToPackage{" << p.second << "}"
+ << "{" << p.first << "}\n";
return packageopts.str();
}
// These are all the 'simple' includes. i.e
// packages which we just \usepackage{package}
- for (int i = 0; i < nb_simplefeatures; ++i) {
- if (mustProvide(simplefeatures[i]))
- packages << "\\usepackage{" << simplefeatures[i] << "}\n";
+ for (char const * feature : simplefeatures) {
+ if (mustProvide(feature))
+ packages << "\\usepackage{" << feature << "}\n";
}
// The rest of these packages are somewhat more complicated
if (mustProvide("changebar")) {
packages << "\\usepackage";
- if (runparams_.flavor == OutputParams::LATEX
- || runparams_.flavor == OutputParams::DVILUATEX)
+ if (runparams_.flavor == Flavor::LaTeX
+ || runparams_.flavor == Flavor::DviLuaTeX)
packages << "[dvips]";
packages << "{changebar}\n";
}
// [pdf]lscape is used to rotate longtables
if (mustProvide("lscape")) {
- if (runparams_.flavor == OutputParams::LATEX
- || runparams_.flavor == OutputParams::DVILUATEX)
+ if (runparams_.flavor == Flavor::LaTeX
+ || runparams_.flavor == Flavor::DviLuaTeX)
packages << "\\usepackage{lscape}\n";
else
packages << "\\usepackage{pdflscape}\n";
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"))
packages << "\\usepackage{esint}\n";
// Known bibliography packages (simple \usepackage{package})
- for (int i = 0; i < nb_bibliofeatures; ++i) {
- if (mustProvide(bibliofeatures[i]))
- packages << "\\usepackage{"
- << bibliofeatures[i] << "}\n";
+ for (char const * feature : bibliofeatures) {
+ if (mustProvide(feature))
+ packages << "\\usepackage{" << feature << "}\n";
}
// Compatibility between achicago and natbib
macros << "\\XeTeXdashbreakstate 0" << '\n';
if (mustProvide("papersize")) {
- if (runparams_.flavor == OutputParams::LATEX
- || runparams_.flavor == OutputParams::DVILUATEX)
+ if (runparams_.flavor == Flavor::LaTeX
+ || runparams_.flavor == Flavor::DviLuaTeX)
macros << papersizedvi_def << '\n';
- else if (runparams_.flavor == OutputParams::LUATEX)
+ else if (runparams_.flavor == Flavor::LuaTeX)
macros << papersizepdflua_def << '\n';
else
macros << papersizepdf_def << '\n';
if (mustProvide("lyxarrow"))
macros << lyxarrow_def << '\n';
+ if (mustProvide("aastex_case"))
+ macros << aastex_case_def << '\n';
+
if (mustProvide("lyxzerowidthspace"))
macros << lyxZWSP_def << '\n';
if (mustProvide("textquotedbl"))
macros << textquotedbl_def << '\n';
if (mustProvide("textquotesinglep")) {
- if (runparams_.flavor == OutputParams::XETEX)
+ if (runparams_.flavor == Flavor::XeTeX)
macros << textquotesinglep_xetex_def << '\n';
else
macros << textquotesinglep_luatex_def << '\n';
}
if (mustProvide("textquotedblp")) {
- if (runparams_.flavor == OutputParams::XETEX)
+ if (runparams_.flavor == Flavor::XeTeX)
macros << textquotedblp_xetex_def << '\n';
else
macros << textquotedblp_luatex_def << '\n';
if (mustProvide("lyxgreyedout")) {
// We need different version for RTL (#8647)
if (hasRTLLanguage()) {
- if (runparams_.flavor == OutputParams::LUATEX)
+ if (runparams_.flavor == Flavor::LuaTeX)
if (useBabel())
macros << lyxgreyedout_luartl_babel_def;
else
if (mustProvide("ct-xcolor-ulem")) {
streamsize const prec = macros.os().precision(2);
- RGBColor cadd = rgbFromHexName(lcolor.getX11Name(Color_addedtext));
+ RGBColor cadd = rgbFromHexName(lcolor.getX11HexName(Color_addedtext));
macros << "\\providecolor{lyxadded}{rgb}{"
<< cadd.r / 255.0 << ',' << cadd.g / 255.0 << ',' << cadd.b / 255.0 << "}\n";
- RGBColor cdel = rgbFromHexName(lcolor.getX11Name(Color_deletedtext));
+ RGBColor cdel = rgbFromHexName(lcolor.getX11HexName(Color_deletedtext));
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.getX11Name(Color_addedtext));
+ RGBColor cadd = rgbFromHexName(lcolor.getX11HexName(Color_addedtext));
macros << "\\providecolor{lyxadded}{rgb}{"
<< cadd.r / 255.0 << ',' << cadd.g / 255.0 << ',' << cadd.b / 255.0 << "}\n";
- RGBColor cdel = rgbFromHexName(lcolor.getX11Name(Color_deletedtext));
+ RGBColor cdel = rgbFromHexName(lcolor.getX11HexName(Color_deletedtext));
macros << "\\providecolor{lyxdeleted}{rgb}{"
<< cdel.r / 255.0 << ',' << cdel.g / 255.0 << ',' << cdel.b / 255.0 << "}\n";
{
odocstringstream tmp;
- for (Language const * lang : UsedLanguages_)
+ for (auto const & lang : UsedLanguages_)
if (!lang->babel_presettings().empty())
tmp << lang->babel_presettings() << '\n';
if (!params_.language->babel_presettings().empty())
{
odocstringstream tmp;
- for (Language const * lang : UsedLanguages_)
+ for (auto const & lang : UsedLanguages_)
if (!lang->babel_postsettings().empty())
tmp << lang->babel_postsettings() << '\n';
if (!params_.language->babel_postsettings().empty())
{
// Check whether name can be encoded in the buffer encoding
bool encodable = true;
- for (size_t i = 0; i < name.size(); ++i) {
- if (!enc.encodable(name[i])) {
+ for (char_type c : name) {
+ if (!enc.encodable(c)) {
encodable = false;
break;
}
// \newfloat{algorithm}{htbp}{loa}
// \providecommand{\algorithmname}{Algorithm}
// \floatname{algorithm}{\protect\algorithmname}
- UsedFloats::const_iterator cit = usedFloats_.begin();
- UsedFloats::const_iterator end = usedFloats_.end();
- for (; cit != end; ++cit) {
- Floating const & fl = floats.getType(cit->first);
+ for (auto const & cit : usedFloats_) {
+ Floating const & fl = floats.getType(cit.first);
// For builtin floats we do nothing.
if (fl.isPredefined())
// used several times, when the same style is still in
// effect. (Lgb)
}
- if (cit->second)
+ if (cit.second)
// The subfig package is loaded later
os << "\n\\AtBeginDocument{\\newsubfloat{" << from_ascii(fl.floattype()) << "}}\n";
}
{
for (Features::iterator it = features_.begin(); it != features_.end();) {
if (contains(*it, ',')) {
- vector<string> const multiples = getVectorFromString(*it, ",");
- vector<string>::const_iterator const end = multiples.end();
- vector<string>::const_iterator itm = multiples.begin();
// Do nothing if any multiple is already required
- for (; itm != end; ++itm) {
- if (!isRequired(*itm))
- require(*itm);
+ for (string const & pkg : getVectorFromString(*it, ",")) {
+ if (!isRequired(pkg))
+ require(pkg);
}
features_.erase(it);
it = features_.begin();
projects / lyx.git / blobdiff