lydown 0.12.4 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f12383235250037392916c2a69ff03fe5f366100
-  data.tar.gz: cf26fbac37decc03b9a271e4f3dc50340e7cb4a6
+  metadata.gz: e53564b3a5ed77a00ed654832969bb2002936153
+  data.tar.gz: 306631f5b426ae1ae60ce2e078e20496f2220dad
 SHA512:
-  metadata.gz: fe50eac747f03ee7afd072b8fccaab45664e6503f76a6413d40044f2e86a233ae5168ffd9d4b9e4bf8b44c3d4736a1a64bbc629de943ec1445ec2002527b4f95
-  data.tar.gz: fe3e4da8045b8b7aca9ba8e287568a8a1f9e5081af05901475654b8e5135aca4271aee51f87d79dbe6d577f2269301cb921809f6678c912773d2a931c957fa87
+  metadata.gz: 0c7bd65c2523aab457281ca7626ee0b22402cb3c58a361b9d325f9e63afea6ee8c47a9672a18c206d0c7f0cc718d88e2eb92d3a03bbdf8edab17ff7ceaa11b99
+  data.tar.gz: 6284022bcc43a640c6fc099dc92bc21675938ab186b9bc63fc8272c17afd32af1ffe996b03184743348c8cf959e84760b633621a2b5bfc43423470fb9052ac20

data/README.md

