* There are cases where updateLabels is not called because no

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 78c4f854942b0f3a2e399abc7b868b7a775bc1ff..5563056cb26401f609871eff668167bfbdcd7911 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -810,6 +810,8 @@ void BufferParams::writeFile(ostream & os) const
 
 void BufferParams::validate(LaTeXFeatures & features) const
 {
+       features.require(getTextClass().requires());
+
        if (outputChanges) {
                bool dvipost    = LaTeXFeatures::isAvailable("dvipost");
                bool xcolorsoul = LaTeXFeatures::isAvailable("soul") &&
@@ -855,6 +857,10 @@ void BufferParams::validate(LaTeXFeatures & features) const
        if (use_esint == package_on)
                features.require("esint");
 
+       // Document-level line spacing
+       if (spacing().getSpace() != Spacing::Single && !spacing().isDefault())
+               features.require("setspace");
+
        // the bullet shapes are buffer level not paragraph level
        // so they are tested here
        for (int i = 0; i < 4; ++i) {
@@ -876,6 +882,9 @@ void BufferParams::validate(LaTeXFeatures & features) const
                        features.require("pifont");
                }
        }
+
+       if (pdfoptions().use_hyperref)
+               features.require("hyperref");
 }
 
 
@@ -1195,6 +1204,9 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
        // The optional packages;
        docstring lyxpreamble(from_ascii(features.getPackages()));
 
+       // Line spacing
+       lyxpreamble += from_utf8(spacing().writePreamble(tclass.provides("SetSpace")));
+
        // We try to load babel late, in case it interferes
        // with other packages. But some packages also need babel to be loaded
        // before, e.g. jurabib has to be called after babel.
@@ -1235,10 +1247,12 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
        //   before hyperref. Then hyperref has a chance to detect babel.
        // * Has to be loaded before the "LyX specific LaTeX commands" to
        //   avoid errors with algorithm floats.
-       odocstringstream oss;
        // use hyperref explicitely when it is required
-       pdfoptions().writeLaTeX(oss, features.isRequired("hyperref"));
-       lyxpreamble += oss.str();
+       if (features.isRequired("hyperref")) {
+               odocstringstream oss;
+               pdfoptions().writeLaTeX(oss, getTextClass().provides("hyperref"));
+               lyxpreamble += oss.str();
+       }
 
        // this might be useful...
        lyxpreamble += "\n\\makeatletter\n";
@@ -1413,7 +1427,7 @@ void BufferParams::makeTextClass()
                                                "may not be possible.\n"), from_utf8(modName));
                        frontend::Alert::warning(_("Package not available"), msg);
                }
-               FileName layout_file = libFileSearch("layouts", lm->filename);
+               FileName layout_file = libFileSearch("layouts", lm->getFilename());
                textClass_->read(layout_file, TextClass::MODULE);
        }
 }
@@ -1557,27 +1571,62 @@ void BufferParams::readModules(Lexer & lex)
 }
 
 
-string const BufferParams::paperSizeName() const
+string const BufferParams::paperSizeName(Papersize_Purpose const & purpose) const
 {
        char real_papersize = papersize;
        if (real_papersize == PAPER_DEFAULT)
                real_papersize = lyxrc.default_papersize;
 
        switch (real_papersize) {
+       case PAPER_DEFAULT:
+               // could be anything, so don't guess
+               return string();
+       case PAPER_CUSTOM: {
+               if (purpose == XDVI && !paperwidth.empty() &&
+                   !paperheight.empty()) {
+                       // heightxwidth<unit>
+                       string first = paperwidth;
+                       string second = paperheight;
+                       if (orientation == ORIENTATION_LANDSCAPE)
+                               first.swap(second);
+                       // cut off unit.
+                       return first.erase(first.length() - 2)
+                               + "x" + second;
+               }
+               return string();
+       }
        case PAPER_A3:
                return "a3";
        case PAPER_A4:
                return "a4";
        case PAPER_A5:
                return "a5";
+       case PAPER_B3:
+               // dvips and dvipdfm do not know this
+               if (purpose == DVIPS || purpose == DVIPDFM)
+                       return string();
+               return "b3";
+       case PAPER_B4:
+               // dvipdfm does not know this
+               if (purpose == DVIPDFM)
+                       return string();
+               return "b4";
        case PAPER_B5:
+               // dvipdfm does not know this
+               if (purpose == DVIPDFM)
+                       return string();
                return "b5";
        case PAPER_USEXECUTIVE:
+               // dvipdfm does not know this
+               if (purpose == DVIPDFM)
+                       return string();
                return "foolscap";
        case PAPER_USLEGAL:
                return "legal";
        case PAPER_USLETTER:
        default:
+               if (purpose == XDVI)
+                       return "us";
                return "letter";
        }
 }
@@ -1597,9 +1646,9 @@ string const BufferParams::dvips_options() const
                result += ' ' + paperwidth;
                result += ',' + paperheight;
        } else {
-               string const paper_option = paperSizeName();
-               if (paper_option != "letter" ||
-                   orientation != ORIENTATION_LANDSCAPE) {
+               string const paper_option = paperSizeName(DVIPS);
+               if (!paper_option.empty() && (paper_option != "letter" ||
+                   orientation != ORIENTATION_LANDSCAPE)) {
                        // dvips won't accept -t letter -t landscape.
                        // In all other cases, include the paper size
                        // explicitly.