Commit Graph

802 Commits

Author SHA1 Message Date
Jim Hague 01124b3d00 Merge with upstream. 2017-10-13 16:17:56 +01:00
Jim Hague 260fbc3ac3 Compact versions of Session tunes. 2017-10-13 16:14:05 +01:00
Jim Hague 06f4e5ea57 Revise transposition scripts to make Compact. 2017-10-13 15:56:23 +01:00
Jim Hague a5b76de484 Introduce mechanism for having different tune images for compact printed output.
Sort alternate .abc in subdir 'Compact' under the booke dir. Use that as
the graphic for A5 output, assuming it will be vertically more compact.
Use Bear Dance as an example, as it has commentary that currently
overflows an A5 landscape page.

For the moment, transposed Bookes don't transpose and so don't use Compact.
2017-10-13 15:44:15 +01:00
Jenkins Build Manager 55294c9d82 Added tag build-default-286 for changeset 34c7947b4542 2017-10-13 12:26:58 +01:00
Jim Hague 7915144930 Correction from Nerys to first bar of C tune in Laudaunum Bunches. 2017-10-13 10:50:18 +01:00
Jim Hague 497e2200da Add chords to New Road to Alston, based on those for Davy Davy Nick Nack. 2017-10-13 10:38:43 +01:00
Jenkins Build Manager 6ec02760bf Added tag build-default-285 for changeset 5c1a240cc0fc 2017-10-12 19:12:32 +01:00
Jim Hague 1ee74be6dc Promote Seven Stars, Enrico and Sue's French Tune to the main Session booke. 2017-10-12 17:55:19 +01:00
Jim Hague 1792a4cd80 Reflow La Mourisque onto 4 lines. 2017-10-12 17:54:37 +01:00
Jim Hague 07b37c3f07 Reflow Astley's Ride onto 4 lines. 2017-10-12 17:51:31 +01:00
Jim Hague f26ac4f8dd Remove hopefully unnecessary !: from Library tunes. 2017-10-12 17:49:11 +01:00
Jenkins Build Manager 09f6b8cbf6 Added tag build-default-284 for changeset 69a7499817c8 2017-10-12 16:05:54 +01:00
Jim Hague 3e66659618 On Nook and A5 prints, start a new page with each tune and centre vertically..
A5 mostly did, but ran into trouble with longer comments on a tune.
This may give blank space after tunes where a long comment overflows
onto another page, but I think for now it's better to have each tune
at the top of the page.

