lydown 0.12.4 → 0.14.0

data/lib/lydown/templates/multi_voice.rb

@@ -0,0 +1,25 @@
+beaming_mode = Lydown::Rendering::Staff.beaming_mode(context, 
+  context.current_setting_opts)
+voice_prefix = part.nil? || (part == "") ? nil : "#{part}_"
+
+`
+<<
+`
+
+context['process/voices'].each do |voice, stream|
+  `
+  {{? voice != 'voice1' }}
+    \new Voice = "{{voice_prefix}}{{voice}}"
+  {{/}}
+
+  {
+    {{beaming_mode}}
+    {{Lydown::Rendering::VoiceSelect.voice_command(voice)}}
+    {{stream['music']}}
+  }
+  `
+end
+`
+>>
+\oneVoice 
+`

data/lib/lydown/templates/part.rb

@@ -0,0 +1,146 @@
+render_mode = context.render_mode
+
+setting_opts = {movement: movement_name, part: name}
+
+inline_part_title = nil
+if name && (name != '')
+  part_title = Lydown::Rendering::Staff.part_title(context, setting_opts)
+  voice_prefix = "#{name}_"
+else
+  part_title = "#\"\""
+  voice_prefix = nil
+end
+staff_id = Lydown::Rendering::Staff.staff_id(name)
+
+score_mode = render_mode == :score
+
+clef = Lydown::Rendering::Staff.clef(context, setting_opts)
+prevent_remove_empty = Lydown::Rendering::Staff.prevent_remove_empty(context, setting_opts)
+
+midi_mode = (context['render_opts/format'] == 'midi') ||
+            (context['render_opts/format'] == 'mp3')
+midi_instrument = midi_mode && Lydown::Rendering::Staff.midi_instrument(name)
+
+beaming_mode = Lydown::Rendering::Staff.beaming_mode(context, setting_opts)
+partial = context.get_setting(:pickup, setting_opts)
+partial = partial ? "\\partial #{partial}" : ""
+
+end_barline = Lydown::Rendering::Staff.end_barline(context, setting_opts)
+
+time = context.get_setting(:time, setting_opts)
+cadenza = time == 'unmetered'
+
+skip_bars = (render_mode == :proof) || (render_mode == :part)
+
+instrument_names = context.get_setting(:instrument_names, setting_opts)
+hide_instrument_names =
+  (instrument_names == 'hide') ||
+  (instrument_names =~ /^inline\-?(.+)?$/)
+
+if instrument_names =~ /^inline\-?(.+)?$/
+  alignment = $1 && "\\#{$1}"
+  inline_part_title = Lydown::Rendering::Staff.inline_part_title(
+    context, setting_opts.merge(alignment: alignment)
+  )
+end
+
+layout = Lydown::Rendering.layout_info(context, setting_opts)
+show_original_clef = score_mode && (layout[:original_clefs] == 'show')
+original_clef = context.get_setting(:original_clef, setting_opts)
+
+`
+<<
+
+\new Staff = {{staff_id}} \with {
+  {{? prevent_remove_empty }}
+    \override VerticalAxisGroup.remove-empty = ##f
+  {{/}}
+
+  {{? size = context.get_setting(:staff_size, setting_opts)}}
+    fontSize = #{{ size }}
+    \override StaffSymbol.staff-space = #(magstep {{ size }})
+  {{/}}
+
+}
+
+\context Staff = {{staff_id}} {
+  {{? skip_bars }}
+    \set Score.skipBars = ##t
+  {{/}}
+
+  {{? tempo = context.get_setting(:tempo, setting_opts)}}
+    \tempo "{{tempo}}"
+  {{/}}
+
+  {{? score_mode && !hide_instrument_names}}
+    \set Staff.instrumentName = {{part_title}}
+  {{/}}
+
+  {{? show_original_clef && original_clef }}
+  \incipit { \omit MensuralStaff.TimeSignature \clef "{{original_clef}}" s4 }
+  {{/}}
+  {{? show_original_clef && !original_clef }}
+  \incipit { \override MensuralStaff.StaffSymbol.color = #(rgb-color 1 1 1)
+    \omit MensuralStaff.TimeSignature \omit MensuralStaff.Clef  s4 }
+  {{/}}
+
+  {{? midi_instrument}}
+    \set Staff.midiInstrument = #"{{midi_instrument}}"
+  {{/}}
+
+  {{? clef}}
+    \clef "{{clef}}"
+  {{/}}
+
+  {{partial}}
+
+  {{? score_mode && inline_part_title}}
+    {{inline_part_title}}
+  {{/}}
+
+  {{beaming_mode}}
+
+  {{? t = context.get_setting(:transpose, setting_opts)}}
+  \transpose {{t}}
+  {{/}}
+
+  \{{Lydown::Rendering.variable_name(setting_opts.merge(stream: :music))}}
+
+  {{? end_barline}}
+    \bar "{{end_barline}}"
+  {{/}}
+}
+`
+
+if part['lyrics']
+  multi_voice = part['lyrics'].size > 1
+  part['lyrics'].each_key do |voice|
+    above_staff = multi_voice && ['voice1', 'voice3'].include?(voice)
+    part['lyrics'][voice].keys.sort.each do |idx|
+      var_name = Lydown::Rendering.variable_name(setting_opts.merge(
+        stream: :lyrics, voice: voice, idx: idx))
+      `
+      \new Lyrics  \with {
+        {{? above_staff}}
+          alignAboveContext = "{{staff_id}}"
+        {{/}}
+        {{? size = context.get_setting(:staff_size, setting_opts)}}
+          fontSize = #{{ size }}
+        {{/}}
+      }
+      { \lyricsto "{{voice_prefix}}{{voice}}" { \{{var_name}} } }
+      `
+    end
+  end
+end
+
+if part['figures']
+  var_name = Lydown::Rendering.variable_name(setting_opts.merge(stream: :figures))
+  `
+  \new FiguredBass { \{{var_name}} }
+  `
+end
+
+`
+>>
+`

