From 4f7187ac9efe404e0c5653fde88ebe972340e9c6 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 22 Jun 2003 22:36:47 +0000 Subject: [PATCH] * scm/define-grob-properties.scm: remove 'type * scripts/convert-ly.py (FatalConversionError.conv): type -> style conversion * lily/text-spanner.cc: change 'type grob prop to 'style --- ChangeLog | 7 +++++++ lily/dynamic-engraver.cc | 2 +- lily/line-spanner.cc | 6 +++--- lily/measure-grouping-engraver.cc | 4 ++-- lily/measure-grouping-spanner.cc | 4 ++-- lily/text-spanner.cc | 2 +- scm/define-grob-properties.scm | 4 ---- scm/define-grobs.scm | 10 +++++----- scripts/convert-ly.py | 10 ++++++++++ stepmake/stepmake/documentation-targets.make | 4 ++-- stepmake/stepmake/help2man-targets.make | 4 ++-- 11 files changed, 35 insertions(+), 22 deletions(-) diff --git a/ChangeLog b/ChangeLog index e3f38b4a9b..adca966ea9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2003-06-23 Han-Wen Nienhuys + * scm/define-grob-properties.scm: remove 'type + + * scripts/convert-ly.py (FatalConversionError.conv): type -> style + conversion + + * lily/text-spanner.cc: change 'type grob prop to 'style + * lily/unfolded-repeat-iterator.cc (process): bugfix: use a "first" flag to decide whether to make a start-repeat diff --git a/lily/dynamic-engraver.cc b/lily/dynamic-engraver.cc index 3a836cee47..12dc059501 100644 --- a/lily/dynamic-engraver.cc +++ b/lily/dynamic-engraver.cc @@ -260,7 +260,7 @@ Dynamic_engraver::process_music () else { cresc_ = new Spanner (get_property ("TextSpanner")); - cresc_->set_grob_property ("type", s); + cresc_->set_grob_property ("style", s); daddy_trans_->set_property ((start_type + "Spanner").to_str0 (), SCM_EOL); s = get_property ((start_type + "Text").to_str0 ()); diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index 82caf55814..541b242550 100644 --- a/lily/line-spanner.cc +++ b/lily/line-spanner.cc @@ -29,7 +29,7 @@ static SCM line_atom (Grob *me, Real thick, Real dx, Real dy) { - SCM type = me->get_grob_property ("type"); + SCM type = me->get_grob_property ("style"); Real staff_space = Staff_symbol_referencer::staff_space (me); // maybe these should be in line-thickness? @@ -124,7 +124,7 @@ Molecule Line_spanner::line_molecule (Grob *me, Real thick, Real dx, Real dy) { Molecule mol; - SCM type = me->get_grob_property ("type"); + SCM type = me->get_grob_property ("style"); if (gh_symbol_p (type) && (type == ly_symbol2scm ("line") || type == ly_symbol2scm ("dashed-line") @@ -331,6 +331,6 @@ ADD_INTERFACE (Line_spanner, "line-spanner-interface", "gap is measured in staff-spaces.\n" "The property 'type is one of: line, dashed-line, trill, dotted-line or zigzag.\n" "\n", - "gap dash-period dash-length zigzag-width zigzag-length thickness type"); + "gap dash-period dash-length zigzag-width zigzag-length thickness style"); diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc index 18f66b3bab..834a7af2d9 100644 --- a/lily/measure-grouping-engraver.cc +++ b/lily/measure-grouping-engraver.cc @@ -95,9 +95,9 @@ Measure_grouping_engraver::process_music () top_engraver ()->add_moment_to_process (Moment (stop_grouping_mom_)); if (grouplen == 3) - grouping_->set_grob_property ("type", ly_symbol2scm ("triangle")); + grouping_->set_grob_property ("style", ly_symbol2scm ("triangle")); else - grouping_->set_grob_property ("type", ly_symbol2scm ("bracket")); + grouping_->set_grob_property ("style", ly_symbol2scm ("bracket")); break ; } diff --git a/lily/measure-grouping-spanner.cc b/lily/measure-grouping-spanner.cc index 7892e7cbb1..fb9da592c9 100644 --- a/lily/measure-grouping-spanner.cc +++ b/lily/measure-grouping-spanner.cc @@ -21,7 +21,7 @@ Measure_grouping::brew_molecule (SCM grob) /* TODO: robustify. */ - SCM which = me->get_grob_property ("type"); + SCM which = me->get_grob_property ("style"); SCM thick = me->get_grob_property ("thickness"); SCM height = me->get_grob_property ("height"); @@ -55,6 +55,6 @@ Measure_grouping::brew_molecule (SCM grob) ADD_INTERFACE (Measure_grouping,"measure-grouping-interface", "indicate groups of beats. Valid choices for 'type are 'bracket and 'triangle.", - "thickness type height"); + "thickness style height"); diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc index 16d7e8f115..a9fdb32579 100644 --- a/lily/text-spanner.cc +++ b/lily/text-spanner.cc @@ -289,5 +289,5 @@ ADD_INTERFACE (Pianopedal,"piano-pedal-interface", ADD_INTERFACE (Text_spanner,"text-spanner-interface", "generic text spanner", - "dash-period if-text-padding dash-length edge-height edge-widen edge-text shorten-pair type thickness enclose-bounds width-correct"); + "dash-period if-text-padding dash-length edge-height edge-widen edge-text shorten-pair style thickness enclose-bounds width-correct"); diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm index a6fdceef56..b7f4566c44 100644 --- a/scm/define-grob-properties.scm +++ b/scm/define-grob-properties.scm @@ -455,10 +455,6 @@ print only if there is no beam associated with this tuplet bracket.") (grob-property-description 'number-visibility boolean-or-symbol? " Like @code{bracket-visibility}, but for the number.") (grob-property-description 'tie ly:grob? "") -(grob-property-description 'type symbol? " - -") - (grob-property-description 'break-visibility procedure? "a function that takes the break direction and returns a cons of booleans containing (TRANSPARENT . EMPTY). diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 8eb4022f1a..dcdf425c59 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -611,7 +611,7 @@ (Glissando . ( - (type . line) + (style . line) (gap . 0.5) (zigzag-width . 0.75) (breakable . #t) @@ -624,7 +624,7 @@ (VoiceFollower . ( - (type . line) + (style . line) (gap . 0.5) (breakable . #t) (X-extent-callback . #f) @@ -718,7 +718,7 @@ . ( (molecule-callback . ,Text_spanner::brew_molecule) (font-family . roman) - (type . line) + (style . line) (if-text-padding . 1.0) (width-correct . 0) (enclose-bounds . #t) @@ -1067,7 +1067,7 @@ . ( (molecule-callback . ,Text_spanner::brew_molecule) (font-family . roman) - (type . line) + (style . line) ;; urg, only for (de)cresc. text spanners (if-text-padding . 1.0) @@ -1084,7 +1084,7 @@ (font-family . roman) (enclose-bounds . #t) (width-correct . 0.0) - (type . dashed-line) + (style . dashed-line) (edge-height . (0 . 1.5)) (direction . 1) (meta . ((interfaces . (text-spanner-interface side-position-interface font-interface spanner-interface)))) diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index ec66a08af6..8ced4b6a79 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -1200,6 +1200,16 @@ if 1: +if 1: + def conv(str): + str = re.sub ( + r"(set|override|revert) *#'type", + r"\1 #'style" + str) + return str + + conversions.append (((1,7,22), conv,"remove GraceContext")) + ################################ # END OF CONVERSIONS ################################ diff --git a/stepmake/stepmake/documentation-targets.make b/stepmake/stepmake/documentation-targets.make index 9f5b2ceb7a..f414297ebb 100644 --- a/stepmake/stepmake/documentation-targets.make +++ b/stepmake/stepmake/documentation-targets.make @@ -16,13 +16,13 @@ deep-footify: INFO_INSTALL_FILES = $(wildcard $(addsuffix *, $(INFO_FILES))) # should we call install-info? -INFOINSTALL=$(MAKE) INSTALLATION_OUT_DIR=$(infodir) depth=$(depth) INSTALLATION_OUT_FILES="$(INFO_INSTALL_FILES)" -f $(stepdir)/install-out.sub.make +INFOINSTALL=$(MAKE) INSTALLATION_OUT_DIR=$(DESTDIR)$(infodir) depth=$(depth) INSTALLATION_OUT_FILES="$(INFO_INSTALL_FILES)" -f $(stepdir)/install-out.sub.make local-install: install-info local-uninstall: uninstall-info install-info: $(INFO_FILES) - -$(INSTALL) -d $(infodir) + -$(INSTALL) -d $(DESTDIR)$(infodir) $(INFOINSTALL) local-install uninstall-info: diff --git a/stepmake/stepmake/help2man-targets.make b/stepmake/stepmake/help2man-targets.make index a425c7eeee..c5abd4aee3 100644 --- a/stepmake/stepmake/help2man-targets.make +++ b/stepmake/stepmake/help2man-targets.make @@ -3,9 +3,9 @@ default: man local-install: install-help2man install-help2man: man - -$(INSTALL) -d $(mandir)/man1 + -$(INSTALL) -d $(DESTDIR)$(mandir)/man1 $(foreach a, $(HELP2MAN_GROFFS), \ - $(INSTALL) -m 644 $(a) $(mandir)/man1 && ) true + $(INSTALL) -m 644 $(a) $(DESTDIR)$(mandir)/man1 && ) true man: $(HELP2MAN_GROFFS) -- 2.39.5