lydown 0.12.4 → 0.14.0

data/lib/lydown/lilypond.rb

@@ -1,5 +1,6 @@
 require 'lydown/errors'
 require 'lydown/cli/output'
+require 'lydown/cli/signals'
 
 require 'tempfile'
 require 'fileutils'
@@ -8,6 +9,49 @@ require 'open3'
 module Lydown
   module Lilypond
     class << self
+      MINIMAL_LILYPOND_VERSION = Gem::Version.new('2.18')
+      
+      def lilypond_path
+        # detect lyp-installed lilypond
+        # path = `lyp which lilypond`.lines.last rescue nil
+        # return path.chomp if path
+        #
+        # path = `which lilypond` rescue nil
+        # return path.chomp if path && !path.empty?
+        
+        return 'lilypond'
+      end
+
+      # detect the lilypond version. If lilypond is not found, or the version is
+      # less than the minimal supported version, display an error message.
+      def detect_lilypond_version(exit_on_error)
+        version = nil
+        if path = lilypond_path
+          msg = `#{lilypond_path} --version`
+          if msg.lines.first =~ /LilyPond ([\d\.]+)/
+            version = $1
+          end
+        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 display_lilypond_version_error_msg(version)
+        if version
+          STDERR.puts "ERROR: The installed lilypond (version #{version}) is too old."
+        else
+          STDERR.puts "ERROR: No copy of lilypond found."
+        end
+      end
+
       def tmpdir
         @tmpdir ||= Dir.mktmpdir
       end
@@ -67,14 +111,30 @@ module Lydown
         end
       end
       
+      # In order to be able to run the lyp lilypond wrapper (if present),
+      # we need to reset the environment variables set by bundler when running
+      # lydown.
+      RESET_ENV = {
+        "_ORIGINAL_GEM_PATH" => "",
+        "BUNDLE_GEMFILE" => "",
+        "BUNDLE_BIN_PATH" => "",
+        "RUBYOPT" => "",
+        "RUBYLIB" => ""
+      }
+      
       # Run lilypond, pipe source into its STDIN, and capture its STDERR
       def invoke(source, opts = {})
-        cmd = format_cmd(opts)
+        tmp_source_path = Tempfile.new('lydown').path
+        File.open(tmp_source_path, 'w') {|f| f << source}
+
+        cmd = format_cmd(opts, tmp_source_path)
+        puts cmd if opts[:verbose]
         
         err_info = ''
         exit_value = nil
-        Open3.popen2e(cmd) do |input, output, wait_thr|
-          err_info = exec(wait_thr, input, output, source, opts)
+        
+        Open3.popen2e(RESET_ENV, cmd) do |input, output, wait_thr|
+          err_info = exec(wait_thr, input, output, opts)
           exit_value = wait_thr.value
         end
         if exit_value != 0
@@ -87,23 +147,23 @@ module Lydown
         end
       end
       
-      def format_cmd(opts)
+      def format_cmd(opts, source_path)
         format = opts[:format]
         format = nil if (format == :midi) || (format == :mp3)
 
-        cmd = 'lilypond '
-        cmd << "-dbackend=eps " if opts[:mode] == :proof
+        cmd = "#{lilypond_path} "
+        # cmd << "-dbackend=eps " if opts[:mode] == :proof
         cmd << "-o #{opts[:output_filename]} "
         cmd << "-dno-point-and-click "
         cmd << "--#{opts[:format]} " if format
-        cmd << ' - '
+        cmd << "-V " if opts[:verbose]
+        cmd << source_path
 
         cmd
       end
       
-      def exec(wait_thr, input, output, source, opts)
+      def exec(wait_thr, input, output, opts)
         Lydown::CLI.register_abortable_process(wait_thr.pid)
-        input.puts source
         input.close_write
         err_info = read_lilypond_progress(output, opts)
         output.close
@@ -128,7 +188,7 @@ module Lydown
       
       def read_lilypond_progress(f, opts)
         info = ''
-        unless opts[:no_progress_bar]
+        if !opts[:verbose] && !opts[:no_progress_bar]
           Lydown::CLI::show_progress('Compile', STATUS_TOTAL) do |bar|
             while !f.eof?
               line = f.gets
@@ -140,6 +200,12 @@ module Lydown
             end
             bar.progress = STATUS_TOTAL
           end
+        elsif opts[:verbose]
+          while !f.eof?
+            line = f.gets
+            STDERR.puts line
+            info += line
+          end
         else
           info = f.read
         end

data/lib/lydown/ly_lib/lib.ly

