vert. spacing: Rename properties (lily, scm).

diff --git a/lily/axis-group-interface.cc b/lily/axis-group-interface.cc
index 85d2d3658889ffc806d823984d7c29d2c8c1b61a..205e76a3f10895e1104f985c20e8876b8d6df6f2 100644 (file)
--- a/lily/axis-group-interface.cc
+++ b/lily/axis-group-interface.cc
@@ -726,28 +726,28 @@ Axis_group_interface::print (SCM smob)
   return ret.smobbed_copy ();
 }
 
   return ret.smobbed_copy ();
 }
 

-MAKE_SCHEME_CALLBACK (Axis_group_interface, calc_pure_next_staff_spacing, 3)
+MAKE_SCHEME_CALLBACK (Axis_group_interface, calc_pure_staff_staff_spacing, 3)

 SCM
 SCM

-Axis_group_interface::calc_pure_next_staff_spacing (SCM smob, SCM start, SCM end)
+Axis_group_interface::calc_pure_staff_staff_spacing (SCM smob, SCM start, SCM end)

 {
 {

-  return calc_maybe_pure_next_staff_spacing (unsmob_grob (smob),
+  return calc_maybe_pure_staff_staff_spacing (unsmob_grob (smob),

                                             true,
                                             scm_to_int (start),
                                             scm_to_int (end));
 }
 
                                             true,
                                             scm_to_int (start),
                                             scm_to_int (end));
 }
 

-MAKE_SCHEME_CALLBACK (Axis_group_interface, calc_next_staff_spacing, 1)
+MAKE_SCHEME_CALLBACK (Axis_group_interface, calc_staff_staff_spacing, 1)

 SCM
 SCM

-Axis_group_interface::calc_next_staff_spacing (SCM smob)
+Axis_group_interface::calc_staff_staff_spacing (SCM smob)

 {
 {

-  return calc_maybe_pure_next_staff_spacing (unsmob_grob (smob),
+  return calc_maybe_pure_staff_staff_spacing (unsmob_grob (smob),

                                             false,
                                             0,
                                             INT_MAX);
 }
 
 SCM
                                             false,
                                             0,
                                             INT_MAX);
 }
 
 SCM

