(Top): explain how to get

.pfas from a .deb.

diff --git a/ChangeLog b/ChangeLog
index 1171f0b19d40602978a31a80c5045b9919e14087..18043fc75e75ab2f4925c5547eb9e7fc821897b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2003-08-20  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * Documentation/topdocs/INSTALL.texi (Top): explain how to get
+       .pfas from a .deb.
+
+2003-08-19  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * Documentation/bibliography/engraving.bib: add entry for
+       Jaschinski's Notation
+
 2003-08-18  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * Documentation/user/refman.itely (Beaming): add note about

diff --git a/Documentation/bibliography/engraving.bib b/Documentation/bibliography/engraving.bib
index fbfa40841247a0fb8de5ca6296db99bd43ec932a..a2a25151bf10b6eedbbe20dc54c2e700526477c3 100644 (file)
--- a/Documentation/bibliography/engraving.bib
+++ b/Documentation/bibliography/engraving.bib
@@ -335,10 +335,15 @@ It can be ordered from the rental department.
 }
 
 @Book{jaschinski00:_notat,
-  author =      {Andreas Jaschinski},
+  editors =     {Andreas Jaschinski},
   title =       {Notation},
   publisher =   {Bärenreiter Verlag},
   year =        2000,
   number =      {BVK1625}
+
+  annote = {Articles from "Musik in Geschichte und Gegenwart"
+pertaining to notation.  Both "alternative" notation and ancient
+notation is treated in depth, while "common" notation is not.  }
 }
 
+

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 3bae59900173dd91a8957f866d16671a529dfe01..65e62ded582d4160f432677772df5f4d88eb114a 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -197,39 +197,26 @@ make pfa-fonts
 make MAKE_PFA_FILES=1 install
 texhash
 @end example 
+
 PFA versions of the fonts for the latest LilyPond version can also be
-obtained from the web site using
+obtained from the internet: download the .deb file that corresponds to
+your version, eg.  
+
 @example
-@ignore
-# old stuff
-mkdir /tmp/newfonts
-cd /tmp/newfonts/
-wget -l 1 -nd -r -A pfa,map http://lilypond.org/stable/mf/out/
-mv *.pfa $LILYPONDSHARE/fonts/type1/
-mv *.map $LILYPONDSHARE/dvips/
-texhash
-@end ignore
-@c this matches the current type1-1.8.0.tar.gz tarball at lilypond.org
-@c better not change this before 1.8.1?
-wget -P/tmp ftp://ftp.lilypond.org/pub/LilyPond/v1.8/type1-1.8.0.tar.gz
-tar -C /usr/share/lilypond/1.8.0/fonts -xf /tmp/type1-1.8.0.tar.gz
-mv /usr/share/lilypond/1.8.0/ && mv fonts/type1/*.map /usr/share/lilypond/1.8.0/dvips
-texhash
-@end example 
-@ignore
-@c this matches new font tarbal layout and should work for 1.8.1.
-wget -P/tmp ftp://ftp.lilypond.org/pub/LilyPond/v1.8/type1-1.8.1.tar.gz
-tar -C /usr/share/lilypond/1.8.1 -xf /tmp/type1-1.8.1.tar.gz
+wget http://ftp.us.debian.org/debian/pool/main/l/lilypond/lilypond_1.8.0-1_i386.deb
+ar x lilypond_1.8.0.-1_i386.deb
+tar -C / -zxf  data.tar.gz /usr/share/lilypond/1.8.0/fonts/type1/
+tar -C / -zxf  data.tar.gz /usr/share/lilypond/1.8.0/dvips/
 texhash
-@end ignore
-where @code{$LILYPONDSHARE} denotes @code{/usr/share/lilypond/1.8.0/} or
-wherever LilyPond is installed on your system.
+@end example
+
+If you are installing LilyPond somewhere else, unpack the appropriate
+files as shown, and move them to the appropriate paths.
 
 If you are doing an upgrade, you should remove all @file{feta}
 @code{.pk} and @code{.tfm} files.  A script has been provided to do the
 work for you, see @file{buildscripts/clean-fonts.sh}.
 
-
 If you are not root, you should choose a @code{--prefix} argument that
 points into your home directory, e.g.:
 @example 

diff --git a/GNUmakefile.in b/GNUmakefile.in
index de2170d2b8b157af4820710f752a8eb0cbaadc10..83eecd00827e82d61d229759e5145136dbe928ce 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -151,5 +151,5 @@ $(config_h): configure.in aclocal.m4
 # maybe move into private script?
 rsync-web:
        cd out-www &&  mkdir web && tar  -xzf web.tar.gz -C web
-       cd out-www/web &&  rsync --delete --stats --progress -lavu -e ssh . x:/var/www/lilypond/doc/v1.8/
+       cd out-www/web &&  rsync --delete --stats --progress -rltvu -e ssh . x:/var/www/lilypond/doc/v1.8/
        cd out-www && rm -rf web/

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index f7559876793af3b3e128bce2c8b5426b9649ab19..71711a257f272c0e25972f9224f370e90655134e 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -25,7 +25,7 @@ should also set allowBeamBreak, but how to do it "portably"? (ie. also
 working with lyric sections)
 
 %}
-break =#(ly:export make-event-chord (list (make-penalty-music -10001)))
+break =#(make-event-chord (list (make-penalty-music -10001)))
 noBreak =  #(make-event-chord (list (make-penalty-music 10001)))
 
 \include "scale-definitions-init.ly"

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index a9f08b392f8df9e4ee9b5ede15adca9533565467..ad46ea5fb7240f0e96790e1b44f473c31cc11aec 100644 (file)
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -16,9 +16,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 Buildrequires: t1utils bison flex mftrace ImageMagick
 Buildrequires: texinfo >= 4.6
-Buildrequires: guile-devel >= 1.6.4-7
+Buildrequires: guile-devel >= 1.6.4-8
 Requires: tetex  tetex-latex libstdc++ python  tetex-dvips tetex-latex
-Requires: guile >= 1.6.4-7
+Requires: guile >= 1.6.4-8
 
 %description
 LilyPond lets you create music notation.  It produces