From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 28 Sep 2002 17:38:43 +0000 (+0000)
Subject: patches by Graham & Werner.
X-Git-Tag: release/1.6.5~2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e8194319b026fba2109464e334f293d838f88220;p=lilypond.git

patches by Graham & Werner.
---

diff --git a/ChangeLog b/ChangeLog
index 125c4b5ab7..7ae4d0d582 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2002-09-28  Werner Lemberg  <wl@gnu.org>
+
+	* scm/tex.scm (header-end): Suppress page numbering.
+
+	* scripts/lilypond-book.py (output_dict) <output-texi-quoted>:
+	Fix quotation for HTML output.
+
+
+2002-09-28   Graham Percival   <gperciva@sfu.ca>
+	
+	* Documentation/user/refman.itely: grammar and phrasing
+	  fixes to "Note Entry" section.  Also adds a few new examples.
+
+2002-09-27  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+	* flower/include/string-data.icc: include string.h
+
+2002-09-25  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+	* scm/chord-name.scm (chord::inner-name-banter): remove space.
+
 2002-09-27  Jan Nieuwenhuizen  <janneke@gnu.org>
 
 	* Documentation/user/GNUmakefile (extra-local-help): Add.
diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index fd0e190320..1f89b4ac67 100644
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -22,9 +22,11 @@
 @end html
 
 This document describes GNU LilyPond and its input format. The last
-revision of this document was made for LilyPond 1.4.1.  It supposes a
-passing familiarity with how LilyPond input works. New users are
-encouraged to study the tutorial first.
+revision of this document was made for LilyPond 1.6.2.  It assumes
+that you already know a little bit about LilyPond input (how to
+make an input file, how to create sheet music from that input file,
+etc).  New users are encouraged to study the tutorial before reading
+this manual.
 
 
 @menu
@@ -54,9 +56,10 @@ encouraged to study the tutorial first.
 @section Note entry
 @cindex Note entry
 
-Notes constitute the most basic form of music, but they do not form
-valid input on their own. Yet for the sake of brevity and simplicity,
-we'll generally omit @code{\score} blocks and @code{\paper} declarations.
+Notes constitute the most basic elements of LilyPond input, but they do
+not form valid input on their own without a @code{\score} block.  However,
+for the sake of brevity and simplicity we will generally omit
+@code{\score} blocks and @code{\paper} declarations in this manual.
 
 
 @menu
@@ -77,7 +80,7 @@ we'll generally omit @code{\score} blocks and @code{\paper} declarations.
 @subsection Notes
 
 
-A note is printed by specifying its pitch, and then its duration.
+A note is printed by specifying its pitch and then its duration.
 @lilypond[fragment,verbatim]
   cis'4 d'8 e'16 c'16
 @end lilypond
@@ -98,18 +101,24 @@ The verbose syntax for pitch specification is
   \pitch @var{scmpitch}
 @end example
 
-@var{scmpitch} is a pitch scheme object.
+where @var{scmpitch} is a pitch scheme object.
 
 In Note and Chord mode, pitches may be designated by names.  The default
 names are the Dutch note names.  The notes are specified by the letters
-@code{a} through @code{g} (where the octave is formed by notes ranging
-from @code{c} to @code{b}).  The pitch @code{c} is an octave below
-middle C and the letters span the octave above that C.
+@code{a} through @code{g}, while the octave is formed with notes ranging
+from @code{c} to @code{b}.  The pitch @code{c} is an octave below
+middle C and the letters span the octave above that C.  Here's an example
+which should make things more clear:
+
+@lilypond[fragment,verbatim]
+\clef bass
+  a,4 b, c d e f g a b c' d' e' \clef treble f' g' a' b' c''
+@end lilypond
 
 @cindex note names, Dutch
 
 In Dutch, a sharp is formed by adding @code{-is} to the end of a pitch
-name and a flat is formed by adding @code{-es}. Double sharps and double
+name and a flat is formed by adding @code{-es}.  Double sharps and double
 flats are obtained by adding @code{-isis} or @code{-eses}.  @code{aes}
 and @code{ees} are contracted to @code{as} and @code{es} in Dutch, but
 both forms are accepted.
@@ -151,17 +160,21 @@ octave; each @code{,} lowers the pitch by an octave.
 @node Chromatic alterations
 @subsection Chromatic alterations
 
-Normally, accidentals are automatically printed, but you may force
-them in the following ways: a reminder accidental
+Normally accidentals are printed automatically, but you may also
+print them manually.  A reminder accidental
 @cindex reminder accidental
