5 files changed, 32 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/latex/guitar/README b/Master/texmf-dist/doc/latex/guitar/README
new file mode 100644
index 00000000000..4fc85743a6c
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/guitar/README
@@ -0,0 +1,10 @@
+guitar - (La)TeX macros for typesetting guitar chords over song texts.
+The toolbox package is required.
+Note that this package only places arbitrary TeX code over the lyrics.
+To typeset the chords graphically (and not only by name),
+use an additional package such as gchords by K. Peeters.
+
+Author: M. V\"ath      martin@mvath.de
+
+The package may be distributed and/or modified under the conditions of
+the LaTeX Project Public License (version 1.3c or later).
diff --git a/Master/texmf-dist/doc/latex/guitar/guitar.pdf b/Master/texmf-dist/doc/latex/guitar/guitar.pdf
index 404f67eb467..2d8da82573b 100644
--- a/Master/texmf-dist/doc/latex/guitar/guitar.pdf
+++ b/Master/texmf-dist/doc/latex/guitar/guitar.pdf
diff --git a/Master/texmf-dist/doc/latex/guitar/guitar.txt b/Master/texmf-dist/doc/latex/guitar/guitar.txt
index edba6e29592..149193f26e2 100644
--- a/Master/texmf-dist/doc/latex/guitar/guitar.txt
+++ b/Master/texmf-dist/doc/latex/guitar/guitar.txt
@@ -1,8 +1,8 @@
 
 %%#
-%%# Author and copyright 2001,2009:
+%%# Author and copyright 2001,2009,2013:
 %%#
-%%# M. V\"ath      vaeth@mathematik.uni-wuerzburg.de
+%%# M. V\"ath      martin@mvath.de
 %%#
 %%# The author thanks
 %%#     Donald Arseneau <asnd@triumf.ca>
@@ -21,7 +21,7 @@
 
 %%#
 %%# This package should run with plain TeX, LaTeX 2.09, and LaTeX 2e.
-%%# Actually, it should actually run with all TeX formats.
+%%# Actually, it should run with all TeX formats.
 %%#
 
 %%# This is not the only package available for typesetting guitar songs.
@@ -264,7 +264,7 @@
 %%# Possible Problems:
 %%#
 
-%%# The special treatment of [ # b and linefeed is realized by a changing of
+%%# The special treatment of [ # b and linefeed is implemented by a changing of
 %%# catcodes. This may cause essentially two sorts of problems:
 %%#
 %%# 1. In some cases, you will want to avoid the automatic replacement of '#'
diff --git a/Master/texmf-dist/source/latex/guitar/guitar.dtx b/Master/texmf-dist/source/latex/guitar/guitar.dtx
index 342e97deef6..6a1c355fe0e 100644
--- a/Master/texmf-dist/source/latex/guitar/guitar.dtx
+++ b/Master/texmf-dist/source/latex/guitar/guitar.dtx
@@ -1,11 +1,11 @@
-% \def\fileversion{1.6}\def\filedate{2009/03/17}\def\docdate{2009/03/17}
+% \def\fileversion{1.6}\def\filedate{2009/03/17}\def\docdate{2013/11/26}
 %\iffalse These lines are necessary for the doc and docstrip utilities
 %<*asciidocu>
 
 %%#
-%%# Author and copyright 2001,2009:
+%%# Author and copyright 2001,2009,2013:
 %%#
-%%# M. V\"ath      vaeth@mathematik.uni-wuerzburg.de
+%%# M. V\"ath      martin@mvath.de
 %%#
 %%# The author thanks
 %%#     Donald Arseneau <asnd@triumf.ca>
@@ -24,7 +24,7 @@
 
 %%#
 %%# This package should run with plain TeX, LaTeX 2.09, and LaTeX 2e.
-%%# Actually, it should actually run with all TeX formats.
+%%# Actually, it should run with all TeX formats.
 %%#
 
 %%# This is not the only package available for typesetting guitar songs.
@@ -314,7 +314,7 @@
 %%# Possible Problems:
 %%#
 
-%%# The special treatment of [ # b and linefeed is realized by a changing of
+%%# The special treatment of [ # b and linefeed is implemented by a changing of
 %%# catcodes. This may cause essentially two sorts of problems:
 %%#
 %%# 1. In some cases, you will want to avoid the automatic replacement of '#'
@@ -385,6 +385,8 @@
 % \newcommand{\cmdcite}[1]{\texttt{\textbackslash#1}}
 % \newcommand{\filecite}[1]{\texttt{#1}}
 %
+% \changes{1.6}{2013/11/26}{Update email, clarify license. Date/version remains the
+%   same since only commments and documentation are modified}
 % \changes{1.6}{2009/03/17}{Do not redefine commands on new catcodes globally.
 %   Instead save and restore the original definition when changing catcodes.
 %   Thanks to Heiko Oberdiek for pointing out this bug}
@@ -453,10 +455,15 @@
 % \def\myspace{\texttt{\textvisiblespace}}
 % \toolboxMakeSplit{/}{guitarSplitDist}
 
-% \title{The \texttt{guitar} package\relax
-%\thanks{This  file has version number \fileversion, last revised \filedate.}}
+% \title{The \texttt{guitar} package\thanks
+%   {This package has version number \fileversion, last revised \filedate.
+%   The package may be distributed and/or modified under the conditions of the
+%   LaTeX Project Public License, either version 1.3c of this license or (at
+%   your option) any later version. The latest version of this license is in
+%   \texttt{http://www.latex-project.org/lppl.txt}, and version 1.3c or later
+%   is part of all distributions of LaTeX version 2005/12/01 or later.}}
 % \author{Martin V\"ath\relax
-%\thanks{\texttt{vaeth@mathematik.uni-wuerzburg.de}}
+%\thanks{\texttt{martin@mvath.de}}
 %{}\thanks{The author thanks
 % Donald Arseneau \texttt{<asnd@triumf.ca>},
 % Dan Luecking \texttt{<luecking@uark.edu>},
@@ -472,9 +479,6 @@
 % \texttt{http://www.damtp.cam.ac.uk/user/kp229/gchords/}
 % \end{abstract}
 
-% You may copy this package freely, as long as you distribute only unmodified
-% and complete versions.\par
-%
 % This is not the only package available for typesetting guitar songs.
 % The following packages are also available (and possibly also others:
 % I do not claim that this list is complete).
@@ -788,7 +792,7 @@
 %
 % \section{Possible Problems}
 %
-% The special treatment of "[" "#" "b" and \meta{linefeed} is realized by a
+% The special treatment of "[" "#" "b" and \meta{linefeed} is implemented by a
 % changing of catcodes. This may cause essentially two sorts of problems:
 % \begin{enumerate}
 % \item
@@ -842,7 +846,7 @@
 %%
 %% Author:
 %%
-%% M. V\"ath      vaeth@mathematik.uni-wuerzburg.de
+%% M. V\"ath      martin@mvath.de
 %%
 
 \ifx\typeout\undefined
diff --git a/Master/texmf-dist/tex/latex/guitar/guitar.sty b/Master/texmf-dist/tex/latex/guitar/guitar.sty
index 78eaa5fc45c..aa32733d1cd 100644
--- a/Master/texmf-dist/tex/latex/guitar/guitar.sty
+++ b/Master/texmf-dist/tex/latex/guitar/guitar.sty
@@ -5,7 +5,7 @@
 %%
 %% Author:
 %%
-%% M. V\"ath      vaeth@mathematik.uni-wuerzburg.de
+%% M. V\"ath      martin@mvath.de
 %%
 
 \ifx\typeout\undefined