From 1d18bf48f89d9fc16d7228e9e33e09d16577a2ba Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Sun, 24 Mar 2002 19:30:43 +0000
Subject: [PATCH] lilypond-0.0.28

---
 .dstreamrc     | 35 ++++++++++++++++++++++-------------
 src/colhpos.cc | 35 +++++++++++++++++++++++++++++++++++
 src/pcol.cc    |  2 +-
 3 files changed, 58 insertions(+), 14 deletions(-)
 create mode 100644 src/colhpos.cc

diff --git a/.dstreamrc b/.dstreamrc
index 5ca2fa850c..088fbcc81a 100644
--- 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
index 0000000000..530e4d4483
--- /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 4c9ef91afc..54e177f486 100644
--- 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;
 }
 
-- 
2.39.5