#include "IndicesList.h"
#include "Language.h"
#include "LaTeXFeatures.h"
+#include "LaTeXFonts.h"
#include "ModuleList.h"
#include "Font.h"
#include "Lexer.h"
// Cite engine
-typedef Translator<string, CiteEngine> CiteEngineTranslator;
+typedef Translator<string, CiteEngineType> CiteEngineTypeTranslator;
-CiteEngineTranslator const init_citeenginetranslator()
+CiteEngineTypeTranslator const init_citeenginetypetranslator()
{
- CiteEngineTranslator translator("basic", ENGINE_BASIC);
- translator.addPair("natbib_numerical", ENGINE_NATBIB_NUMERICAL);
- translator.addPair("natbib_authoryear", ENGINE_NATBIB_AUTHORYEAR);
- translator.addPair("jurabib", ENGINE_JURABIB);
+ CiteEngineTypeTranslator translator("authoryear", ENGINE_TYPE_AUTHORYEAR);
+ translator.addPair("numerical", ENGINE_TYPE_NUMERICAL);
return translator;
}
-CiteEngineTranslator const & citeenginetranslator()
+CiteEngineTypeTranslator const & citeenginetypetranslator()
{
- static CiteEngineTranslator translator = init_citeenginetranslator();
+ static CiteEngineTypeTranslator translator = init_citeenginetypetranslator();
return translator;
}
papersize = PAPER_DEFAULT;
orientation = ORIENTATION_PORTRAIT;
use_geometry = false;
- cite_engine_ = ENGINE_BASIC;
+ cite_engine_.push_back("basic");
+ cite_engine_type_ = ENGINE_TYPE_NUMERICAL;
biblio_style = "plain";
use_bibtopic = false;
use_indices = false;
if (packages.empty()) {
// adding a package here implies a file format change!
packages.push_back("amsmath");
+ packages.push_back("amssymb");
packages.push_back("esint");
packages.push_back("mathdots");
+ packages.push_back("mathtools");
packages.push_back("mhchem");
packages.push_back("undertilde");
}
papersize = papersizetranslator().find(ppsize);
} else if (token == "\\use_geometry") {
lex >> use_geometry;
- } else if (token == "\\use_amsmath") {
- int use_ams;
- lex >> use_ams;
- use_package("amsmath", packagetranslator().find(use_ams));
- } else if (token == "\\use_esint") {
- int useesint;
- lex >> useesint;
- use_package("esint", packagetranslator().find(useesint));
- } else if (token == "\\use_mhchem") {
- int usemhchem;
- lex >> usemhchem;
- use_package("mhchem", packagetranslator().find(usemhchem));
- } else if (token == "\\use_mathdots") {
- int usemathdots;
- lex >> usemathdots;
- use_package("mathdots", packagetranslator().find(usemathdots));
- } else if (token == "\\use_undertilde") {
- int useundertilde;
- lex >> useundertilde;
- use_package("undertilde", packagetranslator().find(useundertilde));
+ } else if (token == "\\use_package") {
+ string package;
+ int use;
+ lex >> package;
+ lex >> use;
+ use_package(package, packagetranslator().find(use));
} else if (token == "\\cite_engine") {
- string engine;
- lex >> engine;
- cite_engine_ = citeenginetranslator().find(engine);
+ lex.eatLine();
+ vector<string> engine = getVectorFromString(lex.getString());
+ setCiteEngine(engine);
+ } else if (token == "\\cite_engine_type") {
+ string engine_type;
+ lex >> engine_type;
+ cite_engine_type_ = citeenginetypetranslator().find(engine_type);
} else if (token == "\\biblio_style") {
lex.eatLine();
biblio_style = lex.getString();
os << "\\begin_removed_modules" << '\n';
list<string>::const_iterator it = removed_modules_.begin();
list<string>::const_iterator en = removed_modules_.end();
- for (; it != en; it++)
+ for (; it != en; ++it)
os << *it << '\n';
os << "\\end_removed_modules" << '\n';
}
os << "\\begin_modules" << '\n';
LayoutModuleList::const_iterator it = layout_modules_.begin();
LayoutModuleList::const_iterator en = layout_modules_.end();
- for (; it != en; it++)
+ for (; it != en; ++it)
os << *it << '\n';
os << "\\end_modules" << '\n';
}
os << "\\begin_includeonly" << '\n';
list<string>::const_iterator it = included_children_.begin();
list<string>::const_iterator en = included_children_.end();
- for (; it != en; it++)
+ for (; it != en; ++it)
os << *it << '\n';
os << "\\end_includeonly" << '\n';
}
if (!fonts_cjk.empty()) {
os << "\\font_cjk " << fonts_cjk << '\n';
}
- os << "\n\\graphics " << graphics_driver << '\n';
+ os << "\\graphics " << graphics_driver << '\n';
os << "\\default_output_format " << default_output_format << '\n';
os << "\\output_sync " << output_sync << '\n';
if (!output_sync_macro.empty())
pdfoptions().writeFile(os);
os << "\\papersize " << string_papersize[papersize]
- << "\n\\use_geometry " << convert<string>(use_geometry)
- << "\n\\use_amsmath " << use_package("amsmath")
- << "\n\\use_esint " << use_package("esint")
- << "\n\\use_mhchem " << use_package("mhchem")
- << "\n\\use_mathdots " << use_package("mathdots")
- << "\n\\use_undertilde " << use_package("undertilde")
- << "\n\\cite_engine " << citeenginetranslator().find(cite_engine_)
+ << "\n\\use_geometry " << convert<string>(use_geometry);
+ vector<string> const & packages = auto_packages();
+ for (size_t i = 0; i < packages.size(); ++i)
+ os << "\n\\use_package " << packages[i] << ' '
+ << use_package(packages[i]);
+
+ os << "\n\\cite_engine ";
+
+ if (!cite_engine_.empty()) {
+ LayoutModuleList::const_iterator be = cite_engine_.begin();
+ LayoutModuleList::const_iterator en = cite_engine_.end();
+ for (LayoutModuleList::const_iterator it = be; it != en; ++it) {
+ if (it != be)
+ os << ',';
+ os << *it;
+ }
+ } else {
+ os << "basic";
+ }
+
+ os << "\n\\cite_engine_type " << citeenginetypetranslator().find(cite_engine_type_)
<< "\n\\biblio_style " << biblio_style
<< "\n\\use_bibtopic " << convert<string>(use_bibtopic)
<< "\n\\use_indices " << convert<string>(use_indices)
features.require("color");
}
+ // some languages are only available via polyglossia
if (features.runparams().flavor == OutputParams::XETEX
- && useNonTeXFonts)
+ && (features.hasPolyglossiaExclusiveLanguages()
+ || useNonTeXFonts))
features.require("polyglossia");
- if (language->lang() == "vietnamese")
- features.require("vietnamese");
- else if (language->lang() == "japanese")
- features.require("japanese");
+ if (!language->requires().empty())
+ features.require(language->requires());
}
bool const use_polyglossia = features.usePolyglossia();
bool const global = lyxrc.language_global_options;
if (use_babel || (use_polyglossia && global)) {
- language_options << features.getLanguages();
+ language_options << features.getBabelLanguages();
if (!language->babel().empty()) {
if (!language_options.str().empty())
language_options << ',';
language_options << language->babel();
}
- if (global && !features.needBabelLangOptions())
+ if (global && !features.needBabelLangOptions()
+ && !language_options.str().empty())
clsoptions << language_options.str() << ',';
}
IndicesList::const_iterator iit = indiceslist().begin();
IndicesList::const_iterator iend = indiceslist().end();
for (; iit != iend; ++iit) {
+ pair<docstring, docstring> indexname_latex =
+ features.runparams().encoding->latexString(iit->index(),
+ features.runparams().dryrun);
+ if (!indexname_latex.second.empty()) {
+ // issue a warning about omitted characters
+ // FIXME: should be passed to the error dialog
+ frontend::Alert::warning(_("Uncodable characters"),
+ bformat(_("The following characters that are used in an index name are not\n"
+ "representable in the current encoding and therefore have been omitted:\n%1$s."),
+ indexname_latex.second));
+ }
lyxpreamble += "\\newindex[";
- lyxpreamble += iit->index();
+ lyxpreamble += indexname_latex.first;
lyxpreamble += "]{";
- lyxpreamble += iit->shortcut();
+ lyxpreamble += escape(iit->shortcut());
lyxpreamble += "}\n";
}
}
// hyperref loads this automatically
lyxpreamble += "\\usepackage{nameref}\n";
+ // bibtopic needs to be loaded after hyperref.
+ // the dot provides the aux file naming which LyX can detect.
+ if (features.mustProvide("bibtopic"))
+ lyxpreamble += "\\usepackage[dot]{bibtopic}\n";
+
// Will be surrounded by \makeatletter and \makeatother when not empty
docstring atlyxpreamble;
}
}
+ // Load custom language package here
+ if (features.langPackage() == LaTeXFeatures::LANG_PACK_CUSTOM) {
+ if (lang_package == "default")
+ lyxpreamble += from_utf8(lyxrc.language_custom_package);
+ else
+ lyxpreamble += from_utf8(lang_package);
+ lyxpreamble += '\n';
+ }
+
docstring const i18npreamble =
features.getTClassI18nPreamble(use_babel, use_polyglossia);
if (!i18npreamble.empty())
DocumentClass const & BufferParams::documentClass() const
{
- return *doc_class_;
+ return *doc_class_.get();
}
-DocumentClass const * BufferParams::documentClassPtr() const
+DocumentClassConstPtr BufferParams::documentClassPtr() const
{
return doc_class_;
}
-void BufferParams::setDocumentClass(DocumentClass const * const tc)
+void BufferParams::setDocumentClass(DocumentClassConstPtr tc)
{
// evil, but this function is evil
- doc_class_ = const_cast<DocumentClass *>(tc);
+ doc_class_ = const_pointer_cast<DocumentClass>(tc);
}
if (!baseClass())
return;
- doc_class_ = &(DocumentClassBundle::get().makeDocumentClass(*baseClass(), layout_modules_));
+ LayoutModuleList mods;
+ LayoutModuleList::iterator it;
+ LayoutModuleList::iterator en;
+
+ it = layout_modules_.begin();
+ en = layout_modules_.end();
+ for (; it != en; ++it)
+ mods.push_back(*it);
+ it = cite_engine_.begin();
+ en = cite_engine_.end();
+ for (; it != en; ++it)
+ mods.push_back(*it);
+ doc_class_ = getDocumentClass(*baseClass(), mods);
if (!local_layout.empty()) {
TextClass::ReturnValues success =
bool BufferParams::moduleCanBeAdded(string const & modName) const
{
- return layout_modules_.moduleCanBeAdded(modName, baseClass());
+ return cite_engine_.moduleCanBeAdded(modName, baseClass()) &&
+ layout_modules_.moduleCanBeAdded(modName, baseClass());
}
{
LayoutModuleList::const_iterator it = layout_modules_.begin();
LayoutModuleList::const_iterator end = layout_modules_.end();
- for (; it != end; it++)
+ for (; it != end; ++it)
if (*it == modName)
return false;
layout_modules_.push_back(modName);
vector<string> BufferParams::backends() const
{
vector<string> v;
- v.push_back(bufferFormat());
+ string const buffmt = bufferFormat();
+
// FIXME: Don't hardcode format names here, but use a flag
- if (v.back() == "latex") {
- v.push_back("pdflatex");
+ if (buffmt == "latex") {
+ if (!useNonTeXFonts) {
+ v.push_back("pdflatex");
+ v.push_back("latex");
+ }
v.push_back("luatex");
v.push_back("dviluatex");
v.push_back("xetex");
- } else if (v.back() == "xetex") {
+ } else if (buffmt == "xetex") {
+ v.push_back("xetex");
v.push_back("luatex");
v.push_back("dviluatex");
- }
+ } else
+ v.push_back(buffmt);
+
v.push_back("xhtml");
v.push_back("text");
v.push_back("lyx");
OutputParams::FLAVOR result = OutputParams::LATEX;
+ // FIXME It'd be better not to hardcode this, but to do
+ // something with formats.
if (dformat == "xhtml")
result = OutputParams::HTML;
+ else if (dformat == "text")
+ result = OutputParams::TEXT;
+ else if (dformat == "lyx")
+ result = OutputParams::LYX;
+ else if (dformat == "pdflatex")
+ result = OutputParams::PDFLATEX;
+ else if (dformat == "xetex")
+ result = OutputParams::XETEX;
+ else if (dformat == "luatex")
+ result = OutputParams::LUATEX;
+ else if (dformat == "dviluatex")
+ result = OutputParams::DVILUATEX;
else {
// Try to determine flavor of default output format
vector<string> backs = backends();
}
+InsetQuotes::QuoteLanguage BufferParams::getQuoteStyle(string const qs) const
+{
+ return quoteslangtranslator().find(qs);
+}
+
+
bool BufferParams::isLatex() const
{
return documentClass().outputType() == LATEX;
// start of the read.
list<string>::const_iterator rit = removed_modules_.begin();
list<string>::const_iterator const ren = removed_modules_.end();
- for (; rit != ren; rit++) {
+ for (; rit != ren; ++rit) {
LayoutModuleList::iterator const mit = layout_modules_.begin();
LayoutModuleList::iterator const men = layout_modules_.end();
LayoutModuleList::iterator found = find(mit, men, *rit);
{
string result;
+ // If the class loads the geometry package, we do not know which
+ // paper size is used, since we do not set it (bug 7013).
+ // Therefore we must not specify any argument here.
+ // dvips gets the correct paper size via DVI specials in this case
+ // (if the class uses the geometry package correctly).
+ if (documentClass().provides("geometry"))
+ return result;
+
if (use_geometry
&& papersize == PAPER_CUSTOM
&& !lyxrc.print_paper_dimension_flag.empty()
string BufferParams::babelCall(string const & lang_opts, bool const langoptions) const
{
- if (lang_package != "auto" && lang_package != "babel"
- && lang_package != "default" && lang_package != "none")
- return lang_package;
- if (lyxrc.language_package_selection == LyXRC::LP_CUSTOM)
- return lyxrc.language_custom_package;
// suppress the babel call if there is no BabelName defined
// for the document language in the lib/languages file and if no
// other languages are used (lang_opts is then empty)
// If the "japanese" package (i.e. pLaTeX) is used,
// inputenc must be omitted.
// see http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129680.html
- if (package == Encoding::japanese)
- features.require("japanese");
-
if ((!encodings.empty() || package == Encoding::inputenc)
&& !features.isRequired("japanese")) {
os << "\\usepackage[";
break;
}
}
-
- // The encoding "armscii8" (for Armenian) is only available when
- // the package "armtex" is loaded.
- if (language->encoding()->latexName() == "armscii8"
- || inputenc == "armscii8")
- os << "\\usepackage{armtex}\n";
}
bool const & use_systemfonts,
LaTeXFeatures & features) const
{
- /* The LaTeX font world is in a flux. In the PSNFSS font interface,
- several packages have been replaced by others, that might not
- be installed on every system. We have to take care for that
- (see psnfss.pdf). We try to support all psnfss fonts as well
- as the fonts that have become de facto standard in the LaTeX
- world (e.g. Latin Modern). We do not support obsolete fonts
- (like PSLatex). In general, it should be possible to mix any
- rm font with any sf or tt font, respectively. (JSpitzm)
- TODO:
- -- separate math fonts.
- */
+ // TODO: separate math fonts.
if (rm == "default" && sf == "default" && tt == "default")
//nothing to do
return os.str();
}
+ // Tex Fonts
+ bool const ot1 = (font_encoding() == "default" || font_encoding() == "OT1");
+ bool const dryrun = features.runparams().dryrun;
+ bool const complete = (sf == "default" && tt == "default");
+
// ROMAN FONTS
- // Computer Modern (must be explicitly selectable -- there might be classes
- // that define a different default font!
- if (rm == "cmr") {
- os << "\\renewcommand{\\rmdefault}{cmr}\n";
- // osf for Computer Modern needs eco.sty
- if (osf)
- os << "\\usepackage{eco}\n";
- }
- // Latin Modern Roman
- else if (rm == "lmodern")
- os << "\\usepackage{lmodern}\n";
- // AE
- else if (rm == "ae") {
- // not needed when using OT1 font encoding.
- if (font_encoding() != "default")
- os << "\\usepackage{ae,aecompl}\n";
- }
- // Times
- else if (rm == "times") {
- // try to load the best available package
- if (LaTeXFeatures::isAvailable("mathptmx"))
- os << "\\usepackage{mathptmx}\n";
- else if (LaTeXFeatures::isAvailable("mathptm"))
- os << "\\usepackage{mathptm}\n";
- else
- os << "\\usepackage{times}\n";
- }
- // Palatino
- else if (rm == "palatino") {
- // try to load the best available package
- if (LaTeXFeatures::isAvailable("mathpazo")) {
- os << "\\usepackage";
- if (osf || sc) {
- os << '[';
- if (!osf)
- os << "sc";
- else
- // "osf" includes "sc"!
- os << "osf";
- os << ']';
- }
- os << "{mathpazo}\n";
- }
- else if (LaTeXFeatures::isAvailable("mathpple"))
- os << "\\usepackage{mathpple}\n";
- else
- os << "\\usepackage{palatino}\n";
- }
- // Utopia
- else if (rm == "utopia") {
- // fourier supersedes utopia.sty, but does
- // not work with OT1 encoding.
- if (LaTeXFeatures::isAvailable("fourier")
- && font_encoding() != "default") {
- os << "\\usepackage";
- if (osf || sc) {
- os << '[';
- if (sc)
- os << "expert";
- if (osf && sc)
- os << ',';
- if (osf)
- os << "oldstyle";
- os << ']';
- }
- os << "{fourier}\n";
- }
- else
- os << "\\usepackage{utopia}\n";
- }
- // Bera (complete fontset)
- else if (rm == "bera" && sf == "default" && tt == "default")
- os << "\\usepackage{bera}\n";
- // everything else
- else if (rm != "default")
- os << "\\usepackage" << "{" << rm << "}\n";
+ os << theLaTeXFonts().getLaTeXFont(from_ascii(rm)).getLaTeXCode(dryrun, ot1, complete, sc, osf);
// SANS SERIF
- // Helvetica, Bera Sans
- if (sf == "helvet" || sf == "berasans") {
- if (sfscale != 100)
- os << "\\usepackage[scaled=" << float(sfscale) / 100
- << "]{" << sf << "}\n";
- else
- os << "\\usepackage{" << sf << "}\n";
- }
- // Avant Garde
- else if (sf == "avant")
- os << "\\usepackage{" << sf << "}\n";
- // Computer Modern, Latin Modern, CM Bright
- else if (sf != "default")
- os << "\\renewcommand{\\sfdefault}{" << sf << "}\n";
-
- // monospaced/typewriter
- // Courier, LuxiMono
- if (tt == "luximono" || tt == "beramono") {
- if (ttscale != 100)
- os << "\\usepackage[scaled=" << float(ttscale) / 100
- << "]{" << tt << "}\n";
- else
- os << "\\usepackage{" << tt << "}\n";
- }
- // Courier
- else if (tt == "courier" )
- os << "\\usepackage{" << tt << "}\n";
- // Computer Modern, Latin Modern, CM Bright
- else if (tt != "default")
- os << "\\renewcommand{\\ttdefault}{" << tt << "}\n";
+ os << theLaTeXFonts().getLaTeXFont(from_ascii(sf)).getLaTeXCode(dryrun, ot1, complete, sc, osf, sfscale);
+
+ // MONOSPACED/TYPEWRITER
+ os << theLaTeXFonts().getLaTeXFont(from_ascii(tt)).getLaTeXCode(dryrun, ot1, complete, sc, osf, ttscale);
return os.str();
}
}
-CiteEngine BufferParams::citeEngine() const
+bool BufferParams::addCiteEngine(string const & engine)
+{
+ LayoutModuleList::const_iterator it = cite_engine_.begin();
+ LayoutModuleList::const_iterator en = cite_engine_.end();
+ for (; it != en; ++it)
+ if (*it == engine)
+ return false;
+ cite_engine_.push_back(engine);
+ return true;
+}
+
+
+bool BufferParams::addCiteEngine(vector<string> const & engine)
+{
+ vector<string>::const_iterator it = engine.begin();
+ vector<string>::const_iterator en = engine.end();
+ bool ret = true;
+ for (; it != en; ++it)
+ if (!addCiteEngine(*it))
+ ret = false;
+ return ret;
+}
+
+
+string const & BufferParams::defaultBiblioStyle() const
+{
+ return documentClass().defaultBiblioStyle();
+}
+
+
+bool const & BufferParams::fullAuthorList() const
+{
+ return documentClass().fullAuthorList();
+}
+
+
+void BufferParams::setCiteEngine(string const & engine)
+{
+ clearCiteEngine();
+ addCiteEngine(engine);
+}
+
+
+void BufferParams::setCiteEngine(vector<string> const & engine)
+{
+ clearCiteEngine();
+ addCiteEngine(engine);
+}
+
+
+vector<string> BufferParams::citeCommands() const
{
- // FIXME the class should provide the numerical/
- // authoryear choice
- if (documentClass().provides("natbib")
- && cite_engine_ != ENGINE_NATBIB_NUMERICAL)
- return ENGINE_NATBIB_AUTHORYEAR;
- return cite_engine_;
+ static CitationStyle const default_style;
+ vector<string> commands =
+ documentClass().citeCommands(citeEngineType());
+ if (commands.empty())
+ commands.push_back(default_style.cmd);
+ return commands;
}
-void BufferParams::setCiteEngine(CiteEngine cite_engine)
+vector<CitationStyle> BufferParams::citeStyles() const
{
- cite_engine_ = cite_engine;
+ static CitationStyle const default_style;
+ vector<CitationStyle> styles =
+ documentClass().citeStyles(citeEngineType());
+ if (styles.empty())
+ styles.push_back(default_style);
+ return styles;
}
} // namespace lyx
projects / lyx.git / blobdiff