From c6a67fa72be5bb9eb70a726cb23f8a38feaea997 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Fri, 25 Jul 2003 12:45:12 +0000
Subject: [PATCH] * Documentation/user/invoking.itexi (Invoking the lilypond
 binary): add note about path.

* Documentation/user/macros.itexi: add @c at EOL, hopefully
suppresses superfluous spaces.
---
 ChangeLog                         | 11 +++++++++++
 Documentation/user/invoking.itexi |  7 +++++--
 Documentation/user/macros.itexi   | 20 ++++++++++----------
 THANKS                            |  9 ++++++++-
 scripts/lilypond-book.py          | 10 +++++-----
 5 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aa14e09173..2861775631 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,20 @@
+2003-07-25  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+	* Documentation/user/invoking.itexi (Invoking the lilypond
+	binary): add note about path.
+
+	* Documentation/user/macros.itexi: add @c at EOL, hopefully
+	suppresses superfluous spaces.
+
 2003-07-25  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* make/srcdir.make.in (web-install): Use SRCMAKE, set outdir.
 
 2003-07-25  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+	* scripts/lilypond-book.py: HTML fixes (by Michael Ossmann
+	<mike@ossmann.com>)
+
 	* Documentation/bibliography/computer-notation.bib (pages): prune
 	unscientific language.
 
diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi
index 9d16766584..55c726e0db 100644
--- a/Documentation/user/invoking.itexi
+++ b/Documentation/user/invoking.itexi
@@ -140,15 +140,18 @@ run it yourself.
 If you use sh, bash, or a similar shell, then add the following to
 your @file{.profile}
 @example
-	. lilypond-profile
+	. @var{/the/path/to/}lilypond-profile
 @end example
 
 If you use csh, tcsh or a similar shell, then add the following to
 your @file{~/.login}
 @example
-	source lilypond-login
+	source @var{/the/path/to/}lilypond-login
 @end example
 
+Of course, in both cases, you should substitute the proper location of
+either script.
+
 These scripts set the following variables
 @table @code
 @item TEXMF
diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index db2c2d8b76..cac243e646 100644
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -87,20 +87,20 @@ $\\flat$%
 @c dup?
 @ifhtml
 @macro internalsref{NAME}
-@uref{../lilypond-internals/\NAME\.html,\NAME\}
-@cindex \NAME\
+@uref{../lilypond-internals/\NAME\.html,\NAME\}@c
+@cindex \NAME\@c
 @end macro
 
 @macro inputfileref{DIR,NAME}
-@uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}
+@uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
 @end macro
 
 @end ifhtml
 
 @ifinfo
 @macro internalsref{NAME}
-@inforef{\NAME\,,lilypond-internals}
-@cindex \NAME\
+@inforef{\NAME\,,lilypond-internals}@c
+@cindex \NAME\@c
 @end macro
 
 @macro inputfileref{DIR,NAME}i
@@ -110,12 +110,12 @@ $\\flat$%
 @end ifinfo
 
 @iftex
-@macro internalsref{NAME}
-@cindex \NAME\
-@code{\NAME\}
+@macro internalsref{NAME}@c
+@cindex \NAME\@c
+@code{\NAME\}@c
 @end macro
-@macro inputfileref{DIR,NAME}
-@file{\DIR\/\NAME\}
+@macro inputfileref{DIR,NAME}@c
+@file{\DIR\/\NAME\}@c
 @end macro
 @end iftex
 
diff --git a/THANKS b/THANKS
index 0325e919e9..1cbc182e2d 100644
--- a/THANKS
+++ b/THANKS
@@ -1,14 +1,20 @@
 
+HEAD HACKERS
+
+Han-Wen Nienhuys
+Jan Nieuwenhuizen
+
+
 CONTRIBUTORS
 
 Graham Percival
 Heikki Junes
-Jeremie Lumbroso
 Juergen Reuter
 Kim Shrier
 Rune Zedeler
 Werner Lemberg
 
+
 BUG HUNTERS
 
 Amelie Zapf
@@ -33,6 +39,7 @@ Pedro Kroger
 Richard Shann
 Ryan O'Neil
 Simon Bailey
+Simon Weatherill
 Stanislav Brabec
 Thomas Rijniers
 Werner Lemberg
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 54a70d3847..43f7b7901c 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -376,7 +376,7 @@ output_dict= {
 		## inline music doesn't.
 		## possibly other center options?
 		'output-html': r'''
-%(pageimages)s''',
+%(htmlimages)s''',
 		},
 
 
@@ -1250,7 +1250,7 @@ linking to the menu.
 		outname = base + '.ly'
 		changed = update_file (content, outname)
 
-		preview = base + ".png"
+		preview = base + ".preview.png"
 		preview_page = base + '-page1.png'
 		
 		if changed or not (os.path.isfile (preview) or
@@ -1258,7 +1258,7 @@ linking to the menu.
 			
 			ly.system ('%s --preview --postscript --verbose %s ' % (ly2dvi_binary, base) ) 
 
-			ly.make_ps_images (base)
+			ly.make_ps_images (base + '.ps')
 			ly.system ('gzip -9 - < %s.ps > %s.ps.gz' %  (base, base))
 			
 		def size_str (fn):
@@ -1281,7 +1281,7 @@ linking to the menu.
 		menu = ''
 		page_files = glob.glob ('%s-page*.png' % base)
 
-		for p in string.split (page_files, '\n'):
+		for p in page_files:
 			p = p.strip()
 			if os.path.isfile (p):
 				sz = size_str (p)
@@ -1319,7 +1319,7 @@ use scalable fonts and should look OK at any resolution."""
 		
 		open (base + '.html','w'). write (separate_menu)
 
-		inline_menu = '<p/><a href="%s.html"><img src="%s"><p/></a>' % (base, original_name, preview)
+		inline_menu = '<p/><a href="%s.html"><img alt="%s" src="%s"></a><p/>' % (base, original_name, preview)
 
 		return ('ly2dvi', inline_menu)
 
-- 
2.39.5