From d35271961e34da635524a2246bb1061091242a3b Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 21 Jun 2002 15:10:20 +0000 Subject: [PATCH] change visibility-lambda to break-visibility --- ChangeLog | 5 +++++ VERSION | 4 ++-- lily/clef-engraver.cc | 4 ++-- lily/item.cc | 6 +++--- lily/key-engraver.cc | 2 +- lily/span-bar-engraver.cc | 2 +- scm/grob-description.scm | 26 ++++++++++++------------- scm/grob-property-description.scm | 2 +- scm/translator-property-description.scm | 2 +- scripts/convert-ly.py | 8 ++++++++ 10 files changed, 37 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 766e264953..153161ec49 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-06-21 Han-Wen Nienhuys + + * scripts/convert-ly.py, lily/*.cc, scm/*.scm: change + visibility-lambda to break-visibility + 2002-06-21 Jan Nieuwenhuizen * input/bugs/part-combiner.ly: New file. diff --git a/VERSION b/VERSION index c773acb338..eca3fb1120 100644 --- 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 a7ad3b39af..1c9151a690 100644 --- 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 d6214c5b6a..594c97517c 100644 --- 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 65abe52d7c..8cbd43b105 100644 --- 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 c2c3fd919c..3561ce7b69 100644 --- 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 f9a0bd1ce2..eccaedbeb3 100644 --- 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 d8d36e5467..c8e5d04f63 100644 --- 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 740feffa94..27012b0df7 100644 --- 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 7ad507e32f..fafa29e2f6 100644 --- 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 -- 2.39.2