* input/proportional.ly: use #'used property. Set break-overshoot property.

* mf/feta-arrow.mf: arrow tip sticks out of bbox.

* lily/paper-column.cc: add used property

diff --git a/ChangeLog b/ChangeLog
index ff6b69a08b829372ec789b84dd400a3f16bc273f..e02dced8164461e77c014ac259d406f126c27070 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2005-08-15  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+       * input/proportional.ly: use #'used property. Set break-overshoot property.
+
+       * mf/feta-arrow.mf: arrow tip sticks out of bbox.
+
+       * lily/paper-column.cc: add used property
+
        * lily/mark-engraver.cc (stop_translation_timestep): set grob
        array for staves found.
 

diff --git a/input/proportional.ly b/input/proportional.ly
index ab2a20cc0e8d1e6d1cf3dcc2aedce4508c2d72bc..e022d16977316a90a487a1b340a8c15c8eb48a0c 100644 (file)
--- a/input/proportional.ly
+++ b/input/proportional.ly
@@ -3,7 +3,7 @@
 \header
 {
   title  = "Proportional notation"
-  copyright = "© 2005 Trevor Bača"
+  copyright = "© 2005 Trevor Bača - verbatim reproduction permitted."
 }
 
 \layout
@@ -26,6 +26,8 @@
    proportionalNotationDuration = #(ly:make-moment 1 64)
    \override TimeSignature #'break-visibility = #end-of-line-invisible
    \override Beam #'break-overshoot = #'(-0.5 . 1.0)
+   \override TupletBracket #'break-overshoot = #'(-0.5 . 1.0)
+   \override PaperColumn #'used = ##t 
  }
  \context {
    % we want over print if necessary.

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index f188bfdb489369262216a8b1c39629a8a4f47432..ce29a2011a1ce3539f9ec8360087ff8e777c3e23 100644 (file)
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -46,6 +46,7 @@ ADD_INTERFACE (Paper_column, "paper-column-interface",
               "page-penalty "
               "shortest-playing-duration "
               "shortest-starter-duration "
+              "used "
               "when ");
 
 void
@@ -117,7 +118,12 @@ Paper_column::is_used (Grob *me)
   if (bbm.size ())
     return true;
   
-  return Item::is_breakable (me);
+  if (Item::is_breakable (me))
+    return true;
+
+  if (to_boolean (me->get_property ("used")))
+    return true;
+  return false;
 }
 
 /*

diff --git a/mf/feta-arrow.mf b/mf/feta-arrow.mf
index 361ee22dfb0f6dbbd369a82833563a53017b5f76..2133446ac864abbd5c72041f5d0b08f0a1207dfa 100644 (file)
--- a/mf/feta-arrow.mf
+++ b/mf/feta-arrow.mf
@@ -31,7 +31,7 @@ def set_arrow_paths (expr width, height, open_tension, arrowlinethickness) =
        indent = linethickness/2;
 
        lft x1 = -width;
-       rt x2 = 0;
+       x2 = 0;
        top y1 = height;
        y2 = 0;
 
@@ -69,7 +69,7 @@ def set_arrow_paths (expr width, height, open_tension, arrowlinethickness) =
 enddef;
 
 fet_beginchar ("open", "open.01");
-       set_char_box (staff_space#, 0, 0.5 staff_space#, 0.5 staff_space#);
+       set_char_box (staff_space#, 1.6 linethickness#/2, 0.5 staff_space#, 0.5 staff_space#);
        set_arrow_paths (staff_space, 0.5 staff_space, 1.0, 1.6 linethickness);
        fill open_path; 
        addto currentpicture also currentpicture yscaled -1;
@@ -78,7 +78,7 @@ fet_beginchar ("open", "open.01");
 fet_endchar;
 
 fet_beginchar ("open", "open.0M1");
-       set_char_box (0, staff_space#, 0.5 staff_space#, 0.5 staff_space#);
+       set_char_box ( 1.6 linethickness#/2, staff_space#, 0.5 staff_space#, 0.5 staff_space#);
        set_arrow_paths (staff_space, 0.5 staff_space, 1.0, 1.6 linethickness);
        fill open_path; 
        addto currentpicture also currentpicture yscaled -1;
@@ -87,7 +87,7 @@ fet_endchar;
 
 fet_beginchar ("open", "open.11");
        set_char_box (.5 staff_space#, .5 staff_space#,
-                       1.0 staff_space#, 0.0 staff_space#);
+                       1.0 staff_space#,  1.6 linethickness#/2);
        set_arrow_paths (staff_space, 0.5 staff_space, 1.0, 1.6 linethickness);
        fill open_path; 
        addto currentpicture also currentpicture yscaled -1;
@@ -96,7 +96,7 @@ fet_endchar;
 
 fet_beginchar ("open", "open.1M1");
        set_char_box (.5 staff_space#, .5 staff_space#,
-                       0.0 staff_space#, 1.0 staff_space#);
+                     1.6 linethickness#/2, 1.0 staff_space#);
        set_arrow_paths (staff_space, 0.5 staff_space, 1.0, 1.6 linethickness);
        fill open_path; 
        addto currentpicture also currentpicture yscaled -1;

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 446000b50981071e29f38312d4eba26529508eb6..b6a8dde3e3f3afdf6fd0326423b2e5e5eea10455 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -348,6 +348,10 @@ spacing constraints.")
 get stems extending to the middle staff line.")
      (number-type ,symbol? "Type of numbers to use in label.  Choices
 include @code{roman-lower}, @code{roman-upper}, and @code{arabic}.")
+     (number-visibility ,boolean-or-symbol? "Like
+@code{bracket-visibility}, but for the number.")
+
+
 
      (packed-spacing ,boolean? "If set, the notes are spaced as
 tightly as possible.")
@@ -472,11 +476,7 @@ reading this property.")
 this grob, which means that grobs can be erased individually.")
      (uniform-stretching ,boolean? "If set, items stretch proportional
 to their durations. This looks better in complex polyphonic patterns")
-
-     (number-visibility ,boolean-or-symbol? "Like
-@code{bracket-visibility}, but for the number.")
-
-
+     (used ,boolean? "If set, this spacing column is kept in the spacing problem")
      (when ,ly:moment? "Global time step associated with this column
 happen?")
      (word-space ,ly:dimension? "space to insert between lyrics or