]> git.donarmstrong.com Git - lilypond.git/commitdiff
projects / lilypond.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 16b5e6e)
Rename foo.html big-page HTML Info docs to foo-big-page.html
authorJohn Mandereau <john.mandereau@gmail.com>
Tue, 6 Feb 2007 21:01:48 +0000 (22:01 +0100)
committerJohn Mandereau <john.mandereau@gmail.com>
Fri, 9 Feb 2007 16:22:47 +0000 (17:22 +0100)
  fixes foo/ vs. foo.html conflict in content negotiation

Documentation/index.html.in patch | blob | history
Documentation/user/GNUmakefile patch | blob | history
Documentation/user/macros.itexi patch | blob | history
stepmake/stepmake/texinfo-rules.make patch | blob | history

diff --git a/Documentation/index.html.in b/Documentation/index.html.in
index e457d98a6d1a8dfa940c2f9aa0831d30604a64dd..803ae39f9d2846d3982d8b60ad6583ab0bfc2fe9 100644 (file)
--- a/Documentation/index.html.in
+++ b/Documentation/index.html.in
@@ -1,4 +1,10 @@
 <html>
+<!--
+    Translation of GIT committish: FILL-IN-HEAD-COMMITTISH
+
+    When revising a translation, copy the HEAD committish of the
+    version that you are working on.  See TRANSLATION for details.
+!-->
   <head>
     <title>LilyPond @TOPLEVEL_VERSION@ Documentation</title>
     <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
@@ -25,7 +31,7 @@
   <body>
         
        <div class="navigation">
-         <h1> LilyPond documentation</h1>
+         <h1>LilyPond documentation</h1>
        </div>
     <div align="center" class="titlepage">
 
@@ -45,9 +51,6 @@
            <a class="title" href="user/lilypond/Tutorial.html">Tutorial</a>
              <br>(start here)
 
-           <li>
-           <a class="title" href="user/lilypond/Tutorial.fr.html">Tutoriel en français</a>
-             <br>(for French-speaking users)
          </ul>
          </td>
          <td class="right-column">
@@ -69,7 +72,7 @@
          <ul>
            <li>
 <a class="title" href="user/lilypond/index.html">User manual</a>
-(in <a class="title" href="user/lilypond.html">one big page</a> ~ 4 Mb,
+(in <a class="title" href="user/lilypond-big-page.html">one big page</a> ~ 4 Mb,
 in <a class="title" href="user/lilypond.pdf">PDF</a>)
 
      <br>(everything about LilyPond)
@@ -87,7 +90,7 @@ in <a class="title" href="user/lilypond.pdf">PDF</a>)
      <br>(current in development)
 
  <li><a class="title" href="user/music-glossary/index.html">Glossary</a>
-(in <a class="title" href="user/music-glossary.html">one big page</a> ~ 1 Mb,
+(in <a class="title" href="user/music-glossary-big-page.html">one big page</a> ~ 1 Mb,
 in <a class="title" href="user/music-glossary.pdf">PDF</a>)
 
      <br>(for non-English users)
@@ -98,7 +101,7 @@ in <a class="title" href="user/music-glossary.pdf">PDF</a>)
          <ul>
            <li>
  <a  class="title" href="user/lilypond-internals/index.html">Program reference</a>
- (in <a class="title" href="user/lilypond-internals.html">one big page</a> ~ 1 Mb)
+ (in <a class="title" href="user/lilypond-internals-big-page.html">one big page</a> ~ 1 Mb)
 
      <br>(definitions for tweaking)
 
@@ -140,5 +143,9 @@ in <a class="title" href="user/music-glossary.pdf">PDF</a>)
         </tr>
       </tbody>
     </table>
+    <p><strong>NOTE</strong>: like every HTML page in this
+      documentation, you can find at bottom links to translations of
+      this page in other languages.
+    </p>
   </body>
 </html>
diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 9186bf5bb0b78d55ba445562522fe5d50197250f..fa52fbe8b63af43a3e791af6d1b7db69ac7e0763 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -15,8 +15,8 @@ OUT_PNG_IMAGES=$(OUT_PDF_IMAGES:%.pdf=%.png)
 
 OUT_TEXI_FILES=$(ITEXI_FILES:%.itexi=$(outdir)/%.texi)\
  $(ITELY_FILES:%.itely=$(outdir)/%.texi)
-HTML_FILES = $(TELY_FILES:%.tely=$(outdir)/%.html)\
- $(outdir)/lilypond-internals.html
+HTML_FILES = $(TELY_FILES:%.tely=$(outdir)/%-big-page.html)\
+ $(outdir)/lilypond-internals-big-page.html
 
 # todo: add latex.
 PDF_FILES = $(TELY_FILES:%.tely=$(outdir)/%.pdf)
@@ -155,8 +155,8 @@ $(outdir)/lilypond/index.html: $(outdir)/lilypond.texi $(OUT_PNG_IMAGES) $(OUT_E
 #
 # One big page manual
 #
-$(outdir)/lilypond.html: $(outdir)/lilypond.texi $(OUT_PNG_IMAGES)
-       $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $<
+$(outdir)/lilypond-big-page.html: $(outdir)/lilypond.texi $(OUT_PNG_IMAGES)
+       $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $<
 
 #
 # The split internals reference
@@ -168,8 +168,8 @@ $(outdir)/lilypond-internals/index.html: $(outdir)/lilypond-internals.texi
 #
 # One big page internals reference
 #
-$(outdir)/lilypond-internals.html: $(outdir)/lilypond-internals.texi
-       $(MAKEINFO) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $<
+$(outdir)/lilypond-internals-big-page.html: $(outdir)/lilypond-internals.texi
+       $(MAKEINFO) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $<
 
 #
 # The split glossary
diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index 68fdfae80f3e72a14d52c5a68fe9fe84d01e7ea7..11b2b59bf13a56d3e21f78b105390e47fcf69cdc 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -70,15 +70,27 @@
 @c @inforef{\NAME\,,lilypond-internals}@c
 @c using @ref without punctuation is OK without for formats other than info
 
-@c annoying parentheses stripped by add-html-footer.py
+@ifset bigpage
+
 @macro internalsref{NAME}
 @vindex \NAME\
-@ref{\NAME\,,,lilypond-internals}
+@ref{\NAME\,,,lilypond-internals-big-page}
 @end macro
 
-@c usage: @inputfileref{input@/regression,FILE@/-NAME.ly}
-@macro inputfileref{DIR,NAME}
-@uref{source/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+@macro rglos{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,music-glossary-big-page}
+@end macro
+
+@end ifset
+
+
+@ifclear bigpage
+
+@c annoying parentheses stripped by add-html-footer.py
+@macro internalsref{NAME}
+@vindex \NAME\
+@ref{\NAME\,,,lilypond-internals}
 @end macro
 
 @c annoying parentheses stripped by add-html-footer.py
@@ -87,6 +99,14 @@
 @ref{\NAME\,,,music-glossary}
 @end macro
 
+@end ifclear
+
+
+@c usage: @inputfileref{input@/regression,FILE@/-NAME.ly}
+@macro inputfileref{DIR,NAME}
+@uref{source/\DIR\/collated-files.html#\NAME\,@file{\DIR\/\NAME\}}@c
+@end macro
+
 @c to get decent quotes in `foo'
 @macro q{TEXT}
 @html
diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make
index 5cf8c2d011b254f588a2369cfc685fd6f956ee84..8dbd7167f9d6f1af6a5c7b14ae6eea6b9fdc5905 100644 (file)
--- a/stepmake/stepmake/texinfo-rules.make
+++ b/stepmake/stepmake/texinfo-rules.make
@@ -4,6 +4,9 @@
 $(outdir)/%.info: $(outdir)/%.texi
        $(MAKEINFO) -I $(outdir) --output=$@ $<
 
+$(outdir)/%-big-page.html: $(outdir)/%.texi
+       $(MAKEINFO) -I $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split -D bigpage --no-headers $<
+
 $(outdir)/%.html: $(outdir)/%.texi
        $(MAKEINFO) -I $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $<
 
Debian packaging of lilypond