Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / lily / include / paper-score.hh

diff --git a/lily/include/paper-score.hh b/lily/include/paper-score.hh
index 3056b478aaa2ed952ca80bad1627fec2825d57d5..7f79aeb54873d172dc878c7cc053d750352bd0a4 100644 (file)
--- a/lily/include/paper-score.hh
+++ b/lily/include/paper-score.hh
@@ -19,6 +19,9 @@ class Paper_score : public Music_output
   System *system_;
   SCM systems_;
   SCM paper_systems_;
+
+  mutable vector<Grob*> cols_;
+  mutable vector<vsize> break_indices_;
 public:
   Paper_score (Output_def *);
   
@@ -28,9 +31,11 @@ public:
   System *root_system () const;
 
   void typeset_system (System *);
-  std::vector<Column_x_positions> calc_breaking ();
-
-  SCM get_paper_systems () const;
+  vector<Column_x_positions> calc_breaking ();
+  vector<vsize> find_break_indices () const;
+  vector<vsize> get_break_indices () const;
+  vector<Grob*> get_columns () const;
+  SCM get_paper_systems ();
 protected:
   virtual void process ();
   virtual void derived_mark () const;