comparison dottes.tex @ 340:8787d85fa641

Regularise use of repeats, tune (A/B/C etc.) markers and final bar. 1. Only show tune markers when a tune change is in the middle of a line. 2. Only show repeat starts |: if the repeat start is in the middle of a line. 3. Final bar end mark must be a thick line. The official rules for a repeat are that if there is no left repeat marker |: then the repeat starts at the previous double bar.
author Jim Hague <jim.hague@acm.org>
date Mon, 12 Aug 2013 18:40:44 +0100
parents 9f9df5c40d1b
children 357244e2939d
comparison
equal deleted inserted replaced
339:2ed268f98411 340:8787d85fa641
48 % Show the main tune graphic and optional change. 48 % Show the main tune graphic and optional change.
49 % Args are tune name, tune title, tune subtitle, composer, tune graphic 49 % Args are tune name, tune title, tune subtitle, composer, tune graphic
50 % filename, change name, change title, credit. 50 % filename, change name, change title, credit.
51 \newcommand{\showtune}[8]{% 51 \newcommand{\showtune}[8]{%
52 \phantomsection 52 \phantomsection
53 \vfill
54 \begin{tabularx}{\textwidth}{LCR} 53 \begin{tabularx}{\textwidth}{LCR}
55 \addcontentsline{toc}{section}{#2} 54 \addcontentsline{toc}{section}{#2}
56 & \hypertarget{#1}{\Large{#2}} & \emph{#4} \\ 55 & \hypertarget{#1}{\Large{#2}} & \emph{#4} \\
57 \ifemptyarg{#3}{}{% 56 \ifemptyarg{#3}{}{%
58 & #3 & \\ 57 & #3 & \\
63 \multicolumn{3}{p{\textwidth}}{% 62 \multicolumn{3}{p{\textwidth}}{%
64 \ifemptyarg{#8}{}{From {#8}. }% 63 \ifemptyarg{#8}{}{From {#8}. }%
65 \ifemptyarg{#6}{}{Change: \hyperlink{#6}{#7}.}% 64 \ifemptyarg{#6}{}{Change: \hyperlink{#6}{#7}.}%
66 }\tabularnewline 65 }\tabularnewline
67 \end{tabularx} 66 \end{tabularx}
67 \vfill
68 } 68 }
69 69
70 % Show the tune first line. Generate table row. 70 % Show the tune first line. Generate table row.
71 % Args are the tune name, tune title and the first line graphic filename. 71 % Args are the tune name, tune title and the first line graphic filename.
72 \newcommand{\showfirstline}[3]{% 72 \newcommand{\showfirstline}[3]{%