From: John Mandereau <john.mandereau@gmail.com>
Date: Sat, 21 Apr 2007 09:42:54 +0000 (+0200)
Subject: Merge branch 'master' into topic/master-translation
X-Git-Tag: release/2.11.23-1~15^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=031f74e2ce73ab7e3172cf7256d5021a6e7ac334;p=lilypond.git

Merge branch 'master' into topic/master-translation

* master:
  (get_subpath_i): Don't use `round' but `floor' since the former
  Replace draw_block with draw_rounded_block.
  Use three macros instead of redefining punctum_char.
  Move generic macros used for parmesan fonts into separate file.
  Fix piano-centred-dynamics template
  Corrected example in Spacing lyrics to be in same octave as the previous one.
  Fix subpath construction.
  Finish adaption of parmesan-heads.mf to mf2top1
  Automagic update of lsr.
  Update makelsr.py script to include the  input/tolsr/  subdirs.
  Update staging area for LSR.
  Next step adapting parmesan-heads.mf to mf2pt1.
---

031f74e2ce73ab7e3172cf7256d5021a6e7ac334