translation-status.py: Use factory for [Un]TranslatedTely.

[lilypond.git] / scm / define-grobs.scm

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 3e8b65908a3d721e790b2c9984bbc7e1ff1c7158..176debd52320ba8bfb08e981da3ce84d5a34792b 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1,6 +1,6 @@
 ;;;; This file is part of LilyPond, the GNU music typesetter.
 ;;;;
-;;;; Copyright (C) 1998--2009 Han-Wen Nienhuys <hanwen@xs4all.nl>
+;;;; Copyright (C) 1998--2010 Han-Wen Nienhuys <hanwen@xs4all.nl>
 ;;;;                 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;
 ;;;; LilyPond is free software: you can redistribute it and/or modify
@@ -533,6 +533,7 @@
        (direction . ,UP)
        (extra-spacing-width . (+inf.0 . -inf.0))
        (font-series . bold)
+       (outside-staff-priority . 450)
        (padding . 0.5)
        (script-priority . 200)
        (side-axis . ,Y)
@@ -606,7 +607,7 @@
     (DoublePercentRepeatCounter
      . (
        (direction . ,UP)
-       (font-encoding . fetaNumber)
+       (font-encoding . fetaText)
        (font-size . -2)
        (padding . 0.2)
        (self-alignment-X . ,CENTER)
@@ -655,11 +656,12 @@
 
        (direction . ,ly:script-interface::calc-direction)
        (extra-spacing-width . (+inf.0 . -inf.0))
-       (font-encoding . fetaDynamic)
+       (font-encoding . fetaText)
        (font-series . bold)
        (font-shape . italic)
        (outside-staff-priority . 250)
        (positioning-done . ,ly:script-interface::calc-positioning-done)
+       (right-padding . 0.5)
        (self-alignment-X . ,CENTER)
        (self-alignment-Y . ,CENTER)
        (stencil . ,ly:text-interface::print)
@@ -667,6 +669,7 @@
        (Y-offset . ,ly:self-alignment-interface::y-aligned-on-self)
        (meta . ((class . Item)
                 (interfaces . (dynamic-interface
+                               dynamic-text-interface
                                font-interface
                                script-interface
                                self-alignment-interface
@@ -674,6 +677,7 @@
 
     (DynamicTextSpanner
      . (
+       (before-line-breaking . ,dynamic-text-spanner::before-line-breaking)
        (bound-details . ((right . ((attach-dir .  ,LEFT)
                                    (Y . 0)
                                    (padding . 0.75)
@@ -684,8 +688,8 @@
 
                          (left . ((attach-dir .  ,LEFT)
                                   (Y . 0)
-                                  (stencil-offset . (0 . -0.5))
-                                  (padding . 0.5)
+                                  (stencil-offset . (-0.75 . -0.5))
+                                  (padding . 0.75)
                                   ))
                          (left-broken . ((attach-dir .  ,RIGHT)
                                   ))
@@ -718,6 +722,33 @@
                                text-interface))))))
 
 
+    (Episema
+     . (
+       (bound-details . ((left . ((Y . 0)
+                                  (padding . 0)
+                                  (attach-dir . ,LEFT)
+                                  ))
+                         (right . ((Y . 0)
+                                   (padding . 0)
+                                   (attach-dir . ,RIGHT)
+                                   ))
+                         ))
+       (direction . ,UP)
+       (left-bound-info . ,ly:line-spanner::calc-left-bound-info)
+       (quantize-position . #t)
+       (right-bound-info . ,ly:line-spanner::calc-right-bound-info)
+       (side-axis . ,Y)
+       (stencil . ,ly:line-spanner::print)
+       (style . line)
+       (Y-offset . ,ly:side-position-interface::y-aligned-side)
+       (meta . ((class . Spanner)
+                (interfaces . (episema-interface
+                               font-interface
+                               line-interface
+                               line-spanner-interface
+                               side-position-interface))))))
+
+
     (Fingering
      . (
 
@@ -726,7 +757,7 @@
        (avoid-slur . around)
        (cross-staff . ,ly:side-position-interface::calc-cross-staff)
        (direction . ,ly:script-interface::calc-direction)
-       (font-encoding . fetaNumber)
+       (font-encoding . fetaText)
        (font-size . -5)                ; don't overlap when next to heads.
        (padding . 0.5)
        (positioning-done . ,ly:script-interface::calc-positioning-done)
@@ -1136,7 +1167,7 @@
      . (
        (bound-padding  . 2.0)
        (direction . ,UP)
-       (font-encoding . fetaNumber)
+       (font-encoding . fetaText)
        (padding . 0.4)
        (self-alignment-X . ,CENTER)
        (side-axis . ,Y)
@@ -1354,7 +1385,7 @@
     (PercentRepeatCounter
      . (
        (direction . ,UP)
-       (font-encoding . fetaNumber)
+       (font-encoding . fetaText)
        (font-size . -2)
        (padding . 0.2)
        (self-alignment-X . ,CENTER)
@@ -1523,16 +1554,6 @@
        (meta . ((class . Item)
                 (interfaces . (script-column-interface))))))
 
-    (SeparationItem
-     . (
-       (avoid-slur . inside)
-       (horizontal-skylines . ,ly:separation-item::calc-skylines)
-       (stencil . ,ly:separation-item::print)
-       (X-extent . ,ly:axis-group-interface::width)
-       (Y-extent . ,ly:axis-group-interface::height)
-       (meta . ((class . Item)
-                (interfaces . (separation-item-interface))))))
-
     (Slur
      . (
        (avoid-slur . inside)
@@ -1737,7 +1758,7 @@
     (StringNumber
      . (
        (avoid-slur . around)
-       (font-encoding . fetaNumber)
+       (font-encoding . fetaText)
        (font-size . -5)                ; don't overlap when next to heads.
        (padding . 0.5)
        (script-priority . 100)
@@ -1888,6 +1909,7 @@
        (font-size . -2)
        (stem-attachment . (0.0 . 1.35))
        (stencil . ,ly:text-interface::print)
+       (whiteout . #t)
        (X-offset . ,ly:self-alignment-interface::x-aligned-on-self)
        (Y-offset . ,ly:staff-symbol-referencer::callback)
        (meta . ((class . Item)
@@ -2072,17 +2094,11 @@
     (TrillSpanner
      . (
        (after-line-breaking . ,ly:spanner::kill-zero-spanned-time)
-       (bound-details . ((left . ((text . ,(make-translate-scaled-markup
-                                            '(0.0 . -1.0)
-                                            (make-musicglyph-markup "scripts.trill")))
+       (bound-details . ((left . ((text . ,(make-musicglyph-markup "scripts.trill"))
                                   (Y . 0)
-                                  (stencil-offset . (-0.5 . 0))
-                                  (padding . 1.5)
+                                  (stencil-offset . (-0.5 . -1))
+                                  (padding . 0.5)
                                   (attach-dir . ,CENTER)
-                                  ;; this isn't CENTER because the trill glyph's origin
-                                  ;; is not centered in its extent; to have the trill
-                                  ;; spanner aligned the same as a trill, we need a slight offset
-                                  (anchor-alignment . 0.15)
                                   ))
                          (left-broken . ((end-on-note . #t)))
                          (right . ((Y . 0)))
@@ -2238,7 +2254,7 @@
      . (
        (direction . ,UP)
        (edge-height . (2.0 . 2.0)) ;; staff-space;
-       (font-encoding . fetaNumber)
+       (font-encoding . fetaText)
        (font-size . -4)
        (stencil . ,ly:volta-bracket-interface::print)
        (thickness . 1.6) ;; line-thickness
@@ -2335,7 +2351,6 @@
    note-head::brew-ez-stencil
    print-circled-text-callback
    lyric-text::print
-   ly:arpeggio::brew-chord-bracket
    ly:bar-line::print
    ly:mensural-ligature::brew-ligature-primitive
    ly:note-head::print
@@ -2350,6 +2365,7 @@
 (define pure-print-to-height-conversions
   `(
     (,ly:arpeggio::print . ,ly:arpeggio::pure-height)
+    (,ly:arpeggio::brew-chord-bracket . ,ly:arpeggio::pure-height)
     (,ly:hairpin::print . ,ly:hairpin::pure-height)
     (,ly:volta-bracket-interface::print . ,volta-bracket-interface::pure-height)))