mm-lilypond 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd930b1d2e25368ab27876e5c0a80e7551eec8f599353892322ed8514f5dfdab
-  data.tar.gz: 02d6e331e9768b36cbbdd38aed6b72ea94fe73c6b7d5c85f0c9b0bbbcb0ae101
+  metadata.gz: fdbfb6d2f24f1d1080cd6ea6559ade00260f830a2c092680bcea1b095b189c8e
+  data.tar.gz: a240526e7b535154b73af7d698ac39e2456acb531c61d31e82a5e4a1fef81c82
 SHA512:
-  metadata.gz: 48e39b98a3f8896df5dd14da6d366b4c07e7f4ebf5e8298bf332db59bf152caa8ee59bae2f803750d5ab83891a15093d678a653cca85f19816d1c1817dc2d3be
-  data.tar.gz: cab4a1af508f392e4bb1e073198eeaf69bdfd7861badaf070d4fe948297d38d4069253a15115f007d2b6737efa3ee1e48d86557b75cfc57d033cf2c622867f4a
+  metadata.gz: 1fc161114967aceae870bfbe23d5daed473cbb0afefb92020935df1474026c2313717a579445c9483dbe74c7d19639d8f0e1433bc56bc8ec165b318deb9fae42
+  data.tar.gz: aa56e773fe514b8c126e7ecbf1d5dc68e95f40482aef1c71b5978231a922c27f8a0306ba9b96ae54af2947ae1bb93fe6654b8e2a1080c28217cf08922d1c6403

data/lib/mm/lilypond.rb

