diff --git a/dottes.tex b/dottes.tex
index 2906dfc..7171206 100644
--- a/dottes.tex
+++ b/dottes.tex
@@ -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.
diff --git a/dottes.tex.firstline-tune b/dottes.tex.firstline-tune
index ffd0942..ac2902e 100644
--- a/dottes.tex.firstline-tune
+++ b/dottes.tex.firstline-tune
@@ -1 +1 @@
-\showfirstline{$name}{$title}{$graphicsdir/firstline-$name}
+\showfirstline{$name}{$fulltitle}{$graphicsdir/firstline-$name}
diff --git a/dottes.tex.tune b/dottes.tex.tune
index 8d161c7..ea1ac6e 100644
--- a/dottes.tex.tune
+++ b/dottes.tex.tune
@@ -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