From 4a78652f47fe5e7475cf38bb7de6ddfc97ee8beb Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 1 Nov 2001 21:02:50 +0100
Subject: [PATCH] patch::: 1.5.20.jcn1

1.5.20.jcn1
===========

* Fixed direct PostScript output, and changed default fonts.

* Bugfix: automaticMelismata in refman (huh, or should lily be changed?)

* pktrace:

      cp mf/out/feta20.* $HOME/usr/src/sketch-0.7.8/Resources/Fontmetrics
      echo 'TeX-feta20,feta20,Roman,-gnu-feta20-medium-r-normal,adobe-fontspecific,feta20' >> $HOME/usr/src/sketch-0.7.8/Resources/Fontmetrics/std.sfd

1.5.20
======
---
 CHANGES                         | 21 ++++++++++++++++++---
 Documentation/user/refman.itely | 22 ++++++++++++----------
 VERSION                         |  2 +-
 ly/params-init.ly               |  4 ++--
 ps/lilyponddefs.ps              | 14 +++++++-------
 5 files changed, 40 insertions(+), 23 deletions(-)

diff --git a/CHANGES b/CHANGES
index 1ef6a0d758..62de546a46 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,19 @@
+1.5.20.jcn1
+===========
+
+* Fixed direct PostScript output, and changed default fonts.
+
+* Bugfix: automaticMelismata in refman (huh, or should lily be changed?)
+
+* pktrace:
+
+      cp mf/out/feta20.* $HOME/usr/src/sketch-0.7.8/Resources/Fontmetrics
+      echo 'TeX-feta20,feta20,Roman,-gnu-feta20-medium-r-normal,adobe-fontspecific,feta20' >> $HOME/usr/src/sketch-0.7.8/Resources/Fontmetrics/std.sfd
+
+
+1.5.20
+======
+
 1.5.19.jcn3
 ===========
 
@@ -13,14 +29,13 @@
    - textrace:
       wget http://www.inf.bme.hu/~pts/textrace-latest.tar.gz
       tar xzf textrace-latest.tar.gz
-@@ -15,18 +17,23 @@
       (cd autotrace-0.27ap; ./configure; make)
       ./traceall.sh feta20 feta20.pfb $HOME/usr/src/lilypond/mf/out
 
-  - copy mf/out/feta20.* to sketch/Resources/Fontmetrics
+  - copy mf/out/feta20.* to sketch/Resources/Fontmetrics:
 
    - append to sketch/Resources/Fontmetrics/std.sfd:
-      echo 'TeX-feta20,feta20,Roman,-gnu-feta20-medium-r-normal,adobe-fontspec\ific,feta20' > $HOME/usr/src/sketch/sketch/Resources/Fontmetrics/std.sfd
+      echo 'TeX-feta20,feta20,Roman,-gnu-feta20-medium-r-normal,adobe-fontspecific,feta20' >> $HOME/usr/src/sketch/sketch/Resources/Fontmetrics/std.sfd
 
    - Hmm, then find that
 
diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 093637d504..d56184a5f1 100644
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -2026,23 +2026,25 @@ definition}.
 Lyrics are printed by interpreting them in the @code{Lyrics}  context.
 
 @c Maybe more pedagogical to avoid \addlyrics in this first example? /MB
-
+@c Add tied and beamed melismata too.
 @lilypond[verbatim,singleline]
-\addlyrics \notes \relative c' {
-        \time 7/4
-        \property Staff.automaticMelismata = ##t
-        d'2 c4 b16 ( a g a b a b ) c a2
-        b2 c4 b8 ( a16 g ) a4 g2 }
-    \context Lyrics \lyrics { 
-       Join us now __ and
-       share the soft -- ware; }
+\addlyrics
+  \notes \relative c' {
+    \time 7/4
+    \property Staff.automaticMelismata = ##t
+    d'2 c4 b16 ( a g a b a b ) c a2
+    b2 c4 b8 ( a16 g ) a4 g2 }
+  \context Lyrics \lyrics { 
+    Join us now __ and
+    share the soft -- ware; }
 @end lilypond
 
 
 Notes and syllable durations are matched automatically. This is
 accomplished using @code{\addlyrics}, which is documented in
 @ref{Automatic syllable durations}. Setting @code{automaticMelismata} in
-the melody staff will cause slurs to be interpreted as melismata.
+the melody staff will cause tied, slurred or beamed notes to be
+interpreted as melismata.
 
 The Lyric syllables are @code{LyricsVoice.LyricSyllable} grobs.
 
diff --git a/VERSION b/VERSION
index 9a676c90ea..aa11a5ea61 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=20
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/ly/params-init.ly b/ly/params-init.ly
index afc951023f..d7dc051286 100644
--- a/ly/params-init.ly
+++ b/ly/params-init.ly
@@ -4,8 +4,8 @@
 %% deprecated
 papersizename = \papersize 
 
-% ly2dvi now uses `papersize' internally (and on cmd line)
-%papersize = \papersize
+% DO NOT change this without fixing -f ps output
+papersize = \papersize
 
 % FIXME
 % direct PostScript line height for single line staves
diff --git a/ps/lilyponddefs.ps b/ps/lilyponddefs.ps
index 2ff908e420..220b6cf2ea 100644
--- a/ps/lilyponddefs.ps
+++ b/ps/lilyponddefs.ps
@@ -73,32 +73,32 @@
 % FIXME: font definitions should come from LilyPond
 %        built-in ps fonts are ugly
 /huge-bold-font {
-	/Times-Bold findfont 20.7 scalefont setfont
+	/Palatino-Bold findfont 20.7 scalefont setfont
 } bind def
 
 /Large-bold-font {
-	/Times-Bold findfont 17.3 scalefont setfont
+	/Palatino-Bold findfont 17.3 scalefont setfont
 } bind def
 
 /large-bold-font {
-	/Times-Bold findfont 14.4 scalefont setfont
+	/Palatino-Bold findfont 14.4 scalefont setfont
 } bind def
 
 /large-font {
-	/Times-Roman findfont 14.4 scalefont setfont
+	/Palatino-Roman findfont 14.4 scalefont setfont
 } bind def
 
 /large-smallcaps-font {
 	% urg
-	/Helvetica findfont 14.4 scalefont setfont
+	/Bookman-Light findfont 14.4 scalefont setfont
 } bind def
 
 /normal-font {
-	/Times-Roman findfont 12 scalefont setfont
+	/Palatino-Roman findfont 12 scalefont setfont
 } bind def
 
 /footnote-font {
-	/Times-Roman findfont 10 scalefont setfont
+	/Palatino-Roman findfont 10 scalefont setfont
 } bind def
 
 /get-text-dimensions % path .. width height
-- 
2.39.5