Merge pull request #107 from openlilylib/dev/os-path

Some os-path touches

Author: uliska

ly/_internal/utilities/os-path.scm

@@ -65,9 +65,9 @@
              (symbol->string elt)))
        path)))
 
-(define-public (join-unix-path path-list)
+(define-public (join-unix-path path)
   "Returns a Unix formatted path string from a (symbol?/string?) list."
-  (string-join (split-path path-list) "/"))
+  (string-join (split-path path) "/"))
 
 (define-public (join-dot-path path)
   "Returns a string in dot-notation (to be displayed).
@@ -132,7 +132,7 @@
 
 (define-public (normalize-location location)
   "Returns a normalized path to the given location object"
-  (car (ly:input-file-line-char-column location)))
+  (normalize-path (car (ly:input-file-line-char-column location))))
 
 (define-public (location-extract-path location)
   "Returns the normalized path from a LilyPond location
@@ -154,14 +154,14 @@
   (define-scheme-function (parser location)()
     (normalize-location location)))
 
-(define-public (this-file-compiled parser location)
+(define-public (this-file-compiled? parser location)
   "Return #t if the file where this function is called
     is the one that is currently compiled by LilyPond."
   (let ((outname (ly:parser-output-name parser))
         (locname (normalize-location location)))
     (regexp-match? (string-match (format "^(.*/)?~A\\.i?ly$" outname) locname))))
 
-;; LilyPond format wrapper for this-file-compiled
+;; LilyPond format wrapper for this-file-compiled?
 (define-public thisFileCompiled
   (define-scheme-function (parser location)()
-    (this-file-compiled parser location)))
+    (this-file-compiled? parser location)))

ly/gridly/__main__.ily

@@ -151,12 +151,6 @@ gridCheck =
     (map (lambda (x) (+ 1 x))
          (iota (hash-ref music-grid-meta #:segments)))))
 
-%%% This is taken from Lalily
-#(define (test-location? parser location)
-   (let ((outname (ly:parser-output-name parser))
-         (locname (car (ly:input-file-line-char-column location))))
-     (regexp-match? (string-match (format "^(.*/)?~A\\.i?ly$" outname) locname))))
-
 %%% Grid initialization
 gridInit =
 #(define-void-function
@@ -358,7 +352,7 @@ gridCompileCell =
    (string? number?)
    (check-grid)
    (check-coords part segment)
-   (if (test-location? parser location)
+   (if (this-file-compiled? parser location)
        (let ((cache-segment #{ \getOption gridly.segment-range #}))
          (ly:message "Compiling test file")
          (if (not (get-music-cell part segment))