lydown 0.12.4 → 0.14.0

data/lib/lydown/version.rb

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

data/lib/lydown/work.rb

@@ -1,4 +1,4 @@
-require 'lydown/templates'
+require 'lydown/inverso'
 require 'lydown/cli/output'
 require 'parallel'
 
@@ -26,6 +26,23 @@ module Lydown
 
     def to_lilypond(opts = {})
       @context[:render_opts] = opts.stringify_keys
+      
+      if edition = @context['render_opts/edition']
+        edition_settings = @context["global/settings/editions/#{edition}"]
+        if edition_settings
+          @context["global/settings/editions/#{edition}"] = nil
+          @context["global/settings"].deep_merge!(edition_settings)
+        end
+        
+        (@context["movements"] || {}).each do |n, m|
+          edition_settings = m["settings/editions/#{edition}"]
+          if edition_settings
+            m["settings/editions/#{edition}"] = nil
+            m["settings"].deep_merge!(edition_settings)
+          end
+        end
+      end
+      
       @context[:variables] = {}
 
       if opts[:stream_path]
@@ -40,7 +57,7 @@ module Lydown
         filtered.extend(TemplateBinding)
 
         # Remove empty lines from the rendered code
-        Lydown::Templates.render(:lilypond_doc, filtered)
+        Inverso::Template.render(:lilypond_doc, context: filtered)
       end
     end
 

data/lib/lydown/work_context.rb

@@ -245,6 +245,7 @@ module Lydown
     def query_setting(movement, part, path)
       path = "#{settings_path(movement, part)}/#{path}"
       value = @context[path]
+
       unless value.nil?
         @temp_setting_value = value
         true
@@ -253,6 +254,10 @@ module Lydown
       end
     end
     
+    def rendered_edition
+      @rendered_edition = @context['render_opts/edition']
+    end
+    
     def query_defaults(path)
       value = DEFAULTS[path]
       unless value.nil?
@@ -274,17 +279,20 @@ module Lydown
       # 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(opts[:movement], nil, path) ||
+
         query_setting(nil, nil, parts_section_path) ||
+
+        query_setting(nil, nil, path) ||
         
         query_defaults("parts/#{opts[:part]}/#{path}") ||
         query_defaults(path)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lydown
 version: !ruby/object:Gem::Version
-  version: 0.12.4
+  version: 0.14.0
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-28 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -138,7 +138,6 @@ 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
@@ -148,6 +147,7 @@ files:
 - lib/lydown/core_ext.rb
 - lib/lydown/defaults.yml
 - lib/lydown/errors.rb
+- lib/lydown/inverso.rb
 - lib/lydown/lilypond.rb
 - lib/lydown/ly_lib/lib.ly
 - lib/lydown/parsing.rb
@@ -158,22 +158,26 @@ files:
 - lib/lydown/rendering/command.rb
 - lib/lydown/rendering/comments.rb
 - lib/lydown/rendering/figures.rb
+- lib/lydown/rendering/layout.rb
 - lib/lydown/rendering/literal.rb
 - lib/lydown/rendering/lyrics.rb
+- lib/lydown/rendering/markup.rb
 - lib/lydown/rendering/movement.rb
 - lib/lydown/rendering/music.rb
 - lib/lydown/rendering/notes.rb
+- lib/lydown/rendering/repeats.rb
 - lib/lydown/rendering/settings.rb
 - lib/lydown/rendering/skipping.rb
 - lib/lydown/rendering/source_ref.rb
 - lib/lydown/rendering/staff.rb
 - lib/lydown/rendering/voices.rb
 - lib/lydown/templates.rb
-- lib/lydown/templates/lilypond_doc.erb
-- lib/lydown/templates/movement.erb
-- lib/lydown/templates/multi_voice.erb
-- lib/lydown/templates/part.erb
-- lib/lydown/templates/variables.erb
+- lib/lydown/templates/layout.rb
+- lib/lydown/templates/lilypond_doc.rb
+- lib/lydown/templates/movement.rb
+- lib/lydown/templates/multi_voice.rb
+- lib/lydown/templates/part.rb
+- lib/lydown/templates/variables.rb
 - lib/lydown/translation.rb
 - lib/lydown/translation/ripple.rb
 - lib/lydown/translation/ripple/nodes.rb

data/lib/lydown/cli/installer.rb

