lydown 0.9.0 → 0.10.0

data/lib/lydown/work_context.rb

@@ -32,14 +32,14 @@ module Lydown
     def reset(mode)
       case mode
       when :work
-        @context[:time] = '4/4'
-        @context[:tempo] = nil
-        @context[:cadenza_mode] = nil
-        @context[:key] = 'c major'
-        @context[:pickup] = nil
-        @context[:beaming] = nil
-        @context[:end_barline] = nil
         @context[:part] = nil
+        set_setting(:time, '4/4')
+        set_setting(:tempo, nil)
+        @context[:cadenza_mode] = nil
+        set_setting(:key, 'c major')
+        set_setting(:pickup, nil)
+        set_setting(:beaming, nil)
+        set_setting(:end_barline, nil)
       when :movement
         @context[:part] = nil
       end
@@ -95,23 +95,102 @@ module Lydown
 
       if filter = opts[:parts]
         filter = [filter] unless filter.is_a?(Array)
+        filter += opts[:include_parts] if opts[:include_parts]
       end
-      filtered[:movements].each do |name, m|
+      
+      filtered[:movements].each do |movement_name, m|
         # delete default part if other parts are present
         if m[:parts].size > 1
           m[:parts].delete('')
         end
 
-        if filter
-          m[:parts].select! do |pname, p|
-            filter.include?(pname.to_s)
-          end
-        end
+        filter_movement_parts(movement_name, m, filter)
       end
 
-      filtered
+      WorkContext.new(nil, filtered)
+    end
+    
+    DEFAULT_SOURCE_STREAMS = %w{music}
+    
+    # Parts are filtered as follows:
+    # 
+    # - Parts for which the render_modes do not include the current mode
+    #   are rejected.
+    # - If a filter is provided, only the specified parts are selected, and any
+    #   colla parte parts are added if found.
+    # - Part includes are checked and added as well
+    def filter_movement_parts(movement_name, m, filter)
+      mode = self['options/mode']
+      if DEFAULT_RENDER_MODES.include?(mode)
+        m[:parts].select!  do |part_name|
+          part_render_modes(movement_name, part_name).include?(mode)
+        end
+      end
+      
+      select_filter_parts(movement_name, m, filter) if filter
+      add_part_includes(movement_name, m)
     end
 
+    DEFAULT_RENDER_MODES = [:part, :score]
+    
+    def part_render_modes(movement_name, part_name)
+      modes = get_setting(:render_modes, part: part_name, movement: movement_name)
+      if modes
+        modes.split(',').map {|m| m.strip.to_sym}
+      else
+        DEFAULT_RENDER_MODES
+      end
+    end
+    
+    def select_filter_parts(movement_name, m, filter)
+      m[:parts].select! {|part_name, p| filter.include?(part_name)}
+    
+      # go over filter and check for colla parte
+      filter.each do |part_name|
+        unless m[:parts].keys.include?(part_name)
+          if source = part_source(movement_name, part_name)
+            part_path = "parts/#{part_name}"
+            source_path = "movements/#{movement_name}/parts/#{source}"
+          
+            source_streams = ['settings']
+            if stream_list = part_source_streams(movement_name, part_name)
+              source_streams += stream_list.split(',').map(&:strip)
+            else
+              source_streams += DEFAULT_SOURCE_STREAMS
+            end
+          
+            m[part_path] = source_streams.inject({}) do |hash, stream|
+              hash[stream] = self["#{source_path}/#{stream}"]
+              hash
+            end.deep!
+          end
+        end
+      end
+    end
+    
+    def add_part_includes(movement_name, m)
+      # check for part includes
+      if part = self['options/parts']
+        part = part[0] if part.is_a?(Array)
+        includes = get_setting(:include_parts, 
+          movement: movement_name, part: part)
+          
+        return unless includes
+        
+        includes = includes.split(',').map(&:strip)
+        
+        includes.each do |included_part|
+          # If the included part does not exist, try to find its source
+          part_hash = self["movements/#{movement_name}/parts/#{included_part}"]
+          unless part_hash
+            source = part_source(movement_name, included_part)
+            part_hash = self["movements/#{movement_name}/parts/#{source}"]
+          end
+          m["parts/#{included_part}"] ||= part_hash
+        end
+      end
+    end
+    
     def [](key)
       @context[key]
     end
