|
@ -23,6 +23,8 @@ |
|
|
\RequirePackage{xstring} |
|
|
\RequirePackage{xstring} |
|
|
\RequirePackage{framed} |
|
|
\RequirePackage{framed} |
|
|
\RequirePackage{currfile} |
|
|
\RequirePackage{currfile} |
|
|
|
|
|
\RequirePackage{ifthen} |
|
|
|
|
|
\RequirePackage{tikz} |
|
|
|
|
|
|
|
|
\newif{\iftabs} |
|
|
\newif{\iftabs} |
|
|
\DeclareOption{tabs}{\tabstrue} |
|
|
\DeclareOption{tabs}{\tabstrue} |
|
@ -336,30 +338,55 @@ |
|
|
\fi |
|
|
\fi |
|
|
}{}% |
|
|
}{}% |
|
|
|
|
|
|
|
|
\newenvironment{bridge}{% |
|
|
|
|
|
|
|
|
% Use a new framed command for bridges |
|
|
|
|
|
\renewcommand{\FrameCommand}[1]{ |
|
|
|
|
|
\begin{tikzpicture} |
|
|
|
|
|
\node[rectangle] (rect) { |
|
|
|
|
|
\begin{minipage}{.8\textwidth} |
|
|
|
|
|
#1 |
|
|
|
|
|
\end{minipage} |
|
|
|
|
|
}; |
|
|
|
|
|
\draw[very thick, dashed] (rect.north west) -- (rect.south west); |
|
|
|
|
|
\end{tikzpicture} |
|
|
|
|
|
} |
|
|
|
|
|
\newenvironment{bridge} |
|
|
|
|
|
{% |
|
|
\begin{framed} |
|
|
\begin{framed} |
|
|
\vspace{-.4cm} |
|
|
\vspace{-.4cm} |
|
|
\begin{verse*} |
|
|
\begin{verse*} |
|
|
}{ |
|
|
} |
|
|
|
|
|
{% |
|
|
\end{verse*} |
|
|
\end{verse*} |
|
|
\vspace{-.2cm} |
|
|
\vspace{-.2cm} |
|
|
\end{framed} |
|
|
\end{framed} |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
\def\removefirstch@r#1{} |
|
|
\def\removefirstch@r#1{} |
|
|
\newcommand{\transposition}[1]{% |
|
|
\newcommand{\transposition}[1]{% |
|
|
\ifnorepeatchords% |
|
|
\ifrepeatchords% |
|
|
|
|
|
\transpose{#1} |
|
|
|
|
|
\else% |
|
|
\musicnote{% |
|
|
\musicnote{% |
|
|
\transpositionname~ |
|
|
\transpositionname~ |
|
|
\ifthenelse{#1>0}{#1$\Uparrow$}{\removefirstch@r#1$\Downarrow$}% |
|
|
\ifthenelse{#1>0}{#1$\Uparrow$}{\removefirstch@r#1$\Downarrow$}% |
|
|
}% |
|
|
}% |
|
|
\else% |
|
|
|
|
|
\transpose{#1} |
|
|
|
|
|
\fi% |
|
|
\fi% |
|
|
}% |
|
|
}% |
|
|
|
|
|
|
|
|
\iftabs |
|
|
\iftabs |
|
|
\RequirePackage{tabs} |
|
|
\RequirePackage{tabs} |
|
|
|
|
|
\else |
|
|
|
|
|
\RequirePackage{verbatim} |
|
|
|
|
|
\newenvironment{tab}{\comment}{\endcomment} |
|
|
\fi |
|
|
\fi |
|
|
|
|
|
|
|
|
|
|
|
\let\@textnoteold\textnote |
|
|
|
|
|
\renewcommand{\textnote}[2][]{% |
|
|
|
|
|
\vspace{.1cm} |
|
|
|
|
|
\IfStrEq{}{#1}{\@textnoteold{#2}}{ |
|
|
|
|
|
\iflanguage{#1}{\@textnoteold{#2}}{} |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
\endinput |
|
|
\endinput |