use svg_width/height arguments for case of static svg

.Rbuildignore

@@ -4,3 +4,4 @@
 ^README.md$
 ^working$
 ^\.github$
+^LICENSE.md$

DESCRIPTION

@@ -1,20 +1,19 @@
 Package: ggsvg
 Type: Package
-Title: SVG Glyphs for ggplot
-Version: 0.1.12
-Author: mikefc
-Maintainer: mikefc <[email protected]>
+Title: SVG Glyphs for Ggplot
+Version: 0.1.13
 Authors@R: c(
-    person("Mike", "FC", , "[email protected]", role = c("aut", "cre"))
+    person("Mike", "Cheng", role = c("aut", "cre", 'cph'), email = "[email protected]")
     )
+Maintainer: Mike Cheng <[email protected]>
 Description: Use SVG graphics as glyphs when plotting points with ggplot2.
 License: MIT + file LICENSE
 URL: https://github.com/coolbutuseless/ggsvg
 BugReports: https://github.com/coolbutuseless/ggsvg/issues
 Encoding: UTF-8
 Language: en-US
 LazyData: true
-RoxygenNote: 7.2.0
+RoxygenNote: 7.3.2
 Imports:
     grid,
     ggplot2,

LICENSE

@@ -1,21 +1,2 @@
-MIT License
-
-Copyright (c) 2021,2022 [email protected]
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+YEAR: 2024
+COPYRIGHT HOLDER: Mike Cheng

LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 [email protected]
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

NEWS.md

@@ -1,4 +1,10 @@
 
+# ggsvg 0.1.13 2024-09-11
+
+* Pass `svg_width` and `svg_height` to `svg_to_rasterGrob()` when 
+  the svg is only rendered once (i.e. `is_static_svg = TRUE`) 
+* Fixed some minor issues to satisfy current `R CMD CHECK`
+
 # ggsvg 0.1.12 2022-07-31
 
 * Fix issue with `css()` selectors in some `scale_svg_*()` functions

R/ggsvg.R

@@ -114,7 +114,7 @@ draw_key_PointSVG <- function(data, params, size) {
 #'        property will have a default value of "black"
 #'
 #' Set `options(GGSVG_DEBUG = TRUE)` for some verbose debugging which will
-#' cause `{ggsvg}` to output (to the console) the final SVG for each and every element
+#' cause ggsvg to output (to the console) the final SVG for each and every element
 #' in the plot.
 #'
 #'
@@ -389,7 +389,9 @@ create_new_GeomPointSVG <- function() {
 
       if (is_static_svg && !has_css_aes) {
         # Parse the SVG just once
-        svg_grob_orig <- svg_to_rasterGrob(coords$svg[[1]])
+        svg_grob_orig <- svg_to_rasterGrob(coords$svg[[1]],
+                                           width  = coords$svg_width,
+                                           height = coords$svg_height)
       }
 
 

R/scales-defaults.R

@@ -187,10 +187,10 @@ scale_svg_default <- function() {
 
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #' S3 method
-#' @param object,plot,objectname see ggplot2 docs
+#' @param object,plot,object_name see ggplot2 docs
 #' @export
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-ggplot_add.ScaleSVGDefault <- function(object, plot, objectname) {
+ggplot_add.ScaleSVGDefault <- function(object, plot, object_name) {
   scale_ggsvg_default(plot)
 }