X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBufferParams.cpp;h=ba261ec7989d42a35ea5688af18c78b96a9b5e64;hb=14001c49fe0fb3d95a0f69f63344e7ae59d28180;hp=b177409dd17e0b341eee41836a6862b921761cd8;hpb=d45ca67d1d3e2d4fdc344cd2a1517725bc91723a;p=lyx.git diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp index b177409dd1..ba261ec798 100644 --- a/src/BufferParams.cpp +++ b/src/BufferParams.cpp @@ -4,10 +4,10 @@ * Licence details can be found in the file COPYING. * * \author Alfredo Braunstein - * \author Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes * \author Jean-Marc Lasgouttes * \author John Levon - * \author André Pönitz + * \author André Pönitz * \author Martin Vermeer * * Full author contact details are available in file CREDITS. @@ -23,7 +23,10 @@ #include "buffer_funcs.h" #include "Bullet.h" #include "Color.h" +#include "ColorSet.h" #include "Encoding.h" +#include "HSpace.h" +#include "IndicesList.h" #include "Language.h" #include "LaTeXFeatures.h" #include "ModuleList.h" @@ -92,6 +95,7 @@ static char const * const tex_graphics[] = { }; + namespace lyx { // Local translators @@ -269,7 +273,6 @@ SpaceTranslator const & spacetranslator() return translator; } - } // anon namespace @@ -282,10 +285,12 @@ public: BranchList branchlist; Bullet temp_bullets[4]; Bullet user_defined_bullets[4]; + IndicesList indiceslist; Spacing spacing; /** This is the amount of space used for paragraph_separation "skip", * and for detached paragraphs in "indented" documents. */ + HSpace indentation; VSpace defskip; PDFOptions pdfoptions; LayoutFileIndex baseClass_; @@ -331,33 +336,47 @@ BufferParams::BufferParams() use_geometry = false; use_amsmath = package_auto; use_esint = package_auto; + use_mhchem = package_auto; cite_engine_ = ENGINE_BASIC; use_bibtopic = false; + use_indices = false; trackChanges = false; outputChanges = false; use_default_options = true; secnumdepth = 3; tocdepth = 3; language = default_language; + fontenc = "global"; fontsRoman = "default"; fontsSans = "default"; fontsTypewriter = "default"; fontsDefaultFamily = "default"; + useXetex = false; fontsSC = false; fontsOSF = false; fontsSansScale = 100; fontsTypewriterScale = 100; inputenc = "auto"; graphicsDriver = "default"; + defaultOutputFormat = "default"; + bibtex_command = "default"; + index_command = "default"; sides = OneSide; columns = 1; listings_params = string(); pagestyle = "default"; + suppress_date = false; + // white is equal to no background color + backgroundcolor = lyx::rgbFromHexName("#ffffff"); compressed = false; for (int iter = 0; iter < 4; ++iter) { user_defined_bullet(iter) = ITEMIZE_DEFAULTS[iter]; temp_bullet(iter) = ITEMIZE_DEFAULTS[iter]; } + // default index + indiceslist().addDefault(B_("Index")); + html_be_strict = true; + html_use_mathml = true; } @@ -392,6 +411,18 @@ BranchList const & BufferParams::branchlist() const } +IndicesList & BufferParams::indiceslist() +{ + return pimpl_->indiceslist; +} + + +IndicesList const & BufferParams::indiceslist() const +{ + return pimpl_->indiceslist; +} + + Bullet & BufferParams::temp_bullet(lyx::size_type const index) { LASSERT(index < 4, /**/); @@ -444,6 +475,18 @@ PDFOptions const & BufferParams::pdfoptions() const } +HSpace const & BufferParams::getIndentation() const +{ + return pimpl_->indentation; +} + + +void BufferParams::setIndentation(HSpace const & indent) +{ + pimpl_->indentation = indent; +} + + VSpace const & BufferParams::getDefSkip() const { return pimpl_->defskip; @@ -501,20 +544,38 @@ string BufferParams::readToken(Lexer & lex, string const & token, } else if (token == "\\master") { lex.eatLine(); master = lex.getString(); + } else if (token == "\\suppress_date") { + lex >> suppress_date; } else if (token == "\\language") { readLanguage(lex); } else if (token == "\\inputencoding") { lex >> inputenc; } else if (token == "\\graphics") { readGraphicsDriver(lex); + } else if (token == "\\default_output_format") { + lex >> defaultOutputFormat; + } else if (token == "\\bibtex_command") { + lex.eatLine(); + bibtex_command = lex.getString(); + } else if (token == "\\index_command") { + lex.eatLine(); + index_command = lex.getString(); + } else if (token == "\\fontencoding") { + lex.eatLine(); + fontenc = lex.getString(); } else if (token == "\\font_roman") { - lex >> fontsRoman; + lex.eatLine(); + fontsRoman = lex.getString(); } else if (token == "\\font_sans") { - lex >> fontsSans; + lex.eatLine(); + fontsSans = lex.getString(); } else if (token == "\\font_typewriter") { - lex >> fontsTypewriter; + lex.eatLine(); + fontsTypewriter = lex.getString(); } else if (token == "\\font_default_family") { lex >> fontsDefaultFamily; + } else if (token == "\\use_xetex") { + lex >> useXetex; } else if (token == "\\font_sc") { lex >> fontsSC; } else if (token == "\\font_osf") { @@ -529,6 +590,10 @@ string BufferParams::readToken(Lexer & lex, string const & token, string parsep; lex >> parsep; paragraph_separation = parseptranslator().find(parsep); + } else if (token == "\\paragraph_indentation") { + lex.next(); + string indentation = lex.getString(); + pimpl_->indentation = HSpace(indentation); } else if (token == "\\defskip") { lex.next(); string defskip = lex.getString(); @@ -554,18 +619,24 @@ string BufferParams::readToken(Lexer & lex, string const & token, int useesint; lex >> useesint; use_esint = packagetranslator().find(useesint); + } else if (token == "\\use_mhchem") { + int usemhchem; + lex >> usemhchem; + use_mhchem = packagetranslator().find(usemhchem); } else if (token == "\\cite_engine") { string engine; lex >> engine; cite_engine_ = citeenginetranslator().find(engine); } else if (token == "\\use_bibtopic") { lex >> use_bibtopic; + } else if (token == "\\use_indices") { + lex >> use_indices; } else if (token == "\\tracking_changes") { lex >> trackChanges; } else if (token == "\\output_changes") { lex >> outputChanges; } else if (token == "\\branch") { - lex.next(); + lex.eatLine(); docstring branch = lex.getDocString(); branchlist().add(branch); while (true) { @@ -579,7 +650,11 @@ string BufferParams::readToken(Lexer & lex, string const & token, if (branch_ptr) branch_ptr->setSelected(lex.getInteger()); } - // not yet operational + if (tok == "\\filename_suffix") { + lex.next(); + if (branch_ptr) + branch_ptr->setFilenameSuffix(lex.getInteger()); + } if (tok == "\\color") { lex.eatLine(); string color = lex.getString(); @@ -590,7 +665,36 @@ string BufferParams::readToken(Lexer & lex, string const & token, color = lcolor.getX11Name(Color_background); // FIXME UNICODE lcolor.setColor(to_utf8(branch), color); - + } + } + } else if (token == "\\index") { + lex.eatLine(); + docstring index = lex.getDocString(); + docstring shortcut; + indiceslist().add(index); + while (true) { + lex.next(); + string const tok = lex.getString(); + if (tok == "\\end_index") + break; + Index * index_ptr = indiceslist().find(index); + if (tok == "\\shortcut") { + lex.next(); + shortcut = lex.getDocString(); + if (index_ptr) + index_ptr->setShortcut(shortcut); + } + if (tok == "\\color") { + lex.eatLine(); + string color = lex.getString(); + if (index_ptr) + index_ptr->setColor(color); + // Update also the Color table: + if (color == "none") + color = lcolor.getX11Name(Color_background); + // FIXME UNICODE + if (!shortcut.empty()) + lcolor.setColor(to_utf8(shortcut), color); } } } else if (token == "\\author") { @@ -598,11 +702,14 @@ string BufferParams::readToken(Lexer & lex, string const & token, istringstream ss(lex.getString()); Author a; ss >> a; - author_map.push_back(pimpl_->authorlist.record(a)); + author_map[a.buffer_id()] = pimpl_->authorlist.record(a); } else if (token == "\\paperorientation") { string orient; lex >> orient; orientation = paperorientationtranslator().find(orient); + } else if (token == "\\backgroundcolor") { + lex.eatLine(); + backgroundcolor = lyx::rgbFromHexName(lex.getString()); } else if (token == "\\paperwidth") { lex >> paperwidth; } else if (token == "\\paperheight") { @@ -663,6 +770,10 @@ string BufferParams::readToken(Lexer & lex, string const & token, toktmp << endl; return toktmp; } + } else if (token == "\\html_use_mathml") { + lex >> html_use_mathml; + } else if (token == "\\html_be_strict") { + lex >> html_be_strict; } else { lyxerr << "BufferParams::readToken(): Unknown token: " << token << endl; @@ -707,8 +818,8 @@ void BufferParams::writeFile(ostream & os) const // removed modules if (!removedModules_.empty()) { os << "\\begin_removed_modules" << '\n'; - set::const_iterator it = removedModules_.begin(); - set::const_iterator en = removedModules_.end(); + list::const_iterator it = removedModules_.begin(); + list::const_iterator en = removedModules_.end(); for (; it != en; it++) os << *it << '\n'; os << "\\end_removed_modules" << '\n'; @@ -737,10 +848,12 @@ void BufferParams::writeFile(ostream & os) const if (language != ignore_language) os << "\\language " << language->lang() << '\n'; os << "\\inputencoding " << inputenc + << "\n\\fontencoding " << fontenc << "\n\\font_roman " << fontsRoman << "\n\\font_sans " << fontsSans << "\n\\font_typewriter " << fontsTypewriter << "\n\\font_default_family " << fontsDefaultFamily + << "\n\\use_xetex " << convert(useXetex) << "\n\\font_sc " << convert(fontsSC) << "\n\\font_osf " << convert(fontsOSF) << "\n\\font_sf_scale " << fontsSansScale @@ -750,6 +863,9 @@ void BufferParams::writeFile(ostream & os) const os << "\\font_cjk " << fontsCJK << '\n'; } os << "\n\\graphics " << graphicsDriver << '\n'; + os << "\\default_output_format " << defaultOutputFormat << '\n'; + os << "\\bibtex_command " << bibtex_command << '\n'; + os << "\\index_command " << index_command << '\n'; if (!float_placement.empty()) { os << "\\float_placement " << float_placement << '\n'; @@ -763,21 +879,37 @@ void BufferParams::writeFile(ostream & os) const << "\n\\use_geometry " << convert(use_geometry) << "\n\\use_amsmath " << use_amsmath << "\n\\use_esint " << use_esint + << "\n\\use_mhchem " << use_mhchem << "\n\\cite_engine " << citeenginetranslator().find(cite_engine_) << "\n\\use_bibtopic " << convert(use_bibtopic) + << "\n\\use_indices " << convert(use_indices) << "\n\\paperorientation " << string_orientation[orientation] + << "\n\\suppress_date " << convert(suppress_date) << '\n'; + if (backgroundcolor != lyx::rgbFromHexName("#ffffff")) + os << "\\backgroundcolor " << lyx::X11hexname(backgroundcolor) << '\n'; BranchList::const_iterator it = branchlist().begin(); BranchList::const_iterator end = branchlist().end(); for (; it != end; ++it) { os << "\\branch " << to_utf8(it->branch()) << "\n\\selected " << it->isSelected() + << "\n\\filename_suffix " << it->hasFilenameSuffix() << "\n\\color " << lyx::X11hexname(it->color()) << "\n\\end_branch" << "\n"; } + IndicesList::const_iterator iit = indiceslist().begin(); + IndicesList::const_iterator iend = indiceslist().end(); + for (; iit != iend; ++iit) { + os << "\\index " << to_utf8(iit->index()) + << "\n\\shortcut " << to_utf8(iit->shortcut()) + << "\n\\color " << lyx::X11hexname(iit->color()) + << "\n\\end_index" + << "\n"; + } + if (!paperwidth.empty()) os << "\\paperwidth " << VSpace(paperwidth).asLyXCommand() << '\n'; @@ -811,9 +943,12 @@ void BufferParams::writeFile(ostream & os) const os << "\\secnumdepth " << secnumdepth << "\n\\tocdepth " << tocdepth << "\n\\paragraph_separation " - << string_paragraph_separation[paragraph_separation] - << "\n\\defskip " << getDefSkip().asLyXCommand() - << "\n\\quotes_language " + << string_paragraph_separation[paragraph_separation]; + if (!paragraph_separation) + os << "\n\\paragraph_indentation " << getIndentation().asLyXCommand(); + else + os << "\n\\defskip " << getDefSkip().asLyXCommand(); + os << "\n\\quotes_language " << string_quotes_language[quotes_language] << "\n\\papercolumns " << columns << "\n\\papersides " << sides @@ -838,17 +973,12 @@ void BufferParams::writeFile(ostream & os) const } } - os << "\\tracking_changes " << convert(trackChanges) << "\n"; - os << "\\output_changes " << convert(outputChanges) << "\n"; + os << "\\tracking_changes " << convert(trackChanges) << "\n" + << "\\output_changes " << convert(outputChanges) << "\n" + << "\\html_use_mathml " << convert(html_use_mathml) << "\n" + << "\\html_be_strict " << convert(html_be_strict) << "\n"; - AuthorList::Authors::const_iterator a_it = pimpl_->authorlist.begin(); - AuthorList::Authors::const_iterator a_end = pimpl_->authorlist.end(); - for (; a_it != a_end; ++a_it) { - if (a_it->second.used()) - os << "\\author " << a_it->second << "\n"; - else - os << "\\author " << Author() << "\n"; - } + os << pimpl_->authorlist; } @@ -858,7 +988,7 @@ void BufferParams::validate(LaTeXFeatures & features) const if (outputChanges) { bool dvipost = LaTeXFeatures::isAvailable("dvipost"); - bool xcolorsoul = LaTeXFeatures::isAvailable("soul") && + bool xcolorulem = LaTeXFeatures::isAvailable("ulem") && LaTeXFeatures::isAvailable("xcolor"); switch (features.runparams().flavor) { @@ -866,18 +996,19 @@ void BufferParams::validate(LaTeXFeatures & features) const if (dvipost) { features.require("ct-dvipost"); features.require("dvipost"); - } else if (xcolorsoul) { - features.require("ct-xcolor-soul"); - features.require("soul"); + } else if (xcolorulem) { + features.require("ct-xcolor-ulem"); + features.require("ulem"); features.require("xcolor"); } else { features.require("ct-none"); } break; case OutputParams::PDFLATEX: - if (xcolorsoul) { - features.require("ct-xcolor-soul"); - features.require("soul"); + case OutputParams::XETEX: + if (xcolorulem) { + features.require("ct-xcolor-ulem"); + features.require("ulem"); features.require("xcolor"); // improves color handling in PDF output features.require("pdfcolmk"); @@ -900,6 +1031,8 @@ void BufferParams::validate(LaTeXFeatures & features) const features.require("amsmath"); if (use_esint == package_on) features.require("esint"); + if (use_mhchem == package_on) + features.require("mhchem"); // Document-level line spacing if (spacing().getSpace() != Spacing::Single && !spacing().isDefault()) @@ -931,60 +1064,20 @@ void BufferParams::validate(LaTeXFeatures & features) const features.require("hyperref"); // due to interferences with babel and hyperref, the color package has to // be loaded after hyperref when hyperref is used with the colorlinks - // option, see http://bugzilla.lyx.org/show_bug.cgi?id=5291 + // option, see http://www.lyx.org/trac/ticket/5291 if (pdfoptions().colorlinks) features.require("color"); } + if (useXetex) + features.require("xetex"); + if (language->lang() == "vietnamese") features.require("vietnamese"); else if (language->lang() == "japanese") features.require("japanese"); } -/// Find out if we need special treatment for babel. -static bool needsSpecialBabelCall(LaTeXFeatures const & features) -{ - // FIXME: don't hardcode this!! - // If Vietnamese is used, babel must directly be loaded with the - // language options, see - // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129417.html - // - // viet = string::npos when not found - // the same is for all other languages that are not directly supported by - // babel, but where LaTeX-packages add babel support. - // this is currently the case for Latvian, Lithuanian, and Mongolian - // - // If Japanese is used, babel must directly be loaded with the - // language options, see - // http://bugzilla.lyx.org/show_bug.cgi?id=4597#c4 - return !lyxrc.language_global_options - || features.hasLanguage("vietnam") - || features.hasLanguage("latvian") - || features.hasLanguage("japanese") - || features.hasLanguage("lithuanian") - || features.hasLanguage("mongolian"); -} - -/// set up if and how babel is called -static docstring babelCall(LaTeXFeatures const & features, - string const & lang_opts) -{ - string babel_call = lyxrc.language_package; - if (babel_call != "\\usepackage{babel}") - return from_utf8(babel_call); - // suppress the babel call when there is no babel language defined - // for the document language in the lib/languages file and if no - // other languages are used (lang_opts is then empty) - if (!features.hasLanguages()) - return docstring(); - - if (needsSpecialBabelCall(features)) - babel_call = "\\usepackage[" + lang_opts + "]{babel}"; - - return from_utf8(babel_call); -} - bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, TexRow & texrow) const @@ -1075,8 +1168,25 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, language_options << ','; language_options << language->babel(); } - if (!language_options.str().empty() - && !needsSpecialBabelCall(features)) + // if Vietnamese is used, babel must directly be loaded + // with language options, not in the class options, see + // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129417.html + size_t viet = language_options.str().find("vietnam"); + // viet = string::npos when not found + // the same is for all other languages that are not directly supported by + // babel, but where LaTeX-packages add babel support. + // this is currently the case for Latvian, Lithuanian, and Mongolian + size_t latvian = language_options.str().find("latvian"); + size_t lithu = language_options.str().find("lithuanian"); + size_t mongo = language_options.str().find("mongolian"); + // if Japanese is used, babel must directly be loaded + // with language options, not in the class options, see + // http://www.lyx.org/trac/ticket/4597#c4 + size_t japan = language_options.str().find("japanese"); + if (lyxrc.language_global_options && !language_options.str().empty() + && viet == string::npos && japan == string::npos + && latvian == string::npos && lithu == string::npos + && mongo == string::npos) clsoptions << language_options.str() << ','; } @@ -1100,11 +1210,16 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, texrow.newline(); // end of \documentclass defs + if (useXetex) { + os << "\\usepackage{fontspec}\n"; + texrow.newline(); + } + // font selection must be done before loading fontenc.sty string const fonts = loadFonts(fontsRoman, fontsSans, fontsTypewriter, fontsSC, fontsOSF, - fontsSansScale, fontsTypewriterScale); + fontsSansScale, fontsTypewriterScale, useXetex); if (!fonts.empty()) { os << from_ascii(fonts); texrow.newline(); @@ -1114,17 +1229,18 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, << from_ascii(fontsDefaultFamily) << "}\n"; // set font encoding - // this one is not per buffer // for arabic_arabi and farsi we also need to load the LAE and // LFE encoding - if (lyxrc.fontenc != "default" && language->lang() != "japanese") { + // XeTeX works without fontenc + if (font_encoding() != "default" && language->lang() != "japanese" + && !useXetex) { if (language->lang() == "arabic_arabi" || language->lang() == "farsi") { - os << "\\usepackage[" << from_ascii(lyxrc.fontenc) + os << "\\usepackage[" << from_ascii(font_encoding()) << ",LFE,LAE]{fontenc}\n"; texrow.newline(); } else { - os << "\\usepackage[" << from_ascii(lyxrc.fontenc) + os << "\\usepackage[" << from_ascii(font_encoding()) << "]{fontenc}\n"; texrow.newline(); } @@ -1154,72 +1270,73 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, os << "}\n"; texrow.newline(); } - if (use_geometry || nonstandard_papersize) { - os << "\\usepackage{geometry}\n"; - texrow.newline(); - os << "\\geometry{verbose"; + if (!tclass.provides("geometry") + && (use_geometry || nonstandard_papersize)) { + odocstringstream ods; + if (!getGraphicsDriver("geometry").empty()) + ods << getGraphicsDriver("geometry"); if (orientation == ORIENTATION_LANDSCAPE) - os << ",landscape"; + ods << ",landscape"; switch (papersize) { case PAPER_CUSTOM: if (!paperwidth.empty()) - os << ",paperwidth=" + ods << ",paperwidth=" << from_ascii(paperwidth); if (!paperheight.empty()) - os << ",paperheight=" + ods << ",paperheight=" << from_ascii(paperheight); break; case PAPER_USLETTER: - os << ",letterpaper"; + ods << ",letterpaper"; break; case PAPER_USLEGAL: - os << ",legalpaper"; + ods << ",legalpaper"; break; case PAPER_USEXECUTIVE: - os << ",executivepaper"; + ods << ",executivepaper"; break; case PAPER_A3: - os << ",a3paper"; + ods << ",a3paper"; break; case PAPER_A4: - os << ",a4paper"; + ods << ",a4paper"; break; case PAPER_A5: - os << ",a5paper"; + ods << ",a5paper"; break; case PAPER_B3: - os << ",b3paper"; + ods << ",b3paper"; break; case PAPER_B4: - os << ",b4paper"; + ods << ",b4paper"; break; case PAPER_B5: - os << ",b5paper"; + ods << ",b5paper"; break; default: // default papersize ie PAPER_DEFAULT switch (lyxrc.default_papersize) { case PAPER_DEFAULT: // keep compiler happy case PAPER_USLETTER: - os << ",letterpaper"; + ods << ",letterpaper"; break; case PAPER_USLEGAL: - os << ",legalpaper"; + ods << ",legalpaper"; break; case PAPER_USEXECUTIVE: - os << ",executivepaper"; + ods << ",executivepaper"; break; case PAPER_A3: - os << ",a3paper"; + ods << ",a3paper"; break; case PAPER_A4: - os << ",a4paper"; + ods << ",a4paper"; break; case PAPER_A5: - os << ",a5paper"; + ods << ",a5paper"; break; case PAPER_B5: - os << ",b5paper"; + ods << ",b5paper"; break; case PAPER_B3: case PAPER_B4: @@ -1227,6 +1344,13 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, break; } } + docstring const g_options = trim(ods.str(), ","); + os << "\\usepackage"; + if (!g_options.empty()) + os << '[' << g_options << ']'; + os << "{geometry}\n"; + texrow.newline(); + os << "\\geometry{verbose"; if (!topmargin.empty()) os << ",tmargin=" << from_ascii(Length(topmargin).asLatexString()); if (!bottommargin.empty()) @@ -1259,6 +1383,15 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, texrow.newline(); } + // only output when the background color is not white + if (backgroundcolor != lyx::rgbFromHexName("#ffffff")) { + // only require color here, the background color will be defined + // in LaTeXFeatures.cpp to avoid interferences with the LaTeX + // package pdfpages + features.require("color"); + features.require("pagecolor"); + } + // Only if class has a ToC hierarchy if (tclass.hasTocLevels()) { if (secnumdepth != tclass.secnumdepth()) { @@ -1276,6 +1409,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, } if (paragraph_separation) { + // when skip separation switch (getDefSkip().kind()) { case VSpace::SMALLSKIP: os << "\\setlength{\\parskip}{\\smallskipamount}\n"; @@ -1296,9 +1430,17 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, break; } texrow.newline(); - os << "\\setlength{\\parindent}{0pt}\n"; texrow.newline(); + } else { + // when separation by indentation + // only output something when a width is given + if (getIndentation().asLyXCommand() != "default") { + os << "\\setlength{\\parindent}{" + << from_utf8(getIndentation().asLatexCommand()) + << "}\n"; + texrow.newline(); + } } // Now insert the LyX specific LaTeX commands... @@ -1307,7 +1449,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, // due to interferences with babel and hyperref, the color package has to // be loaded (when it is not already loaded) before babel when hyperref // is used with the colorlinks option, see - // http://bugzilla.lyx.org/show_bug.cgi?id=5291 + // http://www.lyx.org/trac/ticket/5291 // we decided therefore to load color always before babel, see // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg144349.html lyxpreamble += from_ascii(features.getColorOptions()); @@ -1319,13 +1461,26 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, || features.isRequired("vietnamese") || features.isRequired("japanese") ) ) { // FIXME UNICODE - lyxpreamble += babelCall(features, language_options.str()) + '\n'; + lyxpreamble += from_utf8(babelCall(language_options.str())) + '\n'; lyxpreamble += from_utf8(features.getBabelOptions()) + '\n'; } // The optional packages; lyxpreamble += from_ascii(features.getPackages()); + // Additional Indices + if (features.isRequired("splitidx")) { + IndicesList::const_iterator iit = indiceslist().begin(); + IndicesList::const_iterator iend = indiceslist().end(); + for (; iit != iend; ++iit) { + lyxpreamble += "\\newindex["; + lyxpreamble += iit->index(); + lyxpreamble += "]{"; + lyxpreamble += iit->shortcut(); + lyxpreamble += "}\n"; + } + } + // Line spacing lyxpreamble += from_utf8(spacing().writePreamble(tclass.provides("SetSpace"))); @@ -1344,11 +1499,11 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, lyxpreamble += oss.str(); } - // Will be surrounded by \makeatletter and \makeatother when needed + // Will be surrounded by \makeatletter and \makeatother when not empty docstring atlyxpreamble; // Some macros LyX will need - docstring tmppreamble(from_ascii(features.getMacros())); + docstring tmppreamble(features.getMacros()); if (!tmppreamble.empty()) atlyxpreamble += "\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% " @@ -1362,8 +1517,14 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, "Textclass specific LaTeX commands.\n" + tmppreamble + '\n'; + // suppress date if selected + // use \@ifundefined because we cannot be sure that every document class + // has a \date command + if (suppress_date) + atlyxpreamble += "\\@ifundefined{date}{}{\\date{}}\n"; + /* the user-defined preamble */ - if (!preamble.empty()) + if (!containsOnly(preamble, " \n\t")) // FIXME UNICODE atlyxpreamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% " "User specified LaTeX commands.\n" @@ -1420,11 +1581,9 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, if (!bullets_def.empty()) atlyxpreamble += bullets_def + "}\n\n"; - if (atlyxpreamble.find(from_ascii("@")) != docstring::npos) + if (!atlyxpreamble.empty()) lyxpreamble += "\n\\makeatletter\n" + atlyxpreamble + "\\makeatother\n\n"; - else - lyxpreamble += '\n' + atlyxpreamble; // We try to load babel late, in case it interferes with other packages. // Jurabib and Hyperref have to be called after babel, though. @@ -1433,10 +1592,14 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, && !features.isRequired("vietnamese") && !features.isRequired("japanese")) { // FIXME UNICODE - lyxpreamble += babelCall(features, language_options.str()) + '\n'; + lyxpreamble += from_utf8(babelCall(language_options.str())) + '\n'; lyxpreamble += from_utf8(features.getBabelOptions()) + '\n'; } + docstring const i18npreamble = features.getTClassI18nPreamble(use_babel); + if (!i18npreamble.empty()) + lyxpreamble += i18npreamble + '\n'; + int const nlines = int(count(lyxpreamble.begin(), lyxpreamble.end(), '\n')); for (int j = 0; j != nlines; ++j) { @@ -1444,6 +1607,16 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, } os << lyxpreamble; + + // these packages (xunicode, for that matter) need to be loaded at least + // after amsmath, amssymb, esint and the other packages that provide + // special glyphs + if (useXetex) { + os << "\\usepackage{xunicode}\n"; + texrow.newline(); + os << "\\usepackage{xltxtra}\n"; + texrow.newline(); + } return use_babel; } @@ -1519,52 +1692,7 @@ bool BufferParams::setBaseClass(string const & classname) } pimpl_->baseClass_ = classname; - - // add any required modules not already in use - list const & mods = baseClass()->defaultModules(); - list::const_iterator mit = mods.begin(); - list::const_iterator men = mods.end(); - for (; mit != men; mit++) { - string const & modName = *mit; - // see if we're already in use - if (find(layoutModules_.begin(), layoutModules_.end(), modName) != - layoutModules_.end()) { - LYXERR(Debug::TCLASS, "Default module `" << modName << - "' not added because already used."); - continue; - } - // make sure the user hasn't removed it - if (find(removedModules_.begin(), removedModules_.end(), modName) != - removedModules_.end()) { - LYXERR(Debug::TCLASS, "Default module `" << modName << - "' not added because removed by user."); - continue; - } - // Now we want to check the list of selected modules to see if any of them - // exclude this one. - bool foundit = false; - // so iterate over the selected modules... - LayoutModuleList::const_iterator lit = layoutModules_.begin(); - LayoutModuleList::const_iterator len = layoutModules_.end(); - for (; lit != len; lit++) { - LyXModule * lm = moduleList[*lit]; - if (!lm) - continue; - vector const & exc = lm->getExcludedModules(); - // ...and see if this one excludes us. - if (find(exc.begin(), exc.end(), modName) != exc.end()) { - foundit = true; - LYXERR(Debug::TCLASS, "Default module `" << modName << - "' not added because excluded by loaded module `" << - *lit << "'."); - break; - } - } - if (!foundit) { - LYXERR(Debug::TCLASS, "Default module `" << modName << "' added."); - layoutModules_.push_back(modName); - } - } + layoutModules_.adaptToBaseClass(baseClass(), removedModules_); return true; } @@ -1589,41 +1717,8 @@ void BufferParams::makeDocumentClass() if (!baseClass()) return; - doc_class_ = &(DocumentClassBundle::get().newClass(*baseClass())); + doc_class_ = &(DocumentClassBundle::get().makeDocumentClass(*baseClass(), layoutModules_)); - // FIXME It might be worth loading the children's modules here, - // just as we load their bibliographies and such, instead of just - // doing a check in InsetInclude. - LayoutModuleList::const_iterator it = layoutModules_.begin(); - for (; it != layoutModules_.end(); it++) { - string const modName = *it; - LyXModule * lm = moduleList[modName]; - if (!lm) { - docstring const msg = - bformat(_("The module %1$s has been requested by\n" - "this document but has not been found in the list of\n" - "available modules. If you recently installed it, you\n" - "probably need to reconfigure LyX.\n"), from_utf8(modName)); - frontend::Alert::warning(_("Module not available"), - msg + _("Some layouts may not be available.")); - LYXERR0("BufferParams::makeDocumentClass(): Module " << - modName << " requested but not found in module list."); - continue; - } - if (!lm->isAvailable()) { - docstring const msg = - bformat(_("The module %1$s requires a package that is\n" - "not available in your LaTeX installation. LaTeX output\n" - "may not be possible.\n"), from_utf8(modName)); - frontend::Alert::warning(_("Package not available"), msg); - } - FileName layout_file = libFileSearch("layouts", lm->getFilename()); - 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"); @@ -1632,8 +1727,13 @@ void BufferParams::makeDocumentClass() } } +bool BufferParams::moduleCanBeAdded(string const & modName) const +{ + return layoutModules_.moduleCanBeAdded(modName, baseClass()); +} -bool BufferParams::addLayoutModule(string const & modName) + +bool BufferParams::addLayoutModule(string const & modName) { LayoutModuleList::const_iterator it = layoutModules_.begin(); LayoutModuleList::const_iterator end = layoutModules_.end(); @@ -1783,15 +1883,15 @@ void BufferParams::readRemovedModules(Lexer & lex) string mod = lex.getString(); if (mod == "\\end_removed_modules") break; - removedModules_.insert(mod); + removedModules_.push_back(mod); lex.eatLine(); } // now we want to remove any removed modules that were previously // added. normally, that will be because default modules were added in // setBaseClass(), which gets called when \textclass is read at the // start of the read. - set::const_iterator rit = removedModules_.begin(); - set::const_iterator const ren = removedModules_.end(); + list::const_iterator rit = removedModules_.begin(); + list::const_iterator const ren = removedModules_.end(); for (; rit != ren; rit++) { LayoutModuleList::iterator const mit = layoutModules_.begin(); LayoutModuleList::iterator const men = layoutModules_.end(); @@ -1895,9 +1995,68 @@ string const BufferParams::dvips_options() const } +string const BufferParams::font_encoding() const +{ + return (fontenc == "global") ? lyxrc.fontenc : fontenc; +} + + +string BufferParams::babelCall(string const & lang_opts) const +{ + string lang_pack = lyxrc.language_package; + if (lang_pack != "\\usepackage{babel}") + return lang_pack; + // suppress the babel call when there is no babel language defined + // for the document language in the lib/languages file and if no + // other languages are used (lang_opts is then empty) + if (lang_opts.empty()) + return string(); + // If Vietnamese is used, babel must directly be loaded with the + // language options, see + // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129417.html + size_t viet = lang_opts.find("vietnam"); + // viet = string::npos when not found + // the same is for all other languages that are not directly supported by + // babel, but where LaTeX-packages add babel support. + // this is currently the case for Latvian, Lithuanian, and Mongolian + size_t latvian = lang_opts.find("latvian"); + size_t lithu = lang_opts.find("lithuanian"); + size_t mongo = lang_opts.find("mongolian"); + // If Japanese is used, babel must directly be loaded with the + // language options, see + // http://www.lyx.org/trac/ticket/4597#c4 + size_t japan = lang_opts.find("japanese"); + if (!lyxrc.language_global_options || viet != string::npos + || japan != string::npos || latvian != string::npos + || lithu != string::npos || mongo != string::npos) + return "\\usepackage[" + lang_opts + "]{babel}"; + return lang_pack; +} + + +docstring BufferParams::getGraphicsDriver(string const & package) const +{ + docstring result; + + if (package == "geometry") { + if (graphicsDriver == "dvips" + || graphicsDriver == "dvipdfm" + || graphicsDriver == "pdftex" + || graphicsDriver == "vtex") + result = from_ascii(graphicsDriver); + else if (graphicsDriver == "dvipdfmx") + result = from_ascii("dvipdfm"); + } + + return result; +} + + void BufferParams::writeEncodingPreamble(odocstream & os, LaTeXFeatures & features, TexRow & texrow) const { + if (useXetex) + return; if (inputenc == "auto") { string const doc_encoding = language->encoding()->latexName(); @@ -1935,7 +2094,11 @@ void BufferParams::writeEncodingPreamble(odocstream & os, texrow.newline(); } if (package == Encoding::CJK || features.mustProvide("CJK")) { - os << "\\usepackage{CJK}\n"; + if (language->encoding()->name() == "utf8-cjk" + && LaTeXFeatures::isAvailable("CJKutf8")) + os << "\\usepackage{CJKutf8}\n"; + else + os << "\\usepackage{CJK}\n"; texrow.newline(); } } else if (inputenc != "default") { @@ -1952,7 +2115,11 @@ void BufferParams::writeEncodingPreamble(odocstream & os, texrow.newline(); break; case Encoding::CJK: - os << "\\usepackage{CJK}\n"; + if (encoding().name() == "utf8-cjk" + && LaTeXFeatures::isAvailable("CJKutf8")) + os << "\\usepackage{CJKutf8}\n"; + else + os << "\\usepackage{CJK}\n"; texrow.newline(); break; } @@ -1968,10 +2135,22 @@ void BufferParams::writeEncodingPreamble(odocstream & os, } +string const BufferParams::parseFontName(string const & name) const +{ + string mangled = name; + size_t const idx = mangled.find('['); + if (idx == string::npos || idx == 0) + return mangled; + else + return mangled.substr(0, idx - 1); +} + + string const BufferParams::loadFonts(string const & rm, string const & sf, string const & tt, bool const & sc, bool const & osf, - int const & sfscale, int const & ttscale) const + int const & sfscale, int const & ttscale, + bool const & xetex) const { /* The LaTeX font world is in a flux. In the PSNFSS font interface, several packages have been replaced by others, that might not @@ -1991,6 +2170,37 @@ string const BufferParams::loadFonts(string const & rm, ostringstream os; + if (xetex) { + if (rm != "default") + os << "\\setmainfont[Mapping=tex-text]{" + << parseFontName(rm) << "}\n"; + if (sf != "default") { + string const sans = parseFontName(sf); + if (sfscale != 100) + os << "\\setsansfont[Scale=" + << float(sfscale) / 100 + << ",Mapping=tex-text]{" + << sans << "}\n"; + else + os << "\\setsansfont[Mapping=tex-text]{" + << sans << "}\n"; + } + if (tt != "default") { + string const mono = parseFontName(tt); + if (ttscale != 100) + os << "\\setmonofont[Scale=" + << float(sfscale) / 100 + << "]{" + << mono << "}\n"; + else + os << "\\setmonofont[Mapping=tex-text]{" + << mono << "}\n"; + } + if (osf) + os << "\\defaultfontfeatures{Numbers=OldStyle}\n"; + return os.str(); + } + // ROMAN FONTS // Computer Modern (must be explicitely selectable -- there might be classes // that define a different default font! @@ -2006,7 +2216,7 @@ string const BufferParams::loadFonts(string const & rm, // AE else if (rm == "ae") { // not needed when using OT1 font encoding. - if (lyxrc.fontenc != "default") + if (font_encoding() != "default") os << "\\usepackage{ae,aecompl}\n"; } // Times @@ -2045,7 +2255,7 @@ string const BufferParams::loadFonts(string const & rm, // fourier supersedes utopia.sty, but does // not work with OT1 encoding. if (LaTeXFeatures::isAvailable("fourier") - && lyxrc.fontenc != "default") { + && font_encoding() != "default") { os << "\\usepackage"; if (osf || sc) { os << '['; @@ -2107,6 +2317,8 @@ string const BufferParams::loadFonts(string const & rm, Encoding const & BufferParams::encoding() const { + if (useXetex) + return *(encodings.fromLaTeXName("utf8-plain")); if (inputenc == "auto" || inputenc == "default") return *language->encoding(); Encoding const * const enc = encodings.fromLaTeXName(inputenc);