From cec3578c72af76e3e8c8b4603d5d03c8bd32c1e5 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Mon, 12 Aug 2002 12:01:11 +0000
Subject: [PATCH] release commit
---
ChangeLog | 4 ++++
Documentation/topdocs/AUTHORS.texi | 12 +++---------
Documentation/topdocs/INSTALL.texi | 8 ++++----
ROADMAP | 2 --
input/GNUmakefile | 4 ++--
input/mutopia/GNUmakefile | 2 +-
input/regression/lyric-combine.ly | 13 ++++++-------
make/lilypond.redhat.spec.in | 2 +-
8 files changed, 21 insertions(+), 26 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3fcb6045e8..3aacb5eb11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
2002-08-12 Han-Wen Nienhuys <hanwen@cs.uu.nl>
* VERSION: 1.5.72 released
+
+ * input/sondag-morgen/GNUmakefile (examples): add file
+
+ * input/mutopia/R.Schumann/GNUmakefile (examples): add file
* lily/lily-guile.cc (to_dir): return CENTER if not a direction.
diff --git a/Documentation/topdocs/AUTHORS.texi b/Documentation/topdocs/AUTHORS.texi
index aa186ea6be..90e7ad5b31 100644
--- a/Documentation/topdocs/AUTHORS.texi
+++ b/Documentation/topdocs/AUTHORS.texi
@@ -27,7 +27,7 @@ list is alphabetically ordered.
@item @email{matsb@@s3.kth.se, Mats Bengtsson},
@uref{http://www.s3.kth.se/~matsb/}
lots of testing, fixes, general comments and contributions.
-@item Laura Conrad (lconrad@@world.std.com)
+@item Laura Conrad (lconrad@@laymusic.org)
fixes to abc2ly
@item @email{Jan.A.Fagertun@@trondheim.online.no, Jan Arne Fagertun},
@TeX{} titling and lytodvi.sh
@@ -40,19 +40,15 @@ list is alphabetically ordered.
@item @email{chris@@fluffhouse.org.uk, Chris Jackson},
Piano pedals, Emacs mode indentation, directed arpeggios.
@item @email{nj104@@cus.cam.ac.uk, Neil Jerram}.
- parts of Documentation/Vocab*
+ Glossary translations.
@item @email{heikki.junes@@hut.fi, Heikki Junes}.
Finnish note names, updates to Emacs-mode
-@item Donald Ervin Knuth, @uref{http://www-cs-staff.stanford.edu/~knuth/}
- mf/ital-*.mf (these were taken from the CM fonts)
@item @email{m.krause@@tu-harburg.de, Michael Krause},
breathing signs
@item @email{dlatt@@datenrat.de, Dirk Lattermann},
minor improvements on accidentals/ties/multi measure rests
@item @email{wl@@gnu.org, Werner Lemberg},
misc bugfixes, some Beam and Stem code.
-@item @email{drl@@vuse.vanderbilt.edu, David R. Linn},
- Mailing list maintenance.
@item @email{,Adrian Mariano}
Reference manual, tutorial fixes, glossary.
@item @email{scancm@@biobase.dk,Christian Mondrup}
@@ -68,7 +64,7 @@ list is alphabetically ordered.
testing
@item @email{pinard@@iro.umontreal.ca, Francois Pinard},
@uref{http://www.iro.umontreal.ca/~pinard/}
- parts of Documentation/Vocab*, started internationalization stuff
+ parts of Documentation/user/glossary*, started internationalization stuff
@c urg: @c,{} in @email{} barfs.
@item @email{gperciva@@sfu.ca, Graham Percival},
@uref{http://www.sfu.ca/~gperciva/}
@@ -82,8 +78,6 @@ list is alphabetically ordered.
@item @email{reuterj@@ira.uka.de, Juergen Reuter}
Ancient notation support (custos, porrectus, mensural notation,
ancient clefs, etc.)
-@item @email{daboys@@austin.rr.com, Jeffrey B. Reed},
- Windows-NT support.
@item @email{august@@infran.ru, August S.Sigov}
Russian translation
@item @email{rune@@zedeler.dk, Rune Zedeler}
diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index b206058a6b..33117dd713 100644
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -233,9 +233,9 @@ Building the website requires some additional tools:
@itemize @bullet
@item The netpbm utilities, see @uref{http://netpbm.sourceforge.net/}
-@item pktrace 1.0 or newer, needed for generating PostScript Type1
-fonts. Get it from @uref{http://www.cs.uu.nl/~hanwen/pktrace/}. You
-will need to install some additional packages to get pktrace to work.
+@item mftrace 1.0 or newer, needed for generating PostScript Type1
+fonts. Get it from @uref{http://www.cs.uu.nl/~hanwen/mftrace/}. You
+will need to install some additional packages to get mftrace to work.
@end itemize
@section Building LilyPond
@@ -349,7 +349,7 @@ with the sources. You can make the rpm by issuing
For compilation on a Red Hat system you need these packages, in
addition to the those needed for running: glibc-devel, gcc-c++,
-libstdc++-devel, guile-devel, flex, bison, texinfo, groff, pktrace,
+libstdc++-devel, guile-devel, flex, bison, texinfo, groff, mftrace,
netpbm-progs, autotrace, t1utils.
diff --git a/ROADMAP b/ROADMAP
index 87938a24ab..19cfde6806 100644
--- a/ROADMAP
+++ b/ROADMAP
@@ -34,5 +34,3 @@ source files.
scm/ Scheme initialisation and subroutine files
scripts/ End-user scripts
stepmake/ Generic make subroutine files
-test
-test
diff --git a/input/GNUmakefile b/input/GNUmakefile
index 96a399cfa5..5ed0316b64 100644
--- a/input/GNUmakefile
+++ b/input/GNUmakefile
@@ -3,8 +3,8 @@ depth = ..
SUBDIRS=test regression tutorial no-notation ascii-art template mutopia sondag-morgen
# nereides is tweaked a lot, can't do (read webpage)
-examples=trip star-spangled-banner paddy twinkle font20
-examples+=size11 size13 size16 size20 size23 size26
+examples= size11 size26
+#examples+=size11 size13 size16 size20 size23 size26
LOCALSTEPMAKE_TEMPLATES=ly mutopia
EXTRA_DIST_FILES=paddy.abc
diff --git a/input/mutopia/GNUmakefile b/input/mutopia/GNUmakefile
index 94cc0a2f02..c714662fab 100644
--- a/input/mutopia/GNUmakefile
+++ b/input/mutopia/GNUmakefile
@@ -2,7 +2,7 @@ depth = ../..
LOCALSTEPMAKE_TEMPLATES=ly mutopia
EXTRA_DIST_FILES += claop.py
-SUBDIRS = J.S.Bach F.Schubert E.Satie W.A.Mozart
+SUBDIRS = J.S.Bach F.Schubert E.Satie W.A.Mozart R.Schumann
include $(depth)/make/stepmake.make
diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly
index 98c51a104e..43d7001a30 100644
--- a/input/regression/lyric-combine.ly
+++ b/input/regression/lyric-combine.ly
@@ -1,7 +1,7 @@
\version "1.5.68"
+
\header{
-texidoc="
-Lyrics can be set to a melody automatically. Excess lyrics will be
+texidoc= "Lyrics can be set to a melody automatically. Excess lyrics will be
discarded. Lyrics will not be set over rests. You can have melismata
either by setting a property melismaBusy, or by setting
automaticMelismas (which will set melismas during slurs and ties). If
@@ -9,8 +9,7 @@ you want a different order than first Music, then Lyrics, you must
precook a chord of staves/lyrics and label those. Of course
@code{\rhythm} ignores any other rhythms in the piece. Hyphens and
extenders do not assume anything about lyric lengths, so they continue
-to work.
-"
+to work."
}
@@ -24,9 +23,9 @@ m = \notes \relative c'' {
\melismaEnd
b }
-noise = \repeat unfold 6 \notes \relative c'' {g16 g g g }
-q
-textI = \context LyricsVoice = "middle-1" \lyrics { la2 __ la -- la __ la la la la la }
+noise = \repeat unfold 6 \notes \relative c'' { g16 g g g }
+
+ textI = \context LyricsVoice = "middle-1" \lyrics { la2 __ la -- la __ la la la la la }
textII = \context LyricsVoice = "middle-1" \lyrics { da -- da __ da -- da da da da da }
\score {
diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index 2286693328..4518216fb7 100644
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -12,7 +12,7 @@ Summary: Create and print music notation
URL: http://www.lilypond.org/
BuildRoot: /tmp/lilypond-install
-Buildrequires: t1utils bison flex pktrace texinfo
+Buildrequires: t1utils bison flex mftrace texinfo
Requires: tetex tetex-latex libstdc++ python
%description
--
2.39.5