@@ -1,119 +1,134 @@
-require 'mm'
-require 'pry'
-require 'erb'
-
-class MM::Lilypond
-  VERSION = "1.1.0"
-
-  attr_accessor :offset, :basenames, :prime_limit, :prime_steps
-  attr_writer :template
-
-  def initialize prime_limit: nil
-    # offset is around the circle of fifths
-    @offset = 2 
-    @basenames = ["c", "g", "d", "a", "e", "b", 
-                  "fsharp", "csharp", "gsharp", "dsharp", "asharp", "esharp", "bsharp", 
-                  "fdoublesharp", "cdoublesharp", "gdoublesharp", "ddoublesharp", "adoublesharp", "edoublesharp", "bdoublesharp", 
-                  "fdoubleflat", "cdoubleflat", "gdoubleflat", "ddoubleflat", "adoubleflat", "edoubleflat", "bdoubleflat",
-                  "fflat", "cflat", "gflat", "dflat", "aflat", "eflat", "bflat", "f"]
-    @prime_limit = prime_limit
-    @prime_steps = [1, 4, -2, -1, 3]
-  end
-
-  def get_pitch ratio
-    basename = get_basename ratio
-    alteration = get_alteration ratio
-    octave = get_octave ratio
-    basename + alteration + octave
-  end
-
-  def get_basename ratio
-    @basenames[@offset + get_steps(ratio)].dup
-  end
-
-  def get_alteration ratio
-    ratio.factors.reject {|f| @prime_limit && f[0] > @prime_limit}.map {|f|
-      case f[0]
-      when 5
-        collect_string f[1], "f"
-      when 7
-        collect_string f[1], "s"
-      when 11
-        collect_string f[1] * -1, "e"
-      when 13
-        collect_string f[1], "t"
-      end
-    }.join("")
-  end
-
-  def get_octave ratio
-    offset = (@offset * 4) % 7
-    degrees = ratio.factors.inject(0) {|d, f|
-      d + case f[0]
-      when 2
-        f[1] * 7
-      when 3
-        f[1] * 11
-      when 5
-        f[1] * 16
-      when 7
-        f[1] * 20
-      when 11
-        f[1] * 24
-      when 13
-        f[1] * 26
-      else
-        0
-      end
-    } + offset
-    if degrees > 0
-      (degrees / 7.0).floor.times.map {"'"}.join("")
-    else
-      (degrees / -7.0).ceil.times.map {","}.join("")
-    end
-  end
-
-  def get_duration ratio
-    "1*#{ratio.reciprocal.to_s}"
-  end
-
-  def full_note ratio
-    get_pitch(ratio) + get_duration(ratio)
-  end
-
-  def render ratios
-    my_music = ratios.map {|r| self.full_note r}.join(" ")
-    output = ERB.new @template
-    output.result(binding)
-  end
-
-  private
-
-  def collect_string times, string
-    if times > 0
-      times.times.collect {"D#{string}"}
-    else
-      (times * -1).times.collect {"U#{string}"}
-    end
-  end
-
-  def get_steps ratio
-    ratio.factors.inject(0) {|memo, f|
-      memo + case f[0]
-      when 3
-        f[1] * @prime_steps[0]
-      when 5
-        f[1] * @prime_steps[1]
-      when 7
-        f[1] * @prime_steps[2]
-      when 11
-        f[1] * @prime_steps[3]
-      when 13
-        f[1] * @prime_steps[4]
-      else
-        0
-      end
-    }
-  end
-end
-
+require 'mm'
+require 'erb'
+
+class MM::Lilypond
+  VERSION = "1.2.0"
+
+  attr_accessor :offset, :basenames, :prime_limit, :prime_steps
+  attr_writer :template
+
+  def initialize prime_limit: nil
+    # offset is around the circle of fifths
+    @offset = 2 
+    @basenames = ["c", "g", "d", "a", "e", "b", 
+                  "fsharp", "csharp", "gsharp", "dsharp", "asharp", "esharp", "bsharp", 
+                  "fdoublesharp", "cdoublesharp", "gdoublesharp", "ddoublesharp", "adoublesharp", "edoublesharp", "bdoublesharp", 
+                  "fdoubleflat", "cdoubleflat", "gdoubleflat", "ddoubleflat", "adoubleflat", "edoubleflat", "bdoubleflat",
+                  "fflat", "cflat", "gflat", "dflat", "aflat", "eflat", "bflat", "f"]
+    @prime_limit = prime_limit
+    @prime_steps = [1, 4, -2, -1, 3]
+  end
+
+  def get_pitch ratio
+    basename = get_basename ratio
+    alteration = get_alteration ratio
+    octave = get_octave ratio
+    basename + alteration + octave
+  end
+
+  def get_basename ratio
+    @basenames[@offset + get_steps(ratio)].dup
+  end
+
+  def get_alteration ratio
+    ratio.factors.reject {|f| @prime_limit && f[0] > @prime_limit}.map {|f|
+      case f[0]
+      when 5
+        collect_string f[1], "f"
+      when 7
+        collect_string f[1], "s"
+      when 11
+        collect_string f[1] * -1, "e"
+      when 13
+        collect_string f[1], "t"
+      end
+    }.join("")
+  end
+
+  def get_octave ratio
+    offset = (@offset * 4) % 7
+    degrees = ratio.factors.inject(0) {|d, f|
+      d + case f[0]
+      when 2
+        f[1] * 7
+      when 3
+        f[1] * 11
+      when 5
+        f[1] * 16
+      when 7
+        f[1] * 20
+      when 11
+        f[1] * 24
+      when 13
+        f[1] * 26
+      else
+        0
+      end
+    } + offset
+    if degrees > 0
+      (degrees / 7.0).floor.times.map {"'"}.join("")
+    else
+      (degrees / -7.0).ceil.times.map {","}.join("")
+    end
+  end
+
+  def get_duration ratio
+    "1*#{ratio.reciprocal.to_s}"
+  end
+
+  # Gets the cents deviation from the unaltered pitch (i.e., from the equal
+  # tempered pitch of sharps, flats, naturals).
+  def cents_deviation ratio
+    unaltered = cents_of_unaltered ratio
+    deviation = (ratio.cents % 1200) - unaltered
+    if deviation < 0
+      "#{deviation.round}"
+    else
+      "+#{deviation.round}"
+    end
+  end
+
+  def cents_of_unaltered ratio
+    (get_steps(ratio) * 7) % 12 * 100.0
+  end
+
+  def full_note ratio
+    get_pitch(ratio) + get_duration(ratio)
+  end
+
+  def render ratios
+    my_music = ratios.map {|r| self.full_note r}.join(" ")
+    output = ERB.new @template
+    output.result(binding)
+  end
+
+  private
+
+  def collect_string times, string
+    if times > 0
+      times.times.collect {"D#{string}"}
+    else
+      (times * -1).times.collect {"U#{string}"}
+    end
+  end
+
+  def get_steps ratio
+    ratio.factors.inject(0) {|memo, f|
+      memo + case f[0]
+      when 3
+        f[1] * @prime_steps[0]
+      when 5
+        f[1] * @prime_steps[1]
+      when 7
+        f[1] * @prime_steps[2]
+      when 11
+        f[1] * @prime_steps[3]
+      when 13
+        f[1] * @prime_steps[4]
+      else
+        0
+      end
+    }
+  end
+end
+

