* scm/document-backend.scm (interface-doc): sort grob list for interface.

	* scm/define-grobs.scm (all-grob-descriptions): fix ordering of
	pre/post break align-order.

diff --git a/ChangeLog b/ChangeLog
index 7a690460b07315083d1e9b0c497816c85ac01c4d..467c785ceeb44c4c134d9a1435c1fffea4d7fd3f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,11 @@
 
 2004-03-22  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 
+       * scm/document-backend.scm (interface-doc): sort grob list for interface.
+
+       * scm/define-grobs.scm (all-grob-descriptions): fix ordering of
+       pre/post break align-order.
+
        * spelling patch courtesy Edward Sutton.
 
        * Documentation/user/changing-defaults.itely (Changing context

diff --git a/Documentation/index.html.in b/Documentation/index.html.in
index 1dd4dcaddde5ca5c98fd9e12795b3308d3a1aaf3..fe64c9136eaab5ad9040e10fe544e22e20b8382a 100644 (file)
--- a/Documentation/index.html.in
+++ b/Documentation/index.html.in
@@ -91,7 +91,7 @@
            <li>
  <a  class="title" href="../user/out-www/lilypond-internals/index.html">Program reference</a>
 
-     <br>(for LilyPond hackers)
+     <br>(definitions for tweaking)
 
            <li>
      <a  class="title" href="../../input/regression/out-www/collated-files.html">Regression tests</a> (in <a  class="title" href="../../input/regression/out-www/collated-files.pdf">PDF</a>)

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index eeb235954370b875698aeec774313c4b2cdd8f04..785e1b72d8529afa6d1b91c66702023a76cabba4 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -749,8 +749,8 @@ to indicate improvisation in Jazz pieces,
     \accepts "ImproVoice"
   }}
   \score { \notes \relative c'' {
-    a4 d8 bes8 \new ImproVoice { c4^"ad lib" 
-     c4 c^"undress"  c c_"while playing :)"  } 
+    a4 d8 bes8 \new ImproVoice { c4^"ad lib" c 
+     c4 c^"undress" c_"while playing :)" c } 
     a1 
   }}
 @end lilypond
@@ -851,7 +851,37 @@ which is sometimes when reusing existing context definitions. }
   }
 @end verbatim 
 
+Putting both into a @code{\paper} block, like
 
+@example
+  \paper @{
+    \context @{
+      \name ImproVoice
+      @dots{}
+    @}
+  \context @{
+    \StaffContext
+    \accepts "ImproVoice"
+  @}
+@}
+@end example
+
+Then the output at the start of this subsection can be entered as
+
+@verbatim
+\score {
+  \notes \relative c'' {
+     a4 d8 bes8
+     \new ImproVoice {
+       c4^"ad lib" c 
+       c4 c^"undress"
+       c c_"while playing :)"
+     }
+     a1 
+  }
+}
+@end verbatim
+  
 
     
 @node Which properties to change

diff --git a/scm/define-grob-properties.scm b/scm/define-grob-properties.scm
index 5332dedfb32c5e8351dda5a555ed8674bf33c5b6..2890451ba5dafca48475b1dabc3b5e01fde425a5 100644 (file)
--- a/scm/define-grob-properties.scm
+++ b/scm/define-grob-properties.scm
@@ -112,12 +112,14 @@ potential line breaks.")
 spacing breakable items.")
      (break-align-orders ,vector? " Defines the order in which
 prefatory matter (clefs, key signatures) appears. The format is a
-vector of length 3. Each element is an order for (end-of-line, middle
-of line, and start-of-line). The order is a list of  symbols.
-Clefs are put after key signatures by setting 
+vector of length 3, where each element is one order for end-of-line,
+middle of line, and start-of-line respectively. An order is a list of
+symbols.
+
+For example, clefs are put after key signatures by setting
 
 @example
-       \\property Score.breakAlignOrder = #(make-vector  3
+       \\override Score.BreakAlignment #'break-align-orders = #(make-vector  3
          '(span-bar
          breathing-sign
          staff-bar

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index c987c97b0a738eda0514f301f60bbb7c2296e9c8..3c2beb1b570dc56c74222db5334952e03ba2bc34 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -193,10 +193,13 @@
                                (instrument-name left-edge ambitus breathing-sign
                                                 clef  staff-bar key-signature
                                                 time-signature custos)
+
+                               ; unbroken
                                (instrument-name left-edge ambitus breathing-sign
                                                 clef  staff-bar key-signature
                                                 staff
                                                 time-signature custos)
+                               ; begin of line
                                (instrument-name left-edge ambitus breathing-sign
                                                 clef key-signature staff-bar
                                                 time-signature custos)

diff --git a/scm/document-backend.scm b/scm/document-backend.scm
index 5be1f087efabcc51ef68728f0f20f5d4d9b9c14a..cbd9f390aa10c6dbc93219306942615a5d7e557a 100644 (file)
--- a/scm/document-backend.scm
+++ b/scm/document-backend.scm
@@ -71,8 +71,12 @@
 
              (human-listify
               (map ref-ify
-                   (map symbol->string
-                        (hashq-ref iface->grob-table (car interface) '() )))))
+                   (sort 
+                    (map symbol->string
+                         (hashq-ref iface->grob-table (car interface) '() ))
+                    string<?)
+                   
+                   )))
 
       )))