static char const * const string_papersize[] = {
"default", "custom", "letterpaper", "legalpaper", "executivepaper",
- "a3paper", "a4paper", "a5paper", "b3paper", "b4paper", "b5paper", ""
+ "a0paper", "a1paper", "a2paper", "a3paper", "a4paper", "a5paper",
+ "a6paper", "b0paper", "b1paper", "b2paper","b3paper", "b4paper",
+ "b5paper", "b6paper", "c0paper", "c1paper", "c2paper", "c3paper",
+ "c4paper", "c5paper", "c6paper", "b0j", "b1j", "b2j", "b3j", "b4j", "b5j",
+ "b6j", ""
};
translator.addPair(string_papersize[2], PAPER_USLETTER);
translator.addPair(string_papersize[3], PAPER_USLEGAL);
translator.addPair(string_papersize[4], PAPER_USEXECUTIVE);
- translator.addPair(string_papersize[5], PAPER_A3);
- translator.addPair(string_papersize[6], PAPER_A4);
- translator.addPair(string_papersize[7], PAPER_A5);
- translator.addPair(string_papersize[8], PAPER_B3);
- translator.addPair(string_papersize[9], PAPER_B4);
- translator.addPair(string_papersize[10], PAPER_B5);
+ translator.addPair(string_papersize[5], PAPER_A0);
+ translator.addPair(string_papersize[6], PAPER_A1);
+ translator.addPair(string_papersize[7], PAPER_A2);
+ translator.addPair(string_papersize[8], PAPER_A3);
+ translator.addPair(string_papersize[9], PAPER_A4);
+ translator.addPair(string_papersize[10], PAPER_A5);
+ translator.addPair(string_papersize[11], PAPER_A6);
+ translator.addPair(string_papersize[12], PAPER_B0);
+ translator.addPair(string_papersize[13], PAPER_B1);
+ translator.addPair(string_papersize[14], PAPER_B2);
+ translator.addPair(string_papersize[15], PAPER_B3);
+ translator.addPair(string_papersize[16], PAPER_B4);
+ translator.addPair(string_papersize[17], PAPER_B5);
+ translator.addPair(string_papersize[18], PAPER_B6);
+ translator.addPair(string_papersize[19], PAPER_C0);
+ translator.addPair(string_papersize[20], PAPER_C1);
+ translator.addPair(string_papersize[21], PAPER_C2);
+ translator.addPair(string_papersize[22], PAPER_C3);
+ translator.addPair(string_papersize[23], PAPER_C4);
+ translator.addPair(string_papersize[24], PAPER_C5);
+ translator.addPair(string_papersize[25], PAPER_C6);
+ translator.addPair(string_papersize[26], PAPER_JISB0);
+ translator.addPair(string_papersize[27], PAPER_JISB1);
+ translator.addPair(string_papersize[28], PAPER_JISB2);
+ translator.addPair(string_papersize[29], PAPER_JISB3);
+ translator.addPair(string_papersize[30], PAPER_JISB4);
+ translator.addPair(string_papersize[31], PAPER_JISB5);
+ translator.addPair(string_papersize[32], PAPER_JISB6);
return translator;
}
use_amsmath = package_auto;
use_esint = package_auto;
use_mhchem = package_auto;
+ use_mathdots = package_auto;
cite_engine_ = ENGINE_BASIC;
use_bibtopic = false;
use_indices = false;
tocdepth = 3;
language = default_language;
fontenc = "global";
- fontsRoman = "default";
- fontsSans = "default";
- fontsTypewriter = "default";
- fontsDefaultFamily = "default";
- useXetex = false;
- fontsSC = false;
- fontsOSF = false;
- fontsSansScale = 100;
- fontsTypewriterScale = 100;
+ fonts_roman = "default";
+ fonts_sans = "default";
+ fonts_typewriter = "default";
+ fonts_default_family = "default";
+ useNonTeXFonts = false;
+ fonts_expert_sc = false;
+ fonts_old_figures = false;
+ fonts_sans_scale = 100;
+ fonts_typewriter_scale = 100;
inputenc = "auto";
- graphicsDriver = "default";
- defaultOutputFormat = "default";
+ lang_package = "default";
+ graphics_driver = "default";
+ default_output_format = "default";
bibtex_command = "default";
index_command = "default";
sides = OneSide;
listings_params = string();
pagestyle = "default";
suppress_date = false;
- // white is equal to no background color
+ // no color is the default (white)
backgroundcolor = lyx::rgbFromHexName("#ffffff");
- compressed = false;
+ isbackgroundcolor = false;
+ // no color is the default (black)
+ fontcolor = lyx::rgbFromHexName("#000000");
+ isfontcolor = false;
+ // light gray is the default font color for greyed-out notes
+ notefontcolor = lyx::rgbFromHexName("#cccccc");
+ boxbgcolor = lyx::rgbFromHexName("#ff0000");
+ compressed = lyxrc.save_compressed;
for (int iter = 0; iter < 4; ++iter) {
user_defined_bullet(iter) = ITEMIZE_DEFAULTS[iter];
temp_bullet(iter) = ITEMIZE_DEFAULTS[iter];
}
// default index
indiceslist().addDefault(B_("Index"));
- html_be_strict = true;
- html_use_mathml = true;
+ html_be_strict = false;
+ html_math_output = MathML;
+ html_math_img_scale = 1.0;
+
+ output_sync = false;
+ use_refstyle = true;
}
void BufferParams::setDefSkip(VSpace const & vs)
{
+ // DEFSKIP will cause an infinite loop
+ LASSERT(vs.kind() != VSpace::DEFSKIP, return);
pimpl_->defskip = vs;
}
lex.next();
string const classname = lex.getString();
// if there exists a local layout file, ignore the system one
- // NOTE: in this case, the textclass (.cls file) is assumed to be available.
+ // NOTE: in this case, the textclass (.cls file) is assumed to
+ // be available.
string tcp;
LayoutFileList & bcl = LayoutFileList::get();
if (tcp.empty() && !filepath.empty())
- tcp = bcl.addLocalLayout(classname, filepath.absFilename());
+ tcp = bcl.addLocalLayout(classname, filepath.absFileName());
if (!tcp.empty())
setBaseClass(tcp);
else
setBaseClass(classname);
- // We assume that a tex class exists for local or unknown layouts so this warning
- // will only be given for system layouts.
+ // We assume that a tex class exists for local or unknown
+ // layouts so this warning, will only be given for system layouts.
if (!baseClass()->isTeXClassAvailable()) {
+ docstring const desc =
+ translateIfPossible(from_utf8(baseClass()->description()));
+ docstring const prereqs =
+ from_utf8(baseClass()->prerequisites());
docstring const msg =
- bformat(_("The layout file requested by this document,\n"
- "%1$s.layout,\n"
- "is not usable. This is probably because a LaTeX\n"
- "class or style file required by it is not\n"
- "available. See the Customization documentation\n"
- "for more information.\n"), from_utf8(classname));
+ bformat(_("The selected document class\n"
+ "\t%1$s\n"
+ "requires external files that are not available.\n"
+ "The document class can still be used, but the\n"
+ "document cannot be compiled until the following\n"
+ "prerequisites are installed:\n"
+ "\t%2$s\n"
+ "See section 3.1.2.2 (Class Availability) of the\n"
+ "User's Guide for more information."), desc, prereqs);
frontend::Alert::warning(_("Document class not available"),
- msg + _("LyX will not be able to produce output."));
- }
+ msg);
+ }
} else if (token == "\\begin_preamble") {
readPreamble(lex);
} else if (token == "\\begin_local_layout") {
lex >> suppress_date;
} else if (token == "\\language") {
readLanguage(lex);
+ } else if (token == "\\language_package") {
+ lex.eatLine();
+ lang_package = lex.getString();
} else if (token == "\\inputencoding") {
lex >> inputenc;
} else if (token == "\\graphics") {
readGraphicsDriver(lex);
} else if (token == "\\default_output_format") {
- lex >> defaultOutputFormat;
+ lex >> default_output_format;
} else if (token == "\\bibtex_command") {
lex.eatLine();
bibtex_command = lex.getString();
fontenc = lex.getString();
} else if (token == "\\font_roman") {
lex.eatLine();
- fontsRoman = lex.getString();
+ fonts_roman = lex.getString();
} else if (token == "\\font_sans") {
lex.eatLine();
- fontsSans = lex.getString();
+ fonts_sans = lex.getString();
} else if (token == "\\font_typewriter") {
lex.eatLine();
- fontsTypewriter = lex.getString();
+ fonts_typewriter = lex.getString();
} else if (token == "\\font_default_family") {
- lex >> fontsDefaultFamily;
- } else if (token == "\\use_xetex") {
- lex >> useXetex;
+ lex >> fonts_default_family;
+ } else if (token == "\\use_non_tex_fonts") {
+ lex >> useNonTeXFonts;
} else if (token == "\\font_sc") {
- lex >> fontsSC;
+ lex >> fonts_expert_sc;
} else if (token == "\\font_osf") {
- lex >> fontsOSF;
+ lex >> fonts_old_figures;
} else if (token == "\\font_sf_scale") {
- lex >> fontsSansScale;
+ lex >> fonts_sans_scale;
} else if (token == "\\font_tt_scale") {
- lex >> fontsTypewriterScale;
+ lex >> fonts_typewriter_scale;
} else if (token == "\\font_cjk") {
- lex >> fontsCJK;
+ lex >> fonts_cjk;
} else if (token == "\\paragraph_separation") {
string parsep;
lex >> parsep;
pimpl_->indentation = HSpace(indentation);
} else if (token == "\\defskip") {
lex.next();
- string defskip = lex.getString();
- if (defskip == "defskip")
- // this is invalid
- defskip = "medskip";
+ string const defskip = lex.getString();
pimpl_->defskip = VSpace(defskip);
+ if (pimpl_->defskip.kind() == VSpace::DEFSKIP)
+ // that is invalid
+ pimpl_->defskip = VSpace(VSpace::MEDSKIP);
} else if (token == "\\quotes_language") {
string quotes_lang;
lex >> quotes_lang;
int usemhchem;
lex >> usemhchem;
use_mhchem = packagetranslator().find(usemhchem);
+ } else if (token == "\\use_mathdots") {
+ int usemathdots;
+ lex >> usemathdots;
+ use_mathdots = packagetranslator().find(usemathdots);
} else if (token == "\\cite_engine") {
string engine;
lex >> engine;
if (tok == "\\filename_suffix") {
lex.next();
if (branch_ptr)
- branch_ptr->setFilenameSuffix(lex.getInteger());
+ branch_ptr->setFileNameSuffix(lex.getInteger());
}
if (tok == "\\color") {
lex.eatLine();
istringstream ss(lex.getString());
Author a;
ss >> a;
- author_map[a.buffer_id()] = pimpl_->authorlist.record(a);
+ author_map[a.bufferId()] = pimpl_->authorlist.record(a);
} else if (token == "\\paperorientation") {
string orient;
lex >> orient;
} else if (token == "\\backgroundcolor") {
lex.eatLine();
backgroundcolor = lyx::rgbFromHexName(lex.getString());
+ isbackgroundcolor = true;
+ } else if (token == "\\fontcolor") {
+ lex.eatLine();
+ fontcolor = lyx::rgbFromHexName(lex.getString());
+ isfontcolor = true;
+ } else if (token == "\\notefontcolor") {
+ lex.eatLine();
+ string color = lex.getString();
+ notefontcolor = lyx::rgbFromHexName(color);
+ } else if (token == "\\boxbgcolor") {
+ lex.eatLine();
+ string color = lex.getString();
+ boxbgcolor = lyx::rgbFromHexName(color);
} else if (token == "\\paperwidth") {
lex >> paperwidth;
} else if (token == "\\paperheight") {
toktmp << endl;
return toktmp;
}
- } else if (token == "\\html_use_mathml") {
- lex >> html_use_mathml;
+ } else if (token == "\\html_math_output") {
+ int temp;
+ lex >> temp;
+ html_math_output = static_cast<MathOutput>(temp);
} else if (token == "\\html_be_strict") {
lex >> html_be_strict;
+ } else if (token == "\\html_math_img_scale") {
+ lex >> html_math_img_scale;
+ } else if (token == "\\html_latex_start") {
+ lex.eatLine();
+ html_latex_start = lex.getString();
+ } else if (token == "\\html_latex_end") {
+ lex.eatLine();
+ html_latex_end = lex.getString();
+ } else if (token == "\\output_sync") {
+ lex >> output_sync;
+ } else if (token == "\\output_sync_macro") {
+ lex >> output_sync_macro;
+ } else if (token == "\\use_refstyle") {
+ lex >> use_refstyle;
} else {
lyxerr << "BufferParams::readToken(): Unknown token: " <<
token << endl;
}
// removed modules
- if (!removedModules_.empty()) {
+ if (!removed_modules_.empty()) {
os << "\\begin_removed_modules" << '\n';
- list<string>::const_iterator it = removedModules_.begin();
- list<string>::const_iterator en = removedModules_.end();
+ list<string>::const_iterator it = removed_modules_.begin();
+ list<string>::const_iterator en = removed_modules_.end();
for (; it != en; it++)
os << *it << '\n';
os << "\\end_removed_modules" << '\n';
}
// the modules
- if (!layoutModules_.empty()) {
+ if (!layout_modules_.empty()) {
os << "\\begin_modules" << '\n';
- LayoutModuleList::const_iterator it = layoutModules_.begin();
- LayoutModuleList::const_iterator en = layoutModules_.end();
+ LayoutModuleList::const_iterator it = layout_modules_.begin();
+ LayoutModuleList::const_iterator en = layout_modules_.end();
for (; it != en; it++)
os << *it << '\n';
os << "\\end_modules" << '\n';
}
// includeonly
- if (!includedChildren_.empty()) {
+ if (!included_children_.empty()) {
os << "\\begin_includeonly" << '\n';
- list<string>::const_iterator it = includedChildren_.begin();
- list<string>::const_iterator en = includedChildren_.end();
+ list<string>::const_iterator it = included_children_.begin();
+ list<string>::const_iterator en = included_children_.end();
for (; it != en; it++)
os << *it << '\n';
os << "\\end_includeonly" << '\n';
// then the text parameters
if (language != ignore_language)
os << "\\language " << language->lang() << '\n';
- os << "\\inputencoding " << inputenc
+ os << "\\language_package " << lang_package
+ << "\n\\inputencoding " << inputenc
<< "\n\\fontencoding " << fontenc
- << "\n\\font_roman " << fontsRoman
- << "\n\\font_sans " << fontsSans
- << "\n\\font_typewriter " << fontsTypewriter
- << "\n\\font_default_family " << fontsDefaultFamily
- << "\n\\use_xetex " << convert<string>(useXetex)
- << "\n\\font_sc " << convert<string>(fontsSC)
- << "\n\\font_osf " << convert<string>(fontsOSF)
- << "\n\\font_sf_scale " << fontsSansScale
- << "\n\\font_tt_scale " << fontsTypewriterScale
+ << "\n\\font_roman " << fonts_roman
+ << "\n\\font_sans " << fonts_sans
+ << "\n\\font_typewriter " << fonts_typewriter
+ << "\n\\font_default_family " << fonts_default_family
+ << "\n\\use_non_tex_fonts " << convert<string>(useNonTeXFonts)
+ << "\n\\font_sc " << convert<string>(fonts_expert_sc)
+ << "\n\\font_osf " << convert<string>(fonts_old_figures)
+ << "\n\\font_sf_scale " << fonts_sans_scale
+ << "\n\\font_tt_scale " << fonts_typewriter_scale
<< '\n';
- if (!fontsCJK.empty()) {
- os << "\\font_cjk " << fontsCJK << '\n';
- }
- os << "\n\\graphics " << graphicsDriver << '\n';
- os << "\\default_output_format " << defaultOutputFormat << '\n';
+ if (!fonts_cjk.empty()) {
+ os << "\\font_cjk " << fonts_cjk << '\n';
+ }
+ os << "\n\\graphics " << graphics_driver << '\n';
+ os << "\\default_output_format " << default_output_format << '\n';
+ os << "\\output_sync " << output_sync << '\n';
+ if (!output_sync_macro.empty())
+ os << "\\output_sync_macro \"" << output_sync_macro << "\"\n";
os << "\\bibtex_command " << bibtex_command << '\n';
os << "\\index_command " << index_command << '\n';
<< "\n\\use_amsmath " << use_amsmath
<< "\n\\use_esint " << use_esint
<< "\n\\use_mhchem " << use_mhchem
+ << "\n\\use_mathdots " << use_mathdots
<< "\n\\cite_engine " << citeenginetranslator().find(cite_engine_)
<< "\n\\use_bibtopic " << convert<string>(use_bibtopic)
<< "\n\\use_indices " << convert<string>(use_indices)
<< "\n\\paperorientation " << string_orientation[orientation]
<< "\n\\suppress_date " << convert<string>(suppress_date)
+ << "\n\\use_refstyle " << use_refstyle
<< '\n';
- if (backgroundcolor != lyx::rgbFromHexName("#ffffff"))
+ if (isbackgroundcolor == true)
os << "\\backgroundcolor " << lyx::X11hexname(backgroundcolor) << '\n';
+ if (isfontcolor == true)
+ os << "\\fontcolor " << lyx::X11hexname(fontcolor) << '\n';
+ if (notefontcolor != lyx::rgbFromHexName("#cccccc"))
+ os << "\\notefontcolor " << lyx::X11hexname(notefontcolor) << '\n';
+ if (boxbgcolor != lyx::rgbFromHexName("#ff0000"))
+ os << "\\boxbgcolor " << lyx::X11hexname(boxbgcolor) << '\n';
BranchList::const_iterator it = branchlist().begin();
BranchList::const_iterator end = branchlist().end();
for (; it != end; ++it) {
os << "\\branch " << to_utf8(it->branch())
<< "\n\\selected " << it->isSelected()
- << "\n\\filename_suffix " << it->hasFilenameSuffix()
+ << "\n\\filename_suffix " << it->hasFileNameSuffix()
<< "\n\\color " << lyx::X11hexname(it->color())
<< "\n\\end_branch"
<< "\n";
}
}
- os << "\\tracking_changes " << convert<string>(trackChanges) << "\n"
- << "\\output_changes " << convert<string>(outputChanges) << "\n"
- << "\\html_use_mathml " << convert<string>(html_use_mathml) << "\n"
- << "\\html_be_strict " << convert<string>(html_be_strict) << "\n";
+ os << "\\tracking_changes " << convert<string>(trackChanges) << '\n'
+ << "\\output_changes " << convert<string>(outputChanges) << '\n'
+ << "\\html_math_output " << html_math_output << '\n'
+ << "\\html_be_strict " << convert<string>(html_be_strict) << '\n';
+
+ if (html_math_img_scale != 1.0)
+ os << "\\html_math_img_scale " << convert<string>(html_math_img_scale) << '\n';
+ if (!html_latex_start.empty())
+ os << "\\html_latex_start " << html_latex_start << '\n';
+ if (!html_latex_end.empty())
+ os << "\\html_latex_end " << html_latex_end << '\n';
os << pimpl_->authorlist;
}
features.require("ct-none");
}
break;
+ case OutputParams::LUATEX:
case OutputParams::PDFLATEX:
case OutputParams::XETEX:
if (xcolorulem) {
features.require("esint");
if (use_mhchem == package_on)
features.require("mhchem");
+ if (use_mathdots == package_on)
+ features.require("mathdots");
// Document-level line spacing
if (spacing().getSpace() != Spacing::Single && !spacing().isDefault())
features.require("color");
}
- if (useXetex)
- features.require("xetex");
+ if (features.runparams().flavor == OutputParams::XETEX
+ && useNonTeXFonts)
+ features.require("polyglossia");
if (language->lang() == "vietnamese")
features.require("vietnamese");
bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
TexRow & texrow, FileName const & filepath) const
{
+ // http://www.tug.org/texmf-dist/doc/latex/base/fixltx2e.pdf
+ // !! To use the Fix-cm package, load it before \documentclass, and use the command
+ // \RequirePackage to do so, rather than the normal \usepackage
+ // Do not to load any other package before the document class, unless you
+ // have a thorough understanding of the LATEX internals and know exactly what you
+ // are doing!
+ if (features.mustProvide("fix-cm")) {
+ os << "\\RequirePackage{fix-cm}\n";
+ texrow.newline();
+ }
+
os << "\\documentclass";
DocumentClass const & tclass = documentClass();
clsoptions << fontsize << "pt,";
}
- // custom, A3, B3 and B4 paper sizes need geometry
- bool nonstandard_papersize = papersize == PAPER_B3
- || papersize == PAPER_B4
- || papersize == PAPER_A3
- || papersize == PAPER_CUSTOM;
+ // all paper sizes except of A4, A5, B5 and the US sizes need the
+ // geometry package
+ bool nonstandard_papersize = papersize != PAPER_DEFAULT
+ && papersize != PAPER_USLETTER
+ && papersize != PAPER_USLEGAL
+ && papersize != PAPER_USEXECUTIVE
+ && papersize != PAPER_A4
+ && papersize != PAPER_A5
+ && papersize != PAPER_B5;
if (!use_geometry) {
switch (papersize) {
clsoptions << "legalpaper,";
break;
case PAPER_DEFAULT:
+ case PAPER_A0:
+ case PAPER_A1:
+ case PAPER_A2:
case PAPER_A3:
+ case PAPER_A6:
+ case PAPER_B0:
+ case PAPER_B1:
+ case PAPER_B2:
case PAPER_B3:
case PAPER_B4:
+ case PAPER_B6:
+ case PAPER_C0:
+ case PAPER_C1:
+ case PAPER_C2:
+ case PAPER_C3:
+ case PAPER_C4:
+ case PAPER_C5:
+ case PAPER_C6:
+ case PAPER_JISB0:
+ case PAPER_JISB1:
+ case PAPER_JISB2:
+ case PAPER_JISB3:
+ case PAPER_JISB4:
+ case PAPER_JISB5:
+ case PAPER_JISB6:
case PAPER_CUSTOM:
break;
}
features.useLanguage(default_language);
ostringstream language_options;
- bool const use_babel = features.useBabel();
- if (use_babel) {
+ bool const use_babel = features.useBabel() && !tclass.provides("babel");
+ bool const use_polyglossia = features.usePolyglossia();
+ bool const global = lyxrc.language_global_options;
+ if (use_babel || (use_polyglossia && global)) {
language_options << features.getLanguages();
if (!language->babel().empty()) {
if (!language_options.str().empty())
language_options << ',';
language_options << language->babel();
}
- // if Vietnamese is used, babel must directly be loaded
- // with language options, not in the class options, see
- // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129417.html
- size_t viet = language_options.str().find("vietnam");
- // viet = string::npos when not found
- // the same is for all other languages that are not directly supported by
- // babel, but where LaTeX-packages add babel support.
- // this is currently the case for Latvian, Lithuanian, and Mongolian
- size_t latvian = language_options.str().find("latvian");
- size_t lithu = language_options.str().find("lithuanian");
- size_t mongo = language_options.str().find("mongolian");
- // if Japanese is used, babel must directly be loaded
- // with language options, not in the class options, see
- // http://www.lyx.org/trac/ticket/4597#c4
- size_t japan = language_options.str().find("japanese");
- if (lyxrc.language_global_options && !language_options.str().empty()
- && viet == string::npos && japan == string::npos
- && latvian == string::npos && lithu == string::npos
- && mongo == string::npos)
+ if (global && !features.needBabelLangOptions())
clsoptions << language_options.str() << ',';
}
texrow.newline();
// end of \documentclass defs
- if (useXetex) {
+ int nlines;
+ // if we use fontspec, we have to load the AMS packages here
+ string const ams = features.loadAMSPackages();
+ if (useNonTeXFonts && !ams.empty()) {
+ os << from_ascii(ams);
+ nlines = int(count(ams.begin(), ams.end(), '\n'));
+ texrow.newlines(nlines);
+ }
+
+ if (useNonTeXFonts) {
os << "\\usepackage{fontspec}\n";
texrow.newline();
}
// font selection must be done before loading fontenc.sty
string const fonts =
- loadFonts(fontsRoman, fontsSans,
- fontsTypewriter, fontsSC, fontsOSF,
- fontsSansScale, fontsTypewriterScale, useXetex);
+ loadFonts(fonts_roman, fonts_sans, fonts_typewriter,
+ fonts_expert_sc, fonts_old_figures,
+ fonts_sans_scale, fonts_typewriter_scale,
+ useNonTeXFonts, features);
if (!fonts.empty()) {
os << from_ascii(fonts);
- texrow.newline();
+ nlines =
+ int(count(fonts.begin(), fonts.end(), '\n'));
+ texrow.newlines(nlines);
}
- if (fontsDefaultFamily != "default")
+ if (fonts_default_family != "default")
os << "\\renewcommand{\\familydefault}{\\"
- << from_ascii(fontsDefaultFamily) << "}\n";
+ << from_ascii(fonts_default_family) << "}\n";
// set font encoding
// for arabic_arabi and farsi we also need to load the LAE and
// LFE encoding
- // XeTeX works without fontenc
+ // XeTeX and LuaTeX (with OS fonts) work without fontenc
if (font_encoding() != "default" && language->lang() != "japanese"
- && !useXetex) {
+ && !useNonTeXFonts && !tclass.provides("fontenc")) {
+ size_t fars = language_options.str().find("farsi");
+ size_t arab = language_options.str().find("arabic");
if (language->lang() == "arabic_arabi"
- || language->lang() == "farsi") {
+ || language->lang() == "farsi" || fars != string::npos
+ || arab != string::npos) {
os << "\\usepackage[" << from_ascii(font_encoding())
<< ",LFE,LAE]{fontenc}\n";
texrow.newline();
writeEncodingPreamble(os, features, texrow);
// includeonly
- if (!features.runparams().includeall && !includedChildren_.empty()) {
+ if (!features.runparams().includeall && !included_children_.empty()) {
os << "\\includeonly{";
- list<string>::const_iterator it = includedChildren_.begin();
+ list<string>::const_iterator it = included_children_.begin();
+ list<string>::const_iterator en = included_children_.end();
bool first = true;
- for (; it != includedChildren_.end() ; ++it) {
+ for (; it != en; ++it) {
string incfile = *it;
- FileName inc = makeAbsPath(incfile, filepath.absFilename());
- string mangled = DocFileName(changeExtension(inc.absFilename(), ".tex")).
- mangledFilename();
+ FileName inc = makeAbsPath(incfile, filepath.absFileName());
+ string mangled = DocFileName(changeExtension(inc.absFileName(), ".tex")).
+ mangledFileName();
if (!features.runparams().nice)
incfile = mangled;
// \includeonly doesn't want an extension
incfile = changeExtension(incfile, string());
- incfile = latex_path(incfile);
+ incfile = support::latex_path(incfile);
if (!incfile.empty()) {
if (!first)
os << ",";
case PAPER_USEXECUTIVE:
ods << ",executivepaper";
break;
+ case PAPER_A0:
+ ods << ",a0paper";
+ break;
+ case PAPER_A1:
+ ods << ",a1paper";
+ break;
+ case PAPER_A2:
+ ods << ",a2paper";
+ break;
case PAPER_A3:
ods << ",a3paper";
break;
case PAPER_A5:
ods << ",a5paper";
break;
+ case PAPER_A6:
+ ods << ",a6paper";
+ break;
+ case PAPER_B0:
+ ods << ",b0paper";
+ break;
+ case PAPER_B1:
+ ods << ",b1paper";
+ break;
+ case PAPER_B2:
+ ods << ",b2paper";
+ break;
case PAPER_B3:
ods << ",b3paper";
break;
case PAPER_B5:
ods << ",b5paper";
break;
+ case PAPER_B6:
+ ods << ",b6paper";
+ break;
+ case PAPER_C0:
+ ods << ",c0paper";
+ break;
+ case PAPER_C1:
+ ods << ",c1paper";
+ break;
+ case PAPER_C2:
+ ods << ",c2paper";
+ break;
+ case PAPER_C3:
+ ods << ",c3paper";
+ break;
+ case PAPER_C4:
+ ods << ",c4paper";
+ break;
+ case PAPER_C5:
+ ods << ",c5paper";
+ break;
+ case PAPER_C6:
+ ods << ",c6paper";
+ break;
+ case PAPER_JISB0:
+ ods << ",b0j";
+ break;
+ case PAPER_JISB1:
+ ods << ",b1j";
+ break;
+ case PAPER_JISB2:
+ ods << ",b2j";
+ break;
+ case PAPER_JISB3:
+ ods << ",b3j";
+ break;
+ case PAPER_JISB4:
+ ods << ",b4j";
+ break;
+ case PAPER_JISB5:
+ ods << ",b5j";
+ break;
+ case PAPER_JISB6:
+ ods << ",b6j";
+ break;
default:
// default papersize ie PAPER_DEFAULT
switch (lyxrc.default_papersize) {
case PAPER_DEFAULT: // keep compiler happy
+ break;
case PAPER_USLETTER:
ods << ",letterpaper";
break;
case PAPER_B5:
ods << ",b5paper";
break;
+ case PAPER_A0:
+ case PAPER_A1:
+ case PAPER_A2:
+ case PAPER_A6:
+ case PAPER_B0:
+ case PAPER_B1:
+ case PAPER_B2:
case PAPER_B3:
case PAPER_B4:
+ case PAPER_B6:
+ case PAPER_C0:
+ case PAPER_C1:
+ case PAPER_C2:
+ case PAPER_C3:
+ case PAPER_C4:
+ case PAPER_C5:
+ case PAPER_C6:
+ case PAPER_JISB0:
+ case PAPER_JISB1:
+ case PAPER_JISB2:
+ case PAPER_JISB3:
+ case PAPER_JISB4:
+ case PAPER_JISB5:
+ case PAPER_JISB6:
case PAPER_CUSTOM:
break;
}
os << '[' << g_options << ']';
os << "{geometry}\n";
texrow.newline();
- os << "\\geometry{verbose";
- if (!topmargin.empty())
- os << ",tmargin=" << from_ascii(Length(topmargin).asLatexString());
- if (!bottommargin.empty())
- os << ",bmargin=" << from_ascii(Length(bottommargin).asLatexString());
- if (!leftmargin.empty())
- os << ",lmargin=" << from_ascii(Length(leftmargin).asLatexString());
- if (!rightmargin.empty())
- os << ",rmargin=" << from_ascii(Length(rightmargin).asLatexString());
- if (!headheight.empty())
- os << ",headheight=" << from_ascii(Length(headheight).asLatexString());
- if (!headsep.empty())
- os << ",headsep=" << from_ascii(Length(headsep).asLatexString());
- if (!footskip.empty())
- os << ",footskip=" << from_ascii(Length(footskip).asLatexString());
- if (!columnsep.empty())
- os << ",columnsep=" << from_ascii(Length(columnsep).asLatexString());
- os << "}\n";
- texrow.newline();
- } else if (orientation == ORIENTATION_LANDSCAPE) {
+ // output this only if use_geometry is true
+ if (use_geometry) {
+ os << "\\geometry{verbose";
+ if (!topmargin.empty())
+ os << ",tmargin=" << from_ascii(Length(topmargin).asLatexString());
+ if (!bottommargin.empty())
+ os << ",bmargin=" << from_ascii(Length(bottommargin).asLatexString());
+ if (!leftmargin.empty())
+ os << ",lmargin=" << from_ascii(Length(leftmargin).asLatexString());
+ if (!rightmargin.empty())
+ os << ",rmargin=" << from_ascii(Length(rightmargin).asLatexString());
+ if (!headheight.empty())
+ os << ",headheight=" << from_ascii(Length(headheight).asLatexString());
+ if (!headsep.empty())
+ os << ",headsep=" << from_ascii(Length(headsep).asLatexString());
+ if (!footskip.empty())
+ os << ",footskip=" << from_ascii(Length(footskip).asLatexString());
+ if (!columnsep.empty())
+ os << ",columnsep=" << from_ascii(Length(columnsep).asLatexString());
+ os << "}\n";
+ texrow.newline();
+ }
+ } else if (orientation == ORIENTATION_LANDSCAPE
+ || papersize != PAPER_DEFAULT) {
features.require("papersize");
}
texrow.newline();
}
- // only output when the background color is not white
- if (backgroundcolor != lyx::rgbFromHexName("#ffffff")) {
+ // only output when the background color is not default
+ if (isbackgroundcolor == true) {
// only require color here, the background color will be defined
// in LaTeXFeatures.cpp to avoid interferences with the LaTeX
// package pdfpages
features.require("pagecolor");
}
+ // only output when the font color is not default
+ if (isfontcolor == true) {
+ // only require color here, the font color will be defined
+ // in LaTeXFeatures.cpp to avoid interferences with the LaTeX
+ // package pdfpages
+ features.require("color");
+ features.require("fontcolor");
+ }
+
// Only if class has a ToC hierarchy
if (tclass.hasTocLevels()) {
if (secnumdepth != tclass.secnumdepth()) {
// Now insert the LyX specific LaTeX commands...
docstring lyxpreamble;
+ if (output_sync) {
+ if (!output_sync_macro.empty())
+ lyxpreamble += from_utf8(output_sync_macro) +"\n";
+ else if (features.runparams().flavor == OutputParams::LATEX)
+ lyxpreamble += "\\usepackage[active]{srcltx}\n";
+ else if (features.runparams().flavor == OutputParams::PDFLATEX)
+ lyxpreamble += "\\synctex=-1\n";
+ }
+
// due to interferences with babel and hyperref, the color package has to
// be loaded (when it is not already loaded) before babel when hyperref
// is used with the colorlinks option, see
// If we use hyperref, jurabib, japanese, or vietnamese, we have to call babel before them.
if (use_babel
- && (features.isRequired("jurabib")
- || features.isRequired("hyperref")
- || features.isRequired("vietnamese")
- || features.isRequired("japanese") ) ) {
- // FIXME UNICODE
- lyxpreamble += from_utf8(babelCall(language_options.str())) + '\n';
- lyxpreamble += from_utf8(features.getBabelOptions()) + '\n';
+ && (features.isRequired("jurabib")
+ || features.isRequired("hyperref")
+ || features.isRequired("vietnamese")
+ || features.isRequired("japanese"))) {
+ // FIXME UNICODE
+ lyxpreamble += from_utf8(features.getBabelPresettings());
+ lyxpreamble += from_utf8(babelCall(language_options.str(),
+ features.needBabelLangOptions())) + '\n';
+ lyxpreamble += from_utf8(features.getBabelPostsettings());
}
// The optional packages;
// before hyperref. Then hyperref has a chance to detect babel.
// * Has to be loaded before the "LyX specific LaTeX commands" to
// avoid errors with algorithm floats.
- // use hyperref explicitly when it is required
+ // use hyperref explicitly if it is required
if (features.isRequired("hyperref")) {
- odocstringstream oss;
- pdfoptions().writeLaTeX(oss, documentClass().provides("hyperref"));
- lyxpreamble += oss.str();
- }
-
+ // pass what we have to stream here, since we need
+ // to access the stream itself in PDFOptions.
+ os << lyxpreamble;
+
+ int lines =
+ int(count(lyxpreamble.begin(), lyxpreamble.end(), '\n'));
+
+ OutputParams tmp_params = features.runparams();
+ lines += pdfoptions().writeLaTeX(tmp_params, os,
+ documentClass().provides("hyperref"));
+ texrow.newlines(lines);
+ // set back for the rest
+ lyxpreamble.clear();
+ // correctly break URLs with hyperref and dvi output
+ if (features.runparams().flavor == OutputParams::LATEX
+ && features.isAvailable("breakurl"))
+ lyxpreamble += "\\usepackage{breakurl}\n";
+ } else if (features.isRequired("nameref"))
+ // hyperref loads this automatically
+ lyxpreamble += "\\usepackage{nameref}\n";
+
// Will be surrounded by \makeatletter and \makeatother when not empty
docstring atlyxpreamble;
&& !features.isRequired("vietnamese")
&& !features.isRequired("japanese")) {
// FIXME UNICODE
- lyxpreamble += from_utf8(babelCall(language_options.str())) + '\n';
- lyxpreamble += from_utf8(features.getBabelOptions()) + '\n';
+ lyxpreamble += from_utf8(features.getBabelPresettings());
+ lyxpreamble += from_utf8(babelCall(language_options.str(),
+ features.needBabelLangOptions())) + '\n';
+ lyxpreamble += from_utf8(features.getBabelPostsettings());
+ }
+
+ // xunicode needs to be loaded at least after amsmath, amssymb,
+ // esint and the other packages that provide special glyphs
+ if (features.runparams().flavor == OutputParams::XETEX)
+ lyxpreamble += "\\usepackage{xunicode}\n";
+
+ // Polyglossia must be loaded last
+ if (use_polyglossia) {
+ // call the package
+ lyxpreamble += "\\usepackage{polyglossia}\n";
+ // set the main language
+ lyxpreamble += "\\setdefaultlanguage";
+ if (!language->polyglossiaOpts().empty())
+ lyxpreamble += "[" + from_ascii(language->polyglossiaOpts()) + "]";
+ lyxpreamble += "{" + from_ascii(language->polyglossia()) + "}\n";
+ // now setup the other languages
+ std::map<std::string, std::string> const polylangs =
+ features.getPolyglossiaLanguages();
+ for (std::map<std::string, std::string>::const_iterator mit = polylangs.begin();
+ mit != polylangs.end() ; ++mit) {
+ lyxpreamble += "\\setotherlanguage";
+ if (!mit->second.empty())
+ lyxpreamble += "[" + from_ascii(mit->second) + "]";
+ lyxpreamble += "{" + from_ascii(mit->first) + "}\n";
+ }
}
- docstring const i18npreamble = features.getTClassI18nPreamble(use_babel);
+ docstring const i18npreamble =
+ features.getTClassI18nPreamble(use_babel, use_polyglossia);
if (!i18npreamble.empty())
lyxpreamble += i18npreamble + '\n';
- int const nlines =
- int(count(lyxpreamble.begin(), lyxpreamble.end(), '\n'));
- for (int j = 0; j != nlines; ++j) {
- texrow.newline();
- }
+ nlines = int(count(lyxpreamble.begin(), lyxpreamble.end(), '\n'));
+ texrow.newlines(nlines);
os << lyxpreamble;
- // these packages (xunicode, for that matter) need to be loaded at least
- // after amsmath, amssymb, esint and the other packages that provide
- // special glyphs
- if (useXetex) {
- os << "\\usepackage{xunicode}\n";
- texrow.newline();
- os << "\\usepackage{xltxtra}\n";
- texrow.newline();
- }
return use_babel;
}
}
-DocumentClass const * BufferParams::documentClassPtr() const {
+DocumentClass const * BufferParams::documentClassPtr() const
+{
return doc_class_;
}
-void BufferParams::setDocumentClass(DocumentClass const * const tc) {
+void BufferParams::setDocumentClass(DocumentClass const * const tc)
+{
// evil, but this function is evil
doc_class_ = const_cast<DocumentClass *>(tc);
}
LayoutFileList & bcl = LayoutFileList::get();
if (!bcl.haveClass(classname)) {
docstring s =
- bformat(_("The document class %1$s could not be found. "
- "A default textclass with default layouts will be used. "
- "LyX might not be able to produce output unless a correct "
- "textclass is selected from the document settings dialog."),
+ bformat(_("The layout file:\n"
+ "%1$s\n"
+ "could not be found. A default textclass with default\n"
+ "layouts will be used. LyX will not be able to produce\n"
+ "correct output."),
from_utf8(classname));
frontend::Alert::error(_("Document class not found"), s);
bcl.addEmptyClass(classname);
bool const success = bcl[classname].load();
if (!success) {
docstring s =
- bformat(_("The document class %1$s could not be loaded."),
+ bformat(_("Due to some error in it, the layout file:\n"
+ "%1$s\n"
+ "could not be loaded. A default textclass with default\n"
+ "layouts will be used. LyX will not be able to produce\n"
+ "correct output."),
from_utf8(classname));
frontend::Alert::error(_("Could not load class"), s);
- return false;
+ bcl.addEmptyClass(classname);
}
pimpl_->baseClass_ = classname;
- layoutModules_.adaptToBaseClass(baseClass(), removedModules_);
+ layout_modules_.adaptToBaseClass(baseClass(), removed_modules_);
return true;
}
if (!baseClass())
return;
- doc_class_ = &(DocumentClassBundle::get().makeDocumentClass(*baseClass(), layoutModules_));
+ doc_class_ = &(DocumentClassBundle::get().makeDocumentClass(*baseClass(), layout_modules_));
if (!local_layout.empty()) {
if (!doc_class_->read(local_layout, TextClass::MODULE)) {
}
}
+
bool BufferParams::moduleCanBeAdded(string const & modName) const
{
- return layoutModules_.moduleCanBeAdded(modName, baseClass());
+ return layout_modules_.moduleCanBeAdded(modName, baseClass());
}
bool BufferParams::addLayoutModule(string const & modName)
{
- LayoutModuleList::const_iterator it = layoutModules_.begin();
- LayoutModuleList::const_iterator end = layoutModules_.end();
+ LayoutModuleList::const_iterator it = layout_modules_.begin();
+ LayoutModuleList::const_iterator end = layout_modules_.end();
for (; it != end; it++)
if (*it == modName)
return false;
- layoutModules_.push_back(modName);
+ layout_modules_.push_back(modName);
return true;
}
Font const BufferParams::getFont() const
{
FontInfo f = documentClass().defaultfont();
- if (fontsDefaultFamily == "rmdefault")
+ if (fonts_default_family == "rmdefault")
f.setFamily(ROMAN_FAMILY);
- else if (fontsDefaultFamily == "sfdefault")
+ else if (fonts_default_family == "sfdefault")
f.setFamily(SANS_FAMILY);
- else if (fontsDefaultFamily == "ttdefault")
+ else if (fonts_default_family == "ttdefault")
f.setFamily(TYPEWRITER_FAMILY);
return Font(f, language);
}
string const test = tex_graphics[n++];
if (test == tmptok) {
- graphicsDriver = tmptok;
+ graphics_driver = tmptok;
break;
}
if (test.empty()) {
lex.printError(
"Warning: graphics driver `$$Token' not recognized!\n"
" Setting graphics driver to `default'.\n");
- graphicsDriver = "default";
+ graphics_driver = "default";
break;
}
}
string mod = lex.getString();
if (mod == "\\end_removed_modules")
break;
- removedModules_.push_back(mod);
+ removed_modules_.push_back(mod);
lex.eatLine();
}
// now we want to remove any removed modules that were previously
// added. normally, that will be because default modules were added in
// setBaseClass(), which gets called when \textclass is read at the
// start of the read.
- list<string>::const_iterator rit = removedModules_.begin();
- list<string>::const_iterator const ren = removedModules_.end();
+ list<string>::const_iterator rit = removed_modules_.begin();
+ list<string>::const_iterator const ren = removed_modules_.end();
for (; rit != ren; rit++) {
- LayoutModuleList::iterator const mit = layoutModules_.begin();
- LayoutModuleList::iterator const men = layoutModules_.end();
+ LayoutModuleList::iterator const mit = layout_modules_.begin();
+ LayoutModuleList::iterator const men = layout_modules_.end();
LayoutModuleList::iterator found = find(mit, men, *rit);
if (found == men)
continue;
- layoutModules_.erase(found);
+ layout_modules_.erase(found);
}
}
string child = lex.getString();
if (child == "\\end_includeonly")
break;
- includedChildren_.push_back(child);
+ included_children_.push_back(child);
lex.eatLine();
}
}
}
return string();
}
+ case PAPER_A0:
+ // dvips and dvipdfm do not know this
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "a0";
+ case PAPER_A1:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "a1";
+ case PAPER_A2:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "a2";
case PAPER_A3:
return "a3";
case PAPER_A4:
return "a4";
case PAPER_A5:
return "a5";
+ case PAPER_A6:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "a6";
+ case PAPER_B0:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "b0";
+ case PAPER_B1:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "b1";
+ case PAPER_B2:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "b2";
case PAPER_B3:
- // dvips and dvipdfm do not know this
if (purpose == DVIPS || purpose == DVIPDFM)
return string();
return "b3";
return string();
return "b4";
case PAPER_B5:
- // dvipdfm does not know this
if (purpose == DVIPDFM)
return string();
return "b5";
+ case PAPER_B6:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "b6";
+ case PAPER_C0:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "c0";
+ case PAPER_C1:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "c1";
+ case PAPER_C2:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "c2";
+ case PAPER_C3:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "c3";
+ case PAPER_C4:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "c4";
+ case PAPER_C5:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "c5";
+ case PAPER_C6:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "c6";
+ case PAPER_JISB0:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "jisb0";
+ case PAPER_JISB1:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "jisb1";
+ case PAPER_JISB2:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "jisb2";
+ case PAPER_JISB3:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "jisb3";
+ case PAPER_JISB4:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "jisb4";
+ case PAPER_JISB5:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "jisb5";
+ case PAPER_JISB6:
+ if (purpose == DVIPS || purpose == DVIPDFM)
+ return string();
+ return "jisb6";
case PAPER_USEXECUTIVE:
// dvipdfm does not know this
if (purpose == DVIPDFM)
}
-string BufferParams::babelCall(string const & lang_opts) const
+string BufferParams::babelCall(string const & lang_opts, bool const langoptions) const
{
- string lang_pack = lyxrc.language_package;
- if (lang_pack != "\\usepackage{babel}")
- return lang_pack;
- // suppress the babel call when there is no babel language defined
+ 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 (lang_opts.empty())
return string();
- // If Vietnamese is used, babel must directly be loaded with the
- // language options, see
- // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129417.html
- size_t viet = lang_opts.find("vietnam");
- // viet = string::npos when not found
- // the same is for all other languages that are not directly supported by
- // babel, but where LaTeX-packages add babel support.
- // this is currently the case for Latvian, Lithuanian, and Mongolian
- size_t latvian = lang_opts.find("latvian");
- size_t lithu = lang_opts.find("lithuanian");
- size_t mongo = lang_opts.find("mongolian");
- // If Japanese is used, babel must directly be loaded with the
- // language options, see
- // http://www.lyx.org/trac/ticket/4597#c4
- size_t japan = lang_opts.find("japanese");
- if (!lyxrc.language_global_options || viet != string::npos
- || japan != string::npos || latvian != string::npos
- || lithu != string::npos || mongo != string::npos)
+ // either a specific language (AsBabelOptions setting in
+ // lib/languages) or the prefs require the languages to
+ // be submitted to babel itself (not the class).
+ if (langoptions)
return "\\usepackage[" + lang_opts + "]{babel}";
- return lang_pack;
+ return "\\usepackage{babel}";
}
docstring result;
if (package == "geometry") {
- if (graphicsDriver == "dvips"
- || graphicsDriver == "dvipdfm"
- || graphicsDriver == "pdftex"
- || graphicsDriver == "vtex")
- result = from_ascii(graphicsDriver);
- else if (graphicsDriver == "dvipdfmx")
+ if (graphics_driver == "dvips"
+ || graphics_driver == "dvipdfm"
+ || graphics_driver == "pdftex"
+ || graphics_driver == "vtex")
+ result = from_ascii(graphics_driver);
+ else if (graphics_driver == "dvipdfmx")
result = from_ascii("dvipdfm");
}
void BufferParams::writeEncodingPreamble(odocstream & os,
LaTeXFeatures & features, TexRow & texrow) const
{
- if (useXetex)
+ // XeTeX does not need this
+ if (features.runparams().flavor == OutputParams::XETEX)
+ return;
+ // LuaTeX neither, but with tex fonts, we need to load
+ // the luainputenc package.
+ if (features.runparams().flavor == OutputParams::LUATEX) {
+ if (!useNonTeXFonts && inputenc != "default"
+ && ((inputenc == "auto" && language->encoding()->package() == Encoding::inputenc)
+ || (inputenc != "auto" && encoding().package() == Encoding::inputenc))) {
+ os << "\\usepackage[utf8]{luainputenc}\n";
+ texrow.newline();
+ }
return;
+ }
if (inputenc == "auto") {
string const doc_encoding =
language->encoding()->latexName();
string const & sf, string const & tt,
bool const & sc, bool const & osf,
int const & sfscale, int const & ttscale,
- bool const & xetex) const
+ 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
ostringstream os;
- if (xetex) {
- if (rm != "default")
- os << "\\setmainfont[Mapping=tex-text]{"
- << parseFontName(rm) << "}\n";
+ /* Fontspec (XeTeX, LuaTeX): we provide GUI support for oldstyle
+ * numbers (Numbers=OldStyle) and sf/tt scaling. The Ligatures=TeX/
+ * Mapping=tex-text option assures TeX ligatures (such as "--")
+ * are resolved. Note that tt does not use these ligatures.
+ * TODO:
+ * -- add more GUI options?
+ * -- add more fonts (fonts for other scripts)
+ * -- if there's a way to find out if a font really supports
+ * OldStyle, enable/disable the widget accordingly.
+ */
+ if (use_systemfonts && features.isAvailable("fontspec")) {
+ // "Mapping=tex-text" and "Ligatures=TeX" are equivalent.
+ // However, until v.2 (2010/07/11) fontspec only knew
+ // Mapping=tex-text (for XeTeX only); then "Ligatures=TeX"
+ // was introduced for both XeTeX and LuaTeX (LuaTeX
+ // didn't understand "Mapping=tex-text", while XeTeX
+ // understood both. With most recent versions, both
+ // variants are understood by both engines. However,
+ // we want to provide support for at least TeXLive 2009.
+ string const texmapping =
+ (features.runparams().flavor == OutputParams::XETEX) ?
+ "Mapping=tex-text" : "Ligatures=TeX";
+ if (rm != "default") {
+ os << "\\setmainfont[" << texmapping;
+ if (osf)
+ os << ",Numbers=OldStyle";
+ os << "]{" << parseFontName(rm) << "}\n";
+ }
if (sf != "default") {
string const sans = parseFontName(sf);
if (sfscale != 100)
os << "\\setsansfont[Scale="
<< float(sfscale) / 100
- << ",Mapping=tex-text]{"
+ << "," << texmapping << "]{"
<< sans << "}\n";
else
- os << "\\setsansfont[Mapping=tex-text]{"
+ os << "\\setsansfont[" << texmapping << "]{"
<< sans << "}\n";
}
if (tt != "default") {
string const mono = parseFontName(tt);
if (ttscale != 100)
os << "\\setmonofont[Scale="
- << float(sfscale) / 100
+ << float(ttscale) / 100
<< "]{"
<< mono << "}\n";
else
- os << "\\setmonofont[Mapping=tex-text]{"
+ os << "\\setmonofont{"
<< mono << "}\n";
}
- if (osf)
- os << "\\defaultfontfeatures{Numbers=OldStyle}\n";
return os.str();
}
Encoding const & BufferParams::encoding() const
{
- if (useXetex)
+ // FIXME: actually, we should check for the flavor
+ // or runparams.isFullyUnicode() here:
+ // This check will not work with XeTeX/LuaTeX and tex fonts.
+ // Thus we have to reset the encoding in Buffer::makeLaTeXFile.
+ if (useNonTeXFonts)
return *(encodings.fromLaTeXName("utf8-plain"));
if (inputenc == "auto" || inputenc == "default")
return *language->encoding();
projects / lyx.git / blobdiff