X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Fdefine-grobs.scm;h=304360f4f110c14a0c9dea08bc58ac2b039e0190;hb=dafef223123bb629eab05e53c443c6e6d20e9481;hp=c99b2eedec1246b4e4cbe6cdffd2f77d93c7d504;hpb=99242a027c2281ed7674772e9a0ae7fc86024be0;p=lilypond.git

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index c99b2eedec..304360f4f1 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -74,7 +74,7 @@
 			(staff-bar . (extra-space . 0.0))
 			(time-signature . (extra-space . 0.0))
 			(first-note . (fixed-space . 0.0))))
-	(breakable . #t)
+	(non-musical . #t)
 	(break-align-symbol . ambitus)
 	(break-visibility . ,begin-of-line-visible)
 	(meta . ((class . Item)
@@ -144,7 +144,7 @@
 	(glyph . "|")
 	(layer . 0)
 	(break-visibility . ,all-visible)
-	(breakable . #t)
+	(non-musical . #t)
 
 	(stencil . ,ly:bar-line::print)
 	(glyph-name . ,bar-line::calc-glyph-name)
@@ -177,7 +177,7 @@
     (BarNumber
      . (
 	(stencil . ,ly:text-interface::print)
-	(breakable . #t)
+	(non-musical . #t)
 	(break-visibility . ,begin-of-line-visible)
 	(padding . 1.0)
 	(direction . ,UP)
@@ -185,16 +185,23 @@
 	(font-size . -2)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
-	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
-	(self-alignment-X . 1)
+	(X-offset . ,(ly:make-simple-closure
+		      `(,+
+			,(ly:make-simple-closure
+			  (list ly:break-alignment-align-interface::self-align-callback))
+			,(ly:make-simple-closure
+			  (list ly:self-alignment-interface::x-aligned-on-self)))))
 
+	(self-alignment-X . 1)
+	(break-align-symbol . left-edge)
 	(meta .
 	      ((class . Item)
 	       (interfaces . (side-position-interface
 			      text-interface
+			      break-alignment-align-interface
 			      self-alignment-interface
 			      font-interface
-			      break-aligned-interface))))
+			      ))))
 	))
 
     (BassFigure
@@ -261,7 +268,8 @@
 	(shorten . ,ly:beam::calc-stem-shorten)
 	(beaming . ,ly:beam::calc-beaming)
 	(stencil . ,ly:beam::print)
-
+	(clip-edges . #t)
+	
 	;; TODO: should be in SLT.
 	(thickness . 0.48) ; in staff-space
 	(neutral-direction . ,DOWN)
@@ -292,7 +300,7 @@
 
     (BreakAlignment
      . (
-	(breakable . #t)
+	(non-musical . #t)
 	(stacking-dir . 1)
 	(positioning-done . ,ly:break-align-interface::calc-positioning-done)
 	(X-extent . ,ly:axis-group-interface::width)
@@ -347,7 +355,7 @@
     (BreathingSign
      . (
 	(break-align-symbol . breathing-sign)
-	(breakable . #t)
+	(non-musical . #t)
 	(space-alist . (
 			(ambitus . (extra-space . 2.0))
 			(custos . (minimum-space . 1.0))
@@ -371,7 +379,7 @@
      . (
 	(stencil . ,ly:clef::print)
 	(glyph-name . ,ly:clef::calc-glyph-name)
-	(breakable . #t)
+	(non-musical . #t)
 	(font-family . music)
 	(break-align-symbol . clef)
 	(break-visibility . ,begin-of-line-visible)
@@ -443,7 +451,7 @@
     (Custos
      . (
 	(break-align-symbol . custos)
-	(breakable . #t)
+	(non-musical . #t)
 	(stencil . ,ly:custos::print)
 	(break-visibility . ,end-of-line-visible)
 	(style . vaticana)
@@ -482,7 +490,7 @@
     (DoublePercentRepeat
      . (
 	(stencil . ,ly:percent-repeat-item-interface::double-percent)
-	(breakable . #t)
+	(non-musical . #t)
 	(slope . 1.0)
 	(font-encoding . fetaMusic)
 	(width . 2.0)
@@ -609,7 +617,7 @@
 	(style . line)
 	(gap . 0.5)
 	(zigzag-width . 0.75)
-	(breakable . #t)
+	(non-musical . #t)
 	(X-extent . #f)
 	(Y-extent . #f)
 	(stencil . ,ly:line-spanner::print)
@@ -645,6 +653,7 @@
 	(stencil . ,ly:hairpin::print)
 	(springs-and-rods . ,ly:spanner::set-spacing-rods)
 	(after-line-breaking . ,ly:hairpin::after-line-breaking)
+	(circled-tip . #f)
 	(thickness . 1.0)
 	(height . 0.6666)
 	(minimum-length . 2.0)
@@ -697,7 +706,7 @@
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(break-align-symbol . key-cancellation)
 	(break-visibility . ,begin-of-line-invisible)
-	(breakable . #t)
+	(non-musical . #t)
 	(meta . ((class . Item)
 		 (interfaces . (key-signature-interface
 				font-interface
@@ -713,7 +722,7 @@
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(break-align-symbol . key-signature)
 	(break-visibility . ,begin-of-line-visible)
-	(breakable . #t)
+	(non-musical . #t)
 	(meta . ((class . Item)
 		 (interfaces . (key-signature-interface
 				font-interface
@@ -760,7 +769,7 @@
      . (
 	(break-align-symbol . left-edge)
 	(X-extent . (0 . 0))
-	(breakable . #t)
+	(non-musical . #t)
 	(break-visibility . ,center-invisible)
 	(space-alist . (
 			(custos . (extra-space . 0.0))
@@ -796,6 +805,17 @@
 		 (interfaces . (line-interface
 				tuplet-bracket-interface))))))
 
+
+    (LyricExtender
+     . (
+	(stencil . ,ly:lyric-extender::print)
+	(thickness . 0.8) ; line-thickness
+	(minimum-length . 1.5)
+	(Y-extent . (0 . 0))
+	(meta . ((class . Spanner)
+		 (interfaces . (lyric-interface
+				lyric-extender-interface))))))
+
     (LyricHyphen
      . (
 	(thickness . 1.3)
@@ -814,18 +834,8 @@
 				lyric-hyphen-interface
 				spanner-interface))))))
 
-    (LyricExtender
-     . (
-	(stencil . ,ly:lyric-extender::print)
-	(thickness . 0.8) ; line-thickness
-	(minimum-length . 1.5)
-	(Y-extent . (0 . 0))
-	(meta . ((class . Spanner)
-		 (interfaces . (lyric-interface
-				lyric-extender-interface))))))
-
     (LyricSpace
-     . ((minimum-distance . 0.3)
+     . ((minimum-distance . 0.45)
 	(springs-and-rods . ,ly:hyphen-spanner::set-spacing-rods)
 	(padding . 0.0)
 	(Y-extent . #f)
@@ -913,7 +923,8 @@
 
     (MultiMeasureRestNumber
      . (
-	(springs-and-rods . ,ly:multi-measure-rest::set-spacing-rods)
+	(bound-padding  . 2.0)
+	(springs-and-rods . ,ly:multi-measure-rest::set-text-rods)
 	(stencil . ,ly:text-interface::print)
 	(X-offset . ,(ly:make-simple-closure
 		      `(,+ ,(ly:make-simple-closure (list ly:self-alignment-interface::x-aligned-on-self))
@@ -1051,12 +1062,10 @@
     (PaperColumn
      . (
 	(axes . (0))
-
 	(before-line-breaking . ,ly:paper-column::before-line-breaking)
 	;; (stencil . ,ly:paper-column::print)
 	(X-extent . ,ly:axis-group-interface::width)
 	
-
 	;; debugging
 	;;		         (font-size . -6) (font-name . "sans") (Y-extent . #f)
 	(meta . ((class . Paper_column)
@@ -1065,14 +1074,13 @@
 				spaceable-grob-interface))))))
 
     (ParenthesesItem
-     . (
-	(stencil . ,parentheses-item::print)
+     . ((stencil . ,parentheses-item::print)
 	(font-size . -6)
 	(padding . 0.2)
 	(meta . ((class . Item)
 		 (interfaces . (parentheses-interface font-interface))))
-	
-	      ))
+	))
+    
     (PhrasingSlur
      . ((details . ,default-slur-details)
 	(control-points . ,ly:slur::calc-control-points)
@@ -1094,7 +1102,8 @@
 	(X-extent . ,ly:axis-group-interface::width)
 	;;		      (stencil . ,ly:paper-column::print)
 	
-	(breakable . #t)
+	(non-musical . #t)
+	(line-break-permission . allow)
 
 	;; debugging stuff: print column number.
 	;;		 (font-size . -6) (font-name . "sans")	(Y-extent . #f)
@@ -1155,22 +1164,25 @@
      . (
 	(stencil . ,ly:text-interface::print)
 	(X-offset . ,(ly:make-simple-closure
-		      `(,+ ,(ly:make-simple-closure
-			     `(,ly:self-alignment-interface::x-aligned-on-self))
-			   ,(ly:make-simple-closure
-			     `(,ly:self-alignment-interface::centered-on-x-parent)))
-		      ))
+		      `(,+
+			,(ly:make-simple-closure
+			  (list ly:break-alignment-align-interface::self-align-callback))
+			,(ly:make-simple-closure
+			  (list ly:self-alignment-interface::x-aligned-on-self)))))
+
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(self-alignment-X . 0)
 	(direction . ,UP)
-	(breakable . #t)
+	(non-musical . #t)
 	(font-size . 2)
 	(baseline-skip . 2)
 	(break-visibility . ,end-of-line-invisible)
+	(break-align-symbol . staff-bar)
 	(padding . 0.8)
 	(meta . ((class . Item)
 		 (interfaces . (text-interface
 				side-position-interface
+				break-alignment-align-interface
 				font-interface
 				mark-interface
 				self-alignment-interface))))))
@@ -1282,9 +1294,38 @@
 	(minimum-length . 1.5)
 	(height-limit . 2.0)
 	(ratio . 0.25)
+	(avoid-slur . inside)
 	(meta . ((class . Spanner)
 		 (interfaces . (slur-interface))))))
 
+ (SostenutoPedal
+     . (
+	(stencil . ,ly:text-interface::print)
+	(direction . ,RIGHT)
+	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
+	(no-spacing-rods . #t)
+	(padding . 0.0) ;; padding relative to SostenutoPedalLineSpanner
+	(font-shape . italic)
+	(self-alignment-X . 0)
+	(meta . ((class . Item)
+		 (interfaces . (text-interface
+				self-alignment-interface
+				font-interface))))))
+
+    (SostenutoPedalLineSpanner
+     . (
+	(axes . (1))
+	(Y-extent . ,ly:axis-group-interface::height)
+	(Y-offset . ,ly:side-position-interface::y-aligned-side)
+	(side-axis . ,Y)
+	(staff-padding . 1.0)
+	(padding . 1.2)
+	(minimum-space . 1.0)
+	(direction . ,DOWN)
+	(meta . ((class . Spanner)
+		 (interfaces . (piano-pedal-interface
+				axis-group-interface
+				side-position-interface))))))
     (SpacingSpanner
      . (
 	(springs-and-rods . ,ly:spacing-spanner::set-springs)
@@ -1302,7 +1343,7 @@
 	(break-align-symbol . staff-bar)
 	(Y-extent . ())
 	(layer . 0)
-	(breakable . #t)
+	(non-musical . #t)
 	(stencil . ,ly:span-bar::print)
 	(bar-size . ,ly:span-bar::calc-bar-size)
 	(X-extent . ,ly:span-bar::width)
@@ -1337,61 +1378,16 @@
 				text-interface
 				font-interface))))))
 
-    (StringNumber
-     . (
-	(stencil . ,print-circled-text-callback)
-	(padding . 0.5)
-	(staff-padding . 0.5)
-	(self-alignment-X . 0)
-	(self-alignment-Y . 0)
-	(script-priority . 100)
-	(font-encoding . fetaNumber)
-	(font-size . -5) 		; don't overlap when next to heads.
-	(meta . ((class . Item)
-		 (interfaces . (string-number-interface
-				font-interface
-				text-script-interface
-				text-interface
-				side-position-interface
-				self-alignment-interface
-				item-interface))))))
 
     (StaffSpacing
      . (
-	(breakable . #t)
+	(non-musical . #t)
 	(stem-spacing-correction . 0.4)
 	(meta . ((class . Item)
 		 (interfaces . (spacing-interface
 				staff-spacing-interface))))))
 
-    (SostenutoPedal
-     . (
-	(stencil . ,ly:text-interface::print)
-	(direction . ,RIGHT)
-	(X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
-	(no-spacing-rods . #t)
-	(padding . 0.0) ;; padding relative to SostenutoPedalLineSpanner
-	(font-shape . italic)
-	(self-alignment-X . 0)
-	(meta . ((class . Item)
-		 (interfaces . (text-interface
-				self-alignment-interface
-				font-interface))))))
-
-    (SostenutoPedalLineSpanner
-     . (
-	(axes . (1))
-	(X-extent . ,ly:axis-group-interface::height)
-	(Y-offset . ,ly:side-position-interface::y-aligned-side)
-	(side-axis . ,Y)
-	(padding . 1.2)
-	(minimum-space . 1.0)
-	(direction . ,DOWN)
-	(meta . ((class . Spanner)
-		 (interfaces . (piano-pedal-interface
-				axis-group-interface
-				side-position-interface))))))
-
+   
     (StaffSymbol
      . (
 	(Y-extent . ,ly:staff-symbol::height)
@@ -1407,6 +1403,7 @@
 	(direction . ,ly:stem::calc-direction)
 	(default-direction . ,ly:stem::calc-default-direction)
 	(stem-end-position . ,ly:stem::calc-stem-end-position)
+	(neutral-direction . ,DOWN)
 	(stem-info . ,ly:stem::calc-stem-info)
 	(positioning-done . ,ly:stem::calc-positioning-done)
 	(stencil . ,ly:stem::print)
@@ -1442,10 +1439,6 @@
 
 	    ))
 
-
-	;; default stem direction for note on middle line
-	(neutral-direction . ,DOWN)
-
 	;; We use the normal minima as minimum for the ideal lengths,
 	;; and the extreme minima as abolute minimum length.
 
@@ -1461,11 +1454,31 @@
 	(stencil . ,ly:stem-tremolo::print)
 	(X-extent . #f)
 	(slope . ,ly:stem-tremolo::calc-slope)
-	(beam-width . 1.6) ; staff-space
+	(beam-width . ,ly:stem-tremolo::calc-width) ; staff-space
+        (style . ,ly:stem-tremolo::calc-style)
 	(beam-thickness . 0.48) ; staff-space
 	(meta . ((class . Item)
 		 (interfaces . (stem-tremolo-interface))))))
 
+    (StringNumber
+     . (
+	(stencil . ,print-circled-text-callback)
+	(padding . 0.5)
+	(staff-padding . 0.5)
+	(self-alignment-X . 0)
+	(self-alignment-Y . 0)
+	(script-priority . 100)
+	(font-encoding . fetaNumber)
+	(font-size . -5) 		; don't overlap when next to heads.
+	(meta . ((class . Item)
+		 (interfaces . (string-number-interface
+				font-interface
+				text-script-interface
+				text-interface
+				side-position-interface
+				self-alignment-interface
+				item-interface))))))
+    
     (SustainPedal
      . (
 	(no-spacing-rods . #t)
@@ -1484,7 +1497,7 @@
     (SustainPedalLineSpanner
      . (
 	(axes . (1))
-	(X-extent . ,ly:axis-group-interface::height)
+	(Y-extent . ,ly:axis-group-interface::height)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
 	(padding . 1.2)
@@ -1551,7 +1564,9 @@
     (SystemStartBar
      . (
 	(Y-extent . #f)
-	(padding . 0.0)
+
+	;; ugh--hardcoded. 
+	(padding . -0.1)  ;; bar must cover rounded ending of staff line.
 	(X-offset . ,ly:side-position-interface::x-aligned-side)
 	(direction . ,LEFT)
 	(style . bar-line)
@@ -1567,7 +1582,7 @@
 	(stencil . ,ly:text-interface::print)
 	(Y-offset . ,ly:staff-symbol-referencer::callback)
 	(font-size . -2)
-	(stem-attachment . (1.0 . 1.35))
+	(stem-attachment . (0.0 . 1.35))
 	(font-series . bold)
 	(meta . ((class . Item)
 		 (interfaces
@@ -1665,7 +1680,7 @@
 			(first-note . (fixed-space . 2.0))
 			(right-edge . (extra-space . 0.5))
 			(staff-bar . (minimum-space . 2.0))))
-	(breakable . #t)
+	(non-musical . #t)
 	(style . C)
 	(meta . ((class . Item)
 		 (interfaces . (time-signature-interface
@@ -1776,7 +1791,7 @@
     (UnaCordaPedalLineSpanner
      . (
 	(axes . (1))
-	(X-extent . ,ly:axis-group-interface::height)
+	(Y-extent . ,ly:axis-group-interface::height)
 	(Y-offset . ,ly:side-position-interface::y-aligned-side)
 	(side-axis . ,Y)
 	(padding . 1.2)
@@ -1824,7 +1839,6 @@
     (VoltaBracket
      . (
 	(stencil . ,ly:volta-bracket-interface::print)
-	(after-line-breaking . ,ly:volta-bracket-interface::after-line-breaking)
 	(direction . ,UP)
 	(padding . 1)
 	(font-encoding . fetaNumber)
@@ -1848,7 +1862,7 @@
      . (
 	(style . line)
 	(gap . 0.5)
-	(breakable . #t)
+	(non-musical . #t)
 	(X-extent . #f)
 	(Y-extent . #f)
 	(stencil . ,ly:line-spanner::print)