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;
}
{
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);
}
-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();
// NOTE: in this case, the textclass (.cls file) is assumed to be available.
string tcp;
LayoutFileList & bcl = LayoutFileList::get();
- if (!filepath.empty())
- tcp = bcl.addLayoutFile(classname, filepath.absFilename());
+ 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)) {
}
-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;
}