lydown 0.12.4 → 0.14.0

data/lib/lydown/rendering/lyrics.rb

@@ -12,7 +12,7 @@ module Lydown::Rendering
     def lilypond_lyrics(lyrics)
       lyrics.
         gsub(/_+/)  {|m| " __ #{'_ ' * (m.size - 1)}"}.
-        gsub(/\-+/) {|m| " -- #{'_ ' * (m.size - 1)}"}
+        gsub(/(\\\-)?(\-+)/) {|m| "#{$1 && "-"} -- #{'_ ' * ($2.size - 1)}"}
     end
   end
 end

data/lib/lydown/rendering/markup.rb

@@ -0,0 +1,23 @@
+module Lydown::Rendering
+  module Markup
+    def self.convert(str)
+      convert_line_breaks(str)
+    end
+    
+    def self.convert_styling(str)
+      str.
+        gsub(/__([^_]+)__/) {|m| "\\bold {#{$1} }" }.
+        gsub(/_([^_]+)_/) {|m| "\\italic {#{$1} }" }
+        gsub(/\^([^\^]+)\^/) {|m| "\\smallCaps {#{$1} }" }
+    end
+    
+    def self.convert_line_breaks(str)
+      if str =~/\n/
+        lines = str.lines.map {|s| "\\fill-line { \"#{s.chomp}\" }"}
+        "\\markup \\column { #{lines.join(' ')} }"
+      else
+        "\"#{str}\""
+      end
+    end
+  end
+end

data/lib/lydown/rendering/movement.rb

@@ -3,7 +3,9 @@ module Lydown::Rendering
     def self.movement_title(context, name)
       return nil if name.nil? || name.empty?
       
-      if name =~ /^(?:([0-9]+)([a-z]*))\-(.+)$/
+      if t = context.get_setting('movement_title', movement: name)
+        title = t
+      elsif name =~ /^(?:([0-9]+)([a-z]*))\-(.+)$/
         title = "#{$1.to_i}#{$2}. #{$3.capitalize}"
       else
         title = name
@@ -24,7 +26,8 @@ module Lydown::Rendering
       'before' => {before: true},
       'after'  => {after: true},
       'before and after' => {before: true, after: true},
-      'blank page before' => {blank_page_before: true}
+      'blank page before' => {blank_page_before: true},
+      'bookpart before' => {bookpart_before: true}
     }
     
     def self.page_breaks(context, opts)
@@ -32,8 +35,8 @@ module Lydown::Rendering
       when :score
         context.get_setting('score/page_break', opts)
       when :part
-        part = opts[:part] || context[:part] || 
-          (context['options/parts'] ? context['options/parts'][0] : '')
+        part = opts[:part] || context[:part] || context['render_opts/parts']
+        
         context.get_setting(:page_break, opts.merge(part: part)) ||
           context.get_setting('parts/page_break', opts)
       else

data/lib/lydown/rendering/music.rb

@@ -10,8 +10,25 @@ module Lydown::Rendering
     '6' => '16',
     '3' => '32'
   }
-
+  
   class Duration < Base
+    def self.full_bar_value(time)
+      r = Rational(time)
+      case r.numerator
+      when 1
+        r.denominator.to_s
+      when 3
+        case r.denominator
+        when 1
+          "\\breve."
+        else
+          "#{r.denominator / 2}."
+        end
+      else
+        nil
+      end
+    end
+    
     def translate
       Notes.cleanup_duration_macro(@context)
 
@@ -32,6 +49,7 @@ module Lydown::Rendering
         @context['process/figures_duration_value'] = value
       else
         @context['process/duration_values'] = [value]
+        @context['process/cross_bar_dotting'] = @event[:cross_bar_dotting]
         @context['process/tuplet_mode'] = nil
         @context['process/duration_macro'] = nil unless @context['process/macro_group']
       end
@@ -184,23 +202,11 @@ module Lydown::Rendering
   class Rest < Base
     include Notes
 
