gly 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c2057f1f3a833d1b6bb382573386d7519fd1f83a
-  data.tar.gz: 2c770e056bc7c3c0a6a7aeb689a9888615334f17
+  metadata.gz: 3a2ffe57b4f0e19ec4b23c18288c6ebc3f72409d
+  data.tar.gz: 0f12ea9c6bb6d325e3b988c78229ffad8bc38a03
 SHA512:
-  metadata.gz: 6860d75f1e55af109e10535f76b404d074b6bc9bafad0b13784f98ca706f448705a1116216598052b364802e6c7e3b3b4dde87557d5926d13417dbb69ab488ba
-  data.tar.gz: fd1df56ea96ca42c779086e8b495fcb4da4dddeb77fa13a87238506dd5044802f9486ba220a617efef925671fee73afa7cb98f620ea9f508c7df70c0a7df0180
+  metadata.gz: ea90186703af9c3aa87388f876ef6e7332d7b78ef9babd564a28fa04318051a0b418b705eb5a5f7cda2bd8e8ea22a6e8cda7162b9be7d4f3baccf72a67b3c20e
+  data.tar.gz: 03ebc311afc420dfbebe8bd808c72be8884c3140fde9d802ccfdb8c33525efae27f3fa53203d959963b6c78cad331f56948bd422624953a332b8d3911f1a8a04

data/lib/gly.rb

