gtrcrd (25dec13)

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

4 files changed, 93 insertions, 11 deletions

diff --git a/Master/texmf-dist/doc/latex/gtrcrd/README b/Master/texmf-dist/doc/latex/gtrcrd/README
index 7fb7e945e45..a34dff1a3cb 100644
--- a/Master/texmf-dist/doc/latex/gtrcrd/README
+++ b/Master/texmf-dist/doc/latex/gtrcrd/README
@@ -1,7 +1,7 @@
 Package name: gtrcrd (Guitar chords)
-Author: Riccardo Bresciani - gtrcrd@tex.nopkoguo.net
+Author: Riccardo Bresciani - gtrcrd@tex.nopkoguo.it
 
-Copyright 2012 Riccardo Bresciani
+Copyright 2012-2013 Riccardo Bresciani
 
 Description: This package is suitable to add chords to lyrics.
 The main advantages of using this package is that chords are
@@ -25,4 +25,8 @@ gtrcrd-doc.tex, gtrcrd-doc.pdf
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+2013/12/24: v1.1
+- added \chordsbelow
+- added \neolatin
+
 2012/01/15: v1.0
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/latex/gtrcrd/gtrcrd-doc.pdf b/Master/texmf-dist/doc/latex/gtrcrd/gtrcrd-doc.pdf
index 35a4aaa2f32..f75c9273ca0 100644
--- a/Master/texmf-dist/doc/latex/gtrcrd/gtrcrd-doc.pdf
+++ b/Master/texmf-dist/doc/latex/gtrcrd/gtrcrd-doc.pdf
diff --git a/Master/texmf-dist/doc/latex/gtrcrd/gtrcrd-doc.tex b/Master/texmf-dist/doc/latex/gtrcrd/gtrcrd-doc.tex
index d7c021338c5..d0d31ded6ee 100644
--- a/Master/texmf-dist/doc/latex/gtrcrd/gtrcrd-doc.tex
+++ b/Master/texmf-dist/doc/latex/gtrcrd/gtrcrd-doc.tex
@@ -2,9 +2,7 @@
 
 \usepackage{gtrcrd}
 \usepackage{hyperref}
-\usepackage{fancyvrb}
 
-\VerbatimFootnotes
 \setleftmark{}
 \setrightmark{}
 
@@ -23,8 +21,8 @@ pdfstartview=FitV,
 \newcommand{\ie}{\emph{i.e.} }
 
 \author{Riccardo Bresciani}
