(aligned_side): don't add

padding again.

	* input/test/harmonic.ly: new file.

	* ly/engraver-init.ly:
	s/extraverticalExtent/extraVerticalExtent/.

diff --git a/ChangeLog b/ChangeLog
index 0024cf96d8e496d3126222ce4d83809c45c275a8..10663780b0ee92c0943b098d75d307472a873daa 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2002-08-18  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * input/test/harmonic.ly: new file.
+
+       * lily/side-position-interface.cc (aligned_side): don't add
+       padding again.
+
+2002-08-18  Werner Lemberg  <wl@gnu.org>
+
+       * ly/engraver-init.ly:
+       s/extraverticalExtent/extraVerticalExtent/.
+       
 2002-08-18  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * lily/score-engraver.cc: Uniformise error message.
@@ -20,6 +32,8 @@
 
 2002-08-18  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * 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 (file)
index 8b13789..0000000
--- 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 (file)
index 8b13789..0000000
--- 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 b3c8cc4c2cd5fbc081c5431d6a59243f3b3c2a40..21ec794a5797883fa4b6ffab3f09dbf7a3b794a9 100644 (file)
--- 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 37eb5b9617bcd93623a3de9ded15fe089bcfd760..25434f4cbb0a352fbf38e586708fa824c190fc0f 100644 (file)
--- 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 19230c0d6bb978f1bffa0f7969748416459c2bcf..768f0d0724821163086fee9ea390c878eca62e06 100644 (file)
--- 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 4cbe1feb622388fff502f756fd30bb77159d1ecf..13ed7a6990b289aff28b5afe4e7deb0dfe994b81 100644 (file)
--- 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 ad7f50b90321973b2058ec10c94decdde26336a9..24f3abbc997646f19084b0a27822052fcd16a419 100644 (file)
--- 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 (file)
index 8b13789..0000000
--- a/lily/spacing-wish.cc
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/lily/spring.cc b/lily/spring.cc
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/lily/spring.cc
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 8a768447923bd0e4f6f5964aa68c13bbe1202bb6..c54d508079e461f54046a0146fcef8b951f7689e 100644 (file)
--- 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 312c9a9df46b947f303c437d6147d36d8c9f638a..4549a17f35a2f18e5be2beca7553b8142042829c 100644 (file)
--- 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 e2dfa7dd066f7e56e6eed91f7cd1ff9c3e1be903..35190154ff9c3848888ca40f1e6940c5e56f9e01 100644 (file)
--- 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 (file)
index e69de29..0000000

diff --git a/scm/grob-description.scm b/scm/grob-description.scm
index 5894a55a53ed611e57567ade5c5fe917c6a5c5cc..03a1287b5db660137e834c6be8cf78b548c32300 100644 (file)
--- 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)