lydown 0.6.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c68a05810e98be2fcb3b537974fca72e8ab957ee
-  data.tar.gz: 8fb1263e28187dcb3a2a50c5d293b8f3df03adfc
+  metadata.gz: d8be82e654bd57692d8e882f1c8643bd684d637c
+  data.tar.gz: 80c45eb4a1a4c4eb26960356e01774150d0b2697
 SHA512:
-  metadata.gz: f3def62947a128f550444aa070c4c527452af1047adabb5d50de259a9288b518fc17deef3831e5a8c8a82a10b67b6e2f932379eb5cdf67d3b43b4fc502c4f1fa
-  data.tar.gz: 0baba95bf6967f19cddc306ea483fca59c09be0803996bc7f1b50170fd96a7de6523ae8cd32803240a9076d06992b4ba8bfbe806b5aaa449b604f6abb3984e81
+  metadata.gz: 755759c7dbc352e537743f8b829f35791297baa586a89a2e80cbd6fd98aef6a48cd54bb8f2d7c26c1aa8a4568701c69d5fdf117d56a271e9a1aebdf24aecbf0c
+  data.tar.gz: e5e151f5f78d6b372ca5cf655aeba53dc68be083d6b34b160b0211c89a9c6765498db2878f093ebd7d3e1c9fdac9d3bd2da11ee955c43b768b944f72e81d9f8f

data/README.md