data/test/mm/test_lilypond.rb

@@ -1,70 +1,80 @@
-require "minitest/autorun"
-require "mm/lilypond"
-
-module TestMM; end
-
-class TestMM::TestLilypond < Minitest::Test
-  def setup
-    @lily_parser = MM::Lilypond.new
-  end
-
-  def test_get_duration
-    assert_equal "1*2/3", @lily_parser.get_duration(MM::Ratio.new(3,2))
-  end
-
-  def test_get_basename
-    assert_equal "e", @lily_parser.get_basename(MM::Ratio.new(9,8))
-    assert_equal "fsharp", @lily_parser.get_basename(MM::Ratio.new(5,4))
-    assert_equal "c", @lily_parser.get_basename(MM::Ratio.new(7,4))
-    assert_equal "g", @lily_parser.get_basename(MM::Ratio.new(11,8))
-  end
-
-  def test_get_alteration
-    assert_equal "Df", @lily_parser.get_alteration(MM::Ratio.new(5,4))
-    assert_equal "Ds", @lily_parser.get_alteration(MM::Ratio.new(7,4))
-  end
-
-  def test_get_octave
-    assert_equal ",,", @lily_parser.get_octave(MM::Ratio.new(1,4))
-    assert_equal "'", @lily_parser.get_octave(MM::Ratio.new(9,4))
-    assert_equal "'", @lily_parser.get_octave(MM::Ratio.new(7,4))
-  end
-
-  def test_get_pitch
-    assert_equal "d", @lily_parser.get_pitch(MM::Ratio.new(1,1))
-    assert_equal "a", @lily_parser.get_pitch(MM::Ratio.new(3,2))
-    assert_equal "fsharpDf", @lily_parser.get_pitch(MM::Ratio.new(5,4))
-    assert_equal "cDs'", @lily_parser.get_pitch(MM::Ratio.new(7,4))
-    assert_equal "cDs", @lily_parser.get_pitch(MM::Ratio.new(7,8))
-    assert_equal "d'", @lily_parser.get_pitch(MM::Ratio.new(2,1))
-    assert_equal "d,", @lily_parser.get_pitch(MM::Ratio.new(1,2))
-  end
-
-  def test_get_full_note
-    assert_equal "d'1*1/2", @lily_parser.full_note(MM::Ratio.new(2,1))
-    assert_equal "aflatUfDs1*5/7", @lily_parser.full_note(MM::Ratio.new(7,5))
-  end
-
-  def test_render
-    @lily_parser.template = File.read("test/test_template.ly.erb")
-    exp = "music = { a1*2/3 cDs'1*4/7 }\n"
-    result = @lily_parser.render([MM::Ratio.new(3,2), MM::Ratio.new(7,4)])
-    assert_equal exp, result
-  end
-
-  def test_offset
-    @lily_parser.offset = 0
-    assert_equal "c", @lily_parser.get_pitch(MM::Ratio.new(1,1))
-    assert_equal "eDf", @lily_parser.get_pitch(MM::Ratio.new(5,4))
-    assert_equal "bDf", @lily_parser.get_pitch(MM::Ratio.new(15,8))
-  end
-
-  def test_prime_limit
-    @lily_parser.prime_limit = 3
-    @lily_parser.prime_steps[3] = 6
-    assert_equal "bflat", @lily_parser.get_pitch(MM::Ratio.new(14, 9))
-    assert_equal "fsharp", @lily_parser.get_pitch(MM::Ratio.new(5, 4))
-    assert_equal "gsharp", @lily_parser.get_pitch(MM::Ratio.new(11, 8))
-  end
-end
-
+require "minitest/autorun"
+require "mm/lilypond"
+
+module TestMM; end
+
+class TestMM::TestLilypond < Minitest::Test
+  def setup
+    @lily_parser = MM::Lilypond.new
+  end
+
+  def test_get_duration
+    assert_equal "1*2/3", @lily_parser.get_duration(MM::Ratio.new(3,2))
+  end
+
+  def test_get_basename
+    assert_equal "e", @lily_parser.get_basename(MM::Ratio.new(9,8))
+    assert_equal "fsharp", @lily_parser.get_basename(MM::Ratio.new(5,4))
+    assert_equal "c", @lily_parser.get_basename(MM::Ratio.new(7,4))
+    assert_equal "g", @lily_parser.get_basename(MM::Ratio.new(11,8))
+  end
+
+  def test_get_alteration
+    assert_equal "Df", @lily_parser.get_alteration(MM::Ratio.new(5,4))
+    assert_equal "Ds", @lily_parser.get_alteration(MM::Ratio.new(7,4))
+  end
+
+  def test_get_octave
+    assert_equal ",,", @lily_parser.get_octave(MM::Ratio.new(1,4))
+    assert_equal "'", @lily_parser.get_octave(MM::Ratio.new(9,4))
+    assert_equal "'", @lily_parser.get_octave(MM::Ratio.new(7,4))
+  end
+
+  def test_get_pitch
+    assert_equal "d", @lily_parser.get_pitch(MM::Ratio.new(1,1))
+    assert_equal "a", @lily_parser.get_pitch(MM::Ratio.new(3,2))
+    assert_equal "fsharpDf", @lily_parser.get_pitch(MM::Ratio.new(5,4))
+    assert_equal "cDs'", @lily_parser.get_pitch(MM::Ratio.new(7,4))
+    assert_equal "cDs", @lily_parser.get_pitch(MM::Ratio.new(7,8))
+    assert_equal "d'", @lily_parser.get_pitch(MM::Ratio.new(2,1))
+    assert_equal "d,", @lily_parser.get_pitch(MM::Ratio.new(1,2))
+  end
+
+  def test_get_full_note
+    assert_equal "d'1*1/2", @lily_parser.full_note(MM::Ratio.new(2,1))
+    assert_equal "aflatUfDs1*5/7", @lily_parser.full_note(MM::Ratio.new(7,5))
+  end
+
+  def test_cents_deviation
+    assert_equal "+2", @lily_parser.cents_deviation(MM::Ratio.new(3, 2))
+    assert_equal "-14", @lily_parser.cents_deviation(MM::Ratio.new(5, 4))
+  end
+
+  def test_cents_of_unaltered
+    assert_equal 700.0, @lily_parser.cents_of_unaltered(MM::Ratio.new(3, 2))
+    assert_equal 400.0, @lily_parser.cents_of_unaltered(MM::Ratio.new(5, 4))
+  end
+
+  def test_render
+    @lily_parser.template = File.read("test/test_template.ly.erb")
+    exp = "music = { a1*2/3 cDs'1*4/7 }\n"
+    result = @lily_parser.render([MM::Ratio.new(3,2), MM::Ratio.new(7,4)])
+    assert_equal exp, result
+  end
+
+  def test_offset
+    @lily_parser.offset = 0
+    assert_equal "c", @lily_parser.get_pitch(MM::Ratio.new(1,1))
+    assert_equal "eDf", @lily_parser.get_pitch(MM::Ratio.new(5,4))
+    assert_equal "bDf", @lily_parser.get_pitch(MM::Ratio.new(15,8))
+  end
+
+  def test_prime_limit
+    @lily_parser.prime_limit = 3
+    @lily_parser.prime_steps[3] = 6
+    assert_equal "bflat", @lily_parser.get_pitch(MM::Ratio.new(14, 9))
+    assert_equal "fsharp", @lily_parser.get_pitch(MM::Ratio.new(5, 4))
+    assert_equal "gsharp", @lily_parser.get_pitch(MM::Ratio.new(11, 8))
+  end
+end
+

data/test/test_template.ly.erb

@@ -1 +1 @@
-music = { <%= my_music %> }
+music = { <%= my_music %> }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mm-lilypond
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Andrew Smith
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.11'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement