#include "BufferParams.h"
#include "Author.h"
-#include "BaseClassList.h"
+#include "LayoutFile.h"
#include "BranchList.h"
#include "buffer_funcs.h"
#include "Bullet.h"
static char const * const string_papersize[] = {
- "default", "custom", "letterpaper", "executivepaper", "legalpaper",
+ "default", "custom", "letterpaper", "legalpaper", "executivepaper",
"a3paper", "a4paper", "a5paper", "b3paper", "b4paper", "b5paper", ""
};
namespace {
// Paragraph separation
-typedef Translator<string, BufferParams::PARSEP> ParSepTranslator;
+typedef Translator<string, BufferParams::ParagraphSeparation> ParSepTranslator;
ParSepTranslator const init_parseptranslator()
{
- ParSepTranslator translator(string_paragraph_separation[0], BufferParams::PARSEP_INDENT);
- translator.addPair(string_paragraph_separation[1], BufferParams::PARSEP_SKIP);
+ ParSepTranslator translator
+ (string_paragraph_separation[0], BufferParams::ParagraphIndentSeparation);
+ translator.addPair(string_paragraph_separation[1], BufferParams::ParagraphSkipSeparation);
return translator;
}
// Quotes language
-typedef Translator<string, InsetQuotes::quote_language> QuotesLangTranslator;
+typedef Translator<string, InsetQuotes::QuoteLanguage> QuotesLangTranslator;
QuotesLangTranslator const init_quoteslangtranslator()
{
- QuotesLangTranslator translator(string_quotes_language[0], InsetQuotes::EnglishQ);
- translator.addPair(string_quotes_language[1], InsetQuotes::SwedishQ);
- translator.addPair(string_quotes_language[2], InsetQuotes::GermanQ);
- translator.addPair(string_quotes_language[3], InsetQuotes::PolishQ);
- translator.addPair(string_quotes_language[4], InsetQuotes::FrenchQ);
- translator.addPair(string_quotes_language[5], InsetQuotes::DanishQ);
+ QuotesLangTranslator translator
+ (string_quotes_language[0], InsetQuotes::EnglishQuotes);
+ translator.addPair(string_quotes_language[1], InsetQuotes::SwedishQuotes);
+ translator.addPair(string_quotes_language[2], InsetQuotes::GermanQuotes);
+ translator.addPair(string_quotes_language[3], InsetQuotes::PolishQuotes);
+ translator.addPair(string_quotes_language[4], InsetQuotes::FrenchQuotes);
+ translator.addPair(string_quotes_language[5], InsetQuotes::DanishQuotes);
return translator;
}
typedef Translator<string, PAPER_SIZE> PaperSizeTranslator;
-PaperSizeTranslator const init_papersizetranslator()
+static PaperSizeTranslator initPaperSizeTranslator()
{
PaperSizeTranslator translator(string_papersize[0], PAPER_DEFAULT);
translator.addPair(string_papersize[1], PAPER_CUSTOM);
PaperSizeTranslator const & papersizetranslator()
{
- static PaperSizeTranslator translator = init_papersizetranslator();
+ static PaperSizeTranslator translator = initPaperSizeTranslator();
return translator;
}
// Cite engine
-typedef Translator<string, biblio::CiteEngine> CiteEngineTranslator;
+typedef Translator<string, CiteEngine> CiteEngineTranslator;
CiteEngineTranslator const init_citeenginetranslator()
{
- CiteEngineTranslator translator("basic", biblio::ENGINE_BASIC);
- translator.addPair("natbib_numerical", biblio::ENGINE_NATBIB_NUMERICAL);
- translator.addPair("natbib_authoryear", biblio::ENGINE_NATBIB_AUTHORYEAR);
- translator.addPair("jurabib", biblio::ENGINE_JURABIB);
+ CiteEngineTranslator translator("basic", ENGINE_BASIC);
+ translator.addPair("natbib_numerical", ENGINE_NATBIB_NUMERICAL);
+ translator.addPair("natbib_authoryear", ENGINE_NATBIB_AUTHORYEAR);
+ translator.addPair("jurabib", ENGINE_JURABIB);
return translator;
}
*/
VSpace defskip;
PDFOptions pdfoptions;
- BaseClassIndex baseClass_;
+ LayoutFileIndex baseClass_;
};
BufferParams::Impl::Impl()
- : defskip(VSpace::MEDSKIP), baseClass_(0)
+ : defskip(VSpace::MEDSKIP), baseClass_(string(""))
{
// set initial author
// FIXME UNICODE
BufferParams::Impl *
BufferParams::MemoryTraits::clone(BufferParams::Impl const * ptr)
{
- BOOST_ASSERT(ptr);
+ LASSERT(ptr, /**/);
return new BufferParams::Impl(*ptr);
}
{
setBaseClass(defaultBaseclass());
makeDocumentClass();
- paragraph_separation = PARSEP_INDENT;
- quotes_language = InsetQuotes::EnglishQ;
+ paragraph_separation = ParagraphIndentSeparation;
+ quotes_language = InsetQuotes::EnglishQuotes;
fontsize = "default";
/* PaperLayout */
use_geometry = false;
use_amsmath = package_auto;
use_esint = package_auto;
- cite_engine_ = biblio::ENGINE_BASIC;
+ cite_engine_ = ENGINE_BASIC;
use_bibtopic = false;
trackChanges = false;
outputChanges = false;
listings_params = string();
pagestyle = "default";
compressed = false;
- embedded = false;
for (int iter = 0; iter < 4; ++iter) {
user_defined_bullet(iter) = ITEMIZE_DEFAULTS[iter];
temp_bullet(iter) = ITEMIZE_DEFAULTS[iter];
}
-BufferParams::~BufferParams()
-{}
-
-
-docstring const BufferParams::B_(string const & l10n) const
+docstring BufferParams::B_(string const & l10n) const
{
- BOOST_ASSERT(language);
+ LASSERT(language, /**/);
return getMessages(language->code()).get(l10n);
}
Bullet & BufferParams::temp_bullet(lyx::size_type const index)
{
- BOOST_ASSERT(index < 4);
+ LASSERT(index < 4, /**/);
return pimpl_->temp_bullets[index];
}
Bullet const & BufferParams::temp_bullet(lyx::size_type const index) const
{
- BOOST_ASSERT(index < 4);
+ LASSERT(index < 4, /**/);
return pimpl_->temp_bullets[index];
}
Bullet & BufferParams::user_defined_bullet(lyx::size_type const index)
{
- BOOST_ASSERT(index < 4);
+ LASSERT(index < 4, /**/);
return pimpl_->user_defined_bullets[index];
}
Bullet const & BufferParams::user_defined_bullet(lyx::size_type const index) const
{
- BOOST_ASSERT(index < 4);
+ LASSERT(index < 4, /**/);
return pimpl_->user_defined_bullets[index];
}
}
-string const BufferParams::readToken(Lexer & lex, string const & token,
+string BufferParams::readToken(Lexer & lex, string const & token,
FileName const & filepath)
{
if (token == "\\textclass") {
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.
- pair<bool, lyx::BaseClassIndex> pp =
- make_pair(false, BaseClassIndex(0));
- if (!filepath.empty())
- pp = baseclasslist.addTextClass(
- classname, filepath.absFilename());
- if (pp.first)
- setBaseClass(pp.second);
- else {
- pp = baseclasslist.numberOfClass(classname);
- if (pp.first)
- setBaseClass(pp.second);
- else {
- // a warning will be given for unknown class
- setBaseClass(defaultBaseclass());
- return classname;
- }
- }
- // FIXME: this warning will be given even if there exists a local .cls
- // file. Even worse, the .lyx file can not be compiled or exported
- // because the textclass is marked as unavilable.
- if (!documentClass().isTeXClassAvailable()) {
+ string tcp;
+ LayoutFileList & bcl = LayoutFileList::get();
+ if (tcp.empty() && !filepath.empty())
+ 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.
+ if (!baseClass()->isTeXClassAvailable()) {
docstring const msg =
bformat(_("The layout file requested by this document,\n"
"%1$s.layout,\n"
frontend::Alert::warning(_("Document class not available"),
msg + _("LyX will not be able to produce output."));
}
-
} else if (token == "\\begin_preamble") {
readPreamble(lex);
+ } else if (token == "\\begin_local_layout") {
+ 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();
+ } else if (token == "\\master") {
+ lex.eatLine();
+ master = lex.getString();
} else if (token == "\\language") {
readLanguage(lex);
} else if (token == "\\inputencoding") {
lex >> fontsSansScale;
} else if (token == "\\font_tt_scale") {
lex >> fontsTypewriterScale;
+ } else if (token == "\\font_cjk") {
+ lex >> fontsCJK;
} else if (token == "\\paragraph_separation") {
string parsep;
lex >> parsep;
// Prints out the buffer info into the .lyx file given by file
// the textclass
- os << "\\textclass " << baseclasslist[pimpl_->baseClass_].name() << '\n';
+ os << "\\textclass " << baseClass()->name() << '\n';
// then the preamble
if (!preamble.empty()) {
if (!options.empty()) {
os << "\\options " << options << '\n';
}
+
+ // the master document
+ if (!master.empty()) {
+ 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
+ string const tmplocal = rtrim(local_layout, "\n");
+ os << "\\begin_local_layout\n"
+ << tmplocal
+ << "\n\\end_local_layout\n";
+ }
// then the text parameters
if (language != ignore_language)
<< "\n\\font_osf " << convert<string>(fontsOSF)
<< "\n\\font_sf_scale " << fontsSansScale
<< "\n\\font_tt_scale " << fontsTypewriterScale
- << "\n\\graphics " << graphicsDriver << '\n';
+ << '\n';
+ if (!fontsCJK.empty()) {
+ os << "\\font_cjk " << fontsCJK << '\n';
+ }
+ os << "\n\\graphics " << graphicsDriver << '\n';
if (!float_placement.empty()) {
os << "\\float_placement " << float_placement << '\n';
if (pdfoptions().use_hyperref)
features.require("hyperref");
+
+ if (language->lang() == "vietnamese")
+ features.require("vietnamese");
+ else if (language->lang() == "japanese")
+ features.require("japanese");
}
language_options << ',';
language_options << language->babel();
}
- // when Vietnamese is used, babel must directly be loaded with the
+ // if Vietnamese is used, babel must directly be loaded with the
// 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
+ // if Japanese is used, babel must directly be loaded with the
+ // language options, not in the class options, see
+ // http://bugzilla.lyx.org/show_bug.cgi?id=4597#c4
+ size_t japan = language_options.str().find("japanese");
+ // japan = string::npos when not found
if (lyxrc.language_global_options && !language_options.str().empty()
- && viet == string::npos)
+ && viet == string::npos && japan == string::npos)
clsoptions << language_options.str() << ',';
}
os << ",columnsep=" << from_ascii(Length(columnsep).asLatexString());
os << "}\n";
texrow.newline();
+ } else if (orientation == ORIENTATION_LANDSCAPE) {
+ features.require("papersize");
}
if (tokenPos(tclass.opt_pagestyle(),
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")));
- // We try to load babel late, in case it interferes
- // with other packages. But some packages also need babel to be loaded
- // before, e.g. jurabib has to be called after babel.
- // So load babel after the optional packages but before the user-defined
- // preamble. This allows the users to redefine babel commands, e.g. to
- // translate the word "Index" to the German "Stichwortverzeichnis".
- // For more infos why this place was chosen, see
- // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg128425.html
- // If you encounter problems, you can shift babel to its old place behind
- // the user-defined preamble. But in this case you must change the Vietnamese
- // support from currently "\usepackage[vietnamese]{babel}" to:
- // \usepackage{vietnamese}
- // \usepackage{babel}
- // because vietnamese must be loaded before hyperref
- if (use_babel && !features.isRequired("jurabib")) {
- // FIXME UNICODE
- lyxpreamble += from_utf8(babelCall(language_options.str())) + '\n';
- lyxpreamble += from_utf8(features.getBabelOptions());
- }
-
- // When the language "japanese-plain" is used, the package "japanese" must
- // be loaded behind babel (it provides babel support for Japanese) but before
- // hyperref, see
- // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129680.html
- if (language->lang() == "japanese-plain" &&
- !documentClass().provides("japanese")) {
- //load babel in case it was not loaded due to an empty language list
- if (language_options.str().empty())
- lyxpreamble += "\\usepackage{babel}\n";
- lyxpreamble += "\\usepackage{japanese}\n";
- }
-
// PDF support.
// * Hyperref manual: "Make sure it comes last of your loaded
// packages, to give it a fighting chance of not being over-written,
lyxpreamble += oss.str();
}
- // this might be useful...
- lyxpreamble += "\n\\makeatletter\n";
+ // Will be surrounded by \makeatletter and \makeatother when needed
+ docstring atlyxpreamble;
// Some macros LyX will need
docstring tmppreamble(from_ascii(features.getMacros()));
- if (!tmppreamble.empty()) {
- lyxpreamble += "\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
+ if (!tmppreamble.empty())
+ atlyxpreamble += "\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
"LyX specific LaTeX commands.\n"
+ tmppreamble + '\n';
- }
// the text class specific preamble
tmppreamble = features.getTClassPreamble();
- if (!tmppreamble.empty()) {
- lyxpreamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
+ if (!tmppreamble.empty())
+ atlyxpreamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
"Textclass specific LaTeX commands.\n"
+ tmppreamble + '\n';
- }
/* the user-defined preamble */
- if (!preamble.empty()) {
+ if (!preamble.empty())
// FIXME UNICODE
- lyxpreamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
+ atlyxpreamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
"User specified LaTeX commands.\n"
+ from_utf8(preamble) + '\n';
+
+ // subfig loads internally the LaTeX package "caption". As
+ // caption is a very popular package, users will load it in
+ // the preamble. Therefore we must load subfig behind the
+ // user-defined preamble and check if the caption package was
+ // loaded or not. For the case that caption is loaded before
+ // subfig, there is the subfig option "caption=false". This
+ // option also works when a koma-script class is used and
+ // koma's own caption commands are used instead of caption. We
+ // use \PassOptionsToPackage here because the user could have
+ // already loaded subfig in the preamble.
+ if (features.isRequired("subfig")) {
+ atlyxpreamble += "\\@ifundefined{showcaptionsetup}{}{%\n"
+ " \\PassOptionsToPackage{caption=false}{subfig}}\n"
+ "\\usepackage{subfig}\n";
}
// Itemize bullet settings need to be last in case the user
}
if (!bullets_def.empty())
- lyxpreamble += bullets_def + "}\n\n";
+ atlyxpreamble += bullets_def + "}\n\n";
+
+ if (atlyxpreamble.find(from_ascii("@")) != docstring::npos)
+ lyxpreamble += "\n\\makeatletter\n"
+ + atlyxpreamble + "\\makeatother\n\n";
+ else
+ lyxpreamble += '\n' + atlyxpreamble;
- lyxpreamble += "\\makeatother\n\n";
+ // We try to load babel late, in case it interferes
+ // with other packages.
+ // Jurabib and Hyperref have to be called after babel, though.
+ 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';
+ }
int const nlines =
int(count(lyxpreamble.begin(), lyxpreamble.end(), '\n'));
void BufferParams::useClassDefaults()
{
- TextClass const & tclass = baseclasslist[pimpl_->baseClass_];
+ DocumentClass const & tclass = documentClass();
sides = tclass.sides();
columns = tclass.columns();
bool BufferParams::hasClassDefaults() const
{
- TextClass const & tclass = baseclasslist[pimpl_->baseClass_];
+ DocumentClass const & tclass = documentClass();
return sides == tclass.sides()
&& columns == tclass.columns()
}
-DocumentClass * BufferParams::documentClassPtr() const {
+DocumentClass const * BufferParams::documentClassPtr() const {
return doc_class_;
}
}
-bool BufferParams::setBaseClass(BaseClassIndex tc)
+bool BufferParams::setBaseClass(string const & classname)
{
- if (baseclasslist[tc].load()) {
- pimpl_->baseClass_ = tc;
- return true;
+ LYXERR(Debug::TCLASS, "setBaseClass: " << classname);
+ 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."),
+ from_utf8(classname));
+ frontend::Alert::error(_("Document class not found"), s);
+ bcl.addEmptyClass(classname);
}
-
- docstring s =
- bformat(_("The document class %1$s could not be loaded."),
- from_utf8(baseclasslist[tc].name()));
- frontend::Alert::error(_("Could not load class"), s);
- return false;
+
+ 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);
+ }
+ }
+ return true;
+}
+
+
+LayoutFile const * BufferParams::baseClass() const
+{
+ if (LayoutFileList::get().haveClass(pimpl_->baseClass_))
+ return &(LayoutFileList::get()[pimpl_->baseClass_]);
+ else
+ return 0;
}
-BaseClassIndex BufferParams::baseClass() const
+LayoutFileIndex const & BufferParams::baseClassID() const
{
return pimpl_->baseClass_;
}
void BufferParams::makeDocumentClass()
{
- doc_class_ = &(DocumentClassBundle::get().newClass(baseclasslist[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.
+ if (!baseClass())
+ 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.
LayoutModuleList::const_iterator it = layoutModules_.begin();
for (; it != layoutModules_.end(); it++) {
string const modName = *it;
"probably need to reconfigure LyX.\n"), from_utf8(modName));
frontend::Alert::warning(_("Module not available"),
msg + _("Some layouts may not be available."));
- lyxerr << "BufferParams::makeDocumentClass(): Module " <<
- modName << " requested but not found in module list." <<
- endl;
+ LYXERR0("BufferParams::makeDocumentClass(): Module " <<
+ modName << " requested but not found in module list.");
continue;
}
if (!lm->isAvailable()) {
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");
+ frontend::Alert::warning(_("Read Error"), msg);
+ }
+ }
}
-vector<string> const & BufferParams::getModules() const
-{
- return layoutModules_;
-}
-
-
-
bool BufferParams::addLayoutModule(string const & modName)
{
LayoutModuleList::const_iterator it = layoutModules_.begin();
LayoutModuleList::const_iterator end = layoutModules_.end();
- for (; it != end; it++) {
+ for (; it != end; it++)
if (*it == modName)
- break;
- }
- if (it != layoutModules_.end())
- return false;
+ return false;
layoutModules_.push_back(modName);
return true;
}
-void BufferParams::clearLayoutModules()
-{
- layoutModules_.clear();
-}
-
-
Font const BufferParams::getFont() const
{
FontInfo f = documentClass().defaultfont();
}
+void BufferParams::readLocalLayout(Lexer & lex)
+{
+ if (lex.getString() != "\\begin_local_layout")
+ lyxerr << "Error (BufferParams::readLocalLayout):"
+ "consistency check failed." << endl;
+
+ local_layout = lex.getLongString("\\end_local_layout");
+}
+
+
void BufferParams::readLanguage(Lexer & lex)
{
if (!lex.next()) return;
if (test == tmptok) {
graphicsDriver = tmptok;
break;
- } else if (test == "") {
+ }
+ if (test.empty()) {
lex.printError(
"Warning: graphics driver `$$Token' not recognized!\n"
" Setting graphics driver to `default'.\n");
}
-string const BufferParams::paperSizeName(Papersize_Purpose const & purpose) const
+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;
if (real_papersize == PAPER_DEFAULT)
}
-string const BufferParams::babelCall(string const & lang_opts) const
+string BufferParams::babelCall(string const & lang_opts) const
{
string lang_pack = lyxrc.language_package;
if (lang_pack != "\\usepackage{babel}")
// other languages are used (lang_opts is then empty)
if (lang_opts.empty())
return string();
- // when Vietnamese is used, babel must directly be loaded with the
+ // 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
- if (!lyxrc.language_global_options || viet != string::npos)
+ // If Japanese is used, babel must directly be loaded with the
+ // language options, see
+ // http://bugzilla.lyx.org/show_bug.cgi?id=4597#c4
+ size_t japan = lang_opts.find("japanese");
+ // japan = string::npos when not found
+ if (!lyxrc.language_global_options || viet != string::npos || japan != string::npos)
return "\\usepackage[" + lang_opts + "]{babel}";
return lang_pack;
}
set<string> encodings =
features.getEncodingSet(doc_encoding);
- // When the encodings EUC-JP-plain, JIS-plain, or SJIS-plainare used, the
+ // If the encodings EUC-JP-plain, JIS-plain, or SJIS-plain are used, the
// package inputenc must be omitted. Therefore set the encoding to empty.
// see http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129680.html
if (doc_encoding == "EUC-JP-plain" || doc_encoding == "JIS-plain" ||
else if (tt == "courier" )
os << "\\usepackage{" << tt << "}\n";
// Computer Modern, Latin Modern, CM Bright
- else if (tt != "default")
+ else if (tt != "default")
os << "\\renewcommand{\\ttdefault}{" << tt << "}\n";
return os.str();
Encoding const & BufferParams::encoding() const
{
if (inputenc == "auto" || inputenc == "default")
- return *(language->encoding());
- Encoding const * const enc =
- encodings.getFromLaTeXName(inputenc);
+ return *language->encoding();
+ Encoding const * const enc = encodings.fromLaTeXName(inputenc);
if (enc)
return *enc;
- lyxerr << "Unknown inputenc value `" << inputenc
- << "'. Using `auto' instead." << endl;
- return *(language->encoding());
+ LYXERR0("Unknown inputenc value `" << inputenc
+ << "'. Using `auto' instead.");
+ return *language->encoding();
}
-biblio::CiteEngine BufferParams::getEngine() const
+CiteEngine BufferParams::citeEngine() const
{
// FIXME the class should provide the numerical/
// authoryear choice
if (documentClass().provides("natbib")
- && cite_engine_ != biblio::ENGINE_NATBIB_NUMERICAL)
- return biblio::ENGINE_NATBIB_AUTHORYEAR;
+ && cite_engine_ != ENGINE_NATBIB_NUMERICAL)
+ return ENGINE_NATBIB_AUTHORYEAR;
return cite_engine_;
}
-void BufferParams::setCiteEngine(biblio::CiteEngine const cite_engine)
+void BufferParams::setCiteEngine(CiteEngine cite_engine)
{
cite_engine_ = cite_engine;
}
projects / lyx.git / blobdiff