* input/mutopia/F.Schubert/standchen.ly (trebleThrough): fixes

* lily/simultaneous-music.cc (to_relative_octave): add Event_chord.

* lily/parser.yy (pre_events): remove prefix articulations.

* lily/music-sequence.cc (do_relative_octave): change relative meaning.

diff --git a/ChangeLog b/ChangeLog
index e28a6f553b5f842a197c7d4d2afa11daf2fae33b..2f5a8e90037efcbee21331617f8bac62ed78f7cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
 2003-08-21  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * input/mutopia/F.Schubert/standchen.ly (trebleThrough): fixes
+
+       * lily/simultaneous-music.cc (to_relative_octave): add Event_chord.
+
        * lily/music.cc (var): add ly:music-transpose function.
 
-       * Lily/parser.yy (pre_events): remove prefix articulations.
+       * lily/parser.yy (pre_events): remove prefix articulations.
 
        * lily/music-sequence.cc (do_relative_octave): change relative meaning.
 

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 83eecd00827e82d61d229759e5145136dbe928ce..703d4f177f52345c35d352c0a841d8dacd446c65 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -151,5 +151,5 @@ $(config_h): configure.in aclocal.m4
 # maybe move into private script?
 rsync-web:
        cd out-www &&  mkdir web && tar  -xzf web.tar.gz -C web
-       cd out-www/web &&  rsync --delete --stats --progress -rltvu -e ssh . x:/var/www/lilypond/doc/v1.8/
+       cd out-www/web &&  rsync --delete --stats --progress -rltvu -e ssh . x:/var/www/lilypond/doc/v1.9/
        cd out-www && rm -rf web/

diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly
index 6f8343515528be74eab9bcfedd2b791cc0932556..1d510340ec55d3a4deb56981995edb41c1d37316 100644 (file)
--- a/input/mutopia/F.Schubert/standchen.ly
+++ b/input/mutopia/F.Schubert/standchen.ly
@@ -152,15 +152,23 @@ trebleVerseOne =  \notes\relative c{
        r8 <<f g b>> <<g b d>> <<f g b>> <<g b d>> <<f g b>> |
        r8 <<es g c>> <<g c es>> <<es g c>> <<g c es>> <<es g c>> |
        <<g'' b,>>4.-( <<f d>>8-)
-       \times 2/3 < {  f-[( es  d-) ] } { d c b } > |
+       \times 2/3 { <<f d>>-(-[ <<es c>>-]-) <<d b>> }
+
        %10
        <<c es>>2. |
        r8 <<g, c>> <<c es>> <<g c>> <<c es>> <<g c>> |
        r8 <<f c'>> <<c' d>> <<f, c'>> <<c' d>> <<f, c'>> |
        r8 <<f as bes>> <<as bes d>> <<f as bes>> <<as bes d>> <<f as bes>> |
-       r8 < {  es-[ g es g ] } { g bes g bes } { bes es bes es } >
-       <{ es'(  d4.-)( f8-)}{ c' | bes4.  as8 } >
-       \times 2/3 < {  f-[( es  d-) ] } { as' g f } > |
+       r8
+       <<es g bes>>-[
+       <<g bes es>>
+       <<es g bes>>
+       <<g bes es>>-]
+       <<es' c'>>-(
+       <<d bes>>4.-(-)
+       <<f as>>8-)
+       
+       \times 2/3 { <<f as>>-(-[ <<es g>> <<d f>>-)-] }
        %16
        <<es g>>2. |
        r8 <<f, g>> <<g b>> <<f g>> <<g b>> <<f g>> |
@@ -169,15 +177,16 @@ trebleVerseOne =  \notes\relative c{
        %20
        r8 <<es g bes>> <<g bes es>> <<es g bes>> <<g bes es>> <<es g bes>> |
        \property Voice.Slur \override #'attachment = #'(stem . stem)
-       \grace {  as'32-[( bes ] } \times 2/3 {  as8-[-)( g as] } c4.->  as8-) |
+       \grace {  as'32-[( bes ] }
+       \times 2/3 {  as8-[-)( g as] } c4.->  as8-) |
        \property Voice.Slur \revert #'attachment
        g2. |
        r8 <<f, g>> <<g b>> <<f g>> <<g b>> <<f g>> |
        r8 <<e g>> <<g c>> <<e g>> <<g c>> <<e g>> |
        r8 <<f a c>> <<a c f>> <<f a c>> <<a c f>> <<f a c>> |
        r8 <<e g c>> <<g c e>> <<e g c>> <<g c e>> <<e g c>> |
-       \times 2/3 < {  f'8-[-\f( e f] } {  f' e f } >
-       < {a4.- >  f8-)}  { a'4. f8 }  > |
+       \times 2/3  { <<f f'>>-\f-( <<e e'>> <<f f'>> }
+       <<a a'>>4.-> <<f f'>>8-)  |
 }
 
 trebleEentje =  \notes \relative c' \context Voice {
@@ -227,7 +236,7 @@ trebleThrough =  \notes \relative c'{
        <<e e'>>2. |
        <<es! es'! >>2. |
        \property Voice . TextScript \override #'font-shape = #'italic
-       <d2._"decresc." d'> |
+       <<d d'>>2._"decresc."
        \property Voice . TextScript \revert #'font-shape
 
        %75
@@ -241,7 +250,7 @@ trebleThrough =  \notes \relative c'{
        %80
 
        \property Voice . TextScript \override #'font-shape = #'italic
-       <e2._"dim." g> |
+       <<e g>>_"dim."
        \property Voice . TextScript \revert #'font-shape
 
        <<g, e' g>>2. |
@@ -304,7 +313,7 @@ bassEentje =  \notes\relative c{
 bassThrough =  \notes\relative c{
        \dynamicUp
        %61
-       <g,8^"cresc." g'> [<<g' b d>> <<b d f>> <<g b d>> <<as! b d >>-> <<b d f>>] |
+       <<g, g'>>8^"cresc." [<<g' b d>> <<b d f>> <<g b d>> <<as! b d >>-> <<b d f>>] |
        <<g, g'>>8 [<<g' d'>> <<d' f>> <<g, d'>> <<as b d >>-> <<b d f>>] |
        % copied
        <<g, g'>>8 [<<g' d'>> <<d' f>> <<g, d'>> <<as b d >>-> <<b d f>>] |

diff --git a/lily/include/music-list.hh b/lily/include/music-list.hh
index 1d74ba0438dc40230efe45075da409116419c3e0..4c7707ede5da612525149f85ab271ce7745a2a0e 100644 (file)
--- a/lily/include/music-list.hh
+++ b/lily/include/music-list.hh
@@ -26,17 +26,14 @@ public:
   Simultaneous_music ();
 };
 
-/**
-  The event is a collection of Events. A note that you enter in lilypond is 
-  one Event_chord, one syllable of lyrics is one Event_chord
+/*
+  A chord.
  */
 class Event_chord : public Simultaneous_music
 {
 public:
   VIRTUAL_COPY_CONS (Music);
-  virtual Moment start_mom () const;
-
-  Event_chord ();
+  virtual Pitch to_relative_octave (Pitch);
 };
 
 /**

diff --git a/lily/music-sequence.cc b/lily/music-sequence.cc
index 1d967a3dde51731c1480fe88e7d64418c80d2b3e..cc9a1ed1c9be0ad531ac57703665940eb7bf460e 100644 (file)
--- a/lily/music-sequence.cc
+++ b/lily/music-sequence.cc
@@ -100,12 +100,7 @@ Music_sequence::do_relative_octave (Pitch p, bool ret_first)
   Pitch last = p;
   for (SCM s = music_list (); gh_pair_p (s);  s = ly_cdr (s))
     {
-      Music *m = unsmob_music (ly_car (s));
-      if (!m)
-       {
-         programming_error ("Music_sequence should only contain music!");
-       }
-      else
+      if (Music *m = unsmob_music (ly_car (s)))
        {
          last = m->to_relative_octave (last);
          if (!count ++)
@@ -113,15 +108,10 @@ Music_sequence::do_relative_octave (Pitch p, bool ret_first)
        }
     }
 
-  if (ret_first && first != last)
-    {
-      String str = _("Changing relative definition causes pitch change.");
-      str += "\nWas: " +  first.to_string ()
-       + "Will be: " + last.to_string () + "\n";
-      
-      origin()->warning (str);
-    }
-  return last;
+  if (ret_first)
+    return first;
+  else
+    return last;
 }
 
 void

diff --git a/lily/parser.yy b/lily/parser.yy
index 249bdbbe6e93334f669fd6ea116774933c233005..54f23241c158488f37b723d3876d0b1ab373d155 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -2129,11 +2129,12 @@ step_number:
 
 /*
        UTILITIES
+
+TODO: should deprecate in favor of Scheme?
+
  */
 number_expression:
        number_expression '+' number_term {
-
-               THIS->
                $$ = scm_sum ($1, $3);
        }
        | number_expression '-' number_term {

diff --git a/lily/simultaneous-music.cc b/lily/simultaneous-music.cc
index 108ba5dbb61d75d064b6d5d85ec33a803f1d66be..aa7ecd40f9669851127d78c78eee3566c9021ee8 100644 (file)
--- a/lily/simultaneous-music.cc
+++ b/lily/simultaneous-music.cc
@@ -1,7 +1,6 @@
-
+#include "input.hh"
 #include "moment.hh"
 #include "pitch.hh"
-#include "simultaneous-music-iterator.hh"
 #include "music-list.hh"
 
 Moment
@@ -21,9 +20,44 @@ Simultaneous_music::Simultaneous_music()
 
 }
 
+/*
+  Cut & paste from Music_sequence, (ugh) , but we must add an error
+  message.
+ */
 Pitch
 Simultaneous_music::to_relative_octave (Pitch p)
 {
-  return do_relative_octave (p, true);
+  Pitch first;
+  int count=0;
+
+  Pitch last = p;
+  for (SCM s = music_list (); gh_pair_p (s);  s = ly_cdr (s))
+    {
+      if (Music *m = unsmob_music (ly_car (s)))
+       {
+         last = m->to_relative_octave (last);
+         if (!count ++)
+           first = last;
+       }
+    }
+
+  if (count && first != last)
+    {
+      String str = _("Changing relative definition causes pitch change.");
+      str += "\nWas: " +  first.to_string ()
+       + " -- now returning: " + last.to_string () + "\n";
+      
+      origin()->warning (str);
+    }
+
+  return last;
 }
+
 ADD_MUSIC (Simultaneous_music);
+
+Pitch
+Event_chord::to_relative_octave (Pitch p)
+{
+  return do_relative_octave (p, true);
+}
+ADD_MUSIC(Event_chord);

diff --git a/scm/define-music-types.scm b/scm/define-music-types.scm
index 0b758bc901a3c00dabee2657f66af2be68d74aa2..1eabfbe00f7d86cc1f04c314ab5259d6049d7a5f 100644 (file)
--- a/scm/define-music-types.scm
+++ b/scm/define-music-types.scm
@@ -484,8 +484,7 @@ For example, transposed music.")
     (EventChord
      . (
        (description .  "Internally used to group a set of events.")
-
-       (internal-class-name . "Simultaneous_music")
+       (internal-class-name . "Event_chord")
        (iterator-ctor . ,Event_chord_iterator::constructor)
        (types . (general-music event-chord simultaneous-music))
        )