Merge pull request #157 from openlilylib/acb

pedal decorations now takes account of short segments
openlilylib · Dec 1, 2016 · b2a77df · b2a77df
2 parents 439be7e + a6b66fb
commit b2a77df
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/notation-snippets/pedal-decorations/definitions.ily b/notation-snippets/pedal-decorations/definitions.ily
@@ -80,6 +80,8 @@ pedalWithArrowsAndTextCallback =
                       (#:sans
                        (#:upright
                         (#:whiteout (#:box (#:pad-markup 0.3 lhs-text)))))))))
+                 (text-stil-x-extent (ly:stencil-extent text-stil X))
+                 (text-stil-x-length (interval-length text-stil-x-extent))
 
                  ;; get a list of spanners bounded by PianoPedalBrackets
                  ;; left-bound, which is PaperColumn or NonMusicalPaperColumn
@@ -102,13 +104,17 @@ pedalWithArrowsAndTextCallback =
                  (bounded-piano-brackets-per-column
                   (delete-duplicates piano-pedal-brackets))
 
+                 ;; add text
                  ;; only add text-stil, if current Column does not have two
                  ;; PianoPedalBrackets
-                 ;; TODO is this condition really sufficient?
+                 ;; TODO is this condition re columns really sufficient?
+                 ;; also, do not add text-stil if the segment is too short.
                  (new-stil
-                  (if (= (length bounded-piano-brackets-per-column) 2)
+                  (if (or
+                       (= (length bounded-piano-brackets-per-column) 2)
+                       (< stil-x-length text-stil-x-length))
                       new-stil
-                      (ly:stencil-stack new-stil X LEFT text-stil -6))))
+                      (ly:stencil-stack new-stil X LEFT text-stil -8))))
 
            (ly:grob-set-property! grobber 'stencil new-stil))))