diff options
Diffstat (limited to 'morphology-img/src')
| -rw-r--r-- | morphology-img/src/file_gen.rs | 14 | ||||
| -rw-r--r-- | morphology-img/src/note.rs | 86 | ||||
| -rw-r--r-- | morphology-img/src/template.rs | 13 |
3 files changed, 100 insertions, 13 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)?; diff --git a/morphology-img/src/note.rs b/morphology-img/src/note.rs index 408884d..e3f44ef 100644 --- a/morphology-img/src/note.rs +++ b/morphology-img/src/note.rs @@ -191,25 +191,97 @@ pub fn sequence_to_staff(sequence: &morphology::Sequence) -> Vec<i32> { rungs } -/// Converts staff line positions to a LilyPond Scheme list string. +/// Converts an integer vector to a LilyPond Scheme list string. /// /// # Arguments -/// - `rungs`: Vector of staff line positions +/// - `values`: Vector of integers /// /// # Returns /// A string representing a Scheme list, e.g., "#'(-5 0 5)" /// /// # Examples /// ``` -/// use morphology_img::note::staff_to_scheme_string; +/// use morphology_img::note::vector_to_scheme; /// -/// let rungs = vec![-5, 0, 5]; -/// assert_eq!(staff_to_scheme_string(&rungs), "#'(-5 0 5)"); +/// let values = vec![-5, 0, 5]; +/// assert_eq!(vector_to_scheme(&values), "#'(-5 0 5)"); /// ``` -pub fn staff_to_scheme_string(rungs: &[i32]) -> String { +pub fn vector_to_scheme(values: &[i32]) -> String { use itertools::Itertools; - format!("#'({})", rungs.iter().map(|r| r.to_string()).join(" ")) + format!("#'({})", values.iter().map(|v| v.to_string()).join(" ")) +} + +/// Converts a meta-affine sequence to ledger line positions. +/// +/// This function computes ledger line positions based on even inner values +/// in each subset of values grouped by outer value. +/// +/// # Algorithm +/// For each subset of values with the same outer value: +/// 1. Find min and max inner values in the subset +/// 2. For all even integers in the range [min_inner, max_inner]: +/// - Include (outer * factor) + n in the ledger positions +/// +/// # Arguments +/// - `sequence`: The meta-affine sequence to analyze +/// +/// # Returns +/// A sorted vector of ledger line positions +/// +/// # Examples +/// ``` +/// use morphology::{Sequence, Value}; +/// use morphology_img::note::sequence_to_ledgers; +/// +/// let seq = Sequence::new(vec![ +/// Value::new(1, 0), +/// Value::new(-1, -1), +/// Value::new(-1, -2), +/// Value::new(-1, 0), +/// Value::new(0, 0), +/// ]); +/// +/// // Subsets by outer: +/// // outer=1: inner=[0], range [0,0], even: 0 -> ledger: (1*5)+0 = 5 +/// // outer=-1: inner=[-1,-2,0], range [-2,0], even: -2,0 -> ledgers: -7, -5 +/// // outer=0: inner=[0], range [0,0], even: 0 -> ledger: (0*5)+0 = 0 +/// let ledgers = sequence_to_ledgers(&seq); +/// assert_eq!(ledgers, vec![-7, -5, 0, 5]); +/// ``` +pub fn sequence_to_ledgers(sequence: &morphology::Sequence) -> Vec<i32> { + use std::collections::HashMap; + + let factor = calculate_factor(sequence); + + // Group values by outer + let mut groups: HashMap<i32, Vec<i32>> = HashMap::new(); + for value in sequence.values() { + groups.entry(value.outer) + .or_insert_with(Vec::new) + .push(value.inner); + } + + let mut ledgers = Vec::new(); + + // Process each group + for (outer, inners) in groups { + let min_inner = *inners.iter().min().unwrap(); + let max_inner = *inners.iter().max().unwrap(); + + // Find all even integers in [min_inner, max_inner] + for n in min_inner..=max_inner { + if n % 2 == 0 { + ledgers.push((outer * factor) + n); + } + } + } + + // Sort and deduplicate + ledgers.sort(); + ledgers.dedup(); + + ledgers } /// Converts a vector of LilyPond notes into a space-separated string. diff --git a/morphology-img/src/template.rs b/morphology-img/src/template.rs index e552843..9a66000 100644 --- a/morphology-img/src/template.rs +++ b/morphology-img/src/template.rs @@ -10,6 +10,7 @@ const ELEMENTS_ILY: &str = include_str!("../static/elements.ily"); const MORPHEME_PLACEHOLDER: &str = "%MORPHEME%"; const RUNGS_PLACEHOLDER: &str = "%RUNGS%"; +const LEDGERS_PLACEHOLDER: &str = "%LEDGERS%"; /// Returns the template .ly content pub fn get_template() -> &'static str { @@ -36,13 +37,14 @@ pub fn get_elements_ily() -> &'static str { /// # Arguments /// - `morpheme`: The LilyPond morpheme markup to substitute /// - `rungs`: The Scheme list string for staff line positions +/// - `ledgers`: The Scheme list string for ledger line positions /// /// # Returns /// The complete .ly file content with substitutions applied /// /// # Errors /// Returns `RenderError::Template` if placeholders are not found -pub fn substitute_template(morpheme: &str, rungs: &str) -> Result<String, RenderError> { +pub fn substitute_template(morpheme: &str, rungs: &str, ledgers: &str) -> Result<String, RenderError> { let template = get_template(); if !template.contains(MORPHEME_PLACEHOLDER) { @@ -57,9 +59,16 @@ pub fn substitute_template(morpheme: &str, rungs: &str) -> Result<String, Render )); } + if !template.contains(LEDGERS_PLACEHOLDER) { + return Err(RenderError::Template( + "Template does not contain placeholder '%LEDGERS%'".to_string() + )); + } + let result = template .replace(MORPHEME_PLACEHOLDER, morpheme) - .replace(RUNGS_PLACEHOLDER, rungs); + .replace(RUNGS_PLACEHOLDER, rungs) + .replace(LEDGERS_PLACEHOLDER, ledgers); Ok(result) } |