gly 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1be7280dd39aa6117888f6779c409359202d8bb
-  data.tar.gz: b5bc60c05106a3472b4fa296cc0787f1c804ab8f
+  metadata.gz: c2057f1f3a833d1b6bb382573386d7519fd1f83a
+  data.tar.gz: 2c770e056bc7c3c0a6a7aeb689a9888615334f17
 SHA512:
-  metadata.gz: d695541f34baae56918b864e062387426889b55dbed9e1636688157c1b4eadec906556be053de0b4da8f3a588c1fe415a12104ae844a5045471bfd91dfcec32c
-  data.tar.gz: 8aab9514701279b9e4ab1f00282e323902924c5f9b38fcf2ab1aa2fd9e534759a8a62220a38fa72d08ec0711eb78fb78c499760b97ea901458bcf93c326d7415
+  metadata.gz: 6860d75f1e55af109e10535f76b404d074b6bc9bafad0b13784f98ca706f448705a1116216598052b364802e6c7e3b3b4dde87557d5926d13417dbb69ab488ba
+  data.tar.gz: fd1df56ea96ca42c779086e8b495fcb4da4dddeb77fa13a87238506dd5044802f9486ba220a617efef925671fee73afa7cb98f620ea9f508c7df70c0a7df0180

data/lib/gly.rb

@@ -7,7 +7,9 @@ headers
 lyrics
 document
 document_gabc_convertor
+document_ly_convertor
 preview_generator
+preview_builder
 lister
 string_helpers).each do |mod|
   require "gly/#{mod}"

data/lib/gly/cli.rb

@@ -1,16 +1,38 @@
 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 {|f| DocumentGabcConvertor.new(Parser.new.parse(f)).convert }
+      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)
-      files.each {|f| PreviewGenerator.new.process(Parser.new.parse(f)) }
+      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'
@@ -37,5 +59,34 @@ module Gly
 
       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

data/lib/gly/document.rb

@@ -5,11 +5,35 @@ module Gly
   class Document
     def initialize
       @scores = []
+      @scores_by_id = {}
       @header = Headers.new
       @path = nil
     end
 
     attr_reader :scores, :header
     attr_accessor :path
+
+    def <<(score)
+      @scores << 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
+
+      self
+    end
+
+    def [](key)
+      if key.is_a? Integer
+        @scores[key]
+      else
+        @scores_by_id[key]
+      end
+    end
   end
 end

data/lib/gly/document_gabc_convertor.rb

@@ -1,7 +1,8 @@
 module Gly
   class DocumentGabcConvertor
-    def initialize(document)
+    def initialize(document, **options)
       @doc = document
+      @options = options
     end
 
     def convert
@@ -24,8 +25,11 @@ module Gly
     private
 
     def output_fname(score, score_index=nil)
-      score_id = score.headers['id'] || score_index.to_s
-      score_id = '_' + score_id unless score_id.empty?
+      if @doc.scores.size == 1 && !@options[:suffix_always]
+        score_id = ''
+      else
+        score_id = '_' + (score.headers['id'] || score_index.to_s)
+      end
 
       File.basename(@doc.path)
         .sub(/\.gly\Z/i, "#{score_id}.gabc")

data/lib/gly/document_ly_convertor.rb

