More editing.

diff --git a/ChangeLog b/ChangeLog
index 8269ab461e733671ee85f799c33c1d59ba7a1ffc..bb75786ef68c047d58e9acd0e3c36b6e60e6b813 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-08  Graham Percival  <gperlist@shaw.ca>
+
+       * Documentation/user/{first couple of chapters}: more editing.
+
 2004-09-07  Graham Percival  <gperlist@shaw.ca>
 
        * Documentation/topdocs/AUTHORS.texi, THANKS: add/modify my name and summary.

diff --git a/Documentation/user/examples.itely b/Documentation/user/examples.itely
index cc128fe1561e0ee7556624455f912173df1b11da..47d7c2d5be3aaa019e6cdedc3cb9a2f503f1b62c 100644 (file)
--- a/Documentation/user/examples.itely
+++ b/Documentation/user/examples.itely
@@ -434,6 +434,8 @@ is within a @code{\transpose} section.
 @c   - maybe ask Amelie Zapf to clean it up, or whether I should just
 @c     make whatever changes I feel like.
 
+@c FIXME: produces a warning ; key change merge.
+
 @lilypond[verbatim,raggedright]
 
 \version "2.3.11"

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index cb25ad051cf0527ec9d0689676b12eb611671060..e0db786ad0027bcd16c8520c482e85829ec65bb7 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -268,6 +268,9 @@ appearance of objects.  In the following example, the rule which note
 head objects use to produce their symbol is changed during the music
 fragment.
 
