CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/19 10:13:08
Modified files:
. : ChangeLog
Documentation/topdocs: NEWS.tely
Documentation/user: basic-notation.itely
input/mutopia : claop.py
input/regression: repeat-percent-count.ly
lily : percent-repeat-engraver.cc volta-bracket.cc
volta-engraver.cc
scm : define-context-properties.scm
Log message:
* lily/volta-engraver.cc (process_music): use
Text_interface::is_markup() for setting the 'text property of the
volta bracket.
* input/mutopia/claop.py (accents): update syntax to 2.6
* scm/define-context-properties.scm
(all-user-translation-properties): add countPercentRepeats.
* Documentation/user/basic-notation.itely (Measure repeats): add
isolated percent example.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ChangeLog.diff?tr1=1.4040&tr2=1.4041&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/topdocs/NEWS.tely.diff?tr1=1.70&tr2=1.71&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/Documentation/user/basic-notation.itely.diff?tr1=1.37&tr2=1.38&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/mutopia/claop.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/input/regression/repeat-percent-count.ly.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/percent-repeat-engraver.cc.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/volta-bracket.cc.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/volta-engraver.cc.diff?tr1=1.70&tr2=1.71&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-context-properties.scm.diff?tr1=1.50&tr2=1.51&r1=text&r2=text
Patches:
Index: lilypond/ChangeLog
diff -u lilypond/ChangeLog:1.4040 lilypond/ChangeLog:1.4041
--- lilypond/ChangeLog:1.4040 Thu Aug 18 22:06:45 2005
+++ lilypond/ChangeLog Fri Aug 19 10:13:08 2005
@@ -1,3 +1,17 @@
+2005-08-19 Han-Wen Nienhuys <[EMAIL PROTECTED]>
+
+ * lily/volta-engraver.cc (process_music): use
+ Text_interface::is_markup() for setting the 'text property of the
+ volta bracket.
+
+ * input/mutopia/claop.py (accents): update syntax to 2.6
+
+ * scm/define-context-properties.scm
+ (all-user-translation-properties): add countPercentRepeats.
+
+ * Documentation/user/basic-notation.itely (Measure repeats): add
+ isolated percent example.
+
2005-08-18 Graham Percival <[EMAIL PROTECTED]>
* input/ {various}: change direction #1, #-1 to
@@ -55,7 +69,7 @@
* lily/context-def.cc (instantiate): check for
Engraver_group_engraver and Performer_group_performer not
- Engraver/Performer. Fixes crashes when doing \with { \consist .. }
+ Engraver/Performer. Fixes crashes when doing \with { \consists .. }
2005-08-18 Jan Nieuwenhuizen <[EMAIL PROTECTED]>
Index: lilypond/Documentation/topdocs/NEWS.tely
diff -u lilypond/Documentation/topdocs/NEWS.tely:1.70
lilypond/Documentation/topdocs/NEWS.tely:1.71
--- lilypond/Documentation/topdocs/NEWS.tely:1.70 Thu Aug 18 12:57:20 2005
+++ lilypond/Documentation/topdocs/NEWS.tely Fri Aug 19 10:13:08 2005
@@ -38,9 +38,11 @@
@itemize @bullet
@item
-Percent repeats get incremental numbers to indicate how many repeats there are.
+With the @code{countPercentRepeats} property,
+percent repeats get incremental numbers to indicate how many repeats there are.
[EMAIL PROTECTED],fragment,raggedright]
[EMAIL PROTECTED],fragment,raggedright]
+\set countPercentRepeats = ##t
\repeat percent 4 { c1 }
\time 2/4
\repeat percent 4 { c2 c2 }
Index: lilypond/Documentation/user/basic-notation.itely
diff -u lilypond/Documentation/user/basic-notation.itely:1.37
lilypond/Documentation/user/basic-notation.itely:1.38
--- lilypond/Documentation/user/basic-notation.itely:1.37 Tue Aug 16
15:47:41 2005
+++ lilypond/Documentation/user/basic-notation.itely Fri Aug 19 10:13:08 2005
@@ -2934,6 +2934,16 @@
}
@end lilypond
+Isolated percents can also be printed. This is done by putting a multi
+measure rest, with a different print function,
+
+
[EMAIL PROTECTED],verbatim]
+\override MultiMeasureRest #'print-function
+ = #Multi_measure_rest::percent
+R1
[EMAIL PROTECTED] lilypond
+
@seealso
Index: lilypond/input/mutopia/claop.py
diff -u lilypond/input/mutopia/claop.py:1.3 lilypond/input/mutopia/claop.py:1.4
--- lilypond/input/mutopia/claop.py:1.3 Thu Aug 18 22:01:01 2005
+++ lilypond/input/mutopia/claop.py Fri Aug 19 10:13:08 2005
@@ -167,8 +167,8 @@
elif cr=='d':
namestr="e'"
elif cr=='X':
- namestr="\\property Staff.NoteHead \\override #'style = #'cross c'"
- accstr="-^ \\property Staff.NoteHead \\revert #'style"
+ namestr="\\override Staff.NoteHead #'style = #'cross c'"
+ accstr="-^ \\revert Staff.NoteHead #'style"
else:
print 'foo', cr, chr(ch), ch == 'd', "A%sA" % cr
raise 'foo'
@@ -236,7 +236,7 @@
sys.stdout.write ('%%{\n %s \n %%}' % copyright)
sys.stdout.write (r"""
-\include "paper11.ly"
+#(set-global-staff-size 11)
\header {
title = "CLA(O)P II"
@@ -254,12 +254,15 @@
for st in range(1,voices+1):
str=stemme(st)
ststr=chr((st-1)/24+ord('A')) + chr ((st-1)%24+ord('A'))
- sys.stdout.write( """
+ sys.stdout.write(r'''
-stemme%s = \\notes {\n\\clef percussion
-\\property Staff.instrument = \"%d\"\n
-\\property Staff.instr = \"%d\"\n
-\\property Score.currentBarNumber = #%d\n""" % (ststr,st,st,start_measure))
+stemme%s = {
+\clef percussion
+\set Staff.instrument = "%d"
+\set Staff.instr = "%d"
+\set Score.currentBarNumber = #%d
+'''
+ % (ststr,st,st,start_measure))
for i in range(start_measure-1, start_measure-1+no_measures):
print16(str[i*16:i*16+16])
@@ -269,14 +272,13 @@
sys.stdout.write (r"""
-\score {
- \notes <
- \property Score.BarNumber \override #'padding = #2.5
- \property Score.autoBeamSettings \override
- #'(end * * * *) = #(ly:make-moment 1 4)
- \property Score.skipBars = ##t
- \context StaffGroup <
- \property StaffGroup.Stem \override #'direction = #up
+<<
+ \override Score.BarNumber #'padding = #2.5
+ \override Score.autoBeamSettings
+ #'(end * * * *) = #(ly:make-moment 1 4)
+ \set Score.skipBars = ##t
+ \context StaffGroup <<
+ \override StaffGroup.Stem #'direction = #up
""")
@@ -286,21 +288,22 @@
sys.stdout.write (r"""\context Staff="%s" \%s
""" % (ststr,ststr))
-sys.stdout.write (r""">
- >
- \paper {
+sys.stdout.write (r""">>
+>>
+#(set-default-paper-size "a3")
+\paper {
linewidth = 26.0\cm
indent = 0
textheight = 38.0\cm
%hsize = 30.0 \cm
%vsize = 42.0 \cm
-
- \translator {
- \StaffContext
- StaffSymbol \override #'line-count = #3
- minimumVerticalExtent = #'(-3 . 3)
- }
- }
-
+}
+\context
+{
+ \translator {
+ \StaffContext
+ \override StaffSymbol #'line-count = #3
+ minimumVerticalExtent = #'(-3 . 3)
+ }
}
""")
Index: lilypond/input/regression/repeat-percent-count.ly
diff -u lilypond/input/regression/repeat-percent-count.ly:1.2
lilypond/input/regression/repeat-percent-count.ly:1.3
--- lilypond/input/regression/repeat-percent-count.ly:1.2 Tue Aug 16
21:53:35 2005
+++ lilypond/input/regression/repeat-percent-count.ly Fri Aug 19 10:13:08 2005
@@ -2,8 +2,9 @@
\header {
- texidoc = "Percent repeats get incremental numbers to indicate the repeat
-counts, but only if there are more than two repeats."
+ texidoc = "Percent repeats get incremental numbers when
[EMAIL PROTECTED] is set, to indicate the repeat counts, but
+only if there are more than two repeats."
}
@@ -11,6 +12,7 @@
\version "2.7.6"
\relative c'' \new Voice {
+ \set countPercentRepeats = ##t
\time 4/4
\repeat "percent" 4 { c1 }
\time 2/4
Index: lilypond/lily/percent-repeat-engraver.cc
diff -u lilypond/lily/percent-repeat-engraver.cc:1.48
lilypond/lily/percent-repeat-engraver.cc:1.49
--- lilypond/lily/percent-repeat-engraver.cc:1.48 Thu Aug 18 10:58:04 2005
+++ lilypond/lily/percent-repeat-engraver.cc Fri Aug 19 10:13:08 2005
@@ -153,7 +153,8 @@
Grob *col = unsmob_grob (get_property ("currentCommandColumn"));
percent_->set_bound (LEFT, col);
- if (total_count_ > 2)
+ if (total_count_ > 2
+ && to_boolean (get_property ("countPercentRepeats")))
{
percent_counter_
= make_spanner ("PercentRepeatCounter", repeat_->self_scm ());
@@ -172,7 +173,8 @@
{
double_percent_ = make_item ("DoublePercentRepeat", repeat_->self_scm
());
- if (total_count_ > 2)
+ if (total_count_ > 2
+ && to_boolean (get_property ("countPercentRepeats")))
{
double_percent_counter_
= make_item ("DoublePercentRepeatCounter",
@@ -259,10 +261,21 @@
}
ADD_TRANSLATOR (Percent_repeat_engraver,
- /* doc */ "Make whole bar and double bar repeats.",
+ /* doc */
+ "Make whole bar and double bar repeats.",
+
/* create */
- "PercentRepeat DoublePercentRepeat "
- "PercentRepeatCounter DoublePercentRepeatCounter",
- /* accept */ "repeated-music",
- /* read */ "measureLength currentCommandColumn",
+ "PercentRepeat "
+ "DoublePercentRepeat "
+ "PercentRepeatCounter "
+ "DoublePercentRepeatCounter",
+
+ /* accept */
+ "repeated-music",
+
+ /* read */
+ "measureLength "
+ "currentCommandColumn "
+ "countPercentRepeats",
+
/* write */ "");
Index: lilypond/lily/volta-bracket.cc
diff -u lilypond/lily/volta-bracket.cc:1.46 lilypond/lily/volta-bracket.cc:1.47
--- lilypond/lily/volta-bracket.cc:1.46 Fri Aug 12 00:04:45 2005
+++ lilypond/lily/volta-bracket.cc Fri Aug 19 10:13:08 2005
@@ -98,7 +98,8 @@
{
SCM text = me->get_property ("text");
SCM properties = me->get_property_alist_chain (SCM_EOL);
- SCM snum = Text_interface::interpret_markup (layout->self_scm (),
properties, text);
+ SCM snum = Text_interface::interpret_markup (layout->self_scm (),
+ properties, text);
Stencil num = *unsmob_stencil (snum);
mol.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()
Index: lilypond/lily/volta-engraver.cc
diff -u lilypond/lily/volta-engraver.cc:1.70
lilypond/lily/volta-engraver.cc:1.71
--- lilypond/lily/volta-engraver.cc:1.70 Sat Aug 13 21:35:22 2005
+++ lilypond/lily/volta-engraver.cc Fri Aug 19 10:13:08 2005
@@ -160,7 +160,7 @@
}
if (!volta_span_
- && (scm_is_string (start_string_) || scm_is_pair (start_string_)))
+ && Text_interface::is_markup (start_string_))
{
started_mom_ = now_mom ();
Index: lilypond/scm/define-context-properties.scm
diff -u lilypond/scm/define-context-properties.scm:1.50
lilypond/scm/define-context-properties.scm:1.51
--- lilypond/scm/define-context-properties.scm:1.50 Fri Aug 5 13:44:36 2005
+++ lilypond/scm/define-context-properties.scm Fri Aug 19 10:13:08 2005
@@ -150,6 +150,8 @@
(connectArpeggios ,boolean? " If set, connect arpeggios across
piano staff.")
+ (countPercentRepeats ,boolean? "If set, produce counters for
+percent repeats. ")
(createKeyOnClefChange ,boolean? "Print a key signature whenever the clef
is changed.")
(createSpacing ,boolean? "Create @code{StaffSpacing} objects?
Should be set for staves.")
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
