"%% A simple dot to overcome graphicx limitations\n"
"\\newcommand{\\lyxdot}{.}\n";
+static string const changetracking_dvipost_def =
+ "%% Change tracking with dvipost\n"
+ "\\dvipostlayout\n"
+ "\\dvipost{osstart color push Red}\n"
+ "\\dvipost{osend color pop}\n"
+ "\\dvipost{cbstart color push Blue}\n"
+ "\\dvipost{cbend color pop}\n"
+ "\\newcommand{\\lyxadded}[3]{\\changestart#3\\changeend}\n"
+ "\\newcommand{\\lyxdeleted}[3]{%\n"
+ "\\changestart\\overstrikeon#3\\overstrikeoff\\changeend}\n";
+
+static string const changetracking_none_def =
+ "\\newcommand{\\lyxadded}[3]{#3}\n"
+ "\\newcommand{\\lyxdeleted}[3]{}\n";
/////////////////////////////////////////////////////////////////////
bool LaTeXFeatures::useBabel() const
{
return lyxrc.language_use_babel ||
- bufferParams().language->lang() != lyxrc.default_language ||
+ (bufferParams().language->lang() != lyxrc.default_language &&
+ !bufferParams().language->babel().empty()) ||
this->hasLanguages();
}
}
-void LaTeXFeatures::useLayout(string const & layoutname)
+void LaTeXFeatures::useLayout(docstring const & layoutname)
{
// Some code to avoid loops in dependency definition
static int level = 0;
if (level > maxlevel) {
lyxerr << "LaTeXFeatures::useLayout: maximum level of "
<< "recursion attained by layout "
- << layoutname << endl;
+ << to_utf8(layoutname) << endl;
return;
}
TextClass const & tclass = params_.getTextClass();
if (tclass.hasLayout(layoutname)) {
// Is this layout already in usedLayouts?
- list<string>::const_iterator cit = usedLayouts_.begin();
- list<string>::const_iterator end = usedLayouts_.end();
+ list<docstring>::const_iterator cit = usedLayouts_.begin();
+ list<docstring>::const_iterator end = usedLayouts_.end();
for (; cit != end; ++cit) {
if (layoutname == *cit)
return;
usedLayouts_.push_back(layoutname);
} else {
lyxerr << "LaTeXFeatures::useLayout: layout `"
- << layoutname << "' does not exist in this class"
+ << to_utf8(layoutname) << "' does not exist in this class"
<< endl;
}
void LaTeXFeatures::useLanguage(Language const * lang)
{
- UsedLanguages_.insert(lang);
+ if (!lang->babel().empty())
+ UsedLanguages_.insert(lang);
}
{
ostringstream languages;
- for (LanguageList::const_iterator cit =
- UsedLanguages_.begin();
+ LanguageList::const_iterator const begin = UsedLanguages_.begin();
+ for (LanguageList::const_iterator cit = begin;
cit != UsedLanguages_.end();
- ++cit)
- languages << (*cit)->babel() << ',';
+ ++cit) {
+ if (cit != begin)
+ languages << ',';
+ languages << (*cit)->babel();
+ }
return languages.str();
}
set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding) const
{
+ // This does only find encodings of languages supported by babel, but
+ // that does not matter since we don't have a language with an
+ // encoding supported by inputenc but without babel support.
set<string> encodings;
LanguageList::const_iterator it = UsedLanguages_.begin();
LanguageList::const_iterator end = UsedLanguages_.end();
for (; it != end; ++it)
- // thailatex does not use the inputenc package, but sets up
- // babel directly for tis620-0 encoding, therefore we must
- // not add tis620-0 to the encoding set.
if ((*it)->encoding()->latexName() != doc_encoding &&
- (*it)->encoding()->name() != "tis620-0")
+ (*it)->encoding()->package() == Encoding::inputenc)
encodings.insert((*it)->encoding()->latexName());
return encodings;
}
namespace {
char const * simplefeatures[] = {
+// note that the package order here will be the same in the LaTeX-output
"array",
"verbatim",
"longtable",
"nicefrac",
"tipa",
"framed",
+ "pdfcolmk",
+ "soul",
"textcomp",
+ "xcolor",
+ "pmboxdraw",
+ "bbding",
+ "ifsym",
+ "marvosym",
+ "txfonts",
+ "mathrsfs",
+ "ascii",
};
int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
// than those above.
//
- if (mustProvide("amsmath")
- && params_.use_amsmath != BufferParams::package_off) {
+ // esint is preferred for esintoramsmath
+ if ((mustProvide("amsmath") &&
+ params_.use_amsmath != BufferParams::package_off) ||
+ (mustProvide("esintoramsmath") &&
+ params_.use_esint == BufferParams::package_off)) {
packages << "\\usepackage{amsmath}\n";
}
// are used
// wasysym redefines some integrals (e.g. iint) from amsmath. That
// leads to inconsistent integrals. We only load this package if
- // esint is used, since esint redefines all relevant integral
- // symbols from wasysym and amsmath.
+ // the document does not contain integrals (then isRequired("esint")
+ // is false) or if esint is used, since esint redefines all relevant
+ // integral symbols from wasysym and amsmath.
// See http://bugzilla.lyx.org/show_bug.cgi?id=1942
- if (mustProvide("wasysym") && isRequired("esint") &&
- params_.use_esint != BufferParams::package_off)
+ if (mustProvide("wasysym") &&
+ (params_.use_esint != BufferParams::package_off || !isRequired("esint")))
packages << "\\usepackage{wasysym}\n";
// color.sty
<< "]{graphicx}\n";
}
// shadecolor for shaded
- if (mustProvide("framed")) {
+ if (mustProvide("framed") && mustProvide("color")) {
RGBColor c = RGBColor(lcolor.getX11Name(Color::shadedbg));
- packages << "\\definecolor{shadecolor}{rgb}{"
- << c.r/255 << ',' << c.g/255 << ',' << c.b/255 << "}\n";
+ //255.0 to force conversion to double
+ //NOTE As Jürgen Spitzmüller pointed out, an alternative would be
+ //to use the xcolor package instead, and then we can do
+ // \define{shadcolor}{RGB}...
+ //and not do any conversion. We'd then need to require xcolor
+ //in InsetNote::validate().
+ int const stmSize = packages.precision(2);
+ packages << "\\definecolor{shadecolor}{rgb}{"
+ << c.r / 255.0 << ',' << c.g / 255.0 << ',' << c.b / 255.0 << "}\n";
+ packages.precision(stmSize);
}
// lyxskak.sty --- newer chess support based on skak.sty
}
// amssymb.sty
- if (mustProvide("amssymb")
+ if (mustProvide("amssymb")
|| params_.use_amsmath == BufferParams::package_on)
packages << "\\usepackage{amssymb}\n";
// esint must be after amsmath and wasysym, since it will redeclare
// inconsistent integral symbols
- if (mustProvide("esint")
- && params_.use_esint != BufferParams::package_off)
+ if ((mustProvide("esint") || mustProvide("esintoramsmath")) &&
+ params_.use_esint != BufferParams::package_off)
packages << "\\usepackage{esint}\n";
// url.sty
// 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";
+ "% the following is useful when we have the old nomencl.sty package\n"
+ "\\providecommand{\\printnomenclature}{\\printglossary}\n"
+ "\\providecommand{\\makenomenclature}{\\makeglossary}\n"
+ "\\makenomenclature\n";
}
-
+
+ if (mustProvide("listings"))
+ packages << "\\usepackage{listings}\n";
+
return packages.str();
}
// floats
getFloatDefinitions(macros);
+ // change tracking
+ if (mustProvide("ct-dvipost")) {
+ macros << changetracking_dvipost_def;
+ }
+ if (mustProvide("ct-xcolor-soul")) {
+ int const prec = macros.precision(2);
+
+ RGBColor cadd = RGBColor(lcolor.getX11Name(Color::addedtext));
+ macros << "\\providecolor{lyxadded}{rgb}{"
+ << cadd.r / 255.0 << ',' << cadd.g / 255.0 << ',' << cadd.b / 255.0 << "}\n";
+
+ RGBColor cdel = RGBColor(lcolor.getX11Name(Color::deletedtext));
+ macros << "\\providecolor{lyxdeleted}{rgb}{"
+ << cdel.r / 255.0 << ',' << cdel.g / 255.0 << ',' << cdel.b / 255.0 << "}\n";
+
+ macros.precision(prec);
+
+ macros << "\\newcommand{\\lyxadded}[3]{{\\color{lyxadded}#3}}\n"
+ << "\\newcommand{\\lyxdeleted}[3]{{\\color{lyxdeleted}\\st{#3}}}\n";
+ }
+ if (mustProvide("ct-none")) {
+ macros << changetracking_none_def;
+ }
+
return macros.str();
}
tcpreamble << tclass.preamble();
- list<string>::const_iterator cit = usedLayouts_.begin();
- list<string>::const_iterator end = usedLayouts_.end();
+ list<docstring>::const_iterator cit = usedLayouts_.begin();
+ list<docstring>::const_iterator end = usedLayouts_.end();
for (; cit != end; ++cit) {
tcpreamble << tclass[*cit]->preamble();
}
projects / lyx.git / blobdiff