-Axis_group_interface::calc_maybe_pure_next_staff_spacing (Grob *me, bool pure, int start, int end)
+Axis_group_interface::calc_maybe_pure_staff_staff_spacing (Grob *me, bool pure, int start, int end)

 {
   Grob *grouper = unsmob_grob (me->get_object ("staff-grouper"));
 
 {
   Grob *grouper = unsmob_grob (me->get_object ("staff-grouper"));
 


@@ -755,11 +755,11 @@ Axis_group_interface::calc_maybe_pure_next_staff_spacing (Grob *me, bool pure, i
     {
       Grob *last_in_group = Staff_grouper_interface::get_maybe_pure_last_grob (grouper, pure, start, end);
       if (me == last_in_group)
     {
       Grob *last_in_group = Staff_grouper_interface::get_maybe_pure_last_grob (grouper, pure, start, end);
       if (me == last_in_group)

-       return grouper->get_maybe_pure_property ("after-last-staff-spacing", pure, start, end);
+       return grouper->get_maybe_pure_property ("staffgroup-staff-spacing", pure, start, end);

       else
       else

-       return grouper->get_maybe_pure_property ("between-staff-spacing", pure, start, end);
+       return grouper->get_maybe_pure_property ("staff-staff-spacing", pure, start, end);

     }
     }

-  return me->get_maybe_pure_property ("default-next-staff-spacing", pure, start, end);
+  return me->get_maybe_pure_property ("default-staff-staff-spacing", pure, start, end);

 }
 
 Real
 }
 
 Real


@@ -785,13 +785,13 @@ ADD_INTERFACE (Axis_group_interface,
               "Y-common "
               "adjacent-pure-heights "
               "axes "
               "Y-common "
               "adjacent-pure-heights "
               "axes "

-              "default-next-staff-spacing "
+              "default-staff-staff-spacing "

               "elements "
               "elements "

-              "inter-loose-line-spacing "
-              "inter-staff-spacing "
+              "nonstaff-nonstaff-spacing "
+              "nonstaff-relatedstaff-spacing "

               "max-stretch "
               "max-stretch "

-              "non-affinity-spacing "
-              "next-staff-spacing "
+              "nonstaff-unrelatedstaff-spacing "
+              "staff-staff-spacing "

               "no-alignment "
               "pure-Y-common "
               "pure-relevant-grobs "
               "no-alignment "
               "pure-Y-common "
               "pure-relevant-grobs "

diff --git a/lily/include/axis-group-interface.hh b/lily/include/axis-group-interface.hh
index bd038c7d105f92cfa62526144011e27005a8688b..cb715b22694a98409d09c361e4484d215514225b 100644 (file)
--- a/lily/include/axis-group-interface.hh
+++ b/lily/include/axis-group-interface.hh
@@ -38,8 +38,8 @@ struct Axis_group_interface
   DECLARE_SCHEME_CALLBACK (combine_skylines, (SCM smob));
   DECLARE_SCHEME_CALLBACK (print, (SCM smob));
   DECLARE_SCHEME_CALLBACK (adjacent_pure_heights, (SCM));
   DECLARE_SCHEME_CALLBACK (combine_skylines, (SCM smob));
   DECLARE_SCHEME_CALLBACK (print, (SCM smob));
   DECLARE_SCHEME_CALLBACK (adjacent_pure_heights, (SCM));

-  DECLARE_SCHEME_CALLBACK (calc_next_staff_spacing, (SCM));
-  DECLARE_SCHEME_CALLBACK (calc_pure_next_staff_spacing, (SCM, SCM, SCM));
+  DECLARE_SCHEME_CALLBACK (calc_staff_staff_spacing, (SCM));
+  DECLARE_SCHEME_CALLBACK (calc_pure_staff_staff_spacing, (SCM, SCM, SCM));

   DECLARE_SCHEME_CALLBACK (calc_pure_relevant_grobs, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_pure_relevant_items, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_pure_relevant_spanners, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_pure_relevant_grobs, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_pure_relevant_items, (SCM));
   DECLARE_SCHEME_CALLBACK (calc_pure_relevant_spanners, (SCM));


@@ -60,7 +60,7 @@ struct Axis_group_interface
   static Interval staff_extent (Grob *me, Grob *ref, Axis, Grob *staff, Axis);
   static SCM calc_common (Grob *, Axis);
   static Real minimum_distance (Grob*, Grob*, Axis);
   static Interval staff_extent (Grob *me, Grob *ref, Axis, Grob *staff, Axis);
   static SCM calc_common (Grob *, Axis);
   static Real minimum_distance (Grob*, Grob*, Axis);

-  static SCM calc_maybe_pure_next_staff_spacing (Grob*, bool, int, int);
+  static SCM calc_maybe_pure_staff_staff_spacing (Grob*, bool, int, int);

   DECLARE_GROB_INTERFACE();
 };
 
   DECLARE_GROB_INTERFACE();
 };
 

diff --git a/lily/page-layout-problem.cc b/lily/page-layout-problem.cc
index d2859996726fc1ac5eb58b4ea0c33b629f0c2abe..0fd9a92aa75dbfe2822924fd89e17ea36c05f5dc 100644 (file)
--- a/lily/page-layout-problem.cc
+++ b/lily/page-layout-problem.cc
@@ -227,7 +227,7 @@ Page_layout_problem::append_system (System *sys, Spring const& spring, Real padd
            }
 
          Spring spring (0.5, 0.0);
            }
 
          Spring spring (0.5, 0.0);

-         SCM spec = elts[last_spaceable_staff]->get_property ("next-staff-spacing");
+         SCM spec = elts[last_spaceable_staff]->get_property ("staff-staff-spacing");

          alter_spring_from_spacing_spec (spec, &spring);
 
          springs_.push_back (spring);
          alter_spring_from_spacing_spec (spec, &spring);
 
          springs_.push_back (spring);


