Passed tests and build site with wort()

Computational-Cognitive-Musicology-Lab · Feb 15, 2024 · 6ccad1b · 6ccad1b
1 parent 672b356
commit 6ccad1b
Show file tree

Hide file tree

Showing 146 changed files with 371 additions and 282 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -655,7 +655,12 @@ importFrom(numbers,primeFactors)
 importFrom(rlang,"%|%")
 importFrom(rlang,"%||%")
 importFrom(scales,ContinuousRange)
-importFrom(stringi,stri_enc_detect2)
+importFrom(stringi,stri_enc_detect)
+importFrom(stringi,stri_enc_isascii)
+importFrom(stringi,stri_enc_isutf16be)
+importFrom(stringi,stri_enc_isutf16le)
+importFrom(stringi,stri_enc_isutf32be)
+importFrom(stringi,stri_enc_isutf8)
 importFrom(stringi,stri_read_raw)
 importFrom(stringi,stri_trans_totitle)
 importFrom(stringr,str_count)

diff --git a/R/Chords.R b/R/Chords.R
@@ -1453,7 +1453,7 @@ makeChordTransformer <- function(deparser, callname, outputClass = 'character',
     deparse <- args...$deparse %||% TRUE
 
     # Parse
-    parsedTset <- do(tertianSet, c(list(x, memoize = memoize), parseArgs), memoize = memoize, outputClass = 'tertianSet')
+    parsedTset <- do(tertianSet, c(list(x), parseArgs), memoize = memoize, outputClass = 'tertianSet')
     if (length(transposeArgs) > 0L && is.tertianSet(parsedTset)) {
       parsedTset <- do(transpose.tertianSet, c(list(parsedTset), transposeArgs))
     }

diff --git a/R/Lyrics.R b/R/Lyrics.R
@@ -36,7 +36,7 @@ silbe2wort <- function(x, sep = '-', keep.sep = TRUE, number.syllables = FALSE,
   wort
 }
 
-#' Paste sylllables together into words 
+#' Paste syllables together into words 
 #'
 #' Most humdrum datasets which include lyrics, include them in a `**silbe` spine, representing each syllable from the lyrics on
 #' one so they line up with notes in the music.

diff --git a/R/Pitch.R b/R/Pitch.R
@@ -408,7 +408,7 @@ setMethod('+', signature = c('tonalInterval', 'numeric'),
 
 setMethod('+', signature = c('character', 'tonalInterval'),
           function(e1, e2) {
-              e1 <- tonalInterval.character(e1, memoize = FALSE)
+              e1 <- tonalInterval.character(e1)
 
               e3 <- e1 + e2
               dispatch <- attr(e1, 'dispatch')

diff --git a/docs/articles/ComplexSyntax.html b/docs/articles/ComplexSyntax.html
diff --git a/docs/articles/Context.html b/docs/articles/Context.html
diff --git a/docs/articles/DataFields.html b/docs/articles/DataFields.html
diff --git a/docs/articles/Filtering.html b/docs/articles/Filtering.html
diff --git a/docs/articles/GettingStarted.html b/docs/articles/GettingStarted.html
diff --git a/docs/articles/Grouping.html b/docs/articles/Grouping.html
diff --git a/docs/articles/HumdrumSyntax.html b/docs/articles/HumdrumSyntax.html
diff --git a/docs/articles/KeysAndChord.html b/docs/articles/KeysAndChord.html
diff --git a/docs/articles/PitchAndTonality.html b/docs/articles/PitchAndTonality.html