From ce612f56f26d1e7d403ac8cd02d8b4ce9642e93f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 3 Apr 2010 23:10:19 +0000 Subject: songbook update (31mar10) git-svn-id: svn://tug.org/texlive/trunk@17672 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/songbook/README | 18 ++++-- .../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 +- Master/texmf-dist/doc/latex/songbook/sample-sb.tex | 6 +- Master/texmf-dist/doc/latex/songbook/sampleAdx.tex | 4 +- Master/texmf-dist/doc/latex/songbook/sampleKdx.tex | 6 +- Master/texmf-dist/doc/latex/songbook/sampleTdx.tex | 6 +- Master/texmf-dist/doc/latex/songbook/sampleToc.tex | 6 +- Master/texmf-dist/makeindex/songbook/songbook.ist | 4 -- .../texmf-dist/source/latex/songbook/songbook.dtx | 26 +++++--- .../texmf-dist/source/latex/songbook/songbook.ins | 6 +- .../texmf-dist/tex/latex/songbook/conditionals.sty | 6 +- Master/texmf-dist/tex/latex/songbook/songbook.sty | 6 +- 16 files changed, 101 insertions(+), 85 deletions(-) delete mode 100644 Master/texmf-dist/makeindex/songbook/songbook.ist diff --git a/Master/texmf-dist/doc/latex/songbook/README b/Master/texmf-dist/doc/latex/songbook/README index 24e030a1978..75b675cd3c6 100644 --- a/Master/texmf-dist/doc/latex/songbook/README +++ b/Master/texmf-dist/doc/latex/songbook/README @@ -1,4 +1,4 @@ -@(#)$Id: README,v 1.1 2007/02/04 04:29:10 rathc Exp $ +@(#)$Id: README,v 1.2 2010-03-31 02:06:52 rathc Exp $ - - - - - - - - - @@ -6,11 +6,11 @@ - - - - - - - - - - - - - - - - - - LaTeX Songbook Style, Version 4.3, 2007/02/03 + LaTeX Songbook Style, Version 4.4, 2010/03/31 - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) 1992--2007 Christopher Rath + Copyright (c) 1992--2010 Christopher Rath All rights reserved. - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -21,9 +21,10 @@ 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 free software; with the exception of conditionals.sty, 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 (conditionals.sty is public domain and not bound by LGPL). This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or @@ -33,6 +34,11 @@ 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.4: + + * at Donald Arseneau's request, added language to state that + conditionals.sty is public domain + Changes in Release 4.3: * found a problem with the optional parameter to the xlatn environment diff --git a/Master/texmf-dist/doc/latex/songbook/contrib/README b/Master/texmf-dist/doc/latex/songbook/contrib/README index e9489720099..9288bbca023 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 b21964f06a6..355c9e1ad03 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.6 2007/02/04 04:14:20 rathc Exp $ +@(#)$Id: install.txt,v 1.7 2010-03-31 02:15:49 rathc Exp $ - - - - - - - - - - - - - - @@ -6,11 +6,11 @@ - - - - - - - - - - - - - - - - - - - - LaTeX Songbook Style, Version 4.3, 2007/02/03 + LaTeX Songbook Style, Version 4.4, 2010/03/30 - - - - - - - - - - - - - - - - - - - - - - - - - - - Copyright (c) 1992--2007 Christopher Rath + Copyright (c) 1992--2010 Christopher Rath All rights reserved. - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Master/texmf-dist/doc/latex/songbook/mksbadx b/Master/texmf-dist/doc/latex/songbook/mksbadx index 3695b8f994a..60a72123910 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.3, 03 February, 2007 +## Version 4.4, 30 March, 2010 ## -## Copyright 1992--2007 Christopher Rath +## Copyright 1992--2010 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 a7b97a37bcc..4f26095df3b 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.12 2007/02/04 04:14:20 rathc Exp $ +##### rcsid = @(#)$Id: mksbkdx,v 1.13 2010-03-31 02:15:50 rathc Exp $ ##### ## ## mksbkdx - Produce a songbook style .kdx file from a .kIdx file. ## -## Version 4.3, 03 February, 2007 +## Version 4.4, 30 March, 2010 ## -## Copyright 1992--2007 Christopher Rath +## Copyright 1992--2010 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 b48ffce7285..2f725d19136 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.14 2007/02/04 04:14:21 rathc Exp $ +##### rcsid = @(#)$Id: mksbtdx,v 1.15 2010-03-31 02:15:50 rathc Exp $ ##### ## ## mksbtdx - Produce a songbook style .tdx file from a .tIdx file. ## -## Version 4.3, 03 February, 2007 +## Version 4.4, 30 March, 2010 ## -## Copyright 1992--2007 Christopher Rath +## Copyright 1992--2010 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.tex b/Master/texmf-dist/doc/latex/songbook/sample-sb.tex index 471956a0908..b941aa76841 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.21 2007/02/04 04:14:21 rathc Exp $ +%%%%%% rcsid = @(#)$Id: sample-sb.tex,v 1.22 2010-03-31 02:15:51 rathc Exp $ %%%%%% %% %% =============================== %% Sample Songbook (sample-sb.tex) %% =============================== %% -%% Version 4.3, 02 February, 2007 +%% Version 4.4, 30 March, 2010 %% -%% Copyright 1992--2007 Christopher Rath +%% Copyright 1992--2010 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/sampleAdx.tex b/Master/texmf-dist/doc/latex/songbook/sampleAdx.tex index c38da928e7f..e45ffe7998a 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.3, 02 February, 2007 +%% Version 4.4, 30 March, 2010 %% -%% Copyright 1992--2007 Christopher Rath +%% Copyright 1992--2010 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/sampleKdx.tex b/Master/texmf-dist/doc/latex/songbook/sampleKdx.tex index 799a5a2aada..61ca22a823a 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.14 2007/02/04 04:14:21 rathc Exp $ +%%%%%% rcsid = @(#)$Id: sampleKdx.tex,v 1.15 2010-03-31 02:15:51 rathc Exp $ %%%%%% %% %% ================================ %% Sample Key Index (sampleKdx.tex) %% ================================ %% -%% Version 4.3, 02 February, 2007 +%% Version 4.4, 30 March, 2010 %% -%% Copyright 1992--2007 Christopher Rath +%% Copyright 1992--2010 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/sampleTdx.tex b/Master/texmf-dist/doc/latex/songbook/sampleTdx.tex index ba0ce263ddc..e18330f2c37 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.16 2007/02/04 04:14:22 rathc Exp $ +%%%%%% rcsid = @(#)$Id: sampleTdx.tex,v 1.17 2010-03-31 02:15:51 rathc Exp $ %%%%%% %% %% =============================================== %% Sample Title & First Line Index (sampleTdx.tex) %% =============================================== %% -%% Version 4.3, 02 February, 2007 +%% Version 4.4, 30 March, 2010 %% -%% Copyright 1992--2007 Christopher Rath +%% Copyright 1992--2010 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.tex b/Master/texmf-dist/doc/latex/songbook/sampleToc.tex index af8a7277e17..062d736e31c 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.16 2007/02/04 04:14:22 rathc Exp $ +%%%%%% rcsid = @(#)$Id: sampleToc.tex,v 1.17 2010-03-31 02:15:52 rathc Exp $ %%%%%% %% %% ======================================== %% Sample Table Of Contents (sampleToc.tex) %% ======================================== %% -%% Version 4.3, 02 February, 2007 +%% Version 4.4, 30 March, 2010 %% -%% Copyright 1992--2007 Christopher Rath +%% Copyright 1992--2010 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/makeindex/songbook/songbook.ist b/Master/texmf-dist/makeindex/songbook/songbook.ist deleted file mode 100644 index 603f7583f7c..00000000000 --- a/Master/texmf-dist/makeindex/songbook/songbook.ist +++ /dev/null @@ -1,4 +0,0 @@ -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 2047d67196c..873ce65b556 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.13 2007/02/04 04:12:40 rathc Exp $ +% rcsid = @(#)$Id: songbook.dtx,v 1.14 2010-03-31 02:06:52 rathc Exp $ % % % songbook.sty - Generic SongBook style. % -% Version 4.3, 02 February, 2007 +% Version 4.4, 30 March, 2010 % -% Copyright 1992--2007 Christopher Rath +% Copyright 1992--2010 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 @@ -54,6 +54,8 @@ % \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.} +% \changes{v4.4}{2010/03/30}{At Donald Arseneau's request, added language to state that +% conditionals.sty is public domain.} %\fi % % \hyphenation{make-index} @@ -122,10 +124,10 @@ % \GetFileInfo{songbook.dtx} % % \title{The \Songbook{} Package\\ -% {\large Version 4.2}} +% {\large Version 4.4}} % \author{Christopher Rath\\ % {\small$<$\texttt{Christopher@Rath.ca}$>$}} -% \date{2006/10/10} +% \date{2010/03/30} % \maketitle % % \begin{abstract} @@ -144,6 +146,14 @@ % \tableofcontents % } % +% \section*{Preface to version 4.4} +% What's new in version~4.4: +% \begin{itemize} +% \item there are no functional changes +% \item at Donald Arseneau's request, added language to state that +% conditionals.sty is public domain +% \end{itemize} +% % \section*{Preface to version 4.3} % What's new in version~4.3: % \begin{itemize} @@ -1687,11 +1697,11 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% -%% rcsid = @(#)$Id: songbook.dtx,v 1.13 2007/02/04 04:12:40 rathc Exp $ +%% rcsid = @(#)$Id: songbook.dtx,v 1.14 2010-03-31 02:06:52 rathc Exp $ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{songbook}[2007/02/03 v4.3 All purpose Songbook style] -\typeout{Document Subclass: songbook 2007/02/03 v4.3 All purpose Songbook style} +\ProvidesPackage{songbook}[2010/03/30 v4.4 All purpose Songbook style] +\typeout{Document Subclass: songbook 2010/03/30 v4.4 All purpose Songbook style} % \end{macrocode} % % \section{Initial Code Part} diff --git a/Master/texmf-dist/source/latex/songbook/songbook.ins b/Master/texmf-dist/source/latex/songbook/songbook.ins index 0544ae56b31..61d16a4d669 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.6 2007/02/04 04:14:22 rathc Exp $ +%% rcsid = @(#)$Id: songbook.ins,v 1.7 2010-03-31 02:15:53 rathc Exp $ %% %% songbook.ins - Docstrip batch file for Songbook Style %% -%% Version 4.3, 03 February, 2007 +%% Version 4.4, 30 March, 2010 %% -%% Copyright 1992--2007 Christopher Rath +%% Copyright 1992--2010 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/conditionals.sty b/Master/texmf-dist/tex/latex/songbook/conditionals.sty index 5b849e38c72..929b0699a81 100644 --- a/Master/texmf-dist/tex/latex/songbook/conditionals.sty +++ b/Master/texmf-dist/tex/latex/songbook/conditionals.sty @@ -1,6 +1,10 @@ -% rcsid = @(#)$Id: conditionals.sty,v 1.4 2002/01/17 22:38:45 christopher Exp $ +% rcsid = @(#)$Id: conditionals.sty,v 1.5 2010-03-31 01:04:16 rathc Exp $ %==========Conditionals by Donald Arseneau =========== % (as of 2002/01/17) +% Donald Arseneau asserts no claim to copyright of the contents of this +% conditionals.sty file, and it may be freely used as in the public +% domain. +% % \if\blank{ } --- checks if parameter is blank (Spaces count as blank) % \if\given{ } --- checks if parameter is not blank: like \if\blank{}...\else % \if\nil{ } --- checks if parameter is null (spaces are NOT null) diff --git a/Master/texmf-dist/tex/latex/songbook/songbook.sty b/Master/texmf-dist/tex/latex/songbook/songbook.sty index 182e36e1fbf..39fcf4abf1d 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.13 2007/02/04 04:12:40 rathc Exp $ +%% rcsid = @(#)$Id: songbook.dtx,v 1.14 2010-03-31 02:06:52 rathc Exp $ %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{songbook}[2007/02/03 v4.3 All purpose Songbook style] -\typeout{Document Subclass: songbook 2007/02/03 v4.3 All purpose Songbook style} +\ProvidesPackage{songbook}[2010/03/30 v4.4 All purpose Songbook style] +\typeout{Document Subclass: songbook 2010/03/30 v4.4 All purpose Songbook style} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% %% -- cgit v1.2.3