@@ -121,6 +200,10 @@ module Lydown
     end
     
     def emit(path, *content)
+      if self['process/mode']
+        return unless self['process/mode'] == render_mode
+      end
+      
       stream = current_stream(path)
 
       content.each {|c| stream << c}
@@ -148,5 +231,160 @@ module Lydown
       
       @context[path] = settings
     end
+    
+    def settings_path(movement, part)
+      if part
+        "movements/#{movement}/parts/#{part}/settings"
+      elsif movement && !movement.empty?
+        "movements/#{movement}/settings"
+      else
+        "global/settings"
+      end
+    end
+    
+    def query_setting(movement, part, path)
+      path = "#{settings_path(movement, part)}/#{path}"
+      value = @context[path]
+      unless value.nil?
+        @temp_setting_value = value
+        true
+      else
+        false
+      end
+    end
+    
+    def query_defaults(path)
+      value = DEFAULTS[path]
+      unless value.nil?
+        @temp_setting_value = value
+        true
+      else
+        false
+      end
+    end
+    
+    def query_setting_tree(movement, part, path)
+      path = "#{settings_path(movement, part)}/#{path}"
+      @context[path] || {}
+    end
+    
+    def get_setting(path, opts = {})
+      # In order to allow false values for settings, we create
+      # a temporary instance variable, and use it to store the
+      # setting value once it's found. That way we can use the
+      # || operator to stop searching once we've found it.
+      @temp_setting_value = nil
+      if opts[:part]
+        parts_section_path = "parts/#{opts[:part]}/#{path}"
+        
+        query_setting(opts[:movement], opts[:part], path) ||
+        query_setting(nil, opts[:part], path) ||
+        query_setting(opts[:movement], nil, path) ||
+        query_setting(nil, nil, path) ||
+        
+        # search in parts section
+        query_setting(opts[:movement], nil, parts_section_path) ||
+        query_setting(nil, nil, parts_section_path) ||
+        
+        query_defaults("parts/#{opts[:part]}/#{path}") ||
+        query_defaults(path)
+      else
+        query_setting(opts[:movement], nil, path) || 
+        query_setting(nil, nil, path) || 
+        query_defaults(path)
+      end
+      @temp_setting_value
+    end
+    
+    # Get setting while code is being translated
+    def get_current_setting(path)
+      get_setting(path, current_setting_opts)
+    end
+    
+    def current_setting_opts
+      {movement: @context[:movement], part: @context[:part]}
+    end
+    
+    # Returns a merged tree of the settings from different levels
+    def get_merged_setting_tree(path, opts)
+      tree = (DEFAULTS[path] || {}).deep_merge(
+              query_setting_tree(nil, nil, path))
+
+      if opts[:movement]
+        tree.deep_merge! query_setting_tree(opts[:movement], nil, path)
+      else
+        tree.deep!
+      end
+    end
+    
+    def colla_parte_map(movement_name)
+      parts_settings = get_merged_setting_tree(:parts, movement: movement_name)
+      colla_parte = get_merged_setting_tree(:colla_parte, movement: movement_name)
+      
+      map = Hash.new {|h, k| h[k] = []}
+      parts_settings.each do |name, settings|
+        if source = settings['source']
+          map[source] << name
+        end
+      end
+      
+      colla_parte.each do |source, parts|
+        parts.split(',').map(&:strip).inject(map[source]) do |m, p|
+          m << p unless m.include?(p); m
+        end
+      end
+      
+      map
+    end
+    
+    def part_source(movement_name, part_name)
+      parts_settings = get_merged_setting_tree(:parts, movement: movement_name)
+      if source = parts_settings["#{part_name}/source"]
+        return source
+      else
+        colla_parte = get_merged_setting_tree(:colla_parte, movement: movement_name)
+        colla_parte.each do |source, parts|
+          if parts.split(',').map(&:strip).include?(part_name)
+            return source
+          end
+        end
+      end 
+      nil
+    end
+    
+    def part_source_streams(movement_name, part_name)
+      parts_settings = get_merged_setting_tree(:parts, movement: movement_name)
+      parts_settings["#{part_name}/source_streams"]
+    end
+
+    def set_setting(path, value)
+      path = "#{settings_path(@context[:movement], @context[:part])}/#{path}"
+      @context[path] = value
+    end
+    
+    def render_mode
+      self['options/mode'] || self['render_opts/mode']
+    end
+    
+    def to_msgpack
+      @context.to_msgpack
+    end
+    
+    # Returns a list of parts to extract for the specified opts. Only parts
+    # that should be extracted (based on the render_modes setting) are included.
+    def part_list_for_extraction(opts)
+      parts = []
+      return parts unless @context[:movements]
+      
+      @context[:movements].each do |mname, m|
+        m[:parts].each do |pname, p|
+          # Add only parts that render in part mode
+          if part_render_modes(mname, pname).include?(:part)
+            parts << pname unless (pname == '') || parts.include?(pname)
+          end
+        end
+      end
+      parts
+    end
   end
 end

