[Distr-commits] r882 - branches/distr-2.5/pkg/SweaveListingUtils branches/distr-2.5/pkg/SweaveListingUtils/R pkg/SweaveListingUtils pkg/SweaveListingUtils/R pkg/SweaveListingUtils/man

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

Author: ruckdeschel
Date: 2013-02-08 22:59:56 +0100 (Fri, 08 Feb 2013)
New Revision: 882

Modified:
   branches/distr-2.5/pkg/SweaveListingUtils/DESCRIPTION
   branches/distr-2.5/pkg/SweaveListingUtils/R/SweaveListingUtils.R
   pkg/SweaveListingUtils/DESCRIPTION
   pkg/SweaveListingUtils/R/SweaveListingUtils.R
   pkg/SweaveListingUtils/man/0SweaveListingUtils-package.Rd
Log:
fixed issue with SweaveListingUtils.R -> assignInMyNamespace only is available for R >2.15.1 and vignette folder only from R>=2.14.0 (as notified by Uwe Ligges)

Modified: branches/distr-2.5/pkg/SweaveListingUtils/DESCRIPTION
===================================================================
--- branches/distr-2.5/pkg/SweaveListingUtils/DESCRIPTION	2013-02-08 21:00:28 UTC (rev 881)
+++ branches/distr-2.5/pkg/SweaveListingUtils/DESCRIPTION	2013-02-08 21:59:56 UTC (rev 882)
@@ -2,7 +2,7 @@
 Title: Utilities for Sweave together with TeX listings package
 Encoding: latin1
 Version: 0.7
-Depends: R(>= 2.10.0), startupmsg
+Depends: R(>= 2.14.0), startupmsg
 Suggests: distr, MASS, survival, distrEx, Matrix, splines
 Imports: stats
 ByteCompile: yes

Modified: branches/distr-2.5/pkg/SweaveListingUtils/R/SweaveListingUtils.R
===================================================================
--- branches/distr-2.5/pkg/SweaveListingUtils/R/SweaveListingUtils.R	2013-02-08 21:00:28 UTC (rev 881)
+++ branches/distr-2.5/pkg/SweaveListingUtils/R/SweaveListingUtils.R	2013-02-08 21:59:56 UTC (rev 882)
@@ -76,8 +76,11 @@
 
    sws <- .SweaveListingOptions
    sws$inSweave <- TRUE
-   assignInMyNamespace(".SweaveListingOptions", sws)
-
+   if(getRversion()>"2.15.1")
+      assignInMyNamespace(".SweaveListingOptions", sws) else{
+   assignInNamespace(".SweaveListingOptions", sws, "SweaveListingUtils")
+   }
+   
    withVerbatim <- rep(withVerbatim, length.out=3)
    if(is.null(names(withVerbatim)))
       names(withVerbatim) <- c("Sinput", "Soutput", "Scode")

Modified: pkg/SweaveListingUtils/DESCRIPTION
===================================================================
--- pkg/SweaveListingUtils/DESCRIPTION	2013-02-08 21:00:28 UTC (rev 881)
+++ pkg/SweaveListingUtils/DESCRIPTION	2013-02-08 21:59:56 UTC (rev 882)
@@ -1,8 +1,8 @@
 Package: SweaveListingUtils
 Title: Utilities for Sweave together with TeX listings package
 Encoding: latin1
-Version: 0.6.1
-Depends: R(>= 2.10.0), startupmsg
+Version: 0.6.2
+Depends: R(> 2.13.2), startupmsg
 Suggests: distr, MASS, survival, distrEx, Matrix, splines
 Imports: stats
 ByteCompile: yes
@@ -16,4 +16,4 @@
 Date: 2013-02-08
 LastChangedDate: {$LastChangedDate$}
 LastChangedRevision: {$LastChangedRevision$}
-SVNRevision: 879
+SVNRevision: 881

Modified: pkg/SweaveListingUtils/R/SweaveListingUtils.R
===================================================================
--- pkg/SweaveListingUtils/R/SweaveListingUtils.R	2013-02-08 21:00:28 UTC (rev 881)
+++ pkg/SweaveListingUtils/R/SweaveListingUtils.R	2013-02-08 21:59:56 UTC (rev 882)
@@ -76,8 +76,11 @@
 
    sws <- .SweaveListingOptions
    sws$inSweave <- TRUE
-   assignInMyNamespace(".SweaveListingOptions", sws)
-
+   if(getRversion()>"2.15.1")
+      assignInMyNamespace(".SweaveListingOptions", sws) else{
+   assignInNamespace(".SweaveListingOptions", sws, "SweaveListingUtils")
+   }
+   
    withVerbatim <- rep(withVerbatim, length.out=3)
    if(is.null(names(withVerbatim)))
       names(withVerbatim) <- c("Sinput", "Soutput", "Scode")

Modified: pkg/SweaveListingUtils/man/0SweaveListingUtils-package.Rd
===================================================================
--- pkg/SweaveListingUtils/man/0SweaveListingUtils-package.Rd	2013-02-08 21:00:28 UTC (rev 881)
+++ pkg/SweaveListingUtils/man/0SweaveListingUtils-package.Rd	2013-02-08 21:59:56 UTC (rev 882)
@@ -15,12 +15,12 @@
 \details{
 \tabular{ll}{
 Package: \tab SweaveListingUtils \cr
-Version: \tab 0.6.1 \cr
+Version: \tab 0.6.2 \cr
 Date: \tab 2013-02-08 \cr
-Depends: \tab R(>= 2.10.0), startupmsg \cr
+Depends: \tab R(> 2.13.2), startupmsg \cr
 LazyLoad: \tab yes \cr
 License: \tab LGPL-3 \cr
-SVNRevision: \tab 879 \cr
+SVNRevision: \tab 881 \cr
 }
 
 TeX-package \file{listings}, confer \url{http://www.ctan.org/tex-archive/macros/latex/contrib/listings/},