* lily/mensural-ligature-engraver.cc:

	* scm/grob-property-description.scm: Add head-width, join-left,
	primitive.

diff --git a/ChangeLog b/ChangeLog
index c7e47f2f9e0494954f09b892c87d78145baa5b1e..d884af600a20ed2ab94d40f286f571e0d2158c2f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,16 @@
 
 2002-08-19  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * lily/mensural-ligature-engraver.cc:
+       * scm/grob-property-description.scm: Add head-width, join-left,
+       primitive.
+       
+       * lily/mensural-ligature.cc: 
+       * lily/ligature-bracket.cc: 
+       * scm/grob-property-description.scm: 
+
+       * lily/ligature-head.cc: Add ligature-primitive-callback.
+
        * input/test/beam-control.ly: 
        * input/test/bar-script-visibility.ly: Update.
 

diff --git a/lily/ligature-bracket.cc b/lily/ligature-bracket.cc
index dc71d8088bb106995fd3d34b2c3f3d6c094adf15..b05af4095f6d2ca0b213e686d565728478e2ce42 100644 (file)
--- a/lily/ligature-bracket.cc
+++ b/lily/ligature-bracket.cc
@@ -144,6 +144,6 @@ Ligature_bracket::brew_molecule (SCM smob)
   return bracket.smobbed_copy ();
 }
 
-ADD_INTERFACE(Ligature_bracket, "ligature-bracket-interface",
-             "A bracket indicating a ligature in the original edition",
-             "width thickness height");
+ADD_INTERFACE (Ligature_bracket, "ligature-bracket-interface",
+              "A bracket indicating a ligature in the original edition",
+              "width thickness height ligature-primitive-callback");

diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc
index 899c3585cd977fb877bf0761817b64e9ee42f9e3..799ea1f0bce13f1645829d8ba365c89d2aae391e 100644 (file)
--- a/lily/ligature-engraver.cc
+++ b/lily/ligature-engraver.cc
@@ -188,9 +188,9 @@ Ligature_engraver::acknowledge_grob (Grob_info info)
     }
 }
 
-ENTER_DESCRIPTION(Ligature_engraver,
+ENTER_DESCRIPTION (Ligature_engraver,
 /* descr */       "Abstract class; a concrete subclass handles Ligature_requests by engraving Ligatures in a concrete style.",
 /* creats*/       "Ligature",
 /* acks  */       "ligature-head-interface rest-interface",
 /* reads */       "",
-/* write */       "");
+/* write */       "ligature-primitive-callback");

diff --git a/lily/ligature-head.cc b/lily/ligature-head.cc
index 5b6445a8d6eab152f9d5989dc3333b3b3bbc141e..1352f4100bdb0f58be204bd9593c256ddd095c7f 100644 (file)
--- a/lily/ligature-head.cc
+++ b/lily/ligature-head.cc
@@ -43,4 +43,5 @@ Ligature_head::brew_molecule (SCM smob)
     }
 }
 
-ADD_INTERFACE (Ligature_head,"ligature-head-interface","Ligature head","");
+ADD_INTERFACE (Ligature_head,"ligature-head-interface","Ligature head",
+              "ligature-primitive-callback");

diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc
index 733e5dfffa9813adaccd2cd898fc57ae2f13a3d0..9c7d8690ba6f2150215999a0c4849256b25bc0d3 100644 (file)
--- a/lily/mensural-ligature-engraver.cc
+++ b/lily/mensural-ligature-engraver.cc
@@ -575,9 +575,9 @@ Mensural_ligature_engraver::acknowledge_grob (Grob_info info)
     }
 }
 
-ENTER_DESCRIPTION(Mensural_ligature_engraver,
+ENTER_DESCRIPTION (Mensural_ligature_engraver,
 /* descr */       "Handles Mensural_ligature_requests by glueing special ligature heads together.",
 /* creats*/       "MensuralLigature",
 /* acks  */       "ligature-head-interface note-head-interface rest-interface",
 /* reads */       "",
-/* write */       "");
+/* write */       "head-width join-left primitive");

diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc
index fc7a44e0c559b3081c99d48973b0e07b388e2f89..c8ec471f2189372e4cc73e2eba05e6c3177c958b 100644 (file)
--- a/lily/mensural-ligature.cc
+++ b/lily/mensural-ligature.cc
@@ -255,4 +255,4 @@ Mensural_ligature::brew_molecule (SCM)
 
 ADD_INTERFACE(Mensural_ligature, "mensural-ligature-interface",
              "A mensural ligature",
-             "thickness flexa-width");
+             "thickness flexa-width ligature-primitive-callback");

diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm
index 884fdeddff36c35c70ef60cb2fa82554920394fd..5bfe8736875c5c7916b16cc329ee68b26630c702 100644 (file)
--- a/scm/grob-property-description.scm
+++ b/scm/grob-property-description.scm
@@ -539,6 +539,7 @@ no extent.
 (grob-property-description 'y-free number? "minimal vertical gap between slur and noteheads or stems.")
 (grob-property-description 'y-offset number? "extra vertical offset for ties away from the center line.")
 
+
 ;;; INTERNAL
 
 (grob-property-description 'left-neighbors grob-list? " List of
@@ -574,6 +575,7 @@ columns.
 -- can be stored for debugging")
 (grob-property-description 'least-squares-dy number? 
  "ideal beam slope, without damping.")
+(grob-property-description 'ligature-primitive-callback procedure? "FIXME")
 (grob-property-description 'stem-info pair? "caching of stem parameters")
 (grob-property-description 'note-columns pair? "list of NoteColumn grobs.")
 
@@ -581,6 +583,10 @@ columns.
 (grob-property-description 'grace-space-factor number? "space grace at this fraction of the increment.")
 (grob-property-description 'position-callbacks list? "list of
 functions set spanner positions.")
+(grob-property-description 'join-left number? "DOCME")
+(grob-property-description 'delta-pitch number? "DOCME")
+(grob-property-description 'head-width number? "DOCME")
+(grob-property-description 'primitive number? "DOCME")
 (grob-property-description 'chord-name-function procedure? "DOCME")
 (grob-property-description 'minimum-beam-collision-distance number?
 "Minimum distance to beam for a rest collision.")