lilypond-1.3.40

diff --git a/CHANGES b/CHANGES
index ef5ace978274d2565c81c2302b8934bdef22fa72..7e58070ff217386ba4f50b2733922c97257bc02c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,53 @@
+1.3.39.jbr1
+===========
+
+* buildscripts/mf-to-table.py: feta dep files are now opened with write
+  binary option.  This avoids carriage return linefeed problems and
+  windows while not affecting unix.
+
+* Documentation/hacking.texi: Fixed a texinfo syntax error
+
+* stepmake/bin/package-zip32.sh: Fixed or Removed some legacy, 1.2.x,
+  directory paths.
+
+* Documentation/ntweb/index.texi: Fixed broken links, added 1.3.39 links.
+
+1.3.39.hwn1
+===========
+
+* Glossary updates by Christian Mondrup.
+
+* Bugfix: use generic properties in lyrics too. This fixes the
+\property textStyle for lyrics.
+
+* Score_element::preset_extent(), used by \property
+XXXVerticalExtent, so hard code the size of a vertical group. 
+
+* Don't fix up reference points for originals of broken
+spanners. Fixes spurious "orphaned score-element" warnings.
+
+2000-03-24    <janneke@gnu.org>
+
+* buildscripts/make-cygwin-cross.sh: Use rx-1.5 instead of regex (Jeffrey).
+
+* scm/lily.scm: Fixed check for Windows: by default don't use scm regex.
+
+* Documentation/ntweb/guile-1.3.4-gnu-windows.patch: Significantly smaller
+patch for guile.
+
+* buildscripts/make-cygwin-cross.sh: Compile native package GNU regex,
+which should fix Windows problems with guile.  Also added input directory
+to zip file.
+
+* stepmake/aclocal.m4: Added decent checking for version of guile, and 
+fixed warning message.
+
+* lily/lexer.ll (My_lily_lexer): Bugfix: lookup chordmodifiers in the
+chord-modifier table (not in the pitch list).
+
+1.3.39
+======
+
 1.3.38.hwn2
 ===========
 

diff --git a/Documentation/hacking.texi b/Documentation/hacking.texi
index 5a73183f2025d614b6542418c946be7443a13832..e7a09fe3f0ac239d7a432ede47dc5434c43ae3a5 100644 (file)
--- a/Documentation/hacking.texi
+++ b/Documentation/hacking.texi
@@ -270,7 +270,7 @@ Lilypond every glyph usually is represented by one object, a so-called
 Graphic Object.  The primary relations between graphic objects involve
 positions:
 
-@itemize
+@itemize @asis
 @item consecutive notes are printed left to right, grouped  in a staff
 @item simultaneous notes are horizontally aligned (internally grouped in
 a paper column).

diff --git a/Documentation/ntweb/index.texi b/Documentation/ntweb/index.texi
index d8064fbdc96fad60da37aec6e70523522f7146cf..fe49a8642a407c84c078a5477d93324059593869 100644 (file)
--- a/Documentation/ntweb/index.texi
+++ b/Documentation/ntweb/index.texi
@@ -15,7 +15,7 @@ covered under the GNU General Public License and all of the source is
 available on the official
 @uref{http://www.cs.ruu.nl/people/hanwen/lilypond/index.html,LilyPond
 Homepage}.  A full set of
