2.3.9 released.

diff --git a/VERSION b/VERSION
index cfadf5739854fc3a7944613a81722a5c6d1977d2..bce35a17731e87f79833121906cefe1bfd3ffa63 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,5 +2,5 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=3
 PATCH_LEVEL=9
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=hwn1
 

diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly
index efce4e698d703aa8f791d002c261815ad49f9e53..652d79a3944b75a7e49292025e112a81a109a645 100644 (file)
--- a/input/mutopia/F.Schubert/morgenlied.ly
+++ b/input/mutopia/F.Schubert/morgenlied.ly
@@ -191,3 +191,4 @@ pianoLH =  \relative c'' \repeat volta 2 {
        }
 }
 }
+

diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc
index 0bcc0956362bd658449547c56014db64e0c4b27e..ec39cbb4324d030765fa0cd37f04bff244296370 100644 (file)
--- a/lily/lily-guile.cc
+++ b/lily/lily-guile.cc
@@ -181,6 +181,19 @@ LY_DEFINE (ly_warn, "ly:warn",
   return SCM_UNSPECIFIED;
 }
 
+LY_DEFINE (ly_programming_error, "ly:programming-error",
+          1, 0, 1, (SCM str, SCM rest),
+          "Scheme callable function to issue the warning @code{msg}. "
+          "The message is formatted with @code{format} and @code{rest}.")
+{
+  SCM_ASSERT_TYPE (ly_c_string_p (str), str, SCM_ARG1, __FUNCTION__, "string");
+  progress_indication ("\n");
+
+  str = scm_simple_format (SCM_BOOL_F, str, rest);
+  programming_error (ly_scm2string (str));
+  return SCM_UNSPECIFIED;
+}
+
 LY_DEFINE (ly_dir_p, "ly:dir?",
           1, 0, 0, (SCM s),
          "type predicate. A direction is @code{-1}, @code{0} or "

diff --git a/scm/encoding.scm b/scm/encoding.scm
index 0bd6fc91466675beb6354505336ecc9626f3a265..a1aa1acd0891bacaa917809cc28872929e42795f 100644 (file)
--- a/scm/encoding.scm
+++ b/scm/encoding.scm
@@ -106,8 +106,8 @@ vector of symbols."
              (ly:warn "installation problem: deprecated encoding requested: ~S" coding-name)
              (exit 1))
        (let ((fallback "latin1"))
-         (ly:warn "programming error: no such encoding: ~S" coding-name)
-         (ly:warn "programming error: cross thumbs, using: ~S:" fallback)
+*        (ly:programming-error "no such encoding: ~S" coding-name)
+         (ly:programming-error "programming error: cross thumbs, using: ~S:" fallback)
          (get-coding fallback))))))
 
 (define-public (get-coding-filename coding-name)

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index 3a2419d2ac1df70fed99f088fef6e5f50d78f104..9d7045fd79693026646bc54a8ea2a86305cb5b7c 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -97,7 +97,7 @@
 
       (string-append
        (define-font plain fontname scaling)
-       (if (not (equal? input-encoding font-encoding))
+       (if (equal? input-encoding font-encoding)
           ""
           (reencode-font plain input-encoding command)))))