Added experimental scala scale parser

ziffers/classes/__init__.py

@@ -1,3 +1,3 @@
 from .items import *
-from .sequences import *
 from .root import *
+from .sequences import *

ziffers/classes/items.py

@@ -1,5 +1,6 @@
 """ Ziffers item classes """
 from dataclasses import dataclass, field, asdict
+from math import floor
 import operator
 import random
 from ..scale import (
@@ -171,6 +172,7 @@ class Pitch(Event):
     """Class for pitch in time"""
 
     pitch_class: int
+    pitch_bend: float = field(default=None)
     octave: int = field(default=None)
     modifier: int = field(default=None)
     note: int = field(default=None)
@@ -206,6 +208,10 @@ class Pitch(Event):
     def get_pitch_class(self):
         """Getter for pitche"""
         return self.pitch_class
+    
+    def get_pitch_bend(self):
+        """Getter for pitche"""
+        return self.pitch_bend
 
     def update_note(self, force: bool = False):
         """Update note if Key, Scale and Pitch-class are present"""
@@ -215,15 +221,16 @@ class Pitch(Event):
             and (self.pitch_class is not None)
             and (self.note is None or force)
         ):
-            note = note_from_pc(
+            note, pitch_bend = note_from_pc(
                 root=self.key,
                 pitch_class=self.pitch_class,
                 intervals=self.scale,
                 modifier=self.modifier if self.modifier is not None else 0,
                 octave=self.octave if self.octave is not None else 0,
             )
+            self.pitch_bend = pitch_bend
             self.freq = midi_to_freq(note)
-            self.note = note
+            self.note = floor(note)
         if self.duration is not None:
             self.beat = self.duration * 4
 
@@ -296,6 +303,7 @@ class Chord(Event):
     notes: list[int] = field(default=None)
     inversions: int = field(default=None)
     pitches: list[int] = field(default=None, init=False)
+    pitch_bends: list[int] = field(default=None, init=False)
     freqs: list[float] = field(default=None, init=False)
     octaves: list[int] = field(default=None, init=False)
     durations: list[float] = field(default=None, init=False)
@@ -333,6 +341,10 @@ class Chord(Event):
     def get_pitch_class(self):
         """Getter for  pitches"""
         return self.pitches
+    
+    def get_pitch_bend(self):
+        """Getter for pitche"""
+        return self.pitch_bends
 
     def get_duration(self):
         """Getter for  durations"""
@@ -353,7 +365,7 @@ class Chord(Event):
 
     def update_notes(self, options=None):
         """Update notes"""
-        pitches, notes, freqs, octaves, durations, beats = ([] for _ in range(6))
+        pitches, pitch_bends, notes, freqs, octaves, durations, beats = ([] for _ in range(7))
 
         # Update notes
         for pitch in self.pitch_classes:
@@ -367,6 +379,7 @@ class Chord(Event):
         # Create helper lists
         for pitch in self.pitch_classes:
             pitches.append(pitch.pitch_class)
+            pitch_bends.append(pitch.pitch_bend)
             notes.append(pitch.note)
             freqs.append(pitch.freq)
             octaves.append(pitch.octave)
@@ -374,6 +387,7 @@ class Chord(Event):
             beats.append(pitch.beat)
 
         self.pitches = pitches
+        self.pitch_bends = pitch_bends
         self.notes = notes
         self.freqs = freqs
         self.octaves = octaves

ziffers/classes/root.py

@@ -109,6 +109,14 @@ class Ziffers(Sequence):
             for val in self.evaluated_values
             if isinstance(val, (Pitch, Chord))
         ]
+    
+    def pitch_bends(self) -> list[int]:
+        """Return list of pitch bend values"""
+        return [
+            val.get_pitch_bend()
+            for val in self.evaluated_values
+            if isinstance(val, (Pitch, Chord))
+        ]
 
     def notes(self) -> list[int]:
         """Return list of midi notes"""

ziffers/classes/sequences.py

@@ -1,6 +1,7 @@
 """ Sequence classes for Ziffers """
 from dataclasses import dataclass, field, replace
 from itertools import product
+from math import floor
 from types import LambdaType
 from copy import deepcopy
 from ..defaults import DEFAULT_OPTIONS
@@ -190,7 +191,7 @@ def create_pitch(current: Item, options: dict) -> Pitch:
 
     current_value = current.get_value(merged_options)
 
-    note = note_from_pc(
+    note, pitch_bend = note_from_pc(
         root=merged_options["key"],
         pitch_class=current_value,
         intervals=merged_options["scale"],
@@ -200,8 +201,9 @@ def create_pitch(current: Item, options: dict) -> Pitch:
     new_pitch = Pitch(
         pitch_class=current_value,
         text=str(current_value),
-        note=note,
         freq=midi_to_freq(note),
+        note=floor(note),
+        pitch_bend=pitch_bend,
         octave=c_octave,
         modifier=c_modifier,
         kwargs=merged_options,