From 93c264dcae8eb5c6de54e6883d7b3c16237b3d53 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 6 Oct 2007 00:51:45 +0000 Subject: songbook update (4feb07) git-svn-id: svn://tug.org/texlive/trunk@5119 c570f23f-e606-0410-a88d-b1316a301751 --- Build/cdbuild/ctan2tds.pl | 1 + Master/texmf-dist/doc/latex/songbook/README | 139 +++++++++++++++++++-- .../songbook/contrib/CarolBook/CarolBookOH.pdf | Bin 111879 -> 111780 bytes .../songbook/contrib/CarolBook/CarolBookWB.pdf | Bin 92084 -> 92094 bytes .../texmf-dist/doc/latex/songbook/contrib/README | 70 +++++------ Master/texmf-dist/doc/latex/songbook/install.txt | 6 +- Master/texmf-dist/doc/latex/songbook/mksbadx | 4 +- Master/texmf-dist/doc/latex/songbook/mksbkdx | 6 +- Master/texmf-dist/doc/latex/songbook/mksbtdx | 6 +- .../texmf-dist/doc/latex/songbook/sample-sb.aIdx | 1 + .../texmf-dist/doc/latex/songbook/sample-sb.kIdx | 3 + Master/texmf-dist/doc/latex/songbook/sample-sb.pdf | Bin 142882 -> 147162 bytes .../texmf-dist/doc/latex/songbook/sample-sb.tIdx | 3 + Master/texmf-dist/doc/latex/songbook/sample-sb.tex | 79 +++++++++++- Master/texmf-dist/doc/latex/songbook/sampleAdx.pdf | Bin 30166 -> 30366 bytes Master/texmf-dist/doc/latex/songbook/sampleAdx.tex | 4 +- Master/texmf-dist/doc/latex/songbook/sampleCBK.pdf | Bin 142709 -> 150836 bytes .../texmf-dist/doc/latex/songbook/sampleCSBK.pdf | Bin 145651 -> 152559 bytes Master/texmf-dist/doc/latex/songbook/sampleKdx.pdf | Bin 29688 -> 29914 bytes Master/texmf-dist/doc/latex/songbook/sampleKdx.tex | 6 +- Master/texmf-dist/doc/latex/songbook/sampleOH.pdf | Bin 74724 -> 76514 bytes Master/texmf-dist/doc/latex/songbook/sampleTdx.pdf | Bin 42539 -> 42760 bytes Master/texmf-dist/doc/latex/songbook/sampleTdx.tex | 6 +- Master/texmf-dist/doc/latex/songbook/sampleToc.pdf | Bin 29345 -> 29536 bytes Master/texmf-dist/doc/latex/songbook/sampleToc.tex | 6 +- Master/texmf-dist/doc/latex/songbook/sampleWBK.pdf | Bin 68251 -> 74502 bytes Master/texmf-dist/doc/latex/songbook/songbook.pdf | Bin 347678 -> 350614 bytes .../texmf-dist/source/latex/songbook/songbook.dtx | 111 ++++++++++++++-- .../texmf-dist/source/latex/songbook/songbook.ins | 6 +- Master/texmf-dist/tex/latex/songbook/songbook.sty | 14 ++- 30 files changed, 383 insertions(+), 88 deletions(-) diff --git a/Build/cdbuild/ctan2tds.pl b/Build/cdbuild/ctan2tds.pl index 6a38904e94f..5dfd61dec01 100755 --- a/Build/cdbuild/ctan2tds.pl +++ b/Build/cdbuild/ctan2tds.pl @@ -147,6 +147,7 @@ chdir $startdir || die "chdir($startdir) failed: $!"; 'epiolmec', "&MAKEflatten", 'epix', "warn \"skipping epix, needs C++\n\"", 'eplain', "&MAKEcopy", + 'epspdfconversion', "warn \"skipping for now, no doc source\n\"", 'eqnarray', "&MAKEeqnarray", 'eskdx', "&MAKEeskdx", 'esvect', "&MAKEflatten", diff --git a/Master/texmf-dist/doc/latex/songbook/README b/Master/texmf-dist/doc/latex/songbook/README index 5a354d063fb..24e030a1978 100644 --- a/Master/texmf-dist/doc/latex/songbook/README +++ b/Master/texmf-dist/doc/latex/songbook/README @@ -1,9 +1,130 @@ -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 +@(#)$Id: README,v 1.1 2007/02/04 04:29:10 rathc Exp $ + + - - - - - - - - - + + R E L E A S E N O T E S + + - - - - - - - - - - - - - - - - - + + LaTeX Songbook Style, Version 4.3, 2007/02/03 + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + Copyright (c) 1992--2007 Christopher Rath + All rights reserved. + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + Christopher Rath + + - - - - - - - - - - - - - - - - - - - - - - - - - - + +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 + 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 + FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + License for more details. + + 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.3: + + * found a problem with the optional parameter to the xlatn environment + added in Release 4.2; that optional parameter has been removed + * a new songTranslation environment added to provide the required + capability for the Artist index option + * added a new song to the sample songbook to act as a test case + for translation + + +Changes in Release 4.2: + + * added a new Artist index option + * added a new optional parameter to the xlatn environment; in support of + the new Artist index option + + +chordbk, wordbk, overhead: + + These styles have been used to produce the songbooks for our church. We + needed to produce books that our song-leaders could use, as well as books + for use in the congregation; so, these styles were written. + + The `chordbk' option is used to print a songbook with words and chords, and + it also supports a `compactsong' option which lays out the song in two + columns per page instead of one (the `wordbk' and `overhead' options do not + support compactsong mode at present). The `wordbk' option is used to print + a words-only songbook. The `overhead' option is used to print overhead + transparencies. They all use the same LaTeX input file. `Wordbk' and + `overhead' modes simply ignore all of the chord information. + + +songbook.dtx: + + This is both the formal documentation for the Songbook style as well as + its source code. A .pdf file is provided, as well as the .tex file. + + +sample-sb.tex: + + This is a sample songbook. This file is used to produce the sample???.dvi + files included with this package. To regenerate the .dvi files, simply + uncomment the appropriate \document line and re-LaTeX the file. + + +Manifest: + + conditionals.sty Donald Arseneau's conditional tests. + contrib/ Directory containing user contributed utilities. + LesserGPL.txt Terms & conditions under which the style is + distributed. + mksbkdx A shell script to make the index by song key. + mksbtdx A shell script to make the index by song title. + relnotes.txt The songbook package release notes (this file). + sample-sb.tex A sample songbook. + sampleCBK.pdf Sample-sb.tex formatted using chordbk.sty. + sampleKdx.pdf The sample key index run through LaTeX. + sampleKdx.tex Key index for the sample songbook. + sampleOH.pdf Sample-sb.tex formatted using overhead.sty. + sampleTdx.pdf The sample title index run through LaTeX. + sampleTdx.tex Title index for the sample songbook. + sampleToc.pdf The sample TOC run through LaTeX. + sampleToc.tex TOC for the sample songbook. + sampleWBK.pdf Sample-sb.tex formatted using wordbk.sty. + songbook.pdf The \Songbook's documentation. + songbook.ist The songbook package makeindex .ist file. + songbook.dtx The base style file. + songbook.ins Install script to create .sty from .dtx. + + +Support: + + Please email me for help using the files. Please let me know about any + bugs and problems. + + There is a SongBook Style home page. Its URL is: + + http://www.rath.ca/Misc/Songbook/ + + I will make bug fixes, other user's contributed macros and scripts, and the + latest release of the software available on this web server. + + + Christopher Rath christopher@rath.ca (613) 824-4584 + 1371 Major Rd. + Ottawa, ON + Canada K1E 1H3 + + + + +Local Variables: + mode: indented-text + fill-column: 79 +End: 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 816626ab642..7cb19d5a751 100644 Binary files a/Master/texmf-dist/doc/latex/songbook/contrib/CarolBook/CarolBookOH.pdf and b/Master/texmf-dist/doc/latex/songbook/contrib/CarolBook/CarolBookOH.pdf differ 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 702ed0c03f6..43bbd16a677 100644 Binary files a/Master/texmf-dist/doc/latex/songbook/contrib/CarolBook/CarolBookWB.pdf and b/Master/texmf-dist/doc/latex/songbook/contrib/CarolBook/CarolBookWB.pdf differ diff --git a/Master/texmf-dist/doc/latex/songbook/contrib/README b/Master/texmf-dist/doc/latex/songbook/contrib/README index 9288bbca023..e9489720099 100644 --- a/Master/texmf-dist/doc/latex/songbook/contrib/README +++ b/Master/texmf-dist/doc/latex/songbook/contrib/README @@ -1,35 +1,35 @@ -@(#)$Id: README,v 1.7 2003/08/31 03:23:59 christopher Exp $ - -This directory contains user contributed macros and programs intended/suitable -for use with the LaTeX SongBook Style. - -Content List (in alphabetic order): - - CarolBook - a songbook.sty formatted book containing words for all the - Christmas songs I've been able to find where the words are now in the - public domain. PDF versions of the file are included for quick - and easy use. - - crd2sb - a perl script which converts Chord files into Songbook files. - Contributed by Abel Chow . A postscript formatter for - Chord songs can be ftp'ed from: - ftp://ftp.uu.net/doc/music/guitar/resources/misc/CHORD/ - - modulate - a perl script for modulating a song from one key to another. - Contributed by Christopher Rath . - - texchord.sty - LaTeX macros for printing guitar fingering charts. - Contributed by Joel M. Hoffman . Note, this style is NO - LONGER actively supported by Joel. - - - - - - -Local Variables: - mode: indented-text-fill - fill-column: 79 -End: - - +@(#)$Id: README,v 1.7 2003/08/31 03:23:59 christopher Exp $ + +This directory contains user contributed macros and programs intended/suitable +for use with the LaTeX SongBook Style. + +Content List (in alphabetic order): + + CarolBook - a songbook.sty formatted book containing words for all the + Christmas songs I've been able to find where the words are now in the + public domain. PDF versions of the file are included for quick + and easy use. + + crd2sb - a perl script which converts Chord files into Songbook files. + Contributed by Abel Chow . A postscript formatter for + Chord songs can be ftp'ed from: + ftp://ftp.uu.net/doc/music/guitar/resources/misc/CHORD/ + + modulate - a perl script for modulating a song from one key to another. + Contributed by Christopher Rath . + + texchord.sty - LaTeX macros for printing guitar fingering charts. + Contributed by Joel M. Hoffman . Note, this style is NO + LONGER actively supported by Joel. + + + + + + +Local Variables: + mode: indented-text-fill + fill-column: 79 +End: + + diff --git a/Master/texmf-dist/doc/latex/songbook/install.txt b/Master/texmf-dist/doc/latex/songbook/install.txt index feccc724055..b21964f06a6 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.5 2006/10/15 15:49:49 rathc Exp $ +@(#)$Id: install.txt,v 1.6 2007/02/04 04:14:20 rathc Exp $ - - - - - - - - - - - - - - @@ -6,11 +6,11 @@ - - - - - - - - - - - - - - - - - - - - LaTeX Songbook Style, Version 4.2, 2006/10/13 + LaTeX Songbook Style, Version 4.3, 2007/02/03 - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) 1992--2006 Christopher Rath + Copyright (c) 1992--2007 Christopher Rath All rights reserved. - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Master/texmf-dist/doc/latex/songbook/mksbadx b/Master/texmf-dist/doc/latex/songbook/mksbadx index 2a9f3b17242..3695b8f994a 100644 --- a/Master/texmf-dist/doc/latex/songbook/mksbadx +++ b/Master/texmf-dist/doc/latex/songbook/mksbadx @@ -4,9 +4,9 @@ ## ## mksbadx - Produce a songbook style .adx file from a .aIdx file. ## -## Version 4.2, 13 October, 2006 +## Version 4.3, 03 February, 2007 ## -## Copyright 1992--2006 Christopher Rath +## Copyright 1992--2007 Christopher Rath ## ## This package is free software; you can redistribute it and/or ## modify it under the terms of version 2.1 of the GNU Lesser diff --git a/Master/texmf-dist/doc/latex/songbook/mksbkdx b/Master/texmf-dist/doc/latex/songbook/mksbkdx index 9c877528dcb..a7b97a37bcc 100644 --- a/Master/texmf-dist/doc/latex/songbook/mksbkdx +++ b/Master/texmf-dist/doc/latex/songbook/mksbkdx @@ -1,12 +1,12 @@ #!/bin/sh -##### rcsid = @(#)$Id: mksbkdx,v 1.11 2006/10/15 15:49:49 rathc Exp $ +##### rcsid = @(#)$Id: mksbkdx,v 1.12 2007/02/04 04:14:20 rathc Exp $ ##### ## ## mksbkdx - Produce a songbook style .kdx file from a .kIdx file. ## -## Version 4.2, 13 October, 2006 +## Version 4.3, 03 February, 2007 ## -## Copyright 1992--2006 Christopher Rath +## Copyright 1992--2007 Christopher Rath ## ## This package is free software; you can redistribute it and/or ## modify it under the terms of version 2.1 of the GNU Lesser diff --git a/Master/texmf-dist/doc/latex/songbook/mksbtdx b/Master/texmf-dist/doc/latex/songbook/mksbtdx index fb4b9c348da..b48ffce7285 100644 --- a/Master/texmf-dist/doc/latex/songbook/mksbtdx +++ b/Master/texmf-dist/doc/latex/songbook/mksbtdx @@ -1,12 +1,12 @@ #!/bin/sh -##### rcsid = @(#)$Id: mksbtdx,v 1.13 2006/10/15 15:49:49 rathc Exp $ +##### rcsid = @(#)$Id: mksbtdx,v 1.14 2007/02/04 04:14:21 rathc Exp $ ##### ## ## mksbtdx - Produce a songbook style .tdx file from a .tIdx file. ## -## Version 4.2, 13 October, 2006 +## Version 4.3, 03 February, 2007 ## -## Copyright 1992--2006 Christopher Rath +## Copyright 1992--2007 Christopher Rath ## ## This package is free software; you can redistribute it and/or ## modify it under the terms of version 2.1 of the GNU Lesser diff --git a/Master/texmf-dist/doc/latex/songbook/sample-sb.aIdx b/Master/texmf-dist/doc/latex/songbook/sample-sb.aIdx index 706a48e9e0f..546b40bbfcd 100644 --- a/Master/texmf-dist/doc/latex/songbook/sample-sb.aIdx +++ b/Master/texmf-dist/doc/latex/songbook/sample-sb.aIdx @@ -24,3 +24,4 @@ \indexentry{Unknown+Garment Of Praise}{24} \indexentry{Unknown+I Was Glad}{25} \indexentry{Unknown+Oh, The Blood}{26} +\indexentry{Christopher Rath+You Alone}{27} diff --git a/Master/texmf-dist/doc/latex/songbook/sample-sb.kIdx b/Master/texmf-dist/doc/latex/songbook/sample-sb.kIdx index aed16547cbd..81f1250bf31 100644 --- a/Master/texmf-dist/doc/latex/songbook/sample-sb.kIdx +++ b/Master/texmf-dist/doc/latex/songbook/sample-sb.kIdx @@ -30,3 +30,6 @@ \indexentry{{\sbChord D\relax } -- Oh, The Blood}{26} \indexentry{{\sbChord E\relax } -- Oh, The Blood}{26} \indexentry{{\sbChord F\relax } -- Oh, The Blood}{26} +\indexentry{{\sbChord C\relax } -- You Alone}{27} +\indexentry{{\sbChord D\relax } -- You Alone}{27} +\indexentry{{\sbChord C\relax } -- Tu Es Saint}{27} diff --git a/Master/texmf-dist/doc/latex/songbook/sample-sb.pdf b/Master/texmf-dist/doc/latex/songbook/sample-sb.pdf index be4d099eff2..ced7ed02e67 100644 Binary files a/Master/texmf-dist/doc/latex/songbook/sample-sb.pdf and b/Master/texmf-dist/doc/latex/songbook/sample-sb.pdf differ diff --git a/Master/texmf-dist/doc/latex/songbook/sample-sb.tIdx b/Master/texmf-dist/doc/latex/songbook/sample-sb.tIdx index 14d8a33124c..7eb4adea06a 100644 --- a/Master/texmf-dist/doc/latex/songbook/sample-sb.tIdx +++ b/Master/texmf-dist/doc/latex/songbook/sample-sb.tIdx @@ -30,3 +30,6 @@ \indexentry{I have put on my garment of praise@{\it I have put on my garment of praise\/}}{24} \indexentry{I Was Glad}{25} \indexentry{Oh, The Blood}{26} +\indexentry{You Alone}{27} +\indexentry{Holy, Holy, You alone are Holy@{\it Holy, Holy, You alone are Holy\/}}{27} +\indexentry{Tu Es Saint}{27} diff --git a/Master/texmf-dist/doc/latex/songbook/sample-sb.tex b/Master/texmf-dist/doc/latex/songbook/sample-sb.tex index d5e2a115ef0..471956a0908 100644 --- a/Master/texmf-dist/doc/latex/songbook/sample-sb.tex +++ b/Master/texmf-dist/doc/latex/songbook/sample-sb.tex @@ -1,13 +1,13 @@ -%%%%%% rcsid = @(#)$Id: sample-sb.tex,v 1.19 2006/10/15 15:49:49 rathc Exp $ +%%%%%% rcsid = @(#)$Id: sample-sb.tex,v 1.21 2007/02/04 04:14:21 rathc Exp $ %%%%%% %% %% =============================== %% Sample Songbook (sample-sb.tex) %% =============================== %% -%% Version 4.2, 13 October, 2006 +%% Version 4.3, 02 February, 2007 %% -%% Copyright 1992--2006 Christopher Rath +%% Copyright 1992--2007 Christopher Rath %% %% This package is free software; you can redistribute it and/or %% modify it under the terms of version 2.1 of the GNU Lesser @@ -1237,6 +1237,79 @@ }\end{SBExtraKeys} \end{song} + +\begin{song}{You Alone}{C} + {1992 Glory Alleluia Music} + {Christopher Rath} + {Revelation 4:8} + {Used by Permission} + + \renewcommand{\RevDate}{February~11,~1993} + \FLineIdx{Holy, Holy, You alone are Holy} + + \begin{SBVerse} + \Ch{C}{Ho}\Ch{Em}{ly,} \Ch{F}{Ho}\Ch{C}{ly,} \Ch{F}{} You alone are \Ch{C}{Ho}\Ch{G}{ly.} + + \Ch{C}{Ho}\Ch{Em}{ly,} \Ch{F}{Ho}\Ch{C}{ly,} \Ch{F}{} You alone are \Chr{Am}{Ho}\Ch{G}{ly.} + + Al\Ch{F}{migh}ty God\Ch{C}{} I \Ch{E}{wor}ship You\Ch{Am}{} + + For \Ch{F}{You} a\Ch{G}{lone,} \Ch{F}{You} a\Ch{G}{lone} are \Chr{Dm}{Ho}\Chr{G}{}\Ch{C}{ly.} \Ch{F}{} + \end{SBVerse} + + \begin{SBVerse} + \Ch{C}{Wor}\Ch{Em}{thy,} \Ch{F}{Wor}\Ch{C}{thy,} \Ch{F}{}You alone are \Ch{C}{Wor}\Ch{G}{thy.} + + \Ch{C}{Wor}\Ch{Em}{thy,} \Ch{F}{Wor}\Ch{C}{thy,} \Ch{F}{}You alone are \Ch{Am}{Wor}\Ch{G}{thy.} + + Who \Ch{F}{was,} who is,\Ch{C}{} and \Ch{E}{is} to come.\Ch{Am}{} + + \Ch{F}{You} a\Ch{G}{lone,} \Ch{F}{You} a\Ch{G}{lone} are \Chr{Dm}{Wor}\Chr{G}{}\Ch{C}{thy.} \Ch{[}{}\Ch{F}{}\Ch{]}{} \Ch{[{$^{Mod.}$}}{}\Ch{A7}{}\Ch{]}{} + \end{SBVerse} + + \begin{SBExtraKeys}{% + \STitle{You Alone}{D} + + \begin{SBVerse} + \Ch{D}{Ho}\Ch{F#m}{ly,} \Ch{G}{Ho}\Ch{D}{ly,} \Ch{G}{} You alone are \Ch{D}{Ho}\Ch{A}{ly.} + + \Ch{D}{Ho}\Ch{F#m}{ly,} \Ch{G}{Ho}\Ch{D}{ly,} \Ch{G}{} You alone are \Chr{Bm}{Ho}\Ch{A}{ly.} + + Al\Ch{G}{migh}ty God\Ch{D}{} I \Ch{F#}{wor}ship You\Ch{Bm}{} + + For \Ch{G}{You} a\Ch{A}{lone,} \Ch{G}{You} a\Ch{A}{lone} are \Chr{Em}{Ho}\Chr{A}{}\Ch{D}{ly.} \Ch{G}{} + \end{SBVerse} + }\end{SBExtraKeys} + +\CBPageBrk + \begin{xlatn}{Tu Es Saint} + {} + {Translation by Jocelyne Sarrazin} + \renewcommand{\RevDate}{8~April,~1998} + + \begin{SBVerse} + \Ch{C}{Tu} es \Ch{Em}{Saint,} \Ch{F}{Tu} es \Ch{C}{Saint,}\Ch{F}{} Tu es Saint O \Ch{C}{Sei}\Ch{G}{gneur.} + + \Ch{C}{Tu} es \Ch{Em}{Saint,} \Ch{F}{Tu} es \Ch{C}{Saint,}\Ch{F}{} Tu es Saint O \Chr{Am}{Sei}\Ch{G}{gneur.} + + Dieu \Ch{F}{Tout-}Puissant\Ch{C}{} soit \Ch{E}{glo}rifi\'e,\Ch{Am}{} + + Car \Ch{F}{Tu} es tr\'es \Ch{G}{Saint,} \Ch{F}{Tu} es tr\'es \Ch{G}{Saint,} O oui \Ch{Dm}{Saint}\Ch{G}{} O Sei\Ch{C}{gneur.}\Ch{F}{} + \end{SBVerse} + + \begin{SBVerse} + \Ch{C}{Tu} es \Ch{Em}{Digne,} \Ch{F}{Tu} es \Ch{C}{Digne,} Tu es Digne O \Ch{C}{Sei}\Ch{G}{gneur.} + + \Ch{C}{Tu} es \Ch{Em}{Digne,} \Ch{F}{Tu} es \Ch{C}{Digne,} Tu es Digne O \Chr{Am}{Sei}\Ch{G}{gneur.} + + Toi \Ch{F}{qui} \'etais,\Ch{C}{} qui \Ch{E}{es} et vien,\Ch{Am}{} + + \Ch{F}{\'{A}} Toi l'hon\Ch{G}{neur,} \Ch{F}{\`a} Toi la \Ch{G}{gloire,} \`a Toi \Ch{Dm}{seul}\Ch{G}{} O Sei\Ch{C}{gneur.}\Ch{F}{} + \end{SBVerse} + \end{xlatn} +\end{song} + + \end{document} \bye % diff --git a/Master/texmf-dist/doc/latex/songbook/sampleAdx.pdf b/Master/texmf-dist/doc/latex/songbook/sampleAdx.pdf index a566656e98a..792be76c602 100644 Binary files a/Master/texmf-dist/doc/latex/songbook/sampleAdx.pdf and b/Master/texmf-dist/doc/latex/songbook/sampleAdx.pdf differ diff --git a/Master/texmf-dist/doc/latex/songbook/sampleAdx.tex b/Master/texmf-dist/doc/latex/songbook/sampleAdx.tex index 8e6b668d9d7..c38da928e7f 100644 --- a/Master/texmf-dist/doc/latex/songbook/sampleAdx.tex +++ b/Master/texmf-dist/doc/latex/songbook/sampleAdx.tex @@ -5,9 +5,9 @@ %% Sample Key Index (sampleAdx.tex) %% ================================ %% -%% Version 4.2, 13 October, 2006 +%% Version 4.3, 02 February, 2007 %% -%% Copyright 1992--2006 Christopher Rath +%% Copyright 1992--2007 Christopher Rath %% %% This package is free software; you can redistribute it and/or %% modify it under the terms of version 2.1 of the GNU Lesser diff --git a/Master/texmf-dist/doc/latex/songbook/sampleCBK.pdf b/Master/texmf-dist/doc/latex/songbook/sampleCBK.pdf index 6e2a814ded0..29e41fb96ff 100644 Binary files a/Master/texmf-dist/doc/latex/songbook/sampleCBK.pdf and b/Master/texmf-dist/doc/latex/songbook/sampleCBK.pdf differ diff --git a/Master/texmf-dist/doc/latex/songbook/sampleCSBK.pdf b/Master/texmf-dist/doc/latex/songbook/sampleCSBK.pdf index 82d46ff42f9..a91e2b7ee68 100644 Binary files a/Master/texmf-dist/doc/latex/songbook/sampleCSBK.pdf and b/Master/texmf-dist/doc/latex/songbook/sampleCSBK.pdf differ diff --git a/Master/texmf-dist/doc/latex/songbook/sampleKdx.pdf b/Master/texmf-dist/doc/latex/songbook/sampleKdx.pdf index a8c39afdac3..34cac68ed2b 100644 Binary files a/Master/texmf-dist/doc/latex/songbook/sampleKdx.pdf and b/Master/texmf-dist/doc/latex/songbook/sampleKdx.pdf differ diff --git a/Master/texmf-dist/doc/latex/songbook/sampleKdx.tex b/Master/texmf-dist/doc/latex/songbook/sampleKdx.tex index 99b748886a4..799a5a2aada 100644 --- a/Master/texmf-dist/doc/latex/songbook/sampleKdx.tex +++ b/Master/texmf-dist/doc/latex/songbook/sampleKdx.tex @@ -1,13 +1,13 @@ -%%%%%% rcsid = @(#)$Id: sampleKdx.tex,v 1.13 2006/10/15 15:49:49 rathc Exp $ +%%%%%% rcsid = @(#)$Id: sampleKdx.tex,v 1.14 2007/02/04 04:14:21 rathc Exp $ %%%%%% %% %% ================================ %% Sample Key Index (sampleKdx.tex) %% ================================ %% -%% Version 4.2, 13 October, 2006 +%% Version 4.3, 02 February, 2007 %% -%% Copyright 1992--2006 Christopher Rath +%% Copyright 1992--2007 Christopher Rath %% %% This package is free software; you can redistribute it and/or %% modify it under the terms of version 2.1 of the GNU Lesser diff --git a/Master/texmf-dist/doc/latex/songbook/sampleOH.pdf b/Master/texmf-dist/doc/latex/songbook/sampleOH.pdf index b0601c2f114..f4e5975f45a 100644 Binary files a/Master/texmf-dist/doc/latex/songbook/sampleOH.pdf and b/Master/texmf-dist/doc/latex/songbook/sampleOH.pdf differ diff --git a/Master/texmf-dist/doc/latex/songbook/sampleTdx.pdf b/Master/texmf-dist/doc/latex/songbook/sampleTdx.pdf index 646d1c8ecbf..2043aca0bc0 100644 Binary files a/Master/texmf-dist/doc/latex/songbook/sampleTdx.pdf and b/Master/texmf-dist/doc/latex/songbook/sampleTdx.pdf differ diff --git a/Master/texmf-dist/doc/latex/songbook/sampleTdx.tex b/Master/texmf-dist/doc/latex/songbook/sampleTdx.tex index 9cf074fc7c9..ba0ce263ddc 100644 --- a/Master/texmf-dist/doc/latex/songbook/sampleTdx.tex +++ b/Master/texmf-dist/doc/latex/songbook/sampleTdx.tex @@ -1,13 +1,13 @@ -%%%%%% rcsid = @(#)$Id: sampleTdx.tex,v 1.15 2006/10/15 15:49:50 rathc Exp $ +%%%%%% rcsid = @(#)$Id: sampleTdx.tex,v 1.16 2007/02/04 04:14:22 rathc Exp $ %%%%%% %% %% =============================================== %% Sample Title & First Line Index (sampleTdx.tex) %% =============================================== %% -%% Version 4.2, 13 October, 2006 +%% Version 4.3, 02 February, 2007 %% -%% Copyright 1992--2006 Christopher Rath +%% Copyright 1992--2007 Christopher Rath %% %% This package is free software; you can redistribute it and/or %% modify it under the terms of version 2.1 of the GNU Lesser diff --git a/Master/texmf-dist/doc/latex/songbook/sampleToc.pdf b/Master/texmf-dist/doc/latex/songbook/sampleToc.pdf index 94e80efc308..b1ece6cf96d 100644 Binary files a/Master/texmf-dist/doc/latex/songbook/sampleToc.pdf and b/Master/texmf-dist/doc/latex/songbook/sampleToc.pdf differ diff --git a/Master/texmf-dist/doc/latex/songbook/sampleToc.tex b/Master/texmf-dist/doc/latex/songbook/sampleToc.tex index ef4a6bd317c..af8a7277e17 100644 --- a/Master/texmf-dist/doc/latex/songbook/sampleToc.tex +++ b/Master/texmf-dist/doc/latex/songbook/sampleToc.tex @@ -1,13 +1,13 @@ -%%%%%% rcsid = @(#)$Id: sampleToc.tex,v 1.15 2006/10/15 15:49:50 rathc Exp $ +%%%%%% rcsid = @(#)$Id: sampleToc.tex,v 1.16 2007/02/04 04:14:22 rathc Exp $ %%%%%% %% %% ======================================== %% Sample Table Of Contents (sampleToc.tex) %% ======================================== %% -%% Version 4.2, 13 October, 2006 +%% Version 4.3, 02 February, 2007 %% -%% Copyright 1992--2006 Christopher Rath +%% Copyright 1992--2007 Christopher Rath %% %% This package is free software; you can redistribute it and/or %% modify it under the terms of version 2.1 of the GNU Lesser diff --git a/Master/texmf-dist/doc/latex/songbook/sampleWBK.pdf b/Master/texmf-dist/doc/latex/songbook/sampleWBK.pdf index 231f2eadf73..ee83dd582c0 100644 Binary files a/Master/texmf-dist/doc/latex/songbook/sampleWBK.pdf and b/Master/texmf-dist/doc/latex/songbook/sampleWBK.pdf differ diff --git a/Master/texmf-dist/doc/latex/songbook/songbook.pdf b/Master/texmf-dist/doc/latex/songbook/songbook.pdf index f3fd290a0f0..6e9c237083c 100644 Binary files a/Master/texmf-dist/doc/latex/songbook/songbook.pdf and b/Master/texmf-dist/doc/latex/songbook/songbook.pdf differ diff --git a/Master/texmf-dist/source/latex/songbook/songbook.dtx b/Master/texmf-dist/source/latex/songbook/songbook.dtx index b34404fc6a4..2047d67196c 100644 --- a/Master/texmf-dist/source/latex/songbook/songbook.dtx +++ b/Master/texmf-dist/source/latex/songbook/songbook.dtx @@ -1,12 +1,12 @@ % \iffalse meta-comment % -*- LaTeX -*- -% rcsid = @(#)$Id: songbook.dtx,v 1.12 2006/10/15 15:49:50 rathc Exp $ +% rcsid = @(#)$Id: songbook.dtx,v 1.13 2007/02/04 04:12:40 rathc Exp $ % % % songbook.sty - Generic SongBook style. % -% Version 4.2, 13 October, 2006 +% Version 4.3, 02 February, 2007 % -% Copyright 1992--2006 Christopher Rath +% Copyright 1992--2007 Christopher Rath % % This package is free software; you can redistribute it and/or % modify it under the terms of version 2.1 of the GNU Lesser @@ -21,7 +21,7 @@ % % \fi % -% \CheckSum{2178} +% \CheckSum{2190} %% \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 @@ -52,6 +52,8 @@ % 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.} +% \changes{v4.3}{2007/02/03}{Corrected problem with xlatn environment introduced in v4.2 +% and added a new songTranslation environment.} %\fi % % \hyphenation{make-index} @@ -142,10 +144,23 @@ % \tableofcontents % } % +% \section*{Preface to version 4.3} +% What's new in version~4.3: +% \begin{itemize} +% \item found a problem with the optional parameter to the xlatn environment +% added in Release 4.2; that optional parameter has been removed +% \item a new songTranslation environment added to provide the required +% capability for the Artist index option +% \item added a new song to the sample songbook to act as a test case +% for translation +% \end{itemize} +% % \section*{Preface to version 4.2} % What's new in version~4.2: % \begin{itemize} % \item added a new Artist index option +% \item added a new optional parameter to the xlatn environment; in +% support of the new Artist index option % \end{itemize} % % \section*{Preface to version 4.1a} @@ -528,10 +543,30 @@ % parameters are left empty then the string defined by the % |\SBUnknownTag| macro used (instead of leaving whitespace % in the song header. +% +% \item |\begin{songTranslation}{|\meta{1}|}|\ \ldots|{|\meta{4}|}|\ \meta{\ldots +% the translation\ldots}|\end{songTranslation}|\DescribeEnv{songTranslation} +% is the new song translation environment. The parameter list is defined +% as: +% \begin{enumerate} +% \item \ Translation language; +% \item \ Translated song title (in the foreign language); +% \item \ Translation permission; +% \item \ Who performed the translation. +% \end{enumerate} +% The |songTranslation| environment always occurs within a |song| environment; +% it resets the verse counter, causes the title and other parameter +% information to be displayed, and makes the appropriate index and +% table of contents entries. It is important for the |songTranslation| +% environment to occur within a song environment, because the |songTranslation| +% environment inherits the song environment's |\everypar| definition. % % \item |\begin{xlatn}{|\meta{1}|}|\ \ldots|{|\meta{3}|}|\ \meta{\ldots % the translation\ldots}|\end{xlatn}|\DescribeEnv{xlatn} -% is the song translation environment. The parameter list is defined +% is the old song translation environment---this environment is +% considered obsolete and will be removed in a future relase of the +% \Songbook{} macros; it has been replaced by the |songTranslation| +% environment. The parameter list is defined % as: % \begin{enumerate} % \item \ Translated song title (in the foreign language); @@ -929,6 +964,11 @@ % by the |\OHContPgHdr| command. The default value for this is % ``|\theSBSongCnt\ --- \theSongTitle, continued\ldots|''. % +% \item |\SBBaseLang| \DescribeMacro{\SBBaseLang} tag is the name of the +% language of all songs not specified within an |songTranslation| environment, and +% also as the default value of the |songTranslation| environment's optional song language +% parameter. The default value for this is ``|English|''. +% % \item |\SBBridgeTag| \DescribeMacro{\SBBridgeTag} the Bridge Tag to % insert before the start of a bridge. The default value for this is % ``|Bridge:|''. @@ -1647,11 +1687,11 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% -%% rcsid = @(#)$Id: songbook.dtx,v 1.12 2006/10/15 15:49:50 rathc Exp $ +%% rcsid = @(#)$Id: songbook.dtx,v 1.13 2007/02/04 04:12:40 rathc Exp $ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{songbook}[2006/10/13 v4.2 All purpose Songbook style] -\typeout{Document Subclass: songbook 2006/10/13 v4.2 All purpose Songbook style} +\ProvidesPackage{songbook}[2007/02/03 v4.3 All purpose Songbook style] +\typeout{Document Subclass: songbook 2007/02/03 v4.3 All purpose Songbook style} % \end{macrocode} % % \section{Initial Code Part} @@ -3245,6 +3285,13 @@ % The default value for this is % ``|\theSBSongCnt\ --- \theSongTitle, continued\ldots|''. % +% \begin{macro}{\SBBaseLang} +% The |\SBBaseLang| tag is the name of the language of all songs +% not specified within an |songTranslation| environment, and also as the +% default value of the |songTranslation| environment's optional song language +% parameter. +% The default value for this is ``|English|''. +% % \begin{macro}{\SBBridgeTag} % The |\SBBridgeTag| tag is inserted before the start of a bridge. % The default value for this is ``|Bridge:|''. @@ -3295,6 +3342,7 @@ % \begin{macrocode} \newcommand{\OHContPgFtrTag} {continued on next page\ldots} \newcommand{\OHContPgHdrTag} {\theSBSongCnt\ --- \theSongTitle, continued\ldots} +\newcommand{\SBBaseLang} {English} \newcommand{\SBBridgeTag} {Bridge:} \newcommand{\SBChorusTag} {Ch:} \newcommand{\SBContinueTag} {cont\ldots} @@ -3319,6 +3367,7 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % % \paragraph{Internal Song Variables} % Declare song attribute variables. @@ -3359,6 +3408,9 @@ % \begin{macro}{\theXlatnBy} % |\theXlatnBy| is who translated the song. % +% \begin{macro}{\theXlatnLang} +% |\theXlatnLang| is the language the song has been translated into. +% % \begin{macro}{\theXlatnPerm} % |\theXlatnPerm| is the permission details for the last song % translation. This variable is reset to an empty @@ -3378,6 +3430,7 @@ \newcommand{\theSongScriptRef}{the Scripture} \newcommand{\theSongTitle}{the Title} \newcommand{\theXlatnBy}{the Translator} +\newcommand{\theXlatnLang}{the Language} \newcommand{\theXlatnPerm}{the Permission} \newcommand{\theXlatnTitle}{the Translation Title} @@ -3392,6 +3445,7 @@ % \end{macro} % \end{macro} % \end{macro} +% \end{macro} % % \subsubsection{Special Characters} % Some macros to ease the entry of special characters in songbooks. @@ -4053,7 +4107,7 @@ % is nil or blank when one of these |\the| macros is passed instead of % the native parameter itself. % -% We \emph{clear} the translation macros now, since the |xlatn| environment +% We \emph{clear} the translation macros now, since the |songTranslation| environment % is only valid inside a |song| environment, and we are now declaring a new % |song|. % @@ -4070,6 +4124,7 @@ \renewcommand{\theSongScriptRef}{#6} % \renewcommand{\theSongTitle}{#2} % \renewcommand{\theXlatnBy}{} % + \renewcommand{\theXlatnLang}{\SBBaseLang} % \renewcommand{\theXlatnPerm}{} % \renewcommand{\theXlatnTitle}{} % % @@ -4229,13 +4284,16 @@ % \end{macro} % % \begin{macro}{xlatn} -% |xlatn|\parm{1}\parm{2}\parm{3} is the song-translation environment. +% |xlatn|\parm{1}\parm{2}\parm{3} is the old song-translation environment. % \begin{ParameterList} % \item[\meta{1}] Title of the translated song. % \item[\meta{2}] Translation permission. % \item[\meta{3}] Who performed the translation. % \end{ParameterList} % +% The |xlatn| environment is considered obsolete and will be removed from +% a future release of the \Songbook{} macros. +% % The xlatn environment always occurs within a song environment. % We reset the verse counter then cause the title and other % parameter information to be displayed. @@ -4269,7 +4327,34 @@ \setcounter{SBVerseCnt}{0}% \setcounter{SBSectionCnt}{0}% }{\relax} - +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{songTranslation} +% |songTranslation|\parm{1}\parm{2}\parm{3} is the song-translation environment. +% \begin{ParameterList} +% \item[\meta{1}] Language of translated song. +% \item[\meta{2}] Title of the translated song. +% \item[\meta{3}] Translation permission. +% \item[\meta{4}] Who performed the translation. +% \end{ParameterList} +% +% The |songTranslation| environment always occurs within a |song| environment. +% We reset the verse counter then cause the title and other +% parameter information to be displayed. +% +% The |xlatn| environment was the original song translation environment, but +% with the addition of an additional parameter (the ``Language of translated +% song.'' parameter) it made most sense to create a new environment which +% simply deals with the new parameter and then calls the old environment. At +% some point in the future, when the |xlatn| environment is removed, the |xlatn| +% code will be moved here. +% +% \begin{macrocode} +\newenvironment{songTranslation}[4]{% Comment marker negates the newline. + \renewcommand{\theXlatnBy}{#4}% + \begin{xlatn}{#2}{#3}{#4}% +}{\end{xlatn}} % \end{macrocode} % \end{macro} % @@ -5107,7 +5192,9 @@ % \end{macrocode} % -% There are no obsolete macros in this release. +% The |xlatn| environment is obsolete, but for the sake of +% code-clarity the code has not been moved into the +% Obsolete Macros section of this document. % % \subsubsection{Deprecated Macros} % diff --git a/Master/texmf-dist/source/latex/songbook/songbook.ins b/Master/texmf-dist/source/latex/songbook/songbook.ins index 7532ebcfe0f..0544ae56b31 100644 --- a/Master/texmf-dist/source/latex/songbook/songbook.ins +++ b/Master/texmf-dist/source/latex/songbook/songbook.ins @@ -1,10 +1,10 @@ -%% rcsid = @(#)$Id: songbook.ins,v 1.5 2006/10/15 15:49:50 rathc Exp $ +%% rcsid = @(#)$Id: songbook.ins,v 1.6 2007/02/04 04:14:22 rathc Exp $ %% %% songbook.ins - Docstrip batch file for Songbook Style %% -%% Version 4.2, 13 October, 2006 +%% Version 4.3, 03 February, 2007 %% -%% Copyright 1992--2006 Christopher Rath +%% Copyright 1992--2007 Christopher Rath %% %% This package is free software; you can redistribute it and/or %% modify it under the terms of version 2.1 of the GNU Lesser diff --git a/Master/texmf-dist/tex/latex/songbook/songbook.sty b/Master/texmf-dist/tex/latex/songbook/songbook.sty index c1053a8d039..182e36e1fbf 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.12 2006/10/15 15:49:50 rathc Exp $ +%% rcsid = @(#)$Id: songbook.dtx,v 1.13 2007/02/04 04:12:40 rathc Exp $ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{songbook}[2006/10/13 v4.2 All purpose Songbook style] -\typeout{Document Subclass: songbook 2006/10/13 v4.2 All purpose Songbook style} +\ProvidesPackage{songbook}[2007/02/03 v4.3 All purpose Songbook style] +\typeout{Document Subclass: songbook 2007/02/03 v4.3 All purpose Songbook style} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% %% @@ -644,6 +644,7 @@ \newcommand{\OHContPgFtrTag} {continued on next page\ldots} \newcommand{\OHContPgHdrTag} {\theSBSongCnt\ --- \theSongTitle, continued\ldots} +\newcommand{\SBBaseLang} {English} \newcommand{\SBBridgeTag} {Bridge:} \newcommand{\SBChorusTag} {Ch:} \newcommand{\SBContinueTag} {cont\ldots} @@ -663,6 +664,7 @@ \newcommand{\theSongScriptRef}{the Scripture} \newcommand{\theSongTitle}{the Title} \newcommand{\theXlatnBy}{the Translator} +\newcommand{\theXlatnLang}{the Language} \newcommand{\theXlatnPerm}{the Permission} \newcommand{\theXlatnTitle}{the Translation Title} @@ -888,6 +890,7 @@ \renewcommand{\theSongScriptRef}{#6} % \renewcommand{\theSongTitle}{#2} % \renewcommand{\theXlatnBy}{} % + \renewcommand{\theXlatnLang}{\SBBaseLang} % \renewcommand{\theXlatnPerm}{} % \renewcommand{\theXlatnTitle}{} % % @@ -970,7 +973,10 @@ \setcounter{SBVerseCnt}{0}% \setcounter{SBSectionCnt}{0}% }{\relax} - +\newenvironment{songTranslation}[4]{% Comment marker negates the newline. + \renewcommand{\theXlatnBy}{#4}% +\begin{xlatn}{#2}{#3}{#4}% +}{\end{xlatn}} \def\sbChord#1{% \ifx#1\relax% \let\next=\relax% -- cgit v1.2.3