-1.3.139.jcn1
+--- ../lilypond-1.3.139.jcn1/CHANGES Sun Mar 18 14:46:40 2001
+++ b/CHANGES Sun Mar 18 17:33:23 2001
+@@ -1,3 +1,13 @@
+1.3.139.jcn2
+============
+
+* Small fixes to Coriolan.
+
+* Bugfix: don't typeset suicided multi-measure-rests, don't set
+multi-measure-rests spanning less than one measure.
+
+* Bugfix: line-column-location.
+
+ 1.3.139.jcn1
+ ============
+ 1.3.139.jcn1
============
* Allow markup text for crecscendoText and decrescendoText.
@end lilypond
If you dislike the amount of ties created for a chord, you set
-@code{Thread.sparseTies} to true, resulting in a smaller number of
+@code{Voice.sparseTies} to true, resulting in a smaller number of
ties:
@lilypond[fragment,verbatim,center]
- \property Thread.sparseTies = ##t
+%oops: core dump
+% \property Voice.sparseTies = ##t
<c' e' g'> ~ <c' e' g'>
@end lilypond
@lilypond[verbatim,singleline,fragment]
\context Staff <
\context Voice=one \partcombine Voice
- \context Thread=one \notes\relative c'' {
- g g a b r2
+ \context Thread=one \relative c'' {
+ g a b r
}
- \context Thread=two \notes\relative c'' {
- g g r2 g4 f4
+ \context Thread=two \relative c'' {
+ g r2 f4
}
>
@end lilypond
If you just want the splitting of Threads and setting of directions, and
not the textual markings, you may set the property @var{soloADue} to
-false. There are a number of other properties that you can use to tweak
+false. This mode can be used to set hymns:
+
+@lilypond[verbatim,singleline,fragment]
+ \context Staff <
+ \property Staff.soloADue = ##f
+ \context Voice=one \partcombine Voice
+ \context Thread=one \relative c'' {
+ b4 a c g
+ }
+ \context Thread=two \relative c'' {
+ d,2 a4 g'
+ }
+ >
+@end lilypond
+
+There are a number of other properties that you can use to tweak
the behavior of part combining, refer to the automatically generated
documentation. Look for @code{Thread_devnull_engraver}
@code{Voice_devnull_engraver} and @code{A2_engraver}.
MAJOR_VERSION=1
MINOR_VERSION=3
PATCH_LEVEL=139
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
% the problem is more complex: the mmrest-engraver lives at staff level,
% but it seems that we need one per voice.
%
+
+#(set! point-and-click line-column-location)
+one = \notes\relative c'' {
+
+ f4 \!e-.\f r2|
+ R1|
+ f2\p()es|
+ \property Voice.crescendoText = #'(lines " " "cresc." " ")
+ \property Voice.crescendoSpanner = #'dashed-line
+ d1\<|
+ d1|
+ d2 d2|
+ d2 d2|
+ \!f1\ff ~|
+ f1
+}
+
+two = \notes \relative c'' {
+ r4 c r2|
+ R1*6|
+ c1 ~|
+ c1
+}
+
\score {
\notes <
\context Staff = Viole <
\context Voice=one \partcombine Voice
- \context Thread=one \relative c''{ R1 d4 d d d }
- \context Thread=two { R1*2 }
+ \context Thread=one \one
+ \context Thread=two \two
>
>
\paper {
-% {
\translator {
- \StaffContext
- \remove Multi_measure_rest_engraver;
- \remove Bar_engraver;
+ \ThreadContext
+ \consists "Rest_engraver";
}
\translator {
\VoiceContext
+ \remove "Rest_engraver";
\consists Multi_measure_rest_engraver;
\consists Bar_engraver;
}
-% }
+ \translator {
+ \HaraKiriStaffContext
+ \remove Multi_measure_rest_engraver;
+ \remove Bar_engraver;
+ }
+ \translator {
+ \OrchestralScoreContext
+ RestCollision \override #'maximum-rest-count = #1
+ }
}
}
\ No newline at end of file
--- /dev/null
+%
+% mmrests of second voice should not disappear
+%
+% the problem is more complex: the mmrest-engraver lives at staff level,
+% but it seems that we need one per voice.
+%
+\score {
+ \notes <
+ \context Staff = Viole <
+ \context Voice=one \partcombine Voice
+ \context Thread=one \relative c''{ R1 d4 d d d }
+ \context Thread=two { R1*2 }
+ >
+ >
+ \paper {
+% {
+ \translator {
+ \StaffContext
+ \remove Multi_measure_rest_engraver;
+ \remove Bar_engraver;
+ }
+ \translator {
+ \VoiceContext
+ \consists Multi_measure_rest_engraver;
+ \consists Bar_engraver;
+ }
+% }
+ }
+}
\ No newline at end of file
Moment mp = (unsmob_moment (smp)) ? *unsmob_moment (smp) : Moment (0);
if (mmrest_p_ && (now_mom () >= start_moment_)
- && !mp
- && (scm_ilength (mmrest_p_->get_grob_property ("columns")) >= 2))
+ && !mp
+ && (scm_ilength (mmrest_p_->get_grob_property ("columns")) >= 2))
{
typeset_grob (mmrest_p_);
/*
we must keep mmrest_p_ around to set measure-count.
*/
}
+
if (lastrest_p_)
{
- typeset_grob (lastrest_p_);
+ /* sanity check */
+ if (scm_ilength (lastrest_p_->get_grob_property ("columns")) >= 2
+ && lastrest_p_->get_bound (LEFT) && lastrest_p_->get_bound (RIGHT)
+ && lastrest_p_->get_bound (LEFT) != lastrest_p_->get_bound (RIGHT))
+ typeset_grob (lastrest_p_);
lastrest_p_ = 0;
}
Molecule s;
- int measures = 1;
+ int measures = 0;
SCM m (me->get_grob_property ("measure-count"));
if (gh_number_p (m))
{
SCM limit = me->get_grob_property ("expand-limit");
+ if (measures <= 0)
+ return SCM_EOL;
if (measures == 1)
{
s = musfont->find_by_name (Rest::glyph_name (me, 0, ""));
\property PianoStaff.soloIIText = #""
% This is non-conventional, but currently it is
% the only way to tell the difference.
- \property PianoStaff.aDueText = #"\\`a2"
+ \property PianoStaff.aDueText = #"a2"
\property PianoStaff.splitInterval = #'(1 . 0)
\property PianoStaff.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1))
\property PianoStaff.noDirection = ##t
}
-#(set! point-and-click #t)
+#(set! point-and-click line-column-location)
#(define text-flat '((font-relative-size . -2) (music "accidentals--1")))
-#(set! point-and-click #t)
+#(set! point-and-click line-column-location)
\header{
filename = "violino-viola.ly";
title = "Vier Duette";
-#(set! point-and-click #t)
+#(set! point-and-click line-column-location)
opus = "BWV 924"
piece = "1"
-#(set! point-and-click #t)
+#(set! point-and-click line-column-location)
opus= "BWV 939"
piece = "2"
-#(set! point-and-click #t)
+#(set! point-and-click line-column-location)
opus= "BWV 999"
piece = "3"
-#(set! point-and-click #t)
+#(set! point-and-click line-column-location)
opus = "BWV 925"
piece = "4"
-#(set! point-and-click #t)
+#(set! point-and-click line-column-location)
piece = "5"
opus = "BWV 926"
-#(set! point-and-click #t)
+#(set! point-and-click line-column-location)
opus = "BWV 940"
piece = "6"
(define (line-column-location line col file)
"Print an input location, including column number ."
(string-append (number->string line) ":"
- (number->string col) " " file " ")
+ (number->string col) " " file)
)
(define (line-location line col file)
projects / lilypond.git / commitdiff