Or rather, and this is the other change, in the middle of the page. Centre
the page content for A5 and Nook.
2017-10-12 14:50:51 +01:00
Jim Hague afd6fd83b6 Reduce base font size on Nook to 10pt.
I think this is a better fit to the page size.
2017-10-12 14:48:26 +01:00
Jim Hague b2505f3801 Remove bowing marks from King of the Fairies.
Nothing else has 'em, and they do complicate things for non-fiddle persons.
2017-10-12 13:48:09 +01:00
Jim Hague 52e3d1cde8 Revise Markdown handling of character entities.
Ideally I'd like the ABC character entities to survive Markdown and then
get converted. But because they start with '\', they don't. So I have
no alternative but to convert them to HTML entities, which Markdown then
converts to UTF-8.
2017-10-12 13:32:24 +01:00
Jim Hague f267b21c21 Remove vestiges of support for stdin input to abcfield.py.
I'm not using it, and it complicates things a bit.
2017-10-12 13:29:50 +01:00
Jim Hague 5622d5d239 Convert abcfield.py from OptionParser to ArgumentParser.
abctemplate.py uses ArgumentParser, so this reduced dependencies.
2017-10-12 11:59:28 +01:00
Jim Hague fd98182250 Move prev/next field reading into abctemplate.py.
Fishing all that stuff out in makeWeb.sh was a bit ugly.
2017-10-12 11:21:48 +01:00
Jenkins Build Manager 5d49c010e1 Added tag build-default-283 for changeset 83bffde974c0 2017-10-11 23:14:30 +01:00
Jenkins Build Manager 9c3e711c86 Added tag build-default-282 for changeset 833e6185b6a2 2017-10-11 18:24:29 +01:00
Jim Hague 5909c3486b 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.
2017-10-11 18:09:51 +01:00
Jim Hague cd56cd0bc5 Fix full title text in markdown - getFullTitle() needs a list of lines. 2017-10-11 18:05:32 +01:00
Jim Hague 127c0380db Provide full titles for next and previous tunes in web pages. 2017-10-11 17:45:27 +01:00
Jim Hague 9e27b13c6b Add fulltitle to template fields.
fulltitle is title + [(" subtitle ")"] if subtitle is present.

To do: extend full title to next and prev. this means exposing it
in abcfield.py.
2017-10-11 17:09:31 +01:00
Jim Hague 0f2b90c40d Provide quoting for single and double quotes.
Stop them mucking up HTML quoting by substituting with entities.
2017-10-11 17:03:29 +01:00
Jim Hague d2b405b2a3 Move book and learner tune link to centre of bottom row, and add popup text.
The parts display is not uncomplicated by the images, and they have
explanations - at least some users I've spoken to did not understand
what they do.
2017-10-11 16:18:13 +01:00
Jenkins Build Manager 5c3fae0231 Added tag build-default-281 for changeset f8ab14cc9d8d 2017-10-10 16:18:39 +01:00
Jim Hague dab61c6bbd Add previous and next tune links to website. 2017-10-10 15:01:22 +01:00
Jenkins Build Manager 0f1646cb90 Added tag build-default-280 for changeset da565d2aa309 2017-10-09 19:07:36 +01:00
Jim Hague 7de3397744 More initial tempi. 2017-10-09 17:57:36 +01:00
Jim Hague 22e327b4ab Set first guess tempi for Morris. 2017-10-09 17:55:00 +01:00
Jim Hague 3befbfba06 Automated merge with ssh://hg.cryhavoc.org.uk/dottes 2017-10-09 17:30:56 +01:00
Jim Hague 38b27fd3dc Try to regularise the outline Parts header. 2017-10-09 17:30:48 +01:00
Jim Hague 02b29f13f3 Add subtitle if present in tune links. 2017-10-09 17:30:31 +01:00
Jim Hague 98f0d36349 Morris tunes - name of dance as title, name of tune subtitle. 2017-10-09 16:38:38 +01:00
Jenkins Build Manager e83ad3e0e3 Added tag build-default-279 for changeset 826dd24e5eee 2017-10-08 21:37:57 +01:00
Jim Hague 9e659b02f5 Automated merge with ssh://hg.cryhavoc.org.uk/dottes 2017-10-08 20:34:53 +01:00
Jim Hague 703055e580 Show parts at top left of tune. 2017-10-08 20:34:49 +01:00
Jim Hague d86c5c36ce Add parts info to Skirmish. 2017-10-08 20:34:23 +01:00
Jim Hague eb48e68b47 Handle slows as per Banks of the Dee. 2017-10-08 20:34:07 +01:00
Jenkins Build Manager 13aa89fece Added tag build-default-278 for changeset 7da70e8900ab 2017-10-08 18:09:03 +01:00
Jim Hague 193d7fde2f First attempt at adding Tradition below subtitle in web and print. 2017-10-08 17:06:09 +01:00
Jim Hague 573c14c04f Ensure A: lines are only used for Morris traditions. 2017-10-08 16:49:53 +01:00
Jim Hague 524022903d Add pickup and correct tempo line in Bonny Green. 2017-10-08 16:48:10 +01:00
Jim Hague f5a5895507 Adjust tradition (A:) info, and add comment on Old Tom of Oxford. 2017-10-08 16:26:52 +01:00
Jim Hague 80be36e115 A batch of Headington tunes from Nerys. 2017-10-08 16:21:37 +01:00
Jenkins Build Manager dd32ce2a8d Added tag build-default-277 for changeset 083d8fd4a7c3 2017-09-25 00:13:47 +01:00
Jim Hague 7a7d5a6acc Merge with upstream. 2017-09-24 23:12:36 +01:00