]> git.lyx.org Git - lyx.git/blobdiff - src/BufferParams.cpp
GuiTabular.cpp: don't hardcode decimal align combobox item
[lyx.git] / src / BufferParams.cpp
index 11c3d54f832d92e0d1cc1962a401570a620100ef..24613e5bf835d1d3d5c891149e0915e99a8ea120 100644 (file)
@@ -30,6 +30,7 @@
 #include "IndicesList.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
+#include "LaTeXFonts.h"
 #include "ModuleList.h"
 #include "Font.h"
 #include "Lexer.h"
@@ -997,7 +998,7 @@ void BufferParams::writeFile(ostream & os) const
        if (!fonts_cjk.empty()) {
                os << "\\font_cjk " << fonts_cjk << '\n';
        }
-       os << "\n\\graphics " << graphics_driver << '\n';
+       os << "\\graphics " << graphics_driver << '\n';
        os << "\\default_output_format " << default_output_format << '\n';
        os << "\\output_sync " << output_sync << '\n';
        if (!output_sync_macro.empty())
@@ -1375,7 +1376,7 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
        bool const use_polyglossia = features.usePolyglossia();
        bool const global = lyxrc.language_global_options;
        if (use_babel || (use_polyglossia && global)) {
-               language_options << features.getLanguages();
+               language_options << features.getBabelLanguages();
                if (!language->babel().empty()) {
                        if (!language_options.str().empty())
                                language_options << ',';
@@ -1744,10 +1745,21 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
                IndicesList::const_iterator iit = indiceslist().begin();
                IndicesList::const_iterator iend = indiceslist().end();
                for (; iit != iend; ++iit) {
+                       pair<docstring, docstring> indexname_latex =
+                               features.runparams().encoding->latexString(iit->index(),
+                                                                          features.runparams().dryrun);
+                       if (!indexname_latex.second.empty()) {
+                               // issue a warning about omitted characters
+                               // FIXME: should be passed to the error dialog
+                               frontend::Alert::warning(_("Uncodable characters"),
+                                       bformat(_("The following characters that are used in an index name are not\n"
+                                                 "representable in the current encoding and therefore have been omitted:\n%1$s."),
+                                               indexname_latex.second));
+                       }
                        lyxpreamble += "\\newindex[";
-                       lyxpreamble += iit->index();
+                       lyxpreamble += indexname_latex.first;
                        lyxpreamble += "]{";
-                       lyxpreamble += iit->shortcut();
+                       lyxpreamble += escape(iit->shortcut());
                        lyxpreamble += "}\n";
                }
        }
@@ -1912,6 +1924,15 @@ bool BufferParams::writeLaTeX(otexstream & os, LaTeXFeatures & features,
                }
        }
 
+       // Load custom language package here
+       if (features.langPackage() == LaTeXFeatures::LANG_PACK_CUSTOM) {
+               if (lang_package == "default")
+                       lyxpreamble += from_utf8(lyxrc.language_custom_package);
+               else
+                       lyxpreamble += from_utf8(lang_package);
+               lyxpreamble += '\n';
+       }
+
        docstring const i18npreamble =
                features.getTClassI18nPreamble(use_babel, use_polyglossia);
        if (!i18npreamble.empty())
@@ -2246,6 +2267,12 @@ Font const BufferParams::getFont() const
 }
 
 
