Commit Graph

254 Commits

Author SHA1 Message Date
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
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 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 573c14c04f Ensure A: lines are only used for Morris traditions. 2017-10-08 16:49:53 +01:00
Jim Hague 7a7d5a6acc Merge with upstream. 2017-09-24 23:12:36 +01:00
Jim Hague a38378712a Nerys next: L'Inconnu de Limoise.
No chords. Also fix up title field display to not put a space between
items if 'The' item isn't all alphanumeric. So , L' works.
2017-09-24 23:12:03 +01:00
Jim Hague 20e9f7bf44 Capitalise Vals in title... 2017-09-19 09:05:17 +01:00
Jim Hague 2477b37976 Two more from Nerys - Handlarens Vals and Maguire and Patterson.
Neither came with chords. I've not found and for Handlarens Vals,
and the ones I have found for M&P don't sound too terrific. But add
them now and see if anyone has any better ideas.
2017-09-18 22:30:16 +01:00
Jim Hague bc42887cdc Music notation tidy. |] in the middle of a tune -> ||. 2017-09-18 20:49:13 +01:00
Jim Hague dbd7048a94 Add start of repeat to B tune so that abc2midi does the B tune repeat. 2017-09-17 19:45:34 +01:00
Jim Hague 8aa4c5ec87 La Roulante -> Roulante, La.
So it sorts at Rou... not La...
2017-09-17 19:42:08 +01:00
Jim Hague fab846039f Merge with upstream. 2017-09-16 23:09:55 +01:00
Jim Hague a5da70eb61 Next from Nerys - La Roulante. 2017-09-16 23:09:15 +01:00
Jim Hague e562e421f4 Next from Nerys - Slangpolska number 32. 2017-09-16 22:56:10 +01:00
Jim Hague f5d84ee310 Fix up N: fields that weren't quite right. 2017-09-15 18:27:08 +01:00
Jim Hague b763e68a70 Bagpipers. Add chords for drone and note on drone. 2017-09-15 18:26:52 +01:00
Jim Hague 1214188868 Bagpipers, Sussex Cotillion and Mount Hills from Nerys.
I've added chords for the last two from a net site and Paul Hardy
respectively. Still looking for chords for Bagpipers.
2017-09-15 16:22:21 +01:00
Jim Hague 3d4ac0d557 Fix first attempt at redirect, and fix rename note. 2016-11-22 00:01:10 +00:00
Jim Hague 7d6a3e85ba Add acute accent to Laride. 2016-11-21 22:07:03 +00:00
Jim Hague 0a1c253561 Note the previous misnaming of Mazurka Auvergne. 2016-11-21 22:03:18 +00:00
Jim Hague 3cb576f8eb Correct name of Mazurka d'Auvergne. 2016-11-18 21:00:31 +00:00
Jim Hague 6e79f73b9d Add Dottes History to notes. Currently appears after notes with a gap.
This is intended for longer exposition about a tune.
2016-11-02 18:36:31 +00:00
Jim Hague c5ecfbb689 Convert tunes to use notes for credit and change. 2016-11-02 15:14:12 +00:00
Jim Hague 3d8f52e639 Either abc2midi or abc2xml complains if N: or Z: is the last header. 2016-10-31 23:45:00 +00:00
Jim Hague 07e6191f9c Switch from txt2tags to using pandoc with Markdown (Pandoc flavour) input. 2016-10-29 21:51:59 +01:00
Jim Hague 3992a3a1f2 Rats. Black Nag isn't Sue's tune. 2014-11-27 23:15:03 +00:00
Jim Hague b2b50f5c9c Added The Black Nag. 2014-11-25 07:21:21 +00:00
Jim Hague 976ffe9fe1 Fix up some titles starting 'The'.
The Booke standard is that all should end ", The".

