Merge remote-tracking branch 'origin/translation'

[lilypond.git] / lily / general-scheme.cc

diff --git a/lily/general-scheme.cc b/lily/general-scheme.cc
index e73ab0b9272d7bdf1d3f07d5d7e35d24367ba4e2..19d0af73caf6a338f7169991d36b32a6bae452be 100644 (file)
--- 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--2014 Jan Nieuwenhuizen <janneke@gnu.org>
   Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -114,18 +114,6 @@ LY_DEFINE (ly_dir_p, "ly:dir?",
   return SCM_BOOL_F;
 }
 
-LY_DEFINE (ly_vsize_p, "ly:vsize?",
-           1, 0, 0, (SCM s),
-           "Is @var{s} a vsize?")
-{
-  if (scm_is_integer (s))
-    {
-      int i = scm_to_int (s);
-      return i >= 0 ? SCM_BOOL_T : SCM_BOOL_F;
-    }
-  return SCM_BOOL_F;
-}
-
 LY_DEFINE (ly_assoc_get, "ly:assoc-get",
            2, 2, 0,
            (SCM key, SCM alist, SCM default_value, SCM strict_checking),
@@ -478,7 +466,7 @@ format_single_argument (SCM arg, int precision, bool escape = false)
 
       if (isnan (val) || isinf (val))
         {
-          warning (_ ("Found infinity or nan in output. Substituting 0.0"));
+          warning (_ ("Found infinity or nan in output.  Substituting 0.0"));
           return ("0.0");
           if (strict_infinity_checking)
             abort ();