(compose_ly): remove FRAGMENT_LY.

diff --git a/ChangeLog b/ChangeLog
index 75e179a36685253b64517ad72e4eca44b5218644..6c36f33e28b1b6649c11faa1795c282151aedf42 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-08  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * scripts/lilypond-book.py (compose_ly): remove FRAGMENT_LY.
+
 2004-05-08  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * input/regression/newaddlyrics.ly: Fix.
@@ -11,6 +15,8 @@
 
 2004-05-08  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * input/mutopia/R.Schumann/romanze-op28-2.ly (d): use #(define .. )
+
        * lily/paper-line.cc (Paper_line): don't store list of stencils,
        but convert to single Stencil immediately.
 

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 3c4548ca7de78d9e7c0c4650ed723451199d7f0d..aafa9faf6085f6a5dc4f58a72ee037097cd71da4 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -1387,7 +1387,7 @@ later by preceding the name with a backslash, i.e., @code{\namedMusic}.
 In the next example, a two-note motive is repeated two times by using
 variable substitution
 
-@lilypond[quote,raggedright,verbatim]
+@lilypond[quote,raggedright,verbatim,nofragment]
 seufzer = \notes {
   e'4( dis'4)
 }

diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly
index c211aa5c16b38f9a7cb6f61d51afc380895f40ff..2c0bac808a5da45abd81376daa98937424eb13ec 100644 (file)
--- a/input/mutopia/R.Schumann/romanze-op28-2.ly
+++ b/input/mutopia/R.Schumann/romanze-op28-2.ly
@@ -21,7 +21,11 @@
 
 u = { \change Staff = up  \stemDown }
 m = { \change Staff = mid  \stemUp  }
-d = { \change Staff = down  \stemUp }
+
+%
+% d = .. complains about note names.
+% 
+#(define d  #{ \change Staff = down  \stemUp #})
 
 forcedBreak = \break
 

diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly
index 5a14ef8b3041556834e65d84244c7f808b663802..1105926b2cffad6f32c4720165ef7e594c04ba81 100644 (file)
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly
@@ -1,4 +1,3 @@
-#(ly:set-option 'old-relative)
 \version "2.2.0"
 \include  "mozart-hrn3-defs.ly"
 

diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly
index 2508497ce9481a682d5b97eaf6a29418c3f5e29b..2e673d299b8646fcb66f9c1d514e0834bb4787be 100644 (file)
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly
@@ -1,5 +1,3 @@
-#(ly:set-option 'old-relative)
-
 \version "2.2.0"
 \include  "mozart-hrn3-defs.ly"
 

diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly
index 56052850317bcfd2c650865dc8aad4913d56022c..55c896f42b8172e554b8ebf89a290f7a74a7dc85 100644 (file)
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ly
@@ -1,4 +1,3 @@
-#(ly:set-option 'old-relative)
 \version "2.2.0"
 
 % \include "mozart-hrn3-defs.ly"

diff --git a/input/test/blank-paper.ly b/input/test/blank-paper.ly
index b81ebbb885735fa7169b6966678f45d892d2c574..fb614d6c30682c7d0d3ec5448d994e8a92e89027 100644 (file)
--- a/input/test/blank-paper.ly
+++ b/input/test/blank-paper.ly
@@ -8,14 +8,12 @@ A blank music paper can be produced also by using invisible notes, and removing
 " }
 
 
-\score \with {
+\new Score \with {
     \override TimeSignature #'transparent = ##t
     \override NoteHead #'transparent = ##t
     defaultBarType = #""
     \remove Bar_number_engraver
-}
-
-{
+} {
     %% \clef treble
     \clef bass 
     \repeat unfold 3 { c1 \break }

diff --git a/lily/relative-octave-music.cc b/lily/relative-octave-music.cc
index f6f20454d60fdef40449b5350dbf0a558e0e7d62..fde9c2f8351155f1ec1e1f4abf8392d1f1764e28 100644 (file)
--- a/lily/relative-octave-music.cc
+++ b/lily/relative-octave-music.cc
@@ -17,16 +17,14 @@ Relative_octave_music::to_relative_octave (Pitch p)
   if (lily_1_8_relative)
     {
       lily_1_8_compatibility_used = true;
-      /* ugh: last-pitch should  be junked.
-
-         Change this for lilypond 2.0.
-
-        FIXME: change WHAT?  We're at 2.3 already -- jcn
+      /*  last-pitch should be junked some time, when
+         we ditch 1.8 compat too.
 
         When you do, B should start where A left off.
 
        \relative { A \relative { ...} B }  */
-      return *unsmob_pitch (get_property ("last-pitch"));
+      Pitch *ptr = unsmob_pitch (get_property ("last-pitch"));
+      return (ptr) ?  *ptr : p;
     }
   else
     return p;

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index d9ecc14ac72e01298d5c791714a8c7fabd83ae73..fb055fa67f20badff9de8c5dfdc11b38142c525e 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -304,10 +304,10 @@ PREAMBLE_LY = r'''%%%% Generated by %(program_name)s
 }
 ''' 
 
-FRAGMENT_LY = r'''\score{
-    \notes%(notes_string)s{
+FRAGMENT_LY = r'''
+    %(notes_string)s{
         %(code)s    }
-}'''
+'''
 FULL_LY = '%(code)s'
 
 texinfo_linewidths = {