lyp-win 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bdde7892b2da60d4c3c57e0f4f7bc2c64138f31
-  data.tar.gz: 632d9e270522c741b6d415d6e988fe80b621251c
+  metadata.gz: 3697173d85f0c79b8d561bfe268d0a0510795188
+  data.tar.gz: a2eb68573dda67d1156fe881ad639708b2d2dc86
 SHA512:
-  metadata.gz: 3c87eaf0dde371904971772628fc971914cda3bbc4401809b7eed00fd8747c8e2100946767f6962f407111fe42578e0ee7f40100943eba5d23432561861fe4bf
-  data.tar.gz: 27b720a6fc0c1db76f859e8ba7178749e66d8cde097f21f6d28d519cad49769a265afb5b53a1c63af3ad2a151a5292ae89075431df86d36321ed0e199993633d
+  metadata.gz: 7d763075113f6cc130927168ce8eea57646574f1373db1cb79963f27cbe46af6851b2197464069f4f35b215d8571fcf8e6558701fbfa1709da9f28bf186f28d1
+  data.tar.gz: d85896d55f2e5c1ee7ec7bd2bf5f9cb50ae61b6e2cd2d3901ce1655378625342825cd6e86ca62631ebeb1dbbd37bb8292e090e0f405fdaf08b416417a8c2178a

data/bin/lilypond

@@ -27,10 +27,11 @@ Lyp-provided options:
   -c, --cropped                       crop output (requires setting 0 margins)
   -E, --env                           use version specified in $LILYPOND_VERSION
   -F, --force-version                 use lilypond version specified in user file
+  -m, --music-relative=MUSIC          enter music inline (relative pitch)
+  -M, --music=MUSIC                   enter music inline (absolute pitch)
   -n, --install                       install the specified version if not found
-  -O, --open                          open the target file after compilation
-  -R, --raw                           run raw lilypond (no pre-processing)
   -r, --require=PACKAGE               preload the specified package
+  -R, --raw                           run raw lilypond (no pre-processing)
   -S, --snippet                       produce png cropped images at 600dpi
                                       (--cropped --png -dresolution=600)
   -u, --use=VERSION                   use the given version of lilypond
@@ -59,6 +60,6 @@ else
     Lyp::Lilypond.compile($argv, $options)
   rescue => e
     puts e.message
-    puts e.backtrace.join("\n")
+    puts e.backtrace.join("\n") if $options[:verbose]
   end
 end

data/lib/lyp/base.rb

@@ -62,6 +62,11 @@ module Lyp
     FileUtils.mkdir_p(dir) unless File.directory?(dir)
     dir
   end
+
+  def self.tmp_filename(suffix = nil)
+    fn = (Thread.current.hash * (Time.now.to_f * 1000).to_i % 2**32).to_s(36)
+    "#{TMP_ROOT}/#{fn}#{suffix}"
+  end
   
   def self.sudo_cp(src, dest)
     cmd = "sudo cp #{src} #{dest}"

data/lib/lyp/cli.rb

@@ -128,6 +128,8 @@ class Lyp::CLI < Thor
   desc "compile [<option>...] <FILE>", "compile given file Lilypond source file"
   def compile(*argv)
     opts, argv = Lyp::Lilypond.preprocess_argv(argv)
+    opts[:verbose] ||= options[:verbose]
+    $cmd_options = opts
 
     lilypond_path = Lyp::Lilypond.select_lilypond_version(opts, argv.last)
 

data/lib/lyp/lilypond.rb

@@ -1,7 +1,14 @@
 module Lyp::Lilypond
   class << self
-    NO_ARGUMENT_OPTIONS_REGEXP = /^\-([REnFOcSA]+)(.+)/
+    # multiple options in shorthand form, e.g. -FnO
+    NO_ARGUMENT_SHORTHAND_REGEXP = /^\-([AcEFnRSV]+)(.+)/
 
+    # shorthand option with argument, e.g. -ifoo-bar.ly
+    ARGUMENT_SHORTHAND_REGEXP = /^\-([efHiIjlmMoru])(.+)/
+
+    # longhand option with equal sign and argument, e.g. --include=foo/bar
+    ARGUMENT_EQUAL_REGEXP = /^--([^=]+)=(.+)/
+    
     def preprocess_argv(argv)
       options = {}
       argv = argv.dup # copy for iterating
@@ -15,20 +22,22 @@ module Lyp::Lilypond
 
     def parse_lilypond_arg(arg, argv, argv_clean, options)
       case arg