@@ -0,0 +1,58 @@
+require 'stringio'
+
+module Gly
+  # Converts gly to modern-notation LilyPond
+  #
+  # expects the 'lygre' gem
+  # (which is only an optional dependency of gly)
+  class DocumentLyConvertor
+    def initialize(document)
+      @doc = document
+    end
+
+    def convert
+      gabcor = GabcConvertor.new
+      parser = GabcParser.new
+      lilyor = LilypondConvertor.new cadenza: true, version: false
+
+      ly_output = StringIO.new
+
+      ly_output.puts '\version "2.18.0"'
+      ly_output.puts
+      ly_output.puts header @doc.header
+      ly_output.puts
+      ly_output.puts default_style
+      ly_output.puts
+
+      @doc.scores.each do |score|
+        gabc = gabcor.convert(score).string
+        parsed_score = parser.parse gabc
+        begin
+          ly_output.puts lilyor.convert parsed_score.create_score
+        rescue NoMethodError
+          ly_output.puts "\\markup{error processing score \\italic{#{score.lyrics.readable}}}"
+        end
+
+        ly_output.puts
+      end
+
+      out_fname = File.basename(@doc.path) + '.ly'
+      File.open(out_fname, 'w') do |fw|
+        fw.puts ly_output.string
+      end
+    end
+
+    private
+
+    def header(h)
+      fields = h.each_pair.collect do |k,v|
+        "  #{k} = \"#{v}\""
+      end
+      "\\header {\n#{fields.join("\n")}\n}\n"
+    end
+
+    def default_style
+      '\layout { \context Score \override TimeSignature #\'stencil = ##f }'
+    end
+  end
+end

data/lib/gly/document_ly_convertor.rb~

@@ -0,0 +1,37 @@
+module Gly
+  class DocumentLyConvertor < DocumentGabcConvertor
+    def initialize(document)
+      @doc = document
+    end
+
+    def convert
+      each_score_with_gabcname do |score, out_fname|
+        File.open(out_fname, 'w') do |fw|
+          GabcConvertor.new.convert score, fw
+        end
+        yield score, out_fname if block_given?
+      end
+    end
+
+    # iterates over document scores,
+    # yields score and filename of it's generated gabc file
+    def each_score_with_gabcname
+      @doc.scores.each_with_index do |score, si|
+        yield score, output_fname(score, si)
+      end
+    end
+
+    private
+
+    def output_fname(score, score_index=nil)
+      if @doc.scores.size == 1
+        score_id = ''
+      else
+        score_id = '_' + (score.headers['id'] || score_index.to_s)
+      end
+
+      File.basename(@doc.path)
+        .sub(/\.gly\Z/i, "#{score_id}.gabc")
+    end
+  end
+end

data/lib/gly/options.rb~

@@ -0,0 +1,15 @@
+require 'forwardable'
+
+module Gly
+  # wraps the options Hash provided by Thor,
+  # adds querying methods
+  class Options
+    extend Forwardable
+    
+    def initialize(opts)
+      @opts = opts
+    end
+
+    
+  end
+end

data/lib/gly/parser.rb

@@ -3,8 +3,8 @@ require 'stringio'
 module Gly
   # parses gly source
   class Parser
-    def initialize(syllable_separator='--')
-      @syllable_separator = syllable_separator
+    def initialize(syllable_separator=nil)
+      @syllable_separator = syllable_separator || '--'
     end
 
     def parse(source)
@@ -28,7 +28,7 @@ module Gly
     end
 
     def parse_str(str)
-      parse_io(StringIO.new(source))
+      parse_io(StringIO.new(str))
     end
 
     def parse_io(io)
@@ -52,6 +52,10 @@ module Gly
           @score = @doc.header
         elsif header_line? line
           parse_header line
+        elsif explicit_lyrics? line
+          parse_lyrics line
+        elsif explicit_music? line
+          parse_music line
         elsif lyrics_line? line
           parse_lyrics line
         else
@@ -88,8 +92,18 @@ module Gly
 
     EXPLICIT_LYRICS_RE = /\A\\l(yrics)?\s+/
 
+    def explicit_lyrics?(str)
+      str =~ EXPLICIT_LYRICS_RE
+    end
+
+    EXPLICIT_MUSIC_RE = /\A\\m(usic)?\s+/
+
+    def explicit_music?(str)
+      str =~ EXPLICIT_MUSIC_RE
+    end
+
     def lyrics_line?(str)
