From 54eb65d3f012f497567eb61bdff194e675befbff Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Sun, 16 Sep 2001 23:44:56 +0200 Subject: [PATCH] patch::: 1.5.9.jcn2 1.5.9.jcn2 --- CHANGES | 10 +++++- Documentation/header.html.in | 8 ++--- Documentation/index.texi | 4 +++ Documentation/regression-test.tely | 4 +++ Documentation/topdocs/AUTHORS.texi | 4 +++ Documentation/topdocs/FAQ.texi | 3 ++ Documentation/topdocs/INSTALL.texi | 4 +++ Documentation/topdocs/README.texi | 5 +++ Documentation/topdocs/index.tely | 4 +++ Documentation/user/glossary.tely | 5 +++ Documentation/user/lilypond.tely | 4 +++ Documentation/user/refman.itely | 4 +++ Documentation/user/tutorial.itely | 7 ++-- Documentation/windows/compiling.texi | 4 +++ Documentation/windows/installing.texi | 4 +++ VERSION | 2 +- input/paddy.abc | 47 +++++++++++++++++++-------- stepmake/bin/add-html-footer.py | 44 +++++++++++++++++++++++++ 18 files changed, 145 insertions(+), 22 deletions(-) diff --git a/CHANGES b/CHANGES index d6557c51e8..1171d0b1a0 100644 --- 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 + + + +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 481ad838c6..4f6e3c635d 100644 --- a/Documentation/header.html.in +++ b/Documentation/header.html.in @@ -29,7 +29,7 @@ which substitutes some @AT_VARIABLES@ as well.

GNU LilyPond

-

Welcome to the home of the GNU Music Typesetter

+

@WEB-TITLE@

@@ -41,7 +41,7 @@ which substitutes some @AT_VARIABLES@ as well. What is LilyPond - General information
+ General information
Simple examples
Complex examples
 @@ -49,8 +49,8 @@ which substitutes some @AT_VARIABLES@ as well. Download - Linux
- Windows
+ GNU/Linux binaries
+ GNU/Windows binaries
Source code
 diff --git a/Documentation/index.texi b/Documentation/index.texi index 1cd8739665..4b3fa34a8e 100644 --- a/Documentation/index.texi +++ b/Documentation/index.texi @@ -2,6 +2,10 @@ @setfilename index.info @settitle Index to LilyPond documentation +@html + +@end html + @node Top, , , (dir) @top diff --git a/Documentation/regression-test.tely b/Documentation/regression-test.tely index bed908046a..623caf7189 100644 --- a/Documentation/regression-test.tely +++ b/Documentation/regression-test.tely @@ -2,6 +2,10 @@ @setfilename regression-test.info @settitle LilyPond Regression test +@html + +@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 ae8064175e..01701732aa 100644 --- 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 + +@end html + @node Top @top @menu diff --git a/Documentation/topdocs/FAQ.texi b/Documentation/topdocs/FAQ.texi index 3612f583d0..28d15edd69 100644 --- 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 + +@end html @node Top @chapter FAQ - GNU LilyPond Frequently Asked Questions diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index 21f0b01f3c..24442f34b1 100644 --- 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 + +@end html + @node Top, , , (dir) @top diff --git a/Documentation/topdocs/README.texi b/Documentation/topdocs/README.texi index 2c97cb4c6c..dbd1ffa511 100644 --- 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 + +@end html + @node Top, , , @top diff --git a/Documentation/topdocs/index.tely b/Documentation/topdocs/index.tely index e04df17b4e..4c407a2ebd 100644 --- a/Documentation/topdocs/index.tely +++ b/Documentation/topdocs/index.tely @@ -2,6 +2,10 @@ @setfilename index.info @settitle LilyPond homepage +@html + +@end html + @node Top, , , (dir) @top diff --git a/Documentation/user/glossary.tely b/Documentation/user/glossary.tely index c17523bf93..c2f7b5a74d 100644 --- a/Documentation/user/glossary.tely +++ b/Documentation/user/glossary.tely @@ -1,6 +1,11 @@ \input texinfo @setfilename glossary.info +@html + +@end html + + @c @pagesizes 10.3in @c @everyheading @| @thispage @| diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely index 375272f238..ab70815415 100644 --- a/Documentation/user/lilypond.tely +++ b/Documentation/user/lilypond.tely @@ -2,6 +2,10 @@ @setfilename lilypond.info @settitle GNU LilyPond +@html + +@end html + @dircategory GNU music project @direntry diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index d76a9c9f64..6b9ac9828a 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -17,6 +17,10 @@ @node Reference Manual @chapter Reference Manual +@html + +@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 1234406f23..5bc98fe20f 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -2,10 +2,13 @@ @c TODO: LilyPond LilyPond LilyPond - @node Tutorial @chapter Tutorial - + +@html + +@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 c15753522d..0db6f124db 100644 --- a/Documentation/windows/compiling.texi +++ b/Documentation/windows/compiling.texi @@ -1,3 +1,7 @@ +@html + +@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 18f9949792..2df724461a 100644 --- a/Documentation/windows/installing.texi +++ b/Documentation/windows/installing.texi @@ -2,6 +2,10 @@ @setfilename installing.info @settitle LilyPond on Windows +@html + +@end html + @node Top @top diff --git a/VERSION b/VERSION index ff02146801..512945075c 100644 --- 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 0aadebc63c..41a116e947 100644 --- 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 6a08f29e0a..5d52499adb 100644 --- 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 = '' 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 ('.*?()([^<]*)()', + 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 ('.*?()([^<]*)()', + 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 ('.*?', 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 ('.*?', s, re.DOTALL) + + # urg + s = re.sub ('@WEB-TITLE@', '-- --', s) + + s = remove_self_ref (s) + open (f, 'w').write (s) -- 2.39.5