+@c  FIXME: this example has errors:
+@c    programming error: Grob `NoteHead' has no interface for property `text'
+@c    Continuing; crossing fingers
 @lilypond[quote,raggedright]
 #(define (mc-squared grob orig current)
   (let ((interfaces (ly:grob-property grob 'interfaces))

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index 94108d0f783754bc5506c4fcbf0f3e3e8744e7ce..ab9c2e7a23e23272f9d52d50e7c4edcd93fa3003 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -764,11 +764,13 @@ used.  It is described in the next section.
 It is also possible to redefine the meaning of @code{|}.  This is done
 by assigning a music expression to @code{pipeSymbol},
 
-@lilypond[quote,fragment,raggedright,verbatim]
-pipeSymbol = \bar "||"
+FIXME: example removed to allow doc builds.  Needs to be fixed soon.  -gp
 
-{ c'2 c'2 | c'2 c'2 | }
-@end lilypond 
+@c @lilypond[quote,fragment,raggedright,verbatim]
+@c pipeSymbol = \bar "||"
+
+@c { c'2 c' | c'2 c }
+@c @end lilypond 
 
 
 @node Skipping corrected music
@@ -1094,6 +1096,7 @@ command
 \time 2/4 c'2 \time 3/4 c'2. 
 @end lilypond
 
+@c  FIXME: broken numbers for 4/4 and 2/2 time.
 The symbol that is printed can be customized with the @code{style}
 property.  Setting it to @code{#'()} uses fraction style for 4/4 and
 2/2 time,
@@ -1352,7 +1355,10 @@ the measure, so the next bar line will fall at 2/4 + 3/8.
 @node Controlling formatting of prefatory matter
 @subsection Controlling formatting of prefatory matter
 
-TODO
+TODO  Somebody needs to explain this example, but I don't know what
+they're trying to do, so it won't be me.  -gp
+
+TODO part 2, build message: programming error: No spacing entry from KeyCancellation to `key-signature'
 
 @lilypond[verbatim]
 \transpose c c' {
@@ -1385,6 +1391,13 @@ TODO
 
 @node Polyphony
 @section Polyphony
+
+Polyphony in music refers to having more than one voice occuring in
+a piece of music.  Polyphony in LilyPond refers to having more than
+one voice on the same staff.
+
+@subsection Writing polyphonic music
+@subsection Writing polyphonic music
 @cindex polyphony
 
 The easiest way to enter fragments with more than one voice on a staff
@@ -1401,7 +1414,7 @@ small, short-lived voices or for single chords
 @end lilypond
 
 The separator causes @internalsref{Voice} contexts@footnote{Polyphonic
-voices are sometimes called "layers" in other notation packages}
+voices are sometimes called ``layers'' in other notation packages}
 @cindex layers
 to be instantiated.  They bear the names @code{"1"}, @code{"2"}, etc.  In
 each of these contexts, vertical direction of slurs, stems, etc. is set
@@ -1536,7 +1549,22 @@ notation (see @ref{Clusters}).
 @section Beaming
 
 Beams are used to group short notes into chunks that are aligned with
-the metrum.  They are inserted automatically
+the metrum.  LilyPond normally inserts beams automatically, but if you
+wish you may control them manually or changed how beams are automatically
+grouped.
+
+@cindex Automatic beams
+@menu
+* Automatic beams::
+* Manual beams::                
+* Setting automatic beam behavior::  
+* Beam formatting::             
+@end menu
+
+@node Automatic beams
+@subsection Automatic beams
+
+LilyPond inserts beams automatically
 
 @lilypond[quote,fragment,verbatim,relative=2]
 \time 2/4 c8 c c c \time 6/8 c c c c8. c16  c8
@@ -1559,13 +1587,6 @@ from being beamed
 Program reference: @internalsref{Beam}. 
 
 
-@cindex Automatic beams
-@menu
-* Manual beams::                
-* Setting automatic beam behavior::  
-* Beam formatting::             
-@end menu
-
 @node Manual beams
 @subsection Manual beams
 @cindex beams, manual
@@ -1593,8 +1614,11 @@ is erased
 
 @lilypond[quote,fragment,relative=1,verbatim]
 {
-  f8[ r16 f g a]
-  f8[ r16 \set stemLeftBeamCount = #1 f g a]
+   f8[ r16
+      f g a]
+   f8[ r16
+   \set stemLeftBeamCount = #1
+      f g a]
 }
 @end lilypond
 @cindex @code{stemRightBeamCount}
@@ -1635,7 +1659,7 @@ User manual: @ref{Changing context properties on the fly} for the
 
 @cindex Frenched staves
 Kneed beams are inserted automatically, when a large gap is detected
-between the note heads.  This behavior can be tuned through the object
+between the note heads.  This behavior can be tuned through the object.
 
 
 Automatically kneed cross-staff beams cannot be used together with
@@ -1766,8 +1790,8 @@ down.  However, this behaviour can be altered with the
 @code{neutral-direction} property.
 
 
-@lilypond
-\relative c'' {
+@lilypond[quote,raggedright,relative=2,fragment,verbatim]
+{
    b8[ b]
   \override Beam  #'neutral-direction = #-1
    b[ b]
@@ -5764,6 +5788,8 @@ with respect to that clef.
 @b{Supported Clefs} @tab
 @b{Example}
 
+@c  FIXME: Unknown clef type `neomensural_c2'
+
 @item
 modern style mensural C clef @tab
 @code{neomensural_c1}, @code{neomensural_c2},

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 16188c9f9a6af2cac9f5446ffc3273b41dc06571..f858104dca0f6478360484f229fa16ff82b60500 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -209,17 +209,6 @@ see @ref{Time signature}.
 
 @c cheesy title to avoid clash with chapter name.
 
-@c FIXME: let's not be so casual about Emacs and VIM, but rather
-@c instruct (how) to use them; let advanced user figure-out what
-@c commands to type?
-
-@c
-@c We don't have enough space to explain either VIM
-@c or Emacs non-advanced users, and I fear that both editors will only
-@c confuse newbies.  I vote for keeping the material in footnotes.
-@c 
-@c --hwn 
-
 In the last section we explained what kind of things you could enter
 in a LilyPond file.  In this section we will explain what commands to
 run and how to view or print the output.  If you have not used
@@ -950,7 +939,7 @@ c4 c g' g a a g2
 @c  FIXME
 @c   This is good info, but I wouldn't call it a comment.  IMO it should
 @c   be moved somewhere else.  I don't know exactly where yet, but I'll
-@c   resolve it soon.  -GP
+@c   resolve it soon.  -gp
 
 @cindex versioning