From 9fcacba75cc08ecee17463fea1369f96b7aac6c3 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 22:43:01 +0000
Subject: [PATCH] lilypond-1.3.2

---
 CHANGES                     | 24 ++++++++++++-
 buildscripts/set-lily.sh    |  7 ++--
 lily/include/lookup.hh      |  4 +--
 ly/params.ly                | 22 ++++++------
 ps/lily.ps                  | 40 +++++++++++++---------
 scm/lily.scm                | 68 ++++++++++++++++++-------------------
 stepmake/bin/package-zet.sh |  6 ++--
 tex/lily-ps-defs.tex        | 12 -------
 8 files changed, 102 insertions(+), 81 deletions(-)

diff --git a/CHANGES b/CHANGES
index b7f048a100..8cae195f22 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,26 @@
-pl 3.hwn2,1
+pl 3.jcn1
+	- moved bracket vars to params
+	- reverted broken lilypond-devel
+
+pl 1.uu1
+	- David's patches:
+	* mfplain.mp detection
+	* Graphical_element::common_refpoint() robuster.
+	* fixes for mudela-mode.el
+	- Dirk's patches:
+	* key signature placement,
+	* tied accidentals.
+
+pl 1.hwn2
+	- extra-offset elt property.
+	- junked Chord_tremolo
+
+pl 1.hwn1
+	- changed calling convention for {get,set,remove}_elt_property()
+	- rm'd some mutopia examples.
+
+*******
+pl 0.hwn2,1
       - Generic properties and Property_engraver. Moved most of the
 properties.
 
diff --git a/buildscripts/set-lily.sh b/buildscripts/set-lily.sh
index a4c77ff0cd..15e4633b78 100644
--- a/buildscripts/set-lily.sh
+++ b/buildscripts/set-lily.sh
@@ -35,9 +35,10 @@ testvar ()
 }
 
 
-# . ./stepmake/bin/package-zet.sh
-sourcetree=`basename \`pwd\``
-(cd .. ; rm lilypond-devel ; showln -s $sourcetree lilypond-devel)
+. ./stepmake/bin/package-zet.sh
+#urg.  LILYPOND_PREFIX, _SOURCEDIR, PATH, *INPUTS all broken
+#sourcetree=`basename \`pwd\``
+#(cd .. ; rm lilypond-devel ; showln -s $sourcetree lilypond-devel)
 
 
 echo You should add the following to your profile script
diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 27ac98459a..7d2f0b5cb1 100644
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -39,13 +39,13 @@ public:
   Molecule fill (Box b) const;
   Molecule filledbox (Box b) const;  
   Molecule hairpin (Real width, Real height, Real thick, bool decresc, bool continued) const;
-  Molecule tuplet_bracket (Real dy, Real dx, Real gap, Real thick,Real interline, Direction dir) const;
+  Molecule tuplet_bracket (Real dy, Real dx, Real gap, Real thick,Real height, Direction dir) const;
   Molecule rest (int, bool outside, String) const;
   Molecule accordion (SCM arg, Real interline_f) const;
   Molecule slur (Array<Offset> controls, Real thick) const;
   Molecule text (String style, String text, Paper_def*) const;
   Molecule staff_brace (Real dy, int) const;
-  Molecule staff_bracket (Real dy) const;
+  Molecule staff_bracket (Real height, Paper_def* paper_l) const;
   Molecule volta (Real h, Real w,  Real thick,  bool vert_start, bool vert_end) const;
   Molecule special_time_signature (String, int,int, Paper_def*) const;
   Molecule time_signature (int n,int d, Paper_def*) const;
diff --git a/ly/params.ly b/ly/params.ly
index beb538c9b4..f8123bfe8e 100644
--- a/ly/params.ly
+++ b/ly/params.ly
@@ -16,6 +16,8 @@ beam_thickness = 0.52 * (\interline - \stafflinethickness);
 interbeam = (2.0 * \interline + \stafflinethickness - \beam_thickness) / 2.0;
 interbeam4 = (3.0 * \interline - \beam_thickness) / 3.0;
 
+
+
 % stems and beams
 %
 % poor man's array size
