Merge remote-tracking branch 'origin/translation'

[lilypond.git] / ly / property-init.ly

diff --git a/ly/property-init.ly b/ly/property-init.ly
index 1573bf79f9a48d1343298ccf6039b2e4b0fe9d45..852dbcee9ebaf5cf6d55f874b561114c4c2fe294 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -1,6 +1,6 @@
 % property-init.ly
 
-\version "2.17.6"
+\version "2.17.24"
 
 %% for dashed slurs, phrasing slurs, and ties
 #(define (make-simple-dash-definition dash-fraction dash-period)
@@ -124,17 +124,9 @@ bassFigureStaffAlignmentNeutral =
 
 %% cadenzas
 
-cadenzaOn  = {
-  \set Timing.timing = ##f
-  \set Timing.autoBeaming = ##f
-}
-
-cadenzaOff = {
-  \set Timing.timing = ##t
-  \set Timing.measurePosition = #ZERO-MOMENT
-  \set Timing.autoBeaming = ##t
-}
+cadenzaOn  = \set Timing.timing = ##f
 
+cadenzaOff = \set Timing.timing = ##t
 
 %% chord names
 
@@ -219,14 +211,10 @@ endincipit = \context Staff {
 
 fermataMarkup =
 #(make-music 'MultiMeasureTextEvent
-             'tweaks (list
-                      ;; Set the 'text based on the 'direction
-                      (cons 'text (lambda (grob)
-                                    (if (eq? (ly:grob-property grob 'direction) DOWN)
-                                        (markup #:musicglyph "scripts.dfermata")
-                                        (markup #:musicglyph "scripts.ufermata"))))
-                      (cons 'outside-staff-priority 40)
-                      (cons 'outside-staff-padding 0)))
+            ;; Set the 'text based on the 'direction
+            'text (make-fermata-markup)
+             'tweaks '((outside-staff-priority . 40)
+                      (outside-staff-padding . 0)))
 
 %% font sizes
 
@@ -265,7 +253,6 @@ hideNotes = {
   \override NoteHead.no-ledgers = ##t
   % assume that any Beam inherits transparency from its parent Stem
   \override Stem.transparent = ##t
-  \override Flag.transparent = ##t
   \override Accidental.transparent = ##t
   \override Rest.transparent = ##t
   \override TabNoteHead.transparent = ##t
@@ -273,7 +260,6 @@ hideNotes = {
 unHideNotes = {
   \revert Accidental.transparent
   \revert Stem.transparent
-  \revert Flag.transparent
   \revert NoteHead.transparent
   \revert NoteHead.no-ledgers
   \revert Dots.transparent
@@ -287,12 +273,14 @@ unHideNotes = {
 improvisationOn = {
   \set squashedPosition = #0
   \override NoteHead.style = #'slash
+  \override TabNoteHead.style = #'slash
   \override Accidental.stencil = ##f
   \override AccidentalCautionary.stencil = ##f
 }
 improvisationOff = {
   \unset squashedPosition
   \revert NoteHead.style
+  \revert TabNoteHead.style
   \revert Accidental.stencil
   \revert AccidentalCautionary.stencil
 }
@@ -633,35 +621,30 @@ voiceOneStyle = {
   \override NoteHead.style = #'diamond
   \override NoteHead.color = #red
   \override Stem.color = #red
-  \override Flag.color = #red
   \override Beam.color = #red
 }
 voiceTwoStyle = {
   \override NoteHead.style = #'triangle
   \override NoteHead.color = #blue
   \override Stem.color = #blue
-  \override Flag.color = #blue
   \override Beam.color = #blue
 }
 voiceThreeStyle = {
   \override NoteHead.style = #'xcircle
   \override NoteHead.color = #green
   \override Stem.color = #green
-  \override Flag.color = #green
   \override Beam.color = #green
 }
 voiceFourStyle = {
   \override NoteHead.style = #'cross
   \override NoteHead.color = #magenta
   \override Stem.color = #magenta
-  \override Flag.color = #magenta
   \override Beam.color = #magenta
 }
 voiceNeutralStyle = {
   \revert NoteHead.style
   \revert NoteHead.color
   \revert Stem.color
-  \revert Flag.color
   \revert Beam.color
 }