Commit Graph

810 Commits

Author SHA1 Message Date
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 7befd21cf4 Change wording to say some tunes MAY have an identifiable author.
There's a chance that a book will have no tunes with an identifiable author.
2013-08-21 10:21:19 +01:00
Jenkins Build Manager 3654732c08 Added tag build-default-158 for changeset 6d4b2dab5fcc 2013-08-19 10:31:23 +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 a1e4f86ed1 Add date of last change to bottom of web tune page. 2013-08-19 09:59:46 +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
Jenkins Build Manager d70b122e4e Added tag build-default-157 for changeset c79382d6026b 2013-08-13 12:09:43 +01:00
Jenkins Build Manager 33fcc039bc Added tag build-default-156 for changeset 6bcafbfac674 2013-08-13 11:41:25 +01:00
Jim Hague 4362163e75 Now fix logic error in makeHornInF.sh.
And we get some playable tunes. We might be able to improve the transposition
further by taking the Cello approach of calculating the minimum distance outside
the comfortable range. One for the future.
2013-08-13 01:48:21 +01:00
Jim Hague 2509e70c1c Fix up syntax error in makeHornInF.sh. 2013-08-13 01:06:24 +01:00
Jim Hague 5dcb49f712 Try to be cleverer when transposing for cello.
Jane says: Am most comfortable between the bottom G (the bottom line of the bass clef) and top D (the note above middle C), but can play from bottom C upwards (the C string is a bit growly) and at a push can get as high as the A above middle C.

Implement the following rule:

1. If range is G to d', transpose down 2 octaves.
2. If lowest note is < C, transpose down 1 octave.
3. Otherwise calculate the distance above d for the highest note on a one
   octave transposition, and the distance below G on a two octave
   transposition. Find the smallest, and use the corresponding
   transposition.
2013-08-13 00:51:43 +01:00
Jim Hague db5e5dfe4c Correct arithmetic expression in makeHornInF.sh. 2013-08-13 00:50:02 +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 a8fb51402c Adjust A4 margins.
We were getting close to the bottom of the pages and leaving large gaps
of white in the middle. So bring the top and bottom margins in a bit.
2013-08-12 20:14:08 +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 960cc08a79 Revise A4 and A5 to have inside title page.
Decide to have an inside title page, with the copyright and stuff following
on the A4 verso, A5 top page.
2013-08-12 12:10:37 +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 a16ad7de0c Move cover page colour and blank coloured end page to doc-specific files.
That way output where the colour isn't appropriate, such as Nook or the newly introduced
A4Lulu output (which is the A4 book but with white cover page and no end coloured page, and so
suitable for using as the content on Lulu, where the cover is separate) can omit the colour.
2013-08-09 13:55:59 +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 cfc4e2d032 Oops. Move \vfill between tunes to before the tune.
Doesn't have the desired effect on A4 otherwise.
2013-08-05 18:09:46 +01:00
Jim Hague 7f459bab22 Add Nook-sized PDF output. 2013-08-05 18:06:19 +01:00
Jim Hague f74f9cc59c Put tune title, image and following content into a table.
Use tabularx to put tune title, image and any following content into
a table. This should (a) get the following content closer to the tune image,
and (b) stop LaTeX splitting them over a page.
2013-08-05 18:06:00 +01:00
Jim Hague 53b947e75a Reindent tune macro. 2013-08-05 13:42:36 +01:00
Jim Hague 76a29f9aa8 Make target of hyperlink the tune title.
A slight rearrangement of the tune macro.
2013-08-05 13:39:43 +01:00
Jim Hague c0a0fd45d9 Make emails \url{} to that they will wrap at the end of a line.
Also remove unused reference to graphics dir.
2013-08-05 13:30:08 +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 18e13bd98e Do publisher info page based on Dad's book. 2013-08-04 21:28:05 +01:00
Jim Hague 78d4c39dad Revise printed Booke.
Introduce vestigial copyright page and move instroduction before the contents,
so on A4 it appears on the verso to the content recto. Tunes then start double
page spread on the next page.

Add a \cleardoublepage before the index of first lines to force that to start on
a new double page. This minimises the page turning necessary to see all the index
lines.
2013-07-20 20:40:02 +01:00
Jim Hague cdf1efc900 Go back to using the filename as the hyperlink name.
Latex hyperlinks don't cope with having accented characters in the hyperlink name.
2013-07-18 15:37:23 +01:00
Jim Hague e26974292c Add abcrange.py to return the range of a tune, and use it in instrument transposition.
This lets us transpose on boundaries that aren't octave boundaries.
2013-07-18 15:27:57 +01:00
Jim Hague 0bea7c9b59 Generate different tune PDF for web site download.
For website download, generate a tune PDF with the tune title and composer.
Seems a bit silly to download a PDF giving an anonymouse tune.
2013-07-17 18:28:07 +01:00
Jim Hague eb85854d78 Fix up graphics overflow caused by change to Latex headers.
This reduces the height the graphics can use. Compensate by decreasing the page
margins by 0.25" all round.
2013-07-16 17:21:42 +01:00
Jim Hague d8357c8cec Render tune title, subtitle and composer in Latex/HTML and not in the image.
This way the titles remains a constant size even if the image needs to be scaled.
And we have that text appearance under our control.

I can't find a way of switching off the tune title in abcm2ps, and have worked around
by setting the title format to Y0. Y is not a defined ABC header and is not found in
any Dottes tune.
2013-07-16 16:35:07 +01:00
Jim Hague 470ad386fc Use PDFs as input sources for PNG generation.
The PDFs are cropped, so don't have a margin. Thus margins can be the concern of
CSS only.
2013-07-16 16:27:49 +01:00
Jim Hague 31a8cf479b Back out accidental change. 2013-07-16 16:26:41 +01:00
Jim Hague e6090d8ef4 Add --index parameter to allow selection of nth occurence of field. 2013-07-16 16:25:30 +01:00
Jim Hague 6f50649440 Revise first line table.
Treat the tune title as a paragraph (ragged right). Set the column widths to give
a wider and hence larger first line tune graphic.

Keep using the cropped first line graphic, and introduce our own gaps between lines
to keep the tune separations clear. I did look at using the grpahics borders, but that
gives left and right margins too.
2013-07-12 14:27:41 +01:00
Jim Hague 784a015b18 Make some bools 'false' not 0. 2013-07-12 14:25:18 +01:00
Jim Hague 8bd1c512c6 Use a abcm2pc format file to format the single lines. 2013-07-12 14:25:05 +01:00
Jim Hague 8554e9e664 Move tune and first line inclusion code into macros.
Also use tune title, not name, as hyperlink targets. This removes the need to pass
the name into the macros.
2013-07-12 11:36:14 +01:00
Jim Hague 7bf24bc921 Remove topskip0pt.
It was disturbing the vertical spacing of the first tune.
2013-07-11 17:52:11 +01:00
Jim Hague ff86d30789 Add openany parameter to book.
I want a chapter to start on any page, not just a recto page.
2013-07-11 17:51:51 +01:00