data/lib/lydown/templates/variables.rb

@@ -0,0 +1,43 @@
+var_name = lambda {|opts| Lydown::Rendering.variable_name(opts)}
+context['movements'].each do |mvt_name, mvt|
+  mvt['parts'].each do |part_name, part|
+    var_opts = {movement: mvt_name, part: part_name}
+    notation_size = context.get_setting(:notation_size, var_opts)
+    notation_size = "\\#{notation_size}" if notation_size
+
+    if part_name && !part_name.empty?
+      voice_prefix = "#{part_name}_"
+    else
+      voice_prefix = nil
+    end
+
+    `
+    {{var_name[var_opts.merge(stream: :music)]}} = \relative c {
+      <<
+        \new Voice = "{{voice_prefix}}voice1" {
+          {{notation_size}}
+          {{part['music']}}
+        }
+      >>
+    }
+    `
+  
+    if part['lyrics']
+      part['lyrics'].each do |voice, voice_lyrics|
+        voice_lyrics.each do |idx, lyrics|
+          opts = var_opts.merge(stream: :lyrics, voice: voice, idx: idx)
+          `
+          {{var_name[opts]}} = \lyricmode { {{lyrics}} }
+          `
+        end
+      end
+    end
+
+    if part['figures']
+      `
+      {{var_name[var_opts.merge(stream: :figures)]}} = 
+        \figuremode { {{part['figures']}} }
+      `
+    end
+  end
+end 

data/lib/lydown/translation/ripple.rb

@@ -24,7 +24,7 @@ class RippleParser
 
   def self.format_parser_error(source, parser, opts)
     msg = "#{parser.failure_reason} at #{parser.failure_line}:#{parser.failure_column}\n"
-    msg << "  #{source.lines[parser.failure_line - 1].chomp}\n #{' ' * parser.failure_column}^"
+    # msg << "  #{source.lines[parser.failure_line - 1].chomp}\n #{' ' * parser.failure_column}^"
     msg
   end
 end

data/lib/lydown/translation/ripple/nodes.rb

@@ -68,6 +68,10 @@ module Lydown::Translation::Ripple
         note[:duration] ||= opts[:post_macro_value]
         opts[:post_macro_value] = nil
       end
+      
+      if note[:duration] && note[:grace]
+        note[:duration] += note[:grace]
+      end
 
       stream << "%s%s%s" % [
         note[:duration],
@@ -76,6 +80,12 @@ module Lydown::Translation::Ripple
       ]
     end
     
+    class Grace < Root
+      def translate(note, opts)
+        note[:grace] = text_value
+      end
+    end
+    
     class Head < Root
       def translate(note, opts)
         head = text_value.dup
@@ -96,7 +106,13 @@ module Lydown::Translation::Ripple
         note[:duration] = text_value
       end
     end
-    
+
+    class Articulation < Root
+      def translate(note, opts)
+        note[:expressions] << text_value
+      end
+    end
+
     class Expression < Root
       def translate(note, opts)
         note[:expressions] << text_value
@@ -108,7 +124,7 @@ module Lydown::Translation::Ripple
     def translate(stream, opts)
       signature = {}
       _translate(self, signature, opts)
-      opts[:key] = "#{signature[:head]} #{signature[:mode]}"
+      opts[:key] = "#{signature[:head]} #{signature[:mode]}".strip
       stream << "- key: #{opts[:key]}\n"
     end
     
@@ -188,4 +204,37 @@ module Lydown::Translation::Ripple
       stream << " #{cmd} "
     end
   end
