* scripts/convert-ly.py: add extent rule.

* lily/grob.cc: chang extent-[XY] to [XY]-extent globally.

diff --git a/ChangeLog b/ChangeLog
index 0ed5bfaecaa08f4de9f8fa26c238097f9fa01bed..8c1c007b94ee3d0ed48ed95ebb2491e9295de660 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-09  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * input/test/preset-extent.ly (texidoc): added file.
+
+       * scripts/convert-ly.py: add extent rule.
+
+       * lily/grob.cc: chang extent-[XY] to [XY]-extent globally.
+
 2002-08-09  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * stepmake/stepmake/python-module-rules.make: 

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index ed402017d48562fbc82772af64a60df33376241b..35ed40e707646291629832fa59d49b8d2df76f07 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -19,7 +19,7 @@ default:
 # force these: Make can't know these have to be generated in advance
 $(outdir)/my-lily-parser.o: $(outdir)/parser.hh
 $(outdir)/my-lily-lexer.o: $(outdir)/parser.hh
-$(outdir)/lexer.o: $(outdir)/parser.hh
+$(outdir)/lexer.o: $(outdir)/parser.hh $(outdir)/version.hh
 
 $(outdir)/kpath.o: $(outdir)/version.hh
 $(outdir)/lily-guile.o: $(outdir)/version.hh

diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc
index 9bca1ce3c7ee01006e3217fc9f0d665cb732a105..bdaa7e93f8b070d0affb98173f0d3078bedfe484 100644 (file)
--- a/lily/axis-group-engraver.cc
+++ b/lily/axis-group-engraver.cc
@@ -66,18 +66,18 @@ Axis_group_engraver::finalize ()
       && gh_number_p (ly_cdr (dims)))
     {
       staffline_->set_extent (Grob::preset_extent_proc, Y_AXIS);
-      staffline_->set_grob_property ("extent-Y", dims);
+      staffline_->set_grob_property ("Y-extent", dims);
     }
 
   dims = get_property ("minimumVerticalExtent");
   if (gh_pair_p (dims) && gh_number_p (ly_car (dims))
       && gh_number_p (ly_cdr (dims)))
-    staffline_->set_grob_property ("minimum-extent-Y", dims);
+    staffline_->set_grob_property ("minimum-Y-extent", dims);
 
   dims = get_property ("extraVerticalExtent");
   if (gh_pair_p (dims) && gh_number_p (ly_car (dims))
       && gh_number_p (ly_cdr (dims)))
-    staffline_->set_grob_property ("extra-extent-Y", dims);
+    staffline_->set_grob_property ("extra-Y-extent", dims);
 
   Grob *  it = unsmob_grob (get_property ("currentCommandColumn"));
 

diff --git a/lily/grob.cc b/lily/grob.cc
index 61f48a6aff5f00609a431372a3c5c603495ed8d3..883b0ce04608286df841a3881668b3cb7dfe44b3 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -173,8 +173,8 @@ Grob::preset_extent (SCM element_smob, SCM scm_axis)
   Axis a = (Axis) gh_scm2int (scm_axis);
 
   SCM ext = s->get_grob_property ((a == X_AXIS)
-                                ? "extent-X"
-                                : "extent-Y");
+                                ? "X-extent"
+                                : "Y-extent");
   
   if (gh_pair_p (ext))
     {
@@ -510,8 +510,8 @@ Grob::extent (Grob * refp, Axis a) const
   ext = ly_scm2interval (d->dimension_);
 
   SCM extra = get_grob_property (a == X_AXIS
-                               ? "extra-extent-X"
-                               : "extra-extent-Y");
+                               ? "extra-X-extent"
+                               : "extra-Y-extent");
 
   /*
     signs ?
@@ -523,8 +523,8 @@ Grob::extent (Grob * refp, Axis a) const
     }
   
   extra = get_grob_property (a == X_AXIS
-                               ? "minimum-extent-X"
-                               : "minimum-extent-Y");
+                               ? "minimum-X-extent"
+                               : "minimum-Y-extent");
   if (gh_pair_p (extra))
     {
       ext.unite (Interval (gh_scm2double (ly_car (extra)),
@@ -832,9 +832,9 @@ anything.
 ",
   "X-offset-callbacks Y-offset-callbacks X-extent-callback molecule cause
 Y-extent-callback molecule-callback extra-offset spacing-procedure
-staff-symbol interfaces dependencies extent-X extent-Y extra-extent-X
+staff-symbol interfaces dependencies X-extent Y-extent extra-X-extent
 causes meta layer before-line-breaking-callback
-after-line-breaking-callback extra-extent-Y minimum-extent-X
-minimum-extent-Y transparent");
+after-line-breaking-callback extra-Y-extent minimum-X-extent
+minimum-Y-extent transparent");
 
 

diff --git a/lily/separation-item.cc b/lily/separation-item.cc
index 19962fef3a063c9dbe7a0aa076c75e174a0359a8..0a053065bdbffbcb74fc712c46871e75ddc4552a 100644 (file)
--- a/lily/separation-item.cc
+++ b/lily/separation-item.cc
@@ -78,7 +78,7 @@ Separation_item::conditional_width (Grob * me, Grob * left)
 Interval
 Separation_item::width (Grob *me)
 {
-  SCM sw = me->get_grob_property ("extent-X");
+  SCM sw = me->get_grob_property ("X-extent");
   if (ly_number_pair_p (sw))
     {
       return ly_scm2interval (sw);
@@ -123,7 +123,7 @@ Separation_item::width (Grob *me)
   }
 
 
-  me->set_grob_property ("extent-X", ly_interval2scm (w));
+  me->set_grob_property ("X-extent", ly_interval2scm (w));
   
   
   return w;
@@ -141,4 +141,4 @@ Calc dimensions for the Separating_group_spanner; this has to be
 an item to get dependencies correct.  It can't be an grob_group
 since these usually are in a different X_group
 ",
-  "extent-X conditional-elements elements");
+  "X-extent conditional-elements elements");

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 2e7f64fb1a7d95dcd9440873cb1ce563219a3435..9d9d08e96df86b861d7454df6382eb7cb7139288 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -942,6 +942,15 @@ if 1:
        
        conversions.append (((1,5,68), conv, 'ly-set-X-property -> ly-set-X-property!'))
 
+if 1:
+       def conv (str):
+               str = re.sub ('extent-X', 'X-extent', str)
+               str = re.sub ('extent-Y', 'Y-extent', str)              
+               return str
+       
+       conversions.append (((1,5,71), conv, 'extent-[XY] -> [XY]-extent'))
+
+
 ################################
 #      END OF CONVERSIONS      
 ################################