change

visibility-lambda to break-visibility

diff --git a/ChangeLog b/ChangeLog
index 766e2649539e00f325ca149e456dd153d21e4b7a..153161ec49a834ba0968187e68778cc28f43fa43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-21  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * scripts/convert-ly.py, lily/*.cc, scm/*.scm: change
+       visibility-lambda to break-visibility
+
 2002-06-21  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * input/bugs/part-combiner.ly: New file.

diff --git a/VERSION b/VERSION
index c773acb33841d6b9b9464362d154c5288dfc12c7..eca3fb11200c2667014264ea3d68c8ed5fa822f7 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,8 +1,8 @@
-PACKAGE_NAME=LilyPond
+ACPKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=62
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=uu1
 
 # Use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/clef-engraver.cc b/lily/clef-engraver.cc
index a7ad3b39af8185d9a9bb948a6a40e6f9532afd86..1c9151a69033a1cc34bbc4387041dd526a223a1f 100644 (file)
--- a/lily/clef-engraver.cc
+++ b/lily/clef-engraver.cc
@@ -169,9 +169,9 @@ Clef_engraver::stop_translation_timestep ()
 
       if (vis)
        {
-         clef_p_->set_grob_property ("visibility-lambda", vis);
+         clef_p_->set_grob_property ("break-visibility", vis);
          if (octavate_p_)
-           octavate_p_->set_grob_property ("visibility-lambda", vis);
+           octavate_p_->set_grob_property ("break-visibility", vis);
        }
       
       typeset_grob (clef_p_);

diff --git a/lily/item.cc b/lily/item.cc
index d6214c5b6a8e2e0e89cc887047af582a265ef873..594c97517c8c9b40c796c9cc5a6df9e4d68ab132 100644 (file)
--- a/lily/item.cc
+++ b/lily/item.cc
@@ -156,11 +156,11 @@ Item::handle_prebroken_dependencies ()
 
     TODO:
 
-    handle visibility-lambda the item itself iso. breakstatusdir, so
+    handle break-visibility the item itself iso. breakstatusdir, so
     the function can do more complicated things.
     
   */
-  SCM vis = get_grob_property ("visibility-lambda");
+  SCM vis = get_grob_property ("break-visibility");
   if (gh_procedure_p (vis))
     {
       SCM args = scm_list_n (gh_int2scm (break_status_dir ()), SCM_UNDEFINED);
@@ -201,4 +201,4 @@ unsmob_item (SCM s )
 ADD_INTERFACE(Item,
              "item-interface",
              "",
-             "no-spacing-rods visibility-lambda breakable")
+             "no-spacing-rods break-visibility breakable")

diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc
index 65abe52d7ceb0c6d830f56df47130ff3275d3b86..8cbd43b105ca4d7494d5e569630e04b142ee7ab7 100644 (file)
--- a/lily/key-engraver.cc
+++ b/lily/key-engraver.cc
@@ -76,7 +76,7 @@ Key_engraver::create_key (bool def)
     {
       SCM vis = get_property ("explicitKeySignatureVisibility"); 
       if (gh_procedure_p (vis))
-       item_p_->set_grob_property ("visibility-lambda",vis);
+       item_p_->set_grob_property ("break-visibility",vis);
     }
 }      
 

diff --git a/lily/span-bar-engraver.cc b/lily/span-bar-engraver.cc
index c2c3fd919c78ddb5df8d193712779be0171d1aa3..3561ce7b6999555ab0fe7294f6c521eb283de04d 100644 (file)
--- a/lily/span-bar-engraver.cc
+++ b/lily/span-bar-engraver.cc
@@ -72,7 +72,7 @@ Span_bar_engraver::stop_translation_timestep ()
       for (int i=0; i < bar_l_arr_.size () ; i++)
        Span_bar::add_bar (spanbar_p_,bar_l_arr_[i]);
 
