lydown 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60fcdf6a08bf0d2bcb5696459558cc363eedd69e
-  data.tar.gz: 34a2c3748611306069d495586549a0de7443d133
+  metadata.gz: c68a05810e98be2fcb3b537974fca72e8ab957ee
+  data.tar.gz: 8fb1263e28187dcb3a2a50c5d293b8f3df03adfc
 SHA512:
-  metadata.gz: 866094223b9c739569ec266c621a934eccf9d0cd11ac7eb9453d682c5532ffa3e71e9624af070333fba4854213ec26547369315f969f71b4effb95b52f7899fd
-  data.tar.gz: 640142f2131b45050bba63b9e25e2f50d5dd477947a0519c840063e4ba4c02df93a72aa8517baabb3306a898d07c47e4e36457e8074418f31bad38e0f222d583
+  metadata.gz: f3def62947a128f550444aa070c4c527452af1047adabb5d50de259a9288b518fc17deef3831e5a8c8a82a10b67b6e2f932379eb5cdf67d3b43b4fc502c4f1fa
+  data.tar.gz: 0baba95bf6967f19cddc306ea483fca59c09be0803996bc7f1b50170fd96a7de6523ae8cd32803240a9076d06992b4ba8bfbe806b5aaa449b604f6abb3984e81

data/lib/lydown/parsing/nodes.rb

@@ -275,7 +275,7 @@ module Lydown::Parsing
   module Command
     include Root
     def to_stream(stream)
-      cmd = {type: :command}
+      cmd = {type: :command, raw: text_value}
       cmd[:once] = true if text_value =~ /^\\\!/
       _to_stream(self, cmd)
       stream << cmd

data/lib/lydown/rendering/command.rb

@@ -1,10 +1,15 @@
 module Lydown::Rendering
   class Command < Base
+    include Notes
+    
     def translate
-      once = @event[:once] ? '\once ' : ''
-      
-      cmd = "#{once}\\#{@event[:key]} #{(@event[:arguments] || []).join(' ')} "
-      @work.emit(:music, cmd)
+      if @work['process/duration_macro']
+        add_macro_event(@event[:raw])
+      else
+        once = @event[:once] ? '\once ' : ''
+        cmd = "#{once}\\#{@event[:key]} #{(@event[:arguments] || []).join(' ')} "
+        @work.emit(:music, cmd)
+      end
     end
   end
 end

data/lib/lydown/rendering/defaults.yml

@@ -123,6 +123,9 @@ parts:
   viola-da-gamba2:
     clef: bass
     midi_instrument: viola
+  gamba:
+    clef: alto
+    midi_instrument: viola
   gamba1:
     clef: alto
     midi_instrument: viola
@@ -174,11 +177,11 @@ parts:
     midi_instrument: flute
 score:
   order:
-    - [flauto1, flauto2, flauto3, flute1, flute2, flute3]
-    - [oboe1, oboe2, oboe3]
-    - [violino1, violino2, violino3, violin1, violin2, violin3]
+    - [flute, flauto1, flauto2, flauto3, flute1, flute2, flute3]
+    - [oboe, oboe1, oboe2, oboe3]
+    - [violino, violino1, violino2, violino3, violin1, violin2, violin3]
     - viola
-    - [gamba1, gamba2]
+    - [gamba, gamba1, gamba2]
     - [soprano, alto, tenore, basso]
     - [soprano1, alto1, tenore1, basso1]
     - [soprano2, alto2, tenore2, basso2]

data/lib/lydown/rendering/lib.ly

@@ -0,0 +1,32 @@
+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 }
+}

data/lib/lydown/rendering/music.rb

@@ -9,6 +9,8 @@ module Lydown::Rendering
 
   class Duration < Base
     def translate
+      Notes.cleanup_duration_macro(@work)
+
       # close tuplet braces
       if @work['process/tuplet_mode']
         TupletDuration.emit_tuplet_end(@work)
@@ -39,6 +41,8 @@ module Lydown::Rendering
     end
 
     def translate
+      Notes.cleanup_duration_macro(@work)
+
       # close tuplet braces
       if @work['process/tuplet_mode']
         TupletDuration.emit_tuplet_end(@work)
@@ -226,6 +230,8 @@ module Lydown::Rendering
 
   class DurationMacro < Base
     def translate
