[Distr-commits] r511 - branches/distr-2.2/pkg/SweaveListingUtils/R branches/distr-2.2/pkg/SweaveListingUtils/chm pkg/SweaveListingUtils/R

[noreply at r-forge.r-project.org]

Author: ruckdeschel
Date: 2009-07-16 15:45:42 +0200 (Thu, 16 Jul 2009)
New Revision: 511

Modified:
   branches/distr-2.2/pkg/SweaveListingUtils/R/SweaveListingUtils.R
   branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingUtils.chm
   pkg/SweaveListingUtils/R/SweaveListingUtils.R
Log:
yet another little bugfix in SweaveListingUtils.R ...

Modified: branches/distr-2.2/pkg/SweaveListingUtils/R/SweaveListingUtils.R
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/R/SweaveListingUtils.R	2009-07-16 13:29:04 UTC (rev 510)
+++ branches/distr-2.2/pkg/SweaveListingUtils/R/SweaveListingUtils.R	2009-07-16 13:45:42 UTC (rev 511)
@@ -250,6 +250,8 @@
    cat("\\Rlstset\n")
 cat(line,"%copying relevant parts of Sweave.sty\n",line,"%\n", sep = "")
 
+cat("\\RequirePackage{graphicx,fancyvrb}%\n")
+cat("\\IfFileExists{upquote.sty}{\\RequirePackage{upquote}}{}%\n\n")
 cat("\\RequirePackage{ifthen}%\n")
 ### you might still want to have the boolean TeX
 #   variables available in your code
@@ -266,10 +268,6 @@
        "\\RequirePackage{ae}\n%\n", sep ="")
 }
 
-cat("\\RequirePackage{graphicx,fancyvrb}%\n")
-cat("\\IfFileExists{upquote.sty}{\\RequirePackage{upquote}}{}%\n")
-
-
 cat("\\newenvironment{Schunk}{}{}\n\n")
 
 cat("\\newcommand{\\Sconcordance}[1]{% \n",

Modified: branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingUtils.chm
===================================================================
(Binary files differ)

Modified: pkg/SweaveListingUtils/R/SweaveListingUtils.R
===================================================================
--- pkg/SweaveListingUtils/R/SweaveListingUtils.R	2009-07-16 13:29:04 UTC (rev 510)
+++ pkg/SweaveListingUtils/R/SweaveListingUtils.R	2009-07-16 13:45:42 UTC (rev 511)
@@ -223,7 +223,6 @@
 
 cat(line,"%Preparations for Sweave and Listings\n",line,"%\n", sep = "")
 
-
 cat("\\RequirePackage{color}\n")
 cat("\\definecolor{Rcolor}{rgb}{",paste(Rcolor,collapse=", "),"}\n", sep = "")
 cat("\\definecolor{RRecomdcolor}{rgb}{",paste(RRecomdcolor,collapse=", "),"}\n", sep = "")
@@ -251,26 +250,24 @@
    cat("\\Rlstset\n")
 cat(line,"%copying relevant parts of Sweave.sty\n",line,"%\n", sep = "")
 
+cat("\\RequirePackage{graphicx,fancyvrb}%\n")
+cat("\\IfFileExists{upquote.sty}{\\RequirePackage{upquote}}{}%\n\n")
 cat("\\RequirePackage{ifthen}%\n")
-cat("\\newboolean{Sweave at gin}%\n")
-if(gin)
+### you might still want to have the boolean TeX
+#   variables available in your code
+if(gin){
+  cat("\\newboolean{Sweave at gin}%\n")
   cat("\\setboolean{Sweave at gin}{true}%\n")
-else
-  cat("\\setboolean{Sweave at gin}{true}%\n")
-cat("\\newboolean{Sweave at ae}\n")
-if(ae)
+  cat("\\setkeys{Gin}{width=0.8\\textwidth}%\n")
+}
+
+if(ae){
+   cat("\\newboolean{Sweave at ae}\n")
    cat("\\setboolean{Sweave at ae}{true}%\n")
-else
-   cat("\\setboolean{Sweave at ae}{true}%\n")
+   cat("\\RequirePackage[T1]{fontenc}\n",
+       "\\RequirePackage{ae}\n%\n", sep ="")
+}
 
-cat("\\RequirePackage{graphicx,fancyvrb}%\n")
-cat("\\IfFileExists{upquote.sty}{\\RequirePackage{upquote}}{}%\n")
-
-cat("\\ifthenelse{\\boolean{Sweave at gin}}{\\setkeys{Gin}{width=0.8\\textwidth}}{}%\n")
-cat("\\ifthenelse{\\boolean{Sweave at ae}}{%\n",
-    "\\RequirePackage[T1]{fontenc}\n",
-    "\\RequirePackage{ae}\n}{}%\n", sep ="")
-
 cat("\\newenvironment{Schunk}{}{}\n\n")
 
 cat("\\newcommand{\\Sconcordance}[1]{% \n",