Generated by hanwen@cs.uu.nl using package-diff 0.62,
From = lilypond-1.0.11, To = lilypond-1.0.12

usage 

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

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

--state
1.0.11
1.0.11.mb1
1.0.11.uu1
1.0.12
++state
diff -urN ../lilypond-1.0.11/Documentation/COPERTINA.yo ./Documentation/COPERTINA.yo
--- ../lilypond-1.0.11/Documentation/COPERTINA.yo	Tue Sep 15 18:22:43 1998
+++ ./Documentation/COPERTINA.yo	Fri Sep 25 15:56:26 1998
@@ -1,4 +1,4 @@
-COMMENT(silly... DEFINEMACRO(pic)(1)(url(ARG1)(ARG1.gif)))
+COMMENT(silly... DEFINEMACRO(pic)(1)(url(ARG1)(ARG1.png)))
 DEFINEMACRO(pic)(1)(verbinclude(ARG1.in))
 
 nsect(LilyPond è il tipografo musicale del progetto GNU. )
diff -urN ../lilypond-1.0.11/Documentation/FLAPTEKST.yo ./Documentation/FLAPTEKST.yo
--- ../lilypond-1.0.11/Documentation/FLAPTEKST.yo	Tue Sep 15 18:22:43 1998
+++ ./Documentation/FLAPTEKST.yo	Fri Sep 25 15:56:26 1998
@@ -1,4 +1,4 @@
-COMMENT(silly...DEFINEMACRO(pic)(1)(url(ARG1)(ARG1.gif)))
+COMMENT(silly...DEFINEMACRO(pic)(1)(url(ARG1)(ARG1.png)))
 DEFINEMACRO(pic)(1)(verbinclude(ARG1.in))
 
 nsect(LilyPond -- De Muziek Zetter van het GNU Project)
diff -urN ../lilypond-1.0.11/Documentation/faq.yo ./Documentation/faq.yo
--- ../lilypond-1.0.11/Documentation/faq.yo	Thu Sep 17 14:51:15 1998
+++ ./Documentation/faq.yo	Fri Sep 25 15:57:35 1998
@@ -14,8 +14,8 @@
 
 sect(Installing)
 
-question(Wow, the webpages look really neat, but if I install the .exe
-file on my DOS/windows 3.11 machine, it doesn't work.)
+question(If I install the .exe file on my DOS/windows 3.11 machine, it
+doesn't work.)
 
 The DOS port is done with the cygnus gnu/windows32 port of the GNU utils.
 It does em(not) work with windows 3.x; you need Windows-NT (95/98?).  This
diff -urN ../lilypond-1.0.11/Documentation/index.yo ./Documentation/index.yo
--- ../lilypond-1.0.11/Documentation/index.yo	Tue Sep 15 18:22:43 1998
+++ ./Documentation/index.yo	Fri Sep 25 15:55:32 1998
@@ -30,9 +30,9 @@
 it()url(The GNU Music project)(gnu-music.html)
 it()url(Mutopia -- Music To the People)(mutopia.html)
 it()url(The lilypond
-  logo (Big, format: .gif))(DOEXPAND(pics)/lelieblond.gif)
+  logo (Big, format: .png))(DOEXPAND(pics)/lelieblond.png)
 it()url(The lilypond
-  logo (medium size, format: .gif))(DOEXPAND(pics)/lelie_logo.gif)
+  logo (medium size, format: .png))(DOEXPAND(pics)/lelie_logo.png)
 )
 
 nsubsect(Documentation: manuals)
diff -urN ../lilypond-1.0.11/Documentation/tex/GNUmakefile ./Documentation/tex/GNUmakefile
--- ../lilypond-1.0.11/Documentation/tex/GNUmakefile	Fri Sep 18 17:05:38 1998
+++ ./Documentation/tex/GNUmakefile	Mon Sep 28 17:18:27 1998
@@ -18,14 +18,14 @@
 HTML_FILES = $(addprefix $(outdir)/, $(YO_FILES:.yo=.html))
 PS_FILES = $(DVI_FILES:.dvi=.ps)
 
-STEPMAKE_TEMPLATES=documentation
+STEPMAKE_TEMPLATES=tex documentation
 LOCALSTEPMAKE_TEMPLATES=lilypond mudela
 
 
 include $(depth)/make/stepmake.make 
 
 
-export BIBINPUTS:="$(topdir)/Documentation/tex//"#huh?
+export BIBINPUTS:="$(topdir)/Documentation/tex//"$(PATHSEP)$(BIBINPUTS)
 
 
 
@@ -54,8 +54,9 @@
 $(outdir)/%.bib: %.bib
 	ln -f $< $@
 
+# ignore result since bib2html is nonstandard. Errors would halt the RPM build.j  
 $(outdir)/%.html: %.bib
-	bib2html $< $@
+	-bib2html $< $@
 
 # Yeah right: 
 # make -k out/mudela.dvi => cp -f out/vocabulary.tex out/mudela.dvi
