From: janneke <janneke>
Date: Sun, 3 Apr 2005 09:25:34 +0000 (+0000)
Subject: * Documentation/user/GNUmakefile (source-links): Add symlinks to
X-Git-Tag: release/2.5.23~241
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=56fa9eb9bcc2ad8e5fb5e3498d097aaa2bb600e4;p=lilypond.git
* Documentation/user/GNUmakefile (source-links): Add symlinks to
source dir for split and non-split manuals.
* Documentation/user/GNUmakefile (local-WWW): Do not generate
.ps.gz.
---
diff --git a/ChangeLog b/ChangeLog
index c078e3f200..5be758345c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2005-04-03 Jan Nieuwenhuizen <janneke@gnu.org>
+
+ * Documentation/user/GNUmakefile (source-links): Add symlinks to
+ source dir for split and non-split manuals.
+
+ * Documentation/user/*y: Fix @uref/@inputfile links for
+ split/non-split HTML documents.
+
+ * Documentation/user/GNUmakefile (local-WWW): Do not generate
+ .ps.gz.
+
2005-04-02 Jan Nieuwenhuizen <janneke@gnu.org>
* GNUmakefile.in: Add newline.
diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 483f12a348..0209740d6c 100644
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -195,8 +195,23 @@ DEEP_HTML_FILES =\
$(outdir)/lilypond-internals/index.html\
$(outdir)/music-glossary/index.html
+# Symlinks to refer to external source documents from split and non-split HTML
+source-links = $(outdir)/source $(outdir)/lilypond/source $(outdir)/music-glossary/source
+
+$(outdir)/source:
+ @rm -f $(@)
+ ln -sf ../../../ $(@)
+
+$(outdir)/lilypond/source:
+ @rm -f $(@)
+ ln -sf ../../../../ $(@)
+
+$(outdir)/music-glossary/source:
+ @rm -f $(@)
+ ln -sf ../../../../ $(@)
+
local-WWW: $(HTML_FILES) $(DEEP_HTML_FILES)\
- $(datafiles) $(PDF_FILES) $(PS_GZ_FILES) info info-dir
+ $(datafiles) $(PDF_FILES) $(source-links) info info-dir
local-WWW-clean: deep-WWW-clean
diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index 41ecd4f418..fde3d73a66 100644
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -716,7 +716,7 @@ available in
a big HTML page,
@end iftex
@ifhtml
-@uref{../lilypond.html, a big HTML page}
+@uref{source/Documentation/user/out-www/lilypond.html, one big page},
@end ifhtml
which can be searched easily using the search facility of a web
browser.
@@ -777,7 +777,9 @@ have clickable links.
Various input examples.
@end ifnothtml
@ifhtml
-@uref{../../../../input/test/out-www/collated-files.html,Various input examples}.
+@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}.
@end ifhtml
@cindex snippets
@@ -790,7 +792,9 @@ included.
The regression tests.
@end ifnothtml
@ifhtml
-@uref{../../../../input/regression/out-www/collated-files.html,The regression tests}.
+@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}.
@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 846a75cc4f..aacc7becff 100644
--- a/Documentation/user/invoking.itely
+++ b/Documentation/user/invoking.itely
@@ -572,7 +572,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{../../../topdocs/out-www/INSTALL.html,installation instructions}.
+@uref{source/Documentation/topdocs/out-www/INSTALL.html,installation instructions}.
@end ifhtml
@ifnothtml
installation instructions.
@@ -583,7 +583,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{../../../topdocs/out-www/INSTALL.html,installation instructions}.
+@uref{source/Documentation/topdocs/out-www/INSTALL.html,installation instructions}.
@end ifhtml
@ifnothtml
installation instructions.
diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index e67c7a59a7..7f7884bd41 100644
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -160,7 +160,7 @@ HINTS FOR STYLE
@end ignore
@ifhtml
-This document is also available in @uref{../lilypond.pdf,PDF}.
+This document is also available in @uref{source/Documentation/user/out-www/../lilypond.pdf,PDF}.
@end ifhtml
diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 6bcfaf2f54..7543acf9e3 100644
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -54,16 +54,19 @@
@c using @ref without punctuation is OK without for formats other than info
@macro internalsref{NAME}@c
+@c annoying parentheses stripped by add-html-footer.py
@ref{\NAME\,,,lilypond-internals}@c
@findex \NAME\
@end macro
+@c usage: @inputfileref{input@/regression,FILE@/-NAME.ly}
@macro inputfileref{DIR,NAME}
-@uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+@c @uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+@uref{\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
@end macro
@macro rglos{NAME}@c
-@c annoying parentheses
+@c annoying parentheses stripped by add-html-footer.py
@ref{\NAME\,,,music-glossary}@c
@findex \NAME\
@end macro
@@ -80,7 +83,7 @@
@end macro
@macro inputfileref{DIR,NAME}
-@uref{../../../../\DIR\/out-www/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+@uref{source/\DIR\/out-www/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 82a987a415..a52928c480 100644
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -9,8 +9,8 @@
@end direntry
@ifhtml
-This document is also available in @uref{music-glossary.pdf,PDF}
-and as @uref{../music-glossary.html,one big page}.
+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}.
@end ifhtml
@titlepage