musa-dsl 0.22.1 → 0.22.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4498538210551ab83a9f167c0e9d8656c9c5b70c9bc51f97e99e540109e5de7e
-  data.tar.gz: 9957a89a6db2ed2a4e0d75900f2eb3e1051c6dfc3fcc25c40ed5da1ba8fb6957
+  metadata.gz: e85f0a7bc9ddbb82ea9b6b36741a87c1dc04f2feb1c10ea0f5fcb92e4dfc7a37
+  data.tar.gz: 13ad3537ac0a2e03c07c589174a12a8dd9af5013be79f5bd1ee769820cd94347
 SHA512:
-  metadata.gz: 6c2bbea949c5c22dba0247a6f2ce050f515383ddf23aedf1c0b5755d8d94ddf355ebc2beedee3b6c03aea758da905d393db4fd559f26bb52a667bc9f82cf023e
-  data.tar.gz: da8bf0de7ba0cc96d5e96188293b901135bd4f052218ead671783620cf294c40eed37f89a46220d2eefd32f3cc1e03634c392783efac9164e725635e70b0e1c4
+  metadata.gz: 06f58c414bbbd873179850c378f3022e1bc40eba16325b787824e1cb88b27229c7ac19d08032c8b0385c792ae38324c982970dcc94c91e7fd3d924208b640aa4
+  data.tar.gz: 63398fc18d40799119742df1587735f9736abec4a0c1d97e9a9b29202395b6f4223cea7c01075e95d6f0ae4d752dd7297ba88c9df8c2ac7c76dea439732a8435

data/lib/musa-dsl.rb

@@ -1,5 +1,5 @@
 module Musa
-  VERSION = '0.22.1'
+  VERSION = '0.22.6'
 end
 
 require_relative 'musa-dsl/core-ext'

data/lib/musa-dsl/core-ext/inspect-nice.rb

@@ -12,7 +12,6 @@ module Musa
         alias to_s inspect
       end
 
-
       refine Rational.singleton_class do
         attr_accessor :to_s_as_inspect
       end
@@ -43,7 +42,7 @@ module Musa
         end
 
         def to_s
-          inspect simple: true # !Rational.to_s_as_inspect
+          inspect simple: !Rational.to_s_as_inspect
         end
       end
     end

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

@@ -22,24 +22,13 @@ module Musa::Datasets
       end
     end
 
-    def to_timed_serie(time_start = nil, base_duration: nil)
+    def to_timed_serie(time_start: nil, time_start_component: nil, base_duration: nil)
       time_start ||= 0r
-      base_duration ||= 1/4r # TODO review incoherence between neumalang 1/4r base duration for quarter notes and general 1r size of bar
-
-      # TODO if instead of using clone (needed because of p.shift) we use index counter the P elements would be evaluated on the last moment
+      time_start += self.first[time_start_component] if time_start_component
 
-      Musa::Series::E(clone, base_duration, context: { time: time_start }) do |p, base_duration, context: |
-        value = p.shift
-
-        if value
-          r = { time: context[:time], value: value } if !value.nil?
-
-          delta_time = p.shift
-          context[:time] += delta_time * base_duration if delta_time
+      base_duration ||= 1/4r # TODO review incoherence between neumalang 1/4r base duration for quarter notes and general 1r size of bar
 
-          r&.extend(AbsTimed)
-        end
-      end
+      PtoTimedSerie.new(self, base_duration, time_start)
     end
 
     def map(&block)
@@ -55,5 +44,37 @@ module Musa::Datasets
         end
       end
     end
+
+    class PtoTimedSerie
+      include Musa::Series::Serie
+
+      attr_reader :origin
+
+      def initialize(origin, base_duration, time_start)
+        @origin = origin
+        @base_duration = base_duration
+        @time_start = time_start
+
+        _restart
+
+        mark_as_prototype!
+      end
+
+      def _restart
+        @p = @origin.clone
+        @time = @time_start
+      end
+
+      def _next_value
+        if value = @p.shift
+          r = { time: @time, value: value }.extend(AbsTimed)
+
+          delta_time = @p.shift
+          @time += delta_time * @base_duration if delta_time
+
+          r
+        end
+      end
+    end
   end
 end

data/lib/musa-dsl/datasets/score/to-mxml/process-pdv.rb

@@ -1,9 +1,9 @@
 require 'prime'
 
 module Musa::Datasets::Score::ToMXML
-  private
+  using Musa::Extension::InspectNice
 
-  def process_pdv(measure, bar, divisions_per_bar, element, pointer, logger, do_log)
+  private def process_pdv(measure, bar, divisions_per_bar, element, pointer, logger, do_log)
 
     pitch, octave, sharps = pitch_and_octave_and_sharps(element[:dataset])
 
