lydown 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b8c837a068f50dd59adac76af318ea85b9e27c0
-  data.tar.gz: a2c3297624f4682fda2c3484334955488a7911ec
+  metadata.gz: de11dc5e615a172e26be2794ac4d4ef9ffe1f6cf
+  data.tar.gz: a084d3a2ff38cf986562543ee7cdeba0d42d9b1f
 SHA512:
-  metadata.gz: 105a386ac25d493b6621877cc983508c41a7e00ee6fa6c5a2d3dc61ceef5358ffce2d0a54ae3f06d71076c884a347b341ee9614b0d67315e2995756b4dfce4af
-  data.tar.gz: 441484711848e46815d6cbbba3478dfc54b37d4bcfab1bb1e5171bed91100f6393da6845f1daca92b005c9baf303c88f66c52a0ea9ee461fe3157486b7969368
+  metadata.gz: 283987261fae1293645577aa9ef8dd47dd444a1414568f30c41e60588a2789296c6aa214627e7421c607fb948a9338de49e33aea17d2759afe0d1adf398ed0cc
+  data.tar.gz: c6d97d5602792d02ae693cabb6d5c605d6cf7371ca40c7c9ea795d6ec03becfbd6a55b0f97f392a6fcec357b4bf11c964591358417009c3027c4871030afca1c

data/lib/lydown/core_ext.rb

@@ -11,13 +11,16 @@ class Hash
   end
 
   def deep_merge!(hash)
-    hash.keys.each do |key|
-      if hash[key].is_a? Hash and self[key].is_a? Hash
-        self[key] = self[key].deep_merge!(hash[key])
-        next
+    unless self.hash == hash.hash
+      hash.each do |key, value|
+        svalue = self.old_get(key)
+      
+        if (value.is_a? Hash) && (svalue.is_a? Hash)
+          old_set(key, svalue.deep_merge(value))
+        else
+          old_set(key, value)
+        end
       end
-
-      self[key] = hash[key]
     end
 
     self.deep = true
@@ -96,6 +99,10 @@ class Hash
     @deep = true
     self
   end
+  
+  def is_deep?
+    !!@deep
+  end
 end
 
 class String

data/lib/lydown/rendering/music.rb

@@ -34,14 +34,22 @@ module Lydown::Rendering
     end
 
     def translate
+      # close tuplet braces
+      if @work['process/tuplet_mode']
+        TupletDuration.emit_tuplet_end(@work)
+        @work['process/tuplet_mode'] = nil
+      end
+
       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]]
+        value = LILYPOND_DURATIONS[@event[:value]] || @event[:value]
+
+        @work['process/duration_values'] = [value]
         @work['process/last_value'] = nil
         @work['process/tuplet_mode'] = true
-
-        group_value = @event[:value].to_i / @event[:group_length].to_i
+        
+        group_value = value.to_i / @event[:group_length].to_i
         @work.emit(:music, "\\tuplet #{@event[:fraction]} #{group_value} { ")
       end
     end

data/lib/lydown/rendering/notes.rb

@@ -32,11 +32,16 @@ module Lydown::Rendering
     def self.calc_accidentals_map(accidentals)
       accidentals.inject({}) { |h, a| h[a[0]] = (a[1] == '+') ? 1 : -1; h}
     end
+    
+    ACCIDENTAL_VALUES = {
+      '+' => 1,
+      '-' => -1
+    }
 
     def self.lilypond_note_name(note, key_signature = 'c major')
       value = 0
       # accidental value from note
-      note = note.gsub(/[\-\+]/) { |c| value += (c == '+') ? 1 : -1; '' }
+      note = note.gsub(/[\-\+]/) { |c| value += ACCIDENTAL_VALUES[c]; '' }
       # add key signature value
       value += accidentals_for_key_signature(key_signature)[note] || 0
 

data/lib/lydown/rendering/settings.rb

@@ -29,8 +29,11 @@ module Lydown::Rendering
         @work[key] = value
         case key
         when 'part'
+          @work.set_part_context(value)
+          
           # when changing parts we repeat the last set time and key signature
           render_setting('time', @work[:time]) unless @work[:time] == '4/4'
+          
           key =  @work[:key]
           render_setting('key', key) unless key == 'c major'
 
@@ -113,3 +116,5 @@ module Lydown::Rendering
     end
   end
 end
+
+

data/lib/lydown/templates/lilypond_doc.erb

