* Documentation/user/changing-defaults.itely,

Documentation/user/preface.itely: Use `--', not `---'.
Minor improvements.

* Documentation/user/introduction.itely: Minor improvements.
(Automated engraving): Make example using \applyOutput work
actually.

* input/regression/apply-output.ly: Improve.

diff --git a/ChangeLog b/ChangeLog
index 7e8a3d28d50d86d8872a7613bf87f31e095878e0..2dcb253afa7a1e8b1719e18b155759a136bdc174 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2006-11-05  Werner Lemberg  <wl@gnu.org>
+
+       * Documentation/user/changing-defaults.itely,
+       Documentation/user/preface.itely: Use `--', not `---'.
+       Minor improvements.
+
+       * Documentation/user/introduction.itely: Minor improvements.
+       (Automated engraving): Make example using \applyOutput work
+       actually.
+
+       * input/regression/apply-output.ly: Improve.
+
 2006-11-05  Han-Wen Nienhuys  <hanwen@lilypond.org>
 
        * lily/dynamic-engraver.cc: 

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 97525e0c4605e7dcff36c8025a07db4297aecf16..a784db0e08d0d7040ab7ae7e16053ff2a6e74bb7 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -192,7 +192,7 @@ c1 cis cis c
 
 @item forget
 This is sort of the opposite of @code{no-reset}: Accidentals