+      Notes.cleanup_duration_macro(@work)
+      
       if @event[:macro] =~ /^[a-zA-Z_]/
         macro = @work['macros'][@event[:macro]]
         if macro

data/lib/lydown/rendering/notes.rb

@@ -217,7 +217,7 @@ EOF
         event[:head], event[:octave], event[:accidental_flag],
         lydown_phrasing_close(event),
         event[:figures] ? "<#{event[:figures].join}>" : '',
-        event[:expressions] ? event[:expressions].join : ''
+        event[:expressions] ? event[:expressions].join + ' ' : ''
       ]
 
       # replace place holder and repeaters in macro group with actual note
@@ -233,16 +233,47 @@ EOF
 
       # if group is complete, compile it just like regular code
       unless @work['process/macro_group'].include?('_')
-        # stash macro, in order to compile macro group
+        code = LydownParser.parse(@work['process/macro_group'])
+
+        # stash macro
         macro = @work['process/duration_macro']
         @work['process/duration_macro'] = nil
+        @work['process/macro_group'] = nil
 
-        code = LydownParser.parse(@work['process/macro_group'])
         @work.process(code, no_reset: true)
 
         # restore macro
         @work['process/duration_macro'] = macro
-        @work['process/macro_group'] = nil
+      end
+    end
+    
+    # emits the current macro group up to the first placeholder character.
+    # this method is called 
+    def self.cleanup_duration_macro(work)
+      return unless work['process/macro_group']
+      
+      # truncate macro group up until first placeholder
+      group = work['process/macro_group'].sub(/_.*$/, '')
+      
+      # stash macro, in order to compile macro group
+      macro = work['process/duration_macro']
+      work['process/duration_macro'] = nil
+      work['process/macro_group'] = nil
+
+      code = LydownParser.parse(group)
+      work.process(code, no_reset: true)
+
+      # restore macro
+      work['process/duration_macro'] = macro
+    end
+    
+    def add_macro_event(code)
+      case @work['process/macro_group']
+      when nil
+        @work['process/macro_group'] = @work['process/duration_macro'].clone
+        @work['process/macro_group'].insert(0, " #{code} ")
+      when /_/
+        @work['process/macro_group'].sub!(/([_∞])/, " #{code} \\0")
       end
     end
 

data/lib/lydown/rendering/settings.rb

@@ -1,5 +1,7 @@
 module Lydown::Rendering
   class Setting < Base
+    include Notes
+    
     SETTING_KEYS = [
       'key', 'time', 'pickup', 'clef', 'part', 'movement', 'tempo',
       'accidentals', 'beams', 'end_barline', 'macros', 'empty_staves'
@@ -16,6 +18,11 @@ module Lydown::Rendering
     }
 
     def translate
+      # if setting while doing a macro, insert it into the current macro group
+      if @work['process/duration_macro'] && @event[:raw]
+        return add_macro_event(@event[:raw])
+      end
+      
       key = @event[:key]
       value = @event[:value]
       level = @event[:level] || 0

data/lib/lydown/rendering.rb

@@ -45,4 +45,6 @@ module Lydown::Rendering
       @idx = idx
     end
   end
-end
+end
+
+LY_LIB_DIR = File.join(File.dirname(__FILE__), 'rendering')

data/lib/lydown/templates/lilypond_doc.erb

@@ -1,5 +1,9 @@
 \version "2.18.2"
 
+<% unless self['render_opts']['no_lib'] %>
+\include "<%= File.join(LY_LIB_DIR, 'lib.ly') %>"
+<% end %>
+
 <% if self['layout'] %>
 \layout {
 }

data/lib/lydown/version.rb

@@ -1,3 +1,3 @@
 module Lydown
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

data/lib/lydown/work.rb

@@ -48,6 +48,8 @@ module Lydown
       if @context['process/voice_selector']
         Lydown::Rendering::VoiceSelect.render_voices(self)
       end
+      
+      Lydown::Rendering::Notes.cleanup_duration_macro(self)
 
       # reset processing variables
       @context['process'] = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lydown
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-22 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: treetop
@@ -47,6 +47,7 @@ files:
 - lib/lydown/rendering/comments.rb
 - lib/lydown/rendering/defaults.yml
 - lib/lydown/rendering/figures.rb
+- lib/lydown/rendering/lib.ly
 - lib/lydown/rendering/lyrics.rb
 - lib/lydown/rendering/movement.rb
 - lib/lydown/rendering/music.rb