From: Han-Wen Nienhuys Date: Fri, 2 May 2003 14:41:29 +0000 (+0000) Subject: release commit X-Git-Tag: release/1.7.18 X-Git-Url: https://git.donarmstrong.com/?p=lilypond.git;a=commitdiff_plain;h=ca2d0a9a20ea2aef0065c10b52319e520a680871 release commit --- diff --git a/ChangeLog b/ChangeLog index e140d0c2f9..9dee6cc915 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-05-02 Han-Wen Nienhuys + + * input/mutopia/J.S.Bach/baerenreiter-sarabande.ly: corrections + and syntax updates. + 2003-05-01 Han-Wen Nienhuys * mf/feta-toevallig.mf: revamp flat symbol: use less points, diff --git a/Documentation/user/preface.itely b/Documentation/user/preface.itely index d995952ec7..95d1cb7a57 100644 --- a/Documentation/user/preface.itely +++ b/Documentation/user/preface.itely @@ -33,6 +33,7 @@ rewrite the chord name support [wie meer?] +Han-Wen and Jan, Utrecht/Eindhoven, April/May 2003 @node Preface to version 1.6 diff --git a/VERSION b/VERSION index 7ec1a0131f..f9f335d9ac 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=7 -PATCH_LEVEL=17 +PATCH_LEVEL=18 MY_PATCH_LEVEL= # Use the above to send patches: MY_PATCH_LEVEL is always empty for a diff --git a/buildscripts/lys-to-tely.py b/buildscripts/lys-to-tely.py index b05de07417..9f2099b90b 100644 --- a/buildscripts/lys-to-tely.py +++ b/buildscripts/lys-to-tely.py @@ -61,6 +61,7 @@ if files: s = '''\input texinfo @setfilename %s.info @settitle %s +@finalout @c we do not want black boxes. @c fool ls-latex @ignore diff --git a/input/GNUmakefile b/input/GNUmakefile index 73e0931e91..c60ffdfa9a 100644 --- a/input/GNUmakefile +++ b/input/GNUmakefile @@ -3,7 +3,8 @@ depth = .. SUBDIRS=test regression tutorial no-notation ascii-art template mutopia # nereides is tweaked a lot, can't do (read webpage) -examples= # size13 size26 + +examples= #examples+=size11 size13 size16 size20 size23 size26 LOCALSTEPMAKE_TEMPLATES=ly mutopia diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/header.ly b/input/mutopia/J.S.Bach/Petites-Preludes/header.ly index c20f8cdd6f..4dac75fa07 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/header.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/header.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.17" %{ Header for Petites Preludes. @@ -12,7 +12,7 @@ instrument = "Piano" \header{ - title = "Petites Pr\'eludes" + title = "Petites Pr\\'eludes" subtitle = "Clavierbuechlein" composer = "Johann Sebastian Bach (1685-1750)" enteredby = "JCN,HWN" @@ -28,7 +28,7 @@ instrument = "Piano" style = "Baroque" copyright = "Public Domain" maintainer = "Jan Nieuwenhuizen" - maintainer_email = "janneke@gnu.org" + maintainerEmail = "janneke@gnu.org" lastupdated = "2001/Feb/25" mutopiapublicdomain = "\\parbox{\hsize}{\\thefooter\\quad\\small \\\\This music is part of the Mutopia project, diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly index 6b5f4eeac6..b7fa060b85 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly @@ -18,7 +18,7 @@ Lemoine puts fermatas on ending bar lines everywhere. -\version "1.7.6" +\version "1.7.17" lowstaff = \translator "Staff" = "lower" diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly index 887f2abca9..6b3ca8f997 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly @@ -4,7 +4,7 @@ opus= "BWV 939" piece = "2" -\version "1.7.6" +\version "1.7.17" upper = \context Staff \notes\relative c{ \context Voice=i \property Voice.TextScript \set #'font-style = #'italic diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly index 4cced0ea8e..4ce7fde472 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly @@ -14,7 +14,7 @@ note, some have dotted half notes. This file was partly generated using m4. %} -\version "1.7.6" +\version "1.7.17" upper = \notes \transpose c c' { diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly index b71a662fc9..c816004ff7 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly @@ -1,15 +1,10 @@ -#(ly:set-point-and-click! 'line-column) +#(ly:set-point-and-click 'line-column) opus = "BWV 925" piece = "4" -\version "1.7.6" +\version "1.7.17" -%{ - -This stretches LilyPond capabilities a little. - -%} one = \context Staff \notes\relative c { \context Voice=i @@ -108,9 +103,8 @@ two = \context Staff \notes\relative c{ \translator Staff=upper \stemDown\tieDown d'8. ~ d8 c d4 a8 g | %15 - fis8 \translator Staff=lower \stemUp c' b4 \stemDown <>4. + fis8 \translator Staff=lower \stemUp c' b4 \stemDown + \translator Staff=upper <>4. \stemDown\tieDown a'8~ | a g~ g16 e fis8~ fis16 d8.~ d8. cis!16 | diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly index 76b5e016e8..60c969441c 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly @@ -3,7 +3,7 @@ piece = "5" opus = "BWV 926" -\version "1.7.6" +\version "1.7.17" upper = \context Staff \notes\relative c \context Voice=i { diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly index 64ebdd5ba2..1a40ec8223 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly @@ -3,7 +3,7 @@ opus = "BWV 940" piece = "6" -\version "1.7.6" +\version "1.7.17" diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly index b251160103..4f32d1dd67 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly +++ b/input/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly @@ -1,4 +1,4 @@ -\version "1.7.6" +\version "1.7.17" % This is the main score file of the Petites Preludes \include "header.ly" @@ -11,4 +11,5 @@ \include "preludes-4.ly" \include "preludes-5.ly" \include "preludes-6.ly" + %% new-chords-done %% diff --git a/make/lysdoc-rules.make b/make/lysdoc-rules.make index 7e43bb8e1d..9e696adb8d 100644 --- a/make/lysdoc-rules.make +++ b/make/lysdoc-rules.make @@ -1,6 +1,6 @@ -$(outdir)/$(NAME).tely: $(LY_FILES) +$(outdir)/collated-files.tely: $(LY_FILES) $(PYTHON) ../../buildscripts/lys-to-tely.py --name=$(outdir)/collated-files --title="$(TITLE)" $(LY_FILES) diff --git a/make/lysdoc-targets.make b/make/lysdoc-targets.make index 38d9461153..a3a313758b 100644 --- a/make/lysdoc-targets.make +++ b/make/lysdoc-targets.make @@ -1,2 +1,3 @@ + local-WWW: $(outdir)/$(NAME).html $(outdir)/$(NAME).ps.gz $(outdir)/$(NAME).pdf diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index fea9750d4c..5d1b35d46c 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -1072,7 +1072,13 @@ def schedule_lilypond_block (chunk): for o in opts: m= re.match ("filename=(.*)", o) if m: - newbody = newbody + get_output ("output-filename") % (m.group (1), basename + '.ly', m.group (1)) + template = get_output ("output-filename") + b = basename + '.ly' + human_base = os.path.basename (m.group (1)) + + ## todo: include path, but strip + ## first part of the path. + newbody = newbody + template % (human_base, b,human_base) break