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

diff --git a/lib/layouts/sweave.module b/lib/layouts/sweave.module
index fe323129a5..9d4d10fd97 100644
--- a/lib/layouts/sweave.module
+++ b/lib/layouts/sweave.module
@@ -1,46 +1,34 @@
-#\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
 
-# Within the chunk, lines are separated by newlines (Ctrl-Return)!
+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
 
-Format 22
-OutputType              literate
+Counter chunk
+	GuiName "Knitr Chunk"
+    InitialValue 2
+End
+
+OutputType             literate
 OutputFormat           sweave
 
-Style Chunk
-	Category              Sweave
-	LatexType             Paragraph
-	LatexName             dummy
-	Margin                static
-	ParSep                0.4
-	TopSep                0.4
-	BottomSep             0.4
-	ItemSep               0.4
-	Align                 Left
-	AlignPossible         Block, Left, Right, Center
-	NewLine               0
-	FreeSpacing           1
-	PassThru              1
-	## What is LabelType used for?
-	LabelType             Static
-	TextFont
-	  Color               latex
-	  Family              Typewriter
-	EndFont
+ClassOptions
+	Other          "noae"
 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
@@ -55,12 +43,16 @@ InsetLayout "Sweave Options"
 	  Size                Small
 	EndFont
 	MultiPar              false
-	PassThru              true
+	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
@@ -75,12 +67,14 @@ InsetLayout "S/R expression"
 	  Size                Small
 	EndFont
 	MultiPar              false
-	PassThru              true
+	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
@@ -95,7 +89,11 @@ InsetLayout "Sweave Input File"
 	  Size                Small
 	EndFont
 	MultiPar              false
-	PassThru              true
+	PassThru              1
+	ParbreakIsNewline     1
+	Spellcheck	      0
 	FreeSpacing           true
 	ForceLTR              true
+	AddToToc              literate
+	IsTocCaption          1
 End