X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferparams.C;h=6aa67adfc1150326856d224c08db0ac3eab20ecf;hb=1cfd4fceaccc2de186faf1118c2081346d37c65d;hp=b81d1395cf7665dc5f74725643b08970eddbedf3;hpb=1c9a8d27a26b5f76562914f0e81aa98334f8c06a;p=lyx.git diff --git a/src/bufferparams.C b/src/bufferparams.C index b81d1395cf..6aa67adfc1 100644 --- a/src/bufferparams.C +++ b/src/bufferparams.C @@ -4,15 +4,14 @@ * LyX, The Document Processor * * Copyright 1995 Matthias Ettrich - * Copyright 1995-1999 The LyX Team. + * Copyright 1995-2001 The LyX Team. * * ====================================================== */ #include -#include #ifdef __GNUG__ -#pragma implementation "bufferparams.h" +#pragma implementation #endif #include "bufferparams.h" @@ -20,46 +19,53 @@ #include "layout.h" #include "vspace.h" #include "debug.h" -#include "support/lyxlib.h" -#include "support/lstrings.h" #include "lyxrc.h" #include "language.h" +#include "lyxtextclasslist.h" + +#include "support/lyxlib.h" +#include "support/lstrings.h" + +#include +using std::ostream; +using std::endl; BufferParams::BufferParams() + // Initialize textclass to point to article. if `first' is + // true in the returned pair, then `second' is the textclass + // number; if it is false, second is 0. In both cases, second + // is what we want. + : textclass(textclasslist.NumberOfClass("article").second) { paragraph_separation = PARSEP_INDENT; defskip = VSpace(VSpace::MEDSKIP); quotes_language = InsetQuotes::EnglishQ; quotes_times = InsetQuotes::DoubleQ; fontsize = "default"; - // Initialize textclass to point to article. if `first' is - // true in the returned pair, then `second' is the textclass - // number; if it is false, second is 0. In both cases, second - // is what we want. - textclass = textclasslist.NumberOfClass("article").second; - /* PaperLayout */ + /* PaperLayout */ papersize = PAPER_DEFAULT; - papersize2 = VM_PAPER_DEFAULT; /* DEFAULT */ - paperpackage = PACKAGE_NONE; + papersize2 = VM_PAPER_DEFAULT; /* DEFAULT */ + paperpackage = PACKAGE_NONE; orientation = ORIENTATION_PORTRAIT; - use_geometry = false; - use_amsmath = false; + use_geometry = false; + use_amsmath = false; + use_natbib = false; + use_numerical_citations = false; secnumdepth = 3; tocdepth = 3; - language = "default"; + language = default_language; fonts = "default"; - inputenc = "latin1"; + inputenc = "auto"; graphicsDriver = "default"; sides = LyXTextClass::OneSide; columns = 1; pagestyle = "default"; - for(int iter = 0; iter < 4; ++iter) { - user_defined_bullets[iter] = temp_bullets[iter] - = ITEMIZE_DEFAULTS[iter]; + for (int iter = 0; iter < 4; ++iter) { + user_defined_bullets[iter] = ITEMIZE_DEFAULTS[iter]; + temp_bullets[iter] = ITEMIZE_DEFAULTS[iter]; } - allowAccents = false; } @@ -74,7 +80,7 @@ void BufferParams::writeFile(ostream & os) const // 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"; @@ -86,8 +92,9 @@ void BufferParams::writeFile(ostream & os) const } /* 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'; @@ -102,6 +109,8 @@ void BufferParams::writeFile(ostream & os) const << "\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()) @@ -138,7 +147,7 @@ void BufferParams::writeFile(ostream & os) const << "\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; @@ -162,16 +171,44 @@ void BufferParams::writeFile(ostream & os) const } else { os << "\\bulletLaTeX " << i - << "\n\t" - << user_defined_bullets[i].c_str() - << "\n\\end_bullet\n"; + << "\n\t\"" + << user_defined_bullets[i].getText() + << "\"\n\\end_bullet\n"; } } } } -void BufferParams::useClassDefaults() { +void BufferParams::setPaperStuff() +{ + papersize = PAPER_DEFAULT; + char const c1 = paperpackage; + if (c1 == PACKAGE_NONE) { + char const c2 = papersize2; + if (c2 == VM_PAPER_USLETTER) + papersize = PAPER_USLETTER; + else if (c2 == VM_PAPER_USLEGAL) + papersize = PAPER_LEGALPAPER; + else if (c2 == VM_PAPER_USEXECUTIVE) + papersize = PAPER_EXECUTIVEPAPER; + else if (c2 == VM_PAPER_A3) + papersize = PAPER_A3PAPER; + else if (c2 == VM_PAPER_A4) + papersize = PAPER_A4PAPER; + else if (c2 == VM_PAPER_A5) + papersize = PAPER_A5PAPER; + else if ((c2 == VM_PAPER_B3) || (c2 == VM_PAPER_B4) || + (c2 == VM_PAPER_B5)) + papersize = PAPER_B5PAPER; + } else if ((c1 == PACKAGE_A4) || (c1 == PACKAGE_A4WIDE) || + (c1 == PACKAGE_WIDEMARGINSA4)) + papersize = PAPER_A4PAPER; +} + + +void BufferParams::useClassDefaults() +{ LyXTextClass const & tclass = textclasslist.TextClass(textclass); sides = tclass.sides(); @@ -183,9 +220,22 @@ void BufferParams::useClassDefaults() { } +bool BufferParams::hasClassDefaults() const +{ + LyXTextClass const & tclass = textclasslist.TextClass(textclass); + + return (sides == tclass.sides() + && columns == tclass.columns() + && pagestyle == tclass.pagestyle() + && options == tclass.options() + && secnumdepth == tclass.secnumdepth() + && tocdepth == tclass.tocdepth()); +} + + void BufferParams::readPreamble(LyXLex & lex) { - if (lex.GetString() != "\\begin_preamble") + if (lex.getString() != "\\begin_preamble") lyxerr << "Error (BufferParams::readPreamble):" "consistency check failed." << endl; @@ -197,45 +247,34 @@ void BufferParams::readLanguage(LyXLex & lex) { 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; - return; - } - // not found - language = "default"; - 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"); @@ -244,11 +283,3 @@ void BufferParams::readGraphicsDriver(LyXLex & lex) } } } - - -LyXDirection BufferParams::getDocumentDirection() const -{ - return (lyxrc.rtl_support && - (language == "hebrew" || language == "arabic")) - ? LYX_DIR_RIGHT_TO_LEFT : LYX_DIR_LEFT_TO_RIGHT; -}