From 9193ac6225e2beafb8ea5da2610c70dd610e03be Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 11 Mar 2004 11:53:45 +0000
Subject: [PATCH] *** empty log message ***
---
ChangeLog | 8 ++++++--
Documentation/user/music-glossary.tely | 7 +++----
Documentation/user/notation.itely | 9 ++++++++-
lily/auto-beam-engraver.cc | 2 +-
lily/custos.cc | 4 ++--
ly/engraver-init.ly | 2 --
mf/feta-slag.mf | 2 +-
scm/define-grob-properties.scm | 3 +++
scm/music-functions.scm | 4 ++--
scripts/convert-ly.py | 6 +++---
10 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a17f2620cf..52b485a52b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,11 +9,15 @@
2004-03-11 Han-Wen Nienhuys <hanwen@xs4all.nl>
+ * lily/auto-beam-engraver.cc (create_beam): add Stem as
+ cause. This should fix warnings.
+
+ * mf/feta-slag.mf (trill_ne): fix upmordent size.
+
* lily/accidental.cc (accurate_boxes): enlarge Y-extent of flat to
prevent aligned 6ths.
- * lily/custos.cc (print): remove neutral position.
- (print): remove adjust-if-on-staffline.
+ * lily/custos.cc (print): remove adjust-if-on-staffline.
2004-03-11 Jan Nieuwenhuizen <janneke@gnu.org>
diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index 6be16b1766..722a73c7bc 100644
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -1078,11 +1078,10 @@ of the 20th century
@lilypond
\score {
\notes {
- \override Staff.Custos #'neutral-position = #4
- \override Staff.Custos #'neutral-direction = #-1
- \override Staff.Custos #'adjust-if-on-staffline = ##t
+% \override Staff.Custos #'neutral-position = #4
+ \override Staff.Custos #'neutral-direction = #-1
- \override Staff.Custos #'style = #'hufnagel
+ \override Staff.Custos #'style = #'hufnagel
c'1
\break < d' a' f''>1
}
diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index a9f32c78b5..5187c58124 100644
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -2240,9 +2240,16 @@ care when you mix staves with grace notes and staves without, for example,
@lilypond[relative=2,verbatim,fragment]
<< \new Staff { e4 \bar "|:" \grace c16 d4 }
- \new Staff { c4 \bar "|:" d4 } >>
+ \new Staff { c4 \bar "|:" d4 } >>
@end lilypond
+@noindent
+This can be remedied by inserting grace skips, for the above example
+
+@verbatim
+ \new Staff { c4 \bar "|:" \grace s16 d4 } >>
+@end verbatim
+
Grace sections should only be used within sequential music
expressions. Nesting or juxtaposing grace sections is not supported,
and might produce crashes or other errors.
diff --git a/lily/auto-beam-engraver.cc b/lily/auto-beam-engraver.cc
index 9f3926cd00..a4c431ba55 100644
--- a/lily/auto-beam-engraver.cc
+++ b/lily/auto-beam-engraver.cc
@@ -284,7 +284,7 @@ Auto_beam_engraver::create_beam ()
Beam::add_stem (beam, (*stems_)[i]);
}
- announce_grob (beam, SCM_EOL);
+ announce_grob (beam, (*stems_)[0]->self_scm ());
return beam;
}
diff --git a/lily/custos.cc b/lily/custos.cc
index cf77b605ef..64f93c2a13 100644
--- a/lily/custos.cc
+++ b/lily/custos.cc
@@ -50,7 +50,7 @@ Custos::print (SCM smob)
*/
bool adjust = true;
- int neutral_pos = 0;
+ int neutral_pos = robust_scm2int (me->get_property ("neutral-position"), 0);
Direction neutral_direction =
to_dir (me->get_property ("neutral-direction"));
@@ -103,4 +103,4 @@ Custos::print (SCM smob)
ADD_INTERFACE (Custos, "custos-interface",
"A custos object.",
- "style neutral-direction");
+ "style neutral-position neutral-direction");
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index c43a03166e..9ea43edbf1 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -6,7 +6,6 @@
\accepts Score
\description "Hard coded entry point for LilyPond. Cannot be tuned."
\grobdescriptions #all-grob-descriptions
-
}
%
@@ -721,7 +720,6 @@ EasyNotation = \context {
\override Custos #'style = #'vaticana
\override Custos #'neutral-position = #3
\override Custos #'neutral-direction = #-1
- \override Custos #'adjust-if-on-staffline = ##t
% Score.timing = ##f
% Score.barAlways = ##t
diff --git a/mf/feta-slag.mf b/mf/feta-slag.mf
index 96b4db54fd..bc74235e10 100644
--- a/mf/feta-slag.mf
+++ b/mf/feta-slag.mf
@@ -125,7 +125,7 @@ fet_endchar;
fet_beginchar("upmordent", "upmordent", "upmordent")
set_char_box(3 trill_width#, 3 trill_width#,
- trill_height#, trill_height#);
+ 4/3 trill_height#, 4/3 trill_height#);
currentpicture := remember_pic;
diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 577deb64c3..8c96d894ca 100644
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -151,7 +151,10 @@ line).")
(dashed ,number? " number representing the length of the dashes.")
(neutral-direction ,ly:dir? "Which direction to take in the
center of the staff.")
+ (neutral-position ,number? "Position (in half staff spaces) where
+to flip the direction of custos stem.")
+
;; todo: why is this tunable?
(dir-function ,procedure? "The function to determine the
direction of a beam. Choices include:
diff --git a/scm/music-functions.scm b/scm/music-functions.scm
index 5f7d361988..ba97c623d9 100644
--- a/scm/music-functions.scm
+++ b/scm/music-functions.scm
@@ -283,8 +283,8 @@ OTTAVATION to `8va', or whatever appropriate."
(let ((where (ly:context-property-where-defined context 'middleCPosition))
(oc0 (ly:context-property context 'originalCentralCPosition)))
(ly:context-set-property! context 'middleCPosition oc0)
- (ly:unset-context-property where 'originalCentralCPosition)
- (ly:unset-context-property where 'ottavation))
+ (ly:context-unset-property where 'originalCentralCPosition)
+ (ly:context-unset-property where 'ottavation))
(let* ((where (ly:context-property-where-defined context 'middleCPosition))
(c0 (ly:context-property context 'middleCPosition))
(new-c0 (+ c0 (* -7 octavation)))
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index d5f46f42b6..8e2cf83250 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1995,8 +1995,8 @@ def conv (str):
'ly:stencil-extent', str)
str = re.sub (r'ly:translator-find',
'ly:context-find', str)
- str = re.sub ('ly:context-unset-property',
- 'ly:unset-context-property', str)
+ str = re.sub ('ly:unset-context-property','ly:context-unset-property',
+ str)
str = re.sub (r'ly:get-mutable-properties',
'ly:mutable-music-properties',str)
@@ -2008,7 +2008,7 @@ conversions.append (((2,1,30), conv,
'''\\threeq{flat,sharp} -> \\sesqui{flat,sharp}
ly:get-mutable-properties -> ly:mutable-music-properties
centralCPosition -> middleCPosition
-ly:unset-context-property -> ly:unset-context-property
+ly:unset-context-property -> ly:context-unset-property
ly:translator-find -> ly:context-find
ly:get-stencil-extent -> ly:stencil-extent
'''))
--
2.39.5