See NEWS.md

Author: klaus

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: parkR
 Type: Package
 Title: Generating monophonic jazz solos for chord sequences
-Version: 0.2.2
+Version: 0.4.0
 Authors@R: c(
   person("Klaus", "Frieler", email = "[email protected]", role = c("aut","cre"))
   )
@@ -25,6 +25,7 @@ Imports:
     tidyr,
     stringr,
     stats,
+    tictoc,
     tabr
 Suggests:
     devtools (>= 1.13.6)

NEWS.md

@@ -1,3 +1,9 @@
+# parkR 0.4.0
+
+* Added export for generated solso to PDF/Lilypond and MIDI via the tabr package
+* Fixed lot of bugs
+* Added some useful export functions
+
 # parkR 0.3.0
 
 * Renamed create_from_irb and create_from wjd_db

R/chords.R

@@ -316,6 +316,19 @@ fast_parse_chord <- function(chord_label){
   tibble(chord = chord_label) %>% left_join(parsed_chords, by = "chord") %>% select(-chord)
 }
 
+chord_to_lilypond <- function(chord_labels, lengths = NULL){
+
+  chord <- fast_parse_chord(chord_labels)
+  roots <- str_replace_all(chord$root, "b", "es") %>%  str_replace_all("#", "is") %>% tolower() %>% str_replace("ees", "es")
+  if(is.null(lengths)){
+    chords <- sprintf("%s:%s", roots,  chord$type)
+
+  }
+  else {
+    chords <- sprintf("%s%d:%s", roots, as.integer(floor(lengths)), chord$type)
+  }
+  chords
+}
 #' get_cdpcx
 #'
 #' This function transforms a set of (MIDI) pitches given a list of chords into the corresponding Extended Chordal Diatonic Pitch Classes (CDPCX)
