Merge pull request #213 from ndw/l10n

Rework localization and a number of other backwards-incompatible changes
docbook · Dec 30, 2022 · 425fbd4 · 425fbd4
2 parents 20e5eba + 7f8d3db
commit 425fbd4
Show file tree

Hide file tree

Showing 438 changed files with 65,393 additions and 136,665 deletions.
diff --git a/build.gradle b/build.gradle
@@ -470,11 +470,7 @@ task validateAll() {
   // Just something to hang dependencies on
 }
 
-task generateXslTNGLocales() {
-  // Just something to hang dependencies on
-}
-
-task generateLocales(dependsOn: ['generateXslTNGLocales']) {
+task generateLocales() {
   // Just something to hang dependencies on
 }
 
@@ -1057,34 +1053,32 @@ testDrivers.each { driver ->
 // ============================================================
 
 // Generate tasks to generate the locale files
-fileTree(dir: "${projectDir}/src/main/locales/locale-10", include: "*.xml").each { xml ->
+fileTree(dir: "${projectDir}/src/main/locale", include: "*.xml").each { xml ->
   // Work out the base filename of the test
   def base = xml.toString()
-  def pos = base.indexOf("/locales/locale-10/")
+  def pos = base.lastIndexOf("/")
   if (pos > 0) {
-    base = base.substring(pos+19)
+    base = base.substring(pos+1)
   }
 
-  // The following is only needed while we're generating
-  // from the 1.0 files.
-  def localetng = xml.toString().replace("/locale-10/", "/locale/")
-  Task t = task "locale10_${base}"(type: SaxonXsltTask) {
-    inputs.file "${projectDir}/tools/xform-10-tng.xsl"
+  Task t = task "locale_${base}"(
+    type: SaxonXsltTask
+  ) {
+    inputs.file xml
+    inputs.file "${projectDir}/src/main/xslt/modules/xform-locale.xsl"
+    outputs.file "${buildDir}/xslt/locale/${base}"
 
     input xml
-    stylesheet "${projectDir}/tools/xform-10-tng.xsl"
-    output localetng
-  }
-  generateXslTNGLocales.dependsOn t
-
-  Task u = task "locale_${base}"(type: SaxonXsltTask) {
-    inputs.files "${projectDir}/tools/xform-locale.xsl"
-    input localetng
-    stylesheet "${projectDir}/tools/xform-locale.xsl"
+    stylesheet "${projectDir}/src/main/xslt/modules/xform-locale.xsl"
     output "${buildDir}/xslt/locale/${base}"
+
+    if (base != 'en.xml') {
+      parameters(
+        'fallback.locale': "${projectDir}/src/main/locale/en.xml"
+      )
+    }
   }
-  u.dependsOn t
-  generateLocales.dependsOn u
+  generateLocales.dependsOn t
 }
 
 task makeVersion(type: SaxonXsltTask) {
@@ -1506,6 +1500,7 @@ task guideCustomResources(type: Copy) {
   include "css/**"
   include "js/**"
   include "media/**"
+  include "*.html"
   into "${buildDir}/guide/"
 }
 

diff --git a/properties.gradle b/properties.gradle
@@ -2,11 +2,11 @@
 ext {
   xslTNGtitle = 'DocBook xslTNG'
   xslTNGbaseName = 'docbook-xslTNG'
-  xslTNGversion = '1.11.1'
-  guideVersion = '1.11.0'
+  xslTNGversion = '2.0.0'
+  guideVersion = '2.0.0'
 
-  docbookVersion = '5.2CR2'
-  publishersVersion = '5.2CR2'
+  docbookVersion = '5.2CR4'
+  publishersVersion = '5.2CR4'
 
   saxonVersion = '11.4'
   saxonGroup = 'net.sf.saxon'
@@ -16,7 +16,7 @@ ext {
 
   metadataExtractorVersion = '2.15.0'
   jingVersion = '20220510'
-  xmlresolverVersion = '4.5.1'
-  sincludeVersion = '4.2.0'
+  xmlresolverVersion = '4.6.0'
+  sincludeVersion = '4.2.1'
   slf4jVersion = '1.7.30'
 }
diff --git a/src/guide/resources/ch00.html b/src/guide/resources/ch00.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <noscript>
+      <meta http-equiv="refresh" content="0; url='ch-preface.html'" />
+    </noscript>
+  </head>
+  <body>
+    <p>This page <a href="ch-preface.html">has moved</a>.</p>
+    <script>
+      const url = window.location.toString();
+      const pos = url.lastIndexOf("/");
+      const redirect = url.substring(0, pos+1) + "ch-preface.html";
+      window.location.href = redirect + window.location.search + window.location.hash;
+    </script>
+  </body>
+</html>
diff --git a/src/guide/resources/ch01.html b/src/guide/resources/ch01.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <noscript>
+      <meta http-equiv="refresh" content="0; url='ch-overview.html'" />
+    </noscript>
+  </head>
+  <body>
+    <p>This page <a href="ch-overview.html">has moved</a>.</p>
+    <script>
+      const url = window.location.toString();
+      const pos = url.lastIndexOf("/");
+      const redirect = url.substring(0, pos+1) + "ch-overview.html";
+      window.location.href = redirect + window.location.search + window.location.hash;
+    </script>
+  </body>
+</html>
diff --git a/src/guide/resources/ch02.html b/src/guide/resources/ch02.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <noscript>
+      <meta http-equiv="refresh" content="0; url='ch-using.html'" />
+    </noscript>
+  </head>
+  <body>
+    <p>This page <a href="ch-using.html">has moved</a>.</p>
+    <script>
+      const url = window.location.toString();
+      const pos = url.lastIndexOf("/");
+      const redirect = url.substring(0, pos+1) + "ch-using.html";
+      window.location.href = redirect + window.location.search + window.location.hash;
+    </script>
+  </body>
+</html>
+
diff --git a/src/guide/resources/ch03.html b/src/guide/resources/ch03.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <noscript>
+      <meta http-equiv="refresh" content="0; url='ch-customizing.html'" />
+    </noscript>
+  </head>
+  <body>
+    <p>This page <a href="ch-customizing.html">has moved</a>.</p>
+    <script>
+      const url = window.location.toString();
+      const pos = url.lastIndexOf("/");
+      const redirect = url.substring(0, pos+1) + "ch-customizing.html";
+      window.location.href = redirect + window.location.search + window.location.hash;
+    </script>
+  </body>
+</html>
diff --git a/src/guide/resources/ch04.html b/src/guide/resources/ch04.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <noscript>
+      <meta http-equiv="refresh" content="0; url='ch-implementation.html'" />
+    </noscript>
+  </head>
+  <body>
+    <p>This page <a href="ch-implementation.html">has moved</a>.</p>
+    <script>
+      const url = window.location.toString();
+      const pos = url.lastIndexOf("/");
+      const redirect = url.substring(0, pos+1) + "ch-implementation.html";
+      window.location.href = redirect + window.location.search + window.location.hash;
+    </script>
+  </body>
+</html>
diff --git a/src/guide/resources/ch05.html b/src/guide/resources/ch05.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <noscript>
+      <meta http-equiv="refresh" content="0; url='ch-building.html'" />
+    </noscript>
+  </head>
+  <body>
+    <p>This page <a href="ch-building.html">has moved</a>.</p>
+    <script>
+      const url = window.location.toString();
+      const pos = url.lastIndexOf("/");
+      const redirect = url.substring(0, pos+1) + "ch-building.html";
+      window.location.href = redirect + window.location.search + window.location.hash;
+    </script>
+  </body>
+</html>
diff --git a/src/guide/resources/css/guide.css b/src/guide/resources/css/guide.css
@@ -83,6 +83,14 @@ p .refpurpose-sep {
     text-align: center;
 }
 
+img {
+    max-width: 80%;
+}
+
+.cover img {
+    max-width: inherit;
+}
+
 .figure {
     border: 2px solid #afafaf;
     border-radius: 1em;

diff --git a/src/guide/resources/media/l10n-en-alt.png b/src/guide/resources/media/l10n-en-alt.png
diff --git a/src/guide/resources/media/l10n-en-ann.png b/src/guide/resources/media/l10n-en-ann.png
diff --git a/src/guide/resources/media/l10n-en.png b/src/guide/resources/media/l10n-en.png
diff --git a/src/guide/resources/media/l10n-fr.png b/src/guide/resources/media/l10n-fr.png
diff --git a/src/guide/xml/ackno.xml b/src/guide/xml/ackno.xml
@@ -2,8 +2,10 @@
 	          xmlns:xlink="http://www.w3.org/1999/xlink"
                   version="5.0"
                   xml:id="acknowledgements">
-<?db filename="ackno"?>
-<title>Acknowledgements</title>
+<info>
+  <?db filename="ackno"?>
+  <title>Acknowledgements</title>
+</info>
 
 <para>I’d like to thank The Academy, the…no, wrong event.</para>
 

diff --git a/src/guide/xml/ch00.xml b/src/guide/xml/ch00.xml
@@ -3,7 +3,7 @@
 	 xmlns:xlink="http://www.w3.org/1999/xlink"
 	 version="5.0" xml:id="preface">
 <info>
-  <?db filename="ch00"?>
+  <?db filename="ch-preface"?>
   <title>Preface</title>
 </info>
 

diff --git a/src/guide/xml/ch01.xml b/src/guide/xml/ch01.xml
@@ -3,7 +3,7 @@
 	 xmlns:xlink="http://www.w3.org/1999/xlink"
 	 version="5.0" xml:id="whatfor">
 <info>
-  <?db filename="ch01"?>
+  <?db filename="ch-overview"?>
   <title>Overview</title>
 </info>
 

diff --git a/src/guide/xml/ch02.xml b/src/guide/xml/ch02.xml
@@ -3,7 +3,7 @@
 	 xmlns:xlink="http://www.w3.org/1999/xlink"
 	 version="5.0" xml:id="using">
 <info>
-  <?db filename="ch02"?>
+  <?db filename="ch-using"?>
   <title>Using the stylesheets</title>
 </info>
 

diff --git a/src/guide/xml/ch03.xml b/src/guide/xml/ch03.xml
@@ -4,7 +4,7 @@
 	 xmlns:xlink="http://www.w3.org/1999/xlink"
 	 version="5.0" xml:id="customization">
 <info>
-  <?db filename="ch03"?>
+  <?db filename="ch-customizing"?>
   <title>Customizing the stylesheets</title>
 </info>