release commit

diff --git a/ChangeLog b/ChangeLog
index e140d0c2f92f84205f75fa538c55b34ebe44c4d5..9dee6cc915a3055cf0668e8c3c1ace514e1a3ae9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-02  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
+
+       * input/mutopia/J.S.Bach/baerenreiter-sarabande.ly: corrections
+       and syntax updates.
+
 2003-05-01  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * mf/feta-toevallig.mf: revamp flat symbol: use less points,

diff --git a/Documentation/user/preface.itely b/Documentation/user/preface.itely
index d995952ec7e6ea56a596945cbdfa36a978ad9a34..95d1cb7a57d7c41b257116976f3cc82b4a7f3d06 100644 (file)
--- 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 7ec1a0131fd164c801083b3479317a1a098c7244..f9f335d9acb524b4330df7c48626e6c48ed81e5e 100644 (file)
--- 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 b05de0741760589a7ab96bdf5bf25a89cd7a93fc..9f2099b90b9b3d1a44b628f081481a74d4921c73 100644 (file)
--- 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 73e0931e91b5afa58d02eedddbba0c7c1da5a8dd..c60ffdfa9a9c86edae0f25a7120a00af313e2b5c 100644 (file)
--- 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 c20f8cdd6fa92135e9e81287ef54179130298427..4dac75fa07961e2aa1ca6292499f9fd6e1eeb1d7 100644 (file)
--- 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 6b5f4eeac6db65e5d6900287cecc71c4d3575f51..b7fa060b85fc14283da12fd2a64df63204e6266a 100644 (file)
--- 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 887f2abca9933a056996df791f0974a8303fecf9..6b3ca8f99759c3f613758476fead1b1364b30fa2 100644 (file)
--- 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 4cced0ea8e028f8bbfc362c0b69f85bdf4ebd4d4..4ce7fde472aceb438d3217d613133cd61a13e1bb 100644 (file)
--- 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 b71a662fc9d23d6f2780e9f48afb745a7b368518..c816004ff7a4ff38b47b3c0ebcd48c0d295fba1c 100644 (file)
--- 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 <<a
-       \translator Staff=upper \stemDown
-       a'>>4.
+       fis8 \translator Staff=lower \stemUp c' b4 \stemDown
+       \translator Staff=upper <<a a'>>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 76b5e016e871730c8134d201b338fa17d008a5ff..60c969441c5753d42e953ebf9c788a732a6f2cf4 100644 (file)
--- 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 64ebdd5ba2387d98d1d287c8db96d6a37f562ce9..1a40ec82234298b0fb2c1ee167a0e5773933cbe4 100644 (file)
--- 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 b25116010344c6f2b280436c6d0bdb41d84e2523..4f32d1dd67bd66a8f7b19d3c57fdb68db201edf1 100644 (file)
--- 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 7e43bb8e1d1fc905d6215ae057c1e5ecc74d7623..9e696adb8d0fa5d22164fbfa7fe6024c1541a3c5 100644 (file)
--- 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 38d94611531f99796efe0de5dacf4ddf757e3708..a3a313758baaa51a7699c22adabf3b2fef3d6b20 100644 (file)
--- 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 fea9750d4c8575155364660b543aba56d42758ff..5d1b35d46cbad88bade76ee48ed6f9c3c34fd044 100644 (file)
--- 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