Docs: unconditionnally generate big page translated manuals

diff --git a/Documentation/de/index.html.in b/Documentation/de/index.html.in
index b848cd33d6251dd99222dc497fced4c898727f4f..ee95ddede8bb1131aec23002de4680b16ed022e1 100644 (file)
--- a/Documentation/de/index.html.in
+++ b/Documentation/de/index.html.in
@@ -65,7 +65,7 @@ als <a class="title" href="user/lilypond-learning.de.pdf">PDF</a>)
          <ul>
            <li>
 <a class="title" href="user/lilypond/index.de.html">Notationsreferenz (NR)</a>
- (auf <a class="title" href="user/lilypond-big-page.html">einer gro&szlig;en Seite</a> ~ 4 MB,
+ (auf <a class="title" href="user/lilypond-big-page.de.html">einer gro&szlig;en Seite</a> ~ 4 MB,
  als <a class="title" href="user/lilypond.de.pdf">PDF</a>)
        <br>(Notation mit LilyPond setzen.)
        <br>(<strong>Achtung:</strong> dieses Dokument ist erst teilweise auf deutsch &uuml;bersetzt,<br>
@@ -85,7 +85,7 @@ als <a class="title" href="user/lilypond-learning.de.pdf">PDF</a>)
          <ul>
          <li>
             <a class="title" href="user/lilypond-program/index.de.html">Anwendungsbenutzung (AU)</a>
- (auf <a class="title" href="user/lilypond-program-big-page.html">einer gro&szlig;en Seite</a>,
+ (auf <a class="title" href="user/lilypond-program-big-page.de.html">einer gro&szlig;en Seite</a>,
  als <a class="title" href="user/lilypond-program.de.pdf">PDF</a>)
        <br>(Wie das Programm installiert und gestartet wird.)</li>
           

diff --git a/Documentation/de/user/GNUmakefile b/Documentation/de/user/GNUmakefile
index e983bd2fedd6508c73941e8a88a985740d1311ec..50042f40cbe0c94b2b39495b192c1710d006dc86 100644 (file)
--- a/Documentation/de/user/GNUmakefile
+++ b/Documentation/de/user/GNUmakefile
@@ -1,5 +1,4 @@
 ISOLANG = de
 depth = ../../..
 LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-user
-BIG_PAGE_MANUALS = lilypond-learning
 include $(depth)/make/stepmake.make

diff --git a/Documentation/de/user/macros.itexi b/Documentation/de/user/macros.itexi
index f0987d453474bde793c5e0b5542b3011b56e714e..261ae0561ba3f794b4816173ef46e345884d4c48 100644 (file)
--- a/Documentation/de/user/macros.itexi
+++ b/Documentation/de/user/macros.itexi
@@ -453,15 +453,20 @@ Abschnitt im englischen Benutzerhandbuch.
 
 @ifhtml
 
+@ifset bigpage
+@macro untranslated
+@end macro
+@end ifset
+
+@ifclear bigpage
 @macro untranslated
 UNTRANSLATED NODE: IGNORE ME
 @end macro
+@end ifclear
 
 @end ifhtml
 
 @ifnothtml
-
 @macro untranslated
 @end macro
-
 @end ifnothtml

diff --git a/Documentation/es/user/GNUmakefile b/Documentation/es/user/GNUmakefile
index 548217e511d1034c022d90d54a51e88190749184..4a3d585310f203d490feb738352b4d5fe0551b26 100644 (file)
--- a/Documentation/es/user/GNUmakefile
+++ b/Documentation/es/user/GNUmakefile
@@ -1,5 +1,4 @@
 ISOLANG = es
 depth = ../../..
 LOCALSTEPMAKE_TEMPLATES = lilypond ly doc-i18n-user
-BIG_PAGE_MANUALS = lilypond-learning lilypond lilypond-program
 include $(depth)/make/stepmake.make

diff --git a/Documentation/es/user/macros.itexi b/Documentation/es/user/macros.itexi
index 2cc5eb36a0e6e57fa0efba32d27f3250b10e66c9..e61b9014635709c3ce94a9186345c0cda01cf6ed 100644 (file)
--- a/Documentation/es/user/macros.itexi
+++ b/Documentation/es/user/macros.itexi
@@ -429,9 +429,16 @@ Esta sección aún no está traducida; consulte el manual en inglés.
 
 @ifhtml
 
+@ifset bigpage
+@macro untranslated
+@end macro
+@end ifset
+
+@ifclear bigpage
 @macro untranslated
 UNTRANSLATED NODE: IGNORE ME
 @end macro
+@end ifclear
 
 @end ifhtml
 

diff --git a/Documentation/fr/index.html.in b/Documentation/fr/index.html.in
index f118e106a3600fc2b89fea4f06b05192c63a149b..f01889be69699dffd5c701204df83a71afed8892 100644 (file)
--- a/Documentation/fr/index.html.in
+++ b/Documentation/fr/index.html.in
@@ -36,8 +36,8 @@
            <li>
              <a class="title"
                 href="user/lilypond-learning/index.fr.html">Manuel d'initiation</a>
-             (partiellement traduit,<br>aussi en <a class="title" href="user/lilypond-learning-big-page.html">page
-             unique en anglais</a> ~ 1,5 Mo, ou
+             (partiellement traduit,<br>aussi en <a class="title" href="user/lilypond-learning-big-page.fr.html">page
+             unique</a> ~ 1,5 Mo, ou
              <a class="title" href="user/lilypond-learning.fr.pdf">au format PDF</a>)
               <br>&mdash; commencer ici</li>
            <li><a class="title" href="user/music-glossary/index.html">Glossaire</a>
@@ -62,13 +62,12 @@
            <li>
              <a class="title" href="user/lilypond/index.fr.html">Manuel de notation</a>
              (partiellement traduit,<br>aussi en <a class="title"
-                               href="user/lilypond-big-page.html">page unique
-               en anglais</a> ~ 4 Mo, ou
+                               href="user/lilypond-big-page.fr.html">page unique</a> ~ 4 Mo, ou
                <a class="title" href="user/lilypond.fr.pdf">au format PDF</a>)
                 <br>&mdash; gravure de musique avec LilyPond</li>
            <li>
              <a  class="title" href="user/lilypond-internals/index.html">Référence des propriétés internes</a>
-             <br>(en anglais, en <a class="title" href="user/lilypond-internals-big-page.html">page
+             <br>(en anglais, aussi en <a class="title" href="user/lilypond-internals-big-page.html">page
                unique</a> ~ 1 Mo, <a class="title"
                href="user/lilypond-internals.pdf">au format PDF</a>)
               <br>&mdash; définitions pour les retouches</li>
@@ -79,11 +78,11 @@
             <li>
            <a class="title" href="user/lilypond-program/index.fr.html">Utilisation des programmes</a>
 (partiellement traduit,<br>aussi en <a class="title"
-               href="user/lilypond-program-big-page.html">page unique en anglais</a>, ou
+               href="user/lilypond-program-big-page.fr.html">page unique</a>, ou
            <a class="title" href="user/lilypond-program.fr.pdf">au format PDF</a>)
             <br>&mdash; installation et exécution des programmes</li>
            <li><a class="title" href="../input/lsr/lilypond-snippets/index.html">Exemples de code</a>
-(en <a class="title" href="../input/lsr/lilypond-snippets-big-page.html">page unique en anglais</a> ~ 2 Mo,
+(en anglais, aussi en <a class="title" href="../input/lsr/lilypond-snippets-big-page.html">page unique</a> ~ 2 Mo,
 au format <a class="title" href="user/lilypond-snippets.pdf">PDF</a>)
             <br>&mdash; petits trucs, astuces et exemples</li>
          </ul>

diff --git a/Documentation/fr/user/macros.itexi b/Documentation/fr/user/macros.itexi
index 11aa1fbe42efda83c696167690db87f3f15e144c..ce01f63c3b3bf013186fdcaf552e0d74756ddde1 100644 (file)
--- a/Documentation/fr/user/macros.itexi
+++ b/Documentation/fr/user/macros.itexi
@@ -447,9 +447,16 @@ vous reporter à la documentation correspondante en anglais.
 
 @ifhtml
 
+@ifset bigpage
+@macro untranslated
+@end macro
+@end ifset
+
+@ifclear bigpage
 @macro untranslated
 UNTRANSLATED NODE: IGNORE ME
 @end macro
+@end ifclear
 
 @end ifhtml
 

diff --git a/make/doc-i18n-user-targets.make b/make/doc-i18n-user-targets.make
index 3dd7ea8fa85597829efa34d4831cef727579023c..44c9a1a3d677a4d0afb6bc29ec0a7f8869376865 100644 (file)
--- a/make/doc-i18n-user-targets.make
+++ b/make/doc-i18n-user-targets.make
@@ -2,7 +2,6 @@ default:
 
 local-WWW-1: $(MASTER_TEXI_FILES) $(PDF_FILES) $(XREF_MAPS_FILES)
 
-# BIG_PAGE_HTML_FILES is defined differently in each language makefile
 local-WWW-2: $(DEEP_HTML_FILES) $(BIG_PAGE_HTML_FILES) $(DOCUMENTATION_LOCALE_TARGET)
        find $(outdir) -name '*.html' | xargs grep -L 'UNTRANSLATED NODE: IGNORE ME' | xargs $(PYTHON) $(buildscript-dir)/html-gettext.py $(ISOLANG)
        find $(outdir) -name '*.html' | xargs grep -L --label="" 'UNTRANSLATED NODE: IGNORE ME' | sed 's!$(outdir)/!!g' | xargs $(PYTHON) $(buildscript-dir)/mass-link.py --prepend-suffix .$(ISOLANG) hard $(outdir) $(top-build-dir)/Documentation/user/$(outdir) $(TELY_FILES:%.tely=%.pdf)

diff --git a/make/doc-i18n-user-vars.make b/make/doc-i18n-user-vars.make
index 87ca4cd4fad451a464484d353bf3031bdceb4b7d..2170d43f40ed1b7c4b3e53a07896bfef914b60c2 100644 (file)
--- a/make/doc-i18n-user-vars.make
+++ b/make/doc-i18n-user-vars.make
@@ -7,7 +7,7 @@ OUT_PNG_IMAGES=$(SOURCE_PNG_IMAGES:$(top-src-dir)/Documentation/user/%.png=$(out
 
 TELY_FILES := $(call src-wildcard,*.tely)
 MASTER_TEXI_FILES := $(TELY_FILES:%.tely=$(outdir)/%.texi)
-BIG_PAGE_HTML_FILES := $(BIG_PAGE_MANUALS:%=$(outdir)/%-big-page.html)
+BIG_PAGE_HTML_FILES := $(TELY_FILES:%.tely=$(outdir)/%-big-page.html)
 DEEP_HTML_FILES := $(TELY_FILES:%.tely=$(outdir)/%/index.html)
 PDF_FILES := $(TELY_FILES:%.tely=$(outdir)/%.pdf)