patch::: 1.3.42.jbr1

1.3.42.jbr1
===========
---
Generated by daboys@austin.rr.com,
From = lilypond-1.3.42, To = lilypond-1.3.42.jbr1

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.3.42.jbr1.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure

diff --git a/CHANGES b/CHANGES
index 5d3e8fa2ffbdb33cf8255e082be8b2f83e95290b..c0dc9656007c4a5c22bf36d7527dfc12b6d52aea 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,14 @@
-1.3.42.jcn2
+--- ../lilypond-1.3.42/CHANGES Mon Apr 03 03:19:38 2000
+++ b/CHANGES   Sun Apr 09 10:06:47 2000
+@@ -1,4 +1,8 @@
+1.3.42.jbr1
+===========
+ 
+* Documentation/ntweb: Updated angels.ly to match current syntax.  Also updated
+                       index.texi.
+ 1.3.41.jcn3
+ ===========
+ 1.3.42.jcn2
 ===========
 
 * mf/feta-accordion.mf: Fixed strange turning paths.

diff --git a/Documentation/ntweb/angels.ly b/Documentation/ntweb/angels.ly
index 80e068658ef52cddc23d92eb863eb0b539c3f577..2ea62654ff66b1afccb0ba156eb6843ed836086a 100644 (file)
--- a/Documentation/ntweb/angels.ly
+++ b/Documentation/ntweb/angels.ly
@@ -1,109 +1,109 @@
-\header{
-filename =      "angles.ly";
-title =         "Angels We Have Heard on High";
-description =   "Christmas Carol.";
-
-composer =      "French Carol, 1854";
-enteredby =     "Jeffrey B. Reed";
-copyright =     "public domain";
-}
-
-global = \notes {
-       \time 2/2;
-       \keysignature  bes;
-       \tempo 2=60;
-}
-\version "1.3.4";
-% \include "score-paper.ly"
-
-flute1 = \notes \relative c'' {
-       \clef violin;
-       \property Staff.instrument = "flute"
-       
-       a'4 a a c   | 
-       c4. bes8 a2 |
-       a4 g a c    |
-
-       a4. g8 f2   |
-       a4 a a c    |
-       c4. bes8 a2 |
-
-       a4 g a c                |
-       a4. g8 f2               |
-       c'2( [ d8 c8 bes8  a8 ] |
-
-       bes2 [ c8 bes8 a8 g8 ]  |
-       a2 [ bes8 a8 g8 f8 ]    | 
-       )g4. c,8 c2             |
-
-       f4 g a bes     |
-       a2 g2          |
-       c2( [ d8 c8 bes8  a8 ] |
-
-       bes2 [ c8 bes8 a8 g8 ]  |
-       a2 [ bes8 a8 g8 f8 ]    | 
-       )g4. c,8 c2             |
-
-       f4 g a bes     |
-       a2( )g2        |
-       f1            \bar "|."; 
-}
-
-flute2 = \notes \relative c'' {
-       \clef violin;
-       \property Staff.instrument = "oboe"
-       
-       f4 f e e  | 
-       g4 e f2   |
-       f4 e f f  |
-
-       f4 e f2   |
-       f4 f e e  |
-       f4 g f2   |
-
-       f4 e f f  |
-       f4 e f2   |
-       f4 ( [a8 g8 ] f2( |
-
-       )f4 [g8 f8] e2(  |
-       )e4 [f8 e8] d2   |
-       )c4.c8 c2        |
-
-       c4 e f f  |
-       f2 e2     |
-       f4 ( [a8 g8 ] f2( |
-
-       )f4 [g8 f8] e2(  |
-       )e4 [f8 e8] d2   |
-       )c4.c8 c2        |
-
-       c4 e f f  |
-       f2( )e2   | 
-       c1 \bar "|.";
-}
-
-$flute1_staff = \context Staff = flute1_group <
-       \global
-       \flute1
->
-
-$flute2_staff = \context Staff = flute2_group <
-       \global
-       \flute2
->
-
-$flutes = \context StaffGroup <
-       \$flute1_staff
-       \$flute2_staff
->
-       
-
-\score{
-        <
-                  \$flutes
-       >
-       \paper{}
-       \midi{ 
-               \tempo 2 = 60 ;
-       }
-}
+\header{\r
+filename =      "angles.ly";\r
+title =         "Angels We Have Heard on High";\r
+description =   "Christmas Carol.";\r
+\r
+composer =      "French Carol, 1854";\r
+enteredby =     "Jeffrey B. Reed";\r
+copyright =     "public domain";\r
+}\r
+\r
+global = \notes {\r
+       \time 2/2;\r
+       \key f \major;\r
+       \tempo 2=60;\r
+       \clef treble;\r
+}\r
+\r
+\version "1.3.41";\r
+% \include "paper16.ly"\r
+\r
+flute1 = \notes \relative c'' \context Voice = flute {\r
+       \property Staff.instrument = "flute"\r
+\r
+       a'4 a a c   | \r
+       c4. bes8 a2 |\r
+       a4 g a c    |\r
+\r
+       a4. g8 f2   |\r
+       a4 a a c    |\r
+       c4. bes8 a2 |\r
+\r
+       a4 g a c                |\r
+       a4. g8 f2               |\r
+       c'2( [ d8 c8 bes8  a8 ] |\r
+\r
+       bes2 [ c8 bes8 a8 g8 ]  |\r
+       a2 [ bes8 a8 g8 f8 ]    | \r
+       )g4. c,8 c2             |\r
+\r
+       f4 g a bes     |\r
+       a2 g2          |\r
+       c2( [ d8 c8 bes8  a8 ] |\r
+\r
+       bes2 [ c8 bes8 a8 g8 ]  |\r
+       a2 [ bes8 a8 g8 f8 ]    | \r
+       )g4. c,8 c2             |\r
+\r
+       f4 g a bes     |\r
+       a2( )g2        |\r
+       f1            \bar "|."; \r
+}\r
+\r
+flute2 = \notes \relative c'' \context Voice = flute {\r
+       \property Staff.instrument = "flute"\r
+       \r
+       f4 f e e  | \r
+       g4 e f2   |\r
+       f4 e f f  |\r
+\r
+       f4 e f2   |\r
+       f4 f e e  |\r
+       f4 g f2   |\r
+\r
+       f4 e f f  |\r
+       f4 e f2   |\r
+       f4 ( [a8 g8 ] f2( |\r
+\r
+       )f4 [g8 f8] e2(  |\r
+       )e4 [f8 e8] d2   |\r
+       )c4.c8 c2        |\r
+\r
+       c4 e f f  |\r
+       f2 e2     |\r
+       f4 ( [a8 g8 ] f2( |\r
+\r
+       )f4 [g8 f8] e2(  |\r
+       )e4 [f8 e8] d2   |\r
+       )c4.c8 c2        |\r
+\r
+       c4 e f f  |\r
+       f2( )e2   | \r
+       c1        |\r
+}\r
+\r
+flute1_staff = \context Staff = flute1_group <\r
+       \global\r
+       \flute1\r
+>\r
+\r
+flute2_staff = \context Staff = flute2_group <\r
+       \global\r
+       \flute2\r
+>\r
+\r
+flutes = \context StaffGroup <\r
+       \flute1_staff\r
+       \flute2_staff\r
+>\r
+       \r
+\r
+\score{\r
+        <\r
+                  \flutes\r
+       >\r
+       \paper{}\r
+       \midi{ \r
+               \tempo 2 = 60 ;\r
+       }\r
+}\r

