lydown 0.9.0 → 0.10.0

data/lib/lydown/cli/diff.rb

@@ -45,7 +45,7 @@ module Lydown::CLI::Diff
       first += 1 if first
       last += 1 if last
       
-      first..last
+      [first, last]
     rescue => e
       $stderr.puts e.message
       $stderr.puts e.backtrace.join("\n")

data/lib/lydown/cli/proofing.rb

@@ -77,7 +77,7 @@ module Lydown::CLI::Proofing
         opts[:mode] = :score
       else
         opts[:parts] = [part]
-        opts[:mode] = part
+        opts[:mode] = :proof
         opts[:line_range] = Lydown::CLI::Diff.diff_line_range(path)
       end
       
@@ -85,9 +85,9 @@ module Lydown::CLI::Proofing
     end
     
     def process(opts)
-      if opts[:line_range] != (nil..nil)
+      if opts[:line_range] != [nil, nil]
         t = Time.now.strftime("%H:%M:%S")
-        $stderr.puts "[#{t}] Changed: #{opts[:base_path]} (lines #{opts[:line_range].inspect})"
+        $stderr.puts "[#{t}] Changed: #{opts[:base_path]} (lines #{opts[:line_range][0]}..#{opts[:line_range][1]})"
         Lydown::CLI::Compiler.process(opts)
       end
     end

data/lib/lydown/cli/signals.rb

@@ -0,0 +1,23 @@
+module Lydown::CLI
+  @@abortable_child_processes = []
+  
+  def self.abort
+    $stderr.puts
+    if pid = @@abortable_child_processes.last
+      Process.kill("INT", pid)
+    else
+      exit
+    end
+  end
+  
+  def self.register_abortable_process(pid)
+    @@abortable_child_processes << pid 
+  end
+  
+  def self.unregister_abortable_process(pid)
+    @@abortable_child_processes.delete pid
+  end
+end
+
+Signal.trap("INT") {Lydown::CLI.abort}
+Signal.trap("TERM") {exit}

data/lib/lydown/cli/support.rb

@@ -14,7 +14,7 @@ module Lydown::CLI::Support
   
       # the output defaults to a file named lydown expect if the format is ly.
       # In that case the output will be sent to STDOUT.
-      options[:output_filename] ||= 'lydown' unless options[:format] == 'ly'
+      options[:output_filename] ||= 'lydown' unless options[:format] == :ly
     else
       options[:source_filename] = options[:path]
       if (options[:path] !~ /\.ld$/) and File.file?(options[:path] + ".ld")
@@ -31,4 +31,26 @@ module Lydown::CLI::Support
       end
     end
   end
+  
+  # determine if the specified path is actually a path to a single movement of
+  # a multi-movement work. If so, return the path of the work directory, and 
+  # add a movement parameter. This should also take care of running proof
+  # mode inside of a movement directory.
+  def self.detect_work_directory(opts)
+    return if opts[:movements]
+
+    parent_dir = File.expand_path(File.join(opts[:path], '..'))
+    
+    if !File.exists?(File.join(opts[:path], 'work.ld')) &&
+      File.exists?(File.expand_path(File.join(parent_dir, 'work.ld')))
+
+      movement = File.basename(File.expand_path(opts[:path]))
+      opts[:movements] = [movement] unless opts[:mode] == :proof
+      opts[:path] = parent_dir
+    end
+  end
 end
+
+
+
+

data/lib/lydown/core_ext.rb

@@ -1,4 +1,5 @@
 require 'escape_utils'
+require 'pathname'
 
 class Hash
   # Merges self with another hash, recursively.
@@ -62,7 +63,7 @@ class Hash
     if @deep && k.is_a?(String) && k =~ /\//
       lookup(k)
     elsif @deep && k.is_a?(Symbol)
-      old_get(k) || old_get(k.to_s)
+      old_get(k) || old_get(k.to_s)      
     else
       old_get(k)
     end
@@ -105,6 +106,12 @@ class Hash
   def is_deep?
     !!@deep
   end
+  
+  def stringify_keys
+    h = {}
+    each {|k, v| h[k.to_s] = v}
+    h
+  end
 end
 
 class String
@@ -169,11 +176,40 @@ class String
 end
 
 class Fixnum
