From de0c3dae1b7eb9d7406d3e8553aa5ed27c8f02b5 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 30 Jul 2004 17:19:39 +0000 Subject: [PATCH] 2.3.9 released. --- VERSION | 2 +- input/mutopia/F.Schubert/morgenlied.ly | 1 + lily/lily-guile.cc | 13 +++++++++++++ scm/encoding.scm | 4 ++-- scm/framework-ps.scm | 2 +- 5 files changed, 18 insertions(+), 4 deletions(-) diff --git a/VERSION b/VERSION index cfadf57398..bce35a1773 100644 --- 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 efce4e698d..652d79a394 100644 --- 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 0bcc095636..ec39cbb432 100644 --- 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 0bd6fc9146..a1aa1acd08 100644 --- 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 3a2419d2ac..9d7045fd79 100644 --- 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))))) -- 2.39.2