X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Flily-guile.cc;h=fea8836250486100480bb20aa99adf45f07f40ab;hb=09572e4c45444e78bef63eb92254f292b9f046a9;hp=9f62fbb670096940e457dda8c8c79bfda6544e61;hpb=41d87651a93844bceca9a8ccb6417642aca24457;p=lilypond.git diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 9f62fbb670..fea8836250 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -1,10 +1,21 @@ /* - lily-guile.cc -- implement assorted SCM interface functions + This file is part of LilyPond, the GNU music typesetter. - source file of the GNU LilyPond music typesetter - - (c) 1998--2007 Jan Nieuwenhuizen + Copyright (C) 1998--2010 Jan Nieuwenhuizen Han-Wen Nienhuys + + LilyPond is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + LilyPond is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with LilyPond. If not, see . */ #include "lily-guile.hh" @@ -89,7 +100,7 @@ gulp_file_to_string (string fn, bool must_exist, int size) string result (&chars[0], chars.size ()); if (be_verbose_global) - progress_indication ("]"); + progress_indication ("]\n"); return result; } @@ -561,15 +572,16 @@ robust_scm2int (SCM k, int o) SCM ly_rational2scm (Rational r) { - return scm_divide (scm_from_int (r.numerator ()), scm_from_int (r.denominator ())); + return scm_divide (scm_from_int64 (r.numerator ()), + scm_from_int64 (r.denominator ())); } Rational ly_scm2rational (SCM r) { - return Rational (scm_to_int (scm_numerator (r)), - scm_to_int (scm_denominator (r))); + return Rational (scm_to_int64 (scm_numerator (r)), + scm_to_int64 (scm_denominator (r))); } Rational