lydown 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de11dc5e615a172e26be2794ac4d4ef9ffe1f6cf
-  data.tar.gz: a084d3a2ff38cf986562543ee7cdeba0d42d9b1f
+  metadata.gz: 60fcdf6a08bf0d2bcb5696459558cc363eedd69e
+  data.tar.gz: 34a2c3748611306069d495586549a0de7443d133
 SHA512:
-  metadata.gz: 283987261fae1293645577aa9ef8dd47dd444a1414568f30c41e60588a2789296c6aa214627e7421c607fb948a9338de49e33aea17d2759afe0d1adf398ed0cc
-  data.tar.gz: c6d97d5602792d02ae693cabb6d5c605d6cf7371ca40c7c9ea795d6ec03becfbd6a55b0f97f392a6fcec357b4bf11c964591358417009c3027c4871030afca1c
+  metadata.gz: 866094223b9c739569ec266c621a934eccf9d0cd11ac7eb9453d682c5532ffa3e71e9624af070333fba4854213ec26547369315f969f71b4effb95b52f7899fd
+  data.tar.gz: 640142f2131b45050bba63b9e25e2f50d5dd477947a0519c840063e4ba4c02df93a72aa8517baabb3306a898d07c47e4e36457e8074418f31bad38e0f222d583

data/lib/lydown/parsing/lydown.treetop

@@ -44,7 +44,7 @@ grammar Lydown
     [ \t]+
   end
   rule event
-    (inline_command / inline_lyrics / voice_selector / barline / duration / 
+    (inline_command / inline_lyrics / voice_selector / barline / grace_duration / duration / 
       chord / note / standalone_figures / rest / silence / phrasing / tie) white_space*
   end
   rule barline
@@ -55,6 +55,12 @@ grammar Lydown
   rule duration
     tuplet_value / duration_value / duration_macro
   end
+  rule grace_duration
+    '$' grace_duration_type* number <GraceDuration>
+  end
+  rule grace_duration_type
+    [\/\^]
+  end
   rule tuplet_value
     number '%' (number '/' number)? <TupletValue>
   end

data/lib/lydown/parsing/nodes.rb

@@ -77,6 +77,20 @@ module Lydown::Parsing
     end
   end
 
+  module GraceDuration
+    GRACE_KIND = {
+      nil => :grace,
+      '/' => :acciaccatura,
+      '^' => :appoggiatura
+    }
+    
+    def to_stream(stream)
+      if text_value =~ /^\$([\/\^])?(\d+)$/
+        stream << {type: :grace, value: $2, kind: GRACE_KIND[$1]}
+      end
+    end
+  end
+
   module Note
     include Root
 

data/lib/lydown/rendering/music.rb

@@ -15,6 +15,11 @@ module Lydown::Rendering
         @work['process/tuplet_mode'] = nil
       end
 
+      if @work['process/grace_mode']
+        Grace.emit_grace_end(@work)
+        @work['process/grace_mode'] = nil
+      end
+
       value = @event[:value].sub(/^[0-9]+/) {|m| LILYPOND_DURATIONS[m] || m}
 
       if next_event && next_event[:type] == :stand_alone_figures
@@ -54,6 +59,28 @@ module Lydown::Rendering
       end
     end
   end
+  
+  class Grace < Base
+    def self.emit_grace_end(work)
+      work.emit(:music, '} ')
+    end
+    
+    def translate
+      # close tuplet braces
+      if @work['process/grace_mode']
+        Grace.emit_grace_end(@work)
+        @work['process/grace_mode'] = nil
+      end
+
+      value = LILYPOND_DURATIONS[@event[:value]] || @event[:value]
+
+      @work['process/duration_values'] = [value]
+      @work['process/last_value'] = nil
+      @work['process/grace_mode'] = true
+      
+      @work.emit(:music, "\\#{@event[:kind]} { ")
+    end
+  end
 
   class Note < Base
     include Notes

data/lib/lydown/version.rb

@@ -1,3 +1,3 @@
 module Lydown
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/lib/lydown/work.rb

@@ -41,6 +41,9 @@ module Lydown
       if @context['process/tuplet_mode']
         Lydown::Rendering::TupletDuration.emit_tuplet_end(self)
       end
+      if @context['process/grace_mode']
+        Lydown::Rendering::Grace.emit_grace_end(self)
+      end
       
       if @context['process/voice_selector']
         Lydown::Rendering::VoiceSelect.render_voices(self)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lydown
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-21 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop