From 74441a1bc0a85bcbc445c2187d6c560e88a1c69f Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 27 Mar 2002 02:04:05 +0000
Subject: [PATCH] lilypond-1.5.21
---
Documentation/user/refman.itely | 22 ++++++++++++----------
ly/params-init.ly | 4 ++--
ps/lilyponddefs.ps | 14 +++++++-------
3 files changed, 21 insertions(+), 19 deletions(-)
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/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