-      str =~ EXPLICIT_LYRICS_RE || str.include?(@syllable_separator) || contains_unmusical_letters?(str)
+      !contains_square_brackets?(str) && (str.include?(@syllable_separator) || contains_unmusical_letters?(str))
     end
 
     def in_header_block?
@@ -98,7 +112,11 @@ module Gly
 
     def contains_unmusical_letters?(str)
       letters = str.gsub(/[\W\d_]+/, '')
-      letters !~ /\A[a-mvwoxz]*\Z/i # incomplete gabc music letters!
+      letters !~ /\A[a-morsvwxz]*\Z/i # incomplete gabc music letters!
+    end
+
+    def contains_square_brackets?(str)
+      str.include? '['
     end
 
     def parse_header(str)
@@ -118,6 +136,8 @@ module Gly
     end
 
     def parse_music(str)
+      str = str.sub(EXPLICIT_MUSIC_RE, '')
+
       # music chunks: split by whitespace out of brackets
       StringHelpers.music_split(str).each do |chunk|
         @score.music << chunk
@@ -126,7 +146,7 @@ module Gly
 
     def push_score
       if @score.is_a?(ParsedScore) && !@score.empty?
-        @doc.scores << @score
+        @doc << @score
       end
     end
   end

data/lib/gly/preview_builder.rb

@@ -0,0 +1,38 @@
+module Gly
+  # *builds* the pdf preview from assets prepared
+  # by PreviewGenerator
+  class PreviewBuilder
+    def initialize
+      @gabcs = []
+      @main_tex = nil
+    end
+
+    def add_gabc(path)
+      @gabcs << path
+    end
+
+    attr_accessor :main_tex
+
+    def build
+      @gabcs.each do |g|
+        exec 'gregorio', g
+      end
+
+      exec 'lualatex', @main_tex
+    end
+
+    private
+
+    def exec(progname, *args)
+      ok = system progname, *args
+      unless ok
+        case $?.exitstatus
+        when 127
+          STDERR.puts "'#{progname}' is required for this gly command to work, but it was not found. Please, ensure that '#{progname}' is installed in one of the directories listed in your PATH and try again."
+        else
+          STDERR.puts "'#{progname}' exited with exit code #{$?.to_i}. Let's continue and see what happens ..."
+        end
+      end
+    end
+  end
+end

data/lib/gly/preview_builder.rb~

@@ -0,0 +1,38 @@
+module Gly
+  # *builds* the pdf preview from assets prepared
+  # by PreviewGenerator
+  class PreviewBuilder
+    def initialize
+      @gabcs = []
+      @main_tex = nil
+    end
+    
+    def add_gabc(path)
+      @gabcs << path
+    end
+
+    attr_writer :main_tex
+
+    def build
+      @gabcs.each do |g|
+        exec 'gregorio', g
+      end
+
+      exec 'lualatex', @main_tex
+    end
+    
+    private
+    
+    def exec(progname, *args)
+      ok = system progname, *args
+      unless ok
+        case $?.exitstatus
+        when 127
+          STDERR.puts "'#{progname}' is required for this gly command to work, but it was not found. Please, ensure that '#{progname}' is installed in one of the directories listed in your PATH and try again."
+        else
+          STDERR.puts "'#{progname}' exited with exit code #{$?.to_i}. Let's continue and see what happens ..."
+        end
+      end
+    end
+  end
+end

data/lib/gly/preview_generator.rb

@@ -4,18 +4,38 @@ module Gly
   # Takes Gly::Document, builds a pdf preview
   # (or at least generates all necessary assets)
   class PreviewGenerator
+    def initialize(**options)
+      @preview_dest = nil
+
+      @template = options.delete(:template) || default_template
+      @builder = options.delete(:builder) || PreviewBuilder.new
+      @options = options.delete(:options) || {}
+    end
+
+    # IO to which the main LaTeX document should be written.
+    # If not set, a file will be created with name based on
+    # the source file name.
+    attr_accessor :preview_dest
+
     def process(document)
