From 6e79f73b9d137c1ef7b4545c1fe636bc854fa2e2 Mon Sep 17 00:00:00 2001
From: Jim Hague <jim.hague@acm.org>
Date: Wed, 2 Nov 2016 18:36:31 +0000
Subject: [PATCH] Add Dottes History to notes. Currently appears after notes
 with a gap.

This is intended for longer exposition about a tune.
---
 Session/BearDance.abc |  6 ++++++
 abctemplate.py        |  4 ++++
 dottes.html.tune      |  3 +++
 dottes.tex            |  6 ++++--
 dottes.tex.tune       |  2 +-
 web/css/dottes.css    | 10 ++++++++++
 6 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/Session/BearDance.abc b/Session/BearDance.abc
index dd0160a..fbdf241 100644
--- a/Session/BearDance.abc
+++ b/Session/BearDance.abc
@@ -2,6 +2,12 @@ X:1
 T:Bear Dance
 R:polka
 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
 L:1/16
 Q:1/4=120
diff --git a/abctemplate.py b/abctemplate.py
index 9de32e1..6b9d6f9 100755
--- a/abctemplate.py
+++ b/abctemplate.py
@@ -61,6 +61,7 @@ if __name__ == "__main__":
 
     vars = dict()
     vars["notesvisibility"] = "no"
+    vars["historyvisibility"] = "no"
 
     vars["name"] = fname
     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)
     if vars["notes"]:
         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:
         keyval = val.partition("=")
diff --git a/dottes.html.tune b/dottes.html.tune
index 12b1bce..5d333af 100644
--- a/dottes.html.tune
+++ b/dottes.html.tune
@@ -46,6 +46,9 @@
         <div class="dottes-notes-${notesvisibility}">
           ${notes}
         </div>
+        <div class="dottes-history-${historyvisibility}">
+          ${history}
+        </div>
         <div class="dottes-tune-footer">
           <div class="dottes-tune-footer-row">
             <div class="dottes-tune-footer-left">
diff --git a/dottes.tex b/dottes.tex
index 9b812b0..0bbb0a9 100644
--- a/dottes.tex
+++ b/dottes.tex
@@ -47,8 +47,8 @@
 
 % Show the main tune graphic and optional change.
 % Args are tune name, tune title, tune subtitle, composer, tune graphic
-% filename, notes.
-\newcommand{\showtune}[6]{%
+% filename, notes, history.
+\newcommand{\showtune}[7]{%
   \phantomsection
   \begin{tabularx}{\textwidth}{LCR}
       \addcontentsline{toc}{section}{#2}
@@ -61,6 +61,8 @@
       }\tabularnewline
   \end{tabularx}
   #6
+
+  #7
   \vfill
 }
 
diff --git a/dottes.tex.tune b/dottes.tex.tune
index 19031c7..5a9dce2 100644
--- a/dottes.tex.tune
+++ b/dottes.tex.tune
@@ -1 +1 @@
-\showtune{$name}{$title}{$subtitle}{$composer}{$graphicsdir/$name}{$notes}
+\showtune{$name}{$title}{$subtitle}{$composer}{$graphicsdir/$name}{$notes}{$history}
diff --git a/web/css/dottes.css b/web/css/dottes.css
index c39fae4..61f045e 100644
--- a/web/css/dottes.css
+++ b/web/css/dottes.css
@@ -274,3 +274,13 @@ div.dottes-notes-no
 div.dottes-notes-yes
 {
 }
+
+div.dottes-history-no
+{
+    display: none;
+}
+
+div.dottes-history-yes
+{
+    margin-top: 20px
+}