@@ -1,175 +0,0 @@
-require 'net/http'
-require 'uri'
-require 'ruby-progressbar'
-require 'tempfile'
-require 'fileutils'
-
-module Lydown::CLI::Installer
-  class << self
-    def install(package, version = nil)
-      case package
-      when 'lilypond'
-        Lilypond.install(version)
-      else
-        STDERR.puts "Unknown package name specified"
-        exit!(1)
-      end
-    end
-  end
-  
-  module Lilypond
-    class << self
-      LILYPOND_DEFAULT_VERSION = "2.19.29"
-      
-      def detect_version(specified_version)
-        case specified_version
-        when nil, 'stable'
-          list = get_version_list
-        end
-      end
-    
-      def install(version = nil)
-        platform = detect_lilypond_platform
-        version ||= LILYPOND_DEFAULT_VERSION
-        # version = detect_version(version)
-        url = lilypond_install_url(platform, version)
-        fn = Tempfile.new('lydown-lilypond-installer').path
-
-        download_lilypond(url, fn)
-        install_lilypond_files(fn, platform, version)
-      rescue => e
-        STDERR.puts "Failed to install lilypond #{version}"
-        puts e.message
-        puts e.backtrace.join("\n")
-        exit(1)
-      end
-    
-      BASE_URL = "http://download.linuxaudio.org/lilypond/binaries"
-    
-      def lilypond_install_url(platform, version)
-        ext = platform =~ /darwin/ ? ".tar.bz2" : ".sh"
-        filename = "lilypond-#{version}-1.#{platform}"
-      
-        "#{BASE_URL}/#{platform}/#{filename}#{ext}"
-      end
-    
-      def detect_lilypond_platform
-        case RUBY_PLATFORM
-        when /x86_64-darwin/
-          "darwin-x86"
-        when /ppc-darwin/
-          "darwin-ppc"
-        when "i686-linux"
-          "linux-x86"
-        when "x86_64-linux"
-          "linux-64"
-        when "ppc-linux"
-          "linux-ppc"
-        end
-      end
-    
-      def download_lilypond(url, fn)
-        STDERR.puts "Downloading #{url}"
-      
-        url_base = url.split('/')[2]
-        url_path = '/'+url.split('/')[3..-1].join('/')
-        download_count = 0
-
-        Net::HTTP.start(url_base) do |http|
-          request_url = URI.escape(url_path)
-          response = http.request_head(request_url)
-          total_size = response['content-length'].to_i
-          pbar = ProgressBar.create(title: 'Downloading', total: total_size)
-          File.open(fn, 'w') do |f|
-            http.get(request_url) do |data|
-              f << data
-              download_count += data.length 
-              pbar.progress = download_count if download_count <= total_size
-            end
-          end
-          pbar.finish
-        end
-      end
-    
-      def install_lilypond_files(fn, platform, version)
-        case platform
-        when /darwin/
-          install_lilypond_files_osx(fn, version)
-        when /linux/
-          install_lilypond_files_linux(fn, version)
-        end
-      end
-    
-      def install_lilypond_files_osx(fn, version)
-        target = "/tmp/lydown/installer/lilypond"
-        FileUtils.mkdir_p(target)
-      
-        STDERR.puts "Extracting..."
-        exec "tar -xjf #{fn} -C #{target}"
-      
-        copy_lilypond_files("#{target}/LilyPond.app/Contents/Resources", version)
-      end
-    
-      def install_lilypond_files_linux(fn, version)
-        target = "/tmp/lydown/installer/lilypond"
-        FileUtils.mkdir_p(target)
-      
-        # create temp directory in which to untar file
-        tmp_dir = "/tmp/lydown/#{Time.now.to_f}"
-        FileUtils.mkdir_p(tmp_dir)
-      
-        FileUtils.cd(tmp_dir) do
-          exec "sh #{fn} --tarball"
-        end
-      
-        STDERR.puts "Extracting..."
-        exec "tar -xjf #{tmp_dir}/#{fn} -C #{target}"
-      
-        copy_lilypond_files_linux("#{target}/usr", version)
-      end
-
-      def copy_lilypond_files(base_path, version)
-        target_dir = File.expand_path("~/.lydown/packages/lilypond/#{version}")
-        
-        FileUtils.rm_rf(target_dir) if File.exists?(target_dir)
-        
-        # create directory for lilypond files
-        FileUtils.mkdir_p(target_dir)
-      
-        # copy files
-        STDERR.puts "Copying..."
-        %w{bin etc lib lib64 share var}.each do |entry|
-          dir = File.join(base_path, entry)
-          FileUtils.cp_r(dir, target_dir, remove_destination: true) if File.directory?(dir)
-        end
-        
-        install_lilypond_executable(base_path, version)
-      end
-      
-      BIN_SCRIPT_PATH = "#{File.expand_path('~')}/bin/lilypond"
-      
-      def install_lilypond_executable(base_path, version)
-        target_dir = File.expand_path("~/.lydown/packages/lilypond/#{version}")
-
-        script = "#!/bin/sh\n#{target_dir}/bin/lilypond \"$@\"\n"
-        
-        # create executable
-        FileUtils.rm(BIN_SCRIPT_PATH) if File.file?(BIN_SCRIPT_PATH)
-        File.open(BIN_SCRIPT_PATH, 'w+') {|f| f << script}
-        FileUtils.chmod('+x', BIN_SCRIPT_PATH)
-        # symlink_path = File.expand_path('~/bin/lilypond')
-        # FileUtils.ln_sf("#{target_dir}/bin/lilypond", symlink_path)
-        
-        test_lilypond
-      end
-      
-      def test_lilypond
-        STDERR.puts `lilypond -v`
-      end
-      
-      def exec(cmd)
-        raise unless system(cmd)
-      end
-    end
-  end
-end

