[Sciviews-commits] r153 - komodo/SciViews-K komodo/SciViews-K/content komodo/SciViews-K Unit pkg/svSweave pkg/svSweave/R pkg/svSweave/man
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Wed Jul 15 15:38:13 CEST 2009
Author: phgrosjean
Date: 2009-07-15 15:38:10 +0200 (Wed, 15 Jul 2009)
New Revision: 153
Modified:
komodo/SciViews-K Unit/sciviewskunit-0.7.0-ko.xpi
komodo/SciViews-K/chrome.manifest
komodo/SciViews-K/content/pref-R.xul
komodo/SciViews-K/content/prefsOverlay.xul
komodo/SciViews-K/sciviewsk-0.8.0-ko.xpi
pkg/svSweave/DESCRIPTION
pkg/svSweave/NEWS
pkg/svSweave/R/cleanLyxRnw.R
pkg/svSweave/man/cleanLyxRnw.Rd
Log:
Little changes in svSweave + compilation of SciViews-K 0.8.0
Modified: komodo/SciViews-K/chrome.manifest
===================================================================
--- komodo/SciViews-K/chrome.manifest 2009-07-10 08:33:13 UTC (rev 152)
+++ komodo/SciViews-K/chrome.manifest 2009-07-15 13:38:10 UTC (rev 153)
@@ -3,8 +3,8 @@
overlay chrome://komodo/content/komodo.xul chrome://sciviewsk/content/RBrowserOverlay.xul
# Those two items are not finished yet, and are thus commented out
-#overlay chrome://komodo/content/komodo.xul chrome://sciviewsk/content/rconsole.xul
-#overlay chrome://komodo/content/pref/pref.xul chrome://sciviewsk/content/prefsOverlay.xul
+overlay chrome://komodo/content/komodo.xul chrome://sciviewsk/content/rconsole.xul
+overlay chrome://komodo/content/pref/pref.xul chrome://sciviewsk/content/prefsOverlay.xul
locale sciviewsk en-GB jar:sciviewsk.jar!/locale/en-GB/
locale sciviewsk fr-FR jar:sciviewsk.jar!/locale/fr-FR/
Modified: komodo/SciViews-K/content/pref-R.xul
===================================================================
--- komodo/SciViews-K/content/pref-R.xul 2009-07-10 08:33:13 UTC (rev 152)
+++ komodo/SciViews-K/content/pref-R.xul 2009-07-15 13:38:10 UTC (rev 153)
@@ -55,6 +55,12 @@
<script src="chrome://komodo/content/library/windowManager.js" type="application/x-javascript"/>
<script src="chrome://sciviewsk/content/js/prefs-R.js" type="application/x-javascript"/>
+ <box class="kobox-smallheader" title="R configuration"/>
+
+ <description>
+ For these changes to take effect, you have to close and restart R.
+ </description>
+
<groupbox orient="vertical">
<caption label="Default R Interpreter"/>
<text value="Use this interpreter:" style="padding: 2px 6px 2px 6px"/>
Modified: komodo/SciViews-K/content/prefsOverlay.xul
===================================================================
--- komodo/SciViews-K/content/prefsOverlay.xul 2009-07-10 08:33:13 UTC (rev 152)
+++ komodo/SciViews-K/content/prefsOverlay.xul 2009-07-15 13:38:10 UTC (rev 153)
@@ -38,19 +38,19 @@
<!DOCTYPE overlay PUBLIC "-//MOZILLA//DTD XUL V1.0//EN" "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<?xml-stylesheet href="chrome://komodo/skin/global/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://komodo/skin/bindings/buttons.css" type="text/css"?>
-<?xml-stylesheet href="chrome://komodo/skin/bindings/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://komodo/skin/bindings/listbox.css" type="text/css"?>
+<?xml-stylesheet href="chrome://komodo/skin/global/global.css" type="text/css"?>
<overlay id="SciViewsPrefsOverlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- <treechildren container="false" id="languagesChildren">
- <treeitem container="false" id="RItem">
- <treerow>
- <treecell class="treecell-indent"
- url="chrome://sciviewsk/content/pref-R.xul"
- label="R"/>
- </treerow>
- </treeitem>
- </treechildren>
+ <treeitem id="uiSettingsItem" container="true">
+ <treechildren container="false" id="languagesChildren">
+ <treeitem container="false" id="RItem">
+ <treerow>
+ <treecell class="treecell-indent"
+ url="chrome://sciviewsk/content/pref-R.xul"
+ label="R"/>
+ </treerow>
+ </treeitem>
+ </treechildren>
+ </treeitem>
</overlay>
Modified: komodo/SciViews-K/sciviewsk-0.8.0-ko.xpi
===================================================================
(Binary files differ)
Modified: komodo/SciViews-K Unit/sciviewskunit-0.7.0-ko.xpi
===================================================================
(Binary files differ)
Modified: pkg/svSweave/DESCRIPTION
===================================================================
--- pkg/svSweave/DESCRIPTION 2009-07-10 08:33:13 UTC (rev 152)
+++ pkg/svSweave/DESCRIPTION 2009-07-15 13:38:10 UTC (rev 153)
@@ -3,8 +3,8 @@
Imports: utils
Depends: R (>= 2.6.0)
Description: Supporting functions for the GUI API (Sweave functions)
-Version: 0.9-0
-Date: 2009-06-15
+Version: 0.9-1
+Date: 2009-07-14
Author: Philippe Grosjean
Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
License: GPL (>= 2)
Modified: pkg/svSweave/NEWS
===================================================================
--- pkg/svSweave/NEWS 2009-07-10 08:33:13 UTC (rev 152)
+++ pkg/svSweave/NEWS 2009-07-15 13:38:10 UTC (rev 153)
@@ -1,5 +1,8 @@
= svSweave News
-== Changes in svMisc 0.9-0
+== Changes in svSweave 0.9-1
+* The LaTeX command for our chunks is renamed from \Rchunk{} to \rchunk{}
+== Changes in svSweave 0.9-0
+
This is the first version distributed on R-forge.
Modified: pkg/svSweave/R/cleanLyxRnw.R
===================================================================
--- pkg/svSweave/R/cleanLyxRnw.R 2009-07-10 08:33:13 UTC (rev 152)
+++ pkg/svSweave/R/cleanLyxRnw.R 2009-07-15 13:38:10 UTC (rev 153)
@@ -4,11 +4,11 @@
Rnw <- readLines(RnwCon)
# If the Rnw file is produced with LyX and SciViews Sweave module, chunks are
- # separated by \Rchunk{<<[pars]>>= ... @}
+ # separated by \rchunk{<<[pars]>>= ... @}
# Beginning of R-Chunks (rewrite into <<[pars]>>=)
- starts <- grepl("^\\\\Rchunk\\{<<.*>>=$", Rnw)
- Rnw[starts] <- sub("^\\\\Rchunk\\{", "", Rnw[starts])
+ starts <- grepl("^\\\\rchunk\\{<<.*>>=$", Rnw)
+ Rnw[starts] <- sub("^\\\\rchunk\\{", "", Rnw[starts])
# End of R-Chunks (rewrite as @)
ends <- grepl("^@[ \t]*\\}$", Rnw)
Modified: pkg/svSweave/man/cleanLyxRnw.Rd
===================================================================
--- pkg/svSweave/man/cleanLyxRnw.Rd 2009-07-10 08:33:13 UTC (rev 152)
+++ pkg/svSweave/man/cleanLyxRnw.Rd 2009-07-15 13:38:10 UTC (rev 153)
@@ -1,9 +1,9 @@
\name{cleanLyxRnw}
\alias{cleanLyxRnw}
-\title{ Clean up R noweb files produced by LyX with SciViews Sweave extension }
+\title{ Clean up R noweb files produced by LyX with SciViews Sweave module }
\description{
- The SciViews-LyX extension defines \code{Rchunk} commands to contain
+ The SciViews-LyX extension defines \code{rchunk} commands to contain
R chunks (embedded R code processed by Sweave). Unfortunately, LyX use to
write two line feed for each line of code, introducing extra lines in the R
chunks. Moreover, tabulations are interpreted as 8 spaces, while R code use
More information about the Sciviews-commits
mailing list