-are not remembered at all---and hence all accidentals are
+are not remembered at all -- and hence all accidentals are
 typeset relative to the key signature, regardless of what was
 before in the music
 

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 6eeaca9a76754c847ee15de10b393cac23cae30a..97d32ec4c66ccbc20567a9e624c9b8b5dbfb5d98 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -168,7 +168,7 @@ music = {
 @cindex regular rhythms
 @cindex regular spacing
 
-The fragment only uses quarter notes: notes that are played in a
+Each bar in the fragment only uses notes that are played in a
 constant rhythm.  The spacing should reflect that.  Unfortunately, the
 eye deceives us a little; not only does it notice the distance between
 note heads, it also takes into account the distance between
@@ -176,9 +176,9 @@ consecutive stems.  As a result, the notes of an up-stem/@/down-stem
 combination should be put farther apart, and the notes of a
 down-stem/@/up-stem
 combination should be put closer together, all depending on the
-combined vertical positions of the notes.  The first two measures are
-printed with this correction, the last two measures without.  The notes
-in the last two measures form down-stem/@/up-stem clumps of notes.
+combined vertical positions of the notes.  The upper two measures are
+printed with this correction, the lower two measures without, forming
+down-stem/@/up-stem clumps of notes.
 
 @cindex typography
 
@@ -315,23 +315,22 @@ head objects are used to produce their symbol is changed during the music
 fragment.
 
 @lilypond[quote,ragged-right]
+#(set-global-staff-size 30)
+
 #(define (mc-squared grob orig current)
-  (let ((interfaces (ly:grob-property grob 'interfaces))
-        (pos (ly:grob-property grob 'staff-position)))
-    (if (and (memq 'note-head-interface interfaces)
-             (memq pos '(-2 -3 -5)))
+  (let* ((interfaces (ly:grob-interfaces grob))
+         (pos (ly:grob-property grob 'staff-position)))
+    (if (memq 'note-head-interface interfaces)
         (begin
           (ly:grob-set-property! grob 'stencil ly:text-interface::print)
           (ly:grob-set-property! grob 'font-family 'roman)
-          (ly:grob-set-property!
-           grob 'text
-           (make-raise-markup
-            -0.5
-            (case pos
-              ((-5) (make-simple-markup "m"))
-              ((-3) (make-simple-markup "c "))
-              ((-2) (make-smaller-markup (make-bold-markup "2")))
-              (else (make-simple-markup "bla")))))))))
+          (ly:grob-set-property! grob 'text
+            (make-raise-markup -0.5
+              (case pos
+                ((-5) (make-simple-markup "m"))
+                ((-3) (make-simple-markup "c "))
+                ((-2) (make-smaller-markup (make-bold-markup "2")))
+                (else (make-simple-markup "bla")))))))))
 
 \new Voice \relative c' {
    \stemUp
@@ -339,6 +338,9 @@ fragment.
    \time 2/4
    <d f g>4
    \once \override NoteHead #'stencil = #ly:note-head::brew-ez-stencil
+   \once \override NoteHead #'font-size = #-7
+   \once \override NoteHead #'font-family = #'sans
+   \once \override NoteHead #'font-series = #'bold
    <d f g>
    \once \override NoteHead #'style = #'cross
    <d f g>

diff --git a/Documentation/user/preface.itely b/Documentation/user/preface.itely
index 857b553c7c66195f1a60e33d708ea2f8ddf6c376..09d561a6c0342510fbfe4f048a4616dc4772ca81 100644 (file)
--- a/Documentation/user/preface.itely
+++ b/Documentation/user/preface.itely
@@ -5,7 +5,7 @@
 
 
 It must have been during a rehearsal of the EJE (Eindhoven Youth
-Orchestra), somewhere in 1995 that Jan, one of the cranked violists
+Orchestra), somewhere in 1995 that Jan, one of the cranked violists,
 told Han-Wen, one of the distorted French horn players, about the
 grand new project he was working on.  It was an automated system for
 printing music (to be precise, it was MPP, a preprocessor for
@@ -20,8 +20,8 @@ In some ways, developing a computer program is like learning to play
 an instrument.  In the beginning, discovering how it works is fun, and
 the things you cannot do are challenging.  After the initial excitement,
 you have to practice and practice.  Scales and studies can be dull, and
-if you are not motivated by others---teachers, conductors or
-audience---it is very tempting to give up.  You continue, and gradually
+if you are not motivated by others -- teachers, conductors or
+audience -- it is very tempting to give up.  You continue, and gradually
 playing becomes a part of your life.  Some days it comes naturally, and
 it is wonderful, and on some days it just does not work, but you keep
 playing, day after day.

diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly
index 56d515557055194ed0a04b31a56b9400d71cf9e9..3a9646581211e120651aae0adb3f3f5660dae42d 100644 (file)
--- a/input/regression/apply-output.ly
+++ b/input/regression/apply-output.ly
@@ -1,30 +1,29 @@
+\version "2.9.28"
 
-\version "2.9.6" 
 \header {
-
   texidoc = "The @code{\applyOutput} expression is the most flexible way to
 tune properties for individual grobs.
 
 Here, the layout of a note head is changed depending on its vertical
 position.
 "
+}
 
+\layout {
+  ragged-right = ##t
 }
-\layout { ragged-right = ##t }
 
-#(define  (mc-squared gr org cur)
+#(define (mc-squared gr org cur)
   (let*
    (
      (ifs (ly:grob-interfaces gr))
      (sp (ly:grob-property gr 'staff-position))
    )
-   (if (and (memq 'note-head-interface ifs)
-       (memq sp '(-2 -3 -5)))
+   (if (memq 'note-head-interface ifs)
     (begin
      (ly:grob-set-property! gr 'stencil ly:text-interface::print)
      (ly:grob-set-property! gr 'font-family 'roman)
-     (ly:grob-set-property!
-      gr 'text
+     (ly:grob-set-property! gr 'text
       (make-raise-markup -0.5
        (case sp
        ((-5) (make-simple-markup "m"))
@@ -34,14 +33,15 @@ position.
       ))))
   )))
 
-\context Voice \relative  c' {
+\context Voice \relative c' {
   \stemUp
-  \set autoBeaming =  ##f
+  \set autoBeaming = ##f
+
   { <d f g b>8
-    \applyOutput #'Voice #mc-squared
 
+    \applyOutput #'Voice #mc-squared
     <d f g b>
   }
-  
 }
 
+# EOF