CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/08/18 12:54:26
Modified files:
lily : note-spacing.cc spaceable-grob.cc
spacing-spanner.cc
ly : engraver-init.ly performer-init.ly
scm : define-grobs.scm
Log message:
(get_spacing): remove kludge for EOL wide
time sigs and related stuff.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/note-spacing.cc.diff?tr1=1.61&tr2=1.62&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/spaceable-grob.cc.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/spacing-spanner.cc.diff?tr1=1.151&tr2=1.152&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ly/engraver-init.ly.diff?tr1=1.244&tr2=1.245&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ly/performer-init.ly.diff?tr1=1.51&tr2=1.52&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grobs.scm.diff?tr1=1.225&tr2=1.226&r1=text&r2=text
Patches:
Index: lilypond/lily/note-spacing.cc
diff -u lilypond/lily/note-spacing.cc:1.61 lilypond/lily/note-spacing.cc:1.62
--- lilypond/lily/note-spacing.cc:1.61 Sat Aug 13 21:35:22 2005
+++ lilypond/lily/note-spacing.cc Thu Aug 18 12:54:25 2005
@@ -144,6 +144,12 @@
*/
*space = (base_space - increment) + *fixed;
+#if 0
+ /*
+ The below situation is now handled by the "sticks out a lot" case
+ above. However we keep around the code for a few releases before
+ we drop it.
+ */
if (!extents[RIGHT].is_empty ()
&& (Item::is_breakable (right_col)
|| right_col->original_))
@@ -161,7 +167,8 @@
*space += -extents[RIGHT][LEFT] / 2;
*fixed += -extents[RIGHT][LEFT] / 2;
}
-
+#endif
+
stem_dir_correction (me, right_col, increment, space, fixed);
}
Index: lilypond/lily/spaceable-grob.cc
diff -u lilypond/lily/spaceable-grob.cc:1.46
lilypond/lily/spaceable-grob.cc:1.47
--- lilypond/lily/spaceable-grob.cc:1.46 Sat Aug 13 21:35:22 2005
+++ lilypond/lily/spaceable-grob.cc Thu Aug 18 12:54:25 2005
@@ -56,21 +56,22 @@
}
void
-Spaceable_grob::add_spring (Grob *me, Grob *p, Real d, Real inverse_strength)
+Spaceable_grob::add_spring (Grob *me, Grob *other,
+ Real distance, Real inverse_strength)
{
- if (d <= 0.0 || inverse_strength < 0.0)
+ if (distance <= 0.0 || inverse_strength < 0.0)
{
programming_error ("adding reverse spring, setting to unit");
- d = 1.0;
+ distance = 1.0;
inverse_strength = 1.0;
}
- if (isinf (d) || isnan (d)
+ if (isinf (distance) || isnan (distance)
|| isnan (inverse_strength))
{
/* strength == INF is possible. It means fixed distance. */
programming_error ("insane distance found");
- d = 1.0;
+ distance = 1.0;
inverse_strength = 1.0;
}
@@ -79,7 +80,7 @@
for (SCM s = mins; scm_is_pair (s); s = scm_cdr (s))
{
Spring_smob *sp = unsmob_spring (scm_car (s));
- if (sp->other_ == p)
+ if (sp->other_ == other)
{
programming_error ("already have that spring");
return;
@@ -89,8 +90,8 @@
Spring_smob spring;
spring.inverse_strength_ = inverse_strength;
- spring.distance_ = d;
- spring.other_ = p;
+ spring.distance_ = distance;
+ spring.other_ = other;
SCM ideal = me->get_object ("ideal-distances");
ideal = scm_cons (spring.smobbed_copy (), ideal);
Index: lilypond/lily/spacing-spanner.cc
diff -u lilypond/lily/spacing-spanner.cc:1.151
lilypond/lily/spacing-spanner.cc:1.152
--- lilypond/lily/spacing-spanner.cc:1.151 Sat Aug 13 21:35:22 2005
+++ lilypond/lily/spacing-spanner.cc Thu Aug 18 12:54:25 2005
@@ -24,7 +24,8 @@
#include "spacing-interface.hh"
Rational
-Spacing_spanner::effective_shortest_duration (Grob *me, Link_array<Grob> const
&all)
+Spacing_spanner::effective_shortest_duration (Grob *me,
+ Link_array<Grob> const &all)
{
SCM preset_shortest = me->get_property ("common-shortest-duration");
Rational global_shortest;
Index: lilypond/ly/engraver-init.ly
diff -u lilypond/ly/engraver-init.ly:1.244 lilypond/ly/engraver-init.ly:1.245
--- lilypond/ly/engraver-init.ly:1.244 Thu Aug 18 10:58:04 2005
+++ lilypond/ly/engraver-init.ly Thu Aug 18 12:54:26 2005
@@ -1,4 +1,4 @@
-\version "2.5.18"
+\version "2.7.6"
\context {
\name Global
@@ -11,7 +11,7 @@
}
\context {
- \type "Engraver_group_engraver"
+ \type "Engraver_group"
\name Staff
\consists "Output_property_engraver"
@@ -63,7 +63,7 @@
\context {
\Staff
- \type "Engraver_group_engraver"
+ \type "Engraver_group"
\name DrumStaff
\alias Staff
\remove "Accidental_engraver"
@@ -85,7 +85,7 @@
\context {
- \type "Engraver_group_engraver"
+ \type "Engraver_group"
\name InnerChoirStaff
\consists "System_start_delimiter_engraver"
systemStartDelimiter = #'SystemStartBracket
@@ -114,7 +114,7 @@
\context{
- \type "Engraver_group_engraver"
+ \type "Engraver_group"
minimumVerticalExtent = ##f
extraVerticalExtent = ##f
@@ -160,7 +160,7 @@
\context {
- \type "Engraver_group_engraver"
+ \type "Engraver_group"
\name Voice
\description "
@@ -255,7 +255,7 @@
}
\context{
- \type "Engraver_group_engraver"
+ \type "Engraver_group"
\name GrandStaff
localKeySignature = #'()
@@ -292,7 +292,7 @@
}
\context {
- \type "Engraver_group_engraver"
+ \type "Engraver_group"
\name InnerStaffGroup
\consists "Span_bar_engraver"
@@ -331,7 +331,7 @@
\context{
- \type "Engraver_group_engraver"
+ \type "Engraver_group"
minimumVerticalExtent = #'(-1.2 . 2.4)
extraVerticalExtent = ##f
verticalExtent = ##f
@@ -354,7 +354,7 @@
}
\context {
- \type "Engraver_group_engraver"
+ \type "Engraver_group"
\name NoteNames
\consists "Axis_group_engraver"
@@ -371,7 +371,7 @@
}
\context {
- \type "Engraver_group_engraver"
+ \type "Engraver_group"
\name ChordNames
\description "Typesets chord names."
@@ -592,7 +592,7 @@
\context {
- \type "Engraver_group_engraver"
+ \type "Engraver_group"
\name FiguredBass
\consists "Figured_bass_engraver"
@@ -606,7 +606,7 @@
\context {
\name "Devnull"
- \type "Engraver_group_engraver"
+ \type "Engraver_group"
%% don't want to route anything out of here:
\alias "Staff"
Index: lilypond/ly/performer-init.ly
diff -u lilypond/ly/performer-init.ly:1.51 lilypond/ly/performer-init.ly:1.52
--- lilypond/ly/performer-init.ly:1.51 Tue Jul 19 10:42:49 2005
+++ lilypond/ly/performer-init.ly Thu Aug 18 12:54:26 2005
@@ -1,10 +1,10 @@
-\version "2.6.0"
+\version "2.7.6"
%
% setup for Request->Element conversion.
Guru-only
%
\context {
- \type "Performer_group_performer"
+ \type "Performer_group"
\name Staff
\accepts Voice
@@ -26,7 +26,7 @@
}
\context {
- \type "Performer_group_performer"
+ \type "Performer_group"
\name Voice
% The order of the dynamic performers is significant: absolute dynamic
events must override crescendo events in midi.
\consists "Span_dynamic_performer"
@@ -53,38 +53,38 @@
}
\context {
- \type "Performer_group_performer"
+ \type "Performer_group"
\name FiguredBass
\consists "Swallow_performer"
}
\context {
- \type "Performer_group_performer"
+ \type "Performer_group"
\name GrandStaff
\accepts RhythmicStaff
\accepts Staff
}
\context {
- \type "Performer_group_performer"
+ \type "Performer_group"
\name "PianoStaff"
\accepts Staff
\accepts DrumStaff
}
\context {
- \type "Performer_group_performer"
+ \type "Performer_group"
\name "TabVoice"
\consists "Swallow_performer"
}
\context {
- \type "Performer_group_performer"
+ \type "Performer_group"
\name "Devnull"
\consists "Swallow_performer"
}
\context {
- \type "Performer_group_performer"
+ \type "Performer_group"
\name "TabStaff"
\accepts "TabVoice"
}
@@ -120,8 +120,8 @@
\context {
- \type "Performer_group_performer"
- \consists "Staff_performer" % Performer_group_performer ?
+ \type "Performer_group"
+ \consists "Staff_performer" % Performer_group ?
\consists "Lyric_performer"
\name Lyrics
\consists "Time_signature_performer"
@@ -129,7 +129,7 @@
}
\context{
- \type "Performer_group_performer"
+ \type "Performer_group"
\name ChoirStaff
\accepts Staff
\accepts DrumStaff
@@ -137,20 +137,20 @@
\context {
- \type "Performer_group_performer"
+ \type "Performer_group"
\consists "Staff_performer"
\accepts ChordNameVoice
\name ChordNames
}
\context {
- \type "Performer_group_performer"
+ \type "Performer_group"
\consists "Note_performer"
\name ChordNameVoice
}
\context {
- \type "Performer_group_performer"
+ \type "Performer_group"
\name StaffGroup
\accepts Staff
Index: lilypond/scm/define-grobs.scm
diff -u lilypond/scm/define-grobs.scm:1.225 lilypond/scm/define-grobs.scm:1.226
--- lilypond/scm/define-grobs.scm:1.225 Thu Aug 18 09:55:07 2005
+++ lilypond/scm/define-grobs.scm Thu Aug 18 12:54:26 2005
@@ -949,7 +949,7 @@
(X-extent-callback . ,Axis_group_interface::group_extent_callback)
;; debugging
- ;; (print-function . ,Paper_column::print) (font-size .
-6) (font-name . "sans") (Y-extent-callback . #f)
+ (print-function . ,Paper_column::print) (font-size .
-6) (font-name . "sans") (Y-extent-callback . #f)
(meta . ((class . Paper_column)
(interfaces . (paper-column-interface
axis-group-interface
@@ -976,7 +976,7 @@
(breakable . #t)
;; debugging stuff: print column number.
- ;; (print-function . ,Paper_column::print) (font-size . -6)
(font-name . "sans") (Y-extent-callback . #f)
+ (print-function . ,Paper_column::print) (font-size . -6)
(font-name . "sans") (Y-extent-callback . #f)
(meta . ((class . Paper_column)
(interfaces . (paper-column-interface
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
