From 7ea47a1a1f5f64f1ac5df7e676741d33b74e5bef Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 6 Nov 2002 11:43:32 +0000
Subject: [PATCH] * ly/paper16-init.ly (paperSixteen): Bugfix: set fonts
 instead of stylesheet.

* ly/paper19.ly: Include paper19-init.ly.

* Documentation/user/tutorial.itely (First steps): Fix first
example for font test.

* input/tutorial/brahms-tweaked.ly: Fix by hand for font test.
---
 ChangeLog                         | 12 ++++++++++++
 Documentation/user/tutorial.itely |  9 ++++++---
 input/tutorial/brahms-tweaked.ly  |  2 +-
 ly/paper16-init.ly                |  2 +-
 ly/paper19.ly                     | 13 +------------
 5 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 4d4dbe48cf..14305d368a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2002-11-06  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+	* ly/paper16-init.ly (paperSixteen): Bugfix: set fonts instead of
+	stylesheet.
+
+	* ly/paper19.ly: Include paper19-init.ly.
+
+	* ly/paper19-init.ly: New file.
+
+	* Documentation/user/tutorial.itely (First steps): Fix first
+	example for font test.
+
+	* input/tutorial/brahms-tweaked.ly: Fix by hand for font test.
+
 	* ChangeLog: Add 1.7.6 release marker (see below).
 
 	* stepmake/stepmake/python-module-vars.make (EXTRA_DIST_FILES):
diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 1709fef5d3..cf84115ce1 100644
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -54,9 +54,12 @@ c d e f g a b
 @noindent
 then the result looks like this:
 
-@lilypond[notime]
-\property Score.timing = ##f
-\transpose c c' { c d e f g a b }
+@c ?
+@c \transpose c c' { c d e f g a b }
+@c @lily pond[notime]
+@c \property Score.timing = ##f
+@lilypond[notime, relative=2]
+c d e f g a b
 @end lilypond
 
 We will continue with this format: First we show a snippet of input,
diff --git a/input/tutorial/brahms-tweaked.ly b/input/tutorial/brahms-tweaked.ly
index 3f391addc0..bfc8477ca5 100644
--- a/input/tutorial/brahms-tweaked.ly
+++ b/input/tutorial/brahms-tweaked.ly
@@ -23,7 +23,7 @@
 	  \property Voice.Stem \set #'transparent = ##t
           d'
           \property Voice.Stem \revert #'transparent
-          ~ <<d b>>4  > }
+          ~ <<d b>>4 }
     >
     \context Staff = down {
         \key d \major
diff --git a/ly/paper16-init.ly b/ly/paper16-init.ly
index 453c823d1d..15a3aef28c 100644
--- a/ly/paper16-init.ly
+++ b/ly/paper16-init.ly
@@ -4,7 +4,7 @@
 
 paperSixteen = \paper {
 	staffheight = 16.0\pt
-	\stylesheet #(make-font-list 'paper16)
+	#(define fonts #(make-font-list 'paper16))
 
 	\include "params-init.ly"
 }
diff --git a/ly/paper19.ly b/ly/paper19.ly
index 89d4321bbc..b76df19418 100644
--- a/ly/paper19.ly
+++ b/ly/paper19.ly
@@ -1,14 +1,3 @@
-% paper20-init.ly
-
-
 \version "1.5.68"
 
-paperNineteen = \paper {
-	staffheight = 19.0\pt
-	#(define fonts (make-font-list 'paper19))
-
-	\include "params-init.ly"
-}
-
-\paper { \paperNineteen }
-
+\include "paper19-init.ly"
-- 
2.39.5