[Distr-commits] r497 - branches/distr-2.2/pkg/SweaveListingUtils/inst pkg/SweaveListingUtils/inst/TeX

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

Author: ruckdeschel
Date: 2009-07-02 01:05:54 +0200 (Thu, 02 Jul 2009)
New Revision: 497

Modified:
   branches/distr-2.2/pkg/SweaveListingUtils/inst/MASKING
   branches/distr-2.2/pkg/SweaveListingUtils/inst/NEWS
   pkg/SweaveListingUtils/inst/TeX/Rdlisting.sty
Log:
some inconsistencies between trunc and branch...

Modified: branches/distr-2.2/pkg/SweaveListingUtils/inst/MASKING
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/inst/MASKING	2009-07-01 22:59:33 UTC (rev 496)
+++ branches/distr-2.2/pkg/SweaveListingUtils/inst/MASKING	2009-07-01 23:05:54 UTC (rev 497)
@@ -11,10 +11,19 @@
 with TeX package 'listings' with the possibility to "tune" the
 corresponding keywordstyle for both the package required/"library"-ed
 and respective intermediate packages loaded/attached automatically,
-we intentionally base functions 'library' and 'require' --- however 
-all these functions may still be used in exactly the same way as 
-before masking.
+we intentionally mask base functions 'library' and 'require' --- 
+however all these functions may still be used in exactly the same 
+way as before masking.
 
+Still, for completely returning to the usual behaviour (i.e.; stop
+issuing TeX code for registering new keywords) and unmasking 
+the original versions of 'library' and 'require', at the end of 
+your .Rnw file, you should include an Sweave chunk like
+
+<<cleanup, echo=FALSE>>=
+unloadNamespace("SweaveListingUtils")
+@
+
 *** non-intentional masking: ***
 
 ... nothing discovered so far ...
\ No newline at end of file

Modified: branches/distr-2.2/pkg/SweaveListingUtils/inst/NEWS
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/inst/NEWS	2009-07-01 22:59:33 UTC (rev 496)
+++ branches/distr-2.2/pkg/SweaveListingUtils/inst/NEWS	2009-07-01 23:05:54 UTC (rev 497)
@@ -3,6 +3,30 @@
 ######################################################################
  
 ##############
+v 0.3
+##############
+
+* included some suggestions due to Frank E. Harrel as to the
+  default settings of R markup (in particular as to "literate
+  programming")
+* included some description/documentation how to re-unmask
+  base functions 'library' and 'require' at the end of
+  an .Rnw file
+* Rd-Style Markup
+  +updated Rdlisting.sty according to the new version of 
+   "Parsing Rd Files" by Duncan Murdoch as of Jun 21 2009
+* thanks to Andrew Ellis:
+  new options for SweaveListingPreparations:
+  + withOwnFileSection in order to allow for own definition file/
+                     section to define 'Sinput', 'Soutput',
+                     'Scode' environments
+  + withVerbatim in order to allow to use 'lstnewenvironment' - type
+                 environments for 'Sinput', 'Soutput', 'Scode' instead of 
+                 the Sweave.sty-default with \DefineVerbatimEnvironment.
+                 this in particular allows for escaping mechanisms
+                 as provided for in 'listings' package
+ 
+##############
 v 0.2
 ##############
 

Modified: pkg/SweaveListingUtils/inst/TeX/Rdlisting.sty
===================================================================
--- pkg/SweaveListingUtils/inst/TeX/Rdlisting.sty	2009-07-01 22:59:33 UTC (rev 496)
+++ pkg/SweaveListingUtils/inst/TeX/Rdlisting.sty	2009-07-01 23:05:54 UTC (rev 497)
@@ -1,15 +1,16 @@
 \lstdefinelanguage{Rd}[common]{TeX}%
-  {moretexcs={acronym,alias,arguments,author,bold,cite,%
+{moretexcs={acronym,alias,arguments,author,bold,cite,%
           code,command,concept,cr,deqn,describe,%
-          description,details,dfn,docType,dots,%
+          description,details,dfn,doctype,dots,%
           dontrun,dontshow,donttest,dQuote,%
           email,emph,enc,encoding,enumerate,env,eqn,%
           examples,file,format,item,itemize,kbd,keyword,%
-          keyword,ldots,link,linkS4class,method,name,note,%
-          option,pkg,preformatted,R,references,S3method,%
-          S4method,samp,section,seealso,source,sp,special,%
+          ldots,link,linkS4class,method,name,note,%
+          option,pkg,preformatted,R,Rdopts,Rdversion,%
+          references,S3method,S4method,Sexpr,samp,section,%
+          seealso,source,sp,special,%
           sQuote,strong,synopsis,tab,tabular,testonly,%
-          title,url,usage,value,var},
+          title,url,usage,value,var,verb},
    sensitive=true,%
-   morecomment=[l]\%% 2008 Peter Ruckdeschel
+   morecomment=[l]\%% 2008/9 Peter Ruckdeschel
 }[keywords,comments]%%