* 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

diff --git a/ChangeLog b/ChangeLog
index e3f38b4a9b31c603fe01fa62ba461118612be2c2..adca966ea92bba9f86b17def6fb505617b08254c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2003-06-23  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * 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 3a836cee47ee2d7d10fa1534945fe3713c26e109..12dc059501cc22e6ab619b5460b74e3314145cfa 100644 (file)
--- 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 82caf5581468af2fd8bbcd5cf728013a2522d72d..541b242550c893b983b29c6843de4ec41e0bb71e 100644 (file)
--- 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 18f66b3babb5334b2de006a474a23f05f3c5ebfc..834a7af2d9a7cbd130b85dfc152093f9e5a9d9ff 100644 (file)
--- 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 7892e7cbb1f9c721bdb1da853a3ac79e175f8e3e..fb9da592c95416982ccad332b99cb4400e435ba8 100644 (file)
--- 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 16d7e8f115601d9473ea34395a4482425ba88267..a9fdb325799a1a7590a0c3d36a9931ab95421ceb 100644 (file)
--- 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 a6fdceef56ec9f31f48adc2b79f4e2bb5bb937bc..b7f4566c44b7dde7010ad0bbf59b3ed902fe86ac 100644 (file)
--- 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 8eb4022f1a8bba42a9ee7e8a649dfb433760bcd6..dcdf425c5923c174e3ee5572f59d3aae3cf73c0c 100644 (file)
--- 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 ec66a08af67c6e0e7fc7549f6a3d1617836c9cf6..8ced4b6a799e588d33c895e09a9d32af3375dbff 100644 (file)
--- 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 9f5b2ceb7a1c7c3e1437523f59986b3605ba1df0..f414297ebbead7616cd19a0b7360942f59d0050d 100644 (file)
--- 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 a425c7eeee90a385809815cae40a8d49104efd27..c5abd4aee3a3bad990728ff1e483c5fcd830e8a1 100644 (file)
--- 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)