--- a/dottes.tex	Thu Jul 18 15:27:57 2013 +0100
+++ b/dottes.tex	Thu Jul 18 15:37:23 2013 +0100
@@ -46,33 +46,33 @@
 \makeatother
 
 % Show the main tune graphic and optional change.
-% Args are tune title, tune subtitle, composer, tune graphic filename,
-% change title.
-\newcommand{\showtune}[5]{%
+% Args are tune name, tune title, tune subtitle, composer, tune graphic
+% filename, change name, change title.
+\newcommand{\showtune}[7]{%
   \vfill
   \begin{center}
   \phantomsection
   \begin{tabular*}{\textwidth}{@{} p{0.25\textwidth} @{\extracolsep{\fill}} c >{\raggedleft\arraybackslash}p{0.25\textwidth} @{}}
-   & \Large{#1} & \emph{#3} \\
-  \ifemptyarg{#2}{}{%
-   & #2 & \\
+   & \Large{#2} & \emph{#4} \\
+  \ifemptyarg{#3}{}{%
+   & #3 & \\
   }%
   \end{tabular*}
   \hypertarget{#1}{%
-    \includegraphics[width=\textwidth,height=0.85\textheight,keepaspectratio]{#4}
+    \includegraphics[width=\textwidth,height=0.85\textheight,keepaspectratio]{#5}
   }
-  \addcontentsline{toc}{section}{#1}
+  \addcontentsline{toc}{section}{#2}
   \end{center}
-  \ifemptyarg{#5}{}{%
-    Change: \hyperlink{#5}{#5}
+  \ifemptyarg{#6}{}{%
+    Change: \hyperlink{#6}{#7}
   }%
 }
 
 % Show the tune first line. Generate table row.
-% Args are the tune title and the first line graphic filename.
-\newcommand{\showfirstline}[2]{%
-  \hyperlink{#1}{#1} & %
-    \raisebox{-.4\height}{\includegraphics[width=0.77\textwidth]{#2}} \\
+% Args are the tune name, tune title and the first line graphic filename.
+\newcommand{\showfirstline}[3]{%
+  \hyperlink{#1}{#2} & %
+    \raisebox{-.4\height}{\includegraphics[width=0.77\textwidth]{#3}} \\
 }
 
 % ----- Paper size document setup