@@ -21,24 +21,26 @@ module Musa::Datasets::Score::ToMXML
         decompose_as_sum_of_simple_durations(effective_duration))
 
     if do_log
-      logger.debug "\nprocess_pdv #{element}"
-      logger.debug ""
-      logger.debug "             pointer #{pointer} continue_from_previous #{continue_from_previous_bar} continue_to_next #{continue_to_next_bar}"
-      logger.debug "             effective_start #{effective_start} effective_duration #{effective_duration}"
-      logger.debug "             duration decomposition #{effective_duration_decomposition}"
+      logger.debug ''
+      logger.debug('process_pdv') { "processing #{element.inspect}" }
+      logger.debug { "" }
+      logger.debug { "           pointer #{pointer.inspect} continue_from_previous #{continue_from_previous_bar} continue_to_next #{continue_to_next_bar}" }
+      logger.debug { "           effective_start #{effective_start.inspect} effective_duration #{effective_duration.inspect}" }
+      logger.debug { "           duration decomposition #{effective_duration_decomposition}" }
     end
 
     if pointer > effective_start
       duration_to_go_back = (pointer - effective_start)
 
-      logger.debug "\n         ->  adding backup #{duration_to_go_back * divisions_per_bar}" if do_log
+      logger.debug ''
+      logger.debug { "       ->  adding backup #{duration_to_go_back * divisions_per_bar}" } if do_log
 
       measure.add_backup(duration_to_go_back * divisions_per_bar)
       pointer -= duration_to_go_back
 
 
     elsif pointer < effective_start
