Mercurial > dottes

changeset 599:fceafdb462a8 build-default-242

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with ssh://hg.cryhavoc.org.uk/dottes
author Jim Hague <jim.hague@acm.org>
date Wed, 02 Nov 2016 18:36:54 +0000
parents 35be49cc4d8d (current diff) ed823ea54c83 (diff)
children 04fb44e2c9b7 507d853433ef
files
diffstat 6 files changed, 29 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Session/BearDance.abc	Wed Nov 02 16:04:45 2016 +0000
+++ b/Session/BearDance.abc	Wed Nov 02 18:36:54 2016 +0000
@@ -2,6 +2,12 @@
 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
--- a/abctemplate.py	Wed Nov 02 16:04:45 2016 +0000
+++ b/abctemplate.py	Wed Nov 02 18:36:54 2016 +0000
@@ -61,6 +61,7 @@
 
     vars = dict()
     vars["notesvisibility"] = "no"
+    vars["historyvisibility"] = "no"
 
     vars["name"] = fname
     vars["title"] = getFieldDisplayText(lines, fdir, "T", latex=args.latex)
@@ -70,6 +71,9 @@
     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("=")
--- a/dottes.html.tune	Wed Nov 02 16:04:45 2016 +0000
+++ b/dottes.html.tune	Wed Nov 02 18:36:54 2016 +0000
@@ -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">
--- a/dottes.tex	Wed Nov 02 16:04:45 2016 +0000
+++ b/dottes.tex	Wed Nov 02 18:36:54 2016 +0000
@@ -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
 }
 
--- a/dottes.tex.tune	Wed Nov 02 16:04:45 2016 +0000
+++ b/dottes.tex.tune	Wed Nov 02 18:36:54 2016 +0000
@@ -1,1 +1,1 @@
-\showtune{$name}{$title}{$subtitle}{$composer}{$graphicsdir/$name}{$notes}
+\showtune{$name}{$title}{$subtitle}{$composer}{$graphicsdir/$name}{$notes}{$history}
--- a/web/css/dottes.css	Wed Nov 02 16:04:45 2016 +0000
+++ b/web/css/dottes.css	Wed Nov 02 18:36:54 2016 +0000
@@ -240,7 +240,7 @@
 {
     display: inline;
     margin-left: 0;
-    margin-right: 10px;
+    margin-right: 5px;
 }
 
 div.dottes-tune-list
@@ -274,3 +274,13 @@
 div.dottes-notes-yes
 {
 }
+
+div.dottes-history-no
+{
+    display: none;
+}
+
+div.dottes-history-yes
+{
+    margin-top: 20px
+}