Mercurial > dottes

comparison dottes.tex @ 729:e338d757fdca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Jim Hague <jim.hague@acm.org>
date Wed, 11 Oct 2017 18:09:51 +0100
parents 7e9d5852c802
children 747cb0ac35df
comparison
equal deleted inserted replaced
728:9b562923ac71 729:e338d757fdca
43 \expandafter\@secondoftwo 43 \expandafter\@secondoftwo
44 \fi} 44 \fi}
45 \makeatother 45 \makeatother
46 46
47 % Show the main tune graphic and optional change. 47 % Show the main tune graphic and optional change.
48 % Args are tune name, tune title, tune subtitle, tradition, composer, parts, 48 % Args are:
49 % tune graphic, filename, notes, history. 49 % 1. Tune name
50 \newcommand{\showtune}[9]{% 50 % 2. Tune title
51 % 3. Tune subtitle
52 % 4. Tune full title
53 % 5. Tune tradition
54 % 6. Tune composer
55 % 7. Tune parts
56 % 8. Tune graphic filename
57 \newcommand{\showtune}[8]{%
51 \phantomsection 58 \phantomsection
52 \begin{tabularx}{\textwidth}{LCR} 59 \begin{tabularx}{\textwidth}{LCR}
53 #6 & \hypertarget{#1}{\Large{#2}} & \emph{#5} \tabularnewline 60 #7 & \hypertarget{#1}{\Large{#2}} & \emph{#6} \tabularnewline
54 \ifemptyarg{#3}{}{% 61 \ifemptyarg{#3}{}{%
55 & #3 & \tabularnewline 62 & #3 & \tabularnewline
56 } 63 }
57 \ifemptyarg{#4}{}{% 64 \ifemptyarg{#5}{}{%
58 & \emph{#4} & \tabularnewline 65 & \emph{#5} & \tabularnewline
59 } 66 }
60 \multicolumn{3}{c}{% 67 \multicolumn{3}{c}{%
61 \includegraphics[width=\textwidth,height=0.8\textheight,keepaspectratio]{#7}% 68 \includegraphics[width=\textwidth,height=0.8\textheight,keepaspectratio]{#8}%
62 }\tabularnewline 69 }\tabularnewline
63 \end{tabularx} 70 \end{tabularx}
64 \addcontentsline{toc}{section}{#2} 71 \addcontentsline{toc}{section}{#4}
65 #8
66
67 #9
68 \vfill
69 } 72 }
70 73
71 % Show the tune first line. Generate table row. 74 % Show the tune first line. Generate table row.
72 % Args are the tune name, tune title and the first line graphic filename. 75 % Args are the tune name, tune title and the first line graphic filename.
73 \newcommand{\showfirstline}[3]{% 76 \newcommand{\showfirstline}[3]{%