-      warn "\n         ->  adding start rest duration #{effective_start - pointer} start #{bar + pointer} finish #{bar + effective_start}" if do_log
+      logger.warn { "       ->  adding start rest duration #{effective_start - pointer} start #{bar + pointer} finish #{bar + effective_start}" } if do_log
 
       pointer = process_pdv(measure, bar, divisions_per_bar,
                             { start: bar + pointer,
@@ -125,7 +127,7 @@ module Musa::Datasets::Score::ToMXML
     pointer
   end
 
-  def pitch_and_octave_and_sharps(pdv)
+  private def pitch_and_octave_and_sharps(pdv)
     if pdv[:pitch] == :silence
       [:silence, nil, nil]
     else
@@ -143,7 +145,7 @@ module Musa::Datasets::Score::ToMXML
     end
   end
 
-  def dynamics_index_of(midi_velocity)
+  private def dynamics_index_of(midi_velocity)
     return nil unless midi_velocity
 
     # ppp = midi 16 ... fff = midi 127
@@ -153,7 +155,7 @@ module Musa::Datasets::Score::ToMXML
        .index { |r| r.cover? midi_velocity.round.to_i }
   end
 
-  def dynamics_to_string(dynamics_index)
+  private def dynamics_to_string(dynamics_index)
     return nil unless dynamics_index
     ['pppppp', 'ppppp', 'pppp', 'ppp', 'pp', 'p', 'mp', 'mf', 'f', 'ff', 'fff'][dynamics_index.round.to_i]
   end

data/lib/musa-dsl/datasets/score/to-mxml/process-ps.rb

@@ -1,13 +1,14 @@
 module Musa::Datasets::Score::ToMXML
-  private
+  using Musa::Extension::InspectNice
 
   DynamicsContext = Struct.new(:last_dynamics)
   private_constant :DynamicsContext
 
-  def process_ps(measure, element, context, logger, do_log)
+  private def process_ps(measure, element, context, logger, do_log)
     context ||= DynamicsContext.new
 
-    logger.debug "\nprocess_ps #{element}" if do_log
+    logger.debug ''
+    logger.debug('process_ps') { "processing #{element.inspect}" } if do_log
 
     case element[:dataset][:type]
     when :crescendo, :diminuendo
@@ -15,7 +16,14 @@ module Musa::Datasets::Score::ToMXML
         dynamics = dynamics_to_string(element[:dataset][:from])
 
         if dynamics != context.last_dynamics
-          measure.add_dynamics dynamics, placement: 'below' if dynamics && element[:dataset][:from] > 0
+          if dynamics
+            if element[:dataset][:from] < 0
+              logger.warn { "dynamics #{element[:dataset][:from]} not renderizable" } if do_log
+            elsif element[:dataset][:from] > 0
+              measure.add_dynamics dynamics, placement: 'below'
+            end
+          end
+
           context.last_dynamics = dynamics
         end
 
@@ -29,7 +37,16 @@ module Musa::Datasets::Score::ToMXML
 
         dynamics = dynamics_to_string(element[:dataset][:to])
 
-        measure.add_dynamics dynamics, placement: 'below' if dynamics && element[:dataset][:to] > 0
+        if dynamics != context.last_dynamics
+          if dynamics
+            if element[:dataset][:to] < 0
+              logger.warn { "dynamics #{element[:dataset][:to]} not renderizable" } if do_log
+            elsif element[:dataset][:to] > 0
+              measure.add_dynamics dynamics, placement: 'below'
+            end
+          end
+        end
+
         context.last_dynamics = dynamics
       end
 
@@ -37,7 +54,16 @@ module Musa::Datasets::Score::ToMXML
       dynamics = dynamics_to_string(element[:dataset][:from])
 
       if dynamics != context.last_dynamics
-        measure.add_dynamics dynamics, placement: 'below'
+
+
+        if dynamics
+          if element[:dataset][:from] < 0
+            logger.warn { "dynamics #{element[:dataset][:to]} not renderizable" } if do_log
+          elsif element[:dataset][:from] > 0
+            measure.add_dynamics dynamics, placement: 'below'
+          end
+        end
+
         context.last_dynamics = dynamics
       end
 

data/lib/musa-dsl/datasets/score/to-mxml/to-mxml.rb

@@ -1,5 +1,6 @@
 require_relative '../../../logger'
 require_relative '../../../musicxml'
+require_relative '../../../core-ext/inspect-nice'
 
 require_relative 'process-time'
 require_relative 'process-pdv'
@@ -10,6 +11,8 @@ module Musa::Datasets; class Score
     include Musa::MusicXML::Builder
     include Musa::Datasets
 
+    using Musa::Extension::InspectNice
+
     def to_mxml(beats_per_bar, ticks_per_beat,
                 bpm: nil,
                 title: nil,
@@ -22,7 +25,12 @@ module Musa::Datasets; class Score
       bpm ||= 90
       title ||= 'Untitled'
       creators ||= { composer: 'Unknown' }
-      logger ||= Musa::Logger::Logger.new
+
+      if logger.nil?
+        logger = Musa::Logger::Logger.new
+        logger.debug! if do_log
+      end
+
       do_log ||= nil
 
       mxml = ScorePartwise.new do |_|
@@ -54,12 +62,16 @@ module Musa::Datasets; class Score
       end
 
       if do_log
-        logger.debug"\nscore.to_mxl log:"
-        logger.debug  "-----------------"
+        logger.debug ""
+        logger.debug"score.to_mxml log:"
+        logger.debug"------------------"
       end
 
       parts.each_key do |part_id|
-        fill_part mxml.parts[part_id], beats_per_bar * ticks_per_beat, (parts.size > 1 ? part_id : nil), logger, do_log
+        fill_part mxml.parts[part_id],
+                  beats_per_bar * ticks_per_beat,
+                  (parts.size > 1 ? part_id : nil),
+                  logger, do_log
       end
 
       mxml
@@ -74,7 +86,7 @@ module Musa::Datasets; class Score
       (1..finish || 0).each do |bar|
         if do_log
           logger.debug ""
-          logger.debug msg = "filling part #{part.name} (#{instrument}): processing bar #{bar}"
+          logger.debug msg = "filling part #{part.name} (#{instrument || 'nil'}): processing bar #{bar}"
           logger.debug "-" * msg.size
         end
 
@@ -83,7 +95,7 @@ module Musa::Datasets; class Score
 
         pointer = 0r
 
-        instrument_score = subset { |dataset| dataset[:instrument] == instrument }
+        instrument_score = subset { |dataset| instrument.nil? || dataset[:instrument] == instrument }
 
         bar_elements = \
         (instrument_score.changes_between(bar, bar + 1).select { |p| p[:dataset].is_a?(PS) } +
@@ -92,7 +104,7 @@ module Musa::Datasets; class Score
                                                     e[:dataset].is_a?(PS) ? 0 : 1 ] }
 
         if pdvs.empty?
-          logger.debug "\nadded full bar silence" if do_log
+          logger.debug "\nadding full bar silence..." if do_log
 
           process_pdv(measure, bar, divisions_per_bar,
                       { start: bar,
@@ -104,7 +116,7 @@ module Musa::Datasets; class Score
         else
           first = bar_elements.first
 
-          logger.debug "\nfirst element #{first}" if do_log
+          logger.debug "\nfirst element #{first.inspect}" if do_log
 
           # TODO habrá que arreglar el cálculo de pointer cuando haya avances y retrocesos para que
           # TODO no añada silencios incorrectos al principio o al final
@@ -113,7 +125,7 @@ module Musa::Datasets; class Score
 
             silence_duration = first[:start_in_interval] - bar
 
-            logger.debug "\nadded initial silence for duration #{silence_duration}" if do_log
+            logger.debug "\nadding initial silence for duration #{silence_duration}..." if do_log
 
             pointer = process_pdv(measure, bar, divisions_per_bar,
                                   { start: bar,
@@ -124,6 +136,8 @@ module Musa::Datasets; class Score
                                   do_log)
           end
 
+          logger.debug "\nadding PDV and PS elements..." if do_log
+
           bar_elements.each do |element|
             case element[:dataset]
             when PDV
@@ -140,7 +154,7 @@ module Musa::Datasets; class Score
           if pointer < 1r
             silence_duration = 1r - pointer
 
-            logger.debug "\nadded ending silence for duration #{silence_duration}" if do_log
+            logger.debug "\nadded ending silence for duration #{silence_duration}..." if do_log
 
             process_pdv(measure, bar, divisions_per_bar,
                         { start: bar + pointer,

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

@@ -1,7 +1,12 @@
 require 'logger'
 
+require_relative '../core-ext/inspect-nice'
+
+
 module Musa; module Logger
   class Logger < ::Logger
+    using Musa::Extension::InspectNice
+
     def initialize(sequencer: nil, position_format: nil)
       super STDERR, level: WARN
 
@@ -22,7 +27,7 @@ module Musa; module Logger
 
           progname = "[#{progname}]" if progname
 
-          "#{position}#{level}#{progname} #{msg}\n"
+          "#{position}#{level}#{progname}#{' ' if position || level || progname}#{msg}\n"
         else
           "\n"
         end

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

@@ -22,8 +22,8 @@ module Musa
           indexes
         end
 
-        def to_p(time_dimension, keep_time: nil)
-          condensed_matrices.collect { |m| m.to_p(time_dimension, keep_time: keep_time) }
+        def to_p(time_dimension:, keep_time: nil)
+          condensed_matrices.collect { |m| m.to_p(time_dimension: time_dimension, keep_time: keep_time) }
         end
 
         def condensed_matrices
@@ -69,14 +69,14 @@ module Musa
       refine ::Matrix do
         include Musa::Datasets
 
-        def to_p(time_dimension, keep_time: nil)
+        def to_p(time_dimension:, keep_time: nil)
           decompose(self.to_a, time_dimension).collect do |points|
             line = []
 
             start_point = points[0]
             start_time = start_point[time_dimension]
 
-            line << start_point.tap { |_| _.delete_at(time_dimension) unless keep_time; _ }.extend(Datasets::V)
+            line << start_point.clone.tap { |_| _.delete_at(time_dimension) unless keep_time; _ }.extend(Datasets::V)
 
             (1..points.size-1).each do |i|
               end_point = points[i]
@@ -84,7 +84,7 @@ module Musa
               end_time = end_point[time_dimension]
 
               line << end_time - start_time
-              line << end_point.tap { |_| _.delete_at(time_dimension) unless keep_time; _ }.extend(Datasets::V)
+              line << end_point.clone.tap { |_| _.delete_at(time_dimension) unless keep_time; _ }.extend(Datasets::V)
 
               start_time = end_time
             end
@@ -107,8 +107,9 @@ module Musa
 
           x_dim_values_indexes.keys.sort.each do |value|
             x_dim_values_indexes[value].each do |index|
+              #
               # hacia un lado
-
+              #
               unless used_indexes.include?(index)
                 i = index
                 xx = array[i][time_dimension]
@@ -125,8 +126,9 @@ module Musa
 
                 directional_segments << a if a.size > 1
 
+                #
                 # y hacia el otro
-
+                #
                 i = index
                 xx = array[i][time_dimension]
 

data/lib/musa-dsl/midi/midi-voices.rb

@@ -169,6 +169,7 @@ module Musa
       private_constant :ControllersControl
 
       class NoteControl
+        attr_reader :voice, :pitch, :velocity, :velocity_off, :duration
         attr_reader :start_position, :end_position
 
         def initialize(voice, pitch:, velocity: nil, duration: nil, velocity_off: nil)

data/lib/musa-dsl/music/scales.rb

@@ -303,7 +303,7 @@ module Musa
 
       def [](grade_or_symbol)
 
-        raise ArgumentError, "grade_or_symbol '#{grade_or_symbol}' should be a Numeric, String or Symbol" unless grade_or_symbol.is_a?(Symbol) || grade_or_symbol.is_a?(String) || grade_or_symbol.is_a?(Integer)
+        raise ArgumentError, "grade_or_symbol '#{grade_or_symbol}' should be a Integer, String or Symbol" unless grade_or_symbol.is_a?(Symbol) || grade_or_symbol.is_a?(String) || grade_or_symbol.is_a?(Integer)
 
         wide_grade, sharps = grade_of(grade_or_symbol)