-    def full_bar_value(time)
-      r = Rational(time)
-      case r.numerator
-      when 1
-        r.denominator.to_s
-      when 3
-        "#{r.denominator / 2}."
-      else
-        nil
-      end
-    end
-
     def translate
       translate_expressions
 
       if @event[:multiplier]
-        value = full_bar_value(@context.get_current_setting(:time))
+        value = Duration.full_bar_value(@context.get_current_setting(:time))
         @context['process/duration_macro'] = nil unless @context['process/macro_group']
         if value
           @event[:rest_value] = "#{value}*#{@event[:multiplier]}"
@@ -221,21 +227,9 @@ module Lydown::Rendering
   class Silence < Base
     include Notes
 
-    def full_bar_value(time)
-      r = Rational(time)
-      case r.numerator
-      when 1
-        r.denominator.to_s
-      when 3
-        "#{r.denominator / 2}."
-      else
-        nil
-      end
-    end
-
     def translate
       if @event[:multiplier]
-        value = full_bar_value(@context.get_current_setting(:time))
+        value = Duration.full_bar_value(@context.get_current_setting(:time))
         @context['process/duration_macro'] = nil unless @context['process/macro_group']
         if value
           @event[:rest_value] = "#{value}*#{@event[:multiplier]}"
@@ -285,10 +279,22 @@ module Lydown::Rendering
   end
 
   class Barline < Base
+    
+    LILYPOND_BARLINES = {
+      '|:' => '.|:',
+      ':|' => ':|.',
+      '|\''=> '\halfBarline',
+      '?|' => ''
+    }
+    
     def translate
       barline = @event[:barline]
-      barline = '' if barline == '?|'
-      @context.emit(:music, "\\bar \"#{barline}\" ")
+      barline = LILYPOND_BARLINES[barline] || barline
+      if barline =~ /^\\/
+        @context.emit(:music, "#{barline} ")
+      else
+        @context.emit(:music, "\\bar \"#{barline}\" ")
+      end
     end
   end
 end

data/lib/lydown/rendering/notes.rb

@@ -40,7 +40,7 @@ module Lydown::Rendering
     def self.calc_accidentals_map(accidentals)
       accidentals.inject({}) { |h, a| h[a[0]] = (a[1] == '+') ? 1 : -1; h}
     end
-    
+
     ACCIDENTAL_VALUES = {
       '+' => 1,
       '-' => -1,
@@ -51,26 +51,26 @@ module Lydown::Rendering
     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]; '' }
-        
+
       # add key signature value
       value += accidentals_for_key_signature(key_signature)[note] || 0
 
       note + (value >= 0 ? 'is' * value : 'es' * -value)
     end
-    
+
     def self.chromatic_to_diatonic(note, key_signature = 'c major')
       note =~ /([a-g])([\+\-]*)/
       diatonic_note = $1
       chromatic_value = $2.count('+') - $2.count('-')
-      
+
       key_accidentals = accidentals_for_key_signature(key_signature)
       diatonic_value = key_accidentals[diatonic_note] || 0
       value = chromatic_value - diatonic_value
-      
+
       "#{diatonic_note}#{value >= 0 ? '+' * value : '-' * -value}"
     end
 
@@ -84,35 +84,35 @@ module Lydown::Rendering
       lilypond_note_name(note, key)
     end
   end
-  
+
   module Octaves
     DIATONICS = %w{a b c d e f g}
 
-    # calculates the octave markers needed to put a first note in the right 
+    # calculates the octave markers needed to put a first note in the right
     # octave. In lydown, octaves are relative (i.e. lilypond's relative mode).
-    # But the first note gives the octave to start on, rather than a relative 
+    # But the first note gives the octave to start on, rather than a relative
     # note to c (or any other reference note).
     #
-    # In that manner, d' is d above middle c, g'' is g an octave and fifth 
+    # In that manner, d' is d above middle c, g'' is g an octave and fifth
     # above middle c, a is a a below middle c, and eß, is great e flat.
