// 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;
}
AuthorList authorlist;
BranchList branchlist;
- vector<string> extraEmbeddedFiles;
Bullet temp_bullets[4];
Bullet user_defined_bullets[4];
Spacing spacing;
BufferParams::Impl *
BufferParams::MemoryTraits::clone(BufferParams::Impl const * ptr)
{
- BOOST_ASSERT(ptr);
+ LASSERT(ptr, /**/);
return new BufferParams::Impl(*ptr);
}
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 = lyxrc.use_bundled_format;
for (int iter = 0; iter < 4; ++iter) {
user_defined_bullet(iter) = ITEMIZE_DEFAULTS[iter];
temp_bullet(iter) = ITEMIZE_DEFAULTS[iter];
docstring BufferParams::B_(string const & l10n) const
{
- BOOST_ASSERT(language);
+ LASSERT(language, /**/);
return getMessages(language->code()).get(l10n);
}
}
-vector<string> & BufferParams::extraEmbeddedFiles()
-{
- return pimpl_->extraEmbeddedFiles;
-}
-
-
-vector<string> const & BufferParams::extraEmbeddedFiles() const
-{
- return pimpl_->extraEmbeddedFiles;
-}
-
-
BranchList & BufferParams::branchlist()
{
return pimpl_->branchlist;
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 BufferParams::readToken(Lexer & lex, string const & token,
- FileName const & filepath, FileName const & temppath)
+ FileName const & filepath)
{
if (token == "\\textclass") {
lex.next();
// NOTE: in this case, the textclass (.cls file) is assumed to be available.
string tcp;
LayoutFileList & bcl = LayoutFileList::get();
- if (!temppath.empty())
- tcp = bcl.addLayoutFile(classname, temppath.absFilename(), LayoutFileList::Embedded);
if (tcp.empty() && !filepath.empty())
tcp = bcl.addLayoutFile(classname, filepath.absFilename(), LayoutFileList::Local);
if (!tcp.empty())
} 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") {
toktmp << endl;
return toktmp;
}
- } else if (token == "\\extra_embedded_files") {
- extraEmbeddedFiles().clear();
- string par;
- lex >> par;
- string tmp;
- par = split(par, tmp, ',');
- while (!tmp.empty()) {
- extraEmbeddedFiles().push_back(tmp);
- par = split(par, tmp, ',');
- }
} else {
lyxerr << "BufferParams::readToken(): Unknown token: " <<
token << endl;
if (!options.empty()) {
os << "\\options " << options << '\n';
}
+
+ // the master document
+ if (!master.empty()) {
+ os << "\\master " << master << '\n';
+ }
//the modules
if (!layoutModules_.empty()) {
else
os << "\\author " << Author() << "\n";
}
-
- vector<string>::const_iterator e_it = extraEmbeddedFiles().begin();
- vector<string>::const_iterator e_end = extraEmbeddedFiles().end();
- os << "\\extra_embedded_files \"";
- bool first = true;
- for (; e_it != e_end; ++e_it) {
- if (!first)
- os << ",";
- else
- first = false;
- os << *e_it;
- }
- os << "\"\n";
}
lyxpreamble += oss.str();
}
- // this might be useful...
- lyxpreamble += "\n\\makeatletter\n";
+ // only add \makeatletter and \makeatother when actually needed
+ bool makeatletter = false;
// Some macros LyX will need
docstring tmppreamble(from_ascii(features.getMacros()));
if (!tmppreamble.empty()) {
+ if (!makeatletter) {
+ lyxpreamble += "\n\\makeatletter\n";
+ makeatletter = true;
+ }
lyxpreamble += "\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
"LyX specific LaTeX commands.\n"
+ tmppreamble + '\n';
// the text class specific preamble
tmppreamble = features.getTClassPreamble();
if (!tmppreamble.empty()) {
+ if (!makeatletter) {
+ lyxpreamble += "\n\\makeatletter\n";
+ makeatletter = true;
+ }
lyxpreamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
"Textclass specific LaTeX commands.\n"
+ tmppreamble + '\n';
/* the user-defined preamble */
if (!preamble.empty()) {
+ if (!makeatletter) {
+ lyxpreamble += "\n\\makeatletter\n";
+ makeatletter = true;
+ }
// FIXME UNICODE
lyxpreamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
"User specified LaTeX commands.\n"
}
}
- if (!bullets_def.empty())
+ if (!bullets_def.empty()) {
+ if (!makeatletter) {
+ lyxpreamble += "\n\\makeatletter\n";
+ makeatletter = true;
+ }
lyxpreamble += bullets_def + "}\n\n";
+ }
- lyxpreamble += "\\makeatother\n\n";
+ if (makeatletter)
+ lyxpreamble += "\\makeatother\n\n";
int const nlines =
int(count(lyxpreamble.begin(), lyxpreamble.end(), '\n'));
"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()) {
{
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;
}
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");
}
-biblio::CiteEngine BufferParams::citeEngine() 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 cite_engine)
+void BufferParams::setCiteEngine(CiteEngine cite_engine)
{
cite_engine_ = cite_engine;
}