From: Han-Wen Nienhuys Date: Fri, 21 Oct 2005 14:32:28 +0000 (+0000) Subject: (conv): add rules. X-Git-Tag: release/2.7.14~6 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3245e8b729171c4416f70f9c48f1cf6499dfaf9d;p=lilypond.git (conv): add rules. --- diff --git a/input/test/bar-number-regular-interval.ly b/input/test/bar-number-regular-interval.ly index 3d88af7b93..78b4a9f7e7 100644 --- a/input/test/bar-number-regular-interval.ly +++ b/input/test/bar-number-regular-interval.ly @@ -5,18 +5,18 @@ Bar numbers can be printed at regular intervals, inside a box or a circle. " } -\version "2.7.13" +\version "2.7.14" \relative c'{ \override Score.BarNumber #'break-visibility = #end-of-line-invisible \set Score.barNumberVisibility = #(every-nth-bar-number-visible 4) \override Score.BarNumber #'font-size = #2 - \override Score.BarNumber #'callbacks #'stencil + \override Score.BarNumber #'stencil = #(make-stencil-boxer 0.1 0.25 Text_interface::print) \repeat unfold 5 { c1 } \bar "|" - \override Score.BarNumber #'callbacks #'stencil + \override Score.BarNumber #'stencil = #(make-stencil-circler 0.1 0.25 Text_interface::print) \repeat unfold 4 { c1 } \bar "|." } diff --git a/input/test/boxed-stencil.ly b/input/test/boxed-stencil.ly index dc412bca9e..415853155d 100644 --- a/input/test/boxed-stencil.ly +++ b/input/test/boxed-stencil.ly @@ -1,5 +1,5 @@ -\version "2.7.13" +\version "2.7.14" \header { texidoc = "@cindex Boxed Stencil @@ -10,18 +10,18 @@ grob. " } \layout{raggedright = ##t} \relative c'' { - \override TextScript #'callbacks #'stencil = + \override TextScript #'stencil = #(make-stencil-boxer 0.1 0.3 Text_interface::print) c'4^"foo" - \override Stem #'callbacks #'stencil = + \override Stem #'stencil = #(make-stencil-boxer 0.05 0.25 Stem::print) - \override Score.RehearsalMark #'callbacks #'stencil = + \override Score.RehearsalMark #'stencil = #(make-stencil-boxer 0.15 0.3 Text_interface::print) b8 - \revert Stem #'callbacks % stencil + \revert Stem % stencil c4. c4 \mark "F" c1 diff --git a/input/test/circle.ly b/input/test/circle.ly index e80a28e9a7..3ff498c829 100644 --- a/input/test/circle.ly +++ b/input/test/circle.ly @@ -1,5 +1,5 @@ -\version "2.7.13" +\version "2.7.14" \header { texidoc = "@cindex Circle @@ -18,6 +18,6 @@ c1 \mark \default c2 d^\markup{\circle \finger "2"} \override Score.BarNumber #'break-visibility = #all-visible -\override Score.BarNumber #'callbacks #'stencil +\override Score.BarNumber #'stencil = #(make-stencil-circler 0.1 0.25 Text_interface::print) } \ No newline at end of file diff --git a/input/test/compound-time.ly b/input/test/compound-time.ly index cefeec507f..a8a8d82888 100644 --- a/input/test/compound-time.ly +++ b/input/test/compound-time.ly @@ -1,5 +1,5 @@ -\version "2.7.13" +\version "2.7.14" \header { texidoc = "@cindex compound time @cindex plus @@ -24,7 +24,7 @@ compound time. \relative { %% compound time signature hack \time 5/8 - \override Staff.TimeSignature #'callbacks #'stencil + \override Staff.TimeSignature #'stencil = #(lambda (grob) (compound-time grob "2" "3" "8")) #(override-auto-beam-setting '(end 1 8 5 8) 1 4) c8 c c8 c c diff --git a/python/convertrules.py b/python/convertrules.py index 1423a30e37..9ab036371e 100644 --- a/python/convertrules.py +++ b/python/convertrules.py @@ -2619,7 +2619,10 @@ conversions.append (((2, 7, 13), conv, def conv (str): - str = re.sub (r"#'callbacks", '', str) + str = re.sub (r"\\override +([A-Z.a-z]+) #'callbacks", + r"\\override \1", str) + str = re.sub (r"\\revert ([A-Z.a-z]+) #'callbacks % ([a-zA-Z]+)", + r"\\revert \1 #'\2", str) str = re.sub (r"([XY]-extent)-callback", r'\1', str) return str diff --git a/scm/output-lib.scm b/scm/output-lib.scm index d0dde3f4d5..0a9dc19fcc 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -59,8 +59,11 @@ ;;; end of tablature functions (define-public (make-stencil-boxer thickness padding callback) + "Return function that adds a box around the grob passed as argument." - (lambda (grob) (box-stencil (callback grob) thickness padding))) + (lambda (grob) + + (box-stencil (callback grob) thickness padding))) (define-public (make-stencil-circler thickness padding callback) "Return function that adds a circle around the grob passed as argument."