lydown 0.4.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f65c145556a28db3b86c183d1f12460e903c4fa
-  data.tar.gz: 2c7faca659a582e802793be8c84551efdb0e863d
+  metadata.gz: 768154bba0df3c6550e92d7bab1846d78e767652
+  data.tar.gz: a964448d153898925ee16869131f9888a1298ca2
 SHA512:
-  metadata.gz: 138a326275fd7b015c991439ef18c9533d4928d04fcfe9700a8a102712250d2e0e1839a844ea31cb0fe96cbe7c3caa56a9ec0f4c02759f0550d41976f5738ba0
-  data.tar.gz: 3c8d435a1971f739c50b3b9bd8d4987a7f928ab418583fa1a8c0125e725deebc5f38420bc261902dd53dd2ab9767a0430f2be44d3f3a89807fa78f683fc5e832
+  metadata.gz: fdc5ae5af05d007763399b2e33b4d7c7ab98050f2abbfd2ffc2f84a49fa8ed6e907762aed1ea577c58bbe98a5ff3d44ab21e11a9382fcd02a830719740fda29d
+  data.tar.gz: 286f620033bd8c01c53bd1dffacb6d715264d4a135674389d892b5602e8c4d23fc3f55f540514a75a1e46b499316cea09766aa9764252e2e9b02b64332e76ab3

data/README.md

@@ -87,6 +87,12 @@ Augmentation dots are entered like in lilypond:
 
     8.c6d 8.e6f 2g => c8. d16 e8. f16 g2
     8..g 3g 4c => g8.. g32 c4
+    
+Notes can be repeated using the <code>@</code> placeholder:
+
+    4c@@@ => c4 c c c
+
+(The repeating note placeholder is useful when entering repeated notes with accidentals).
 
 ### Rests
 
@@ -239,6 +245,11 @@ In the case of key signatures, accidentals will follow the lydown syntax:
 
     - key: b- major
     - key: f+ minor
+    
+Key signatures can also be specified using shorthand notation (upper case for major, lower case for minor):
+
+    - key: B- // b flat major
+    - key: f+ // f sharp minor
 
 The default key signature is C major, and the default time signature is 4/4.
 
@@ -248,7 +259,7 @@ Key or time signatures can be changed on the fly:
     4c e g b
     - time: 3/4
     c e g 2.c
