ramekin 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78c8f609fa645c1807ac00bf970bf5d05fc78015c185a50d55410a81faa888a4
-  data.tar.gz: aab9adb5b304bbcedc94aee84ca95ddd4bf70307d5f807fcbca93944c79c109f
+  metadata.gz: 399438b57abf19c6d68cbc4db7fbb96586985bf801f0f94cea4cd1365d2839e9
+  data.tar.gz: 5abb75a51346fa517c749f3dd78d469459d02bef30bb3478060f2ed9527a0792
 SHA512:
-  metadata.gz: 42986dbf7c0e96bf7e1ecff4552b052cc99fa662f7e648f8aa16e5e5f668e76759b753f563a11a315c530d2d6ef86867a1f7cb0d1080a1a6d7cfdb0a3c8ac908
-  data.tar.gz: b7e71fecb8146fbd9b2a8391a827db80c95bff25deff7bc15a50619f8d9f8264346894dd4653629cfe36dc905b4b21c0ddf96c3054a4a2e610d5fe11759c11a6
+  metadata.gz: e9306550e91db609450792179302dce6752cb6fa9cb5fe97f95f1ac926bf28bc8548719c5e0d55e7909c0e4c8817149675f7caff6a86c0d4b37bbeaaf634840b
+  data.tar.gz: 38abeba0943b587b1559e9fe0a1fe5fe0875f349a1b7fa5883b1e7da57e1e52898a0bd0ef2b7fee02b418a8f739aae118baae74627cbfce6d773d6d4fba5a4a9

data/lib/ramekin/bends.rb

@@ -62,11 +62,13 @@ module Ramekin
         adjust = 2 - leftover
         bend_duration -= adjust
         leftover += adjust
-        if bend_duration < 0
+        if bend_duration <= 0
           return error! 'bend duration too small to insert legato-off toggle', el: self
         end
       end
 
+      return '' unless check_duration!(from)
+
       out = StringIO.new
 
       out << from.octave_amk(oct)
@@ -92,6 +94,16 @@ module Ramekin
       true
     end
 
+    def check_duration!(note)
+      ticks = note.ticks
+      return true if ticks > 0 && ticks <= 96
+
+      error! 'bend length too short (must be at least one tick)', el: note if ticks <= 0
+      error! 'bend duration too long (max 96 ticks or a half note)', el: note if ticks > 96
+
+      false
+    end
+
     def to_amk(octave, divisor)
       if massive_special_case?(divisor)
         return render_massive_special_case(octave, divisor)
@@ -113,6 +125,7 @@ module Ramekin
         end
 
         ticks /= divisor
+        next unless check_duration!(note)
 
         # $dd doesn't work properly if the note
         # beforehand is more than a half note, so we have to
@@ -132,6 +145,13 @@ module Ramekin
     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
     end
   end

data/lib/ramekin/renderer.rb

@@ -177,7 +177,7 @@ module Ramekin
         else
           @octave = nil
           unless @instrument_index.key?(token.value)
-            error! "undeclared instrument @#{token.value}"
+            return error! "undeclared instrument @#{token.value}"
           end
 
           yield "@#{@instrument_index[token.value]}"
@@ -224,6 +224,12 @@ module Ramekin
         when 'C' then 10
         end
 
+        if pan > 20
+          return error! 'invalid pan (max yL10)'
+        elsif pan < 0
+          return error! 'invalid pan (max yR10)'
+        end
+
         yield "y#{pan}"
 
       when :p
@@ -257,9 +263,6 @@ module Ramekin
       # triplets are handled in NoteAggregator
       when :lbrace, :rbrace
         # pass
-      when :rbrace
-        yield '}'
-
       else
         error! "unexpected token type: #{token.type}"
       end
@@ -272,10 +275,10 @@ module Ramekin
       if time.nil?
         "v#{vol}"
       else
-        time = time.to_i
+        time = time.to_i / @track.meta.divisor
         time = 255 if time > 255
         time = 0 if time < 0
-        sprintf("$E8$%02x$%02x", time, vol)
+        sprintf("$e8$%02x$%02x", time, vol)
       end
     end
 

metadata

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