X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fbufferparams.C;h=dff424a9af00d7cb4d0b5cae3fedd22f7e08c9f9;hb=89b422b320a352e503c0625820da1073805d74a9;hp=ab542c0db2ba6dc66bd4abd3c07084cf7b062393;hpb=b27bb5cb53edeee088cf408eb37dd7d72586b90d;p=lyx.git diff --git a/src/bufferparams.C b/src/bufferparams.C index ab542c0db2..dff424a9af 100644 --- a/src/bufferparams.C +++ b/src/bufferparams.C @@ -46,13 +46,12 @@ #include -namespace support = lyx::support; -using lyx::docstring; -using lyx::odocstream; -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; @@ -62,7 +61,6 @@ using std::ostringstream; using std::pair; namespace Alert = lyx::frontend::Alert; -namespace biblio = lyx::biblio; // Local translators @@ -176,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; } @@ -264,7 +261,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))); } @@ -299,7 +297,8 @@ 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; trackChanges = false; @@ -433,7 +432,7 @@ string const BufferParams::readToken(LyXLex & lex, string const & token) if (!getLyXTextClass().isTeXClassAvailable()) { docstring const msg = bformat(_("The document uses a missing " - "TeX class \"%1$s\".\n"), lyx::from_utf8(classname)); + "TeX class \"%1$s\".\n"), from_utf8(classname)); Alert::warning(_("Document class not available"), msg + _("LyX will not be able to produce output.")); } @@ -484,7 +483,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; @@ -497,7 +500,7 @@ string const BufferParams::readToken(LyXLex & lex, string const & token) lex >> outputChanges; } else if (token == "\\branch") { lex.next(); - string branch = lex.getString(); + docstring branch = lex.getDocString(); branchlist().add(branch); while (true) { lex.next(); @@ -519,7 +522,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); } } @@ -633,6 +637,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] @@ -641,7 +646,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" @@ -729,10 +734,10 @@ bool BufferParams::writeLaTeX(odocstream & 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) { @@ -811,10 +816,10 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, if (!strOptions.empty()) { strOptions = rtrim(strOptions, ","); // FIXME UNICODE - os << '[' << lyx::from_utf8(strOptions) << ']'; + os << '[' << from_utf8(strOptions) << ']'; } - os << '{' << lyx::from_ascii(tclass.latexname()) << "}\n"; + os << '{' << from_ascii(tclass.latexname()) << "}\n"; texrow.newline(); // end of \documentclass defs @@ -824,45 +829,53 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, fontsTypewriter, fontsSC, fontsOSF, fontsSansScale, fontsTypewriterScale); if (!fonts.empty()) { - os << lyx::from_ascii(fonts); + os << from_ascii(fonts); texrow.newline(); } if (fontsDefaultFamily != "default") os << "\\renewcommand{\\familydefault}{\\" - << lyx::from_ascii(fontsDefaultFamily) << "}\n"; + << from_ascii(fontsDefaultFamily) << "}\n"; // this one is not per buffer if (lyxrc.fontenc != "default") { - os << "\\usepackage[" << lyx::from_ascii(lyxrc.fontenc) + os << "\\usepackage[" << from_ascii(lyxrc.fontenc) << "]{fontenc}\n"; texrow.newline(); } - // TODO: Some people want to support more encodings than UTF-8. They can have a field day around here - if (true) { - os << "\\usepackage[utf8]{inputenc}\n"; - texrow.newline(); - } else { - if (inputenc == "auto") { - string const doc_encoding = - language->encoding()->latexName(); + if (inputenc == "auto") { + string const doc_encoding = + language->encoding()->latexName(); - // Create a list with all the input encodings used - // in the document - std::set encodings = - features.getEncodingSet(doc_encoding); + // Create a list with all the input encodings used + // in the document + std::set encodings = + features.getEncodingSet(doc_encoding); + // 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 << lyx::from_ascii(*it) << ','; - os << lyx::from_ascii(doc_encoding) << "]{inputenc}\n"; - texrow.newline(); - } else if (inputenc != "default") { - os << "\\usepackage[" << lyx::from_ascii(inputenc) - << "]{inputenc}\n"; + 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") { + os << "\\usepackage[" << from_ascii(inputenc) + << "]{inputenc}\n"; + texrow.newline(); } if (use_geometry || nonstandard_papersize) { @@ -875,10 +888,10 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, case PAPER_CUSTOM: if (!paperwidth.empty()) os << ",paperwidth=" - << lyx::from_ascii(paperwidth); + << from_ascii(paperwidth); if (!paperheight.empty()) os << ",paperheight=" - << lyx::from_ascii(paperheight); + << from_ascii(paperheight); break; case PAPER_USLETTER: os << ",letterpaper"; @@ -939,19 +952,19 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, } } if (!topmargin.empty()) - os << ",tmargin=" << lyx::from_ascii(topmargin); + os << ",tmargin=" << from_ascii(topmargin); if (!bottommargin.empty()) - os << ",bmargin=" << lyx::from_ascii(bottommargin); + os << ",bmargin=" << from_ascii(bottommargin); if (!leftmargin.empty()) - os << ",lmargin=" << lyx::from_ascii(leftmargin); + os << ",lmargin=" << from_ascii(leftmargin); if (!rightmargin.empty()) - os << ",rmargin=" << lyx::from_ascii(rightmargin); + os << ",rmargin=" << from_ascii(rightmargin); if (!headheight.empty()) - os << ",headheight=" << lyx::from_ascii(headheight); + os << ",headheight=" << from_ascii(headheight); if (!headsep.empty()) - os << ",headsep=" << lyx::from_ascii(headsep); + os << ",headsep=" << from_ascii(headsep); if (!footskip.empty()) - os << ",footskip=" << lyx::from_ascii(footskip); + os << ",footskip=" << from_ascii(footskip); os << "}\n"; texrow.newline(); } @@ -962,7 +975,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, os << "\\usepackage{fancyhdr}\n"; texrow.newline(); } - os << "\\pagestyle{" << lyx::from_ascii(pagestyle) << "}\n"; + os << "\\pagestyle{" << from_ascii(pagestyle) << "}\n"; texrow.newline(); } @@ -985,47 +998,47 @@ bool BufferParams::writeLaTeX(odocstream & 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{" - << lyx::from_ascii(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 << lyx::from_ascii(babelCall(language_options.str())) + os << from_ascii(babelCall(language_options.str())) << '\n' - << lyx::from_ascii(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%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% " @@ -1043,9 +1056,10 @@ bool BufferParams::writeLaTeX(odocstream & 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 @@ -1054,11 +1068,11 @@ bool BufferParams::writeLaTeX(odocstream & 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 @@ -1074,9 +1088,8 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, bullets_def += 'v'; break; } - // FIXME UNICODE bullets_def += '{' + - lyx::to_ascii(user_defined_bullet(i).getText()) + user_defined_bullet(i).getText() + "}\n"; } } @@ -1088,8 +1101,9 @@ bool BufferParams::writeLaTeX(odocstream & 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"; @@ -1110,8 +1124,7 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features, texrow.newline(); } - // FIXME UNICODE - os << lyx::from_utf8(lyxpreamble); + os << lyxpreamble; return use_babel; } @@ -1449,3 +1462,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