patch::: 1.5.9.jcn2

1.5.9.jcn2

diff --git a/CHANGES b/CHANGES
index d6557c51e8409f27a726002f4ae96e4bd4172023..1171d0b1a0257371f8346923fd450f6f1e0352f8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,14 @@
-1.5.9.jcn1
+1.5.9.jcn2
 ==========
 
+* add-html-footer.py: remove href to self.  Substitute @at-variables@
+defined in html comments.  Any occurrence of
+
+   <!-- @foo@=bar -->
+
+in the html page, will subsequently substitute any occurrence of @foo@
+in the same html page with `bar'.
+
 * Bugfix: update-lily: remove unprotected gettext.py include.
 
 * po update.

diff --git a/Documentation/header.html.in b/Documentation/header.html.in
index 481ad838c6043f8826b0d79080fd97f20b2e1ffb..4f6e3c635d09b71ec85dc3c5c4b788b3e188695b 100644 (file)
--- a/Documentation/header.html.in
+++ b/Documentation/header.html.in
@@ -29,7 +29,7 @@ which substitutes some @AT_VARIABLES@ as well.
      </td>
     <td align=center valign=middle width="80%" bgcolor="#e8ffe8">
       <h1>GNU LilyPond</h1>
-      <h2>Welcome to the home of the GNU Music Typesetter</h2>
+      <h2>@WEB-TITLE@</h2>
     </td>
   </tr>
 
@@ -41,7 +41,7 @@ which substitutes some @AT_VARIABLES@ as well.
       <b>What is LilyPond</b>
       </td></tr>
       <tr><td><font size="-1">
-       <a href="@TOP@index.html#everyone">General information</a><br>
+       <a href="@TOP@index.html">General information</a><br>
        <a href="@TOP@short-examples.html">Simple examples</a><br>
        <a href="@TOP@long-examples.html">Complex examples</a><br>
       </font></td></tr>
@@ -49,8 +49,8 @@ which substitutes some @AT_VARIABLES@ as well.
        <b>Download </b>
       </td></tr>
       <tr><td><font size="-1">
-       <a href="@TOP@Documentation/topdocs/out-www/INSTALL.html#download-binaries">Linux</a><br>
-       <a href="@TOP@Documentation/windows/out-www/installing.html">Windows</a><br>
+       <a href="@TOP@Documentation/topdocs/out-www/INSTALL.html#download-binaries">GNU/Linux binaries</a><br>
+       <a href="@TOP@Documentation/windows/out-www/installing.html">GNU/Windows binaries</a><br>
        <a href="@TOP@Documentation/topdocs/out-www/INSTALL.html#download-source">Source code</a><br>
       </font></td></tr>
       <tr><td bgcolor="#e8e8ff">

diff --git a/Documentation/index.texi b/Documentation/index.texi
index 1cd8739665a2909775720d9f2d2303e4191f3dfd..4b3fa34a8e2d3388fe58b57e54eadd5c50701d40 100644 (file)
--- a/Documentation/index.texi
+++ b/Documentation/index.texi
@@ -2,6 +2,10 @@
 @setfilename index.info
 @settitle Index to LilyPond documentation
 
+@html
+<!--- @@WEB-TITLE@@=Documentation --->
+@end html
+
 @node Top, , , (dir)
 @top
 

diff --git a/Documentation/regression-test.tely b/Documentation/regression-test.tely
index bed908046a03c252a2edf3ee0d04581700fc4eb7..623caf71893593a85ad34e673635be16f518a6eb 100644 (file)
--- a/Documentation/regression-test.tely
+++ b/Documentation/regression-test.tely
@@ -2,6 +2,10 @@
 @setfilename regression-test.info
 @settitle LilyPond Regression test
 
+@html
+<!--- @@WEB-TITLE@@=Regression Test --->
+@end html
+
 @c fool ls-latex
 @ignore
 @author Han-Wen Nienhuys and Jan Nieuwenhuizen

diff --git a/Documentation/topdocs/AUTHORS.texi b/Documentation/topdocs/AUTHORS.texi
index ae8064175e81e53290753522b0ea5b61c266c80a..01701732aa39490eae90130cf63306758c7bdb7d 100644 (file)
--- a/Documentation/topdocs/AUTHORS.texi
+++ b/Documentation/topdocs/AUTHORS.texi
@@ -2,6 +2,10 @@
 @setfilename AUTHORS.info
 @settitle AUTHORS - who did what on GNU LilyPond-
 
+@html
+<!--- @@WEB-TITLE@@=Authors --->
+@end html
+
 @node Top
 @top
 @menu

diff --git a/Documentation/topdocs/FAQ.texi b/Documentation/topdocs/FAQ.texi
index 3612f583d04b4378843689385c80b6ed62de133d..28d15edd696934e5a103b269358863283a795f96 100644 (file)
--- a/Documentation/topdocs/FAQ.texi
+++ b/Documentation/topdocs/FAQ.texi
@@ -2,6 +2,9 @@
 @setfilename FAQ.info
 @settitle FAQ - GNU LilyPond Frequently Asked Questions
 
+@html
+<!--- @@WEB-TITLE@@=Frequently Asked Questions --->
+@end html
 
 @node Top
 @chapter FAQ - GNU LilyPond Frequently Asked Questions

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 21f0b01f3c9d4da00952088336f123f89d1f34a9..24442f34b1bcaf89443175c2897dbadd300d6a5f 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -2,6 +2,10 @@
 @setfilename INSTALL.info
 @settitle INSTALL - compiling and installing GNU LilyPond
 
+@html
+<!--- @@WEB-TITLE@@=Installation Instructions --->
+@end html
+
 @node Top, , , (dir)
 @top
 

diff --git a/Documentation/topdocs/README.texi b/Documentation/topdocs/README.texi
index 2c97cb4c6c29ec12527fb58f796e69a5f1886f99..dbd1ffa5115048b0278a73a47818ddce2b1998bb 100644 (file)
--- a/Documentation/topdocs/README.texi
+++ b/Documentation/topdocs/README.texi
@@ -1,6 +1,11 @@
 \input texinfo @c -*-texinfo-*-
 @setfilename README.info
 @settitle This is the toplevel README to LilyPond
+
+@html
+<!--- @@WEB-TITLE@@=README --->
+@end html
+
 @node Top, , , 
 @top
 

diff --git a/Documentation/topdocs/index.tely b/Documentation/topdocs/index.tely
index e04df17b4e1117c53887f7df8481c471408eca66..4c407a2ebd5c6893669fab09eb0f76e5bea00ef7 100644 (file)
--- a/Documentation/topdocs/index.tely
+++ b/Documentation/topdocs/index.tely
@@ -2,6 +2,10 @@
 @setfilename index.info
 @settitle LilyPond homepage
 
+@html
+<!--- @@WEB-TITLE@@=Welcome to the home of the GNU Music Typesetter --->
+@end html
+
 @node Top, , , (dir)
 @top
 

diff --git a/Documentation/user/glossary.tely b/Documentation/user/glossary.tely
index c17523bf93a6136252781b43625eb00ed9518572..c2f7b5a74d6ca3ef5f6191e582a89ed8db2f31fb 100644 (file)
--- a/Documentation/user/glossary.tely
+++ b/Documentation/user/glossary.tely
@@ -1,6 +1,11 @@
 \input texinfo
 @setfilename glossary.info
 
+@html
+<!--- @@WEB-TITLE@@=Glossary --->
+@end html
+
+
 @c @pagesizes 10.3in
 
 @c @everyheading @| @thispage @|

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 375272f238eb88dc3db01dfa8c7d3d0d2e4c9245..ab708154150b66003e9a5586aad58e216bace366 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -2,6 +2,10 @@
 @setfilename lilypond.info
 @settitle GNU LilyPond
 
+@html
+<!--- @@WEB-TITLE@@=User Manual --->
+@end html
+
 
 @dircategory GNU music project
 @direntry

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index d76a9c9f64fce118c062ea2378ab7e72dd4165ff..6b9ac9828a7bc23a5232b106dd11b286b1bff370 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -17,6 +17,10 @@
 @node Reference Manual
 @chapter Reference Manual
 
+@html
+<!--- @@WEB-TITLE@@=Reference Manual --->
+@end html
+
 This document describes GNU LilyPond and its input format. The last
 revision of this document was made for LilyPond 1.4.1.  It supposes a
 passing familiarity with how LilyPond input works. New users are

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 1234406f2320db3a4c2ef221a360228944e25ddc..5bc98fe20fa9b1dc39a1df7aae277f6e65f124cd 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -2,10 +2,13 @@
 
 @c TODO: LilyPond LilyPond LilyPond
 
-
 @node Tutorial
 @chapter Tutorial
-  
+
+@html
+<!--- @@WEB-TITLE@@=Tutorial --->
+@end html
+
 @menu
 * First steps::                 Music language of LilyPond
 * Simple legend::               Small table of music language symbols

diff --git a/Documentation/windows/compiling.texi b/Documentation/windows/compiling.texi
index c15753522d28b52e1439d9200293ea9ce997998d..0db6f124dbcae349cd8607434b83c19ee7a5b94a 100644 (file)
--- a/Documentation/windows/compiling.texi
+++ b/Documentation/windows/compiling.texi
@@ -1,3 +1,7 @@
+@html
+<!--- @@WEB-TITLE@@=Windows Compilation --->
+@end html
+
 @section Obtaining LilyPond
 
 You can get the latest version of LilyPond at

diff --git a/Documentation/windows/installing.texi b/Documentation/windows/installing.texi
index 18f9949792a01ca129214d877dba4d4e7676e0dc..2df724461ad98167c8e9fe51ddfd9c4840e1883f 100644 (file)
--- a/Documentation/windows/installing.texi
+++ b/Documentation/windows/installing.texi
@@ -2,6 +2,10 @@
 @setfilename installing.info
 @settitle LilyPond on Windows
 
+@html
+<!--- @@WEB-TITLE@@=Windows Installation --->
+@end html
+
 @node Top
 @top
 

diff --git a/VERSION b/VERSION
index ff0214680183532da9485e9eb5673bc61acd38ef..512945075c13e16b5b1ba1ebb04592cf52fb8f2a 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=9
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/input/paddy.abc b/input/paddy.abc
index 0aadebc63c1e9f3144087a46af9fbd5448ef8905..41a116e9474b73ff908a0fac5d60bbd35ef03f47 100644 (file)
--- a/input/paddy.abc
+++ b/input/paddy.abc
@@ -1,16 +1,35 @@
-%
-%  This is NOT a lilypond input file. It is an ABC file, see
-%  http://www.gre.ac.uk/~c.walshaw/abc/
-%  
-%  LilyPond includes import tools for Finale, Musedata, ABC, MIDI and PMX
-%
-X:1
-T:Paddy O'Rafferty
-C:Trad.
-M:6/8
-K:D
-dff cee|def gfe|dff cee|dfe dBA|dff cee|def gfe|faf gfe|1 dfe dBA:|2 dfe dcB||
-~A3 B3|gfe fdB|AFA B2c|dfe dcB|~A3 ~B3|efe efg|faf gfe|1 dfe dcB:|2 dfe dBA||
-fAA eAA|def gfe|fAA eAA|dfe dBA|fAA eAA|def gfe|faf gfe|dfe dBA:|
+\header {
+       footnotes = ""
+       tagline = "Lily was here (unknown version) -- automatically converted from ABC"
+}
+voicedefault = \notes {
+\property Score.defaultBarType="empty"
 
+        c''8        c''8        f''8              }               
+%    This is NOT a lilypond input file. It is an ABC file, see
+ %    http://www.gre.ac.uk/~c.walshaw/abc/
+     %    
+     
+%    LilyPond includes import tools for Finale, Musedata, ABC, MIDI and PMX
+               b''8 ^\downbow   a''8      f''8        d''''1    b'''1    a'''1  
+    b''8    a''8      e''''1      b''8    a''8      f''8        e''''1    
+d''''1    b'''1    a'''1      b''8    a''8      c''8      e''''1    f''8        
+b''8    a''8        b'''2 ^"~"         b''8 ^"~"-.   a''8        b''8    a''8   
+     f''8        d''''1    b'''1    a'''1      b''8    a''8        b''8    a''8 
+       a'''1    a'''1    e''''1    a'''1    a'''1      b''8    a''8        
+b'''1    a'''1      b''8    a''8      d''''1    e''''1    f''8      f''8      
+b'''1    a'''1      b''8    a''8      }                     c''8      \grace {  
+            }                   }           }   
+}\score{
+        \notes <
 
+       \context Staff="default"
+       {
+           \voicedefault 
+       }
+
+    >
+       \paper {
+       }
+       \midi {}
+}

diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py
index 6a08f29e0a4c69c865aba175ae9f2e4b27e0d5aa..5d52499adb2f2fa67ab1e236d46f4b005b7861ab 100644 (file)
--- a/stepmake/bin/add-html-footer.py
+++ b/stepmake/bin/add-html-footer.py
@@ -137,6 +137,37 @@ footer = compose (default_footer, footer_file) + built
 header_tag = '<!-- header_tag -->'
 footer_tag = '<!-- footer_tag -->'
 
+# Python < 1.5.2 compatibility
+#
+# On most platforms, this is equivalent to
+#`normpath(join(os.getcwd()), PATH)'.  *Added in Python version 1.5.2*
+if os.path.__dict__.has_key ('abspath'):
+       abspath = os.path.abspath
+else:
+       def abspath (path):
+               return os.path.normpath (os.path.join (os.getcwd (), path))
+
+
+def remove_self_ref (s):       
+       self_url = abspath (os.getcwd () + '/' + f)
+       #sys.stderr.write ('url0: %s\n' % self_url)
+       self_url = re.sub ('.*' + string.lower (package_name) + '[^/]*/',
+                        '', self_url)
+       #sys.stderr.write ('url1: %s\n' % self_url)
+       
+       #urg, ugly lily-specific toplevel index hack
+       self_url = re.sub ('.*topdocs/out-www/index.html', 'index.html', self_url)
+       #sys.stderr.write ('url2: %s\n' % self_url)
+
+       m = re.match ('.*?(<a href="[\./]*' + self_url + '#?[^"]*">)([^<]*)(</a>)',
+                     s, re.DOTALL)
+       while m:
+               sys.stderr.write ('self: %s\n' % m.group (2))
+               s = s[:m.start (1)] + m.group (2) + s[m.end (3):]
+               m = re.match ('.*?(<a href="[\./]*' + self_url + '#?[^"]*">)([^<]*)(</a>)',
+                             s, re.DOTALL)
+       return s
+
 def do_file (f):
        s = gulp_file (f)
 
@@ -197,6 +228,19 @@ def do_file (f):
        s = re.sub ('@LOCALTIME@', localtime, s)
        s = re.sub ('@MAIL_ADDRESS@', mail_address, s)
 
+       m = re.match ('.*?<!-- (@[a-zA-Z0-9_-]*@)=(.*?) -->', s, re.DOTALL)
+       while m:
+               at_var = m.group (1)
+               at_val = m.group (2)
+               #sys.stderr.write ('at: %s -> %s\n' % (at_var, at_val))
+               s = re.sub (at_var, at_val, s)
+               m = re.match ('.*?<!-- (@[a-zA-Z0-9_-]*@)=(.*?) -->', s, re.DOTALL)
+
+       # urg
+       s = re.sub ('@WEB-TITLE@', '-- --', s)
+       
+       s = remove_self_ref (s)
+
        open (f, 'w').write (s)