Author: lasgouttes
Date: Wed Jun 22 11:30:57 2011
New Revision: 39189
URL: http://www.lyx.org/trac/changeset/39189
Log:
Fix incompatibility between jss.layout and Sweave (see bug 7555).
Backport of r39188.
Modified:
lyx-devel/branches/BRANCH_2_0_X/lib/layouts/jss.layout
lyx-devel/branches/BRANCH_2_0_X/status.20x
Modified: lyx-devel/branches/BRANCH_2_0_X/lib/layouts/jss.layout
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/lib/layouts/jss.layout Wed Jun 22
11:26:58 2011 (r39188)
+++ lyx-devel/branches/BRANCH_2_0_X/lib/layouts/jss.layout Wed Jun 22
11:30:57 2011 (r39189)
@@ -9,3 +9,10 @@
# 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
Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x Wed Jun 22 11:26:58 2011
(r39188)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x Wed Jun 22 11:30:57 2011
(r39189)
@@ -134,6 +134,8 @@
- 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.