@@ -89,16 +91,9 @@ grace_forced_stem_shorten3 = \grace_forced_stem_shorten2;
 % * MEAN     : mean centre distance of all notes
 % * MEDIAN   : mean centre distance weighted per note
 %
-% enum Dir_algorithm { DOWN=-1, UP=1, MAJORITY=2, MEAN, MEDIAN };
-%
-DOWN = -1.0;
-UP = 1.0;
-MAJORITY = 2.0;
-MEAN = 3.0;
-MEDIAN = 4.0;
 
-#'beam_dir_algorithm = #'majority
-#'slope_quantisation = #'normal
+#'slope-quantisation = #'normal
+#'beam-dir-algorithm = #'majority	%urg.
 
 
 %{
@@ -109,8 +104,6 @@ used based on the mean center distance.  If set to 4.0 then median
 selection is used, based on the median center distance.
 %}
 
-% [Ross]: majority
-beam_dir_algorithm = \MAJORITY;
 
 % catch suspect beam slopes, set slope to zero if
 % outer stem is lengthened more than
@@ -206,6 +199,13 @@ barthick_thick = 6.0* \stafflinethickness;
 barthick_thin = 1.6*\stafflinethickness;
 barthick_score = 1.6*\stafflinethickness;
 
+bracket_arch_thick = \interline / 3.0;
+bracket_width = 2.0 * \interline;
+bracket_thick = 2.0 * \stafflinethickness;
+bracket_arch_height = 1.5 * \interline;
+bracket_arch_width = \bracket_arch_height;
+bracket_arch_angle = 50.0;
+
 tuplet_spanner_gap = 2.0 * \interline;
 tuplet_thick = 1.0*\stafflinethickness;
 volta_thick = 1.6*\stafflinethickness;
diff --git a/ps/lily.ps b/ps/lily.ps
index 265789d1d7..b948ccff70 100644
--- a/ps/lily.ps
+++ b/ps/lily.ps
@@ -142,30 +142,30 @@
 % 
 % 
 % 
-/half_bracket 
+/half_bracket
 { 
 %6 
 	0 0 
 %5a 
-	bracket_b bracket_v add bracket_h bracket_t sub bracket_u add 
-	bracket_alpha bracket_v -0.15 mul bracket_traject 
+	arch_thick arch_height add half_height bracket_thick sub arch_width add 
+	arch_angle arch_height -0.15 mul bracket_traject 
 %5b 
-	1 bracket_h 
-	0 bracket_v 0.5 mul bracket_traject 
+	1 half_height 
+	0 arch_height 0.5 mul bracket_traject 
 %5c 
-	0 bracket_h 
+	0 half_height 
 %4a 
-	bracket_b bracket_h bracket_t sub 
-	0 bracket_v 0.4 mul bracket_traject 
+	arch_thick half_height bracket_thick sub 
+	0 arch_height 0.4 mul bracket_traject 
 %4b 
-	bracket_b bracket_v add bracket_h bracket_t sub bracket_u add 
-	bracket_alpha bracket_v -0.25 mul bracket_traject 
+	arch_thick arch_height add half_height bracket_thick sub arch_width add 
+	arch_angle arch_height -0.25 mul bracket_traject 
 %4c 
-	bracket_b bracket_v add bracket_h bracket_t sub bracket_u add 
+	arch_thick arch_height add half_height bracket_thick sub arch_width add 
 %3 
-	bracket_b bracket_h bracket_t sub 
+	arch_thick half_height bracket_thick sub 
 %2 
-	bracket_b 0 
+	arch_thick 0 
 %1 
 	0 0 
 } bind def 
@@ -182,10 +182,18 @@
 	grestore 
 } bind def 
 % 