data/lib/lydown/templates/lilypond_doc.erb

@@ -1,34 +0,0 @@
-\version "2.18.2"
-
-<% unless self['render_opts/no_lib'] %>
-\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 %>
-
-<% if self['layout'] %>
-\layout {
-}
-<% end %>
-
-<%= Lydown::Templates.render(:variables, self) %>
-
-\book {
-  \header {
-  }
-
-  \bookpart {
-  <% self['movements'].each do |n, m| %>
-    <%= Lydown::Templates.render(:movement, self, name: n, movement: m) 
-    %>
-  <% end %>
-  
-  }
-}

data/lib/lydown/templates/movement.erb

@@ -1,118 +0,0 @@
-<%
-  render_mode = self.render_mode
-  staff_groups = Lydown::Rendering::Staff.staff_groups(
-    self, {movement: name}, movement['parts'].keys)
-  parts_in_order = staff_groups.flatten
-  staff_hierarchy = Lydown::Rendering::Staff.staff_hierarchy(staff_groups)
-    
-  parts = parts_in_order.inject({}) do |m, p|
-    m[p] = movement['parts'][p]
-    m
-  end
-
-  score_mode = (render_mode == :score) || 
-    (render_mode == :proof) || (parts.size > 1)
-  
-  tacet = Lydown::Rendering::Movement.tacet?(self, name)
-  movement_title = Lydown::Rendering::Movement.movement_title(self, name)
-  movement_source = self.get_setting(:movement_source , movement: name)
-  
-  format = self['options/format'] || self['render_opts/format'] || :pdf
-  midi_mode = (format == :midi) || (format == :mp3)
-  
-  empty_staves = self.get_setting(:empty_staves, movement: name)
-  
-  page_breaks = Lydown::Rendering::Movement.page_breaks(self, movement: name)
-  
-  includes = Lydown::Rendering.include_files(self, movement: name)
-  
-  hide_bar_numbers = Lydown::Rendering::Movement.hide_bar_numbers?(
-    self, movement: name
-  )
-%>
-
-<% if page_breaks[:blank_page_before] %>
-} \bookpart {
-  \markup \column {
-  \null \null \null \null \null \null
-  \null \null \null \null \null \null
-  \null \null \null \null \null \null
-  \null \null \null \null \null \null
-  \fill-line { "(this page has been left blank to facilitate page turning)" } 
-  }
-} \bookpart {
-\pageBreak
-<% elsif page_breaks[:before] %>
-  } \bookpart {
-<% end %>
-
-<% includes.each do |i| %>
-  <%= i %>
-<% end %>
-
-<% unless tacet %>
-  \score {
-    <% if movement_title && render_mode != :proof %>
-      \header { 
-        piece = \markup { 
-          \bold \large { <%= movement_title %> } 
-          <% if movement_source %>
-            \hspace #1 \italic { <%= movement_source %> }
-          <% end %>
-        }
-      }
-    <% end %>
-  
-    <% if score_mode %>
-      <% if empty_staves == 'hide' %>
-        \layout {
-          \context {
-            \RemoveEmptyStaffContext
-            \override VerticalAxisGroup #'remove-first = ##t
-          }
-        }      
-      <% end %>
-    
-      \new StaffGroup <<
-        \set StaffGroup.systemStartDelimiterHierarchy = <%= staff_hierarchy %>
-    <% end %>
-    
-        <% if n = movement['bar_number'] %>
-          \set Score.currentBarNumber = #<%= n %>
-          \set Score.barNumberVisibility = #all-bar-numbers-visible
-          \bar ""
-        <% end %>
-      
-        <% parts.each do |n, p| %>
-          <%= Lydown::Templates.render(:part, self, 
-            name: n, part: p, movement: movement, movement_name: name) %>
-        <% end %>
-  
-    <% if score_mode %>
-      >>
-    <% end %>
-    <% if midi_mode %>
-    \midi {
-      <% if tempo = self.get_setting(:midi_tempo, movement: name) %>
-        \tempo <%= tempo %>
-      <% end %>
-    }
-    <% end %> 
-    
-    <% if hide_bar_numbers %>
-    \layout {
-      \context {
-        \Score
-        \omit BarNumber
-      }
-    }
-    <% end %>
-  }
-<% else # tacet %>
-  \markup { 
-    \line { \bold \large { <%= movement_title %> } }
-    \line { \pad-markup #3 " " }
-    
-  }
-<% end %>
-<% if page_breaks[:after] %>\pageBreak <% end %>