-      tpl_name = File.join(File.dirname(__FILE__), 'templates/lualatex_document.tex')
-      template = File.read(tpl_name)
+      convertor = DocumentGabcConvertor.new(document, **@options)
+      convertor.convert
 
       doc_body = fw = StringIO.new
 
-      convertor = DocumentGabcConvertor.new(document)
+      if @options[:full_headers]
+        fw.puts header_table document.header
+      end
+
       convertor.each_score_with_gabcname do |score, gabc_fname|
-        system "gregorio #{gabc_fname}"
+        @builder.add_gabc gabc_fname
+
+        if @options[:full_headers]
+          fw.puts header_table score.headers
+        end
+
         gtex_fname = gabc_fname.sub /\.gabc/i, ''
-        piece_title = %w(book manuscript arranger author).collect do |m|
-          score.headers[m]
+        piece_title = %w(book manuscript arranger author).collect do |m|          score.headers[m]
         end.delete_if(&:nil?).join ', '
         fw.puts "\\commentary{\\footnotesize{#{piece_title}}}\n" unless piece_title.empty?
 
@@ -30,19 +50,70 @@ module Gly
         fw.puts "\\includescore{#{gtex_fname}}\n\\vspace{1cm}"
       end
 
-      replacements = {
-        title: document.header['title'],
-        maketitle: (document.header['title'] && '\maketitle'),
-        body: doc_body.string
-      }
-      tex = template % replacements
+      if @options['no_document']
+        tex = doc_body.string
+      else
+        replacements = {
+          glyvars: header_variables(document.header),
+          body: doc_body.string
+        }
+        tex = @template % replacements
+      end
+
+      with_preview_io(document.path) do |fw|
+        @builder.main_tex = fw.path if fw.respond_to? :path
 
-      out_fname = File.basename(document.path).sub(/\.gly\Z/i, '.tex')
-      File.open(out_fname, 'w') do |fw|
         fw.puts tex
       end
 
-      system "lualatex #{out_fname}"
+      build_disabled = @options['no_build'] || @options['no_document']
+      if @builder.main_tex && !build_disabled
+        @builder.build
+      end
+    end
+
+    private
+
+    def with_preview_io(src_name)
+      if @preview_dest
+        yield @preview_dest
+        return
+      end
+
+      File.open(preview_fname(src_name), 'w') do |fw|
+        yield fw
+      end
+    end
+
+    def preview_fname(src_name)
+      File.basename(src_name).sub(/\.gly\Z/i, '.tex')
+    end
+
+    def default_template
+      File.read(File.join(File.dirname(__FILE__), 'templates/lualatex_document.tex'))
+    end
+
+    # full header of a score/file as table
+    def header_table(header)
+      return '' if header.empty?
+
+      cols = header.each_pair.collect {|k,v| "#{k} & #{v} \\\\" }
+
+      "\\begin{tabular}{ | r | l | } \\hline %s \\hline \\end{tabular}\n\n" % cols.join("\\hline\n")
+    end
+
+    # transforms header to LaTeX command definitions
+    def header_variables(header)
+      header.each_pair.collect do |k,v|
+        '\newcommand{\%s}{%s}' % [latex_cmd_name(k), v]
+      end.join("\n")
+    end
+
+    def latex_cmd_name(header_name)
+      sanitized = header_name
+                  .gsub(/\s+/, '')
+                  .gsub(/[-_]+(\w)/) {|m| m[1].upcase }
+      prefixed = 'gly' + sanitized[0].upcase + sanitized[1..-1]
     end
   end
 end

data/lib/gly/templates/lualatex_document.tex

@@ -5,23 +5,47 @@
 \usepackage[left=2cm, right=2cm, top=2cm, bottom=2cm]{geometry}
 
 \usepackage{fontspec}
+\usepackage[hidelinks]{hyperref}
+\usepackage{etoolbox}
 
 %% for gregorio
 \usepackage{luatextra}
 \usepackage{graphicx}
 \usepackage{gregoriotex}
 