Fix tune page generator to do this on subtitles too.
2014-08-14 14:32:06 +01:00
Jim Hague 59724808cb abc2xml doesn't like Q:n/d where n<>1. 2014-06-17 14:10:18 +01:00
Jim Hague 9e01f4dcd3 In ABC proper, ties should be after the first note, not before the second.
abcm2ps copes, abc2xml throws a bad parse.
2014-06-17 14:09:03 +01:00
Jim Hague 27325d726c Squash The Twister into 3 lines.
Currently The Twister takes up enough of an A4 page to admit no other tune
onto that page. Follow the layout of Horse's Brawl and squash it into
3 lines.
2014-03-21 23:22:17 +00:00
Jim Hague 5f1cfe3b4e Tidy up Bonny Kate.
Make the ending of the B tune more like the Spiers & Boden version.

Redo formatting to match rest of booke.
2014-03-14 22:44:56 +00:00
Jim Hague 02760d4973 Add B tune repeat in Orange in Bloom. 2014-02-21 18:48:16 +00:00
Jim Hague 6c3bfc0ffb Automated merge with ssh://hg.cryhavoc.org.uk/dottes 2014-02-14 22:39:36 +00:00
Jim Hague e65a8d8023 Add Ed's new tune, The Twister.
Commerating tiles and the Iffley Road mini-tornado.
2014-02-14 22:38:49 +00:00
Jim Hague d22930b6e6 Looks like we prefer the other order of A/B tune.
This is how Dave Townsend has it. Nick Barber is, as ever, wrong.
2013-12-02 20:50:57 +00:00
Jim Hague 575812fa51 Fix up origin and area in Louth Quickstep. 2013-11-03 20:46:51 +00:00
Jim Hague 70acb5728b Correct run in Captain Lanoe.
All the dots I can find for this - and my ears - suggest that the second/fifth
bars go gfed not gfdd.
2013-10-14 21:41:28 +01:00
Jim Hague e1e03394e7 Change to tunes for the major to the relative minor.
I think these are minor, not major.
2013-10-09 17:37:50 +01:00
Jim Hague f71ab0bfdd Automated merge with ssh://hg.cryhavoc.org.uk/dottes 2013-09-11 22:30:38 +01:00
Jim Hague 73af79806c abc2midi messes up with repeats in sections after a [1..[2 |]
Jane found out that abc2midi output goes rather random sometimes. I've narrowed
this down to sections of music after a [1..[2 |] repeat has happened.

Work around by adding explicit |: for those sections, which doesn't (to my
mind) look so good printed but gets correct behaviour from abc2midi.
2013-09-11 22:30:10 +01:00
Jim Hague f7555a1866 Replace slur on same note with a tie.
A slur on the same note and a tie look the same. It makes a difference to
abc2midi, though.
2013-09-11 21:59:43 +01:00
Jim Hague 7d17c8e7de Add start of repeat at B tune back in Emma.
abc2midi screws up otherwise.

Also extend last bar to 3 beats.
2013-09-09 21:34:16 +01:00
Jim Hague a2b3310883 Fix last bar of A and B tunes in Mazurka d'Avignon.
It's in 3/4 stupid. Why have last bar last for 4?
2013-09-09 21:16:37 +01:00
Jim Hague 88a0543ff1 Remove 2 quaver intro Havoc don't play.
And expand last note in A tune to a minim. This make the bar counts correct, too.
2013-09-09 21:15:50 +01:00
Jim Hague b3ac36564f Improve the writing of the Session blurb. 2013-09-01 20:35:46 +01:00
Jim Hague 9b6c57d997 Automated merge with ssh://hg.cryhavoc.org.uk/dottes 2013-08-21 10:32:59 +01:00
Jim Hague ed0ef9ce66 Use txt2tags to format intro text.
That way we can include basic markup in the into text and use it in
both LaTeX and HTML.

Take advantage of this to expand the wording of the intro text in all
books.
2013-08-21 10:28:10 +01:00
Jim Hague 7220eeea94 Corrections from Mick.
1. Add missing two last notes in final bar of B tune.
2. Move 'no chord' marker to start of 2nd repeat in A tune.
3. Mark middle B in last line of Horse's Brawl as Bb.
4. Last note of 4th bar of King of the Fairies should be quaver.
5. 4th bar of B tune should be same as 4th bar of A tune in Plane Tree.
6. Railway has change to Fiery Clock Face.
2013-08-19 10:09:02 +01:00
Jim Hague 01a656aaba Reduce speed a tad on Winster Gallop.
It did sound a bit frantic.
2013-08-19 09:59:28 +01:00
Jim Hague 3fae31f75f Move Canal En Octobre into 4 lines.
Last line looks a bit squashed.
2013-08-12 20:24:33 +01:00
Jim Hague db46099ba1 Reformat Green Mountain Petronella.
There's no need to have it squished into 3 lines now.
2013-08-12 20:11:06 +01:00
Jim Hague 189e42f203 Remove parts repeat spec from Gathering Peasecods.
The parts aren't marked, as per rules, and music didn't repeat on first
line.

Also extend value of first repeat first time to fill bar.
2013-08-12 19:27:01 +01:00
Jim Hague 5f5a6e0515 Add tune markers to Green Mountain Petronella.
The tune changes in the middle of a line.
2013-08-12 19:19:47 +01:00
Jim Hague 721513bfd3 Reformat Captain Rock slightly. 2013-08-12 18:58:05 +01:00
Jim Hague 02b1f8360a Remove start repeat sign superfluous under rules. 2013-08-12 18:57:33 +01:00
Jim Hague 8435d10927 Regularise use of repeats, tune (A/B/C etc.) markers and final bar.
1. Only show tune markers when a tune change is in the middle of a line.
2. Only show repeat starts |: if the repeat start is in the middle of a line.
3. Final bar end mark must be a thick line.

The official rules for a repeat are that if there is no left repeat
marker |: then the repeat starts at the previous double bar.
2013-08-12 18:40:44 +01:00
Jim Hague f1d031d358 Change licence to by-nc-sa on Buttered Peas. 2013-08-12 18:29:53 +01:00
Jim Hague 651676d765 Rufty Tufty - Inject some repeats and so reduce to one line per A/B/C tune. 2013-08-12 17:53:44 +01:00
Jim Hague e1d1417a1f Automated merge with ssh://hg.cryhavoc.org.uk/dottes 2013-08-12 11:53:32 +01:00
Jim Hague d65f0d3056 Caddam Wood and Si Beag relegated to Library. 2013-08-12 11:53:20 +01:00
Jim Hague ff01539526 Transcribe Susie's Buttered Peas.
It's different to the others I've found.
2013-08-09 10:59:03 +01:00
Jim Hague 6427153e8e Add --contains flag to abcfield.py.
Currently we rely on any N: field with a Change: subnotice being the first
N: field. Add --contains field to abcfield.py to remove this restriction.

Also use it to extract new subfield Credit: and add that if present
to the tune information in print and on web.
2013-08-04 22:09:25 +01:00
Jim Hague 5039ce0be5 Regularise session tune title capitalisation. 2013-07-07 20:26:41 +01:00
Jim Hague 6d405fb24d Relegate Polska Fran Lovstabruk to the Library.
I don't recognise it at all.

Ironically, it required all the work on special character handling
which no other tune now uses. Ah well. It's there for the future.
2013-07-05 22:23:48 +01:00
Jim Hague bb0bbfdf89 Add timing for Davy Davy Knick Knack. 2013-07-05 22:22:18 +01:00
Jim Hague b6b99eba55 Add timing to Bear Dance. 2013-07-05 22:15:07 +01:00
Jim Hague 642ee1c623 I think Paul Hardy's Buttered Peas is closer to what Susie plays. 2013-07-05 20:49:49 +01:00
Jim Hague 91df562d8f Remove composer Trad. 2013-07-05 20:49:09 +01:00
Jim Hague 6317f70028 Move Moll In The Wad and Mrs Casey to the Library. 2013-07-05 20:22:28 +01:00
Jim Hague 17af768037 Add timing to Fiery Clock Face. 2013-07-05 20:21:03 +01:00
Jim Hague fd50bf44e7 Add timing to Caddam Wood. 2013-07-05 20:19:53 +01:00
Jim Hague 338fccaf76 Add timing to Captain Lanoe. 2013-07-05 20:18:46 +01:00
Jim Hague bdbd488412 Add timing to a load of tunes. 2013-07-05 20:17:04 +01:00
Jim Hague 7bfb6c7115 Demote Staffordshire Hornpipe and Sonny Brogan's Mazurka to the Library. 2013-07-05 20:16:46 +01:00
Jim Hague 9bb81cdea9 Add timing and chords to Springvals. 2013-07-05 20:10:14 +01:00
Jim Hague 359c0d4ad8 Add timing and chords to Sherrifs Ride. 2013-07-05 19:46:38 +01:00
Jim Hague d351f4bee2 I had the wrong Orange In Bloom.
Replace with Paul Hardy's version.
2013-07-05 19:29:21 +01:00
Jim Hague 109c7653bc Add timing and guitar chords to Mazurka De Lapleau. 2013-07-05 19:21:20 +01:00
Jim Hague 41d582cbba When I listen to Three Around Three in a session, it sounds slightly simpler. 2013-07-05 19:00:28 +01:00
Jim Hague 31d21e9b7d Remove all composers who are 'Trad.' or 'Anon.'.
From now on, only put real people in the composer field.
2013-07-03 22:14:09 +01:00
Jim Hague e497ed0eba Revise some details of the tune and all the chords in From Night Till Morn. 2013-07-03 22:10:47 +01:00
Jim Hague afc072b8ec Standardise O: field on country or area name, not adjective. 2013-07-03 21:08:10 +01:00
Jim Hague 4d54db85fe Correct spelling of Schottische.
Also, since chords have been changed, remove Nick Barber attribution.
2013-07-03 21:05:46 +01:00
Jim Hague a2ccb1a8b8 Amend composer to 'arr.'. I didn't understand 'efter'. 2013-07-03 21:02:38 +01:00
Jim Hague 294a6cd3bd Add A/B tune markers, timing and rhythm to Captain Rock. 2013-07-01 21:19:33 +01:00
Jim Hague 5515f1d47f Add A/B tune markers and timing to Elizabeth Clare. 2013-07-01 21:10:37 +01:00
Jim Hague 9128ad87ca Add speed, A/B tune marking and guitar chords. 2013-07-01 21:06:48 +01:00
Jim Hague 8b4f2c8568 Add speed and A/B part marks and correct final bar. 2013-07-01 20:58:24 +01:00
Jim Hague b06b804e39 Add A/B tune markers. 2013-07-01 20:57:57 +01:00
Jim Hague ae2b60e3af Add timing, auto-chords to A La Mode de France. 2013-07-01 20:50:07 +01:00
Jim Hague 6c216a49d3 We have to shink some tunes anyway. So revert squasjing of Rufty Tufty.
I's easier to read the original way.
2013-06-21 22:28:21 +01:00
Jim Hague f3a159b378 Moerge first 3 lines into two to reduce height of Rufty Tufty. 2013-06-21 19:38:39 +01:00
Jim Hague 4860a6c98d Added Wals voor Polle.
Note comment with YouTube link. See the musician for whom it was written
play it.
2013-06-21 10:59:10 +01:00
Jim Hague ee7639118d Bring Michael Turner's Waltz into line with a recording made at a session.
Also add a licence. Creative Commons allow mods on sharing, allow
commercial use.
2013-06-21 10:09:50 +01:00
Jim Hague 62c7af9922 Redo the printed Booke title page.
Put a big title in English Towne, the official Havoc font.
Add a title for each volume, and also print the subtitle on the cover.

Add the buzzard, too. On A5, we now need to split the title page across two
physical pages. This looks OK to me.
2013-06-14 23:19:25 +01:00
Jim Hague 61da09b7ab The version of Michael Turners from Nick Barber isn't what we actually play.
Digging around, I find that the tune is actually due to no less than
Mozart. Replace Nick Barber with what Mozart wrote. I'm not sure it's
still exactly what Havoc play, but I think it's closer.
2013-06-14 09:22:06 +01:00
Jim Hague 1b90e6959d Correct spelling in filename of Gathering Peascods, and fix up change link.
I forgot the scripts now expect the .abc filename in the change note.
2013-06-12 10:11:44 +01:00
Jim Hague 7bdb641a6d Automated merge with ssh://hg.cryhavoc.org.uk/dottes 2013-06-10 21:59:00 +01:00
Jim Hague dd79b320f5 Emma is usually know to Havoc as 'Emma from Finland'. 2013-06-10 21:58:40 +01:00