Use full title in printed version.

Since \newcommand takes a maximum of 9 params, move the notes, history
and closing \vfill for each tune from \showtune to the text generated
for each tune in dottes.tex.tune.
This commit is contained in:
Jim Hague 2017-10-11 18:09:51 +01:00
parent cd56cd0bc5
commit 5909c3486b
3 changed files with 21 additions and 14 deletions

View File

@ -45,27 +45,30 @@
\makeatother
% Show the main tune graphic and optional change.
% Args are tune name, tune title, tune subtitle, tradition, composer, parts,
% tune graphic, filename, notes, history.
\newcommand{\showtune}[9]{%
% Args are:
% 1. Tune name
% 2. Tune title
% 3. Tune subtitle
% 4. Tune full title
% 5. Tune tradition
% 6. Tune composer
% 7. Tune parts
% 8. Tune graphic filename
\newcommand{\showtune}[8]{%
\phantomsection
\begin{tabularx}{\textwidth}{LCR}
#6 & \hypertarget{#1}{\Large{#2}} & \emph{#5} \tabularnewline
#7 & \hypertarget{#1}{\Large{#2}} & \emph{#6} \tabularnewline
\ifemptyarg{#3}{}{%
& #3 & \tabularnewline
}
\ifemptyarg{#4}{}{%
& \emph{#4} & \tabularnewline
\ifemptyarg{#5}{}{%
& \emph{#5} & \tabularnewline
}
\multicolumn{3}{c}{%
\includegraphics[width=\textwidth,height=0.8\textheight,keepaspectratio]{#7}%
\includegraphics[width=\textwidth,height=0.8\textheight,keepaspectratio]{#8}%
}\tabularnewline
\end{tabularx}
\addcontentsline{toc}{section}{#2}
#8
#9
\vfill
\addcontentsline{toc}{section}{#4}
}
% Show the tune first line. Generate table row.

View File

@ -1 +1 @@
\showfirstline{$name}{$title}{$graphicsdir/firstline-$name}
\showfirstline{$name}{$fulltitle}{$graphicsdir/firstline-$name}

View File

@ -1 +1,5 @@
\showtune{$name}{$title}{$subtitle}{$tradition}{$composer}{$parts}{$graphicsdir/$name}{$notes}{$history}
\showtune{$name}{$title}{$subtitle}{$fulltitle}{$tradition}{$composer}{$parts}{$graphicsdir/$name}
$notes
$history
\vfill