GuiTabular.cpp: don't hardcode decimal align combobox item

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 36edd59e2e719e97b72ec5cffddba5f882a84e9e..24613e5bf835d1d3d5c891149e0915e99a8ea120 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -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"
@@ -2784,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
@@ -2856,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();
 }