+  
+  class Noop < Root
+    def translate(stream, opts)
+      # noop
+    end
+  end
+  
+  class Repeat < Root
+    def translate(stream, opts)
+      _translate(self, stream, opts)
+      stream << "*| "
+    end
+    
+    class Start < Root
+      def translate(stream, opts)
+        stream << "|:*2 "
+        _translate(self, stream, opts)
+      end
+    end
+    
+    class Alternative < Root
+      def translate(stream, opts)
+        stream << "|* "
+        _translate(self, stream, opts)
+      end
+    end
+  end
+  
+  class Barline < Root
+    def translate(stream, opts)
+      stream << " #{text_value} "
+    end
+  end
 end

data/lib/lydown/translation/ripple/ripple.treetop

@@ -10,15 +10,28 @@ grammar Ripple
   end
   
   rule event
-    (relative_cmd / curly_brace / key_signature / time_signature /
-    full_rest / note / phrasing / named_macro / stop_macro / command) white_space?
+    (relative_command / repeat / curly_brace / key_signature / time_signature / 
+     tempo_command / partial_command / full_rest / note / phrasing / named_macro / stop_macro / 
+     noop / barline / command / comment
+    ) white_space?
   end
   
-  rule relative_cmd
-    '\relative' [\s]+ relative_cmd_note
+  rule no_brace_events
+    white_space? no_brace_event* <Root>
   end
   
-  rule relative_cmd_note
+  rule no_brace_event
+    (key_signature / time_signature / partial_command / 
+     tempo_command / full_rest / note / phrasing / named_macro / stop_macro / 
+     noop / barline / command / comment
+    ) white_space?
+  end
+  
+  rule relative_command
+    '\relative' [\s]+ relative_command_note
+  end
+  
+  rule relative_command_note
     [a-g] accidental? octave* <RelativeCommand>
   end
   
@@ -27,21 +40,29 @@ grammar Ripple
   end
   
   rule key_signature
-    '\key' [\s]+ note_head [\s+] key_mode <KeySignature>
+    '\key' white_space+ key_note_head white_space+ key_mode <KeySignature>
   end
   
   rule key_mode
-    '\major' / '\minor' <KeySignature::Mode>
+    '\\' ('major' / 'minor') <KeySignature::Mode>
   end
   
   rule note
-    note_head duration? expression* <Note>
+    grace? note_head duration? articulation* expression* <Note>
+  end
+  
+  rule grace
+    [\^] <Note::Grace>
   end
   
   rule note_head
     [a-gr] accidental octave* accidental_flag? <Note::Head>
   end
   
+  rule key_note_head
+    [a-g] accidental <Note::Head>
+  end
+  
   rule octave
     [,']+
   end
@@ -58,8 +79,12 @@ grammar Ripple
     [0-9]+ '.'* <Note::Duration>
   end
   
+  rule articulation
+    '-' [\+] <Note::Articulation>
+  end
+  
   rule expression
-    '\\' [a-zA-Z]+ <Note::Expression>
+    '_'? '\\' [a-zA-Z]+ <Note::Expression>
   end
 
   rule time_signature
@@ -70,8 +95,12 @@ grammar Ripple
     [0-9\/]+ <TimeSignature>
   end
   
+  rule partial_command
+    '\partial' white_space [0-9]+
+  end
+  
   rule full_rest
-    'R' [0-9]+ ('*' [0-9]+)? <FullRest>
+    'R' [0-9\.]+ ('*' [0-9]+)? <FullRest>
   end
   
   rule phrasing
@@ -97,4 +126,52 @@ grammar Ripple
   rule clef_command
     '\clef ' [a-z0-9_]+ <Command>
   end
+  
+  rule tempo_command
+    '\tempo "' [^"]+ '"' <Noop>
+  end
+  
+  rule noop
+    midi_block
+  end
+  
+  rule midi_block
+    'm{{' [^\}]+ '}}' <Noop>
+  end
+  
+  rule repeat
+    repeat_start white_space? repeat_alternatives <Repeat>
+  end
+  
+  rule repeat_start
+    repeat_start_prefix no_brace_events repeat_start_postfix <Repeat::Start>
+  end
+  
+  rule repeat_start_prefix
+    '\repeat volta 2' white_space? '{'
+  end
+    
+  rule repeat_start_postfix
+    '}' white_space?
+  end
+  
+  rule repeat_alternatives
+    '\alternative' white_space? '{' repeat_alternative+ '}' <Root>
+  end
+
+  rule repeat_alternative
+    white_space? '{' no_brace_events '}' white_space? <Repeat::Alternative>
+  end
+ 
+  rule comment
+    '%' [^\n]*
+  end
+ 
+  rule barline
+    '\bar "'? barline_sign '"'?
+  end
+ 
+  rule barline_sign
+    '?|' / ':|][|:' / '[|:' / ':|]' / [\|\.\:]+ <Barline>
+ end
 end