-
+    
 ### Pickup bars
 
 [Pickup bars](http://www.lilypond.org/doc/v2.18/Documentation/notation/displaying-rhythms#upbeats) (anacrusis, upbeat) are defined with the pickup setting:
@@ -259,6 +270,20 @@ Key or time signatures can be changed on the fly:
     c8cdcb4aaa
     d8dedc4bb
 
+### Lilypond Commands and inline settings
+
+Lilypond commands and settings can be entered inline as part of the note stream:
+
+  cd \key:E- e \stemDown f
+  
+A useful shorthand is for one-time (<code>\once</code>) overrides, with an exclamation mark between the backslash and the command:
+
+  \!override:"NoteHead.color = #red"
+
+Multiple arguments can be given, separated by colons. Arguments need to be quoted only if they contain whitespace, or colons:
+
+  \!override:AccidentalSuggestion:"#'avoid-slur = #'outside"
+
 ### Inline lyrics
 
 Lyrics for vocal parts can be entered on separate lines prefixed by a > symbol:
@@ -266,7 +291,17 @@ Lyrics for vocal parts can be entered on separate lines prefixed by a > symbol:
     4c[8de]4fd(4c[8de]2f)
     > Ly-down is the bomb__
 
-Text alignment follows the duration, beaming and slurring of the music, just like in lilypond. Sillables are expected to be separated by a dash. Melismas, i.e. a single sillable streched over multiple notes, is signified by one or more underscores.
+Or between notes using quotes:
+
+    4c[8de]4fd(4c[8de]2f) >"Ly-down is the bomb__"
+
+Text alignment follows the duration, beaming and slurring of the music, [just like in lilypond](http://www.lilypond.org/doc/v2.18/Documentation/notation/common-notation-for-vocal-music#automatic-syllable-durations). Sillables are expected to be separated by a dash. Melismas, i.e. a single sillable streched over multiple notes, is signified by one or more underscores.
+
+Multiple stanzas for the same music can be specified by including the stanza number in parens:
+
+    4cege1c
+    > Ly-down is the bomb.
+    >(2) Li-ly-pond is too.
 
 ### Stream switching
 
@@ -280,6 +315,13 @@ Lyrics can be entered in a block, before or after musical notation, by switching
     =music
     8g'gffeed4
     ...
+    
+Multiple lyrics stanzas can be written by including the stanza number in parens:
+
+    =lyrics(1) // optional, same as =lyrics
+    ...
+    =lyrics(2)
+    ...
 
 ### Figured bass
 
@@ -308,8 +350,13 @@ For multi-movement works, prefix each movement with a -movement setting:
 
 [Multiple voices](http://www.lilypond.org/doc/v2.18/Documentation/notation/multiple-voices#single_002dstaff-polyphony) on the same staff can be easily entered using the following notation:
 
-    1: 8egfdeg4f
-    2: 4cded
+    1: 8egfdeg4f 2: 4cded u: ...
+    
+the <code>u:<\code> command is used to return to single voice (_unisono_) mode.
+  
+Lyrics can be added for individual voices by using inline lyrics:
+
+    1: ceg >"yeah yeah yeah" 2: gbd >"no no no" u: ...
 
 ## Piano scores
 

data/lib/lydown/parsing/lydown.treetop

@@ -5,16 +5,13 @@ grammar Lydown
     line ([\n] line)* <Root>
   end
   rule stream_switch
-    music_stream / lyrics_stream / lyrics2_stream
+    music_stream / lyrics_stream
   end
   rule music_stream
     '=music' white_space? [\n] music ([\n] !stream_breaker music)*
   end
   rule lyrics_stream
-    '=lyrics' white_space? [\n] lyrics_content ([\n] !stream_breaker lyrics_content)*
-  end
-  rule lyrics2_stream
-    '=lyrics2' white_space? [\n] lyrics2_content ([\n] !stream_breaker lyrics2_content)*
+    '=lyrics' stream_idx? white_space? [\n] lyrics_content ([\n] !stream_breaker lyrics_content)* <Lyrics>
   end
   rule stream_breaker
     stream_switch / stream_breaking_setting
@@ -47,7 +44,8 @@ grammar Lydown
     [ \t]+
   end
   rule event
-    (barline / duration / note / standalone_figures / rest / silence / phrasing / tie) white_space*
+    (inline_command / inline_lyrics / voice_selector / barline / duration / 
+      note / standalone_figures / rest / silence / phrasing / tie) white_space*
   end
   rule barline
     ('?|' / ':|][|:' / '[|:' / ':|]' / [\|\.\:]+) <Barline>
@@ -91,7 +89,7 @@ grammar Lydown
     note_head octave* accidental_flag? figures? expression* <Note>
   end
   rule expression
-    (expression_shorthand / expression_longhand) <Note::Expression>
+    (expression_shorthand / expression_longhand / string) <Note::Expression>
   end
 
   rule expression_shorthand
@@ -100,6 +98,9 @@ grammar Lydown
   rule expression_longhand
     '\\' [^\s\n]+
   end
+  rule string
+    '"' ('\"' / !'"' .)* '"'
+  end
   rule figures # bass figures
     '<' figures_component? (white_space? figures_component)* '>'
   end
@@ -110,13 +111,16 @@ grammar Lydown
     duration_value? figures <StandAloneFigures>
   end
   rule rest
-    [rR] multiplier* <Rest>
+    [rR] multiplier* rest_expression* <Rest>
+  end
+  rule rest_expression
+    (expression_longhand / string) <Note::Expression>
   end
   rule silence
     [s] multiplier* <Silence>
   end
   rule note_head
-    [a-g] octave* accidental* <Note::Head>
+    [a-g@] octave* accidental* <Note::Head>
   end
   rule accidental
     [\+\-]+
@@ -125,7 +129,7 @@ grammar Lydown
     [\,']+ <Note::Octave>
   end
   rule accidental_flag
-    [\!\?] <Note::AccidentalFlag>
+    [\!\?\^] <Note::AccidentalFlag>
   end
   rule phrasing
     beam_open / beam_close / slur_open / slur_close
@@ -152,12 +156,30 @@ grammar Lydown
     '&' <ShortTie>
   end
   rule lyrics
-    '>' white_space* lyrics_content
+    '>' stream_idx? white_space* lyrics_content <Lyrics>
+  end
+  rule inline_lyrics
+    '>' stream_idx? lyrics_quoted_content <Lyrics>
+  end
+  rule stream_idx
+    '(' [\d] ')' <StreamIndex>
   end
   rule lyrics_content
-    (!"\n" !"//" .)* <Lyrics>
+    (!"\n" !"//" .)* <Lyrics::Content>
+  end
+  rule lyrics_quoted_content
+    string <Lyrics::QuotedContent>
+  end
+  rule inline_command
+    '\\' '!'? inline_command_key (':' inline_command_argument)* <Command>
+  end
+  rule inline_command_key
+    [a-zA-Z_0-9]+ <Command::Key>
+  end
+  rule inline_command_argument
+    (string / [^\s\t\n\:]+) <Command::Argument>
   end
-  rule lyrics2_content
-    (!"\n" !"//" .)* <Lyrics2>
+  rule voice_selector
+    [1234u] ':' <VoiceSelector>
   end
 end

data/lib/lydown/parsing/nodes.rb

@@ -171,12 +171,16 @@ module Lydown::Parsing
   end
 
   module Rest
+    include Root
+    
     def to_stream(stream)
       rest = {type: :rest, raw: text_value, head: text_value[0]}
       if text_value =~ /^R(\*([0-9]+))?$/
         rest[:multiplier] = $2 || '1'
       end
 
+      _to_stream(self, rest)
+
       stream << rest
     end
   end
@@ -194,14 +198,47 @@ module Lydown::Parsing
   end
 
   module Lyrics
+    include Root
     def to_stream(stream)
-      stream << {type: :lyrics, content: text_value}
+      o = {type: :lyrics}
+      _to_stream(self, o)
+      stream << o
     end
-  end
+    
+    module Content
+      def to_stream(o)
+        if o[:content]
+          o[:content] << ' ' << text_value
+        else
+          o[:content] = text_value
+        end
+      end
+    end
+    
+    module QuotedContent
+      def to_stream(o)
+        if text_value =~ /^"(.+)"$/
+          content = $1
+        else
+          raise LydownError, "Unexpected quoted lyrics content (#{text_value.inspect})"
+        end
 
-  module Lyrics2
-    def to_stream(stream)
-      stream << {type: :lyrics, stream: :lyrics2, content: text_value}
+        if o[:content]
+          o[:content] << ' ' << content
+        else
+          o[:content] = content
+        end
+      end
+    end
+  end
+  
+  module StreamIndex
+    def to_stream(o)
+      idx = (text_value =~ /\(([\d]+)\)/) && $1.to_i
+      if idx.nil?
+        raise LydownError, "Invalid stream index (#{text_value.inspect})"
+      end
+      o[:stream_index] = idx
     end
   end
 
@@ -210,4 +247,49 @@ module Lydown::Parsing
       stream << {type: :barline, barline: text_value}
     end
   end
+  
+  module Command
+    include Root
+    def to_stream(stream)
+      cmd = {type: :command}
+      cmd[:once] = true if text_value =~ /^\\\!/
+      _to_stream(self, cmd)
+      stream << cmd
+    end
+    
+    SETTING_KEYS = %w{time key clef}
+    
+    module Key
+      def to_stream(cmd)
+        cmd[:key] = text_value
+        if SETTING_KEYS.include?(text_value)
+          cmd[:type] = :setting
+        end
+      end
+    end
+    
+    module Argument
+      def to_stream(cmd)
+        if text_value =~ /^"(.+)"$/
+          value = $1
+        else
+          value = text_value
+        end
+        
+        if cmd[:type] == :setting
+          cmd[:value] = value
+        else
+          cmd[:arguments] ||= []
+          cmd[:arguments] << value
+        end
+      end
+    end
+  end
+  
+  module VoiceSelector
+    def to_stream(stream)
+      voice = (text_value =~ /^([1234])/) && $1.to_i
+      stream << {type: :voice_select, voice: voice}
+    end
+  end
 end

data/lib/lydown/parsing.rb

@@ -26,7 +26,7 @@ class LydownParser
     else
       msg << "#{parser.failure_reason}:\n"
     end
-    msg << "  #{source.lines[parser.failure_line - 1]} #{' ' * parser.failure_column}^"
+    msg << "  #{source.lines[parser.failure_line - 1].chomp}\n #{' ' * parser.failure_column}^"
 
     msg
   end

data/lib/lydown/rendering/command.rb

@@ -0,0 +1,10 @@
+module Lydown::Rendering
+  class Command < Base
+    def translate
+      once = @event[:once] ? '\once ' : ''
+      
+      cmd = "#{once}\\#{@event[:key]} #{(@event[:arguments] || []).join(' ')} "
+      @work.emit(:music, cmd)
+    end
+  end
+end

data/lib/lydown/rendering/lyrics.rb

@@ -2,7 +2,11 @@ module Lydown::Rendering
   class Lyrics < Base
     def translate
       value = lilypond_lyrics(@event[:content])
-      @work.emit(@event[:stream] || :lyrics, value, ' ')
+      
+      lyrics_idx = @event[:stream_index] || 1
+      voice = @work['process/voice_selector'] || 'voice1'
+      
+      @work.emit("lyrics/#{voice}/#{lyrics_idx}", value, ' ')
     end
 
     def lilypond_lyrics(lyrics)

data/lib/lydown/rendering/music.rb

@@ -60,7 +60,12 @@ module Lydown::Rendering
     def add_note(event)
       return add_macro_note(event) if @work['process/duration_macro']
 
-      @work['process/last_note_head'] = event[:head]
+      if @event[:head] == '@'
+        # replace repeating note head
+        @event[:head] = @work['process/last_note_head'] 
+      else
+        @work['process/last_note_head'] = event[:head]
+      end
 
       value = @work['process/duration_values'].first
       @work['process/duration_values'].rotate!
@@ -87,20 +92,35 @@ module Lydown::Rendering
 
       @work.emit(event[:stream] || :music, lilypond_note(event, value: value))
     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
-        "%s%s%s%s%s%s " % [
+        if event[:accidental_flag] == '^'
+          accidental_flag = ''
+          prefix =  FICTA_CODE
+        else
+          accidental_flag = event[:accidental_flag]
+          prefix = ''
+        end
+        
+        [
+          prefix,
           head,
           event[:octave],
-          event[:accidental_flag],
+          accidental_flag,
           options[:value],
           lilypond_phrasing(event),
-          event[:expressions] ? event[:expressions].join : ''
-        ]
+          event[:expressions] ? event[:expressions].join : '',
+          ' '
+        ].join
       end
     end
 
@@ -152,12 +172,12 @@ module Lydown::Rendering
       ]
 
       # replace place holder and repeaters in macro group with actual note
-      @work['process/macro_group'].gsub!(/[_@]/) do |match|
+      @work['process/macro_group'].gsub!(/[_∞]/) do |match|
         case match
         when '_'
           underscore_count += 1
           underscore_count == 1 ? lydown_note : match
-        when '@'
+        when '∞'
           underscore_count < 2 ? event[:head] : match
         end
       end
@@ -176,6 +196,34 @@ module Lydown::Rendering
         @work['process/macro_group'] = nil
       end
     end
+
+    LILYPOND_EXPRESSIONS = {
+      '_' => '--',
+      '.' => '-.',
+      '`' => '-!'
+    }
+
+    def translate_expressions
+      return unless @event[:expressions]
+
+      @event[:expressions] = @event[:expressions].map do |expr|
+        if expr =~ /^(?:\\(_?))?"(.+)"$/
+          placement = ($1 == '_') ? '_' : '^'
+          "#{placement}\\markup { #{translate_string_expression($2)} }"
+        elsif expr =~ /^\\/
+          expr
+        elsif LILYPOND_EXPRESSIONS[expr]
+          LILYPOND_EXPRESSIONS[expr]
+        else
+          raise LydownError, "Invalid expression #{expr.inspect}"
+        end
+      end
+    end
+
+    def translate_string_expression(expr)
+      expr.gsub(/__([^_]+)__/) {|m| "\\bold { #{$1} }" }.
+           gsub(/_([^_]+)_/) {|m| "\\italic { #{$1} }" }
+    end
   end
 
   LILYPOND_DURATIONS = {
@@ -232,7 +280,7 @@ module Lydown::Rendering
       # look ahead and see if any beam or slur closing after note
       look_ahead_idx = @idx + 1
       while event = @stream[look_ahead_idx]
-        case @stream[@idx + 1][:type]
+        case event[:type]
         when :beam_close
           @event[:beam_close] = true
         when :slur_close
@@ -245,26 +293,6 @@ module Lydown::Rendering
 
       add_note(@event)
     end
-
-    LILYPOND_EXPRESSIONS = {
-      '_' => '--',
-      '.' => '-.',
-      '`' => '-!'
-    }
-
-    def translate_expressions
-      return unless @event[:expressions]
-
-      @event[:expressions] = @event[:expressions].map do |expr|
-        if expr =~ /^\\/
-          expr
-        elsif LILYPOND_EXPRESSIONS[expr]
-          LILYPOND_EXPRESSIONS[expr]
-        else
-          raise LydownError, "Invalid expression #{expr.inspect}"
-        end
-      end
-    end
   end
 
   class StandAloneFigures < Base
@@ -327,6 +355,8 @@ module Lydown::Rendering
     end
 
     def translate
+      translate_expressions
+
       if @event[:multiplier]
         value = full_bar_value(@work[:time])
         if value
@@ -369,7 +399,9 @@ module Lydown::Rendering
           if macro =~ /^\{(.+)\}$/
             macro = $1
           end
-          @work['process/duration_macro'] = macro
+          # replace the repeating note placeholder with another sign in order to
+          # avoid mixing up with repeating notes from outside the macro
+          @work['process/duration_macro'] = macro.gsub('@', '∞')
         else
           raise LydownError, "Unknown macro #{@event[:macro]}"
         end

data/lib/lydown/rendering/settings.rb

@@ -1,8 +1,8 @@
 module Lydown::Rendering
   class Setting < Base
     SETTING_KEYS = [
-      'key', 'time', 'pickup', 'clef', 'part', 'movement',
-      'accidentals', 'beams', 'end_barline', 'macros'
+      'key', 'time', 'pickup', 'clef', 'part', 'movement', 'tempo',
+      'accidentals', 'beams', 'end_barline', 'macros', 'empty_staves'
     ]
 
     RENDERABLE_SETTING_KEYS = [
@@ -11,7 +11,8 @@ module Lydown::Rendering
 
     ALLOWED_SETTING_VALUES = {
       'accidentals' => ['manual', 'auto'],
-      'beams' => ['manual', 'auto']
+      'beams' => ['manual', 'auto'],
+      'empty_staves' => ['hide', 'show']
     }
 
     def translate
@@ -20,11 +21,12 @@ module Lydown::Rendering
       level = @event[:level] || 0
 
       unless (level > 0) || SETTING_KEYS.include?(key)
-        raise Lydown, "Invalid setting (#{key})"
+        raise LydownError, "Invalid setting (#{key})"
       end
 
       if level == 0
-        @work[key] = check_setting_value(key, value)
+        value = check_setting_value(key, value)
+        @work[key] = value
         case key
         when 'part'
           # when changing parts we repeat the last set time and key signature
@@ -55,7 +57,13 @@ module Lydown::Rendering
     end
 
     def check_setting_value(key, value)
-      if ALLOWED_SETTING_VALUES[key]
+      if key == 'key'
+        # process shorthand notation
+        if value =~ /^([a-gA-G])[\+\-]*$/
+          mode = $1.downcase == $1 ? 'minor' : 'major'
+          value = "#{value.downcase} #{mode}"
+        end
+      elsif ALLOWED_SETTING_VALUES[key]
         unless ALLOWED_SETTING_VALUES[key].include?(value)
           raise LydownError, "Invalid value for setting #{key}: #{value.inspect}"
         end

data/lib/lydown/rendering/voices.rb

@@ -0,0 +1,42 @@
+module Lydown::Rendering
+  class VoiceSelect < Base
+    def translate
+      if @event[:voice]
+        @work['process/voice_selector'] = "voice#{@event[:voice]}"
+      else
+        self.class.render_voices(@work)
+      end
+    end
+    
+    def self.render_voices(work)
+      work['process/voice_selector'] = nil
+      
+      music = Lydown::Templates.render(:multi_voice, work, part: work[:part])
+      
+      work.emit(:music, music)
+      
+      work['process/voices'].each_value do |stream|
+        if stream['lyrics']
+          stream['lyrics'].each do |voice, lyrics_stream|
+            lyrics_stream.each do |idx, content|
+              work.emit("lyrics/#{voice}/#{idx}", content)
+            end
+          end
+        end
+      end
+      
+      work['process/voices'] = nil
+    end
+    
+    VOICE_COMMANDS = {
+      'voice1' => '\voiceOne',
+      'voice2' => '\voiceTwo',
+      'voice3' => '\voiceThree',
+      'voice4' => '\voiceFour',
+    }
+    
+    def self.voice_command(voice)
+      VOICE_COMMANDS[voice]
+    end
+  end
+end

data/lib/lydown/rendering.rb

@@ -7,6 +7,8 @@ require 'lydown/rendering/music'
 require 'lydown/rendering/settings'
 require 'lydown/rendering/staff'
 require 'lydown/rendering/movement'
+require 'lydown/rendering/command'
+require 'lydown/rendering/voices'
 
 require 'yaml'
 

data/lib/lydown/templates/movement.erb

@@ -27,6 +27,15 @@
   
   <% if score_mode %>
     \score {
+      <% if self['empty_staves'] == 'hide' %>
+        \layout {
+          \context {
+            \RemoveEmptyStaffContext
+            \override VerticalAxisGroup #'remove-first = ##t
+          }
+        }      
+      <% end %>
+      
       \new StaffGroup <<
         \set StaffGroup.systemStartDelimiterHierarchy = <%= staff_hierarchy %>
   <% end %>
@@ -36,7 +45,7 @@
         \set Score.barNumberVisibility = #all-bar-numbers-visible
         \bar ""
       <% end %>
-
+      
       <% parts.each do |n, p| %>
         <%= Lydown::Templates.render(:part, self, 
           name: n, part: p, movement: movement) %>

data/lib/lydown/templates/multi_voice.erb

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

data/lib/lydown/templates/part.erb

@@ -2,8 +2,13 @@
   title = nil
   if name && (name != '')
     title = Lydown::Rendering.part_title(name)
+    voice_prefix = "#{name}_"
+  else
+    title = nil
+    voice_prefix = nil
   end
-  id = "#{title && title.gsub(' ', '')}Staff"
+  staff_id = "#{title && title.gsub(' ', '')}Staff"
+  
 
   score_mode = self['render_opts/mode'] == :score
 
@@ -18,19 +23,27 @@
 
 <<
 
-\new Staff = <%= id %> \with {
+<% if self[:tempo] %>
+  \tempo "<%= self[:tempo] %>"
+<% end %>
+
+\new Staff = <%= staff_id %> \with {
 }
 
-\context Staff = <%= id %> {
+\context Staff = <%= staff_id %> {
 <% if score_mode %>\set Staff.instrumentName = #"<%= title %>"<% end %>
   \relative c {
     <% if clef %>
         \clef "<%= clef %>"
     <% end %>
-    <%= beaming_mode %>
     <%= partial %>
-    <%= part['music'] %>
-
+    
+    <<
+      \new Voice = "<%= voice_prefix %>voice1" {
+        <%= beaming_mode %>
+        <%= part['music'] %>
+      }
+    >>
     <% if end_barline %>
       \bar "<%= end_barline %>"
     <% end %>
@@ -38,15 +51,22 @@
 }
 
   <% if part['lyrics'] %>
-    \addlyrics {
-      <%= part['lyrics'] %>
-    }
-  <% end %>
-
-  <% if part['lyrics2'] %>
-    \addlyrics {
-      <%= part['lyrics2'] %>
-    }
+    <% 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| %>
+        \new Lyrics 
+        <% if above_staff %>
+          \with { alignAboveContext = "<%= staff_id %>" }
+        <% end %>
+        {
+          \lyricsto "<%= voice_prefix %><%= voice %>" {
+            <%= part['lyrics'][voice][idx] %>
+          }
+        }
+      <% end %>
+    <% end %>
+  
   <% end %>
 
   <% if part['figures'] %>

data/lib/lydown/version.rb

@@ -1,3 +1,3 @@
 module Lydown
-  VERSION = "0.4.0"
+  VERSION = "0.6.1"
 end

data/lib/lydown/work.rb

@@ -28,6 +28,7 @@ module Lydown
       case mode
       when :work, :movement
         @context[:time] = '4/4'
+        @context[:tempo] = nil
         @context[:cadenza_mode] = nil
         @context[:key] = 'c major'
         @context[:pickup] = nil
@@ -38,6 +39,10 @@ module Lydown
       if @context['process/tuplet_mode']
         Lydown::Rendering::TupletDuration.emit_tuplet_end(self)
       end
+      
+      if @context['process/voice_selector']
+        Lydown::Rendering::VoiceSelect.render_voices(self)
+      end
 
       # reset processing variables
       @context['process'] = {
@@ -65,16 +70,20 @@ module Lydown
       reset_context(:part) unless opts[:no_reset]
     end
 
-    def emit(stream_type, *content)
-      stream = current_stream(stream_type)
+    def emit(path, *content)
+      stream = current_stream(path)
 
       content.each {|c| stream << c}
     end
 
-    def current_stream(type)
-      movement = @context[:movement]
-      part = @context[:part]
-      path = "movements/#{movement}/parts/#{part}/#{type}"
+    def current_stream(subpath)
+      if @context['process/voice_selector']
+        path = "process/voices/#{@context['process/voice_selector']}/#{subpath}"
+      else
+        movement = @context[:movement]
+        part = @context[:part]
+        path = "movements/#{movement}/parts/#{part}/#{subpath}"
+      end
       @context[path] ||= ''
     end
 
@@ -101,8 +110,11 @@ module Lydown
     def filter_context(opts = {})
       filtered = @context.deep_clone
 
-      # delete default movement if other movements are present
-      if filtered['movements'].size > 1
+      if filtered['movements'].nil? || filtered['movements'].size == 0
+        # no movements found, so no music
+        raise LydownError, "No music found"
+      elsif filtered['movements'].size > 1
+        # delete default movement if other movements are present
         filtered['movements'].delete('')
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lydown
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-27 00:00:00.000000000 Z
+date: 2015-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -43,6 +43,7 @@ files:
 - lib/lydown/parsing/nodes.rb
 - lib/lydown/rendering.rb
 - lib/lydown/rendering/base.rb
+- lib/lydown/rendering/command.rb
 - lib/lydown/rendering/comments.rb
 - lib/lydown/rendering/defaults.yml
 - lib/lydown/rendering/figures.rb
@@ -51,9 +52,11 @@ files:
 - lib/lydown/rendering/music.rb
 - lib/lydown/rendering/settings.rb
 - lib/lydown/rendering/staff.rb
+- lib/lydown/rendering/voices.rb
 - lib/lydown/templates.rb
 - lib/lydown/templates/lilypond_doc.erb
 - lib/lydown/templates/movement.erb
+- lib/lydown/templates/multi_voice.erb
 - lib/lydown/templates/part.erb
 - lib/lydown/version.rb
 - lib/lydown/work.rb