patch::: 1.3.41.mwd1: Repeat bar questions and patches

1.3.41.mwd1
===========

* Fixed extra dots on repeat span-bars.

* Changed the look of :|: repeat bars.

---
Generated by Michael Welsh Duggan <md5i@cs.cmu.edu>,
>From = lilypond-1.3.41, To = lilypond-1.3.41.mwd1

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.41.mwd1.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure

diff --git a/CHANGES b/CHANGES
index 3701ebff5676e1a6927261cc9a1397971aeee137..29ebd84c8e44b5471e1ea858a97cb19db8f95152 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,16 @@
-1.3.41.jcn1
+--- ../lilypond-1.3.41/CHANGES Thu Mar 30 04:05:01 2000
+++ b/CHANGES   Fri Mar 31 00:30:53 2000
+@@ -1,3 +1,10 @@
+1.3.41.mwd1
+===========
+
+* Fixed extra dots on repeat span-bars.
+
+* Changed the look of :|: repeat bars.
+
+ 1.3.40.jcn3
+ ===========
+ 1.3.41.jcn1
 ===========
 
 * More windows distribution changes: distribute minimal .zip too, and

diff --git a/VERSION b/VERSION
index c00f04e683b486cde9c9be481d9cdf15fd22c7d6..c4a2122142e46ed5a04951ee92b678d5ad6749a5 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=41
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=mwd1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/bar.cc b/lily/bar.cc
index 70432970eee65e98d05cd6652731a6e96c84360f..bdb41250ff60bd371122f23165b44761988e840c 100644 (file)
--- a/lily/bar.cc
+++ b/lily/bar.cc
@@ -122,10 +122,21 @@ Bar::compound_barline (String str, Real h) const
     }
   else if (str == ":|:")
     {
-      m.add_at_edge (X_AXIS, LEFT, thick, thinkern);
-      m.add_at_edge (X_AXIS, LEFT, colon, kern);      
-      m.add_at_edge (X_AXIS, RIGHT, thick, kern);
+//        m.add_at_edge (X_AXIS, LEFT, thick, thinkern);
+//        m.add_at_edge (X_AXIS, LEFT, colon, kern);      
+//        m.add_at_edge (X_AXIS, RIGHT, thick, kern);
+//        m.add_at_edge (X_AXIS, RIGHT, colon, kern);      
+      m.add_at_edge (X_AXIS, RIGHT, thick, 0);
+      m.add_at_edge (X_AXIS, RIGHT, thin, kern);
       m.add_at_edge (X_AXIS, RIGHT, colon, kern);      
+      m.add_at_edge (X_AXIS, LEFT, thin, kern);
+      m.add_at_edge (X_AXIS, LEFT, colon, kern);      
+    }
+  else if (str == ";|;")
+    {
+      m.add_at_edge (X_AXIS, RIGHT, thick, 0);
+      m.add_at_edge (X_AXIS, RIGHT, thin, kern);
+      m.add_at_edge (X_AXIS, LEFT, thin, kern);
     }
   else if (str == ".|.")
     {

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index ac458ad177d0343ae111a6121d53d29ada22a2cd..2ed93ad54503940fd1dd9fb5b4a77de94ae0510c 100644 (file)
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -41,10 +41,10 @@ Span_bar::width_callback (Dimension_cache const * c)
 void
 Span_bar::before_line_breaking ()
 {
-  Bar::before_line_breaking ();
-  
   evaluate_empty ();
   
+  Bar::before_line_breaking ();
+  
   //  set_empty (false, Y_AXIS); // a hack to make mark scripts work.
 }
 
@@ -94,13 +94,10 @@ Span_bar::evaluate_empty ()
     }
   else if (type_str== ":|:")
     {
-      type_str= ".|.";
+      type_str= ";|;";
     }
+    set_elt_property ("glyph", ly_str02scm (type_str.ch_C ()));
   }
-
-  /*
-    uhh. should do something with type_str ?!!
-   */
 }
 
 Interval

diff --git a/scm/lily.scm b/scm/lily.scm
index f2645988b89a668526598bfd1ae0d5a2cb86975e..c8655ddd097f8f2f14810b19ddfed5a13fab485a 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -962,9 +962,11 @@
 (define (break-barline glyph dir)
    (let ((result (assoc glyph 
                        '((":|:" . (":|" . "|:"))
+                         (";|;" . ("|." . ".|"))
                          ("|" . ("|" . ""))
                          ("|s" . (nil . "|"))
                          ("|:" . ("|" . "|:"))
+                         (".|" . ("|" . ".|"))
                          ("|." . ("|." . nil))
                          (":|" . (":|" . nil))
                          ("||" . ("||" . nil))