try to fix for CRAN

ropensci · Apr 8, 2024 · d7cd294 · d7cd294
1 parent 11afbec
commit d7cd294
Show file tree

Hide file tree

Showing 55 changed files with 450 additions and 617 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: phonfieldwork
 Type: Package
 Title: Linguistic Phonetic Fieldwork Tools
-Version: 0.0.12
+Version: 0.0.13
 Depends: R (>= 3.5.0)
 Imports:
     tuneR,
@@ -11,7 +11,7 @@ Imports:
     graphics,
     rmarkdown,
     xml2,
-    uchardet,
+    readr,
     tools,
     mime
 Authors@R: c(
@@ -47,7 +47,7 @@ URL: https://CRAN.R-project.org/package=phonfieldwork, https://docs.ropensci.org
 BugReports: https://github.com/ropensci/phonfieldwork/issues
 Encoding: UTF-8
 LazyData: true
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 VignetteBuilder: knitr
 Suggests: 
     knitr,

diff --git a/NAMESPACE b/NAMESPACE
@@ -44,6 +44,7 @@ importFrom(graphics,rect)
 importFrom(graphics,segments)
 importFrom(graphics,text)
 importFrom(mime,guess_type)
+importFrom(readr,guess_encoding)
 importFrom(rmarkdown,render)
 importFrom(stats,fft)
 importFrom(stats,na.omit)
@@ -55,7 +56,6 @@ importFrom(tuneR,extractWave)
 importFrom(tuneR,readMP3)
 importFrom(tuneR,readWave)
 importFrom(tuneR,writeWave)
-importFrom(uchardet,detect_file_enc)
 importFrom(utils,installed.packages)
 importFrom(utils,read.delim)
 importFrom(utils,write.csv)

diff --git a/R/formant_to_df.R b/R/formant_to_df.R
@@ -13,7 +13,7 @@
 #' formant_to_df(system.file("extdata", "e.Formant", package = "phonfieldwork"))
 #' @export
 #'
-#' @importFrom uchardet detect_file_enc
+#' @importFrom readr guess_encoding
 #'
 
 formant_to_df <- function(file_name) {
@@ -22,7 +22,8 @@ formant_to_df <- function(file_name) {
     formant <- file_name
   } else {
     # thanks to Artem Klevtsov for this code
-    con <- file(file_name, encoding = uchardet::detect_file_enc(file_name))
+    con <- file(file_name,
+                encoding = readr::guess_encoding(file_name)$encoding)
     formant <- readLines(con)
     close(con)
   }

diff --git a/R/intensity_to_df.R b/R/intensity_to_df.R
@@ -13,7 +13,7 @@
 #' intensity_to_df(system.file("extdata", "test.Intensity", package = "phonfieldwork"))
 #' @export
 #'
-#' @importFrom uchardet detect_file_enc
+#' @importFrom readr guess_encoding
 #'
 
 intensity_to_df <- function(file_name) {
@@ -23,7 +23,8 @@ intensity_to_df <- function(file_name) {
     intensity <- file_name
   } else {
     # thanks to Artem Klevtsov for this code
-    con <- file(file_name, encoding = uchardet::detect_file_enc(file_name))
+    con <- file(file_name,
+                encoding = readr::guess_encoding(file_name)$encoding)
     intensity <- readLines(con)
     close(con)
   }

diff --git a/R/pitch_to_df.R b/R/pitch_to_df.R
@@ -16,7 +16,7 @@
 #' pitch_to_df(system.file("extdata", "test.Pitch", package = "phonfieldwork"))
 #' @export
 #'
-#' @importFrom uchardet detect_file_enc
+#' @importFrom readr guess_encoding
 #'
 
 pitch_to_df <- function(file_name,
@@ -26,7 +26,8 @@ pitch_to_df <- function(file_name,
     pitch <- file_name
   } else {
     # thanks to Artem Klevtsov for this code
-    con <- file(file_name, encoding = uchardet::detect_file_enc(file_name))
+    con <- file(file_name,
+                encoding = readr::guess_encoding(file_name)$encoding)
     pitch <- readLines(con)
     close(con)
   }

diff --git a/R/set_textgrid_names.R b/R/set_textgrid_names.R
@@ -19,7 +19,6 @@
 #' )
 #' @export
 #'
-#' @importFrom uchardet detect_file_enc
 #'
 
 set_textgrid_names <- function(textgrid,

diff --git a/R/srt_to_df.R b/R/srt_to_df.R
@@ -13,13 +13,14 @@
 #' srt_to_df(system.file("extdata", "test.srt", package = "phonfieldwork"))
 #' @export
 #'
-#' @importFrom uchardet detect_file_enc
+#' @importFrom readr guess_encoding
 #'
 
 srt_to_df <- function(file_name) {
 
   # thanks to Artem Klevtsov for this code
-  con <- file(file_name, encoding = uchardet::detect_file_enc(file_name))
+  con <- file(file_name,
+              encoding = readr::guess_encoding(file_name)$encoding)
   srt <- readLines(con)
   close(con)
 

diff --git a/R/textgrid_to_df.R b/R/textgrid_to_df.R
@@ -21,7 +21,6 @@
 #' ))
 #' @export
 #'
-#' @importFrom uchardet detect_file_enc
 #'
 
 textgrid_to_df <- function(file_name) {

diff --git a/R/utils.r b/R/utils.r
@@ -3,15 +3,16 @@
 #' @author George Moroz <[email protected]>
 #' @param file_name string with a filename or path to the TextGrid
 #' @noRd
-#' @importFrom uchardet detect_file_enc
+#' @importFrom readr guess_encoding
 #'
 
 read_textgrid <- function(file_name) {
   if (grepl("TextGrid", file_name[2])) {
     tg <- file_name
   } else {
     # thanks to Artem Klevtsov for this code
-    con <- file(file_name, encoding = uchardet::detect_file_enc(file_name))
+    con <- file(file_name,
+                encoding = readr::guess_encoding(file_name)$encoding)
     tg <- readLines(con)
     close(con)
   }

diff --git a/codemeta.json b/codemeta.json
@@ -8,19 +8,13 @@
   "codeRepository": "https://github.com/ropensci/phonfieldwork",
   "issueTracker": "https://github.com/ropensci/phonfieldwork/issues",
   "license": "https://spdx.org/licenses/GPL-2.0",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",
     "url": "https://r-project.org"
   },
-  "runtimePlatform": "R version 4.2.2 Patched (2022-11-10 r83330)",
-  "provider": {
-    "@id": "https://cran.r-project.org",
-    "@type": "Organization",
-    "name": "Comprehensive R Archive Network (CRAN)",
-    "url": "https://cran.r-project.org"
-  },
+  "runtimePlatform": "R version 4.3.3 (2024-02-29)",
   "author": [
     {
       "@type": "Person",
@@ -206,15 +200,15 @@
     },
     "9": {
       "@type": "SoftwareApplication",
-      "identifier": "uchardet",
-      "name": "uchardet",
+      "identifier": "readr",
+      "name": "readr",
       "provider": {
         "@id": "https://cran.r-project.org",
         "@type": "Organization",
         "name": "Comprehensive R Archive Network (CRAN)",
         "url": "https://cran.r-project.org"
       },
-      "sameAs": "https://CRAN.R-project.org/package=uchardet"
+      "sameAs": "https://CRAN.R-project.org/package=readr"
     },
     "10": {
       "@type": "SoftwareApplication",
@@ -235,7 +229,7 @@
     },
     "SystemRequirements": "pandoc (>= 1.14) - http://pandoc.org"
   },
-  "fileSize": "4371.17KB",
+  "fileSize": "4059.603KB",
   "citation": [
     {
       "datePublished": "2023",

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/CONTRIBUTING.html b/docs/CONTRIBUTING.html
diff --git a/docs/LICENSE-text.html b/docs/LICENSE-text.html
diff --git a/docs/additional/first_example.html b/docs/additional/first_example.html
@@ -3060,20 +3060,23 @@
   });
 };
 
-if (document.readyState !== "loading" &&
-    document.querySelector('slides') === null) { 
-  // if the document is done loading but our element hasn't yet appeared, defer
-  // loading of the deck
-  window.setTimeout(function() {
-    loadDeck(null);
-  }, 0);
-} else {
-  // still loading the DOM, so wait until it's finished
-  document.addEventListener("DOMContentLoaded", loadDeck);
+if (!window.Shiny) {
+  // If Shiny is loaded, the slide deck is initialized in ioslides template
+
+  if (document.readyState !== "loading" &&
+      document.querySelector('slides') === null) {
+    // if the document is done loading but our element hasn't yet appeared, defer
+    // loading of the deck
+    window.setTimeout(function() {
+      loadDeck(null);
+    }, 0);
+  } else {
+    // still loading the DOM, so wait until it's finished
+    document.addEventListener("DOMContentLoaded", loadDeck);
+  }
 }
 
 
-
 </script>
 
   <style type="text/css">
@@ -3184,6 +3187,11 @@ <h1 data-config-title><!-- populated from slide_config.json --></h1>
          window.jQuery(e.target).trigger('shown');
       });
     }
+    if (window.Shiny) {
+      // Initialize slides when this script appears on the page, since it
+      // indicates that the <slides> markup has been fully loaded.
+      window.loadDeck();
+    }
   })();
 </script>
 

diff --git a/docs/additional/glossed_document.docx b/docs/additional/glossed_document.docx
diff --git a/docs/additional/second_example.html b/docs/additional/second_example.html
@@ -3060,20 +3060,23 @@
   });
 };
 
