lilypond-1.3.0

diff --git a/ly/auto-beam-settings.ly b/ly/auto-beam-settings.ly
index 71b2c55cabe8f78c064bda1a4fab687c900e58f9..c3f20c4886027718c985eef89114a7c304f98c2b 100644 (file)
--- a/ly/auto-beam-settings.ly
+++ b/ly/auto-beam-settings.ly
@@ -1,7 +1,3 @@
-%%In the file ly/auto-beam-settings.ly, all necessary i-iii settings should
-%%be listed, here's a new version with more comments, (hw, please include).
-%%duh
-
 % auto-beam-settings.ly
 % setup for auto-beam engraver
 %
@@ -21,47 +17,49 @@
 %   end beams each 1/2 note
 %   end beams with 16th notes each 1/4 note
 %   end beams with 32th notes each 1/8 note
-time3_2beamAutoEnd = "1/2";
-time3_2beamAutoEnd_16 = "1/4";
-time3_2beamAutoEnd_32 = "1/8";
 
-time3_4beamAutoBegin_8 = "1/4";
-time3_4beamAutoEnd = "3/4";
-time3_4beamAutoBegin_16 = "1/16";
-time3_4beamAutoEnd_16 = "1/4";
-%time3_4beamAutoBegin_32 = "1/8";
-time3_4beamAutoEnd_32 = "1/8";
+time3_2beamAutoEnd = #(make-moment 1 2)
+%time3_2beamAutoEnd_16 = #(make-moment 1 4)
+time3_2beamAutoEnd_16 = #(make-moment 1 4)
+time3_2beamAutoEnd_32 = #(begin (make-moment 1 8))
+
+time3_4beamAutoBegin_8 = #(begin (make-moment 1 4))
+time3_4beamAutoEnd = #(begin (make-moment 3 4))
+time3_4beamAutoBegin_16 = #(begin (make-moment 1 16))
+time3_4beamAutoEnd_16 = #(begin (make-moment 1 4))
+%time3_4beamAutoBegin_32 = #(begin (make-moment 1 8))
+time3_4beamAutoEnd_32 = #(begin (make-moment 1 8))
 
-time3_8beamAutoBegin = "1/8";
-time3_8beamAutoEnd = "3/8";
+time3_8beamAutoBegin = #(begin (make-moment 1 8))
+time3_8beamAutoEnd = #(begin (make-moment 3 8))
 
 % in common time:
 %   end beams each 1/2 note
 %   end beams with 32th notes each 1/8 note
 %   end beams with 1/8 triplets each 1/4 note
 
-time4_4beamAutoEnd = "1/2";
-time4_4beamAutoEnd_12 = "1/4";
-time4_4beamAutoEnd_16 = "1/4";
-time4_4beamAutoEnd_32 = "1/8";
+time4_4beamAutoEnd = #(begin (make-moment 1 2))
+time4_4beamAutoEnd_12 = #(begin (make-moment 1 4))
+time4_4beamAutoEnd_16 = #(begin (make-moment 1 4))
+time4_4beamAutoEnd_32 = #(begin (make-moment 1 8))
 
-time4_8beamAutoEnd = "1/4";
-time4_8beamAutoEnd_16 = "1/4";
-time4_8beamAutoEnd_32 = "1/8";
+time4_8beamAutoEnd = #(begin (make-moment 1 4))
+time4_8beamAutoEnd_16 = #(begin (make-moment 1 4))
+time4_8beamAutoEnd_32 = #(begin (make-moment 1 8))
 
-time4_16beamAutoEnd = "1/8";
+time4_16beamAutoEnd = #(begin (make-moment 1 8))
 
-time6_8beamAutoEnd = "3/8";
-time6_8beamAutoEnd_16 = "3/8";
-time6_8beamAutoEnd_32 = "1/8";
+time6_8beamAutoEnd = #(begin (make-moment 3 8))
+time6_8beamAutoEnd_16 = #(begin (make-moment 3 8))
+time6_8beamAutoEnd_32 = #(begin (make-moment 1 8))
 
-time9_8beamAutoEnd = "3/8";
-time9_8beamAutoEnd_16 = "3/8";
-time9_8beamAutoEnd_32 = "1/8";
+time9_8beamAutoEnd = #(begin (make-moment 3 8))
+time9_8beamAutoEnd_16 = #(begin (make-moment 3 8))
+time9_8beamAutoEnd_32 = #(begin (make-moment 1 8))
 
-time12_8beamAutoEnd = "3/8";
-time12_8beamAutoEnd_16 = "3/8";
-time12_8beamAutoEnd_32 = "1/8";
+time12_8beamAutoEnd = #(begin (make-moment 3 8))
+time12_8beamAutoEnd_16 = #(begin (make-moment 3 8))
+time12_8beamAutoEnd_32 = #(begin (make-moment 1 8))
 
 
 
@@ -70,10 +68,10 @@ time12_8beamAutoEnd_32 = "1/8";
 Users may override in most cases, simply by issuing
 
     % from here on consider ending beam every 1/4 note
-    \property Voice.beamAutoEnd = "1/4"
+    \property Voice.beamAutoEnd = #(make-moment 1 4)
 
     % no autobeaming
-    \property Voice.beamAuto = "0"  
+    \property Voice.beamAuto = ##f  
 
 or, more globally, by doing:
 
@@ -81,7 +79,7 @@ or, more globally, by doing:
         \translator{
             \VoiceContext
             % consider ending beam at every 1/2 note
-            beamAutoEnd = "1/2";
+            beamAutoEnd = #(make-moment 1 2)
         }
     }
 

