X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Finput-scheme.cc;h=4c771f0049b538ad63b90dc6d341fa9a74304ee3;hb=dbf55d6ee960e31cd339e25d7d75439279be503f;hp=c9f257c5b68ba345cdde822acfc1ad81187f1973;hpb=c1e549802b23c458bcd808c6edcc6f8dfcd6fd68;p=lilypond.git diff --git a/lily/input-scheme.cc b/lily/input-scheme.cc index c9f257c5b6..4c771f0049 100644 --- a/lily/input-scheme.cc +++ b/lily/input-scheme.cc @@ -1,10 +1,9 @@ /* - input-scheme.cc -- implement Input bindings. + input-scheme.cc -- implement Input bindings. source file of the GNU LilyPond music typesetter (c) 2005 Han-Wen Nienhuys - */ #include "string.hh" @@ -20,7 +19,7 @@ LY_DEFINE (ly_input, "ly:input-location?", 1, 0, 0, } LY_DEFINE (ly_input_message, "ly:input-message", 2, 0, 0, (SCM sip, SCM msg), - "Print @var{msg} as a GNU compliant error message, pointing to the" + "Print @var{msg} as a GNU compliant error message, pointing to the" "location in @var{sip}.\n") { Input *ip = unsmob_input (sip); @@ -33,11 +32,8 @@ LY_DEFINE (ly_input_message, "ly:input-message", 2, 0, 0, (SCM sip, SCM msg), return SCM_UNSPECIFIED; } -/* - TODO: rename this function. ly:input-location? vs ly:input-location - */ -LY_DEFINE (ly_input_location, "ly:input-location", 1, 0, 0, (SCM sip), - "Return input location in @var{sip} as (file-name line column).") +LY_DEFINE (ly_input_file_line_column, "ly:input-file-line-column", 1, 0, 0, (SCM sip), + "Return input location in @var{sip} as (file-name line column).") { Input *ip = unsmob_input (sip); SCM_ASSERT_TYPE (ip, sip, SCM_ARG1, __FUNCTION__, "input location"); @@ -47,7 +43,7 @@ LY_DEFINE (ly_input_location, "ly:input-location", 1, 0, 0, (SCM sip), } LY_DEFINE (ly_input_both_locations, "ly:input-both-locations", 1, 0, 0, (SCM sip), - "Return input location in @var{sip} as (file-name first-line first-column last-line last-column).") + "Return input location in @var{sip} as (file-name first-line first-column last-line last-column).") { Input *ip = unsmob_input (sip); SCM_ASSERT_TYPE (ip, sip, SCM_ARG1, __FUNCTION__, "input location");