lilypond-1.3.72

diff --git a/config.make.in b/config.make.in
index 23798deabf1f6f15d8f833c10b5ddf9774660ef2..2e4232adfd93ce61bb8531e763f0cfdc4fea3bc9 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -38,8 +38,6 @@ localedir = @localedir@
 program_prefix = @program_prefix@
 program_suffix = @program_suffix@
 EXTRA_LIBES = @EXTRA_LIBES@ @LIBS@
-TFM_PATH = @TFM_PATH@
-TFM_SUFFIXES = @TFM_SUFFIXES@
 RANLIB = @RANLIB@
 DEFS = @DEFS@
 #SET_MAKE = @SET_MAKE@

diff --git a/input/scarlatti-edited.ly b/input/scarlatti-edited.ly
index 1bea1212a0c1f4cc808aea71d5fe6f05b9eed320..1fe645427846286135b621583bcf48341862e40a 100644 (file)
--- a/input/scarlatti-edited.ly
+++ b/input/scarlatti-edited.ly
@@ -5,11 +5,13 @@
        composer = "D. Scarlatti and J. D. S. Sankey";
 }
 
-\version "1.3.70";
-
 \include "scarlatti-properties.ly"
 \include "scarlatti-paper.ly"
 
+forceStaffDown = \translator "Staff" = "down"
+forceStaffUp = \translator "Staff" = "up"
+
+
 \score{
        \notes \context PianoStaff <
        \context Staff=up <
@@ -32,7 +34,7 @@
                %a6
                a''32 s fis'' s d'' s a' s d' s a s|
                %a7
-               r16 a' fis'8. d'16~
+               \forceStaffUp r16 a' fis'8. d'16~
                %a8
                d'16 g' e'8. cis'16|
                %a9
@@ -131,7 +133,13 @@
        \context Voice=vb< \zs
        \sd
        \context Thread=td{ \n
-               \lh \sm[\times 2/3{d32 fis a}\n d'16]a8 a|
+               \lh \sm
+               %
+               % WARNING: interface still subject to change!
+               %
+               \property Voice. beamHeight = 5
+               [\times 2/3{d32 fis a}\n d'16]a8 a|
+               \property Voice.beamHeight = ##f
                %b2
                d4 s8|
                %b3
@@ -139,7 +147,7 @@
                %b4
                r32[d fis a][d' fis' a' d'']r \rh[d fis a]
                %b5
-               [d'32 fis' a' d'']r32 \lh[d fis a][d' fis' a' d'']
+               [d'32 fis' a' d''] \forceStaffDown r32 \lh[d fis a][d' fis' a' d'']
                %b6
                s a''32 s fis'' s d'' s a' s d' s a|
                %b7

diff --git a/input/scarlatti-properties.ly b/input/scarlatti-properties.ly
index 3a86facf1c7dd6857f76d410bd846a2f8b46ec5f..651de9a37b7c97dde0392acdbf16022feed10948 100644 (file)
--- a/input/scarlatti-properties.ly
+++ b/input/scarlatti-properties.ly
@@ -1,5 +1,8 @@
 
 
+
+\version "1.3.70";
+
 rh=\property Thread.noteHeadStyle=##f 
 lh=\property Thread.noteHeadStyle = #'diamond
 n=\property Thread.fontSize=#0  

diff --git a/input/test/tuplet.ly b/input/test/tuplet.ly
index 7ce624fbd95214458e200c42faaaa926bdb59dc8..f9d946904ba9d1eb048befd40152b4ec43b6bc56 100644 (file)
--- a/input/test/tuplet.ly
+++ b/input/test/tuplet.ly
@@ -1,15 +1,26 @@
-\version "1.3.59"
+\version "1.3.70"
 
 \score { 
   \context Voice \notes\relative c'' {
 
+       \times 2/3 { c'8 c,, c }
+       \times 2/3 { c'8 c'' c,, }
+
+  
   \times 2/3 { [c8 c c]  }
   \times 2/3 { c8 [c c]  }
 
+    \times 2/3 { [c8 c c]  }
+  \times 2/4 { r8 [c, c'] r8 }
+
+
+  
   \property Voice .tupletBracketVisibility = #'if-no-beam  
   \times 2/3 { [c8 c c]  }
   \property Voice .tupletDirection = #1
   \property Voice .tupletNumberVisibility = ##f
   \times 2/3 { c8 [c c]  }
+    
+
 }
 }

diff --git a/lily/main.cc b/lily/main.cc
index f1362afc9b3921ad210f3b8f7602514285a8f88b..33c8e8f33877fcc9fdece8bbbccf755478e496b4 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -230,10 +230,6 @@ setup_paths ()
       String p =  prefix + to_str ('/') + String (*s);
       
       global_path.add (p);
-      /* Urg: GNU make's $(word) index starts at 1 */
-      int i  = 1;
-      while (global_path.try_add (p + to_str (".") + to_str (i)))
-       i++;
     }
 }
 

diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index 2cbdcded23de56ab6df7ce43f2d9fba1b84cabab..027f47c8830a0097c7fab174447b69744221081b 100644 (file)
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -22,11 +22,6 @@ AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm) $(AF_FILES:.af=.afm))
 TFM_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.tfm))
 PFA_FILES = $(addprefix $(outdir)/, $(FONT_FILES:.mf=.pfa)) 
 
-foo:
-       @echo fof: $(FONT_FILES)
-       @echo fef: $(FET_FILES)
-       @echo tfm: $(TFM_FILES)
-
 # Make tfm files first, log files last, 
 # so that normally log files aren't made twice
 ALL_GEN_FILES= $(TFM_FILES) $(TEXTABLES) $(AFM_FILES) $(TFM_FILES) $(PFA_FILES) $(LOG_FILES)