X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fsweave.module;h=9d4d10fd975465ae2a8cc78aaad1b403ee0e9311;hb=a6e20d713816670662e5780004df8e22a7144d1c;hp=836ff73e857d5fd3b2d87513c879876a32af4e36;hpb=b9b619641bf3a5cac120abba2e1b67e43995a384;p=lyx.git

diff --git a/lib/layouts/sweave.module b/lib/layouts/sweave.module
index 836ff73e85..9d4d10fd97 100644
--- a/lib/layouts/sweave.module
+++ b/lib/layouts/sweave.module
@@ -1,15 +1,20 @@
-#\DeclareLyXModule[sweave->latex]{Sweave}
+#\DeclareLyXModule[sweave->latex,fancyvrb.sty]{Sweave}
+#\DeclareCategory{Literate Programming}
 #DescriptionBegin
-#Allows to use the statistical language S/R as a literate programming tool.
+#Allows to use the statistical language S/R as a literate programming tool via the Sweave() function.
+#For more info see Help > Specific Manuals > Sweave.
 #DescriptionEnd
-#Category: literate
+#Excludes: lilypond
 
+Format 103
 
-# To add :
-# - \setkeys{Gin}{width=0.8\textwidth} How to add such a "beast"? This is used to define
-#   the size of produced plots.
+Input litinsets.inc
+
+Counter chunk
+	GuiName "Knitr Chunk"
+    InitialValue 2
+End
 
-Format 30
 OutputType             literate
 OutputFormat           sweave
 
@@ -17,30 +22,13 @@ ClassOptions
 	Other          "noae"
 End
 
-Style Chunk
-	Category              Sweave
-	LatexType             Paragraph
-	LatexName             dummy
-	Margin                static
-	Align                 Left
-	AlignPossible         Block, Left, Right, Center
-	NewLine               0
-	FreeSpacing           1
-	PassThru              1
-	ParbreakIsNewline     1
-	## What is LabelType used for?
-	LabelType             Static
-	TextFont
-	  Color               latex
-	  Family              Typewriter
-	EndFont
-End
-
-Style Scrap
-	ObsoletedBy           Chunk
-End
+AddToPreamble
+	<<echo=F>>=
+	  if(exists(".orig.enc")) options(encoding = .orig.enc)
+	@
+EndPreamble
 
-InsetLayout "Sweave Options"
+InsetLayout "Flex:Sweave Options"
 	LabelString           "Sweave opts"
 	LatexType             Command
 	LaTexName             SweaveOpts
@@ -57,11 +45,14 @@ InsetLayout "Sweave Options"
 	MultiPar              false
 	PassThru              1
 	ParbreakIsNewline     1
+	Spellcheck	      0
 	FreeSpacing           true
 	ForceLTR              true
+	AddToToc              literate
+	IsTocCaption          0
 End
 
-InsetLayout "S/R expression"
+InsetLayout "Flex:S/R expression"
 	LabelString           "S/R expr"
 	LatexType             Command
 	LaTexName             Sexpr
@@ -78,11 +69,12 @@ InsetLayout "S/R expression"
 	MultiPar              false
 	PassThru              1
 	ParbreakIsNewline     1
+	Spellcheck	      0
 	FreeSpacing           true
 	ForceLTR              true
 End
 
-InsetLayout "Sweave Input File"
+InsetLayout "Flex:Sweave Input File"
 	LabelString           "Sweave Input File"
 	LatexType             Command
 	LaTexName             SweaveInput
@@ -99,6 +91,9 @@ InsetLayout "Sweave Input File"
 	MultiPar              false
 	PassThru              1
 	ParbreakIsNewline     1
+	Spellcheck	      0
 	FreeSpacing           true
 	ForceLTR              true
+	AddToToc              literate
+	IsTocCaption          1
 End