From noreply at r-forge.r-project.org Thu Oct 10 16:44:26 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 10 Oct 2013 16:44:26 +0200 (CEST) Subject: [Sciviews-commits] r531 - komodo komodo/SciViews-K komodo/SciViews-K/.komodotools komodo/SciViews-K/.komodotools/Project komodo/SciViews-K/content/js komodo/SciViews-K/content/js/tools komodo/SciViews-K/defaults pkg/SciViews pkg/SciViews/R pkg/svDoc pkg/svDoc/R pkg/svDoc/man Message-ID: <20131010144426.9DC7B18551C@r-forge.r-project.org> Author: phgrosjean Date: 2013-10-10 16:44:26 +0200 (Thu, 10 Oct 2013) New Revision: 531 Removed: komodo/SciViews-K/defaults/SciViews_0.9-10.tar.gz komodo/SciViews-K/defaults/SciViews_0.9-10.zip komodo/SciViews-K/defaults/ascii_2.1.zip komodo/SciViews-K/defaults/codetools_0.2-8.zip komodo/SciViews-K/defaults/ellipse_0.3-7.tar.gz komodo/SciViews-K/defaults/ellipse_0.3-7.zip komodo/SciViews-K/defaults/svDoc_0.9-7.tar.gz komodo/SciViews-K/defaults/svDoc_0.9-7.zip komodo/SciViews-K/defaults/svHttp_0.9-54.zip komodo/SciViews-K/defaults/svKomodo_0.9-60.zip komodo/SciViews-K/defaults/svMisc_0.9-68.tar.gz komodo/SciViews-K/defaults/svMisc_0.9-68.zip komodo/SciViews-K/defaults/svSocket_0.9-55.zip komodo/SciViews-K/defaults/svTools_0.9-3.zip Modified: komodo/.DS_Store komodo/SciViews-K/.komodotools/Build.komodotool komodo/SciViews-K/.komodotools/Build_and_Install.komodotool komodo/SciViews-K/.komodotools/Docs_-_Extensions.komodotool komodo/SciViews-K/.komodotools/Project/Build.komodotool komodo/SciViews-K/.komodotools/Project/Configure.komodotool komodo/SciViews-K/.komodotools/Project/extension_lib.komodotool komodo/SciViews-K/SciViews-K.komodoproject komodo/SciViews-K/content/js/r.js komodo/SciViews-K/content/js/socket.js komodo/SciViews-K/content/js/tools/file.js komodo/SciViews-K/defaults/svHttp_0.9-54.tar.gz komodo/SciViews-K/defaults/svKomodo_0.9-60.tar.gz komodo/SciViews-K/defaults/svSocket_0.9-55.tar.gz komodo/SciViews-K/defaults/svStart.R komodo/SciViews-K/defaults/svTools_0.9-3.tar.gz komodo/SciViews-K/install.rdf pkg/SciViews/NEWS pkg/SciViews/R/SciViews-internal.R pkg/svDoc/DESCRIPTION pkg/svDoc/NEWS pkg/svDoc/R/svDoc-internal.R pkg/svDoc/man/svDoc-package.Rd Log: SciViews-K compatibility with Komodo 8 (binDir bug + initial error with sv.r.test) and R 3 (prepare for separate v2 and v3 dirs for R packages binaries) Modified: komodo/.DS_Store =================================================================== (Binary files differ) Modified: komodo/SciViews-K/.komodotools/Build.komodotool =================================================================== --- komodo/SciViews-K/.komodotools/Build.komodotool 2013-09-13 17:01:17 UTC (rev 530) +++ komodo/SciViews-K/.komodotools/Build.komodotool 2013-10-10 14:44:26 UTC (rev 531) @@ -29,7 +29,7 @@ ], "trigger": "", "rank": 100, - "version": "1.0.11", + "version": "1.0.12", "async": 1, "type": "macro", "icon": "chrome://fugue/skin/icons/building--plus.png" Modified: komodo/SciViews-K/.komodotools/Build_and_Install.komodotool =================================================================== --- komodo/SciViews-K/.komodotools/Build_and_Install.komodotool 2013-09-13 17:01:17 UTC (rev 530) +++ komodo/SciViews-K/.komodotools/Build_and_Install.komodotool 2013-10-10 14:44:26 UTC (rev 531) @@ -47,7 +47,7 @@ ], "trigger": "", "rank": 100, - "version": "1.0.11", + "version": "1.0.12", "async": 1, "type": "macro", "icon": "chrome://fugue/skin/icons/building--arrow.png" Modified: komodo/SciViews-K/.komodotools/Docs_-_Extensions.komodotool =================================================================== --- komodo/SciViews-K/.komodotools/Docs_-_Extensions.komodotool 2013-09-13 17:01:17 UTC (rev 530) +++ komodo/SciViews-K/.komodotools/Docs_-_Extensions.komodotool 2013-10-10 14:44:26 UTC (rev 531) @@ -8,7 +8,7 @@ ], "trigger": "", "rank": 100, - "version": "1.0.11", + "version": "1.0.12", "async": 1, "type": "macro", "icon": "chrome://fugue/skin/icons/information-white.png" Modified: komodo/SciViews-K/.komodotools/Project/Build.komodotool =================================================================== --- komodo/SciViews-K/.komodotools/Project/Build.komodotool 2013-09-13 17:01:17 UTC (rev 530) +++ komodo/SciViews-K/.komodotools/Project/Build.komodotool 2013-10-10 14:44:26 UTC (rev 531) @@ -48,7 +48,7 @@ "});", "" ], - "version": "1.0.7", + "version": "1.0.12", "async": "0", "type": "macro", "icon": "chrome://famfamfamsilk/skin/icons/lightning_go.png" Modified: komodo/SciViews-K/.komodotools/Project/Configure.komodotool =================================================================== --- komodo/SciViews-K/.komodotools/Project/Configure.komodotool 2013-09-13 17:01:17 UTC (rev 530) +++ komodo/SciViews-K/.komodotools/Project/Configure.komodotool 2013-10-10 14:44:26 UTC (rev 531) @@ -70,7 +70,7 @@ "}", "" ], - "version": "1.0.7", + "version": "1.0.12", "async": "0", "type": "macro", "icon": "chrome://famfamfamsilk/skin/icons/wrench.png" Modified: komodo/SciViews-K/.komodotools/Project/extension_lib.komodotool =================================================================== --- komodo/SciViews-K/.komodotools/Project/extension_lib.komodotool 2013-09-13 17:01:17 UTC (rev 530) +++ komodo/SciViews-K/.komodotools/Project/extension_lib.komodotool 2013-10-10 14:44:26 UTC (rev 531) @@ -167,7 +167,7 @@ "}", "" ], - "version": "1.0.7", + "version": "1.0.12", "async": "0", "type": "macro", "icon": "chrome://famfamfamsilk/skin/icons/brick.png" Modified: komodo/SciViews-K/SciViews-K.komodoproject =================================================================== --- komodo/SciViews-K/SciViews-K.komodoproject 2013-09-13 17:01:17 UTC (rev 530) +++ komodo/SciViews-K/SciViews-K.komodoproject 2013-10-10 14:44:26 UTC (rev 531) @@ -17,7 +17,7 @@ - + 1 1 Modified: komodo/SciViews-K/content/js/r.js =================================================================== --- komodo/SciViews-K/content/js/r.js 2013-09-13 17:01:17 UTC (rev 530) +++ komodo/SciViews-K/content/js/r.js 2013-10-10 14:44:26 UTC (rev 531) @@ -168,8 +168,10 @@ return(true); } } catch (e) { + // PhG: this happens when Komodo Edit is still loading... + // Thus, set ShowMessage to false! sv.log.exception(e, "Unknown error while testing R" - + " sv.r.test():\n\n (" + e + ")", true); + + " sv.r.test():\n\n (" + e + ")", false); return(false); } } Modified: komodo/SciViews-K/content/js/socket.js =================================================================== --- komodo/SciViews-K/content/js/socket.js 2013-09-13 17:01:17 UTC (rev 530) +++ komodo/SciViews-K/content/js/socket.js 2013-10-10 14:44:26 UTC (rev 531) @@ -219,7 +219,10 @@ var httpRequest, url; httpRequest = new XMLHttpRequest(); httpRequest.onprogress = function () { - sv.r.print(httpRequest.responseText, false, false, false); + // This would allow to get results chunk by chunks... but have + // to check echo first and to disable second output in + // onreadystatechange! + //sv.r.print(httpRequest.responseText, false, false, false); }; httpRequest.onreadystatechange = function () { try { Modified: komodo/SciViews-K/content/js/tools/file.js =================================================================== --- komodo/SciViews-K/content/js/tools/file.js 2013-09-13 17:01:17 UTC (rev 530) +++ komodo/SciViews-K/content/js/tools/file.js 2013-10-10 14:44:26 UTC (rev 531) @@ -169,7 +169,10 @@ // If above fails, try Komodo directories too: var dirs = Components.classes['@activestate.com/koDirs;1'] .getService(Components.interfaces.koIDirs); - if (dirs.propertyIsEnumerable(dirName)) + //PhG: this does not work any more on Komodo 8, but commenting + // out this line leads to undefined as answer in case of a + // wrong item => should be OK. + //if (dirs.propertyIsEnumerable(dirName)) file = dirs[dirName]; } } catch(e) {} Deleted: komodo/SciViews-K/defaults/SciViews_0.9-10.tar.gz =================================================================== (Binary files differ) Deleted: komodo/SciViews-K/defaults/SciViews_0.9-10.zip =================================================================== (Binary files differ) Deleted: komodo/SciViews-K/defaults/ascii_2.1.zip =================================================================== (Binary files differ) Deleted: komodo/SciViews-K/defaults/codetools_0.2-8.zip =================================================================== (Binary files differ) Deleted: komodo/SciViews-K/defaults/ellipse_0.3-7.tar.gz =================================================================== (Binary files differ) Deleted: komodo/SciViews-K/defaults/ellipse_0.3-7.zip =================================================================== (Binary files differ) Deleted: komodo/SciViews-K/defaults/svDoc_0.9-7.tar.gz =================================================================== (Binary files differ) Deleted: komodo/SciViews-K/defaults/svDoc_0.9-7.zip =================================================================== (Binary files differ) Modified: komodo/SciViews-K/defaults/svHttp_0.9-54.tar.gz =================================================================== (Binary files differ) Deleted: komodo/SciViews-K/defaults/svHttp_0.9-54.zip =================================================================== (Binary files differ) Modified: komodo/SciViews-K/defaults/svKomodo_0.9-60.tar.gz =================================================================== (Binary files differ) Deleted: komodo/SciViews-K/defaults/svKomodo_0.9-60.zip =================================================================== (Binary files differ) Deleted: komodo/SciViews-K/defaults/svMisc_0.9-68.tar.gz =================================================================== (Binary files differ) Deleted: komodo/SciViews-K/defaults/svMisc_0.9-68.zip =================================================================== (Binary files differ) Modified: komodo/SciViews-K/defaults/svSocket_0.9-55.tar.gz =================================================================== (Binary files differ) Deleted: komodo/SciViews-K/defaults/svSocket_0.9-55.zip =================================================================== (Binary files differ) Modified: komodo/SciViews-K/defaults/svStart.R =================================================================== --- komodo/SciViews-K/defaults/svStart.R 2013-09-13 17:01:17 UTC (rev 530) +++ komodo/SciViews-K/defaults/svStart.R 2013-10-10 14:44:26 UTC (rev 531) @@ -9,6 +9,7 @@ ## Version 0.9.27, 2012-04-22 modified by Ph. Grosjean ## Version 0.9.28, 2012-12-17 modified by Ph. Grosjean ## Version 0.9.29, 2013-02-08 modified by Ph. Grosjean (don't use locate on the Mac) +## Version 0.9.31, 2013-10-10 modified by Ph. Grosjean (pkg binaires v2 & v3) ## TODO: also use value in koDebug to debug server from within R! ## TODO: use the mechanism of startHttpServer() to retrieve default config @@ -36,6 +37,14 @@ ## Needed later for tryCatch'ing: err.null <- function (e) return(NULL) + ## With a switch to R v. 3.0.0, we now have two binaries: one for v2 and + ## one for version 3. For now, maintain both into separate dirs! + if (.Platform$pkgType == "win.binary") { + if (R.version$major < 3) { + pkg.dir <- file.path(pkg.dir, "v2") + } else pkg.dir <- file.path(pkg.dir, "v3") + } + ## If minVersion not provided, get it from packages in 'default' directory pkg.extpat <- switch(.Platform$pkgType, win.binary = "zip", "tar\\.gz") pkgFiles <- dir(pkg.dir, pattern = paste("^.*_[0-9\\.\\-]+\\.", pkg.extpat, @@ -299,7 +308,7 @@ ## in R 2.10.1 under Mac OS X when the path to the package has ## spaces. Also, correct a bug here when installing package ## from a repository where we are not supposed to prepend a - ## path! Copy the dfile temporarily to the temp dir + ## path! Copy the file temporarily to the temp dir sourcefile <- file.path(pkg.dir, pkgFile) file <- file.path(tempdir(), pkgFile) repos <- NULL Modified: komodo/SciViews-K/defaults/svTools_0.9-3.tar.gz =================================================================== (Binary files differ) Deleted: komodo/SciViews-K/defaults/svTools_0.9-3.zip =================================================================== (Binary files differ) Modified: komodo/SciViews-K/install.rdf =================================================================== --- komodo/SciViews-K/install.rdf 2013-09-13 17:01:17 UTC (rev 530) +++ komodo/SciViews-K/install.rdf 2013-10-10 14:44:26 UTC (rev 531) @@ -5,7 +5,7 @@ true sciviewsk at sciviews.org SciViews-K - 0.9.31 + 0.9.32 Edit R code with Komodo Philippe Grosjean Romain Francois Modified: pkg/SciViews/NEWS =================================================================== --- pkg/SciViews/NEWS 2013-09-13 17:01:17 UTC (rev 530) +++ pkg/SciViews/NEWS 2013-10-10 14:44:26 UTC (rev 531) @@ -6,7 +6,11 @@ package. Related function path(), is.path(), as.path() are renamed accordingly filePath(), is.filePath() and as.filePath(). The print method is also adapted. +* warnAssignWithEqualSign, warnPartialMatchArgs, warnPartialMatchAttr and + warnPartialMatchDollar in options() are now initialized to FALSE if they are + not defined yet there. + == SciViews version 0.9-10 * Import from data.table is eliminated. For now, `@:=` is the same as `@<-`. Modified: pkg/SciViews/R/SciViews-internal.R =================================================================== --- pkg/SciViews/R/SciViews-internal.R 2013-09-13 17:01:17 UTC (rev 530) +++ pkg/SciViews/R/SciViews-internal.R 2013-10-10 14:44:26 UTC (rev 531) @@ -1,15 +1,15 @@ .onLoad <- function (lib, pkg) { - ## With SciViews, we try to avoid traps as much as possible! - ## So, if corresponding options are not defined yet, specify them to TRUE! + ## If corresponding options are not defined yet, specify them to FALSE + ## by default, but make them explicitly available in options() if (!length(getOption("warnAssignWithEqualSign"))) - options(warnAssignWithEqualSign = TRUE) + options(warnAssignWithEqualSign = FALSE) if (!length(getOption("warnPartialMatchArgs"))) - options(warnPartialMatchArgs = TRUE) + options(warnPartialMatchArgs = FALSE) if (!length(getOption("warnPartialMatchAttr"))) - options(warnPartialMatchAttr = TRUE) + options(warnPartialMatchAttr = FALSE) if (!length(getOption("warnPartialMatchDollar"))) - options(warnPartialMatchDollar = TRUE) + options(warnPartialMatchDollar = FALSE) ## TODO: check configuration and install everything that we need to use the ## SciViews extensions, including the HTTP or socket server Modified: pkg/svDoc/DESCRIPTION =================================================================== --- pkg/svDoc/DESCRIPTION 2013-09-13 17:01:17 UTC (rev 530) +++ pkg/svDoc/DESCRIPTION 2013-10-10 14:44:26 UTC (rev 531) @@ -1,7 +1,7 @@ Package: svDoc Type: Package -Version: 0.9-8 -Date: 2013-08-22 +Version: 0.9-9 +Date: 2013-09-21 Title: SciViews GUI API - svDoc functions Authors at R: c(person("Philippe", "Grosjean", role = c("aut", "cre"), email = "phgrosjean at sciviews.org")) Modified: pkg/svDoc/NEWS =================================================================== --- pkg/svDoc/NEWS 2013-09-13 17:01:17 UTC (rev 530) +++ pkg/svDoc/NEWS 2013-10-10 14:44:26 UTC (rev 531) @@ -1,5 +1,10 @@ = svDoc News +== Changes in svDoc 0.9-9 + +* Detection of python, internal function .python(), sometimes failed. Corrected. + + == Changes in svDoc 0.9-8 * svDoc documents can now be processed through an URL pointing to the internal R Modified: pkg/svDoc/R/svDoc-internal.R =================================================================== --- pkg/svDoc/R/svDoc-internal.R 2013-09-13 17:01:17 UTC (rev 530) +++ pkg/svDoc/R/svDoc-internal.R 2013-10-10 14:44:26 UTC (rev 531) @@ -108,7 +108,8 @@ ## Try getting a valid python executable, with version at least min.version .pyCheck <- function (py, min.version = min.version) { if (Sys.which(paste('"', py, '"', sep = "")) == "") - return(FALSE) # Not found + if (Sys.which(py) == "") # Quoted command sometimes fails + return(FALSE) # Not found ## Check version... ## The following is obvious, but does not work in Rterm.exe (stdout is ## *not* redirected to stdin there!) Modified: pkg/svDoc/man/svDoc-package.Rd =================================================================== --- pkg/svDoc/man/svDoc-package.Rd 2013-09-13 17:01:17 UTC (rev 530) +++ pkg/svDoc/man/svDoc-package.Rd 2013-10-10 14:44:26 UTC (rev 531) @@ -12,8 +12,8 @@ \tabular{ll}{ Package: \tab svDoc\cr Type: \tab Package\cr - Version: \tab 0.9-8\cr - Date: \tab 2013-08-22\cr + Version: \tab 0.9-9\cr + Date: \tab 2013-09-21\cr License: \tab GPL 2 or above, at your convenience\cr } % TODO: add description of main functions here. Also add examples From noreply at r-forge.r-project.org Thu Oct 10 16:45:38 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Thu, 10 Oct 2013 16:45:38 +0200 (CEST) Subject: [Sciviews-commits] r532 - in komodo/SciViews-K/defaults: . v2 v3 Message-ID: <20131010144538.28FCD183D2F@r-forge.r-project.org> Author: phgrosjean Date: 2013-10-10 16:45:37 +0200 (Thu, 10 Oct 2013) New Revision: 532 Added: komodo/SciViews-K/defaults/v2/ komodo/SciViews-K/defaults/v2/SciViews_0.9-10.zip komodo/SciViews-K/defaults/v2/ascii_2.1.zip komodo/SciViews-K/defaults/v2/codetools_0.2-8.zip komodo/SciViews-K/defaults/v2/ellipse_0.3-8.zip komodo/SciViews-K/defaults/v2/svDoc_0.9-7.zip komodo/SciViews-K/defaults/v2/svHttp_0.9-54.zip komodo/SciViews-K/defaults/v2/svKomodo_0.9-60.zip komodo/SciViews-K/defaults/v2/svMisc_0.9-68.zip komodo/SciViews-K/defaults/v2/svSocket_0.9-55.zip komodo/SciViews-K/defaults/v2/svTools_0.9-3.zip komodo/SciViews-K/defaults/v3/ komodo/SciViews-K/defaults/v3/SciViews_0.9-11.zip komodo/SciViews-K/defaults/v3/ascii_2.1.zip komodo/SciViews-K/defaults/v3/codetools_0.2-8.zip komodo/SciViews-K/defaults/v3/ellipse_0.3-8.zip komodo/SciViews-K/defaults/v3/svDoc_0.9-9.zip komodo/SciViews-K/defaults/v3/svHttp_0.9-54.zip komodo/SciViews-K/defaults/v3/svKomodo_0.9-60.zip komodo/SciViews-K/defaults/v3/svMisc_0.9-70.zip komodo/SciViews-K/defaults/v3/svSocket_0.9-55.zip komodo/SciViews-K/defaults/v3/svTools_0.9-3.zip Log: Added v2/v3 subduers to defaults for R package binaries for R 2 vs R 3 Added: komodo/SciViews-K/defaults/v2/SciViews_0.9-10.zip =================================================================== (Binary files differ) Property changes on: komodo/SciViews-K/defaults/v2/SciViews_0.9-10.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: komodo/SciViews-K/defaults/v2/ascii_2.1.zip =================================================================== (Binary files differ) Property changes on: komodo/SciViews-K/defaults/v2/ascii_2.1.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: komodo/SciViews-K/defaults/v2/codetools_0.2-8.zip =================================================================== (Binary files differ) Property changes on: komodo/SciViews-K/defaults/v2/codetools_0.2-8.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: komodo/SciViews-K/defaults/v2/ellipse_0.3-8.zip =================================================================== (Binary files differ) Property changes on: komodo/SciViews-K/defaults/v2/ellipse_0.3-8.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: komodo/SciViews-K/defaults/v2/svDoc_0.9-7.zip =================================================================== (Binary files differ) Property changes on: komodo/SciViews-K/defaults/v2/svDoc_0.9-7.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: komodo/SciViews-K/defaults/v2/svHttp_0.9-54.zip =================================================================== (Binary files differ) Property changes on: komodo/SciViews-K/defaults/v2/svHttp_0.9-54.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: komodo/SciViews-K/defaults/v2/svKomodo_0.9-60.zip =================================================================== (Binary files differ) Property changes on: komodo/SciViews-K/defaults/v2/svKomodo_0.9-60.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: komodo/SciViews-K/defaults/v2/svMisc_0.9-68.zip =================================================================== (Binary files differ) Property changes on: komodo/SciViews-K/defaults/v2/svMisc_0.9-68.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: komodo/SciViews-K/defaults/v2/svSocket_0.9-55.zip =================================================================== (Binary files differ) Property changes on: komodo/SciViews-K/defaults/v2/svSocket_0.9-55.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: komodo/SciViews-K/defaults/v2/svTools_0.9-3.zip =================================================================== (Binary files differ) Property changes on: komodo/SciViews-K/defaults/v2/svTools_0.9-3.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: komodo/SciViews-K/defaults/v3/SciViews_0.9-11.zip =================================================================== (Binary files differ) Property changes on: komodo/SciViews-K/defaults/v3/SciViews_0.9-11.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: komodo/SciViews-K/defaults/v3/ascii_2.1.zip =================================================================== (Binary files differ) Property changes on: komodo/SciViews-K/defaults/v3/ascii_2.1.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: komodo/SciViews-K/defaults/v3/codetools_0.2-8.zip =================================================================== (Binary files differ) Property changes on: komodo/SciViews-K/defaults/v3/codetools_0.2-8.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: komodo/SciViews-K/defaults/v3/ellipse_0.3-8.zip =================================================================== (Binary files differ) Property changes on: komodo/SciViews-K/defaults/v3/ellipse_0.3-8.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: komodo/SciViews-K/defaults/v3/svDoc_0.9-9.zip =================================================================== (Binary files differ) Property changes on: komodo/SciViews-K/defaults/v3/svDoc_0.9-9.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: komodo/SciViews-K/defaults/v3/svHttp_0.9-54.zip =================================================================== (Binary files differ) Property changes on: komodo/SciViews-K/defaults/v3/svHttp_0.9-54.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: komodo/SciViews-K/defaults/v3/svKomodo_0.9-60.zip =================================================================== (Binary files differ) Property changes on: komodo/SciViews-K/defaults/v3/svKomodo_0.9-60.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: komodo/SciViews-K/defaults/v3/svMisc_0.9-70.zip =================================================================== (Binary files differ) Property changes on: komodo/SciViews-K/defaults/v3/svMisc_0.9-70.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: komodo/SciViews-K/defaults/v3/svSocket_0.9-55.zip =================================================================== (Binary files differ) Property changes on: komodo/SciViews-K/defaults/v3/svSocket_0.9-55.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: komodo/SciViews-K/defaults/v3/svTools_0.9-3.zip =================================================================== (Binary files differ) Property changes on: komodo/SciViews-K/defaults/v3/svTools_0.9-3.zip ___________________________________________________________________ Added: svn:mime-type + application/octet-stream From noreply at r-forge.r-project.org Tue Oct 29 12:20:40 2013 From: noreply at r-forge.r-project.org (noreply at r-forge.r-project.org) Date: Tue, 29 Oct 2013 12:20:40 +0100 (CET) Subject: [Sciviews-commits] r533 - komodo/SciViews-K komodo/SciViews-K/content komodo/SciViews-K/content/js pkg/svDoc/R Message-ID: <20131029112040.924E51844AC@r-forge.r-project.org> Author: phgrosjean Date: 2013-10-29 12:20:40 +0100 (Tue, 29 Oct 2013) New Revision: 533 Modified: komodo/SciViews-K/content/js/commands.js komodo/SciViews-K/content/js/r.js komodo/SciViews-K/content/js/sciviews.js komodo/SciViews-K/content/overlayMain-ko6.xul komodo/SciViews-K/content/overlayMain.xul komodo/SciViews-K/install.rdf pkg/svDoc/R/asciidoc.R Log: A couple of bug fixes for Komodo 8 in SciViews-K + update of asciidoc support in svDoc Modified: komodo/SciViews-K/content/js/commands.js =================================================================== --- komodo/SciViews-K/content/js/commands.js 2013-10-10 14:45:37 UTC (rev 532) +++ komodo/SciViews-K/content/js/commands.js 2013-10-29 11:20:40 UTC (rev 533) @@ -495,8 +495,8 @@ function _isRCurLanguage () { var view = ko.views.manager.currentView; - if (!view || !view.document) return(false); - return(view.document.language == "R"); + if (!view || !view.koDoc) return(false); // Was view.document in pre-Ko7 + return(view.koDoc.language == "R"); // Was view.document in pre-Ko7 } function _hasSelection () { Modified: komodo/SciViews-K/content/js/r.js =================================================================== --- komodo/SciViews-K/content/js/r.js 2013-10-10 14:45:37 UTC (rev 532) +++ komodo/SciViews-K/content/js/r.js 2013-10-29 11:20:40 UTC (rev 533) @@ -470,7 +470,7 @@ if (!view) return(false); // No current view, do nothing! view.setFocus(); var scimoz = view.scimoz; - var doc = view.document; + var doc = view.koDoc; // Was document in pre-Ko7 var file; // FIXME: (sometimes?) doc is not defined in ko7! Modified: komodo/SciViews-K/content/js/sciviews.js =================================================================== --- komodo/SciViews-K/content/js/sciviews.js 2013-10-10 14:45:37 UTC (rev 532) +++ komodo/SciViews-K/content/js/sciviews.js 2013-10-29 11:20:40 UTC (rev 533) @@ -848,13 +848,13 @@ sv.reworkUI = function (level /*= sciviews.uilevel pref*/) { // Don't use with Komodo < 6 (ko.toolbox2 is not defined there) - if ((ko.toolbox2 === undefined)) { + if (!(ko.toolbox2 === undefined)) { try { sv.toggleById("r_uilevel", true); // The toolbar is wrong because it is a toolbar in Komodo 5, // but a toolbaritem in Komodo 6... Fix this now! - var Rtoolbaritem = document.getElementById("RToolbar"); - var Rtoolbar = document.createElement("toolbar"); + var Rtoolbaritem = document.getElementById("RToolbar"); + var Rtoolbar = document.createElement("toolbar") Rtoolbar.setAttribute("class", "chromeclass-toolbar"); Rtoolbaritem.setAttribute("id", "OldRToolbar"); Rtoolbar.setAttribute("id", "RToolbar"); @@ -866,14 +866,25 @@ Rtoolbar.setAttribute("tooltiptext", "R Toolbar"); Rtoolbar.setAttribute("mode", "icons"); Rtoolbar.setAttribute("insertbefore", "toolsToolbar"); + + // In Ko8, there is now a toolbaritem level + RtoolbarWrapper = document.createElement("toolbaritem"); + Rtoolbar.appendChild(RtoolbarWrapper); + var tb = Rtoolbaritem.firstChild; + tb.setAttribute("class", tb.getAttribute("class") + " first-child"); + RtoolbarWrapper.appendChild(tb); + tb = Rtoolbaritem.firstChild; while (tb) { - Rtoolbar.appendChild(tb); + RtoolbarWrapper.appendChild(tb); tb = Rtoolbaritem.firstChild; } + RtoolbarWrapper.lastChild.setAttribute("class", + RtoolbarWrapper.lastChild.getAttribute("class") + " last-child"); + RtoolbarWrapper.setAttribute("class", "has-children"); Rtoolbaritem.parentNode.replaceChild(Rtoolbar, Rtoolbaritem); - } catch (e) { } - return; + } catch (e) { } + //return; } // Retrieve or ask the desired uilevel Modified: komodo/SciViews-K/content/overlayMain-ko6.xul =================================================================== --- komodo/SciViews-K/content/overlayMain-ko6.xul 2013-10-10 14:45:37 UTC (rev 532) +++ komodo/SciViews-K/content/overlayMain-ko6.xul 2013-10-29 11:20:40 UTC (rev 533) @@ -470,7 +470,7 @@ class="stop-icon" observes="cmd_svREscape" label="&rEscape;" /> - + - + - + - + true sciviewsk at sciviews.org SciViews-K - 0.9.32 + 0.9.33 Edit R code with Komodo Philippe Grosjean Romain Francois Modified: pkg/svDoc/R/asciidoc.R =================================================================== --- pkg/svDoc/R/asciidoc.R 2013-10-10 14:45:37 UTC (rev 532) +++ pkg/svDoc/R/asciidoc.R 2013-10-29 11:20:40 UTC (rev 533) @@ -25,7 +25,7 @@ Rscript <- readLines(svDocFile, encoding = encoding) l <- length(Rscript) - ## Detect doc chunks (start with !!", and end with !<<...>>=") + ## Detect doc chunks (start with !!", and end with <<...>>=") start <- grepl('^!!"[ \t]*$', Rscript) end <- grepl('^<<.*>>="[ \t]*$', Rscript) ## Must have at least one doc chunk and same number of starts and ends