-      SCM vissym =ly_symbol2scm ("visibility-lambda");
+      SCM vissym =ly_symbol2scm ("break-visibility");
       SCM vis = bar_l_arr_[0]->internal_get_grob_property (vissym);      
       if (scm_equal_p (spanbar_p_->internal_get_grob_property (vissym), vis) != SCM_BOOL_T)
        spanbar_p_->internal_set_grob_property (vissym, vis);

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index f9a0bd1ce2061044c0aa994c4cf48c5df0d02c52..eccaedbeb3f8ba1cafb158f7a49e38c0e74f8a52 100644 (file)
--- a/scm/grob-description.scm
+++ b/scm/grob-description.scm
@@ -47,7 +47,7 @@
        (break-glyph-function . ,default-break-barline)
        (bar-size-procedure . ,Bar_line::get_staff_bar_size)
        (molecule-callback . ,Bar_line::brew_molecule)     
-       (visibility-lambda . ,all-visible)
+       (break-visibility . ,all-visible)
        (breakable . #t)
        (before-line-breaking-callback . ,Bar_line::before_line_breaking)
        (space-alist . (
@@ -72,7 +72,7 @@
      . (
        (molecule-callback . ,Text_item::brew_molecule)
        (breakable . #t)
-       (visibility-lambda . ,begin-of-line-visible)
+       (break-visibility . ,begin-of-line-visible)
        (padding . 1.0)
        (direction . 1)
        (font-family . roman)
@@ -165,7 +165,7 @@
        (font-family . music)
        (text . "scripts-rcomma")
        (Y-offset-callbacks . (,Breathing_sign::offset_callback))
-       (visibility-lambda . ,begin-of-line-invisible)
+       (break-visibility . ,begin-of-line-invisible)
        (meta . ((interfaces . (break-aligned-interface breathing-sign-interface text-interface font-interface))))
        ))
 
@@ -176,7 +176,7 @@
        (breakable . #t)
        (font-family . music)      
        (break-align-symbol . clef)
-       (visibility-lambda . ,begin-of-line-visible)
+       (break-visibility . ,begin-of-line-visible)
        (space-alist . (
                        (staff-bar . (minimum-space .  3.7))
                        (key-signature . (minimum-space . 4.0))
@@ -202,7 +202,7 @@
        (break-align-symbol . custos)
        (breakable . #t)
        (molecule-callback . ,Custos::brew_molecule)
-       (visibility-lambda . ,end-of-line-visible)
+       (break-visibility . ,end-of-line-visible)
        (style . vaticana)
        (neutral-position . 0)
        (neutral-direction . -1)
@@ -242,7 +242,7 @@
                          (width . 2.0)
                          (thickness . 0.48)
                          (break-align-symbol . staff-bar)
-                         (visibility-lambda . ,begin-of-line-invisible)
+                         (break-visibility . ,begin-of-line-invisible)
                          (meta . ((interfaces . (font-interface
                                                  break-aligned-interface
                                                  percent-repeat-interface))))
@@ -348,7 +348,7 @@
        (self-alignment-Y . 0)
        (molecule-callback . ,Text_item::brew_molecule)         
        (break-align-symbol . instrument-name)
-       (visibility-lambda . ,begin-of-line-visible)
+       (break-visibility . ,begin-of-line-visible)
        (baseline-skip . 2)
        (font-family . roman)
        (meta . ((interfaces . (font-interface self-alignment-interface side-position-interface text-interface break-aligned-interface))))
@@ -364,7 +364,7 @@
                        ))
        (Y-offset-callbacks . (,Staff_symbol_referencer::callback))
        (break-align-symbol . key-signature)
-       (visibility-lambda . ,begin-of-line-visible)
+       (break-visibility . ,begin-of-line-visible)
        (breakable . #t)
        (meta . ((interfaces . (key-signature-interface  font-interface  break-aligned-interface))))
        ))
@@ -463,7 +463,7 @@
        (direction . 1)
        (breakable . #t)
        (font-family . roman)
-       (visibility-lambda . ,end-of-line-invisible)
+       (break-visibility . ,end-of-line-invisible)
        (padding . 0.8)
        (meta . ((interfaces . (text-interface side-position-interface font-interface mark-interface self-alignment-interface))))
        ))
@@ -553,7 +553,7 @@
      . (
        (self-alignment-X . 0)
        (text . "8")
-       (visibility-lambda . ,begin-of-line-visible)
+       (break-visibility . ,begin-of-line-visible)
        (X-offset-callbacks . (,Self_alignment_interface::centered_on_parent ,Self_alignment_interface::aligned_on_self))
        (Y-offset-callbacks . (,Side_position_interface::aligned_side))
        (molecule-callback . ,Text_item::brew_molecule)
@@ -720,7 +720,7 @@
        (break-align-symbol . staff-bar)
        (bar-size-procedure . ,Span_bar::get_bar_size) 
        (molecule-callback . ,Span_bar::brew_molecule)
-       (visibility-lambda . ,begin-of-line-invisible)
+       (break-visibility . ,begin-of-line-invisible)
        (X-extent-callback . ,Span_bar::width_callback)
        (Y-extent-callback . ())
        (breakable . #t)
@@ -743,7 +743,7 @@
        (breakable . #t)
        (molecule-callback . ,Text_item::brew_molecule)         
        (break-align-symbol . clef)
-       (visibility-lambda . ,begin-of-line-visible)
+       (break-visibility . ,begin-of-line-visible)
        (font-family . roman)
        (meta . ((interfaces . (break-aligned-interface text-interface font-interface))))               
        ))
@@ -962,7 +962,7 @@
      . (
        (molecule-callback . ,Time_signature::brew_molecule)
        (break-align-symbol . time-signature)
-       (visibility-lambda . ,all-visible)
+       (break-visibility . ,all-visible)
        (space-alist . (
                        (first-note . (extra-space . 2.0))
                        (staff-bar .  (minimum-space . 2.0))

diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm
index d8d36e5467530fae7b6a3289ed114cda35cc9889..c8e5d04f63a3c41832ca65b300bcbd0a1888ec05 100644 (file)
--- a/scm/grob-property-description.scm
+++ b/scm/grob-property-description.scm
@@ -412,7 +412,7 @@ one of: line, dashed-line, trill or dotted-line.
 
 [FIXME: type is too generic for this doc, move doco to intefrace] 
 ")
-(grob-property-description 'visibility-lambda procedure? "a function that takes the break direction and returns a  cons of booleans containing (TRANSPARENT . EMPTY).")
+(grob-property-description 'break-visibility procedure? "a function that takes the break direction and returns a  cons of booleans containing (TRANSPARENT . EMPTY).")
 (grob-property-description 'when moment? "when does this column happen?.")
 (grob-property-description 'word-space number? "elongate left by this much (FIXME: cumbersome semantics).")
 (grob-property-description 'alignment number? "alignment of lyrics on notehead, -1 is LEFT, 0 is CENTRE, 1 is RIGHT .")

diff --git a/scm/translator-property-description.scm b/scm/translator-property-description.scm
index 740feffa94c9569190f658c8522447bceda82827..27012b0df76c9e8a0e8a7e51802ba84a7877c2cd 100644 (file)
--- a/scm/translator-property-description.scm
+++ b/scm/translator-property-description.scm
@@ -205,7 +205,7 @@ Do nothing.
 
 (translator-property-description 'explicitKeySignatureVisibility
 procedure? "visibility-lambda function for explicit Key changes;
-\override of #'visibility-lambda will set the visibility for normal
+\override of #'break-visibility will set the visibility for normal
 (ie. at the start of the line) key signatures.")
 
 (translator-property-description 'extraNatural boolean? "Whether to typeset an

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 7ad507e32f7ab0eb6e14c278986e900ca319aada..fafa29e2f6bbff542a2fa5d8eb2a4ec09ef4e79c 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -885,6 +885,14 @@ if 1:
        conversions.append (((1,5,59), conv,
        'XxxxVerticalExtent -> xxxVerticalExtent'))
 
+if 1:
+       def conv (str):
+               str = re.sub ('visibility-lambda', 'break-visibility', str)
+               return str
+
+       conversions.append (((1,5,62), conv,
+       'visibility-lambda -> break-visibility'))
+
 
 ################################
 #      END OF CONVERSIONS