CVSROOT: /cvsroot/lilypond
Module name: lilypond
Branch:
Changes by: Han-Wen Nienhuys <[EMAIL PROTECTED]> 05/10/17 01:03:05
Modified files:
lily : ligature-engraver.cc
ly : engraver-init.ly
scm : define-grob-properties.scm
document-translation.scm
Log message:
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/lily/ligature-engraver.cc.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/ly/engraver-init.ly.diff?tr1=1.259&tr2=1.260&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/define-grob-properties.scm.diff?tr1=1.131&tr2=1.132&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/lilypond/lilypond/scm/document-translation.scm.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
Patches:
Index: lilypond/lily/ligature-engraver.cc
diff -u lilypond/lily/ligature-engraver.cc:1.52
lilypond/lily/ligature-engraver.cc:1.53
--- lilypond/lily/ligature-engraver.cc:1.52 Sun Oct 16 13:52:42 2005
+++ lilypond/lily/ligature-engraver.cc Mon Oct 17 01:03:04 2005
@@ -106,12 +106,18 @@
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
}
/*
Index: lilypond/ly/engraver-init.ly
diff -u lilypond/ly/engraver-init.ly:1.259 lilypond/ly/engraver-init.ly:1.260
--- lilypond/ly/engraver-init.ly:1.259 Sun Oct 16 14:20:45 2005
+++ lilypond/ly/engraver-init.ly Mon Oct 17 01:03:05 2005
@@ -618,8 +618,7 @@
%% 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
Index: lilypond/scm/define-grob-properties.scm
diff -u lilypond/scm/define-grob-properties.scm:1.131
lilypond/scm/define-grob-properties.scm:1.132
--- lilypond/scm/define-grob-properties.scm:1.131 Sun Oct 16 14:20:45 2005
+++ lilypond/scm/define-grob-properties.scm Mon Oct 17 01:03:05 2005
@@ -419,8 +419,8 @@
(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 @@
@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
[EMAIL PROTECTED] 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 @@
;; [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}).")
Index: lilypond/scm/document-translation.scm
diff -u lilypond/scm/document-translation.scm:1.28
lilypond/scm/document-translation.scm:1.29
--- lilypond/scm/document-translation.scm:1.28 Mon Oct 17 00:50:45 2005
+++ lilypond/scm/document-translation.scm Mon Oct 17 01:03:05 2005
@@ -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)
_______________________________________________
Lilypond-cvs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/lilypond-cvs