-/draw_bracket % height 
+/draw_bracket % arch_angle arch_width arch_height bracket_width bracket_height arch_thick bracket_thick
 { 
-	2 div bracket_b add /bracket_h exch def 
-	bracket_t setlinewidth 
+	% urg
+	/bracket_thick exch def
+	/arch_thick exch def
+	/bracket_height exch def
+	/bracket_width exch def
+	/arch_height exch def
+	/arch_width exch def
+	/arch_angle exch def
+%
+	bracket_height 2 div arch_thick add /half_height exch def 
 % urg: the only Level-2 PS, check effect in print 
 %	true setstrokeadjust 
 	1 setlinecap 
diff --git a/scm/lily.scm b/scm/lily.scm
index de49911154..980344441c 100644
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -90,34 +90,34 @@
 
 (define space-alist
  '(
-   (("" "Clef_item") . (minimum_space 1.0))
-   (("" "Staff_bar") . (minimum_space 0.0))
-   (("" "Clef_item") . (minimum_space 1.0))
-   (("" "Key_item") . (minimum_space 0.5))
-   (("" "Span_bar") . (extra_space 0.0))
-   (("" "Time_signature") . (extra_space 0.0))
-   (("" "begin-of-note") . (minimum_space 1.5))
-   (("Clef_item" "Key_item") . (minimum_space 4.0))
-   (("Key_item" "Time_signature") . (extra_space 1.0))
-   (("Clef_item"  "Time_signature") . (minimum_space 3.5))
-   (("Staff_bar" "Clef_item") .   (minimum_space 1.0))
-   (("Clef_item"  "Staff_bar") .  (minimum_space 3.7))
-   (("Time_signature" "Staff_bar") .  (minimum_space 2.0))
-   (("Key_item"  "Staff_bar") .  (extra_space 1.0))
-   (("Span_bar" "Clef_item") .   (extra_space 1.0))
-   (("Clef_item"  "Span_bar") . (minimum_space 3.7))
-   (("Time_signature" "Span_bar") . (minimum_space 2.0))
-   (("Key_item"  "Span_bar") . (minimum_space 2.5))
-   (("Staff_bar" "Time_signature") . (minimum_space 1.5)) ;double check this.
-   (("Time_signature" "begin-of-note") . (extra_space 2.0)) ;double check this.
-   (("Key_item" "begin-of-note") . (extra_space 2.5))
-   (("Staff_bar" "begin-of-note") . (extra_space 1.0))
-   (("Clef_item" "begin-of-note") . (minimum_space 5.0))
-   (("" "Breathing_sign") . (minimum_space 0.0))
-   (("Breathing_sign" "Key_item") . (minimum_space 1.5))
-   (("Breathing_sign" "begin-of-note") . (minimum_space 1.0))
-   (("Breathing_sign" "Staff_bar") . (minimum_space 1.5))
-   (("Breathing_sign" "Clef_item") . (minimum_space 2.0))
+   (("" "Clef_item") . (minimum-space 1.0))
+   (("" "Staff_bar") . (minimum-space 0.0))
+   (("" "Clef_item") . (minimum-space 1.0))
+   (("" "Key_item") . (minimum-space 0.5))
+   (("" "Span_bar") . (extra-space 0.0))
+   (("" "Time_signature") . (extra-space 0.0))
+   (("" "begin-of-note") . (minimum-space 1.5))
+   (("Clef_item" "Key_item") . (minimum-space 4.0))
+   (("Key_item" "Time_signature") . (extra-space 1.0))
+   (("Clef_item"  "Time_signature") . (minimum-space 3.5))
+   (("Staff_bar" "Clef_item") .   (minimum-space 1.0))
+   (("Clef_item"  "Staff_bar") .  (minimum-space 3.7))
+   (("Time_signature" "Staff_bar") .  (minimum-space 2.0))
+   (("Key_item"  "Staff_bar") .  (extra-space 1.0))
+   (("Span_bar" "Clef_item") .   (extra-space 1.0))
+   (("Clef_item"  "Span_bar") . (minimum-space 3.7))
+   (("Time_signature" "Span_bar") . (minimum-space 2.0))
+   (("Key_item"  "Span_bar") . (minimum-space 2.5))
+   (("Staff_bar" "Time_signature") . (minimum-space 1.5)) ;double check this.
+   (("Time_signature" "begin-of-note") . (extra-space 2.0)) ;double check this.
+   (("Key_item" "begin-of-note") . (extra-space 2.5))
+   (("Staff_bar" "begin-of-note") . (extra-space 1.0))
+   (("Clef_item" "begin-of-note") . (minimum-space 5.0))
+   (("" "Breathing_sign") . (minimum-space 0.0))
+   (("Breathing_sign" "Key_item") . (minimum-space 1.5))
+   (("Breathing_sign" "begin-of-note") . (minimum-space 1.0))
+   (("Breathing_sign" "Staff_bar") . (minimum-space 1.5))
+   (("Breathing_sign" "Clef_item") . (minimum-space 2.0))
    )
 )
  
