From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Thu, 1 Apr 2010 21:34:22 +0000 (+0000)
Subject: Fix ticket #6634: LyX should pass the "noae" option to Sweave.sty
X-Git-Tag: 2.0.0~3572
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=b8fb599130b118e3f881e3a9d6df6285a2bc44a9;p=features.git

Fix ticket #6634: LyX should pass the "noae" option to Sweave.sty

We pass it as a global document option.


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

diff --git a/lib/layouts/sweave.module b/lib/layouts/sweave.module
index 79d830359e..891fd14db4 100644
--- a/lib/layouts/sweave.module
+++ b/lib/layouts/sweave.module
@@ -11,9 +11,13 @@
 #   the size of produced plots.
 
 Format 26
-OutputType              literate
+OutputType             literate
 OutputFormat           sweave
 
+ClassOptions
+	Other          "noae"
+End
+
 Style Chunk
 	Category              Sweave
 	LatexType             Paragraph
diff --git a/src/TextClass.cpp b/src/TextClass.cpp
index 6bc0bc0c8e..7e9c206a9c 100644
--- a/src/TextClass.cpp
+++ b/src/TextClass.cpp
@@ -837,7 +837,10 @@ void TextClass::readClassOptions(Lexer & lexrc)
 			break;
 		case CO_OTHER:
 			lexrc.next();
-			options_ = lexrc.getString();
+			if (options_.empty())
+				options_ = lexrc.getString();
+			else
+				options_ += ',' + lexrc.getString();
 			break;
 		case CO_HEADER:
 			lexrc.next();