diff -urN ../lilypond-1.0.11/Documentation/tex/computer-notation.bib ./Documentation/tex/computer-notation.bib
--- ../lilypond-1.0.11/Documentation/tex/computer-notation.bib	Tue Sep 15 18:22:43 1998
+++ ./Documentation/tex/computer-notation.bib	Fri Sep 25 14:42:17 1998
@@ -144,7 +144,7 @@
 
 @Article{belkin94,
   author = 	 {Alan Belkin},
-  title = 	 {Macintosh Notatino Software: Present and Future},
+  title = 	 {Macintosh Notation Software: Present and Future},
   journal = 	 CMJ,
   year = 	 1994,
   volume =	 18,
diff -urN ../lilypond-1.0.11/Documentation/tex/other-packages.bib ./Documentation/tex/other-packages.bib
--- ../lilypond-1.0.11/Documentation/tex/other-packages.bib	Fri Sep 18 13:16:56 1998
+++ ./Documentation/tex/other-packages.bib	Tue Sep 29 18:38:15 1998
@@ -17,14 +17,16 @@
 
 @Misc{graph_music_press,
   title =	 {Graphire Music Press},
-publisher={Graphire Corporation} ,
-html={http://www.sover.net/\~graphire/},
+  publisher={Graphire Corporation} ,
+  html={http://www.sover.net/\~graphire/},
 }
 
 @Misc{igor,
   title =	 {Igor},
-  note =	 {Vaporware from Sweden.},
-html={http://www.igortech.pi.se/igor/},
+  author = {Technoligor AB},
+  note =	 {Commercial music notation with bigwig supporters.
+Still in beta},
+  html={http://www.igortech.pi.se/},
 }
 
 
@@ -243,12 +245,6 @@
   author={David Webber},
 }
   
-@misc{Noteworthy,
-  title={Noteworthy},
-  HTML={http://www.ntworthy.com},
-  note={Shareware},
-  publisher={Noteworthy Artware inc.},
-}
     
 @misc{WolfGang,
   title = {WolfGang},
@@ -333,14 +329,32 @@
 }
 
 @Misc{mp,
-  OPTkey = 	 {},
-  OPTauthor = 	 {Bernhard Hill},
-  OPTtitle = 	 {Music Publisher},
-  html={http://www.braeburn.co.uk/mp.htm}
-  OPThowpublished = {},
-  OPTmonth = 	 {},
-  OPTyear = 	 {},
-  OPTnote = 	 {},
-  OPTannote = 	 {}
+  author = 	 {Bernard Hill},
+  title = 	 {Music Publisher},
+  html={http://www.braeburn.co.uk/mp.htm},
+  publisher={Braeburn Software},
+  address={Selkirk, Scotland},
+  year = {1998},
+  note = {This is the W95 version of NoteWorthy.}
+}
+
+@misc{Noteworthy,
+  title={Noteworthy Composer},
+  HTML={http://www.ntworthy.com},
+  publisher={Noteworthy Artware inc.},
+  note = {Shareware.  Not affiliated with Braeburn Software's products.},
+  year = {1994}
+}
+
+
+@Misc{NoteWorthy-hill,
+  note = {NoteWorthy and their successors are graphical editors, that do
+not know about musical structure. Shareware. },
+  html={http://www.braeburn.co.uk/},
+  publisher={Braeburn Software},
+  address= {Selkirk, Scotland},
+  author = {Bernard Hill},
+  year = 1992,
+  title = {NoteWorthy}
 }
 
diff -urN ../lilypond-1.0.11/Documentation/tex/refman.yo ./Documentation/tex/refman.yo
--- ../lilypond-1.0.11/Documentation/tex/refman.yo	Thu Sep 24 15:45:24 1998
+++ ./Documentation/tex/refman.yo	Tue Sep 29 16:14:56 1998
@@ -2,9 +2,6 @@
 
 redef(var)(1)(whenlatex(latexcommand({\normalfont\scshape )ARG1+latexcommand(}))\
     whenhtml(sc(ARG1)))
-def(mycode)(1)(tt(ARG1))
-
-
 
 COMMENT( This document contains Mudela fragments.  You need at least
 Yodl-1.30.18 to convert this to tex or html.
@@ -52,7 +49,10 @@
 latexcommand(\def\textbf#1{\bf #1})
 )
 
+COMMENT(urg, texinfo include breaks)
+whenhtml(
 includefile(html-disclaimer.yo-urg)
+)
 
 bf(This document is not up to date).  All rendered examples of course
 are current, but the rest probably isn't.  Adjusting the tutorial was
@@ -849,6 +849,17 @@
 the starting pitch for this comparision.  In the case of chords, the
 first note of a chord is used as the base for the pitches in the next
 chord.  
+
+Because transposing changes both note names and octaves relativizing
+transposed music doesn't make any sense.  If you want to transpose
+relative music, do code(\transpose var(pitch) \relative var(pitch)
+var(music)), i.e., first enter the music in relative mode, and then
+transpose it by prepending the code(\transpose) keyword.
+code(\relative var(pitch) \transpose var(pitch)) has no effect.
+
+For the same reason the first code(\relative) in code(\relative
+var(pitch1) \relative var(pitch2) var(music)) has no effect.
+
 
 dit(code(\score) var(statementlist)) Define music.
 
diff -urN ../lilypond-1.0.11/Documentation/tex/tutorial.yo ./Documentation/tex/tutorial.yo
--- ../lilypond-1.0.11/Documentation/tex/tutorial.yo	Fri Sep 18 16:01:31 1998
+++ ./Documentation/tex/tutorial.yo	Tue Sep 29 12:55:19 1998
@@ -3,8 +3,6 @@
 redef(var)(1)(whenlatex(latexcommand({\normalfont\scshape )ARG1+latexcommand(}))\
     whenhtml(sc(ARG1)))
 
-def(mycode)(1)(tt(ARG1))
-
 COMMENT( This document contains Mudela fragments.  You need at least
 Yodl-1.30.18 to convert this to tex or html.
 
@@ -62,7 +60,10 @@
 latexcommand(\def\postexample{\par\medskip})
 latexcommand(\def\file#1{{mycode(#1)}})
 
+COMMENT(urg, texinfo include breaks)
+whenhtml(
 includefile(html-disclaimer.yo-urg)
+)
 
 sect(Introduction)
 label(tutorial:introduction)
@@ -1444,7 +1445,7 @@
     >
     \paper {
       linewidth = -1.0;
-      stem_length = 12.0*\internote;
+      stem_length = 6.0*\interline;
     }
   }
 )
diff -urN ../lilypond-1.0.11/Documentation/topdocs/index.yo ./Documentation/topdocs/index.yo
--- ../lilypond-1.0.11/Documentation/topdocs/index.yo	Tue Sep 15 18:22:43 1998
+++ ./Documentation/topdocs/index.yo	Fri Sep 25 15:54:23 1998
@@ -1,6 +1,6 @@
 DEFINEMACRO(depth)(0)(.)
 DEFINEMACRO(docdir)(0)(Documentation)
-DEFINEMACRO(pic)(1)(url(ARG1)(DOEXPAND(docdir)/pictures/DOEXPAND(outdir)/ARG1.gif
+DEFINEMACRO(pic)(1)(url(ARG1)(DOEXPAND(docdir)/pictures/DOEXPAND(outdir)/ARG1.png
 ))
 
 
@@ -56,9 +56,9 @@
 nsubsect(Examples)
 
 itemize(
-it()url(short examples of what LilyPond can do: MIDI, PS, .gif and input.)
+it()url(short examples of what LilyPond can do: MIDI, PS, .png and input.)
 (DOEXPAND(depth)/input/DOEXPAND(outdir)/index.html)
-it()url(examples of what LilyPond can do with real music: MIDI, PS, .gif and input)(DOEXPAND(depth)/mutopia/DOEXPAND(outdir)/index.html)
+it()url(examples of what LilyPond can do with real music: MIDI, PS, .png and input)(DOEXPAND(depth)/mutopia/DOEXPAND(outdir)/index.html)
 )
 
 nsubsect(NEWS)
diff -urN ../lilypond-1.0.11/NEWS ./NEWS
--- ../lilypond-1.0.11/NEWS	Thu Sep 24 15:45:51 1998
+++ ./NEWS	Wed Sep 30 11:04:38 1998
@@ -1,6 +1,28 @@
+pl 11.uu2
+	- added Transposed_music for mixing transposition and relative 
+
+pl 11.jcn1
+	- bf: config.make striproff
+	- texinfo
+pl 11.mb2
+ 	- feta-timesig.mf: Added some flesh on C and C2,
+ 	  added old-style mensuration marks.
+ 
+pl 11.mb1
+ 	- Added feta-timesig.mf, font for C and alla breve.
+
+
+pl 11.uu1
+	- new \property: meterSignatureStyle for C and C2 time sigs
+	- bf: BIBINPUTS
+	- stepmake 53
+	- bf: gif vs. png stuff
+
+*******
+pl 11
 
 pl 10.uu2
-	- plet-spanner fix.
+	- plet-spanner fix. 
 	- large doc patch (thanks Adrian)
 
 pl 10.jbr1
diff -urN ../lilypond-1.0.11/VERSION ./VERSION
--- ../lilypond-1.0.11/VERSION	Thu Sep 24 16:02:45 1998
+++ ./VERSION	Wed Sep 30 12:00:35 1998
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
-PATCH_LEVEL=11
+PATCH_LEVEL=12
 MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
diff -urN ../lilypond-1.0.11/aclocal.m4 ./aclocal.m4
--- ../lilypond-1.0.11/aclocal.m4	Thu Sep 24 15:39:22 1998
+++ ./aclocal.m4	Tue Sep 29 12:55:20 1998
@@ -229,7 +229,7 @@
     AC_CHECK_PROGS(TAR, tar, error)
     AC_CHECK_PROGS(BASH, bash, /bin/sh)
 
-    AC_PATH_PROG(PYTHON, python, -echo no python)
+    AC_PATH_PROG(PYTHON, ${PYTHON:-python}, -echo no python)
     AC_SUBST(PYTHON)
 
 
diff -urN ../lilypond-1.0.11/buildscripts/clean-fonts.sh ./buildscripts/clean-fonts.sh
--- ../lilypond-1.0.11/buildscripts/clean-fonts.sh	Tue Sep 15 18:22:43 1998
+++ ./buildscripts/clean-fonts.sh	Wed Sep 30 11:08:56 1998
@@ -19,7 +19,7 @@
 
 # remove possibly stale .pk/.tfm files 
 echo> /tmp/cleaning-font-dummy
-FILES=`find $TEXDIR -name "feta*$WHAT*tfm" -or -name "feta*$WHAT*pk"`
+FILES=`find .  $TEXDIR -name "feta*$WHAT*tfm" -or -name "feta*$WHAT*pk"`
 
 echo removing $FILES
 rm  -f $FILES /tmp/cleaning-font-dummy
diff -urN ../lilypond-1.0.11/buildscripts/genheader.py ./buildscripts/genheader.py
--- ../lilypond-1.0.11/buildscripts/genheader.py	Tue Sep 15 18:22:43 1998
+++ ./buildscripts/genheader.py	Mon Sep 28 15:38:01 1998
@@ -25,7 +25,10 @@
 
 
 def name():
-    return pwd.getpwuid(os.getuid())[4]
+	return os.environ['USERNAME']
+
+# field 4 of passwd is also used for finger info (phone no.,  office etc)
+#   return pwd.getpwuid(os.getuid())[4]
 
 def c_commentify(str):
     return  '/* ' + regsub.gsub('^','  ', str) + '\n */';
diff -urN ../lilypond-1.0.11/buildscripts/ps-to-gifs.sh ./buildscripts/ps-to-gifs.sh
--- ../lilypond-1.0.11/buildscripts/ps-to-gifs.sh	Tue Sep 22 19:59:18 1998
+++ ./buildscripts/ps-to-gifs.sh	Tue Sep 29 12:55:20 1998
@@ -75,7 +75,7 @@
 rm -f $BASE{.ppm,.$GIF} $BASE-page*{.ppm,.$GIF}
 
 # generate the pixmap at twice the size, then rescale (for antialiasing)
-cat $FILE | gs -sDEVICE=ppmraw $SIZE -sOutputFile="$BASE-page%d.ppm" -r200 -dNOPAUSE - -c quit $FILE
+cat $FILE | gs -sDEVICE=ppmraw $SIZE -sOutputFile="$BASE-page%d.ppm" -r180 -dNOPAUSE - -c quit $FILE
 # quant is soo slow
 # cat $PPMFILE | ppmquant 2 | pnmscale 0.3333 | pnmcrop | $PNMTOGIF $color > $OUTFILE
 PPMS=`ls $BASE*ppm`
diff -urN ../lilypond-1.0.11/config.make.in ./config.make.in
--- ../lilypond-1.0.11/config.make.in	Thu Sep 17 13:35:59 1998
+++ ./config.make.in	Tue Sep 29 12:55:52 1998
@@ -52,6 +52,7 @@
 PERL = @PERL@
 PYTHON = @PYTHON@
 TAR= @TAR@
+STRIPROFF = @STRIPROFF@
 TROFF = @TROFF@
 YODL= @YODL@
 YODL2HTML= @YODL2HTML@
diff -urN ../lilypond-1.0.11/input/test/time.fly ./input/test/time.fly
--- ../lilypond-1.0.11/input/test/time.fly	Thu Jan  1 00:00:00 1970
+++ ./input/test/time.fly	Wed Sep 30 11:47:09 1998
@@ -0,0 +1,23 @@
+
+
+\property Staff.timeSignatureStyle = "C"
+\time 12/8;
+
+[c8 c c][c8 c c][c8 c c][c8 c c]
+
+\time 2/2;
+\property Staff.timeSignatureStyle = "old3_2"
+c2 c2
+
+\time 2/2;
+\property Staff.timeSignatureStyle = "oldC"
+c2 c2
+
+\time 2/2;
+\property Staff.timeSignatureStyle = "old6_4"
+c2 c2
+
+\time 2/2;
+\property Staff.timeSignatureStyle = "old9_4"
+c2 c2
+
diff -urN ../lilypond-1.0.11/input/test/transposition.ly ./input/test/transposition.ly
--- ../lilypond-1.0.11/input/test/transposition.ly	Fri Sep 18 12:53:24 1998
+++ ./input/test/transposition.ly	Tue Sep 29 15:48:47 1998
@@ -35,7 +35,7 @@
         c4 c |
 }
 
-vTwo = \notes \relative c''\transpose d' { \vOne }
+vTwo = \notes \transpose d' { \vOne }
 
 vThree = \notes \relative c''{
         \clef"violin";
@@ -48,7 +48,7 @@
         cis4 ais4 |
 }
 
-vFour = \notes \relative c''\transpose d' \vThree
+vFour = \notes \transpose d' \vThree
 
 \score {
   \type StaffGroup <
diff -urN ../lilypond-1.0.11/lily/VERSION ./lily/VERSION
--- ../lilypond-1.0.11/lily/VERSION	Thu Sep 24 16:03:16 1998
+++ ./lily/VERSION	Wed Sep 30 12:01:01 1998
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
-PATCH_LEVEL=11
+PATCH_LEVEL=12
 MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
diff -urN ../lilypond-1.0.11/lily/include/lookup.hh ./lily/include/lookup.hh
--- ../lilypond-1.0.11/lily/include/lookup.hh	Tue Sep 15 18:22:42 1998
+++ ./lily/include/lookup.hh	Mon Sep 28 15:40:53 1998
@@ -41,6 +41,7 @@
   Atom vbrace (Real &dy) const;
   Atom vbracket (Real &dy) const;
   Atom time_signature (Array<Scalar>) const;
+  Atom special_time_signature (String) const;
   Atom stem (Real y1_pos, Real y2_pos) const;
   Atom rule_symbol (Real height, Real width) const;
   Atom accidental (int) const;
diff -urN ../lilypond-1.0.11/lily/include/relative-music-iterator.hh ./lily/include/relative-music-iterator.hh
--- ../lilypond-1.0.11/lily/include/relative-music-iterator.hh	Tue Sep 15 18:22:42 1998
+++ ./lily/include/relative-music-iterator.hh	Thu Jan  1 00:00:00 1970
@@ -1,17 +0,0 @@
-/*   
-  relative-music-iterator.hh -- declare 
-  
-  source file of the GNU LilyPond music typesetter
-  
-  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
-  
- */
-
-#ifndef RELATIVE_MUSIC_ITERATOR_HH
-#define RELATIVE_MUSIC_ITERATOR_HH
-
-
-
-#error
-#endif /* RELATIVE_MUSIC_ITERATOR_HH */
-
diff -urN ../lilypond-1.0.11/lily/include/time-signature.hh ./lily/include/time-signature.hh
--- ../lilypond-1.0.11/lily/include/time-signature.hh	Tue Sep 15 18:22:42 1998
+++ ./lily/include/time-signature.hh	Mon Sep 28 15:38:38 1998
@@ -18,12 +18,16 @@
   
  */
 class Time_signature: public Item {
-  Array<Scalar> args;
+
+  
 
 protected:
   virtual Molecule*brew_molecule_p() const;
 public:
-  Time_signature (Array<Scalar> args) ;
+  Time_signature () ;
+  Array<Scalar> args_;
+  String time_sig_type_str_;
+  
   DECLARE_MY_RUNTIME_TYPEINFO;
   SCORE_ELEMENT_CLONE(Time_signature);
 };
diff -urN ../lilypond-1.0.11/lily/include/transposed-music.hh ./lily/include/transposed-music.hh
--- ../lilypond-1.0.11/lily/include/transposed-music.hh	Thu Jan  1 00:00:00 1970
+++ ./lily/include/transposed-music.hh	Tue Sep 29 15:27:36 1998
@@ -0,0 +1,29 @@
+/*   
+  transposed-music.hh -- declare 
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  
+ */
+
+#ifndef TRANSPOSED_MUSIC_HH
+#define TRANSPOSED_MUSIC_HH
+
+
+#include "music-wrapper.hh"
+
+class Transposed_music : public Music_wrapper
+{
+public:
+  Musical_pitch transpose_to_pitch_;
+
+  void do_print () const;
+  Transposed_music (Music*, Musical_pitch);
+  DECLARE_MY_RUNTIME_TYPEINFO;
+  VIRTUAL_COPY_CONS (Transposed_music, Music);
+  virtual Musical_pitch to_relative_octave (Musical_pitch);
+};
+
+#endif /* TRANSPOSED_MUSIC_HH */
+
diff -urN ../lilypond-1.0.11/lily/lookup.cc ./lily/lookup.cc
--- ../lilypond-1.0.11/lily/lookup.cc	Tue Sep 15 18:22:42 1998
+++ ./lily/lookup.cc	Mon Sep 28 15:53:53 1998
@@ -260,7 +260,7 @@
   if (type > 2)
     type = 2;
 
-  return  afm_find ("balls" + String ("-") +to_str (type) + "l");
+  return  afm_find ("balls-" + to_str (type) + "l");
 }
 
 Atom
@@ -291,6 +291,16 @@
 
   return s;
 }
+
+
+
+Atom
+Lookup::special_time_signature (String s) const
+{
+  Atom a (afm_find ("timesig-"+ s));
+  return a;
+}
+
 
 
 Atom
diff -urN ../lilypond-1.0.11/lily/music-wrapper.cc ./lily/music-wrapper.cc
--- ../lilypond-1.0.11/lily/music-wrapper.cc	Tue Sep 15 18:22:42 1998
+++ ./lily/music-wrapper.cc	Tue Sep 29 15:23:57 1998
@@ -27,6 +27,8 @@
 {
   element_p_->print ();
 }
+
+
 void
 Music_wrapper::transpose (Musical_pitch p)
 {
diff -urN ../lilypond-1.0.11/lily/parser.yy ./lily/parser.yy
--- ../lilypond-1.0.11/lily/parser.yy	Fri Sep 18 12:53:24 1998
+++ ./lily/parser.yy	Tue Sep 29 15:39:21 1998
@@ -41,7 +41,7 @@
 #include "mudela-version.hh"
 #include "scope.hh"
 #include "relative-music.hh"
-
+#include "transposed-music.hh"
 
 // mmm
 Mudela_version oldest_version ("1.0.3");
@@ -700,8 +700,7 @@
 	| Simultaneous_music		{ $$ = $1; }
 	| Sequential_music		{ $$ = $1; }
 	| TRANSPOSE musical_pitch Music {
-		$$ = $3;
-		$$ -> transpose (*$2);
+		$$ = new Transposed_music ($3, *$2);
 		delete $2;
 	}
 	| MUSIC_IDENTIFIER { $$ = $1->access_Music (); }
@@ -1283,7 +1282,6 @@
 		velt_p->set_spot (THIS->here_input ());
 		velt_p->add_music (m);
 		$$ = velt_p;
-
 	}
 	| STRING notemode_duration 			{
 		if (!THIS->lexer_p_->lyric_state_b ())
diff -urN ../lilypond-1.0.11/lily/plet-spanner.cc ./lily/plet-spanner.cc
--- ../lilypond-1.0.11/lily/plet-spanner.cc	Thu Sep 24 15:43:46 1998
+++ ./lily/plet-spanner.cc	Tue Sep 29 12:55:20 1998
@@ -119,7 +119,7 @@
   do {
     if (stem_l_drul_[d]->empty_b ())
       {
-	Direction u = d;
+        Direction u = d;
 	flip (&u);
 	dy_f_drul_[d] = dy_f_drul_[u]; // ughugh \[/3 r8 c8 r8 \]/1
       }
diff -urN ../lilypond-1.0.11/lily/time-signature-engraver.cc ./lily/time-signature-engraver.cc
--- ../lilypond-1.0.11/lily/time-signature-engraver.cc	Tue Sep 15 18:22:42 1998
+++ ./lily/time-signature-engraver.cc	Mon Sep 28 15:46:58 1998
@@ -39,10 +39,12 @@
       args.push (req->beats_i_);
       args.push (req->one_beat_i_);
 	
-      time_signature_p_ = new Time_signature (args);
+      time_signature_p_ = new Time_signature ();
+      time_signature_p_->args_ = args;
       time_signature_p_->break_priority_i_ = 1; // ugh
     }
 
+  
   if (time_signature_p_)
     announce_element (Score_element_info (time_signature_p_, req));
 }
@@ -52,6 +54,12 @@
 {
   if (time_signature_p_) 
     {
+      Scalar sigstyle = get_property ("timeSignatureStyle");
+      if (sigstyle.length_i ())
+	{
+	  time_signature_p_->time_sig_type_str_ = sigstyle;
+	}
+
       typeset_element (time_signature_p_);
       time_signature_p_ =0;
     }
diff -urN ../lilypond-1.0.11/lily/time-signature.cc ./lily/time-signature.cc
--- ../lilypond-1.0.11/lily/time-signature.cc	Tue Sep 15 18:22:42 1998
+++ ./lily/time-signature.cc	Mon Sep 28 15:43:01 1998
@@ -1,11 +1,19 @@
+/*   
+  time-signature.cc --  implement Time_signature
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 1996--1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  
+ */
+
 #include "scalar.hh"
 #include "molecule.hh"
 #include "time-signature.hh"
 #include "paper-def.hh"
 #include "lookup.hh"
 
-Time_signature::Time_signature (Array<Scalar>a)
-  :args (a)
+Time_signature::Time_signature ()
 {
   breakable_b_ = true;
 }
@@ -13,7 +21,13 @@
 Molecule*
 Time_signature::brew_molecule_p() const
 {
-  Atom s = lookup_l ()->time_signature (args);
+  Atom s;
+  if (time_sig_type_str_.length_i ())
+    {
+      s = lookup_l ()-> special_time_signature (time_sig_type_str_);
+    }
+  else
+    s = lookup_l ()->time_signature (args_);
   s.translate_axis (-s.extent()[Y_AXIS].center (), Y_AXIS);
   return new Molecule (Atom (s));
 }
diff -urN ../lilypond-1.0.11/lily/transposed-music.cc ./lily/transposed-music.cc
--- ../lilypond-1.0.11/lily/transposed-music.cc	Thu Jan  1 00:00:00 1970
+++ ./lily/transposed-music.cc	Tue Sep 29 15:58:17 1998
@@ -0,0 +1,38 @@
+/*   
+  transposed-music.cc --  implement Transposed_music
+  
+  source file of the GNU LilyPond music typesetter
+  
+  (c) 1998 Han-Wen Nienhuys <hanwen@cs.uu.nl>
+  
+ */
+
+#include "transposed-music.hh"
+#include "debug.hh"
+
+Transposed_music::Transposed_music (Music *p, Musical_pitch pit)
+  : Music_wrapper (p)
+{
+  transpose_to_pitch_ = pit;
+  p->transpose (pit);
+}
+
+
+
+void
+Transposed_music::do_print () const
+{
+  Music_wrapper::do_print ();
+  DOUT << "transposition pitch: " << transpose_to_pitch_.str ();
+}
+
+Musical_pitch
+Transposed_music::to_relative_octave (Musical_pitch p)
+{
+#if 0				// Mats?
+    warning (_("Will ignore \relative for transposed music"));
+#endif
+  return p;
+}
+
+IMPLEMENT_IS_TYPE_B1 (Transposed_music, Music_wrapper);
diff -urN ../lilypond-1.0.11/make/STATE-VECTOR ./make/STATE-VECTOR
--- ../lilypond-1.0.11/make/STATE-VECTOR	Thu Sep 24 16:03:08 1998
+++ ./make/STATE-VECTOR	Wed Sep 30 12:00:40 1998
@@ -87,3 +87,6 @@
 1.0.10.uu1
 1.0.10.uu2
 1.0.11
+1.0.11.mb1
+1.0.11.uu1
+1.0.12
diff -urN ../lilypond-1.0.11/make/mutopia-inclusions.make ./make/mutopia-inclusions.make
--- ../lilypond-1.0.11/make/mutopia-inclusions.make	Thu Jan  1 00:00:00 1970
+++ ./make/mutopia-inclusions.make	Mon Sep 28 18:00:07 1998
@@ -0,0 +1,9 @@
+
+ifndef MUTOPIA_INCLUSIONS
+STEPMAKE_TEMPLATES := tex $(STEPMAKE_TEMPLATES)
+
+-include $(stepdir)/tex-inclusions
+MUTOPIA_INCLUSIONS=done
+
+
+endif
diff -urN ../lilypond-1.0.11/make/mutopia-rules.make ./make/mutopia-rules.make
--- ../lilypond-1.0.11/make/mutopia-rules.make	Thu Sep 17 13:35:59 1998
+++ ./make/mutopia-rules.make	Wed Sep 30 11:45:14 1998
@@ -23,9 +23,9 @@
 .PRECIOUS: $(outdir)/%.dvi
 
 $(outdir)/%.dvi: %.ly
-	sh $(depth)/scripts/ly2dvi.sh -S $(topdir) -o $(outdir)  $< 
+	$(PYTHON) $(depth)/scripts/ly2dvi32.py -o $(outdir)  $< 
 	-mv $(basename $<).midi $(outdir)
 
 $(outdir)/%.dvi: %.fly
-	sh $(depth)/scripts/ly2dvi.sh -S $(topdir) -o $(outdir)  $< 
+	$(PYTHON) $(depth)/scripts/ly2dvi32.py -o $(outdir)  $< 
 	-mv $(basename $<).midi $(outdir)
diff -urN ../lilypond-1.0.11/make/stepmake.make ./make/stepmake.make
--- ../lilypond-1.0.11/make/stepmake.make	Fri Sep 18 17:04:56 1998
+++ ./make/stepmake.make	Mon Sep 28 17:59:58 1998
@@ -31,6 +31,11 @@
 
 all:
 
+-include $(addprefix $(depth)/make/,$(addsuffix -inclusions.make, $(LOCALSTEPMAKE_TEMPLATES)))
+
+-include $(addprefix $(depth)/make/,$(addsuffix -inclusions.make, $(STEPMAKE_TEMPLATES)))
+
+
 include $(addprefix $(stepdir)/,$(addsuffix -vars.make, $(STEPMAKE_TEMPLATES)))
 
 # ugh. need to do this because of PATH :=$(topdir)/..:$(PATH) 
diff -urN ../lilypond-1.0.11/mf/feta-generic.mf ./mf/feta-generic.mf
--- ../lilypond-1.0.11/mf/feta-generic.mf	Tue Sep 15 18:22:43 1998
+++ ./mf/feta-generic.mf	Mon Sep 28 13:10:54 1998
@@ -32,6 +32,7 @@
 	input feta-schrift;
 	input feta-banier;
 	input feta-klef;
+	input feta-timesig;
 else:
 %	input feta-bolletjes;	
 %	input feta-banier;
@@ -41,4 +42,5 @@
 %	input feta-schrift;
 %	input feta-schrift;
 %	input feta-haak;
+%	input feta-timesig;
 fi
diff -urN ../lilypond-1.0.11/mf/feta-timesig.mf ./mf/feta-timesig.mf
--- ../lilypond-1.0.11/mf/feta-timesig.mf	Thu Jan  1 00:00:00 1970
+++ ./mf/feta-timesig.mf	Wed Sep 30 11:04:15 1998
@@ -0,0 +1,104 @@
+% 
+% feta-timesig.mf --  implement Time Signatures
+% 
+% source file of the Feta (Font-En-Tja) music font
+% 
+% (c) 1998 Mats Bengtsson <matsb@s3.kth.se>
+
+fet_begingroup("timesig");
+
+def draw_C =
+	save hair, bulb_rad;
+	hair# := stafflinethickness#;
+	bulb_rad# := interline# / 3;
+	define_pixels(hair, bulb_rad);
+
+	x1r = x5;
+	y1r = .4 interline;
+	z2 = (0, interline);
+	z3r = (-b, 0);
+	z4 = (0, -interline);
+	z5r = (w, -2 stafflinethickness);
+	
+	penpos1(hair, 0);
+	penpos2(stafflinethickness, 90);
+	penpos3(4 stafflinethickness, 180);
+	penpos4(stafflinethickness, -90);
+	penpos5(hair, -5);
+	
+	draw_bulb(-1, z1l,  z1r, bulb_rad, .8);
+
+	fill z1l{up} .. z2l{left} .. z3l{down} .. z4l{right} ..
+	simple_serif(z5l, z5r, -90) .. 
+	z4r{left} .. z3r{up} .. z2r{right} .. z1r -- cycle;
+	
+%	labels(1,2,3,4,5);
+	penlabels(1,2,3,4,5);
+enddef;
+
+fet_beginchar ("4/4 meter", "C", "fourfourmeter")
+	set_char_box(.8 interline#, .7 interline#, interline#, interline#);
+	
+	draw_C;
+fet_endchar;
+
+fet_beginchar ("2/2 meter", "C2", "allabreve")
+	set_char_box(.8 interline#, .7 interline#, 1.4 interline#, 1.4 interline#);
+	
+	draw_C;
+	draw_block((-1.5stafflinethickness, -d), (0, h));
+fet_endchar;
+
+path threequartercircle;
+threequartercircle = halfcircle & quartercircle rotated 180;
+
+save Cdiameter,Cthickness;
+Cdiameter# := 3/2 interline#;
+Cthickness# := 2 stafflinethickness#;
+define_pixels(Cdiameter,Cthickness);
+
+fet_beginchar ("Mensural 4/4 meter", "oldC", "oldfourfourmeter")
+	set_char_box(.5 Cdiameter#, .5 Cdiameter#, .5 Cdiameter#, .5 Cdiameter#);
+	
+	pickup pencircle scaled Cthickness;
+	draw threequartercircle rotated 45 scaled Cdiameter;
+fet_endchar;
+
+fet_beginchar ("Mensural 2/2 meter", "oldC2", "oldallabreve")
+	set_char_box(.5 Cdiameter#, .5 Cdiameter#, interline#, interline#);
+	
+	pickup pencircle scaled Cthickness;
+	draw threequartercircle rotated 45 scaled Cdiameter;
+	draw_block((-Cthickness, -d), (0, h));
+fet_endchar;
+
+fet_beginchar ("Mensural 3/2 meter", "old3_2", "oldthreetwometer")
+	set_char_box(.5 Cdiameter#, .5 Cdiameter#, .5 Cdiameter#, .5 Cdiameter#);
+	
+	pickup pencircle scaled Cthickness;
+	draw fullcircle scaled Cdiameter;
+fet_endchar;
+
+fet_beginchar ("Mensural 6/4 meter", "old6_4", "oldsixfourmeter")
+	set_char_box(.5 Cdiameter#, .5 Cdiameter#, 
+		.5 Cdiameter# + .5 interline#, Cdiameter#+ .5 interline#);
+	
+	pickup pencircle scaled Cthickness;
+	draw threequartercircle rotated 45 scaled Cdiameter 
+		shifted (0,.5 interline);
+	pickup pencircle scaled 3 stafflinethickness;
+	draw (0,.5 interline);
+fet_endchar;
+
+fet_beginchar ("Mensural 9/4 meter", "old9_4", "oldninefourmeter")
+	set_char_box(.5 Cdiameter#, .5 Cdiameter#, 
+		.5 Cdiameter# + .5 interline#, Cdiameter#+ .5 interline#);
+	
+	pickup pencircle scaled Cthickness;
+	draw fullcircle scaled Cdiameter shifted (0,.5 interline);
+	pickup pencircle scaled 3 stafflinethickness;
+	draw (0,.5 interline);
+fet_endchar;
+
+
+fet_endgroup("timesig");
diff -urN ../lilypond-1.0.11/mf/graycx.mf ./mf/graycx.mf
--- ../lilypond-1.0.11/mf/graycx.mf	Thu Jan  1 00:00:00 1970
+++ ./mf/graycx.mf	Mon Sep 28 13:18:06 1998
@@ -0,0 +1,8 @@
+% Gray font for CX with proofsheet resolution 75 pixels per inch.
+% Each pixel is represented by a 4x4 square, with 4/16 of the dots on.
+
+font_identifier "GRAYCX";
+
+boolean lightweight;
+
+input grayf
diff -urN ../lilypond-1.0.11/mf/grayimagen.mf ./mf/grayimagen.mf
--- ../lilypond-1.0.11/mf/grayimagen.mf	Tue Sep 15 18:22:43 1998
+++ ./mf/grayimagen.mf	Thu Jan  1 00:00:00 1970
@@ -1,9 +0,0 @@
-% Gray font for Imagen 8/300; proofsheet resolution is 75 pixels per inch.
-% Each pixel is represented by a 4x4 square, with 4/16 of the dots on.
-
-
-font_identifier "GRAYIMAGEN";
-
-boolean lightweight;
-
-input grayf
diff -urN ../lilypond-1.0.11/scripts/ly2dvi32.py ./scripts/ly2dvi32.py
--- ../lilypond-1.0.11/scripts/ly2dvi32.py	Tue Sep 15 18:22:43 1998
+++ ./scripts/ly2dvi32.py	Wed Sep 30 11:43:28 1998
@@ -15,6 +15,7 @@
 
 name = 'ly2dvi'
 version = '0.0.4'
+errorlog = ''
 
 import sys
 import os
@@ -504,10 +505,11 @@
         """
 
         path =''
-        cmd =('kpsewhich tex %s 2>&1' % var)
+        cmd =('kpsewhich tex %s %s' % (var,errorlog))
         pipe = os.popen (cmd, 'r')
         path = pipe.readline ()[:-1] # chop off \n
-        if pipe.close():
+	return_status =  pipe.close()
+	if return_status and not path:
             path = os.path.join(this.get('root'), 'texmf', 'tex',
                                 'lilypond', var)
 	fd = open(path, 'r')
diff -urN ../lilypond-1.0.11/scripts/mudela-book.py ./scripts/mudela-book.py
--- ../lilypond-1.0.11/scripts/mudela-book.py	Tue Sep 15 18:22:43 1998
+++ ./scripts/mudela-book.py	Tue Sep 29 16:00:31 1998
@@ -1,5 +1,4 @@
-
-# python version of mudela-book.  WIP.
+#!@PYTHON@
 
 #  TODO: center option
 
diff -urN ../lilypond-1.0.11/stepmake/NEWS ./stepmake/NEWS
--- ../lilypond-1.0.11/stepmake/NEWS	Tue Sep 22 19:59:18 1998
+++ ./stepmake/NEWS	Mon Sep 28 17:03:54 1998
@@ -1,3 +1,5 @@
+pl 53
+	- moved TeX stuff into tex template
 pl 52
 	- striproff
 	- reeable $(PACKAGE)_LIBES,_INCLUDES
diff -urN ../lilypond-1.0.11/stepmake/VERSION ./stepmake/VERSION
--- ../lilypond-1.0.11/stepmake/VERSION	Tue Sep 22 19:59:18 1998
+++ ./stepmake/VERSION	Mon Sep 28 17:03:55 1998
@@ -1,7 +1,7 @@
 PACKAGE_NAME=StepMake
 MAJOR_VERSION=0
 MINOR_VERSION=1
-PATCH_LEVEL=52
+PATCH_LEVEL=53
 MY_PATCH_LEVEL=
 
 # use the above to send patches, always empty for released version:
diff -urN ../lilypond-1.0.11/stepmake/stepmake/generic-rules.make ./stepmake/stepmake/generic-rules.make
--- ../lilypond-1.0.11/stepmake/stepmake/generic-rules.make	Tue Sep 15 18:22:43 1998
+++ ./stepmake/stepmake/generic-rules.make	Mon Sep 28 13:14:55 1998
@@ -15,18 +15,3 @@
 %.gz: %
 	gzip -c9 $< > $@
 
-# bit docrules, these...
-$(outdir)/%.dvi: $(outdir)/%.tex
-	(cd $(outdir); tex \\nonstopmode \\input $(<F))
-
-$(outdir)/%.dvi: $(outdir)/%.latex
-	(cd $(outdir); \
-	  latex \\nonstopmode \\input $(<F);\
-	  bibtex $(basename $(<F));\
-	  latex \\nonstopmode \\input $(<F);\
-	  latex \\nonstopmode \\input $(<F);\
-	)
-
-$(outdir)/%.ps: $(outdir)/%.dvi
-	dvips -ta4 -o $@ $<
-
diff -urN ../lilypond-1.0.11/stepmake/stepmake/tex-rules.make ./stepmake/stepmake/tex-rules.make
--- ../lilypond-1.0.11/stepmake/stepmake/tex-rules.make	Thu Jan  1 00:00:00 1970
+++ ./stepmake/stepmake/tex-rules.make	Mon Sep 28 13:17:06 1998
@@ -0,0 +1,16 @@
+
+
+$(outdir)/%.dvi: $(outdir)/%.tex
+	(cd $(outdir); tex \\nonstopmode \\input $(<F))
+
+$(outdir)/%.dvi: $(outdir)/%.latex
+	(cd $(outdir); \
+	  latex \\nonstopmode \\input $(<F);\
+	  bibtex $(basename $(<F));\
+	  latex \\nonstopmode \\input $(<F);\
+	  latex \\nonstopmode \\input $(<F);\
+	)
+
+$(outdir)/%.ps: $(outdir)/%.dvi
+	dvips -ta4 -o $@ $<
+
diff -urN ../lilypond-1.0.11/stepmake/stepmake/tex-targets.make ./stepmake/stepmake/tex-targets.make
--- ../lilypond-1.0.11/stepmake/stepmake/tex-targets.make	Thu Jan  1 00:00:00 1970
+++ ./stepmake/stepmake/tex-targets.make	Mon Sep 28 13:17:06 1998
@@ -0,0 +1,2 @@
+
+# also empty
diff -urN ../lilypond-1.0.11/stepmake/stepmake/tex-vars.make ./stepmake/stepmake/tex-vars.make
--- ../lilypond-1.0.11/stepmake/stepmake/tex-vars.make	Thu Jan  1 00:00:00 1970
+++ ./stepmake/stepmake/tex-vars.make	Mon Sep 28 13:17:06 1998
@@ -0,0 +1,2 @@
+
+#empty
