static docstring const changetracking_xcolor_ulem_def = from_ascii(
"%% Change tracking with ulem\n"
- "\\newcommand{\\lyxadded}[3]{{\\color{lyxadded}#3}}\n"
+ "\\newcommand{\\lyxadded}[3]{{\\color{lyxadded}{}#3}}\n"
"\\newcommand{\\lyxdeleted}[3]{{\\color{lyxdeleted}\\sout{#3}}}\n");
static docstring const changetracking_xcolor_ulem_hyperref_def = from_ascii(
"%% Change tracking with ulem\n"
- "\\newcommand{\\lyxadded}[3]{{\\texorpdfstring{\\color{lyxadded}}{}#3}}\n"
+ "\\newcommand{\\lyxadded}[3]{{\\texorpdfstring{\\color{lyxadded}{}}{}#3}}\n"
"\\newcommand{\\lyxdeleted}[3]{{\\texorpdfstring{\\color{lyxdeleted}\\sout{#3}}{}}}\n");
static docstring const changetracking_none_def = from_ascii(
"\\newcommand{\\lyxdeleted}[3]{}\n");
static docstring const textgreek_def = from_ascii(
- "\\DeclareRobustCommand{\\greektext}{%\n"
- " \\fontencoding{LGR}\\selectfont\\def\\encodingdefault{LGR}}\n"
+ "\\AtBeginDocument{\\DeclareRobustCommand{\\greektext}{%\n"
+ " \\fontencoding{LGR}\\selectfont\\def\\encodingdefault{LGR}%\n"
+ " \\renewcommand{\\~}{\\char126}%\n"
+ "}}\n"
"\\DeclareRobustCommand{\\textgreek}[1]{\\leavevmode{\\greektext #1}}\n"
"\\DeclareFontEncoding{LGR}{}{}\n");
{
docstring const & lname = lay.name();
DocumentClass const & tclass = params_.documentClass();
- if (!tclass.hasInsetLayout(lname)) {
- lyxerr << "LaTeXFeatures::useInsetLayout: layout `"
- << to_utf8(lname) << "' does not exist in this class"
- << endl;
+
+ // this is a default inset layout, nothing useful here
+ if (!tclass.hasInsetLayout(lname))
return;
- }
// Is this layout already in usedInsetLayouts?
if (find(usedInsetLayouts_.begin(), usedInsetLayouts_.end(), lname)
!= usedInsetLayouts_.end())
if (i != string::npos) {
string const from = name.substr(0,i);
string const to = name.substr(i+2);
- LYXERR0("from=[" << from << "] to=[" << to << "]");
+ //LYXERR0("from=[" << from << "] to=[" << to << "]");
return theConverters().isReachable(from, to);
}
// 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
+ // See http://www.lyx.org/trac/ticket/1942
if (mustProvide("wasysym") &&
(params_.use_esint != BufferParams::package_off || !isRequired("esint")))
packages << "\\usepackage{wasysym}\n";
if (mustProvide("accents"))
packages << "\\usepackage{accents}\n";
+ // mathdots must be loaded after amsmath
+ if (mustProvide("mathdots"))
+ packages << "\\usepackage{mathdots}\n";
+
+ // yhmath must be loaded after amsmath
+ if (mustProvide("yhmath"))
+ packages << "\\usepackage{yhmath}\n";
+
// [x]color and pdfcolmk are handled in getColorOptions() above
// makeidx.sty
packages << "\\PassOptionsToPackage{normalem}{ulem}\n"
"\\usepackage{ulem}\n";
+ if (mustProvide("mhchem") &&
+ params_.use_mhchem != BufferParams::package_off)
+ packages << "\\PassOptionsToPackage{version=3}{mhchem}\n"
+ "\\usepackage{mhchem}\n";
+
if (mustProvide("nomencl")) {
// Make it work with the new and old version of the package,
// but don't use the compatibility option since it is
}
+string LaTeXFeatures::getPreambleSnippets() const
+{
+ ostringstream snip;
+ SnippetList::const_iterator pit = preamble_snippets_.begin();
+ SnippetList::const_iterator pend = preamble_snippets_.end();
+ for (; pit != pend; ++pit)
+ snip << *pit << '\n';
+ return snip.str();
+}
+
+
docstring const LaTeXFeatures::getMacros() const
{
odocstringstream macros;
- if (!preamble_snippets_.empty())
+ if (!preamble_snippets_.empty()) {
macros << '\n';
- SnippetList::const_iterator pit = preamble_snippets_.begin();
- SnippetList::const_iterator pend = preamble_snippets_.end();
- for (; pit != pend; ++pit)
- macros << *pit << '\n';
+ macros << from_utf8(getPreambleSnippets());
+ }
- if (mustProvide("papersize")) {
+ if (mustProvide("papersize")) {
if (runparams_.flavor == OutputParams::LATEX)
macros << papersizedvi_def << '\n';
else