X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferParams.cpp;h=9302a35c294e43881eeebd47bbbf8816bbb004f9;hb=700af7e7011f102d92222744791638ff2db18f94;hp=147fe8e10f6ef6252c2398b4f8b01ea0b7df945e;hpb=f62fbd05d2c5f8c4476ffcf3a465122fb7f80850;p=lyx.git diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index 147fe8e10f..9302a35c29 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -18,6 +18,7 @@ #include "BufferParams.h" #include "Author.h" +#include "LayoutFile.h" #include "BranchList.h" #include "buffer_funcs.h" #include "Bullet.h" @@ -29,7 +30,6 @@ #include "Font.h" #include "Lexer.h" #include "LyXRC.h" -#include "TextClassList.h" #include "OutputParams.h" #include "Spacing.h" #include "TexRow.h" @@ -95,13 +95,14 @@ namespace lyx { namespace { // Paragraph separation -typedef Translator ParSepTranslator; +typedef Translator 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; } @@ -114,17 +115,18 @@ ParSepTranslator const & parseptranslator() // Quotes language -typedef Translator QuotesLangTranslator; +typedef Translator 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; } @@ -140,7 +142,7 @@ QuotesLangTranslator const & quoteslangtranslator() typedef Translator PaperSizeTranslator; -PaperSizeTranslator const init_papersizetranslator() +static PaperSizeTranslator initPaperSizeTranslator() { PaperSizeTranslator translator(string_papersize[0], PAPER_DEFAULT); translator.addPair(string_papersize[1], PAPER_CUSTOM); @@ -159,7 +161,7 @@ PaperSizeTranslator const init_papersizetranslator() PaperSizeTranslator const & papersizetranslator() { - static PaperSizeTranslator translator = init_papersizetranslator(); + static PaperSizeTranslator translator = initPaperSizeTranslator(); return translator; } @@ -275,6 +277,7 @@ public: AuthorList authorlist; BranchList branchlist; + vector extraEmbeddedFiles; Bullet temp_bullets[4]; Bullet user_defined_bullets[4]; Spacing spacing; @@ -283,11 +286,12 @@ public: */ VSpace defskip; PDFOptions pdfoptions; + LayoutFileIndex baseClass_; }; BufferParams::Impl::Impl() - : defskip(VSpace::MEDSKIP) + : defskip(VSpace::MEDSKIP), baseClass_(string("")) { // set initial author // FIXME UNICODE @@ -313,10 +317,10 @@ void BufferParams::MemoryTraits::destroy(BufferParams::Impl * ptr) BufferParams::BufferParams() : pimpl_(new Impl) { - setBaseClass(defaultTextclass()); - makeTextClass(); - paragraph_separation = PARSEP_INDENT; - quotes_language = InsetQuotes::EnglishQ; + setBaseClass(defaultBaseclass()); + makeDocumentClass(); + paragraph_separation = ParagraphIndentSeparation; + quotes_language = InsetQuotes::EnglishQuotes; fontsize = "default"; /* PaperLayout */ @@ -347,7 +351,7 @@ BufferParams::BufferParams() 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]; @@ -355,11 +359,7 @@ BufferParams::BufferParams() } -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); @@ -378,6 +378,18 @@ AuthorList const & BufferParams::authors() const } +vector & BufferParams::extraEmbeddedFiles() +{ + return pimpl_->extraEmbeddedFiles; +} + + +vector const & BufferParams::extraEmbeddedFiles() const +{ + return pimpl_->extraEmbeddedFiles; +} + + BranchList & BufferParams::branchlist() { return pimpl_->branchlist; @@ -454,35 +466,33 @@ void BufferParams::setDefSkip(VSpace const & vs) } -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 pp = - make_pair(false, textclass_type(0)); - if (!filepath.empty()) - pp = textclasslist.addTextClass( - classname, filepath.absFilename()); - if (pp.first) - setBaseClass(pp.second); - else { - pp = textclasslist.numberOfClass(classname); - if (pp.first) - setBaseClass(pp.second); - else { - // a warning will be given for unknown class - setBaseClass(defaultTextclass()); - 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 (!getTextClass().isTeXClassAvailable()) { + if (!baseClass()->isTeXClassAvailable()) { docstring const msg = bformat(_("The layout file requested by this document,\n" "%1$s.layout,\n" @@ -496,6 +506,8 @@ string const BufferParams::readToken(Lexer & lex, string const & token, } else if (token == "\\begin_preamble") { readPreamble(lex); + } else if (token == "\\begin_local_layout") { + readLocalLayout(lex); } else if (token == "\\begin_modules") { readModules(lex); } else if (token == "\\options") { @@ -529,7 +541,11 @@ string const BufferParams::readToken(Lexer & lex, string const & token, paragraph_separation = parseptranslator().find(parsep); } else if (token == "\\defskip") { lex.next(); - pimpl_->defskip = VSpace(lex.getString()); + string defskip = lex.getString(); + if (defskip == "defskip") + // this is invalid + defskip = "medskip"; + pimpl_->defskip = VSpace(defskip); } else if (token == "\\quotes_language") { string quotes_lang; lex >> quotes_lang; @@ -615,6 +631,8 @@ string const BufferParams::readToken(Lexer & lex, string const & token, lex >> headsep; } else if (token == "\\footskip") { lex >> footskip; + } else if (token == "\\columnsep") { + lex >> columnsep; } else if (token == "\\paperfontsize") { lex >> fontsize; } else if (token == "\\papercolumns") { @@ -655,6 +673,16 @@ string const BufferParams::readToken(Lexer & lex, string const & token, 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; @@ -671,7 +699,7 @@ void BufferParams::writeFile(ostream & os) const // Prints out the buffer info into the .lyx file given by file // the textclass - os << "\\textclass " << textclasslist[baseClass_].name() << '\n'; + os << "\\textclass " << baseClass()->name() << '\n'; // then the preamble if (!preamble.empty()) { @@ -696,6 +724,15 @@ void BufferParams::writeFile(ostream & os) const os << "\\end_modules" << '\n'; } + // local layout information + if (!local_layout.empty()) { + // remove '\n' from the end + string const tmplocal = rtrim(local_layout, "\n"); + os << "\\begin_local_layout\n" + << tmplocal + << "\n\\end_local_layout\n"; + } + // then the text parameters if (language != ignore_language) os << "\\language " << language->lang() << '\n'; @@ -764,6 +801,9 @@ void BufferParams::writeFile(ostream & os) const if (!footskip.empty()) os << "\\footskip " << VSpace(footskip).asLyXCommand() << '\n'; + if (!columnsep.empty()) + os << "\\columnsep " + << VSpace(columnsep).asLyXCommand() << '\n'; os << "\\secnumdepth " << secnumdepth << "\n\\tocdepth " << tocdepth << "\n\\paragraph_separation " @@ -805,18 +845,25 @@ void BufferParams::writeFile(ostream & os) const else os << "\\author " << Author() << "\n"; } + + vector::const_iterator e_it = extraEmbeddedFiles().begin(); + vector::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::validate(LaTeXFeatures & features) const { - if (!getTextClass().requires().empty()) { - vector req = getTextClass().requires(); - for (vector::const_iterator it = req.begin(); - it != req.end(); ++it) { - features.require(*it); - } - } + features.require(documentClass().requires()); if (outputChanges) { bool dvipost = LaTeXFeatures::isAvailable("dvipost"); @@ -858,7 +905,7 @@ void BufferParams::validate(LaTeXFeatures & features) const // AMS Style is at document level if (use_amsmath == package_on - || getTextClass().provides("amsmath")) + || documentClass().provides("amsmath")) features.require("amsmath"); if (use_esint == package_on) features.require("esint"); @@ -899,7 +946,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, { os << "\\documentclass"; - TextClass const & tclass = getTextClass(); + DocumentClass const & tclass = documentClass(); ostringstream clsoptions; // the document class options. @@ -1141,6 +1188,8 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, os << ",headsep=" << from_ascii(Length(headsep).asLatexString()); if (!footskip.empty()) os << ",footskip=" << from_ascii(Length(footskip).asLatexString()); + if (!columnsep.empty()) + os << ",columnsep=" << from_ascii(Length(columnsep).asLatexString()); os << "}\n"; texrow.newline(); } @@ -1238,7 +1287,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, // hyperref, see // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129680.html if (language->lang() == "japanese-plain" && - !getTextClass().provides("japanese")) { + !documentClass().provides("japanese")) { //load babel in case it was not loaded due to an empty language list if (language_options.str().empty()) lyxpreamble += "\\usepackage{babel}\n"; @@ -1256,7 +1305,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, // use hyperref explicitely when it is required if (features.isRequired("hyperref")) { odocstringstream oss; - pdfoptions().writeLaTeX(oss, getTextClass().provides("hyperref")); + pdfoptions().writeLaTeX(oss, documentClass().provides("hyperref")); lyxpreamble += oss.str(); } @@ -1338,7 +1387,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, void BufferParams::useClassDefaults() { - TextClass const & tclass = textclasslist[baseClass_]; + DocumentClass const & tclass = documentClass(); sides = tclass.sides(); columns = tclass.columns(); @@ -1354,57 +1403,80 @@ void BufferParams::useClassDefaults() bool BufferParams::hasClassDefaults() const { - TextClass const & tclass = textclasslist[baseClass_]; + DocumentClass const & tclass = documentClass(); - return (sides == tclass.sides() + return sides == tclass.sides() && columns == tclass.columns() && pagestyle == tclass.pagestyle() && options == tclass.options() && secnumdepth == tclass.secnumdepth() - && tocdepth == tclass.tocdepth()); + && tocdepth == tclass.tocdepth(); } -TextClass const & BufferParams::getTextClass() const +DocumentClass const & BufferParams::documentClass() const { - return *textClass_; + return *doc_class_; } -TextClassPtr BufferParams::getTextClassPtr() const { - return textClass_; +DocumentClass * BufferParams::documentClassPtr() const { + return doc_class_; } -void BufferParams::setTextClass(TextClassPtr tc) { - textClass_ = tc; +void BufferParams::setDocumentClass(DocumentClass const * const tc) { + // evil, but this function is evil + doc_class_ = const_cast(tc); } -bool BufferParams::setBaseClass(textclass_type tc) +bool BufferParams::setBaseClass(string const & classname) { - if (textclasslist[tc].load()) { - 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(textclasslist[tc].name())); + from_utf8(classname)); frontend::Alert::error(_("Could not load class"), s); return false; } -textclass_type BufferParams::getBaseClass() const +LayoutFile const * BufferParams::baseClass() const { - return baseClass_; + if (LayoutFileList::get().haveClass(pimpl_->baseClass_)) + return &(LayoutFileList::get()[pimpl_->baseClass_]); + else + return 0; } -void BufferParams::makeTextClass() +LayoutFileIndex const & BufferParams::baseClassID() const { - textClass_.reset(new TextClass(textclasslist[getBaseClass()])); + return pimpl_->baseClass_; +} + + +void BufferParams::makeDocumentClass() +{ + 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 @@ -1421,7 +1493,7 @@ void BufferParams::makeTextClass() "probably need to reconfigure LyX.\n"), from_utf8(modName)); frontend::Alert::warning(_("Module not available"), msg + _("Some layouts may not be available.")); - lyxerr << "BufferParams::makeTextClass(): Module " << + lyxerr << "BufferParams::makeDocumentClass(): Module " << modName << " requested but not found in module list." << endl; continue; @@ -1434,18 +1506,30 @@ void BufferParams::makeTextClass() frontend::Alert::warning(_("Package not available"), msg); } FileName layout_file = libFileSearch("layouts", lm->getFilename()); - textClass_->read(layout_file, TextClass::MODULE); + if (!doc_class_->read(layout_file, TextClass::MODULE)) { + docstring const msg = + bformat(_("Error reading module %1$s\n"), from_utf8(modName)); + frontend::Alert::warning(_("Read Error"), msg); + } + } + if (!local_layout.empty()) { + if (!doc_class_->read(local_layout, TextClass::MODULE)) { + docstring const msg = _("Error reading internal layout information"); + frontend::Alert::warning(_("Read Error"), msg); + } } } -vector const & BufferParams::getModules() const { +vector const & BufferParams::getModules() const +{ return layoutModules_; } -bool BufferParams::addLayoutModule(string const & modName) { +bool BufferParams::addLayoutModule(string const & modName) +{ LayoutModuleList::const_iterator it = layoutModules_.begin(); LayoutModuleList::const_iterator end = layoutModules_.end(); for (; it != end; it++) { @@ -1459,14 +1543,15 @@ bool BufferParams::addLayoutModule(string const & modName) { } -void BufferParams::clearLayoutModules() { +void BufferParams::clearLayoutModules() +{ layoutModules_.clear(); } Font const BufferParams::getFont() const { - FontInfo f = getTextClass().defaultfont(); + FontInfo f = documentClass().defaultfont(); if (fontsDefaultFamily == "rmdefault") f.setFamily(ROMAN_FAMILY); else if (fontsDefaultFamily == "sfdefault") @@ -1487,6 +1572,16 @@ void BufferParams::readPreamble(Lexer & lex) } +void BufferParams::readLocalLayout(Lexer & lex) +{ + if (lex.getString() != "\\begin_local_layout") + lyxerr << "Error (BufferParams::readLocalLayout):" + "consistency check failed." << endl; + + local_layout = lex.getLongString("\\end_local_layout"); +} + + void BufferParams::readLanguage(Lexer & lex) { if (!lex.next()) return; @@ -1507,7 +1602,8 @@ void BufferParams::readLanguage(Lexer & lex) void BufferParams::readGraphicsDriver(Lexer & lex) { - if (!lex.next()) return; + if (!lex.next()) + return; string const tmptok = lex.getString(); // check if tmptok is part of tex_graphics in tex_defs.h @@ -1531,7 +1627,8 @@ void BufferParams::readGraphicsDriver(Lexer & lex) void BufferParams::readBullets(Lexer & lex) { - if (!lex.next()) return; + if (!lex.next()) + return; int const index = lex.getInteger(); lex.next(); @@ -1550,7 +1647,8 @@ void BufferParams::readBullets(Lexer & lex) void BufferParams::readBulletsLaTeX(Lexer & lex) { // The bullet class should be able to read this. - if (!lex.next()) return; + if (!lex.next()) + return; int const index = lex.getInteger(); lex.next(true); docstring const temp_str = lex.getDocString(); @@ -1577,7 +1675,7 @@ void BufferParams::readModules(Lexer & lex) } -string const BufferParams::paperSizeName(Papersize_Purpose const & purpose) const +string BufferParams::paperSizeName(PapersizePurpose purpose) const { char real_papersize = papersize; if (real_papersize == PAPER_DEFAULT) @@ -1669,7 +1767,7 @@ string const BufferParams::dvips_options() const } -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}") @@ -1888,7 +1986,7 @@ string const BufferParams::loadFonts(string const & rm, else if (tt == "courier" ) os << "\\usepackage{" << tt << "}\n"; // Computer Modern, Latin Modern, CM Bright - else if (tt != "default") + else if (tt != "default") os << "\\renewcommand{\\ttdefault}{" << tt << "}\n"; return os.str(); @@ -1898,29 +1996,28 @@ string const BufferParams::loadFonts(string const & rm, Encoding const & BufferParams::encoding() const { if (inputenc == "auto" || inputenc == "default") - return *(language->encoding()); - Encoding const * const enc = - encodings.getFromLaTeXName(inputenc); + return *language->encoding(); + Encoding const * const enc = encodings.fromLaTeXName(inputenc); if (enc) return *enc; - lyxerr << "Unknown inputenc value `" << inputenc - << "'. Using `auto' instead." << endl; - return *(language->encoding()); + LYXERR0("Unknown inputenc value `" << inputenc + << "'. Using `auto' instead."); + return *language->encoding(); } -biblio::CiteEngine BufferParams::getEngine() const +biblio::CiteEngine BufferParams::citeEngine() const { // FIXME the class should provide the numerical/ // authoryear choice - if (getTextClass().provides("natbib") + if (documentClass().provides("natbib") && cite_engine_ != biblio::ENGINE_NATBIB_NUMERICAL) return biblio::ENGINE_NATBIB_AUTHORYEAR; return cite_engine_; } -void BufferParams::setCiteEngine(biblio::CiteEngine const cite_engine) +void BufferParams::setCiteEngine(biblio::CiteEngine cite_engine) { cite_engine_ = cite_engine; }