''

diff --git a/ChangeLog b/ChangeLog
index a594d9975b06c1ca19bb765989ce6046838788a8..8ab2767367a4ead1e6b68626143f2dba65fd76e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-06-25  Juergen Reuter  <reuter@ipd.uka.de>
+
+       * input/test/ambitus.ly, lily/ambitus-engraver.cc,
+       lily/ambitus.cc, lily/include/ambitus.hh, ly/engraver-init.ly,
+       scm/basic-properties.scm, scm/grob-description.scm,
+       scm/grob-property-description.scm: added support for ambitus
+
 2002-06-24  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * lily/text-spanner.cc: add some props to interface (patch

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 313fb1623792d33d5513f31c0418c568f33f1918..7f20c8c42544f42907da04e94bf291143b140796 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -414,6 +414,7 @@ ScoreContext = \translator {
        breakAlignOrder = #'(
          instrument-name
          left-edge
+         ambitus
          span-bar
          breathing-sign
          clef

diff --git a/scm/basic-properties.scm b/scm/basic-properties.scm
index 5217d00c813b8c2b0bf57f2a380e447c86433c09..d3823ca4fbc4e0e8402714a01ad1c1a05c298665 100644 (file)
--- a/scm/basic-properties.scm
+++ b/scm/basic-properties.scm
@@ -62,6 +62,7 @@
  '(
    ((none Instrument_name) . (extra-space 1.0))
    ((none Left_edge_item) . (extra-space 0.0))
+   ((none Ambitus) . (extra-space 1.0))
    ((none Clef_item) . (minimum-space-pair  1.0))
    ((none Staff_bar) . (minimum-space-pair  0.0))
    ((none Clef_item) . (minimum-space-pair  1.0))

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index 11d6feaf4da2a7aa11af5e5559cbdc791b3a0b1a..825e03a21c8ca1f847b7f1c6fd9591bc6b80c8c0 100644 (file)
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -28,6 +28,25 @@
        (meta . ((interfaces . (accidental-placement-interface))))
        ))
 
+    (Ambitus
+     . (
+       (breakable . #t)
+       (break-align-symbol . ambitus)
+       (molecule-callback . ,Ambitus::brew_molecule)
+       (font-family . music)
+       (note-head-style . "noteheads-2")
+       (visibility-lambda . ,begin-of-line-visible)
+       (join-heads . #t)
+       (space-alist . (
+                      (clef . (extra-space . 0.0))
+                      (key-signature . (extra-space . 0.0))
+                      (staff-bar . (extra-space . 0.0))
+                      (time-signature . (extra-space . 0.0)) 
+                      (first-note . (extra-space . 0.0))
+                      ))
+       (meta . ((interfaces . (ambitus-interface staff-symbol-referencer-interface break-aligned-interface font-interface))))
+       ))
+
     (Arpeggio
      . (
        (X-extent-callback . ,Arpeggio::width_callback)
@@ -155,6 +174,7 @@
        (break-align-symbol . breathing-sign)
        (breakable . #t)
        (space-alist . (
+                       (ambitus . (extra-space . 2.0))
                        (key-signature . (minimum-space . 1.5))
                        (staff-bar . (minimum-space . 1.5))
                        (clef . (minimum-space . 2.0))
@@ -178,6 +198,7 @@
        (break-align-symbol . clef)
        (break-visibility . ,begin-of-line-visible)
        (space-alist . (
+                       (ambitus . (extra-space . 2.0))
                        (staff-bar . (minimum-space .  3.7))
                        (key-signature . (minimum-space . 4.0))
                        (time-signature . (minimum-space . 4.2))
@@ -282,6 +303,7 @@
        (X-extent-callback . ,Grob::point_dimension_callback)
        (breakable . #t)
        (space-alist . (
+                       (ambitus . (extra-space . 2.0))
                        (time-signature . (extra-space . 0.0)) 
                        (staff-bar . (extra-space . 0.0))
                        (breathing-sign . (minimum-space  . 0.0))

diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm
index 825ff4b622f880cf5fc0127aae5a2b351bc0fee0..b3c0593e1d9381307075fbd6f0da62c982f61df8 100644 (file)
--- a/scm/grob-property-description.scm
+++ b/scm/grob-property-description.scm
@@ -191,6 +191,7 @@ is used by @ref{note-collision-interface}.")
 (grob-property-description 'interfaces list? "list of symbols indicating the interfaces supported by this object. Is initialized from the @code{meta} field.")
 (grob-property-description 'inversion list? " musical-pitch, optional.")
 (grob-property-description 'items-worth-living grob-list? "list of interesting items. If empty in a particular system, clear that system.")
+(grob-property-description 'join-heads boolean? "Whether to join the noteheads of an ambitus grob with a vertical line.")
 (grob-property-description 'kern number? "amount of extra white space to add.
 
 For text,  this is `relative'(?) to the current alignment.
@@ -262,6 +263,7 @@ FIXME: also pair? (cons LEFT RIGHT)
 (grob-property-description 'no-spacing-rods boolean? "read from grobs: boolean that makes Separation_item ignore this item (MOVE ME TO ITEM).")
 (grob-property-description 'no-stem-extend boolean? "should stem not be extended to middle staff line?.")
 (grob-property-description 'non-default boolean? "not set because of existence of a bar?.")
+(grob-property-description 'note-head-style string? "name of the font character to be used as note heads in the ambitus grob.")
 (grob-property-description 'note-heads grob-list? "List of note head grobs")
 (grob-property-description 'number-threshold number? "only put numbers bigger than this threshold over multi measure rest.")
 (grob-property-description 'old-accidentals list? "list of (pitch, accidental) pairs.")