From b4a71a67ea6e7517a1a272bb32a64ec35043b043 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 6 Dec 2005 10:44:33 +0000 Subject: [PATCH] *** empty log message *** --- ChangeLog | 10 ++++++++++ Documentation/user/GNUmakefile | 6 +++--- Documentation/user/introduction.itely | 6 +++--- Documentation/user/invoking.itely | 4 ++-- Documentation/user/lilypond.tely | 2 +- Documentation/user/macros.itexi | 4 ++-- Documentation/user/music-glossary.tely | 4 ++-- VERSION | 2 +- 8 files changed, 24 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index de6d642251..a1c40b2c09 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2005-12-06 Han-Wen Nienhuys + + * Documentation/user/*: strip out-www from paths. + 2005-12-05 Heikki Junes * Documentation/user/lilypond.tely (direntry): remove empty lines; @@ -5,8 +9,14 @@ 2005-12-05 Han-Wen Nienhuys + * Documentation/user/GNUmakefile: idem. + + * Documentation/user/macros.itexi: strip out-www + * python/rational.py: python 2.3 compat. + * VERSION (PATCH_LEVEL): release 2.7.21 + * scripts/musicxml2ly.py (NonDentedHeadingFormatter.format_headi): option formatting, lilypond style. diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index 6ab1df325b..f88316a0ad 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -210,15 +210,15 @@ source-links = $(outdir)/source $(outdir)/lilypond/source $(outdir)/music-glossa $(outdir)/source: @rm -f $(@) - ln -sf ../../../ $(@) + ln -sf ../../ $(@) $(outdir)/lilypond/source: @rm -f $(@) - ln -sf ../../../../ $(@) + ln -sf ../../../ $(@) $(outdir)/music-glossary/source: @rm -f $(@) - ln -sf ../../../../ $(@) + ln -sf ../../../ $(@) local-WWW: $(HTML_FILES) $(DEEP_HTML_FILES)\ $(datafiles) $(PDF_FILES) $(source-links) info info-dir diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index f1a8a491ea..8f03e9461d 100644 --- a/Documentation/user/introduction.itely +++ b/Documentation/user/introduction.itely @@ -759,7 +759,7 @@ available in a big HTML page, @end iftex @ifhtml -@uref{source/Documentation/user/out-www/lilypond.html, one big page}, +@uref{source/Documentation/user/lilypond.html, one big page}, @end ifhtml which can be searched easily using the search facility of a web browser. @@ -823,7 +823,7 @@ Various input examples. @ifhtml @c Works, but link name is not so nice; so write-out macro @c @inputfileref{input/test,Various input examples}. -@uref{source/input/test/out-www/collated-files.html,Various input examples}. +@uref{source/input/test/collated-files.html,Various input examples}. @end ifhtml This collection of files shows various tips and tricks, and is @@ -837,7 +837,7 @@ The regression tests. @ifhtml @c Works, but link name is not so nice; so write-out macro @c @inputfileref{input/regression,The regression tests}. -@uref{source/input/regression/out-www/collated-files.html,The regression tests}. +@uref{source/input/regression/collated-files.html,The regression tests}. @end ifhtml This collection of files tests each notation and engraving feature of diff --git a/Documentation/user/invoking.itely b/Documentation/user/invoking.itely index e698d13a3a..3a2becd505 100644 --- a/Documentation/user/invoking.itely +++ b/Documentation/user/invoking.itely @@ -574,7 +574,7 @@ and syntax coloring, handy compile short-cuts and reading LilyPond manuals using Info. If @file{lilypond-mode} is not installed on your platform, then read the @ifhtml -@uref{source/Documentation/topdocs/out-www/INSTALL.html,installation instructions}. +@uref{source/Documentation/topdocs/INSTALL.html,installation instructions}. @end ifhtml @ifnothtml installation instructions. @@ -585,7 +585,7 @@ installation instructions. For @uref{http://@/www@/.vim@/.org,VIM}, a @file{vimrc} is supplied, along with syntax coloring tools. For more information, refer to the @ifhtml -@uref{source/Documentation/topdocs/out-www/INSTALL.html,installation instructions}. +@uref{source/Documentation/topdocs/INSTALL.html,installation instructions}. @end ifhtml @ifnothtml installation instructions. diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely index 55bc53ce7b..01b61c190f 100644 --- a/Documentation/user/lilypond.tely +++ b/Documentation/user/lilypond.tely @@ -168,7 +168,7 @@ HINTS FOR STYLE @end ignore @ifhtml -This document is also available in @uref{source/Documentation/user/out-www/lilypond.pdf,PDF}. +This document is also available in @uref{source/Documentation/user/lilypond.pdf,PDF}. @end ifhtml diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi index d711749fb7..443d8a7bac 100644 --- a/Documentation/user/macros.itexi +++ b/Documentation/user/macros.itexi @@ -61,7 +61,7 @@ @c usage: @inputfileref{input@/regression,FILE@/-NAME.ly} @macro inputfileref{DIR,NAME} -@uref{source/\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c +@uref{source/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c @end macro @macro rglos{NAME}@c @@ -82,7 +82,7 @@ @end macro @macro inputfileref{DIR,NAME} -@uref{source/\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c +@uref{source/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c @end macro @macro rglos{NAME}@c diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely index f89f7c6269..f24c412a25 100644 --- a/Documentation/user/music-glossary.tely +++ b/Documentation/user/music-glossary.tely @@ -12,8 +12,8 @@ @end direntry @ifhtml -This document is also available in @uref{source/Documentation/user/out-www/music-glossary.pdf,PDF} -and as @uref{source/Documentation/user/out-www/music-glossary.html,one big page}. +This document is also available in @uref{source/Documentation/user/music-glossary.pdf,PDF} +and as @uref{source/Documentation/user/music-glossary.html,one big page}. @end ifhtml @titlepage diff --git a/VERSION b/VERSION index 70214b6bd2..b95b53613f 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=2 MINOR_VERSION=7 -PATCH_LEVEL=21 +PATCH_LEVEL=22 MY_PATCH_LEVEL= -- 2.39.2