resolve merge

[lilypond.git] / lily / include / lily-proto.hh

diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh
index 40df1bfab3461ff7a74a93115f224ee6ee99b2cc..5cde918e3f9401bb5bda86cddb152410ab828545 100644 (file)
--- a/lily/include/lily-proto.hh
+++ b/lily/include/lily-proto.hh
@@ -1,9 +1,20 @@
 /*
-  lily-proto.hh -- declare class names.
+  This file is part of LilyPond, the GNU music typesetter.
 
-  source file of the GNU LilyPond music typesetter
+  Copyright (C) 1997--2011 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
-  (c) 1997--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef LILY_PROTO_HH
@@ -31,6 +42,9 @@ class Axis_group_engraver;
 class Bar_engraver;
 class Bar_req_collect_engraver;
 class Beaming_pattern;
+class Beam_scoring_problem;
+class Beam_configuration;
+class Beam_quant_parameters;
 class Bezier;
 class Bezier_bow;
 class Book;
@@ -43,6 +57,7 @@ class Cluster_engraver;
 class Column_x_positions;
 class Context;
 class Context_def;
+class Context_mod;
 class Context_specced_music;
 class Dispatcher;
 class Dot_column;
@@ -117,9 +132,6 @@ class Music_wrapper;
 class Music_wrapper_iterator;
 class Note_performer;
 class Output_def;
-class Object_key;
-class Object_key_dumper;
-class Object_key_undumper;
 class Open_type_font;
 class Output_property;
 class Page_breaking;
@@ -141,6 +153,7 @@ class Relative_octave_music;
 class Repeated_music;
 class Scale;
 class Scheme_hash_table;
+class Scheme_engraver;
 class Score;
 class Score_context;
 class Score_engraver;
@@ -166,8 +179,6 @@ class Staff_group_bar_engraver;
 class Staff_performer;
 class Stencil;
 class Stream_event;
-class Swallow_engraver;
-class Swallow_performer;
 class System;
 class Tempo_performer;
 class Tie;
@@ -185,10 +196,10 @@ class Translator;
 class Translator_change;
 class Translator_group;
 class Transposed_music;
-class Type_swallow_translator;
 class yyFlexLexer;
 
-typedef void (*Engraver_void_function_engraver_grob_info) (Engraver *, Grob_info);
+typedef void (*Engraver_void_function_engraver_grob_info) (Engraver *,
+                                                          Grob_info);
 typedef void (*Translator_void_method_ptr) (Translator *);
 
 #endif /* LILY_PROTO_HH */