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
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 ());
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?
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")
"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");
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 ;
}
/*
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");
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");
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");
(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).
(Glissando
. (
- (type . line)
+ (style . line)
(gap . 0.5)
(zigzag-width . 0.75)
(breakable . #t)
(VoiceFollower
. (
- (type . line)
+ (style . line)
(gap . 0.5)
(breakable . #t)
(X-extent-callback . #f)
. (
(molecule-callback . ,Text_spanner::brew_molecule)
(font-family . roman)
- (type . line)
+ (style . line)
(if-text-padding . 1.0)
(width-correct . 0)
(enclose-bounds . #t)
. (
(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)
(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))))
+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
################################
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:
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)