Merge remote-tracking branch 'origin/ul/parser-syntax-change'

Author: uliska

.travis.yml

@@ -40,4 +40,4 @@ script: ./test/automated_tests.py
 #                  during the installation and test scripts
 env:
   - LILY_PLATFORM=linux-64 LILY_VERSION=2.18.2-1
-  - LILY_PLATFORM=linux-64 LILY_VERSION=2.19.17-1
+  - LILY_PLATFORM=linux-64 LILY_VERSION=2.19.22-1

ly/_internal/module-handling.ily

@@ -159,7 +159,6 @@ declareLibrary =
          ))
      options)))
 
-
 % Initialize a library before first use.
 % This also serves as a kind of declaration of the intent of using it.
 % If options are passed in a \with {} clause they are set after in
@@ -192,8 +191,10 @@ useLibrary =
          (if (file-exists? init-file)
              (begin
               (oll:log location "Initialize library \"~a\" ..." display-name)
-              (ly:parser-include-string parser
-                (format "\\include \"~a\"" init-file))))
+              (let ((arg (format "\\include \"~a\"" init-file)))
+                (if (lilypond-greater-than? "2.19.21")
+                    (ly:parser-include-string arg)
+                    (ly:parser-include-string parser arg)))))
 
          ;; If a \with clause has been given pass the options to the library.
          ;; If the options have not been registered in the __init__ file this
@@ -210,13 +211,16 @@ useLibrary =
          (if (file-exists? main-file)
              (begin
               ;              (ly:parser-include-string parser (ly:gulp-file main-file))
-              (ly:parser-include-string parser
-                (format "\\include \"~a\"" main-file))
+              (let ((arg (format "\\include \"~a\"" main-file)))
+                (if (lilypond-greater-than? "2.19.21")
+                    (ly:parser-include-string arg)
+                    (ly:parser-include-string parser arg))
+              
               (set! oll-loaded-libraries
                     (append oll-loaded-libraries
                       `(,name)))
               (oll:log "... completed." ""))
-             (oll:warn location (format "Library main file \"~a\" not found" main-file)))))))
+             (oll:warn location (format "Library main file \"~a\" not found" main-file))))))))
 
 
 % Load a module from within a library.
@@ -275,13 +279,25 @@ useModule =
 
                    ;; include init-file if present
                    (if init-file
+                       (if (lilypond-greater-tha
+                   (if init-file
+                       (if (lilypond-greater-than? "2.19.21")
+                       (ly:parser-include-string
+                         (format "\\include \"~a\"" init-file))
+                       (ly:parser-include-string parser
+                         (format "\\include \"~a\"" init-file))))n? "2.19.21")
+                       (ly:parser-include-string
+                         (format "\\include \"~a\"" init-file))
                        (ly:parser-include-string parser
-                         (format "\\include \"~a\"" init-file)))
+                         (format "\\include \"~a\"" init-file))))
 
 
                    ;; include module file
-                   (ly:parser-include-string parser
-                     (format "\\include \"~a\"" filename))
+                   (if (lilypond-greater-than? "2.19.21")
+                       (ly:parser-include-string
+                        (format "\\include \"~a\"" filename))
+                       (ly:parser-include-string parser
+                         (format "\\include \"~a\"" filename)))
 
                    ;; register module
                    (set! oll-loaded-modules
@@ -325,8 +341,12 @@ registerLibrary =
           (if (file-exists? lib-init-file)
               (begin
                (oll:log "initialize library \"~a\"" lib)
-               (ly:parser-include-string parser
-                 (format "\\include \"~a\"" lib-init-file))))))))
+               (if (lilypond-greater-than? "2.19.21")
+                   (ly:parser-include-string 
+                     (format "\\include \"~a\"" lib-init-file))
+                   (ly:parser-include-string parser
+                     (format "\\include \"~a\"" lib-init-file))
+                   )))))))
 
 % Load module from an openLilyLib library
 % A module may be an individual file or a whole library, this can also be
@@ -376,8 +396,11 @@ loadModule =
              #{ \registerLibrary #(first path-list) #}
              ;; then load the requested module
              (oll:log "load module ~a" load-path)
-             (ly:parser-include-string parser
-               (format "\\include \"~a\"" load-path))
+             (if (lilypond-greater-than? "2.19.21")
+                 (ly:parser-include-string 
+                  (format "\\include \"~a\"" load-path))
+                 (ly:parser-include-string parser
+                   (format "\\include \"~a\"" load-path)))
              (set! oll-loaded-modules
                    (append! oll-loaded-modules `(,load-path))))
             (oll:warn "module not found: ~a" load-path)))))

