* lily/beam.cc (struct Int_set): typo.

* mf/feta-beugel.mf (code): braces should start at 0, not 1.

* lily/beam.cc (struct Int_set): don't get stuck inserting
interval segments of length 0.0.

* scripts/convert-ly.py:  break-align conversion.

diff --git a/ChangeLog b/ChangeLog
index acc6853502c55d98d544c417b94369362c3c1811..2034382be988189c77c5f870c33700c556ecf4a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2002-08-08  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * lily/beam.cc (struct Int_set): typo.
+
+       * mf/feta-beugel.mf (code): braces should start at 0, not 1.
+
        * lily/include/lily-guile.hh (scm_int2num): guile 1.4 compatibility. 
 
        * scm/grob-description.scm (all-grob-descriptions): set

diff --git a/lily/beam.cc b/lily/beam.cc
index b4a98a36a70c764b01a886b200cc87d7cf3b545b..d3e2d0b525037ee662b59a5a5e3d8fa3a5ff0f6c 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -599,7 +599,7 @@ struct Int_set
            before[RIGHT] = s[LEFT];
            after[LEFT] = s[RIGHT];
 
-           if (before.empty_b() && before.length () > 0.0)
+           if (!before.empty_b() && before.length () > 0.0)
              {
                allowed_regions_.insert (before, i);
                i++;

diff --git a/mf/feta-beugel.mf b/mf/feta-beugel.mf
index 419f3b59edc221e7e6653c750bdadb4ac00e0b81..8f779e1c6894a129cc70ef503c45f2d59eff9d24 100644 (file)
--- a/mf/feta-beugel.mf
+++ b/mf/feta-beugel.mf
@@ -8,7 +8,7 @@ mode_setup;
 staffsize#:=16pt#;
 
 save code;
-code := 0;
+code := -1;
 
 
 def abc_encode_int (expr i) =
@@ -19,8 +19,6 @@ def abc_encode_int (expr i) =
        fi
 enddef ;
 
-message (abc_encode_int (26));
-
 def draw_brace (expr height_sharp, width_sharp, slt_sharp) =
 
        save pendir, height, width, thin, thick, slt;

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index bcdd1f261cb295a3c01adda7c13b88baf2f2b45f..2e7f64fb1a7d95dcd9440873cb1ce563219a3435 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -840,6 +840,35 @@ if 1:
        
        conversions.append (((1,5,38), conv, 'SystemStartDelimiter -> systemStartDelimiter'))
 
+
+if 1:
+       def conv (str):
+       
+               def func(match):
+                       break_dict = {
+                       "Instrument_name": "instrument-name",
+                       "Left_edge_item": "left-edge",
+                       "Span_bar": "span-bar",
+                       "Breathing_sign": "breathing-sign",
+                       "Staff_bar": "staff-bar",
+                       "Clef_item": "clef",
+                       "Key_item": "key-signature",
+                       "Time_signature": "time-signature",
+                       "Custos": "custos"
+                       }
+                       props =  match.group (1)
+                       for (k,v) in break_dict.items():
+                               props = re.sub (k, v, props)
+                       return  "breakAlignOrder = #'(%s)" % props
+
+               str = re.sub ("breakAlignOrder *= *#'\\(([a-z_\n\tA-Z ]+)\\)",
+                             func, str)
+               return str
+
+       # 40 ? 
+       conversions.append (((1,5,40), conv, 'breakAlignOrder property names'))
+       
+
 if 1:
        def conv (str):
                str = re.sub ('noAutoBeaming *= *##f', 'autoBeaming = ##t', str)
@@ -913,34 +942,6 @@ if 1:
        
        conversions.append (((1,5,68), conv, 'ly-set-X-property -> ly-set-X-property!'))
 
-if 1:
-       def conv (str):
-       
-               def func(match):
-                       break_dict = {
-                       "Instrument_name": "instrument-name",
-                       "Left_edge_item": "left-edge",
-                       "Span_bar": "span-bar",
-                       "Breathing_sign": "breathing-sign",
-                       "Staff_bar": "staff-bar",
-                       "Clef_item": "clef",
-                       "Key_item": "key-signature",
-                       "Time_signature": "time-signature",
-                       "Custos": "custos"
-                       }
-                       props =  match.group (1)
-                       for (k,v) in break_dict.items():
-                               props = re.sub (k, v, props)
-                       return  "breakAlignOrder = #'(%s)" % props
-
-               str = re.sub ("breakAlignOrder *= *#'\\(([a-z_\n\tA-Z ]+)\\)",
-                             func, str)
-               return str
-
-       # 40 ? 
-       conversions.append (((1,5,40), conv, 'breakAlignOrder property names'))
-       
-
 ################################
 #      END OF CONVERSIONS      
 ################################