On Saturday, 14 August 1999, Michael Nyvang writes: > > I guess your problem was already fixed, but I'm currently > > looking at the dir: > > Yes thats a bitch > > > ftp://dev.linuxppc.org/users/fsirl/R5/RPMS/ppc/ > > > > but now to try gcc-2.95, myself. > > > > > > and did you get it ? Yes. > I just looked, and it looks like it is just fine now > but otherwise try this one > > ftp://devel.linuxppc.org/users/fsirl/R5/RPMS/ppc/ > > - hey, it is also still working, I wonder what they > are actually doing. They are sure having fun with > names. > > By the way do lilypond compile with gcc-2.95 ? Yes, after fixing some gcc-2.95 nitpicks; see below. It's amazing, release 0a looks good on powerpc. It seems they've done a fine job. Greetings, Jan. Generated by [EMAIL PROTECTED] using package-diff 0.62, >From = lilypond-1.2.0, To = lilypond-1.2.0.jcn1 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.2.0.jcn1.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure --state 1.2.0 1.2.0.jcn1 ++state diff -urN ../lilypond-1.2.0/BUGS ./BUGS --- ../lilypond-1.2.0/BUGS Thu Jul 15 00:20:26 1999 +++ ./BUGS Sat Aug 14 21:51:55 1999 @@ -1,6 +1,10 @@ This documents serious bugs +Send bug reports to [EMAIL PROTECTED] For help and questions use [EMAIL PROTECTED] and [EMAIL PROTECTED] Please consult +the faq before mailing your problems. + ******** [LinuxPPC-R5, egcs-1.1.2-12c] @@ -9,7 +13,7 @@ *dest++ = *src++; -Bug report filed, fixed in egcs-1.1.2-12f. +Bug report filed, fixed in egcs-1.1.2-12f or gcc-2.95-0a. Although we've currently got a workaround in place, the compiler is buggy; you should upgrade: diff -urN ../lilypond-1.2.0/Documentation/topdocs/INSTALL.yo ./Documentation/topdocs/INSTALL.yo --- ../lilypond-1.2.0/Documentation/topdocs/INSTALL.yo Wed Jul 28 17:56:02 1999 +++ ./Documentation/topdocs/INSTALL.yo Sat Aug 14 21:52:41 1999 @@ -305,6 +305,12 @@ Separate instructions on building for W32 are avaible url(in the file README-W32.yo)(../../DOEXPAND(outdir)/README-W32.html). +sect(BUGS) + +Send bug reports to [EMAIL PROTECTED] For help and questions use [EMAIL PROTECTED] and [EMAIL PROTECTED] Please consult +the faq before mailing your problems. + sect(AUTHORS) nemail(Han-Wen Nienhuys)([EMAIL PROTECTED]) diff -urN ../lilypond-1.2.0/Documentation/topdocs/README.yo ./Documentation/topdocs/README.yo --- ../lilypond-1.2.0/Documentation/topdocs/README.yo Wed Jul 28 17:56:02 1999 +++ ./Documentation/topdocs/README.yo Sat Aug 14 21:52:22 1999 @@ -90,6 +90,13 @@ a script to do this for you is in file(buildscripts/clean-fonts.sh) +sect(BUGS) + +Send bug reports to [EMAIL PROTECTED] For help and questions use [EMAIL PROTECTED] and [EMAIL PROTECTED] Please consult +the faq before mailing your problems. + + sect(CDROM DISTRIBUTIONS) If you have received LilyPond on a cdrom, chances are that development diff -urN ../lilypond-1.2.0/NEWS ./NEWS --- ../lilypond-1.2.0/NEWS Wed Jul 28 17:56:02 1999 +++ ./NEWS Sat Aug 14 21:53:12 1999 @@ -1,29 +1,3 @@ - -WHAT'S NEW? - -* Large cleanups, enhanced design and GUILE integration for smaller - memory footprint and more flexible code. - -* Direct output to PostScript (optional), PDFTeX or as GUILE script - (default output still to plain TeX). - -* Convertors for ABC and MUP formats. - -* Font: now available as scalable PostScript. New glyphs: time - signature, more note heads. - -* Enhanced input: semi-automatic beaming, (nested) tuplets, (nested) - repeats, chordnames, automatic Lyrics - durations. - -* Grace notes, volta brackets, multiple styles for note heads and - time signatures, breathing signs, lyric extenders, cross staff - beaming and slurring. - -* --safe option for the paranoid. - -* More elegant spacing. Text is spaced exactly. - -* Lots of bugfixes. - - +pl 0.jcn1 + - gcc-2.95 nitpicks + - added pointers to mailing lists in toplevel docs diff -urN ../lilypond-1.2.0/VERSION ./VERSION --- ../lilypond-1.2.0/VERSION Wed Jul 28 17:56:02 1999 +++ ./VERSION Fri Aug 13 23:44:34 1999 @@ -2,7 +2,7 @@ MAJOR_VERSION=1 MINOR_VERSION=2 PATCH_LEVEL=0 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=jcn1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff -urN ../lilypond-1.2.0/flower/include/dictionary-iter.hh ./flower/include/dictionary-iter.hh --- ../lilypond-1.2.0/flower/include/dictionary-iter.hh Tue Feb 9 11:46:10 1999 +++ ./flower/include/dictionary-iter.hh Sat Aug 14 00:02:43 1999 @@ -15,7 +15,7 @@ template<class V> -class Dictionary_iter<V> : public Hash_table_iter<String,V> +class Dictionary_iter : public Hash_table_iter<String,V> { public: Dictionary_iter (Dictionary<V> const &d) diff -urN ../lilypond-1.2.0/flower/include/parray.hh ./flower/include/parray.hh --- ../lilypond-1.2.0/flower/include/parray.hh Fri Apr 16 13:02:10 1999 +++ ./flower/include/parray.hh Fri Aug 13 23:44:29 1999 @@ -21,7 +21,7 @@ template<class T> class Link_array : private Array<void *> { - static default_compare (T *const& p1, T *const&p2) { + static int default_compare (T *const& p1, T *const&p2) { /* can't do p1 -p2, since T might be an incomplete type */ if (p1 < p2) return -1 ; diff -urN ../lilypond-1.2.0/flower/include/text-db.hh ./flower/include/text-db.hh --- ../lilypond-1.2.0/flower/include/text-db.hh Tue Feb 9 11:46:10 1999 +++ ./flower/include/text-db.hh Fri Aug 13 23:45:27 1999 @@ -14,7 +14,7 @@ Text_record() { } // needed because of other ctor /// report an error in this line. - message (String s) { + void message (String s) { cerr << '\n'<< filename << ": "<< line_no << s << "\n"; } String operator[](int j) { diff -urN ../lilypond-1.2.0/flower/include/text-stream.hh ./flower/include/text-stream.hh --- ../lilypond-1.2.0/flower/include/text-stream.hh Tue Feb 9 11:46:10 1999 +++ ./flower/include/text-stream.hh Sat Aug 14 13:06:21 1999 @@ -48,7 +48,7 @@ } char peek() { if (eof_b ()) - return -1; + return (char)-1; char c = get(); unget (c); return c; diff -urN ../lilypond-1.2.0/flower/include/virtual-methods.hh ./flower/include/virtual-methods.hh --- ../lilypond-1.2.0/flower/include/virtual-methods.hh Tue Feb 9 11:46:10 1999 +++ ./flower/include/virtual-methods.hh Sat Aug 14 21:39:50 1999 @@ -28,6 +28,28 @@ }; */ -#define VIRTUAL_COPY_CONS(base) virtual base *clone () const { return new typeof(*this) (*this); } +// fix constness: gcc-2.95 is correct in defining +// typeof (*this) +// in a const member function to be const + +#if 0 +#define VIRTUAL_COPY_CONS(base) \ + virtual base *clone () const \ + { \ + return new typeof(*this) (*this); \ + } +#else +#define VIRTUAL_COPY_CONS(base) \ + virtual base* clone_const_helper () \ + { \ + return new typeof (*this) (*this); \ + } \ + virtual base* clone () const \ + { \ + base* urg = (base*)this; \ + return urg->clone_const_helper (); \ + } #endif + +#endif /* VIRTUAL_METHODS_HH */ diff -urN ../lilypond-1.2.0/flower/string.cc ./flower/string.cc --- ../lilypond-1.2.0/flower/string.cc Mon Apr 12 11:05:31 1999 +++ ./flower/string.cc Sat Aug 14 00:04:23 1999 @@ -285,7 +285,7 @@ char * found= (char*) memchr (me_l, set[i], n ); if (found) { - return found - me_l; + return found - (char const*)me_l; } } return -1; diff -urN ../lilypond-1.2.0/lily/axis-group-element.cc ./lily/axis-group-element.cc --- ../lilypond-1.2.0/lily/axis-group-element.cc Mon Jul 26 13:28:26 1999 +++ ./lily/axis-group-element.cc Sat Aug 14 12:25:26 1999 @@ -86,7 +86,8 @@ Axis_group_element::extra_extent (Axis a )const { Interval g; - purge_extra (); // Yeah yeah, const correctness. + Axis_group_element* urg = (Axis_group_element*)this; + urg->purge_extra (); // Yeah yeah, const correctness. for (int i=0; i < extra_elems_.size (); i++) { Interval ge = extra_elems_[i]->extent (a); diff -urN ../lilypond-1.2.0/lily/bar-number-engraver.cc ./lily/bar-number-engraver.cc --- ../lilypond-1.2.0/lily/bar-number-engraver.cc Mon Jun 28 14:43:15 1999 +++ ./lily/bar-number-engraver.cc Sat Aug 14 13:32:52 1999 @@ -18,7 +18,7 @@ axis_ = Y_AXIS; type_ = "barNumber"; visibility_lambda_ - = gh_eval_str ("postbreak_only_visibility"); + = ly_ch_C_eval_scm ("postbreak_only_visibility"); } void diff -urN ../lilypond-1.2.0/lily/bar-script-engraver.cc ./lily/bar-script-engraver.cc --- ../lilypond-1.2.0/lily/bar-script-engraver.cc Mon Jul 26 13:28:26 1999 +++ ./lily/bar-script-engraver.cc Sat Aug 14 13:32:52 1999 @@ -23,7 +23,7 @@ text_p_ =0; hang_on_clef_b_ = false; visibility_lambda_ - = gh_eval_str ("non_postbreak_visibility"); + = ly_ch_C_eval_scm ("non_postbreak_visibility"); } void diff -urN ../lilypond-1.2.0/lily/base-span-bar-engraver.cc ./lily/base-span-bar-engraver.cc --- ../lilypond-1.2.0/lily/base-span-bar-engraver.cc Mon Jul 26 13:28:26 1999 +++ ./lily/base-span-bar-engraver.cc Sat Aug 14 13:32:52 1999 @@ -55,7 +55,7 @@ String visnam = String(name()) + "_visibility"; spanbar_p_->set_elt_property (visibility_lambda_scm_sym, - gh_eval_str (visnam.ch_C())); + ly_ch_C_eval_scm (visnam.ch_C())); if (use_priority_b_) { diff -urN ../lilypond-1.2.0/lily/beam.cc ./lily/beam.cc --- ../lilypond-1.2.0/lily/beam.cc Mon Jul 26 13:28:26 1999 +++ ./lily/beam.cc Sat Aug 14 12:27:02 1999 @@ -199,7 +199,7 @@ */ Direction beam_dir; - Direction neutral_dir = (int)paper_l ()->get_var ("stem_default_neutral_direction"); + Direction neutral_dir = (Direction)(int)paper_l ()->get_var +("stem_default_neutral_direction"); Dir_algorithm a = (Dir_algorithm)rint(paper_l ()->get_var ("beam_dir_algorithm")); switch (a) diff -urN ../lilypond-1.2.0/lily/break-align-item.cc ./lily/break-align-item.cc --- ../lilypond-1.2.0/lily/break-align-item.cc Mon Jul 26 13:28:26 1999 +++ ./lily/break-align-item.cc Sat Aug 14 13:32:52 1999 @@ -47,7 +47,7 @@ SCM symbol_list = SCM_EOL; Array<Real> dists; - SCM current_origin = gh_str02scm (""); + SCM current_origin = ly_ch_C_to_scm (""); for (int i=0; i <= elems.size (); i++) { Score_element *next_elt = i < elems.size () @@ -61,11 +61,11 @@ next_origin = next_elt->get_elt_property (origin_scm_sym); next_origin = (next_origin == SCM_BOOL_F) - ? gh_str02scm ("") + ? ly_ch_C_to_scm ("") : SCM_CDR (next_origin); } else - next_origin = gh_str02scm ("begin-of-note"); + next_origin = ly_ch_C_to_scm ("begin-of-note"); SCM extra_space = scm_eval (scm_listify (ly_symbol ("break-align-spacer"), @@ -173,7 +173,7 @@ warning bells about missing Y refpoints go off later on. */ hg->dim_cache_[Y_AXIS]->parent_l_ = dim_cache_[Y_AXIS]; - hg->set_elt_property (ly_symbol("origin"), gh_str02scm (it->name())); + hg->set_elt_property (ly_symbol ("origin"), ly_ch_C_to_scm (it->name ())); pscore_l_->typeset_element (hg); add_element_priority (hg, priority); diff -urN ../lilypond-1.2.0/lily/breathing-sign.cc ./lily/breathing-sign.cc --- ../lilypond-1.2.0/lily/breathing-sign.cc Fri Jun 25 15:36:07 1999 +++ ./lily/breathing-sign.cc Sat Aug 14 13:32:52 1999 @@ -26,7 +26,7 @@ set_elt_property (breakable_scm_sym, SCM_BOOL_T); set_elt_property (break_priority_scm_sym, gh_int2scm (-4)); set_elt_property (visibility_lambda_scm_sym, - gh_eval_str ("non_postbreak_visibility")); + ly_ch_C_eval_scm ("non_postbreak_visibility")); } void diff -urN ../lilypond-1.2.0/lily/chord.cc ./lily/chord.cc --- ../lilypond-1.2.0/lily/chord.cc Tue Jul 27 18:09:43 1999 +++ ./lily/chord.cc Sat Aug 14 12:28:31 1999 @@ -260,7 +260,7 @@ } void -Chord::find_additions_and_subtractions(Array<Musical_pitch>* add_arr_p, Array<Musical_pitch>* sub_arr_p) +Chord::find_additions_and_subtractions(Array<Musical_pitch>* add_arr_p, +Array<Musical_pitch>* sub_arr_p) const { Musical_pitch tonic = pitch_arr_[0]; /* diff -urN ../lilypond-1.2.0/lily/clef-engraver.cc ./lily/clef-engraver.cc --- ../lilypond-1.2.0/lily/clef-engraver.cc Fri Jun 25 15:36:07 1999 +++ ./lily/clef-engraver.cc Sat Aug 14 13:32:52 1999 @@ -130,7 +130,7 @@ create_clef(); if(def) clef_p_->set_elt_property(visibility_lambda_scm_sym, - gh_eval_str ("postbreak_only_visibility")); + ly_ch_C_eval_scm ("postbreak_only_visibility")); } /* ugh; should make Clef_referenced baseclass */ @@ -194,7 +194,7 @@ String clefstyle = get_property ("clefStyle", 0); if (clefstyle.length_i ()) c->set_elt_property (style_scm_sym, - gh_str02scm (clefstyle.ch_C())); + ly_ch_C_to_scm (clefstyle.ch_C())); announce_element (Score_element_info (c, clef_req_l_)); clef_p_ = c; diff -urN ../lilypond-1.2.0/lily/dimension-cache.cc ./lily/dimension-cache.cc --- ../lilypond-1.2.0/lily/dimension-cache.cc Mon Jul 26 13:28:26 1999 +++ ./lily/dimension-cache.cc Sat Aug 14 12:38:41 1999 @@ -100,18 +100,14 @@ Dimension_cache * Dimension_cache::common_group (Dimension_cache const* s) const { - Link_array<Dimension_cache const> my_groups; - for (Dimension_cache const *c = this; - c ; c = c->parent_l_) - my_groups.push (c); - + Link_array<Dimension_cache> my_groups; + for (Dimension_cache const *c = this; c ; c = c->parent_l_) + my_groups.push ((Dimension_cache*)c); Dimension_cache const *common=0; - for (Dimension_cache const * d = s; - !common && d; - d = d->parent_l_) - common = my_groups.find_l (d); + for (Dimension_cache const * d = s; !common && d; d = d->parent_l_) + common = (Dimension_cache const*)my_groups.find_l (d); return (Dimension_cache*)common; } diff -urN ../lilypond-1.2.0/lily/dynamic-engraver.cc ./lily/dynamic-engraver.cc --- ../lilypond-1.2.0/lily/dynamic-engraver.cc Wed Jul 28 17:56:03 1999 +++ ./lily/dynamic-engraver.cc Sat Aug 14 18:14:03 1999 @@ -7,7 +7,6 @@ */ #include "debug.hh" #include "crescendo.hh" -#include "dynamic-engraver.hh" #include "musical-request.hh" #include "lookup.hh" #include "paper-def.hh" diff -urN ../lilypond-1.2.0/lily/graphical-axis-group.cc ./lily/graphical-axis-group.cc --- ../lilypond-1.2.0/lily/graphical-axis-group.cc Mon Jul 26 13:28:26 1999 +++ ./lily/graphical-axis-group.cc Sat Aug 14 12:48:46 1999 @@ -17,7 +17,16 @@ Graphical_axis_group at one time. */ Graphical_axis_group::Graphical_axis_group(Graphical_axis_group const&s) { +#if 0 + /* + gcc-2.95: huh? why can't i assign a const value to a var? + graphical-axis-group.cc:20: incompatible types in assignment of `const Axis[2]' to +`Axis[2]' + */ axes_ = s.axes_; +#else + axes_[0] = s.axes_[0]; + axes_[1] = s.axes_[1]; +#endif ordered_b_ = s.ordered_b_; } diff -urN ../lilypond-1.2.0/lily/includable-lexer.cc ./lily/includable-lexer.cc --- ../lilypond-1.2.0/lily/includable-lexer.cc Mon Jul 19 00:56:08 1999 +++ ./lily/includable-lexer.cc Sat Aug 14 12:56:32 1999 @@ -107,7 +107,7 @@ } char const* -Includable_lexer::here_ch_C () +Includable_lexer::here_ch_C () const { if (include_stack_.empty ()) return 0; diff -urN ../lilypond-1.2.0/lily/include/bar-align-engraver.hh ./lily/include/bar-align-engraver.hh --- ../lilypond-1.2.0/lily/include/bar-align-engraver.hh Tue Feb 9 11:45:50 1999 +++ ./lily/include/bar-align-engraver.hh Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ -/* - bar-align-engraver.hh -- declare - - source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys <[EMAIL PROTECTED]> -*/ - - -#ifndef BAR_ALIGN_GRAV_HH -#define BAR_ALIGN_GRAV_HH - -#endif // BAR_ALIGN_GRAV_HH diff -urN ../lilypond-1.2.0/lily/include/bar-script-engraver.hh ./lily/include/bar-script-engraver.hh --- ../lilypond-1.2.0/lily/include/bar-script-engraver.hh Mon Jun 28 14:43:15 1999 +++ ./lily/include/bar-script-engraver.hh Sat Aug 14 18:09:18 1999 @@ -18,6 +18,8 @@ */ class Bar_script_engraver : public Engraver { +public: + VIRTUAL_COPY_CONS(Translator); protected: Staff_side_item* staff_side_p_; Text_item* text_p_; diff -urN ../lilypond-1.2.0/lily/include/beam-swallow-trans.hh ./lily/include/beam-swallow-trans.hh --- ../lilypond-1.2.0/lily/include/beam-swallow-trans.hh Tue Feb 9 11:45:50 1999 +++ ./lily/include/beam-swallow-trans.hh Thu Jan 1 01:00:00 1970 @@ -1,15 +0,0 @@ -/* - beam-swallow-trans.hh -- declare - - source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys <[EMAIL PROTECTED]> - - */ - -#ifndef BEAM_SWALLOW_TRANS_HH -#define BEAM_SWALLOW_TRANS_HH - - -#endif /* BEAM_SWALLOW_TRANS_HH */ - diff -urN ../lilypond-1.2.0/lily/include/chord.hh ./lily/include/chord.hh --- ../lilypond-1.2.0/lily/include/chord.hh Tue Feb 9 11:45:50 1999 +++ ./lily/include/chord.hh Sat Aug 14 12:28:47 1999 @@ -27,7 +27,7 @@ int find_tonic_i () const; int find_pitch_i (Musical_pitch p) const; int find_notename_i (Musical_pitch p) const; - void find_additions_and_subtractions(Array<Musical_pitch>* add_arr_p, Array<Musical_pitch>* sub_arr_p); + void find_additions_and_subtractions(Array<Musical_pitch>* add_arr_p, +Array<Musical_pitch>* sub_arr_p) const; Array<Musical_pitch> pitch_arr_; }; diff -urN ../lilypond-1.2.0/lily/include/dynamic-engraver.hh ./lily/include/dynamic-engraver.hh --- ../lilypond-1.2.0/lily/include/dynamic-engraver.hh Tue Feb 9 11:45:50 1999 +++ ./lily/include/dynamic-engraver.hh Thu Jan 1 01:00:00 1970 @@ -1,13 +0,0 @@ -/* - dynamic-engraver.hh -- declare Dynamic_engraver - - source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys <[EMAIL PROTECTED]> -*/ - - -#ifndef DYNAMIC_GRAV_HH -#define DYNAMIC_GRAV_HH - -#endif // DYNAMIC_GRAV_HH diff -urN ../lilypond-1.2.0/lily/include/includable-lexer.hh ./lily/include/includable-lexer.hh --- ../lilypond-1.2.0/lily/include/includable-lexer.hh Tue Feb 9 11:45:50 1999 +++ ./lily/include/includable-lexer.hh Sat Aug 14 12:56:52 1999 @@ -46,7 +46,7 @@ void new_input (String name, String data, Sources*); void add_lexed_char (int); - char const * here_ch_C (); + char const * here_ch_C () const; }; diff -urN ../lilypond-1.2.0/lily/include/lily-guile.hh ./lily/include/lily-guile.hh --- ../lilypond-1.2.0/lily/include/lily-guile.hh Thu Jul 15 00:20:26 1999 +++ ./lily/include/lily-guile.hh Sat Aug 14 13:32:47 1999 @@ -15,6 +15,8 @@ #include <libguile.h> #include "direction.hh" +SCM ly_ch_C_to_scm (char const*c); +SCM ly_ch_C_eval_scm (char const*c); SCM ly_symbol (String name); String symbol_to_string (SCM); SCM ly_set_scm (String name , SCM val); diff -urN ../lilypond-1.2.0/lily/include/musical-request.hh ./lily/include/musical-request.hh --- ../lilypond-1.2.0/lily/include/musical-request.hh Mon Jul 26 13:26:09 1999 +++ ./lily/include/musical-request.hh Sat Aug 14 16:33:25 1999 @@ -24,7 +24,7 @@ Duration duration_; virtual void do_print () const; - bool do_equal_b (Request*) const; + bool do_equal_b (Request const*) const; void compress (Moment); virtual Moment length_mom () const; static int compare (Rhythmic_req const&,Rhythmic_req const&); @@ -60,7 +60,7 @@ public: String articulation_str_; protected: - virtual bool do_equal_b (Request*) const; + virtual bool do_equal_b (Request const*) const; virtual void do_print () const; VIRTUAL_COPY_CONS(Music); }; @@ -73,7 +73,7 @@ String style_str_; protected: VIRTUAL_COPY_CONS(Music); - virtual bool do_equal_b (Request*)const; + virtual bool do_equal_b (Request const*)const; virtual void do_print () const; }; @@ -88,7 +88,7 @@ protected: /// transpose. #delta# is relative to central c. virtual void transpose (Musical_pitch delta); - virtual bool do_equal_b (Request*) const; + virtual bool do_equal_b (Request const*) const; virtual void do_print () const; VIRTUAL_COPY_CONS(Music); }; @@ -110,7 +110,7 @@ Note_req(); protected: virtual void do_print () const; - bool do_equal_b (Request*) const; + bool do_equal_b (Request const*) const; VIRTUAL_COPY_CONS(Music); }; diff -urN ../lilypond-1.2.0/lily/include/request.hh ./lily/include/request.hh --- ../lilypond-1.2.0/lily/include/request.hh Wed Jul 28 17:56:03 1999 +++ ./lily/include/request.hh Sat Aug 14 16:38:11 1999 @@ -28,9 +28,9 @@ public: virtual ~Request(){} VIRTUAL_COPY_CONS(Music); - bool equal_b (Request*) const; + bool equal_b (Request const*) const; protected: - virtual bool do_equal_b (Request*) const; + virtual bool do_equal_b (Request const*) const; virtual void do_print() const; }; @@ -57,7 +57,7 @@ Span_req(); protected: - virtual bool do_equal_b (Request*) const; + virtual bool do_equal_b (Request const*) const; virtual void do_print() const; VIRTUAL_COPY_CONS(Music); }; diff -urN ../lilypond-1.2.0/lily/include/type-swallow-trans.hh ./lily/include/type-swallow-trans.hh --- ../lilypond-1.2.0/lily/include/type-swallow-trans.hh Tue Feb 9 11:45:50 1999 +++ ./lily/include/type-swallow-trans.hh Thu Jan 1 01:00:00 1970 @@ -1,38 +0,0 @@ -/* - type-swallow-engraver.hh -- declare Type_swallow_translator - - source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys <[EMAIL PROTECTED]> -*/ - - -#ifndef TYPESWALLOW_GRAV_HH -#define TYPESWALLOW_GRAV_HH - -#include "translator.hh" - -/** eat a certain type of request. - (Duh, it's good for your skin) - */ -class Type_swallow_translator : public virtual Translator -{ -protected: - String swallow_str_; - bool do_try_music (Music*); -public: - VIRTUAL_COPY_CONS(Translator); -}; - -#define DECLARE_REQUEST_SWALLOWER(TYPE) \ -struct TYPE ## _swallow_translator : public Type_swallow_translator {\ - TYPE ## _swallow_translator() { \ - swallow_str_ = #TYPE;\ - }\ - \ - VIRTUAL_COPY_CONS(Translator);\ -};\ -ADD_THIS_TRANSLATOR(TYPE ## _swallow_translator);\ - -#endif // TYPESWALLOW_GRAV_HH - diff -urN ../lilypond-1.2.0/lily/include/type-swallow-translator.hh ./lily/include/type-swallow-translator.hh --- ../lilypond-1.2.0/lily/include/type-swallow-translator.hh Thu Jan 1 01:00:00 1970 +++ ./lily/include/type-swallow-translator.hh Tue Feb 9 11:45:50 1999 @@ -0,0 +1,38 @@ +/* + type-swallow-engraver.hh -- declare Type_swallow_translator + + source file of the GNU LilyPond music typesetter + + (c) 1997--1999 Han-Wen Nienhuys <[EMAIL PROTECTED]> +*/ + + +#ifndef TYPESWALLOW_GRAV_HH +#define TYPESWALLOW_GRAV_HH + +#include "translator.hh" + +/** eat a certain type of request. + (Duh, it's good for your skin) + */ +class Type_swallow_translator : public virtual Translator +{ +protected: + String swallow_str_; + bool do_try_music (Music*); +public: + VIRTUAL_COPY_CONS(Translator); +}; + +#define DECLARE_REQUEST_SWALLOWER(TYPE) \ +struct TYPE ## _swallow_translator : public Type_swallow_translator {\ + TYPE ## _swallow_translator() { \ + swallow_str_ = #TYPE;\ + }\ + \ + VIRTUAL_COPY_CONS(Translator);\ +};\ +ADD_THIS_TRANSLATOR(TYPE ## _swallow_translator);\ + +#endif // TYPESWALLOW_GRAV_HH + diff -urN ../lilypond-1.2.0/lily/key-engraver.cc ./lily/key-engraver.cc --- ../lilypond-1.2.0/lily/key-engraver.cc Thu Jul 22 15:21:07 1999 +++ ./lily/key-engraver.cc Sat Aug 14 13:32:52 1999 @@ -92,7 +92,7 @@ if (def) { item_p_->set_elt_property (visibility_lambda_scm_sym, - gh_eval_str ("postbreak_only_visibility")); + ly_ch_C_eval_scm ("postbreak_only_visibility")); } } diff -urN ../lilypond-1.2.0/lily/lily-guile.cc ./lily/lily-guile.cc --- ../lilypond-1.2.0/lily/lily-guile.cc Mon Jul 19 00:56:08 1999 +++ ./lily/lily-guile.cc Sat Aug 14 13:32:52 1999 @@ -19,6 +19,20 @@ #include "file-path.hh" #include "debug.hh" +SCM +ly_ch_C_to_scm (char const*c) +{ + // this all really sucks, guile should take char const* arguments! + return gh_str02scm ((char*)c); +} + +SCM +ly_ch_C_eval_scm (char const*c) +{ + // this all really sucks, guile should take char const* arguments! + return gh_eval_str ((char*)c); +} + /* scm_m_quote doesn't use any env, but needs one for a good signature in GUILE. @@ -41,7 +55,7 @@ SCM ly_symbol (String name) { - return gh_car (scm_intern (name.ch_C(), name.length_i())); + return gh_car (scm_intern ((char*)name.ch_C(), name.length_i())); } String @@ -53,7 +67,7 @@ SCM ly_set_scm (String name, SCM val) { - return scm_sysintern (name.ch_C(), val); + return scm_sysintern ((char*)name.ch_C(), val); } @@ -78,7 +92,7 @@ Simple_file_storage f(s); - gh_eval_str ((char *) f.ch_C()); + ly_ch_C_eval_scm ((char *) f.ch_C()); *mlog << ']' << flush; } @@ -100,7 +114,7 @@ Simple_file_storage f(s); - return gh_str02scm (f.ch_C()); + return ly_ch_C_to_scm (f.ch_C()); } void @@ -152,8 +166,8 @@ void init_functions () { - scm_make_gsubr ("ly-warn", 1, 0, 0, ly_warning); - scm_make_gsubr ("ly-gulp-file", 1,0, 0, ly_gulp_file); + scm_make_gsubr ("ly-warn", 1, 0, 0, (SCM(*)(...))ly_warning); + scm_make_gsubr ("ly-gulp-file", 1,0, 0, (SCM(*)(...))ly_gulp_file); } extern void init_symbols (); diff -urN ../lilypond-1.2.0/lily/lookup.cc ./lily/lookup.cc --- ../lilypond-1.2.0/lily/lookup.cc Wed Jul 21 20:31:48 1999 +++ ./lily/lookup.cc Sat Aug 14 13:32:52 1999 @@ -393,7 +393,7 @@ /* UGH. */ - SCM l = gh_eval_str (("(style-to-cmr \"" + style + "\")").ch_C()); + SCM l = ly_ch_C_eval_scm (("(style-to-cmr \"" + style + "\")").ch_C()); if (l != SCM_BOOL_F) { style = ly_scm2string (SCM_CDR(l)) +to_str ((int)font_h); @@ -422,7 +422,7 @@ brace_count ++; else if (text[i] == '}') brace_count --; - Character_metric *c = afm_l->get_char ((unsigned char)text[i],false); + Character_metric *c = (Character_metric*)afm_l->get_char ((unsigned +char)text[i],false); w += c->dimensions()[X_AXIS].length (); ydims.unite (c->dimensions()[Y_AXIS]); @@ -449,7 +449,7 @@ Atom at (gh_list (text_scm_sym, - gh_str02scm (text.ch_C()), + ly_ch_C_to_scm (text.ch_C()), SCM_UNDEFINED)); at.font_ = ly_symbol (style); at.magn_ = gh_int2scm (font_mag); diff -urN ../lilypond-1.2.0/lily/main.cc ./lily/main.cc --- ../lilypond-1.2.0/lily/main.cc Mon Jul 19 00:56:08 1999 +++ ./lily/main.cc Sat Aug 14 12:54:04 1999 @@ -254,7 +254,7 @@ void -main_prog (int argc, char **argv) +main_prog (int, char**) { /* need to do this first. Engravers use lily.scm contents. @@ -388,7 +388,7 @@ #ifdef WINNT gh_enter (argc, argv, main_prog); #else - gh_enter (argc, argv, (void(*)())main_prog); + gh_enter (argc, argv, (void(*)(...))main_prog); #endif return 0; // unreachable diff -urN ../lilypond-1.2.0/lily/mark-engraver.cc ./lily/mark-engraver.cc --- ../lilypond-1.2.0/lily/mark-engraver.cc Mon Jun 28 14:43:15 1999 +++ ./lily/mark-engraver.cc Sat Aug 14 13:32:52 1999 @@ -18,7 +18,7 @@ mark_req_l_ = 0; axis_ = Y_AXIS; type_ = "mark"; - visibility_lambda_ = gh_eval_str ("mark-visibility"); + visibility_lambda_ = ly_ch_C_eval_scm ("mark-visibility"); } void diff -urN ../lilypond-1.2.0/lily/multi-measure-rest-engraver.cc ./lily/multi-measure-rest-engraver.cc --- ../lilypond-1.2.0/lily/multi-measure-rest-engraver.cc Mon Jul 5 13:17:45 1999 +++ ./lily/multi-measure-rest-engraver.cc Sat Aug 14 13:32:52 1999 @@ -75,7 +75,7 @@ mmrest_p_ = new Multi_measure_rest; if(dynamic_cast<Repetitions_req *> (multi_measure_req_l_)) mmrest_p_->set_elt_property (alt_symbol_scm_sym, - gh_str02scm("scripts-repeatsign")); + ly_ch_C_to_scm ("scripts-repeatsign")); announce_element (Score_element_info (mmrest_p_, multi_measure_req_l_)); start_measure_i_ = time->bars_i_; } diff -urN ../lilypond-1.2.0/lily/musical-request.cc ./lily/musical-request.cc --- ../lilypond-1.2.0/lily/musical-request.cc Wed Jul 28 17:56:03 1999 +++ ./lily/musical-request.cc Sat Aug 14 16:37:42 1999 @@ -47,9 +47,9 @@ bool -Melodic_req::do_equal_b (Request*r) const +Melodic_req::do_equal_b (Request const* r) const { - Melodic_req* m= dynamic_cast <Melodic_req *> (r); + Melodic_req const* m= dynamic_cast <Melodic_req const*> (r); return m&& !compare (*m, *this); } @@ -75,9 +75,9 @@ } bool -Rhythmic_req::do_equal_b (Request*r) const +Rhythmic_req::do_equal_b (Request const* r) const { - Rhythmic_req* rh = dynamic_cast <Rhythmic_req *> (r); + Rhythmic_req const* rh = dynamic_cast <Rhythmic_req const*> (r); return rh && !compare (*this, *rh); } @@ -114,9 +114,9 @@ bool -Note_req::do_equal_b (Request*r) const +Note_req::do_equal_b (Request const* r) const { - Note_req *n = dynamic_cast<Note_req*> (r); + Note_req const* n = dynamic_cast<Note_req const*> (r); return n&& Rhythmic_req::do_equal_b (n) && Melodic_req::do_equal_b (n); } @@ -148,9 +148,9 @@ bool -Span_req::do_equal_b (Request*r) const +Span_req::do_equal_b (Request const*r) const { - Span_req * s = dynamic_cast <Span_req *> (r); + Span_req const* s = dynamic_cast <Span_req const*> (r); return s && span_dir_ == s->span_dir_; } @@ -180,9 +180,9 @@ } bool -Text_script_req::do_equal_b (Request *r) const +Text_script_req::do_equal_b (Request const* r) const { - Text_script_req * t = dynamic_cast<Text_script_req*>(r); + Text_script_req const* t = dynamic_cast<Text_script_req const*> (r); return t && t->text_str_ == text_str_ && t->style_str_ == style_str_; } @@ -193,9 +193,9 @@ } bool -Articulation_req::do_equal_b (Request*r) const +Articulation_req::do_equal_b (Request const* r) const { - Articulation_req * a = dynamic_cast<Articulation_req*>(r); + Articulation_req const* a = dynamic_cast<Articulation_req const*> (r); return a && articulation_str_ == a->articulation_str_; } diff -urN ../lilypond-1.2.0/lily/my-lily-lexer.cc ./lily/my-lily-lexer.cc --- ../lilypond-1.2.0/lily/my-lily-lexer.cc Wed Jul 28 17:53:57 1999 +++ ./lily/my-lily-lexer.cc Sat Aug 14 12:56:56 1999 @@ -238,6 +238,6 @@ Input My_lily_lexer::here_input () const { - Source_file * f_l= source_file_l(); - return Input (f_l, here_ch_C()); + Source_file * f_l= source_file_l (); + return Input (f_l, (char*)here_ch_C ()); } diff -urN ../lilypond-1.2.0/lily/note-column.cc ./lily/note-column.cc --- ../lilypond-1.2.0/lily/note-column.cc Mon Jul 5 13:17:45 1999 +++ ./lily/note-column.cc Sat Aug 14 12:54:33 1999 @@ -63,7 +63,7 @@ if (stem_l_) return stem_l_->dir_; else if (head_l_arr_.size ()) - return sign (head_positions_interval().center ()); + return (Direction)sign (head_positions_interval().center ()); programming_error ("Note column without heads and stem!"); return CENTER; diff -urN ../lilypond-1.2.0/lily/note-head.cc ./lily/note-head.cc --- ../lilypond-1.2.0/lily/note-head.cc Mon Jul 26 13:28:26 1999 +++ ./lily/note-head.cc Sat Aug 14 13:05:46 1999 @@ -78,7 +78,7 @@ if (streepjes_i) { - Direction dir = sign (position_i_); + Direction dir = (Direction)sign (position_i_); Interval hd = out->dim_[X_AXIS]; Real hw = hd.length ()/4; diff -urN ../lilypond-1.2.0/lily/note-heads-engraver.cc ./lily/note-heads-engraver.cc --- ../lilypond-1.2.0/lily/note-heads-engraver.cc Mon Jul 26 13:28:26 1999 +++ ./lily/note-heads-engraver.cc Sat Aug 14 13:32:52 1999 @@ -58,7 +58,7 @@ Scalar dir = get_property ("verticalDirection",0); if (dir.isdir_b()) { - d->resolve_dir_ = int (dir); + d->resolve_dir_ = (Direction)(int)dir; } announce_element (Score_element_info (d,0)); @@ -70,7 +70,7 @@ note_p->set_elt_property (transparent_scm_sym, SCM_BOOL_T); else note_p->set_elt_property (style_scm_sym, - gh_str02scm (noteheadstyle.ch_C())); + ly_ch_C_to_scm (noteheadstyle.ch_C())); Score_element_info itinf (note_p,note_req_l); diff -urN ../lilypond-1.2.0/lily/paper-outputter.cc ./lily/paper-outputter.cc --- ../lilypond-1.2.0/lily/paper-outputter.cc Mon Jul 12 02:42:45 1999 +++ ./lily/paper-outputter.cc Sat Aug 14 13:32:52 1999 @@ -57,10 +57,10 @@ if (safe_global_b) { ly_set_scm ("security-paranoia", SCM_BOOL_T); - // gh_eval_str ("(set! security-paranoia #t)"); + // ly_ch_C_eval_scm ("(set! security-paranoia #t)"); } String s = String ("(eval (") + output_global_ch + "-scm 'all-definitions))"; - gh_eval_str (s.ch_C ()); + ly_ch_C_eval_scm (s.ch_C ()); String creator; if (no_timestamps_global_b) @@ -80,8 +80,8 @@ } SCM args_scm = - gh_list (gh_str02scm (creator.ch_l ()), - gh_str02scm (generate.ch_l ()), SCM_UNDEFINED); + gh_list (ly_ch_C_to_scm (creator.ch_l ()), + ly_ch_C_to_scm (generate.ch_l ()), SCM_UNDEFINED); #ifndef NPRINT DOUT << "output_header\n"; @@ -140,7 +140,7 @@ if (i->font_) { output_scheme (gh_list (ly_symbol ("select-font"), - gh_str02scm (symbol_to_string (i->font_).ch_C()), + ly_ch_C_to_scm (symbol_to_string (i->font_).ch_C()), SCM (i->magn_), SCM_UNDEFINED)); } @@ -241,7 +241,7 @@ { SCM scm = gh_list (ly_symbol ("font-def"), gh_int2scm (i), - gh_str02scm (str.ch_l ()), + ly_ch_C_to_scm (str.ch_l ()), SCM_UNDEFINED); output_scheme (scm); @@ -252,8 +252,8 @@ { SCM scm = gh_list (ly_symbol ("lily-def"), - gh_str02scm (k.ch_l ()), - gh_str02scm (to_str(v).ch_l ()), + ly_ch_C_to_scm (k.ch_l ()), + ly_ch_C_to_scm (to_str(v).ch_l ()), SCM_UNDEFINED); output_scheme (scm); @@ -265,20 +265,20 @@ { SCM scm = gh_list (ly_symbol ("lily-def"), - gh_str02scm (k.ch_l ()), - gh_str02scm (v.ch_l ()), + ly_ch_C_to_scm (k.ch_l ()), + ly_ch_C_to_scm (v.ch_l ()), SCM_UNDEFINED); output_scheme (scm); - gh_define (k.ch_l (), gh_str02scm (v.ch_l ())); + gh_define (k.ch_l (), ly_ch_C_to_scm (v.ch_l ())); } void Paper_outputter::output_int_def (String k, int v) { SCM scm = gh_list (ly_symbol ("lily-def"), - gh_str02scm (k.ch_l ()), - gh_str02scm (to_str (v).ch_l ()), + ly_ch_C_to_scm (k.ch_l ()), + ly_ch_C_to_scm (to_str (v).ch_l ()), SCM_UNDEFINED); output_scheme (scm); diff -urN ../lilypond-1.2.0/lily/parser.yy ./lily/parser.yy --- ../lilypond-1.2.0/lily/parser.yy Tue Jul 27 18:09:43 1999 +++ ./lily/parser.yy Sat Aug 14 17:52:15 1999 @@ -427,6 +427,9 @@ translator_spec_body: TRANS_IDENTIFIER { $$ = $1->access_content_Translator (true); + Translator_group * tg = dynamic_cast<Translator_group*> ($$); + if (!tg) + THIS->parser_error (_("Need a translator group for a +context")); $$-> set_spot (THIS->here_input ()); } | TYPE STRING semicolon { @@ -456,8 +459,10 @@ delete $4; /* ugh*/ - Translator_group * tr = dynamic_cast<Translator_group*>($$); - tr->set_property (*$2, str); + Translator_group* tg = dynamic_cast<Translator_group*> ($$); + if (!tg) + THIS->parser_error (_("Need a translator group for a +context")); + tg->set_property (*$2, str); } | translator_spec_body NAME STRING semicolon { $$->type_str_ = *$3; diff -urN ../lilypond-1.2.0/lily/request.cc ./lily/request.cc --- ../lilypond-1.2.0/lily/request.cc Fri May 28 10:16:01 1999 +++ ./lily/request.cc Sat Aug 14 13:32:52 1999 @@ -15,13 +15,13 @@ } bool -Request::equal_b (Request *r) const +Request::equal_b (Request const* r) const { return r->do_equal_b (this) || this->do_equal_b (r) ; } bool -Request::do_equal_b (Request*) const +Request::do_equal_b (Request const*) const { return true; } diff -urN ../lilypond-1.2.0/lily/rest-engraver.cc ./lily/rest-engraver.cc --- ../lilypond-1.2.0/lily/rest-engraver.cc Fri Jun 4 12:54:22 1999 +++ ./lily/rest-engraver.cc Sat Aug 14 13:32:52 1999 @@ -60,7 +60,7 @@ String reststyle = get_property ("restStyle", 0); if (reststyle.length_i ()) rest_p_->set_elt_property (style_scm_sym, - gh_str02scm (reststyle.ch_C())); + ly_ch_C_to_scm (reststyle.ch_C())); } announce_element (Score_element_info (rest_p_, rest_req_l_)); } diff -urN ../lilypond-1.2.0/lily/score-element.cc ./lily/score-element.cc --- ../lilypond-1.2.0/lily/score-element.cc Mon Jul 26 13:28:26 1999 +++ ./lily/score-element.cc Sat Aug 14 13:19:24 1999 @@ -161,13 +161,13 @@ { if (!lookup_l_) { - Score_element * me = (Score_element*)this; - SCM sz = me->remove_elt_property (fontsize_scm_sym); + Score_element * urg = (Score_element*)this; + SCM sz = urg->remove_elt_property (fontsize_scm_sym); int i = (sz != SCM_BOOL_F) ? gh_scm2int (SCM_CDR (sz)) : 0; - me->lookup_l_ = pscore_l_->paper_l_->lookup_l (i); + urg->lookup_l_ = (Lookup*)pscore_l_->paper_l_->lookup_l (i); } return lookup_l_; } diff -urN ../lilypond-1.2.0/lily/script-engraver.cc ./lily/script-engraver.cc --- ../lilypond-1.2.0/lily/script-engraver.cc Mon Jul 26 13:28:26 1999 +++ ./lily/script-engraver.cc Sat Aug 14 13:32:52 1999 @@ -42,7 +42,7 @@ Articulation_req* l=script_req_l_arr_[i]; - SCM list = gh_eval_str (("(articulation-to-scriptdef \"" + l->articulation_str_ + "\")").ch_C()); + SCM list = ly_ch_C_eval_scm (("(articulation-to-scriptdef \"" + +l->articulation_str_ + "\")").ch_C()); if (list == SCM_BOOL_F) { @@ -67,13 +67,13 @@ SCM priority = SCM_CAR(list); if (relative_stem_dir) - ss->relative_dir_ = relative_stem_dir; + ss->relative_dir_ = (Direction)relative_stem_dir; else - ss->dir_ = force_dir; + ss->dir_ = (Direction)force_dir; Scalar dir_prop (get_property ("articulationScriptVerticalDirection", 0)); if (dir_prop.isnum_b () && (int) dir_prop != CENTER) - ss->dir_ = (int) dir_prop; + ss->dir_ = (Direction)(int)dir_prop; if (l->dir_) ss->dir_ = l->dir_; diff -urN ../lilypond-1.2.0/lily/staff-margin-engraver.cc ./lily/staff-margin-engraver.cc --- ../lilypond-1.2.0/lily/staff-margin-engraver.cc Mon Jun 28 14:43:15 1999 +++ ./lily/staff-margin-engraver.cc Sat Aug 14 16:19:02 1999 @@ -18,8 +18,7 @@ { axis_ = X_AXIS; type_ = "margin"; - visibility_lambda_ - = gh_eval_str ("postbreak_only_visibility"); + visibility_lambda_ = ly_ch_C_eval_scm ("postbreak_only_visibility"); } diff -urN ../lilypond-1.2.0/lily/stem-engraver.cc ./lily/stem-engraver.cc --- ../lilypond-1.2.0/lily/stem-engraver.cc Wed Jun 30 20:30:19 1999 +++ ./lily/stem-engraver.cc Sat Aug 14 16:16:40 1999 @@ -104,7 +104,7 @@ stem_p_->set_elt_property (dir_forced_scm_sym, SCM_BOOL_T); } - Translator_group const *which; + Translator_group* which; prop = get_property ("stemLeftBeamCount", &which); if (prop.isnum_b ()) { @@ -127,7 +127,7 @@ prop = get_property ("stemStyle", 0); if (prop.to_bool ()) { - stem_p_->set_elt_property (style_scm_sym, gh_str02scm (prop.ch_C())); + stem_p_->set_elt_property (style_scm_sym, ly_ch_C_to_scm (prop.ch_C())); } typeset_element(stem_p_); diff -urN ../lilypond-1.2.0/lily/stem-staff-side.cc ./lily/stem-staff-side.cc --- ../lilypond-1.2.0/lily/stem-staff-side.cc Mon Jul 26 13:28:26 1999 +++ ./lily/stem-staff-side.cc Sat Aug 14 16:16:57 1999 @@ -41,7 +41,7 @@ Direction Stem_staff_side_item::get_default_direction () const { - return relative_dir_ * stem_l_->dir_; + return (Direction)(relative_dir_ * stem_l_->dir_); } void diff -urN ../lilypond-1.2.0/lily/tie.cc ./lily/tie.cc --- ../lilypond-1.2.0/lily/tie.cc Thu Jul 22 15:21:07 1999 +++ ./lily/tie.cc Sat Aug 14 16:19:02 1999 @@ -44,7 +44,7 @@ If dir is not determined: inverse of stem: down (see stem::get_default_dir ()) */ - Direction neutral_dir = (int)paper_l ()->get_var ("stem_default_neutral_direction"); + Direction neutral_dir = (Direction)(int)paper_l ()->get_var +("stem_default_neutral_direction"); return (m == 0) ? other_dir (neutral_dir) : (m < 0) ? DOWN : UP; } diff -urN ../lilypond-1.2.0/lily/type-swallow-trans.cc ./lily/type-swallow-trans.cc --- ../lilypond-1.2.0/lily/type-swallow-trans.cc Mon May 17 11:22:24 1999 +++ ./lily/type-swallow-trans.cc Thu Jan 1 01:00:00 1970 @@ -1,23 +0,0 @@ -/* - type-swallow-trans.cc -- implement Type_swallow_translator - - source file of the GNU LilyPond music typesetter - - (c) 1997--1999 Han-Wen Nienhuys <[EMAIL PROTECTED]> -*/ - -#include "type-swallow-trans.hh" -#include "musical-request.hh" - - -bool -Type_swallow_translator::do_try_music (Music*r) -{ - if (classname (r) == swallow_str_) - return true; - return false; -} - - - -DECLARE_REQUEST_SWALLOWER(Skip_req); diff -urN ../lilypond-1.2.0/lily/type-swallow-translator.cc ./lily/type-swallow-translator.cc --- ../lilypond-1.2.0/lily/type-swallow-translator.cc Thu Jan 1 01:00:00 1970 +++ ./lily/type-swallow-translator.cc Sat Aug 14 18:11:48 1999 @@ -0,0 +1,23 @@ +/* + type-swallow-translator.cc -- implement Type_swallow_translator + + source file of the GNU LilyPond music typesetter + + (c) 1997--1999 Han-Wen Nienhuys <[EMAIL PROTECTED]> +*/ + +#include "type-swallow-translator.hh" +#include "musical-request.hh" + + +bool +Type_swallow_translator::do_try_music (Music*r) +{ + if (classname (r) == swallow_str_) + return true; + return false; +} + + + +DECLARE_REQUEST_SWALLOWER(Skip_req); diff -urN ../lilypond-1.2.0/lily/vertical-align-engraver.cc ./lily/vertical-align-engraver.cc --- ../lilypond-1.2.0/lily/vertical-align-engraver.cc Thu Jul 15 00:16:19 1999 +++ ./lily/vertical-align-engraver.cc Sat Aug 14 16:19:02 1999 @@ -47,7 +47,7 @@ dist = get_property ("alignmentReference",0); if (dist.length_i () && dist.isnum_b ()) { - valign_p_->align_dir_ = int (dist); + valign_p_->align_dir_ = (Direction)(int)dist; } valign_p_->set_bounds(RIGHT,get_staff_info().command_pcol_l ()); typeset_element (valign_p_); @@ -58,7 +58,9 @@ bool Vertical_align_engraver::qualifies_b (Score_element_info i) const { +#if 0 Translator * t = i.origin_trans_l_arr_[0]; +#endif int sz = i.origin_trans_l_arr_.size() ; #if 0 diff -urN ../lilypond-1.2.0/lily/volta-spanner.cc ./lily/volta-spanner.cc --- ../lilypond-1.2.0/lily/volta-spanner.cc Mon Jul 19 00:56:09 1999 +++ ./lily/volta-spanner.cc Sat Aug 14 16:42:25 1999 @@ -36,9 +36,9 @@ bool no_vertical_start = false; bool no_vertical_end = last_b_; Spanner *orig_span = dynamic_cast<Spanner*> (original_l_); - if (orig_span && orig_span->broken_into_l_arr_[0] != this) + if (orig_span && (orig_span->broken_into_l_arr_[0] != (Spanner*)this)) no_vertical_start = true; - if (orig_span && orig_span->broken_into_l_arr_.top () != this) + if (orig_span && (orig_span->broken_into_l_arr_.top () != (Spanner*)this)) no_vertical_end = true; if (bar_arr_.top ()->type_str_.length_i () > 1) no_vertical_end = false; Jan Nieuwenhuizen <[EMAIL PROTECTED]> | GNU LilyPond - The music typesetter http://www.xs4all.nl/~jantien/ | http://www.lilypond.org/
