* scm/backend-documentation-lib.scm (check-dangling-properties):

Fix error message.

* lily/text-item.cc (ADD_INTERFACE): Remove align, magnify.  Add
axis, extent.

* scm/grob-property-description.scm (magnify): Remove.
(extent, axis): Add.

diff --git a/ChangeLog b/ChangeLog
index 1d4dc97a204c2f721ce40832dc4b7fc378bd686a..7741ab31ffb36dae0494b3f22e2f7dffe527d6e5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2002-11-04  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * scm/backend-documentation-lib.scm (check-dangling-properties):
+       Fix error message.
+
+       * lily/text-item.cc (ADD_INTERFACE): Remove align, magnify.  Add
+       axis, extent.
+
+       * scm/grob-property-description.scm (magnify): Remove.
+       (extent, axis): Add.
+
 2002-11-03  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * scripts/convert-ly.py: more uniformization substitutions.

diff --git a/lily/text-item.cc b/lily/text-item.cc
index 006cc2150f86fa5de1d282cbeb84bda58d529386..c84ee7e7f0509dcf10cf5831eb4eafdde28fefa9 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -239,4 +239,4 @@ Text_item::brew_molecule (SCM smob)
 
 ADD_INTERFACE (Text_item,"text-interface",
   "A scheme markup text",
-  "text align baseline-skip lookup raise kern word-space magnify");
+  "text axis baseline-skip extent lookup raise kern word-space");

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index da2571f6bc5cc8e4797e38ebab6381b8a5292a7c..dfc6008aad0cc212ac5f7467294799799d8d9ff2 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -162,7 +162,7 @@ VoiceContext = \translator {
        \consists "Phrasing_slur_engraver"
        \consists "Slur_engraver"
        \consists "Tie_engraver"
-       \consists "New_tie_engraver"
+       %%\consists "New_tie_engraver"
        \consists "Porrectus_engraver"
        \consists "Tuplet_engraver"
        \consists "A2_engraver"

diff --git a/scm/backend-documentation-lib.scm b/scm/backend-documentation-lib.scm
index c5175f20dfd33484665e05907cc88ee2542e9179..0d7a13f259da08411fa881661277b047267580c3 100644 (file)
--- a/scm/backend-documentation-lib.scm
+++ b/scm/backend-documentation-lib.scm
@@ -152,8 +152,7 @@ node."
 
 (define (check-dangling-properties prop)
   (if (not (object-property prop 'iface-marked))
-      (error  "\nDangling property: " prop))
-  )
+      (error  "\ngrob-property-description.scm: Can't find property:" prop)))
 
 (map check-dangling-properties all-backend-properties)
 

diff --git a/scm/chord-name.scm b/scm/chord-name.scm
index 99e8c226bd5e59fbb3b9300b85e4687337064055..951a752327cbcb8eb9084465385bde8ab4541fd0 100644 (file)
--- a/scm/chord-name.scm
+++ b/scm/chord-name.scm
@@ -195,7 +195,7 @@
 
 ;; text: list of word
 ;; word: string + optional list of property
-;; property: align, kern, font (?), size
+;; property: axis, kern, font (?), size
 
 (define chord::minor-major-vec (list->vector '(0 -1 -1 0 -1 -1 0)))
 

diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm
index a8e3d1fb84ecc1b4a742cb4cee0fe547619beedc..bef73be0122585f110f14b074649a6022980373c 100644 (file)
--- a/scm/grob-property-description.scm
+++ b/scm/grob-property-description.scm
@@ -65,7 +65,7 @@ the grob to the nearest open space.
 (grob-property-description 'adjust-if-on-staffline boolean? "If this grob is on a staff line, adjust its appearance, so that it better fits into the staff.  E.g., if set true on stem grobs, flares of mensural flags will always be aligned with the staff lines, regardless if the associated note head is printed on a staff line or inbetween.")
 (grob-property-description 'after-line-breaking-callback procedure? "Procedure taking a grob as argument.
 This procedure is called (using dependency resolution) after line breaking. Return value is ignored.")
-(grob-property-description 'align number? "the alignment of the text, 0 is horizontal, 1 is vertical.")
+(grob-property-description 'axis number? "the alignment of the text, 0 is horizontal, 1 is vertical.")
 (grob-property-description 'align-dir ly:dir? "Which side to align? -1: left side, 0: around center of width, 1: right side.")
 (grob-property-description 'alignment-done boolean? "boolean to administrate whether we've done the alignment already (to ensure that the process is done only once).")
 (grob-property-description 'all-elements grob-list? "list of all grobs in this line. Needed for protecting grobs from GC.")
@@ -178,6 +178,7 @@ mean centre distance weighted per note
 (grob-property-description 'expand-limit integer? "maximum number of measures expanded in church rests.")
 (grob-property-description 'extra-X-extent number-pair? "enlarge in X dimension by this much, measured in staff space.")
 (grob-property-description 'extra-Y-extent number-pair? "see @code{extra-Y-extent}.")
+(grob-property-description 'extent number-pair? "the extent of the text: (WIDTH . HEIGHT)")
 (grob-property-description 'X-extent number-pair? "Store extent. internal use only. ")
 (grob-property-description 'Y-extent number-pair? "Store extent. internal use only. ")
 (grob-property-description 'extra-offset number-pair? "pair of reals
@@ -294,7 +295,6 @@ work: @code{\override} is processed after the StaffSymbol is created,
 and will have no effect.
 ")
 (grob-property-description 'lookup symbol? "lookup method: 'value for plain text, 'name for character-name.")
-(grob-property-description 'magnify number? "the magnification factor.  FIXME: doesn't work for feta fonts.")
 (grob-property-description 'maximum-length number? "don't make Grob longer than this")
 (grob-property-description 'maximum-rest-count integer? "kill off rests so we don't more than this number left.")
 (grob-property-description 'measure-length ly:moment? "Length of a