*** empty log message ***

diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc
index 1480a4d3c3985e8c0b4063b12144729cff4d0a92..1678a1e0189496666b659880196f1d503f979bcf 100644 (file)
--- a/lily/ligature-engraver.cc
+++ b/lily/ligature-engraver.cc
@@ -106,12 +106,18 @@ Ligature_engraver::try_music (Music *m)
 void
 Ligature_engraver::override_stencil_callback ()
 {
+#if 0
+  /*
+    This has  been broken with the introduction of generic callbacks.
+   */
   SCM target_callback = ly_symbol2scm ("print-function");
   SCM source_callback = ly_symbol2scm ("ligature-primitive-callback");
   SCM noteHeadProperties = updated_grob_properties (context (), ly_symbol2scm ("NoteHead"));
   SCM value = scm_cdr (scm_sloppy_assq (source_callback, noteHeadProperties));
   execute_pushpop_property (context (), ly_symbol2scm ("NoteHead"),
                            target_callback, value);
+
+#endif
 }
 
 /*

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 3c59a45e4507be2cf00752ceef9adb25ee3248d0..79ecb85d407f2a810a0b8ad7b1f2abecd66a3302 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -618,8 +618,7 @@ AncientRemoveEmptyStaffContext = \context {
   %% increases beam thickness and spacing; beams are
   %% too big. We have to adjust the beam settings:
   \override Beam #'thickness = #0.32
-  \override Beam #'space-function =
-  #(lambda (beam mult) (* 0.62 (Beam::space_function beam mult)))
+  \override Beam #'length-fraction = #0.62
 
   %% No accidental in tablature !
   \remove Accidental_engraver

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 74522da880f7757957c173cb23cf28bd184c453d..c87cf389d6cba86e536ab684cce0345aaaa5f7f1 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -419,8 +419,8 @@ for stems with the same direction to compensate for note-head to stem distance."
      (stroke-style ,string? "set to \"grace\" to turn stroke through flag on.")
      
      (style ,symbol? "This setting determines in what style a grob is
-typeset. Valid choices depend on the @code{print-function} that is
-reading this property.")
+typeset. Valid choices depend on the @code{stencil} callback reading
+this property.")
      (text ,markup? "Text markup.  See @usermanref{Text markup}.")
 ;;FIXME -- Should both be the same?
      (text-direction ,ly:dir? "This controls the ordering of the
@@ -436,9 +436,7 @@ use LEFT.")
 @var{min} and @var{max} are dimensions in staff space.")
      (tie-configuration ,list? "List of (@var{position} . @var{dir})
 pairs, indicating the desired tie configuration.")
-     (transparent ,boolean? "This is almost the same as setting
-@code{print-function} to @code{#f}, but this retains the dimensions of
-this grob, which means that grobs can be erased individually.")
+     (transparent ,boolean? "This makes the grob invisible.")
      (uniform-stretching ,boolean? "If set, items stretch proportional
 to their durations. This looks better in complex polyphonic patterns")
      (used ,boolean? "If set, this spacing column is kept in the spacing problem")
@@ -575,7 +573,7 @@ functions set spanner positions.")
 
      ;; [TODO: change this]
      (primitive ,integer? "Pointer to a ligature primitive, i.e. an item similar to a note head that is part of a ligature. ")
-     (stencil ,ly:stencil? "Cached output of the print-function.")
+     (stencil ,ly:stencil? "The symbol to print.")
      (ideal-distances ,list? "(@var{obj} . (@var{dist} . @var{strength})) pairs.")
      (minimum-distances ,list? "list of rods, that have the format (@var{obj} . @var{dist}).")
 

diff --git a/scm/document-translation.scm b/scm/document-translation.scm
index eed1c618bdc84f1fef0685c2a88b11714519f0f6..605e6c84036a6b462517d8f557d7e016cc5d4d89 100644 (file)
--- a/scm/document-translation.scm
+++ b/scm/document-translation.scm
@@ -127,12 +127,8 @@
 
       (string-append
        "@item Set "
-       (format "grob-property @code{~a} " (string-join path " "))
-       (format " in @ref{~a} " context-sym)
-       (if (not (null? (cddr body)))
-          (format " to @code{~a}" (scm->texi value))
-          "")
-       
+       (format "grob-property @code{~a} " (string-join (map symbol->string path) " "))
+       (format " in @ref{~a} to @code{~a}.  " context-sym (scm->texi value))
        "\n")))
      ((equal? (object-property context-sym 'is-grob?) #t) "")
      ((equal? tag 'assign)