@@ -1,53 +1,53 @@
-\header {
-  tagline = ##f
-}
+#(define-markup-command (mm-feed layout props amount) (number?)
+ (let ((o-s (ly:output-def-lookup layout 'output-scale)))
+   (ly:make-stencil "" '(0 . 0) (cons 0 (abs (/ amount o-s))))))
 
 segno = {
-  \once \override Score.RehearsalMark #'font-size = #-2
+  \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
+  \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
+  \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
+  \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
+  \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
+  \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)
+  \once \override Staff.BarLine.extra-spacing-width = #'(-2 . 0)
 }
 
 padbarlineafter = {
-  \once \override Staff.BarLine #'extra-spacing-width = #'(0 . 2)
+  \once \override Staff.BarLine.extra-spacing-width = #'(0 . 2)
 }
 
 editF = \markup { \center-align \concat { \bold { \italic ( }
@@ -63,7 +63,8 @@ fort = \markup { \center-align \bold { \italic fort }}
 ten = \markup { \italic ten. }
 
 ficta = {
-  \once \override AccidentalSuggestion #'avoid-slur = #'outside
+  \once \override AccidentalSuggestion.avoid-slur = #'outside
+  \once \override AccidentalSuggestion.parenthesized = ##t
   \once \set suggestAccidentals = ##t
 }
 
@@ -84,99 +85,6 @@ ficta = {
         #f))))
         
 
-\layout {
-  #(layout-set-staff-size 17)
-  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")
@@ -277,21 +185,126 @@ prallupbefore = {
         (markup #:fontsize 0 fig-markup)
         empty-markup)))
 
-\layout {        
+\layout {
   \context { 
     \FiguredBass 
     figuredBassFormatter = #better-format-bass-figure
-%     \override BassFigure #'font-size = #-1
-%     \override BassFigure #'font-name = #"Georgia"
+%     \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))
-%
-%   }
 }
+
+#(define-markup-command (when-property layout props symbol markp) (symbol? 
+markup?)
+  (if (chain-assoc-get symbol props)
+      (interpret-markup layout props markp)
+      (ly:make-stencil empty-stencil)))
+      
+#(define-markup-command (apply-fromproperty layout props fn symbol)
+  (procedure? symbol?)
+  (let ((m (chain-assoc-get symbol props)))
+    (if (markup? m)
+        (interpret-markup layout props (fn m))
+        empty-stencil)))
+
+\header { tagline = ##f } % no tagline
+
+setVerticalMargins = #(define-scheme-function
+  (parser location top-staff top-markup bottom) (number? number? number?)
+  #{
+  \paper {
+    top-system-spacing.basic-distance = #top-staff
+    top-system-spacing.minimum-distance = #top-staff
+    top-system-spacing.padding = -100 % negative padding to ignore skyline
+    top-system-spacing.stretchability = 0 % fixed position
+
+    top-markup-spacing.basic-distance = #top-markup
+    top-markup-spacing.minimum-distance = #top-markup
+    top-markup-spacing.padding = -100 % negative padding to ignore skyline
+    top-markup-spacing.stretchability = 0 % fixed position
+
+    last-bottom-spacing.basic-distance = #bottom
+    last-bottom-spacing.minimum-distance = #bottom
+    last-bottom-spacing.padding = -100 % negative padding to ignore skyline
+    last-bottom-spacing.stretchability = 0 % fixed position
+  }
+  #}
+)
+
+halfBarline = {
+  \once \hide Score.SpanBar
+  \once \override Score.BarLine.bar-extent = #'(-1 . 1)
+  \noBreak
+  \bar "|"
+}
+
+scoreMode = #(define-void-function (parser location music) (scheme?)
+  (if (eq? lydown:render-mode 'score)
+    #{ #music #}
+  ))
+  
+partMode = #(define-music-function (parser location music) (ly:music?)
+  (if (eq? lydown:render-mode 'part)
+    #{ #music #}
+    #{ #}
+  ))
+
+#(define lydown:score-mode (eq? lydown:render-mode 'score))
+#(define lydown:part-mode (eq? lydown:render-mode 'part))
+
+\layout {
+  % The OrchestraGroup is used in score mode as a wrapping context for staff
+  % groups. It is based on the ChoirStaff in order to allow individual span
+  % bars.
+  \context {
+    \ChoirStaff
+    \name "OrchestraGroup"
+    \accepts StaffGroup
+    systemStartDelimiter = #'SystemStartBar
+  }
+  
+  \context {
+    \Score
+    \accepts OrchestraGroup
+  }
+}
+
+tacetScore = {
+  \new Staff \with {
+    \override StaffSymbol.staff-space = 0.001
+    \override StaffSymbol.line-count = 1
+    \override StaffSymbol.thickness = 0
+    \override StaffSymbol.color = #(rgb-color 1 1 1)
+    \remove "Time_signature_engraver"
+    \remove "Clef_engraver"
+  }
+  { s4 }
+}
+
+% Shaping commands
+
+sR = #(define-music-function (parser location r) (number?)
+  #{ \once \override Slur.ratio = #r #}
+)
+sE = #(define-music-function (parser location e) (number?)
+  #{ \once \override Slur.eccentricity = #e #}
+)
+
+sHL = #(define-music-function (parser location l) (number?)
+  #{ \once \override Slur.height-limit = #l #}
+)
+
+sP = #(define-music-function (parser location p1 p2) (number? number?)
+  #{ \once \override Slur.positions = #(cons p1 p2) #}
+)
+
+#(define (convert-shape-coords s)
+  (map (lambda (v) (if (eq? v #f) '(0 . 0) v)) s)
+)
+
+sS = #(define-music-function (parser location s) (scheme?)
+  #{ \once \shape #(convert-shape-coords s) Slur #}
+)
+
+knee = \once \override Beam.auto-knee-gap = #0