-@uref{http://www.cs.ruu.nl/people/hanwen/lilypond/Documentation/tex/out-www/index.html,documentation}
+@uref{http://www.cs.ruu.nl/people/hanwen/lilypond/Documentation/out-www/index.html,documentation}
 in various formats is also available.
 
 
@@ -29,13 +29,10 @@ the GNU Project.
  @item BUG FIXES
   @itemize @bullet
    @item
-      @code{os.rename(this.__base + '.' + str(os.getpid()) + '.dvi', outfile)  
-        os.error: (2, 'No such file or directory')}
-        This problem was reported by many and thoroughly debugged by
-       Wolf Lother.  We have abandoned the use of @code{os.getpid()}, which
-       for one reason or another resulted in negative numbers on
-       windows 95, in favor of the tempfile module.  We have also
-        attempted to use only one '.' in naming temporary files.
+        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.
   @end itemize
 @end table
 
@@ -130,7 +127,7 @@ LilyPond.
 
 @itemize @bullet
     @item 
-        @uref{http://www.snafu.de/~cschenk/miktex/,MiKTeX}. Versions
+        @uref{http://www.miktex.de/,MiKTeX}. Versions
         1.10b, 1.11, and 1.20b are known to work.
     @item 
         @uref{http://www.python.org,Python}. Version 1.5.1 and
@@ -147,6 +144,10 @@ LilyPond.
         @uref{lilypond-TOPLEVEL_VERSION-95.exe,lilypond-TOPLEVEL_VERSION-95}
     @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}
+    @item Windows NT 4.0 (Latest Stable Release)
+        @uref{lilypond-1.2.0-nt.exe,lilypond-1.2.0-nt}
 @end itemize
 
 @section Installation
@@ -204,7 +205,7 @@ LilyPond.
   @item 
         @uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/,LilyPond Ftp Site}
   @item 
-        @uref{http://jab.org/mail/gnu-music-discuss@@gnu.org/,gnu-music-discuss mail archive}
+        @uref{http://www.mail-archive.com/help-gnu-music@@gnu.org,gnu-music-discuss mail archive}
   @item Please feel free to mail us at @uref{mailto:gnu-music-discuss@@gnu.org,gnu-music-discuss}
 @end itemize
 

diff --git a/Documentation/user/glossary.tely b/Documentation/user/glossary.tely
index e7cf139d2121081d521c757d8e5a83e103da2488..c7de116fcc2e1536fb28f763adc68c35109cf6c9 100644 (file)
--- a/Documentation/user/glossary.tely
+++ b/Documentation/user/glossary.tely
@@ -1,4 +1,4 @@
-
+\input ruled
 \input texinfo
 @setfilename glossary.info
 
@@ -67,8 +67,8 @@ accidental.
   gis1_"sharp" s s2
   gisis1_"db. sharp" s s2
   ges1_"flat" s s2
-  geses1_"db. flat" s s2
-  g!1_"natural"
+  geses1_"db. flat" s s2 
+  g!1_"natural" s2
 }
 @end mudela
 
@@ -140,8 +140,8 @@ the duration of the long a. is proportionate to that of the main note.
 @
 
 @mudela[13pt,eps]
-\property Voice.textEmptyDimension = ##t
-
+\emptyText
+%\property Voice.textEmptyDimension = ##t
 \property Voice.textStyle = "large"
 \notes\relative c'' {
 \key d;
@@ -178,8 +178,8 @@ An appoggiatura may have more notes preceding the main note.
 @end mudela
 
 @item arpeggio
-I: arpeggio, F: arp@`ege, D: Arpeggio, Akkordbrechungen, gebrochener Akkord,
-NL: gebroken akoord, DK: arpeggio, akkordbrydning, S: arpeggio, N:
+I: arpeggio, F: arp@`ege, D: Arpeggio, Akkordbrechungen, gebrochener
+Akkord, NL: gebroken akoord, DK: arpeggio, akkordbrydning, S: arpeggio, N:
 
 @
 
@@ -325,7 +325,8 @@ orchestral or choral score.
 @
 
 @mudela[13pt,eps] 
-\context StaffGroup < 
+%\context StaffGroup < 
+\context ChoirStaff < 
   \property StaffGroup.minVerticalAlign = 12
   \notes\relative c'' { \clef treble; g4 e c2 }
   \notes\relative c { \clef bass; c1 \bar "|."; } > 
@@ -373,17 +374,20 @@ lines.
 
 @mudela[13pt,eps] 
 \property Score.barNonAuto = ##t
-\property Lyrics.textStyle = "large"
-\property Voice.clefStyle = "fullSizeChanges"
+\property Staff.clefStyle = #"fullSizeChanges"
+\property Staff.textStyle = #"large"
+\property Lyrics.textStyle = #"large"
 \addlyrics
 \notes\relative c' { 
-  \clef "C1"; c1 s s
-  \clef "C2"; c s s
-  \clef "C3"; c s s
-  \clef "C4"; c s s
-  \clef "C5"; c s
+  \clef soprano; c1 s s
+  \clef mezzosoprano; c s s
+  \clef alto; c s s
+  \clef tenor; c s s
+  \clef baritone; c s
+}
+\context Lyrics \lyrics { 
+  Soprano Mezzosoprano Alto Tenor Baritone 
 }
-\context Lyrics \lyrics { Soprano Mezzosoprano Alto Tenor Baritone }
 @end mudela
 
 @item cadence 
@@ -430,6 +434,7 @@ chords are denoted open chords
 
 @mudela[13pt,eps] 
 \property Score.barNonAuto = ##t
+\property Voice.textNonEmpty = ##t
 \property Voice.textStyle = "large"
 \time 4/4;
 \notes\relative c'' {
@@ -438,7 +443,7 @@ chords are denoted open chords
   <g_"dimished" bes des>
   <g_"augmented~" b dis>
   <g_"seventh-chord~" b d f>
-  <g_"ninth-chord" b d f a>
+  <g_"ninth-chord" b d f a> s s2
 }
 @end mudela
 
@@ -687,7 +692,7 @@ also to some extent in newer jazz music.
 \addlyrics
 \notes\relative c' { 
   d1
- \property Voice.textScriptPadding = #-10
+  \property Voice.textScriptPadding = #-10
   e^"~~ S"
   f g a 
   \property Voice.textScriptPadding = #-4
@@ -821,7 +826,7 @@ harmonic minor scale type an augmented second (A) occurs between the 6th and
   b^"~~ S" c d e fis 
   \property Voice.textScriptPadding = #0
   gis^"~~ S" a g! 
-  \property Voice.textScriptPadding = "-1"
+  \property Voice.textScriptPadding = #-1
   f!^"~~ S" e d 
   \property Voice.textScriptPadding = #-4
   c^"~~ S" b a
@@ -1038,18 +1043,21 @@ octave lower (for example on double bass @w{@ar{}@strong{strings}}).
 
 @
 
-@ignore
-@mud ela[13pt,eps] 
+@c @ignore
+@mudela[13pt,eps] 
 \property Score.barNonAuto = ##t 
-\property Voice.clefStyle = "fullSizeChanges"
+\property Staff.clefStyle = #"fullSizeChanges"
 \property Lyrics.textStyle = "large"
 \addlyrics
 \notes\relative c { 
-  \clef "F3";
+%  \clef "F3";
+  \clef varbaritone;
   f1 s
-  \clef "F4";
+%  \clef "F4";
+  \clef bass;
   f1 s
-  \clef "F5";
+%  \clef "F5";
+  \clef subbass;
   f1 s
   \clef "F^8";
   f'1 s s
@@ -1064,7 +1072,7 @@ octave lower (for example on double bass @w{@ar{}@strong{strings}}).
   "octaved down" 
 }
 @end mudela
-@end ignore
+@c @end ignore
 
 @item fermata
 I: corona, F: pause, D: Fermate, NL: fermate, DK: fermat, S: fermat, N: .
@@ -1178,14 +1186,18 @@ that).
 
 @mudela[13pt,eps] 
 \property Score.barNonAuto = ##t 
+\property Staff.clefStyle = #"fullSizeChanges"
 \property Lyrics.textStyle = "large"
-\property Voice.clefStyle = "fullSizeChanges"
 \addlyrics
 \notes\relative c'' { 
-  \clef "G1"; g1 s s s s
-  \clef "G2"; g s s s 
-  \clef "G^8"; g' s s s 
-  \clef "G_8"; g,, s s
+  \clef french; 
+  g1 s s s s
+  \clef treble; 
+  g s s s
+  \clef "G^8"; 
+  g' s s s 
+  \clef "G_8"; 
+  g,, s s
 }
 \context Lyrics \lyrics { 
   "french violin clef" 
@@ -1502,7 +1514,10 @@ note value: double length of @w{@ar{}@strong{brevis}}. @w{@ar{}@strong{note valu
 
 @mudela[13pt,eps] 
 \property Score.barNonAuto = ##t 
-\notes\relative c'' { g\longa } 
+\notes\relative c'' { 
+  \property Voice.noteHeadStyle = "mensural"
+  g\longa 
+} 
 @end mudela
 
 @item major interval
@@ -1614,11 +1629,11 @@ First C below the 440 Hz A.
 
 @mudela[13pt,eps] 
 \property Score.barNonAuto = ##t 
-\property Voice.clefStyle = "fullSizeChanges"
+\property Staff.clefStyle = #"fullSizeChanges"
 \notes\relative c' { 
-  \clef "F"; c1 s
-  \clef "C3"; c s
-  \clef "G2"; c s
+  \clef bass; c1 s
+  \clef alto; c s
+  \clef treble; c s
 } 
 @end mudela
 
@@ -1717,7 +1732,7 @@ I: nona, F: neuvi@`eme, D: None, NL: noon, DK: none, S: nona, N: .
 @item note
 I: nota, F: note, D: Note, NL: noot, DK: node, S: not, N: ,
 
-Notes are signs by means of which music is fixed in writing. The term is, also
+Notes are signs by means of which music is fixed in writing. The term is also
 used for the sound indicated by a note, and even for the key of the piano
 which produces the sound. However, a clear distinction between the terms tone
 and @w{@ar{}@strong{note}} is strongly recommended. Briefly, one sees a note,
@@ -1749,7 +1764,9 @@ but sometimes (mostly in pre baroque music) the double length note value
 \property Voice.textStyle = "large"
 \property Score.barNonAuto = ##t
 \notes\relative c'' { 
+  \property Voice.noteHeadStyle = "mensural"
   g\longa_"longa" g\breve_"breve" 
+  \property Voice.noteHeadStyle = ""
   g1_"1/1" g2_"1/2" g4_"1/4" s16 g8_"1/8" s16
   g16_"1/16" s16 g32_"1/32" s16 g64_"1/64" s32 }
 @end mudela
@@ -1798,6 +1815,9 @@ frequently used.
   g8 g g g g4 \bar "||";}
 @end mudela
 
+@
+
+
 @item octave sign
 @w{@ar{}@strong{g clef}} @w{@ar{}@strong{f clef}}
 
@@ -1816,8 +1836,6 @@ middle of the 19th century and onwards the trill is performed with the main
 note first while in the music from the preceding baroque and classic periods
 the upper note is played first.
 
-@
-
 @mudela[13pt,eps]
 <
   \context Staff = sa {
@@ -2623,8 +2641,140 @@ A family of blown wooden musical instruments. Today some of these instruments
 are actually made from metal. The woodwind instruments commonly used in a
 symphony orchestra are flute, oboe, clarinet, saxophone and bassoon.
 
+@end table
+
+@page
+
+@table @strong
+@item DURATION NAMES, NOTES AND RESTS
+@end table
+
+@multitable @columnfractions .111 .111 .111 .111 .111 .111 .111 .111 .111 
+
+@item @tab @strong{UK} @tab @strong{I} @tab @strong{F} @tab @strong{D} @tab
+@strong{NL} @tab @strong{DK} @tab @strong{S} @tab @strong{N}
+
+@item
+
+@item @strong{longa} @tab longa @tab longa @tab Longa @tab longa @tab longa
+@tab longa @tab longa @tab longa
+
+@item
+
+@item @strong{breve} @tab breve @tab breve @tab br@`eve @tab Brevis @tab
+brevis @tab brevis @tab brevis @tab brevis
+
+@item
+
+@item @strong{whole} @tab semi@-breve @tab semi@-breve @tab ronde @tab 
+Ganze @tab hele @tab hel @tab hel @tab
+
+@item
+
+@item @strong{half} @tab minim @tab minima @tab blanche @tab Halbe @tab 
+halve @tab halv @tab halv @tab 
+
+@item
+
+@item @strong{quarter} @tab crotchet @tab semi@-minima @tab noire @tab  
+Viertel @tab kwart @tab fjerde@-del @tab fj@"arde@-del @tab 
+
+@item
+
+@item @strong{eighth} @tab quaver @tab croma @tab croche @tab Achtel @tab 
+achtste @tab ottende@-del @tab @aa{}tton@-del @tab 
+
+@item
+
+@item @strong{sixteenth} @tab semi@-quaver @tab semi@-croma @tab double croche
+@tab Sech@-zehntel @tab zes@-ti@-ende @tab seks@-tende@-del @tab sexton@-del
+@tab
+
+@item
+
+@item @strong{thirty-second} @tab demi@-semi@-quaver @tab bis@-croma @tab
+triple croche @tab Zwei@-und@-drei@-@ss{}ig@-stel @tab 32e @tab
+toog@-tredivte-del @tab trettio@-tv@aa{}on@-del @tab
+
+@item
+
+@item @strong{sixty-fourth} @tab hemi@-demi@-semi@-quaver @tab
+semi@-bis@-croma @tab qua@-druple croche @tab Vier@-und@-sechzig@-stel @tab
+vier@-en@-zestig@-ste @tab fireog@-tred@-sinds@-ty@-ven@-de@-del @tab
+sextio@-fj@"arde@-del @tab
+
+@end multitable
+@c @item @tab @tab @tab @tab @tab @tab @tab @tab 
+
+@page
+
+@table @strong
+@item PITCH NAMES
+@end table
+
+@multitable @columnfractions .125 .125 .125 .125 .125 .125 .125 .125 
+
+@item @tab @strong{I} @tab @strong{F} @tab @strong{D} @tab
+@strong{NL} @tab @strong{DK} @tab @strong{S} @tab @strong{N}
+
+@item
+
+@item @strong{c} @tab do @tab ut @tab C @tab c @tab c @tab c @tab c
+
+@item
+
+@item @strong{c-sharp} @tab do diesis @tab ut di@`ese @tab Cis @tab cis @tab
+cis @tab cis @tab cis
+
+@item
+
+@item @strong{d-flat} @tab re bemolle @tab r@'e b@'emol @tab Des @tab des @tab
+des @tab des @tab des
+
+@item
+
+@item @strong{d} @tab re @tab r@'e @tab D @tab d @tab d @tab d @tab d
+
+@item
+
+@item @strong{e} @tab mi @tab mi @tab E @tab e @tab e @tab e @tab e
+
+@item
+
+@item @strong{f} @tab fa @tab fa @tab F @tab f @tab f @tab f @tab f
+
+@item
+
+@item @strong{g} @tab sol @tab sol @tab G @tab g @tab g @tab g @tab g
+
+@item
+
+@item @strong{a-flat} @tab la bemolle @tab la b@'emol @tab As @tab as @tab as
+@tab as @tab as
+
+@item
+
+@item @strong{a} @tab la @tab la @tab A @tab a @tab a @tab a @tab a
+
+@item
+
+@item @strong{a-sharp} @tab la diesis @tab la di@`ese @tab Ais @tab ais @tab
+ais @tab ais @tab ais
+
+@item
+
+@item @strong{b-flat} @tab si bemolle @tab si b@'emol @tab B @tab bes @tab b
+@tab b @tab b
+
+@item
+
+@item @strong{b} @tab si @tab si @tab H @tab b @tab h @tab h @tab h
+
+@end multitable
 @
 
+@table @strong
+
 @item ---------------------
 
 @

diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index 5a695d2e960f41385d0625f00a1dec878c148f20..4c87408117cd194c885b7aa023647ceedd1bc05c 100644 (file)
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -166,6 +166,6 @@ for filenm in files:
        afm = open (afmfile_nm, 'w')
        write_afm_metric (afm, g,m)
        write_tex_defs (open (texfile_nm, 'w'), g, m)
-       write_deps (open (depfile_nm, 'w'), deps, [texfile_nm, afmfile_nm])
+       write_deps (open (depfile_nm, 'wb'), deps, [texfile_nm, afmfile_nm])
 
 

diff --git a/stepmake/bin/package-zip32.sh b/stepmake/bin/package-zip32.sh
index fd41ca4883ce9b6f1e7f3f50017a6cb4a6812358..788763e3a6f51d3813cc1d5464c8794e6830420a 100644 (file)
--- a/stepmake/bin/package-zip32.sh
+++ b/stepmake/bin/package-zip32.sh
@@ -51,17 +51,17 @@ if ! make ; then
 fi
 
 # failure allowed
-make -C Documentation info
+#make -C Documentation info
 
 if ! make install ; then
     echo "make install failed"
     exit 1
 fi
 
-if ! make -C Documentation/man WWW ; then
-    echo "make -C documentation/man WWW failed"
-    exit 1
-fi
+#if ! make -C Documentation/man WWW ; then
+#    echo "make -C documentation/man WWW failed"
+#    exit 1
+#fi
 
 if ! make -C Documentation/ntweb WWW ; then
     echo "make -C documentation/ntweb WWW failed"
@@ -115,14 +115,14 @@ mv $distdir/bin/mudela-book $distdir/bin/mudela-book.py
 #
 # copy man documentation to doc directory
 #
-mkdir $distdir/doc
-cp Documentation/man/out/*.html $distdir/doc
+#mkdir $distdir/doc
+#cp Documentation/man/out/*.html $distdir/doc
 
 #
 # copy web documentation to web directory
 #
 mkdir $distdir/web
-for i in index.html guile.patch angels.ly
+for i in index.html guile-1.3.4-gnu-windows.patch angels.ly
 do
   cp Documentation/ntweb/out/$i $distdir/web || exit 1
 done