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

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


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@39188 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