From 00774a3ce169b64d8415878b419726e06638b8a0 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 14 May 1997 11:20:01 +0000 Subject: [PATCH] lilypond-0.0.62 --- lily/colhpos.cc | 1 + lily/include/colhpos.hh | 2 ++ lily/include/scoreline.hh | 1 + lily/scoreline.cc | 11 +++++++++++ make/lilypond.lsm | 6 +++--- 5 files changed, 18 insertions(+), 3 deletions(-) diff --git a/lily/colhpos.cc b/lily/colhpos.cc index 530e4d4483..e96b3f99ad 100644 --- a/lily/colhpos.cc +++ b/lily/colhpos.cc @@ -7,6 +7,7 @@ Col_hpositions::Col_hpositions() { energy = INFTY; + ugh_b_ = false; } void diff --git a/lily/include/colhpos.hh b/lily/include/colhpos.hh index 5398417ab1..c62b70e654 100644 --- a/lily/include/colhpos.hh +++ b/lily/include/colhpos.hh @@ -12,6 +12,8 @@ typedef Array Line_of_cols; struct Col_hpositions { + bool ugh_b_; + Line_of_cols error_col_l_arr_; Line_of_cols cols; Array config; Real energy; diff --git a/lily/include/scoreline.hh b/lily/include/scoreline.hh index 33bbc4a2d8..814cb7e8c2 100644 --- a/lily/include/scoreline.hh +++ b/lily/include/scoreline.hh @@ -15,6 +15,7 @@ struct Line_of_score { Pointer_list cols; + bool error_mark_b_; // need to store height of each staff. IPointer_list staffs; PScore * pscore_l_; // needed to generate staffs diff --git a/lily/scoreline.cc b/lily/scoreline.cc index 65c6546b5a..d1837b4a67 100644 --- a/lily/scoreline.cc +++ b/lily/scoreline.cc @@ -1,3 +1,11 @@ +/* + scoreline.cc -- implement Line_of_score + + source file of the LilyPond music typesetter + + (c) 1996, 1997 Han-Wen Nienhuys +*/ + #include "scoreline.hh" #include "staffline.hh" #include "dimen.hh" @@ -12,6 +20,8 @@ String Line_of_score::TeXstring() const { String s("\\vbox{%<- line of score\n"); + if (error_mark_b_) + s+= "\\scorelineerrormark"; for (iter_top(staffs,sc); sc.ok(); sc++){ s += sc->TeXstring(); if ((sc+1).ok()) @@ -25,6 +35,7 @@ Line_of_score::TeXstring() const Line_of_score::Line_of_score(Array sv, PScore *ps) { + error_mark_b_ = 0; pscore_l_ = ps; for (int i=0; i< sv.size(); i++) { PCol *p=(PCol *) sv[i]; diff --git a/make/lilypond.lsm b/make/lilypond.lsm index 00c79bcf92..ad7b4d70e2 100644 --- a/make/lilypond.lsm +++ b/make/lilypond.lsm @@ -2,8 +2,8 @@ Begin3 Title: LilyPond -Version: 0.0.61 -Entered-date: 05/12/97 +Version: 0.0.62 +Entered-date: 05/14/97 Description: LilyPond is a program which converts a music-script (mudela) into TeX output, or MIDI to produce multi-staff scores. Features include multiple meters, clefs, keys, lyrics, versatile input-language, cadenzas @@ -13,7 +13,7 @@ Author: hanwen@stack.nl (Han-Wen Nienhuys) jan@digicash.com (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: pcnov095.win.tue.nl /pub/lilypond/ - 300k lilypond-0.0.61.tar.gz + 300k lilypond-0.0.62.tar.gz Alternate-site: Original-site: Platform: unix/win32, GNU C++ -- 2.11.4.GIT