From df5bbc00ca0ba143548807abde9ae83ab4cc2c9b Mon Sep 17 00:00:00 2001 From: hanwen Date: Sun, 18 Jan 2004 22:37:40 +0000 Subject: [PATCH] * Documentation/user/GNUmakefile ($(outdir)/lilypond/lilypond.html): posix conforming globs. Link iso. copy. * stepmake/stepmake/metafont-rules.make: remove --keep-trying. * lily/separating-group-spanner.cc (set_spacing_rods): add padding. --- ChangeLog | 8 ++++++++ Documentation/topdocs/INSTALL.texi | 14 ++++++++++++++ Documentation/user/GNUmakefile | 2 +- THANKS | 1 + lily/include/separating-group-spanner.hh | 2 +- lily/separating-group-spanner.cc | 14 ++++++++------ ly/engraver-init.ly | 1 + mf/GNUmakefile | 2 +- stepmake/stepmake/metafont-rules.make | 4 ++-- 9 files changed, 37 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 520f002838..5338b5cee4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2004-01-18 Han-Wen Nienhuys + * Documentation/user/GNUmakefile + ($(outdir)/lilypond/lilypond.html): posix conforming globs. Link + iso. copy. + + * stepmake/stepmake/metafont-rules.make: remove --keep-trying. + + * lily/separating-group-spanner.cc (set_spacing_rods): add padding. + * mf/,scripts/,make/,ly/,scm/: remove AsciiScript remnants. * lily/lily-guile.cc (robust_scm2double): new function. Use throughout. diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index 6437694eac..02b91dc74c 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -267,6 +267,20 @@ reports to @email{bug-lilypond@@gnu.org}. Bugs that are not fault of LilyPond are documented here. +@subsection Bison 1.875 + +There is a bug in bison-1.875: compilation fails with "parse error +before `goto'" in line 4922 due to a bug in bison. To fix, either +recompile bison 1.875 with the following fix: + +@example + $ cd lily; make out/parser.cc + $ vi +4919 out/parser.cc + # append a semicolon to the line containing "__attribute__ ((__unused__)) + # save + $ make +@end example + @subsection Linking to kpathsea If kpathsea and the corresponding header files are installed in some diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index 806e5b72f6..dea8570b27 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -69,7 +69,7 @@ $(outdir)/lilypond/lilypond.html: $(outdir)/lilypond.texi mkdir -p $(dir $@) $(MAKEINFO) --output=$(outdir)/lilypond --html $< $(MAKEINFO) -I $(outdir) --output=$@ --html --no-split --no-headers $< - -cp -f $(outdir)/*.{png,ly} $(outdir)/lilypond + -ln -f $(outdir)/*.png $(outdir)/*.ly $(outdir)/lilypond/ $(outdir)/lilypond-internals/lilypond-internals.html: $(outdir)/lilypond-internals.texi mkdir -p $(dir $@) diff --git a/THANKS b/THANKS index 21d40658a6..45cc9324c1 100644 --- a/THANKS +++ b/THANKS @@ -3,6 +3,7 @@ Release 2.1 BUG HUNTERS/SUGGESTIONS +Matthias Kilian Eric Wurbel John Williams José Luis Cruz diff --git a/lily/include/separating-group-spanner.hh b/lily/include/separating-group-spanner.hh index 85b108c170..5a6376775a 100644 --- a/lily/include/separating-group-spanner.hh +++ b/lily/include/separating-group-spanner.hh @@ -14,9 +14,9 @@ class Separating_group_spanner { + static void find_rods (Item*, SCM, Real); public: static void add_spacing_unit (Grob*me, Item*); - static void find_rods (Item*, SCM); static bool has_interface (Grob*); static void find_musical_sequences (Grob*); diff --git a/lily/separating-group-spanner.cc b/lily/separating-group-spanner.cc index cfe9409140..ae543ba2db 100644 --- a/lily/separating-group-spanner.cc +++ b/lily/separating-group-spanner.cc @@ -15,7 +15,7 @@ #include "group-interface.hh" void -Separating_group_spanner::find_rods (Item * r, SCM next) +Separating_group_spanner::find_rods (Item * r, SCM next, Real padding) { /* @@ -26,7 +26,8 @@ Separating_group_spanner::find_rods (Item * r, SCM next) */ if (Separation_item::width (r).is_empty ()) return; - + + for(; gh_pair_p (next); next = ly_cdr (next)) { Item *l = dynamic_cast (unsmob_grob (ly_car( next))); @@ -43,7 +44,7 @@ Separating_group_spanner::find_rods (Item * r, SCM next) rod.item_l_drul_[LEFT] = lb; rod.item_l_drul_[RIGHT] = r; - rod.distance_ = li[RIGHT] - ri[LEFT]; + rod.distance_ = li[RIGHT] - ri[LEFT] + padding; rod.add_to_cols (); } } @@ -57,7 +58,7 @@ Separating_group_spanner::find_rods (Item * r, SCM next) rod.item_l_drul_[LEFT] =l; rod.item_l_drul_[RIGHT]=r; - rod.distance_ = li[RIGHT] - ri[LEFT]; + rod.distance_ = li[RIGHT] - ri[LEFT] + padding; rod.add_to_cols (); break; @@ -85,6 +86,7 @@ SCM Separating_group_spanner::set_spacing_rods (SCM smob) { Grob*me = unsmob_grob (smob); + Real padding = robust_scm2double (me->get_grob_property ("padding"), 0.1); for (SCM s = me->get_grob_property ("elements"); gh_pair_p (s) && gh_pair_p (ly_cdr (s)); s = ly_cdr (s)) { @@ -100,9 +102,9 @@ Separating_group_spanner::set_spacing_rods (SCM smob) Item *rb = dynamic_cast (r->find_prebroken_piece (LEFT)); - find_rods (r, ly_cdr (s)); + find_rods (r, ly_cdr (s), padding); if (rb) - find_rods (rb, ly_cdr (s)); + find_rods (rb, ly_cdr (s), padding); } return SCM_UNSPECIFIED ; diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 6722db4821..8b13c41ebd 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -362,6 +362,7 @@ minimumVerticalExtent = #'(0 . 2.5) extraVerticalExtent = ##f + SeparatingGroupSpanner \override #'padding = #0.8 verticalExtent = ##f } diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 54407dfc52..23b792a59b 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -71,7 +71,7 @@ default: pfa_warning $(ALL_GEN_FILES) pfa_warning: -ifneq ($(basename $(MFTRACE)),mftrace) +ifneq ($(notdir $(MFTRACE)),mftrace) @echo "" @echo "ERROR: mftrace not found" @echo "" diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make index 8f10f03530..a5d48d996d 100644 --- a/stepmake/stepmake/metafont-rules.make +++ b/stepmake/stepmake/metafont-rules.make @@ -30,11 +30,11 @@ $(outdir)/%.$(XPM_RESOLUTION)pk: $(outdir)/%.$(XPM_RESOLUTION)gf $(outdir)/%.pfa: %.mf - $(MFTRACE) $(MFTRACE_FLAGS) -I $(outdir)/ --pfa --simplify --keep-trying $(basename $(@F)) + $(MFTRACE) $(MFTRACE_FLAGS) -I $(outdir)/ --pfa --simplify $(basename $(@F)) mv $(basename $(@F)).pfa $(outdir) $(outdir)/%.pfb: %.mf - $(MFTRACE) $(MFTRACE_FLAGS) -I $(outdir)/ --pfa --pfb --simplify --keep-trying $(basename $(@F)) + $(MFTRACE) $(MFTRACE_FLAGS) -I $(outdir)/ --pfa --pfb --simplify $(basename $(@F)) -mv $(basename $(@F)).pfa $(outdir) mv $(basename $(@F)).pfb $(outdir) -- 2.39.5