diff --git a/ly/declarations.ly b/ly/declarations.ly
index a6e51b93952155554fd109fbc14b1925f14557c7..56438398937461dcee6b51decdc9b5741b66115e 100644 (file)
--- a/ly/declarations.ly
+++ b/ly/declarations.ly
@@ -34,8 +34,8 @@ lydian = 7
 phrygian = 8
 dorian = 10
 
-melisma = \property Staff.melismaBusy = "1"
-melismaEnd = \property Staff.melismaBusy = "0"
+melisma = \property Staff.melismaBusy = ##t
+melismaEnd = \property Staff.melismaBusy = ##f
 
 
 

diff --git a/ly/nederlands.ly b/ly/nederlands.ly
index 78fc35ed04ef4f0a2f516c32c3191d95ea2419f5..b5a6d360bdcd32e0166bd2320c3f21c90437c434 100644 (file)
--- a/ly/nederlands.ly
+++ b/ly/nederlands.ly
@@ -1,13 +1,5 @@
 %{
  common dutch names for notes. "es" means flat, "is" means sharp
-
-
-
-
- Please note that, while these names are used to enter *notes*, they
- actually are *melodic*s, i.e. they represent a pitch solely. Notes
- have a rhythmic part too. This is the reason that we don't write 'note { .. }'
-
 %}
 
 \notenames {
@@ -56,6 +48,7 @@
        % upper case: 1 octave lower.
        %
 
+       %% deprecated.
 
        Ceses   = \musicalpitch { -2 0 -2 }
        Ces     = \musicalpitch { -2 0 -1 }

diff --git a/ly/property.ly b/ly/property.ly
index ea41ac9656b675a4665b2016e1986073985daca6..ddc99ba5078de2f4a7791bf45686df8fa330fd62 100644 (file)
--- a/ly/property.ly
+++ b/ly/property.ly
@@ -8,7 +8,7 @@ SEE THE REFERENCE MANUAL FOR EXPLANATIONS.
 
 %}
 
-\version "1.2.0";
+\version "1.2.16";
 
 %hmm, (these) abbrevs suck, imo
 % i guess they're meant as some form of doco
@@ -17,52 +17,28 @@ stemup =        \property Voice.verticalDirection = \up
 stemboth=      \property Voice.verticalDirection = \center
 stemdown =     \property Voice.verticalDirection = \down
 
-slurup = \notes {
-       s1*0
-       \property Voice.slurVerticalDirection = \up 
-       }
-slurboth= \notes {
-       s1*0
-       \property Voice.slurVerticalDirection = \center
-}
-slurdown = \notes {    
-       s1*0
-       \property Voice.slurVerticalDirection = \down
-}
-
-shifton = \property Voice.horizontalNoteShift = 1
-shiftoff = \property Voice.horizontalNoteShift = 0
+slurup   = \property Voice.slurVerticalDirection = \up 
+slurboth = \property Voice.slurVerticalDirection = \center
+slurdown = \property Voice.slurVerticalDirection = \down
+shifton  = \property Voice.horizontalNoteShift = #1
+shiftoff = \property Voice.horizontalNoteShift = #0
 
 onevoice = {   
        \stemboth \shiftoff     
 }
 
-%{ THESE ARE DEPRECATED  %}
-voiceone = 
-       \context Voice = one  {
+voiceone = \stemup
+voicetwo = \stemdown
+voicethree = {
        \stemup
+       \shifton
 }
 
-voicetwo = 
-       \context Voice = two {
-       \stemdown
-}
-
-voicethree = 
-       \context Voice = three {
-       \stemup
-
-}
-
-voicefour = 
-       \context Voice = four {
+voicefour = {
        \stemdown
        \shifton
 }
 
-%{ END OF DEPRECATED %}
-
-
 % ugh, cluttering global namespace...
 
 % ugh2. 
@@ -97,26 +73,26 @@ slurnormal =
        \property Voice.slurDash = ""
 
 
-slurdotted = 
+slurdotted =                           
        \property Voice.slurDash = 1
 
 
-tupletoff = {
+tupletoff =
        \property Voice.tupletVisibility = 0
-}
-tupleton = {
+
+tupleton = 
        \property Voice.tupletVisibility = 3
-}
-tiny  = {
-       \property Voice.fontSize= "-2"
-}
 
-small  = {
-       \property Voice.fontSize= "-1"
-}
+tiny  = 
+       \property Voice.fontSize= -2
+
+
+small  = 
+       \property Voice.fontSize= -1
+
 
 normalsize = {
-       \property Voice.fontSize= "0"
+       \property Voice.fontSize= 0
 }
 
 normalkey = {
@@ -130,13 +106,13 @@ specialkey = {
 % End the incipit and print a ``normal line start''.
 endincipit = \notes{
     \partial 16; s16  % Hack to handle e.g. \bar ".|"; \endincipit
-    \property Staff.clefStyle = "fullSizeChanges" 
+    \property Staff.clefStyle = #"fullSizeChanges" 
     \nobreak \bar "";
 }
 
-autoBeamOff = \property Voice.noAutoBeaming = "1"
-autoBeamOn = \property Voice.noAutoBeaming = ""
+autoBeamOff = \property Voice.noAutoBeaming = #t
+autoBeamOn = \property Voice.noAutoBeaming = ##f
 
 
-emptyText = \property Voice.textEmptyDimension = "1"
-fatText = \property Voice.textEmptyDimension = ""
+emptyText = \property Voice.textEmptyDimension = ##t
+fatText = \property Voice.textEmptyDimension = ##f