From 9855a3fdc9b2076a75c9ece2685149af85308b97 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 17 Jul 2003 12:23:25 +0000 Subject: [PATCH] * stepmake/stepmake/metafont-rules.make: backport 1.7 fixes. * scripts/etf2ly.py: backport 1.7.24 fixes. * Documentation/topdocs/INSTALL.texi (Top): idem. * Documentation/topdocs/README.texi (Top): change to ftp.lilypond.org --- ChangeLog | 10 ++++ Documentation/topdocs/INSTALL.texi | 27 ++-------- Documentation/topdocs/README.texi | 2 +- Documentation/user/lilypond-book.itely | 14 ++--- VERSION | 2 +- input/regression/chord-tremolo.ly | 5 +- scripts/etf2ly.py | 71 +++++++++++++++++--------- stepmake/stepmake/metafont-rules.make | 8 ++- 8 files changed, 80 insertions(+), 59 deletions(-) diff --git a/ChangeLog b/ChangeLog index d1851fc174..5cd944c7af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2003-07-17 Han-Wen Nienhuys + + * stepmake/stepmake/metafont-rules.make: backport 1.7 fixes. + + * scripts/etf2ly.py: backport 1.7.24 fixes. + + * Documentation/topdocs/INSTALL.texi (Top): idem. + + * Documentation/topdocs/README.texi (Top): change to ftp.lilypond.org + 2003-07-14 Han-Wen Nienhuys * lily/main.cc (notice): change FSF address diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index 2ca95a60e4..dff86a5c58 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -41,12 +41,9 @@ packages if these are available for your platform. @item Download development releases from @c Hmm, these won't show up in lilypond.org/stats @c Otoh, lilypond.org is not updated when release mail arrives -@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/} by FTP and -@uref{http://ftp.cs.uu.nl/pub/GNU/LilyPond/}, by HTTP. -@item @uref{ftp://sca.uwaterloo.ca/pub/} by FTP (Canadian mirror) -@item at @code{lilypond.org} @uref{ftp://ftp.lilypond.org/pub/LilyPond/} by FTP and @uref{http://www.lilypond.org/ftp/} by HTTP. +@item @uref{ftp://sca.uwaterloo.ca/pub/} by FTP (Canadian mirror) @end itemize @@ -349,12 +346,7 @@ file. @subsection Red Hat Linux -Red Hat 7.x i386 RPMS are available from -@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/binaries/}. For running on -a Red Hat system you need these packages: guile, tetex, tetex-latex, -tetex-dvips, libstdc++, python, ghostscript. - -You can also compile them yourself. A spec file is in +A spec file is in @file{make/out/lilypond.redhat.spec}. This file is distributed along with the sources. You can make the rpm by issuing @example @@ -371,22 +363,13 @@ addition to the those needed for running: glibc-devel, gcc-c++, libstdc++-devel, guile-devel, flex, bison, texinfo, groff, mftrace, netpbm-progs, autotrace, t1utils. +For running on a Red Hat system you need these packages: guile, tetex, +tetex-latex, tetex-dvips, libstdc++, python, ghostscript. -@subsection LinuxPPC - - -Some LinuxPPC RPMS should available from -@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/binaries/}. - -A LinuxPPC RPM can be made using the @file{lilypond.redhat.spec} file. - @subsection SuSE -Some SUSE RPMS should available from -@uref{ftp://ftp.lilypond.org/pub/LilyPond/binaries/SuSE}. - -You can also compile a RPM for SUSE yourself. A spec file is in +You can compile a RPM for SUSE yourself. A spec file is in @file{make/out/lilypond.suse.spec}, see the instructions for building the Red Hat RPM. diff --git a/Documentation/topdocs/README.texi b/Documentation/topdocs/README.texi index ba4f471873..667fa1c6a0 100644 --- a/Documentation/topdocs/README.texi +++ b/Documentation/topdocs/README.texi @@ -27,7 +27,7 @@ Version 1.6 is the latest stable release. @section Downloading The primary download site for sourcecode is -@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/}. +@uref{ftp://ftp.lilypond.org/pub/LilyPond/}. If you have a slow connection, then you are advised to use @uref{ftp://ftp.xcf.berkeley.edu/pub/xdelta/,xdelta} for patching diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely index 1b23cbd4a2..cbfed83278 100644 --- a/Documentation/user/lilypond-book.itely +++ b/Documentation/user/lilypond-book.itely @@ -30,11 +30,11 @@ It can work on La@TeX{}, @code{html} or texinfo documents. A tutorial on using lilypond-book is in @ref{Integrating text and music}. @menu -* Integrating Texinfo and music:: -* Integrating La@TeX{} and music:: -* Integrating HTML and music:: -* Music fragment options:: -* Invoking lilypond-book:: +* Integrating Texinfo and music:: +* Integrating LaTeX and music:: +* Integrating HTML and music:: +* Music fragment options:: +* Invoking lilypond-book:: @end menu @@ -102,8 +102,8 @@ When producing texinfo, lilypond-book also generates bitmaps of the music, so you can make a HTML document with embedded music. -@node Integrating La@TeX{} and music -@section Integrating La@TeX{} and music +@node Integrating LaTeX and music +@section Integrating LaTeX and music You specify LilyPond code like this: diff --git a/VERSION b/VERSION index 9dbb7f861b..a777164567 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=6 -PATCH_LEVEL=10 +PATCH_LEVEL=11 MY_PATCH_LEVEL= # Use the above to send patches: MY_PATCH_LEVEL is always empty for a diff --git a/input/regression/chord-tremolo.ly b/input/regression/chord-tremolo.ly index 391443d5af..eeb130894c 100644 --- a/input/regression/chord-tremolo.ly +++ b/input/regression/chord-tremolo.ly @@ -1,4 +1,4 @@ -\version "1.7.18" +\version "1.6.11" \header{ texidoc=" @@ -37,7 +37,6 @@ In this example, each tremolo lasts exactly one measure. c4 c4 c4 c4 c4 } - + \paper {} \midi { } } -%% new-chords-done %% diff --git a/scripts/etf2ly.py b/scripts/etf2ly.py index 4219f1d8df..b2742e6d0a 100644 --- a/scripts/etf2ly.py +++ b/scripts/etf2ly.py @@ -75,19 +75,31 @@ def transpose(orig, delta): -# find transposition of C-major scale that belongs here. def interpret_finale_key_sig (finale_id): + """ +find the transposition of C-major scale that belongs here. + +we are not going to insert the correct major/minor, we only want to +have the correct number of accidentals +""" + p = (0,0) - if 0 <= finale_id < 7: - while finale_id > 0: + + + bank_number = finale_id >> 8 + accidental_bits = finale_id & 0xff + + if 0 <= accidental_bits < 7: + while accidental_bits > 0: p = transpose (p, (4,0)) # a fifth up - finale_id = finale_id - 1 - elif 248 < finale_id <= 255: - while finale_id < 256: + accidental_bits = accidental_bits - 1 + elif 248 < accidental_bits <= 255: + while accidental_bits < 256: p = transpose (p, (3,0)) - finale_id = finale_id + 1 - + accidental_bits = accidental_bits + 1 + p = (p[0] % 7, p[1]) + return p # should cache this. @@ -233,8 +245,9 @@ class Slur: if not cs or not ce: raise IndexError - cs.note_suffix = '(' + cs.note_suffix - ce.note_prefix = ce.note_prefix + ')' + cs.note_suffix = '-(' + cs.note_suffix + ce.note_suffix = ce.note_suffix + '-)' + except IndexError: sys.stderr.write ("""\nHuh? Slur no %d between (%d,%d), with %d notes""" % (self.number, startnote, endnote, len (chords))) @@ -243,7 +256,7 @@ class Global_measure: def __init__ (self, number): self.timesig = '' self.number = number - self.keysignature = None + self.key_signature = None self.scale = None self.force_break = 0 @@ -256,16 +269,22 @@ class Global_measure: def set_timesig (self, finale): (beats, fdur) = finale (log, dots) = EDU_to_duration (fdur) + + if dots == 1: + beats = beats * 3 + log = log * 2 + dots = 0 + if dots <> 0: - sys.stderr.write ("\nHuh? Beat duration has a dot? (EDU Duration = %d)" % fdur) + sys.stderr.write ("\nHuh? Beat duration has dots? (EDU Duration = %d)" % fdur) self.timesig = (beats, log) def length (self): return self.timesig - def set_keysig (self, finale): + def set_key_sig (self, finale): k = interpret_finale_key_sig (finale) - self.keysignature = k + self.key_signature = k self.scale = find_scale (k) def set_flags (self,flag1, flag2): @@ -483,9 +502,11 @@ class Staff: e = '' if g: - if last_key <> g.keysignature: - e = e + "\\key %s \\major " % lily_notename (g.keysignature) - last_key = g.keysignature + if last_key <> g.key_signature: + pitch= g.key_signature + e = e + "\\key %s \\major " % (lily_notename (pitch)) + + last_key = g.key_signature if last_time <> g.timesig : e = e + "\\time %d/%d " % g.timesig last_time = g.timesig @@ -700,15 +721,18 @@ class Chord: if rest: nn = rest - s = s + '%s%d%s' % (nn, self.duration[0], '.'* self.duration[1]) + s = s + nn if not self.pitches: - s = 'r%d%s' % (self.duration[0] , '.'* self.duration[1]) - s = self.note_prefix + s + self.note_suffix + s = 'r' if len (self.pitches) > 1: - s = '<%s>' % s + s = '<< %s >>' % s + + s = s + '%d%s' % (self.duration[0], '.'* self.duration[1]) + s = self.note_prefix + s + self.note_suffix s = self.chord_prefix + s + self.chord_suffix + return s @@ -934,7 +958,8 @@ class Etf_file: measno = indices[0] keynum = contents[1] meas =self. get_global_measure (measno) - meas.set_keysig (keynum) + + meas.set_key_sig (keynum) beats = contents[2] beatlen = contents[3] @@ -1113,7 +1138,7 @@ This is free software. It is covered by the GNU General Public License, and you are welcome to change it and/or distribute copies of it under certain conditions. Invoke as `midi2ly --warranty' for more information. -Copyright (c) 2000 by Han-Wen Nienhuys +Copyright (c) 2000--2003 by Han-Wen Nienhuys """ % version) diff --git a/stepmake/stepmake/metafont-rules.make b/stepmake/stepmake/metafont-rules.make index a04fdf158c..7adeba2992 100644 --- a/stepmake/stepmake/metafont-rules.make +++ b/stepmake/stepmake/metafont-rules.make @@ -8,6 +8,7 @@ $(outdir)/%.dvi: %.mf mv $(basename $<).dvi $(outdir) rm $(basename $<).*gf +# This is not metafont, this is feta-specific $(outdir)/%.log: %.mf $(METAFONT) $< mv $(@F) $@ @@ -28,12 +29,15 @@ $(outdir)/%.$(XPM_RESOLUTION)pk: $(outdir)/%.$(XPM_RESOLUTION)gf gftopk $< $@ +ENCODINGFILE=$(wildcard $(outdir)/$(patsubst %.mf,%.enc,$<)) +ENCODINGOPTION=$(if $(ENCODINGFILE),--encoding=$(ENCODINGFILE),) $(outdir)/%.pfa: %.mf - $(MFTRACE) -I $(outdir)/ --pfa --simplify --keep-trying $(basename $(@F)) + $(MFTRACE) $(ENCODINGOPTION) -I $(outdir)/ --pfa --simplify --keep-trying $(basename $(@F)) mv $(basename $(@F)).pfa $(outdir) $(outdir)/%.pfb: %.mf - $(MFTRACE) -I $(outdir)/ --pfb --simplify --keep-trying $(basename $(@F)) + $(MFTRACE) -I $(outdir)/ --pfa --pfb --simplify --keep-trying $(basename $(@F)) + -mv $(basename $(@F)).pfa $(outdir) mv $(basename $(@F)).pfb $(outdir) #%.afm: -- 2.39.5