ly/_internal/utilities/alist-access.ily

@@ -54,13 +54,17 @@
 
 % after \clralist <name> the variable <name> is initialized with an empty list
 #(define-public clralist
-  (define-void-function (parser location alst)(symbol?)
-    (ly:parser-define! parser alst (list))
-    ))
+   (define-void-function (parser location alst)(symbol?)
+     (if (lilypond-greater-than? "2.19.21")
+         (ly:parser-define! alst (list))
+         (ly:parser-define! parser alst (list)))
+     ))
 % sets one value - replaces the value and leaves the order of elements, if <name> is already present
 #(define-public setalist
   (define-void-function (parser location alst name val)(symbol? symbol? scheme?)
-    (let ((l (ly:parser-lookup parser alst))
+    (let ((l (if (lilypond-greater-than? "2.19.21")
+                 (ly:parser-lookup alst)
+                 (ly:parser-lookup parser alst)))
           (setv #t))
       (set! l (map (lambda (p)
                      (if (and (pair? p) (equal? (car p) name))
@@ -70,28 +74,40 @@
                          p
                          )) l))
       (if setv (set! l (append l (list (cons name val)))))
-      (ly:parser-define! parser alst l)
-      )))
+      (if (lilypond-greater-than? "2.19.21")
+          (ly:parser-define! alst l)
+          (ly:parser-define! parser alst l)))))
 % sets one value - <name> is always placed at the end of the list
 #(define-public addalist
   (define-void-function (parser location alst name val)
     (symbol? symbol? scheme?)
-    (let ((l (ly:parser-lookup parser alst)))
+    (let ((l (if (lilypond-greater-than? "2.19.21")
+                 (ly:parser-lookup alst)
+                 (ly:parser-lookup parser alst))))
       (set! l (filter (lambda (p) (and (pair? p)(not (equal? (car p) name)))) l))
-      (ly:parser-define! parser alst (append l (list (cons name val))))
+      (if (lilypond-greater-than? "2.19.21")
+          (ly:parser-define! alst (append l (list (cons name val))))
+          (ly:parser-define! parser alst (append l (list (cons name val)))))
       )))
 % removes one entry from association list
 #(define-public remalist
   (define-void-function (parser location alst name)(symbol? symbol?)
-    (let ((l (ly:parser-lookup parser alst)))
-      (ly:parser-define! parser alst
-        (filter (lambda (p) (and (pair? p)(not (equal? (car p) name)))) l))
+    (let ((l (if (lilypond-greater-than? "2.19.21")
+                 (ly:parser-lookup alst)
+                 (ly:parser-lookup parser alst))))
+      (if (lilypond-greater-than? "2.19.21")
+          (ly:parser-define! alst
+            (filter (lambda (p) (and (pair? p)(not (equal? (car p) name)))) l))
+          (ly:parser-define! parser alst
+            (filter (lambda (p) (and (pair? p)(not (equal? (car p) name)))) l)))
       )))
 
 % get entry from nested a-list
 #(define-public (get-a-tree parser location name path)
    (if (not (symbol? name)) (set! name (string->symbol (object->string name))))