@@ -112,14 +112,18 @@ Full bar rests are [similar to lilypond](http://www.lilypond.org/doc/v2.18/Docum
 
 ### Accidentals
 
-Accidentals are entered using + and -
+Accidentals can be entered using + and -
 
-    8cgb-c2a => c8 g bb c a2
+    8cgb-c2a => c8 g bes c a2
+
+But can also be entered using the characters # for sharp, ß for flat and h for natural:
+
+    c#dßeh => cis des e
 
 In lydown notes follow the key signature by default:
 
     - key: g major
-    8g6fedcba2g => g8 fs16 e d c b a g2
+    ff#fhfßd#bß => fis fisis f f dis bes
 
 The accidental mode can be changed by specifiying the manual accidental mode:
 

data/bin/lydown

@@ -3,6 +3,7 @@
 require 'rubygems'
 require 'lydown'
 require 'lydown/version'
+require 'lydown/cli'
 require 'optparse'
 
 trap("INT") {exit}
@@ -58,6 +59,10 @@ opts = OptionParser.new do |opts|
     $options["score_only"] = true # implied
   end
   
+  opts.on("-P", "--proof", "Start proofing mode") do
+    $options["proof_mode"] = true
+  end
+  
   opts.on("-O", "--open", "Open PDF/Midi file after processing") do
     $options["open_target"] = true
   end
@@ -72,6 +77,7 @@ opts = OptionParser.new do |opts|
 end
 
 opts.parse!
+$options.deep!
 
 if $options["gen"]
   # Ripple.generate($options["gen"], ARGV)
@@ -79,7 +85,7 @@ if $options["gen"]
 end
 
 source = ''
-if ARGV[0].nil? || ARGV[0] == '-'
+if ARGV[0] == '-'
   # read source from stdin
   source = STDIN.read
   
@@ -87,7 +93,7 @@ if ARGV[0].nil? || ARGV[0] == '-'
   # In that case the output will be sent to STDOUT.
   $options["output_filename"] ||= 'lydown' unless $options["format"] == 'ly'
 else
-  filename = ARGV[0]
+  filename = ARGV[0] || '.'
   $options['source_filename'] = filename
   if (filename !~ /\.ld$/) and File.file?(filename + ".ld")
     filename += ".ld"
@@ -96,54 +102,15 @@ else
   $options["output_filename"] ||= (filename =~ /^(.+)\.ld$/) ? $1 : filename
 end
 
-# translate lydown code to lilypond code
-ly = ''
-begin
-  work = Lydown::Work.new(path: $options['source_filename'], nice_error: true)
-  # work.process(lydown)
-  ly = work.to_lilypond(mode: :score)
-rescue LydownError => e
-  STDERR.puts e.message
-  exit 1
-rescue => e
-  STDERR.puts "#{e.class}: #{e.message}\n#{e.backtrace.join("\n")}"
-  exit 1
+# compile score
+unless $options[:no_score] || $options[:parts]
+  Lydown::CLI::Compiler.process($options.merge(mode: :score, parts: nil))
 end
 
-if $options['format'] == 'ly'
-  unless $options["output_filename"]
-    puts ly
-    exit
-  else
-    begin
-      File.open($options["output_filename"] + '.ly', 'w+') do |f|
-        f.write ly
-      end
-      exit
-    rescue => e
-      STDERR.puts "#{e.class}: #{e.message}"
-      exit 1
-    end
+# compile parts
+unless $options[:score_only] || !$options[:parts]
+  parts = $options[:parts]
+  parts.each do |p|
+    Lydown::CLI::Compiler.process($options.merge(mode: :part, parts: p))
   end
 end
-
-# compile lilypond code
-begin
-  opts = {
-    output_filename:  $options['output_filename'],
-    format:           $options['format'],
-    mode:             :score
-  }
-  Lydown::Lilypond.compile(ly, opts)
-rescue LydownError => e
-  STDERR.puts e.message
-  exit 1
-rescue => e
-  STDERR.puts "#{e.class}: #{e.message}"
-  exit 1
-end
-
-if $options['open_target']
-  filename = "#{$options['output_filename']}.#{$options['format']}"
-  system("open #{filename}")
-end

data/lib/lydown/cli/compiler.rb

@@ -0,0 +1,75 @@
+require 'lydown'
+
+module Lydown::CLI::Compiler
+  class << self
+    def output_filename(opts)
+      fn = opts[:output_filename]
+      if opts[:movements] && opts[:movements].size == 1
+        fn << "-#{opts[:movements].first}"
+      end
+      if opts[:parts] && opts[:parts].size == 1
+        fn << "-#{opts[:parts].first}"
+      end
+      fn
+    end
+    
+    def process(opts)
+      opts = opts.deep_clone
+      # translate lydown code to lilypond code
+      ly_code = ''
+      begin
+        opts[:path] = opts[:source_filename]
+        opts[:nice_error] = true
+        work = Lydown::Work.new(opts)
+        ly_code = work.to_lilypond(opts)
+      rescue LydownError => e
+        STDERR.puts e.message
+        STDERR.puts e.backtrace.join("\n")
+        exit 1
+      rescue => e
+        STDERR.puts "#{e.class}: #{e.message}\n#{e.backtrace.join("\n")}"
+        exit 1
+      end
+      
+      opts[:output_target] = output_filename(opts)
+
+      if opts[:format] == 'ly'
+        unless opts[:output_target]
+          STDOUT << ly_code
+        else
+          begin
+            File.open(opts[:output_target] + '.ly', 'w+') do |f|
+              f.write ly_code
+            end
+          rescue => e
+            STDERR.puts "#{e.class}: #{e.message}"
+          end
+        end
+      else
+        compile(ly_code, opts)
+      end
+    end
+
+    def compile(ly_code, opts)
+      opts = opts.deep_clone
+      begin
+        STDERR.puts "Compiling => #{opts[:output_target]}"
+        t1 = Time.now
+        Lydown::Lilypond.compile(ly_code, opts)
+        t2 = Time.now
+        STDERR.puts "Elapsed: #{t2-t1}s"
+      rescue LydownError => e
+        STDERR.puts e.message
+        STDERR.puts e.backtrace.join("\n")
+      rescue => e
+        STDERR.puts "#{e.class}: #{e.message}"
+        STDERR.puts e.backtrace.join("\n")
+      end
+
+      if opts[:open_target]
+        filename = "#{opts[:output_target]}.#{opts[:format]}"
+        system("open #{filename}")
+      end
+    end
+  end
+end

data/lib/lydown/cli.rb

@@ -0,0 +1,6 @@
+module Lydown
+  module CLI
+  end
+end
+
+require 'lydown/cli/compiler'

data/lib/lydown/lilypond.rb

@@ -1,5 +1,6 @@
 require 'lydown/errors'
-require 'tmpdir'
+require 'tempfile'
+require 'fileutils'
 
 module Lydown
   module Lilypond
@@ -11,17 +12,28 @@ module Lydown
       def compile(source, opts = {})
         opts[:output_filename] ||= 'lydown'
         
-        ly_path = File.join(tmpdir, File.basename(opts[:output_filename]))
-        File.open(ly_path, 'w+') do |f|
-          f << source
+        target = opts[:output_filename].dup
+        ext = ".#{opts[:format] || 'pdf'}"
+        if target !~ /#{ext}$/
+          target << ext
         end
         
+        tmp_target = Tempfile.new('lydown').path
+        opts[:output_filename] = tmp_target
+        invoke(source, opts)
+        FileUtils.cp(tmp_target + ext, target)
+      rescue => e
+        puts e.message
+        p e.backtrace
+      end
+      
+      def invoke(source, opts = {})
         # Run lilypond, pipe source into its STDIN, and capture its STDERR
         cmd = 'lilypond -lERROR '
-        cmd << "-o #{File.dirname(opts[:output_filename])} "
+        cmd << "-o #{opts[:output_filename]} "
         cmd << "--#{opts[:format]} " if opts[:format]
-        # cmd << '-s - 2>&1'
-        cmd << "-s #{ly_path} 2>&1"
+        cmd << '-s - 2>&1'
+        # cmd << "-s #{ly_path} 2>&1"
         
         err_info = ''
         IO.popen(cmd, 'r+') do |f|

data/lib/lydown/parsing/lydown.treetop

@@ -110,7 +110,7 @@ grammar Lydown
   rule string
     '"' ('\"' / !'"' .)* '"'
   end
-  rule figures # bass figures
+  rule figures
     '<' figures_component? (white_space? figures_component)* '>'
   end
   rule figures_component
@@ -132,13 +132,13 @@ grammar Lydown
     [a-g@] octave* accidental* <Note::Head>
   end
   rule accidental
-    [\+\-]+
+    [\+\-#ßh]+
   end
   rule octave
     [\,']+ <Note::Octave>
   end
   rule accidental_flag
-    [\!\?\^] <Note::AccidentalFlag>
+    [\!\?\^]+ <Note::AccidentalFlag>
   end
   rule phrasing
     beam_open / beam_close / slur_open / slur_close

data/lib/lydown/rendering/lib.ly

@@ -30,3 +30,20 @@ dalsegnoadlib = {
   \once \override Score.RehearsalMark #'font-size = #-2
   \mark \markup { \musicglyph #"scripts.segno" ad lib }
 }
+
+editF = \markup { \center-align \concat { \bold { \italic ( }
+  \dynamic f \bold { \italic ) } } }
+editP = \markup { \center-align \concat { \bold { \italic ( }
+  \dynamic p \bold { \italic ) } } }
+editPP = \markup { \center-align \concat { \bold { \italic ( }
+  \dynamic pp \bold { \italic ) } } }
+  
+doux = \markup { \center-align \bold { \italic doux }}
+fort = \markup { \center-align \bold { \italic fort }}
+
+ten = \markup { \italic ten. }
+
+ficta = {
+  \once \override AccidentalSuggestion #'avoid-slur = #'outside
+  \once \set suggestAccidentals = ##t
+}

data/lib/lydown/rendering/movement.rb

@@ -3,7 +3,7 @@ module Lydown::Rendering
     def self.movement_title(work, name)
       return nil if name.nil? || name.empty?
       
-      if name =~ /^(?:([0-9])+([a-z]*))\-(.+)$/
+      if name =~ /^(?:([0-9]+)([a-z]*))\-(.+)$/
         title = "#{$1.to_i}#{$2}. #{$3.capitalize}"
       else
         title = name

data/lib/lydown/rendering/notes.rb

@@ -11,7 +11,13 @@ module Lydown::Rendering
       KEY_ACCIDENTALS[signature] ||= calc_accidentals_for_key_signature(signature)
     end
 
+    SIGNATURE_ACCIDENTAL_TRANSLATION = {
+      '#' => '+',
+      'ß' => '-'
+    }
+
     def self.calc_accidentals_for_key_signature(signature)
+      signature = signature.gsub(/[#ß]/) {|c| SIGNATURE_ACCIDENTAL_TRANSLATION[c]}
       unless signature =~ /^([a-g][\+\-]*) (major|minor)$/
         raise "Invalid key signature #{signature.inspect}"
       end
@@ -35,13 +41,19 @@ module Lydown::Rendering
     
     ACCIDENTAL_VALUES = {
       '+' => 1,
-      '-' => -1
+      '-' => -1,
+      '#' => 1,
+      'ß' => -1
     }
 
     def self.lilypond_note_name(note, key_signature = 'c major')
+      # if the natural sign (h) is used, no need to calculate the note name
+      return $1 if note =~ /([a-g])h/
+        
       value = 0
       # accidental value from note
-      note = note.gsub(/[\-\+]/) { |c| value += ACCIDENTAL_VALUES[c]; '' }
+      note = note.gsub(/[\-\+#ß]/) { |c| value += ACCIDENTAL_VALUES[c]; '' }
+        
       # add key signature value
       value += accidentals_for_key_signature(key_signature)[note] || 0
 
@@ -131,19 +143,14 @@ module Lydown::Rendering
       @work.emit(event[:stream] || :music, lilypond_chord(event, notes, options))
     end
     
-    FICTA_CODE = <<EOF
-      \\once \\override AccidentalSuggestion #'avoid-slur = #'outside
-      \\once \\set suggestAccidentals = ##t 
-EOF
-
     def lilypond_note(event, options = {})
       head = Accidentals.translate_note_name(@work, event[:head])
       if options[:head_only]
         head
       else
-        if event[:accidental_flag] == '^'
-          accidental_flag = ''
-          prefix =  FICTA_CODE
+        if event[:accidental_flag] =~ /\^/
+          accidental_flag = event[:accidental_flag].gsub('^', '')
+          prefix = '\ficta '
         else
           accidental_flag = event[:accidental_flag]
           prefix = ''

data/lib/lydown/rendering/settings.rb

@@ -69,7 +69,7 @@ module Lydown::Rendering
     def check_setting_value(key, value)
       if key == 'key'
         # process shorthand notation
-        if value =~ /^([a-gA-G])[\+\-]*$/
+        if value =~ /^([a-gA-G])[\+\-#ß]*$/
           mode = $1.downcase == $1 ? 'minor' : 'major'
           value = "#{value.downcase} #{mode}"
         end
@@ -104,7 +104,7 @@ module Lydown::Rendering
         e = next_event
         return if e && (e[:type] == :setting) && (e[:key] == 'key')
 
-        unless value =~ /^([a-g][\+\-]*) (major|minor)$/
+        unless value =~ /^([A-Ga-g][\+\-#ß]*) (major|minor)$/
           raise LydownError, "Invalid key signature #{value.inspect}"
         end
 

data/lib/lydown/version.rb

@@ -1,3 +1,3 @@
 module Lydown
-  VERSION = "0.6.5"
+  VERSION = "0.7.0"
 end

data/lib/lydown/work.rb

@@ -18,8 +18,7 @@ module Lydown
     def initialize(opts = {})
       @context = {}.deep!
       reset_context(:work)
-
-      opts.each {|k, v| @context[k] = v}
+      @context[:options] = opts.deep_clone
 
       process_work_files if opts[:path]
     end
@@ -199,7 +198,7 @@ module Lydown
     end
 
     def process_work_files
-      path = @context[:path]
+      path = @context[:options][:path]
       path += '.ld' if File.file?(path + '.ld')
 
       if File.file?(path)
@@ -219,12 +218,16 @@ module Lydown
         process_lydown_file(File.join(path, 'work.ld'))
         # process movement specific code
         process_lydown_file(File.join(path, 'movement.ld'))
-
+        
+        part_filter = @context[:options][:parts]
+        mvmt_filter = @context[:options][:movements]
+        
         # 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)
+            skip = part_filter && !part_filter.include?(part)
+            unless DEFAULT_BASENAMES.include?(part) || skip
               preserve_context do
                 process_lydown_file(entry, [
                   {type: :setting, key: 'part', value: part}
@@ -233,8 +236,11 @@ module Lydown
             end
           elsif File.directory?(entry) && recursive
             movement = File.basename(entry)
-            process([{type: :setting, key: 'movement', value: movement}])
-            process_directory(entry, false)
+            skip = mvmt_filter && !mvmt_filter.include?(movement)
+            unless skip
+              process([{type: :setting, key: 'movement', value: movement}])
+              process_directory(entry, false)
+            end
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lydown
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-24 00:00:00.000000000 Z
+date: 2015-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -35,6 +35,8 @@ files:
 - README.md
 - bin/lydown
 - lib/lydown.rb
+- lib/lydown/cli.rb
+- lib/lydown/cli/compiler.rb
 - lib/lydown/core_ext.rb
 - lib/lydown/errors.rb
 - lib/lydown/lilypond.rb