From: fred <fred>
Date: Sun, 24 Mar 2002 19:30:18 +0000 (+0000)
Subject: lilypond-0.0.28
X-Git-Tag: release/1.5.59~5473
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=2701f779e905cfdff439c7cb6b79084927a95d3f;p=lilypond.git

lilypond-0.0.28
---

diff --git a/hdr/colhpos.hh b/hdr/colhpos.hh
new file mode 100644
index 0000000000..d06657485f
--- /dev/null
+++ b/hdr/colhpos.hh
@@ -0,0 +1,29 @@
+/*
+  colhpos.hh -- part of LilyPond
+
+  (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+*/
+
+#ifndef COLHPOS_HH
+#define COLHPOS_HH
+#include "varray.hh"
+#include "proto.hh"
+
+typedef Array<PCol*>  Line_of_cols;
+
+struct Col_hpositions {
+    Line_of_cols cols;
+    Array<Real> config;
+    Real energy;
+
+    /****************/
+    void OK()const;
+
+    Col_hpositions();
+    void add( PCol*c);
+    void print() const;
+};
+
+
+#endif // COLHPOS_HH
+
diff --git a/hdr/proto.hh b/hdr/proto.hh
index 4987a70547..1ef4d8d9f2 100644
--- a/hdr/proto.hh
+++ b/hdr/proto.hh
@@ -23,7 +23,7 @@ struct CNote_info;
 struct Chord;
 struct Clef;
 struct Clef_item;
-struct Col_configuration;
+struct Col_hpositions;
 struct Colinfo;
 struct Command;
 struct Commands_at ;
@@ -90,8 +90,10 @@ struct Slur;
 struct Slur_req;
 class Source;
 class Source_file;
+struct Spacing_req ;
 struct Span_req;
 struct Spanner;
+struct Blank_req;
 struct Staff;
 struct Staff_column;
 struct Staff_command_req;
diff --git a/hdr/pscore.hh b/hdr/pscore.hh
index f796247353..3b47c65e44 100644
--- a/hdr/pscore.hh
+++ b/hdr/pscore.hh
@@ -3,7 +3,7 @@
 #ifndef PSCORE_HH
 #define PSCORE_HH
 
-#include "break.hh"
+#include "colhpos.hh"
 #include "varray.hh"
 #include "pcol.hh"
 #include "pstaff.hh"
@@ -38,7 +38,7 @@ struct PScore {
     
     PScore(Paperdef*);
     /// add a line to the broken stuff. Positions given in #config#
-    void set_breaking(Array<Col_configuration>);
+    void set_breaking(Array<Col_hpositions>);
 
     void add(PStaff *);