lydown 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66935404398a57aa09da31ebddd911edae7227fe
-  data.tar.gz: 6bc6875c3b2e2187140a91bb586b53411aeb57c3
+  metadata.gz: 5f65c145556a28db3b86c183d1f12460e903c4fa
+  data.tar.gz: 2c7faca659a582e802793be8c84551efdb0e863d
 SHA512:
-  metadata.gz: 28dcdb1e4501356d371f3ff217af806f966a37fe24611fe7f33426ec264d80b197fc609441fef6953b3929d9239436289950e05983d0bbf15f8fc58770663392
-  data.tar.gz: 36a98eb309977703065fb6feb0dc5284b2f78d7b241f40606f0098087980e70415258d9df13d30b06854ac40b92a93fec84bdad93cb6fe9acaea565d3d8e76c0
+  metadata.gz: 138a326275fd7b015c991439ef18c9533d4928d04fcfe9700a8a102712250d2e0e1839a844ea31cb0fe96cbe7c3caa56a9ec0f4c02759f0550d41976f5738ba0
+  data.tar.gz: 3c8d435a1971f739c50b3b9bd8d4987a7f928ab418583fa1a8c0125e725deebc5f38420bc261902dd53dd2ab9767a0430f2be44d3f3a89807fa78f683fc5e832

data/lib/lydown/parsing/lydown.treetop

@@ -55,7 +55,10 @@ grammar Lydown
     #  '.|') <Barline>
   end
   rule duration
-    duration_value / duration_macro
+    tuplet_value / duration_value / duration_macro
+  end
+  rule tuplet_value
+    number '%' (number '/' number)? <TupletValue>
   end
   rule duration_value
     number dots* multiplier? <DurationValue>
@@ -113,7 +116,7 @@ grammar Lydown
     [s] multiplier* <Silence>
   end
   rule note_head
-    [a-g] accidental* <Note::Head>
+    [a-g] octave* accidental* <Note::Head>
   end
   rule accidental
     [\+\-]+

data/lib/lydown/parsing/nodes.rb

@@ -58,6 +58,25 @@ module Lydown::Parsing
     end
   end
 
+  module TupletValue
+    def to_stream(stream)
+      if text_value =~ /^(\d+)%((\d+)\/(\d+))?$/
+        value, fraction, group_length = $1, $2, $4
+        unless fraction
+          fraction = '3/2'
+          group_length = '2'
+        end
+
+        stream << {
+          type: :tuplet_duration,
+          value: value,
+          fraction: fraction,
+          group_length: group_length
+        }
+      end
+    end
+  end
+
   module Note
     include Root
 
@@ -69,7 +88,10 @@ module Lydown::Parsing
 
     module Head
       def to_stream(note)
-        note[:head] = text_value
+        # remove octave marks from note head (this is only in case the order
+        # accidental-octave was reversed)
+        head = text_value.gsub(/[',]+/) {|m| note[:octave] = m; ''}
+        note[:head] = head
       end
     end
 

data/lib/lydown/rendering/music.rb

@@ -169,7 +169,7 @@ module Lydown::Rendering
         @work['process/duration_macro'] = nil
 
         code = LydownParser.parse(@work['process/macro_group'])
-        @work.process(code)
+        @work.process(code, no_reset: true)
 
         # restore macro
         @work['process/duration_macro'] = macro
@@ -185,15 +185,42 @@ module Lydown::Rendering
 
   class Duration < Base
     def translate
+      # close tuplet braces
+      if @work['process/tuplet_mode']
+        TupletDuration.emit_tuplet_end(@work)
+        @work['process/tuplet_mode'] = nil
+      end
+
       value = @event[:value].sub(/^[0-9]+/) {|m| LILYPOND_DURATIONS[m] || m}
 
       if next_event && next_event[:type] == :stand_alone_figures
         @work['process/figures_duration_value'] = value
       else
         @work['process/duration_values'] = [value]
+        @work['process/tuplet_mode'] = nil
         @work['process/duration_macro'] = nil unless @work['process/macro_group']
       end
     end
+
+  end
+
+  class TupletDuration < Base
+    def self.emit_tuplet_end(work)
+      work.emit(:music, '} ')
+    end
+
+    def translate
+      if next_event && next_event[:type] == :stand_alone_figures
+        @work['process/figures_duration_value'] = "#{@event[:value]}*#{@event[:fraction]}"
+      else
+        @work['process/duration_values'] = [@event[:value]]
+        @work['process/last_value'] = nil
+        @work['process/tuplet_mode'] = true
+
+        group_value = @event[:value].to_i / @event[:group_length].to_i
+        @work.emit(:music, "\\tuplet #{@event[:fraction]} #{group_value} { ")
+      end
+    end
   end
 
   class Note < Base

data/lib/lydown/version.rb

@@ -1,3 +1,3 @@
 module Lydown
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/lib/lydown/work.rb

@@ -34,16 +34,16 @@ module Lydown
         @context[:beaming] = nil
         @context[:end_barline] = nil
         @context[:part] = nil
-        @context['process/duration_values'] = ['4']
-        @context['process/running_values'] = []
-        @context['process/last_value'] = nil
-        @context['process/last_figures_value'] = nil
-      when :part
-        @context['process/duration_values'] = ['4']
-        @context['process/running_values'] = []
-        @context['process/last_value'] = nil
-        @context['process/last_figures_value'] = nil
       end
+      if @context['process/tuplet_mode']
+        Lydown::Rendering::TupletDuration.emit_tuplet_end(self)
+      end
+
+      # reset processing variables
+      @context['process'] = {
+        'duration_values' => ['4'],
+        'running_values' => []
+      }
     end
 
     # Used to bind to instance when rendering templates
@@ -54,7 +54,7 @@ module Lydown
     end
 
     # translate a lydown stream into lilypond
-    def process(lydown_stream)
+    def process(lydown_stream, opts = {})
       lydown_stream.each_with_index do |e, idx|
         if e[:type]
           Lydown::Rendering.translate(self, e, lydown_stream, idx)
@@ -62,6 +62,7 @@ module Lydown
           raise LydownError, "Invalid lydown stream event: #{e.inspect}"
         end
       end
+      reset_context(:part) unless opts[:no_reset]
     end
 
     def emit(stream_type, *content)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lydown
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -24,7 +24,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-description: 'Lydown '
+description: Lydown is a language and tool for music notation
 email: ciconia@gmail.com
 executables:
 - lydown