From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Wed, 22 Jun 2011 09:30:57 +0000 (+0000)
Subject: Fix incompatibility between jss.layout and Sweave (see bug 7555).
X-Git-Tag: 2.0.1~137
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=bcb4e90f2a2e7fb3917c1025a43b425685245ed5;p=features.git

Fix incompatibility between jss.layout and Sweave (see bug 7555).

Backport of r39188.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39189 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/layouts/jss.layout b/lib/layouts/jss.layout
index 098f2fe9a5..57d50c4db5 100644
--- a/lib/layouts/jss.layout
+++ b/lib/layouts/jss.layout
@@ -9,3 +9,10 @@ Format 35
 
 # Read the definitions from article.layout
 Input article.layout
+
+# The commented macro below is enough to prevent Sweave from loading
+# Sweave.sty. This is needed because jss.cls already provides
+# this package's functionality (see bug 7555).
+AddToPreamble
+    %\usepackage{Sweave}
+EndPreamble
diff --git a/status.20x b/status.20x
index 78a65228f7..c224f064c0 100644
--- a/status.20x
+++ b/status.20x
@@ -134,6 +134,8 @@ What's new
 - Fix LaTeX error with Sweave module when the directory where R has
   been installed contains a space.
 
+- Fix incompatibility between jss.layout and Sweave (see bug 7555).
+
 * USER INTERFACE
 
 - Fixed crash relating to outliner and mouse movement.