release: 1.0.12

diff --git a/Documentation/COPERTINA.yo b/Documentation/COPERTINA.yo
index b4e0e0acef8db26097620d19725f71465a73c45a..dd4c568b46e5f6f8f551c61c59ff25913663ffe9 100644 (file)
--- a/Documentation/COPERTINA.yo
+++ b/Documentation/COPERTINA.yo
@@ -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. )
 DEFINEMACRO(pic)(1)(verbinclude(ARG1.in))
 
 nsect(LilyPond è il tipografo musicale del progetto GNU. )

diff --git a/Documentation/FLAPTEKST.yo b/Documentation/FLAPTEKST.yo
index 4513c045e31922e2412495fee4809070b5daf331..b144222cebd273a539d9672221d94dc69110108b 100644 (file)
--- a/Documentation/FLAPTEKST.yo
+++ b/Documentation/FLAPTEKST.yo
@@ -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)
 DEFINEMACRO(pic)(1)(verbinclude(ARG1.in))
 
 nsect(LilyPond -- De Muziek Zetter van het GNU Project)

diff --git a/Documentation/faq.yo b/Documentation/faq.yo
index 5d64a38233ec126e916a2199c29b30829de90493..059cc78381be1b3e8d4c03d99e56548ae15d6240 100644 (file)
--- a/Documentation/faq.yo
+++ b/Documentation/faq.yo
@@ -14,8 +14,8 @@ Note: relative paths are meant to be relative to the source directory
 
 sect(Installing)
 
 
 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
 
 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 --git a/Documentation/index.yo b/Documentation/index.yo
index aa87b18f09cb73380512335ba4117c96688033ae..0e1e885ff3ac9d049eb7271adec06ae1b3ecf36b 100644 (file)
--- a/Documentation/index.yo
+++ b/Documentation/index.yo
@@ -30,9 +30,9 @@ it() url(Design criteria)(MANIFESTO.html)
 it()url(The GNU Music project)(gnu-music.html)
 it()url(Mutopia -- Music To the People)(mutopia.html)
 it()url(The lilypond
 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
 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)
 )
 
 nsubsect(Documentation: manuals)

diff --git a/Documentation/tex/GNUmakefile b/Documentation/tex/GNUmakefile
index 9ac25bad2789a1301f138ff64685ef89c96487e2..beff5d81a9fe7ad11386d0a47e6617df52a6c9dc 100644 (file)
--- a/Documentation/tex/GNUmakefile
+++ b/Documentation/tex/GNUmakefile
@@ -18,14 +18,14 @@ EXTRA_DIST_FILES= $(BIB_FILES) $(DOC_FILES) $(DATA_FILES) $(EL_FILES) $(YO_URG_F
 HTML_FILES = $(addprefix $(outdir)/, $(YO_FILES:.yo=.html))
 PS_FILES = $(DVI_FILES:.dvi=.ps)
 
 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 
 
 
 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 @@ local-WWW: $(HTML_FILES) $(OUTDOC_FILES:.doc=.ps.gz) $(OUTYO_FILES:.yo=.latex) $
 $(outdir)/%.bib: %.bib
        ln -f $< $@
 
 $(outdir)/%.bib: %.bib
        ln -f $< $@
 

+# ignore result since bib2html is nonstandard. Errors would halt the RPM build.j  

 $(outdir)/%.html: %.bib
 $(outdir)/%.html: %.bib

-       bib2html $< $@
+       -bib2html $< $@

 
 # Yeah right: 
 # make -k out/mudela.dvi => cp -f out/vocabulary.tex out/mudela.dvi
 
 # Yeah right: 
 # make -k out/mudela.dvi => cp -f out/vocabulary.tex out/mudela.dvi

diff --git a/Documentation/tex/computer-notation.bib b/Documentation/tex/computer-notation.bib
index ca314247e22f7d7a45ccd1d6405752f6d82f1f61..2cadd45a20cfe27883af726a17b29947681a5cf9 100644 (file)
--- a/Documentation/tex/computer-notation.bib
+++ b/Documentation/tex/computer-notation.bib
@@ -144,7 +144,7 @@ note = {A no-science-here review of Encore. HWN}
 
 @Article{belkin94,
   author =      {Alan Belkin},
 
 @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,
   journal =     CMJ,
   year =        1994,
   volume =      18,

diff --git a/Documentation/tex/other-packages.bib b/Documentation/tex/other-packages.bib
index da52e7ea9b6863dba3f96c857913a0775bd29c6e..6a2c615618f96053e9750f3a3cd89b9ee1e5f399 100644 (file)
--- a/Documentation/tex/other-packages.bib
+++ b/Documentation/tex/other-packages.bib
@@ -17,14 +17,16 @@
 
 @Misc{graph_music_press,
   title =       {Graphire Music Press},
 
 @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},
 }
 
 @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 @@ html=                {http://www.musicwareinc.com/},
   author={David Webber},
 }
   
   author={David Webber},
 }
   

