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 7bcae49..8040674 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, sequence_to_staff, staff_to_scheme_string}; +use crate::note::{sequence_to_notes, notes_to_markup, sequence_to_staff, sequence_to_ledgers, vector_to_scheme}; /// Generates a filename for a sequence with proper zero-padding. /// @@ -121,10 +121,16 @@ pub fn generate_ly_file( let staff = sequence_to_staff(sequence); // Convert staff to Scheme list string - let rungs = staff_to_scheme_string(&staff); + let rungs = vector_to_scheme(&staff); - // Substitute both values into template - let ly_content = template::substitute_template(&morpheme, &rungs)?; + // Convert sequence to ledger line positions + let ledger_positions = sequence_to_ledgers(sequence); + + // Convert ledgers to Scheme list string + let ledgers = vector_to_scheme(&ledger_positions); + + // Substitute all values into template + let ly_content = template::substitute_template(&morpheme, &rungs, &ledgers)?; // Write to file (UTF-8) fs::write(output_path, ly_content)?; |