Help avoiding shortcut clashes by discriminating strings.

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index b0651be8d5b7282d3f78029ab907aa4295d92dca..3ecf73184c74e078ff6ef51adfb7769eef49b88a 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -572,8 +572,8 @@ string BufferParams::readToken(Lexer & lex, string const & token,
                                                 "document cannot be compiled until the following\n"
                                                 "prerequisites are installed:\n"
                                                 "\t%2$s\n"
-                                                "See section 3.1.2.2 of the User's Guide for\n"
-                                                "more information."), desc, prereqs);
+                                                "See section 3.1.2.2 (Class Availability) of the\n"
+                                                "User's Guide for more information."), desc, prereqs);
                        frontend::Alert::warning(_("Document class not available"),
                                       msg);
                }
@@ -1202,6 +1202,17 @@ void BufferParams::validate(LaTeXFeatures & features) const
 bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
                              TexRow & texrow, FileName const & filepath) const
 {
+       // http://www.tug.org/texmf-dist/doc/latex/base/fixltx2e.pdf
+       // !! To use the Fix-cm package, load it before \documentclass, and use the command
+       // \RequirePackage to do so, rather than the normal \usepackage
+       // Do not to load any other package before the document class, unless you
+       // have a thorough understanding of the LATEX internals and know exactly what you
+       // are doing!
+       if (features.mustProvide("fix-cm")) {
+               os << "\\RequirePackage{fix-cm}\n";
+               texrow.newline();
+       }
+
        os << "\\documentclass";
 
        DocumentClass const & tclass = documentClass();
@@ -1356,9 +1367,10 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
 
        // font selection must be done before loading fontenc.sty
        string const fonts =
-               loadFonts(fonts_roman, fonts_sans,
-                         fonts_typewriter, fonts_expert_sc, fonts_old_figures,
-                         fonts_sans_scale, fonts_typewriter_scale, useNonTeXFonts);
+               loadFonts(fonts_roman, fonts_sans, fonts_typewriter,
+                         fonts_expert_sc, fonts_old_figures,
+                         fonts_sans_scale, fonts_typewriter_scale,
+                         useNonTeXFonts, features);
        if (!fonts.empty()) {
                os << from_ascii(fonts);
                nlines =
@@ -1789,6 +1801,10 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
                texrow.newlines(lines);
                // set back for the rest
                lyxpreamble.clear();
+               // correctly break URLs with hyperref and dvi output
+               if (features.runparams().flavor == OutputParams::LATEX
+                   && features.isAvailable("breakurl"))
+                       lyxpreamble += "\\usepackage{breakurl}\n";
        } else if (features.isRequired("nameref"))
                // hyperref loads this automatically
                lyxpreamble += "\\usepackage{nameref}\n";
@@ -2568,7 +2584,8 @@ 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,
-                                    bool const & use_systemfonts) const
+                                    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
@@ -2588,9 +2605,30 @@ string const BufferParams::loadFonts(string const & rm,
 
        ostringstream os;
 
+       /* Fontspec (XeTeX, LuaTeX): we provide GUI support for oldstyle
+        * numbers (Numbers=OldStyle) and sf/tt scaling. The Ligatures=TeX/
+        * Mapping=tex-text option assures TeX ligatures (such as "--")
+        * are resolved. Note that tt does not use these ligatures.
+        * TODO:
+        *    -- add more GUI options?
+        *    -- add more fonts (fonts for other scripts)
+        *    -- if there's a way to find out if a font really supports
+        *       OldStyle, enable/disable the widget accordingly. 
+       */
        if (use_systemfonts) {
+               // "Mapping=tex-text" and "Ligatures=TeX" are equivalent.
+               // However, until v.2 (2010/07/11) fontspec only knew
+               // Mapping=tex-text (for XeTeX only); then "Ligatures=TeX"
+               // was introduced for both XeTeX and LuaTeX (LuaTeX
+               // didn't understand "Mapping=tex-text", while XeTeX
+               // understood both. With most recent versions, both
+               // variants are understood by both engines. However,
+               // we want to provide support for at least TeXLive 2009.
+               string const texmapping =
+                       (features.runparams().flavor == OutputParams::XETEX) ?
+                       "Mapping=tex-text" : "Ligatures=TeX";
                if (rm != "default") {
-                       os << "\\setmainfont[Mapping=tex-text";
+                       os << "\\setmainfont[" << texmapping;
                        if (osf)
                                os << ",Numbers=OldStyle";
                        os << "]{" << parseFontName(rm) << "}\n";
@@ -2600,10 +2638,10 @@ string const BufferParams::loadFonts(string const & rm,
                        if (sfscale != 100)
                                os << "\\setsansfont[Scale=" 
                                   << float(sfscale) / 100 
-                                  << ",Mapping=tex-text]{"
+                                  << "," << texmapping << "]{"
                                   << sans << "}\n";
                        else
-                               os << "\\setsansfont[Mapping=tex-text]{"
+                               os << "\\setsansfont[" << texmapping << "]{"
                                   << sans << "}\n";
                }
                if (tt != "default") {
@@ -2614,7 +2652,7 @@ string const BufferParams::loadFonts(string const & rm,
                                   << "]{"
                                   << mono << "}\n";
                        else
-                               os << "\\setmonofont[Mapping=tex-text]{"
+                               os << "\\setmonofont{"
                                   << mono << "}\n";
                }
                return os.str();