From 8586145c97979785808ebb4f04d050c68fcac3b5 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 18 Aug 2002 11:17:45 +0000 Subject: [PATCH] (aligned_side): don't add padding again. * input/test/harmonic.ly: new file. * ly/engraver-init.ly: s/extraverticalExtent/extraVerticalExtent/. --- ChangeLog | 14 ++++++++++++++ input/regression/beam-quanting.ly | 1 - input/regression/spacing-individual-tuning.ly | 1 - lily/ambitus-engraver.cc | 4 ++-- lily/ambitus.cc | 6 +++--- lily/grob-property.cc | 3 --- lily/piano-pedal-engraver.cc | 3 ++- lily/side-position-interface.cc | 4 ---- lily/spacing-wish.cc | 1 - lily/spring.cc | 1 - ly/engraver-init.ly | 14 +++++++------- mf/feta-eindelijk.mf | 2 +- mf/feta20.mf | 4 ++-- scm/generate-interface-doc.scm | 0 scm/grob-description.scm | 7 ++++++- 15 files changed, 37 insertions(+), 28 deletions(-) delete mode 100644 input/regression/beam-quanting.ly delete mode 100644 input/regression/spacing-individual-tuning.ly delete mode 100644 lily/spacing-wish.cc delete mode 100644 lily/spring.cc delete mode 100644 scm/generate-interface-doc.scm diff --git a/ChangeLog b/ChangeLog index 0024cf96d8..10663780b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2002-08-18 Han-Wen Nienhuys + + * input/test/harmonic.ly: new file. + + * lily/side-position-interface.cc (aligned_side): don't add + padding again. + +2002-08-18 Werner Lemberg + + * ly/engraver-init.ly: + s/extraverticalExtent/extraVerticalExtent/. + 2002-08-18 Jan Nieuwenhuizen * lily/score-engraver.cc: Uniformise error message. @@ -20,6 +32,8 @@ 2002-08-18 Han-Wen Nienhuys + * VERSION: 1.5.74 released + * lily/break-substitution.cc (fast_fubstitute_grob_list): use realloc() diff --git a/input/regression/beam-quanting.ly b/input/regression/beam-quanting.ly deleted file mode 100644 index 8b13789179..0000000000 --- a/input/regression/beam-quanting.ly +++ /dev/null @@ -1 +0,0 @@ - diff --git a/input/regression/spacing-individual-tuning.ly b/input/regression/spacing-individual-tuning.ly deleted file mode 100644 index 8b13789179..0000000000 --- a/input/regression/spacing-individual-tuning.ly +++ /dev/null @@ -1 +0,0 @@ - diff --git a/lily/ambitus-engraver.cc b/lily/ambitus-engraver.cc index b3c8cc4c2c..21ec794a57 100644 --- a/lily/ambitus-engraver.cc +++ b/lily/ambitus-engraver.cc @@ -115,13 +115,13 @@ Ambitus_engraver::stop_translation_timestep () * assumed to be 0. */ SCM c0 = get_property ("centralCPosition"); - ambitus_->set_grob_property ("centralCPosition", c0); + ambitus_->set_grob_property ("c0-position", c0); /* * Similar for keySignature. */ SCM key_signature = get_property ("keySignature"); - ambitus_->set_grob_property ("keySignature", key_signature); + ambitus_->set_grob_property ("accidentals", key_signature); typeset_grob (ambitus_); is_typeset = 1; diff --git a/lily/ambitus.cc b/lily/ambitus.cc index 37eb5b9617..25434f4cbb 100644 --- a/lily/ambitus.cc +++ b/lily/ambitus.cc @@ -172,7 +172,7 @@ Ambitus::brew_molecule (SCM smob) me->programming_error ("Ambitus: reverse range"); } - SCM c0 = me->get_grob_property ("centralCPosition"); + SCM c0 = me->get_grob_property ("c0-position"); if (gh_number_p (c0)) { p_min += gh_scm2int (c0); @@ -219,7 +219,7 @@ Ambitus::brew_molecule (SCM smob) molecule.add_molecule (ledger_lines); // add accidentals - SCM key_signature = me->get_grob_property ("keySignature"); + SCM key_signature = me->get_grob_property ("key-signature"); SCM scm_accidentals_style = me->get_grob_property ("accidentals-style"); String accidentals_style; if (gh_symbol_p (scm_accidentals_style)) @@ -248,4 +248,4 @@ Ambitus::brew_molecule (SCM smob) ADD_INTERFACE (Ambitus, "ambitus-interface", "An ambitus represents the pitch range of a voice.", - "note-head-style join-heads"); + "c0-position note-head-style join-heads"); diff --git a/lily/grob-property.cc b/lily/grob-property.cc index 19230c0d6b..768f0d0724 100644 --- a/lily/grob-property.cc +++ b/lily/grob-property.cc @@ -7,20 +7,17 @@ #include "main.hh" #include "input-smob.hh" - #include "group-interface.hh" #include "misc.hh" #include "paper-score.hh" #include "paper-def.hh" #include "grob.hh" - #include "spanner.hh" #include "item.hh" #include "misc.hh" #include "item.hh" - SCM Grob::get_property_alist_chain (SCM def) const { diff --git a/lily/piano-pedal-engraver.cc b/lily/piano-pedal-engraver.cc index 4cbe1feb62..13ed7a6990 100644 --- a/lily/piano-pedal-engraver.cc +++ b/lily/piano-pedal-engraver.cc @@ -185,7 +185,8 @@ Piano_pedal_engraver::process_acknowledged_grobs () { String name = String (p->name_) + "PedalLineSpanner"; p->line_spanner_ = new Spanner (get_property (name.to_str0 ())); - Side_position_interface::set_axis (p->line_spanner_, Y_AXIS); + + Music * rq = (p->req_l_drul_[START] ? p->req_l_drul_[START] : p->req_l_drul_[STOP]); announce_grob (p->line_spanner_, rq->self_scm ()); } diff --git a/lily/side-position-interface.cc b/lily/side-position-interface.cc index ad7f50b903..24f3abbc99 100644 --- a/lily/side-position-interface.cc +++ b/lily/side-position-interface.cc @@ -207,10 +207,6 @@ Side_position_interface::aligned_side (SCM element_smob, SCM axis) d = DOWN; } o += - iv[-d]; - - SCM pad = me->get_grob_property ("padding"); - if (gh_number_p (pad)) - o += d *gh_scm2double (pad) ; } return gh_double2scm (o); } diff --git a/lily/spacing-wish.cc b/lily/spacing-wish.cc deleted file mode 100644 index 8b13789179..0000000000 --- a/lily/spacing-wish.cc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/lily/spring.cc b/lily/spring.cc deleted file mode 100644 index 8b13789179..0000000000 --- a/lily/spring.cc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 8a76844792..c54d508079 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -35,7 +35,7 @@ StaffContext=\translator { \consistsend "Axis_group_engraver" minimumVerticalExtent = #'(-6 . 6) - extraverticalExtent = ##f + extraVerticalExtent = ##f verticalExtent = ##f localKeySignature = #'() @@ -54,7 +54,7 @@ StaffContainerContext = \translator { \type Engraver_group_engraver \consists "Axis_group_engraver" minimumVerticalExtent = ##f - extraverticalExtent = ##f + extraVerticalExtent = ##f verticalExtent = ##f localKeySignature = #'() @@ -92,7 +92,7 @@ RhythmicStaffContext=\translator{ minimumVerticalExtent = ##f - extraverticalExtent = ##f + extraVerticalExtent = ##f verticalExtent = ##f localKeySignature = #'() @@ -249,7 +249,7 @@ LyricsVoiceContext= \translator{ \type "Engraver_group_engraver" \consistsend "Axis_group_engraver" minimumVerticalExtent = #(cons -1.2 1.2) - extraverticalExtent = ##f + extraVerticalExtent = ##f verticalExtent = ##f \name LyricsVoice \consists "Separating_line_group_engraver" @@ -267,7 +267,7 @@ NoteNamesContext = \translator { \consistsend "Axis_group_engraver" minimumVerticalExtent = ##f - extraverticalExtent = ##f + extraVerticalExtent = ##f verticalExtent = ##f @@ -283,7 +283,7 @@ LyricsContext = \translator { \consistsend "Axis_group_engraver" minimumVerticalExtent = ##f - extraverticalExtent = ##f + extraVerticalExtent = ##f verticalExtent = ##f \accepts "LyricsVoice" @@ -303,7 +303,7 @@ ChordNamesContext = \translator { \consists "Skip_req_swallow_translator" \consistsend "Axis_group_engraver" minimumVerticalExtent = ##f - extraverticalExtent = ##f + extraVerticalExtent = ##f verticalExtent = ##f } diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf index 312c9a9df4..4549a17f35 100644 --- a/mf/feta-eindelijk.mf +++ b/mf/feta-eindelijk.mf @@ -517,7 +517,7 @@ fet_beginchar("Neo-mensural half rest", "1neo_mensural", "neomensminimahalfrest" neomens_half_block_rest; fet_endchar; -neomensrestsize# = .8staff_space#; +neomensrestsize# = 0.8 staff_space#; fet_beginchar("Neo-mensural 4th rest","2neo_mensural","neomenssemiminimarest") set_char_box(0,neomensrestsize#,0,neomensrestsize#); diff --git a/mf/feta20.mf b/mf/feta20.mf index e2dfa7dd06..35190154ff 100644 --- a/mf/feta20.mf +++ b/mf/feta20.mf @@ -6,9 +6,9 @@ staffsize#:=20pt#; input feta-autometric; fet_beginfont("feta", 20); -% AFBLIJVEN! Gebruik feta-test16/20, anders verneuk je de distributie. -test := 0; +% use feta-test for debugging. +test := 0; input feta-generic; fet_endfont("feta"); diff --git a/scm/generate-interface-doc.scm b/scm/generate-interface-doc.scm deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/scm/grob-description.scm b/scm/grob-description.scm index 5894a55a53..03a1287b5d 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -830,6 +830,8 @@ . ( (axes . (1)) (Y-extent-callback . ,Axis_group_interface::group_extent_callback) + (Y-offset-callbacks . (,Side_position_interface::aligned_side)) + (padding . 1.2) (minimum-space . 1.0) @@ -933,7 +935,8 @@ (SustainPedalLineSpanner . ( (axes . (1)) - (Y-extent-callback . ,Axis_group_interface::group_extent_callback) + (Y-extent-callback . ,Axis_group_interface::group_extent_callback) + (Y-offset-callbacks . (,Side_position_interface::aligned_side)) (padding . 1.2) (minimum-space . 1.0) @@ -1094,6 +1097,8 @@ . ( (axes . (1)) (Y-extent-callback . ,Axis_group_interface::group_extent_callback) + (Y-offset-callbacks . (,Side_position_interface::aligned_side)) + (padding . 1.2) (minimum-space . 1.0) (direction . -1) -- 2.39.2