ramekin 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78c8f609fa645c1807ac00bf970bf5d05fc78015c185a50d55410a81faa888a4
-  data.tar.gz: aab9adb5b304bbcedc94aee84ca95ddd4bf70307d5f807fcbca93944c79c109f
+  metadata.gz: f859d4c5dc75cc34a8053dcf5d9958aa48a80aea10d58bb44ac130e1b37c9af0
+  data.tar.gz: b1f2678cb27b008646ad250346c5345c7bf173749ba119d1b42ca5b8dbd3f1f4
 SHA512:
-  metadata.gz: 42986dbf7c0e96bf7e1ecff4552b052cc99fa662f7e648f8aa16e5e5f668e76759b753f563a11a315c530d2d6ef86867a1f7cb0d1080a1a6d7cfdb0a3c8ac908
-  data.tar.gz: b7e71fecb8146fbd9b2a8391a827db80c95bff25deff7bc15a50619f8d9f8264346894dd4653629cfe36dc905b4b21c0ddf96c3054a4a2e610d5fe11759c11a6
+  metadata.gz: 5ac7a907935cdb923dd3007b739b257c89262cbd862fd7b987189487330c3b39c6ae762741c5cd91ffa0b8e5f07455ab40ad90fef6178e773db8db32fb9ecf23
+  data.tar.gz: 3ab59a78f14c06923c2f93011567b8fa6a41aa9c5d56ef8121088157b43f7775da6c8c43ebfe497039498348f3583d3c70523e121904922614215c094f410431

data/README.md

@@ -10,6 +10,8 @@ Ramekin is a pre-processor for AddMusicK syntax that is in very early developmen
 
 Please keep in mind that as alpha software, **I may make breaking changes at any time.** After initial testing is done, I will release 1.0.0, at which point I will make a reasonable commitment to back-compatibility. That time is not yet.
 
+For a preview of what full Ramekin tracks look like, feel free to check out [the examples repo](https://codeberg.org/jneen/ramekin-examples).
+
 # Installation
 
 First, [Install Ruby](https://ruby-lang.org). Windows users can use [RubyInstaller](https://rubyinstaller.org/).

data/lib/ramekin/bends.rb

@@ -56,13 +56,15 @@ module Ramekin
 
       leftover = total_duration - bend_duration
 
+      return '' unless check_duration!(from, div)
+
       # ensure there is some leftover so we can toggle legato
       # before the end
       if leftover < 2
         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
@@ -92,6 +94,16 @@ module Ramekin
       true
     end
 
+    def check_duration!(note, divisor)
+      ticks = note.ticks / divisor
+      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)
@@ -104,34 +116,36 @@ module Ramekin
         to_note = @notes[i+1]
 
         if i == 0
-          ticks = note.ticks + to_note.ticks
           out << note.octave_amk(octave)
           out << note.note_name
         else
-          ticks = to_note.ticks
           out << '^'
         end
 
-        ticks /= divisor
+        next unless check_duration!(note, divisor)
 
-        # $dd doesn't work properly if the note
-        # beforehand is more than a half note, so we have to
-        # split it up
-        clamped_ticks = [0x60, ticks].min
-        leftover_ticks = [0, ticks-0x60].max
+        ticks = note.ticks
+        ticks /= divisor
 
         # always use tick count notation here because
         # amk can insert ties in some cases which will break $dd
-        out << "=#{clamped_ticks}"
-        out << dd(note.ticks, to_note)
+        out << "=#{ticks}"
+        out << dd(ticks, to_note)
         out << '$f4$01' if @end_legato && i == 0
-        out << "^=#{leftover_ticks}" if leftover_ticks > 0
       end
 
+      out << "^#{@notes.last.length_amk(divisor)}" if @notes.last.ticks > 0
       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
     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,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: ramekin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - jneen
 bindir: gembin
 cert_chain: []
-date: 2025-03-07 00:00:00.000000000 Z
+date: 2025-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: strscan