(start-system): Bugfix: add closing brace (Beernd

Noordkamp).

diff --git a/ChangeLog b/ChangeLog
index f1d668c6cf48455d7baee84d615bf5e16dc0ac36..f16f90cd8f078f84d7061a65bdb782fbeb6acc8a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-04-13  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scm/pdftex.scm (start-system): Bugfix: add closing brace (Beernd
+       Noordkamp).
+
+2003-03-04  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * cygwin/post-lilypond.sh: Add FHS-specified path for fonts to
+       clean out.
+
 2003-04-09  Mats Bengtsson  <mats.bengtsson@s3.kth.se>
 
        * Documentation/topdocs/AUTHORS.texi (AUTHORS): Updated contact
@@ -33,6 +43,7 @@
 
        * mf/feta-beugel.mf (code): backport brace fix from 1.7
 
+>>>>>>> 1.482.2.132
 2003-02-26  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * Backport:

diff --git a/cygwin/post-lilypond.sh b/cygwin/post-lilypond.sh
index db8927dbb881fe6fb1fd3260318083bac2d6a3b4..f8e2ad2f014a41e5723d34f924cc8cd749c29cb3 100644 (file)
--- a/cygwin/post-lilypond.sh
+++ b/cygwin/post-lilypond.sh
@@ -2,7 +2,7 @@
 # /etc/profile.d/post-lily.sh  -- Setup LilyPond
 
 touch /tmp/.lilypond-install
-rm $(find /var/lib/texmf /var/spool/texmf -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan*pk' -or -name 'parmesan*tfm')
+rm $(find /var/lib/texmf /var/spool/texmf /var/cache/fonts -name 'feta*pk' -or -name 'feta*tfm' -or -name 'parmesan*pk' -or -name 'parmesan*tfm')
 rm -f /tmp/.lilypond-install
 
 

diff --git a/scm/pdftex.scm b/scm/pdftex.scm
index 25ba5b604f34eea81fda891376f6a7cb96d40570..7386d5453a884fcf0d430d6e03ffcd18f1aaaba3 100644 (file)
--- a/scm/pdftex.scm
+++ b/scm/pdftex.scm
@@ -226,7 +226,7 @@
                 "  {\\advance\\scoreshift by -\\lilypondscoreshift}%\n"
                 "\\lybox{"
                 (ly-number->string wd) "}{"
-                (ly-number->string ht) "{%\n"))
+                (ly-number->string ht) "}{%\n"))
 
 (define (stop-system) 
   "}%\n%\n\\interscoreline\n%\n")