*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index afd46f802f504a60cd9e6fa79ddb83fd261a7733..f750d7998f2775943508ac5f2031db0df58a6616 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,16 @@
 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. 

diff --git a/input/regression/triplets.ly b/input/regression/triplets.ly
index 2b50f23e8a015e3a41b0b87ebfa4cba1aee2cd2b..23cb80a0170d9e5ab1a178d552766d78875b0bd6 100644 (file)
--- a/input/regression/triplets.ly
+++ b/input/regression/triplets.ly
@@ -14,8 +14,8 @@ ex = \notes \relative c' {
   \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}

diff --git a/input/test/defaultbars.ly b/input/test/defaultbars.ly
index b3af46fc60e2ca29034149b91e3b5d1f2d0a169f..517b1a3c4e4ace76beac5260306d78917ded7607 100644 (file)
--- a/input/test/defaultbars.ly
+++ b/input/test/defaultbars.ly
@@ -1,10 +1,16 @@
 \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 }
 }

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 09bf8084c8a218c2ecb7db454a3325deb1f2f378..91a581a8605312c10bb506d98463066962836eb6 100644 (file)
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -60,7 +60,7 @@ void
 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)))
@@ -69,12 +69,12 @@ Axis_group_engraver::finalize ()
       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);
@@ -176,5 +176,5 @@ ENTER_DESCRIPTION(Axis_group_engraver,
 /* 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 */       "");

diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc
index 798dbaddc522cf7e9e5ff473ed5bda6143759681..a70f658ea2e924c22e825febe1b9d9fec27a1f41 100644 (file)
--- a/lily/gourlay-breaking.cc
+++ b/lily/gourlay-breaking.cc
@@ -213,7 +213,7 @@ Gourlay_breaking::combine_demerits (Column_x_positions const &prev,
   /*
     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;

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 578d148b6e18f82dcd962a7d6274c25cacb84525..5491381a4062dc6231f23e6808b313a4c3d46725 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -35,9 +35,9 @@ StaffContext=\translator {
        \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 
@@ -54,9 +54,9 @@ StaffContext=\translator {
 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
@@ -92,9 +92,9 @@ RhythmicStaffContext=\translator{
        \consists "Output_property_engraver"    
 
 
-       MinimumVerticalExtent = ##f
-       ExtraVerticalExtent = ##f
-       VerticalExtent = ##f 
+       minimumVerticalExtent = ##f
+       extraVerticalExtent = ##f
+       verticalExtent = ##f 
        localKeySignature = #'()
 
        \consists "Pitch_squash_engraver"
@@ -242,9 +242,9 @@ StaffGroupContext = \translator {
 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"
@@ -260,9 +260,9 @@ NoteNamesContext = \translator {
        \name NoteNames
        \consistsend "Axis_group_engraver"
 
-       MinimumVerticalExtent = ##f
-       ExtraVerticalExtent = ##f
-       VerticalExtent = ##f 
+       minimumVerticalExtent = ##f
+       extraVerticalExtent = ##f
+       verticalExtent = ##f 
 
        
        \consists "Note_name_engraver"
@@ -276,9 +276,9 @@ LyricsContext = \translator {
 
 
        \consistsend "Axis_group_engraver"
-       MinimumVerticalExtent = ##f
-       ExtraVerticalExtent = ##f
-       VerticalExtent = ##f 
+       minimumVerticalExtent = ##f
+       extraVerticalExtent = ##f
+       verticalExtent = ##f 
        
        \accepts "LyricsVoice"
 }
@@ -296,9 +296,9 @@ ChordNamesContext = \translator {
        \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 
        }
 
 

diff --git a/scm/translator-property-description.scm b/scm/translator-property-description.scm
index 36845bf2631d869e876e5078db0cbc6178176c73..377fa616b00f5a17a9a478550172a65c7950829a 100644 (file)
--- a/scm/translator-property-description.scm
+++ b/scm/translator-property-description.scm
@@ -15,17 +15,17 @@
 
 
 
-(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

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 02453aeeab6e7405c527bc57d58c2a8b42354e48..7ad507e32f7ab0eb6e14c278986e900ca319aada 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -873,6 +873,19 @@ if 1:
        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      
 ################################