CVSROOT:        /cvsroot/lilypond
Module name:    lilypond
Branch:         
Changes by:     Han-Wen Nienhuys <[EMAIL PROTECTED]>    05/08/18 14:55:12

Modified files:
        input          : les-nereides.ly 
        input/test     : engraver-one-by-one.ly staff-container.ly 
                         time-signature-staff.ly 
        lily           : translator-group-ctors.cc 
Added files:
        lily           : engraver-group.cc performer-group.cc 
Removed files:
        lily           : engraver-group-engraver.cc 
                         performer-group-performer.cc 

Log message:
        

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/les-nereides.ly.diff?tr1=1.78&tr2=1.79&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/test/engraver-one-by-one.ly.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/test/staff-container.ly.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/test/time-signature-staff.ly.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/engraver-group.cc.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/performer-group.cc?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/translator-group-ctors.cc.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: lilypond/input/les-nereides.ly
diff -u lilypond/input/les-nereides.ly:1.78 lilypond/input/les-nereides.ly:1.79
--- lilypond/input/les-nereides.ly:1.78 Thu Aug 18 10:23:15 2005
+++ lilypond/input/les-nereides.ly      Thu Aug 18 14:55:12 2005
@@ -260,7 +260,7 @@
            \remove Bar_number_engraver
         }
        \context {
-           \type "Engraver_group_engraver"
+           \type "Engraver_group"
            \name Dynamics
            \consists "Output_property_engraver"
            minimumVerticalExtent = #'(-1 . 1)
Index: lilypond/input/test/engraver-one-by-one.ly
diff -u lilypond/input/test/engraver-one-by-one.ly:1.28 
lilypond/input/test/engraver-one-by-one.ly:1.29
--- lilypond/input/test/engraver-one-by-one.ly:1.28     Sun Jun 26 22:46:56 2005
+++ lilypond/input/test/engraver-one-by-one.ly  Thu Aug 18 14:55:12 2005
@@ -1,5 +1,5 @@
 
-\version "2.6.0"
+\version "2.7.6"
 \header {
     
 texidoc = "The notation problem, creating a certain symbol,
@@ -32,7 +32,7 @@
 %
 
 MyStaff =\context {
-       \type "Engraver_group_engraver"
+       \type "Engraver_group"
        \name Staff
 
        \description "Handles clefs, bar lines, keys, accidentals.  It can 
contain
@@ -73,7 +73,7 @@
 
 
 MyVoice = \context {
-       \type "Engraver_group_engraver"
+       \type "Engraver_group"
        \name Voice
 
 \description "
Index: lilypond/input/test/staff-container.ly
diff -u lilypond/input/test/staff-container.ly:1.38 
lilypond/input/test/staff-container.ly:1.39
--- lilypond/input/test/staff-container.ly:1.38 Sun Jun 26 22:46:56 2005
+++ lilypond/input/test/staff-container.ly      Thu Aug 18 14:55:12 2005
@@ -1,4 +1,4 @@
-\version "2.6.0"
+\version "2.7.6"
 
 \header {
 
@@ -43,7 +43,7 @@
            \denies Staff
        }
        \context {
-           \type Engraver_group_engraver
+           \type Engraver_group
            \consists Clef_engraver
            \consists Time_signature_engraver
            \consists Separating_line_group_engraver
Index: lilypond/input/test/time-signature-staff.ly
diff -u lilypond/input/test/time-signature-staff.ly:1.1 
lilypond/input/test/time-signature-staff.ly:1.2
--- lilypond/input/test/time-signature-staff.ly:1.1     Wed Aug  3 13:03:57 2005
+++ lilypond/input/test/time-signature-staff.ly Thu Aug 18 14:55:12 2005
@@ -6,14 +6,14 @@
   used contemporary pieces with many time signature changes.  "
 
 }
-\version "2.6.0"
+\version "2.7.6"
 \layout {
   raggedright =  ##T
 }
 
 \layout{
   \context { 
-    \type "Engraver_group_engraver"
+    \type "Engraver_group"
     \consists "Time_signature_engraver"
     \consists "Axis_group_engraver"
     \name "TimeSig"
Index: lilypond/lily/translator-group-ctors.cc
diff -u lilypond/lily/translator-group-ctors.cc:1.3 
lilypond/lily/translator-group-ctors.cc:1.4
--- lilypond/lily/translator-group-ctors.cc:1.3 Thu Aug 18 11:40:22 2005
+++ lilypond/lily/translator-group-ctors.cc     Thu Aug 18 14:55:12 2005
@@ -11,6 +11,7 @@
 #include "engraver-group-engraver.hh"
 #include "performer-group-performer.hh"
 #include "recording-group-engraver.hh"
+#include "warn.hh"
 
 /*
   Quick & dirty.
@@ -29,6 +30,11 @@
   else if (sym == ly_symbol2scm ("Recording_group_engraver"))
     return new Recording_group_engraver ();
 
+  programming_error ("Couldn't find type");
+  scm_flush (scm_current_error_port ());
+  scm_display (sym, scm_current_error_port ());
+  scm_flush (scm_current_error_port ());
+  
   assert (0);
   return 0;
 }


_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs

Reply via email to