@@ -12,8 +12,10 @@ Lydown is a language and compiler for creating music scores, parts and snippets.
 - [The lydown syntax](#the-lydown-syntax)
 	- [Notes and durations](#notes-and-durations)
 	- [Accidentals](#accidentals)
-	- [Octaves](#otaves)
+	- [Octaves](#octaves)
+  - [Grace notes](#grace-notes)
 	- [Barlines](#barlines)
+	- [Repeats with alternatives](#repeats-with-alternatives)
 	- [Rests](#rests)
 	- [Beams, slurs and ties](#beams-slurs-and-ties)
 	- [Articulation and expression marks](#articulation-and-expression-marks)
@@ -279,6 +281,23 @@ c'''  // third octave
 For the following notes, the octave markers <code>'</code> and <code>,</code> are used for jumping between octaves, using the same rules as 
  lilypond's [relative mode](http://www.lilypond.org/doc/v2.18/Documentation/notation/writing-pitches#relative-octave-entry):
 
+### Grace notes
+
+Grace notes are signified by appending a grace kind after the the duration value:
+
+```lydown
+// grace
+6°d8edcd2c
+
+// appoggiatura
+6^d8cbag
+
+// acciaccatura
+6`dc8bcde
+```
+
+The grace holds until the next change of duration.
+
 ### Barlines
 
 Just like in lilypond, barlines are taken care of automatically according to the time signature. Final bar lines and repeat bar lines can be entered explicitly by using shorthand syntax:
@@ -294,6 +313,19 @@ When entering unmetered music, an invisible barline can be added in order to pro
 cdef ?| gag
 ```
 
+### Repeats with alternatives
+
+Repeats with alternatives can be written by using the following syntax:
+
+```lydown
+|:*2 // start a repeat
+|*   // start a volta
+*|   // end the repeat
+
+// example: 2 repeats
+|:*2 1c d |* e f |* g a *| b c
+```
+
 ### Rests and silences
 
 Normal rests are written [like in lilypond](http://www.lilypond.org/doc/v2.18/Documentation/notation/writing-rests#rests):
@@ -814,6 +846,14 @@ To place includes at the beginning of the lilypond document, includes should be
 
 Pathnames are relative to the lydown source file.
 
+## Requiring packages
+
+[Lyp](https://github.com/noteflakes/lyp) packages can be loaded by using `-include` settings, usually in `work.ld`:
+
+```lydown
+- require: better-slurs
+```
+
 ### Including templates
 
 In addition to including normal lilypond files, Lydown also supports the rendering of templates into the generated lilypond doc, by using the <code>.ely</code> extension. The templates should be written using Ruby's [ERB](http://www.stuartellis.eu/articles/erb/) syntax, and are supplied with the lydown context object as <code>self</code>. A trivial example:

data/bin/lydown

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+$LOAD_PATH.unshift File.expand_path('../lib', File.dirname(__FILE__))
+
 require 'lydown/cli'
 
 if ARGV.empty?

data/lib/lydown.rb

@@ -1,15 +1,19 @@
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__))
+
 require 'lydown/core_ext'
 require 'lydown/cache'
 
 module Lydown
   require 'yaml'
-  DEFAULTS = YAML.load(IO.read(File.join(File.dirname(__FILE__), 
-    'lydown/defaults.yml'))).deep!
+  
+  DEFAUTLS_FILENAME = File.expand_path('lydown/defaults.yml', File.dirname(__FILE__))
+  DEFAULTS = YAML.load(IO.read(DEFAUTLS_FILENAME)).deep!
 end
 
 require 'lydown/errors'
 require 'lydown/parsing'
 require 'lydown/templates'
+require 'lydown/inverso'
 require 'lydown/rendering'
 require 'lydown/lilypond'
 require 'lydown/work_context'

data/lib/lydown/cache.rb

@@ -1,4 +1,5 @@
 require 'digest/md5'
+require 'fileutils'
 
 module Cache
   class << self
@@ -46,8 +47,11 @@ module Cache
       end
     end
     
+    CACHE_DIR = "/tmp/lydown/cache"
+    FileUtils.mkdir_p(CACHE_DIR)
+    
     def filename(cache_key)
-      "/tmp/lydown-cache-#{cache_key}"
+      "#{CACHE_DIR}/#{cache_key}"
     end
   end
 end

data/lib/lydown/cli.rb

@@ -10,6 +10,6 @@ require 'lydown/cli/diff'
 require 'lydown/cli/translation'
 require 'lydown/cli/output'
 require 'lydown/cli/repl'
-require 'lydown/cli/installer'
+require 'lydown/lilypond'
 require 'lydown/cli/commands'
 require 'lydown/cli/signals'

data/lib/lydown/cli/commands.rb

@@ -2,12 +2,16 @@ require 'thor'
 
 module Lydown::CLI
   class Commands < Thor
+    package_name "lydown"
+    map "-v" => :version
+    class_option :verbose, aliases: '-V', :type => :boolean, desc: 'show verbose output'
+
     desc "version", "show Lydown version"
     def version
       require 'lydown/version'
       $stderr.puts "Lydown version #{Lydown::VERSION}"
       
-      lilypond_version = Lydown::CLI::Support.detect_lilypond_version(false)
+      lilypond_version = Lydown::Lilypond.detect_lilypond_version(false)
       if lilypond_version
         $stderr.puts "Lilypond version #{lilypond_version}"
       end
@@ -37,7 +41,8 @@ module Lydown::CLI
       desc: 'Open output file after compilation'
     method_option :separate, type: :boolean, aliases: '-S',
       desc: 'Create separate file for each movement'
-    method_option :verbose, type: :boolean
+    method_option :verbose, aliases: '-V', type: :boolean
+    method_option :edition, aliases: '-e', type: :string
     def compile(*args)
       path = args.first || '.'
 
@@ -46,8 +51,6 @@ module Lydown::CLI
         return send($1)
       end
       
-      Lydown::CLI::Support.detect_lilypond_version(true)
-      
       require 'lydown'
       
       opts = Lydown::CLI::Support.copy_options(options)
@@ -88,8 +91,6 @@ module Lydown::CLI
       enum: %w{pdf png ly}
     method_option :include_parts, aliases: '-i', desc: 'Include parts (comma separated)'
     def proof(*args)
-      Lydown::CLI::Support.detect_lilypond_version(true)
-
       require 'lydown'
 
       opts = Lydown::CLI::Support.copy_options(options)
@@ -115,11 +116,6 @@ module Lydown::CLI
       Lydown::CLI::Translation.process(opts)
     end
     
-    desc "install [PACKAGE] [VERSION]", "install a package"
-    def install(*args)
-      Lydown::CLI::Installer.install(*args)
-    end
-    
     def method_missing(method, *args)
       args = ["compile", method.to_s] + args
       self.class.start(args)

data/lib/lydown/cli/compiler.rb

@@ -165,6 +165,11 @@ module Lydown::CLI::Compiler
     
     def output_filename(opts)
       fn = opts[:output_filename].dup
+
+      if opts[:edition]
+        fn << "-#{opts[:edition]}"
+      end
+      
       if opts[:movements] && opts[:movements].size == 1
         fn << "-#{opts[:movements].first}"
       end

data/lib/lydown/cli/proofing.rb

@@ -3,7 +3,7 @@ require 'directory_watcher'
 module Lydown::CLI::Proofing
   class << self
     def start_proofing(opts)
-      $stderr.puts "Proof mode: #{source} -> #{opts[:output_filename]}"
+      $stderr.puts "Proof mode: #{opts[:source_filename]} -> #{opts[:output_filename]}"
 
       trap("INT") {return}
       watch(opts)
@@ -65,7 +65,7 @@ module Lydown::CLI::Proofing
       if dir =~ /^\.\/(.+)$/
         dir = $1
       end
-      if dir =~ /#{base}\/([^\/]+)/
+      if File.expand_path(dir) =~ /#{base}\/([^\/]+)/
         mvt = $1
       else
         mvt = nil

data/lib/lydown/cli/repl.rb

@@ -9,7 +9,7 @@ module Lydown::CLI::REPL
       require 'lydown/version'
       puts "Lydown version #{Lydown::VERSION}"
       
-      lilypond_version = Lydown::CLI::Support.detect_lilypond_version(true)
+      lilypond_version = Lydown::Lilypond.detect_lilypond_version(true)
       if lilypond_version
         puts "Lilypond version #{lilypond_version}"
       end

data/lib/lydown/cli/support.rb

@@ -49,39 +49,6 @@ module Lydown::CLI::Support
       opts[:path] = parent_dir
     end
   end
-  
-  MINIMAL_LILYPOND_VERSION = Gem::Version.new('2.18')
-  
-  # detect the lilypond version. If lilypond is not found, or the version is
-  # less than the minimal supported version, display an error message.
-  def self.detect_lilypond_version(exit_on_error)
-    msg = `lilypond --version`
-    version = nil
-    if msg.lines.first =~ /LilyPond ([\d\.]+)/
-      version = $1
-    end
-    unless version && Gem::Version.new(version) >= MINIMAL_LILYPOND_VERSION
-      display_lilypond_version_error_msg(version)
-      exit!(1) if exit_on_error
-      version = nil
-    end
-    version
-  rescue => e
-    display_lilypond_version_error_msg(nil)
-    exit!(1) if exit_on_error
-  end
-  
-  def self.display_lilypond_version_error_msg(version)
-    if version
-      STDERR.puts "ERROR: The installed lilypond (version #{version}) is too old.
-       You can install lilypond by running `lydown install lilypond` or by
-       downloading a recent version from http://lilypond.org/"
-    else
-      STDERR.puts "ERROR: No copy of lilypond found.
-       You can install lilypond by running `lydown install lilypond` or by
-       downloading a recent version from http://lilypond.org/"
-    end
-  end
 end
 
 

data/lib/lydown/defaults.yml

@@ -1,8 +1,15 @@
-ly_dir: ./_ly
-pdf_dir: ./_pdf
-midi_dir: ./_midi
-lilypond_cmd: lilypond
+layout:
+  paper: A4 portrait
+  staff_size: 6mm
+  margin_inner: 12mm
+  margin_outer: 18mm
+  margin_top: 10mm
+  margin_bottom: 10mm
+  margin_top_content: 24mm
+  margin_bottom_content: 24mm
 parts:
+  layout:
+    staff_size: 7mm
   soprano:
     clef: treble
     beaming: manual
@@ -102,6 +109,12 @@ parts:
   violino2:
     clef: treble
     midi_instrument: violin
+  violon1:
+    clef: treble
+    midi_instrument: violin
+  violon2:
+    clef: treble
+    midi_instrument: violin
   violini:
     clef: treble
     midi_instrument: violin
@@ -132,6 +145,15 @@ parts:
   gamba2:
     clef: alto
     midi_instrument: viola
+  viole:
+    clef: alto
+    midi_instrument: viola
+  viole1:
+    clef: alto
+    midi_instrument: viola
+  viole2:
+    clef: alto
+    midi_instrument: viola
   fagott:
     clef: bass
     midi_instrument: bassoon
@@ -176,13 +198,33 @@ parts:
     midi_instrument: flute
   flute2:
     midi_instrument: flute
+  trumpet:
+    midi_instrument: trumpet
+  tromba:
+    midi_instrument: trumpet
+  trumpet1:
+    midi_instrument: trumpet
+  trumpet2:
+    midi_instrument: trumpet
+  trumpet3:
+    midi_instrument: trumpet
+  tromba1:
+    midi_instrument: trumpet
+  tromba2:
+    midi_instrument: trumpet
+  tromba3:
+    midi_instrument: trumpet
+      
 score:
+  layout:
+    staff_size: 4.8mm
   order:
+    - [trumpet, tromba, trumpet1, trumpet2, trumpet3, tromba1, tromba2, tromba3]
     - [flute, flauto1, flauto2, flauto3, flute1, flute2, flute3]
     - [oboe, oboe1, oboe2, oboe3]
-    - [violino, violino1, violino2, violino3, violin1, violin2, violin3]
-    - viola
-    - [gamba, gamba1, gamba2]
+    - [violino, violino1, violino2, violino3, violin1, violin2, violin3, viola, violon1, violon2]
+    - [viola1, viola2]
+    - [gamba, viole, gamba1, gamba2, viole1, viole2]
     - [soprano1, soprano2, soprano, alto1, alto2, alto, tenore1, tenore2, tenore, basso1, basso2, basso]
-    - continuo
+    - [fagotto, continuo, "basse-continue"]
 end_barline: "|."

data/lib/lydown/inverso.rb

@@ -0,0 +1,84 @@
+module Inverso
+  class Template
+    EMIT_DELIMITER = '`'.freeze
+    EMIT_RE = /#{EMIT_DELIMITER}(((?!#{EMIT_DELIMITER}).)*)#{EMIT_DELIMITER}/m
+
+    INTERPOLATION_START = "{{".freeze
+    INTERPOLATION_END = "}}".freeze
+    INTERPOLATION_RE = /#{INTERPOLATION_START}([^\?\/](?:(?!#{INTERPOLATION_END}).)*)#{INTERPOLATION_END}/m
+
+    IF_START = "{{?".freeze
+    IF_END = "{{/}}".freeze
+    IF_RE = /\{\{\?((?:(?!#{INTERPOLATION_END}).)*)#{INTERPOLATION_END}((?:(?!#{IF_END}).)*)#{IF_END}/m
+
+    ESCAPED_QUOTE = '\\"'.freeze
+    QUOTE = '"'.freeze
+
+    # From the metaid gem
+    def metaclass; class << self; self; end; end
+
+    def initialize(templ)
+      templ = templ.gsub(EMIT_RE) {|m| convert_literal($1)}
+      method_str = <<EOF
+      define_method(:render) do |_ = {}, env = {}|
+        _.each {|k, v| metaclass.instance_eval {define_method(k) {v}}}
+        __buffer__ = env[:buffer] ||= ''
+        __emit__ = env[:emit] ||= lambda {|*args| args.each {|s| __buffer__ << s}}
+        __render_l__ = env[:render] ||= lambda {|n, o| Template.render(n, o, env)}
+        metaclass.instance_eval "define_method(:__render__) {|n, o| __render_l__[n, o]}"
+        begin
+          #{templ}
+        end
+        __buffer__.gsub(/^\s+$/, '').gsub(/\n+/m, "\n")
+      end
+EOF
+
+      metaclass.instance_eval method_str
+    end
+
+    def convert_interpolation(s)
+      s.gsub(INTERPOLATION_RE) do
+        code = $1.gsub(ESCAPED_QUOTE, QUOTE)
+        "\#{#{code}}"
+      end
+    end
+
+    def convert_literal(s)
+      # look for interpolated values, wrap them with #{}
+      s = s.inspect.gsub(INTERPOLATION_RE) do
+        code = $1.gsub(ESCAPED_QUOTE, QUOTE)
+        "\#{#{code}}"
+      end
+
+      s = s.gsub(IF_RE) do
+        test, code = $1, $2
+        test = test.strip.gsub(ESCAPED_QUOTE, QUOTE)
+        "\#\{if #{test}; \"#{code}\"; end}"
+      end
+
+      "__emit__[#{s}]"
+    end
+
+    # Global template registry
+    @@templates = {}
+
+    def self.load_templates(path)
+      Dir["#{path}/*.rb"].each do |fn|
+        File.basename(fn) =~ /^(.+)\.rb$/
+        name = $1
+        set(name, IO.read(fn))
+      end
+    end
+
+    def self.set(name, templ)
+      @@templates[name.to_sym] = new(templ)
+    end
+
+    def self.render(name, arg = {}, env = {})
+      raise unless @@templates[name.to_sym]
+      @@templates[name.to_sym].render(arg, env)
+    end
+  end
+end
+
+Inverso::Template.load_templates(File.expand_path('templates', File.dirname(__FILE__)))