created animint2pages()

.Rbuildignore

@@ -1,3 +1,4 @@
+readme_website.md
 .github
 ^.*\.Rproj$
 ^\.Rproj\.user$

.github/workflows/tests.yaml

@@ -13,13 +13,6 @@ jobs:
       fail-fast: false
       matrix:
         test-suite: [ renderer1,renderer2,renderer3,renderer4,renderer5,compiler,CRAN]
-
-    # services:
-    #   selenium:
-    #     image: selenium/standalone-firefox-debug:2.53.0
-    #     ports:
-    #       - 5900:5900
-    #       - 4444:4444
 
     name: Test Suite ${{ matrix.test-suite }}
     env: 
@@ -41,6 +34,12 @@ jobs:
 
       - name: install package
         run: R CMD INSTALL .
+
+      - name: git config user.name 
+        run: git config --global user.name "GitHub Actions"
+
+      - name: git config user.email
+        run: git config --global user.email toby.hocking@r-project.org
 
       - name: run tests
         run: if [ "$TEST_SUITE" == "CRAN" ];then bash build.sh;else Rscript -e "source('tests/testthat.R', chdir = TRUE)";fi

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: animint2
 Title: Animated Interactive Grammar of Graphics
-Version: 2023.6.11
+Version: 2023.11.15
 URL: https://animint.github.io/animint2/
 BugReports: https://github.com/animint/animint2/issues
 Authors@R: c(
@@ -76,6 +76,7 @@ Imports:
     methods
 Suggests:
     servr,
+    gert, gitcreds, gh,
     sp,
     gistr (>= 0.2),
     shiny,
@@ -269,12 +270,13 @@ Collate:
     'z_animintHelpers.R'
     'z_facets.R'
     'z_geoms.R'
-    'z_gist.R'
     'z_helperFunctions.R'
     'z_knitr.R'
+    'z_pages.R'
     'z_print.R'
     'z_scales.R'
     'z_theme_animint.R'
     'z_transformShape.R'
 RoxygenNote: 7.2.3
 Config/Needs/website: tidyverse/tidytemplate
+VignetteBuilder: knitr

NAMESPACE

@@ -214,7 +214,7 @@ export(aes_string)
 export(alpha)
 export(animint)
 export(animint2dir)
-export(animint2gist)
+export(animint2pages)
 export(animintOutput)
 export(annotate)
 export(annotation_custom)
@@ -489,6 +489,7 @@ export(theme_void)
 export(toRGB)
 export(transform_position)
 export(unit)
+export(update_gallery)
 export(update_geom_defaults)
 export(update_labels)
 export(update_stat_defaults)

NEWS.md

@@ -1,3 +1,24 @@
+# Changes in 2023.11.15
+
+- New function `animint2pages(viz,"new_github_repo")` for
+  publishing/sharing animints, replacement for animint2gist, which
+  stopped working recently.
+- New option `animint(source="http://path.to/source.R")` which should
+  be the URL of data viz source code, used to display a link below the
+  rendered viz.
+- New function `update_gallery("path/to/gallery_repo")` for updating
+  galleries such as https://animint.github.io/gallery/
+- Bugfix: geom_text renders color as svg fill style (was rendering as
+  stroke style, a regression introduced by the initial implementation
+  of `fill_off`).
+- re-organization of animint.js in order to reduce duplication /
+  emphasize similarities and differences between geoms.
+- geom rect and tile now default to color="black" instead of
+  transparent, for consistency with other geoms (and for the case of
+  using clickSelects, which defaults to black color for selected, and
+  transparent for not). To get the old behavior, specify
+  color="transparent" (for non-clickSelects).
+
 # Changes in 2023.10.6
 
 - User-configurable selection style - fill_off.

R/data.R

@@ -164,7 +164,7 @@
 #' All built-in \code{\link{colors}()} translated into Luv colour space.
 #'
 #' @format A data frame with 657 observations and 4 variables:
-#' \itemize{
+#' \describe{
 #' \item{L,u,v}{Position in Luv colour space}
 #' \item{col}{Colour name}
 #' }
@@ -176,7 +176,7 @@
 #' real estate center, \url{https://www.recenter.tamu.edu/}.
 #'
 #' @format A data frame with 8602 observations and 9 variables:
-#' \itemize{
+#' \describe{
 #' \item{city}{Name of MLS area}
 #' \item{year,month,date}{Date}
 #' \item{sales}{Number of sales}

R/geom-.r

@@ -305,7 +305,6 @@ Geom <- gganimintproto("Geom",
     processed_values <- l$geom$pre_process(g, g.data, ranges)
     g <- processed_values$g
     g.data <- processed_values$g.data
-
     ## Check g.data for color/fill - convert to hexadecimal so JS can parse correctly.
     for(color.var in c("colour", "color", "fill", "colour_off", "color_off", "fill_off")){
       if(color.var %in% names(g.data)){

R/geom-histogram.r

@@ -65,10 +65,6 @@
 #' # Use origin = 0, to make sure we don't take sqrt of negative values
 #' m + geom_histogram(origin = 0) + coord_trans(x = "sqrt")
 #'
-#' # You can also transform the y axis.  Remember that the base of the bars
-#' # has value 0, so log transformations are not appropriate
-#' m <- ggplot(movies, aes(x = rating))
-#' m + geom_histogram(binwidth = 0.5) + scale_y_sqrt()
 #' }
 #' rm(movies)
 geom_histogram <- function(mapping = NULL, data = NULL,

R/geom-tile.r

@@ -95,7 +95,7 @@ GeomTile <- gganimintproto("GeomTile", GeomRect,
     )
   },
 
-  default_aes = aes(fill = "grey20", colour = NA, size = 0.1, linetype = 1,
+  default_aes = aes(fill = "grey20", colour = "black", size = 0.1, linetype = 1,
     alpha = NA),
 
   required_aes = c("x", "y"),
@@ -104,9 +104,6 @@ GeomTile <- gganimintproto("GeomTile", GeomRect,
 
   pre_process = function(g, g.data, ...) {
     g$geom <- "rect"
-    if(is.null(g$params$colour)){
-      g$params$colour <- "transparent"
-    }
     return(list(g = g, g.data = g.data))
   }
 )

R/plot-build.r

@@ -132,7 +132,6 @@ layer_grob <- function(plot, i = 1L) {
 #'  a ggplot2 plot.
 #' @return a \code{\link{gtable}} object
 #' @keywords internal
-#' @param plot plot object
 #' @param data plot data generated by \code{\link{ggplot_build}}
 #' @export
 ggplot_gtable <- function(data) {

R/scale-.r

@@ -119,6 +119,10 @@ Scale <- gganimintproto("Scale", NULL,
     }
   },
 
+  range_is_zero = function(self, limits) {
+    isTRUE(scales::zero_range(as.numeric(limits)))
+  },
+
   # The physical size of the scale.
   # This always returns a numeric vector of length 2, giving the physical
   # dimensions of a scale.
@@ -206,15 +210,13 @@ ScaleContinuous <- gganimintproto("ScaleContinuous", Scale,
 
   get_breaks = function(self, limits = self$get_limits()) {
     if (self$is_empty()) return(numeric())
-
     # Limits in transformed space need to be converted back to data space
     limits <- self$trans$inverse(limits)
-
     if (is.null(self$breaks)) {
       return(NULL)
     } else if (identical(self$breaks, NA)) {
       stop("Invalid breaks specification. Use NULL, not NA")
-    } else if (zero_range(as.numeric(limits))) {
+    } else if (self$range_is_zero(limits)) {
       breaks <- limits[1]
     } else if (is.waive(self$breaks)) {
       breaks <- self$trans$breaks(limits)
@@ -240,7 +242,7 @@ ScaleContinuous <- gganimintproto("ScaleContinuous", Scale,
   },
 
   get_breaks_minor = function(self, n = 2, b = self$break_positions(), limits = self$get_limits()) {
-    if (zero_range(as.numeric(limits))) {
+    if (self$range_is_zero(limits)) {
       return()
     }
 

R/z_animint.R

@@ -285,6 +285,10 @@ animint2dir <- function(plot.list, out.dir = NULL,
   if(!is.null(plot.list$out.dir)){
     plot.list$out.dir <- NULL
   }
+  if(is.character(plot.list[["source"]])){
+    meta$source <- plot.list[["source"]]
+    plot.list$source <- NULL
+  }
 
   ## Extract essential info from ggplots, reality checks.
   for(list.name in names(plot.list)){
@@ -631,8 +635,8 @@ animint2dir <- function(plot.list, out.dir = NULL,
     file.copy(style.file, file.path(out.dir, "styles.css"), overwrite=TRUE)
   }
   file.copy(to.copy, out.dir, overwrite=TRUE, recursive=TRUE)
-  export.names <-
-    c("geoms", "time", "duration", "selectors", "plots", "title")
+  export.names <- c(
+    "geoms", "time", "duration", "selectors", "plots", "title", "source")
   export.data <- list()
   for(export.name in export.names){
     if(export.name %in% ls(meta)){