* scm/define-grob-properties.scm (gap-count): add gap-count

* make/lilypond-vars.make: add /lilypond to LILYPONDPREFIX

diff --git a/ChangeLog b/ChangeLog
index 2f6a2986d62f9299f4a40e8443c67357d43d664d..6d85123ef6baac6d02f09e865303aa915175c6b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-22  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * scm/define-grob-properties.scm (gap-count): add gap-count
+
+       * make/lilypond-vars.make: add /lilypond to LILYPONDPREFIX
+
 2003-09-22  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * cygwin/mknetrel.doc: Typo.

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 0b8613180dd30f8f369bcb343eab5bd151cb2cf2..c967da8063949c8daa2c30105943f0579fad03a0 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -6,12 +6,12 @@ export PATH:=$(builddir)/lily/$(outconfbase):$(builddir)/buildscripts/$(outconfb
 
 # LilyPond is often run from within $(outdir), making a relative
 # PREFIX incorrect.
-export LILYPONDPREFIX:=$(build_lilypond_datadir)
+export LILYPONDPREFIX:=$(build_lilypond_datadir)/lilypond
 
 export PYTHONPATH:=$(builddir)/python/$(outconfbase):$(PYTHONPATH)
 
 ## arg, TEXINPUTS, TFMFONTS, MFINPUTS may still override and thus break this
-export TEXMF:={$(LILYPONDPREFIX),$(shell kpsexpand \$$TEXMF)}
+export TEXMF:={$(build_lilypond_datadir),$(shell kpsexpand \$$TEXMF)}
 
 export MFINPUTS:=
 export TEXINPUTS:=

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 519caf96d2414f7ac0ea9cd476172443870b5366..e6004e4cf482838874fdabf054e230fa9e9860bd 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -241,6 +241,7 @@ beaming style: stems stop at innermost beams.")
 name of character within font.")
 
 (grob-property-description 'gap ly:dimension? "Size of a gap in a variable symbol.")
+(grob-property-description 'gap-count integer? "Number of gapped beams for tremolo.")
 
 (grob-property-description 'grow-direction ly:dir? "crescendo or decrescendo?.")
 (grob-property-description 'hair-thickness number? "thickness, measured in stafflinethickness.")