readLocalLayout(lex);
} else if (token == "\\begin_modules") {
readModules(lex);
+ } else if (token == "\\begin_removed_modules") {
+ readRemovedModules(lex);
} else if (token == "\\options") {
lex.eatLine();
options = lex.getString();
os << "\\master " << master << '\n';
}
- //the modules
+ // removed modules
+ if (!removedModules_.empty()) {
+ os << "\\begin_removed_modules" << '\n';
+ set<string>::const_iterator it = removedModules_.begin();
+ set<string>::const_iterator en = removedModules_.end();
+ for (; it != en; it++)
+ os << *it << '\n';
+ os << "\\end_removed_modules" << '\n';
+ }
+
+ // the modules
if (!layoutModules_.empty()) {
os << "\\begin_modules" << '\n';
LayoutModuleList::const_iterator it = layoutModules_.begin();
- for (; it != layoutModules_.end(); it++)
+ LayoutModuleList::const_iterator en = layoutModules_.end();
+ for (; it != en; it++)
os << *it << '\n';
os << "\\end_modules" << '\n';
}
-
+
// local layout information
if (!local_layout.empty()) {
// remove '\n' from the end
texrow.newline();
}
- // If we use jurabib, we have to call babel here.
- if (use_babel && features.isRequired("jurabib")) {
- os << from_ascii(babelCall(language_options.str()))
+ // If we use hyperref, jurabib, japanese, or vietnamese, we have to call babel here.
+ if (use_babel
+ && (features.isRequired("jurabib")
+ || features.isRequired("hyperref")
+ || features.isRequired("vietnamese")
+ || features.isRequired("japanese") ) ) {
+ // FIXME UNICODE
+ os << from_utf8(babelCall(language_options.str()))
<< '\n'
- << from_ascii(features.getBabelOptions());
+ << from_utf8(features.getBabelOptions());
texrow.newline();
}
// Line spacing
lyxpreamble += from_utf8(spacing().writePreamble(tclass.provides("SetSpace")));
- // If we use hyperref or japanese or vietnamese, we have to call babel here.
- 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());
- }
-
// PDF support.
// * Hyperref manual: "Make sure it comes last of your loaded
// packages, to give it a fighting chance of not being over-written,
bcl.addEmptyClass(classname);
}
- if (bcl[classname].load()) {
- pimpl_->baseClass_ = classname;
- return true;
+ bool const success = bcl[classname].load();
+ if (!success) {
+ docstring s =
+ bformat(_("The document class %1$s could not be loaded."),
+ from_utf8(classname));
+ frontend::Alert::error(_("Could not load class"), s);
+ return false;
+ }
+
+ pimpl_->baseClass_ = classname;
+
+ // add any required modules not already in use
+ set<string> const & mods = baseClass()->defaultModules();
+ set<string>::const_iterator mit = mods.begin();
+ set<string>::const_iterator men = mods.end();
+ for (; mit != men; mit++) {
+ string const & modName = *mit;
+ // see if we're already in use
+ if (find(layoutModules_.begin(), layoutModules_.end(), modName) !=
+ layoutModules_.end()) {
+ LYXERR(Debug::TCLASS, "Default module `" << modName <<
+ "' not added because already used.");
+ continue;
+ }
+ // 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;
+ }
+ // Now we want to check the list of selected modules to see if any of them
+ // exclude this one.
+ bool foundit = false;
+ // so iterate over the selected modules...
+ LayoutModuleList::const_iterator lit = layoutModules_.begin();
+ LayoutModuleList::const_iterator len = layoutModules_.end();
+ for (; lit != len; lit++) {
+ LyXModule * lm = moduleList[*lit];
+ if (!lm)
+ continue;
+ vector<string> const & exc = lm->getExcludedModules();
+ // ...and see if this one excludes us.
+ if (find(exc.begin(), exc.end(), modName) != exc.end()) {
+ foundit = true;
+ LYXERR(Debug::TCLASS, "Default module `" << modName <<
+ "' not added because excluded by loaded module `" <<
+ *lit << "'.");
+ break;
+ }
+ }
+ if (!foundit) {
+ LYXERR(Debug::TCLASS, "Default module `" << modName << "' added.");
+ layoutModules_.push_back(modName);
+ }
}
-
- docstring s =
- bformat(_("The document class %1$s could not be loaded."),
- from_utf8(classname));
- frontend::Alert::error(_("Could not load class"), s);
- return false;
+ return true;
}
return;
doc_class_ = &(DocumentClassBundle::get().newClass(*baseClass()));
-
- //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.
+
+ // 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;
}
-vector<string> const & BufferParams::getModules() const
-{
- return layoutModules_;
-}
-
-
-
bool BufferParams::addLayoutModule(string const & modName)
{
LayoutModuleList::const_iterator it = layoutModules_.begin();
}
-void BufferParams::clearLayoutModules()
-{
- layoutModules_.clear();
-}
-
-
Font const BufferParams::getFont() const
{
FontInfo f = documentClass().defaultfont();
}
+void BufferParams::readRemovedModules(Lexer & lex)
+{
+ if (!lex.eatLine()) {
+ lyxerr << "Error (BufferParams::readRemovedModules):"
+ "Unexpected end of input." << endl;
+ return;
+ }
+ while (true) {
+ string mod = lex.getString();
+ if (mod == "\\end_removed_modules")
+ break;
+ removedModules_.insert(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();
+ for (; rit != ren; rit++) {
+ LayoutModuleList::iterator const mit = layoutModules_.begin();
+ LayoutModuleList::iterator const men = layoutModules_.end();
+ LayoutModuleList::iterator found = find(mit, men, *rit);
+ if (found == men)
+ continue;
+ layoutModules_.erase(found);
+ }
+}
+
+
string BufferParams::paperSizeName(PapersizePurpose purpose) const
{
char real_papersize = papersize;