@@ -1,13 +1,16 @@
 module Gly; end
 
 %w(parser
+exceptions
 gabc_convertor
-parsed_score
+score
 headers
 lyrics
+markup
 document
 document_gabc_convertor
 document_ly_convertor
+gly_convertor
 preview_generator
 preview_builder
 lister

data/lib/gly/cli.rb

@@ -15,6 +15,8 @@ module Gly
       files.each do |f|
         DocumentGabcConvertor.new(parser.parse(f)).convert
       end
+    rescue Gly::Exception => ex
+      error_exit! ex
     end
 
     desc 'preview FILE ...', 'convert to gabc AND generate pdf preview'
@@ -24,19 +26,42 @@ module Gly
     option :template, aliases: :t, banner: 'use custom document template'
     def preview(*files)
       tpl = nil
-      tpl = File.read(options[:template]) if options[:template]
+      if options[:template]
+        begin
+          tpl = File.read(options[:template])
+        rescue Errno::ENOENT
+          raise Gly::Exception.new("File not found: '#{options[:template]}'")
+        end
+      end
+
+      # convert HashWithIndifferentAccess to Hash
+      # with Symbol keys - options.to_h would make Hash
+      # with String keys
+      opts = options.each_pair.collect {|k,v| [k.to_sym,v]}.to_h
 
-      opts = options.to_h
       opts[:suffix_always] = true
 
       files.each do |f|
         gen = PreviewGenerator.new template: tpl, options: opts
-        gen.process(parser.parse(f))
+        begin
+          gen.process(parser.parse(f))
+        rescue Errno::ENOENT
+          with_extension = f + '.gly'
+          if File.exist? with_extension
+            gen.process(parser.parse(with_extension))
+          else
+            raise Gly::Exception.new("File not found: '#{f}'")
+          end
+        end
       end
+
+    rescue Gly::Exception => ex
+      error_exit! ex
     end
 
     desc 'list FILE ...', 'list scores contained in files'
     option :recursive, type: :boolean, aliases: :r, banner: 'recursively traverse directories', default: false
+    option :format, type: :string, aliases: :f, banner: 'grep|overview'
     def list(*files)
       if files.empty?
         STDERR.puts 'No file specified.'
@@ -54,22 +79,48 @@ module Gly
         files.flatten!
       end
 
-      lister = Lister.new(files)
+      lister = Lister.new(files, options[:format])
       lister.list(STDOUT, STDERR)
 
       exit(lister.error? ? 1 : 0)
+    rescue Gly::Exception => ex
+      error_exit! ex
     end
 
     desc 'ly FILE ...', 'transform gly document to lilypond document'
     def ly(*files)
-      unless defined? LilypondConvertor
-        STDERR.puts "'lygre' gem not found. Please, install lygre in order to run 'gly ly'."
-        exit 1
-      end
+      check_lygre_available!
 
       files.each do |f|
         DocumentLyConvertor.new(parser.parse(f)).convert
       end
+
+    rescue Gly::Exception => ex
+      error_exit! ex
+    end
+
+    desc 'fy FILE ...', 'transform gabc to gly'
+    def fy(*files)
+      check_lygre_available!
+
+      files.each_with_index do |f,i|
+        input = File.read f
+
+        parser = GabcParser.new
+        result = parser.parse(input)
+
+        if result then
+          puts if i >= 1
+          GlyConvertor.new.convert result.create_score, STDOUT
+        else
+          STDERR.puts 'glyfy considers the input invalid gabc:'
+          STDERR.puts
+          STDERR.puts "'#{parser.failure_reason}' on line #{parser.failure_line} column #{parser.failure_column}:"
+          STDERR.puts input.split("\n")[parser.failure_line-1]
+          STDERR.puts (" " * parser.failure_column) + "^"
+          return false
+        end
+      end
     end
 
     private
@@ -78,6 +129,13 @@ module Gly
       Parser.new options[:separator]
     end
 
+    def check_lygre_available!
+      unless defined? LilypondConvertor
+        STDERR.puts "'lygre' gem not found. Please, install lygre in order to run 'gly ly'."
+        exit 1
+      end
+    end
+
     class << self
       # override Thor's default handler
       def handle_no_command_error(command, has_namespace=$thor_runner)
@@ -88,5 +146,10 @@ module Gly
         end
       end
     end
+
+    def error_exit!(exception)
+      STDERR.puts 'ERROR: ' + exception.message
+      exit 1
+    end
   end
 end

data/lib/gly/document.rb

@@ -5,24 +5,36 @@ module Gly
   class Document
     def initialize
       @scores = []
+      @content = []
       @scores_by_id = {}
       @header = Headers.new
       @path = nil
     end
 
-    attr_reader :scores, :header
+    # only Scores
+    attr_reader :scores
+
+    # Scores and Markups
+    attr_reader :content
+
+    attr_reader :header
     attr_accessor :path
 
+    # append a new Score (or Markup)
     def <<(score)
-      @scores << score
+      @content << score
 
-      sid = score.headers['id']
-      if sid
-        if @scores_by_id.has_key? sid
-          raise ArgumentError.new("More than one score with id '#{sid}'.")
-        end
+      if score.is_a? Score
+        @scores << score
 
-        @scores_by_id[sid] = score
+        sid = score.headers['id']
+        if sid
+          if @scores_by_id.has_key? sid
+            raise ArgumentError.new("More than one score with id '#{sid}'.")
+          end
+
+          @scores_by_id[sid] = score
+        end
       end
 
       self

data/lib/gly/document_gabc_convertor.rb

@@ -17,14 +17,18 @@ module Gly
     # iterates over document scores,
     # yields score and filename of it's generated gabc file
     def each_score_with_gabcname
+      return to_enum(:each_score_with_gabcname) unless block_given?
+
       @doc.scores.each_with_index do |score, si|
-        yield score, output_fname(score, si)
+        gabc = gabc_fname(score, si)
+        gtex = gtex_fname(score, si)
+        yield score, gabc, gtex
       end
     end
 
     private
 
-    def output_fname(score, score_index=nil)
+    def gabc_fname(score, score_index=nil)
       if @doc.scores.size == 1 && !@options[:suffix_always]
         score_id = ''
       else
@@ -34,5 +38,9 @@ module Gly
       File.basename(@doc.path)
         .sub(/\.gly\Z/i, "#{score_id}.gabc")
     end
+
+    def gtex_fname(score, score_index=nil)
+      gabc_fname(score, score_index).sub('.gabc', '.gtex')
+    end
   end
 end

data/lib/gly/exceptions.rb

@@ -0,0 +1,16 @@
+module Gly
+  # general application-specific error
+  class Exception < StandardError
+    def self.wrap(exception)
+      e = new exception.message
+      e.wrapped_exception = exception
+      e
+    end
+
+    # may be nil
+    attr_accessor :wrapped_exception
+  end
+
+  # error when parsing gly input file
+  class ParseError < Exception; end
+end

data/lib/gly/exceptions.rb~

@@ -0,0 +1,3 @@
+module Gly
+  class Exception < StandardError; end
+end

data/lib/gly/gabc_convertor.rb

@@ -1,7 +1,7 @@
 require 'stringio'
 
 module Gly
-  # takes ParsedScore, translates it to gabc
+  # takes Score, translates it to gabc
   class GabcConvertor
     def convert(score, out=StringIO.new)
       score.headers.each_pair do |key,value|
@@ -12,43 +12,61 @@ module Gly
       out.puts '%%'
 
       lyric_enum = score.lyrics.each_syllable.to_enum
+
       score.music.each_with_index do |mus_chunk,i|
         begin
           next_syl = lyric_enum.peek
+          out.print lyric_enum.next if next_syl == ' '
         rescue StopIteration
           next_syl = ''
-        end
+        end until next_syl != ' '
 
-        if clef?(mus_chunk) ||
-           (nonlyrical_chunk?(mus_chunk) && ! nonlyrical_lyrics?(next_syl))
-          # music chunk normally not having lyrics
-          out.print ' ' if i != 0
+        if no_lyrics? mus_chunk, next_syl
+          if i == score.music.size - 1
+            out.print ' '
+          end
         else
           # regular music chunk
           begin
             out.print strip_directives lyric_enum.next
           rescue StopIteration
-            out.print ' ' if i != 0
+            out.print ' ' if i > 0 # don't add space at the very beginning
           end
         end
+
         out.print "(#{mus_chunk})"
-        # out.puts if differentia?(mus_chunk) # newline after each differentia
+        if no_lyrics?(mus_chunk, next_syl) &&
+           i != (score.music.size - 1) &&
+           ! score.lyrics.empty?
+          out.print ' '
+        end
       end
 
       return out
     end
 
+    def no_lyrics?(music_chunk, syllable)
+      clef?(music_chunk) ||
+        (nonlyrical_chunk?(music_chunk) &&
+         ! nonlyrical_lyrics?(syllable))
+    end
+
     def clef?(chunk)
       chunk =~ /\A[cf][1-4]\Z/
     end
 
-    def differentia?(chunk)
-      chunk =~ /\A*[,;:`]+\Z/ # differentia
+    def without_differentiae(chunk)
+      chunk.gsub /(([,`])|(:[:']?)|(;[1-6]?))/, ''
+    end
+
+    def without_breaks(chunk)
+      chunk.gsub /[zZ]/, ''
     end
 
     # is the given music chunk capable of bearing lyrics?
     def nonlyrical_chunk?(chunk)
-      differentia? chunk
+      chunk.size > 0 &&
+        without_breaks(without_differentiae(chunk)).empty?
     end
 
     def nonlyrical_lyrics?(syl)

data/lib/gly/gly_convertor.rb

@@ -0,0 +1,52 @@
+require 'delegate'
+
+module Gly
+  # converts gabc to gly
+  class GlyConvertor
+    # score - GabcScore (from the lygre gem)
+    def convert(score, output_stream=StringIO.new)
+      out = NonemptyPrinter.new output_stream
+      out.puts '\score'
+      out.puts header score
+      out.puts music score
+      out.puts lyrics score
+      out
+    end
+
+    def header(score)
+      score.header.each_pair.collect do |key,value|
+        "#{key}: #{value}"
+      end.join "\n"
+    end
+
+    def music(score)
+      score.music.words.collect do |word|
+        word.each_syllable.collect do |syl|
+          syl = syl.notes.collect(&:text_value).join ''
+          if syl.include? ' ' || syl.empty?
+            syl = "(#{syl})"
+          end
+          syl
+        end.join ' '
+      end.flatten.join ' '
+    end
+
+    def lyrics(score)
+      score.music.words
+        .collect {|w| word w }
+        .select {|w_str| ! w_str.empty? }
+        .join(' ')
+    end
+
+    def word(word)
+      word.each_syllable.collect {|s| s.lyrics }.join ' -- '
+    end
+  end
+
+  class NonemptyPrinter < SimpleDelegator
+    def puts(what)
+      return if what.nil? || what.empty?
+      super(what)
+    end
+  end
+end

data/lib/gly/gly_convertor.rb~

@@ -0,0 +1,11 @@
+module Gly
+  # converts gabc to gly
+  class GlyConvertor
+    # score - GabcScore (from the lygre gem)
+    def convert(score, out=StringIO.new)
+      out.puts '\header'
+      
+      out
+    end
+  end
+end

data/lib/gly/glyfy_cli.rb~

@@ -0,0 +1,92 @@
+require 'thor'
+
+begin
+  require 'grely'
+rescue LoadError
+end
+
+module Gly
+  # implements the 'gly' executable
+  class CLI < Thor
+    class_option :separator, aliases: :s, banner: 'syllable separator (default is double dash "--")'
+
+    desc 'gabc FILE ...', 'convert gly to gabc'
+    def gabc(*files)
+      files.each do |f|
+        DocumentGabcConvertor.new(parser.parse(f)).convert
+      end
+    end
+
+    desc 'preview FILE ...', 'convert to gabc AND generate pdf preview'
+    option :no_build, type: :boolean, aliases: :B, banner: 'only generate preview assets, don\'t compile them'
+    option :no_document, type: :boolean, aliases: :D, banner: 'produce main LaTeX file without document definition; in this case --no-build is applied automatically'
+    option :full_headers, type: :boolean, aliases: :h, banner: 'include full document and score headers'
+    option :template, aliases: :t, banner: 'use custom document template'
+    def preview(*files)
+      tpl = nil
+      tpl = File.read(options[:template]) if options[:template]
+
+      opts = options.to_h
+      opts[:suffix_always] = true
+
+      files.each do |f|
+        gen = PreviewGenerator.new template: tpl, options: opts
+        gen.process(parser.parse(f))
+      end
+    end
+
+    desc 'list FILE ...', 'list scores contained in files'
+    option :recursive, type: :boolean, aliases: :r, banner: 'recursively traverse directories', default: false
+    def list(*files)
+      if files.empty?
+        STDERR.puts 'No file specified.'
+        exit 1
+      end
+
+      if options[:recursive]
+        files = files.collect do |f|
+          if File.directory?(f)
+            Dir[File.join(f, '**/*.gly')]
+          else
+            f
+          end
+        end
+        files.flatten!
+      end
+
+      lister = Lister.new(files)
+      lister.list(STDOUT, STDERR)
+
+      exit(lister.error? ? 1 : 0)
+    end
+
+    desc 'ly FILE ...', 'transform gly document to lilypond document'
+    def ly(*files)
+      unless defined? LilypondConvertor
+        STDERR.puts "'lygre' gem not found. Please, install lygre in order to run 'gly ly'."
+        exit 1
+      end
+
+      files.each do |f|
+        DocumentLyConvertor.new(parser.parse(f)).convert
+      end
+    end
+
+    private
+
+    def parser
+      Parser.new options[:separator]
+    end
+
+    class << self
+      # override Thor's default handler
+      def handle_no_command_error(command, has_namespace=$thor_runner)
+        if has_namespace
+          fail Thor::UndefinedCommandError, "Could not find command #{command.inspect} in #{namespace.inspect} namespace."
+        else
+          fail Thor::UndefinedCommandError, "Could not find command #{command.inspect}. Did you mean 'gly preview #{command}' ?"
+        end
+      end
+    end
+  end
+end