rubysketch 0.7.14 → 0.7.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fb4742ea051ed33c17f3bb8020d207523359025d8df86de5a5e4d09aa81dafc
-  data.tar.gz: 31cfb5c9be061229e6cfd0385afae6a0fd9ba1e76908d4adb1aec4126beb7242
+  metadata.gz: 21a167597b95be3b08c1a2ed54d74b82f7d8d3a14cd2a2ca4ea2273cf0738322
+  data.tar.gz: 291bbd92fa9c8377290a230e635da8515eea6bbf5637ffed73594a1cd9bc74ff
 SHA512:
-  metadata.gz: 68509d9831c127e4dd0671f847920935e0255e31973380fe0bafc823e772698d777f431ea94202a59890c859cf241cb369ddddb31fa3eac7fcc74c45668c0bab
-  data.tar.gz: 3273c1129127a0399be849b0487b98c52ac6597aebf32913d3f8efb3d085da90a0cba8f065d33453c76be0707df5c56856e15f4df0bdb16f4f3dacd544c07229
+  metadata.gz: 85cc04f6637996f41f86ab1b20ef8488bc27da3e948cc91245243dd654176c118fa3575a867914225968f2db7a28f08564b3193e29ae18a46c1c4c1d9419a702
+  data.tar.gz: dc97d8c679832469f1577790858a075a347c5a2f9a2da87b58711cf53ff28cb9e021616f3838f44aaa324f79b84c9bfb80e69fcd1a81b5f33f8078864bdb34f7

data/ChangeLog.md

@@ -1,6 +1,15 @@
 # rubysketch ChangeLog
 
 
+## [v0.7.15] - 2026-04-09
+
+- Add MML class
+- Add Sprite#mouseWheel
+- Update dependencies
+
+- Fix mouseClicked? crash when view is detached from window
+
+
 ## [v0.7.14] - 2025-07-06
 
 - Add RtMidi to podspec

data/Gemfile.lock

@@ -3,7 +3,7 @@ GEM
   specs:
     power_assert (2.0.3)
     rake (13.1.0)
-    rexml (3.4.1)
+    rexml (3.4.4)
     test-unit (3.6.1)
       power_assert
     yard (0.9.34)

data/RubySketch.podspec

@@ -12,7 +12,7 @@ Pod::Spec.new do |s|
   s.homepage     = "https://github.com/xord/rubysketch"
 
   s.osx.deployment_target = "10.10"
-  s.ios.deployment_target = "10.0"
+  s.ios.deployment_target = "12.0"
 
   root = "${PODS_ROOT}/#{s.name}"
   exts = File.read(File.expand_path 'Rakefile', __dir__)

data/VERSION

@@ -1 +1 @@
-0.7.14
+0.7.15

data/lib/rubysketch/all.rb

@@ -1,11 +1,13 @@
-require 'processing/all'
+require 'strscan'
 require 'beeps'
+require 'processing/all'
 
 
 module RubySketch
 
-  Vector = Processing::Vector
-  Image  = Processing::Image
+  Vector     = Processing::Vector
+  Image      = Processing::Image
+  WheelEvent = Processing::WheelEvent
 
 end# RubySketch
 
@@ -19,3 +21,5 @@ require 'rubysketch/sound'
 require 'rubysketch/easings'
 require 'rubysketch/graphics_context'
 require 'rubysketch/context'
+
+require 'rubysketch/mml'

data/lib/rubysketch/mml.rb