-      when NO_ARGUMENT_OPTIONS_REGEXP
-        # handle multiple options in shorthand form, e.g. -FnO
+      when ARGUMENT_EQUAL_REGEXP
+        argv.insert(0, "--#{$1}", $2)
+      when ARGUMENT_SHORTHAND_REGEXP
+        argv.insert(0, "-#{$1}", $2)
+      when NO_ARGUMENT_SHORTHAND_REGEXP
         tmp_args = []
         $1.each_char {|c| tmp_args << "-#{c}"}
         tmp_args << "-#{$2}"
-        argv = tmp_args + argv
+        argv.insert(0, *tmp_args)
       when '-A', '--auto-install-deps'
         options[:resolve] = true
       when '-c', '--cropped'
         argv_clean.concat ['-dbackend=eps', '-daux-files=#f']
       when '-E', '--env'
         unless ENV['LILYPOND_VERSION']
-          STDERR.puts "$LILYPOND_VERSION not set"
-          exit 1
+          raise "$LILYPOND_VERSION not set"
         end
         options[:use_version] = ENV['LILYPOND_VERSION']
       when '-F', '--force-version'
@@ -38,10 +47,14 @@ module Lyp::Lilypond
         options[:include_paths] ||= []
         options[:include_paths] << path
         argv_clean << "--include=#{path}"
+      when '-M', '--music'
+        fn = prepare_inline_music_file(argv.shift)
+        argv << fn
+      when '-m', '--music-relative'
+        fn = prepare_inline_music_file(argv.shift, relative: true)
+        argv << fn
       when '-n', '--install'
         options[:install] = true
-      when '-O', '--open'
-        options[:open] = true
       when '-r', '--require'
         options[:ext_require] ||= []
         options[:ext_require] << argv.shift
@@ -55,17 +68,36 @@ module Lyp::Lilypond
         options[:snippet_paper_preamble] = true
       when '-u', '--use'
         options[:use_version] = argv.shift
-      when /^(?:\-u|\-\-use\=)"?([^\s]+)"?/
-        options[:use_version] = $1
+      when '-V', '--verbose'
+        options[:verbose] = true
+        argv_clean << arg
       when '--invoke-system'
         options[:mode] = :system
       when '--invoke-quiet'
         options[:mode] = :quiet
+      when '--svg'
+        argv_clean.concat ['-dbackend=svg']
       else
         argv_clean << arg
       end
     end
 
+    def prepare_inline_music_file(music, opts = {})
+      filename = Lyp.tmp_filename('.ly')
+      File.open(filename, 'w+') do |f|
+        f << format_inline_music(music, opts)
+      end
+      filename
+    end
+
+    def format_inline_music(music, opts)
+      if opts[:relative]
+        "\\relative c' { #{music} }"
+      else
+        "{ #{music} }"
+      end
+    end
+
     VERSION_STATEMENT_REGEX = /\\version "([^"]+)"/
 
     def select_lilypond_version(opts, file_path)

data/lib/lyp/version.rb

@@ -1,3 +1,3 @@
 module Lyp
-  VERSION = "1.3.4"
+  VERSION = "1.3.5"
 end

data/lib/lyp/wrapper.rb

@@ -3,14 +3,16 @@ module Lyp
     File.expand_path('templates/deps_wrapper.rb', File.dirname(__FILE__))
   ))
 
+  WRAPPERS_DIR = "#{Lyp::TMP_ROOT}/wrappers"
+
   def self.wrap(fn, opts = {})
     r = Lyp::DependencyResolver.new(fn, opts).resolve_package_dependencies
     # copy current_package_dir option
     r[:current_package_dir] = opts[:current_package_dir]
     r[:opts] = opts
 
-    FileUtils.mkdir_p("#{Lyp::TMP_ROOT}/wrappers")
-    fn = "#{Lyp::TMP_ROOT}/wrappers/#{File.basename(fn)}"
+    FileUtils.mkdir_p(WRAPPERS_DIR)
+    fn = "#{WRAPPERS_DIR}/#{File.basename(fn)}"
 
     File.open(fn, 'w+') {|f| f << WRAPPER_TEMPLATE.render(r)}
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lyp-win
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient
@@ -115,7 +115,7 @@ files:
 - lib/lyp/version.rb
 - lib/lyp/windows.rb
 - lib/lyp/wrapper.rb
-homepage: http://github.com/noteflakes/lyp
+homepage: http://lyp.noteflakes.com
 licenses:
 - MIT
 metadata: {}