* LyX, The Document Processor
*
* Copyright 1995 Matthias Ettrich
- * Copyright 1995-2000 The LyX Team.
+ * Copyright 1995-2001 The LyX Team.
*
* ====================================================== */
orientation = ORIENTATION_PORTRAIT;
use_geometry = false;
use_amsmath = false;
+ use_natbib = false;
+ use_numerical_citations = false;
secnumdepth = 3;
tocdepth = 3;
- language = "default";
- language_info = default_language;
+ language = default_language;
fonts = "default";
inputenc = "auto";
graphicsDriver = "default";
sides = LyXTextClass::OneSide;
columns = 1;
pagestyle = "default";
- for(int iter = 0; iter < 4; ++iter) {
+ for (int iter = 0; iter < 4; ++iter) {
user_defined_bullets[iter] = temp_bullets[iter]
= ITEMIZE_DEFAULTS[iter];
}
// then the the preamble
if (!preamble.empty()) {
// remove '\n' from the end of preamble
- string tmppreamble = strip(preamble, '\n');
+ string const tmppreamble = strip(preamble, '\n');
os << "\\begin_preamble\n"
<< tmppreamble
<< "\n\\end_preamble\n";
}
/* then the text parameters */
- os << "\\language " << language
- << "\n\\inputencoding " << inputenc
+ if (language != ignore_language)
+ os << "\\language " << language->lang() << '\n';
+ os << "\\inputencoding " << inputenc
<< "\n\\fontscheme " << fonts
<< "\n\\graphics " << graphicsDriver << '\n';
<< "\n\\paperpackage " << string_paperpackages[paperpackage]
<< "\n\\use_geometry " << use_geometry
<< "\n\\use_amsmath " << use_amsmath
+ << "\n\\use_natbib " << use_natbib
+ << "\n\\use_numerical_citations " << use_numerical_citations
<< "\n\\paperorientation " << string_orientation[orientation]
<< '\n';
if (!paperwidth.empty())
<< "\n\\defskip " << defskip.asLyXCommand()
<< "\n\\quotes_language "
<< string_quotes_language[quotes_language] << '\n';
- switch(quotes_times) {
+ switch (quotes_times) {
// An output operator for insetquotes would be nice
case InsetQuotes::SingleQ:
os << "\\quotes_times 1\n"; break;
void BufferParams::readPreamble(LyXLex & lex)
{
- if (lex.GetString() != "\\begin_preamble")
+ if (lex.getString() != "\\begin_preamble")
lyxerr << "Error (BufferParams::readPreamble):"
"consistency check failed." << endl;
{
if (!lex.next()) return;
- string tmptok = lex.GetString();
+ string const tmptok = lex.getString();
// check if tmptok is part of tex_babel in tex-defs.h
- Languages::iterator lit = languages.find(tmptok);
- if (lit != languages.end()) {
- // found it
- language = tmptok;
- language_info = &(*lit).second;
- } else {
- // not found
- language = "default";
- language_info = default_language;
- if (tmptok != "default") {
- lyxerr << "Warning: language `"
- << tmptok << "' not recognized!\n"
- << " Setting language to `default'."
- << endl;
- }
+ language = languages.getLanguage(tmptok);
+ if (!language) {
+ // Language tmptok was not found
+ language = default_language;
+ lyxerr << "Warning: Setting language `"
+ << tmptok << "' to `" << language->lang()
+ << "'." << endl;
}
}
void BufferParams::readGraphicsDriver(LyXLex & lex)
{
- string tmptok;
- string test;
- int n = 0;
-
-
if (!lex.next()) return;
- tmptok = lex.GetString();
+ string const tmptok = lex.getString();
// check if tmptok is part of tex_graphics in tex_defs.h
+ int n = 0;
while (true) {
- test = tex_graphics[n++];
+ string const test = tex_graphics[n++];
if (test == tmptok) {
graphicsDriver = tmptok;
break;
- }
- else if (test == "last_item") {
+ } else if (test == "last_item") {
lex.printError(
"Warning: graphics driver `$$Token' not recognized!\n"
" Setting graphics driver to `default'.\n");