@@ -0,0 +1,233 @@
+module RubySketch
+
+
+  class MML
+
+    TONES = %i[
+      sine triangle square sawtooth pulse12_5 pulse25 noise
+    ].freeze
+
+    class << self
+
+      def compile(str, streaming = false)
+        seq, duration = compile! str
+        Sound.new Beeps::Sound.new(seq, streaming ? 0 : duration)
+      end
+
+      def compile!(str)
+        scanner = StringScanner.new expandLoops__ str.gsub(/[;%].*(?:\n|$)/, '')
+        seq     = Beeps::Sequencer.new
+        note    = Note__.new
+        pending = nil
+        prevOsc = nil
+
+        scanner.skip(/\s*/)
+        until scanner.eos?
+          case
+          when scanner.scan(/T\s*(\d+)/i)
+            note.bpm         = scanner[1].to_i
+          when scanner.scan(/O\s*(\d+)/i)
+            note.octave      = scanner[1].to_i
+          when scanner.scan(/([<>])/)
+            note.octave     +=
+              case scanner[1]
+              when '<' then -1
+              when '>' then +1
+              else           0
+              end
+          when scanner.scan(/@\s*(\d+)/)
+            note.tone        = scanner[1].to_i
+          when scanner.scan(/L\s*(\d+)/i)
+            note.length      = scanner[1].to_i
+          when scanner.scan(/V\s*(\d+)/i)
+            note.velocity    = scanner[1].to_i
+          when scanner.scan(/Q\s*(\d+)/i)
+            note.quantize    = scanner[1].to_i
+          when scanner.scan(/K\s*([+-]?\d+)/i)
+            note.transpose   = scanner[1].to_i
+          when scanner.scan(/Y\s*([+-]?\d+)/i)
+            note.detune      = scanner[1].to_i
+          when scanner.scan(/\&\s*(\d+)?\s*(\.+)?/)
+            len, dots        = [1, 2].map {scanner[_1]}
+            if len || dots
+              pending.seconds += seconds__ note, len&.to_i, dots&.size if pending
+            else
+              note.tie       = true
+            end
+          when scanner.scan(/\^\s*(\d+)?\s*(\.+)?/)
+            len, dots        = [1, 2].map {scanner[_1]}
+            pending.seconds += seconds__ note, len&.to_i, dots&.size if pending
+          when scanner.scan(/_/)
+            note.portamento  = true
+          when scanner.scan(/R\s*(\d+)?\s*(\.+)?/i)
+            len, dots        = [1, 2].map {scanner[_1]}
+            note.clearLegatoFlags
+            addNote__ seq, pending, note, prevOsc if pending
+            pending          = nil
+            prevOsc          = nil
+            note.time       += seconds__ note, len&.to_i, dots&.size
+          when scanner.scan(/([CDEFGAB])\s*([#+-]+)?\s*(\d+)?\s*(\.+)?/i)&.chomp
+            char, offset, len, dots = [1, 2, 3, 4].map {scanner[_1]}
+
+            note.frequency   = frequency__ note, char, offset
+            prevOsc          = addNote__ seq, pending, note, prevOsc if pending
+
+            pending          = note.dup
+            pending.seconds += seconds__ note, len&.to_i, dots&.size
+
+            note.clearLegatoFlags
+          else
+            raise "Unknown input: #{scanner.rest[..10]}"
+          end
+
+          scanner.skip(/\s*/)
+        end
+
+        addNote__ seq, pending, note, prevOsc if pending
+        return seq, note.time
+      end
+
+      def play(str)
+        compile(str).play
+      end
+
+      private
+
+      V_MAX__ = 127.0
+      Q_MAX__ = 100.0
+
+      # @private
+      Note__ = Struct.new(
+        :time, :frequency, :seconds,
+        :bpm, :octave, :tone, :length, :velocity, :quantize, :transpose, :detune,
+        :tie, :portamento) do
+
+        def initialize()
+          super(
+            0, 1, 0,
+            120, 4, 0, 4, V_MAX__, Q_MAX__, 0, 0,
+            false, false)
+        end
+
+        def legato?()
+          self.tie || self.portamento
+        end
+
+        def clearLegatoFlags()
+          self.tie = self.portamento = false
+        end
+      end
+
+      # @private
+      def expandLoops__(str)
+        nil while str.gsub!(/\[([^\[\]]*)\]\s*(\d+)?/) {$1 * ($2&.to_i || 2)}
+        str
+      end
+
+      # @private
+      def seconds__(note, length, dots)
+        length ||= note.length
+        dots   ||= 0
+        60.0 * 4 / note.bpm / length * (1 + dots.times.map {0.5 ** (_1 + 1)}.sum)
+      end
+
+      # @private
+      DISTANCES__ = -> {
+        notes   = 'c_d_ef_g_a_b'.each_char.with_index.reject {|c,| c == '_'}.to_a
+        octaves = (0..11).to_a
+        octaves.product(notes)
+          .map.with_object({}) {|(octave, (note, index)), hash|
+            hash[[note, octave]] = octave * 12 + index - 57
+          }
+      }.call
+
+      # @private
+      def frequency__(note, char, offset)
+        distance  = DISTANCES__[[char.downcase, note.octave.to_i]] ||
+          (raise ArgumentError, "char:'#{char}' octave:'#{note.octave}'")
+        distance += (offset || '').each_char.reduce(0) {|value, char|
+          case char
+          when '+', '#' then value + 1
+          when '-'      then value - 1
+          else               value
+          end
+        }
+        distance += note.transpose + (note.detune / 100.0)
+        440 * (2 ** (distance.to_f / 12))
+      end
+
+      # @private
+      def addNote__(seq, note, nextNote, prevOsc)
+        processor, sec  = createProcessor__ note, nextNote
+        osc             = findInput__(processor) {_1.class == Beeps::Oscillator}
+        syncPhase__ osc, prevOsc if prevOsc
+        seq.add processor, note.time, sec
+        nextNote.time  += note.seconds
+        return osc
+      end
+
+      # @private
+      def createProcessor__(note, nextNote)
+        tone = TONES[note.tone] || (raise ArgumentError, "tone:'#{note.tone}'")
+        freq = nextNote.portamento ? Beeps::Value.new(note.frequency).tap {
+          _1.insert nextNote.frequency, note.seconds if nextNote.frequency != note.frequency
+        } : note.frequency
+        gate = note.quantize.clamp(0, Q_MAX__) / Q_MAX__ * note.seconds
+        vel  = note.velocity.clamp(0, V_MAX__) / V_MAX__
+        adsr = {
+          attack_time:  (    note.legato? ? 0 : nil),
+          release_time: (nextNote.legato? ? 0 : nil)
+        }.compact
+
+        osc  = createOscillator__ tone, 32, freq: freq
+        env  = Beeps::Envelope.new(**adsr) {
+          note_on
+          note_off nextNote.legato? ? note.seconds : (gate - release).clamp(0..)
+        }
+        gain = Beeps::Gain.new gain: vel
+        return (osc >> env >> gain), (nextNote.legato? ? note.seconds : gate)
+      end
+
+      # @private
+      def createOscillator__(type, size, **kwargs)
+        case type
+        when :noise then Beeps::Oscillator.new type
+        else
+          samples = (@samples ||= {})[type] ||= createSamples__ type, size
+          Beeps::Oscillator.new samples: samples, **kwargs
+        end
+      end
+
+      # @private
+      def createSamples__(type, size)
+        input = size.times.map {_1.to_f / size}
+        duty  = {pulse12_5: 0.125, pulse25: 0.25, pulse75: 0.75}[type] || 0.5
+        case type
+        when :sine     then input.map {Math.sin _1 * Math::PI * 2}
+        when :triangle then input.map {_1 < 0.5 ? _1 * 4 - 1 : 3 - _1 * 4}
+        when :sawtooth then input.map {_1 * 2 - 1}
+        else                input.map {_1 < duty ? 1 : -1}
+        end
+      end
+
+      # @private
+      def syncPhase__(osc, prev)
+        osc.on(:start) {osc.phase = prev.phase}
+      end
+
+      # @private
+      def findInput__(processor, &block)
+        p = processor
+        while p
+          return p if block.call p
+          p = p.input
+        end
+        nil
+      end
+
+    end# <<self
+
+  end# MML
+
+
+end# RubySketch

data/lib/rubysketch/sound.rb

@@ -42,6 +42,14 @@ module RubySketch
       not @players.empty?
     end
 
+    # Returns the duration in seconds
+    #
+    # @return [Numeric] duration in seconds
+    #
+    def seconds()
+      @sound.seconds
+    end
+
     # Load a sound file.
     #
     # @param [String] path file path

data/lib/rubysketch/sprite.rb

@@ -931,6 +931,20 @@ module RubySketch
       nil
     end
 
+    # Defines mouseWheel block.
+    #
+    # @example Print wheel states on mouse wheel
+    #  sprite.mouseWheel do |event|
+    #    p event.getCount
+    #  end
+    #
+    # @return [nil] nil
+    #
+    def mouseWheel(&block)
+      @view__.mouseWheel = block if block
+      nil
+    end
+
     # Defines touchStarted block.
     #
     # @example Print touches on touch start
@@ -1182,7 +1196,7 @@ module RubySketch
     #
     def offset()
       s, z = @view.scroll, zoom
-      Vector.new -s.x / z, -s.y / z, -s.z / z
+      Vector.new(-s.x / z, -s.y / z, -s.z / z)
     end
 
     # Sets the offset of the sprite world.
@@ -1204,7 +1218,7 @@ module RubySketch
         when nil    then [0,           0,           0]
         else raise ArgumentError
         end
-      @view.scroll_to -x * zoom_, -y * zoom_, -z * zoom_
+      @view.scroll_to(-x * zoom_, -y * zoom_, -z * zoom_)
       offset
     end
 
@@ -1303,8 +1317,8 @@ module RubySketch
     end
 
     attr_accessor :update,
-      :mousePressed, :mouseReleased, :mouseMoved, :mouseDragged, :mouseClicked,
-      :touchStarted, :touchEnded, :touchMoved,
+      :mousePressed, :mouseReleased, :mouseMoved, :mouseDragged,
+      :mouseClicked, :mouseWheel, :touchStarted, :touchEnded, :touchMoved,
       :keyPressed, :keyReleased, :keyTyped,
       :contact, :contactEnd, :willContact
 
@@ -1383,6 +1397,10 @@ module RubySketch
       on_pointer_up e
     end
 
+    def on_wheel(e)
+      callBlock @mouseWheel, WheelEvent.new(e)
+    end
+
     def on_key_down(e)
       updateKeyStates e, true
       callBlock @keyPressed
@@ -1452,7 +1470,7 @@ module RubySketch
     end
 
     def mouseClicked?()
-      return false unless parent && @pointer && @pointerDownStartPos
+      return false unless @pointer && @pointerDownStartPos && window
       [to_screen(@pointer.pos), @pointerDownStartPos]
         .map {|pos| Rays::Point.new pos.x, pos.y, 0}
         .then {|pos, startPos| (pos - startPos).length < 3}

data/rubysketch.gemspec

@@ -25,12 +25,12 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_dependency 'xot',        '~> 0.3.9', '>= 0.3.9'
-  s.add_dependency 'rucy',       '~> 0.3.9', '>= 0.3.9'
-  s.add_dependency 'beeps',      '~> 0.3.9', '>= 0.3.9'
-  s.add_dependency 'rays',       '~> 0.3.9', '>= 0.3.9'
-  s.add_dependency 'reflexion',  '~> 0.3.10', '>= 0.3.10'
-  s.add_dependency 'processing', '~> 1.1',   '>= 1.1.13'
+  s.add_dependency 'xot',        '~> 0.3.10'
+  s.add_dependency 'rucy',       '~> 0.3.10'
+  s.add_dependency 'beeps',      '~> 0.3.10'
+  s.add_dependency 'rays',       '~> 0.3.10'
+  s.add_dependency 'reflexion',  '~> 0.3.11'
+  s.add_dependency 'processing', '~> 1.1.14'
 
   s.files            = `git ls-files`.split $/
   s.test_files       = s.files.grep %r{^(test|spec|features)/}

data/test/test_mml.rb

@@ -0,0 +1,217 @@
+require_relative 'helper'
+
+
+class TestMML < Test::Unit::TestCase
+
+  def compile(str)
+    RubySketch::MML.compile! str
+  end
+
+  def procs(str, klass = nil)
+    compile(str)[0].each.with_object([]) do |(processor, *), array|
+      processor = find_input(processor) {_1.class == klass} if klass
+      array << processor
+    end
+  end
+
+  def times(str)
+    compile(str)[0].each.with_object([]) do |(_, offset, duration), array|
+      array << [offset, duration]
+    end
+  end
+
+  def duration(str)
+    compile(str)[1]
+  end
+
+  def oscillators(str) = procs(str, Beeps::Oscillator)
+
+  def gains(str)       = procs(str, Beeps::Gain)
+
+  def find_input(processor, &block)
+    p = processor
+    while p
+      return p if block.call p
+      p = p.input
+    end
+    nil
+  end
+
+  def test_note_frequency()
+    assert_in_delta 440,     oscillators('A')    .first.freq
+
+    assert_in_delta 246.942, oscillators('O3 B') .first.freq
+    assert_in_delta 261.626, oscillators('O4 C') .first.freq
+    assert_in_delta 277.183, oscillators('O4 C+').first.freq
+    assert_in_delta 277.183, oscillators('O4 D-').first.freq
+    assert_in_delta 293.665, oscillators('O4 D') .first.freq
+    assert_in_delta 311.127, oscillators('O4 D+').first.freq
+    assert_in_delta 311.127, oscillators('O4 E-').first.freq
+    assert_in_delta 329.628, oscillators('O4 E') .first.freq
+    assert_in_delta 349.228, oscillators('O4 F') .first.freq
+    assert_in_delta 369.994, oscillators('O4 F+').first.freq
+    assert_in_delta 369.994, oscillators('O4 G-').first.freq
+    assert_in_delta 391.995, oscillators('O4 G') .first.freq
+    assert_in_delta 415.305, oscillators('O4 G+').first.freq
+    assert_in_delta 415.305, oscillators('O4 A-').first.freq
+    assert_in_delta 440,     oscillators('O4 A') .first.freq
+    assert_in_delta 466.164, oscillators('O4 A+').first.freq
+    assert_in_delta 466.164, oscillators('O4 B-').first.freq
+    assert_in_delta 493.883, oscillators('O4 B') .first.freq
+    assert_in_delta 523.251, oscillators('O5 C') .first.freq
+  end
+
+  def test_note_duration()
+    assert_in_delta 0.5,     duration('C')
+
+    assert_in_delta 4,       duration('T60 C1')
+    assert_in_delta 6,       duration('T60 C1.')
+    assert_in_delta 7,       duration('T60 C1..')
+    assert_in_delta 7.5,     duration('T60 C1...')
+    assert_in_delta 2,       duration('T60 C2')
+    assert_in_delta 3,       duration('T60 C2.')
+    assert_in_delta 3.5,     duration('T60 C2..')
+    assert_in_delta 3.75,    duration('T60 C2...')
+    assert_in_delta 1,       duration('T60 C4')
+    assert_in_delta 1.5,     duration('T60 C4.')
+    assert_in_delta 1.75,    duration('T60 C4..')
+    assert_in_delta 1.875,   duration('T60 C4...')
+    assert_in_delta 0.5,     duration('T60 C8')
+    assert_in_delta 0.75,    duration('T60 C8.')
+    assert_in_delta 0.875,   duration('T60 C8..')
+    assert_in_delta 0.9375,  duration('T60 C8...')
+    assert_in_delta 0.25,    duration('T60 C16')
+    assert_in_delta 0.375,   duration('T60 C16.')
+    assert_in_delta 0.4375,  duration('T60 C16..')
+    assert_in_delta 0.46875, duration('T60 C16...')
+
+    assert_in_delta 2,     duration('T120 C1')
+    assert_in_delta 1,     duration('T120 C2')
+    assert_in_delta 0.5,   duration('T120 C4')
+    assert_in_delta 0.25,  duration('T120 C8')
+    assert_in_delta 0.125, duration('T120 C16')
+
+    assert_in_delta 1, duration('T60 C-4')
+    assert_in_delta 1, duration('T60 C+4')
+    assert_in_delta 1, duration('T60 C#4')
+    assert_in_delta 2, duration('T60 L4 C C')
+
+    assert_equal [[0, 1], [1, 1]], times('T60 C C')
+  end
+
+  def test_rest()
+    assert_equal [[0, 1], [2, 1]], times('T60 C    R    C')
+    assert_equal [[0, 1], [3, 1]], times('T60 C    R2   C')
+    assert_equal [[0, 1], [4, 1]], times('T60 C    R2.  C')
+    assert_equal [[0, 1], [3, 1]], times('T60 C L2 R L4 C')
+  end
+
+  def test_tempo()
+    assert_equal 0.5, duration(     'C')
+    assert_equal 0.5, duration('T120 C')
+    assert_equal 1,   duration('T60  C')
+  end
+
+  def test_octave()
+    assert_in_delta 440,     oscillators('O4   A').first.freq
+    assert_in_delta 440 / 2, oscillators('O3   A').first.freq
+    assert_in_delta 440 * 2, oscillators('O5   A').first.freq
+    assert_in_delta 440 / 2, oscillators('O4 < A').first.freq
+    assert_in_delta 440 * 2, oscillators('O4 > A').first.freq
+  end
+
+  def test_tone()
+    assert_equal     oscillators('@0 C').first.samples, oscillators(   'C').first.samples
+    assert_not_equal oscillators('@0 C').first.samples, oscillators('@1 C').first.samples
+  end
+
+  def test_length()
+    assert_equal [[0, 1], [1, 1]],   times('T60    C C')
+    assert_equal [[0, 1], [1, 1]],   times('T60 L4 C C')
+    assert_equal [[0, 2], [2, 2]],   times('T60 L2 C C')
+    assert_equal [[0, 2], [2, 1]],   times('T60 L2 C C4')
+  end
+
+  def test_velocity()
+    assert_in_delta 1,   gains(    'C').first.gain
+    assert_in_delta 0,   gains('V0  C').first.gain
+    assert_in_delta 0.5, gains('V63 C').first.gain, 0.01
+  end
+
+  def test_tie_and()
+    assert_equal 2.5,  duration('T60 C&.')
+    assert_equal 1.5,  duration('T60 C&8')
+    assert_equal 1.75, duration('T60 C&8.')
+    assert_equal 3.25, duration('T60 C&8.&.')
+
+    assert_equal [[0, 1],   [1,   1]],         times('T60 C  & C')
+    assert_equal [[0, 1.5], [1.5, 1]],         times('T60 C. & C')
+    assert_equal [[0, 1],   [1,   1], [2, 1]], times('T60 C  & C E')
+
+    assert_equal [[0, 1], [1, 0.5]], times('T60 Q50 C & C')
+    assert_equal [[0, 1], [2, 1]],   times('T60     C & R C')
+  end
+
+  def test_tie_caret()
+    assert_equal 2,    duration('T60 C^')
+    assert_equal 1.5,  duration('T60 C^8')
+    assert_equal 1.75, duration('T60 C^8.')
+    assert_equal 2.75, duration('T60 C^8.^')
+    assert_equal 3.25, duration('T60 C^8.^.')
+  end
+
+  def test_portamento()
+    assert_equal [[0, 1], [1, 1], [2, 1]], times('T60 L4 C_D_E')
+  end
+
+  def test_quantize()
+    assert_equal [[0, 1],   [1, 1]],   times('T60 L4      C C')
+    assert_equal [[0, 1],   [1, 1]],   times('T60 L4 Q100 C C')
+    assert_equal [[0, 0.5], [1, 0.5]], times('T60 L4 Q50  C C')
+    assert_equal [[0, 0],   [1, 0]],   times('T60 L4 Q0   C C')
+
+    assert_in_delta 2,              duration('T60 L4      C C')
+    assert_in_delta 2,              duration('T60 L4 Q50  C C')
+  end
+
+  def test_transpose()
+    assert_in_delta 466.164, oscillators('K 1  A').first.freq
+    assert_in_delta 466.164, oscillators('K+1  A').first.freq
+    assert_in_delta 415.305, oscillators('K-1  A').first.freq
+    assert_in_delta 493.883, oscillators('K 2  A').first.freq
+    assert_in_delta 880,     oscillators('K 12 A').first.freq
+    assert_in_delta 220,     oscillators('K-12 A').first.freq
+  end
+
+  def test_detune()
+    assert_in_delta 442.549, oscillators('Y 10   A').first.freq
+    assert_in_delta 466.164, oscillators('Y 100  A').first.freq
+    assert_in_delta 466.164, oscillators('Y+100  A').first.freq
+    assert_in_delta 415.305, oscillators('Y-100  A').first.freq
+    assert_in_delta 493.883, oscillators('Y 200  A').first.freq
+    assert_in_delta 880,     oscillators('Y 1200 A').first.freq
+    assert_in_delta 220,     oscillators('Y-1200 A').first.freq
+  end
+
+  def test_loop()
+    assert_equal 6,  procs('T60 [CDE]')    .size
+    assert_equal 6,  procs('T60 [CDE]2')   .size
+    assert_equal 9,  procs('T60 [CDE]3')   .size
+    assert_equal 3,  procs('T60 [CDE]1')   .size
+    assert_equal 0,  procs('T60 [CDE]0')   .size
+    assert_equal 36, procs('T60 [[CDE]3]4').size
+    assert_equal 12, procs('T60 [[CDE]]')  .size
+  end
+
+  def test_comment()
+    assert_in_delta 1, duration(<<~EOS)
+      ; comment
+      T60 L4 C ; C
+    EOS
+    assert_in_delta 1, duration(<<~EOS)
+      % comment
+      T60 L4 C % C
+    EOS
+  end
+
+end# TestMMLCompiler

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubysketch
 version: !ruby/object:Gem::Version
-  version: 0.7.14
+  version: 0.7.15
 platform: ruby
 authors:
 - xordog
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-05 00:00:00.000000000 Z
+date: 2026-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xot
@@ -16,120 +16,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.9
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: 0.3.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.9
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: 0.3.10
 - !ruby/object:Gem::Dependency
   name: rucy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.9
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: 0.3.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.9
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: 0.3.10
 - !ruby/object:Gem::Dependency
   name: beeps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.9
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: 0.3.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.9
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: 0.3.10
 - !ruby/object:Gem::Dependency
   name: rays
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.9
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: 0.3.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.9
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.9
+        version: 0.3.10
 - !ruby/object:Gem::Dependency
   name: reflexion
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.10
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: 0.3.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.10
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: 0.3.11
 - !ruby/object:Gem::Dependency
   name: processing
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.13
+        version: 1.1.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.13
+        version: 1.1.14
 description: A game engine based on the Processing API.
 email: xordog@gmail.com
 executables: []
@@ -163,6 +127,7 @@ files:
 - lib/rubysketch/extension.rb
 - lib/rubysketch/graphics_context.rb
 - lib/rubysketch/helper.rb
+- lib/rubysketch/mml.rb
 - lib/rubysketch/shape.rb
 - lib/rubysketch/sound.rb
 - lib/rubysketch/sprite.rb
@@ -172,6 +137,7 @@ files:
 - src/RubySketch.mm
 - test/helper.rb
 - test/test_context.rb
+- test/test_mml.rb
 - test/test_sound.rb
 - test/test_sprite.rb
 homepage: https://github.com/xord/rubysketch
@@ -200,5 +166,6 @@ summary: A game engine based on the Processing API.
 test_files:
 - test/helper.rb
 - test/test_context.rb
+- test/test_mml.rb
 - test/test_sound.rb
 - test/test_sprite.rb