-    # 
+    #
     # The return value is a string with octave markers for relative mode,
     # based on the refence note
     def self.relative_octave(note, ref_note = 'c')
       note_diatonic, ref_diatonic = note[0], ref_note[0]
       raise LydownError, "Invalid note #{note}" unless DIATONICS.index(note_diatonic)
       raise LydownError, "Invalid reference note #{ref_note}" unless DIATONICS.index(ref_diatonic)
-      
+
       # calculate diatonic interval
       note_array = DIATONICS.rotate(DIATONICS.index(ref_diatonic))
       interval = note_array.index(note_diatonic)
 
-      # calculate octave interval and 
+      # calculate octave interval and
       octave_value = note.count("'") - note.count(',')
       ref_value = ref_note.count("'") - ref_note.count(',')
       octave_interval = octave_value - ref_value
       octave_interval += 1 if interval >= 4
-      
+
       # generate octave markers
       octave_interval >= 0 ? "'" * octave_interval : "," * -octave_interval
     end
@@ -121,17 +121,17 @@ module Lydown::Rendering
       note_diatonic, ref_diatonic = note[0], ref_note[0]
       raise LydownError, "Invalid note #{note}" unless DIATONICS.index(note_diatonic)
       raise LydownError, "Invalid reference note #{ref_note}" unless DIATONICS.index(ref_diatonic)
-      
+
       # calculate diatonic interval
       note_array = DIATONICS.rotate(DIATONICS.index(ref_diatonic))
       interval = note_array.index(note_diatonic)
 
-      # calculate octave interval and 
+      # calculate octave interval and
       note_value = note.count("'") - note.count(',')
       ref_value = ref_note.count("'") - ref_note.count(',')
       octave_interval = ref_value + note_value
       octave_interval -= 1 if interval >= 4
-      
+
       # generate octave markers
       octave_interval >= 0 ? "'" * octave_interval : "," * -octave_interval
     end
@@ -142,19 +142,19 @@ module Lydown::Rendering
 
     def add_note(event, options = {})
       @context.set_setting(:got_music, true)
-      
+
       return add_macro_note(event) if @context['process/duration_macro']
-      
+
       # calculate relative octave markers for first note
       unless @context['process/first_note'] || event[:head] =~ /^[rsR]/
         note = event[:head] + (event[:octave] || '')
         event[:octave] = Lydown::Rendering::Octaves.relative_octave(note)
         @context['process/first_note'] = note
       end
-      
+
       if event[:head] == '@'
         # replace repeating note head
-        event[:head] = @context['process/last_note_head'] 
+        event[:head] = @context['process/last_note_head']
       else
         @context['process/last_note_head'] = event[:head]
       end
@@ -174,7 +174,7 @@ module Lydown::Rendering
           @context['process/running_values'] << value
         end
       end
-      
+
       # only add the value if different than the last used
       if options[:no_value] || (value == @context['process/last_value'])
         value = ''
@@ -190,7 +190,7 @@ module Lydown::Rendering
       code = lilypond_note(event, options.merge(value: value))
       @context.emit(event[:stream] || :music, code)
     end
-    
+
     def add_chord(event, options = {})
       value = @context['process/duration_values'].first
       @context['process/duration_values'].rotate!
@@ -214,16 +214,20 @@ module Lydown::Rendering
       else
         @context['process/last_value'] = value
       end
-      
+
       notes = event[:notes].map do |note|
         lilypond_note(note)
       end
-      
+
       options = options.merge(value: value)
       @context.emit(event[:stream] || :music, lilypond_chord(event, notes, options))
     end
-    
+
     def lilypond_note(event, options = {})
+      if @context['process/cross_bar_dotting']
+        return cross_bar_dot_lilypond_note(event, options)
+      end
+
       head = Accidentals.translate_note_name(@context, event[:head])
       if options[:head_only]
         head
@@ -235,7 +239,7 @@ module Lydown::Rendering
           accidental_flag = event[:accidental_flag]
           prefix = ''
         end
