forked from CryHavoc/dottes
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:
parent
cd56cd0bc5
commit
5909c3486b
27
dottes.tex
27
dottes.tex
|
@ -45,27 +45,30 @@
|
||||||
\makeatother
|
\makeatother
|
||||||
|
|
||||||
% Show the main tune graphic and optional change.
|
% Show the main tune graphic and optional change.
|
||||||
% Args are tune name, tune title, tune subtitle, tradition, composer, parts,
|
% Args are:
|
||||||
% tune graphic, filename, notes, history.
|
% 1. Tune name
|
||||||
\newcommand{\showtune}[9]{%
|
% 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
|
\phantomsection
|
||||||
\begin{tabularx}{\textwidth}{LCR}
|
\begin{tabularx}{\textwidth}{LCR}
|
||||||
#6 & \hypertarget{#1}{\Large{#2}} & \emph{#5} \tabularnewline
|
#7 & \hypertarget{#1}{\Large{#2}} & \emph{#6} \tabularnewline
|
||||||
\ifemptyarg{#3}{}{%
|
\ifemptyarg{#3}{}{%
|
||||||
& #3 & \tabularnewline
|
& #3 & \tabularnewline
|
||||||
}
|
}
|
||||||
\ifemptyarg{#4}{}{%
|
\ifemptyarg{#5}{}{%
|
||||||
& \emph{#4} & \tabularnewline
|
& \emph{#5} & \tabularnewline
|
||||||
}
|
}
|
||||||
\multicolumn{3}{c}{%
|
\multicolumn{3}{c}{%
|
||||||
\includegraphics[width=\textwidth,height=0.8\textheight,keepaspectratio]{#7}%
|
\includegraphics[width=\textwidth,height=0.8\textheight,keepaspectratio]{#8}%
|
||||||
}\tabularnewline
|
}\tabularnewline
|
||||||
\end{tabularx}
|
\end{tabularx}
|
||||||
\addcontentsline{toc}{section}{#2}
|
\addcontentsline{toc}{section}{#4}
|
||||||
#8
|
|
||||||
|
|
||||||
#9
|
|
||||||
\vfill
|
|
||||||
}
|
}
|
||||||
|
|
||||||
% Show the tune first line. Generate table row.
|
% Show the tune first line. Generate table row.
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
\showfirstline{$name}{$title}{$graphicsdir/firstline-$name}
|
\showfirstline{$name}{$fulltitle}{$graphicsdir/firstline-$name}
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in New Issue