-  ROMAN = %w[0 I II III IV V VI VII VIII IX X XI XII XIII XIV XV XVI XVII XVIII XIX
-    XX XXI XXII XXIII XXIV XXV XXVI XXVII XXVIII XXIX XXX]
-  
+  # Taken from https://github.com/AndrewVos/roman-numerals
+  # Copyright (c) 2011 Andrew Vos
+  @@roman_digits = {
+    1000 => 'M',
+    900  => 'CM',
+    500  => 'D',
+    400  => 'CD',
+    100  => 'C',
+    90   => 'XC',
+    50   => 'L',
+    40   => 'XL',
+    10   => 'X',
+    9    => 'IX',
+    5    => 'V',
+    4    => 'IV',
+    1    => 'I'
+  }
+
   def to_roman
-    ROMAN[self]
+    result = ''
+    value = self
+    @@roman_digits.keys.each do |decimal|
+      while value >= decimal
+        value -= decimal
+        result += @@roman_digits[decimal]
+      end
+    end
+    result
   end
 end
 
+class Pathname
+  # Returns path relative to working directory
+  def self.relative_pwd(path)
+    self.new(path).relative_path_from(pwd).to_s
+  end
+end

data/lib/lydown/{rendering/defaults.yml → defaults.yml}

@@ -148,6 +148,7 @@ parts:
     clef: bass
     midi_instrument: cello
     embed_figures: true
+    remove_empty: false
   organo:
     clef: bass
     midi_instrument: church organ
@@ -182,7 +183,6 @@ score:
     - [violino, violino1, violino2, violino3, violin1, violin2, violin3]
     - viola
     - [gamba, gamba1, gamba2]
-    - [soprano, alto, tenore, basso]
-    - [soprano1, alto1, tenore1, basso1]
-    - [soprano2, alto2, tenore2, basso2]
+    - [soprano1, soprano2, soprano, alto1, alto2, alto, tenore1, tenore2, tenore, basso1, basso2, basso]
     - continuo
+end_barline: "|."

data/lib/lydown/errors.rb

@@ -1,2 +1,5 @@
 class LydownError < RuntimeError
+end
+
+class CompilationAbortError < RuntimeError
 end

data/lib/lydown/lilypond.rb

@@ -13,10 +13,31 @@ module Lydown
       end
       
       def compile(source, opts = {})
-        opts[:output_filename] ||= 'lydown'
+        opts[:output_target] ||= 'lydown'
+
+        if opts[:temp]
+          opts[:output_filename] = opts[:output_target]
+          invoke(source, opts)
+        else
+          invoke_with_tempfile(source, opts)
+        end
         
-        target = opts[:output_filename].dup
-        ext = ".#{opts[:format] || 'pdf'}"
+      rescue CompilationAbortError => e
+        raise e
+      rescue => e
+        $stderr.puts e.message
+        $stderr.puts e.backtrace.join("\n") unless e.is_a?(LydownError)
+        raise e
+      end
+      
+      # Compile into a tempfile. We do this because lilypond's behavior when 
+      # supplied with target filenames is broken. If it is given a target
+      # path which corresponds to an existing directory name, it does not use
+      # the specified path plus extension, but instead creates a file inside
+      # the directory.
+      def invoke_with_tempfile(source, opts)
+        target = opts[:output_target].dup
+        ext = ".#{opts[:format] || :pdf}"
         if target !~ /#{ext}$/
           target << ext
         end
@@ -25,15 +46,12 @@ module Lydown
         opts[:output_filename] = tmp_target
         invoke(source, opts)
         
+        # Copy tempfile to target
         if File.file?(tmp_target + ext)
           FileUtils.cp(tmp_target + ext, target)
         else
           copy_pages(tmp_target, target, ext)
         end
-      rescue => e
-        $stderr.puts e.message
-        $stderr.puts e.backtrace.join("\n")
-        raise e
       end
       
       def copy_pages(source, target, ext)
@@ -49,30 +67,49 @@ module Lydown
         end
       end
       
+      # Run lilypond, pipe source into its STDIN, and capture its STDERR
       def invoke(source, opts = {})
-        format = opts[:format]
-        format = nil if format == 'midi'
+        cmd = format_cmd(opts)
         