-        
+
         [
           prefix,
           head,
@@ -249,6 +253,37 @@ module Lydown::Rendering
       end
     end
 
+    TRANSPARENT_TIE = "\\once \\override Tie #'transparent = ##t"
+    TRANSPARENT_NOTE = <<EOF
+\\once \\override NoteHead #'transparent = ##t
+\\once \\override Dots #'extra-offset = #'(-1.3 . 0)
+\\once \\override Stem #'transparent = ##t
+EOF
+
+    def cross_bar_dot_lilypond_note(event, options)
+      @context['process/cross_bar_dotting'] = nil
+
+      original_duration = @context['process/duration_values'][0]
+      original_duration =~ /([0-9]+)(\.+)/
+      value, dots =  $1, $2
+
+      main_note = lilypond_note(event, options.merge(value: value))
+
+      cross_bar_note_head = lilypond_note(event, options.merge(head_only: true))
+      cross_bar_note = "#{cross_bar_note_head}#{original_duration}*0"
+
+      silence = "s#{value.to_i * 2} "
+
+      [
+        TRANSPARENT_TIE,
+        main_note,
+        '~',
+        TRANSPARENT_NOTE,
+        cross_bar_note,
+        silence
+      ].join(' ')
+    end
+
     def lilypond_chord(event, notes, options = {})
       [
         '<',
@@ -309,7 +344,7 @@ module Lydown::Rendering
         event[:figures] ? "<#{event[:figures].join}>" : '',
         event[:expressions] ? event[:expressions].join + ' ' : ''
       ]
-      
+
       # replace place holder and repeaters in macro group with actual note
       @context['process/macro_group'].gsub!(/[_∞]/) do |match|
         case match
@@ -325,7 +360,7 @@ module Lydown::Rendering
       # correct
       @context['process/macro_filename'] = event[:filename]
       @context['process/macro_source'] = event[:source]
-      
+
       # increment group note count
       @context['process/macro_group_note_count'] ||= 0
       @context['process/macro_group_note_count'] += 1
@@ -335,20 +370,19 @@ module Lydown::Rendering
         Notes.add_duration_macro_group(@context, @context['process/macro_group'])
       end
     end
-    
+
     # emits the current macro group up to the first placeholder character.
-    # this method is called 
+    # this method is called
     def self.cleanup_duration_macro(context)
       return unless context['process/macro_group_note_count'] &&
         context['process/macro_group_note_count'] > 0
-      
+
       # truncate macro group up until first placeholder
-      group = context['process/macro_group'].sub(/_.*$/, '')
+      group = context['process/macro_group'].sub(/(?<!\<)_.*$/, '')
 
-      # Refrain from adding 
       add_duration_macro_group(context, group)
     end
-    
+
     def self.add_duration_macro_group(context, group)
       opts = (context[:options] || {}).merge({
         filename: context['process/macro_filename'],
@@ -367,7 +401,7 @@ module Lydown::Rendering
       # restore macro
       context['process/duration_macro'] = macro
     end
-    
+
     def add_macro_event(code)
       case @context['process/macro_group']
       when nil
@@ -389,7 +423,7 @@ module Lydown::Rendering
       '>' => 'left-align',
       '|' => 'center-align'
     }
-    
+
     DYNAMICS = %w{
       pppp ppp pp p mp mf f ff fff ffff fp sf sff sp spp sfz rfz
     }
@@ -421,19 +455,19 @@ module Lydown::Rendering
           gsub(/__([^_]+)__/) {|m| "\\bold { #{$1} }" }.
           gsub(/_([^_]+)_/) {|m| "\\italic { #{$1} }" }
     end
-    
+
     TEXTMATE_URL = "txmt://open?url=file://%s&line=%d&column=%d"
-    
+
     ADD_LINK_COMMAND = '\once \override NoteHead.after-line-breaking =
             #(add-link "%s") '
-    
+
     def note_event_url_link(event)
       url = TEXTMATE_URL % [
         File.expand_path(event[:filename]).uri_escape,
         event[:line],
         event[:column]
       ]
-      
+
       ADD_LINK_COMMAND % [url]
     end
   end