* 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.

diff --git a/ChangeLog b/ChangeLog
index d5922f7d99a170ad6ce0c582182e3b9e4e7b4760..f1b65a8341b99146db84cfc01a9689bdb709d9fa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-02-27  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * 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   <hanwen@xs4all.nl>
 
        * make/lilypond.redhat.spec.in (Group): add/delete music-glossary too. 

diff --git a/input/test/cautionaries.ly b/input/test/cautionaries.ly
index 36a2f946d89454fb3ec13a8f1d8ed354463869c1..75d1c3b06b8d510508e96159b317d23681ffe5cc 100644 (file)
--- 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 16a75957d7fc975309bb3ba90f4c7fb48a17e38d..8ce5263cbe63bcb74ff4552fd6ae87f19a1d9fc9 100644 (file)
--- 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 4f3fb803ce67705d674399ff3591e3fbc653230f..37a612a4b1d156393531e1f13168bbcf973b52ea 100644 (file)
--- 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 c052c6a38bbf7739261959f1edd2d0cc07a28675..46bed5bda106daf8fcc55a1ab35d5309cdb06135 100644 (file)
--- 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 6eb47a7dd0124c6a97690004361bb8b2704e1658..fafeab7b7dc7879b895ba25de2e5d881a5c519dc 100644 (file)
--- 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);