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 79d830359ea88f86ed06796cfdfd600b0c87ed77..891fd14db49768ddddcfbf56ee1080fb12759a72 100644 (file)
--- 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 6bc0bc0c8e65aded738618c509014955e8c4588b..7e9c206a9cf03e6867e6b92743f57e5a89c0adf7 100644 (file)
--- 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();