musa-dsl 0.26.1 → 0.26.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c2f6d36cc5f3c4693e45e47e82ea57a8a7cb12cd3e4e8566a33c8b1be198417
-  data.tar.gz: b392ad73c0097ac15f3b66140e43c19859aaece1f5a0dd9612e3a2d7bbd188fd
+  metadata.gz: f7f400c1a2c9841fc229ddb34343788eb688c4ab627e3f5ad8d4bcb57bd9ab90
+  data.tar.gz: f0a0bf769dc19d17fc54818f83ca92174b223a503fb1f5145b996ac743bc0a1a
 SHA512:
-  metadata.gz: e801b2e5190aa4364679b472ffb34f68643a12f86d685942debf09ab38f651712d724e2ad215f1177657a34cbc2c673d77ff5cea4a24433966a97339e2df3120
-  data.tar.gz: 875ee51602f569b4c823ccce5efdac7fb67696ee5b0b205a69b93ced1c12768c8828be846e91dca77ec4ae49bfbb3726946b99af7fb5fba136ed23c584d5d6d0
+  metadata.gz: d35323bf0ef3686f839fcbdc4683fe3c7a05e9de99b4fab7a365f55576fd125704b52833bbea89bfae11db3c70d9d34a2fb2a2400252bd6fedf1d881483000ce
+  data.tar.gz: bf02e13897e2441ce2d48c82a0ac9d1a2ba25ba244a22597597232710fb18efd688c8f5228fa94ef8956f9fea9818725c251d122dfe05086d4e745e1c745538c

data/lib/musa-dsl/datasets/gdv.rb

@@ -16,16 +16,20 @@ module Musa::Datasets
 
     attr_accessor :base_duration
 
+    # TODO create a customizable MIDI velocity to score dynamics bidirectional conversor
+    # ppp = 16 ... fff = 127 (-5 ... 4) the standard used by Musescore 3 and others starts at ppp = 16
+    VELOCITY_MAP = [1, 8, 16, 33, 49, 64, 80, 96, 112, 127].freeze
+
     def to_pdv(scale)
       pdv = {}.extend PDV
       pdv.base_duration = @base_duration
 
       if self[:grade]
         pdv[:pitch] = if self[:silence]
-                      :silence
-                    else
-                      scale[self[:grade]].sharp(self[:sharps] || 0).octave(self[:octave] || 0).pitch
-                    end
+                        :silence
+                      else
+                        scale[self[:grade]].sharp(self[:sharps] || 0).octave(self[:octave] || 0).pitch
+                      end
       end
 
       if self[:duration]
@@ -41,9 +45,19 @@ module Musa::Datasets
       end
 
       if self[:velocity]
-        # ppp = 16 ... fff = 127 (-5 ... 4) the standard used by Musescore 3 and others starts at ppp = 16
-        # TODO create a customizable MIDI velocity to score dynamics bidirectional conversor
-        pdv[:velocity] = [1, 8, 16, 33, 49, 64, 80, 96, 112, 127][self[:velocity] + 5]
+        index = if (-5..4).cover?(self[:velocity])
+                  self[:velocity]
+                else
+                  self[:velocity] < -5 ? -5 : 4
+                end
+        
+        index_min = index.floor
+        index_max = index.ceil
+
+        velocity = VELOCITY_MAP[index_min + 5] +
+          (VELOCITY_MAP[index_max + 5] - VELOCITY_MAP[index_min + 5]) * (self[:velocity] - index_min)
+
+        pdv[:velocity] = velocity
       end
 
       (keys - NaturalKeys).each { |k| pdv[k] = self[k] }
@@ -52,7 +66,7 @@ module Musa::Datasets
     end
 
     def to_neuma
-      @base_duration ||= Rational(1,4)
+      @base_duration ||= Rational(1, 4)
 
       attributes = []
 

data/lib/musa-dsl.rb

@@ -1,5 +1,5 @@
 module Musa
-  VERSION = '0.26.1'.freeze
+  VERSION = '0.26.2'.freeze
 end
 
 require_relative 'musa-dsl/core-ext'

data/musa-dsl.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'musa-dsl'
-  s.version     = '0.26.1'
-  s.date        = '2021-11-23'
+  s.version     = '0.26.2'
+  s.date        = '2021-11-25'
   s.summary     = 'A simple Ruby DSL for making complex music'
   s.description = 'Musa-DSL: A Ruby framework and DSL for algorithmic sound and musical thinking and composition'
   s.authors     = ['Javier Sánchez Yeste']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: musa-dsl
 version: !ruby/object:Gem::Version
-  version: 0.26.1
+  version: 0.26.2
 platform: ruby
 authors:
 - Javier Sánchez Yeste
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-23 00:00:00.000000000 Z
+date: 2021-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger