lydown 0.10.0 → 0.12.4

data/lib/lydown/rendering/source_ref.rb

@@ -3,11 +3,12 @@ module Lydown::Rendering
   # for notes in a macro group
   class SourceRef < Base
     def translate
-      return # unless @context['options/proof_mode']
-
       fn = @event[:filename]
       if fn && fn != @context['process/last_filename']
         @context['process/last_filename'] = fn
+
+        return # unless @context['options/proof_mode']
+
         @context.emit(@event[:stream] || :music, "%{::#{File.expand_path(fn)}%} ")
       end
     end

data/lib/lydown/templates/lilypond_doc.erb

@@ -4,6 +4,11 @@
 \include "<%= File.join(LY_LIB_DIR, 'lib.ly') %>"
 <% end %>
 
+<% includes = Lydown::Rendering.include_files(self, {}) %>
+<% includes.each do |i| %>
+  <%= i %>
+<% end %>
+
 <% if self.render_mode == :proof %>
 <%= Lydown::Rendering::PROOFING_LY_SETTINGS %>
 <% end %>

data/lib/lydown/templates/movement.erb

@@ -24,7 +24,7 @@
   
   page_breaks = Lydown::Rendering::Movement.page_breaks(self, movement: name)
   
-  includes = Lydown::Rendering::Movement.include_files(self, movement: name)
+  includes = Lydown::Rendering.include_files(self, movement: name)
   
   hide_bar_numbers = Lydown::Rendering::Movement.hide_bar_numbers?(
     self, movement: name

data/lib/lydown/templates/variables.erb

@@ -2,6 +2,8 @@
 <% self['movements'].each do |mvt_name, mvt|
      mvt['parts'].each do |part_name, part|
        var_opts = {movement: mvt_name, part: part_name}
+       notation_size = self.get_setting(:notation_size, var_opts)
+
        if part_name && !part_name.empty?
          voice_prefix = "#{part_name}_"
        else
@@ -11,6 +13,9 @@
 <%= var_name[var_opts.merge(stream: :music)] %> = \relative c {
   <<
     \new Voice = "<%= voice_prefix %>voice1" {
+      <% if notation_size %>
+      \<%= notation_size %>
+      <% end %>
       <%= part['music'] %>
     }
   >>

data/lib/lydown/version.rb

@@ -1,3 +1,3 @@
 module Lydown
-  VERSION = "0.10.0"
+  VERSION = "0.12.4"
 end

data/lib/lydown/work.rb

@@ -58,7 +58,6 @@ module Lydown
     end
 
     def process_file(path, prefix = [], opts = {})
-      $stderr.puts path
       content = IO.read(path)
       stream = LydownParser.parse(content, {
         filename: File.expand_path(path),
@@ -155,14 +154,16 @@ module Lydown
       proof_mode =  @context['options/proof_mode']
       paths = streams.keys
       
-      processed_streams = Parallel.map(paths, PARALLEL_PARSE_OPTIONS.clone) do |path|
+      opts = PARALLEL_PARSE_OPTIONS.clone
+      opts[:progress] = nil if @context['options/no_progress_bar']
+      processed_streams = Parallel.map(paths, opts) do |path|
         content = IO.read(path)
         Cache.hit(content) do
           LydownParser.parse(content, {
             filename: File.expand_path(path),
             source: content,
             proof_mode: proof_mode,
-            no_progress: true
+            no_progress_bar: true
           })
         end
       end
@@ -180,7 +181,11 @@ module Lydown
     
     def translate_movement_files(state)
       stream_entries = prepare_work_stream_array(state)
-      processed_contexts = Parallel.map(stream_entries, PARALLEL_PROCESS_OPTIONS.clone) do |entry|
+
+      opts = PARALLEL_PROCESS_OPTIONS.clone
+      opts[:progress] = nil if @context['options/no_progress_bar']
+
+      processed_contexts = Parallel.map(stream_entries, opts) do |entry|
         mvmt_stream, stream = *entry
         ctx = @context.clone_for_translation
         Cache.hit(ctx, mvmt_stream, stream) do

data/lib/lydown/work_context.rb

@@ -366,10 +366,6 @@ module Lydown
       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)
@@ -377,10 +373,12 @@ module Lydown
       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)
+        if m[:parts]
+          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
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lydown
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.12.4
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-20 00:00:00.000000000 Z
+date: 2015-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -108,20 +108,6 @@ dependencies:
     - - '='
       - !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
@@ -136,20 +122,6 @@ dependencies:
     - - '='
       - !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:
@@ -166,8 +138,10 @@ files:
 - lib/lydown/cli/commands.rb
 - lib/lydown/cli/compiler.rb
 - lib/lydown/cli/diff.rb
+- lib/lydown/cli/installer.rb
 - lib/lydown/cli/output.rb
 - lib/lydown/cli/proofing.rb
+- lib/lydown/cli/repl.rb
 - lib/lydown/cli/signals.rb
 - lib/lydown/cli/support.rb
 - lib/lydown/cli/translation.rb
@@ -227,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Lydown is a language for music notation