diff options
| author | Karl Berry <karl@freefriends.org> | 2006-10-19 00:24:47 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2006-10-19 00:24:47 +0000 |
| commit | 4888ceffcebbbff65e9dfd805b5c062a4990ce18 (patch) | |
| tree | 5b90a4164fbff80e4c4b7e722975a0dbd7d99650 | |
| parent | ff920c7e23a7b1736eef9cb4ad2304a859cd0db8 (diff) | |
songbook 4.2 update (17oct06)
git-svn-id: svn://tug.org/texlive/trunk@2351 c570f23f-e606-0410-a88d-b1316a301751
34 files changed, 439 insertions, 117 deletions
diff --git a/Build/tools/tpm-ctan-check b/Build/tools/tpm-ctan-check index 026d5eb1fe5..eeabc2841a0 100755 --- a/Build/tools/tpm-ctan-check +++ b/Build/tools/tpm-ctan-check @@ -72,7 +72,7 @@ my @WorkingTPM = qw( randbild refstyle robustcommand rtklage sciposter screenplay sectionbox sectsty semantic seminar semioneside - setspace sf298 sgame shapepar showexpl sides skaknew + setspace sf298 sgame shapepar showexpl sides skaknew songbook sort-by-letters sparklines splitindex spotcolor stellenbosch sttools struktex subfig sudoku sudokubundle sugconf svn-multi svninfo syntrace synttree 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 Binary files differindex 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 Binary files differindex 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 Binary files differnew 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 Binary files differnew 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 2fad8458193..f3fd290a0f0 100644 --- a/Master/texmf-dist/doc/latex/songbook/songbook.pdf +++ b/Master/texmf-dist/doc/latex/songbook/songbook.pdf diff --git a/Master/texmf-dist/makeindex/songbook/songbook.ist b/Master/texmf-dist/makeindex/songbook/songbook.ist index d42d562f9a1..603f7583f7c 100644 --- a/Master/texmf-dist/makeindex/songbook/songbook.ist +++ b/Master/texmf-dist/makeindex/songbook/songbook.ist @@ -1,4 +1,4 @@ -level '~' +level '+' preamble "" postamble "" delim_0 ",~" diff --git a/Master/texmf-dist/source/latex/songbook/songbook.dtx b/Master/texmf-dist/source/latex/songbook/songbook.dtx index d21e7b3573a..b34404fc6a4 100644 --- a/Master/texmf-dist/source/latex/songbook/songbook.dtx +++ b/Master/texmf-dist/source/latex/songbook/songbook.dtx @@ -1,18 +1,17 @@ % \iffalse meta-comment % -*- LaTeX -*- -% rcsid = @(#)$Id: songbook.dtx,v 1.11 2003/09/23 01:18:57 christopher Exp $ +% rcsid = @(#)$Id: songbook.dtx,v 1.12 2006/10/15 15:49:50 rathc Exp $ % % % songbook.sty - Generic SongBook style. % -% Version 4.1a, 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 @@ -22,7 +21,7 @@ % % \fi % -% \CheckSum{2112} +% \CheckSum{2178} %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z %% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z @@ -48,10 +47,11 @@ % % 4.0 and earlier... are not documented in this file. % \changes{v4.1}{2003/08/31}{Added an optional parameter to the \textsf{song} -% environment along with a corresponding usepackage option.} +% environment along with a corresponding usepackage option.} % \changes{v4.1a}{2003/09/22}{Corrected a bug whereby the new exclude song mode -% was throwing an error when the \textsf{SBRef} and -% \textsf{SBMargNote} commands were used.} +% was throwing an error when the \textsf{SBRef} and +% \textsf{SBMargNote} commands were used.} +% \changes{v4.2}{2006/10/13}{Added abilty to create an index by song artist.} %\fi % % \hyphenation{make-index} @@ -120,10 +120,10 @@ % \GetFileInfo{songbook.dtx} % % \title{The \Songbook{} Package\\ -% {\large Version 4.1a}} +% {\large Version 4.2}} % \author{Christopher Rath\\ % {\small$<$\texttt{Christopher@Rath.ca}$>$}} -% \date{2003/08/31} +% \date{2006/10/10} % \maketitle % % \begin{abstract} @@ -142,6 +142,12 @@ % \tableofcontents % } % +% \section*{Preface to version 4.2} +% What's new in version~4.2: +% \begin{itemize} +% \item added a new Artist index option +% \end{itemize} +% % \section*{Preface to version 4.1a} % What's new in version~4.1a: % \begin{itemize} @@ -590,21 +596,26 @@ % \item |\CSColBrk| \DescribeMacro{\CSColBrk} generates a column break % here if we're in |compactsong| mode. % -% \item |\makeKeyIndex| \DescribeMacro{\makeKeyIndex} start creation of +% \item |\makeArtistIndex| \DescribeMacro{\makeArtistIndex} starts creation +% of an index of songs by artist (composer). If you need to add your +% own information to this index use the |\artistIndex[][]| command, +% documented in the \textit{Detailed Documentation} section, below. +% +% \item |\makeKeyIndex| \DescribeMacro{\makeKeyIndex} starts creation of % an index of songs by key. If you need to add your own information % to this index use the |\keyIndex[][]| command, documented in the % \textit{Detailed Documentation} section, below. % -% \item |\makeTitleContents| \DescribeMacro{\makeTitleContents} start +% \item |\makeTitleContents| \DescribeMacro{\makeTitleContents} starts % creation of a table of contents. If you need to add your own % information to this index use the |\titleContents[][]| command, % documented in the \textit{Detailed Documentation} section, below. % -% \item |\makeTitleContentsSkip| \DescribeMacro{\makeTitleContentsSkip} start +% \item |\makeTitleContentsSkip| \DescribeMacro{\makeTitleContentsSkip} starts % creation of a table of contents of songs exluded from the current % songbook. This macro operates in the same manner as |\makeTitleContents|. % -% \item |\makeTitleIndex| \DescribeMacro{\makeTitleIndex} start +% \item |\makeTitleIndex| \DescribeMacro{\makeTitleIndex} starts % creation of a title and first line index. If you need to add your % own information to this index use the |\titleIndex[][]| command, % documented in the \textit{Detailed Documentation} section, below. @@ -1244,6 +1255,17 @@ % \item Run \LaTeX2e{} on your copy of \texttt{sampleKdx.tex}. % \end{enumerate} % +% \subsection{Song Artist Index Generation} +% To produce an index by song artist (composer) follow the same steps as +% for song key index generation, above, with the following exceptions: +% \begin{itemize} +% +% \item use |\makeArtistIndex| instead of |\makeKeyIndex|. +% +% \item use \texttt{./mksbadx} instead of \texttt{./mksbkdx}. +% +% \item use \texttt{sampleAdx.tex} instead of \texttt{sampleKdx.tex}. +% \end{itemize} % % \section{Example} % Here is an example songbook; where the the songbook contains exactly @@ -1267,6 +1289,7 @@ % \makeTitleIndex %% Title and First Line Index. % \makeTitleContents %% Table of Contents. % \makeKeyIndex %% Song Key Index. +% \makeArtistIndex %% Index by Artist. % % \begin{document} % %% @@ -1274,7 +1297,7 @@ % %% % \begin{song}{What A Mighty God We Serve}{C} % {\SBPubDom} -% {Unknown} +% {\SBUnknownTag} % {Isaiah 9:6} % {\NotCCLIed} % @@ -1361,9 +1384,9 @@ % % \section{Dependencies} % The \Songbook{} style is dependent upon four other \LaTeX2e{} styles: -% \texttt{conditional.sty}, \texttt{calc.sty}, \texttt{ifthen.sty}, and +% \texttt{conditionals.sty}, \texttt{calc.sty}, \texttt{ifthen.sty}, and % \texttt{multicol.sty}. -% \texttt{Conditional.sty} is supplied with this package. +% \texttt{Conditionals.sty} is supplied with this package. % \texttt{Calc.sty}, \texttt{ifthen.sty}, and \texttt{multicol.sty} are % part of the \LaTeX2e{} distribution. % @@ -1374,13 +1397,17 @@ % % \section{Files} % \begin{description} -% \item[conditionals.sty] Donald Arseneau's conditional tests. +% \item[conditionals.sty] Donald Arseneau's conditional tests; included +% with Donald's kind permission. +% \item[mksbadx] A shell script around makeindex to sort the song +% artist index. % \item[mksbkdx] A shell script around makeindex to sort the song % key index. % \item[mksbtdx] A shell script around makeindex to sort the % title \& first line index. % \item[relnotes.txt] The \Songbook{} package release notes. % \item[sample-sb.tex] A sample songbook. +% \item[sampleAdx.tex] Song artist index for the sample songbook. % \item[sampleKdx.tex] Song key index for the sample songbook. % \item[sampleTdx.tex] Title \& first line index for the sample % songbook. @@ -1553,7 +1580,7 @@ \documentclass{ltxdoc} \RequirePackage{calc} \EnableCrossrefs \CodelineIndex \RecordChanges % Gather update information - %\OnlyDescription % comment out for implementation details + %\OnlyDescription % comment out for implementation details %\OldMakeindex % use if your MakeIndex is pre-v2.9 \setlength\hfuzz{15pt} % dont make so many \hbadness=7000 % over and under full box warnings @@ -1620,11 +1647,11 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% -%% rcsid = @(#)$Id: songbook.dtx,v 1.11 2003/09/23 01:18:57 christopher Exp $ +%% rcsid = @(#)$Id: songbook.dtx,v 1.12 2006/10/15 15:49:50 rathc Exp $ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{songbook}[2003/08/31 v4.1a All purpose Songbook style] -\typeout{Document Subclass: songbook 2003/08/31 v4.1a All purpose Songbook style} +\ProvidesPackage{songbook}[2006/10/13 v4.2 All purpose Songbook style] +\typeout{Document Subclass: songbook 2006/10/13 v4.2 All purpose Songbook style} % \end{macrocode} % % \section{Initial Code Part} @@ -1796,8 +1823,8 @@ % % \begin{macrocode} \newif\ifCompactSongMode\CompactSongModefalse -\newif\ifExcludeSong \ExcludeSongfalse -\newif\ifPrintAllSongs \PrintAllSongsfalse +\newif\ifExcludeSong \ExcludeSongfalse +\newif\ifPrintAllSongs \PrintAllSongsfalse \newif\ifSamepageMode \SamepageModefalse \newif\ifSongEject \SongEjecttrue % \end{macrocode} @@ -3303,6 +3330,13 @@ % \begin{macro}{\theSongComposer} % |\theSongComposer| is the composer and lyricist of the last song. % +% \changes{v4.2}{2006/10/13}{Added new |theSongComposerU| variable.} +% \begin{macro}{\theSongComposerU} +% |\theSongComposerU| takes the value of |\theSongComposer| except +% when the song composer parameter was left empty in the songbook; +% in which case this variable will be assigned the value of +% |\SBUnknownTag|. +% % \begin{macro}{\theSongKey} % |\theSongKey| is the key of the last song. This variable must be % reset within the |\STitle| command, as well as at the @@ -3337,6 +3371,7 @@ % % \begin{macrocode} \newcommand{\theSongComposer}{the Composer} +\newcommand{\theSongComposerU}{the ComposerU} \newcommand{\theSongCopyRt}{the Copyright} \newcommand{\theSongKey}{the Key} \newcommand{\theSongLicense}{the License} @@ -3356,6 +3391,7 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % % \subsubsection{Special Characters} % Some macros to ease the entry of special characters in songbooks. @@ -3488,6 +3524,45 @@ %%=======================================================% % \end{macrocode} % +% \changes{v4.2}{2006/10/13}{Added |makeArtistIndex| and necessary children.} +% \begin{macro}{\makeArtistIndex} +% |\makeArtistIndex| starts the creation of an index of artists. +% \begin{ParameterList} +% \item None. +% \end{ParameterList} +% +% \begin{macrocode} +\def\makeArtistIndex{\if@filesw \newwrite\@artistIndexfile + \immediate\openout\@artistIndexfile=\jobname.aIdx + \def\artistIndex{\@bsphack\begingroup + \def\protect####1{\string####1\space}\@sanitize + \@wrArtistIndex}\typeout + {Writing index file \jobname.aIdx }\fi} + +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\artistIndex} +% |\artistIndex|\parm{1}\parm{2} makes an entry in the index of songs +% by artist. +% \begin{ParameterList} +% \item[\meta{1}] Song artist. +% \item[\meta{2}] Song title and number. +% \end{ParameterList} +% +% \begin{macrocode} +\def\@wrArtistIndex#1#2{\let\thepage\relax + \xdef\@gtempa{\write\@artistIndexfile{\string + \indexentry{#1}{#2}}}\endgroup\@gtempa + \if@nobreak \ifvmode\nobreak\fi\fi\@esphack} + +\def\artistIndex{\@bsphack\begingroup \@sanitize\@artistIndex} + +\def\@artistIndex#1#2{\endgroup\@esphack} + +% \end{macrocode} +% \end{macro} +% % \begin{macro}{\makeKeyIndex} % |\makeKeyIndex| starts the creation of an index of songs % by key. @@ -3963,7 +4038,7 @@ % \begin{macrocode} \newenvironment{song}[7][Y]{ % Comment markers to negate \if#1Y\ExcludeSongfalse\else\ExcludeSongtrue\fi% the newline. - \ifPrintAllSongs\ExcludeSongfalse\fi % + \ifPrintAllSongs\ExcludeSongfalse\fi % \SongMarkboth{\relax}{\relax} % \SBinSongEnvtrue % \renewcommand{\SBinSongEnv}{\True} % @@ -3984,6 +4059,11 @@ % % \begin{macrocode} \renewcommand{\theSongComposer}{#5} % + \if\blank{#5} % + \renewcommand{\theSongComposerU}{\SBUnknownTag}% + \else % + \renewcommand{\theSongComposerU}{#5} % + \fi % \renewcommand{\theSongCopyRt}{#4} % \renewcommand{\theSongKey}{#3} % \renewcommand{\theSongLicense}{#7} % @@ -3998,22 +4078,24 @@ % \end{macrocode} % % \changes{v4.1}{2003/08/31}{Changes index invocation to match -% \meta{Include?} directive.} +% \meta{Include?} directive.} +% \changes{v4.2}{2006/10/13}{Added invocation for artist index.} % % Write table of contents and index entries in reponse to the user's % \meta{Include?} directive. % % \begin{macrocode} - \ifExcludeSong % + \ifExcludeSong % \titleContentsSkip{\theSongTitle}{\theSongKey}% - \else % + \else % \titleIndex{\theSongTitle}{\theSBSongCnt} % \titleContents{\theSongTitle}{\theSongKey} % - \fi % + \artistIndex{\theSongComposerU+\theSongTitle}{\theSBSongCnt}% + \fi % % \end{macrocode} % % \changes{v4.1}{2003/08/31}{Implemented \meta{Include?} parameter through use -% of \TeX's |box2|.} +% of \TeX's |box2|.} % % Now we deal with the user's \meta{Include?} directive. If \meta{Include?} is % ``\texttt{Y}'' then we will cause normal songbook processing to occur; @@ -4119,7 +4201,7 @@ % \item[|OHExcl|\ ] Exclude the song when in |overhead| mode % \item[|WBExcl|\ ] Exclude the song when in |wordbk| mode % \item[|WOExcl|\ ] Exclude the song when in either |wordbk| or -% |overhead| mode +% |overhead| mode % \end{description} % % Here's an example usage which shows a song to be excluded when in @@ -4405,7 +4487,7 @@ % the error that will occur from attempting to use the |\marginpar| command % within a |\vbox{}|. % \changes{v4.1a}{2003/09/22}{Added an \textsf{ifExcludeSong} clause to avoid the -% conflict with \textsf{marginpar}} +% conflict with \textsf{marginpar}} % % \begin{macrocode} \newcommand{\SBMargNote}[1]{% @@ -4442,7 +4524,7 @@ % error that will occur from attempting to use the |\marginpar| command % within a |\vbox{}|. % \changes{v4.1a}{2003/09/22}{Added an \textsf{ifExcludeSong} clause to avoid the -% conflict with \textsf{marginpar}} +% conflict with \textsf{marginpar}} % % \begin{macrocode} \newcommand{\SBRef}[2]{% diff --git a/Master/texmf-dist/source/latex/songbook/songbook.ins b/Master/texmf-dist/source/latex/songbook/songbook.ins index 3663a991f58..7532ebcfe0f 100644 --- a/Master/texmf-dist/source/latex/songbook/songbook.ins +++ b/Master/texmf-dist/source/latex/songbook/songbook.ins @@ -1,16 +1,15 @@ -%% rcsid = @(#)$Id: songbook.ins,v 1.4 2003/08/19 23:30:37 christopher Exp $ +%% rcsid = @(#)$Id: songbook.ins,v 1.5 2006/10/15 15:49:50 rathc Exp $ %% %% songbook.ins - Docstrip batch file for Songbook Style %% -%% Version 4.1, 31 August, 2003 +%% Version 4.2, 13 October, 2006 %% -%% Copyright 2002--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/tex/latex/songbook/songbook.sty b/Master/texmf-dist/tex/latex/songbook/songbook.sty index 208b1df4173..c1053a8d039 100644 --- a/Master/texmf-dist/tex/latex/songbook/songbook.sty +++ b/Master/texmf-dist/tex/latex/songbook/songbook.sty @@ -49,11 +49,11 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% -%% rcsid = @(#)$Id: songbook.dtx,v 1.11 2003/09/23 01:18:57 christopher Exp $ +%% rcsid = @(#)$Id: songbook.dtx,v 1.12 2006/10/15 15:49:50 rathc Exp $ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{songbook}[2003/08/31 v4.1a All purpose Songbook style] -\typeout{Document Subclass: songbook 2003/08/31 v4.1a All purpose Songbook style} +\ProvidesPackage{songbook}[2006/10/13 v4.2 All purpose Songbook style] +\typeout{Document Subclass: songbook 2006/10/13 v4.2 All purpose Songbook style} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% %% @@ -77,8 +77,8 @@ \newif\ifNotWordsOnly \NotWordsOnlyfalse \newif\ifSBinSongEnv \SBinSongEnvfalse \newif\ifCompactSongMode\CompactSongModefalse -\newif\ifExcludeSong \ExcludeSongfalse -\newif\ifPrintAllSongs \PrintAllSongsfalse +\newif\ifExcludeSong \ExcludeSongfalse +\newif\ifPrintAllSongs \PrintAllSongsfalse \newif\ifSamepageMode \SamepageModefalse \newif\ifSongEject \SongEjecttrue \newif\ifSBpaperAfour \SBpaperAfourfalse @@ -656,6 +656,7 @@ \newcommand{\Songbook} {\textrm{Song$\flat$ook}} \newcommand{\theSongComposer}{the Composer} +\newcommand{\theSongComposerU}{the ComposerU} \newcommand{\theSongCopyRt}{the Copyright} \newcommand{\theSongKey}{the Key} \newcommand{\theSongLicense}{the License} @@ -701,6 +702,22 @@ %% % %% A N D I N D I C E S % %%=======================================================% +\def\makeArtistIndex{\if@filesw \newwrite\@artistIndexfile + \immediate\openout\@artistIndexfile=\jobname.aIdx + \def\artistIndex{\@bsphack\begingroup + \def\protect####1{\string####1\space}\@sanitize + \@wrArtistIndex}\typeout + {Writing index file \jobname.aIdx }\fi} + +\def\@wrArtistIndex#1#2{\let\thepage\relax + \xdef\@gtempa{\write\@artistIndexfile{\string + \indexentry{#1}{#2}}}\endgroup\@gtempa + \if@nobreak \ifvmode\nobreak\fi\fi\@esphack} + +\def\artistIndex{\@bsphack\begingroup \@sanitize\@artistIndex} + +\def\@artistIndex#1#2{\endgroup\@esphack} + \def\makeKeyIndex{\if@filesw \newwrite\@keyIndexfile \immediate\openout\@keyIndexfile=\jobname.kIdx \def\keyIndex{\@bsphack\begingroup @@ -852,7 +869,7 @@ \newenvironment{song}[7][Y]{ % Comment markers to negate \if#1Y\ExcludeSongfalse\else\ExcludeSongtrue\fi% the newline. - \ifPrintAllSongs\ExcludeSongfalse\fi % + \ifPrintAllSongs\ExcludeSongfalse\fi % \SongMarkboth{\relax}{\relax} % \SBinSongEnvtrue % \renewcommand{\SBinSongEnv}{\True} % @@ -860,6 +877,11 @@ \setlength{\parindent}{0pt} % \fi % \renewcommand{\theSongComposer}{#5} % + \if\blank{#5} % + \renewcommand{\theSongComposerU}{\SBUnknownTag}% + \else % + \renewcommand{\theSongComposerU}{#5} % + \fi % \renewcommand{\theSongCopyRt}{#4} % \renewcommand{\theSongKey}{#3} % \renewcommand{\theSongLicense}{#7} % @@ -871,12 +893,13 @@ % \addtocounter{SBSongCnt}{1} % % - \ifExcludeSong % + \ifExcludeSong % \titleContentsSkip{\theSongTitle}{\theSongKey}% - \else % + \else % \titleIndex{\theSongTitle}{\theSBSongCnt} % \titleContents{\theSongTitle}{\theSongKey} % - \fi % + \artistIndex{\theSongComposerU+\theSongTitle}{\theSBSongCnt}% + \fi % \ifExcludeSong\setbox2=\vbox\bgroup\fi% \ifSamepageMode% \begin{samepage}% diff --git a/Master/texmf-dist/tpm/songbook.tpm b/Master/texmf-dist/tpm/songbook.tpm index f380311a939..7f95476d7c2 100644 --- a/Master/texmf-dist/tpm/songbook.tpm +++ b/Master/texmf-dist/tpm/songbook.tpm @@ -3,7 +3,7 @@ <rdf:Description about="http://texlive.dante.de/texlive/Package/songbook.zip"> <TPM:Name>songbook</TPM:Name> <TPM:Type>Package</TPM:Type> - <TPM:Date>2006/01/11 23:57:54</TPM:Date> + <TPM:Date>2006/10/19 00:23:31</TPM:Date> <TPM:Version>3.1</TPM:Version> <TPM:Creator>rahtz</TPM:Creator> <TPM:Title>Package for typesetting song lyrics.</TPM:Title> @@ -22,14 +22,15 @@ multiple languages. <TPM:Author>Christopher Rath</TPM:Author> <TPM:Size>1400100</TPM:Size> <TPM:Build/> - <TPM:RunFiles size="48554"> + <TPM:RunFiles size="49623"> texmf-dist/makeindex/songbook/songbook.ist texmf-dist/tex/latex/songbook/conditionals.sty texmf-dist/tex/latex/songbook/songbook.sty texmf-dist/tpm/songbook.tpm </TPM:RunFiles> - <TPM:DocFiles size="1163197"> + <TPM:DocFiles size="1395495"> texmf-dist/doc/latex/songbook/LesserGPL.txt +texmf-dist/doc/latex/songbook/README texmf-dist/doc/latex/songbook/contrib/CarolBook/CarolBook.tex texmf-dist/doc/latex/songbook/contrib/CarolBook/CarolBookOH.pdf texmf-dist/doc/latex/songbook/contrib/CarolBook/CarolBookWB.pdf @@ -40,12 +41,17 @@ texmf-dist/doc/latex/songbook/contrib/crd2sb/crd2sb.txt texmf-dist/doc/latex/songbook/contrib/modulate texmf-dist/doc/latex/songbook/contrib/texchord.sty texmf-dist/doc/latex/songbook/install.txt +texmf-dist/doc/latex/songbook/mksbadx texmf-dist/doc/latex/songbook/mksbkdx texmf-dist/doc/latex/songbook/mksbtdx texmf-dist/doc/latex/songbook/relnotes.txt +texmf-dist/doc/latex/songbook/sample-sb.aIdx texmf-dist/doc/latex/songbook/sample-sb.kIdx +texmf-dist/doc/latex/songbook/sample-sb.pdf texmf-dist/doc/latex/songbook/sample-sb.tIdx texmf-dist/doc/latex/songbook/sample-sb.tex +texmf-dist/doc/latex/songbook/sampleAdx.pdf +texmf-dist/doc/latex/songbook/sampleAdx.tex texmf-dist/doc/latex/songbook/sampleCBK.pdf texmf-dist/doc/latex/songbook/sampleCSBK.pdf texmf-dist/doc/latex/songbook/sampleKdx.pdf @@ -58,7 +64,7 @@ texmf-dist/doc/latex/songbook/sampleToc.tex texmf-dist/doc/latex/songbook/sampleWBK.pdf texmf-dist/doc/latex/songbook/songbook.pdf </TPM:DocFiles> - <TPM:SourceFiles size="188349"> + <TPM:SourceFiles size="191620"> texmf-dist/source/latex/songbook/songbook.dtx texmf-dist/source/latex/songbook/songbook.ins </TPM:SourceFiles> diff --git a/Master/texmf/lists/songbook b/Master/texmf/lists/songbook index 8c46ce27481..8ab4b4af4c8 100644 --- a/Master/texmf/lists/songbook +++ b/Master/texmf/lists/songbook @@ -1,4 +1,5 @@ texmf-dist/doc/latex/songbook/LesserGPL.txt +texmf-dist/doc/latex/songbook/README texmf-dist/doc/latex/songbook/contrib/CarolBook/CarolBook.tex texmf-dist/doc/latex/songbook/contrib/CarolBook/CarolBookOH.pdf texmf-dist/doc/latex/songbook/contrib/CarolBook/CarolBookWB.pdf @@ -9,12 +10,17 @@ texmf-dist/doc/latex/songbook/contrib/crd2sb/crd2sb.txt texmf-dist/doc/latex/songbook/contrib/modulate texmf-dist/doc/latex/songbook/contrib/texchord.sty texmf-dist/doc/latex/songbook/install.txt +texmf-dist/doc/latex/songbook/mksbadx texmf-dist/doc/latex/songbook/mksbkdx texmf-dist/doc/latex/songbook/mksbtdx texmf-dist/doc/latex/songbook/relnotes.txt +texmf-dist/doc/latex/songbook/sample-sb.aIdx texmf-dist/doc/latex/songbook/sample-sb.kIdx +texmf-dist/doc/latex/songbook/sample-sb.pdf texmf-dist/doc/latex/songbook/sample-sb.tIdx texmf-dist/doc/latex/songbook/sample-sb.tex +texmf-dist/doc/latex/songbook/sampleAdx.pdf +texmf-dist/doc/latex/songbook/sampleAdx.tex texmf-dist/doc/latex/songbook/sampleCBK.pdf texmf-dist/doc/latex/songbook/sampleCSBK.pdf texmf-dist/doc/latex/songbook/sampleKdx.pdf diff --git a/Master/texmf/tpm/collection-latexextra.tpm b/Master/texmf/tpm/collection-latexextra.tpm index 10f15b023bb..0660c50dc10 100644 --- a/Master/texmf/tpm/collection-latexextra.tpm +++ b/Master/texmf/tpm/collection-latexextra.tpm @@ -416,7 +416,6 @@ A large collection of add-on packages for LaTeX. <TPM:Package name="smartref"/> <TPM:Package name="smflatex"/> <TPM:Package name="snapshot"/> - <TPM:Package name="songbook"/> <TPM:Package name="soul"/> <TPM:Package name="sparklines"/> <TPM:Package name="splitbib"/> diff --git a/Master/texmf/tpm/collection-music.tpm b/Master/texmf/tpm/collection-music.tpm index 54ece1e5e2c..ca0ca2f770c 100644 --- a/Master/texmf/tpm/collection-music.tpm +++ b/Master/texmf/tpm/collection-music.tpm @@ -21,6 +21,7 @@ <TPM:Package name="musixlyr"/> <TPM:Package name="musixps"/> <TPM:Package name="musixtex"/> + <TPM:Package name="songbook"/> <TPM:TLCore name="bin-musixflx"/> <TPM:TLCore name="collection-latex"/> </TPM:Requires> |