Commit Graph

50 Commits

Author SHA1 Message Date
Jim Hague c325095406 Switch to running abc2xml with python3. 2022-11-18 19:27:37 +00:00
Jim Hague b6a4389bca Sort LC_ALL=C to get Linux sort to order Beginners as expected.
Remove other unnecessary uses of sort. When generating intermediate
files, it doesn't matter in what order it happens.
2020-02-19 11:14:40 +00:00
Jim Hague 75b6499621 Add web links to the Bumper Booke. 2019-08-08 11:38:54 +01:00
Jim Hague 441c321487 Fix target generation for transposed booke web items. 2019-08-06 08:48:39 +01:00
Jim Hague aa97e0f688 Change web page layout.
Put tune contents under 'tunes/<name>' or 'tunes-<instrument>/<name>'.
That way they won't move if the tune gets moved between Bookes.

For now I have not attempted to redirect old URLs.
2019-08-05 23:25:28 +01:00
Jim Hague 51353e49b9 Correct Mac-ism. find -maxdepth n, not find -depth n. 2017-10-13 17:19:06 +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
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
Jim Hague 127c0380db Provide full titles for next and previous tunes in web pages. 2017-10-11 17:45:27 +01:00
Jim Hague dab61c6bbd Add previous and next tune links to website. 2017-10-10 15:01:22 +01:00
Jim Hague 1155d9d257 Enable a tune book to have a htaccess file, copied to .htaccess in web. 2016-11-21 21:57:15 +00:00
Jim Hague 262ee6c3e4 Replace sed substitution with Python templating for HTML and LaTeX output. 2016-11-02 00:21:18 +00:00
Jim Hague fbd277f6c9 More abcfield.py updates and mark it Python 3.
- Move title fixups into Python.
- Move key display name expansion into Python.
- Add Dottes-specific header continuation line format. None of the usual
  tools appears to support the official +: continuation.
2016-10-31 23:48:45 +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 fcc48a7a58 Revise abcfield.py to recognise continuation fields.
Also default to HTML entity output, and replace --contains with
--starts, which does the same thing but checks only the start of
the line and removes the matched item.
2016-10-29 19:32:53 +01:00
Jim Hague 14cc350ffb Correct web generation.
1. Subtitle and composer to be HTML not Latex.
2. Fix escaping of & in sed patterns.
2015-12-13 17:50:23 +00:00
Jim Hague eb38b7dd10 Fix last changed item on web pages for transposed instruments. 2014-06-30 10:01:51 +01:00
Jim Hague 8cd827a2ee Duh. Remove all the web graphics, why don't I? 2014-06-17 15:18:26 +01:00
Jim Hague 2f05dc6976 Ensure that web directory doesn't exist.
I had a problem in a build with one web directory being created as a file.
2014-06-17 14:13:28 +01:00
Jim Hague 30c34782b7 Add MusicXML conversion to tune pages.
Might help someone.
2014-06-17 09:11:38 +01:00
Jim Hague 2934a737ac Handle trailing ", The" in subtitles as well as titles. 2014-04-28 22:54:32 +01:00
Jim Hague 8e0c1feba1 Fix command error linking MP3s into transposed directory. 2013-09-02 12:34:58 +01:00
Jim Hague deba133b3b First go at adding the tune learner page. 2013-09-02 11:48:16 +01:00
Jim Hague 37474b20f1 Pigwidgeon doesn't have -r in ln. So do it another way. 2013-08-31 00:38:45 +01:00
Jim Hague c7a6b849fe Comment on soft link creation. Jenkins archive will dereference them.
Bloody IE8. I will think about whether to just dump player functions on
all non-HTML5.
2013-08-30 23:59:41 +01:00
Jim Hague cefbabf8e5 Ratchet up the IE8 attempt.
Thanks to http://www.yourwebskills.com/htmlobject.php.
2013-08-30 23:55:22 +01:00
Jim Hague 4499d9fe53 Don't mark SSI files executable.
We now archive to publish, and archiving loses the executable bit, so I've
had to enable SSI for all .html anyway.
2013-08-21 13:51:52 +01:00
Jim Hague 9b6c57d997 Automated merge with ssh://hg.cryhavoc.org.uk/dottes 2013-08-21 10:32:59 +01:00
Jim Hague 8766830f70 Use server-side includes (with Apache XBitHack setting) in web.
This means that we can have one main web page, dottes.html, for each
book and include the intro and tunelist to make the page. This removes
the separate header and footer components.

