From 6737351de8166d60662b45ac789078e3f173983e Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 18 Jan 2005 19:47:32 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 8 ++++++++ Documentation/user/notation.itely | 11 ++++++++--- scm/auto-beam.scm | 13 ++----------- 3 files changed, 18 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index 889d4e7a3c..cfc1f0f4a4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-01-18 Erlend Aasland + + * scm/auto-beam.scm: Simplify score-override-auto-beam-setting + + * Documentation/user/notation.itely: Document + score-override-auto-beam-setting Fix documentation for + revert-auto-beam-setting. + 2005-01-18 Werner Lemberg * scm/framework-ps.scm (ps-embed-cff): Fix DSC comments. diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely index cc66e5e7aa..71ec568ee2 100644 --- a/Documentation/user/notation.itely +++ b/Documentation/user/notation.itely @@ -1725,12 +1725,15 @@ or at durations specified by the properties in @code{autoBeamSettings}. The defaults for @code{autoBeamSettings} are defined in @file{scm/@/auto@/-beam@/.scm}. -The value of @code{autoBeamSettings} is changed with two functions, +The value of @code{autoBeamSettings} is changed with three functions, @example #(override-auto-beam-setting '(@var{be} @var{p} @var{q} @var{n} @var{m}) @var{a} @var{b} [@var{context}]) -#(revert-auto-beam-setting '(@var{be} @var{p} @var{q} @var{n} @var{m})) +#(score-override-auto-beam-setting + '(@var{be} @var{p} @var{q} @var{n} @var{m}) @var{a} @var{b}) +#(revert-auto-beam-setting '(@var{be} @var{p} @var{q} @var{n} @var{m}) + [@var{context}]) @end example Here, @var{be} is the symbol @code{begin} or @code{end}, and @var{context} is an optional context (default: @code{'Voice}). It @@ -1741,7 +1744,9 @@ to a time signature (wildcards `@code{* *}' may be entered to designate all time signatures), @var{a}/@var{b} is a duration. By default, this command changes settings for the current voice. It is also possible to adjust settings at higher contexts, by adding a -@var{context} argument. +@var{context} argument. @code{score-override-auto-beam-setting} is +equal to @code{override-auto-beam-setting} with the argument +@var{context} set to @code{'Score}. For example, if automatic beams should end on every quarter note, use the following diff --git a/scm/auto-beam.scm b/scm/auto-beam.scm index f046f81016..0fd1a6acc9 100644 --- a/scm/auto-beam.scm +++ b/scm/auto-beam.scm @@ -118,17 +118,8 @@ a fresh copy of the list-head is made." (car rest) 'Voice)))) -;; UGH -- fixme, docme -(define-public (score-override-auto-beam-setting setting num den . rest) - (ly:export - (context-spec-music - (make-apply-context (lambda (c) - (override-property-setting - c 'autoBeamSettings - setting (ly:make-moment num den)))) - (if (and (pair? rest) (symbol? (car rest))) - (car rest) - 'Score)))) +(define-public (score-override-auto-beam-setting setting num den) + (override-auto-beam-setting setting num den 'Score)) (define-public (revert-auto-beam-setting setting . rest) (ly:export -- 2.39.5