diff options
Diffstat (limited to 'morphology-img/src/file_gen.rs')
| -rw-r--r-- | morphology-img/src/file_gen.rs | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/morphology-img/src/file_gen.rs b/morphology-img/src/file_gen.rs index dffb7bb..7bcae49 100644 --- a/morphology-img/src/file_gen.rs +++ b/morphology-img/src/file_gen.rs @@ -6,7 +6,7 @@ use tempfile::TempDir; use morphology::Sequence; use crate::error::RenderError; use crate::template; -use crate::note::{sequence_to_notes, notes_to_markup}; +use crate::note::{sequence_to_notes, notes_to_markup, sequence_to_staff, staff_to_scheme_string}; /// Generates a filename for a sequence with proper zero-padding. /// @@ -115,10 +115,16 @@ pub fn generate_ly_file( let notes = sequence_to_notes(sequence); // Convert notes to markup string - let markup = notes_to_markup(¬es); + let morpheme = notes_to_markup(¬es); - // Substitute into template - let ly_content = template::substitute_template(&markup)?; + // Convert sequence to staff line positions + let staff = sequence_to_staff(sequence); + + // Convert staff to Scheme list string + let rungs = staff_to_scheme_string(&staff); + + // Substitute both values into template + let ly_content = template::substitute_template(&morpheme, &rungs)?; // Write to file (UTF-8) fs::write(output_path, ly_content)?; |