lyp 1.3.5 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 950515603fdf45dbf2925e4c1f9cab856e6011ab
-  data.tar.gz: a2eb68573dda67d1156fe881ad639708b2d2dc86
+  metadata.gz: d17c4c76b6e7d80fb92d00eb7308853034f2482c
+  data.tar.gz: 46a6db73bcad7379c7222584f45d896aceb28b14
 SHA512:
-  metadata.gz: b857247eb1de5b5d4e67a549d4c8ba19df1e1efbe8311f69b9dcd31f4da831ce20d72abd7cc673a7225a7722c02facaf26271d40d77123e3a9d91c62eb6f1aae
-  data.tar.gz: d85896d55f2e5c1ee7ec7bd2bf5f9cb50ae61b6e2cd2d3901ce1655378625342825cd6e86ca62631ebeb1dbbd37bb8292e090e0f405fdaf08b416417a8c2178a
+  metadata.gz: e08ff84cd4fd32602a583e84ce4a501b3f201f1b346eeacc670f0055ef29b97efacc5c22cfc66d9092174c39127c906614ba954ebb69ea2c83b50368e498d98d
+  data.tar.gz: 83f4d533894a531c13ce561d1ea68dd1f91144e1b5adc190b44e0e36df2570f581fad3bb409d2b333df038606bbce7c35086a9a61ee8ef2722a33b4f235b1348

data/README.md

@@ -9,11 +9,11 @@
 
 lyp is an open-source tool that takes the pain out of working with [Lilypond](http://lilypond.org/).
 
-__Use packages__: Install [packages](http://lyp.noteflakes.com/lyp/#/?id=working-with-packages) to enhance your Lilypond files with additional functionality. Add [specialized tweaks](http://lyp.noteflakes.com/lyp/#/packages?id=tweaking) or even [change the music font](http://lyp.noteflakes.com/lyp/#/packages?id=fonts).
+__Use packages__: Install [packages](http://lyp.noteflakes.com/#/?id=working-with-packages) to enhance your Lilypond files with additional functionality. Add [specialized tweaks](http://lyp.noteflakes.com/#/packages?id=tweaking) or even [change the music font](http://lyp.noteflakes.com/#/packages?id=fonts).
 
-__No hassle Lilypond installation__: with lyp you can [install Lilypond](http://lyp.noteflakes.com/lyp/#/?id=installing-and-using-lilypond) with a single easy command, no need to click links, or unzip and copy files around.
+__No hassle Lilypond installation__: with lyp you can [install Lilypond](http://lyp.noteflakes.com/#/?id=installing-and-using-lilypond) with a single easy command, no need to click links, or unzip and copy files around.
 
-__Even more tools for power users__: watch and automatically [recompile](http://lyp.noteflakes.com/lyp/#/?id=lyp-watch) changed source files, [flatten](http://lyp.noteflakes.com/lyp/#/?id=lyp-flatten) include files, and [automatically install](http://lyp.noteflakes.com/lyp/#/?id=lyp-compile) package dependencies or any required version of Lilypond.
+__Even more tools for power users__: watch and automatically [recompile](http://lyp.noteflakes.com/#/?id=lyp-watch) changed source files, [flatten](http://lyp.noteflakes.com/#/?id=lyp-flatten) include files, and [automatically install](http://lyp.noteflakes.com/#/?id=lyp-compile) package dependencies or any required version of Lilypond.
 
 For more information, see the lyp [documentation](http://lyp.noteflakes.com/).
 

data/bin/lilypond

@@ -1,5 +1,8 @@
 #!/usr/bin/env ruby
 
+# Make sure encoding is UTF-8
+Encoding.default_external = "UTF-8"
+
 $LOAD_PATH.unshift File.expand_path("../lib", File.dirname(__FILE__))
 
 require 'lyp/version'

data/lib/lyp/etc/lyp.ly

@@ -117,6 +117,7 @@
       (ly:parser-include-string parser str)))
 
   (define (lyp:include parser location path once)  (let* (
+      (path (if (symbol? path) (symbol->string path) path))
       (current-dir  (lyp:this-dir))
       (abs-path     (if (lyp:absolute-path? path)
                         path
@@ -146,7 +147,8 @@
 )
 
 % command form
-require = #(define-void-function (parser location ref)(string?) (let* (
+require = #(define-void-function (parser location ref)(string-or-symbol?) (let* (
+    (ref (if (symbol? ref) (symbol->string ref) ref))
     (name (lyp:ref->name ref))
     (package-dir (lyp:name->dir name))
     (entry-point-path (lyp:join-path package-dir "package.ly"))
@@ -160,14 +162,14 @@ require = #(define-void-function (parser location ref)(string?) (let* (
   ))
 ))
 
-pinclude = #(define-void-function (parser location path)(string?)
+pinclude = #(define-void-function (parser location path)(string-or-symbol?)
   (lyp:include parser location path #f))
 
-pcondInclude = #(define-void-function (parser location expr path)(scheme? string?)
+pcondInclude = #(define-void-function (parser location expr path)(scheme? string-or-symbol?)
   (if expr (lyp:include parser location path #f)))
 
-pincludeOnce = #(define-void-function (parser location path)(string?)
+pincludeOnce = #(define-void-function (parser location path)(string-or-symbol?)
   (lyp:include parser location path #t))
 
-pcondIncludeOnce = #(define-void-function (parser location expr path)(scheme? string?) 
+pcondIncludeOnce = #(define-void-function (parser location expr path)(scheme? string-or-symbol?) 
   (if expr (lyp:include parser location path #t)))

data/lib/lyp/lilypond.rb

@@ -493,7 +493,7 @@ module Lyp::Lilypond
         "linux-64"
       when "ppc-linux"
         "linux-ppc"
-      when "x64-mingw32"
+      when /mingw|mswin/
         "mingw"
       end
     end

data/lib/lyp/resolver.rb

@@ -120,7 +120,7 @@ module Lyp
       end
     end
 
-    DEP_RE = /\\(require|include|pinclude|pincludeOnce) "([^"]+)"/.freeze
+    DEP_RE = /\\(require|include|pinclude|pincludeOnce)\s+(?:"|#')?([^\s"]+)"?/.freeze
     INCLUDE = "include".freeze
     PINCLUDE = "pinclude".freeze
     PINCLUDE_ONCE = "pincludeOnce".freeze
@@ -225,12 +225,17 @@ module Lyp
       search_paths = [dir]
       search_paths += @opts[:include_paths] if @opts[:include_paths]
 
+      # Reminder: return inside a proc returns from the caller
+      search = proc {|fn| return fn if File.file?(fn) }
+
       search_paths.each do |path|
         full_path = File.expand_path(ref, path)
-        return full_path if File.file?(full_path)
+        search.(full_path)
+        search.("#{full_path}.ily")
+        search.("#{full_path}.ly")
       end
 
-      error("Missing include file specified in %s", location)
+      error("Could not find include file reference #{ref} specified in %s", location)
     end
 
     def process_require_command(ref, dir, leaf, opts, location)

data/lib/lyp/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lyp
 version: !ruby/object:Gem::Version
-  version: 1.3.5
+  version: 1.3.6
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-16 00:00:00.000000000 Z
+date: 2018-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httpclient