simon-git: gonville (master): Simon Tatham

Sat Mar 14 18:42:58 GMT 2020

TL;DR:
  e730bf3 Add a missing Python import.
  d8ae284 Buildscr: replace -DNOBRACE with -DFASTBRACE.
  620018f Rework the output font directories.
  6e549e6 Replace lilysetup with a Lilypond 2.20 'stylesheet'.
  541da6a Rewrite README for the modern world.

Repository:     https://git.tartarus.org/simon/gonville.git
On the web:     https://git.tartarus.org/?p=simon/gonville.git
Branch updated: master
Committer:      Simon Tatham <anakin at pobox.com>
Date:           2020-03-14 18:42:58

commit e730bf31d710e6e1cf3de73b09fd085683ad36e4
web diff https://git.tartarus.org/?p=simon/gonville.git;a=commitdiff;h=e730bf31d710e6e1cf3de73b09fd085683ad36e4;hp=732ddb773ad2b6494569c1eea08244c251c7e5e2
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Mar 14 14:39:47 2020 +0000

    Add a missing Python import.

    This was breaking the build of the braces font, which is what I get
    for having introduced a faster build mode for use in development that
    leaves it out! Perhaps I should have arranged that it still built a
    _few_ braces, just not most of them.

 glyphs.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit d8ae284107def2956513c60d76e5982d842a1efa
web diff https://git.tartarus.org/?p=simon/gonville.git;a=commitdiff;h=d8ae284107def2956513c60d76e5982d842a1efa;hp=e730bf31d710e6e1cf3de73b09fd085683ad36e4
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Mar 14 18:04:30 2020 +0000

    Buildscr: replace -DNOBRACE with -DFASTBRACE.

    This will stop me from making the same mistake again that I just fixed
    in the previous commit: now we _do_ build the brace font in the faster
    dev build cycle, we just don't put 576 different sizes of brace in it
    any more. So if I do anything that makes the brace-font build actually
    fail, I'll notice in early development.

 Buildscr  | 2 +-
 glyphs.py | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

commit 620018f9637745a4fc03b11678af504bce03291c
web diff https://git.tartarus.org/?p=simon/gonville.git;a=commitdiff;h=620018f9637745a4fc03b11678af504bce03291c;hp=d8ae284107def2956513c60d76e5982d842a1efa
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Mar 14 17:08:36 2020 +0000

    Rework the output font directories.

    Now that a stable Lilypond release (2.20) is out with a proper font-
    switching mechanism, users no longer need to overwrite the previous
    font in their Lilypond data dir, or switch the whole directory out for
    a new one.

    This commit changes the behaviour of glyphs.py --lily so that it
    generates two different output directories, for different installation
    methods.

    'lilyfonts' is for new Lilypond: it's designed to be overlaid on top
    of the Lilypond data dir, so that the font files in its 'otf' and
    'svg' subdirs drop into the corresponding subdirs of
    /usr/share/lilypond/2.20/fonts (or wherever). Then you can typeset a
    score in Gonville by selecting it using the set-global-fonts system.

    'lilyfonts-old' is for old Lilypond. That one is designed to _replace_
    the fonts subdirectory of the Lilypond data dir, and it provides all
    the Gonville font files under the same names that Lilypond 2.18 was
    going to look for its standard font.

 .gitignore |   6 +--
 glyphs.py  | 165 ++++++++++++++++++++++---------------------------------------
 2 files changed, 60 insertions(+), 111 deletions(-)

commit 6e549e6f44550214acce52c475db26f5ffad9752
web diff https://git.tartarus.org/?p=simon/gonville.git;a=commitdiff;h=6e549e6f44550214acce52c475db26f5ffad9752;hp=620018f9637745a4fc03b11678af504bce03291c
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Mar 14 17:13:52 2020 +0000

    Replace lilysetup with a Lilypond 2.20 'stylesheet'.

    For Lilypond 2.20, I'm going to start recommending that people
    actually use the new font-switching system. That's configured in the
    Lilypond input file, so you can make your own scores come out in
    Gonville by writing an appropriate font definition statement in your
    .ly files.

    But what about separating style from content? If I want to pass a
    score file on to other people, I might not want to force them all to
    install Gonville. Conversely, if I _get_ a score from other people,
    I'd rather be able to typeset it in my own choice of font without
    having to edit the input file (especially if I'm keeping it up to date
    via source control).

    So it's nicer if you can have a command-line option to switch fonts.
    Fortunately, you can: make an include file containing the appropriate
    Lilypond setting, and then it can be pre-included on the command line
    via 'lilypond -d include-settings=gonville.ily'.

    Even easier is if I've already provided the include file myself. So in
    this commit I add a suitable 'gonville.ily' and arrange to put it in
    the distribution archive.

    (You could think of that file as a sort of 'stylesheet'; in fact, the
    one I use for my own actual score-writing includes a lot of other
    personal preferences in addition to changing the notation font.)

    I'm also removing the 'lilysetup' script, because there's no need to
    be tricky about it any more. With the new layout of the lilyfonts-old
    directory, all you have to do is to 'cp -rT' to replace files in an
    original Lilypond data directory with the new ones.

    Buildscr now depends on Lilypond 2.20 itself, because it builds the
    demo images using the new switching stylesheet. In order to avoid
    having to overwrite a real LP data directory, I've used the 'unshare'
    mechanism to bind-mount a modified one over the top. I'll mention that
    in a forthcoming README update.

 Buildscr                  | 14 +++++++++----
 gonville.ily              | 13 ++++++++++++
 lilysetup                 | 34 -------------------------------
 run-lilypond-with-datadir | 52 -----------------------------------------------
 4 files changed, 23 insertions(+), 90 deletions(-)

commit 541da6abb4970164c8a9ed0642e4a46c122ebaa7
web diff https://git.tartarus.org/?p=simon/gonville.git;a=commitdiff;h=541da6abb4970164c8a9ed0642e4a46c122ebaa7;hp=6e549e6f44550214acce52c475db26f5ffad9752
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Mar 14 12:05:56 2020 +0000

    Rewrite README for the modern world.

    Now I put the Lilypond 2.20 font switching system front and centre,
    and relegate the old horrors to 'previously, in 2.18'.

    I've also removed discussion of LILYPOND_DATADIR, because I've found
    that it's actually broken in 2.18. There are workarounds, but they're
    quite horrible to start with, and more so when Debian wraps the actual
    Lilypond binary with a script:

    https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=951801

    Instead, I've included a suggestion about unshare and bind mounts (the
    same trick I use in Buildscr here) to try to help people. But really,
    I'm going to have to start advising people to use the up-to-date LP if
    they want to use Gonville without undue pain. It's a shame that 2.18
    is still in current distros, but that'll pass.

 README | 129 +++++++++++++++++++++++++++++++++++++----------------------------
 1 file changed, 74 insertions(+), 55 deletions(-)