#include "Floating.h"
#include "FloatList.h"
#include "Language.h"
+#include "LaTeXPackages.h"
#include "Layout.h"
#include "Lexer.h"
#include "LyXRC.h"
#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 lyx_hyperref_def = from_ascii(
+ "\\providecommand{\\LyX}{\\texorpdfstring%\n"
+ " {L\\kern-.1667em\\lower.25em\\hbox{Y}\\kern-.125emX\\@}\n"
+ " {LyX}}");
static docstring const noun_def = from_ascii(
"\\newcommand{\\noun}[1]{\\textsc{#1}}");
static docstring const tabularnewline_def = from_ascii(
"%% Because html converters don't know tabularnewline\n"
"\\providecommand{\\tabularnewline}{\\\\}\n");
-
+
static docstring const lyxgreyedout_def = from_ascii(
"%% The greyedout annotation environment\n"
- "\\newenvironment{lyxgreyedout}{\\textcolor[gray]{0.8}\\bgroup}{\\egroup}\n");
+ "\\newenvironment{lyxgreyedout}\n"
+ " {\\textcolor{note_fontcolor}\\bgroup\\ignorespaces}\n"
+ " {\\ignorespacesafterend\\egroup}\n");
// We want to omit the file extension for includegraphics, but this does not
// work when the filename contains other dots.
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(
- "\\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
//
/////////////////////////////////////////////////////////////////////
-LaTeXFeatures::Packages LaTeXFeatures::packages_;
-
LaTeXFeatures::LaTeXFeatures(Buffer const & b, BufferParams const & p,
OutputParams const & r)
bool LaTeXFeatures::useBabel() const
{
- return lyxrc.language_use_babel ||
- (bufferParams().language->lang() != lyxrc.default_language &&
- !bufferParams().language->babel().empty()) ||
- this->hasLanguages();
+ if (usePolyglossia())
+ return false;
+ if (bufferParams().lang_package == "default")
+ return (lyxrc.language_package_selection != LyXRC::LP_NONE)
+ || (bufferParams().language->lang() != lyxrc.default_language
+ && !bufferParams().language->babel().empty())
+ || this->hasLanguages();
+ return (bufferParams().lang_package != "none")
+ || (bufferParams().language->lang() != lyxrc.default_language
+ && !bufferParams().language->babel().empty())
+ || this->hasLanguages();
}
-void LaTeXFeatures::require(string const & name)
+bool LaTeXFeatures::usePolyglossia() const
{
- features_.insert(name);
+ if (bufferParams().lang_package == "default")
+ return (lyxrc.language_package_selection == LyXRC::LP_AUTO)
+ && isRequired("polyglossia")
+ && isAvailable("polyglossia")
+ && !params_.documentClass().provides("babel")
+ && this->hasPolyglossiaLanguages();
+ return (bufferParams().lang_package == "auto")
+ && isRequired("polyglossia")
+ && isAvailable("polyglossia")
+ && !params_.documentClass().provides("babel")
+ && this->hasPolyglossiaLanguages();
}
-void LaTeXFeatures::require(set<string> const & names)
+void LaTeXFeatures::require(string const & name)
{
- features_.insert(names.begin(), names.end());
+ features_.insert(name);
}
-void LaTeXFeatures::getAvailable()
+void LaTeXFeatures::require(set<string> const & names)
{
- Lexer lex;
- support::FileName const real_file = libFileSearch("", "packages.lst");
-
- if (real_file.empty())
- return;
-
- lex.setFile(real_file);
-
- if (!lex.isOK())
- return;
-
- // Make sure that we are clean
- packages_.clear();
-
- bool finished = false;
- // Parse config-file
- while (lex.isOK() && !finished) {
- switch (lex.lex()) {
- case Lexer::LEX_FEOF:
- finished = true;
- break;
- default:
- packages_.insert(lex.getString());
- }
- }
+ features_.insert(names.begin(), names.end());
}
DocumentClass const & tclass = params_.documentClass();
if (tclass.hasLayout(layoutname)) {
// Is this layout already in usedLayouts?
- if (find(usedLayouts_.begin(), usedLayouts_.end(), layoutname)
+ if (find(usedLayouts_.begin(), usedLayouts_.end(), layoutname)
!= usedLayouts_.end())
return;
{
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)
+ if (find(usedInsetLayouts_.begin(), usedInsetLayouts_.end(), lname)
!= usedInsetLayouts_.end())
return;
//LYXERR0("from=[" << from << "] to=[" << to << "]");
return theConverters().isReachable(from, to);
}
-
- if (packages_.empty())
- getAvailable();
- string n = name;
- if (suffixIs(n, ".sty"))
- n.erase(name.length() - 4);
- return packages_.find(n) != packages_.end();
+ return LaTeXPackages::isAvailable(name);
}
}
+void LaTeXFeatures::addCSSSnippet(std::string const & snippet)
+{
+ SnippetList::const_iterator begin = css_snippets_.begin();
+ SnippetList::const_iterator end = css_snippets_.end();
+ if (find(begin, end, snippet) == end)
+ css_snippets_.push_back(snippet);
+}
+
+
void LaTeXFeatures::useFloat(string const & name, bool subfloat)
{
if (!usedFloats_[name])
// use the "H" modifier. This includes modified table and
// figure floats. (Lgb)
Floating const & fl = params_.documentClass().floats().getType(name);
- if (!fl.type().empty() && !fl.builtin()) {
+ if (!fl.floattype().empty() && fl.usesFloatPkg()) {
require("float");
}
}
}
+bool LaTeXFeatures::hasPolyglossiaLanguages() const
+{
+ LanguageList::const_iterator const begin = UsedLanguages_.begin();
+ for (LanguageList::const_iterator cit = begin;
+ cit != UsedLanguages_.end();
+ ++cit) {
+ if ((*cit)->polyglossia().empty())
+ return false;
+ }
+ return true;
+}
+
+
string LaTeXFeatures::getLanguages() const
{
ostringstream languages;
}
+std::map<std::string, std::string> LaTeXFeatures::getPolyglossiaLanguages() const
+{
+ std::map<std::string, std::string> languages;
+
+ LanguageList::const_iterator const begin = UsedLanguages_.begin();
+ for (LanguageList::const_iterator cit = begin;
+ cit != UsedLanguages_.end();
+ ++cit) {
+ languages[(*cit)->polyglossia()] = (*cit)->polyglossiaOpts();
+ }
+ return languages;
+}
+
+
set<string> LaTeXFeatures::getEncodingSet(string const & doc_encoding) const
{
// This does only find encodings of languages supported by babel, but
// 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
"ifsym",
"marvosym",
"txfonts",
+ "pxfonts",
+ "mathdesign",
"mathrsfs",
+ "mathabx",
"ascii",
"url",
"covington",
"csquotes",
"enumitem",
"endnotes",
+ "hhline",
"ifthen",
- "amsthm",
// listings is handled in BufferParams.cpp
"bm",
"pdfpages",
"amscd",
- "slashed"
+ "slashed",
+ "multirow",
+ "tfrupee"
};
int const nb_simplefeatures = sizeof(simplefeatures) / sizeof(char const *);
if (mustProvide("color") || mustProvide("xcolor")) {
string const package =
(mustProvide("xcolor") ? "xcolor" : "color");
- if (params_.graphicsDriver == "default"
- || params_.graphicsDriver == "none")
+ if (params_.graphics_driver == "default"
+ || params_.graphics_driver == "none")
colors << "\\usepackage{" << package << "}\n";
else
colors << "\\usepackage["
- << params_.graphicsDriver
+ << params_.graphics_driver
<< "]{" << package << "}\n";
}
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
if (mustProvide("pagecolor")) {
- // the \pagecolor command must be set after color is loaded and
- // before pdfpages, therefore add the command here
- // define the set color
colors << "\\definecolor{page_backgroundcolor}{rgb}{";
colors << outputLaTeXColor(params_.backgroundcolor) << "}\n";
// set the page color
colors << "\\pagecolor{page_backgroundcolor}\n";
}
+ if (mustProvide("fontcolor")) {
+ colors << "\\definecolor{document_fontcolor}{rgb}{";
+ colors << outputLaTeXColor(params_.fontcolor) << "}\n";
+ // set the color
+ colors << "\\color{document_fontcolor}\n";
+ }
+
+ if (mustProvide("lyxgreyedout")) {
+ colors << "\\definecolor{note_fontcolor}{rgb}{";
+ colors << outputLaTeXColor(params_.notefontcolor) << "}\n";
+ // the color will be set together with the definition of
+ // the lyxgreyedout environment (see lyxgreyedout_def)
+ }
+
+ // color for shaded boxes
+ if (isRequired("framed") && mustProvide("color")) {
+ colors << "\\definecolor{shadecolor}{rgb}{";
+ colors << outputLaTeXColor(params_.boxbgcolor) << "}\n";
+ // this color is automatically used by the LaTeX-package "framed"
+ }
+
return colors.str();
}
// 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.
//
// than those above.
//
- // esint is preferred for esintoramsmath
- if ((mustProvide("amsmath")
- && params_.use_amsmath != BufferParams::package_off)
- || (mustProvide("esintoramsmath")
- && params_.use_esint == BufferParams::package_off
- && params_.use_amsmath != BufferParams::package_off)) {
- packages << "\\usepackage{amsmath}\n";
- } else {
- // amsbsy and amstext are already provided by amsmath
- if (mustProvide("amsbsy"))
- packages << "\\usepackage{amsbsy}\n";
- if (mustProvide("amstext"))
- packages << "\\usepackage{amstext}\n";
- }
-
+ // if fontspec is used, AMS packages have to be loaded before
+ // fontspec (in BufferParams)
+ string const amsPackages = loadAMSPackages();
+ if (!params_.useNonTeXFonts && !amsPackages.empty())
+ packages << amsPackages;
+
+ // fixltx2e must be loaded after amsthm, since amsthm produces an error with
+ // the redefined \[ command (bug 7233). Load is as early as possible, since
+ // other packages might profit from it.
+ if (mustProvide("fixltx2e"))
+ packages << "\\usepackage{fixltx2e}\n";
+
// wasysym is a simple feature, but it must be after amsmath if both
// are used
// wasysym redefines some integrals (e.g. iint) from amsmath. That
// 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";
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("yhmath"))
packages << "\\usepackage{yhmath}\n";
+ if (mustProvide("undertilde") &&
+ params_.use_undertilde != BufferParams::package_off)
+ packages << "\\usepackage{undertilde}\n";
+
// [x]color and pdfcolmk are handled in getColorOptions() above
-
+
// makeidx.sty
if (isRequired("makeidx") || isRequired("splitidx")) {
if (!tclass.provides("makeidx") && !isRequired("splitidx"))
}
// graphicx.sty
- if (mustProvide("graphicx") && params_.graphicsDriver != "none") {
- if (params_.graphicsDriver == "default")
+ if (mustProvide("graphicx") && params_.graphics_driver != "none") {
+ if (params_.graphics_driver == "default")
packages << "\\usepackage{graphicx}\n";
else
packages << "\\usepackage["
- << params_.graphicsDriver
+ << params_.graphics_driver
<< "]{graphicx}\n";
}
- // shadecolor for shaded
- if (isRequired("framed") && mustProvide("color")) {
- RGBColor c = rgbFromHexName(lcolor.getX11Name(Color_shadedbg));
- //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
if (mustProvide("chess"))
if (mustProvide("setspace") && !tclass.provides("SetSpace"))
packages << "\\usepackage{setspace}\n";
- // amssymb.sty
- 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") || mustProvide("esintoramsmath")) &&
+ if (mustProvide("esint") &&
params_.use_esint != BufferParams::package_off)
packages << "\\usepackage{esint}\n";
// jurabib -- we need version 0.6 at least.
if (mustProvide("jurabib"))
packages << "\\usepackage{jurabib}[2004/01/25]\n";
-
+
// xargs -- we need version 1.09 at least
if (mustProvide("xargs"))
packages << "\\usepackage{xargs}[2008/03/08]\n";
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"))
+ if (params_.use_mhchem == BufferParams::package_on ||
+ (mustProvide("mhchem") &&
+ params_.use_mhchem != BufferParams::package_off))
packages << "\\PassOptionsToPackage{version=3}{mhchem}\n"
"\\usepackage{mhchem}\n";
"\\makenomenclature\n";
}
+ // fixltx2e provides subscript
+ if (mustProvide("subscript") && !isRequired("fixltx2e"))
+ packages << "\\usepackage{subscript}\n";
+
return packages.str();
}
+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();
+}
+
+
+std::string LaTeXFeatures::getCSSSnippets() const
+{
+ ostringstream snip;
+ SnippetList::const_iterator pit = css_snippets_.begin();
+ SnippetList::const_iterator pend = css_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
macros << papersizepdf_def << '\n';
}
- if (mustProvide("LyX"))
- macros << lyx_def << '\n';
-
- if (mustProvide("lyxline"))
- macros << lyxline_def << '\n';
+ if (mustProvide("LyX")) {
+ if (isRequired("hyperref"))
+ macros << lyx_hyperref_def << '\n';
+ else
+ macros << lyx_def << '\n';
+ }
if (mustProvide("noun"))
macros << noun_def << '\n';
if (mustProvide("lyxarrow"))
macros << lyxarrow_def << '\n';
- if (mustProvide("textgreek"))
- macros << textgreek_def << '\n';
+ if (!usePolyglossia() && mustProvide("textgreek")) {
+ // Avoid a LaTeX error if times fonts are used and the grtimes
+ // package is installed but actual fonts are not (bug 6469).
+ if (params_.fonts_roman == "times")
+ macros << subst(textgreek_def,
+ from_ascii("\\greektext #1"),
+ from_ascii("%\n \\IfFileExists"
+ "{grtm10.tfm}{}{\\fontfamily"
+ "{cmr}}\\greektext #1"))
+ << '\n';
+ else
+ macros << textgreek_def << '\n';
+ }
- if (mustProvide("textcyr"))
+ if (!usePolyglossia() && mustProvide("textcyr"))
macros << textcyr_def << '\n';
if (mustProvide("lyxmathsym"))
if (mustProvide("NeedTabularnewline"))
macros << tabularnewline_def;
- // greyedout environment (note inset)
+ // greyed-out environment (note inset)
+ // the color is specified in the routine
+ // getColorOptions() to avoid LaTeX-package clashes
if (mustProvide("lyxgreyedout"))
macros << lyxgreyedout_def;
// 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}{"
<< cadd.r / 255.0 << ',' << cadd.g / 255.0 << ',' << cadd.b / 255.0 << "}\n";
<< cdel.r / 255.0 << ',' << cdel.g / 255.0 << ',' << cdel.b / 255.0 << "}\n";
macros.precision(prec);
-
+
if (isRequired("hyperref"))
macros << changetracking_xcolor_ulem_hyperref_def;
else
}
-string const LaTeXFeatures::getBabelOptions() const
+string const LaTeXFeatures::getBabelPresettings() const
+{
+ ostringstream tmp;
+
+ LanguageList::const_iterator it = UsedLanguages_.begin();
+ LanguageList::const_iterator end = UsedLanguages_.end();
+ for (; it != end; ++it)
+ 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();
+ 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_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;
+}
+
+
+string const LaTeXFeatures::loadAMSPackages() const
+{
+ ostringstream tmp;
+ if (mustProvide("amsthm"))
+ tmp << "\\usepackage{amsthm}\n";
+
+ if (mustProvide("amsmath")
+ && params_.use_amsmath != BufferParams::package_off) {
+ tmp << "\\usepackage{amsmath}\n";
+ } else {
+ // amsbsy and amstext are already provided by amsmath
+ if (mustProvide("amsbsy"))
+ tmp << "\\usepackage{amsbsy}\n";
+ if (mustProvide("amstext"))
+ tmp << "\\usepackage{amstext}\n";
+ }
+
+ if (mustProvide("amssymb")
+ || params_.use_amsmath == BufferParams::package_on)
+ tmp << "\\usepackage{amssymb}\n";
return tmp.str();
}
}
-docstring const LaTeXFeatures::getTClassHTMLPreamble() const
+docstring const LaTeXFeatures::getTClassHTMLPreamble() const
{
DocumentClass const & tclass = params_.documentClass();
odocstringstream tcpreamble;
}
-docstring const LaTeXFeatures::getTClassHTMLStyles() const {
+docstring const LaTeXFeatures::getTClassHTMLStyles() const
+{
DocumentClass const & tclass = params_.documentClass();
odocstringstream tcpreamble;
+ tcpreamble << tclass.htmlstyles();
+
list<docstring>::const_iterator cit = usedLayouts_.begin();
list<docstring>::const_iterator end = usedLayouts_.end();
for (; cit != end; ++cit)
namespace {
-docstring const getFloatI18nPreamble(docstring const & type, docstring const & name, docstring const & lang)
+docstring const getFloatI18nPreamble(docstring const & type,
+ docstring const & name, Language const * lang,
+ Encoding const & enc, bool const polyglossia)
{
+ docstring const language = polyglossia ? from_ascii(lang->polyglossia())
+ : from_ascii(lang->babel());
+ docstring const langenc = from_ascii(lang->encoding()->iconvName());
+ docstring const texenc = from_ascii(lang->encoding()->latexName());
+ docstring const bufenc = from_ascii(enc.iconvName());
+ docstring const s1 = docstring(1, 0xF0000);
+ docstring const s2 = docstring(1, 0xF0001);
+ docstring const translated = (langenc == bufenc) ? name
+ : from_ascii("\\inputencoding{") + texenc + from_ascii("}")
+ + s1 + langenc + s2 + translated + s1 + bufenc + s2;
+
odocstringstream os;
- os << "\\addto\\captions" << lang
- << "{\\renewcommand{\\" << type << "name}{" << name << "}}\n";
+ os << "\\addto\\captions" << language
+ << "{\\renewcommand{\\" << type << "name}{" << translated << "}}\n";
return os.str();
}
}
-docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel) const
+docstring const LaTeXFeatures::getTClassI18nPreamble(bool use_babel, bool use_polyglossia) const
{
DocumentClass const & tclass = params_.documentClass();
// collect preamble snippets in a set to prevent multiple identical
list<docstring>::const_iterator end = usedLayouts_.end();
for (; cit != end; ++cit) {
// language dependent commands (once per document)
- snippets.insert(tclass[*cit].langpreamble(buffer().language()));
+ snippets.insert(tclass[*cit].langpreamble(buffer().language(),
+ buffer().params().encoding(),
+ use_polyglossia));
// commands for language changing (for multilanguage documents)
- if (use_babel && !UsedLanguages_.empty()) {
- snippets.insert(tclass[*cit].babelpreamble(buffer().language()));
+ if ((use_babel || use_polyglossia) && !UsedLanguages_.empty()) {
+ snippets.insert(tclass[*cit].babelpreamble(
+ buffer().language(),
+ buffer().params().encoding(),
+ use_polyglossia));
for (lang_it lit = lbeg; lit != lend; ++lit)
- snippets.insert(tclass[*cit].babelpreamble(*lit));
+ snippets.insert(tclass[*cit].babelpreamble(
+ *lit,
+ buffer().params().encoding(),
+ use_polyglossia));
}
}
- if (use_babel && !UsedLanguages_.empty()) {
+ if ((use_babel || use_polyglossia) && !UsedLanguages_.empty()) {
FloatList const & floats = params_.documentClass().floats();
UsedFloats::const_iterator fit = usedFloats_.begin();
UsedFloats::const_iterator fend = usedFloats_.end();
for (; fit != fend; ++fit) {
Floating const & fl = floats.getType(fit->first);
- docstring const type = from_ascii(fl.type());
+ // we assume builtin floats are translated
+ if (fl.isPredefined())
+ continue;
+ docstring const type = from_ascii(fl.floattype());
docstring const flname = from_utf8(fl.name());
- docstring name = translateIfPossible(flname,
- buffer().language()->code());
- snippets.insert(getFloatI18nPreamble(
- type, name,
- from_ascii(buffer().language()->babel())));
- for (lang_it lit = lbeg; lit != lend; ++lit) {
- name = translateIfPossible(flname,
- (*lit)->code());
+ docstring name = buffer().language()->translateLayout(fl.name());
+ // only request translation if we have a real translation
+ // (that differs from the source)
+ if (flname != name)
snippets.insert(getFloatI18nPreamble(
- type, name,
- from_ascii((*lit)->babel())));
+ type, name, buffer().language(),
+ buffer().params().encoding(),
+ use_polyglossia));
+ for (lang_it lit = lbeg; lit != lend; ++lit) {
+ string const code = (*lit)->code();
+ name = (*lit)->translateLayout(fl.name());
+ // we assume we have a suitable translation if
+ // either the language is English (we need to
+ // translate into English if English is a secondary
+ // language) or if translateIfPossible returns
+ // something different to the English source.
+ bool const have_translation =
+ (flname != name || contains(code, "en"));
+ if (have_translation)
+ snippets.insert(getFloatI18nPreamble(
+ type, name, *lit,
+ buffer().params().encoding(),
+ use_polyglossia));
}
}
}
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();
Floating const & fl = floats.getType(cit->first);
// For builtin floats we do nothing.
- if (fl.builtin()) continue;
+ if (fl.isPredefined())
+ continue;
// We have to special case "table" and "figure"
- if (fl.type() == "tabular" || fl.type() == "figure") {
+ if (fl.floattype() == "tabular" || fl.floattype() == "figure") {
// Output code to modify "table" or "figure"
// but only if builtin == false
// and that have to be true at this point in the
// function.
- docstring const type = from_ascii(fl.type());
+ docstring const type = from_ascii(fl.floattype());
docstring const placement = from_ascii(fl.placement());
docstring const style = from_ascii(fl.style());
if (!style.empty()) {
} else {
// The other non builtin floats.
- docstring const type = from_ascii(fl.type());
+ docstring const type = from_ascii(fl.floattype());
docstring const placement = from_ascii(fl.placement());
docstring const ext = from_ascii(fl.ext());
docstring const within = from_ascii(fl.within());
docstring const style = from_ascii(fl.style());
- docstring const name = translateIfPossible(
- from_utf8(fl.name()),
- buffer().language()->code());
+ docstring const name =
+ buffer().language()->translateLayout(fl.name());
os << "\\floatstyle{" << style << "}\n"
<< "\\newfloat{" << type << "}{" << placement
<< "}{" << ext << '}';
// effect. (Lgb)
}
if (cit->second)
- os << "\n\\newsubfloat{" << from_ascii(fl.type()) << "}\n";
+ os << "\n\\newsubfloat{" << from_ascii(fl.floattype()) << "}\n";
+ }
+}
+
+
+void LaTeXFeatures::resolveAlternatives()
+{
+ for (Features::iterator it = features_.begin(); it != features_.end();) {
+ if (contains(*it, '|')) {
+ vector<string> const alternatives = getVectorFromString(*it, "|");
+ vector<string>::const_iterator const end = alternatives.end();
+ vector<string>::const_iterator ita = alternatives.begin();
+ for (; ita != end; ++ita) {
+ if (isRequired(*ita))
+ break;
+ }
+ if (ita == end)
+ require(alternatives.front());
+ features_.erase(it);
+ it = features_.begin();
+ } else
+ ++it;
}
}
projects / lyx.git / blobdiff