Compare commits

..

3 Commits

Author SHA1 Message Date
kennethreitz 6efa4f18ce v0.39.0: Articulations, ramp(), drop numeral, djembe expansion
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-28 17:51:29 -04:00
kennethreitz 06fc4cabb7 Drop numeral dependency, inline Roman numeral helpers
Replace the numeral package with ~30 lines of int2roman()/roman2int()
in _statics.py. Reduces supply chain surface. Fixes #47.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-28 17:48:22 -04:00
kennethreitz d3a93c18b3 Add song #31: Acid Tabla (303 + tabla fusion)
Showcases ramp(), articulations, Part.hit(), filter automation,
and cross-genre fusion. 303 acid bass with tabla entering at the
peak and riding through the outro.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
2026-03-28 17:26:20 -04:00
8 changed files with 182 additions and 23 deletions
+16
View File
@@ -2,6 +2,22 @@
All notable changes to PyTheory are documented here.
## 0.39.0
- **Dropped `numeral` dependency** — Roman numeral helpers inlined,
reducing supply chain surface (#47)
- **`Part.ramp()`** — smooth parameter automation with 4 interpolation
curves (linear, ease_in, ease_out, ease_in_out)
- **Articulations** — staccato, legato, marcato, tenuto, accent, fermata
- **Dynamic curves** — crescendo(), decrescendo(), swell(), dynamics()
- **`Part.hit()`** — individual drum sounds with articulation support
- **Cross-choke drum damping** — djembe, hi-hats, cajón, doumbek
- **5 new djembe patterns** + 3 djembe fills (30 fills total)
- **6 new drum fills** — 3 cajón, 3 metal
- **Duration arithmetic** — multiply, divide, add
- **Improved djembe slap** synthesis
- Song #31: Acid Tabla
## 0.38.2
- **`Part.ramp()`** — smooth parameter automation from current value to
+118 -1
View File
@@ -2324,6 +2324,122 @@ def sitar_drone():
play_song(score, "Sitar Drone — Raga Bhairav (22-Shruti JI, hold() polyphony)")
def acid_tabla():
"""Acid Tabla — 303 filter automation meets Indian percussion."""
score = Score("4/4", bpm=132)
# ── House drums ──
score.drums("house", repeats=20, fill="house", fill_every=8)
score.set_drum_effects(volume=0.45)
# ── 303 acid bass ──
acid = score.part("acid", synth="saw", volume=0.75,
legato=True, glide=0.035,
distortion=0.35, distortion_drive=4.5,
saturation=0.15, humanize=0.05)
# Intro (4 bars): filter closed, high resonance
acid.set(lowpass=600, lowpass_q=12.0)
for _ in range(4):
for n in ["C3","C3","C2","C3","Eb3","C2","G2","C3"]:
acid.add(n, Duration.EIGHTH)
# Build (4 bars): filter opens
acid.ramp(over=Duration.WHOLE * 4, curve="ease_in", lowpass=4500)
for _ in range(4):
for n in ["C2","G2","C3","Eb3","C2","Bb2","G2","C3"]:
acid.add(n, Duration.EIGHTH)
# Peak (4 bars): wide open, wilder pattern
acid.set(lowpass=7000, lowpass_q=7.0)
for _ in range(2):
for n in ["C2","C3","Eb3","G3","C2","Bb2","G2","Eb3"]:
acid.add(n, Duration.EIGHTH)
for _ in range(2):
for n in ["C2","Eb3","C3","G3","Bb2","C3","G2","C2"]:
acid.add(n, Duration.EIGHTH)
# Tabla section (4 bars): filter pulls back
acid.set(lowpass=3000, lowpass_q=5.0)
for _ in range(4):
for n in ["C2","G2","C3","C2","Eb2","G2","Bb2","C2"]:
acid.add(n, Duration.EIGHTH)
# Outro (4 bars): filter closes
acid.ramp(over=Duration.WHOLE * 4, curve="ease_out", lowpass=400, lowpass_q=15.0)
for _ in range(4):
for n in ["C3","G2","C2","C3","C2","G2","Eb2","C2"]:
acid.add(n, Duration.EIGHTH)
# ── Tabla: enters bar 9, rides through to the end ──
tabla = score.part("tabla", synth="sine", volume=0.55, reverb=0.15)
# 8 bars rest
for _ in range(64):
tabla.rest(Duration.EIGHTH)
# Bars 9-12: keherwa groove
for _ in range(4):
tabla.hit(DrumSound.TABLA_DHA, Duration.EIGHTH, velocity=100, articulation="accent")
tabla.hit(DrumSound.TABLA_TIT, Duration.EIGHTH, velocity=55)
tabla.hit(DrumSound.TABLA_TIT, Duration.EIGHTH, velocity=50)
tabla.hit(DrumSound.TABLA_NA, Duration.EIGHTH, velocity=88)
tabla.hit(DrumSound.TABLA_TIN, Duration.EIGHTH, velocity=82)
tabla.hit(DrumSound.TABLA_TIT, Duration.EIGHTH, velocity=52)
tabla.hit(DrumSound.TABLA_DHA, Duration.EIGHTH, velocity=95, articulation="accent")
tabla.hit(DrumSound.TABLA_GE, Duration.EIGHTH, velocity=78)
# Bars 13-14: busier with 16ths
for _ in range(2):
tabla.hit(DrumSound.TABLA_DHA, Duration.EIGHTH, velocity=105, articulation="marcato")
tabla.hit(DrumSound.TABLA_TIT, Duration.SIXTEENTH, velocity=48)
tabla.hit(DrumSound.TABLA_TIT, Duration.SIXTEENTH, velocity=52)
tabla.hit(DrumSound.TABLA_NA, Duration.EIGHTH, velocity=90)
tabla.hit(DrumSound.TABLA_TIN, Duration.EIGHTH, velocity=85)
tabla.hit(DrumSound.TABLA_TIT, Duration.SIXTEENTH, velocity=48)
tabla.hit(DrumSound.TABLA_NA, Duration.SIXTEENTH, velocity=58)
tabla.hit(DrumSound.TABLA_DHA, Duration.EIGHTH, velocity=100, articulation="accent")
tabla.hit(DrumSound.TABLA_GE_BEND, Duration.EIGHTH, velocity=88)
# Bars 15-16: tihai crescendo ending
for vel in [85, 90, 95]:
tabla.hit(DrumSound.TABLA_DHA, Duration.EIGHTH, velocity=vel, articulation="accent")
tabla.hit(DrumSound.TABLA_TIT, Duration.SIXTEENTH, velocity=int(vel * 0.6))
tabla.hit(DrumSound.TABLA_NA, Duration.SIXTEENTH, velocity=int(vel * 0.75))
for vel in [100, 105, 110]:
tabla.hit(DrumSound.TABLA_DHA, Duration.EIGHTH, velocity=vel, articulation="marcato")
tabla.hit(DrumSound.TABLA_TIT, Duration.SIXTEENTH, velocity=int(vel * 0.55))
tabla.hit(DrumSound.TABLA_NA, Duration.SIXTEENTH, velocity=int(vel * 0.7))
tabla.hit(DrumSound.TABLA_DHA, Duration.QUARTER, velocity=127, articulation="fermata")
tabla.hit(DrumSound.TABLA_GE_BEND, Duration.QUARTER, velocity=110)
tabla.rest(Duration.HALF)
# Bars 17-20: tabla continues through outro, lighter
for _ in range(4):
tabla.hit(DrumSound.TABLA_DHA, Duration.EIGHTH, velocity=85, articulation="accent")
tabla.hit(DrumSound.TABLA_TIT, Duration.EIGHTH, velocity=45)
tabla.hit(DrumSound.TABLA_TIT, Duration.EIGHTH, velocity=42)
tabla.hit(DrumSound.TABLA_NA, Duration.EIGHTH, velocity=75)
tabla.hit(DrumSound.TABLA_TIN, Duration.EIGHTH, velocity=70)
tabla.hit(DrumSound.TABLA_TIT, Duration.EIGHTH, velocity=42)
tabla.hit(DrumSound.TABLA_DHA, Duration.EIGHTH, velocity=80)
tabla.hit(DrumSound.TABLA_GE, Duration.EIGHTH, velocity=65)
# ── Pad: enters at peak, fades during outro ──
pad = score.part("pad", synth="supersaw", envelope="pad", volume=0.0,
reverb=0.4, chorus=0.2, detune=10, lowpass=2500)
for _ in range(32):
pad.rest(Duration.QUARTER)
pad.ramp(over=Duration.WHOLE * 2, volume=0.18)
for sym in ["Cm", "Ab", "Eb", "Bb"] * 3:
pad.add(Chord.from_symbol(sym), Duration.WHOLE)
pad.ramp(over=Duration.WHOLE * 2, curve="ease_out", volume=0.0)
for sym in ["Cm", "Cm"]:
pad.add(Chord.from_symbol(sym), Duration.WHOLE)
play_song(score, "Acid Tabla — 303 filter automation + tabla (ramp, articulations, Part.hit)")
SONGS = {
"1": ("Bossa Nova in A minor", bossa_nova_girl),
"2": ("Bebop in Bb major", bebop_in_bb),
@@ -2355,6 +2471,7 @@ SONGS = {
"28": ("Descent (Generative — different every time)", descent),
"29": ("Pop Rock (I-V-vi-IV)", pop_rock),
"30": ("Sitar Drone (Bhairav, hold() polyphony)", sitar_drone),
"31": ("Acid Tabla (303 + tabla, ramp, articulations)", acid_tabla),
}
if __name__ == "__main__":
@@ -2368,7 +2485,7 @@ if __name__ == "__main__":
print(f" {key:>2}. {name}")
print()
choice = input(" Pick a song (1-30, or 'all'): ").strip()
choice = input(" Pick a song (1-31, or 'all'): ").strip()
print()
if choice == "all":
+1 -2
View File
@@ -1,6 +1,6 @@
[project]
name = "pytheory"
version = "0.38.2"
version = "0.39.0"
description = "Music Theory for Humans"
readme = "README.md"
license = "MIT"
@@ -21,7 +21,6 @@ classifiers = [
"Programming Language :: Python :: 3.13",
]
dependencies = [
"numeral",
"sounddevice",
"scipy",
]
+1 -1
View File
@@ -1,6 +1,6 @@
"""PyTheory: Music Theory for Humans."""
__version__ = "0.38.2"
__version__ = "0.39.0"
from .tones import Tone, Interval
from .systems import System, SYSTEMS, TET
+37
View File
@@ -2,6 +2,43 @@ import math
REFERENCE_A = 440
# ── Roman numeral helpers (replaces `numeral` package) ───────────────────
_ROMAN_MAP = [
(1000, "M"), (900, "CM"), (500, "D"), (400, "CD"),
(100, "C"), (90, "XC"), (50, "L"), (40, "XL"),
(10, "X"), (9, "IX"), (5, "V"), (4, "IV"), (1, "I"),
]
_ROMAN_VALUES = {
"I": 1, "V": 5, "X": 10, "L": 50, "C": 100, "D": 500, "M": 1000,
}
def int2roman(n: int) -> str:
"""Convert an integer to an uppercase Roman numeral string."""
result = []
for value, numeral in _ROMAN_MAP:
while n >= value:
result.append(numeral)
n -= value
return "".join(result)
def roman2int(s: str) -> int:
"""Convert a Roman numeral string (case-insensitive) to an integer."""
s = s.upper()
total = 0
prev = 0
for ch in reversed(s):
val = _ROMAN_VALUES.get(ch, 0)
if val < prev:
total -= val
else:
total += val
prev = val
return total
# Index of C in the Western tone list (A=0, A#=1, B=2, C=3, ...).
# Scientific pitch notation changes octave at C, not A, so this offset
# is needed for all octave arithmetic.
+2 -2
View File
@@ -849,7 +849,7 @@ class Chord:
>>> Chord([D4, F4, A4]).analyze("C")
'ii'
"""
import numeral as numeral_mod
from ._statics import int2roman
from .scales import TonedScale
from .systems import SYSTEMS
from .tones import Tone
@@ -874,7 +874,7 @@ class Chord:
scale_names = [t.name for t in scale.tones[:-1]]
def _build_numeral(root, quality, degree_idx, prefix=""):
numeral_str = numeral_mod.int2roman(degree_idx + 1, only_ascii=True)
numeral_str = int2roman(degree_idx + 1)
suffix = ""
if "minor" in quality:
numeral_str = numeral_str.lower()
+6 -6
View File
@@ -2,8 +2,6 @@ from __future__ import annotations
from typing import Optional, Union
import numeral
from .systems import SYSTEMS, System
from .tones import Tone
@@ -49,7 +47,8 @@ class Scale:
def __repr__(self) -> str:
r = []
for (i, tone) in enumerate(self.tones):
degree = numeral.int2roman(i + 1, only_ascii=True)
from ._statics import int2roman
degree = int2roman(i + 1)
r += [f"{degree}={tone.full_name}"]
r = " ".join(r)
@@ -200,7 +199,7 @@ class Scale:
>>> scale.progression("I", "IV", "V", "I")
[<Chord (C,E,G)>, <Chord (F,A,C)>, <Chord (G,B,D)>, <Chord (C,E,G)>]
"""
import numeral as numeral_mod
from ._statics import roman2int
chords = []
for num in numerals:
is_seventh = num.endswith("7")
@@ -213,7 +212,7 @@ class Scale:
elif clean.startswith("#") and len(clean) > 1:
clean = clean[1:]
flat_offset = 1 # one semitone up
degree = numeral_mod.roman2int(clean.upper()) - 1
degree = roman2int(clean.upper()) - 1
if is_seventh:
chord = self.seventh(degree)
else:
@@ -406,7 +405,8 @@ class Scale:
if isinstance(item, str):
degrees = []
for (i, tone) in enumerate(self.tones):
degrees.append(numeral.int2roman(i + 1, only_ascii=True))
from ._statics import int2roman
degrees.append(int2roman(i + 1))
if item in degrees:
item = degrees.index(item)
Generated
+1 -11
View File
@@ -486,14 +486,6 @@ wheels = [
{ url = "https://files.pythonhosted.org/packages/d3/ac/686789b9145413f1a61878c407210e41bfdb097976864e0913078b24098c/myst_parser-5.0.0-py3-none-any.whl", hash = "sha256:ab31e516024918296e169139072b81592336f2fef55b8986aa31c9f04b5f7211", size = 84533, upload-time = "2026-01-15T09:08:16.788Z" },
]
[[package]]
name = "numeral"
version = "0.1.0.17"
source = { registry = "https://pypi.org/simple" }
wheels = [
{ url = "https://files.pythonhosted.org/packages/17/0d/ac6a186e169fcbdfea316f78fb5e34981bcf8d5c1d7cc8b6581f597e1e4c/numeral-0.1.0.17-py2.py3-none-any.whl", hash = "sha256:7dff0c1efb9b3655c9c1dc93b4666993741b15abcac0dc01dcb96b21cc20f6ae", size = 22066, upload-time = "2020-04-12T08:24:59.129Z" },
]
[[package]]
name = "numpy"
version = "2.2.6"
@@ -698,10 +690,9 @@ wheels = [
[[package]]
name = "pytheory"
version = "0.38.2"
version = "0.39.0"
source = { editable = "." }
dependencies = [
{ name = "numeral" },
{ name = "scipy", version = "1.15.3", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version < '3.11'" },
{ name = "scipy", version = "1.17.1", source = { registry = "https://pypi.org/simple" }, marker = "python_full_version >= '3.11'" },
{ name = "sounddevice" },
@@ -721,7 +712,6 @@ docs = [
[package.metadata]
requires-dist = [
{ name = "numeral" },
{ name = "scipy" },
{ name = "sounddevice" },
]