Add Dottes History to notes. Currently appears after notes with a gap.

This is intended for longer exposition about a tune.
This commit is contained in:
Jim Hague 2016-11-02 18:36:31 +00:00
parent 7791a913d4
commit 6e79f73b9d
6 changed files with 28 additions and 3 deletions

View File

@ -2,6 +2,12 @@ X:1
T:Bear Dance T:Bear Dance
R:polka R:polka
S: Nick Barber S: Nick Barber
H:Dottes: A foot stomping pulse behind this Flemish polka and its inevitable
H:+ predecessor <Laride6.abc> typically marks the end, or somewhere
H:+ near the end, of a Havoc evening.
H:+
H:+ Unless we're feeling contrary, in which case it'll happen somewhere
H:+ near the start of a session.
M:2/4 M:2/4
L:1/16 L:1/16
Q:1/4=120 Q:1/4=120

View File

@ -61,6 +61,7 @@ if __name__ == "__main__":
vars = dict() vars = dict()
vars["notesvisibility"] = "no" vars["notesvisibility"] = "no"
vars["historyvisibility"] = "no"
vars["name"] = fname vars["name"] = fname
vars["title"] = getFieldDisplayText(lines, fdir, "T", latex=args.latex) vars["title"] = getFieldDisplayText(lines, fdir, "T", latex=args.latex)
@ -70,6 +71,9 @@ if __name__ == "__main__":
vars["notes"] = getFieldDisplayText(lines, fdir, "N", starts="Dottes:", latex=args.latex) vars["notes"] = getFieldDisplayText(lines, fdir, "N", starts="Dottes:", latex=args.latex)
if vars["notes"]: if vars["notes"]:
vars["notesvisibility"] = "yes" vars["notesvisibility"] = "yes"
vars["history"] = getFieldDisplayText(lines, fdir, "H", starts="Dottes:", latex=args.latex)
if vars["history"]:
vars["historyvisibility"] = "yes"
for val in args.values: for val in args.values:
keyval = val.partition("=") keyval = val.partition("=")

View File

@ -46,6 +46,9 @@
<div class="dottes-notes-${notesvisibility}"> <div class="dottes-notes-${notesvisibility}">
${notes} ${notes}
</div> </div>
<div class="dottes-history-${historyvisibility}">
${history}
</div>
<div class="dottes-tune-footer"> <div class="dottes-tune-footer">
<div class="dottes-tune-footer-row"> <div class="dottes-tune-footer-row">
<div class="dottes-tune-footer-left"> <div class="dottes-tune-footer-left">

View File

@ -47,8 +47,8 @@
% Show the main tune graphic and optional change. % Show the main tune graphic and optional change.
% Args are tune name, tune title, tune subtitle, composer, tune graphic % Args are tune name, tune title, tune subtitle, composer, tune graphic
% filename, notes. % filename, notes, history.
\newcommand{\showtune}[6]{% \newcommand{\showtune}[7]{%
\phantomsection \phantomsection
\begin{tabularx}{\textwidth}{LCR} \begin{tabularx}{\textwidth}{LCR}
\addcontentsline{toc}{section}{#2} \addcontentsline{toc}{section}{#2}
@ -61,6 +61,8 @@
}\tabularnewline }\tabularnewline
\end{tabularx} \end{tabularx}
#6 #6
#7
\vfill \vfill
} }

View File

@ -1 +1 @@
\showtune{$name}{$title}{$subtitle}{$composer}{$graphicsdir/$name}{$notes} \showtune{$name}{$title}{$subtitle}{$composer}{$graphicsdir/$name}{$notes}{$history}

View File

@ -274,3 +274,13 @@ div.dottes-notes-no
div.dottes-notes-yes div.dottes-notes-yes
{ {
} }
div.dottes-history-no
{
display: none;
}
div.dottes-history-yes
{
margin-top: 20px
}