+InsetQuotes::QuoteLanguage BufferParams::getQuoteStyle(string const qs) const
+{
+       return quoteslangtranslator().find(qs);
+}
+
+
 bool BufferParams::isLatex() const
 {
        return documentClass().outputType() == LATEX;
@@ -2628,11 +2655,6 @@ string const BufferParams::font_encoding() const
 
 string BufferParams::babelCall(string const & lang_opts, bool const langoptions) const
 {
-       if (lang_package != "auto" && lang_package != "babel"
-           && lang_package != "default" && lang_package != "none")
-               return lang_package;
-       if (lyxrc.language_package_selection == LyXRC::LP_CUSTOM)
-               return lyxrc.language_custom_package;
        // suppress the babel call if there is no BabelName defined
        // for the document language in the lib/languages file and if no
        // other languages are used (lang_opts is then empty)
@@ -2763,17 +2785,7 @@ string const BufferParams::loadFonts(string const & rm,
                                     bool const & use_systemfonts,
                                     LaTeXFeatures & features) const
 {
-       /* The LaTeX font world is in a flux. In the PSNFSS font interface,
-          several packages have been replaced by others, that might not
-          be installed on every system. We have to take care for that
-          (see psnfss.pdf). We try to support all psnfss fonts as well
-          as the fonts that have become de facto standard in the LaTeX
-          world (e.g. Latin Modern). We do not support obsolete fonts
-          (like PSLatex). In general, it should be possible to mix any
-          rm font with any sf or tt font, respectively. (JSpitzm)
-          TODO:
-               -- separate math fonts.
-       */
+       // TODO: separate math fonts.
 
        if (rm == "default" && sf == "default" && tt == "default")
                //nothing to do
@@ -2835,115 +2847,19 @@ string const BufferParams::loadFonts(string const & rm,
                return os.str();
        }
 
+       // Tex Fonts
+       bool const ot1 = (font_encoding() == "default" || font_encoding() == "OT1");
+       bool const dryrun = features.runparams().dryrun;
+       bool const complete = (sf == "default" && tt == "default");
+
        // ROMAN FONTS
-       // Computer Modern (must be explicitly selectable -- there might be classes
-       // that define a different default font!
-       if (rm == "cmr") {
-               os << "\\renewcommand{\\rmdefault}{cmr}\n";
-               // osf for Computer Modern needs eco.sty
-               if (osf)
-                       os << "\\usepackage{eco}\n";
-       }
-       // Latin Modern Roman
-       else if (rm == "lmodern")
-               os << "\\usepackage{lmodern}\n";
-       // AE
-       else if (rm == "ae") {
-               // not needed when using OT1 font encoding.
-               if (font_encoding() != "default")
-                       os << "\\usepackage{ae,aecompl}\n";
-       }
-       // Times
-       else if (rm == "times") {
-               // try to load the best available package
-               if (LaTeXFeatures::isAvailable("mathptmx"))
-                       os << "\\usepackage{mathptmx}\n";
-               else if (LaTeXFeatures::isAvailable("mathptm"))
-                       os << "\\usepackage{mathptm}\n";
-               else
-                       os << "\\usepackage{times}\n";
-       }
-       // Palatino
-       else if (rm == "palatino") {
-               // try to load the best available package
-               if (LaTeXFeatures::isAvailable("mathpazo")) {
-                       os << "\\usepackage";
-                       if (osf || sc) {
-                               os << '[';
-                               if (!osf)
-                                       os << "sc";
-                               else
-                                       // "osf" includes "sc"!
-                                       os << "osf";
-                               os << ']';
-                       }
-                       os << "{mathpazo}\n";
-               }
-               else if (LaTeXFeatures::isAvailable("mathpple"))
-                       os << "\\usepackage{mathpple}\n";
-               else
-                       os << "\\usepackage{palatino}\n";
-       }
-       // Utopia
-       else if (rm == "utopia") {
-               // fourier supersedes utopia.sty, but does
-               // not work with OT1 encoding.
-               if (LaTeXFeatures::isAvailable("fourier")
-                   && font_encoding() != "default") {
-                       os << "\\usepackage";
-                       if (osf || sc) {
-                               os << '[';
-                               if (sc)
-                                       os << "expert";
-                               if (osf && sc)
-                                       os << ',';
-                               if (osf)
-                                       os << "oldstyle";
-                               os << ']';
-                       }
-                       os << "{fourier}\n";
-               }
-               else
-                       os << "\\usepackage{utopia}\n";
-       }
-       // Bera (complete fontset)
-       else if (rm == "bera" && sf == "default" && tt == "default")
-               os << "\\usepackage{bera}\n";
-       // everything else
-       else if (rm != "default")
-               os << "\\usepackage" << "{" << rm << "}\n";
+       os << theLaTeXFonts().getLaTeXFont(from_ascii(rm)).getLaTeXCode(dryrun, ot1, complete, sc, osf);
 
        // SANS SERIF
-       // Helvetica, Bera Sans
-       if (sf == "helvet" || sf == "berasans") {
-               if (sfscale != 100)
-                       os << "\\usepackage[scaled=" << float(sfscale) / 100
-                          << "]{" << sf << "}\n";
-               else
-                       os << "\\usepackage{" << sf << "}\n";
-       }
-       // Avant Garde
-       else if (sf == "avant")
-               os << "\\usepackage{" << sf << "}\n";
-       // Computer Modern, Latin Modern, CM Bright
-       else if (sf != "default")
-               os << "\\renewcommand{\\sfdefault}{" << sf << "}\n";
-
-       // monospaced/typewriter
-       // Courier, LuxiMono
-       if (tt == "luximono" || tt == "beramono") {
-               if (ttscale != 100)
-                       os << "\\usepackage[scaled=" << float(ttscale) / 100
-                          << "]{" << tt << "}\n";
-               else
-                       os << "\\usepackage{" << tt << "}\n";
-       }
-       // Courier
-       else if (tt == "courier" )
-               os << "\\usepackage{" << tt << "}\n";
-       // Computer Modern, Latin Modern, CM Bright
-       else if (tt != "default")
-               os << "\\renewcommand{\\ttdefault}{" << tt << "}\n";
+       os << theLaTeXFonts().getLaTeXFont(from_ascii(sf)).getLaTeXCode(dryrun, ot1, complete, sc, osf, sfscale);
+
+       // MONOSPACED/TYPEWRITER
+       os << theLaTeXFonts().getLaTeXFont(from_ascii(tt)).getLaTeXCode(dryrun, ot1, complete, sc, osf, ttscale);
 
        return os.str();
 }