patch::: 1.3.97.jcn2

1.3.97.jcn2
===========

* Quick bugfix for regtest.

diff --git a/CHANGES b/CHANGES
index 27c4ba3001f116684973544c46ff85908286c300..ee34e3cab6bec2232b94c226f1a881cd1a0089cd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+1.3.97.jcn2
+===========
+
+* Quick bugfix for regtest.
+
 1.3.97.jcn1
 ===========
 

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

diff --git a/scm/font.scm b/scm/font.scm
index 2f9a88fb45349cb1f79f036410f84fbb44bba002..64d3d5c67a2b4dadcee380eb49402a79514fa999 100644 (file)
--- a/scm/font.scm
+++ b/scm/font.scm
@@ -29,6 +29,8 @@
     (("medium upright music feta 20" . 0) . "feta20")
     (("medium upright music feta 16" . -1) . "feta16")
     (("medium upright music feta 13" . -2) . "feta13")
+    (("medium upright music feta 13" . -3) . "feta11")
+    (("medium upright music feta 13" . -4) . "feta11")
     (("medium upright music feta 23" . 1) . "feta23")
     (("medium upright music feta 26" . 2) . "feta26")
     (("medium upright braces feta-braces 20" . 0) . "feta-braces20")
@@ -96,6 +98,9 @@
                   (if entry (cdr entry) "[^ ]+"))
                 " "))
              '(font-series font-shape font-family font-name font-point font-size)))))
+    ;;(display "font-regexp: `")
+    ;;(display font-regexp)
+    ;;(display "'\n")
     (font-regexp-to-font-name paper font-regexp)))
 
 (define markup-abbrev-to-properties-alist
@@ -116,7 +121,7 @@
        style-to-font-alist)))
   
 (define (markup-to-properties markup)
-  ;;  (display "markup: `")
+  ;;(display "markup: `")
   ;;(display markup)
   ;;(display "'\n")
   (if (pair? markup)