From 564616ff8acf931598b0a0f364eaff58440d51ee Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Fri, 27 Feb 2004 09:26:42 +0000 Subject: [PATCH] * input/test/chord-names-jazz.ly: * input/test/embedded-scm.ly: Clarify. * input/test/cautionaries.ly: Typo. * lily/input-smob.cc (ly_input_location): Compile fix. --- ChangeLog | 9 ++++++ input/test/cautionaries.ly | 2 +- input/test/chord-names-jazz.ly | 54 ++++++++++++++++++++-------------- input/test/count-systems.ly | 10 +++++++ input/test/embedded-scm.ly | 28 +++++++++++------- lily/input-smob.cc | 6 ++-- 6 files changed, 73 insertions(+), 36 deletions(-) diff --git a/ChangeLog b/ChangeLog index d5922f7d99..f1b65a8341 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-02-27 Jan Nieuwenhuizen + + * input/test/chord-names-jazz.ly: + * input/test/embedded-scm.ly: Clarify. + + * input/test/cautionaries.ly: Typo. + + * lily/input-smob.cc (ly_input_location): Compile fix. + 2004-02-27 Han-Wen Nienhuys * make/lilypond.redhat.spec.in (Group): add/delete music-glossary too. diff --git a/input/test/cautionaries.ly b/input/test/cautionaries.ly index 36a2f946d8..75d1c3b06b 100644 --- a/input/test/cautionaries.ly +++ b/input/test/cautionaries.ly @@ -1,7 +1,7 @@ \version "2.1.26" \header{ texidoc="@cindex Cautionary Accidentals -Cautinary accidnetals are displayed in slurs by default. They can be +Cautinary accidentals are displayed in slurs by default. They can be shown also with accidentals of smaller size. " } \score { \notes \context Staff \transpose c c'' { diff --git a/input/test/chord-names-jazz.ly b/input/test/chord-names-jazz.ly index 16a75957d7..8ce5263cbe 100644 --- a/input/test/chord-names-jazz.ly +++ b/input/test/chord-names-jazz.ly @@ -5,8 +5,11 @@ texidoc = " Chord names are generated from a list pitches. The functions which construct these names can be customised. Here are shown -Jazz chords, following Ignatzek (pp. 17-18, 1995), Banter chords, -and an alternative Jazz chord notation. +Jazz chords, following Ignatzek (pp. 17-18, 1995) and +an alternative Jazz chord notation. + +Chords following Banter (1987) can also be printed from this file, but +are turned off for brevity. " @@ -95,18 +98,14 @@ epartialmusicJazzAlt = \notes{ epartialJazzAlt = #(sequential-music-to-chord-exceptions epartialmusicJazzAlt #f) -jazzAltProperties = - -\sequential { - \set majorSevenSymbol = #whiteTriangleMarkup - \set chordNameSeparator = #(make-simple-markup "/") - \set chordNameExceptionsFull = #efullJazzAlt - \set chordNameExceptionsPartial = #epartialJazzAlt - \set chordNameFunction = #jazz-chord-names +jazzAltProperties = \sequential { + \set majorSevenSymbol = #whiteTriangleMarkup + \set chordNameSeparator = #(make-simple-markup "/") + \set chordNameExceptionsFull = #efullJazzAlt + \set chordNameExceptionsPartial = #epartialJazzAlt + \set chordNameFunction = #jazz-chord-names } -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - banterProperties = \sequential { \set chordNameFunction = #banter-chord-names } @@ -116,26 +115,37 @@ banterProperties = \sequential { \new ChordNames { \set instrument = #"Ignatzek (default)" \set instr = #"Def" - \chs } + \chs + } + \new ChordNames { + \jazzAltProperties \set instrument = #"Alternative" \set instr = #"Alt" - \jazzAltProperties - \chs } + \chs + } - % This is the banter style. - % it gives exceedingly verbose (wide) names - % making this file take up to 4 pages. - %{ - \new ChordNames { + + %% This is the Banter (1987) style. It gives exceedingly + %% verbose (wide) names, making the output file take up to 4 pages. + %% (FIXME: how big is is now?) + %% Turned off by default. + + %% FIXME: use smaller font for Banter (or remove some esoteric + %% chords). + + \new ChordNames { \banterProperties + \set instrument = #"Banter" + \set instr = #"Ban" \chs - } + } %} + \new Staff \notes \transpose c c' { \chs } >> - \paper{ + \paper { indent = 3.\cm \translator { \ChordNamesContext diff --git a/input/test/count-systems.ly b/input/test/count-systems.ly index 4f3fb803ce..37a612a4b1 100644 --- a/input/test/count-systems.ly +++ b/input/test/count-systems.ly @@ -7,9 +7,19 @@ The function which controls the printing of the system number may be also overridden to print, for example, the number of systems or the system number of a grob. " } + % Original comment has no sense? -HJJ: % This can be most useful to assertain that a piece uses a specified number of lines. +%% What is the problem? -- jcn: +%% See, eg, input/mutopia/J.S.Bach/baerenreiter-sarabande.ly for +%% an application: + +%% We want this to perfectly match the Baerenreiter spacing. +%% If we're not using 6 systems, there's definately a problem. +%% #(define (assert-system-count smob n) ... + + #(define (display-systemno smob) (let* ((this-system (ly:grob-system smob)) (systems (ly:spanner-broken-into diff --git a/input/test/embedded-scm.ly b/input/test/embedded-scm.ly index c052c6a38b..46bed5bda1 100644 --- a/input/test/embedded-scm.ly +++ b/input/test/embedded-scm.ly @@ -1,14 +1,22 @@ - \version "2.1.26" -% TODO: does this work? It doesn't do anything with 1.7.20 -% Still does not work. 2.1.26 -HJJ -\header {texidoc="@cindex Embedded scm -You can embed scm functions in your scores. -"} - -#(begin (newline)(display "hello world")(newline))\score{ - \notes\relative c'{ c } -\paper{raggedright = ##t} +\header { + + texidoc = "@cindex Embedded scm + +You can embed scheme functions in your scores. While processing this +file, ``hello world'' is printed to the console. +" + % see also: --safe-mode +} + +#(begin + (newline) + (display "hello world") + (newline)) + +\score { + \notes\relative c' { c } + \paper {raggedright = ##t} } diff --git a/lily/input-smob.cc b/lily/input-smob.cc index 6eb47a7dd0..fafeab7b7d 100644 --- a/lily/input-smob.cc +++ b/lily/input-smob.cc @@ -98,9 +98,9 @@ LY_DEFINE (ly_input_location, "ly:input-location", 1, 0, 0, (SCM sip), { Input *ip = unsmob_input (sip); SCM_ASSERT_TYPE (ip, sip, SCM_ARG1, __FUNCTION__, "input location"); - return scm_list3 (scm_makfrom0str (ip->file_string ().to_str0 ()), - scm_int2num (ip->line_number ()), - scm_int2num (ip->column_number ())); + return scm_list_3 (scm_makfrom0str (ip->file_string ().to_str0 ()), + scm_int2num (ip->line_number ()), + scm_int2num (ip->column_number ())); } ADD_SCM_INIT_FUNC (input, start_input_smobs); -- 2.39.2