Merge branch 'master' into nested-bookparts

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

diff --git a/lily/include/lily-parser.hh b/lily/include/lily-parser.hh
index e9a42109e0bb7dae12ea1d5bfa548de29b9b6789..c73f8f7991faedd86fd1d7243895dfa0c006fbf0 100644 (file)
--- a/lily/include/lily-parser.hh
+++ b/lily/include/lily-parser.hh
@@ -30,7 +30,7 @@ class Lily_parser
   Simultaneous_music *get_chord (Pitch tonic,
                                 vector<Pitch> *adds, vector<Pitch> *subs,
                                 Pitch *inversion, Pitch *bass, Duration d);
-  void set_chord_tremolo (int type_i);
+  void set_chord_tremolo (int type);
   void set_last_duration (Duration const *);
   void set_last_pitch (Pitch const *);
 
@@ -74,6 +74,9 @@ SCM ly_parser_scorify (SCM, SCM);
 Output_def *get_layout (Lily_parser *parser);
 Output_def *get_midi (Lily_parser *parser);
 Output_def *get_paper (Lily_parser *parser);
+void stack_paper (Lily_parser *parser, Output_def *paper);
+void unstack_paper (Lily_parser *parser);
+void set_paper (Lily_parser *parser, Output_def *paper);
 SCM get_header (Lily_parser *parser);
 
 #endif /* LILY_PARSER_HH */