songbook 4.2 update (17oct06)

git-svn-id: svn://tug.org/texlive/trunk@2351 c570f23f-e606-0410-a88d-b1316a301751

25 files changed, 264 insertions, 58 deletions

diff --git a/Master/texmf-dist/doc/latex/songbook/README b/Master/texmf-dist/doc/latex/songbook/README
new file mode 100644
index 00000000000..5a354d063fb
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/songbook/README
@@ -0,0 +1,9 @@
+The Songbook style provides an all purpose songbook style for
+LaTeX2e.  The package allows for three types of output from a
+single input file: words and chords books for the musicians to
+play from, words only songbooks for the congregation to sing
+from, and overhead transparency masters for congregational use.
+The style will also print a table of contents, an index sorted
+by title and first line, and an index sorted by key.  It
+attempts to handle songs in multiple keys, as well as songs in
+multiple languages.
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/songbook/contrib/CarolBook/CarolBookOH.pdf b/Master/texmf-dist/doc/latex/songbook/contrib/CarolBook/CarolBookOH.pdf
index 309f9f328b8..816626ab642 100644
--- a/Master/texmf-dist/doc/latex/songbook/contrib/CarolBook/CarolBookOH.pdf
+++ b/Master/texmf-dist/doc/latex/songbook/contrib/CarolBook/CarolBookOH.pdf
diff --git a/Master/texmf-dist/doc/latex/songbook/contrib/CarolBook/CarolBookWB.pdf b/Master/texmf-dist/doc/latex/songbook/contrib/CarolBook/CarolBookWB.pdf
index 3e047d69437..702ed0c03f6 100644
--- a/Master/texmf-dist/doc/latex/songbook/contrib/CarolBook/CarolBookWB.pdf
+++ b/Master/texmf-dist/doc/latex/songbook/contrib/CarolBook/CarolBookWB.pdf
diff --git a/Master/texmf-dist/doc/latex/songbook/contrib/modulate b/Master/texmf-dist/doc/latex/songbook/contrib/modulate
index 39fe8b8674c..e4901d5c626 100644
--- a/Master/texmf-dist/doc/latex/songbook/contrib/modulate
+++ b/Master/texmf-dist/doc/latex/songbook/contrib/modulate
@@ -2,14 +2,12 @@
 ###

 # modulate - Modulate a song from one key to another.

 #

-# @(#)$Id: modulate,v 1.5 2002/01/17 03:19:24 christopher Exp $

+# @(#)$Id: modulate,v 1.6 2006/10/15 15:48:10 rathc Exp $

 # Copyright 1998--2002 Christopher Rath <christopher@rath.ca>

 #

-# This package is free software; you can redistribute it and/or

-# modify it under the terms of the GNU Lesser General Public

-# License as published by the Free Software Foundation; either

-# version 2.1 of the License, or (at your option) any later

-# version.

+# This package is free software; you can redistribute it and/or modify

+# it under the terms of version 2.1 of the GNU Lesser General Public

+# License as published by the Free Software Foundation.

 #

 # This package is distributed in the hope that it will be

 # useful, but WITHOUT ANY WARRANTY; without even the implied

