lilypond-0.0.28

diff --git a/.dstreamrc b/.dstreamrc
index 5ca2fa850cd1aac38ca3dae767ed93c67456c1d6..088fbcc81a976d2d14b6b4d7b8a683b6dc8666c3 100644 (file)
--- a/.dstreamrc
+++ b/.dstreamrc
@@ -2,11 +2,11 @@
 
 My_flex_lexer          1
 yyFlexLexer            1
-PCol                   0
-Score_column           0
+PCol                   1
+Score_column           1
 Ineq_constrained_qp    1
-Spacing_problem        0
-Colinfo                        0
+Spacing_problem        1
+Colinfo                        1
 Mixed_qp               1
 PScore                 1
 Idealspacing           1
@@ -22,20 +22,29 @@ Lexer                       1
 parse_duration         1
 parse_pitchmod         1
 Col_configuration      1
-Request                        0
-Note_req               0
-Rhythmic_req           0
+Request                        1
+Note_req               1
+Rhythmic_req           1
 Rest_req               1
 delete_identifiers     1
 Command                        1
 Staff_commands         1
 Stem                   1
-Staff                  0
+Staff                  1
 Score                  1
-Voice                  0
-Voice_element          0
+Voice                  1
+Voice_element          1
 Input_cursor           1
-Commands_at            0
-Input_command          0
-Time_description       0
+Commands_at            1
+Input_command          1
+Time_description       1
 Melodic_req            1
+Stem_req               1
+Group_change_req       1
+Script_req             1
+Colinfo                        1
+Word_wrap              1
+Text_req               1
+Script_def             1
+Text_def               1
+Paperdef               1

diff --git a/src/colhpos.cc b/src/colhpos.cc
new file mode 100644 (file)
index 0000000..530e4d4
--- /dev/null
+++ b/src/colhpos.cc
@@ -0,0 +1,35 @@
+#include "colhpos.hh"
+#include "real.hh"
+#include "debug.hh"
+#include "const.hh"
+#include "vector.hh"
+
+Col_hpositions::Col_hpositions()
+{
+    energy = INFTY;
+}
+
+void
+Col_hpositions::add( PCol*c)
+{
+    cols.push(c);
+}
+
+void
+Col_hpositions::print() const
+{
+#ifndef NPRINT
+    mtor << "energy : " << energy << '\n';
+    mtor << "line of " << config.size() << " cols\n";
+    Vector v(config);
+    mtor << v;
+#endif
+}
+
+void
+Col_hpositions::OK()const
+{
+#ifndef NDEBUG
+    assert(config.size() == cols.size());
+#endif
+}

diff --git a/src/pcol.cc b/src/pcol.cc
index 4c9ef91afcb4de8169b0fd46c750b2e9569154c5..54e177f4860c30ee438f68303814be75e8c2f57d 100644 (file)
--- a/src/pcol.cc
+++ b/src/pcol.cc
@@ -97,7 +97,7 @@ PCol::PCol(PCol *parent)
     prebreak_p_=0;
     postbreak_p_=0;
     line_l_=0;
- 
+    hpos = -1.0;
     pscore_l_ = 0;
 }