@@ -8,6 +8,7 @@
 \book {
   \header {
   }
+
   <% self['movements'].each do |n, m| %>
     <%= Lydown::Templates.render(:movement, self, name: n, movement: m) 
     %>

data/lib/lydown/templates/part.erb

@@ -11,20 +11,26 @@
   
 
   score_mode = self['render_opts/mode'] == :score
+  
+  part['settings'] ||= {
+    'pickup' => @context[:pickup],
+    'key' => @context[:key],
+    'tempo' => @context[:tempo]
+  }.deep!
 
   clef = Lydown::Rendering::Staff.clef(name)
   beaming_mode = Lydown::Rendering::Staff.beaming_mode(name)
-  partial = self[:pickup] ? "\\partial #{self[:pickup]}" : ""
-
+  partial = part['settings'][:pickup] ? "\\partial #{part['settings'][:pickup]}" : ""
+  
   end_barline = Lydown::Rendering::Staff.end_barline(self, movement)
 
-  cadenza = self[:time] == 'unmetered'
+  cadenza = part['settings'][:time] == 'unmetered'
 %>
 
 <<
 
-<% if self[:tempo] %>
-  \tempo "<%= self[:tempo] %>"
+<% if part['settings'][:tempo] %>
+  \tempo "<%= part['settings'][:tempo] %>"
 <% end %>
 
 \new Staff = <%= staff_id %> \with {

data/lib/lydown/version.rb

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

data/lib/lydown/work.rb

@@ -26,7 +26,7 @@ module Lydown
 
     def reset_context(mode)
       case mode
-      when :work, :movement
+      when :work
         @context[:time] = '4/4'
         @context[:tempo] = nil
         @context[:cadenza_mode] = nil
@@ -35,6 +35,8 @@ module Lydown
         @context[:beaming] = nil
         @context[:end_barline] = nil
         @context[:part] = nil
+      when :movement
+        @context[:part] = nil
       end
       if @context['process/tuplet_mode']
         Lydown::Rendering::TupletDuration.emit_tuplet_end(self)
@@ -84,7 +86,7 @@ module Lydown
         part = @context[:part]
         path = "movements/#{movement}/parts/#{part}/#{subpath}"
       end
-      @context[path] ||= ''
+      @context[path] ||= (subpath == :settings) ? {} : ''
     end
 
     def to_lilypond(opts = {})
@@ -157,6 +159,39 @@ module Lydown
     def []=(path, value)
       context[path] = value
     end
+    
+    # Helper method to preserve context while processing a file or directory.
+    # This method is called with a block. After the block is executed, the 
+    # context is restored.
+    def preserve_context
+      old_context = @context
+      new_context = old_context.deep_merge({})
+      @context = new_context
+      yield
+    ensure
+      @context = old_context
+      if new_context['movements']
+        if @context['movements']
+          @context['movements'].deep_merge! new_context['movements']
+        else
+          @context['movements'] = new_context['movements']
+        end
+        if @context['movements/01-intro/parts/violino1/settings'] && @context['movements/01-intro/parts/violino1/settings'].keys.include?('pickup')
+        end
+      end
+    end
+    
+    def set_part_context(part)
+      movement = @context[:movement]
+      path = "movements/#{movement}/parts/#{part}/settings"
+
+      settings = {}.deep!
+      settings[:pickup] = @context[:pickup]
+      settings[:key] = @context[:key]
+      settings[:tempo] = @context[:tempo]
+      
+      @context[path] = settings
+    end
 
     def process_work_files
       path = @context[:path]
@@ -174,32 +209,34 @@ module Lydown
     DEFAULT_BASENAMES = %w{work movement}
 
     def process_directory(path, recursive = true)
-      # process work code
-      process_lydown_file(File.join(path, 'work.ld'))
-
-      # process movement specific code
-      process_lydown_file(File.join(path, 'movement.ld'))
-
-      # Iterate over sorted directory entries
-      Dir["#{path}/*"].entries.sort.each do |entry|
-        if File.file?(entry) && (entry =~ /\.ld$/)
-          basename = File.basename(entry, '.*')
-          unless DEFAULT_BASENAMES.include?(basename)
-            part_code = [{type: :setting, key: 'part', value: basename}]
-            lydown_code = part_code + LydownParser.parse(IO.read(entry))
-            process(lydown_code)
+      preserve_context do
+        # process work code
+        process_lydown_file(File.join(path, 'work.ld'))
+        # process movement specific code
+        process_lydown_file(File.join(path, 'movement.ld'))
+
+        # Iterate over sorted directory entries
+        Dir["#{path}/*"].entries.sort.each do |entry|
+          if File.file?(entry) && (entry =~ /\.ld$/)
+            part = File.basename(entry, '.*')
+            unless DEFAULT_BASENAMES.include?(part)
+              preserve_context do
+                process_lydown_file(entry, [
+                  {type: :setting, key: 'part', value: part}
+                ])
+              end
+            end
+          elsif File.directory?(entry) && recursive
+            movement = File.basename(entry)
+            process([{type: :setting, key: 'movement', value: movement}])
+            process_directory(entry, false)
           end
-        elsif File.directory?(entry) && recursive
-          basename = File.basename(entry)
-          # set movement
-          process([{type: :setting, key: 'movement', value: basename}])
-          process_directory(entry, false)
         end
       end
     end
 
-    def process_lydown_file(path)
-      process LydownParser.parse(IO.read(path)) if File.file?(path)
+    def process_lydown_file(path, prefix = [])
+      process(prefix + LydownParser.parse(IO.read(path))) if File.file?(path)
     end
   end
 end

metadata

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