-@misc{Noteworthy,
-  title={Noteworthy},
-  HTML={http://www.ntworthy.com},
-  note={Shareware},
-  publisher={Noteworthy Artware inc.},
-}

     
 @misc{WolfGang,
   title = {WolfGang},
     
 @misc{WolfGang,
   title = {WolfGang},


@@ -333,14 +329,32 @@ music.'},
 }
 
 @Misc{mp,
 }
 
 @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 --git a/Documentation/tex/refman.yo b/Documentation/tex/refman.yo
index b635bfc2e1b0eb28a410321461f315f9e0de0532..40e025e9112e6ed649bc1620fc6c15eec778afe2 100644 (file)
--- a/Documentation/tex/refman.yo
+++ b/Documentation/tex/refman.yo
@@ -2,9 +2,6 @@ COMMENT(-*-text-*-)
 
 redef(var)(1)(whenlatex(latexcommand({\normalfont\scshape )ARG1+latexcommand(}))\
     whenhtml(sc(ARG1)))
 
 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.
 
 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\texttt#1{\tt #1})
 latexcommand(\def\textbf#1{\bf #1})
 )
 
 latexcommand(\def\textbf#1{\bf #1})
 )
 

+COMMENT(urg, texinfo include breaks)
+whenhtml(

 includefile(html-disclaimer.yo-urg)
 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
 
 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


@@ -850,6 +850,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.  
 
 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.
 
 dit(code(\script) code({) var(name) var(instaff) var(withstem)
 dit(code(\score) var(statementlist)) Define music.
 
 dit(code(\script) code({) var(name) var(instaff) var(withstem)

diff --git a/Documentation/tex/tutorial.yo b/Documentation/tex/tutorial.yo
index 1f0d591e5fb466bbbd0fa21574006dd373361076..a8e7f025e263a8602af0f4b241c836d02f259bf9 100644 (file)
--- a/Documentation/tex/tutorial.yo
+++ b/Documentation/tex/tutorial.yo
@@ -3,8 +3,6 @@ COMMENT(-*-text-*-)
 redef(var)(1)(whenlatex(latexcommand({\normalfont\scshape )ARG1+latexcommand(}))\
     whenhtml(sc(ARG1)))
 
 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.
 
 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\preexample{\par})
 latexcommand(\def\postexample{\par\medskip})
 latexcommand(\def\file#1{{mycode(#1)}})
 
 latexcommand(\def\postexample{\par\medskip})
 latexcommand(\def\file#1{{mycode(#1)}})
 

+COMMENT(urg, texinfo include breaks)
+whenhtml(

 includefile(html-disclaimer.yo-urg)
 includefile(html-disclaimer.yo-urg)

+)

 
 sect(Introduction)
 label(tutorial:introduction)
 
 sect(Introduction)
 label(tutorial:introduction)


@@ -1444,7 +1445,7 @@ mudela(verbatim)(
     >
     \paper {
       linewidth = -1.0;
     >
     \paper {
       linewidth = -1.0;

-      stem_length = 12.0*\internote;
+      stem_length = 6.0*\interline;

     }
   }
 )
     }
   }
 )

diff --git a/Documentation/topdocs/index.yo b/Documentation/topdocs/index.yo
index 0e43156068ad4ba49e215d2d9d49eaae2b65ab1f..734dbab853da3948fb5de7893c59eca949f05b38 100644 (file)
--- a/Documentation/topdocs/index.yo
+++ b/Documentation/topdocs/index.yo
@@ -1,6 +1,6 @@
 DEFINEMACRO(depth)(0)(.)
 DEFINEMACRO(docdir)(0)(Documentation)
 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 @@ dit(lurl(http://sca.uwaterloo.ca/lilypond/))
 nsubsect(Examples)
 
 itemize(
 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)
 (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)
 )
 
 nsubsect(NEWS)

diff --git a/NEWS b/NEWS
index 4da9b2d30362727098e8f1281c291c2dc39a6fdd..855cc07ca3b9a8c744e3c29cb8c5209144e494d0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,28 @@
-pl 11.mb2
-       - feta-timesig.mf: Added some flesh on C and C2,
-         added old-style mensuration marks.
+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
 pl 11.mb1

-       - Added feta-timesig.mf, font for C and alla breve.
+       - 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
 
 pl 10.uu2

-       - plet-spanner fix.
+       - plet-spanner fix. 

        - large doc patch (thanks Adrian)
 
 pl 10.jbr1
        - large doc patch (thanks Adrian)
 
 pl 10.jbr1

diff --git a/VERSION b/VERSION
index 6bdac35005315ab42d2ffb2587b976518b4ed12d..75df7b13ab22a1700126dee360a31f6a878afed8 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,8 +1,8 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0

-PATCH_LEVEL=11
-MY_PATCH_LEVEL=mb2
+PATCH_LEVEL=12
+MY_PATCH_LEVEL=

 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/aclocal.m4 b/aclocal.m4
index 9400efd8e00172970fa2f0c4c279c4090e66f6d4..9aae46c03267a191383438dfc08167654ed3afa5 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -229,7 +229,7 @@ dnl    fi
     AC_CHECK_PROGS(TAR, tar, error)
     AC_CHECK_PROGS(BASH, bash, /bin/sh)
 
     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)
 
 
     AC_SUBST(PYTHON)
 
 

diff --git a/buildscripts/clean-fonts.sh b/buildscripts/clean-fonts.sh
index a57dc7fc74a86ba0c19e7a5bce7d3c67f092ae7c..597efa90327c4190b95ee21b06e134730ce00e3d 100755 (executable)
--- a/buildscripts/clean-fonts.sh
+++ b/buildscripts/clean-fonts.sh
@@ -19,7 +19,7 @@ fi
 
 # remove possibly stale .pk/.tfm files 
 echo> /tmp/cleaning-font-dummy
 
 # 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
 
 echo removing $FILES
 rm  -f $FILES /tmp/cleaning-font-dummy

diff --git a/buildscripts/genheader.py b/buildscripts/genheader.py
index 8e6f39603700e9f53c02e56a833bf72bee7dc28d..2c1d6be30842512900fbd484e72ba52c96e9cd09 100644 (file)
--- a/buildscripts/genheader.py
+++ b/buildscripts/genheader.py
@@ -25,7 +25,10 @@ my_options = My_options()
 
 
 def name():
 
 
 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 */';
 
 def c_commentify(str):
     return  '/* ' + regsub.gsub('^','  ', str) + '\n */';

diff --git a/buildscripts/ps-to-gifs.sh b/buildscripts/ps-to-gifs.sh
index b342cbc2994e20871b4526e8138f9811f72be2c4..0f4afe0a5ab7177bd0a7916f0e681687fc697f60 100755 (executable)
--- a/buildscripts/ps-to-gifs.sh
+++ b/buildscripts/ps-to-gifs.sh
@@ -75,7 +75,7 @@ fi
 rm -f $BASE{.ppm,.$GIF} $BASE-page*{.ppm,.$GIF}
 
 # generate the pixmap at twice the size, then rescale (for antialiasing)
 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`
 # quant is soo slow
 # cat $PPMFILE | ppmquant 2 | pnmscale 0.3333 | pnmcrop | $PNMTOGIF $color > $OUTFILE
 PPMS=`ls $BASE*ppm`

diff --git a/config.make.in b/config.make.in
index 1cc983d7c58531a06d853054f26b76685b48fc8b..021262f2525f5269960ad1f67d46b83078779978 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -52,6 +52,7 @@ PATHSEP = @PATHSEP@
 PERL = @PERL@
 PYTHON = @PYTHON@
 TAR= @TAR@
 PERL = @PERL@
 PYTHON = @PYTHON@
 TAR= @TAR@

+STRIPROFF = @STRIPROFF@

 TROFF = @TROFF@
 YODL= @YODL@
 YODL2HTML= @YODL2HTML@
 TROFF = @TROFF@
 YODL= @YODL@
 YODL2HTML= @YODL2HTML@

diff --git a/configure b/configure
index 305e0192d6cc930681e9f449ed18d5453166e405..3bbe851497543a026ac75c7e053118cccd3fabbc 100755 (executable)
--- a/configure
+++ b/configure
@@ -869,8 +869,8 @@ done
 test -n "$BASH" || BASH="/bin/sh"
 
 
 test -n "$BASH" || BASH="/bin/sh"
 
 

-    # Extract the first word of "python", so it can be a program name with args.
-set dummy python; ac_word=$2
+    # Extract the first word of "${PYTHON:-python}", so it can be a program name with args.
+set dummy ${PYTHON:-python}; ac_word=$2

 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 echo "configure:876: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
 echo "configure:876: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then

diff --git a/input/test/time.fly b/input/test/time.fly
new file mode 100644 (file)
index 0000000..0029b15
--- /dev/null
+++ b/input/test/time.fly
@@ -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 --git a/input/test/transposition.ly b/input/test/transposition.ly
index ba4569910c5dd63faf5987bc4504ed63b5d0bbcc..18f742d1273ddb22f7bd05949b0d64492f999360 100644 (file)
--- a/input/test/transposition.ly
+++ b/input/test/transposition.ly
@@ -35,7 +35,7 @@ vOne = \notes \relative c''{
         c4 c |
 }
 
         c4 c |
 }
 

-vTwo = \notes \relative c''\transpose d' { \vOne }
+vTwo = \notes \transpose d' { \vOne }

 
 vThree = \notes \relative c''{
         \clef"violin";
 
 vThree = \notes \relative c''{
         \clef"violin";


@@ -48,7 +48,7 @@ vThree = \notes \relative c''{
         cis4 ais4 |
 }
 
         cis4 ais4 |
 }
 

-vFour = \notes \relative c''\transpose d' \vThree
+vFour = \notes \transpose d' \vThree

 
 \score {
   \type StaffGroup <
 
 \score {
   \type StaffGroup <

diff --git a/lily/VERSION b/lily/VERSION
index 6bdac35005315ab42d2ffb2587b976518b4ed12d..75df7b13ab22a1700126dee360a31f6a878afed8 100644 (file)
--- a/lily/VERSION
+++ b/lily/VERSION
@@ -1,8 +1,8 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0

-PATCH_LEVEL=11
-MY_PATCH_LEVEL=mb2
+PATCH_LEVEL=12
+MY_PATCH_LEVEL=

 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh
index 763beb8d42f60762fa3a698018c032a50c687b70..5dc56d279c4e1e388e7e45c0ff91acbecf2793ed 100644 (file)
--- a/lily/include/lookup.hh
+++ b/lily/include/lookup.hh
@@ -41,6 +41,7 @@ struct Lookup {
   Atom vbrace (Real &dy) const;
   Atom vbracket (Real &dy) const;
   Atom time_signature (Array<Scalar>) const;
   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;
   Atom stem (Real y1_pos, Real y2_pos) const;
   Atom rule_symbol (Real height, Real width) const;
   Atom accidental (int) const;

diff --git a/lily/include/relative-music-iterator.hh b/lily/include/relative-music-iterator.hh
deleted file mode 100644 (file)
index c792445..0000000
--- a/lily/include/relative-music-iterator.hh
+++ /dev/null
@@ -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 --git a/lily/include/time-signature.hh b/lily/include/time-signature.hh
index 762f465b98c27cc2c627f7abf5fc7a1465bc5173..ed079a29ff746f2051631925f5b44c5f3fabb9ac 100644 (file)
--- a/lily/include/time-signature.hh
+++ b/lily/include/time-signature.hh
@@ -18,12 +18,16 @@
   
  */
 class Time_signature: public Item {
   
  */
 class Time_signature: public Item {

-  Array<Scalar> args;
+
+  

 
 protected:
   virtual Molecule*brew_molecule_p() const;
 public:
 
 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);
 };
   DECLARE_MY_RUNTIME_TYPEINFO;
   SCORE_ELEMENT_CLONE(Time_signature);
 };

diff --git a/lily/include/transposed-music.hh b/lily/include/transposed-music.hh
new file mode 100644 (file)
index 0000000..fe8781c
--- /dev/null
+++ b/lily/include/transposed-music.hh
@@ -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 --git a/lily/lookup.cc b/lily/lookup.cc
index 1624a42b467f482c1a4b5940f5a2bc166d67fb33..b03cc59de93eb870e2001f9e2944a31e7a37b3c8 100644 (file)
--- a/lily/lookup.cc
+++ b/lily/lookup.cc
@@ -260,7 +260,7 @@ Lookup::streepje (int type) const
   if (type > 2)
     type = 2;
 
   if (type > 2)
     type = 2;
 

-  return  afm_find ("balls" + String ("-") +to_str (type) + "l");
+  return  afm_find ("balls-" + to_str (type) + "l");

 }
 
 Atom
 }
 
 Atom


@@ -293,6 +293,16 @@ Lookup::time_signature (Array<Scalar> a) const
 }
 
 
 }
 
 

+
+Atom
+Lookup::special_time_signature (String s) const
+{
+  Atom a (afm_find ("timesig-"+ s));
+  return a;
+}
+
+
+

 Atom
 Lookup::stem (Real y1,Real y2) const
 {
 Atom
 Lookup::stem (Real y1,Real y2) const
 {

diff --git a/lily/music-wrapper.cc b/lily/music-wrapper.cc
index 72971abf50c40efc4bece48003a0e46c1ff768b5..b6f6618e7998b91254187061385f6a1e91089188 100644 (file)
--- a/lily/music-wrapper.cc
+++ b/lily/music-wrapper.cc
@@ -27,6 +27,8 @@ Music_wrapper::do_print () const
 {
   element_p_->print ();
 }
 {
   element_p_->print ();
 }

+
+

 void
 Music_wrapper::transpose (Musical_pitch p)
 {
 void
 Music_wrapper::transpose (Musical_pitch p)
 {

diff --git a/lily/parser.yy b/lily/parser.yy
index 067eed8e65b4504944083769ac156ad5d8243deb..af2252a226a3f7902a496bc7d98fd5bdcdd47396 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -41,7 +41,7 @@
 #include "mudela-version.hh"
 #include "scope.hh"
 #include "relative-music.hh"
 #include "mudela-version.hh"
 #include "scope.hh"
 #include "relative-music.hh"

-
+#include "transposed-music.hh"

 
 // mmm
 Mudela_version oldest_version ("1.0.3");
 
 // mmm
 Mudela_version oldest_version ("1.0.3");


@@ -700,8 +700,7 @@ Music:
        | Simultaneous_music            { $$ = $1; }
        | Sequential_music              { $$ = $1; }
        | TRANSPOSE musical_pitch Music {
        | 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 (); }
                delete $2;
        }
        | MUSIC_IDENTIFIER { $$ = $1->access_Music (); }


@@ -1283,7 +1282,6 @@ simple_element:
                velt_p->set_spot (THIS->here_input ());
                velt_p->add_music (m);
                $$ = velt_p;
                velt_p->set_spot (THIS->here_input ());
                velt_p->add_music (m);
                $$ = velt_p;

-

        }
        | STRING notemode_duration                      {
                if (!THIS->lexer_p_->lyric_state_b ())
        }
        | STRING notemode_duration                      {
                if (!THIS->lexer_p_->lyric_state_b ())

diff --git a/lily/plet-spanner.cc b/lily/plet-spanner.cc
index 4ec3c8d623112d468251f2061b0ab4389d9014d1..5b7637f12e103b07a417c55bbb54dcbb5cc3b3d2 100644 (file)
--- a/lily/plet-spanner.cc
+++ b/lily/plet-spanner.cc
@@ -119,7 +119,7 @@ Plet_spanner::do_post_processing ()
   do {
     if (stem_l_drul_[d]->empty_b ())
       {
   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
       }
        flip (&u);
        dy_f_drul_[d] = dy_f_drul_[u]; // ughugh \[/3 r8 c8 r8 \]/1
       }

diff --git a/lily/time-signature-engraver.cc b/lily/time-signature-engraver.cc
index 75d803226ba608eaa17c7cbfc6e32ab371bc0b0d..b72d78460853e73712695352555af1c5a69c9ee2 100644 (file)
--- a/lily/time-signature-engraver.cc
+++ b/lily/time-signature-engraver.cc
@@ -39,10 +39,12 @@ Time_signature_engraver::do_process_requests()
       args.push (req->beats_i_);
       args.push (req->one_beat_i_);
        
       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
     }
 
       time_signature_p_->break_priority_i_ = 1; // ugh
     }
 

+  

   if (time_signature_p_)
     announce_element (Score_element_info (time_signature_p_, req));
 }
   if (time_signature_p_)
     announce_element (Score_element_info (time_signature_p_, req));
 }


@@ -52,6 +54,12 @@ Time_signature_engraver::do_pre_move_processing()
 {
   if (time_signature_p_) 
     {
 {
   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;
     }
       typeset_element (time_signature_p_);
       time_signature_p_ =0;
     }

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index e882c5558287c66756e293761c04368d0331c08f..931766ccc815f3bcd9d69971de1e6e7ff835b802 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -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"
 
 #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;
 }
 {
   breakable_b_ = true;
 }


@@ -13,7 +21,13 @@ Time_signature::Time_signature (Array<Scalar>a)
 Molecule*
 Time_signature::brew_molecule_p() const
 {
 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));
 }
   s.translate_axis (-s.extent()[Y_AXIS].center (), Y_AXIS);
   return new Molecule (Atom (s));
 }

diff --git a/lily/transposed-music.cc b/lily/transposed-music.cc
new file mode 100644 (file)
index 0000000..952c33c
--- /dev/null
+++ b/lily/transposed-music.cc
@@ -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 --git a/make/STATE-VECTOR b/make/STATE-VECTOR
index a81e757b3be8487c45c039fa6c2d0e8f3c0ef96b..459dacb43ac50dcedfcbead0e4e38bc2a18b771c 100644 (file)
--- a/make/STATE-VECTOR
+++ b/make/STATE-VECTOR
@@ -88,4 +88,5 @@
 1.0.10.uu2
 1.0.11
 1.0.11.mb1
 1.0.10.uu2
 1.0.11
 1.0.11.mb1

-1.0.11.mb2
+1.0.11.uu1
+1.0.12

diff --git a/make/mutopia-inclusions.make b/make/mutopia-inclusions.make
new file mode 100644 (file)
index 0000000..28636f7
--- /dev/null
+++ b/make/mutopia-inclusions.make
@@ -0,0 +1,9 @@
+
+ifndef MUTOPIA_INCLUSIONS
+STEPMAKE_TEMPLATES := tex $(STEPMAKE_TEMPLATES)
+
+-include $(stepdir)/tex-inclusions
+MUTOPIA_INCLUSIONS=done
+
+
+endif

diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index 23887b901c61acb09e03c518de03ad14ffaabf27..1905f1f4dd1def2bd059e0f8e0b9bb1954779bef 100644 (file)
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -23,9 +23,9 @@ $(outdir)/%.fly.txt: %.fly
 .PRECIOUS: $(outdir)/%.dvi
 
 $(outdir)/%.dvi: %.ly
 .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
        -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)
        -mv $(basename $<).midi $(outdir)

diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm
index 294683ff576c40aa66d138650d8084288c6652f6..9fa9b7e27257a546055f18861900396e0f197e56 100644 (file)
--- a/make/out/lelievijver.lsm
+++ b/make/out/lelievijver.lsm
@@ -1,15 +1,15 @@
 Begin3
 Titel: LilyPond
 Begin3
 Titel: LilyPond

-Versie: 1.0.11
-Inschrijf datum: 24SEP98
+Versie: 1.0.12
+Inschrijf datum: 30SEP98

 Beschrijving: @FLAPTEKST@
 Trefwoorden: muziek typezetten midi notatie
 Auteur: hanwen@stack.nl (Han-Wen Nienhuys)
        janneke@gnu.org (Jan Nieuwenhuizen)
 Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys)
 Voornaamste plek: sunsite.unc.edu /pub/Linux/apps
 Beschrijving: @FLAPTEKST@
 Trefwoorden: muziek typezetten midi notatie
 Auteur: hanwen@stack.nl (Han-Wen Nienhuys)
        janneke@gnu.org (Jan Nieuwenhuizen)
 Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys)
 Voornaamste plek: sunsite.unc.edu /pub/Linux/apps

-       770k lilypond-1.0.11.tar.gz 
+       770k lilypond-1.0.12.tar.gz 

 Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
 Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/

-       770k lilypond-1.0.11.tar.gz 
+       770k lilypond-1.0.12.tar.gz 

 Copi-eer voorwaarden: GPL
 End
 Copi-eer voorwaarden: GPL
 End

diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm
index 36edf7ac64826376172bda5acd7d79bd5a0f9dde..714d3bc1908220a720b820cb1027b920cd2ac8f7 100644 (file)
--- a/make/out/lilypond.lsm
+++ b/make/out/lilypond.lsm
@@ -1,7 +1,7 @@
 Begin3
 Title: LilyPond
 Begin3
 Title: LilyPond

-Version: 1.0.11
-Entered-date: 24SEP98
+Version: 1.0.12
+Entered-date: 30SEP98

 Description: 
 LilyPond is the GNU Project music typesetter.  This program can print
 beautiful sheet music from a music definition file.  It can also play
 Description: 
 LilyPond is the GNU Project music typesetter.  This program can print
 beautiful sheet music from a music definition file.  It can also play


@@ -14,8 +14,8 @@ Author: hanwen@cs.ruu.nl (Han-Wen Nienhuys)
        janneke@gnu.org (Jan Nieuwenhuizen)
 Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys)
 Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert
        janneke@gnu.org (Jan Nieuwenhuizen)
 Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys)
 Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert

-       770k lilypond-1.0.11.tar.gz 
+       770k lilypond-1.0.12.tar.gz 

 Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/
 Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/

-       770k lilypond-1.0.11.tar.gz 
+       770k lilypond-1.0.12.tar.gz 

 Copying-policy: GPL
 End
 Copying-policy: GPL
 End

diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec
index 49a083f836edacc3cf7eae419ada86a82e54a4e6..a86c555bb25340300212efe6d0142ad5dba4ecdc 100644 (file)
--- a/make/out/lilypond.spec
+++ b/make/out/lilypond.spec
@@ -1,9 +1,9 @@
 Name: lilypond
 Name: lilypond

-Version: 1.0.11
+Version: 1.0.12

 Release: 1
 Copyright: GPL
 Group: Applications/Publishing
 Release: 1
 Copyright: GPL
 Group: Applications/Publishing

-Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.0.11.tar.gz
+Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.0.12.tar.gz

 Summary: A program for printing sheet music.
 URL: http://www.cs.uu.nl/~hanwen/lilypond
 Packager: Han-Wen Nienhuys <hanwen@cs.uu.nl>
 Summary: A program for printing sheet music.
 URL: http://www.cs.uu.nl/~hanwen/lilypond
 Packager: Han-Wen Nienhuys <hanwen@cs.uu.nl>

diff --git a/make/stepmake.make b/make/stepmake.make
index 835f6907a4fa21de789a015cccdda0c14adc3a49..8dc7c4e1db770e7e89962f65b1364d2bda581903 100644 (file)
--- a/make/stepmake.make
+++ b/make/stepmake.make
@@ -31,6 +31,11 @@ LOCALSTEPMAKE_TEMPLATES:= generic $(LOCALSTEPMAKE_TEMPLATES)
 
 all:
 
 
 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) 
 include $(addprefix $(stepdir)/,$(addsuffix -vars.make, $(STEPMAKE_TEMPLATES)))
 
 # ugh. need to do this because of PATH :=$(topdir)/..:$(PATH) 

diff --git a/mf/graycx.mf b/mf/graycx.mf
new file mode 100644 (file)
index 0000000..3098b60
--- /dev/null
+++ b/mf/graycx.mf
@@ -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 --git a/mf/grayimagen.mf b/mf/grayimagen.mf
deleted file mode 100644 (file)
index db627b0..0000000
--- a/mf/grayimagen.mf
+++ /dev/null
@@ -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 --git a/mf/out/feta11.afm b/mf/out/feta11.afm
index cc6148945befa74a988e1ff8487857e904a05b0e..1b71cf5e37e19a0678b40b57295e472f0fe10abf 100644 (file)
--- a/mf/out/feta11.afm
+++ b/mf/out/feta11.afm
@@ -72,5 +72,12 @@ C 67; N clefs-bass; B -1375.00 -6875.00 9900.02 2750.00 ;
 C 68; N clefs-bass_change; B -1100.02 -5500.03 7920.04 2200.01 ;
 C 69; N clefs-violin; B -2396.44 -8250.00 10277.13 13750.00 ;
 C 70; N clefs-violin_change; B -2082.15 -6600.04 8056.75 11000.06 ;
 C 68; N clefs-bass_change; B -1100.02 -5500.03 7920.04 2200.01 ;
 C 69; N clefs-violin; B -2396.44 -8250.00 10277.13 13750.00 ;
 C 70; N clefs-violin_change; B -2082.15 -6600.04 8056.75 11000.06 ;

+C 71; N timesig-C; B -2200.01 -2750.00 1924.99 2750.00 ;
+C 72; N timesig-C2; B -2200.01 -3849.99 1924.99 3849.99 ;
+C 73; N timesig-oldC; B -2062.50 -2062.50 2062.50 2062.50 ;
+C 74; N timesig-oldC2; B -2062.50 -2750.00 2062.50 2750.00 ;
+C 75; N timesig-old3_2; B -2062.50 -2062.50 2062.50 2062.50 ;
+C 76; N timesig-old6_4; B -2062.50 -3437.50 2062.50 5500.00 ;
+C 77; N timesig-old9_4; B -2062.50 -3437.50 2062.50 5500.00 ;

 EndCharMetrics
 EndFontMetrics
 EndCharMetrics
 EndFontMetrics

diff --git a/mf/out/feta13.afm b/mf/out/feta13.afm
index b122ce708ff1a747ef51c780886c5d107ed3bf6e..9908f0cc4cceea9baecd62acaa04307138dc1e01 100644 (file)
--- a/mf/out/feta13.afm
+++ b/mf/out/feta13.afm
@@ -72,5 +72,12 @@ C 67; N clefs-bass; B -1625.00 -8125.00 11700.03 3250.00 ;
 C 68; N clefs-bass_change; B -1300.02 -6500.02 9360.02 2600.00 ;
 C 69; N clefs-violin; B -2832.14 -9750.00 12145.70 16250.00 ;
 C 70; N clefs-violin_change; B -2460.72 -7800.02 9521.58 13000.03 ;
 C 68; N clefs-bass_change; B -1300.02 -6500.02 9360.02 2600.00 ;
 C 69; N clefs-violin; B -2832.14 -9750.00 12145.70 16250.00 ;
 C 70; N clefs-violin_change; B -2460.72 -7800.02 9521.58 13000.03 ;

+C 71; N timesig-C; B -2600.00 -3250.00 2275.00 3250.00 ;
+C 72; N timesig-C2; B -2600.00 -4549.99 2275.00 4549.99 ;
+C 73; N timesig-oldC; B -2437.50 -2437.50 2437.50 2437.50 ;
+C 74; N timesig-oldC2; B -2437.50 -3250.00 2437.50 3250.00 ;
+C 75; N timesig-old3_2; B -2437.50 -2437.50 2437.50 2437.50 ;
+C 76; N timesig-old6_4; B -2437.50 -4062.50 2437.50 6500.00 ;
+C 77; N timesig-old9_4; B -2437.50 -4062.50 2437.50 6500.00 ;

 EndCharMetrics
 EndFontMetrics
 EndCharMetrics
 EndFontMetrics

diff --git a/mf/out/feta16.afm b/mf/out/feta16.afm
index d4f7310b93dae5a007dc659ab5f183b22972a011..51d4dc9549fba2f395424e5fecb36257cf63f32c 100644 (file)
--- a/mf/out/feta16.afm
+++ b/mf/out/feta16.afm
@@ -72,5 +72,12 @@ C 67; N clefs-bass; B -2000.00 -10000.00 14400.02 4000.00 ;
 C 68; N clefs-bass_change; B -1600.04 -8000.03 11520.03 3200.01 ;
 C 69; N clefs-violin; B -3485.72 -12000.00 14948.55 20000.00 ;
 C 70; N clefs-violin_change; B -3028.58 -9600.04 11718.89 16000.06 ;
 C 68; N clefs-bass_change; B -1600.04 -8000.03 11520.03 3200.01 ;
 C 69; N clefs-violin; B -3485.72 -12000.00 14948.55 20000.00 ;
 C 70; N clefs-violin_change; B -3028.58 -9600.04 11718.89 16000.06 ;

+C 71; N timesig-C; B -3200.01 -4000.00 2799.99 4000.00 ;
+C 72; N timesig-C2; B -3200.01 -5599.98 2799.99 5599.98 ;
+C 73; N timesig-oldC; B -3000.00 -3000.00 3000.00 3000.00 ;
+C 74; N timesig-oldC2; B -3000.00 -4000.00 3000.00 4000.00 ;
+C 75; N timesig-old3_2; B -3000.00 -3000.00 3000.00 3000.00 ;
+C 76; N timesig-old6_4; B -3000.00 -5000.00 3000.00 8000.00 ;
+C 77; N timesig-old9_4; B -3000.00 -5000.00 3000.00 8000.00 ;

 EndCharMetrics
 EndFontMetrics
 EndCharMetrics
 EndFontMetrics

diff --git a/mf/out/feta19.afm b/mf/out/feta19.afm
index 34cfa447226f8914a591b692a96715d931bd6560..484905b5362fa0cb44c07dd457acae8967e92a41 100644 (file)
--- a/mf/out/feta19.afm
+++ b/mf/out/feta19.afm
@@ -72,5 +72,12 @@ C 67; N clefs-bass; B -2375.00 -11875.00 17100.04 4750.00 ;
 C 68; N clefs-bass_change; B -1900.04 -9500.05 13680.05 3800.02 ;
 C 69; N clefs-violin; B -4139.30 -14250.00 17751.40 23750.00 ;
 C 70; N clefs-violin_change; B -3596.45 -11400.05 13916.18 19000.09 ;
 C 68; N clefs-bass_change; B -1900.04 -9500.05 13680.05 3800.02 ;
 C 69; N clefs-violin; B -4139.30 -14250.00 17751.40 23750.00 ;
 C 70; N clefs-violin_change; B -3596.45 -11400.05 13916.18 19000.09 ;

+C 71; N timesig-C; B -3800.02 -4750.00 3324.98 4750.00 ;
+C 72; N timesig-C2; B -3800.02 -6649.98 3324.98 6649.98 ;
+C 73; N timesig-oldC; B -3562.50 -3562.50 3562.50 3562.50 ;
+C 74; N timesig-oldC2; B -3562.50 -4750.00 3562.50 4750.00 ;
+C 75; N timesig-old3_2; B -3562.50 -3562.50 3562.50 3562.50 ;
+C 76; N timesig-old6_4; B -3562.50 -5937.50 3562.50 9500.00 ;
+C 77; N timesig-old9_4; B -3562.50 -5937.50 3562.50 9500.00 ;

 EndCharMetrics
 EndFontMetrics
 EndCharMetrics
 EndFontMetrics

diff --git a/mf/out/feta20.afm b/mf/out/feta20.afm
index 07717c21510935a9ff30ed6866417789ec71d46d..271f7a999e07849b98c9e7ee1b97deb2ca9759df 100644 (file)
--- a/mf/out/feta20.afm
+++ b/mf/out/feta20.afm
@@ -72,5 +72,12 @@ C 67; N clefs-bass; B -2500.00 -12500.00 18000.03 5000.00 ;
 C 68; N clefs-bass_change; B -2000.05 -10000.05 14400.04 4000.02 ;
 C 69; N clefs-violin; B -4357.15 -15000.00 18685.68 25000.00 ;
 C 70; N clefs-violin_change; B -3785.74 -12000.05 14648.60 20000.08 ;
 C 68; N clefs-bass_change; B -2000.05 -10000.05 14400.04 4000.02 ;
 C 69; N clefs-violin; B -4357.15 -15000.00 18685.68 25000.00 ;
 C 70; N clefs-violin_change; B -3785.74 -12000.05 14648.60 20000.08 ;

+C 71; N timesig-C; B -4000.02 -5000.00 3499.98 5000.00 ;
+C 72; N timesig-C2; B -4000.02 -6999.97 3499.98 6999.97 ;
+C 73; N timesig-oldC; B -3750.00 -3750.00 3750.00 3750.00 ;
+C 74; N timesig-oldC2; B -3750.00 -5000.00 3750.00 5000.00 ;
+C 75; N timesig-old3_2; B -3750.00 -3750.00 3750.00 3750.00 ;
+C 76; N timesig-old6_4; B -3750.00 -6250.00 3750.00 10000.00 ;
+C 77; N timesig-old9_4; B -3750.00 -6250.00 3750.00 10000.00 ;

 EndCharMetrics
 EndFontMetrics
 EndCharMetrics
 EndFontMetrics

diff --git a/mf/out/feta23.afm b/mf/out/feta23.afm
index 54d662faf9c83724d427b6e5bb554b6c24d19558..0e07d2b96cb5aa8203a5d7eade35ae0cb3281873 100644 (file)
--- a/mf/out/feta23.afm
+++ b/mf/out/feta23.afm
@@ -72,5 +72,12 @@ C 67; N clefs-bass; B -2812.50 -14062.50 20250.03 5625.00 ;
 C 68; N clefs-bass_change; B -2250.05 -11250.05 16200.04 4500.02 ;
 C 69; N clefs-violin; B -4901.80 -16875.00 21021.40 28125.00 ;
 C 70; N clefs-violin_change; B -4258.94 -13500.05 16479.68 22500.08 ;
 C 68; N clefs-bass_change; B -2250.05 -11250.05 16200.04 4500.02 ;
 C 69; N clefs-violin; B -4901.80 -16875.00 21021.40 28125.00 ;
 C 70; N clefs-violin_change; B -4258.94 -13500.05 16479.68 22500.08 ;

+C 71; N timesig-C; B -4500.02 -5625.00 3937.48 5625.00 ;
+C 72; N timesig-C2; B -4500.02 -7874.97 3937.48 7874.97 ;
+C 73; N timesig-oldC; B -4218.75 -4218.75 4218.75 4218.75 ;
+C 74; N timesig-oldC2; B -4218.75 -5625.00 4218.75 5625.00 ;
+C 75; N timesig-old3_2; B -4218.75 -4218.75 4218.75 4218.75 ;
+C 76; N timesig-old6_4; B -4218.75 -7031.25 4218.75 11250.00 ;
+C 77; N timesig-old9_4; B -4218.75 -7031.25 4218.75 11250.00 ;

 EndCharMetrics
 EndFontMetrics
 EndCharMetrics
 EndFontMetrics

diff --git a/mf/out/feta26.afm b/mf/out/feta26.afm
index dc5c64e84cb1cd97ffa4103c833f3ef620b9c942..d302492127660592e15ab88dc957363db2de3142 100644 (file)
--- a/mf/out/feta26.afm
+++ b/mf/out/feta26.afm
@@ -72,5 +72,12 @@ C 67; N clefs-bass; B -3250.00 -16250.00 23400.04 6500.00 ;
 C 68; N clefs-bass_change; B -2600.07 -13000.08 18720.08 5200.03 ;
 C 69; N clefs-violin; B -5664.29 -19500.00 24291.40 32500.00 ;
 C 70; N clefs-violin_change; B -4921.46 -15600.08 19043.21 26000.14 ;
 C 68; N clefs-bass_change; B -2600.07 -13000.08 18720.08 5200.03 ;
 C 69; N clefs-violin; B -5664.29 -19500.00 24291.40 32500.00 ;
 C 70; N clefs-violin_change; B -4921.46 -15600.08 19043.21 26000.14 ;

+C 71; N timesig-C; B -5200.03 -6500.00 4549.99 6500.00 ;
+C 72; N timesig-C2; B -5200.03 -9099.96 4549.99 9099.96 ;
+C 73; N timesig-oldC; B -4875.00 -4875.00 4875.00 4875.00 ;
+C 74; N timesig-oldC2; B -4875.00 -6500.00 4875.00 6500.00 ;
+C 75; N timesig-old3_2; B -4875.00 -4875.00 4875.00 4875.00 ;
+C 76; N timesig-old6_4; B -4875.00 -8125.00 4875.00 13000.00 ;
+C 77; N timesig-old9_4; B -4875.00 -8125.00 4875.00 13000.00 ;

 EndCharMetrics
 EndFontMetrics
 EndCharMetrics
 EndFontMetrics

diff --git a/scripts/ly2dvi32.py b/scripts/ly2dvi32.py
index 7f801b7a18c163071ff58cef99734a9a97220ade..40f1e157db939e84f4c80b80ee206c8ab18449d1 100644 (file)
--- a/scripts/ly2dvi32.py
+++ b/scripts/ly2dvi32.py
@@ -15,6 +15,7 @@ Output: DVI file
 
 name = 'ly2dvi'
 version = '0.0.4'
 
 name = 'ly2dvi'
 version = '0.0.4'

+errorlog = ''

 
 import sys
 import os
 
 import sys
 import os


@@ -504,10 +505,11 @@ class Properties:
         """
 
         path =''
         """
 
         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
         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')
             path = os.path.join(this.get('root'), 'texmf', 'tex',
                                 'lilypond', var)
        fd = open(path, 'r')

diff --git a/scripts/mudela-book.py b/scripts/mudela-book.py
index 911539b71641e86c865f40d03df7e8afa21f18e2..359d68b326958e1b1e544ceac7bd6e5f931b6f7f 100644 (file)
--- a/scripts/mudela-book.py
+++ b/scripts/mudela-book.py
@@ -1,5 +1,4 @@
-
-# python version of mudela-book.  WIP.
+#!@PYTHON@

 
 #  TODO: center option
 
 
 #  TODO: center option
 

diff --git a/stepmake/NEWS b/stepmake/NEWS
index 9c93e9697d2c3becd02ba482fa3232fc44cad509..2dbb0532e274e855a87b2643fee672bcc6f7e219 100644 (file)
--- a/stepmake/NEWS
+++ b/stepmake/NEWS
@@ -1,3 +1,5 @@
+pl 53
+       - moved TeX stuff into tex template

 pl 52
        - striproff
        - reeable $(PACKAGE)_LIBES,_INCLUDES
 pl 52
        - striproff
        - reeable $(PACKAGE)_LIBES,_INCLUDES

diff --git a/stepmake/VERSION b/stepmake/VERSION
index 0724c08a8936cc2ba9ced75d4ff59c79a93438e8..58e4ed00c01e66a2d56c03fb50a12225b398b8bf 100644 (file)
--- a/stepmake/VERSION
+++ b/stepmake/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=StepMake
 MAJOR_VERSION=0
 MINOR_VERSION=1
 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:
 MY_PATCH_LEVEL=
 
 # use the above to send patches, always empty for released version:

diff --git a/stepmake/make/out/stepmake.lsm b/stepmake/make/out/stepmake.lsm
index ead3d16fe65139e8b8464c96dcbf14dfcb6ab8e3..0e0ce4505c6408218da46e6f2e5a9ae90757da10 100644 (file)
--- a/stepmake/make/out/stepmake.lsm
+++ b/stepmake/make/out/stepmake.lsm
@@ -1,15 +1,15 @@
 Begin3
 Title: StepMake
 Begin3
 Title: StepMake

-Version: 0.1.52
-Entered-date: 24SEP98
+Version: 0.1.53
+Entered-date: 29SEP98

 Description: 
 Keywords: music notation typesetting midi fonts engraving
 Author: janneke@gnu.org (Jan Nieuwenhuizen)
        hanwen@cs.ruu.nl (Han-Wen Nienhuys)
 Maintained-by: janneke@gnu.org (Jan Nieuwenhuizen)
 Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert
 Description: 
 Keywords: music notation typesetting midi fonts engraving
 Author: janneke@gnu.org (Jan Nieuwenhuizen)
        hanwen@cs.ruu.nl (Han-Wen Nienhuys)
 Maintained-by: janneke@gnu.org (Jan Nieuwenhuizen)
 Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert

-       40k stepmake-0.1.52.tar.gz 
+       40k stepmake-0.1.53.tar.gz 

 Original-site: pcnov095.win.tue.nl /pub/lilypond/development/
 Original-site: pcnov095.win.tue.nl /pub/lilypond/development/

-       40k stepmake-0.1.52.tar.gz 
+       40k stepmake-0.1.53.tar.gz 

 Copying-policy: GPL
 End
 Copying-policy: GPL
 End

diff --git a/stepmake/make/out/stepmake.spec b/stepmake/make/out/stepmake.spec
index 7ba65fcfceece120db751f5ddd79f1b6a14aa04b..805479cac1c13d7ebaa425252be9cd99bd533c6b 100644 (file)
--- a/stepmake/make/out/stepmake.spec
+++ b/stepmake/make/out/stepmake.spec
@@ -1,9 +1,9 @@
 Name: stepmake
 Name: stepmake

-Version: 0.1.52
+Version: 0.1.53

 Release: 1
 Copyright: GPL
 Group: Development
 Release: 1
 Copyright: GPL
 Group: Development

-Source0: pcnov095.win.tue.nl:/pub/lilypond/development/stepmake-0.1.52.tar.gz
+Source0: pcnov095.win.tue.nl:/pub/lilypond/development/stepmake-0.1.53.tar.gz

 Summary: generic make package
 Packager: janneke@gnu.org (Jan Nieuwenhuizen)
 Buildroot: /tmp/stepmake-install
 Summary: generic make package
 Packager: janneke@gnu.org (Jan Nieuwenhuizen)
 Buildroot: /tmp/stepmake-install

diff --git a/stepmake/stepmake/generic-rules.make b/stepmake/stepmake/generic-rules.make
index fb05e13e3a640ce515e482ba76d1e52817ce952a..48b0a0983d265d8fa5dabcb58783700b0ac95961 100644 (file)
--- a/stepmake/stepmake/generic-rules.make
+++ b/stepmake/stepmake/generic-rules.make
@@ -15,18 +15,3 @@ $(outdir)/%: %.m4
 %.gz: %
        gzip -c9 $< > $@
 
 %.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 --git a/stepmake/stepmake/tex-rules.make b/stepmake/stepmake/tex-rules.make
new file mode 100644 (file)
index 0000000..96f2bd0
--- /dev/null
+++ b/stepmake/stepmake/tex-rules.make
@@ -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 --git a/stepmake/stepmake/tex-targets.make b/stepmake/stepmake/tex-targets.make
new file mode 100644 (file)
index 0000000..215aa61
--- /dev/null
+++ b/stepmake/stepmake/tex-targets.make
@@ -0,0 +1,2 @@
+
+# also empty

diff --git a/stepmake/stepmake/tex-vars.make b/stepmake/stepmake/tex-vars.make
new file mode 100644 (file)
index 0000000..841db19
--- /dev/null
+++ b/stepmake/stepmake/tex-vars.make
@@ -0,0 +1,2 @@
+
+#empty