*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 889d4e7a3c27eae24ec4ed35220e8198c3da8ed4..cfc1f0f4a4048613c832abd4dc03ee43021c05c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-01-18  Erlend Aasland  <erlenda@gmail.com>
+
+       * 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  <wl@gnu.org>
 
        * scm/framework-ps.scm (ps-embed-cff): Fix DSC comments.

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index cc66e5e7aa4b8500bde04840b593ff56dc27bfa1..71ec568ee2c0849c1002e50e31f00548ecbf27d5 100644 (file)
--- 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 f046f810160031ea3b12f1542d100e2d7d2e1a70..0fd1a6acc94f7de8625e65acbf3e9cb44175065e 100644 (file)
--- 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