|
@ -69,7 +69,7 @@ |
|
|
\iflyric |
|
|
\iflyric |
|
|
\tabsfalse % |
|
|
\tabsfalse % |
|
|
\lilypondfalse% |
|
|
\lilypondfalse% |
|
|
\nodiagramtrue% |
|
|
\diagramfalse% |
|
|
\picturesfalse% |
|
|
\picturesfalse% |
|
|
\renewcommand{\colbotglue}{0pt plus .5\textheight minus 0pt}% |
|
|
\renewcommand{\colbotglue}{0pt plus .5\textheight minus 0pt}% |
|
|
\fi |
|
|
\fi |
|
@ -180,16 +180,7 @@ |
|
|
\let\gtab@Original\gtab |
|
|
\let\gtab@Original\gtab |
|
|
\newcommand{\gtab@Hidden}[2]{}% |
|
|
\newcommand{\gtab@Hidden}[2]{}% |
|
|
|
|
|
|
|
|
\ifnodiagram% |
|
|
\ifdiagram% |
|
|
\renewcommand{\gtab}{\@ifstar |
|
|
|
|
|
\gtab@Hidden% |
|
|
|
|
|
\gtab@Hidden% |
|
|
|
|
|
} |
|
|
|
|
|
\renewcommand{\utab}{\@ifstar |
|
|
|
|
|
\utab@Hidden% |
|
|
|
|
|
\utab@Hidden% |
|
|
|
|
|
} |
|
|
|
|
|
\else% |
|
|
|
|
|
\ifimportantdiagramonly% |
|
|
\ifimportantdiagramonly% |
|
|
\renewcommand{\gtab}{\@ifstar |
|
|
\renewcommand{\gtab}{\@ifstar |
|
|
\gtab@Original% |
|
|
\gtab@Original% |
|
@ -209,6 +200,15 @@ |
|
|
\utab@Original% |
|
|
\utab@Original% |
|
|
} |
|
|
} |
|
|
\fi% |
|
|
\fi% |
|
|
|
|
|
\else% |
|
|
|
|
|
\renewcommand{\gtab}{\@ifstar |
|
|
|
|
|
\gtab@Hidden% |
|
|
|
|
|
\gtab@Hidden% |
|
|
|
|
|
} |
|
|
|
|
|
\renewcommand{\utab}{\@ifstar |
|
|
|
|
|
\utab@Hidden% |
|
|
|
|
|
\utab@Hidden% |
|
|
|
|
|
} |
|
|
\fi% |
|
|
\fi% |
|
|
|
|
|
|
|
|
\ifguitar% |
|
|
\ifguitar% |
|
@ -330,7 +330,8 @@ |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
\newenvironment{repeatedchords}{% |
|
|
\newenvironment{repeatedchords}{% |
|
|
\ifnorepeatchords% |
|
|
\ifrepeatchords% |
|
|
|
|
|
\else% |
|
|
\CB@chordshidden% |
|
|
\CB@chordshidden% |
|
|
\fi |
|
|
\fi |
|
|
}{}% |
|
|
}{}% |
|
@ -357,7 +358,7 @@ |
|
|
\fi% |
|
|
\fi% |
|
|
}% |
|
|
}% |
|
|
|
|
|
|
|
|
\iftab |
|
|
\iftabs |
|
|
\RequirePackage{tabs} |
|
|
\RequirePackage{tabs} |
|
|
\fi |
|
|
\fi |
|
|
|
|
|
|
|
|