2002-06-07 Han-Wen Nienhuys <hanwen@cs.uu.nl>
* scripts/convert-ly.py: add tuplet-X-visibility rules.
+ add VerticalExtent -> verticalExtent rules.
+
+ * lily/axis-group-engraver.cc: consistent case for
+ XxxxVerticalExtent properties.
* Documentation/user/refman.itely (Tuplets): update
tuplet-X-visibility properties.
+ * input/test/defaultbars.ly: Corrected (thanks Mats)
+
2002-06-05 Han-Wen Nienhuys <hanwen@cs.uu.nl>
* lily/beam.cc (shift_region_to_valid): fix stupido bug.
\repeat "volta" 2 {
\times 2/3 {c8( cis d} \times 2/3 {dis e f}
\times 2/3 {fis g gis} \times 2/3 {a bes b} |
- \property Voice.TupletBracket \override #'tuplet-number-visibility = ##f
- \property Voice.TupletBracket \override #'tuplet-bracket-visibility = ##f
+ \property Voice.TupletBracket \override #'number-visibility = ##f
+ \property Voice.TupletBracket \override #'bracket-visibility = ##f
\times 2/3 {c8 cis d} \times 2/3 {dis e f}
\times 2/3 {fis g gis} \times 2/3 {a bes b} |
\times 2/3 {c b bes} \times 2/3 {a aes g}
\version "1.3.146"
+\header {
+
+ texidoc = "By setting barAlways and defaultBarType, you can
+ automatically insert barlines everywhere."
+}
+
\score {
\notes {
- \property Staff.barAlways = ##t
- \property Staff.defaultBarType = ":|:"
+ \property Score.barAlways = ##t
+ \property Score.defaultBarType = ":|:"
c4 c4 c4 c4 }
}
Axis_group_engraver::finalize ()
{
String type = daddy_grav_l ()->type_str_ ;
- SCM dims = get_property ("VerticalExtent");
+ SCM dims = get_property ("verticalExtent");
if (gh_pair_p (dims) && gh_number_p (ly_car (dims))
&& gh_number_p (ly_cdr (dims)))
staffline_p_->set_grob_property ("extent-Y", dims);
}
- dims = get_property ("MinimumVerticalExtent");
+ dims = get_property ("minimumVerticalExtent");
if (gh_pair_p (dims) && gh_number_p (ly_car (dims))
&& gh_number_p (ly_cdr (dims)))
staffline_p_->set_grob_property ("minimum-extent-Y", dims);
- dims = get_property ("ExtraVerticalExtent");
+ dims = get_property ("extraVerticalExtent");
if (gh_pair_p (dims) && gh_number_p (ly_car (dims))
&& gh_number_p (ly_cdr (dims)))
staffline_p_->set_grob_property ("extra-extent-Y", dims);
/* descr */ "Group all objects created in this context in a VerticalAxisGroup spanner.",
/* creats*/ "VerticalAxisGroup",
/* acks */ "grob-interface",
-/* reads */ "VerticalExtent MinimumVerticalExtent ExtraVerticalExtent",
+/* reads */ "verticalExtent minimumVerticalExtent extraVerticalExtent",
/* write */ "");
/*
Q: do want globally non-cramped lines, or locally equally cramped lines.
*/
- Real demerit = abs (this_one.force_f_) + abs (prev.force_f_ - this_one.force_f_)
+ Real demerit = abs (this_one.force_f_) + 0.1 *abs (prev.force_f_ - this_one.force_f_)
+ break_penalties;
#else
Real demerit = abs (this_one.force_f_) + break_penalties;
\consistsend "Axis_group_engraver"
- MinimumVerticalExtent = #'(-6 . 6)
- ExtraVerticalExtent = ##f
- VerticalExtent = ##f
+ minimumVerticalExtent = #'(-6 . 6)
+ extraVerticalExtent = ##f
+ verticalExtent = ##f
localKeySignature = #'()
% explicitly set instrument, so we don't get
StaffContainerContext = \translator {
\type Engraver_group_engraver
\consists "Axis_group_engraver"
- MinimumVerticalExtent = ##f
- ExtraVerticalExtent = ##f
- VerticalExtent = ##f
+ minimumVerticalExtent = ##f
+ extraVerticalExtent = ##f
+ verticalExtent = ##f
localKeySignature = #'()
\accepts Staff
\consists "Output_property_engraver"
- MinimumVerticalExtent = ##f
- ExtraVerticalExtent = ##f
- VerticalExtent = ##f
+ minimumVerticalExtent = ##f
+ extraVerticalExtent = ##f
+ verticalExtent = ##f
localKeySignature = #'()
\consists "Pitch_squash_engraver"
LyricsVoiceContext= \translator{
\type "Engraver_group_engraver"
\consistsend "Axis_group_engraver"
- MinimumVerticalExtent = #(cons -1.2 1.2)
- ExtraVerticalExtent = ##f
- VerticalExtent = ##f
+ minimumVerticalExtent = #(cons -1.2 1.2)
+ extraVerticalExtent = ##f
+ verticalExtent = ##f
\name LyricsVoice
\consists "Separating_line_group_engraver"
\consists "Lyric_engraver"
\name NoteNames
\consistsend "Axis_group_engraver"
- MinimumVerticalExtent = ##f
- ExtraVerticalExtent = ##f
- VerticalExtent = ##f
+ minimumVerticalExtent = ##f
+ extraVerticalExtent = ##f
+ verticalExtent = ##f
\consists "Note_name_engraver"
\consistsend "Axis_group_engraver"
- MinimumVerticalExtent = ##f
- ExtraVerticalExtent = ##f
- VerticalExtent = ##f
+ minimumVerticalExtent = ##f
+ extraVerticalExtent = ##f
+ verticalExtent = ##f
\accepts "LyricsVoice"
}
\consists "Chord_name_engraver"
\consists "Skip_req_swallow_translator"
\consistsend "Axis_group_engraver"
- MinimumVerticalExtent = ##f
- ExtraVerticalExtent = ##f
- VerticalExtent = ##f
+ minimumVerticalExtent = ##f
+ extraVerticalExtent = ##f
+ verticalExtent = ##f
}
-(translator-property-description 'ExtraVerticalExtent
+(translator-property-description 'extraVerticalExtent
number-pair? "extra vertical extent, same format as MinimumVerticalExtent")
-(translator-property-description 'MinimumVerticalExtent number-pair?
+(translator-property-description 'minimumVerticalExtent number-pair?
"minimum vertical extent, same format as VerticalExtent")
-(translator-property-description 'VerticalExtent number-pair?
+(translator-property-description 'verticalExtent number-pair?
"hard coded vertical extent.
The format is a pair of dimensions, for example, this sets the sizes
of a staff to 10 (5+5) staffspaces high.
@example
-property Staff.VerticalExtent = #(-5.0 . 5.0)
+property Staff.verticalExtent = #(-5.0 . 5.0)
@end example
VerticalExtent, MinimumVerticalExtent and ExtraVerticalExtent are
conversions.append (((1,5,58), conv, 'deprecate textNonEmpty'))
+if 1:
+ def conv (str):
+ str = re.sub ('MinimumVerticalExtent', 'MinimumV@rticalExtent', str)
+ str = re.sub ('ExtraVerticalExtent', 'ExtraV@rticalExtent', str)
+ str = re.sub ('VerticalExtent', 'verticalExtent', str)
+ str = re.sub ('ExtraV@rticalExtent', 'extraVerticalExtent', str)
+ str = re.sub ('MinimumV@rticalExtent', 'minimumVerticalExtent', str)
+ return str
+
+ conversions.append (((1,5,59), conv,
+ 'XxxxVerticalExtent -> xxxVerticalExtent'))
+
+
################################
# END OF CONVERSIONS
################################