diff --git a/Documentation/ntweb/index.texi b/Documentation/ntweb/index.texi
index fe49a8642a407c84c078a5477d93324059593869..6266ce868e9a5e063489aeb8f9e5d2b1a2c4709e 100644 (file)
--- a/Documentation/ntweb/index.texi
+++ b/Documentation/ntweb/index.texi
@@ -2,11 +2,26 @@
 @setfilename index.info
 @settitle LilyPond Windows NT 4-0/95 Distribution
 
-@chapter LilyPond Windows NT 4.0/95 Distribution
+@node Top, Introduction, (dir), (dir)
+@comment  node-name,  next,  previous,  up
+@top LilyPond Windows NT 4.0/95 Distribution
+
+@menu
+* Introduction::                
+* News::                        
+* Bugs::                        
+* Required Packages::           
+* Download::                    
+* Installation::                
+* Running LilyPond::            
+* LilyPond Resources::          
+@end menu
 
 This page documents the NT port of LilyPond.  It reflects  the latest
 version of lilypond that was ported.
 
+@node Introduction, News, Top, Top
+@comment  node-name,  next,  previous,  up
 @section Introduction
 
 This page is dedicated to the distribution of precompiled and
@@ -19,20 +34,20 @@ Homepage}.  A full set of
 in various formats is also available.
 
 