@@ -690,14 +690,14 @@ Page_layout_problem::get_spacing_spec (Grob *before, Grob *after, bool pure, int
   if (is_spaceable (before))
     {
       if (is_spaceable (after))
   if (is_spaceable (before))
     {
       if (is_spaceable (after))

-       return before->get_maybe_pure_property ("next-staff-spacing", pure, start, end);
+       return before->get_maybe_pure_property ("staff-staff-spacing", pure, start, end);

       else
        {
          Direction affinity = to_dir (after->get_maybe_pure_property ("staff-affinity", pure, start, end));
          return (affinity == DOWN)
       else
        {
          Direction affinity = to_dir (after->get_maybe_pure_property ("staff-affinity", pure, start, end));
          return (affinity == DOWN)

-           ? add_stretchability (after->get_maybe_pure_property ("non-affinity-spacing", pure, start, end),
+           ? add_stretchability (after->get_maybe_pure_property ("nonstaff-unrelatedstaff-spacing", pure, start, end),

                                  LARGE_STRETCH)
                                  LARGE_STRETCH)

-           : after->get_maybe_pure_property ("inter-staff-spacing", pure, start, end);
+           : after->get_maybe_pure_property ("nonstaff-relatedstaff-spacing", pure, start, end);

        }
     }
   else
        }
     }
   else


@@ -706,9 +706,9 @@ Page_layout_problem::get_spacing_spec (Grob *before, Grob *after, bool pure, int
        {
          Direction affinity = to_dir (before->get_maybe_pure_property ("staff-affinity", pure, start, end));
          return (affinity == UP)
        {
          Direction affinity = to_dir (before->get_maybe_pure_property ("staff-affinity", pure, start, end));
          return (affinity == UP)

-           ? add_stretchability (before->get_maybe_pure_property ("non-affinity-spacing", pure, start, end),
+           ? add_stretchability (before->get_maybe_pure_property ("nonstaff-unrelatedstaff-spacing", pure, start, end),

                                  LARGE_STRETCH)
                                  LARGE_STRETCH)

-           : before->get_maybe_pure_property ("inter-staff-spacing", pure, start, end);
+           : before->get_maybe_pure_property ("nonstaff-relatedstaff-spacing", pure, start, end);

        }
       else
        {
        }
       else
        {


@@ -720,10 +720,10 @@ Page_layout_problem::get_spacing_spec (Grob *before, Grob *after, bool pure, int
              after_affinity = before_affinity;
            }
          if (before_affinity != UP)
              after_affinity = before_affinity;
            }
          if (before_affinity != UP)

-           return before->get_maybe_pure_property ("inter-loose-line-spacing", pure, start, end);
+           return before->get_maybe_pure_property ("nonstaff-nonstaff-spacing", pure, start, end);

          else if (after_affinity != DOWN)
          else if (after_affinity != DOWN)

-           return before->get_maybe_pure_property ("inter-loose-line-spacing", pure, start, end);
-         return add_stretchability (before->get_maybe_pure_property ("non-affinity-spacing", pure, start, end),
+           return before->get_maybe_pure_property ("nonstaff-nonstaff-spacing", pure, start, end);
+         return add_stretchability (before->get_maybe_pure_property ("nonstaff-unrelatedstaff-spacing", pure, start, end),

                                     LARGE_STRETCH);
        }
     }
                                     LARGE_STRETCH);
        }
     }