-\title{%{title}}
+%{glyvars}
+
+%% header fields like title, transcription-date etc.
+%% are translated by 'gly preview' to latex commands like
+%% \glyTitle \glyTranscriptionDate etc.
+%% (All of your document header fields are handled this way.)
+%% These commands can be used for various purposes,
+%% but we will use them only to assemble document title:
+\newcommand{\glyPreviewTitle}{
+  \begin{center}
+    \ifdef{\glyTitle}{{\huge \glyTitle}}{}
+
+    \ifdef{\glyAuthor}{\emph{\glyAuthor}}{}
+
+    \ifdef{\glyYear}{\glyYear}{}
+
+    \vspace{6mm}
+  \end{center}
+}
+
+\newcommand{\glyPreviewTagline}{
+  \begin{center}
+    \texttt{\href{https://github.com/igneus/gly}{gly preview} \today}
+  \end{center}
+}
 
 \begin{document}
 
-%{maketitle}
+\glyPreviewTitle
 
 %{body}
 
 %% tagline
 \vfill
-\begin{center}
-  \texttt{gly preview https://github.com/igneus/gly}
-\end{center}
+\glyPreviewTagline
 \end{document}

data/tests/examples/gly/expected/explicit_music.gabc

@@ -0,0 +1,2 @@
+%%
+(č) (ř) (š)

data/tests/examples/gly/expected/explicit_music.gabc~

@@ -0,0 +1 @@
+\music č ř š

data/tests/examples/gly/given/explicit_music.gly

@@ -0,0 +1,3 @@
+% the result will be invalid gabc, but gly shouldn't care
+% if it is explicitly told to handle the line as music
+\music č ř š

data/tests/examples/gly/given/explicit_music.gly~

@@ -0,0 +1,3 @@
+% the result will be invalid gabc, but gly shouldn't care
+% if it is explicitly told to handle the line as music
+\music č ř š

data/tests/string_helpers_test.rb

@@ -7,8 +7,10 @@ class StringHelpersTest < GlyTest
     ['single_chunk', 'a', ['a']],
     ['simple_whitespace', 'aa aa', ['aa', 'aa']],
     ['leading_trailing_whitespace', ' a a  ', ['a', 'a']],
+    ['repeated_inner_whitespace', 'a    a', ['a', 'a']],
     ['bracketted', '(a)', ['a']],
-    ['empty', '()', ['']]
+    ['empty', '()', ['']],
+    ['nested', '(a(b))', ['a(b', ')']] # nesting isn't supported
   ]
 
   examples.each do |e|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gly
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jakub Pavlík
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-16 00:00:00.000000000 Z
+date: 2016-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -38,108 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
-description: "# gly\n\nWriter-friendly Gregorian notation format compiling to gabc.\n\n*GLY*
-  is an acronym of \"Gregorio for liLYponders\" or\n\"Gregorio with separate LYrics.\n\n##
-  Why\n\nOne of the most popular solutions for typesetting quadratic\nnotation used
-  for the Gregorian chant is [Gregorio][gregorio].\n\nHowever, I have several objections
-  against it's input format.\nThat led me to designing an alternative, Gregorio-inspired\nnotation
-  format, which compiles to pure Gregorio GABC\n(which I don't like writing manually).\n\n##
-  Features\n\n* music separated from lyrics\n  * no need of the ubiquitous and tedious
-  parentheses\n  * separation of \"material and form\" -> easy copying of the music
-  or\n    lyrics alone is possible (useful for a composer)\n  * syllabified lyrics
-  entered in a format inspired by LilyPond\n* music and lyrics can be interspersed
-  as needed\n* no semicolons in the header\n* custom header fields supported (commented
-  out in the GABC output,\n  as gregorio doesn't tolerate headers it doesn't know)\n*
-  several scores per file (when compiled to gabc, each becomes\n  a separate file)\n*
-  compile pdf preview by a single command, without writing any (La)TeX\n\n## Real
-  world examples\n\n* [Proper Divine Office chants of Bohemian Premonstratensian houses][opraem_boh]\n\n##
-  Basic examples\n\nTypical GABC source of an antiphon looks like this:\n\n    name:
-  Nativitas gloriosae;\n    office-part: laudes, 1. ant.;\n    occasion: In Nativitate
-  B. Mariae Virginis;\n    book: Antiphonale Romanum 1912, pg. 704;\n    mode: 8;\n
-  \   initial-style: 1;\n    %%\n    \n    (c4) NA(g)TI(g)VI(g)TAS(gd) glo(f)ri(gh)ó(g)sae(g)
-  * (,)\n    Vír(g)gi(g)nis(hi) Ma(gh)rí(gf)ae,(f) (;)\n    ex(f) sé(g)mi(h)ne(h)
-  A(hiwji)bra(hg)hae,(g) (;)\n    or(gh~)tae(g) de(g) tri(g)bu(fe/fgf) Ju(d)da,(d)
-  (;)\n    cla(df!gh)ra(g) ex(f) stir(hg~)pe(hi) Da(h)vid.(g) (::)\n\nCorresponding
-  GLY may look like this:\n\n    name: Nativitas gloriosae\n    office-part: laudes,
-  1. ant.\n    occasion: In Nativitate B. Mariae Virginis\n    book: Antiphonale Romanum
-  1912, pg. 704\n    mode: 8\n    initial-style: 1\n    \n    c4 g g g gd f gh g g
-  ,\n    g g hi gh gf f ;\n    f g h h hiwji hg g ;\n    gh~ g g g fe/fgf d d ;\n
-  \   df!gh g f hg~ hi h g ::\n    \n    NA -- TI -- VI -- TAS glo -- ri -- ósae *\n
-  \   Vír -- gi -- nis Ma -- rí -- ae,\n    ex sé -- mi -- ne A -- bra -- hae,\n    or
-  -- tae de tri -- bu Ju -- da,\n    cla -- ra ex stir -- pe Da -- vid.\n\nOr, with
-  music and lyrics interlaced\n(this arrangement may be handy for larger scores,\nlike
-  full-notated hymns, sequences or nocturnal responsories):\n\n    name: Nativitas
-  gloriosae\n    office-part: laudes, 1. ant.\n    occasion: In Nativitate B. Mariae
-  Virginis\n    book: Antiphonale Romanum 1912, pg. 704\n    mode: 8\n    initial-style:
-  1\n    \n    c4 g g g gd f gh g g ,\n    NA -- TI -- VI -- TAS glo -- ri -- ósae
-  *\n    \n    g g hi gh gf f ;\n    Vír -- gi -- nis Ma -- rí -- ae,\n    \n    f
-  g h h hiwji hg g ;\n    ex sé -- mi -- ne A -- bra -- hae,\n    \n    gh~ g g g
-  fe/fgf d d ;\n    or -- tae de tri -- bu Ju -- da,\n    \n    df!gh g f hg~ hi h
-  g ::\n    cla -- ra ex stir -- pe Da -- vid.\n\nOther arrangements are also possible.
-  Order of music and lyrics\nis actually ignored during processing.\n\n## Installation\n\nInstall
-  Ruby (some 2.x version) runtime. Then install as any ruby gem:\n\n`gem install gly`\n\n##
-  Usage\n\nThis gem provides executable `gly`. Run `gly help` for full list\nof subcommands.
-  The most important ones are:\n\n`gly gabc FILE1 ...`\n\nconverts given gly file(s)
-  to one or more gabc files (one per score,\ni.e. one gly may spawn a bunch of gabcs).\n\n`gly
-  preview FILE1 ...`\n\nAttempts to create a pdf document with all scores contained
-  in each\ngly file. Expects `gregorio` and `lualatex` to be in PATH\nand `gregoriotex`
-  to be installed and accessible by `lualatex`.\n\n## Tools\n\n[Emacs mode with syntax
-  highlighting for gly][elisp]\n\n![Editing gly in emacs](/doc/img/gly_emacs_scr.png)\n\n##
-  Syntax reference\n\nGly syntax is line-based.\nThe interpreter reads the input line
-  by line,\nand depending on context it interprets each line as\ne.g. music, lyrics
-  or header field.\n\nThe syntax is quite permissive, not requiring a lot of delimiters\nor
-  hints for the parser concerning what each line means.\nMostly the parser guesses
-  the meaning correctly.\nWhere not, meaning of each line can be stated explicitly.\n\n###
-  1. Comments\n\nWhen a `%` sign is encountered, everything until the end of line\nis
-  considered a comment and not interpreted.\n(Comment syntax is the same as in gabc.)\n\nPlease
-  note, that when compiling to gabc, comments are dropped\nand don't appear in the
-  resulting gabc file.\n\n### 2. Whitespace\n\nEmpty lines are ignored.\n\n### 3.
-  Scores\n\nA new score begins at the beginning of a file or at a line containing\na
-  single keyword '\\score'.\n\nIt consists of\na header (optional, only permitted
-  at the beginning of a score)\nand music- and lyrics-lines.\nLines with music and
-  lyrics may appear in any order.\n\nScore ends with end of file or with explicit
-  beginning of a new score\nor another top-level element.\n\n#### 3.1 Score header\n\nScore
-  header consists of fields.\n\nEach header field is on it's own (one) line and consists
-  of\nidentifier, colon and value:\n\n`mode: 8`\n\nHeader field identifier may only
-  consist of alphanumeric characters,\nminus-sign and underscore. Value can contain
-  anything.\n\nScore header ends with first non-empty line identified by the parser\nas
-  music or lyrics.\n\nHeader field 'id' is special: if present, it is used as suffix\nof
-  the generated gabc file (instead of the default, which is\nnumeric position of the
-  score in the source document).\n\n#### 3.2 Lyrics\n\nSyntax of lyrics is inspired
-  by LilyPond.\nLyrics have to be manually syllabified. Default syllable delimiter\nis
-  double dash (minus) `--` with optional whitespace around.\n\n`cla -- ra ex stir
-  -- pe Da -- vid.`\n\nThe parser guesses meaning of the line by attempting to find\nsyllable
-  separator in it and by looking if it's alphanumeric\ncharacters contains something
-  that cannot be interpreted as music.\nIf any of these conditions is met, the line
-  is interpreted as lyrics.\n\nIf gly fails to guess your lyrics line correctly and
-  interprets\nit as music, place `\\lyrics` or short `\\l` at the beginning\nof the
-  unhappy line:\n\n`\\l a a a`\n\n#### 3.3 Music\n\nAny line appearing in a score
-  and not identified as header field\nor lyrics is music by default.\n\nMusic line
-  contains one or more music chunks separated by whitespace.\nFor music syntax see
-  [official gabc documentation][gabc] -\ngly doesn't change anything in this respect.\n\nMusic
-  chunks may be enclosed in parentheses as in gabc.\n(Of course you don't like the
-  parentheses and are happy that gly\nlet's you leave them out. But in some special
-  cases they come handy.)\n\n#### 3.4 Matching lyrics to music\n\nWhen processing
-  the gly source and producing gabc, music chunks\nare matched to lyric syllables.\n\nThere
-  are, however, a few special cases, to make it work conveniently:\n\nThese special
-  cases of music chunks don't get lyric syllable:\n\n* clef\n* music chunk containing
-  only a division - i.e. music chunk containing\n  one of `,` , `;` , `:` , `::` alone\n\nException
-  to this rule are 'nonlyrical lyrics chunks'.\nCurrently there is only one built-in
-  nonlyrical lyric chunk:\nasterisk `*`.\nNormally it is treated as any other syllable,\nbut
-  if it meets a division, it is set as it's lyrics, while\na normal syllable wouldn't
-  be.\n\nIf you need to set some other syllable under a division,\nmake it 'nonlyrical'
-  by placing\nan exclamation mark at it's beginning, e.g. `!<i>Ps.</i>`\n\nIn the
-  other direction it is sometimes necessary to set a syllable\nnot matching any music
-  at all. In such cases empty music chunk\n`()` is what you need.\n\n### 4. Document
-  header\n\nEach gly document may optinally contain a document header.\nIt may appear
-  anywhere in the document, but best practice is to place\nit at the very beginning.\n\nDocument
-  header starts with keyword `\\header` and ends\nat the end of file or at the beginning
-  of another top-level element.\nThe syntax of it's content is the same\nas for [Score
-  header][].\n\nField 'title' in the document header is, if present,\nused by `gly
-  preview` as title of the generated pdf.\n\n## Run tests\n\nby executing `tests/run.rb`\n\n##
-  License\n\nMIT\n\n[gregorio]: https://github.com/gregorio-project/gregorio\n[gabc]:
-  http://gregorio-project.github.io/gabc/index.html\n[elisp]: /tree/master/elisp\n\n[opraem_boh]:
-  https://gist.github.com/igneus/1aed0b36e9b23b51526d\n"
+description: 
 email: jkb.pavlik@gmail.com
 executables:
 - gly
@@ -156,6 +55,8 @@ files:
 - lib/gly/document.rb~
 - lib/gly/document_gabc_convertor.rb
 - lib/gly/document_gabc_convertor.rb~
+- lib/gly/document_ly_convertor.rb
+- lib/gly/document_ly_convertor.rb~
 - lib/gly/gabc_convertor.rb
 - lib/gly/gabc_convertor.rb~
 - lib/gly/headers.rb
@@ -164,10 +65,13 @@ files:
 - lib/gly/lister.rb~
 - lib/gly/lyrics.rb
 - lib/gly/lyrics.rb~
+- lib/gly/options.rb~
 - lib/gly/parsed_score.rb
 - lib/gly/parsed_score.rb~
 - lib/gly/parser.rb
 - lib/gly/parser.rb~
+- lib/gly/preview_builder.rb
+- lib/gly/preview_builder.rb~
 - lib/gly/preview_generator.rb
 - lib/gly/preview_generator.rb~
 - lib/gly/string_helpers.rb
@@ -181,9 +85,10 @@ files:
 - tests/examples/gly/expected/differentiae.gabc~
 - tests/examples/gly/expected/document_header.gabc
 - tests/examples/gly/expected/document_header.gabc~
-- tests/examples/gly/expected/empty.gabc
 - tests/examples/gly/expected/explicit_lyrics.gabc
 - tests/examples/gly/expected/explicit_lyrics.gabc~
+- tests/examples/gly/expected/explicit_music.gabc
+- tests/examples/gly/expected/explicit_music.gabc~
 - tests/examples/gly/expected/explicit_score.gabc
 - tests/examples/gly/expected/force_divisio_lyrics.gabc
 - tests/examples/gly/expected/header.gabc
@@ -203,8 +108,9 @@ files:
 - tests/examples/gly/given/differentiae.gly
 - tests/examples/gly/given/differentiae.gly~
 - tests/examples/gly/given/document_header.gly
-- tests/examples/gly/given/empty.gly
 - tests/examples/gly/given/explicit_lyrics.gly
+- tests/examples/gly/given/explicit_music.gly
+- tests/examples/gly/given/explicit_music.gly~
 - tests/examples/gly/given/explicit_score.gly
 - tests/examples/gly/given/force_divisio_lyrics.gly
 - tests/examples/gly/given/header.gly

data/tests/examples/gly/expected/empty.gabc

@@ -1 +0,0 @@
-%%