X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferparams.C;h=d7e58ef4d7cf6d3351cf5dc8703ae7b0a827fe94;hb=ba62665f966508db5a4de6864f4aa7374c5a5356;hp=243a7df3a6821ebb2245147a4b8d0613dbb65ac5;hpb=43b77ba2d722cdb8a9437926f839c1dcbf3c0b89;p=lyx.git diff --git a/src/bufferparams.C b/src/bufferparams.C index 243a7df3a6..d7e58ef4d7 100644 --- a/src/bufferparams.C +++ b/src/bufferparams.C @@ -46,10 +46,12 @@ #include -namespace support = lyx::support; -using lyx::support::bformat; -using lyx::support::rtrim; -using lyx::support::tokenPos; + +namespace lyx { + +using support::bformat; +using support::rtrim; +using support::tokenPos; using std::endl; using std::string; @@ -58,7 +60,7 @@ using std::ostream; using std::ostringstream; using std::pair; -namespace biblio = lyx::biblio; +namespace Alert = lyx::frontend::Alert; // Local translators @@ -172,23 +174,22 @@ SidesTranslator const & sidestranslator() } - -// AMS -typedef Translator AMSTranslator; +// LaTeX packages +typedef Translator PackageTranslator; -AMSTranslator const init_amstranslator() +PackageTranslator const init_packagetranslator() { - AMSTranslator translator(0, BufferParams::AMS_OFF); - translator.addPair(1, BufferParams::AMS_AUTO); - translator.addPair(2, BufferParams::AMS_ON); + PackageTranslator translator(0, BufferParams::package_off); + translator.addPair(1, BufferParams::package_auto); + translator.addPair(2, BufferParams::package_on); return translator; } -AMSTranslator const & amstranslator() +PackageTranslator const & packagetranslator() { - static AMSTranslator translator = init_amstranslator(); + static PackageTranslator translator = init_packagetranslator(); return translator; } @@ -235,9 +236,18 @@ SpaceTranslator const & spacetranslator() return translator; } -// ends annonym namespace + +textclass_type defaultTextclass() +{ + // 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. + return textclasslist.numberOfClass("article").second; } +} // anon namespace + class BufferParams::Impl { @@ -260,7 +270,8 @@ BufferParams::Impl::Impl() : defskip(VSpace::MEDSKIP) { // set initial author - authorlist.record(Author(lyxrc.user_name, lyxrc.user_email)); + // FIXME UNICODE + authorlist.record(Author(from_utf8(lyxrc.user_name), from_utf8(lyxrc.user_email))); } @@ -280,12 +291,7 @@ void BufferParams::MemoryTraits::destroy(BufferParams::Impl * ptr) 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), - pimpl_(new Impl) + : textclass(defaultTextclass()), pimpl_(new Impl) { paragraph_separation = PARSEP_INDENT; quotes_language = InsetQuotes::EnglishQ; @@ -295,11 +301,12 @@ BufferParams::BufferParams() papersize = PAPER_DEFAULT; orientation = ORIENTATION_PORTRAIT; use_geometry = false; - use_amsmath = AMS_AUTO; + use_amsmath = package_auto; + use_esint = package_auto; cite_engine = biblio::ENGINE_BASIC; use_bibtopic = false; - tracking_changes = false; - output_changes = false; + trackChanges = false; + outputChanges = false; secnumdepth = 3; tocdepth = 3; language = default_language; @@ -419,7 +426,7 @@ string const BufferParams::readToken(LyXLex & lex, string const & token) if (pp.first) { textclass = pp.second; } else { - textclass = 0; + textclass = defaultTextclass(); return classname; } } @@ -427,11 +434,11 @@ string const BufferParams::readToken(LyXLex & lex, string const & token) // fail because of the lack of path info. Warnings will be given although // the layout file will be correctly loaded later. if (!getLyXTextClass().isTeXClassAvailable()) { - string const msg = - bformat(lyx::to_utf8(_("The document uses a missing " - "TeX class \"%1$s\".\n")), classname); - Alert::warning(lyx::to_utf8(_("Document class not available")), - msg + lyx::to_utf8(_("LyX will not be able to produce output."))); + docstring const msg = + bformat(_("The document uses a missing " + "TeX class \"%1$s\".\n"), from_utf8(classname)); + Alert::warning(_("Document class not available"), + msg + _("LyX will not be able to produce output.")); } } else if (token == "\\begin_preamble") { readPreamble(lex); @@ -480,7 +487,11 @@ string const BufferParams::readToken(LyXLex & lex, string const & token) } else if (token == "\\use_amsmath") { int use_ams; lex >> use_ams; - use_amsmath = amstranslator().find(use_ams); + use_amsmath = packagetranslator().find(use_ams); + } else if (token == "\\use_esint") { + int useesint; + lex >> useesint; + use_esint = packagetranslator().find(useesint); } else if (token == "\\cite_engine") { string engine; lex >> engine; @@ -488,12 +499,12 @@ string const BufferParams::readToken(LyXLex & lex, string const & token) } else if (token == "\\use_bibtopic") { lex >> use_bibtopic; } else if (token == "\\tracking_changes") { - lex >> tracking_changes; + lex >> trackChanges; } else if (token == "\\output_changes") { - lex >> output_changes; + lex >> outputChanges; } else if (token == "\\branch") { lex.next(); - string branch = lex.getString(); + docstring branch = lex.getDocString(); branchlist().add(branch); while (true) { lex.next(); @@ -515,7 +526,8 @@ string const BufferParams::readToken(LyXLex & lex, string const & token) // Update also the LColor table: if (color == "none") color = lcolor.getX11Name(LColor::background); - lcolor.setColor(branch, color); + // FIXME UNICODE + lcolor.setColor(to_utf8(branch), color); } } @@ -629,6 +641,7 @@ void BufferParams::writeFile(ostream & os) const os << "\\papersize " << string_papersize[papersize] << "\n\\use_geometry " << convert(use_geometry) << "\n\\use_amsmath " << use_amsmath + << "\n\\use_esint " << use_esint << "\n\\cite_engine " << citeenginetranslator().find(cite_engine) << "\n\\use_bibtopic " << convert(use_bibtopic) << "\n\\paperorientation " << string_orientation[orientation] @@ -637,7 +650,7 @@ void BufferParams::writeFile(ostream & os) const BranchList::const_iterator it = branchlist().begin(); BranchList::const_iterator end = branchlist().end(); for (; it != end; ++it) { - os << "\\branch " << it->getBranch() + os << "\\branch " << to_utf8(it->getBranch()) << "\n\\selected " << it->getSelected() << "\n\\color " << lyx::X11hexname(it->getColor()) << "\n\\end_branch" @@ -690,27 +703,26 @@ void BufferParams::writeFile(ostream & os) const << user_defined_bullet(i).getSize() << "\n"; } else { + // FIXME UNICODE os << "\\bulletLaTeX " << i << " \"" - << user_defined_bullet(i).getText() + << lyx::to_ascii(user_defined_bullet(i).getText()) << "\"\n"; } } } - os << "\\tracking_changes " << convert(tracking_changes) << "\n"; - os << "\\output_changes " << convert(output_changes) << "\n"; + os << "\\tracking_changes " << convert(trackChanges) << "\n"; + os << "\\output_changes " << convert(outputChanges) << "\n"; - if (tracking_changes) { - AuthorList::Authors::const_iterator it = pimpl_->authorlist.begin(); - AuthorList::Authors::const_iterator end = pimpl_->authorlist.end(); - for (; it != end; ++it) { - os << "\\author " << it->second << "\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) { + os << "\\author " << a_it->second << "\n"; } } -bool BufferParams::writeLaTeX(ostream & os, LaTeXFeatures & features, +bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, TexRow & texrow) const { os << "\\documentclass"; @@ -726,10 +738,10 @@ bool BufferParams::writeLaTeX(ostream & os, LaTeXFeatures & features, } // custom, A3, B3 and B4 paper sizes need geometry - bool nonstandard_papersize = (papersize == PAPER_B3) || - (papersize == PAPER_B4) || - (papersize == PAPER_A3) || - (papersize == PAPER_CUSTOM); + bool nonstandard_papersize = papersize == PAPER_B3 + || papersize == PAPER_B4 + || papersize == PAPER_A3 + || papersize == PAPER_CUSTOM; if (!use_geometry) { switch (papersize) { @@ -807,28 +819,29 @@ bool BufferParams::writeLaTeX(ostream & os, LaTeXFeatures & features, string strOptions(clsoptions.str()); if (!strOptions.empty()) { strOptions = rtrim(strOptions, ","); - os << '[' << strOptions << ']'; + // FIXME UNICODE + os << '[' << from_utf8(strOptions) << ']'; } - os << '{' << tclass.latexname() << "}\n"; + os << '{' << from_ascii(tclass.latexname()) << "}\n"; texrow.newline(); // end of \documentclass defs // font selection must be done before loading fontenc.sty string const fonts = - loadFonts(features, fontsRoman, fontsSans, + loadFonts(fontsRoman, fontsSans, fontsTypewriter, fontsSC, fontsOSF, fontsSansScale, fontsTypewriterScale); if (!fonts.empty()) { - os << fonts; + os << from_ascii(fonts); texrow.newline(); } if (fontsDefaultFamily != "default") os << "\\renewcommand{\\familydefault}{\\" - << fontsDefaultFamily << "}\n"; + << from_ascii(fontsDefaultFamily) << "}\n"; // this one is not per buffer if (lyxrc.fontenc != "default") { - os << "\\usepackage[" << lyxrc.fontenc + os << "\\usepackage[" << from_ascii(lyxrc.fontenc) << "]{fontenc}\n"; texrow.newline(); } @@ -842,13 +855,30 @@ bool BufferParams::writeLaTeX(ostream & os, LaTeXFeatures & features, std::set encodings = features.getEncodingSet(doc_encoding); - os << "\\usepackage["; - std::copy(encodings.begin(), encodings.end(), - std::ostream_iterator(os, ",")); - os << doc_encoding << "]{inputenc}\n"; - texrow.newline(); - } else if (inputenc != "default") { - os << "\\usepackage[" << inputenc + // thailatex does not use the inputenc package, but sets up + // babel directly for tis620-0 encoding, therefore we must + // not request inputenc for tis620-0 encoding + if (!encodings.empty() || doc_encoding != "tis620-0") { + os << "\\usepackage["; + std::set::const_iterator it = encodings.begin(); + std::set::const_iterator const end = encodings.end(); + if (it != end) { + os << from_ascii(*it); + ++it; + } + for (; it != end; ++it) + os << ',' << from_ascii(*it); + if (doc_encoding != "tis620-0") { + if (!encodings.empty()) + os << ','; + os << from_ascii(doc_encoding); + } + os << "]{inputenc}\n"; + texrow.newline(); + } + } else if (inputenc != "default" && inputenc != "tis620-0" && + inputenc != "ascii") { + os << "\\usepackage[" << from_ascii(inputenc) << "]{inputenc}\n"; texrow.newline(); } @@ -863,10 +893,10 @@ bool BufferParams::writeLaTeX(ostream & os, LaTeXFeatures & features, case PAPER_CUSTOM: if (!paperwidth.empty()) os << ",paperwidth=" - << paperwidth; + << from_ascii(paperwidth); if (!paperheight.empty()) os << ",paperheight=" - << paperheight; + << from_ascii(paperheight); break; case PAPER_USLETTER: os << ",letterpaper"; @@ -927,19 +957,19 @@ bool BufferParams::writeLaTeX(ostream & os, LaTeXFeatures & features, } } if (!topmargin.empty()) - os << ",tmargin=" << topmargin; + os << ",tmargin=" << from_ascii(topmargin); if (!bottommargin.empty()) - os << ",bmargin=" << bottommargin; + os << ",bmargin=" << from_ascii(bottommargin); if (!leftmargin.empty()) - os << ",lmargin=" << leftmargin; + os << ",lmargin=" << from_ascii(leftmargin); if (!rightmargin.empty()) - os << ",rmargin=" << rightmargin; + os << ",rmargin=" << from_ascii(rightmargin); if (!headheight.empty()) - os << ",headheight=" << headheight; + os << ",headheight=" << from_ascii(headheight); if (!headsep.empty()) - os << ",headsep=" << headsep; + os << ",headsep=" << from_ascii(headsep); if (!footskip.empty()) - os << ",footskip=" << footskip; + os << ",footskip=" << from_ascii(footskip); os << "}\n"; texrow.newline(); } @@ -950,7 +980,7 @@ bool BufferParams::writeLaTeX(ostream & os, LaTeXFeatures & features, os << "\\usepackage{fancyhdr}\n"; texrow.newline(); } - os << "\\pagestyle{" << pagestyle << "}\n"; + os << "\\pagestyle{" << from_ascii(pagestyle) << "}\n"; texrow.newline(); } @@ -973,47 +1003,47 @@ bool BufferParams::writeLaTeX(ostream & os, LaTeXFeatures & features, if (paragraph_separation) { switch (getDefSkip().kind()) { case VSpace::SMALLSKIP: - os << "\\setlength\\parskip{\\smallskipamount}\n"; + os << "\\setlength{\\parskip}{\\smallskipamount}\n"; break; case VSpace::MEDSKIP: - os << "\\setlength\\parskip{\\medskipamount}\n"; + os << "\\setlength{\\parskip}{\\medskipamount}\n"; break; case VSpace::BIGSKIP: - os << "\\setlength\\parskip{\\bigskipamount}\n"; + os << "\\setlength{\\parskip}{\\bigskipamount}\n"; break; case VSpace::LENGTH: - os << "\\setlength\\parskip{" - << getDefSkip().length().asLatexString() + os << "\\setlength{\\parskip}{" + << from_utf8(getDefSkip().length().asLatexString()) << "}\n"; break; default: // should never happen // Then delete it. - os << "\\setlength\\parskip{\\medskipamount}\n"; + os << "\\setlength{\\parskip}{\\medskipamount}\n"; break; } texrow.newline(); - os << "\\setlength\\parindent{0pt}\n"; + os << "\\setlength{\\parindent}{0pt}\n"; texrow.newline(); } // If we use jurabib, we have to call babel here. if (use_babel && features.isRequired("jurabib")) { - os << babelCall(language_options.str()) + os << from_ascii(babelCall(language_options.str())) << '\n' - << features.getBabelOptions(); + << from_ascii(features.getBabelOptions()); texrow.newline(); } // Now insert the LyX specific LaTeX commands... // The optional packages; - string lyxpreamble(features.getPackages()); + docstring lyxpreamble(from_ascii(features.getPackages())); // this might be useful... lyxpreamble += "\n\\makeatletter\n"; // Some macros LyX will need - string tmppreamble(features.getMacros()); + docstring tmppreamble(from_ascii(features.getMacros())); if (!tmppreamble.empty()) { lyxpreamble += "\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% " @@ -1031,9 +1061,10 @@ bool BufferParams::writeLaTeX(ostream & os, LaTeXFeatures & features, /* the user-defined preamble */ if (!preamble.empty()) { + // FIXME UNICODE lyxpreamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% " "User specified LaTeX commands.\n" - + preamble + '\n'; + + from_utf8(preamble) + '\n'; } // Itemize bullet settings need to be last in case the user @@ -1042,11 +1073,11 @@ bool BufferParams::writeLaTeX(ostream & os, LaTeXFeatures & features, // Actually it has to be done much later than that // since some packages like frenchb make modifications // at \begin{document} time -- JMarc - string bullets_def; + docstring bullets_def; for (int i = 0; i < 4; ++i) { if (user_defined_bullet(i) != ITEMIZE_DEFAULTS[i]) { if (bullets_def.empty()) - bullets_def="\\AtBeginDocument{\n"; + bullets_def += "\\AtBeginDocument{\n"; bullets_def += " \\def\\labelitemi"; switch (i) { // `i' is one less than the item to modify @@ -1075,14 +1106,15 @@ bool BufferParams::writeLaTeX(ostream & os, LaTeXFeatures & features, // with other packages. // Jurabib has to be called after babel, though. if (use_babel && !features.isRequired("jurabib")) { - lyxpreamble += babelCall(language_options.str()) + '\n'; - lyxpreamble += features.getBabelOptions(); + // FIXME UNICODE + lyxpreamble += from_utf8(babelCall(language_options.str())) + '\n'; + lyxpreamble += from_utf8(features.getBabelOptions()); } lyxpreamble += "\\makeatother\n"; // dvipost settings come after everything else - if (features.isAvailable("dvipost") && tracking_changes && output_changes) { + if (features.isAvailable("dvipost") && outputChanges) { lyxpreamble += "\\dvipostlayout\n" "\\dvipost{osstart color push Red}\n" @@ -1227,7 +1259,7 @@ void BufferParams::readBulletsLaTeX(LyXLex & lex) if (!lex.next()) return; int const index = lex.getInteger(); lex.next(true); - string const temp_str = lex.getString(); + docstring const temp_str = lex.getDocString(); user_defined_bullet(index).setText(temp_str); temp_bullet(index).setText(temp_str); @@ -1300,7 +1332,7 @@ string const BufferParams::babelCall(string const & lang_opts) const } -string const BufferParams::loadFonts(LaTeXFeatures & features, string const & rm, +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 @@ -1344,9 +1376,9 @@ string const BufferParams::loadFonts(LaTeXFeatures & features, string const & rm // Times else if (rm == "times") { // try to load the best available package - if (features.isAvailable("mathptmx")) + if (LaTeXFeatures::isAvailable("mathptmx")) os << "\\usepackage{mathptmx}\n"; - else if (features.isAvailable("mathptm")) + else if (LaTeXFeatures::isAvailable("mathptm")) os << "\\usepackage{mathptm}\n"; else os << "\\usepackage{times}\n"; @@ -1354,7 +1386,7 @@ string const BufferParams::loadFonts(LaTeXFeatures & features, string const & rm // Palatino else if (rm == "palatino") { // try to load the best available package - if (features.isAvailable("mathpazo")) { + if (LaTeXFeatures::isAvailable("mathpazo")) { os << "\\usepackage"; if (osf || sc) { os << '['; @@ -1367,7 +1399,7 @@ string const BufferParams::loadFonts(LaTeXFeatures & features, string const & rm } os << "{mathpazo}\n"; } - else if (features.isAvailable("mathpple")) + else if (LaTeXFeatures::isAvailable("mathpple")) os << "\\usepackage{mathpple}\n"; else os << "\\usepackage{palatino}\n"; @@ -1376,7 +1408,7 @@ string const BufferParams::loadFonts(LaTeXFeatures & features, string const & rm else if (rm == "utopia") { // fourier supersedes utopia.sty, but does // not work with OT1 encoding. - if (features.isAvailable("fourier") + if (LaTeXFeatures::isAvailable("fourier") && lyxrc.fontenc != "default") { os << "\\usepackage"; if (osf || sc) { @@ -1435,3 +1467,19 @@ string const BufferParams::loadFonts(LaTeXFeatures & features, string const & rm return os.str(); } + + +Encoding const & BufferParams::encoding() const +{ + if (inputenc == "auto" || inputenc == "default") + return *(language->encoding()); + Encoding const * const enc = + encodings.getFromLaTeXName(inputenc); + if (enc) + return *enc; + lyxerr << "Unknown inputenc value `" << inputenc + << "'. Using `auto' instead." << endl; + return *(language->encoding()); +} + +} // namespace lyx