Perhaps we should use a template engine instead to generate the output.
That means choosing one. And preferably one that isn't aimed only at
HTML so we could use it for the printed books. More research required.
2013-08-21 10:32:50 +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 a1e4f86ed1 Add date of last change to bottom of web tune page. 2013-08-19 09:59:46 +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 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 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 e6b292e8f2 % added to buildno.txt needs to be removed for web. 2013-07-08 14:57:15 +01:00
Jim Hague 7f6c121630 Revert tracing change than slipped into the archive. 2013-04-02 09:47:20 +01:00
Jim Hague 6d365e8004 Amend Library into and subtitle into something that doesn't break scripts.
The scripts expect a single line of text, it seems.
2013-03-31 21:33:56 +01:00
Jim Hague 6c091c1470 Modify Change tune handling.
Change all change notes to reference the filename of the tune to change to.

Modify web and document generators to pull the change note out of the abc
and generate an appropiate bit of content. This is now, in both cases,
a hyperlink.

In the process, remove the tune-specific .tex facility. It wasn't being
used.

I could really do with a proper templating system, and using some sort
of templating in the LaTeX generation.
2013-02-23 13:10:58 +00:00
Jim Hague 36bd2926b5 Make transposed tunes use the original audio.
The aim of MIDI and MP3 is to allow the user to hear what a tune sounds
like. For transposed bookes, I think this should be reused from the main
booke page, because hearing it at the transposed pitch isn't a major help.

And in fact given the way cello transposition is done, the sound won't
be transposed anyway. And Jane hasn't complained.

This will speed up building the bookes by removing audio generation,
the slowest process, from the transposed bookes.
2013-02-22 01:09:37 +00:00
Jim Hague 3a567e0637 Fix up problems in Horn in F transposition.
1. Ensure makeWeb.sh gets its second parameter quoted, to allow for spaces in it.
2. Don't forget to copy the component text items into the horn dir.
3. Fix removing transposition tag from page title.
2013-02-20 13:45:58 +00:00
Jim Hague e705f35e5e When listing titles for web, straighten out ones of the form 'Something, The'.
Basically anything with a ', <first>' has than removed and the first prepended.
2013-02-18 22:37:46 +00:00
Jim Hague 8a94281be0 Handle '&' appearing in HTML output from tune titles.
It must be escaped or sed will substitute the pattern being searched for
at that point in the result.
2013-02-17 01:29:44 +00:00
Jim Hague 8ca95b24f9 Fix up typo from last commit of this file. 2013-02-17 00:39:59 +00:00
Jim Hague 533c08cb4f Finish first version of newly tarted up website. 2013-02-17 00:27:07 +00:00
Jim Hague 2f40bc5018 Change web to use PNG rather than JPG.
This makes the image files smaller and much sharper.
2013-02-10 18:27:29 +00:00
Jim Hague 77cd8ca396 Oops. Printables not moved to the right web place. 2013-01-26 18:35:02 +00:00
Jim Hague 4c8f2a3ade Make output larger where possible.
This is done by

a) reducing the page margins
b) compressing the heading and removing all but Notes: fields.

The latter produced vertically smaller tune PDFs that will scale wider.

In the process, modify abctitle.py to extract the first of any header field, and
move formatting for a single tune into a .fmt file.
2012-04-21 19:47:30 +01:00
Jim Hague 19e9f59ff2 Add basic diacritic handling for LaTeX and web.
It would be nice if everyone used UTF-8, but it doesn't look like that
works at present.
2012-03-15 14:32:53 +00:00
Jim Hague 6ce9367a9c Web. Add download links for book. 2012-03-04 13:07:50 +00:00
Jim Hague 2edd15e2d6 First go at producing a very simple website.
Templating done with sed, and minimal HTML.
2012-03-04 12:39:12 +00:00