-        # Run lilypond, pipe source into its STDIN, and capture its STDERR
+        err_info = ''
+        exit_value = nil
+        Open3.popen2e(cmd) do |input, output, wait_thr|
+          err_info = exec(wait_thr, input, output, source, opts)
+          exit_value = wait_thr.value
+        end
+        if exit_value != 0
+          if exit_value.termsig
+            raise CompilationAbortError
+          else
+            # err_info = err_info.lines[0, 3].join
+            raise LydownError, "Lilypond compilation failed:\n#{err_info}"
+          end
+        end
+      end
+      
+      def format_cmd(opts)
+        format = opts[:format]
+        format = nil if (format == :midi) || (format == :mp3)
+
         cmd = 'lilypond '
+        cmd << "-dbackend=eps " if opts[:mode] == :proof
         cmd << "-o #{opts[:output_filename]} "
         cmd << "-dno-point-and-click "
         cmd << "--#{opts[:format]} " if format
         cmd << ' - '
-        
-        err_info = ''
-        success = false
-        Open3.popen2e(cmd) do |input, output, wait_thr|
-          input.puts source
-          input.close_write
-          err_info = read_lilypond_progress(output, opts)
-          output.close
-          success = wait_thr.value == 0
-        end
-        unless success
-          err_info = err_info.lines[0, 3].join
-          raise LydownError, "Lilypond compilation failed:\n#{err_info}"
-        end
+
+        cmd
+      end
+      
+      def exec(wait_thr, input, output, source, opts)
+        Lydown::CLI.register_abortable_process(wait_thr.pid)
+        input.puts source
+        input.close_write
+        err_info = read_lilypond_progress(output, opts)
+        output.close
+        err_info
+      ensure
+        Lydown::CLI.unregister_abortable_process(wait_thr.pid)
       end
       
       LILYPOND_STATUS_LINES = %w{
@@ -91,18 +128,23 @@ module Lydown
       
       def read_lilypond_progress(f, opts)
         info = ''
-        Lydown::CLI::show_progress('Compile', STATUS_TOTAL) do |bar|
-          while !f.eof?
-            line = f.gets
-            info += line
-            if line =~ /^([^\s]+)/
-              idx = LILYPOND_STATUS_LINES.index($1)
-              bar.progress = idx + 1 if idx
+        unless opts[:no_progress_bar]
+          Lydown::CLI::show_progress('Compile', STATUS_TOTAL) do |bar|
+            while !f.eof?
+              line = f.gets
+              info += line
+              if line =~ /^([^\s]+)/
+                idx = LILYPOND_STATUS_LINES.index($1)
+                bar.progress = idx + 1 if idx
+              end
             end
           end
+        else
+          info = f.read
         end
         info
       end
+
     end
   end
 end

data/lib/lydown/ly_lib/lib.ly

@@ -0,0 +1,297 @@
+\header {
+  tagline = ##f
+}
+
+segno = {
+  \once \override Score.RehearsalMark #'font-size = #-2
+  \mark \markup { \musicglyph #"scripts.segno" }
+}
+
+segnobottom = {
+  \once \override Score.RehearsalMark #'direction = #DOWN
+  \once \override Score.RehearsalMark #'font-size = #-2
+  \mark \markup { \musicglyph #"scripts.segno" }
+}
+
+dalsegno = {
+  \once \override Score.RehearsalMark #'break-visibility = #begin-of-line-invisible
+  \once \override Score.RehearsalMark #'direction = #DOWN
+  \once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
+  \once \override Score.RehearsalMark #'font-size = #-2
+  \mark \markup { \fontsize #2 {"dal segno "} \musicglyph #"scripts.segno" }
+}
+
+dacapo = {
+  \once \override Score.RehearsalMark #'break-visibility = #begin-of-line-invisible
+  \once \override Score.RehearsalMark #'direction = #DOWN
+  \once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
+  \mark \markup {\bold {\italic {"Da capo"}}}
+}
+
+dalsegnoadlib = {
+  \once \override Score.RehearsalMark #'direction = #DOWN
+  \once \override Score.RehearsalMark #'self-alignment-X = #LEFT
+  \once \override Score.RehearsalMark #'font-size = #-2
+  \mark \markup { \musicglyph #"scripts.segno" ad lib }
+}
+
+finedellaparteprima = {
+  \once \override Score.RehearsalMark #'break-visibility = #begin-of-line-invisible
+  \once \override Score.RehearsalMark #'direction = #DOWN
+  \once \override Score.RehearsalMark #'self-alignment-X = #RIGHT
+  \mark \markup {\bold {\italic {"Fine della parte prima"}}}
+}
+
+padbarlinebefore = {
+  \once \override Staff.BarLine #'extra-spacing-width = #'(-2 . 0)
+}
+
+padbarlineafter = {
+  \once \override Staff.BarLine #'extra-spacing-width = #'(0 . 2)
+}
+
+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
+}
+
+%{
+  http://www.lilypond.org/doc/v2.18/Documentation/snippets/editorial-annotations#editorial-annotations-adding-links-to-objects
+%}
+#(define (add-link url-strg)
+  (lambda (grob)
+    (let* ((stil (ly:grob-property grob 'stencil)))
+      (if (ly:stencil? stil)
+        (begin
+          (let* (
+             (x-ext (ly:stencil-extent stil X))
+             (y-ext (ly:stencil-extent stil Y))
+             (url-expr (list 'url-link url-strg `(quote ,x-ext) `(quote ,y-ext)))
+             (new-stil (ly:stencil-add (ly:make-stencil url-expr x-ext y-ext) stil)))
+          (ly:grob-set-property! grob 'stencil new-stil)))
+        #f))))
+        
+
+\layout {
+  #(layout-set-staff-size 14)
+  indent = 0\cm
+
+  \context {
+    \Score
+    \override InstrumentName #'self-alignment-X = #right
+    \override InstrumentName #'padding = 0.6
+    
+    \override BarNumber #'padding = 1.5
+    
+    %make note stems a bit thicker
+    \override Stem.thickness = #2
+    
+    % slurs and ties are a bit curvier and thicker
+    % ties are also a bit more distant from note heads
+    % all that with a bit of randomness
+    \override Slur.eccentricity = #(lambda (grob) (* 0.05 (random:normal)))
+    \override Slur.height-limit = #(lambda (grob) (+ 2.8 (* 0.2 (random:normal))))
+    \override Slur.thickness = #(lambda (grob) (+ 2.9 (* 0.1 (random:normal))))
+    \override Slur.ratio = #(lambda (grob) (+ 0.3 (* 0.05 (random:normal))))
+
+    \override Tie.thickness = #(lambda (grob) (+ 2.9 (* 0.1 (random:normal))))
+    \override Tie.ratio = #(lambda (grob) (+ 0.3 (* 0.05 (random:normal))))
+    \override Tie #'details #'note-head-gap = #(lambda (grob) (+ 0.5 (* 0.1 (random:normal))))
+    
+    \override Beam.beam-thickness = #(lambda (grob) (+ 0.55 (* 0.02 (random:normal))))
+    \override Beam.length-fraction = #1.15
+    
+%     \remove "Bar_number_engraver"
+  }
+  
+  \context {
+    \Staff
+    \override StaffSymbol.color = #(rgb-color 0.25 0.2 0.2)
+    
+  }
+  
+  \context {
+    \Lyrics
+    % candidates: Georgia, Hoefler Text, Hoefler Text Italic,
+    % 
+    \override LyricText #'font-name = #"Hoefler Text"
+%     \override LyricText #'font-size = #3
+  }
+  
+  \context {
+    \override MarkupText #'font-name = #"Hoefler Text"
+  }
+}
+
+\paper {
+%   #(set-default-paper-size "A5")
+  
+%   system-system-spacing #'basic-distance = #17
+  
+  top-margin = 1.4\cm
+  bottom-margin = 1.4\cm
+  two-sided = ##t
+  inner-margin = 1.4\cm
+  outer-margin = 2\cm
+  
+  markup-system-spacing #'padding = #3
+  markup-system-spacing #'stretchability = #10
+  score-markup-spacing #'padding = #7
+  top-system-spacing #'padding = #3
+  top-markup-spacing #'padding = #3
+  system-system-spacing #'minimum-distance = #9
+  system-system-spacing #'stretchability = #15
+  
+  
+%   ragged-last-bottom = ##t
+  ragged-bottom = ##t
+  
+  print-first-page-number = ##f
+
+	oddHeaderMarkup = \markup
+	\fill-line {
+	  %% force the header to take some space, otherwise the
+	  %% page layout becomes a complete mess.
+	  " "
+%     \on-the-fly #not-first-page {
+	  	\on-the-fly #print-page-number-check-first \fromproperty #'page:page-number-string
+%     }
+	}
+
+	evenHeaderMarkup = \markup
+	\fill-line {
+	  \on-the-fly #print-page-number-check-first \fromproperty #'page:page-number-string
+	  " "
+	}
+
+}
+
+% trill = #(make-articulation "stopped")
+trillSharp = #(make-articulation "trillSharp")
+trillNatural = #(make-articulation "trillNatural")
+tr = #(make-articulation "t")
+trillSug = #(make-articulation "trillSug")
+prallSug = #(make-articulation "prallSug")
+arcTrill = #(make-articulation "arcTrill")
+arcDot = #(make-articulation "arcDot")
+arcArc = #(make-articulation "arcArc")
+arcArcDot = #(make-articulation "arcArcDot")
+dotDot = #(make-articulation "dotDot")
+dotPrall = #(make-articulation "dotPrall")
+dotDoublePrallDoublePrall = #(make-articulation "dotDoublePrallDoublePrall")
+doublePrall = #(make-articulation "doublePrall")
+
+prallupbefore = {
+  \mark\markup {
+    \musicglyph #"scripts.prallup"
+    \hspace #1 
+  }
+}
+
+% override the figured bass formatter in order to fix size of figure accidentals
+#(define-public (better-format-bass-figure figure event context)
+  (let* ((fig (ly:event-property event 'figure))
+         (fig-markup (if (number? figure)
+
+                         ;; this is not very elegant, but center-aligning
+                         ;; all digits is problematic with other markups,
+                         ;; and shows problems in the (lack of) overshoot
+                         ;; of feta-alphabet glyphs.
+                         ((if (<= 10 figure)
+                              (lambda (y) (make-translate-scaled-markup
+                                           (cons -0.7 0) y))
+                              identity)
+
+                          (cond
+                           ((eq? #t (ly:event-property event 'diminished))
+                            (markup #:slashed-digit figure))
+                           ((eq? #t (ly:event-property event 'augmented-slash))
+                            (markup #:backslashed-digit figure))
+                           (else (markup #:number (number->string figure 10)))))
+                         #f))
+
+         (alt (ly:event-property event 'alteration))
+         (alt-markup
+          (if (number? alt)
+              (markup
+               #:general-align Y DOWN #:fontsize
+               (if (not (= alt DOUBLE-SHARP))
+                   0 2)
+               (alteration->text-accidental-markup alt))
+              #f))
+
+         (plus-markup (if (eq? #t (ly:event-property event 'augmented))
+                          (markup #:number "+")
+                          #f))
+
+         (alt-dir (ly:context-property context 'figuredBassAlterationDirection))
+         (plus-dir (ly:context-property context 'figuredBassPlusDirection)))
+
+    (if (and (not fig-markup) alt-markup)
+        (begin
+          (set! fig-markup (markup #:left-align #:pad-around 0.2 alt-markup))
+          (set! alt-markup #f)))
+
+
+    ;; hmm, how to get figures centered between note, and
+    ;; lone accidentals too?
+
+    ;;    (if (markup? fig-markup)
+    ;;  (set!
+    ;;   fig-markup (markup #:translate (cons 1.0 0)
+    ;;                      #:center-align fig-markup)))
+
+    (if alt-markup
+        (set! fig-markup
+              (markup #:put-adjacent
+                      X (if (number? alt-dir)
+                            alt-dir
+                            LEFT)
+                      fig-markup
+                      #:pad-x 0.2 #:lower 0.1 alt-markup)))
+
+    (if plus-markup
+        (set! fig-markup
+              (if fig-markup
+                  (markup #:put-adjacent
+                          X (if (number? plus-dir)
+                                plus-dir
+                                LEFT)
+                          fig-markup
+                          #:pad-x 0.2 plus-markup)
+                  plus-markup)))
+
+    (if (markup? fig-markup)
+        (markup #:fontsize 0 fig-markup)
+        empty-markup)))
+
+\layout {        
+  \context { 
+    \FiguredBass 
+    figuredBassFormatter = #better-format-bass-figure
+%     \override BassFigure #'font-size = #-1
+%     \override BassFigure #'font-name = #"Georgia"
+  }
+  
+%   \context {
+%     \StaffGroup
+%     \override StaffGrouper.staff-staff-spacing =
+%       #'((basic-distance . 10)
+%          (minimum-distance . 7)
+%          (padding . 0)
+%          (stretchability . 7))
+%
+%   }
+}