Show parts at top left of tune.
This commit is contained in:
parent
d86c5c36ce
commit
703055e580
|
@ -24,6 +24,7 @@
|
|||
# * tradition. The Morris tradition the dance tune is from.
|
||||
# * composer. The tune composer.
|
||||
# * key. The tune key.
|
||||
# * parts. The tune parts order (A(AB2)3 etc.).
|
||||
# * changefile. The name of the 'change' file, if any.
|
||||
# * changename. The change file base name.
|
||||
# * changetitle. The change file tune title.
|
||||
|
@ -70,6 +71,7 @@ if __name__ == "__main__":
|
|||
vars["tradition"] = getFieldDisplayText(lines, fdir, "A", latex=args.latex)
|
||||
vars["composer"] = getFieldDisplayText(lines, fdir, "C", latex=args.latex)
|
||||
vars["key"] = getFieldDisplayText(lines, fdir, "K", latex=args.latex)
|
||||
vars["parts"] = getFieldDisplayText(lines, fdir, "P", latex=args.latex)
|
||||
vars["notes"] = getFieldDisplayText(lines, fdir, "N", starts="Dottes:", latex=args.latex)
|
||||
if vars["notes"]:
|
||||
vars["notesvisibility"] = "yes"
|
||||
|
|
|
@ -25,14 +25,17 @@
|
|||
<div class="dottes-tune-header-composer-column"></div>
|
||||
<div class="dottes-tune-header-row">
|
||||
<div class="dottes-tune-header-icons">
|
||||
<a class="dottes-tune-icon-link" href="learner-${name}.html">
|
||||
<img class="dottes-tune-header-image" src="../img/learner.png"
|
||||
alt="Learner">
|
||||
</a>
|
||||
<a class="dottes-tune-icon-link" href="index.html">
|
||||
<img class="dottes-tune-header-image" src="../img/book.png"
|
||||
alt="Tune index">
|
||||
</a>
|
||||
<p>
|
||||
<a class="dottes-tune-icon-link" href="learner-${name}.html">
|
||||
<img class="dottes-tune-header-image" src="../img/learner.png"
|
||||
alt="Learner">
|
||||
</a>
|
||||
<a class="dottes-tune-icon-link" href="index.html">
|
||||
<img class="dottes-tune-header-image" src="../img/book.png"
|
||||
alt="Tune index">
|
||||
</a>
|
||||
${parts}
|
||||
</p>
|
||||
</div>
|
||||
<div class="dottes-tune-header-title">
|
||||
<h1>${title}</h1>
|
||||
|
|
14
dottes.tex
14
dottes.tex
|
@ -45,13 +45,12 @@
|
|||
\makeatother
|
||||
|
||||
% Show the main tune graphic and optional change.
|
||||
% Args are tune name, tune title, tune subtitle, tradition, composer,
|
||||
% Args are tune name, tune title, tune subtitle, tradition, composer, parts,
|
||||
% tune graphic, filename, notes, history.
|
||||
\newcommand{\showtune}[8]{%
|
||||
\newcommand{\showtune}[9]{%
|
||||
\phantomsection
|
||||
\begin{tabularx}{\textwidth}{LCR}
|
||||
\addcontentsline{toc}{section}{#2}
|
||||
& \hypertarget{#1}{\Large{#2}} & \emph{#5} \tabularnewline
|
||||
#6 & \hypertarget{#1}{\Large{#2}} & \emph{#5} \tabularnewline
|
||||
\ifemptyarg{#3}{}{%
|
||||
& #3 & \tabularnewline
|
||||
}
|
||||
|
@ -59,12 +58,13 @@
|
|||
& \emph{#4} & \tabularnewline
|
||||
}
|
||||
\multicolumn{3}{c}{%
|
||||
\includegraphics[width=\textwidth,height=0.8\textheight,keepaspectratio]{#6}%
|
||||
\includegraphics[width=\textwidth,height=0.8\textheight,keepaspectratio]{#7}%
|
||||
}\tabularnewline
|
||||
\end{tabularx}
|
||||
#7
|
||||
|
||||
\addcontentsline{toc}{section}{#2}
|
||||
#8
|
||||
|
||||
#9
|
||||
\vfill
|
||||
}
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
\showtune{$name}{$title}{$subtitle}{$tradition}{$composer}{$graphicsdir/$name}{$notes}{$history}
|
||||
\showtune{$name}{$title}{$subtitle}{$tradition}{$composer}{$parts}{$graphicsdir/$name}{$notes}{$history}
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
partsbox true
|
||||
measurenb false
|
||||
scale 0.9
|
||||
titleformat T0 C1
|
||||
titleformat P-1 T0 C1
|
||||
% I don't want any info fields in the graphics. To turn off the
|
||||
% fields, give a blank infoname for that letter.
|
||||
infoname S
|
||||
|
|
|
@ -155,6 +155,12 @@ div.dottes-tune-header-row
|
|||
div.dottes-tune-header-icons
|
||||
{
|
||||
display: table-cell;
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
div.dottes-tune-header-icons p
|
||||
{
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
div.dottes-tune-header-title
|
||||
|
@ -289,6 +295,11 @@ a.dottes-tune-icon-link
|
|||
text-decoration: none;
|
||||
}
|
||||
|
||||
a.dottes-tune-icon-link img
|
||||
{
|
||||
vertical-align: middle;
|
||||
}
|
||||
|
||||
ul.tune-type-list
|
||||
{
|
||||
list-style-type: none;
|
||||
|
|
Loading…
Reference in New Issue