patch::: 1.3.50.jcn1

1.3.50.jcn1
===========

* Don't use regex in chord-names.scm under windows; hybrid chordnames
  user+calculated will be partly broken.

diff --git a/CHANGES b/CHANGES
index 2be8dd6bfb28f44389ad17eeec463fee94e49267..28a0e7d45b12237c298c28416af8ab8aa3fae9d3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+1.3.50.jcn1
+===========
+
+* Don't use regex in chord-names.scm under windows; hybrid chordnames
+  user+calculated will be partly broken.
 
 1.3.49.hwn2
 ===========

diff --git a/VERSION b/VERSION
index c03a84f994da13c4c4c31ef7902bd0219e3f229f..4be4d9c8ad5923474c24a6ac53c3e54e18cf8d00 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=50
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/scm/chord-names.scm b/scm/chord-names.scm
index 738fdb4abed7e69bfb725f25e60fc8c2762b4af3..a7ef7bf2768ac4855a2705ebef83d88b0328ff94 100644 (file)
--- a/scm/chord-names.scm
+++ b/scm/chord-names.scm
@@ -10,6 +10,11 @@
    (ice-9 regex)
    )
 
+;; The regex module may not be available, or may be broken.
+(define use-regex
+  (let ((os (string-downcase (vector-ref (uname) 0))))
+    (not (equal? "cygwin" (substring os 0 (min 6 (string-length os)))))))
+
 ;;
 ;; (octave notename accidental)
 ;;
@@ -249,7 +254,8 @@
     (apply append (pitch->text-banter tonic)
           (if user-name user-name '())
           ;; why does list->string not work, format seems only hope...
-          (if (and (string-match "super" (format "~s" user-name))
+          (if (and use-regex
+                   (string-match "super" (format "~s" user-name))
                    (or (pair? additions)
                        (pair? subtractions)))
               '(("/" (type . "super")))