Doc build fix: apparently @uref{@version{}} breaks the tex input stack.

I guess I need to get python involved in writing version.itexi
sooner than I thought, because these "echo"s are ridiculous.  :(

diff --git a/Documentation/general/download.itexi b/Documentation/general/download.itexi
index 99a70267b8a6c7a742f97a08d0e56a8530e90696..48ed94f37bcaf64758f6760fe45c20e41351a5b4 100644 (file)
--- a/Documentation/general/download.itexi
+++ b/Documentation/general/download.itexi
@@ -138,28 +138,28 @@ package manager.
 
 @item
 @sourceimage{logo-linux,,,}
-@uref{http://download.linuxaudio.org/lilypond/binaries/linux-x86/lilypond-@versionStable{}-1.linux-x86.sh,
-Linux x86: LilyPond @versionStable{}} (if in doubt, use this)
+@downloadStableLinux
+(if in doubt, use this)
 
 @item
 @sourceimage{logo-linux,,,}
-@uref{http://download.linuxaudio.org/lilypond/binaries/linux-64/lilypond-@versionStable{}-1.linux-64.sh,
-Linux 64-bit: LilyPond @versionStable{}}
+@c @uref{http://download.linuxaudio.org/lilypond/binaries/linux-64/lilypond-@versionStable{}-1.linux-64.sh,
+@c Linux 64-bit: LilyPond @versionStable{}}
 
 @item
 @sourceimage{logo-linux,,,}
-@uref{http://download.linuxaudio.org/lilypond/binaries/linux-ppc/lilypond-@versionStable{}-1.linux-ppc.sh,
-Linux PPC: LilyPond @versionStable{}}
+@c @uref{http://download.linuxaudio.org/lilypond/binaries/linux-ppc/lilypond-@versionStable{}-1.linux-ppc.sh,
+@c Linux PPC: LilyPond @versionStable{}}
 
 @item
 @sourceimage{logo-freebsd,,,}
-@uref{http://download.linuxaudio.org/lilypond/binaries/freebsd-x86/lilypond-@versionStable{}-1.freebsd-x86.sh,
-FreeBSD i386: LilyPond @versionStable{}}
+@c @uref{http://download.linuxaudio.org/lilypond/binaries/freebsd-x86/lilypond-@versionStable{}-1.freebsd-x86.sh,
+@c FreeBSD i386: LilyPond @versionStable{}}
 
 @item
 @sourceimage{logo-freebsd,,,}
-@uref{http://download.linuxaudio.org/lilypond/binaries/freebsd-64/lilypond-@versionStable{}-1.freebsd-64.sh,
-FreeBSD amd64: LilyPond @versionStable{}}
+@c @uref{http://download.linuxaudio.org/lilypond/binaries/freebsd-64/lilypond-@versionStable{}-1.freebsd-64.sh,
+@c FreeBSD amd64: LilyPond @versionStable{}}
 
 @end itemize
 
@@ -249,16 +249,16 @@ acknowledged.
 
 @item
 @sourceimage{logo-macosx,,,}
-@uref{
-http://download.linuxaudio.org/lilypond/binaries/darwin-x86/lilypond-@versionStable{}-1.darwin-x86.tar.bz2,
-lilypond-@versionStable{}.darwin-x86.tar.bz2}
+@c @uref{
+@c http://download.linuxaudio.org/lilypond/binaries/darwin-x86/lilypond-@versionStable{}-1.darwin-x86.tar.bz2,
+@c lilypond-@versionStable{}.darwin-x86.tar.bz2}
 For Intel chips (if in doubt, use this).
 
 @item
 @sourceimage{logo-macosx,,,}
-@uref{
-http://download.linuxaudio.org/lilypond/binaries/darwin-x86/lilypond-@versionStable{}-1.darwin-ppc.tar.bz2,
-lilypond-@versionStable{}.darwin-ppc.tar.bz2}
+@c @uref{
+@c http://download.linuxaudio.org/lilypond/binaries/darwin-x86/lilypond-@versionStable{}-1.darwin-ppc.tar.bz2,
+@c lilypond-@versionStable{}.darwin-ppc.tar.bz2}
 For G3 and G4 CPUs (old Apple computers).
 
 @end itemize
@@ -483,8 +483,8 @@ pre-built version.}
 @divClass{column-left-bottom}
 @subheading Source tarball
 
-FIXME link @uref{http://download.linuxaudio.org/lilypond/sources/v2.12/lilypond-@versionStable{}.tar.gz,
-lilypond-@versionStable{}-source.tar.bz2}
+@c FIXME link @uref{http://download.linuxaudio.org/lilypond/sources/v2.12/lilypond-@versionStable{}.tar.gz,
+@c lilypond-@versionStable{}-source.tar.bz2}
 
 For an extensive listing of all versions (old and new), see our
 @uref{http://download.linuxaudio.org/lilypond/binaries/, download

diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index e3c602a6f7c653976073dd8406d09299ed754f95..f0204fabe57cd8cb5e74175ae8a02485a5af8800 100644 (file)
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -70,6 +70,16 @@ $(outdir)/version.%: $(top-src-dir)/VERSION
        echo '@macro versionDevel'>> $@
        echo $(TOPLEVEL_VERSION_DEVEL)>> $@
        echo '@end macro'>> $@
+       echo ''>> $@
+       echo '@macro downloadStableLinux'>> $@
+       echo -n '@uref{http://download.linuxaudio.org/'>> $@
+       echo -n 'lilypond/binaries/linux-x86/lilypond-'>> $@
+       echo -n $(TOPLEVEL_VERSION_STABLE)>> $@
+       echo '-1.linux-x86.sh,'>> $@
+       echo -n 'Linux x86: LilyPond '>> $@
+       echo -n $(TOPLEVEL_VERSION_STABLE)>> $@
+       echo '}'>> $@
+       echo '@end macro'>> $@
 
 .SECONDARY: $(outdir)/version.itexi $(outdir)/version.texi \
   $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep \