+2002-04-02 Han-Wen <hanwen@cs.uu.nl>
+
+ * lily/spaceable-grob.cc (add_spring): change incorrect spring to
+ unit spring here. Reduces number of warning messages.
+
+ * lily/auto-beam-engraver.cc: change noAutoBeaming to autoBeaming.
+
2002-04-01 Han-Wen <hanwen@cs.uu.nl>
* scm/generic-property.scm: remove generic-property, property-engraver
+++ /dev/null
-\version "1.3.148"
-\header {
-texidoc="The first and last notes of a measure should be spaced nicely."
-}
-% jij had zoon mooi tight spacing example,
-% kan zo'n harde space ook niet voor en na maatstreep!
-\score {
- \notes \relative c'' {
- \time 2/4
- \property Voice.noAutoBeaming=##t
- a4 a8
- a32 a a a
-}
-%%set bit wide
-\paper {linewidth = 100.\mm}
-}
}
\score { \notes \relative c'' \context Staff {
- \property Voice.noAutoBeaming = ##t
+ \property Voice.autoBeaming = ##f
[a8 a8 a8 a8] a8 a8 a8 a8
}
\paper {
linewidth = -1
}
}
+
+\version "1.5.49"
% include file for scarlatti-test
+\version "1.5.49"
+
rh=\property Thread.NoteHead \override #'style = #'default
lh=\property Thread.NoteHead \override #'style = #'diamond
-ab=\property Voice.noAutoBeaming=##f
-xb=\property Voice.noAutoBeaming=##t
+ab=\property Voice.autoBeaming = ##t
+xb=\property Voice.autoBeaming = ##f
-\version "1.3.146"
+\version "1.5.49"
%K000.ly LilyPond 1.2.16
\header {
title="John's Scarlatti quotes"
sls={\property Voice.forceHorizontalShift="-0.22"}
rs={\property Voice.forceHorizontalShift="0.6"}
srs={\property Voice.forceHorizontalShift="0.22"}
-ab={\property Voice.noAutoBeaming=##f}
-xb={\property Voice.noAutoBeaming=##t}
+ab={\property Voice.autoBeaming = ##t}
+xb={\property Voice.autoBeaming = ##f}
%}
-\version "1.5.1"
+\version "1.5.49"
\header {
dedication = "dedication"
\context ChordNames \accompaniment
\addlyrics
\context Staff = one {
- \property Staff.noAutoBeaming = ##t
+ \property Staff.autoBeaming = ##f
\property Staff.automaticMelismata = ##t
\melody
}
-\version "1.5.1"
+\version "1.5.49"
\header {
dedication = "dedication"
<
\addlyrics
\context Staff = one {
- \property Staff.noAutoBeaming = ##t
+ \property Staff.autoBeaming = ##f
\property Staff.automaticMelismata = ##t
\melody
}
-\version "1.5.1"
+\version "1.5.49"
\header {
dedication = "dedication"
<
\addlyrics
\context Staff = mel {
- \property Staff.noAutoBeaming = ##t
+ \property Staff.autoBeaming = ##f
\property Staff.automaticMelismata = ##t
\melody
}
-\version "1.3.146"
+\version "1.5.49"
\header {
title = "ancient font test"
date = "2000"
#'line-count = #5
\notes \transpose c' {
- \property Voice.noAutoBeaming = ##t
+ \property Voice.autoBeaming = ##f
\property Staff.Clef \set #'font-family = #'ancient
\property Staff.KeySignature \set #'font-family = #'ancient
\property Staff.KeySignature \override #'style = #'mensural
\translator {
\ScoreContext
% \remove System_start_delimiter_engraver
-% SystemStartDelimiter \override #'glyph = #'brace
+% systemStartDelimiter \override #'glyph = #'brace
}
\translator {
\ChoirStaffContext
\remove System_start_delimiter_engraver
-% SystemStartDelimiter \override #'glyph = #'empty
+% systemStartDelimiter \override #'glyph = #'empty
}
}
}
\version "1.3.146"
-
-
%{
Currently (1.1.27.jcn3), the auto-beam engraver will only engrave
sensible beams, which means that it will end a beam when:
c8 c c4
r8 c c c
% no autobeaming
- \property Voice.noAutoBeaming = ##t
+ \property Voice.autoBeaming = ##f
c8 c c c
}
\paper{
\header {
texidoc = "some instruments (notably: cello and double bass) are alternatively written on one and two staves. This is the way to do it:"
}
-\version "1.3.146"
+\version "1.5.49"
voiceOne = \notes \relative c'' {
\paper{
linewidth=80.0\mm
- \translator { \VoiceContext noAutoBeaming = ##t }
+ \translator { \VoiceContext autoBeaming = ##f }
\translator { \HaraKiriStaffContext }
\translator { \OrchestralScoreContext skipBars = ##t }
}
-\version "1.3.146"
+\version "1.5.49"
\score{
\notes\relative c''{
c,(g' c e f d b)g
c,(g' c e f d b)g
-\property Voice.noAutoBeaming = ##t
+\property Voice.autoBeaming = ##f
\stemUp
a8(a a a a a a)a
-\version "1.3.146"
+\version "1.5.49"
\header{
texidoc="
fragment = \notes {
- \property Voice.noAutoBeaming = ##t
+ \property Voice.autoBeaming = ##f
\property Voice.Stem \set #'direction = #1
\property Voice.Slur \set #'direction = #1
d'32( f'4 )d8..
-\version "1.3.146"
+\version "1.5.49"
fragment = \notes {
-\version "1.3.146"
+\version "1.5.49"
\header{
texidoc="
The same goes for slurs. They behave decently when broken across
-\version "1.3.146"
+\version "1.5.49"
\score{
\notes\relative c''{
-\version "1.3.146"
+\version "1.5.49"
% test damping
-\version "1.3.146"
+\version "1.5.49"
\score{
-\version "1.3.146"
+\version "1.5.49"
\score {
\context Voice \notes\relative c {
-\version "1.3.146"
+\version "1.5.49"
\header {
texidoc = ""
}
-\version "1.3.146"
+\version "1.5.49"
\score{
\notes\relative c''{
-\version "1.3.146"
+\version "1.5.49"
x = {
-\version "1.3.146"
+\version "1.5.49"
\header{
% should look the same
-\version "1.3.146"
+\version "1.5.49"
\header{
% should look the same
-\version "1.3.146"
+\version "1.5.49"
\header {
texidoc="You can get ugly slurs, if you want.
-\version "1.3.146"
+\version "1.5.49"
+\version "1.5.49"
\header {
title = "The river is flowing"
\addlyrics
\context Staff = mel
- { \property Staff.noAutoBeaming = ##t
+ { \property Staff.autoBeaming = ##f
\property Staff.automaticMelismata = ##t
\melody }
\context Lyrics \text
void
Auto_beam_engraver::consider_begin (Moment test_mom)
{
- bool off = to_boolean (get_property ("noAutoBeaming"));
- if (!stem_l_arr_p_ && ! off)
+ bool on = to_boolean (get_property ("autoBeaming"));
+ if (!stem_l_arr_p_ && on)
{
bool b = test_moment (START, test_mom);
if (b)
if (stem_l_arr_p_)
{
/* Allow already started autobeam to end:
- don't check for noAutoBeaming */
+ don't check for autoBeaming */
bool b = test_moment (STOP, test_mom);
if (b)
end_beam ();
",
/* creats*/ "Beam",
/* acks */ "stem-interface rest-interface beam-interface bar-line-interface",
-/* reads */ "noAutoBeaming autoBeamSettings subdivideBeams",
+/* reads */ "autoBeaming autoBeamSettings subdivideBeams",
/* write */ "");
if (d == STOP)
{
SCM m = get_property ("automaticMelismata");
- SCM b = get_property ("noAutoBeaming");
- if (to_boolean (m) && to_boolean (b))
+ SCM b = get_property ("autoBeaming");
+ if (to_boolean (m) && !to_boolean (b))
{
set_melisma (false);
}
if (beam_p_)
{
SCM m = get_property ("automaticMelismata");
- SCM b = get_property ("noAutoBeaming");
- if (to_boolean (m) && to_boolean (b))
+ SCM b = get_property ("autoBeaming");
+ if (to_boolean (m) && !to_boolean (b))
{
set_melisma (true);
}
{
programming_error ("Insane spring found. Setting to unit spring.");
- cout << "columns " << Paper_column::rank_i (cols[i])
- << " " << Paper_column::rank_i (cols[i+1]) << endl;
desc.hooke_f_ = 1.0;
desc.ideal_f_ = 1.0;
}
{
if (d < 0.0 || strength <= 0.0)
{
- programming_error ("Adding reverse spring!");
+ programming_error ("Adding reverse spring! Setting to unit spring");
+ d = 1.0;
+ strength = 1.0;
}
#ifndef NDEBUG
centralCPosition = #-6
automaticPhrasing = ##t
-
+
defaultBarType = #"|"
explicitClefVisibility = #all-visible
explicitKeySignatureVisibility = #all-visible
autoBeamSettings = #auto-beam-settings
-
+ autoBeaming = ##t
scriptDefinitions = #default-script-alist
verticalAlignmentChildCallback = #Align_interface::alignment_callback
\bar ""
}
-autoBeamOff = \property Voice.noAutoBeaming = ##t
-autoBeamOn = \property Voice.noAutoBeaming = ##f
+autoBeamOff = \property Voice.autoBeaming = ##f
+autoBeamOn = \property Voice.autoBeaming = ##t
emptyText = \property Voice.textNonEmpty = ##f
fatText = \property Voice.textNonEmpty = ##t
footer = "Mutopia-2001/04/27-xx"
}
-\version "1.3.146"
+\version "1.5.49"
dynamicUp = \property Voice.DynamicLineSpanner \override #'direction = #1
dynamicRevert = \property Voice.DynamicLineSpanner \revert #'direction
vocals = \context Voice \notes {
\clef treble
% certainly no auto-beaming for vocals
- \property Voice.noAutoBeaming = ##t
+ \property Voice.autoBeaming = ##f
\property Staff.automaticMelismata= ##t
\dynamicUp
(ly-number->string x1)
" "
(ly-number->string y1)
- " moveto"
+ " moveto "
(ly-number->string x2)
" "
(ly-number->string y2)
MIDI instrument to use ")
(translator-property-description 'midiMinimumVolume number? "[DOCUMENT-ME]")
(translator-property-description 'midiMaximumVolume number? "[DOCUMENT-ME]")
-
-
-(translator-property-description 'noAutoBeaming boolean? "If set to true then beams are not generated automatically.
-")
+(translator-property-description 'autoBeaming boolean? "If set to true
+then beams are generated automatically.")
(translator-property-description 'noDirection boolean? "Don't set directions by a2-engraver when part-combining.")
(translator-property-description 'oneBeat moment? " How long does one beat in the current time signature last?")
(translator-property-description 'pedalSustainStrings list? "List of string to print for sustain-pedal. Format is
conversions.append (((1,5,38), conv, 'SystemStartDelimiter -> systemStartDelimiter'))
+if 1:
+ def conv (str):
+ str = re.sub ('noAutoBeaming *= *##f', 'autoBeaming = ##t', str)
+ str = re.sub ('noAutoBeaming *= *##t', 'autoBeaming = ##f', str)
+ return str
+
+ conversions.append (((1,5,49), conv, 'noAutoBeaming -> autoBeaming'))
################################
# END OF CONVERSIONS