release: 1.3.94

[lilypond.git] / ly / property.ly

diff --git a/ly/property.ly b/ly/property.ly
index b056e3511126c42c57794a4d37758fb06387a708..d5e2211674b5c0012b9b419d3b86c5044b539767 100644 (file)
--- a/ly/property.ly
+++ b/ly/property.ly
@@ -1,89 +1,57 @@
 % property.ly
-% list of properties that lily recognises
-% and some shorthands (ugh)
 
-%{
+\version "1.3.93";
 
-SEE THE REFERENCE MANUAL FOR EXPLANATIONS.
+stemUp = \property Voice.Stem \push #'direction = #1
+stemDown = \property Voice.Stem \push #'direction = #-1 
+stemBoth= \property Voice.Stem \pop #'direction
 
-%}
+slurUp   = \property Voice.Slur \push #'direction = #1
+slurBoth = \property Voice.Slur \pop #'direction 
+slurDown = \property Voice.Slur \push #'direction = #-1
+shiftOn  = \property Voice.NoteColumn \push #'horizontal-shift = #1
+shiftOnn  = \property Voice.NoteColumn \push #'horizontal-shift = #2
+shiftOnnn  = \property Voice.NoteColumn \push #'horizontal-shift = #3
+shiftOff  = \property Voice.NoteColumn \pop #'horizontal-shift 
 
-\version "1.2.16";
 
-%hmm, (these) abbrevs suck, imo
-% i guess they're meant as some form of doco
-% that's what i use them for...
+tieUp = \property Voice.Tie \push #'direction = #1
+tieDown = \property Voice.Tie \push #'direction = #-1
+tieBoth = \property Voice.Tie \pop #'direction 
 
-stemup =        \property Voice.verticalDirection = \up 
-stemboth=      \property Voice.verticalDirection = \center
-stemdown =     \property Voice.verticalDirection = \down
+cadenzaOn = \property Score.timing = ##f
+cadenzaOff = { \property Score.timing = ##t
+       \property Score.measurePosition = #(make-moment 0 1)
+       }
 
-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     
+       
+oneVoice = {   
+       \stemBoth
+       \tieBoth
+       \shiftOff
 }
 
-voiceone = \stemup
-voicetwo = \stemdown
-voicethree = {
-       \stemup
-       \shifton
+voiceOne = { \stemUp
+   \tieUp
 }
-
-voicefour = {
-       \stemdown
-       \shifton
+voiceTwo = { \stemDown
+   \tieDown
+   }
+   
+voiceThree = {
+       \stemUp
+       \shiftOn
 }
 
-% ugh, cluttering global namespace...
-
-% ugh2. 
-infinity=10000
-
-beamslopeproportional = 
-       \property Score.beamslopedamping = 0
-
-beamslopedamped = 
-       \property Score.beamslopedamping = 1
-
-
-beamslopezero = 
-       \property Score.beamslopedamping = \infinity
-
-
-% this sucks, you'd want to pass an array, at least
-% (or embedded code: you still can't dictate the slope / stemlength)
-beamposfree = 
-       \property Score.beamquantisation = 0
-
-
-beamposnormal = 
-       \property Score.beamquantisation = 1
-
-
-beampostraditional = 
-       \property Score.beamquantisation = 2
-
-
-slurnormal = 
-       \property Voice.slurDash = ""
-
-
-slurdotted =                           
-       \property Voice.slurDash = 1
-
-
-tupletoff =
-       \property Voice.tupletVisibility = 0
+voiceFour = {
+       \stemDown
+       \shiftOn
+}
 
-tupleton = 
-       \property Voice.tupletVisibility = 3
+slurDotted = \property Voice.Slur \push #'dash = #1
+slurNoDots = \property Voice.Slur \pop #'dash
 
+       
 tiny  = 
        \property Voice.fontSize= -2
 
@@ -97,23 +65,24 @@ normalsize = {
 }
 
 normalkey = {
-       \property Staff.keyOctaviation = 1
+       \property Staff.keyOctaviation = ##f
 }
 
 specialkey = {
-       \property Staff.keyOctaviation = 0
+       \property Staff.keyOctaviation = ##t
 }
 
 % 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" 
-    \nobreak \bar "";
+    \bar "";
 }
 
-autoBeamOff = \property Voice.noAutoBeaming = #t
+autoBeamOff = \property Voice.noAutoBeaming = ##t
 autoBeamOn = \property Voice.noAutoBeaming = ##f
 
 
-emptyText = \property Voice.textEmptyDimension = ##t
-fatText = \property Voice.textEmptyDimension = ##f
+emptyText = \property Voice.textNonEmpty = ##f
+fatText = \property Voice.textNonEmpty = ##t
+