@@ -126,7 +126,7 @@
     (if entry
 	(cdr entry)
 	(begin (ly-warn (string-append "Unknown spacing pair `" this "', `" next "'"))
-	       '(minimum_space 0.0)))))
+	       '(minimum-space 0.0)))))
   
 	
 
@@ -201,8 +201,8 @@
   (define (beam width slope thick)
     (embedded-ps ((ps-scm 'beam) width slope thick)))
 
-  (define (bracket h)
-    (embedded-ps ((ps-scm 'bracket) h)))
+  (define (bracket arch_angle arch_width arch_height width height arch_thick thick)
+    (embedded-ps ((ps-scm 'bracket) arch_angle arch_width arch_height width height arch_thick thick)))
 
   (define (dashed-slur thick dash l)
     (embedded-ps ((ps-scm 'dashed-slur)  thick dash l)))
@@ -267,7 +267,6 @@
 	  (regexp-substitute/global #f "\\\\" s 'pre "$\\backslash$" 'post)
 	  s))
       
-
   (define (lily-def key val)
     (string-append
      "\\def\\"
@@ -439,8 +438,9 @@
     (string-append
      (numbers->string (list width slope thick)) " draw_beam" ))
 
-  (define (bracket h)
-    (invoke-dim1 " draw_bracket" h))
+  (define (bracket arch_angle arch_width arch_height width height arch_thick thick)
+    (string-append
+     (numbers->string (list arch_angle arch_width arch_height width height arch_thick thick)) " draw_bracket" ))
 
   (define (char i)
     (invoke-char " show" i))
diff --git a/stepmake/bin/package-zet.sh b/stepmake/bin/package-zet.sh
index b970f50b48..c7ec22bf94 100755
--- a/stepmake/bin/package-zet.sh
+++ b/stepmake/bin/package-zet.sh
@@ -24,8 +24,10 @@ fi
 # and create links to here, if necessary
 #
 sourcetree=`basename \`pwd\``
-(cd ..; rm -f $package 2>&1 > /dev/null)
-(cd ..; ln -s $sourcetree $package)
+if [ "xsourcetree" != "x$package" ]; then
+	(cd ..; rm -f $package 2>&1 > /dev/null)
+	(cd ..; ln -s $sourcetree $package)
+fi
 #
 if [ ! -r $sources ]; then
 	(cd ..; ln -s `pwd` $sources)
diff --git a/tex/lily-ps-defs.tex b/tex/lily-ps-defs.tex
index 084d51ce55..ca33b2543d 100644
--- a/tex/lily-ps-defs.tex
+++ b/tex/lily-ps-defs.tex
@@ -8,24 +8,12 @@
 % note the ! sign.  See dvips.info for details.
 %
 
-% ARG. Fix brackets
 \def\turnOnPostScript{%
         % This sets CTM so that you get to the currentpoint
         % by executing a 0 0 moveto
         \def\embeddedps##1{%
                 \special{ps: @beginspecial @setspecial ##1 @endspecial}       
         }
-        %
-        \special{! 
-/stafflinethickness \mudelapaperstafflinethickness\space def
-/interline \mudelapaperinterline\space def
-interline 3 div /bracket_b exch def
-interline 2 mul /bracket_w exch def
-stafflinethickness 2 mul /bracket_t exch def
-interline 1.5 mul /bracket_v exch def
-bracket_v /bracket_u exch def
-50 /bracket_alpha exch def
-1 setlinecap}
 }
 
 \def\turnOnExperimentalFeatures{}
-- 
2.39.5