Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/lilypond

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

diff --git a/ly/property-init.ly b/ly/property-init.ly
index b982843cf9d3ec8f2f145acb2da0a1dbb5503839..788cabb96c9412019e4541c71d8d98c7e39fe6dd 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -172,14 +172,14 @@ 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)))
-
+             '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)))
 
 %% font sizes
 
@@ -251,7 +251,7 @@ mergeDifferentlyHeadedOff =
 
 %% numeric time signature
 
-numericTimeSignature = \override Staff.TimeSignature #'style = #'()
+numericTimeSignature = \override Staff.TimeSignature #'style = #'numbered
 defaultTimeSignature = \revert Staff.TimeSignature #'style
 
 
@@ -265,7 +265,7 @@ palmMuteOff =
    (revert-head-style 'NoteHead))
 palmMute =
 #(define-music-function (parser location note) (ly:music?)
-    (style-note-heads 'NoteHead 'do note))
+   (style-note-heads 'NoteHead 'do note))
 
 
 %% phrasing slurs
@@ -278,7 +278,9 @@ phrasingSlurNeutral = \revert PhrasingSlur #'direction
 % dash-patterns (make-simple-dash-definition defined at top of file)
 phrasingSlurDashPattern =
 #(define-music-function (parser location dash-fraction dash-period)
-  (number? number?)
+   (number? number?)
+   (_i "Set up a custom style of dash pattern for @var{dash-fraction} ratio of
+line to space repeated at @var{dash-period} interval.")
   #{
      \override PhrasingSlur #'dash-definition =
        $(make-simple-dash-definition dash-fraction dash-period)
@@ -301,10 +303,16 @@ phrasingSlurSolid =
 
 pointAndClickOn  =
 #(define-music-function (parser location) ()
+   (_i "Enable generation of code in final-format (e.g. pdf) files to reference the
+originating lilypond source statement;
+this is helpful when developing a score but generates bigger final-format files.")
    (ly:set-option 'point-and-click #t)
    (make-music 'SequentialMusic 'void #t))
+
 pointAndClickOff =
 #(define-music-function (parser location) ()
+   (_i "Suppress generating extra code in final-format (e.g. pdf) files to point
+back to the lilypond source statement.")
    (ly:set-option 'point-and-click #f)
    (make-music 'SequentialMusic 'void #t))
 
@@ -375,7 +383,14 @@ tabFullNotation = {
   % time signature
   \revert TabStaff.TimeSignature #'stencil
   % stems (the half note gets a double stem)
+  \revert TabVoice.Stem #'length
+  \revert TabVoice.Stem #'no-stem-extend
+  \revert TabVoice.Stem #'flag-style
+  \revert TabVoice.Stem #'details
+  \revert TabVoice.Stem #'transparent
   \override TabVoice.Stem #'stencil = #tabvoice::draw-double-stem-for-half-notes
+  \set autoBeaming = ##t
+  \revert NoteColumn #'ignore-collision
   % beams, dots
   \revert TabVoice.Beam #'stencil
   \revert TabVoice.Dots #'stencil
@@ -385,22 +400,24 @@ tabFullNotation = {
   \revert TabVoice.RepeatTie #'after-line-breaking
   \revert TabVoice.LaissezVibrerTie #'stencil
   \revert TabVoice.Slur #'stencil
-  \revert PhrasingSlur #'stencil
+  \revert TabVoice.PhrasingSlur #'stencil
   % tuplet stuff
   \revert TabVoice.TupletBracket #'stencil
   \revert TabVoice.TupletNumber #'stencil
   % dynamic signs
-  \revert DynamicText #'transparent
-  \revert DynamicTextSpanner #'stencil
+  \revert TabVoice.DynamicText #'transparent
+  \revert TabVoice.DynamicTextSpanner #'stencil
   \revert TabVoice.DynamicTextSpanner #'stencil
   \revert TabVoice.Hairpin #'transparent
   % rests
   \revert TabVoice.Rest #'stencil
   \revert TabVoice.MultiMeasureRest #'stencil
+  \revert TabVoice.MultiMeasureRestNumber #'transparent
   % markups etc.
   \revert TabVoice.Script #'stencil
   \revert TabVoice.TextScript #'stencil
   \revert TabStaff.Arpeggio #'stencil
+  \revert TabStaff.NoteColumn #'ignore-collision
 }
 
 %tie/repeat tie behaviour