musa-dsl 0.26.0 → 0.26.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2baccb6e4a0d7c120cd44154229080d001861570f09a6c955acd2b8831d95b65
-  data.tar.gz: a191b5e72d8ee8086224d8e950a731854bd7ba8e01cfacf11e6d9295ad626439
+  metadata.gz: 0631b9bf8dbc0fedbfe7c00bdc5c4da34c3b319ade3de83fa49d08f7b95ea9b0
+  data.tar.gz: 1c258db1cd5105a794e9cbfec73e12fc8e6ec3565395d25c234ec3ac0aed5d28
 SHA512:
-  metadata.gz: e11bb0c2cdd2bcb8086cac5c1c67c70a98e70a16ad7af1ee022cd31eff7947c6f7050ac2c4c8786c41624221fe54a7b5642863edc10cf82c4e50f4d4500bf523
-  data.tar.gz: 11824a54cd89809d1879396544a697060a31ec8884c7a70481962a1c341b10065fd9d404ef6d7811987d5a62f7ec082fdb722085c72b4d4f1dd07533a699b42d
+  metadata.gz: 86068de4a4b03eb6615438863fe62302b8d4c899058bf1faba5d2aef00608b91bb61b0a54775736ecf99b7ad91a9b765085f68201daeba537df042634f806c97
+  data.tar.gz: bd321b8c0d140557fd2a747f5e1d8ecdf9335e6865abfc4d1cce2182e6493dd4e8983f0cdc208beefd91f098f589ff566afa33dcb534e7549d1a1e11609b0e8e

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/midi/midi-voices.rb

@@ -138,7 +138,26 @@ module Musa
           @output = output
           @channel = channel
 
-          @controller_map = { sustain_pedal: 0x40 }
+          @controller_map = { mod_wheel: 1,
+                              breath: 2,
+                              volume: 7,
+                              expression: 11,
+                              general_purpose_1: 16,
+                              general_purpose_2: 17,
+                              general_purpose_3: 18,
+                              general_purpose_4: 19,
+
+                              mod_wheel_lsb: 1 + 32,
+                              breath_lsb: 2 + 32,
+                              volume_lsb: 7 + 32,
+                              expression_lsb: 11 + 32,
+                              general_purpose_1_lsb: 16 + 32,
+                              general_purpose_2_lsb: 17 + 32,
+                              general_purpose_3_lsb: 18 + 32,
+                              general_purpose_4_lsb: 19 + 32,
+
+                              sustain_pedal: 64,
+                              portamento: 65 }
           @controller = []
         end
 

data/lib/musa-dsl/repl/repl.rb

@@ -6,13 +6,14 @@ module Musa
     class REPL
       @@repl_mutex = Mutex.new
 
-      def initialize(binder = nil, port: nil, after_eval: nil, logger: nil)
+      def initialize(binder = nil, port: nil, after_eval: nil, logger: nil, highlight_exception: true)
 
         self.binder = binder
 
         port ||= 1327
 
         @logger = logger || Musa::Logger::Logger.new
+        @highlight_exception = highlight_exception
 
         @block_source = nil
 
@@ -52,7 +53,7 @@ module Musa
 
                         rescue StandardError, ScriptError => e
                           @logger.warn('REPL') { 'code execution error' }
-                          @logger.warn('REPL') { e.full_message(highlight: true, order: :top) }
+                          @logger.warn('REPL') { e.full_message(highlight: @highlight_exception, order: :top) }
 
                           send_exception e, output: @connection
                         else
@@ -66,7 +67,7 @@ module Musa
 
                 rescue IOError, Errno::ECONNRESET, Errno::EPIPE => e
                   @logger.warn('REPL') { 'lost connection' }
-                  @logger.warn('REPL') { e.full_message(highlight: true, order: :top) }
+                  @logger.warn('REPL') { e.full_message(highlight: @highlight_exception, order: :top) }
 
                 ensure
                   @logger.debug("REPL") { "closing connection (running #{@run})" }
@@ -77,7 +78,7 @@ module Musa
             end
           rescue Errno::ECONNRESET, Errno::EPIPE => e
             @logger.warn('REPL') { 'connection failure while getting server port; will retry...' }
-            @logger.warn('REPL') { e.full_message(highlight: true, order: :top) }
+            @logger.warn('REPL') { e.full_message(highlight: @highlight_exception, order: :top) }
             retry
 
           end
@@ -130,7 +131,7 @@ module Musa
 
       def send_exception(e, output:)
 
-        @logger.error('REPL') { e.full_message(highlight: true, order: :top) }
+        @logger.error('REPL') { e.full_message(highlight: @highlight_exception, order: :top) }
 
         send output: output, command: '//error'
 

data/lib/musa-dsl.rb

@@ -1,5 +1,5 @@
 module Musa
-  VERSION = '0.26.0'.freeze
+  VERSION = '0.26.4'.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.0'
-  s.date        = '2021-11-19'
+  s.version     = '0.26.4'
+  s.date        = '2022-02-17'
   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.0
+  version: 0.26.4
 platform: ruby
 authors:
 - Javier Sánchez Yeste
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-19 00:00:00.000000000 Z
+date: 2022-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logger