Fix bug #7013: Wrong paper size passed to dvips

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40590 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index e2959ed0926ed83d253a2bcbec1c9e9cdf2aa1b6..00b830588e370f63377c69775f0215232bf78984 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -2526,6 +2526,14 @@ string const BufferParams::dvips_options() const
 {
        string result;
 
+       // If the class loads the geometry package, we do not know which
+       // paper size is used, since we do not set it (bug 7013).
+       // Therefore we must not specify any argument here.
+       // dvips gets the correct paper size via DVI specials in this case
+       // (if the class uses the geometry package correctly).
+       if (documentClass().provides("geometry"))
+               return result;
+
        if (use_geometry
            && papersize == PAPER_CUSTOM
            && !lyxrc.print_paper_dimension_flag.empty()