#include "buffer_funcs.h"
#include "Bullet.h"
#include "Color.h"
+#include "ColorSet.h"
#include "Encoding.h"
+#include "HSpace.h"
+#include "IndicesList.h"
#include "Language.h"
#include "LaTeXFeatures.h"
#include "ModuleList.h"
};
+
namespace lyx {
// Local translators
return translator;
}
-
} // anon namespace
BranchList branchlist;
Bullet temp_bullets[4];
Bullet user_defined_bullets[4];
+ IndicesList indiceslist;
Spacing spacing;
/** This is the amount of space used for paragraph_separation "skip",
* and for detached paragraphs in "indented" documents.
*/
+ HSpace indentation;
VSpace defskip;
PDFOptions pdfoptions;
LayoutFileIndex baseClass_;
use_geometry = false;
use_amsmath = package_auto;
use_esint = package_auto;
+ use_mhchem = package_auto;
cite_engine_ = ENGINE_BASIC;
use_bibtopic = false;
+ use_indices = false;
trackChanges = false;
outputChanges = false;
use_default_options = true;
secnumdepth = 3;
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;
inputenc = "auto";
graphicsDriver = "default";
+ defaultOutputFormat = "default";
+ bibtex_command = "default";
+ index_command = "default";
sides = OneSide;
columns = 1;
listings_params = string();
pagestyle = "default";
+ suppress_date = false;
+ // white is equal to no background color
+ backgroundcolor = lyx::rgbFromHexName("#ffffff");
compressed = false;
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;
}
}
+IndicesList & BufferParams::indiceslist()
+{
+ return pimpl_->indiceslist;
+}
+
+
+IndicesList const & BufferParams::indiceslist() const
+{
+ return pimpl_->indiceslist;
+}
+
+
Bullet & BufferParams::temp_bullet(lyx::size_type const index)
{
LASSERT(index < 4, /**/);
}
+HSpace const & BufferParams::getIndentation() const
+{
+ return pimpl_->indentation;
+}
+
+
+void BufferParams::setIndentation(HSpace const & indent)
+{
+ pimpl_->indentation = indent;
+}
+
+
VSpace const & BufferParams::getDefSkip() const
{
return pimpl_->defskip;
} else if (token == "\\master") {
lex.eatLine();
master = lex.getString();
+ } else if (token == "\\suppress_date") {
+ lex >> suppress_date;
} else if (token == "\\language") {
readLanguage(lex);
} else if (token == "\\inputencoding") {
lex >> inputenc;
} else if (token == "\\graphics") {
readGraphicsDriver(lex);
+ } else if (token == "\\default_output_format") {
+ lex >> defaultOutputFormat;
+ } else if (token == "\\bibtex_command") {
+ lex.eatLine();
+ bibtex_command = lex.getString();
+ } else if (token == "\\index_command") {
+ lex.eatLine();
+ index_command = lex.getString();
+ } else if (token == "\\fontencoding") {
+ lex.eatLine();
+ fontenc = lex.getString();
} else if (token == "\\font_roman") {
- lex >> fontsRoman;
+ lex.eatLine();
+ fontsRoman = lex.getString();
} else if (token == "\\font_sans") {
- lex >> fontsSans;
+ lex.eatLine();
+ fontsSans = lex.getString();
} else if (token == "\\font_typewriter") {
- lex >> fontsTypewriter;
+ lex.eatLine();
+ fontsTypewriter = lex.getString();
} else if (token == "\\font_default_family") {
lex >> fontsDefaultFamily;
+ } else if (token == "\\use_xetex") {
+ lex >> useXetex;
} else if (token == "\\font_sc") {
lex >> fontsSC;
} else if (token == "\\font_osf") {
string parsep;
lex >> parsep;
paragraph_separation = parseptranslator().find(parsep);
+ } else if (token == "\\paragraph_indentation") {
+ lex.next();
+ string indentation = lex.getString();
+ pimpl_->indentation = HSpace(indentation);
} else if (token == "\\defskip") {
lex.next();
string defskip = lex.getString();
int useesint;
lex >> useesint;
use_esint = packagetranslator().find(useesint);
+ } else if (token == "\\use_mhchem") {
+ int usemhchem;
+ lex >> usemhchem;
+ use_mhchem = packagetranslator().find(usemhchem);
} else if (token == "\\cite_engine") {
string engine;
lex >> engine;
cite_engine_ = citeenginetranslator().find(engine);
} else if (token == "\\use_bibtopic") {
lex >> use_bibtopic;
+ } else if (token == "\\use_indices") {
+ lex >> use_indices;
} else if (token == "\\tracking_changes") {
lex >> trackChanges;
} else if (token == "\\output_changes") {
lex >> outputChanges;
} else if (token == "\\branch") {
- lex.next();
+ lex.eatLine();
docstring branch = lex.getDocString();
branchlist().add(branch);
while (true) {
if (branch_ptr)
branch_ptr->setSelected(lex.getInteger());
}
- // not yet operational
+ if (tok == "\\filename_suffix") {
+ lex.next();
+ if (branch_ptr)
+ branch_ptr->setFilenameSuffix(lex.getInteger());
+ }
if (tok == "\\color") {
lex.eatLine();
string color = lex.getString();
color = lcolor.getX11Name(Color_background);
// FIXME UNICODE
lcolor.setColor(to_utf8(branch), color);
-
+ }
+ }
+ } else if (token == "\\index") {
+ lex.eatLine();
+ docstring index = lex.getDocString();
+ docstring shortcut;
+ indiceslist().add(index);
+ while (true) {
+ lex.next();
+ string const tok = lex.getString();
+ if (tok == "\\end_index")
+ break;
+ Index * index_ptr = indiceslist().find(index);
+ if (tok == "\\shortcut") {
+ lex.next();
+ shortcut = lex.getDocString();
+ if (index_ptr)
+ index_ptr->setShortcut(shortcut);
+ }
+ if (tok == "\\color") {
+ lex.eatLine();
+ string color = lex.getString();
+ if (index_ptr)
+ index_ptr->setColor(color);
+ // Update also the Color table:
+ if (color == "none")
+ color = lcolor.getX11Name(Color_background);
+ // FIXME UNICODE
+ if (!shortcut.empty())
+ lcolor.setColor(to_utf8(shortcut), color);
}
}
} else if (token == "\\author") {
istringstream ss(lex.getString());
Author a;
ss >> a;
- author_map.push_back(pimpl_->authorlist.record(a));
+ author_map[a.buffer_id()] = pimpl_->authorlist.record(a);
} else if (token == "\\paperorientation") {
string orient;
lex >> orient;
orientation = paperorientationtranslator().find(orient);
+ } else if (token == "\\backgroundcolor") {
+ lex.eatLine();
+ backgroundcolor = lyx::rgbFromHexName(lex.getString());
} 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_be_strict") {
+ lex >> html_be_strict;
} else {
lyxerr << "BufferParams::readToken(): Unknown token: " <<
token << endl;
// removed modules
if (!removedModules_.empty()) {
os << "\\begin_removed_modules" << '\n';
- set<string>::const_iterator it = removedModules_.begin();
- set<string>::const_iterator en = removedModules_.end();
+ list<string>::const_iterator it = removedModules_.begin();
+ list<string>::const_iterator en = removedModules_.end();
for (; it != en; it++)
os << *it << '\n';
os << "\\end_removed_modules" << '\n';
if (language != ignore_language)
os << "\\language " << language->lang() << '\n';
os << "\\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
os << "\\font_cjk " << fontsCJK << '\n';
}
os << "\n\\graphics " << graphicsDriver << '\n';
+ os << "\\default_output_format " << defaultOutputFormat << '\n';
+ os << "\\bibtex_command " << bibtex_command << '\n';
+ os << "\\index_command " << index_command << '\n';
if (!float_placement.empty()) {
os << "\\float_placement " << float_placement << '\n';
<< "\n\\use_geometry " << convert<string>(use_geometry)
<< "\n\\use_amsmath " << use_amsmath
<< "\n\\use_esint " << use_esint
+ << "\n\\use_mhchem " << use_mhchem
<< "\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';
+ if (backgroundcolor != lyx::rgbFromHexName("#ffffff"))
+ os << "\\backgroundcolor " << lyx::X11hexname(backgroundcolor) << '\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\\color " << lyx::X11hexname(it->color())
<< "\n\\end_branch"
<< "\n";
}
+ IndicesList::const_iterator iit = indiceslist().begin();
+ IndicesList::const_iterator iend = indiceslist().end();
+ for (; iit != iend; ++iit) {
+ os << "\\index " << to_utf8(iit->index())
+ << "\n\\shortcut " << to_utf8(iit->shortcut())
+ << "\n\\color " << lyx::X11hexname(iit->color())
+ << "\n\\end_index"
+ << "\n";
+ }
+
if (!paperwidth.empty())
os << "\\paperwidth "
<< VSpace(paperwidth).asLyXCommand() << '\n';
os << "\\secnumdepth " << secnumdepth
<< "\n\\tocdepth " << tocdepth
<< "\n\\paragraph_separation "
- << string_paragraph_separation[paragraph_separation]
- << "\n\\defskip " << getDefSkip().asLyXCommand()
- << "\n\\quotes_language "
+ << string_paragraph_separation[paragraph_separation];
+ if (!paragraph_separation)
+ os << "\n\\paragraph_indentation " << getIndentation().asLyXCommand();
+ else
+ os << "\n\\defskip " << getDefSkip().asLyXCommand();
+ os << "\n\\quotes_language "
<< string_quotes_language[quotes_language]
<< "\n\\papercolumns " << columns
<< "\n\\papersides " << sides
}
}
- os << "\\tracking_changes " << convert<string>(trackChanges) << "\n";
- os << "\\output_changes " << convert<string>(outputChanges) << "\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";
- AuthorList::Authors::const_iterator a_it = pimpl_->authorlist.begin();
- AuthorList::Authors::const_iterator a_end = pimpl_->authorlist.end();
- for (; a_it != a_end; ++a_it) {
- if (a_it->second.used())
- os << "\\author " << a_it->second << "\n";
- else
- os << "\\author " << Author() << "\n";
- }
+ os << pimpl_->authorlist;
}
if (outputChanges) {
bool dvipost = LaTeXFeatures::isAvailable("dvipost");
- bool xcolorsoul = LaTeXFeatures::isAvailable("soul") &&
+ bool xcolorulem = LaTeXFeatures::isAvailable("ulem") &&
LaTeXFeatures::isAvailable("xcolor");
switch (features.runparams().flavor) {
if (dvipost) {
features.require("ct-dvipost");
features.require("dvipost");
- } else if (xcolorsoul) {
- features.require("ct-xcolor-soul");
- features.require("soul");
+ } else if (xcolorulem) {
+ features.require("ct-xcolor-ulem");
+ features.require("ulem");
features.require("xcolor");
} else {
features.require("ct-none");
}
break;
case OutputParams::PDFLATEX:
- if (xcolorsoul) {
- features.require("ct-xcolor-soul");
- features.require("soul");
+ case OutputParams::XETEX:
+ if (xcolorulem) {
+ features.require("ct-xcolor-ulem");
+ features.require("ulem");
features.require("xcolor");
// improves color handling in PDF output
features.require("pdfcolmk");
features.require("amsmath");
if (use_esint == package_on)
features.require("esint");
+ if (use_mhchem == package_on)
+ features.require("mhchem");
// Document-level line spacing
if (spacing().getSpace() != Spacing::Single && !spacing().isDefault())
features.require("hyperref");
// due to interferences with babel and hyperref, the color package has to
// be loaded after hyperref when hyperref is used with the colorlinks
- // option, see http://bugzilla.lyx.org/show_bug.cgi?id=5291
+ // option, see http://www.lyx.org/trac/ticket/5291
if (pdfoptions().colorlinks)
features.require("color");
}
+ if (useXetex)
+ features.require("xetex");
+
if (language->lang() == "vietnamese")
features.require("vietnamese");
else if (language->lang() == "japanese")
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://bugzilla.lyx.org/show_bug.cgi?id=4597#c4
+ // 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
texrow.newline();
// end of \documentclass defs
+ if (useXetex) {
+ 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);
+ fontsSansScale, fontsTypewriterScale, useXetex);
if (!fonts.empty()) {
os << from_ascii(fonts);
texrow.newline();
<< from_ascii(fontsDefaultFamily) << "}\n";
// set font encoding
- // this one is not per buffer
// for arabic_arabi and farsi we also need to load the LAE and
// LFE encoding
- if (lyxrc.fontenc != "default" && language->lang() != "japanese") {
+ // XeTeX works without fontenc
+ if (font_encoding() != "default" && language->lang() != "japanese"
+ && !useXetex) {
if (language->lang() == "arabic_arabi"
|| language->lang() == "farsi") {
- os << "\\usepackage[" << from_ascii(lyxrc.fontenc)
+ os << "\\usepackage[" << from_ascii(font_encoding())
<< ",LFE,LAE]{fontenc}\n";
texrow.newline();
} else {
- os << "\\usepackage[" << from_ascii(lyxrc.fontenc)
+ os << "\\usepackage[" << from_ascii(font_encoding())
<< "]{fontenc}\n";
texrow.newline();
}
os << "}\n";
texrow.newline();
}
- if (use_geometry || nonstandard_papersize) {
+ if (!tclass.provides("geometry")
+ && (use_geometry || nonstandard_papersize)) {
odocstringstream ods;
if (!getGraphicsDriver("geometry").empty())
ods << getGraphicsDriver("geometry");
texrow.newline();
}
+ // only output when the background color is not white
+ if (backgroundcolor != lyx::rgbFromHexName("#ffffff")) {
+ // only require color here, the background color will be defined
+ // in LaTeXFeatures.cpp to avoid interferences with the LaTeX
+ // package pdfpages
+ features.require("color");
+ features.require("pagecolor");
+ }
+
// Only if class has a ToC hierarchy
if (tclass.hasTocLevels()) {
if (secnumdepth != tclass.secnumdepth()) {
}
if (paragraph_separation) {
+ // when skip separation
switch (getDefSkip().kind()) {
case VSpace::SMALLSKIP:
os << "\\setlength{\\parskip}{\\smallskipamount}\n";
break;
}
texrow.newline();
-
os << "\\setlength{\\parindent}{0pt}\n";
texrow.newline();
+ } else {
+ // when separation by indentation
+ // only output something when a width is given
+ if (getIndentation().asLyXCommand() != "default") {
+ os << "\\setlength{\\parindent}{"
+ << from_utf8(getIndentation().asLatexCommand())
+ << "}\n";
+ texrow.newline();
+ }
}
// Now insert the LyX specific LaTeX commands...
// 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
- // http://bugzilla.lyx.org/show_bug.cgi?id=5291
+ // http://www.lyx.org/trac/ticket/5291
// we decided therefore to load color always before babel, see
// http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg144349.html
lyxpreamble += from_ascii(features.getColorOptions());
// The optional packages;
lyxpreamble += from_ascii(features.getPackages());
+ // Additional Indices
+ if (features.isRequired("splitidx")) {
+ IndicesList::const_iterator iit = indiceslist().begin();
+ IndicesList::const_iterator iend = indiceslist().end();
+ for (; iit != iend; ++iit) {
+ lyxpreamble += "\\newindex[";
+ lyxpreamble += iit->index();
+ lyxpreamble += "]{";
+ lyxpreamble += iit->shortcut();
+ lyxpreamble += "}\n";
+ }
+ }
+
// Line spacing
lyxpreamble += from_utf8(spacing().writePreamble(tclass.provides("SetSpace")));
lyxpreamble += oss.str();
}
- // Will be surrounded by \makeatletter and \makeatother when needed
+ // Will be surrounded by \makeatletter and \makeatother when not empty
docstring atlyxpreamble;
// Some macros LyX will need
- docstring tmppreamble(from_ascii(features.getMacros()));
+ docstring tmppreamble(features.getMacros());
if (!tmppreamble.empty())
atlyxpreamble += "\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
"Textclass specific LaTeX commands.\n"
+ tmppreamble + '\n';
+ // suppress date if selected
+ // use \@ifundefined because we cannot be sure that every document class
+ // has a \date command
+ if (suppress_date)
+ atlyxpreamble += "\\@ifundefined{date}{}{\\date{}}\n";
+
/* the user-defined preamble */
- if (!preamble.empty())
+ if (!containsOnly(preamble, " \n\t"))
// FIXME UNICODE
atlyxpreamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
"User specified LaTeX commands.\n"
if (!bullets_def.empty())
atlyxpreamble += bullets_def + "}\n\n";
- if (atlyxpreamble.find(from_ascii("@")) != docstring::npos)
+ if (!atlyxpreamble.empty())
lyxpreamble += "\n\\makeatletter\n"
+ atlyxpreamble + "\\makeatother\n\n";
- else
- lyxpreamble += '\n' + atlyxpreamble;
// We try to load babel late, in case it interferes with other packages.
// Jurabib and Hyperref have to be called after babel, though.
lyxpreamble += from_utf8(features.getBabelOptions()) + '\n';
}
+ docstring const i18npreamble = features.getTClassI18nPreamble(use_babel);
+ if (!i18npreamble.empty())
+ lyxpreamble += i18npreamble + '\n';
+
int const nlines =
int(count(lyxpreamble.begin(), lyxpreamble.end(), '\n'));
for (int j = 0; j != nlines; ++j) {
}
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;
}
}
-bool BufferParams::removeBadModules()
-{
- // we'll write a new list of modules, since we can't just remove them,
- // as that would invalidate our iterators
- list<string> oldModules = getModules();
- clearLayoutModules();
-
- list<string> const & provmods = baseClass()->providedModules();
- list<string> const & exclmods = baseClass()->excludedModules();
- bool consistent = true; // set to false if we have to do anything
-
- list<string>::const_iterator oit = oldModules.begin();
- list<string>::const_iterator const oen = oldModules.end();
- for (; oit != oen; ++oit) {
- string const & modname = *oit;
- // skip modules that the class provides
- if (find(provmods.begin(), provmods.end(), modname) != provmods.end()) {
- LYXERR0("Module `" << modname << "' dropped because provided by document class.");
- consistent = false;
- continue;
- }
- // are we excluded by the document class?
- if (find(exclmods.begin(), exclmods.end(), modname) != exclmods.end()) {
- LYXERR0("Module `" << modname << "' dropped because excluded by document class.");
- consistent = false;
- continue;
- }
- // determine whether some provided module excludes us or we exclude it
- list<string>::const_iterator pit = provmods.begin();
- list<string>::const_iterator const pen = provmods.end();
- bool excluded = false;
- for (; !excluded && pit != pen; ++pit) {
- if (!LyXModule::areCompatible(modname, *pit)) {
- LYXERR0("Module " << modname <<
- " dropped becuase it conflicts with provided module `" << *pit << "'.");
- consistent = false;
- excluded = true;
- }
- }
- if (excluded)
- continue;
- layoutModules_.push_back(modname);
- }
- return consistent;
-}
-
-
-void BufferParams::addDefaultModules()
-{
- // add any default modules not already in use
- list<string> const & mods = baseClass()->defaultModules();
- list<string>::const_iterator mit = mods.begin();
- list<string>::const_iterator men = mods.end();
-
- // We want to insert the default modules at the beginning of
- // the list, but also to insert them in the correct order.
- // The obvious thing to do would be to collect them and then
- // insert them, but that doesn't work because a later default
- // module may require an earlier one, and then the test below
- // moduleCanBeAdded(modname)
- // will fail. So we have to do it a more complicated way.
- list<string>::iterator insertpos = layoutModules_.begin();
- int numinserts = 0;
-
- for (; mit != men; mit++) {
- string const & modName = *mit;
- // make sure the user hasn't removed it
- if (find(removedModules_.begin(), removedModules_.end(), modName) !=
- removedModules_.end()) {
- LYXERR(Debug::TCLASS, "Default module `" << modName <<
- "' not added because removed by user.");
- continue;
- }
-
- if (!moduleCanBeAdded(modName)) {
- // FIXME This could be because it's already present, so we should
- // probably return something indicating that.
- LYXERR(Debug::TCLASS, "Default module `" << modName <<
- "' could not be added.");
- continue;
- }
- LYXERR(Debug::TCLASS, "Default module `" << modName << "' added.");
- layoutModules_.insert(insertpos, modName);
- // now we reset insertpos
- ++numinserts;
- insertpos = layoutModules_.begin();
- advance(insertpos, numinserts);
- }
-}
-
-
-bool BufferParams::checkModuleConsistency() {
- bool consistent = true;
- // Perform a consistency check on the set of modules. We need to make
- // sure that none of the modules exclude each other and that requires
- // are satisfied.
- list<string> oldModules = getModules();
- clearLayoutModules();
- list<string>::const_iterator oit = oldModules.begin();
- list<string>::const_iterator oen = oldModules.end();
- list<string> const & provmods = baseClass()->providedModules();
- for (; oit != oen; ++oit) {
- string const & modname = *oit;
- bool excluded = false;
- // Determine whether some prior module excludes us, or we exclude it
- list<string>::const_iterator lit = layoutModules_.begin();
- list<string>::const_iterator len = layoutModules_.end();
- for (; !excluded && lit != len; ++lit) {
- if (!LyXModule::areCompatible(modname, *lit)) {
- consistent = false;
- LYXERR0("Module " << modname <<
- " dropped because it is excluded by prior module " << *lit);
- excluded = true;
- }
- }
-
- if (excluded)
- continue;
-
- // determine whether some provided module or some prior module
- // satisfies our requirements
- LyXModule const * const oldmod = moduleList[modname];
- if (!oldmod) {
- LYXERR0("Default module " << modname <<
- " added although it is unavailable and can't check requirements.");
- continue;
- }
-
- vector<string> const & reqs = oldmod->getRequiredModules();
- if (!reqs.empty()) {
- // we now set excluded to true, meaning that we haven't
- // yet found a required module.
- excluded = true;
- vector<string>::const_iterator rit = reqs.begin();
- vector<string>::const_iterator ren = reqs.end();
- for (; rit != ren; ++rit) {
- string const reqmod = *rit;
- if (find(provmods.begin(), provmods.end(), reqmod) !=
- provmods.end()) {
- excluded = false;
- break;
- }
- if (find(layoutModules_.begin(), layoutModules_.end(), reqmod) !=
- layoutModules_.end()) {
- excluded = false;
- break;
- }
- }
- }
- if (excluded) {
- consistent = false;
- LYXERR0("Module " << modname << " dropped because requirements not met.");
- } else {
- LYXERR(Debug::TCLASS, "Module " << modname << " passed consistency check.");
- layoutModules_.push_back(modname);
- }
- }
- return consistent;
-}
-
-
bool BufferParams::setBaseClass(string const & classname)
{
LYXERR(Debug::TCLASS, "setBaseClass: " << classname);
}
pimpl_->baseClass_ = classname;
- // the previous document class may have loaded some modules that the
- // new one excludes, and the new class may provide, etc, some that
- // conflict with ones that were already loaded. So we need to go
- // through the list and fix everything. I suppose there are various
- // ways this could be done, but the following seems to work at the
- // moment. (Thanks to Philippe Charpentier for helping work out all
- // the bugs---rgh.)
- //
- // first, we remove any modules the new document class itself provides,
- // those it excludes, and those that conflict with ones it excludes.
- // this has to be done first because, otherwise, a module we're about
- // to remove could prevent a default module from being added.
- removeBadModules();
- // next, we add any default modules the new class provides.
- addDefaultModules();
- // finally, we perform a general consistency check on the set of
- // loaded modules.
- checkModuleConsistency();
- // FIXME removeBadModules() and checkModuleConsistency() both return
- // a boolean indicating whether something had to be changed. It might
- // be worth popping a message to the user if so.
-
+ layoutModules_.adaptToBaseClass(baseClass(), removedModules_);
return true;
}
if (!baseClass())
return;
- doc_class_ = &(DocumentClassBundle::get().newClass(*baseClass()));
+ doc_class_ = &(DocumentClassBundle::get().makeDocumentClass(*baseClass(), layoutModules_));
- // FIXME It might be worth loading the children's modules here,
- // just as we load their bibliographies and such, instead of just
- // doing a check in InsetInclude.
- LayoutModuleList::const_iterator it = layoutModules_.begin();
- for (; it != layoutModules_.end(); it++) {
- string const modName = *it;
- LyXModule * lm = moduleList[modName];
- if (!lm) {
- docstring const msg =
- bformat(_("The module %1$s has been requested by\n"
- "this document but has not been found in the list of\n"
- "available modules. If you recently installed it, you\n"
- "probably need to reconfigure LyX.\n"), from_utf8(modName));
- frontend::Alert::warning(_("Module not available"),
- msg + _("Some layouts may not be available."));
- LYXERR0("BufferParams::makeDocumentClass(): Module " <<
- modName << " requested but not found in module list.");
- continue;
- }
- if (!lm->isAvailable()) {
- docstring const msg =
- bformat(_("The module %1$s requires a package that is\n"
- "not available in your LaTeX installation. LaTeX output\n"
- "may not be possible.\n"), from_utf8(modName));
- frontend::Alert::warning(_("Package not available"), msg);
- }
- FileName layout_file = libFileSearch("layouts", lm->getFilename());
- if (!doc_class_->read(layout_file, TextClass::MODULE)) {
- docstring const msg =
- bformat(_("Error reading module %1$s\n"), from_utf8(modName));
- frontend::Alert::warning(_("Read Error"), msg);
- }
- }
if (!local_layout.empty()) {
if (!doc_class_->read(local_layout, TextClass::MODULE)) {
docstring const msg = _("Error reading internal layout information");
}
}
-
bool BufferParams::moduleCanBeAdded(string const & modName) const
{
- // Is the module already present?
- LayoutModuleList::const_iterator it = layoutModules_.begin();
- LayoutModuleList::const_iterator end = layoutModules_.end();
- for (; it != end; it++)
- if (*it == modName)
- return false;
-
- LyXModule const * const lm = moduleList[modName];
- if (!lm)
- return true;
-
- // Is this module explicitly excluded by the document class?
- list<string>::const_iterator const exclmodstart =
- baseClass()->excludedModules().begin();
- list<string>::const_iterator const exclmodend =
- baseClass()->excludedModules().end();
- if (find(exclmodstart, exclmodend, modName) != exclmodend)
- return false;
-
- // Is this module already provided by the document class?
- list<string>::const_iterator const provmodstart =
- baseClass()->providedModules().begin();
- list<string>::const_iterator const provmodend =
- baseClass()->providedModules().end();
- if (find(provmodstart, provmodend, modName) != provmodend)
- return false;
-
- // Check for conflicts with used modules
- // first the provided modules...
- list<string>::const_iterator provmodit = provmodstart;
- for (; provmodit != provmodend; ++provmodit) {
- if (!LyXModule::areCompatible(modName, *provmodit))
- return false;
- }
- // and then the selected modules
- LayoutModuleList::const_iterator mit = getModules().begin();
- LayoutModuleList::const_iterator const men = getModules().end();
- for (; mit != men; ++mit)
- if (!LyXModule::areCompatible(modName, *mit))
- return false;
-
- // Check whether some required module is available
- vector<string> const reqs = lm->getRequiredModules();
- if (reqs.empty())
- return true;
-
- mit = getModules().begin(); // reset
- vector<string>::const_iterator rit = reqs.begin();
- vector<string>::const_iterator ren = reqs.end();
- bool foundone = false;
- for (; rit != ren; ++rit) {
- if (find(mit, men, *rit) != men ||
- find(provmodstart, provmodend, *rit) != provmodend) {
- foundone = true;
- break;
- }
- }
-
- return foundone;
+ return layoutModules_.moduleCanBeAdded(modName, baseClass());
}
string mod = lex.getString();
if (mod == "\\end_removed_modules")
break;
- removedModules_.insert(mod);
+ removedModules_.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.
- set<string>::const_iterator rit = removedModules_.begin();
- set<string>::const_iterator const ren = removedModules_.end();
+ list<string>::const_iterator rit = removedModules_.begin();
+ list<string>::const_iterator const ren = removedModules_.end();
for (; rit != ren; rit++) {
LayoutModuleList::iterator const mit = layoutModules_.begin();
LayoutModuleList::iterator const men = layoutModules_.end();
}
+string const BufferParams::font_encoding() const
+{
+ return (fontenc == "global") ? lyxrc.fontenc : fontenc;
+}
+
+
string BufferParams::babelCall(string const & lang_opts) const
{
string lang_pack = lyxrc.language_package;
size_t mongo = lang_opts.find("mongolian");
// If Japanese is used, babel must directly be loaded with the
// language options, see
- // http://bugzilla.lyx.org/show_bug.cgi?id=4597#c4
+ // 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
void BufferParams::writeEncodingPreamble(odocstream & os,
LaTeXFeatures & features, TexRow & texrow) const
{
+ if (useXetex)
+ return;
if (inputenc == "auto") {
string const doc_encoding =
language->encoding()->latexName();
texrow.newline();
}
if (package == Encoding::CJK || features.mustProvide("CJK")) {
- os << "\\usepackage{CJK}\n";
+ if (language->encoding()->name() == "utf8-cjk"
+ && LaTeXFeatures::isAvailable("CJKutf8"))
+ os << "\\usepackage{CJKutf8}\n";
+ else
+ os << "\\usepackage{CJK}\n";
texrow.newline();
}
} else if (inputenc != "default") {
texrow.newline();
break;
case Encoding::CJK:
- os << "\\usepackage{CJK}\n";
+ if (encoding().name() == "utf8-cjk"
+ && LaTeXFeatures::isAvailable("CJKutf8"))
+ os << "\\usepackage{CJKutf8}\n";
+ else
+ os << "\\usepackage{CJK}\n";
texrow.newline();
break;
}
}
+string const BufferParams::parseFontName(string const & name) const
+{
+ string mangled = name;
+ size_t const idx = mangled.find('[');
+ if (idx == string::npos || idx == 0)
+ return mangled;
+ else
+ return mangled.substr(0, idx - 1);
+}
+
+
string const BufferParams::loadFonts(string const & rm,
string const & sf, string const & tt,
bool const & sc, bool const & osf,
- int const & sfscale, int const & ttscale) const
+ int const & sfscale, int const & ttscale,
+ bool const & xetex) 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";
+ if (sf != "default") {
+ string const sans = parseFontName(sf);
+ if (sfscale != 100)
+ os << "\\setsansfont[Scale="
+ << float(sfscale) / 100
+ << ",Mapping=tex-text]{"
+ << sans << "}\n";
+ else
+ os << "\\setsansfont[Mapping=tex-text]{"
+ << sans << "}\n";
+ }
+ if (tt != "default") {
+ string const mono = parseFontName(tt);
+ if (ttscale != 100)
+ os << "\\setmonofont[Scale="
+ << float(sfscale) / 100
+ << "]{"
+ << mono << "}\n";
+ else
+ os << "\\setmonofont[Mapping=tex-text]{"
+ << mono << "}\n";
+ }
+ if (osf)
+ os << "\\defaultfontfeatures{Numbers=OldStyle}\n";
+ return os.str();
+ }
+
// ROMAN FONTS
// Computer Modern (must be explicitely selectable -- there might be classes
// that define a different default font!
// AE
else if (rm == "ae") {
// not needed when using OT1 font encoding.
- if (lyxrc.fontenc != "default")
+ if (font_encoding() != "default")
os << "\\usepackage{ae,aecompl}\n";
}
// Times
// fourier supersedes utopia.sty, but does
// not work with OT1 encoding.
if (LaTeXFeatures::isAvailable("fourier")
- && lyxrc.fontenc != "default") {
+ && font_encoding() != "default") {
os << "\\usepackage";
if (osf || sc) {
os << '[';
Encoding const & BufferParams::encoding() const
{
+ if (useXetex)
+ return *(encodings.fromLaTeXName("utf8-plain"));
if (inputenc == "auto" || inputenc == "default")
return *language->encoding();
Encoding const * const enc = encodings.fromLaTeXName(inputenc);
projects / lyx.git / blobdiff