ramekin 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d868f9a713e079e67a612eb195411f981e08762404d04d864e3c49ebb436264
-  data.tar.gz: 1147c0e541694973b8c5e50c953822cce616abdcffba5a00e9a379e21bc65920
+  metadata.gz: a249d3680d6f96fe57c566445a3add42d0287de30bd86a556131963b58b239b8
+  data.tar.gz: df8ab404da547bd42b68fee9ef45d3eeed5c1c46201c997dea2a04cb65a8e0aa
 SHA512:
-  metadata.gz: b5f887113d039e9f9e496062b96c2905a1b877dd9199daf2db87a8e5b2072b3db74736ab496fbc92680f40bb8567ba875a6b0fb4e8934d9e674bc3734dc35f10
-  data.tar.gz: 76a5c121c7e2755fa09ef578fe8d9a002b3357c0fcdb3af5cf7241fbad7d59b153b6a111201caa4467c4a18e83d87c3c273d1a41467d219eec7a030ce0dc370b
+  metadata.gz: 3001f9832d107a892137de8e811c842d972ad226de761e2cd033b79845d455988de28e328c55d14c78215c61a6adb5d11b3819ca35682e66a3c3b9bb0593961c
+  data.tar.gz: b52c6b301948c3400d7c0c7db3cdc4f3da93e1827a352cd927d5fa8c7bf06d06aee67e70b21392002262fee92ede83cef2cbdd69dbf4c11d84ecb55af5e890f1

data/lib/ramekin/amk_runner.rb

@@ -48,6 +48,10 @@ module Ramekin
       ln("#@amk_path/samples/default", "#@workdir/samples/default")
       ln("#@amk_path/samples/optimized", "#@workdir/samples/optimized")
       ln("#@amk_path/samples/EMPTY.brr", "#@workdir/samples/EMPTY.brr")
+      if File.exist?("#@amk_path/samples/SPECIALWAVE.brr")
+        ln("#@amk_path/samples/SPECIALWAVE.brr", "#@workdir/samples/SPECIALWAVE.brr")
+      end
+
       if @meta.instruments.any?
         sample_dir = "#@workdir/samples/#{@meta.sample_path || basename}"
         FileUtils.mkdir_p(sample_dir)

data/lib/ramekin/bends.rb

@@ -32,11 +32,11 @@ module Ramekin
     end
 
     def tie?
-      false
+      @notes.first.tie?
     end
 
     def ending_octave
-      @notes.first.octave
+      @notes.last.octave
     end
 
     # in the event of a tie-free bend exactly at a note out where we *also*
@@ -74,7 +74,7 @@ module Ramekin
       out << from.octave_amk(oct)
       out << from.note_name
       out << "=#{bend_duration}"
-      out << dd(bend_duration, to)
+      out << dd(bend_duration, to, from.octave_num)
       out << "$f4$01^=#{leftover}"
 
       out.string
@@ -119,6 +119,7 @@ module Ramekin
 
         if i == 0
           out << note.octave_amk(octave)
+          octave = note.octave_num
           out << note.note_name
         else
           out << '^'
@@ -129,7 +130,7 @@ module Ramekin
         # always use tick count notation here because
         # amk can insert ties in some cases which will break $dd
         out << "=#{ticks}"
-        out << dd(ticks, to_note)
+        out << dd(ticks, to_note, octave)
         out << '$f4$01' if @end_legato && i == 0
       end
 
@@ -137,15 +138,9 @@ module Ramekin
       out.string
     end
 
-    def dd(dur, note)
-      hex = note.note_hex
-
-      unless 0x80 <= hex && hex <= 0xC5
-        error! 'note out of range (o1c - o6a)', el: note
-        return ''
-      end
-
-      sprintf '$dd$00$%02x$%02x', dur, note.note_hex
+    def dd(dur, note, current_octave)
+      oct = note.octave_switching_amk(current_octave)
+      sprintf '$dd$00$%02x%s%s', dur, oct, note.note_name
     end
   end
 

data/lib/ramekin/meta.rb

@@ -288,7 +288,7 @@ module Ramekin
     end
 
     def tuning
-      @tuning ||= ext_tuning || pack_tuning || [0, 0]
+      @tuning ||= ext_tuning || pack_tuning || [4, 0]
     end
 
     def pack_tuning

data/lib/ramekin/note_aggregator.rb

@@ -107,6 +107,14 @@ module Ramekin
       end
     end
 
+    def octave_switching_amk(current_octave)
+      diff = octave_num - current_octave
+
+      return '' if diff == 0
+      return '<' * (-diff) if diff < 0
+      return '>' * diff if diff > 0
+    end
+
     def to_amk(current_octave=nil, divisor=1)
       return "#{octave_amk(current_octave)}#{note_name}#{length_amk(divisor)}"
     end

data/lib/ramekin/renderer.rb

@@ -58,7 +58,7 @@ module Ramekin
       yield "; https://codeberg.org/jneen/ramekin\n\n"
 
       # TODO
-      yield "#amk #{@track.meta.amk&.value || 2}\n\n"
+      yield "#amk #{@track.meta.amk&.value || 4}\n\n"
 
       if m.instruments.any?
         yield "#path #{(m.sample_path || @filename.chomp('.rmk')).inspect}\n"
@@ -130,7 +130,7 @@ module Ramekin
 
           yield el.to_amk(@octave, @track.meta.divisor)
 
-          @octave = el.ending_octave
+          @octave = el.ending_octave unless el.tie?
         when NoteEvent
           old_tick = @tick
           @tick += el.ticks

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ramekin
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - jneen