-if (document.readyState !== "loading" &&
-    document.querySelector('slides') === null) { 
-  // if the document is done loading but our element hasn't yet appeared, defer
-  // loading of the deck
-  window.setTimeout(function() {
-    loadDeck(null);
-  }, 0);
-} else {
-  // still loading the DOM, so wait until it's finished
-  document.addEventListener("DOMContentLoaded", loadDeck);
+if (!window.Shiny) {
+  // If Shiny is loaded, the slide deck is initialized in ioslides template
+
+  if (document.readyState !== "loading" &&
+      document.querySelector('slides') === null) {
+    // if the document is done loading but our element hasn't yet appeared, defer
+    // loading of the deck
+    window.setTimeout(function() {
+      loadDeck(null);
+    }, 0);
+  } else {
+    // still loading the DOM, so wait until it's finished
+    document.addEventListener("DOMContentLoaded", loadDeck);
+  }
 }
 
 
-
 </script>
 
   <style type="text/css">
@@ -3184,6 +3187,11 @@ <h1 data-config-title><!-- populated from slide_config.json --></h1>
          window.jQuery(e.target).trigger('shown');
       });
     }
+    if (window.Shiny) {
+      // Initialize slides when this script appears on the page, since it
+      // indicates that the <slides> markup has been fully loaded.
+      window.loadDeck();
+    }
   })();
 </script>