patch::: 1.5.14.jcn4

1.5.14.jcn4

diff --git a/CHANGES b/CHANGES
index 24cd0fc8badffc617ee65876c5e897d60059a6e0..3b4f34ad688ce2f3652877180cd57c0230e96ff8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
-1.5.14.jcn3
+1.5.14.jcn4
 ===========
 
+* Slightly better doco for r, s and \skip, with examples.
+
+* Bugfixes: add-html-footer.py and @MAILADDRESS@.
+
 * Some website related fixes (thanks Tiggr).
 
 * Ugly hack in add-html-footer for disabling tutorial and refman links

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index e9ba808c3c6378ace2201ec14d89d556b4df39c5..fac04df277f0078928d233fc68fb886d4d0415be 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -5,6 +5,8 @@
 @c     M-x texinfo-all-menus-update
 @c to automagically fill in these menus before saving changes
 
+@c FIXME: singular vs. plural:  Beams/Beam
+
 
 @macro refbugs
 @strong{BUGS}
@@ -103,6 +105,7 @@ These threemanship of tasks (parsing, translating, typesetting) and
 data-structures (music, context, graphical objects) permeates the entire
 design of the program.
 
+@c FIXME: Note entry vs Music entry at top level menu is confusing.
 @c . {Note entry}
 @node Note entry
 @section Note entry
@@ -118,7 +121,7 @@ brevity we omit obligatory lint such as @code{\score} blocks and
 * Notes::                       
 * Pitches::                     
 * Rests::                       
-* Skips::                       
+* Skips::
 * Durations::                   
 * Ties::                        
 * Tuplets::                     
@@ -220,26 +223,57 @@ octave; each @code{,} lowers the pitch by an octave.
 @subsection Rests
 @cindex Rests
 
-Rests are entered like notes, with note name `@code{r}'. The grob is
-@code{Rest}. Whole bar rests centered in the bar are specified using
-@code{R}, see @ref{Multi measure rests}.
+A rest is entered like a note, with note name `@code{r}':
+
+@lilypond[singleline,verbatim]
+r1 r2 r4 r8
+@end lilypond
+
+The grob is @code{Rest}. Whole bar rests centered in the bar are
+specified using @code{R}, see @ref{Multi measure rests}.
 
 
 @c .  {Skips}
+@c FIXME: naming.
 @node Skips
 @subsection Skips
 @cindex Skip
+@cindex Invisible rest
+@cindex Space note
 
+An invisible rest, or skip, can be entered like a note with note name
+`@code{s}':
+
+@lilypond[singleline,verbatim]
+a2 s4 a4 s1 a4
+@end lilypond
+
+Actually, this is a shorthand for the @code{\skip} command, and it is
+only available in Note mode and Chord mode.
+
+@c FIXME: in lyrics mode, we have " " and _
+
+In Lyrics mode, you can use `@code{" "}' and `@code{_}':
+@lilypond[singleline,verbatim]
+<
+  \context Lyrics \lyrics { lah2 di4 " " dah2 _4 di }
+  \notes\relative c'' { a2 a4 a a2 a4 a }
+>
+@end lilypond
+
+The unabbreviated `@code{\skip} @var{duration}' also works outside of
+note mode:
+
+@lilypond[singleline,verbatim]
+\score {
+  \context Staff <
+    { \time 4/8 \skip 2 \time 4/4 } 
+    \notes\relative c'' { a2 a1 }
+  >
+}
+@end lilypond
 
-@example
-  \skip @var{duration} 
-  s@var{duration}
-@end example
-@cindex @code{\skip}
 
-Skips the amount of time specified by @var{duration}.  If no other music
-is played, a gap will be left for the skipped time without any notes
-printed.  The shorthand is only available in Note and Chord mode.
 
 @c .  {Durations}
 @node Durations
@@ -460,8 +494,8 @@ Hal-Leonard Inc.  music publishers.
 @lilypond[singleline,verbatim]
 \include "paper23.ly"
 \score {
-        \notes { c'2 e'4 f' | g'1 }
-        \paper { \translator { \EasyNotation } } 
+  \notes { c'2 e'4 f' | g'1 }
+  \paper { \translator { \EasyNotation } } 
 }
 @end lilypond
 
@@ -3758,7 +3792,7 @@ number.
 
 
 
-
+@c FIXME: Note entry vs Music entry at top level menu is confusing.
 @c . {Music entry}
 @node Music entry
 @section Music entry

diff --git a/VERSION b/VERSION
index a6361b957b8ab52db329dadbd07b979c574043c6..70f2ca8c098904a0294d1e2ab8ad8d4300732aad 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=14
-MY_PATCH_LEVEL=jcn3
+MY_PATCH_LEVEL=jcn4
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/test/add-staccato.ly b/input/test/add-staccato.ly
index 8bf959d3d1ead63c052ff739ecfaa6a2a4d95a99..cebb441105593d8ec3c4ed513d784095b01559b7 100644 (file)
--- a/input/test/add-staccato.ly
+++ b/input/test/add-staccato.ly
@@ -1,7 +1,8 @@
 \header {
 
 texidoc= "Using make-music, you can add various stuff to notes. Here
-is an example how to add staccato dots."
+is an example how to add staccato dots.  Note: for this simple case
+one would not use scm constructs.  See separate-staccato.ly first."
 
 } 
 

diff --git a/input/test/separate-staccato.ly b/input/test/separate-staccato.ly
new file mode 100644 (file)
index 0000000..5fc2f6e
--- /dev/null
+++ b/input/test/separate-staccato.ly
@@ -0,0 +1,17 @@
+\header {
+
+texidoc="You can enter notes and articulations separately, and merge
+them into one thread.  Here is an example to add repeated staccato dots."
+
+} 
+
+staccatos = \notes { s4-. s-. s-. s s }
+
+music = \notes\relative c' { c4 d e f g  a b c d e }
+
+\score {
+   \context Thread=one <
+     \music
+     \repeat unfold 2 \staccatos
+   >
+}

diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py
index 409f9e427210f96a993bd8bc35475cfac65b69ad..744c6ac5093a240b901bf4d962559f43d3b63243 100644 (file)
--- a/stepmake/bin/add-html-footer.py
+++ b/stepmake/bin/add-html-footer.py
@@ -42,7 +42,7 @@ built = r"""<hr>
 <p><font size="-1">
 This page was built from @PACKAGE_NAME@-@PACKAGE_VERSION@ by<br>
 </font>
-<address><font size="-1">@GCOS@ &lt;<a href="mailto:%s">@MAILADDRESS@</a>&gt;,
+<address><font size="-1">@GCOS@ &lt;<a href="mailto:@MAILADDRESS@">@MAILADDRESS@</a>&gt;,
 @LOCALTIME@.</font></address>"""
 
 
@@ -238,7 +238,7 @@ def do_file (f):
        s = re.sub ('@WEBMASTER@', webmaster, s)
        s = re.sub ('@GCOS@', gcos, s)
        s = re.sub ('@LOCALTIME@', localtime, s)
-       s = re.sub ('@MAIL_ADDRESS@', mail_address, s)
+       s = re.sub ('@MAILADDRESS@', mail_address, s)
 
        m = re.match ('.*?<!-- (@[a-zA-Z0-9_-]*@)=(.*?) -->', s, re.DOTALL)
        while m: