[Distr-commits] r508 - branches/distr-2.2/pkg/SweaveListingUtils/chm branches/distr-2.2/pkg/SweaveListingUtils/inst/doc pkg/SweaveListingUtils/inst/doc
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu Jul 16 11:21:33 CEST 2009
Author: ruckdeschel
Date: 2009-07-16 11:21:26 +0200 (Thu, 16 Jul 2009)
New Revision: 508
Modified:
branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingUtils.chm
branches/distr-2.2/pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw
branches/distr-2.2/pkg/SweaveListingUtils/inst/doc/exam00.tex
branches/distr-2.2/pkg/SweaveListingUtils/inst/doc/preamble2.tex
branches/distr-2.2/pkg/SweaveListingUtils/inst/doc/preambleExp.tex
pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw
pkg/SweaveListingUtils/inst/doc/exam00.tex
pkg/SweaveListingUtils/inst/doc/preamble2.tex
pkg/SweaveListingUtils/inst/doc/preambleExp.tex
Log:
minor corrections in vignette to SweaveListingUtils
Modified: branches/distr-2.2/pkg/SweaveListingUtils/chm/SweaveListingUtils.chm
===================================================================
(Binary files differ)
Modified: branches/distr-2.2/pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw 2009-07-15 09:03:30 UTC (rev 507)
+++ branches/distr-2.2/pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw 2009-07-16 09:21:26 UTC (rev 508)
@@ -503,9 +503,9 @@
\newblock \hreft{http://cran.r-project.org/doc/Rnews/Rnews_2003-2.pdf}.
%
-\bibitem[{Murdoch (2008)}]{Murd:08}
-Murdoch, D (2008)
-\newblock {Parsing Rd Files. Technical Report on {\tt developer.r-project.org}} as of Nov. 4 2008.
+\bibitem[{Murdoch (2009)}]{Murd:08}
+Murdoch, D (2009)
+\newblock {Parsing Rd Files. Technical Report on {\tt developer.r-project.org}} as of Jun. 21 2009.
\newblock \hreft{http://developer.r-project.org/parseRd.pdf}.
%
Modified: branches/distr-2.2/pkg/SweaveListingUtils/inst/doc/exam00.tex
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/inst/doc/exam00.tex 2009-07-15 09:03:30 UTC (rev 507)
+++ branches/distr-2.2/pkg/SweaveListingUtils/inst/doc/exam00.tex 2009-07-16 09:21:26 UTC (rev 508)
@@ -18,3 +18,5 @@
numbers=none}
\lstdefinestyle{Routstyle}{style=RoutstyleO,frame=none,backgroundcolor=\color{white},%
numbers=none}
+
+
Modified: branches/distr-2.2/pkg/SweaveListingUtils/inst/doc/preamble2.tex
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/inst/doc/preamble2.tex 2009-07-15 09:03:30 UTC (rev 507)
+++ branches/distr-2.2/pkg/SweaveListingUtils/inst/doc/preamble2.tex 2009-07-16 09:21:26 UTC (rev 508)
@@ -11,15 +11,15 @@
SweaveListingPreparations(#
Rin = c(getSweaveListingOption("Rin"),
frame = "trBL",
- backgroundcolor = "\\color{gray90}",%
+ backgroundcolor = "\\color{gray90}",
numbers = "left",
numberstyle = "\\tiny",
stepnumber = "1",
numbersep = "7pt"),
- Rout = c(getSweaveListingOption("Rout"),,
+ Rout = c(getSweaveListingOption("Rout"),
frame = "trBL",
frameround = "fttt",
- backgroundcolor = "\\color{gray95}",%
+ backgroundcolor = "\\color{gray95}",
numbers = "left",
numberstyle = "\\tiny",
stepnumber="3",
Modified: branches/distr-2.2/pkg/SweaveListingUtils/inst/doc/preambleExp.tex
===================================================================
--- branches/distr-2.2/pkg/SweaveListingUtils/inst/doc/preambleExp.tex 2009-07-15 09:03:30 UTC (rev 507)
+++ branches/distr-2.2/pkg/SweaveListingUtils/inst/doc/preambleExp.tex 2009-07-16 09:21:26 UTC (rev 508)
@@ -1,6 +1,6 @@
-% -------------------------------------------------------------------------------
\RequirePackage{fancyvrb}
\RequirePackage{listings}
+%\usepackage{Sweave}
% -------------------------------------------------------------------------------
%------------------------------------------------------------------------------%
%Preparations for Sweave and Listings
@@ -8,9 +8,10 @@
%
\RequirePackage{color}
\definecolor{Rcolor}{rgb}{0, 0.5, 0.5}
+\definecolor{RRecomdcolor}{rgb}{0, 0.6, 0.4}
\definecolor{Rbcolor}{rgb}{0, 0.6, 0.6}
-\definecolor{Rout}{rgb}{0.461, 0.039, 0.102}
-\definecolor{Rcomment}{rgb}{0.101, 0.043, 0.432}
+\definecolor{Routcolor}{rgb}{0.461, 0.039, 0.102}
+\definecolor{Rcommentcolor}{rgb}{0.101, 0.043, 0.432}
%------------------------------------------------------------------------------%
\lstdefinelanguage{Rd}[common]{TeX}%
{moretexcs={acronym,alias,arguments,author,bold,cite,%
@@ -29,12 +30,16 @@
morecomment=[l]\%% 2008/9 Peter Ruckdeschel
}[keywords,comments]%%
%------------------------------------------------------------------------------%
-\lstdefinestyle{Rstyle}{fancyvrb=true,escapechar=§,language=R,%
+\lstdefinestyle{Rstyle}{fancyvrb=true,escapechar=§,language=R,%
+ % note:
+ % '§' replaces accent grave (otherwise difficulties in TeXing this verbatim)
basicstyle={\color{Rcolor}\small},%
keywordstyle={\bf\color{Rcolor}},%
- commentstyle={\color{Rcomment}\ttfamily\itshape},%
+ commentstyle={\color{Rcommentcolor}\ttfamily\itshape},%
literate={<-}{{$\leftarrow$}}2{<<-}{{$\twoheadleftarrow$}}2%
- {~}{{$\sim$}}1{<=}{{$\leq$}}2{>=}{{$\geq$}}2{^}{{$\scriptstyle\wedge$}}1,%
+ {~}{{$\sim$}}1{<=}{{$\leq$}}2%
+ {>=}{{$\geq$}}2%
+ {^}{{$\scriptstyle\wedge$}}1,%
alsoother={$},%
alsoletter={.<-},%
otherkeywords={!,!=,~,$,*,\&,\%/\%,\%*\%,\%\%,<-,<<-,/},%
@@ -46,6 +51,11 @@
%------------------------------------------------------------------------------%
\global\def\Rlstset{\lstset{style=Rstyle}}%
\global\def\Rdlstset{\lstset{style=Rdstyle}}%
+%------------------------------------------------------------------------------%
+\global\def\Rinlstset{\lstset{style=Rinstyle}}%
+\global\def\Routlstset{\lstset{style=Routstyle}}%
+\global\def\Rcodelstset{\lstset{style=Rcodestyle}}%
+%------------------------------------------------------------------------------%
\Rlstset
%------------------------------------------------------------------------------%
%copying relevant parts of Sweave.sty
@@ -75,15 +85,19 @@
% ---- end of parts of Sweave.sty
%------------------------------------------------------------------------------%
%
-\lstnewenvironment{Sinput}%
- {\Rlstset\lstset{basicstyle=\color{Rcolor}\small,fancyvrb=true}}%
- {\Rlstset}
-\lstnewenvironment{Soutput}%
- {\Rlstset\lstset{fancyvrb=false,basicstyle=\color{Rout}\small}}%
- {\Rlstset}
-\lstnewenvironment{Scode}%
- {\Rlstset\lstset{fontshape=sl,basicstyle=\color{Rcolor}\small,fancyvrb=true}}%
- {\Rlstset}
+\lstdefinestyle{RinstyleO}{style=Rstyle,fancyvrb=true,%
+ basicstyle=\color{Rcolor}\small}%
+\lstdefinestyle{Rinstyle}{style=Rstyle,fancyvrb=true,%
+ basicstyle=\color{Rcolor}\small}%
+\lstnewenvironment{Sinput}{\Rinlstset}{\Rlstset}
+\lstdefinestyle{RoutstyleO}{fancyvrb=false,basicstyle=\color{Routcolor}\small}%
+\lstdefinestyle{Routstyle}{fancyvrb=false,basicstyle=\color{Routcolor}\small}%
+\lstnewenvironment{Soutput}{\Routlstset}{\Rlstset}
+\lstdefinestyle{RcodestyleO}{style=Rstyle,fancyvrb=true,fontshape=sl,%
+ basicstyle=\color{Rcolor}}%
+\lstdefinestyle{Rcodestyle}{style=Rstyle,fancyvrb=true,fontshape=sl,%
+ basicstyle=\color{Rcolor}}%
+\lstnewenvironment{Scode}{\Rcodelstset}{\Rlstset}
%------------------------------------------------------------------------------%
\let\code\lstinline
\def\Code#1{{\tt\color{Rcolor} #1}}
Modified: pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw
===================================================================
--- pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw 2009-07-15 09:03:30 UTC (rev 507)
+++ pkg/SweaveListingUtils/inst/doc/ExampleSweaveListingUtils.Rnw 2009-07-16 09:21:26 UTC (rev 508)
@@ -503,9 +503,9 @@
\newblock \hreft{http://cran.r-project.org/doc/Rnews/Rnews_2003-2.pdf}.
%
-\bibitem[{Murdoch (2008)}]{Murd:08}
-Murdoch, D (2008)
-\newblock {Parsing Rd Files. Technical Report on {\tt developer.r-project.org}} as of Nov. 4 2008.
+\bibitem[{Murdoch (2009)}]{Murd:08}
+Murdoch, D (2009)
+\newblock {Parsing Rd Files. Technical Report on {\tt developer.r-project.org}} as of Jun. 21 2009.
\newblock \hreft{http://developer.r-project.org/parseRd.pdf}.
%
Modified: pkg/SweaveListingUtils/inst/doc/exam00.tex
===================================================================
--- pkg/SweaveListingUtils/inst/doc/exam00.tex 2009-07-15 09:03:30 UTC (rev 507)
+++ pkg/SweaveListingUtils/inst/doc/exam00.tex 2009-07-16 09:21:26 UTC (rev 508)
@@ -18,3 +18,5 @@
numbers=none}
\lstdefinestyle{Routstyle}{style=RoutstyleO,frame=none,backgroundcolor=\color{white},%
numbers=none}
+
+
Modified: pkg/SweaveListingUtils/inst/doc/preamble2.tex
===================================================================
--- pkg/SweaveListingUtils/inst/doc/preamble2.tex 2009-07-15 09:03:30 UTC (rev 507)
+++ pkg/SweaveListingUtils/inst/doc/preamble2.tex 2009-07-16 09:21:26 UTC (rev 508)
@@ -11,15 +11,15 @@
SweaveListingPreparations(#
Rin = c(getSweaveListingOption("Rin"),
frame = "trBL",
- backgroundcolor = "\\color{gray90}",%
+ backgroundcolor = "\\color{gray90}",
numbers = "left",
numberstyle = "\\tiny",
stepnumber = "1",
numbersep = "7pt"),
- Rout = c(getSweaveListingOption("Rout"),,
+ Rout = c(getSweaveListingOption("Rout"),
frame = "trBL",
frameround = "fttt",
- backgroundcolor = "\\color{gray95}",%
+ backgroundcolor = "\\color{gray95}",
numbers = "left",
numberstyle = "\\tiny",
stepnumber="3",
Modified: pkg/SweaveListingUtils/inst/doc/preambleExp.tex
===================================================================
--- pkg/SweaveListingUtils/inst/doc/preambleExp.tex 2009-07-15 09:03:30 UTC (rev 507)
+++ pkg/SweaveListingUtils/inst/doc/preambleExp.tex 2009-07-16 09:21:26 UTC (rev 508)
@@ -30,11 +30,16 @@
morecomment=[l]\%% 2008/9 Peter Ruckdeschel
}[keywords,comments]%%
%------------------------------------------------------------------------------%
-\lstdefinestyle{Rstyle}{fancyvrb=true,escapechar=`,language=R,%
+\lstdefinestyle{Rstyle}{fancyvrb=true,escapechar=§,language=R,%
+ % note:
+ % '§' replaces accent grave (otherwise difficulties in TeXing this verbatim)
basicstyle={\color{Rcolor}\small},%
keywordstyle={\bf\color{Rcolor}},%
commentstyle={\color{Rcommentcolor}\ttfamily\itshape},%
- literate={<-}{{$\leftarrow$}}2{<<-}{{$\twoheadleftarrow$}}2{~}{{$\sim$}}1{<=}{{$\leq$}}2{>=}{{$\geq$}}2{^}{{$\scriptstyle\wedge$}}1,%
+ literate={<-}{{$\leftarrow$}}2{<<-}{{$\twoheadleftarrow$}}2%
+ {~}{{$\sim$}}1{<=}{{$\leq$}}2%
+ {>=}{{$\geq$}}2%
+ {^}{{$\scriptstyle\wedge$}}1,%
alsoother={$},%
alsoletter={.<-},%
otherkeywords={!,!=,~,$,*,\&,\%/\%,\%*\%,\%\%,<-,<<-,/},%
More information about the Distr-commits
mailing list