CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/10/21 14:32:28
Modified files:
input/test : bar-number-regular-interval.ly boxed-stencil.ly
circle.ly compound-time.ly
python : convertrules.py
scm : output-lib.scm
Log message:
(conv): add rules.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/test/bar-number-regular-interval.ly.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/test/boxed-stencil.ly.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/test/circle.ly.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/test/compound-time.ly.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/python/convertrules.py.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/output-lib.scm.diff?tr1=1.88&tr2=1.89&r1=text&r2=text
Patches:
Index: lilypond/input/test/bar-number-regular-interval.ly
diff -u lilypond/input/test/bar-number-regular-interval.ly:1.28
lilypond/input/test/bar-number-regular-interval.ly:1.29
--- lilypond/input/test/bar-number-regular-interval.ly:1.28 Mon Oct 17
15:34:55 2005
+++ lilypond/input/test/bar-number-regular-interval.ly Fri Oct 21 14:32:27 2005
@@ -5,18 +5,18 @@
" }
-\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 "|."
}
Index: lilypond/input/test/boxed-stencil.ly
diff -u lilypond/input/test/boxed-stencil.ly:1.13
lilypond/input/test/boxed-stencil.ly:1.14
--- lilypond/input/test/boxed-stencil.ly:1.13 Mon Oct 17 15:34:55 2005
+++ lilypond/input/test/boxed-stencil.ly Fri Oct 21 14:32:27 2005
@@ -1,5 +1,5 @@
-\version "2.7.13"
+\version "2.7.14"
\header {
texidoc = "@cindex Boxed Stencil
@@ -10,18 +10,18 @@
\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
Index: lilypond/input/test/circle.ly
diff -u lilypond/input/test/circle.ly:1.3 lilypond/input/test/circle.ly:1.4
--- lilypond/input/test/circle.ly:1.3 Mon Oct 17 15:34:55 2005
+++ lilypond/input/test/circle.ly Fri Oct 21 14:32:27 2005
@@ -1,5 +1,5 @@
-\version "2.7.13"
+\version "2.7.14"
\header {
texidoc = "@cindex Circle
@@ -18,6 +18,6 @@
\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)
}
Index: lilypond/input/test/compound-time.ly
diff -u lilypond/input/test/compound-time.ly:1.3
lilypond/input/test/compound-time.ly:1.4
--- lilypond/input/test/compound-time.ly:1.3 Mon Oct 17 15:34:55 2005
+++ lilypond/input/test/compound-time.ly Fri Oct 21 14:32:27 2005
@@ -1,5 +1,5 @@
-\version "2.7.13"
+\version "2.7.14"
\header {
texidoc = "@cindex compound time
@cindex plus
@@ -24,7 +24,7 @@
\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
Index: lilypond/python/convertrules.py
diff -u lilypond/python/convertrules.py:1.23
lilypond/python/convertrules.py:1.24
--- lilypond/python/convertrules.py:1.23 Fri Oct 21 13:54:32 2005
+++ lilypond/python/convertrules.py Fri Oct 21 14:32:27 2005
@@ -2619,7 +2619,10 @@
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
Index: lilypond/scm/output-lib.scm
diff -u lilypond/scm/output-lib.scm:1.88 lilypond/scm/output-lib.scm:1.89
--- lilypond/scm/output-lib.scm:1.88 Sun Oct 16 13:52:42 2005
+++ lilypond/scm/output-lib.scm Fri Oct 21 14:32:28 2005
@@ -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."
_______________________________________________
Lilypond-cvs mailing list
Lilypond-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
