X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fgeneral-scheme.cc;h=b9507766894df7216cdfa1de7eb65026114a1879;hb=d06ebc90ec926e435ec00f5fb18dec838928df20;hp=af2bcd73b4337e06689c74615a2310b0cf60996f;hpb=a066a93ee74edebb9d238a1bac93c3bc7e8e6e4a;p=lilypond.git

diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index af2bcd73b4..b950776689 100644
--- a/lily/general-scheme.cc
+++ b/lily/general-scheme.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2012 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -99,7 +99,6 @@ LY_DEFINE (ly_gulp_file, "ly:gulp-file",
   return scm_from_locale_stringn (contents.c_str (), contents.length ());
 }
 
-
 LY_DEFINE (ly_dir_p, "ly:dir?",
            1, 0, 0, (SCM s),
            "Is @var{s} a direction?  Valid directions are @w{@code{-1}},"
@@ -107,7 +106,7 @@ LY_DEFINE (ly_dir_p, "ly:dir?",
            " left or down, @code{1}@tie{}represents right or up, and @code{0}"
            " represents a neutral direction.")
 {
-  if (scm_is_number (s))
+  if (scm_is_integer (s))
     {
       int i = scm_to_int (s);
       return (i >= -1 && i <= 1) ? SCM_BOOL_T : SCM_BOOL_F;
@@ -229,8 +228,8 @@ LY_DEFINE (ly_number_2_string, "ly:number->string",
       Real r (scm_to_double (s));
       if (isinf (r) || isnan (r))
         {
-          programming_error (_ ("infinity or NaN encountered while converting Real number"));
-          programming_error (_ ("setting to zero"));
+          programming_error ("infinity or NaN encountered while converting Real number, "
+                             "setting to zero");
 
           r = 0.0;
         }