#include "BufferParams.h"
#include "Author.h"
-#include "BaseClassList.h"
+#include "LayoutFile.h"
#include "BranchList.h"
#include "buffer_funcs.h"
#include "Bullet.h"
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;
}
AuthorList authorlist;
BranchList branchlist;
+ vector<string> extraEmbeddedFiles;
Bullet temp_bullets[4];
Bullet user_defined_bullets[4];
Spacing spacing;
*/
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
{
setBaseClass(defaultBaseclass());
makeDocumentClass();
- paragraph_separation = PARSEP_INDENT;
- quotes_language = InsetQuotes::EnglishQ;
+ paragraph_separation = ParagraphIndentSeparation;
+ quotes_language = InsetQuotes::EnglishQuotes;
fontsize = "default";
/* PaperLayout */
listings_params = string();
pagestyle = "default";
compressed = false;
- embedded = 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];
}
-BufferParams::~BufferParams()
-{}
-
-
-docstring const BufferParams::B_(string const & l10n) const
+docstring BufferParams::B_(string const & l10n) const
{
BOOST_ASSERT(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;
}
-string const BufferParams::readToken(Lexer & lex, string const & token,
- FileName const & filepath)
+string BufferParams::readToken(Lexer & lex, string const & token,
+ FileName const & filepath, FileName const & temppath)
{
if (token == "\\textclass") {
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.
- pair<bool, lyx::BaseClassIndex> pp =
- make_pair(false, BaseClassIndex(0));
- if (!filepath.empty())
- pp = BaseClassList::get().addTextClass(
- classname, filepath.absFilename());
- if (pp.first)
- setBaseClass(pp.second);
- else {
- pp = BaseClassList::get().numberOfClass(classname);
- if (pp.first)
- setBaseClass(pp.second);
- else {
- // a warning will be given for unknown class
- setBaseClass(defaultBaseclass());
- return classname;
- }
+ 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())
+ setBaseClass(tcp);
+ else if (bcl.haveClass(classname)) {
+ setBaseClass(classname);
+ } 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()) {
+ if (!baseClass()->isTeXClassAvailable()) {
docstring const msg =
bformat(_("The layout file requested by this document,\n"
"%1$s.layout,\n"
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;
// Prints out the buffer info into the .lyx file given by file
// the textclass
- os << "\\textclass " << BaseClassList::get()[pimpl_->baseClass_].name() << '\n';
+ os << "\\textclass " << baseClass()->name() << '\n';
// then the preamble
if (!preamble.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";
}
void BufferParams::useClassDefaults()
{
- TextClass const & tclass = BaseClassList::get()[pimpl_->baseClass_];
+ DocumentClass const & tclass = documentClass();
sides = tclass.sides();
columns = tclass.columns();
bool BufferParams::hasClassDefaults() const
{
- TextClass const & tclass = BaseClassList::get()[pimpl_->baseClass_];
+ DocumentClass const & tclass = documentClass();
return sides == tclass.sides()
&& columns == tclass.columns()
}
-bool BufferParams::setBaseClass(BaseClassIndex tc)
+bool BufferParams::setBaseClass(string const & classname)
{
- if (BaseClassList::get()[tc].load()) {
- pimpl_->baseClass_ = tc;
+ LYXERR(Debug::TCLASS, "setBaseClass: " << classname);
+ LayoutFileList const & bcl = LayoutFileList::get();
+ if (!bcl.haveClass(classname)) {
+ docstring s =
+ bformat(_("The document class %1$s could not be found."),
+ from_utf8(classname));
+ frontend::Alert::error(_("Class not found"), s);
+ return false;
+ }
+
+ if (bcl[classname].load()) {
+ pimpl_->baseClass_ = classname;
return true;
}
docstring s =
bformat(_("The document class %1$s could not be loaded."),
- from_utf8(BaseClassList::get()[tc].name()));
+ from_utf8(classname));
frontend::Alert::error(_("Could not load class"), s);
return false;
}
-BaseClassIndex BufferParams::baseClass() const
+LayoutFile const * BufferParams::baseClass() const
+{
+ if (LayoutFileList::get().haveClass(pimpl_->baseClass_))
+ return &(LayoutFileList::get()[pimpl_->baseClass_]);
+ else
+ return 0;
+}
+
+
+LayoutFileIndex const & BufferParams::baseClassID() const
{
return pimpl_->baseClass_;
}
void BufferParams::makeDocumentClass()
{
- doc_class_ = &(DocumentClassBundle::get().newClass(BaseClassList::get()[baseClass()]));
+ 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
}
-string const BufferParams::paperSizeName(Papersize_Purpose const & purpose) const
+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}")
}
-biblio::CiteEngine BufferParams::getEngine() const
+biblio::CiteEngine BufferParams::citeEngine() const
{
// FIXME the class should provide the numerical/
// authoryear choice
}
-void BufferParams::setCiteEngine(biblio::CiteEngine const cite_engine)
+void BufferParams::setCiteEngine(biblio::CiteEngine cite_engine)
{
cite_engine_ = cite_engine;
}