-@cindex @code{?}
-can be forced by adding an exclamation mark @code{!} after the pitch.  A
-cautionary accidental,
+@cindex @code{?} can be forced by adding an exclamation mark @code{!}
+after the pitch.  A cautionary accidental
 @cindex cautionary accidental
 @cindex parenthesized accidental
-i.e., an accidental within parentheses can be obtained by adding the
+(an accidental within parentheses) can be obtained by adding the
 question mark `@code{?}' after the pitch.
 
+@lilypond[fragment,verbatim]
+  cis' cis' cis'! cis'?
+@end lilypond
+
+
 The automatic production of accidentals can be tuned in many
 ways. For more information, refer to @ref{Accidentals}.
 
@@ -170,17 +183,18 @@ ways. For more information, refer to @ref{Accidentals}.
 @subsection Rests
 @cindex Rests
 
-Rests are entered like notes, with an `@code{r}' note name:
+Rests are entered like notes, with a ``note name'' of `@code{r}':
 
 @lilypond[singleline,verbatim]
 r1 r2 r4 r8
 @end lilypond
 
-Whole bar rests, centered in the bar, are specified using @code{R}, see
-@ref{Multi measure rests}. See also @seeinternals{Rest}.
+Whole bar rests, centered in middle of the bar, are specified using
+@code{R} (capital R); see @ref{Multi measure rests}.  See also
+@seeinternals{Rest}.
 
-For polyphonic music, it can be convenient to explicitly specify the rest's
-vertical position. This can be achieved by entering a note, with the @code{\rest}
+For some music, you may wish to explicitly specify the rest's vertical
+position.  This can be achieved by entering a note with the @code{\rest}
 keyword appended. Rest collision testing will leave these rests alone.
 
 @lilypond[singleline,verbatim]
@@ -196,8 +210,8 @@ a'4\rest d'4\rest
 @cindex Invisible rest
 @cindex Space note
 
-An invisible rest, or skip, can be entered like a note with note name
-@code{s}, or with @code{\skip @var{duration}}:
+An invisible rest (also called a `skip') can be entered like a note
+with note name `@code{s}' or with @code{\skip @var{duration}}:
 
 @lilypond[singleline,verbatim]
 a2 s4 a4 \skip 1 a4 
@@ -214,9 +228,9 @@ or `@code{_}':
 >
 @end lilypond
 
-Note that the @code{s} syntax  is only available in Note mode and Chord
-mode. In other situations, you should use the @code{\skip} command, which
-also works outside of those two modes:
+Note that the @code{s} syntax is only available in Note mode and Chord
+mode.  In other situations, you should use the @code{\skip} command,
+which will work outside of those two modes:
 
 @lilypond[singleline,verbatim]
 \score {
@@ -227,7 +241,7 @@ also works outside of those two modes:
 }
 @end lilypond
 
-The skip command is merely an empty musical placeholder. It doesn't
+The skip command is merely an empty musical placeholder.  It doesn't
 produce any output, not even transparent output.
 
 
@@ -242,8 +256,12 @@ produce any output, not even transparent output.
 
 
 In Note, Chord, and Lyrics mode, durations are designated by numbers