-   (let ((opts (ly:parser-lookup parser name)))
+   (let ((opts (if (lilypond-greater-than? "2.19.21")
+                   (ly:parser-lookup name)
+                   (ly:parser-lookup parser name))))
      (define (getval ol op)
        (let ((sym (car op)))
          (cond
@@ -111,8 +127,12 @@
          )))
 % add an entry to a nested a-list
 #(define (add-a-tree parser location name sympath val assoc-set-append)
-  (if (not (symbol? name)) (set! name (string->symbol (object->string name))))
-  (let ((opts (ly:parser-lookup parser name)))
+   (if (not (symbol? name)) (set! name (string->symbol (object->string name))))
+   (let ((opts
+          (if (lilypond-greater-than? "2.19.21")
+              (ly:parser-lookup name)
+              (ly:parser-lookup parser name)
+              )))
     (define (setval ol op)
       (let ((sym (car op))
             (ol (if (list? ol) ol (begin
@@ -133,12 +153,16 @@
               )
             )))
     (set! opts (setval opts sympath))
-    (ly:parser-define! parser name opts)
-    ))
+     (if (lilypond-greater-than? "2.19.21")
+         (ly:parser-define! name opts)
+         (ly:parser-define! parser name opts))
+     ))
 % remove an entry from a nested a-list
 #(define (rem-a-tree parser location name sympath)
   (if (not (symbol? name)) (set! name (string->symbol (object->string name))))
-  (let ((opts (ly:parser-lookup parser name)))
+  (let ((opts (if (lilypond-greater-than? "2.19.21")
+                  (ly:parser-lookup name)
+                  (ly:parser-lookup parser name))))
     (define (remval ol op)
       (let ((sym (car op)))
         (if (> (length op) 1)
@@ -152,7 +176,9 @@
             )
         ))
     (set! opts (remval opts sympath))
-    (ly:parser-define! parser name opts)
+    (if (lilypond-greater-than? "2.19.21")
+        (ly:parser-define! name opts)
+        (ly:parser-define! parser name opts))
     ))
 
 % clear/create an empty a-list

ly/_internal/utilities/include-pattern.ily

@@ -45,6 +45,8 @@ includePattern =
                         (istr (format "\\include \"~A\"\n" file)))
                    (if (and ipv (or (not (list? ipv))(> (length ipv) 0)))
                        (oll:log "~A" istr))
-                   (ly:parser-include-string parser istr)))
+                   (if (lilypond-greater-than? "2.19.21")
+                       (ly:parser-include-string istr)
+                       (ly:parser-include-string parser istr))))
        includefiles)
      ))

ly/openlilylib

@@ -21,10 +21,22 @@
 % - Add general tools that are available for all libraries.
 %   - lilypond-version-predicates
 %   - logging commands
+%
+% NOTE: There has been a major syntax change in 2.19.22:
+% the parser argument is now obsolete with a number of functions,
+% e.g. ly:parser-include-string.
+% As the lilypond-version-predicates have not been included yet
+% we have to hard-code the switch here.
 initOpenLilyLib =
 #(define-void-function (parser location)()
    (if (not (defined? 'openlilylib-options))
-       (begin
-        (ly:parser-include-string parser
-          "\\include \"_internal/init-openlilylib.ily\""))))
+       (if (let ((v (ly:version)))
+             (or (> (first  v)  2)
+                 (> (second v) 19)
+                 (>= (third v) 22)))
+           (ly:parser-include-string
+            "\\include \"_internal/init-openlilylib.ily\"")
+           (ly:parser-include-string parser
+             "\\include \"_internal/init-openlilylib.ily\"")
+           )))
 \initOpenLilyLib

ly/stylesheets/__main__.ily

@@ -65,8 +65,11 @@ http://fonts.openlilylib.org.\n")
 #(define (use-font-extensions parser location name)
    (let ((filename (make-style-file name "extensions")))
      (if (file-exists? filename)
-         (ly:parser-include-string parser
+         (if (lilypond-greater-than? "2.19.21")
+         (ly:parser-include-string
            (ly:gulp-file filename))
+         (ly:parser-include-string parser
+           (ly:gulp-file filename)))
          (oll:warn location
            (format "No extensions available for font \"~a\". Skipping." name))
          )))
@@ -205,11 +208,14 @@ useNotationFont =
        ; I think one has to somehow access the current paper block
        ; through Scheme (I suspect there are options in the paper
        ; related ly: functions but I didn't succeed to find a solution).
-       (ly:parser-include-string parser
-         (format "\\include \"~a\""
-           (string-append
-            #{ \getOption global.root-path #}
-            "/stylesheets/load-font")))
+       (let ((arg 
+              (format "\\include \"~a\""
+                (string-append
+                 #{ \getOption global.root-path #}
+                 "/stylesheets/load-font"))))
+         (if (lilypond-greater-than? "2.19.21")
+             (ly:parser-include-string parser arg)
+             (ly:parser-include-string arg)))
        (oll:log location
          (format "Font \"~a\" loaded successfully" name))
 
@@ -219,7 +225,10 @@ useNotationFont =
        ;; include the determined style file for the font
        ;; if not "none".
        (if (and style-file (not (string=? "none" style)))
+           (if (lilypond-greater-than? "2.19.21")
+           (ly:parser-include-string 
+             (format "\\include \"~a\"" style-file))
            (ly:parser-include-string parser
-             (format "\\include \"~a\"" style-file)))
+             (format "\\include \"~a\"" style-file))))
        (oll:log location (format "Associated \"~a\" stylesheet loaded successfully" style))
        ))))

ly/stylesheets/usage-examples/.automated-tests-exclude

@@ -0,0 +1 @@
+arnold--berg-opus-5-excerpt.ly