From: hanwen <hanwen>
Date: Tue, 20 Jan 2004 15:20:16 +0000 (+0000)
Subject: * mf/GNUmakefile ($(outdir)/$(redhat-package)): use http for
X-Git-Tag: release/2.1.13~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=47b93166a1528ef8c37d435fb7326c9464030260;p=lilypond.git

* mf/GNUmakefile ($(outdir)/$(redhat-package)): use http for
downloading.

* lily/tuplet-bracket.cc (get_default_dir): new algorithm for
tuplet direction.
---

diff --git a/ChangeLog b/ChangeLog
index 7b6ea7d5ed..e847f78c3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-01-20  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+	* mf/GNUmakefile ($(outdir)/$(redhat-package)): use http for
+	downloading.
+
 	* scm/output-lib.scm (shift-right-at-line-begin): new function:
 	kludge rehearsalmark placement.
 
diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index ea911228bd..83d2c3d9f3 100644
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -8585,7 +8585,7 @@ staffs. The size of individual staffs are relative to the global size,
 which can be set   in the following manner:
 
 @example
-  #(set-staff-size 14)
+  #(set-global-staff-size 14)
 @end example
 
 This sets the global default size to 14pt staff height, and scales all
diff --git a/VERSION b/VERSION
index 791a0827c3..842bb6259b 100644
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=1
-PATCH_LEVEL=12
+PATCH_LEVEL=13
 MY_PATCH_LEVEL=
 
diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly
index 640a709f89..450b515b09 100644
--- a/input/mutopia/F.Schubert/morgenlied.ly
+++ b/input/mutopia/F.Schubert/morgenlied.ly
@@ -26,13 +26,13 @@
 
 }
 
-\version "2.1.10"
+\version "2.1.13"
 manuscriptBreak = { \break }
 
 
 
 \paper  {
-    #(set-staff-size (* 6.0 1 ))
+    #(set-global-staff-size(* 6.0 1 ))
     linewidth = #(* mm 160)
     indent = 8\mm
     interscoreline = 2.\mm
diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly
index 0576ff65a2..be046e9593 100644
--- a/input/mutopia/F.Schubert/standchen.ly
+++ b/input/mutopia/F.Schubert/standchen.ly
@@ -42,12 +42,12 @@ instrument = "Piano"
  footer = "Mutopia-2001/04/27-xx"
 } 
 
-\version "2.1.11"
+\version "2.1.13"
 
 dynamicUp = \property Voice.DynamicLineSpanner \override #'direction = #1
 dynamicRevert = \property Voice.DynamicLineSpanner \revert #'direction
 
