#include "support/gettext.h"
#include "support/lstrings.h"
+#include <algorithm>
+
+
using namespace std;
using namespace lyx::support;
static docstring const lyx_def = from_ascii(
"\\providecommand{\\LyX}{L\\kern-.1667em\\lower.25em\\hbox{Y}\\kern-.125emX\\@}");
-static docstring const lyxline_def = from_ascii(
- "\\newcommand{\\lyxline}[1][1pt]{%\n"
- " \\par\\noindent%\n"
- " \\rule[.5ex]{\\linewidth}{#1}\\par}");
-
static docstring const noun_def = from_ascii(
"\\newcommand{\\noun}[1]{\\textsc{#1}}");
"\\newcommand{\\lyxdeleted}[3]{}\n");
static docstring const textgreek_def = from_ascii(
- "\\providecommand*{\\perispomeni}{\\char126}\n"
- "\\AtBeginDocument{\\DeclareRobustCommand{\\greektext}{%\n"
- " \\fontencoding{LGR}\\selectfont\\def\\encodingdefault{LGR}%\n"
- " \\renewcommand{\\~}{\\perispomeni}%\n"
- "}}\n"
+ "\\DeclareRobustCommand{\\greektext}{%\n"
+ " \\fontencoding{LGR}\\selectfont\\def\\encodingdefault{LGR}}\n"
"\\DeclareRobustCommand{\\textgreek}[1]{\\leavevmode{\\greektext #1}}\n"
- "\\DeclareFontEncoding{LGR}{}{}\n");
+ "\\DeclareFontEncoding{LGR}{}{}\n"
+ "\\DeclareTextSymbol{\\~}{LGR}{126}");
static docstring const textcyr_def = from_ascii(
"\\DeclareRobustCommand{\\cyrtext}{%\n"
" \\mathchar\"0\\hexnumber@\\symtipasymb0C}{#2}}\n"
"\\newcommand{\\ogonek}[1]{\\mathpalette\\doogonek{#1}}\n");
+static docstring const lyxref_def = from_ascii(
+ "\\RS@ifundefined{subref}\n"
+ " {\\def\\RSsubtxt{section~}\\newref{sub}{name = \\RSsubtxt}}\n"
+ " {}\n"
+ "\\RS@ifundefined{thmref}\n"
+ " {\\def\\RSthmtxt{theorem~}\\newref{thm}{name = \\RSthmtxt}}\n"
+ " {}\n"
+ "\\RS@ifundefined{lemref}\n"
+ " {\\def\\RSlemtxt{lemma~}\\newref{lem}{name = \\RSlemtxt}}\n"
+ " {}\n");
+
+
/////////////////////////////////////////////////////////////////////
//
// LaTeXFeatures
bool LaTeXFeatures::useBabel() const
{
- return lyxrc.language_use_babel ||
- (bufferParams().language->lang() != lyxrc.default_language &&
+ return (lyxrc.language_package_selection != LyXRC::LP_NONE) &&
+ ((bufferParams().language->lang() != lyxrc.default_language &&
!bufferParams().language->babel().empty()) ||
- this->hasLanguages();
+ this->hasLanguages());
}
// subfig is handled in BufferParams.cpp
"varioref",
"prettyref",
+ "refstyle",
/*For a successful cooperation of the `wrapfig' package with the
`float' package you should load the `wrapfig' package *after*
the `float' package. See the caption package documentation
"framed",
"soul",
"textcomp",
+ "subscript",
"pmboxdraw",
"bbding",
"ifsym",
"pdfpages",
"amscd",
"slashed",
- "multirow"
+ "multirow",
+ "tfrupee"
};
int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
// FIXME: currently, we can only load packages and macros known
// to LyX.
// However, with the Require tag of layouts/custom insets,
- // also inknown packages can be requested. They are silently
+ // also unknown packages can be requested. They are silently
// swallowed now. We should change this eventually.
//
packages << "\\usepackage{accents}\n";
// mathdots must be loaded after amsmath
- if (mustProvide("mathdots"))
+ if (mustProvide("mathdots") &&
+ params_.use_mathdots != BufferParams::package_off)
packages << "\\usepackage{mathdots}\n";
// yhmath must be loaded after amsmath
if (mustProvide("xy"))
packages << "\\usepackage[all]{xy}\n";
+ if (mustProvide("feyn"))
+ packages << "\\usepackage{feyn}\n"; //Diagram
+
if (mustProvide("ulem"))
packages << "\\PassOptionsToPackage{normalem}{ulem}\n"
"\\usepackage{ulem}\n";
- if (mustProvide("mhchem") &&
- params_.use_mhchem != BufferParams::package_off)
+ if (params_.use_mhchem == BufferParams::package_on ||
+ (mustProvide("mhchem") &&
+ params_.use_mhchem != BufferParams::package_off))
packages << "\\PassOptionsToPackage{version=3}{mhchem}\n"
"\\usepackage{mhchem}\n";
if (mustProvide("LyX"))
macros << lyx_def << '\n';
- if (mustProvide("lyxline"))
- macros << lyxline_def << '\n';
-
if (mustProvide("noun"))
macros << noun_def << '\n';
// floats
getFloatDefinitions(macros);
-
+
+ if (mustProvide("refstyle"))
+ macros << lyxref_def << '\n';
+
// change tracking
if (mustProvide("ct-dvipost"))
macros << changetracking_dvipost_def;
-
+
if (mustProvide("ct-xcolor-ulem")) {
- int const prec = macros.precision(2);
+ streamsize const prec = macros.precision(2);
RGBColor cadd = rgbFromHexName(lcolor.getX11Name(Color_addedtext));
macros << "\\providecolor{lyxadded}{rgb}{"
}
-string const LaTeXFeatures::getBabelOptions() const
+string const LaTeXFeatures::getBabelPresettings() const
{
ostringstream tmp;
LanguageList::const_iterator it = UsedLanguages_.begin();
- LanguageList::const_iterator end = UsedLanguages_.end();
+ LanguageList::const_iterator end = UsedLanguages_.end();
for (; it != end; ++it)
- if (!(*it)->latex_options().empty())
- tmp << (*it)->latex_options() << '\n';
- if (!params_.language->latex_options().empty())
- tmp << params_.language->latex_options() << '\n';
+ if (!(*it)->babel_presettings().empty())
+ tmp << (*it)->babel_presettings() << '\n';
+ if (!params_.language->babel_presettings().empty())
+ tmp << params_.language->babel_presettings() << '\n';
return tmp.str();
}
+string const LaTeXFeatures::getBabelPostsettings() const
+{
+ ostringstream tmp;
+
+ LanguageList::const_iterator it = UsedLanguages_.begin();
+ LanguageList::const_iterator end = UsedLanguages_.end();
+ for (; it != end; ++it)
+ if (!(*it)->babel_postsettings().empty())
+ tmp << (*it)->babel_postsettings() << '\n';
+ if (!params_.language->babel_postsettings().empty())
+ tmp << params_.language->babel_postsettings() << '\n';
+
+ return tmp.str();
+}
+
+
+bool LaTeXFeatures::needBabelLangOptions() const
+{
+ if (!lyxrc.language_global_options || params_.language->asBabelOptions())
+ return true;
+
+ LanguageList::const_iterator it = UsedLanguages_.begin();
+ LanguageList::const_iterator end = UsedLanguages_.end();
+ for (; it != end; ++it)
+ if ((*it)->asBabelOptions())
+ return true;
+
+ return false;
+}
+
+
docstring const LaTeXFeatures::getTClassPreamble() const
{
// the text class specific preamble
fi != end; ++fi)
// FIXME UNICODE
sgmlpreamble << "\n<!ENTITY " << fi->first
- << (isSGMLFilename(fi->second) ? " SYSTEM \"" : " \"")
+ << (isSGMLFileName(fi->second) ? " SYSTEM \"" : " \"")
<< makeRelPath(from_utf8(fi->second), basename) << "\">";
return sgmlpreamble.str();
projects / lyx.git / blobdiff