diff --git a/lily/staff-grouper-interface.cc b/lily/staff-grouper-interface.cc
index 9a5d93da25a80ac998c82ccbf6a8a3821b86ee67..476171a63a8b8f0d0a8738d57c6343d24936ac3c 100644 (file)
--- a/lily/staff-grouper-interface.cc
+++ b/lily/staff-grouper-interface.cc
@@ -40,7 +40,7 @@ ADD_INTERFACE (Staff_grouper_interface,
               "A grob that collects staves together.",
 
               /* properties */
               "A grob that collects staves together.",
 
               /* properties */

-              "between-staff-spacing "
-              "after-last-staff-spacing "
+              "staff-staff-spacing "
+              "staffgroup-staff-spacing "

               );
 
               );
 

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 4202b26b96080da12ae992b1da4338808cac8e30..29c72d4fc14ee0e16d482a34f94133f8c9caef86 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -38,9 +38,9 @@
 ;;
      (add-stem-support ,boolean? "If set, the @code{Stem} object is
 included in this script's support.")
 ;;
      (add-stem-support ,boolean? "If set, the @code{Stem} object is
 included in this script's support.")

-     (after-last-staff-spacing ,list? "An alist of spacing variables
+     (staffgroup-staff-spacing ,list? "An alist of spacing variables

 that controls the spacing after the last staff in this staff group.
 that controls the spacing after the last staff in this staff group.

-See @var{next-staff-spacing} for a description of the elements of
+See @var{staff-staff-spacing} for a description of the elements of

 this alist.")
      (after-line-breaking ,boolean? "Dummy property, used to trigger
 callback for @code{after-line-breaking}.")
 this alist.")
      (after-line-breaking ,boolean? "Dummy property, used to trigger
 callback for @code{after-line-breaking}.")


@@ -110,9 +110,9 @@ beamlet, as a proportion of the distance between two adjacent stems.")
      (before-line-breaking ,boolean? "Dummy property, used to trigger
 a callback function.")
      (between-cols ,pair? "Where to attach a loose column to.")
      (before-line-breaking ,boolean? "Dummy property, used to trigger
 a callback function.")
      (between-cols ,pair? "Where to attach a loose column to.")

-     (between-staff-spacing ,list? "An alist of spacing variables
+     (staff-staff-spacing ,list? "An alist of spacing variables

 that controls the spacing between staves within this staff group.
 that controls the spacing between staves within this staff group.

-See @var{next-staff-spacing} for a description of the elements of
+See @var{staff-staff-spacing} for a description of the elements of

 this alist.")
      (bound-details ,list? "An alist of properties for determining
 attachments of spanners to edges.")
 this alist.")
      (bound-details ,list? "An alist of properties for determining
 attachments of spanners to edges.")


@@ -207,9 +207,9 @@ an ending t-value, a @code{dash-fraction}, and a @code{dash-period}.")
 whitespace.  If negative, no line is drawn at all.")
      (default-direction ,ly:dir? "Direction determined by note head
 positions.")
 whitespace.  If negative, no line is drawn at all.")
      (default-direction ,ly:dir? "Direction determined by note head
 positions.")

-     (default-next-staff-spacing ,list? "An alist of spacing variables
+     (default-staff-staff-spacing ,list? "An alist of spacing variables

 that controls the spacing between this staff and the next.
 that controls the spacing between this staff and the next.

-See @var{next-staff-spacing} for a description of the elements of
+See @var{staff-staff-spacing} for a description of the elements of

 this alist.")
      (details ,list? "Alist of parameters for detailed grob behavior.
 More information on the allowed parameters for a grob can be found by
 this alist.")
      (details ,list? "Alist of parameters for detailed grob behavior.
 More information on the allowed parameters for a grob can be found by


@@ -475,12 +475,12 @@ resolution on this @code{NoteColumn}.")
 configuration to this index, and print the respective scores.")
      (inspect-quants ,number-pair? "If debugging is set, set beam and
 slur quants to this position, and print the respective scores.")
 configuration to this index, and print the respective scores.")
      (inspect-quants ,number-pair? "If debugging is set, set beam and
 slur quants to this position, and print the respective scores.")

-     (inter-loose-line-spacing ,list? "Specifies how to vertically
+     (nonstaff-nonstaff-spacing ,list? "Specifies how to vertically

 position a non-spaced line relative to the other non-spaced lines
 position a non-spaced line relative to the other non-spaced lines

-around it.  See @var{next-staff-spacing} for the format of this list.")
-     (inter-staff-spacing ,list? "Specifies how to vertically
+around it.  See @var{staff-staff-spacing} for the format of this list.")
+     (nonstaff-relatedstaff-spacing ,list? "Specifies how to vertically

 position a non-spaced line relative to the staff for which it
 position a non-spaced line relative to the staff for which it

-has affinity.  See @var{next-staff-spacing} for the format of this list.")
+has affinity.  See @var{staff-staff-spacing} for the format of this list.")

 
 
 ;;
 
 
 ;;


@@ -585,7 +585,7 @@ center of the staff.")
 to flip the direction of custos stem.")
      (next ,ly:grob? "Object that is next relation (e.g., the lyric
 syllable following an extender).")
 to flip the direction of custos stem.")
      (next ,ly:grob? "Object that is next relation (e.g., the lyric
 syllable following an extender).")

-     (next-staff-spacing ,list? "An alist of properties used to position
+     (staff-staff-spacing ,list? "An alist of properties used to position

 the next staff in the system.  The symbols that can be defined in the alist
 are
 @itemize @bullet
 the next staff in the system.  The symbols that can be defined in the alist
 are
 @itemize @bullet


@@ -613,10 +613,10 @@ which NON-break-aligned interfaces to align this to.")
 object.")
      (no-stem-extend ,boolean? "If set, notes with ledger lines do not
 get stems extending to the middle staff line.")
 object.")
      (no-stem-extend ,boolean? "If set, notes with ledger lines do not
 get stems extending to the middle staff line.")

-     (non-affinity-spacing ,list? "An alist of spacing variables
+     (nonstaff-unrelatedstaff-spacing ,list? "An alist of spacing variables

 that controls the spacing from a loose line (see @var{staff-affinity})
 to the staff for which the loose line does not have affinity.
 that controls the spacing from a loose line (see @var{staff-affinity})
 to the staff for which the loose line does not have affinity.

-See @var{next-staff-spacing} for a description of the elements of
+See @var{staff-staff-spacing} for a description of the elements of

 this alist.")
      (non-default ,boolean? "Set for manually specified clefs.")
      (non-musical ,boolean? "True if the grob belongs to a
 this alist.")
      (non-default ,boolean? "Set for manually specified clefs.")
      (non-musical ,boolean? "True if the grob belongs to a

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 2b572bc7e134999d75e98cef0d006d33ecfe0416..bc72e2c1f6f56a0ad02659785e52f09e7e6c6196 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1689,10 +1689,10 @@
 
     (StaffGrouper
      . (
 
     (StaffGrouper
      . (

-       (between-staff-spacing . ((space . 9)
+       (staff-staff-spacing . ((space . 9)

                                  (minimum-distance . 7)
                                  (padding . 1)))
                                  (minimum-distance . 7)
                                  (padding . 1)))

-       (after-last-staff-spacing . ((space . 10.5)
+       (staffgroup-staff-spacing . ((space . 10.5)

                                     (minimum-distance . 8)
                                     (padding . 1)))
        (meta . ((class . Spanner)
                                     (minimum-distance . 8)
                                     (padding . 1)))
        (meta . ((class . Spanner)


@@ -2262,11 +2262,11 @@
      . (
        (adjacent-pure-heights . ,ly:axis-group-interface::adjacent-pure-heights)
        (axes . (,Y))
      . (
        (adjacent-pure-heights . ,ly:axis-group-interface::adjacent-pure-heights)
        (axes . (,Y))

-       (default-next-staff-spacing . ((space . 9)
+       (default-staff-staff-spacing . ((space . 9)

                                       (minimum-distance . 8)
                                       (padding . 1)))
                                       (minimum-distance . 8)
                                       (padding . 1)))

-       (next-staff-spacing . ,ly:axis-group-interface::calc-next-staff-spacing)
-       (non-affinity-spacing . ((padding . 0.5)))
+       (staff-staff-spacing . ,ly:axis-group-interface::calc-staff-staff-spacing)
+       (nonstaff-unrelatedstaff-spacing . ((padding . 0.5)))

        (stencil . ,ly:axis-group-interface::print)
        (vertical-skylines . ,ly:hara-kiri-group-spanner::calc-skylines)
        (X-extent . ,ly:axis-group-interface::width)
        (stencil . ,ly:axis-group-interface::print)
        (vertical-skylines . ,ly:hara-kiri-group-spanner::calc-skylines)
        (X-extent . ,ly:axis-group-interface::width)


@@ -2448,7 +2448,7 @@
 (define pure-conversions-alist
   `(
     (,ly:accidental-interface::height . ,ly:accidental-interface::pure-height)
 (define pure-conversions-alist
   `(
     (,ly:accidental-interface::height . ,ly:accidental-interface::pure-height)

-    (,ly:axis-group-interface::calc-next-staff-spacing . ,ly:axis-group-interface::calc-pure-next-staff-spacing)
+    (,ly:axis-group-interface::calc-staff-staff-spacing . ,ly:axis-group-interface::calc-pure-staff-staff-spacing)

     (,ly:axis-group-interface::height . ,ly:axis-group-interface::pure-height)
     (,ly:grob::stencil-height . ,pure-stencil-height)
     (,ly:hara-kiri-group-spanner::y-extent . ,ly:hara-kiri-group-spanner::pure-height)
     (,ly:axis-group-interface::height . ,ly:axis-group-interface::pure-height)
     (,ly:grob::stencil-height . ,pure-stencil-height)
     (,ly:hara-kiri-group-spanner::y-extent . ,ly:hara-kiri-group-spanner::pure-height)