From b09659cdb8a55eaed217db00cf8f5f578300f3be Mon Sep 17 00:00:00 2001 From: hanwen Date: Thu, 18 Aug 2005 14:55:12 +0000 Subject: [PATCH] *** empty log message *** --- input/les-nereides.ly | 2 +- input/test/engraver-one-by-one.ly | 6 +++--- input/test/staff-container.ly | 4 ++-- input/test/time-signature-staff.ly | 4 ++-- lily/{engraver-group-engraver.cc => engraver-group.cc} | 0 lily/{performer-group-performer.cc => performer-group.cc} | 0 lily/translator-group-ctors.cc | 6 ++++++ 7 files changed, 14 insertions(+), 8 deletions(-) rename lily/{engraver-group-engraver.cc => engraver-group.cc} (100%) rename lily/{performer-group-performer.cc => performer-group.cc} (100%) diff --git a/input/les-nereides.ly b/input/les-nereides.ly index 73ff6b60de..dea383a68c 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -260,7 +260,7 @@ theScore = \score{ \remove Bar_number_engraver } \context { - \type "Engraver_group_engraver" + \type "Engraver_group" \name Dynamics \consists "Output_property_engraver" minimumVerticalExtent = #'(-1 . 1) diff --git a/input/test/engraver-one-by-one.ly b/input/test/engraver-one-by-one.ly index 47f06bd859..694f84ac6b 100644 --- a/input/test/engraver-one-by-one.ly +++ b/input/test/engraver-one-by-one.ly @@ -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 @@ Staff context. % 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 @@ MyStaff =\context { MyVoice = \context { - \type "Engraver_group_engraver" + \type "Engraver_group" \name Voice \description " diff --git a/input/test/staff-container.ly b/input/test/staff-container.ly index 218693bc02..00c13dc796 100644 --- a/input/test/staff-container.ly +++ b/input/test/staff-container.ly @@ -1,4 +1,4 @@ -\version "2.6.0" +\version "2.7.6" \header { @@ -43,7 +43,7 @@ what you would expect.) \denies Staff } \context { - \type Engraver_group_engraver + \type Engraver_group \consists Clef_engraver \consists Time_signature_engraver \consists Separating_line_group_engraver diff --git a/input/test/time-signature-staff.ly b/input/test/time-signature-staff.ly index e176c9cc7d..a58cf37a17 100644 --- a/input/test/time-signature-staff.ly +++ b/input/test/time-signature-staff.ly @@ -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" diff --git a/lily/engraver-group-engraver.cc b/lily/engraver-group.cc similarity index 100% rename from lily/engraver-group-engraver.cc rename to lily/engraver-group.cc diff --git a/lily/performer-group-performer.cc b/lily/performer-group.cc similarity index 100% rename from lily/performer-group-performer.cc rename to lily/performer-group.cc diff --git a/lily/translator-group-ctors.cc b/lily/translator-group-ctors.cc index 529a60184b..0f9656d8cd 100644 --- a/lily/translator-group-ctors.cc +++ b/lily/translator-group-ctors.cc @@ -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 @@ get_translator_group (SCM sym) 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; } -- 2.39.2