X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=scm%2Felement-descriptions.scm;h=9bd688f806ece6398e800e82f27356dfc3ba197f;hb=7776d4901caa57e1d0f3ab7cf01348b930a6dbee;hp=4ea382e3e70169797668c8c4493c5dab4fe39bf5;hpb=2522fadff41b2b07313c4967a4f85c147fe9b9c4;p=lilypond.git

diff --git a/scm/element-descriptions.scm b/scm/element-descriptions.scm
index 4ea382e3e7..9bd688f806 100644
--- a/scm/element-descriptions.scm
+++ b/scm/element-descriptions.scm
@@ -1,4 +1,3 @@
-
 ; distances are given in stafflinethickness (thicknesses) and
 ; staffspace (distances)
 
@@ -93,14 +92,16 @@
 		(meta . ,(element-description "ChordNames"  font-interface text-interface chord-name-interface))
 	))
 
-	(NoteCollision . (
-		(axes 0 1)
-		(note-width . 1.65)
-		(meta . ,(element-description "NoteCollision"
-		   note-collision-interface axis-group-interface
-		))
-	))
-
+       (Custos . (
+               (break-align-symbol . Custos)
+               (breakable . #t )
+               (molecule-callback . ,Custos::brew_molecule)
+               (visibility-lambda . ,end-of-line-visible)
+	       (style .  "vaticana")
+	       (Y-offset-callbacks . (,Staff_symbol_referencer::callback))
+               (meta . ,(element-description "Custos" custos-interface staff-symbol-interface break-aligned-interface) )
+       ))
+	
 	(Crescendo . (
 		(molecule-callback . ,Crescendo::brew_molecule)
 		(thickness . 1.0)
@@ -139,8 +140,8 @@
 	
 	(DynamicLineSpanner . (
 		(axes . ( 1))
-		(padding . 3)
-		(minimum-space . 6)
+		(padding . 0.6)
+		(minimum-space . 1.2)
 		(meta . ,(element-description "DynamicLineSpanner" dynamic-interface axis-group-interface side-position-interface))
 	))
 	
@@ -154,7 +155,7 @@
 	(Fingering . (
 		(molecule-callback . ,Text_item::brew_molecule)
 		(X-offset-callbacks . (,Side_position::centered_on_parent ,Side_position::aligned_on_self))
-		(padding . 	3.0)
+		(padding . 0.6)
 		(self-alignment-X . 0)
 		(font-family . number)
 		(font-relative-size . -3)
@@ -246,7 +247,7 @@
 		(font-family . number)
 		(font-relative-size . 1)
 		(visibility-lambda . ,end-of-line-invisible)
-		(padding . 4.0)
+		(padding . 0.8)
 		(meta . ,(element-description "RehearsalMark"  mark-interface side-position-interface))
 	))
 	
@@ -261,6 +262,13 @@
 		(font-relative-size . 1)
 		(meta . ,(element-description "MultiMeasureRest" multi-measure-rest-interface  font-interface ))
 	))
+	(NoteCollision . (
+		(axes 0 1)
+		(note-width . 1.65)
+		(meta . ,(element-description "NoteCollision"
+		   note-collision-interface axis-group-interface
+		))
+	))
 	
 	(NoteColumn . (
 		(axes . (0 1))
@@ -446,12 +454,12 @@
 		(collapse-height . 1.0)
 		(thickness . 1.6)
 		(arch-height . 1.5)
-		(arch-angle . 50.0)
+		(arch-angle . 25.0)
 		(arch-thick . 0.25)
 		(glyph . bar-line)
 		(arch-width . 1.5)
 		(bracket-thick . 0.25)
-		(bracket-width . 2.0)
+		(bracket-width . 0.4)
 		(font-family . braces)
 		(font-point-size . 20)
 		(Y-extent-callback . #f)
@@ -505,6 +513,7 @@
 		(thick . 1.0)
 		(after-line-breaking-callback . ,Tuplet_spanner::after_line_breaking)
 		(molecule-callback . ,Tuplet_spanner::brew_molecule)
+		(font-family . roman)
 		(font-shape . italic)
 		(font-relative-size . -1)
 		(meta .  ,(element-description "TupletBracket" text-interface
@@ -532,7 +541,7 @@
 		(Y-offset-callbacks . (,Side_position::aligned_side))
 		(thickness . 1.6)  ;  stafflinethickness
 		(height . 2.0) ; staffspace;
-		(minimum-space . 25)
+		(minimum-space . 5)
  		(font-family . number)
  		(font-relative-size . -2)
 		(meta . ,(element-description "VoltaBracket" volta-bracket-interface side-position-interface font-interface))