X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferparams.C;h=b24ee8e69d0bc981c1d52c7013e2da4c1705ba93;hb=98c966c64594611e469313314abd1e59524adb4a;hp=1d043af71347532ecf3c30ff649e4558890f3ff8;hpb=83acbbd5237373926c629855379e1df9a04209b2;p=lyx.git diff --git a/src/bufferparams.C b/src/bufferparams.C index 1d043af713..b24ee8e69d 100644 --- a/src/bufferparams.C +++ b/src/bufferparams.C @@ -1,18 +1,17 @@ /* This file is part of - * ====================================================== - * + * ====================================================== + * * LyX, The Document Processor - * + * * Copyright 1995 Matthias Ettrich * Copyright 1995-2001 The LyX Team. * * ====================================================== */ #include -#include #ifdef __GNUG__ -#pragma implementation "bufferparams.h" +#pragma implementation #endif #include "bufferparams.h" @@ -20,34 +19,40 @@ #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); + 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; @@ -58,8 +63,8 @@ BufferParams::BufferParams() columns = 1; pagestyle = "default"; for (int iter = 0; iter < 4; ++iter) { - user_defined_bullets[iter] = temp_bullets[iter] - = ITEMIZE_DEFAULTS[iter]; + user_defined_bullets[iter] = ITEMIZE_DEFAULTS[iter]; + temp_bullets[iter] = ITEMIZE_DEFAULTS[iter]; } } @@ -69,9 +74,9 @@ void BufferParams::writeFile(ostream & os) const // The top of the file is written by the buffer. // Prints out the buffer info into the .lyx file given by file - // the textclass - os << "\\textclass " << textclasslist.NameOfClass(textclass) << '\n'; - + // the textclass + os << "\\textclass " << textclasslist[textclass].name() << '\n'; + // then the the preamble if (!preamble.empty()) { // remove '\n' from the end of preamble @@ -80,15 +85,16 @@ void BufferParams::writeFile(ostream & os) const << tmppreamble << "\n\\end_preamble\n"; } - - /* the options */ + + /* the options */ if (!options.empty()) { os << "\\options " << options << '\n'; } - + /* then the text parameters */ - os << "\\language " << language->lang() - << "\n\\inputencoding " << inputenc + if (language != ignore_language) + os << "\\language " << language->lang() << '\n'; + os << "\\inputencoding " << inputenc << "\n\\fontscheme " << fonts << "\n\\graphics " << graphicsDriver << '\n'; @@ -103,33 +109,35 @@ 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()) + if (!paperwidth.empty()) os << "\\paperwidth " << VSpace(paperwidth).asLyXCommand() << '\n'; - if (!paperheight.empty()) + if (!paperheight.empty()) os << "\\paperheight " << VSpace(paperheight).asLyXCommand() << '\n'; - if (!leftmargin.empty()) + if (!leftmargin.empty()) os << "\\leftmargin " << VSpace(leftmargin).asLyXCommand() << '\n'; - if (!topmargin.empty()) + if (!topmargin.empty()) os << "\\topmargin " << VSpace(topmargin).asLyXCommand() << '\n'; - if (!rightmargin.empty()) + if (!rightmargin.empty()) os << "\\rightmargin " << VSpace(rightmargin).asLyXCommand() << '\n'; - if (!bottommargin.empty()) + if (!bottommargin.empty()) os << "\\bottommargin " << VSpace(bottommargin).asLyXCommand() << '\n'; - if (!headheight.empty()) + if (!headheight.empty()) os << "\\headheight " << VSpace(headheight).asLyXCommand() << '\n'; - if (!headsep.empty()) + if (!headsep.empty()) os << "\\headsep " << VSpace(headsep).asLyXCommand() << '\n'; - if (!footskip.empty()) + if (!footskip.empty()) os << "\\footskip " << VSpace(footskip).asLyXCommand() << '\n'; os << "\\secnumdepth " << secnumdepth @@ -143,7 +151,7 @@ void BufferParams::writeFile(ostream & os) const // An output operator for insetquotes would be nice case InsetQuotes::SingleQ: os << "\\quotes_times 1\n"; break; - case InsetQuotes::DoubleQ: + case InsetQuotes::DoubleQ: os << "\\quotes_times 2\n"; break; } os << "\\papercolumns " << columns @@ -163,17 +171,45 @@ void BufferParams::writeFile(ostream & os) const } else { os << "\\bulletLaTeX " << i - << "\n\t" + << "\n\t\"" << user_defined_bullets[i].getText() - << "\n\\end_bullet\n"; + << "\"\n\\end_bullet\n"; } } } } -void BufferParams::useClassDefaults() { - LyXTextClass const & tclass = textclasslist.TextClass(textclass); +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]; sides = tclass.sides(); columns = tclass.columns(); @@ -184,9 +220,22 @@ void BufferParams::useClassDefaults() { } +bool BufferParams::hasClassDefaults() const +{ + LyXTextClass const & tclass = textclasslist[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,8 +246,8 @@ void BufferParams::readPreamble(LyXLex & lex) void BufferParams::readLanguage(LyXLex & lex) { if (!lex.next()) return; - - string const tmptok = lex.GetString(); + + string const tmptok = lex.getString(); // check if tmptok is part of tex_babel in tex-defs.h language = languages.getLanguage(tmptok); @@ -215,14 +264,14 @@ void BufferParams::readLanguage(LyXLex & lex) void BufferParams::readGraphicsDriver(LyXLex & lex) { if (!lex.next()) return; - - string const 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) { string const test = tex_graphics[n++]; - - if (test == tmptok) { + + if (test == tmptok) { graphicsDriver = tmptok; break; } else if (test == "last_item") { @@ -231,6 +280,6 @@ void BufferParams::readGraphicsDriver(LyXLex & lex) " Setting graphics driver to `default'.\n"); graphicsDriver = "default"; break; - } + } } }