-and dots: durations are entered as their reciprocal values.  For notes
+and dots: durations are entered as their reciprocal values.  For example,
+a quarter note is entered using a @code{4} (since it's a 1/4 note), while
+a half note is entered using a @code{2} (since it's a 1/2 note).  For notes
 longer than a whole you must use identifiers.
+@c FIXME: what's an identifier?  I don't think it's been introduced yet.
+@c and if it has, I obviously skipped that part.     - Graham
 
 @example 
 c'\breve  
@@ -280,7 +298,7 @@ note lengths:
 @cindex @code{.}
 
 @lilypond[fragment,verbatim,center]
-  a'4. b'4.. c'8.
+  a' b' c''8 b' a'4 a'4. b'4.. c'8.
 @end lilypond
 @cindex @code{r}
 @cindex @code{s}
@@ -289,9 +307,13 @@ You can alter the length of duration by a fraction @var{N/M}
 appending `@code{*}@var{N/M}' (or `@code{*}@var{N}' if @var{M=1}). This
 won't affect the appearance of the notes or rests produced.
 
+@lilypond[fragment,verbatim]
+  a'2*2 b'4*2 a'8*4 a'4*3/2 gis'4*3/2 a'4*3/2 a'4
+@end lilypond
+
 Durations can also be produced through GUILE extension mechanism. 
 @lilypond[verbatim,fragment]
- c\duration #(make-duration 2 1)
+ c'\duration #(make-duration 2 1)
 @end lilypond
 
 
@@ -311,15 +333,15 @@ Dot placement for chords is not perfect.  In some cases, dots overlap:
 @cindex @code{~}
 
 A tie connects two adjacent note heads of the same pitch.  The tie in
-effect extends the length of a note. Ties should not be confused with
-slurs, which indicate articulation, and phrasing slurs, which indicate
-musical phrasing. A tie is entered using the tilde symbol `@code{~}'.
+effect extends the length of a note.  Ties should not be confused with
+slurs, which indicate articulation, or phrasing slurs, which indicate
+musical phrasing.  A tie is entered using the tilde symbol `@code{~}'.
 
 @lilypond[fragment,verbatim,center]
   e' ~ e' <c' e' g'> ~ <c' e' g'>
 @end lilypond
 
-When a tie is applied to a chord, all note heads, whose pitches match, are
+When a tie is applied to a chord, all note heads (whose pitches match) are
 connected.  If you try to tie together chords that have no common pitches,
 no ties will be created.
 
@@ -338,10 +360,10 @@ exactly the same concept.
 @lilypond[fragment, singleline]
 \time 3/4 c'2. c'2 ~ c'4
 @end lilypond
-And if you need to tie notes over bars, it may be easier to use
+If you need to tie notes over bars, it may be easier to use
 @ref{Automatic note splitting}.
 
-See also  @seeinternals{Tie}.
+See also @seeinternals{Tie}.
 
 
 @refbugs
@@ -358,8 +380,8 @@ Switching staves when a tie is active will not work.
 @subsection Automatic note splitting
 @c FIXME: This subsection doesn't belong in @ref{Note entry}.
 
-There is a facility for automatically converting long notes to tied
-notes. This is done by replacing the @code{Note_heads_engraver} by the
+LilyPond can automatically converting long notes to tied notes.  This
+is done by replacing the @code{Note_heads_engraver} by the
 @code{Completion_heads_engraver}. 
 
 @lilypond[verbatim,noindent,noquote]
@@ -375,7 +397,7 @@ notes. This is done by replacing the @code{Note_heads_engraver} by the
 @end lilypond
 
 This engraver splits all running notes at the bar line, and inserts
-ties. One of its uses is to debug complex scores: if the measures are
+ties.  One of its uses is to debug complex scores: if the measures are
 not entirely filled, then the ties exactly show how much each measure
 is off.
 
@@ -400,10 +422,10 @@ with a fraction.
 @end example
 
 The duration of @var{musicexpr} will be multiplied by the fraction. 
-In print, the fraction's denominator will be printed over the notes,
-optionally with a bracket.  The most common tuplet is the triplet in
-which 3 notes have the length of 2, so the notes are 2/3 of
-their written length:
+In the sheet music, the fraction's denominator will be printed over
+the notes, optionally with a bracket.  The most common tuplet is the
+triplet in which 3 notes have the length of 2, so the notes are 2/3
+of their written length:
 
 @lilypond[fragment,verbatim,center]
   g'4 \times 2/3 {c'4 c' c'} d'4 d'4
@@ -411,7 +433,7 @@ their written length:
 
 The property @code{tupletSpannerDuration} specifies how long each bracket
 should last.  With this, you can make lots of tuplets while typing
-@code{\times} only once, thus  saving typing work.
+@code{\times} only once, saving you lots of typing.
 
 @lilypond[fragment,  relative, singleline, verbatim]
 \property Voice.tupletSpannerDuration = #(make-moment 1 4)
@@ -419,7 +441,7 @@ should last.  With this, you can make lots of tuplets while typing
 @end lilypond
 
 The format of the number is determined by the property
-@code{tupletNumberFormatFunction}. The default prints only the
+@code{tupletNumberFormatFunction}.  The default prints only the
 denominator, but if you set it to the Scheme function
 @code{fraction-tuplet-formatter}, Lilypond will print @var{num}:@var{den}
 instead.
@@ -432,7 +454,7 @@ See also @seeinternals{TupletBracket}.
 
 @refbugs
 
-Nested tuplets are not formatted automatically. In this case, outer
+Nested tuplets are not formatted automatically.  In this case, outer
 tuplet brackets should be moved automatically.
 
 @node Easy Notation note heads 
@@ -443,7 +465,7 @@ tuplet brackets should be moved automatically.
 
 A entirely different type of note head is the "easyplay" note head: a
 note head that includes a note name.  It is used in some publications by
-Hal-Leonard Inc.  music publishers.
+Hal-Leonard Inc. music publishers.
 
 @lilypond[singleline,verbatim,26pt]
 \score {
@@ -453,8 +475,11 @@ Hal-Leonard Inc.  music publishers.
 @end lilypond
 
 Note that @code{EasyNotation} overrides a @internalsref{Score} context.  You
-probably will want to print it with magnification or a large font size to make it more
-readable.
+probably will want to print it with magnification or a large font size to
+make it more readable.  To print with magnification, you must create a dvi
+(with @file{ly2dvi}) and then enlarge it with something like @file{dvips -x
+2000 file.dvi}.  See @file{man dvips} for details.  To print with a larger
+font, see @ref{Font Size}.
 
 
 @cindex Xdvi
diff --git a/THANKS b/THANKS
index 997a22bde7..d9cb3c915c 100644
--- a/THANKS
+++ b/THANKS
@@ -9,9 +9,10 @@ Juergen Reuter
 
 BUG HUNTERS
 
+Erik Sandberg
+Hans Kieserman
+Jeremie Lumbroso
 Karl-Johan Karlsson 
 Karl Berry
 Werner Lemberg
-Jeremie Lumbroso
-Erik Sandberg
 
diff --git a/flower/include/string-data.icc b/flower/include/string-data.icc
index bb3f9c7da1..f02a5d3b60 100644
--- a/flower/include/string-data.icc
+++ b/flower/include/string-data.icc
@@ -11,6 +11,7 @@
 
 #include <assert.h>
 #include <memory.h>
+#include <string.h>
 
 #include "string-data.hh"
 const int INITIALMAX=8;
diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index 9b6647f19a..97ebe1921a 100644
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -1,4 +1,4 @@
-\version "1.6.5"
+\version "1.6.4"
 
 \header {
     composer =   "ARTHUR GRAY"
diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly
index 044434e038..2be2b1cbca 100644
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly
@@ -6,7 +6,7 @@ longgrace = \property Voice.Stem \override #'stroke-style = #'()
 endlonggrace = \property Voice.Stem \revert #'stroke-style
 ritenuto = \textscript #'(italic  "rit.")
 
-\version "1.6.5"
+\version "1.6.4"
 
 #(define italic-bf '((font-shape . italic) (font-series . bold)))
 
diff --git a/input/test/bagpipe.ly b/input/test/bagpipe.ly
index 001fdc88f8..f5fb3aa4e0 100644
--- a/input/test/bagpipe.ly
+++ b/input/test/bagpipe.ly
@@ -1,4 +1,4 @@
-\version "1.6.5"
+\version "1.6.4"
 
 % bagpipe music.
 
diff --git a/scm/chord-name.scm b/scm/chord-name.scm
index c47b803a28..c562070d6c 100644
--- a/scm/chord-name.scm
+++ b/scm/chord-name.scm
@@ -323,7 +323,7 @@
 	 (subs-text (chord::subtractions->text-banter subtractions))
 	 (b+i-text (chord::bass-and-inversion->text-banter bass-and-inversion)))
     (text-append
-     tonic-text except-text " " sep-text
+     tonic-text except-text  sep-text
      ;;(list (list simple-super) adds-text subs-text)
      (list (list '((raise . 1) (font-relative-size . -1))) adds-text subs-text)
      b+i-text)))
diff --git a/scm/tex.scm b/scm/tex.scm
index 106720b36b..dba7f1955c 100644
--- a/scm/tex.scm
+++ b/scm/tex.scm
@@ -200,6 +200,7 @@
    "    \\endgroup\n"
    "    \\def\\LilyPondDocument{}\n"
    "    \\documentclass{article}\n"
+   "    \\pagestyle{empty}\n"
    ; argh, we can't say \begin{document} because \begin is defined as
    ; \outer in texinfo
    "    \\begingroup\n"
diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 58be944513..9764e88085 100644
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -56,7 +56,7 @@ import __main__
 ## https://sourceforge.net/tracker/?func=detail&aid=604803&group_id=5470&atid=105470
 ##
 
-if float (sys.version[0:3]) <= 2.1:
+if float (sys.version[0:3]) <= 2.1 or sys.version[0:5] == '2.2.1':
 	try:
 		import pre
 		re = pre
@@ -459,8 +459,7 @@ output_dict= {
 \catcode`\@=0
 @end tex
 @html
-<p>
-<a href="%(fn)s.png">
+<p><a href="%(fn)s.png">
 <img border=0 src="%(fn)s.png" alt="[picture of music]">
 </a><p>
 @end html
@@ -473,13 +472,12 @@ output_dict= {
 \input %(fn)s.tex
 \catcode`\@=0
 @end tex
-@end quotation
 @html
-<p>
 <a href="%(fn)s.png">
 <img border=0 src="%(fn)s.png" alt="[picture of music]">
-</a><p>
+</a>
 @end html
+@end quotation
 ''',
 		}