-#(set-staff-size 16)
+#(set-global-staff-size 16)
 
 vocalVerse =  \notes\relative c''{
 	\dynamicUp
diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly
index 35bad4e51e..2f54ab5e3f 100644
--- a/input/mutopia/R.Schumann/romanze-op28-2.ly
+++ b/input/mutopia/R.Schumann/romanze-op28-2.ly
@@ -3,8 +3,8 @@
 
 \include "deutsch.ly"
 
-#(set-staff-size 16)
-\version "2.1.11"
+#(set-global-staff-size 16)
+\version "2.1.13"
 
 \header {
   title = "Romanzen"
diff --git a/input/no-notation/denneboom.ly b/input/no-notation/denneboom.ly
index 254efb8aee..9e882944bb 100644
--- a/input/no-notation/denneboom.ly
+++ b/input/no-notation/denneboom.ly
@@ -1,4 +1,4 @@
-\version "2.1.11"
+\version "2.1.13"
 \header{
 filename = 	 "denneboom.ly"
 enteredby = 	 "jcn"
@@ -6,7 +6,7 @@ copyright = 	 "public domain"
 }
 %{ file tests silly line shapes %}
 
-#(set-staff-size 20)
+#(set-global-staff-size 20)
 
 
 
diff --git a/input/no-notation/midi-volume-equaliser.ly b/input/no-notation/midi-volume-equaliser.ly
index 6e5bd7ec5f..636ac3e0ee 100644
--- a/input/no-notation/midi-volume-equaliser.ly
+++ b/input/no-notation/midi-volume-equaliser.ly
@@ -1,12 +1,12 @@
 #(ly:set-option 'old-relative)
-\version "2.1.11"
+\version "2.1.13"
 \header {
 texidoc = "@cindex Midi Volume Equaliser
 The full orchestra plays a notes, where groups stop one after
 another. Use this to tune equalizer settings. "
 }
 
-#(set-staff-size 16)
+#(set-global-staff-size 16)
 
 %{
 
diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly
index c53c8e5912..b2a356a0ea 100644
--- a/input/puer-fragment.ly
+++ b/input/puer-fragment.ly
@@ -1,4 +1,4 @@
-\version "2.1.11"
+\version "2.1.13"
 \header {
     title	= "Puer natus est nobis (excerptum)"
     subtitle	= "Antiphona ad introitum VII"
@@ -17,7 +17,7 @@ before the ligature (not demonstrated in this example)."
 
 }
 
-#(set-staff-size 26)
+#(set-global-staff-size 26)
 \include "gregorian-init.ly"
 
 %%% N.B.: Yes, I know, the formatting of the following looks awful,
diff --git a/input/regression/size11.ly b/input/regression/size11.ly
index e48b728fc5..b99037b005 100644
--- a/input/regression/size11.ly
+++ b/input/regression/size11.ly
@@ -1,4 +1,4 @@
-\version "2.1.11"
+\version "2.1.13"
 
 \header{
 texidoc="
@@ -14,5 +14,5 @@ foollilypondbook = "
 
 
 
-#(set-staff-size 11)
+#(set-global-staff-size 11)
 \include "allfontstyle.lyinc"
diff --git a/input/regression/size13.ly b/input/regression/size13.ly
index d73d433728..2ecef9c4a2 100644
--- a/input/regression/size13.ly
+++ b/input/regression/size13.ly
@@ -1,4 +1,4 @@
-\version "2.1.11"
+\version "2.1.13"
 foollilypondbook = "
 \score
 "
@@ -7,5 +7,5 @@ foollilypondbook = "
     texidoc ="Staff height 13 pt."
     }
 
-#(set-staff-size 13)
+#(set-global-staff-size 13)
 \include "allfontstyle.lyinc"
diff --git a/input/regression/size16.ly b/input/regression/size16.ly
index 6c7cea8f11..35b8945a2e 100644
--- a/input/regression/size16.ly
+++ b/input/regression/size16.ly
@@ -1,4 +1,4 @@
-\version "2.1.11"
+\version "2.1.13"
 foollilypondbook = "
 \score
 "
@@ -9,5 +9,5 @@ foollilypondbook = "
 
 
 
-#(set-staff-size 16)
+#(set-global-staff-size 16)
 \include "allfontstyle.lyinc"
diff --git a/input/regression/size20.ly b/input/regression/size20.ly
index 32f631b0ac..8030e36c21 100644
--- a/input/regression/size20.ly
+++ b/input/regression/size20.ly
@@ -1,4 +1,4 @@
-\version "2.1.11"
+\version "2.1.13"
 foollilypondbook = "
 \score
 "
@@ -9,5 +9,5 @@ foollilypondbook = "
 
 
 
-#(set-staff-size 20)
+#(set-global-staff-size 20)
 \include "allfontstyle.lyinc"
diff --git a/input/regression/size23.ly b/input/regression/size23.ly
index 880a54c7f0..0544666362 100644
--- a/input/regression/size23.ly
+++ b/input/regression/size23.ly
@@ -1,4 +1,4 @@
-\version "2.1.11"
+\version "2.1.13"
 foollilypondbook = "
 \score
 "
@@ -8,5 +8,5 @@ foollilypondbook = "
     }
 
 
-#(set-staff-size 23)
+#(set-global-staff-size 23)
 \include "allfontstyle.lyinc"
diff --git a/input/regression/size26.ly b/input/regression/size26.ly
index 959fca5afd..888d9e6023 100644
--- a/input/regression/size26.ly
+++ b/input/regression/size26.ly
@@ -1,4 +1,4 @@
-\version "2.1.11"
+\version "2.1.13"
 foollilypondbook = "
 \score
 "
@@ -9,5 +9,5 @@ foollilypondbook = "
 
 
 
-#(set-staff-size 26)
+#(set-global-staff-size 26)
 \include "allfontstyle.lyinc"
diff --git a/input/template/jazz-combo.ly b/input/template/jazz-combo.ly
index 16892572f5..fa59fe0a1a 100644
--- a/input/template/jazz-combo.ly
+++ b/input/template/jazz-combo.ly
@@ -1,4 +1,4 @@
-\version "2.1.11"
+\version "2.1.13"
 \header {
         title = "Song"
         subtitle = "(tune)"
@@ -9,7 +9,7 @@
 	texidoc = "Jazz tune for combo (horns, piano, drums, bass, guitar)."
 }
 
-#(set-staff-size 16)
+#(set-global-staff-size 16)
 \include "english.ly"
 
 %%%%%%%%%%%% Some macros %%%%%%%%%%%%%%%%%%%
diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index abe8f80e3d..eb09706250 100644
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,5 +1,5 @@
 
-\version "2.1.11"
+\version "2.1.13"
 
 
 % Ugh, we need to override some LaTeX titling stuff
@@ -16,7 +16,7 @@ texidoc = "@cindex Orchestra Score
 Demonstration of how to set up an orchestral score (Beethoven's Coriolan overture).
 " }
 
-#(set-staff-size 16)
+#(set-global-staff-size 16)
 
 raisedFlat = \markup { \raise #0.4 \smaller \smaller \musicglyph #"accidentals--1"  }
 
diff --git a/input/test/fill-a4.ly b/input/test/fill-a4.ly
index 937e2a12b5..c86908b7a1 100644
--- a/input/test/fill-a4.ly
+++ b/input/test/fill-a4.ly
@@ -1,4 +1,4 @@
-\version "2.1.11"
+\version "2.1.13"
 %possible rename to paper-fill-a4.ly -gp
 % candidate for reg -gp
 % Han says no, but keeping this comment temporarily so that I don't
@@ -16,7 +16,7 @@
 This should fill a4 paper. "
 }
 
-#(set-staff-size 13)
+#(set-global-staff-size 13)
 
 \score{
 	\context Voice \notes\relative c'{
diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index bfd22d886e..be1e7aeed9 100644
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -504,9 +504,9 @@ Tuplet_bracket::get_default_dir (Grob*me)
   for (SCM s = me->get_grob_property ("note-columns"); gh_pair_p (s); s = ly_cdr (s))
     {
       Grob * nc = unsmob_grob (ly_car (s));
-
-      
-      dirs[Note_column::dir (nc)]++;
+      Direction d = Note_column::dir (nc);
+      if (d)
+	dirs[d]++;
     }
 
   return dirs[UP] >= dirs[DOWN] ? UP : DOWN;
diff --git a/ly/book-init-init.ly b/ly/book-init-init.ly
index f07ec86ee5..7ebb27bbe6 100644
--- a/ly/book-init-init.ly
+++ b/ly/book-init-init.ly
@@ -1,10 +1,10 @@
 % Toplevel initialisation file. 
 	
-\version "2.1.11"
+\version "2.1.13"
 
 
 \include "declarations-init.ly"
-#(set-staff-size 16)
+#(set-global-staff-size 16)
 
  \paper{
 	\paperSixteen
diff --git a/ly/center-init.ly b/ly/center-init.ly
index c2eaea4742..ca066e96b4 100644
--- a/ly/center-init.ly
+++ b/ly/center-init.ly
@@ -1,10 +1,10 @@
 % Toplevel initialisation file. 
 	
-\version "2.1.11"
+\version "2.1.13"
 
 
 \include "declarations-init.ly"
-#(set-staff-size 16)
+#(set-global-staff-size 16)
 
  \paper { 
   \paperSixteen
diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 07ade93713..ad5d6ab836 100644
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -1,6 +1,6 @@
 #(ly:set-option 'old-relative)
 
-\version "1.9.8"
+\version "2.1.13"
 breve = #(ly:make-duration -1 0)
 longa = #(ly:make-duration -2 0 )
 maxima = #(ly:make-duration -3 0)
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 23b792a59b..ebc4b8660e 100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -103,7 +103,7 @@ get-deb-pfa: $(outdir)/$(debian-package)
 
 redhat-package=lilypond-$(TOPLEVEL_VERSION)-1.i386.rpm
 $(outdir)/$(redhat-package):
-	wget  --passive-ftp -P $(outdir) ftp://ftp.lilypond.org/pub/LilyPond/binaries/RedHat-9/$(redhat-package)
+	wget  --passive-ftp -P $(outdir) http://lilypond.org/download/binaries/RedHat-9/$(redhat-package)
 
 get-rpm-pfa: $(outdir)/$(redhat-package)
 	cd $(outdir) ; rm -rf usr/ # (root alert!) 
diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index f961537f41..1160607eb9 100644
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -1695,7 +1695,7 @@ conversions.append (((2,1,12), conv, """OttavaSpanner -> OttavaBracket"""))
 
 
 def conv (str):
-	str =re.sub (r"\(set-staff-size ", r"(set-global-staff-size", str)
+	str =re.sub (r"\(set-staff-size ", r"(set-global-staff-size ", str)
 	return str
 
 conversions.append (((2,1,13), conv, """set-staff-size -> set-global-staff-size"""))
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 65032d824b..ab4bc7b796 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -726,7 +726,7 @@ def compose_full_body (body, opts):
 	body = r'''
 %% Generated automatically by: lilypond-book.py
 %% options are %s
-#(set-staff-size %d)
+#(set-global-staff-size %d)
 
 \paper  {
   %s