@@ -613,8 +626,9 @@ create_leadsheet_from_irb <- function(compid, name = NULL, with_form = F){
 #' @export
 create_leadsheet_from_wjd_db <- function(compid, name = NULL, with_form = F){
   db <- parkR::wjd_chord_db %>%
-    rename(chord = original) %>%
-    left_join(parkR::wjd_meta %>% select(title, id, time = signature), by = "id")
+    rename(chord = original, section = form_name) %>%
+    left_join(parkR::wjd_meta %>%
+                select(title, id, composer, date = recordingyear, key, time = signature), by = "id")
   create_leadsheet_from_chord_db(db, compid, name, with_form)
 }
 

R/convert.R

@@ -76,7 +76,7 @@ solo_to_mcsv2 <- function(solo_tbl, tempo = 120){
 #' @param tempo (double scale) Tempo (bpm) of  the generated solo.
 #' @return A solo data frame in MCSV2 format
 #' @export
-solo_to_lilypond <- function(solo_tbl, file = "solo.pdf", key = "c", tempo = 120, ...){
+solo_to_lilypond <- function(solo_tbl, file = "solo.pdf", key = "c", tempo = 120, lead_sheet = NULL, ...){
   tmp <- solo_tbl %>%
     select(-c(type, mlu, phrase_id, chorus_id, chord)) %>%
     mutate(
@@ -87,8 +87,18 @@ solo_to_lilypond <- function(solo_tbl, file = "solo.pdf", key = "c", tempo = 120
            true_ioi = c(diff(mpos), NA),
            end_beat = floor(end_pos / ticks_per_beat) ,
            over_beat = beat != end_beat)
+  #browser()
+
   if(tmp[1,]$beat_pos != 0){
-    patch_row <- tmp[1,] %>% mutate(pitch = -1, ioi = mpos, mpos = 0, overbeat = F)
+    patch_row <- tmp[1,] %>% mutate(pitch = -1,
+                                    ioi = mpos,
+                                    mpos = 0,
+                                    bar = 0,
+                                    beat = 0, beat_pos = 0,
+                                    end_pos = ioi,
+                                    true_ioi = 5,
+                                    end_beat = floor(ioi / ticks_per_beat),
+                                    over_beat = ioi > 4)
     tmp <- bind_rows(patch_row, tmp)
   }
   #browser()
@@ -99,11 +109,17 @@ solo_to_lilypond <- function(solo_tbl, file = "solo.pdf", key = "c", tempo = 120
   tmp <- tmp %>%
     filter(ioi != true_ioi, mpos != 0) %>%
     mutate(pitch = -1,
+           mpos = mpos + ioi,
            ioi = true_ioi - ioi,
-           beat_pos = (beat_pos + ioi) %% ticks_per_beat) %>%
+           true_ioi = ioi,
+           bar = floor(mpos / ticks_per_bar),
+           beat = floor(mpos / ticks_per_beat) ,
+           beat_pos = mpos %% ticks_per_beat,
+           end_pos = mpos + ioi - 1,
+           end_beat = floor(end_pos / ticks_per_beat) ,
+           over_beat = beat != end_beat) %>%
     mutate(tabr_dur = ioi_to_tabr_dur(ioi)) %>%
     bind_rows(tmp)
-
   good_iois <- tmp %>% filter(tabr_dur != "split", !over_beat)
   bad_iois <- tmp %>% filter(tabr_dur == "split" | over_beat)
 
@@ -127,11 +143,19 @@ solo_to_lilypond <- function(solo_tbl, file = "solo.pdf", key = "c", tempo = 120
     browser()
   }
   notes <- sprintf("%s%s", get_tabr_note(tmp$pitch), tmp$tilde)
-
+  chord_seq <- NULL
+  attached_lead_sheet <- attr(solo_tbl, "lead_sheet")
+  if(!is.null(attached_lead_sheet)){
+    chord_seq <- setNames(4/attached_lead_sheet$duration, chord_to_lilypond(attached_lead_sheet$chord))
+  }
+  if(!is.null(lead_sheet)){
+    chord_seq <- setNames(4/lead_sheet$duration, chord_to_lilypond(lead_sheet$chord))
+  }
+  browser()
   tabr::as_music(notes = notes, info = tmp$tabr_dur) %>%
     p() %>%
     track(tab = F) %>%
-    score()  %>%
+    score(chord_seq = chord_seq)  %>%
     tab(file = file, key = key, time = "4/4", tempo = sprintf("4 = %s", tempo))
 }
 

R/interval_grammar.R

@@ -4,11 +4,27 @@ printf <- function(...) print(sprintf(...))
 messagef <- function(...) if(parkR::parkr_options()$debug) message(sprintf(...))
 
 #' @export
-value_to_vec <- function(value_str){
+value_to_vec <- function(value_str, type = c("integer", "character"), collapse = ""){
+  type <- match.arg(type)
   vec <- gsub("\\[", "", as.character(value_str))
   vec <- gsub("\\]", "", vec)
+  vec <- gsub("[\\{\\(]+", "", vec)
+  vec <- gsub("[\\}\\)]+", "", vec)
   vec <- gsub(" ", "", vec)
-  as.integer(unlist(strsplit(vec, ",")))
+  if(type == "integer"){
+    as.integer(unlist(strsplit(vec, ",")))
+    ret <- map(strsplit(vec, ","), ~{as.integer(.x)})
+    if(length(value_str) == 1){
+      ret <- ret[[1]]
+    }
+  }
+  else {
+    ret <- strsplit(vec, ",")
+    if(!is.null(collapse) & !nzchar(collapse)){
+      ret <- map(ret, ~{paste(.x, collapse = collapse)}) %>% unlist()
+    }
+  }
+  ret
 }
 
 # column_to_vector <- function(tbf, col_name) tbf[[col_name]]

data-raw/data_import.R

@@ -1,7 +1,7 @@
 library(tidyverse)
 F_blues <- tibble(chord = c("F7","Bb7", "F7",  "Cmin7", "F7", "Bb7", "Bb7", "F7", "F7", "Gmin7", "C7", "F7", "F7"),
-                length_beats = as.integer(c(4, 4, 4, 2, 2, 4, 4, 4, 4, 4, 4, 4, 4)))
-F_blues <- F_blues %>% mutate(length_ticks = length_beats*4) %>%
+                duration = as.integer(c(4, 4, 4, 2, 2, 4, 4, 4, 4, 4, 4, 4, 4)))
+F_blues <- F_blues %>% mutate(length_ticks = duration * 4) %>%
   mutate(parsed = map(chord, parkR::parse_chord)) %>%
   tidyr::unnest(cols = parsed)
 F_blues$onset_ticks <- cumsum(F_blues$length_ticks)