[Sciviews-commits] r100 - komodo/SciViews-K komodo/SciViews-K/content komodo/SciViews-K/content/js komodo/SciViews-K/content/js/tools komodo/SciViews-K/locale/en-GB komodo/SciViews-K/locale/fr-FR pkg/svMisc pkg/svMisc/R pkg/svMisc/inst/po/fr/LC_MESSAGES pkg/svMisc/man pkg/svMisc/po pkg/svUnit/inst/doc
noreply at r-forge.r-project.org
noreply at r-forge.r-project.org
Thu Jan 22 16:43:22 CET 2009
Author: phgrosjean
Date: 2009-01-22 16:43:22 +0100 (Thu, 22 Jan 2009)
New Revision: 100
Modified:
komodo/SciViews-K/content/js/robjects.js
komodo/SciViews-K/content/js/tools/io.js
komodo/SciViews-K/content/overlay.xul
komodo/SciViews-K/install.rdf
komodo/SciViews-K/locale/en-GB/sciviewsk.dtd
komodo/SciViews-K/locale/fr-FR/sciviewsk.dtd
komodo/SciViews-K/sciviewsk-0.6.5-ko.xpi
pkg/svMisc/DESCRIPTION
pkg/svMisc/NAMESPACE
pkg/svMisc/NEWS
pkg/svMisc/R/Complete.R
pkg/svMisc/R/CompletePlus.R
pkg/svMisc/TODO
pkg/svMisc/inst/po/fr/LC_MESSAGES/R-svMisc.mo
pkg/svMisc/man/objBrowse.Rd
pkg/svMisc/po/R-fr.po
pkg/svMisc/po/R-svMisc.pot
pkg/svUnit/inst/doc/svUnit.lyx
Log:
Cleanup of svMisc package for submitting to CRAN + a couple of other details
Modified: komodo/SciViews-K/content/js/robjects.js
===================================================================
--- komodo/SciViews-K/content/js/robjects.js 2009-01-22 15:02:20 UTC (rev 99)
+++ komodo/SciViews-K/content/js/robjects.js 2009-01-22 15:43:22 UTC (rev 100)
@@ -806,8 +806,6 @@
rObjectsTree.displayPackageList(refreshObjects);
};
-
-
rObjectsTree.toggleViewSearchPath = function(event) {
var what = event.target.tagName;
var broadcaster = document.getElementById("cmd_robjects_viewSearchPath");
@@ -830,7 +828,6 @@
}
}
-
// Display the list of packages in the search path
rObjectsTree.displayPackageList = function(refreshObjects) {
var pack;
@@ -859,7 +856,6 @@
rObjectsTree.refreshAll();
};
-
// Change the display status of a package by clicking an item in the list
rObjectsTree.packageSelectedEvent = function(event) {
var el = event.target;
@@ -872,7 +868,6 @@
//print(el.checked);
};
-
rObjectsTree.refreshAll = function () {
var selectedPackages = new Array(rObjectsTree.treeData.length);
for (var i = 0; i < selectedPackages.length; i++)
@@ -1010,7 +1005,6 @@
scimoz.insertText(scimoz.currentPos, namesArr.join(', '));
}
-
rObjectsTree.setFilterBy = function(menuItem, column) {
var filterBy = ['name', 'dims', 'class', 'group', 'fullName'].indexOf(column);
if (filterBy == -1)
@@ -1059,8 +1053,6 @@
}
}
-
-
rObjectsTree.do = function(action) {
var obj = [];
var rows = rObjectsTree.getSelectedRows();
@@ -1111,8 +1103,6 @@
//scimoz.insertText(scimoz.currentPos, res.join(";" + ["\r\n", "\n", "\r"][scimoz.eOLMode]));
}
-
-
rObjectsTree.onEvent = function(event) {
if (event.type == "keypress") {
var keyCode = event.keyCode;
@@ -1164,7 +1154,6 @@
return;
}
-
// default action: insert selected names:
rObjectsTree.insertName(event.ctrlKey);
event.originalTarget.focus();
@@ -1172,21 +1161,21 @@
// drag & drop handling for search paths list
rObjectsTree.packageListObserver = {
-onDrop : function (event, transferData, session) {
- window.temp = transferData;
- var data = transferData;
- var path;
- if (transferData.flavour.contentType == "application/x-moz-file") {
- path = transferData.data.path;
- } else if (transferData.flavour.contentType == "text/unicode") {
- path = new String(transferData.data).trim();
- }
- if (path.search(/\.RData$/i) > 0) {
- //sv.cmdout.append(path);
- sv.r.loadWorkspace(path, true);
- rObjectsTree.getPackageList();
- }
- },
+ onDrop : function (event, transferData, session) {
+ window.temp = transferData;
+ var data = transferData;
+ var path;
+ if (transferData.flavour.contentType == "application/x-moz-file") {
+ path = transferData.data.path;
+ } else if (transferData.flavour.contentType == "text/unicode") {
+ path = new String(transferData.data).trim();
+ }
+ if (path.search(/\.RData$/i) > 0) {
+ //sv.cmdout.append(path);
+ sv.r.loadWorkspace(path, true);
+ rObjectsTree.getPackageList();
+ }
+ },
onDragEnter : function(event, flavour, session) {
var s = "";
@@ -1196,19 +1185,16 @@
sv.cmdout.append(s);
},
+ onDragOver : function(event, flavour, session) {
+ session.canDrop = flavour.contentType == 'text/unicode' || flavour.contentType == 'application/x-moz-file';
+ },
-
- onDragOver : function(event, flavour, session) {
- session.canDrop = flavour.contentType == 'text/unicode' || flavour.contentType == 'application/x-moz-file';
- },
-
-
- getSupportedFlavours : function () {
- var flavours = new FlavourSet();
- flavours.appendFlavour("application/x-moz-file","nsIFile");
- flavours.appendFlavour("text/unicode");
- return flavours;
- }
+ getSupportedFlavours : function () {
+ var flavours = new FlavourSet();
+ flavours.appendFlavour("application/x-moz-file","nsIFile");
+ flavours.appendFlavour("text/unicode");
+ return flavours;
+ }
}
rObjectsTree.packageListKeyEvent = function(event) {
Modified: komodo/SciViews-K/content/js/tools/io.js
===================================================================
--- komodo/SciViews-K/content/js/tools/io.js 2009-01-22 15:02:20 UTC (rev 99)
+++ komodo/SciViews-K/content/js/tools/io.js 2009-01-22 15:43:22 UTC (rev 100)
@@ -1,12 +1,17 @@
-// input/output wrappers:
-//sv.io.readfile(filename, encoding))
-//sv.io.writefile(filename, content, encoding, append)
+// SciViews-K functions
+// Various functions for input/output
+// by Kamil Barton
+////////////////////////////////////////////////////////////////////////////////
+// sv.io.defaultEncoding // Encoding in use currently
+// sv.io.readfile(filename, encoding); // Read a file with encoding
+// sv.io.writefile(filename, content, encoding, append);
+ // Write in a file with encoding
+////////////////////////////////////////////////////////////////////////////////
// Define the 'sv.io' namespace
if (typeof(sv.io) == 'undefined') sv.io = new Object();
-
sv.io.defaultEncoding = "latin1";
sv.io.readfile = function(filename, encoding) {
@@ -22,7 +27,6 @@
.createInstance(Components.interfaces.nsIConverterInputStream);
try {
-
file.initWithPath(filename);
fis.init(file, -1, -1, 0);
is.init(fis, encoding, 1024, 0xFFFD);
@@ -47,7 +51,6 @@
}
sv.io.writefile = function(filename, content, encoding, append) {
-
if (!encoding)
encoding = sv.io.defaultEncoding;
@@ -62,10 +65,10 @@
var os = Components.classes["@mozilla.org/intl/converter-output-stream;1"]
.createInstance(Components.interfaces.nsIConverterOutputStream);
- //PR_CREATE_FILE = 0x08;
- //PR_WRONLY 0x02
- //PR_APPEND 0x10
- //PR_TRUNCATE 0x20
+ //PR_CREATE_FILE = 0x08
+ //PR_WRONLY = 0x02
+ //PR_APPEND = 0x10
+ //PR_TRUNCATE = 0x20
try {
file.initWithPath(filename);
@@ -79,5 +82,4 @@
finally {
os.close();
}
-
}
Modified: komodo/SciViews-K/content/overlay.xul
===================================================================
--- komodo/SciViews-K/content/overlay.xul 2009-01-22 15:02:20 UTC (rev 99)
+++ komodo/SciViews-K/content/overlay.xul 2009-01-22 15:43:22 UTC (rev 100)
@@ -20,6 +20,7 @@
Contributor(s):
Philippe Grosjean
Romain Francois
+ Kamil Barton
ActiveState Software Inc
Alternatively, the contents of this file may be used under the terms of
Modified: komodo/SciViews-K/install.rdf
===================================================================
--- komodo/SciViews-K/install.rdf 2009-01-22 15:02:20 UTC (rev 99)
+++ komodo/SciViews-K/install.rdf 2009-01-22 15:43:22 UTC (rev 100)
@@ -41,7 +41,7 @@
<Description about="urn:mozilla:install-manifest">
<em:id>sciviewsk at sciviews.org</em:id>
<em:name>SciViews-K</em:name>
- <em:version>0.6.5</em:version>
+ <em:version>0.7.0</em:version>
<em:description>SciViews-K - Edit R (http://www.r-project.org) code in Komodo</em:description>
<em:creator>Philippe Grosjean and Romain Francois</em:creator>
<em:homepageURL>http://sciviews.org/SciViews-K</em:homepageURL>
@@ -52,7 +52,7 @@
<!-- Komodo IDE's uuid -->
<em:id>{36E66FA0-F259-11D9-850E-000D935D3368}</em:id>
<em:minVersion>4.1</em:minVersion>
- <em:maxVersion>4.4.*</em:maxVersion>
+ <em:maxVersion>5.0.*</em:maxVersion>
</Description>
</em:targetApplication>
<em:targetApplication>
@@ -60,7 +60,7 @@
<!-- Komodo Edit's uuid -->
<em:id>{b1042fb5-9e9c-11db-b107-000d935d3368}</em:id>
<em:minVersion>4.1</em:minVersion>
- <em:maxVersion>4.4.*</em:maxVersion>
+ <em:maxVersion>5.0.*</em:maxVersion>
</Description>
</em:targetApplication>
</Description>
Modified: komodo/SciViews-K/locale/en-GB/sciviewsk.dtd
===================================================================
--- komodo/SciViews-K/locale/en-GB/sciviewsk.dtd 2009-01-22 15:02:20 UTC (rev 99)
+++ komodo/SciViews-K/locale/en-GB/sciviewsk.dtd 2009-01-22 15:43:22 UTC (rev 100)
@@ -1,3 +1,20 @@
+<!ENTITY sciviews.console.tab "R Console">
+<!ENTITY sciviews.console.tip "R Console">
+<!ENTITY sciviews.console.history.filter.tip "Filter the history with a regular expression">
+
+<!ENTITY sciviews.rconsole.completion.cb.arguments "arguments">
+<!ENTITY sciviews.rconsole.completion.cb.functions "functions">
+<!ENTITY sciviews.rconsole.completion.cb.packages "packages">
+<!ENTITY sciviews.rconsole.completion.cb.history "history">
+
+<!ENTITY sciviews.rconsole.completion.cb.arguments.tip "Display function arguments">
+<!ENTITY sciviews.rconsole.completion.cb.functions.tip "Display functions">
+<!ENTITY sciviews.rconsole.completion.cb.packages.tip "Display packages">
+<!ENTITY sciviews.rconsole.completion.cb.history.tip "Display command history">
+
+<!ENTITY sciviews.rconsole.completion.settings.label "Settings">
+<!ENTITY sciviews.rconsole.completion.settings.tip "Select which completions are displayed">
+
<!ENTITY sciviews.robjects.tab "R Objects">
<!ENTITY sciviews.robjects.tip "R objects explorer">
<!ENTITY sciviews.robjects.refresh "Refresh">
@@ -10,38 +27,22 @@
<!ENTITY sciviews.robjects.Group "Group">
<!ENTITY sciviews.robjects.Class "Class">
<!ENTITY sciviews.robjects.FullName "Full name">
-<!ENTITY sciviews.console.tab "R Console" >
-<!ENTITY sciviews.console.tip "R Console" >
-<!ENTITY sciviews.console.history.filter.tip "Filter the history with a regular expression" >
-<!ENTITY sciviews.rconsole.completion.cb.arguments "arguments" >
-<!ENTITY sciviews.rconsole.completion.cb.functions "functions" >
-<!ENTITY sciviews.rconsole.completion.cb.packages "packages" >
-<!ENTITY sciviews.rconsole.completion.cb.history "history" >
+<!ENTITY sciviews.robjects.insName "Insert name into text">
+<!ENTITY sciviews.robjects.insFullName "Insert full name into text">
+<!ENTITY sciviews.robjects.rmObj "Remove objects">
+<!ENTITY sciviews.robjects.loadPkg "Load package">
+<!ENTITY sciviews.robjects.detach "Detach package">
+<!ENTITY sciviews.robjects.clrFilter "Clear filter text">
+<!ENTITY sciviews.robjects.filterByDims "Filter dimensions">
+<!ENTITY sciviews.robjects.filterByGroup "Filter group">
+<!ENTITY sciviews.robjects.filterByClass "Filter class">
+<!ENTITY sciviews.robjects.filterByName "Filter name">
+<!ENTITY sciviews.robjects.help "Help">
+<!ENTITY sciviews.robjects.names "Names">
+<!ENTITY sciviews.robjects.str "Structure">
+<!ENTITY sciviews.robjects.plot "Plot">
+<!ENTITY sciviews.robjects.print "Print">
+<!ENTITY sciviews.robjects.summary "Summary">
-<!ENTITY sciviews.rconsole.completion.cb.arguments.tip "Display function arguments" >
-<!ENTITY sciviews.rconsole.completion.cb.functions.tip "Display functions" >
-<!ENTITY sciviews.rconsole.completion.cb.packages.tip "Display packages" >
-<!ENTITY sciviews.rconsole.completion.cb.history.tip "Display command history" >
-
-<!ENTITY sciviews.rconsole.completion.settings.label "Settings" >
-<!ENTITY sciviews.rconsole.completion.settings.tip "Select which completions are displayed" >
-
-<!ENTITY sciviews.robjects.insName "Insert name into text" >
-<!ENTITY sciviews.robjects.insFullName "Insert full name into text" >
-<!ENTITY sciviews.robjects.rmObj "Remove objects" >
-<!ENTITY sciviews.robjects.loadPkg "Load package" >
-<!ENTITY sciviews.robjects.detach "Detach package" >
-<!ENTITY sciviews.robjects.clrFilter "Clear filter text" >
-<!ENTITY sciviews.robjects.filterByDims "Filter dimensions" >
-<!ENTITY sciviews.robjects.filterByGroup "Filter group" >
-<!ENTITY sciviews.robjects.filterByClass "Filter class" >
-<!ENTITY sciviews.robjects.filterByName "Filter name" >
-<!ENTITY sciviews.robjects.help "Help" >
-<!ENTITY sciviews.robjects.names "Names" >
-<!ENTITY sciviews.robjects.str "Structure" >
-<!ENTITY sciviews.robjects.plot "Plot" >
-<!ENTITY sciviews.robjects.print "Print" >
-<!ENTITY sciviews.robjects.summary "Summary" >
-
-<!ENTITY sciviews.robjects.filterEmptyText "Filter objects..." >
+<!ENTITY sciviews.robjects.filterEmptyText "Filter objects...">
Modified: komodo/SciViews-K/locale/fr-FR/sciviewsk.dtd
===================================================================
--- komodo/SciViews-K/locale/fr-FR/sciviewsk.dtd 2009-01-22 15:02:20 UTC (rev 99)
+++ komodo/SciViews-K/locale/fr-FR/sciviewsk.dtd 2009-01-22 15:43:22 UTC (rev 100)
@@ -1,3 +1,20 @@
+<!ENTITY sciviews.console.tab "Console R">
+<!ENTITY sciviews.console.tip "Console R">
+<!ENTITY sciviews.console.history.filter.tip "Filtrer l'historique des commandes">
+
+<!ENTITY sciviews.rconsole.completion.cb.arguments "arguments">
+<!ENTITY sciviews.rconsole.completion.cb.functions "fonctions">
+<!ENTITY sciviews.rconsole.completion.cb.packages "packages">
+<!ENTITY sciviews.rconsole.completion.cb.history "historique">
+
+<!ENTITY sciviews.rconsole.completion.cb.arguments.tip "Afficher les arguments de fonctions">
+<!ENTITY sciviews.rconsole.completion.cb.functions.tip "Afficher les fonctions">
+<!ENTITY sciviews.rconsole.completion.cb.packages.tip "Afficher les packages">
+<!ENTITY sciviews.rconsole.completion.cb.history.tip "Afficher les commandes de l'historique">
+
+<!ENTITY sciviews.rconsole.completion.settings.label "Reglages">
+<!ENTITY sciviews.rconsole.completion.settings.tip "Choix du type de completions affichees">
+
<!ENTITY sciviews.robjects.tab "R Objects">
<!ENTITY sciviews.robjects.tip "Explorateur d'objets R">
<!ENTITY sciviews.robjects.refresh "RŽactualiser">
@@ -10,38 +27,22 @@
<!ENTITY sciviews.robjects.Group "Groupe">
<!ENTITY sciviews.robjects.Class "Classe">
<!ENTITY sciviews.robjects.FullName "Full name">
-<!ENTITY sciviews.console.tab "Console R" >
-<!ENTITY sciviews.console.tip "Console R" >
-<!ENTITY sciviews.console.history.filter.tip "Filtrer l'historique des commandes" >
-<!ENTITY sciviews.rconsole.completion.cb.arguments "arguments" >
-<!ENTITY sciviews.rconsole.completion.cb.functions "fonctions" >
-<!ENTITY sciviews.rconsole.completion.cb.packages "packages" >
-<!ENTITY sciviews.rconsole.completion.cb.history "historique" >
-
-<!ENTITY sciviews.rconsole.completion.cb.arguments.tip "Afficher les arguments de fonctions" >
-<!ENTITY sciviews.rconsole.completion.cb.functions.tip "Afficher les fonctions" >
-<!ENTITY sciviews.rconsole.completion.cb.packages.tip "Afficher les packages" >
-<!ENTITY sciviews.rconsole.completion.cb.history.tip "Afficher les commandes de l'historique" >
-
-<!ENTITY sciviews.rconsole.completion.settings.label "Reglages" >
-<!ENTITY sciviews.rconsole.completion.settings.tip "Choix du type de completions affichees" >
-
-<!ENTITY sciviews.robjects.insName "Insert name into text" >
-<!ENTITY sciviews.robjects.insFullName "Insert full name into text" >
-<!ENTITY sciviews.robjects.rmObj "Remove objects" >
-<!ENTITY sciviews.robjects.loadPkg "Load package" >
-<!ENTITY sciviews.robjects.detach "Detach package" >
-<!ENTITY sciviews.robjects.clrFilter "Clear filter text" >
-<!ENTITY sciviews.robjects.filterByDims "Filter dimensions" >
-<!ENTITY sciviews.robjects.filterByGroup "Filter group" >
-<!ENTITY sciviews.robjects.filterByClass "Filter class" >
-<!ENTITY sciviews.robjects.filterByName "Filter name" >
-<!ENTITY sciviews.robjects.help "Help" >
-<!ENTITY sciviews.robjects.names "Names" >
+<!ENTITY sciviews.robjects.insName "Inserer le nom dans le texte">
+<!ENTITY sciviews.robjects.insFullName "Inserer le nom complet dans le texte">
+<!ENTITY sciviews.robjects.rmObj "Effacer les objets">
+<!ENTITY sciviews.robjects.loadPkg "Charger un package" >
+<!ENTITY sciviews.robjects.detach "Detacher un package">
+<!ENTITY sciviews.robjects.clrFilter "Effacer les criteres de filtration">
+<!ENTITY sciviews.robjects.filterByDims "Filtrer les dimensions">
+<!ENTITY sciviews.robjects.filterByGroup "Filtrer les groupes">
+<!ENTITY sciviews.robjects.filterByClass "Filtrer les classes">
+<!ENTITY sciviews.robjects.filterByName "Filter les noms" >
+<!ENTITY sciviews.robjects.help "Aide" >
+<!ENTITY sciviews.robjects.names "Noms" >
<!ENTITY sciviews.robjects.str "Structure" >
-<!ENTITY sciviews.robjects.plot "Plot" >
-<!ENTITY sciviews.robjects.print "Print" >
-<!ENTITY sciviews.robjects.summary "Summary" >
+<!ENTITY sciviews.robjects.plot "Graphique" >
+<!ENTITY sciviews.robjects.print "Imprimer" >
+<!ENTITY sciviews.robjects.summary "Resume" >
-<!ENTITY sciviews.robjects.filterEmptyText "Filter objects..." >
\ No newline at end of file
+<!ENTITY sciviews.robjects.filterEmptyText "Filtrer les objets..." >
\ No newline at end of file
Modified: komodo/SciViews-K/sciviewsk-0.6.5-ko.xpi
===================================================================
(Binary files differ)
Modified: pkg/svMisc/DESCRIPTION
===================================================================
--- pkg/svMisc/DESCRIPTION 2009-01-22 15:02:20 UTC (rev 99)
+++ pkg/svMisc/DESCRIPTION 2009-01-22 15:43:22 UTC (rev 100)
@@ -3,9 +3,9 @@
Imports: utils, methods
Depends: R (>= 2.6.0)
Description: Supporting functions for the GUI API (various utilitary functions)
-Version: 0.9.48
-Date: 2008-11-19
-Author: Philippe Grosjean
+Version: 0.9.46
+Date: 2009-01-22
+Author: Philippe Grosjean, Romain Francois & Kamil Barton
Maintainer: Philippe Grosjean <phgrosjean at sciviews.org>
License: GPL (>= 2)
URL: http://www.sciviews.org/SciViews-R
Modified: pkg/svMisc/NAMESPACE
===================================================================
--- pkg/svMisc/NAMESPACE 2009-01-22 15:02:20 UTC (rev 99)
+++ pkg/svMisc/NAMESPACE 2009-01-22 15:43:22 UTC (rev 100)
@@ -55,5 +55,5 @@
TempEnv,
tempvar,
write.objList)
-S3method( print, objList )
+S3method(print, objList)
Modified: pkg/svMisc/NEWS
===================================================================
--- pkg/svMisc/NEWS 2009-01-22 15:02:20 UTC (rev 99)
+++ pkg/svMisc/NEWS 2009-01-22 15:43:22 UTC (rev 100)
@@ -1,9 +1,22 @@
= svMisc News
+== Changes in svMisc 0.9-46
+
+* Added objList(), print() method for 'objList' objects and write.objList() (KB)
+
+* Localisation complete and French local file done
+
+
== Changes in svMisc 0.9-45
-* Made compatible with R 2.6.x
+* Made backward compatible with R 2.6.0 (was R >= 2.7.0 in previous version)
+* captureAll() is reworked by Kamil Barton (KB). Debugging code eliminated (data
+ saved in .GlobalEnv for debugging)
+
+* Error handler added to captureAll() - KB.
+
+
== Changes in svMisc 0.9-44
* CompletePlus() reworked to use man pages instead of .Rd files
Modified: pkg/svMisc/R/Complete.R
===================================================================
--- pkg/svMisc/R/Complete.R 2009-01-22 15:02:20 UTC (rev 99)
+++ pkg/svMisc/R/Complete.R 2009-01-22 15:43:22 UTC (rev 100)
@@ -1,14 +1,14 @@
"Complete" <-
function(code, givetype = FALSE, sep = "\t") {
### TODO: implement 'givetype'!
-
+
# Get a completion list, given a part of the code
code <- paste(as.character(code), collapse = "\n")
if (is.null(code) || length(code) == 0 || code == "") return("")
-
+
# Use the internal win32consoleCompletion function in utils package
res <- utils:::.win32consoleCompletion(code, nchar(code))
-
+
# Is there a single addition?
if (res$addition != "") {
res <- paste(sep, gsub("=", " = ", res$addition), sep = "")
@@ -22,5 +22,5 @@
return("")
} else {
return(res)
- }
+ }
}
Modified: pkg/svMisc/R/CompletePlus.R
===================================================================
--- pkg/svMisc/R/CompletePlus.R 2009-01-22 15:02:20 UTC (rev 99)
+++ pkg/svMisc/R/CompletePlus.R 2009-01-22 15:43:22 UTC (rev 100)
@@ -47,7 +47,7 @@
out[test.arg, 2] <- fguess
out[test.arg, 3] <- descArgs(fguess, arg, pack)
}
- }
+ }
### deal with completions with "$"
if (length(test.dollar <- grep("\\$", comps))) {
@@ -58,7 +58,7 @@
out[ test.dollar, 2 ] <- pack
out[ test.dollar, 3 ] <- descData( object, after, package = pack )
}
-
+
### deal with completions with "@"
if( length(test.slot <- grep("@", comps)) ){
elements <- comps[ test.dollar ]
@@ -68,14 +68,14 @@
out[ test.dollar, 2 ] <- pack
out[ test.dollar, 3 ] <- descSlots( object, slots, package = pack )
}
-
+
### deal with completions with "["
if( length(test.square <- grep("\\[", comps)) ){
elements <- comps[ test.square ]
out[ test.square, 2 ] <- ""
out[ test.square, 3 ] <- descSquare( elements, package = pack )
}
-
+
### TODO: do not know what to do with these
test.others <- grep(" ", comps)
# TODO: are there other kind of completions I miss here
@@ -97,7 +97,7 @@
out[, 3] <- gsub("\t", " ", out[, 3])
out[, 3] <- gsub("\n", " ", out[, 3])
-
+
# Make sure that arguments are witten 'arg = ', and not 'arg='
out[, 1] <- sub("=$", " = ", out[, 1])
@@ -123,5 +123,3 @@
names(out) <- what
sub( "^package:", "", out )
}
-
-
Modified: pkg/svMisc/TODO
===================================================================
--- pkg/svMisc/TODO 2009-01-22 15:02:20 UTC (rev 99)
+++ pkg/svMisc/TODO 2009-01-22 15:43:22 UTC (rev 100)
@@ -19,5 +19,3 @@
* objMenu(): add copy name to clipboard, send name to editor in menu
* Use RShowDoc() to access further R documentation.
-
-* Translate completely this package
Modified: pkg/svMisc/inst/po/fr/LC_MESSAGES/R-svMisc.mo
===================================================================
(Binary files differ)
Modified: pkg/svMisc/man/objBrowse.Rd
===================================================================
--- pkg/svMisc/man/objBrowse.Rd 2009-01-22 15:02:20 UTC (rev 99)
+++ pkg/svMisc/man/objBrowse.Rd 2009-01-22 15:43:22 UTC (rev 100)
@@ -33,9 +33,6 @@
\method{print}{objList}(x, sep = "\t", eol = "\n", header = !attr(x, "all.info"), \dots)
write.objList(x, path, sep = "\t", \dots)
-
-
-
}
\arguments{
@@ -89,7 +86,8 @@
is returned invisibly.
}
-\author{Philippe Grosjean (\email{phgrosjean at sciviews.org})}
+\author{Philippe Grosjean (\email{phgrosjean at sciviews.org}) and
+ Kamil Barton (\email{kbarton at zbs.bialowieza.pl})}
\seealso{ \code{\link{Complete}}, \code{\link{CallTip}} }
Modified: pkg/svMisc/po/R-fr.po
===================================================================
--- pkg/svMisc/po/R-fr.po 2009-01-22 15:02:20 UTC (rev 99)
+++ pkg/svMisc/po/R-fr.po 2009-01-22 15:43:22 UTC (rev 100)
@@ -1,92 +1,324 @@
# Translation of R-tcltk.pot to French
# Copyright (C) 2005 The R Foundation
-# This file is distributed under the same license as the tcltk R package.
-# Philippe Grosjean <phgrosjean at sciviews.org>, 2005.
+# This file is distributed under the same license as the svMisc R package.
+# Philippe Grosjean <phgrosjean at sciviews.org>, 2005-2009.
#
msgid ""
msgstr ""
-"Project-Id-Version: R 2.5.0\n"
+"Project-Id-Version: R 2.6.0\n"
"Report-Msgid-Bugs-To: bugs at r-project.org\n"
-"POT-Creation-Date: 2007-07-24 17:04\n"
-"PO-Revision-Date: 2007-07-24 17:25+0100\n"
+"POT-Creation-Date: 2009-01-22 15:56\n"
+"PO-Revision-Date: 2009-01-22 16:33+0100\n"
"Last-Translator: Philippe Grosjean <phgrosjean at sciviews.org>\n"
"Language-Team: French <R-core at r-project.org>\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-msgid "Package or bundle '%s' was not found in %s. Would you like to install it now?"
-msgstr "Le package ou le bundle '%s' est introuvable dans %s. Voulez-vous l'installer maintenant ?"
+msgid "'obj' should inherit from 'list'"
+msgstr "'obj' doit un objet 'list'"
-msgid "Missing package or bundle '%s' was neither installed nor loaded"
-msgstr "Package ou bundle '%s' manquant non installé, ni chargé"
+msgid "Data you add in actions must be a named character vector"
+msgstr "Les données que vous ajoutez dans les actions doivent être des vecteurs de chaînes de caractères nommées"
-msgid "Local Repository"
-msgstr "Entrepot local"
+msgid "'obj' should inherit from 'character'"
+msgstr "'obj' doit être un objet 'character'"
-msgid "Local Zip File"
-msgstr "Fichier zip local"
+msgid "Icons map you add must be a named character vector"
+msgstr "Le mappage des icônes que vous ajoutez doit être un vecteur de chaînes de caractères nommées"
-msgid "Select the directory PACKAGES description file"
-msgstr "Sélectionnez le fichier de description PACKAGES"
+msgid "must be a list!"
+msgstr "doit être une liste!"
-msgid "Packages description"
-msgstr "Description de packages"
+msgid "'type' could be only 'google', 'archive' or 'wiki', currently!"
+msgstr "'type' ne peut être que 'google', 'archive' ou 'wiki', pour l'instant !"
-msgid "file:"
-msgstr "fichier :"
+msgid "'f' must ba a character string!"
+msgstr "'f' doit être une chaîne de caractères !"
+msgid "Impossible to create the Object Browser 'path' directory!"
+msgstr "Impossible de créer le répertoire pour lexplorateur d'objets"
+
+msgid "'value' must be numeric!"
+msgstr "'value' doit être numérique !"
+
+msgid "'max.value' must be numeric or NULL!"
+msgstr "'max.value' doit être numérique ou NULL !"
+
+msgid "Progress:"
+msgstr "Progression :"
+
+msgid "on"
+msgstr "sur"
+
+msgid "'x' must be character string(s)!"
+msgstr "'x' doit une chaîne de caractères, ou un vecteur de chaînes de caractères !"
+
msgid ""
-"The repository '%s' does not appear to be a valid repository.\n"
-"Would you like to try another repository?"
+"Load...\n"
+"Load R objects"
msgstr ""
-"L'entrepot '%s' ne semble pas être un entrepot valide.\n"
-"Voulez-vous essayer un autre entrepot ?"
+"Charger...\n"
+"Charger des objets R : load()"
msgid ""
-"The package '%s' was not found in the selected repository (%s).\n"
-"Would you like to try another repository?"
+"Source...\n"
+"Source R code"
msgstr ""
-"Le package '%s' est introuvable dans l'entrepot sélectionné (%s).\n"
-"Voulez-vous essayer un autre entrepot ?"
+"Sourcer...\n"
+"Sourcer du code R : source()"
-msgid "The selected file name does not contain the package name '%s'. Would you like to select a different file instead?"
-msgstr "Le fichier sélectionné ne contient pas le package '%s'. Voulez-vous sélectionner un autre fichier à la place ?"
+msgid ""
+"Save as...\n"
+"Save to a file"
+msgstr ""
+"Sauver sous...\n"
+"Sauver dans un fichier"
-msgid "The selected file name does not end with '.zip'. Would you like to select a different file instead?"
-msgstr "Le fichier sélectionné n'a pas une extension '.zip'. Voulez-vous sélectionner un autre fichier à la la place ?"
+msgid ""
+"Import...\n"
+"Import data in R"
+msgstr ""
+"Importer...\n"
+"Importer des données dans R : import()"
-msgid "The package or bundle was not found on %s"
-msgstr "Le package ou bundle est introuvable dans %s"
+msgid ""
+"Export...\n"
+"Export data to a file"
+msgstr ""
+"Exporter...\n"
+"Exporter des données vers un fichier : export()"
-msgid "Impossible to send the command: %s"
-msgstr "Impossible d'envoyer la commande : %s"
+msgid ""
+"Report...\n"
+"Prepare a report for this object"
+msgstr ""
+"Reporter...\n"
+"Preparer un rapport pour cet objet : report()"
-msgid "bad argument"
-msgstr "argument erroné"
+msgid ""
+"Set Working dir...\n"
+"Change current R working directory"
+msgstr ""
+"Changer le répertoire de travail...\n"
+"Changer le répertoire de travail courant : setwd()"
-msgid "'type' could be only 'google', 'archive' or 'wiki', currently!"
-msgstr "'type' ne peut être que 'google', 'archive' ou 'wiki', pour l'instant !"
+msgid ""
+"Print or show\n"
+"Print or show the content of the object"
+msgstr ""
+"Visualiser...\n"
+"Visualiser le contenu de l'objet : print() ou show()"
-msgid "'f' must ba a character string!"
-msgstr "'f' doit être une chaîne de caractères !"
+msgid ""
+"<<<fun>>>()\n"
+"Apply method <<<fun>>>() to the object"
+msgstr ""
+"<<<fun>>>()\n"
+"Appliquer la méthode <<<fun>>>() à l'objet"
-msgid "'f' is not an existing function!"
-msgstr "'f' n'est pas une fonction existante !"
+msgid ""
+"Names\n"
+"Names of variables contained in the object"
+msgstr ""
+"Noms\n"
+"Nom des variables contenues dans l'objet : names()"
-msgid "'value' must be numeric!"
-msgstr "'value' doit être numérique !"
+msgid ""
+"Str\n"
+"Compact str() representation of an object"
+msgstr ""
+"Str\n"
+"Représentation compacte de l'objet : str()"
-msgid "'max.value' must be numeric or NULL!"
-msgstr "'max.value' doit être numérique ou NULL !"
+msgid ""
+"Help\n"
+"Help on an object"
+msgstr ""
+"Aide\n"
+"Aide sur un objet"
-msgid "Progress:"
-msgstr "Progression :"
+msgid ""
+"Example\n"
+"Run examples for this object"
+msgstr ""
+"Exemple\n"
+"Exacuter les exemples pour cet objet : example()"
-msgid "on"
-msgstr "sur"
+msgid ""
+"Edit\n"
+"Edit an object"
+msgstr ""
+"Editer\n"
+"Editer un objet : edit()"
-msgid "'x' must be character string(s)!"
-msgstr "'x' doit une chaîne de caractères, ou un vecteur de chaînes de caractères !"
+msgid ""
+"Fix\n"
+"Fix an R object"
+msgstr ""
+"Réparer\n"
+"Réparer un objet R"
+msgid ""
+"Remove\n"
+"Remove (permanently!) one or several objects from memory"
+msgstr ""
+"Effacer\n"
+"Effacer (de manière permanente !) un ou plusieurs objets de la mémoire"
+
+msgid ""
+"Require <<<pkg>>>\n"
+"Require the package <<<pkg>>>"
+msgstr ""
+"Requière le <<<pkg>>>\n"
+"Requiérir le package <<<pkg>>>"
+
+msgid ""
+"Require (compact)\n"
+"Compact require one or several R packages"
+msgstr ""
+"Requiérir (forme compacte)\n"
+"Requiérir un ou plusieurs packages (forme compacte)"
+
+msgid ""
+"Attach\n"
+"Attach an object to the search path"
+msgstr ""
+"Attacher\n"
+"Attacher un objet au chemin de recherche de R"
+
+msgid ""
+"Detach\n"
+"Detach an object or package from the search path"
+msgstr ""
+"Détacher\n"
+"Détacher un objet ou un package du chemin de recherche"
+
+msgid ""
+"Detach and unload\n"
+"Detach a package from the search path and unload it"
+msgstr ""
+"Détacher et décharger\n"
+"Détacher un package du chemin de recherche et le décharger de la mémoire"
+
+msgid ""
+"Reattach\n"
+"Reattach an object to the search path"
+msgstr ""
+"Réattacher\n"
+"Réattacher un objet au chemin de recherche"
+
+msgid ""
+"Package info\n"
+"Show detailed information for this package"
+msgstr ""
+"Package info\n"
+"Afficher des informations détaillées sur ce package"
+
+msgid ""
+"View (default)\n"
+"Default view for this object"
+msgstr ""
+"Voir (défaut)\n"
+"Vue par défaut de l'objet"
+
+msgid ""
+"View <<<type>>>\n"
+"Display a '<<<type>>>' view for this object"
+msgstr ""
+"Voir <<<type>>>\n"
+"Afficher une vue '<<<type>>>' pour cet objet"
+
+msgid ""
+"Copy (default)\n"
+"Copy this object to the clipboard (default format)"
+msgstr ""
+"Copier (défaut)\n"
+"Copier cet objet vers le presse-papier (format par défaut)"
+
+msgid ""
+"Copy <<<type>>>\n"
+"Copy this object to the clipboard in '<<<type>>>' format"
+msgstr ""
+"Copier @@@type>>>\n"
+"Copier cet objet vers le presse-papier"
+
+msgid ""
+"Functions\n"
+"Generic functions and methods"
+msgstr ""
+"Fonctions\n"
+"Fonctions génériques et méthodes"
+
+msgid ""
+"View\n"
+"View the object"
+msgstr ""
+"Voir\n"
+"Voir cet objet"
+
+msgid ""
+"Copy\n"
+"Copy the object to the clipboard"
+msgstr ""
+"Copier\n"
+"Copier l'objet vers le presse-papier"
+
+msgid "'strip' must be a 'svStripbar' object"
+msgstr "'strip' doit être un objet 'svStripbar'"
+
+msgid "'widgets' must be 'menu', 'item', 'sep' or 'space'"
+msgstr "'widgets' doit être 'menu', 'item', 'sep' ou 'space'"
+
+#~ msgid ""
+#~ "Package or bundle '%s' was not found in %s. Would you like to install it "
+#~ "now?"
+#~ msgstr ""
+#~ "Le package ou le bundle '%s' est introuvable dans %s. Voulez-vous "
+#~ "l'installer maintenant ?"
+#~ msgid "Missing package or bundle '%s' was neither installed nor loaded"
+#~ msgstr "Package ou bundle '%s' manquant non installé, ni chargé"
+#~ msgid "Local Repository"
+#~ msgstr "Entrepot local"
+#~ msgid "Local Zip File"
+#~ msgstr "Fichier zip local"
+#~ msgid "Select the directory PACKAGES description file"
+#~ msgstr "Sélectionnez le fichier de description PACKAGES"
+#~ msgid "Packages description"
+#~ msgstr "Description de packages"
+#~ msgid "file:"
+#~ msgstr "fichier :"
+#~ msgid ""
+#~ "The repository '%s' does not appear to be a valid repository.\n"
+#~ "Would you like to try another repository?"
+#~ msgstr ""
+#~ "L'entrepot '%s' ne semble pas être un entrepot valide.\n"
+#~ "Voulez-vous essayer un autre entrepot ?"
+#~ msgid ""
+#~ "The package '%s' was not found in the selected repository (%s).\n"
+#~ "Would you like to try another repository?"
+#~ msgstr ""
+#~ "Le package '%s' est introuvable dans l'entrepot sélectionné (%s).\n"
+#~ "Voulez-vous essayer un autre entrepot ?"
+#~ msgid ""
+#~ "The selected file name does not contain the package name '%s'. Would you "
+#~ "like to select a different file instead?"
+#~ msgstr ""
+#~ "Le fichier sélectionné ne contient pas le package '%s'. Voulez-vous "
+#~ "sélectionner un autre fichier à la place ?"
+#~ msgid ""
+#~ "The selected file name does not end with '.zip'. Would you like to select "
+#~ "a different file instead?"
+#~ msgstr ""
+#~ "Le fichier sélectionné n'a pas une extension '.zip'. Voulez-vous "
+#~ "sélectionner un autre fichier à la la place ?"
+#~ msgid "The package or bundle was not found on %s"
+#~ msgstr "Le package ou bundle est introuvable dans %s"
+#~ msgid "Impossible to send the command: %s"
+#~ msgstr "Impossible d'envoyer la commande : %s"
+#~ msgid "bad argument"
+#~ msgstr "argument erroné"
+#~ msgid "'f' is not an existing function!"
[TRUNCATED]
To get the complete diff run:
svnlook diff /svnroot/sciviews -r 100
More information about the Sciviews-commits
mailing list