X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Flayouts%2Fsweave.module;h=912642040d0d76cc581591f98dd2f36fe3253b94;hb=4beba4e8f87ca218473448caf10563b99faf7b21;hp=08b3067d821c3df95242a5b8c53c6e25040c588a;hpb=6aa26820fd2fc809c2928f7d1f52d9ee3ef9fb18;p=lyx.git

diff --git a/lib/layouts/sweave.module b/lib/layouts/sweave.module
index 08b3067d82..912642040d 100644
--- a/lib/layouts/sweave.module
+++ b/lib/layouts/sweave.module
@@ -1,15 +1,12 @@
-#\DeclareLyXModule[sweave->latex]{Sweave}
+#\DeclareLyXModule[sweave->latex,fancyvrb.sty]{Sweave}
 #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 the LyX example file sweave.lyx.
 #DescriptionEnd
 #Category: literate
+#Excludes: lilypond
 
-
-# To add :
-# - \setkeys{Gin}{width=0.8\textwidth} How to add such a "beast"? This is used to define
-#   the size of produced plots.
-
-Format 27
+Format 45
 OutputType             literate
 OutputFormat           sweave
 
@@ -17,21 +14,26 @@ ClassOptions
 	Other          "noae"
 End
 
+AddToPreamble
+	<<echo=F>>=
+	  if(exists(".orig.enc")) options(encoding = .orig.enc)
+	@
+EndPreamble
+
 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
+	TopSep                0.7
+	BottomSep             0.7
 	NewLine               0
 	FreeSpacing           1
 	PassThru              1
 	ParbreakIsNewline     1
+	Spellcheck	      0
 	## What is LabelType used for?
 	LabelType             Static
 	TextFont
@@ -44,7 +46,7 @@ Style Scrap
 	ObsoletedBy           Chunk
 End
 
-InsetLayout "Sweave Options"
+InsetLayout "Flex:Sweave Options"
 	LabelString           "Sweave opts"
 	LatexType             Command
 	LaTexName             SweaveOpts
@@ -59,12 +61,14 @@ InsetLayout "Sweave Options"
 	  Size                Small
 	EndFont
 	MultiPar              false
-	PassThru              true
+	PassThru              1
+	ParbreakIsNewline     1
+	Spellcheck	      0
 	FreeSpacing           true
 	ForceLTR              true
 End
 
-InsetLayout "S/R expression"
+InsetLayout "Flex:S/R expression"
 	LabelString           "S/R expr"
 	LatexType             Command
 	LaTexName             Sexpr
@@ -79,12 +83,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
@@ -99,7 +105,9 @@ InsetLayout "Sweave Input File"
 	  Size                Small
 	EndFont
 	MultiPar              false
-	PassThru              true
+	PassThru              1
+	ParbreakIsNewline     1
+	Spellcheck	      0
 	FreeSpacing           true
 	ForceLTR              true
 End