-\title{gtrcrd\hfill{\small\href{http://tex.nopkoguo.net/gtrcrd}{http://tex.nopkoguo.net/gtrcrd}}}
-\newcommand{\belowLine}{{\normalsize Version 1.0 --- \today}}
+\title{gtrcrd\hfill{\small\href{http://tex.nopkoguo.it/gtrcrd}{http://tex.nopkoguo.it/gtrcrd}}}
+\newcommand{\belowLine}{{\normalsize Version 1.1 --- \today}}
 
 \makeatletter
 \renewcommand{\maketitle}{\thispagestyle{plain}{\Huge\textbf{\colorB\@title}\Large\\\vspace{2ex}
@@ -86,6 +84,17 @@ For example \texttt{\textbackslash G[7sus4]\{text\}} produces the following: \G[
 \D my fair \G lady. &\texttt{\textbackslash D my fair \textbackslash G lady.}
 \end{tabular}
 
+\artsubsection{Different notations}\label{notations}
+
+By default chords are typeset in English notation above the text. The default behaviour can be altered via the following commands:
+
+\begin{itemize}
+	\item \texttt{\textbackslash chordsbelow} switches to typesetting chords below the text --- for example \texttt{\textbackslash Cs\{text\}} outputs {\chordsbelow \Cs{text}} instead of \Cs{text};
+	\item \texttt{\textbackslash neolatin} switches to the neo-latin notation (\emph{i.e.} Do-Re-Mi-Fa-Sol-La-Si)  --- for example \texttt{\textbackslash As\{text\}} outputs {\neolatin \As{text}} instead of \As{text}.
+\end{itemize}
+
+
+
 \artsubsection{Operations on chords}\label{opts}
 
 It is sometimes useful to transpose a song by a certain number of half-tones. This package provides the following commands to do this:
@@ -112,7 +121,7 @@ Another possibility is to convert all chords with a $\flat$ to the corresponding
 Finally it is possible to avoid all occurrences of E$\sharp$, F$\flat$, B$\sharp$ and C$\flat$ and replace them with F, E, C and B respectively by using the command \texttt{\textbackslash normalize}.
 
 \artsubsection{Package Options}
-All commands from \S\ref{opts} can be run at the beginning of the document by using the desired ones as package options --- the initial backslash has to be omitted of course!
+All commands from \S\S\ref{notations},\ref{opts} can be run at the beginning of the document by using the desired ones as package options --- the initial backslash has to be omitted of course!
 
 \artsubsection{Changing the Way Things Look}
 The line spacing in presence of a chord is controlled by the length \texttt{\textbackslash crdheight} --- the default setting is \texttt{3ex}.
@@ -126,7 +135,7 @@ All chords are specific instances of the command \texttt{\textbackslash CHORD},
 It is possible to change the way a chord is typeset by redefining this command --- and this does not compromise the functionality of the commands in \S\ref{opts} as long as the meaning of the arguments of \texttt{\textbackslash CHORD} is not changed.
 
 \artsection{Contacts}
-If you have comments or want to report any bug, please send a mail to \textsl{\href{mailto:gtrcrd@tex.nopkoguo.net}{gtrcrd@tex.nopkoguo.net}}.
+If you have comments or want to report any bug, please send a mail to \textsl{\href{mailto:gtrcrd@tex.nopkoguo.net}{gtrcrd@tex.nopkoguo.it}}.
 
 
 \end{document}
\ No newline at end of file
diff --git a/Master/texmf-dist/tex/latex/gtrcrd/gtrcrd.sty b/Master/texmf-dist/tex/latex/gtrcrd/gtrcrd.sty
index c7d331af2fc..e95c2ebdbd3 100644
--- a/Master/texmf-dist/tex/latex/gtrcrd/gtrcrd.sty
+++ b/Master/texmf-dist/tex/latex/gtrcrd/gtrcrd.sty
@@ -1,9 +1,9 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%                                                                 %%
 %% Package name: gtrcrd                                            %%
-%% Author: Riccardo Bresciani - gtrcrd@tex.nopkoguo.net            %%
+%% Author: Riccardo Bresciani - gtrcrd@tex.nopkoguo.it             %%
 %%                                                                 %%
-%% Copyright 2012 Riccardo Bresciani                               %%
+%% Copyright 2012-2013 Riccardo Bresciani                          %%
 %%                                                                 %%
 %% Description: This package is suitable to add chords to lyrics.  %%
 %% The main advantages of using this package is that chords are    %%
@@ -27,7 +27,7 @@
 %%                                                                 %%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\ProvidesPackage{gtrcrd} [2012/01/15 v1.0 Guitar chords]
+\ProvidesPackage{gtrcrd} [2013/12/24 v1.1 Guitar chords]
 
 \newlength{\wordwidth}
 \newlength{\crdwidth}
@@ -45,6 +45,17 @@
 \hspace{\wordwidth}%
 }
 
+\newcommand{\chordsbelow}{%
+\renewcommand{\CHORD}[3][]{%
+\settowidth{\wordwidth}{##3}%
+\settowidth{\crdwidth}{{\crdfont ##2##1}}%
+##3%
+\hspace{-\wordwidth}\raisebox{-2.2ex}{\parbox[t][\crdheight][t]{\crdwidth}{\crdfont ##2##1}}%
+\addtolength{\wordwidth}{-\crdwidth}%
+\hspace{\wordwidth}%
+}%
+}
+
 
 \newcommand{\crdA}[2][]{\CHORD[#1]{A}{#2}}
 \newcommand{\crdB}[2][]{\CHORD[#1]{B}{#2}}
@@ -94,6 +105,56 @@
 \newcommand{\crdFsm}[2][]{\CHORD[#1]{F$\sharp$m}{#2}}
 \newcommand{\crdGsm}[2][]{\CHORD[#1]{G$\sharp$m}{#2}}
 
+\newcommand{\neolatin}{%
+\renewcommand{\crdA}[2][]{\CHORD[##1]{La}{##2}}%
+\renewcommand{\crdB}[2][]{\CHORD[##1]{Si}{##2}}%
+\renewcommand{\crdC}[2][]{\CHORD[##1]{Do}{##2}}%
+\renewcommand{\crdD}[2][]{\CHORD[##1]{Re}{##2}}%
+\renewcommand{\crdE}[2][]{\CHORD[##1]{Mi}{##2}}%
+\renewcommand{\crdF}[2][]{\CHORD[##1]{Fa}{##2}}%
+\renewcommand{\crdG}[2][]{\CHORD[##1]{Sol}{##2}}%
+%
+\renewcommand{\crdAm}[2][]{\CHORD[##1]{Lam}{##2}}%
+\renewcommand{\crdBm}[2][]{\CHORD[##1]{Sim}{##2}}%
+\renewcommand{\crdCm}[2][]{\CHORD[##1]{Dom}{##2}}%
+\renewcommand{\crdDm}[2][]{\CHORD[##1]{Rem}{##2}}%
+\renewcommand{\crdEm}[2][]{\CHORD[##1]{Mim}{##2}}%
+\renewcommand{\crdFm}[2][]{\CHORD[##1]{Fam}{##2}}%
+\renewcommand{\crdGm}[2][]{\CHORD[##1]{Solm}{##2}}%
+%
+\renewcommand{\crdAb}[2][]{\CHORD[##1]{La$\flat$}{##2}}%
+\renewcommand{\crdBb}[2][]{\CHORD[##1]{Si$\flat$}{##2}}%
+\renewcommand{\crdCb}[2][]{\CHORD[##1]{Do$\flat$}{##2}}%
+\renewcommand{\crdDb}[2][]{\CHORD[##1]{Re$\flat$}{##2}}%
+\renewcommand{\crdEb}[2][]{\CHORD[##1]{Mi$\flat$}{##2}}%
+\renewcommand{\crdFb}[2][]{\CHORD[##1]{Fa$\flat$}{##2}}%
+\renewcommand{\crdGb}[2][]{\CHORD[##1]{Sol$\flat$}{##2}}%
+%
+\renewcommand{\crdAbm}[2][]{\CHORD[##1]{La$\flat$m}{##2}}%
+\renewcommand{\crdBbm}[2][]{\CHORD[##1]{Si$\flat$m}{##2}}%
+\renewcommand{\crdCbm}[2][]{\CHORD[##1]{Do$\flat$m}{##2}}%
+\renewcommand{\crdDbm}[2][]{\CHORD[##1]{Re$\flat$m}{##2}}%
+\renewcommand{\crdEbm}[2][]{\CHORD[##1]{Mi$\flat$m}{##2}}%
+\renewcommand{\crdFbm}[2][]{\CHORD[##1]{Fa$\flat$m}{##2}}%
+\renewcommand{\crdGbm}[2][]{\CHORD[##1]{Sol$\flat$m}{##2}}%
+%
+\renewcommand{\crdAs}[2][]{\CHORD[##1]{La$\sharp$}{##2}}%
+\renewcommand{\crdBs}[2][]{\CHORD[##1]{Si$\sharp$}{##2}}%
+\renewcommand{\crdCs}[2][]{\CHORD[##1]{Do$\sharp$}{##2}}%
+\renewcommand{\crdDs}[2][]{\CHORD[##1]{Re$\sharp$}{##2}}%
+\renewcommand{\crdEs}[2][]{\CHORD[##1]{Mi$\sharp$}{##2}}%
+\renewcommand{\crdFs}[2][]{\CHORD[##1]{Fa$\sharp$}{##2}}%
+\renewcommand{\crdGs}[2][]{\CHORD[##1]{Sol$\sharp$}{##2}}%
+%
+\renewcommand{\crdAsm}[2][]{\CHORD[##1]{La$\sharp$m}{##2}}%
+\renewcommand{\crdBsm}[2][]{\CHORD[##1]{Si$\sharp$m}{##2}}%
+\renewcommand{\crdCsm}[2][]{\CHORD[##1]{Do$\sharp$m}{##2}}%
+\renewcommand{\crdDsm}[2][]{\CHORD[##1]{Re$\sharp$m}{##2}}%
+\renewcommand{\crdEsm}[2][]{\CHORD[##1]{Mi$\sharp$m}{##2}}%
+\renewcommand{\crdFsm}[2][]{\CHORD[##1]{Fa$\sharp$m}{##2}}%
+\renewcommand{\crdGsm}[2][]{\CHORD[##1]{Sol$\sharp$m}{##2}}%
+}
+
 \newcommand{\notranspose}{
 \let\A\crdA
 \let\B\crdB
@@ -808,5 +869,13 @@
 \normalize
 }
 
+\DeclareOption{chordsbelow}{
+\chordsbelow
+}
+
+\DeclareOption{neolatin}{
+\neolatin
+}
+
 \ExecuteOptions{notranspose}
 \ProcessOptions
\ No newline at end of file