-    LilyPond is a music typesetter.  It produces beautiful sheet music
+LilyPond is a music typesetter.  It produces beautiful sheet music
 using a high level description file as input.  LilyPond is part of 
 the GNU Project.
 
+@node News, Bugs, Introduction, Top
+@comment  node-name,  next,  previous,  up
 @section News
 
 @table @samp
  @item BUG FIXES
   @itemize @bullet
    @item
-        After a long absence and many enhancements and bug
-        fixes by the LilyPond team, that are too numerous to list, the
-        Windows NT 4.0/95 precompiled preformatted release 1.3.39 is
-        available.
+        The Windows NT 4.0/95 precompiled preformatted release 1.3.42 is
+        available.  
   @end itemize
 @end table
 
@@ -99,6 +114,8 @@ found to be operational.  If you have any troubles and or comments
 please do not hesitate to drop me a line 
 @uref{mailto:daboys@@austin.rr.com,Jeffrey B. Reed}.
 
+@node Bugs, Required Packages, News, Top
+@comment  node-name,  next,  previous,  up
 @section Bugs
 
 @itemize @bullet
@@ -110,6 +127,8 @@ please do not hesitate to drop me a line
        foo.tex". 
 @end itemize
 
+@node Required Packages, Download, Bugs, Top
+@comment  node-name,  next,  previous,  up
 @section Required Packages
 
 LilyPond uses the @code{TeX} package as its rendering engine. @code{TeX}
@@ -137,6 +156,8 @@ LilyPond.
        Version 5.10 is known to work.
 @end itemize
 
+@node Download, Installation, Required Packages, Top
+@comment  node-name,  next,  previous,  up
 @section Download
 
 @itemize @bullet
@@ -145,15 +166,17 @@ LilyPond.
     @item Windows NT 4.0
         @uref{lilypond-TOPLEVEL_VERSION-nt.exe,lilypond-TOPLEVEL_VERSION-nt}
     @item Windows 95 (Latest Stable Release)
-        @uref{lilypond-1.2.0-95.exe,lilypond-1.2.0-95}
+        @uref{lilypond-1.2.0.jbr1-95.exe,lilypond-1.2.0-95}
     @item Windows NT 4.0 (Latest Stable Release)
-        @uref{lilypond-1.2.0-nt.exe,lilypond-1.2.0-nt}
+        @uref{lilypond-1.2.0-nt.jbr1.exe,lilypond-1.2.0-nt}
 @end itemize
 
+@node Installation, Running LilyPond, Download, Top
+@comment  node-name,  next,  previous,  up
 @section Installation
 
 @itemize @bullet
- the distribution.
+  @item Download the distribution. See @ref{Download}.
   @item run downloaded executable.  
   @item  The first installation of LilyPond also requires these
         additional steps:
@@ -185,18 +208,24 @@ LilyPond.
  instructions below
 @end itemize
 
+@node Running LilyPond, LilyPond Resources, Installation, Top
+@comment  node-name,  next,  previous,  up
 @section Running LilyPond
 
 @itemize @bullet
   @item Take a look at @uref{angels.ly,angels.ly}
   @item Save angels.ly to your local disk
   @item Select the @strong{lilyshell} shortcut from the @emph{Lilypond} group  
-  @item  From a LilyPond Command Prompt run:  
-  @strong{ly2dvi angels.ly}  
-  @strong{dvips angels.dvi}  
-  @strong{start angels.ps}  
+  @item  From a LilyPond Command Prompt run:  @*
+  @example
+   % @strong{ly2dvi angels.ly} 
+   % @strong{dvips angels.dvi}
+   % @strong{start angels.ps}
+  @end example
 @end itemize
 
+@node LilyPond Resources,  , Running LilyPond, Top
+@comment  node-name,  next,  previous,  up
 @section LilyPond Resources
 
 @itemize @bullet
@@ -209,7 +238,8 @@ LilyPond.
   @item Please feel free to mail us at @uref{mailto:gnu-music-discuss@@gnu.org,gnu-music-discuss}
 @end itemize
 
-
-
+@html
+<!- banner_id ->
+@end html
 
 @bye

diff --git a/VERSION b/VERSION
index 2f9e5ccf9ecac1fc2f0c58b6289e9ae06698d04d..abd178b3753fb5f6f5aa53051c27b6693be70f53 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=42
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jbr1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.