From: Georg Baum <georg.baum@post.rwth-aachen.de>
Date: Sun, 8 Jan 2012 17:00:33 +0000 (+0000)
Subject: Fix bug #7013: Wrong paper size passed to dvips
X-Git-Tag: 2.1.0beta1~2138
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=45c831306d3759062a96cab1c24d3b7831aba35e;p=lyx.git

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 e2959ed092..00b830588e 100644
--- 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()