oops

davidgohel · Feb 7, 2018 · 660ff6f · 660ff6f
1 parent 97f1375
commit 660ff6f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: rvg
 Type: Package
 Title: R Graphics Devices for Vector Graphics Output
-Version: 0.1.8.0001
+Version: 0.1.8.0002
 Authors@R: c(
     person("David", "Gohel", role = c("aut", "cre"),
       email = "david.gohel@ardata.fr"),

diff --git a/R/body_add_vg.R b/R/body_add_vg.R
@@ -44,7 +44,7 @@ body_add_vg <- function( x, code, pos = "after", ... ){
 
   tryCatch(code, finally = dev.off() )
   raster_files <- list.files(path = getwd(), pattern = paste0("^", uid, "(.*)\\.png$"), full.names = TRUE )
-  xml_elt <- scan( dml_file, what = "character", quiet = T, sep = "\n" )
+  xml_elt <- scan( dml_file, what = "character", quiet = T, sep = "\n", encoding = "UTF-8" )
   xml_elt <- gsub(pattern = "<w:drawing>",
                   replacement = paste0("<w:p ",
                                        "xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" ",

diff --git a/R/ph_with_vg.R b/R/ph_with_vg.R
@@ -108,7 +108,7 @@ ph_with_vg_at <- function( x, code, ggobj = NULL, left, top, width, height, ...
   }, finally = dev.off() )
 
   raster_files <- list_raster_files(img_dir = img_directory )
-  dml_str <- scan( dml_file, what = "character", quiet = T, sep = "\n" )
+  dml_str <- scan( dml_file, what = "character", quiet = T, sep = "\n", encoding = "UTF-8" )
 
   if( length(raster_files) ){
     slide$reference_img(src = raster_files, dir_name = file.path(x$package_dir, "ppt/media"))

diff --git a/tests/testthat/test-docx-text.R b/tests/testthat/test-docx-text.R
@@ -26,7 +26,7 @@ test_that("text alpha col can be found", {
   text(0.2, 0.2, "hello", col = "#00000099")
   dev.off()
 
-  x <- scan(file, what = "character", sep = "\n", quiet = TRUE)
+  x <- scan(file, what = "character", sep = "\n", quiet = TRUE, encoding = "UTF-8" )
   expect_true(grepl("<w14:alpha val=\"60000\"/>", x))
 })