diff --git a/Master/texmf-dist/doc/latex/songbook/install.txt b/Master/texmf-dist/doc/latex/songbook/install.txt
index e78623c34f7..feccc724055 100644
--- a/Master/texmf-dist/doc/latex/songbook/install.txt
+++ b/Master/texmf-dist/doc/latex/songbook/install.txt
@@ -1,4 +1,4 @@
-@(#)$Id: install.txt,v 1.4 2003/08/19 23:31:15 christopher Exp $
+@(#)$Id: install.txt,v 1.5 2006/10/15 15:49:49 rathc Exp $
 
 			  - - - - - - - - - - - - - -
                                    
@@ -6,10 +6,11 @@
                                    
 		     - - - - - - - - - - - - - - - - - - -
                                    
-	         LaTeX Songbook Style, Version 4.1, 2003/08/31
+	         LaTeX Songbook Style, Version 4.2, 2006/10/13
+
 	      - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-		   Copyright (c) 1992--2003 Christopher Rath
+		   Copyright (c) 1992--2006 Christopher Rath
 			     All rights reserved.
 
 	      - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -23,8 +24,7 @@ Legal Stuff:
 
     This package is free software; you can redistribute it and/or modify it
     under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or (at
-    your option) any later version.
+    version 2.1 of the Free Software Foundation.
 
     This package is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
diff --git a/Master/texmf-dist/doc/latex/songbook/mksbadx b/Master/texmf-dist/doc/latex/songbook/mksbadx
new file mode 100644
index 00000000000..2a9f3b17242
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/songbook/mksbadx
@@ -0,0 +1,50 @@
+#!/bin/sh
+##### rcsid = @(#)$Id: mksbkdx,v 1.10 2003/08/19 23:30:36 christopher Exp $
+#####
+##
+##	mksbadx - Produce a songbook style .adx file from a .aIdx file.
+##
+##      Version 4.2, 13 October, 2006
+##
+##      Copyright 1992--2006 Christopher Rath <christopher@rath.ca>
+##
+##	This package is free software; you can redistribute it and/or
+##	modify it under the terms of version 2.1 of the GNU Lesser
+##	General Public License as published by the Free Software
+##	Foundation.
+##
+##	This package is distributed in the hope that it will be
+##	useful, but WITHOUT ANY WARRANTY; without even the implied
+##	warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+##	PURPOSE.  See the GNU Lesser General Public License for more
+##	details.
+##
+##	Take a .aIdx file produced by one of the songbook styles and
+##	turn it into a .adx file for final formatting into an index 
+##	of songs by key.
+##
+#####
+#####
+
+###
+# Check that the proper parameters were input.
+###
+if [ "$1" = "" ]
+then
+  echo USAGE: $0 jobname
+fi
+
+###
+# Call makeindex to do the required munging.
+##
+makeindex -s songbook.ist -o $1.adx $1.aIdx
+
+###
+# Tell the user what the new filename is.
+###
+echo " "
+echo "The new Index file is called \`$1.adx'."
+
+###
+# End of script.
+###
diff --git a/Master/texmf-dist/doc/latex/songbook/mksbkdx b/Master/texmf-dist/doc/latex/songbook/mksbkdx
index 7ae86e3bc3b..9c877528dcb 100644
--- a/Master/texmf-dist/doc/latex/songbook/mksbkdx
+++ b/Master/texmf-dist/doc/latex/songbook/mksbkdx
@@ -1,18 +1,17 @@
 #!/bin/sh
-##### rcsid = @(#)$Id: mksbkdx,v 1.10 2003/08/19 23:30:36 christopher Exp $
+##### rcsid = @(#)$Id: mksbkdx,v 1.11 2006/10/15 15:49:49 rathc Exp $
 #####
 ##
 ##	mksbkdx - Produce a songbook style .kdx file from a .kIdx file.
 ##
-##      Version 4.1, 31 August, 2003
+##      Version 4.2, 13 October, 2006
 ##
-##      Copyright 1992--2003 Christopher Rath <christopher@rath.ca>
+##      Copyright 1992--2006 Christopher Rath <christopher@rath.ca>
 ##
 ##	This package is free software; you can redistribute it and/or
-##	modify it under the terms of the GNU Lesser General Public
-##	License as published by the Free Software Foundation; either
-##	version 2.1 of the License, or (at your option) any later
-##	version.
+##	modify it under the terms of version 2.1 of the GNU Lesser
+##	General Public License as published by the Free Software
+##	Foundation.
 ##
 ##	This package is distributed in the hope that it will be
 ##	useful, but WITHOUT ANY WARRANTY; without even the implied
diff --git a/Master/texmf-dist/doc/latex/songbook/mksbtdx b/Master/texmf-dist/doc/latex/songbook/mksbtdx
index f4d8eef2b13..fb4b9c348da 100644
--- a/Master/texmf-dist/doc/latex/songbook/mksbtdx
+++ b/Master/texmf-dist/doc/latex/songbook/mksbtdx
@@ -1,18 +1,17 @@
 #!/bin/sh
-##### rcsid = @(#)$Id: mksbtdx,v 1.12 2003/08/19 23:30:37 christopher Exp $
+##### rcsid = @(#)$Id: mksbtdx,v 1.13 2006/10/15 15:49:49 rathc Exp $
 #####
 ##
 ##	mksbtdx - Produce a songbook style .tdx file from a .tIdx file.
 ##
-##      Version 4.1, 31 August, 2003
+##      Version 4.2, 13 October, 2006
 ##
-##      Copyright 1992--2003 Christopher Rath <christopher@rath.ca>
+##      Copyright 1992--2006 Christopher Rath <christopher@rath.ca>
 ##
 ##	This package is free software; you can redistribute it and/or
-##	modify it under the terms of the GNU Lesser General Public
-##	License as published by the Free Software Foundation; either
-##	version 2.1 of the License, or (at your option) any later
-##	version.
+##	modify it under the terms of version 2.1 of the GNU Lesser
+##	General Public License as published by the Free Software
+##	Foundation.
 ##
 ##	This package is distributed in the hope that it will be
 ##	useful, but WITHOUT ANY WARRANTY; without even the implied
diff --git a/Master/texmf-dist/doc/latex/songbook/relnotes.txt b/Master/texmf-dist/doc/latex/songbook/relnotes.txt
index c7de0a89188..a1c2b9967b0 100644
--- a/Master/texmf-dist/doc/latex/songbook/relnotes.txt
+++ b/Master/texmf-dist/doc/latex/songbook/relnotes.txt
@@ -1,4 +1,4 @@
-@(#)$Id: relnotes.txt,v 1.21 2003/09/23 01:18:57 christopher Exp $
+@(#)$Id: relnotes.txt,v 1.22 2006/10/15 15:49:49 rathc Exp $
 
 			       - - - - - - - - -
                                    
@@ -6,11 +6,11 @@
                                    
 		       - - - - - - - - - - - - - - - - -
                                    
-	         LaTeX Songbook Style, Version 4.1a, 2003/08/31
+	         LaTeX Songbook Style, Version 4.2, 2006/10/13
                                    
 	      - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-		   Copyright (c) 1992--2003 Christopher Rath
+		   Copyright (c) 1992--2006 Christopher Rath
 			     All rights reserved.
 
 	      - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -23,8 +23,7 @@ Legal Stuff:
 
     This package is free software; you can redistribute it and/or modify it
     under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2.1 of the License, or (at
-    your option) any later version.
+    version 2.1 of the Free Software Foundation.
 
     This package is distributed in the hope that it will be useful, but WITHOUT
     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
@@ -34,6 +33,9 @@ Legal Stuff:
     You should have received a copy of the GNU Lesser General Public License
     along with this library; if not, I'll be glad to provide one.
 
+Changes in Release 4.2:
+
+    * added a new Artist index option
 
 Changes in Release 4.1a:
 
diff --git a/Master/texmf-dist/doc/latex/songbook/sample-sb.aIdx b/Master/texmf-dist/doc/latex/songbook/sample-sb.aIdx
new file mode 100644
index 00000000000..706a48e9e0f
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/songbook/sample-sb.aIdx
@@ -0,0 +1,26 @@
+\indexentry{Unknown+What A Mighty God We Serve}{1}
+\indexentry{Unknown+Finally, My Brethren}{2}
+\indexentry{Unknown+The Lord Of Covenant}{3}
+\indexentry{Unknown+We Will Rejoice}{4}
+\indexentry{Unknown+Praise Him In His Sanctuary}{5}
+\indexentry{Unknown+Rise Up}{6}
+\indexentry{Unknown+We Are Marching In Messiah's Band}{7}
+\indexentry{Unknown+A Song Of Love}{8}
+\indexentry{Christopher Rath+Hail To The King}{9}
+\indexentry{Anonymous and I.\nobreakspace  {}Miron \&\nobreakspace  {}J.\nobreakspace  {}Grossman+The Horse And Rider}{10}
+\indexentry{Robert Lowry+Nothing But The Blood}{11}
+\indexentry{Unknown+Far Above All Rule And Authority}{12}
+\indexentry{Unknown+Sing Hallelujah}{13}
+\indexentry{Unknown+Zephaniah 3:17}{14}
+\indexentry{Unknown+Come And Let Us Go}{15}
+\indexentry{Unknown+Behold, I Am The Lord}{16}
+\indexentry{Unknown+Stand Up And Bless}{17}
+\indexentry{Unknown+Jesus Is The Lord}{18}
+\indexentry{Unknown+I Will Sing Praises}{19}
+\indexentry{Unknown+Let God Be Magnified}{20}
+\indexentry{Unknown+There's A Light Shining Forth}{21}
+\indexentry{Unknown+How Great Is Our God}{22}
+\indexentry{Unknown+Lift Jesus Higher}{23}
+\indexentry{Unknown+Garment Of Praise}{24}
+\indexentry{Unknown+I Was Glad}{25}
+\indexentry{Unknown+Oh, The Blood}{26}
diff --git a/Master/texmf-dist/doc/latex/songbook/sample-sb.pdf b/Master/texmf-dist/doc/latex/songbook/sample-sb.pdf
new file mode 100644
index 00000000000..be4d099eff2
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/songbook/sample-sb.pdf
diff --git a/Master/texmf-dist/doc/latex/songbook/sample-sb.tex b/Master/texmf-dist/doc/latex/songbook/sample-sb.tex
index 072d7c8206d..d5e2a115ef0 100644
--- a/Master/texmf-dist/doc/latex/songbook/sample-sb.tex
+++ b/Master/texmf-dist/doc/latex/songbook/sample-sb.tex
@@ -1,19 +1,18 @@
-%%%%%% rcsid = @(#)$Id: sample-sb.tex,v 1.18 2003/08/31 03:22:28 christopher Exp $
+%%%%%% rcsid = @(#)$Id: sample-sb.tex,v 1.19 2006/10/15 15:49:49 rathc Exp $
 %%%%%%
 %%
 %%      ===============================
 %%      Sample Songbook (sample-sb.tex)
 %%      ===============================
 %%
-%%      Version 4.1, 31 August, 2003
+%%      Version 4.2, 13 October, 2006
 %%
-%%      Copyright 1992--2003 Christopher Rath <christopher@rath.ca>
+%%      Copyright 1992--2006 Christopher Rath <christopher@rath.ca>
 %%
 %%      This package is free software; you can redistribute it and/or
-%%      modify it under the terms of the GNU Lesser General Public
-%%      License as published by the Free Software Foundation; either
-%%      version 2.1 of the License, or (at your option) any later
-%%      version.
+%%      modify it under the terms of version 2.1 of the GNU Lesser
+%%	General Public License as published by the Free Software 
+%%	Foundation.
 %%
 %%      This package is distributed in the hope that it will be
 %%      useful, but WITHOUT ANY WARRANTY; without even the implied
@@ -188,6 +187,7 @@
 \makeTitleIndex         %% Title and First Line Index.
 \makeTitleContents      %% Table of Contents.
 \makeKeyIndex           %% Index of song by key.
+\makeArtistIndex	%% Index of song by artist.
 
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff --git a/Master/texmf-dist/doc/latex/songbook/sampleAdx.pdf b/Master/texmf-dist/doc/latex/songbook/sampleAdx.pdf
new file mode 100644
index 00000000000..a566656e98a
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/songbook/sampleAdx.pdf
diff --git a/Master/texmf-dist/doc/latex/songbook/sampleAdx.tex b/Master/texmf-dist/doc/latex/songbook/sampleAdx.tex
new file mode 100644
index 00000000000..8e6b668d9d7
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/songbook/sampleAdx.tex
@@ -0,0 +1,126 @@
+%%%%%% rcsid = @(#)$Id: $
+%%%%%%
+%%
+%%      ================================
+%%      Sample Key Index (sampleAdx.tex)
+%%      ================================
+%%
+%%      Version 4.2, 13 October, 2006
+%%
+%%      Copyright 1992--2006 Christopher Rath <christopher@rath.ca>
+%%
+%%	This package is free software; you can redistribute it and/or
+%%	modify it under the terms of version 2.1 of the GNU Lesser 
+%%	General Public License as published by the Free Software
+%%	Foundation.
+%%
+%%	This package is distributed in the hope that it will be
+%%	useful, but WITHOUT ANY WARRANTY; without even the implied
+%%	warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+%%	PURPOSE.  See the GNU Lesser General Public License for more
+%%	details.
+%%
+%%      This file is provided as a template for Song Artist
+%%      Index generation.
+%%
+%%%%%%
+%%%%%%
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                      %%
+%%           P R E A M B L E   B E G I N S              %%
+%%                                                      %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+\documentclass[12pt,twocolumn]{book}
+\usepackage{latexsym,fancyhdr}
+\usepackage[wordbk]{songbook}
+
+%%%
+% Revision Date and Release Date definitions.
+%
+%       \RelDate - The last time this songbook was released.
+%       \RevDate - The last time this file was revised in any way.
+%%%
+\newcommand{\RelDate}{30~May'96}
+\newcommand{\RevDate}{\RelDate}
+
+%%%
+% Redefine fonts from SongBook style that I don't like, and define
+% any extra fonts I require.
+%%%
+\font\myTinySF=cmss8    at  8pt
+\font\myHugeSF=cmssbx10 at 25pt
+\renewcommand{\CpyRtInfoFont}{\tiny\myTinySF}
+\newcommand{\myTitleFont}{\Huge\myHugeSF}
+\newcommand{\mySubTitleFont}{\large\sf}
+
+%%%
+% Define fonts to use in the headers and footers of the songbook.
+%%%
+\newcommand{\LHeadFont}{\normalsize}            % = cmr12  at 12pt
+\newcommand{\CHeadFont}{\normalsize\rm}         % = cmr12  at 12pt
+\newcommand{\RHeadFont}{\normalsize}            % = cmr12  at 12pt
+\newcommand{\LFootFont}{\scriptsize}            % = cmr8   at  8pt
+\newcommand{\CFootFont}{\tiny\myTinySF}         % = cmss8  at  8pt
+\newcommand{\RFootFont}{\scriptsize}            % = cmr8   at  8pt
+
+%%%
+% Turn on and define fancy page heading/footing definition.
+%%%
+\pagestyle{fancy}
+
+\addtolength{\headwidth}{\marginparsep}
+\addtolength{\headwidth}{\marginparwidth}
+\renewcommand{\footrulewidth}{0.4pt}
+\lhead{\LHeadFont A Church Songbook}
+       \chead{\CHeadFont Artist~Index({\rm\thepage})}
+       \rhead{\RHeadFont\RelDate}
+
+\lfoot{\LFootFont Property of a Church}
+       \cfoot{\CFootFont Last Revised:  \RevDate}
+       \rfoot{\RFootFont Material used by permission.}
+
+
+%%%
+% Index entries command definition.
+%%%
+\renewcommand{\item}{\par\hangindent=40pt}
+\renewcommand{\subitem}{\par\hangindent=40pt \hspace*{20pt}}
+\renewcommand{\subsubitem}{\par\hangindent=40pt \hspace*{30pt}}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%                                                      %%
+%%           D O C U M E N T   B E G I N S              %%
+%%                                                      %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\begin{document}
+
+%%%
+% Index begins.
+%%%
+{\parindent 8pt
+  {\myTitleFont --- Artist Index ---}}\par
+\vskip 20pt
+
+\input{sample-sb.adx}
+
+\end{document}
+\bye
+%
+%%%
+% Document ends.
+%%%
+
+% Local Variables:
+%   LaTeX-item-indent:     -1
+%   LaTeX-indent-level:     2
+%   TeX-brace-indent-level: 2
+%   TeX-auto-untabify:      nil
+%   TeX-style-local:        style/
+% End:
diff --git a/Master/texmf-dist/doc/latex/songbook/sampleCBK.pdf b/Master/texmf-dist/doc/latex/songbook/sampleCBK.pdf
index fe568043f39..6e2a814ded0 100644
--- a/Master/texmf-dist/doc/latex/songbook/sampleCBK.pdf
+++ b/Master/texmf-dist/doc/latex/songbook/sampleCBK.pdf
diff --git a/Master/texmf-dist/doc/latex/songbook/sampleCSBK.pdf b/Master/texmf-dist/doc/latex/songbook/sampleCSBK.pdf
index f8733d0a803..82d46ff42f9 100644
--- a/Master/texmf-dist/doc/latex/songbook/sampleCSBK.pdf
+++ b/Master/texmf-dist/doc/latex/songbook/sampleCSBK.pdf
diff --git a/Master/texmf-dist/doc/latex/songbook/sampleKdx.pdf b/Master/texmf-dist/doc/latex/songbook/sampleKdx.pdf
index eca9ecc165b..a8c39afdac3 100644
--- a/Master/texmf-dist/doc/latex/songbook/sampleKdx.pdf
+++ b/Master/texmf-dist/doc/latex/songbook/sampleKdx.pdf
diff --git a/Master/texmf-dist/doc/latex/songbook/sampleKdx.tex b/Master/texmf-dist/doc/latex/songbook/sampleKdx.tex
index d9f18f7a2d6..99b748886a4 100644
--- a/Master/texmf-dist/doc/latex/songbook/sampleKdx.tex
+++ b/Master/texmf-dist/doc/latex/songbook/sampleKdx.tex
@@ -1,19 +1,18 @@
-%%%%%% rcsid = @(#)$Id: sampleKdx.tex,v 1.12 2003/08/31 03:23:21 christopher Exp $
+%%%%%% rcsid = @(#)$Id: sampleKdx.tex,v 1.13 2006/10/15 15:49:49 rathc Exp $
 %%%%%%
 %%
 %%      ================================
 %%      Sample Key Index (sampleKdx.tex)
 %%      ================================
 %%
-%%      Version 4.1, 31 August, 2003
+%%      Version 4.2, 13 October, 2006
 %%
-%%      Copyright 1992--2003 Christopher Rath <christopher@rath.ca>
+%%      Copyright 1992--2006 Christopher Rath <christopher@rath.ca>
 %%
 %%	This package is free software; you can redistribute it and/or
-%%	modify it under the terms of the GNU Lesser General Public
-%%	License as published by the Free Software Foundation; either
-%%	version 2.1 of the License, or (at your option) any later
-%%	version.
+%%	modify it under the terms of version 2.1 of the GNU Lesser 
+%%	General Public License as published by the Free Software
+%%	Foundation.
 %%
 %%	This package is distributed in the hope that it will be
 %%	useful, but WITHOUT ANY WARRANTY; without even the implied
diff --git a/Master/texmf-dist/doc/latex/songbook/sampleOH.pdf b/Master/texmf-dist/doc/latex/songbook/sampleOH.pdf
index 4cd6304a2f9..b0601c2f114 100644
--- a/Master/texmf-dist/doc/latex/songbook/sampleOH.pdf
+++ b/Master/texmf-dist/doc/latex/songbook/sampleOH.pdf
diff --git a/Master/texmf-dist/doc/latex/songbook/sampleTdx.pdf b/Master/texmf-dist/doc/latex/songbook/sampleTdx.pdf
index d23c3c900eb..646d1c8ecbf 100644
--- a/Master/texmf-dist/doc/latex/songbook/sampleTdx.pdf
+++ b/Master/texmf-dist/doc/latex/songbook/sampleTdx.pdf
diff --git a/Master/texmf-dist/doc/latex/songbook/sampleTdx.tex b/Master/texmf-dist/doc/latex/songbook/sampleTdx.tex
index 3825512cf53..9cf074fc7c9 100644
--- a/Master/texmf-dist/doc/latex/songbook/sampleTdx.tex
+++ b/Master/texmf-dist/doc/latex/songbook/sampleTdx.tex
@@ -1,19 +1,18 @@
-%%%%%% rcsid = @(#)$Id: sampleTdx.tex,v 1.14 2003/08/31 03:23:21 christopher Exp $
+%%%%%% rcsid = @(#)$Id: sampleTdx.tex,v 1.15 2006/10/15 15:49:50 rathc Exp $
 %%%%%%
 %%
 %%      ===============================================
 %%      Sample Title & First Line Index (sampleTdx.tex)
 %%      ===============================================
 %%
-%%      Version 4.1, 31 August, 2003
+%%      Version 4.2, 13 October, 2006
 %%
-%%      Copyright 1992--2003 Christopher Rath <christopher@rath.ca>
+%%      Copyright 1992--2006 Christopher Rath <christopher@rath.ca>
 %%
 %%      This package is free software; you can redistribute it and/or
-%%      modify it under the terms of the GNU Lesser General Public
-%%      License as published by the Free Software Foundation; either
-%%      version 2.1 of the License, or (at your option) any later
-%%      version.
+%%      modify it under the terms of version 2.1 of the GNU Lesser 
+%%	General Public License as published by the Free Software 
+%%	Foundation.
 %%
 %%      This package is distributed in the hope that it will be
 %%      useful, but WITHOUT ANY WARRANTY; without even the implied
diff --git a/Master/texmf-dist/doc/latex/songbook/sampleToc.pdf b/Master/texmf-dist/doc/latex/songbook/sampleToc.pdf
index 5167869b329..94e80efc308 100644
--- a/Master/texmf-dist/doc/latex/songbook/sampleToc.pdf
+++ b/Master/texmf-dist/doc/latex/songbook/sampleToc.pdf
diff --git a/Master/texmf-dist/doc/latex/songbook/sampleToc.tex b/Master/texmf-dist/doc/latex/songbook/sampleToc.tex
index 2c907622708..ef4a6bd317c 100644
--- a/Master/texmf-dist/doc/latex/songbook/sampleToc.tex
+++ b/Master/texmf-dist/doc/latex/songbook/sampleToc.tex
@@ -1,19 +1,18 @@
-%%%%%% rcsid = @(#)$Id: sampleToc.tex,v 1.14 2003/08/31 03:23:21 christopher Exp $
+%%%%%% rcsid = @(#)$Id: sampleToc.tex,v 1.15 2006/10/15 15:49:50 rathc Exp $
 %%%%%%
 %%
 %%      ========================================
 %%      Sample Table Of Contents (sampleToc.tex)
 %%      ========================================
 %%
-%%      Version 4.1, 31 August, 2003
+%%      Version 4.2, 13 October, 2006
 %%
-%%      Copyright 1992--2003 Christopher Rath <christopher@rath.ca>
+%%      Copyright 1992--2006 Christopher Rath <christopher@rath.ca>
 %%
 %%      This package is free software; you can redistribute it and/or
-%%      modify it under the terms of the GNU Lesser General Public
-%%      License as published by the Free Software Foundation; either
-%%      version 2.1 of the License, or (at your option) any later
-%%      version.
+%%      modify it under the terms of version 2.1 of the GNU Lesser 
+%%	General Public License as published by the Free Software 
+%%	Foundation.
 %%
 %%      This package is distributed in the hope that it will be
 %%      useful, but WITHOUT ANY WARRANTY; without even the implied
diff --git a/Master/texmf-dist/doc/latex/songbook/sampleWBK.pdf b/Master/texmf-dist/doc/latex/songbook/sampleWBK.pdf
index a086fb1bed2..231f2eadf73 100644
--- a/Master/texmf-dist/doc/latex/songbook/sampleWBK.pdf
+++ b/Master/texmf-dist/doc/latex/songbook/sampleWBK.pdf
diff --git a/Master/texmf-dist/doc/latex/songbook/songbook.pdf b/Master/texmf-dist/doc/latex/songbook/songbook.pdf
index 2fad8458193..f3fd290a0f0 100644
--- a/Master/texmf-dist/doc/latex/songbook/songbook.pdf
+++ b/Master/texmf-dist/doc/latex/songbook/songbook.pdf