metadata

@@ -1,29 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: lydown
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.6.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.6.2
+- !ruby/object:Gem::Dependency
+  name: diff-lcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+- !ruby/object:Gem::Dependency
+  name: escape_utils
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.19.1
+- !ruby/object:Gem::Dependency
+  name: directory_watcher
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.5.1
+- !ruby/object:Gem::Dependency
+  name: ruby-progressbar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.5
+- !ruby/object:Gem::Dependency
+  name: parallel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.1
+- !ruby/object:Gem::Dependency
+  name: msgpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.6.2
+- !ruby/object:Gem::Dependency
+  name: combine_pdf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.2.5
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 description: Lydown is a language and tool for music notation
 email: ciconia@gmail.com
 executables:
@@ -35,17 +161,21 @@ files:
 - README.md
 - bin/lydown
 - lib/lydown.rb
+- lib/lydown/cache.rb
 - lib/lydown/cli.rb
 - lib/lydown/cli/commands.rb
 - lib/lydown/cli/compiler.rb
 - lib/lydown/cli/diff.rb
 - lib/lydown/cli/output.rb
 - lib/lydown/cli/proofing.rb
+- lib/lydown/cli/signals.rb
 - lib/lydown/cli/support.rb
 - lib/lydown/cli/translation.rb
 - lib/lydown/core_ext.rb
+- lib/lydown/defaults.yml
 - lib/lydown/errors.rb
 - lib/lydown/lilypond.rb
+- lib/lydown/ly_lib/lib.ly
 - lib/lydown/parsing.rb
 - lib/lydown/parsing/lydown.treetop
 - lib/lydown/parsing/nodes.rb
@@ -53,9 +183,8 @@ files:
 - lib/lydown/rendering/base.rb
 - lib/lydown/rendering/command.rb
 - lib/lydown/rendering/comments.rb
-- lib/lydown/rendering/defaults.yml
 - lib/lydown/rendering/figures.rb
-- lib/lydown/rendering/lib.ly
+- lib/lydown/rendering/literal.rb
 - lib/lydown/rendering/lyrics.rb
 - lib/lydown/rendering/movement.rb
 - lib/lydown/rendering/music.rb
@@ -70,6 +199,7 @@ files:
 - lib/lydown/templates/movement.erb
 - lib/lydown/templates/multi_voice.erb
 - lib/lydown/templates/part.erb
+- lib/lydown/templates/variables.erb
 - lib/lydown/translation.rb
 - lib/lydown/translation/ripple.rb
 - lib/lydown/translation/ripple/nodes.rb