git subrepo pull website

subrepo: subdir: "website" merged: "60110b888b" upstream: origin: "[email protected]:daisy/pipeline.git" branch: "website" commit: "60110b888b" git-subrepo: version: "0.3.1" origin: "???" commit: "???"
daisy · Jan 29, 2025 · 1aacbcc · 1aacbcc
1 parent 018b0a0
commit 1aacbcc
Show file tree

Hide file tree

Showing 11 changed files with 118 additions and 29 deletions.
diff --git a/website/.gitrepo b/website/.gitrepo
@@ -6,6 +6,6 @@
 [subrepo]
 	remote = [email protected]:daisy/pipeline.git
 	branch = website
-	commit = a8d1a3e3dd391f31e77eb2b2af994f49a077b14b
-	parent = b40a9bbc10ff80e6ff32e94df49a603fb9cb8c67
+	commit = 60110b888b46f9ae7db503dc18d545592b287ecf
+	parent = 0cd4aa0030a412ce0a07d24a13fc861938f22f0c
 	cmdver = 0.3.1
diff --git a/website/src/_data/api.yml b/website/src/_data/api.yml
@@ -90,8 +90,6 @@ xprocdoc:
   artifact: nimas-fileset-validator
 - group: org.daisy.pipeline.modules
   artifact: word-to-dtbook
-- group: org.daisy.pipeline.modules
-  artifact: word-to-epub3
 - group: org.daisy.pipeline.modules
   artifact: zedai-to-epub3
 - group: org.daisy.pipeline.modules

diff --git a/website/src/_data/downloads.yml b/website/src/_data/downloads.yml
@@ -1,7 +1,85 @@
 ## Generate with:
-## curl -u bertfrees:$(pass github-tokens/curl | head -1) https://api.github.com/repos/daisy/pipeline-assembly/releases | jq --arg version 1.14.20 '.[] | select(.tag_name == ("v"+$version))|{group:"main",version:$version,sort:$version,state:"stable",github_tag:("v"+$version),github_url:.html_url,description:"FIXME",files:.assets|map({platform:.browser_download_url|capture("^.+\\.(?<ext>[^\\.]+)$")["ext"]|(if .=="zip" then "linux" elif .=="deb" then "debian" else "?" end),package:.browser_download_url|capture("^.+\\.(?<ext>[^\\.]+)$")["ext"]|sub("exe";"installer"),content:(if .browser_download_url|endswith(".zip") then ["server", "cli"] else ["server"] end),url:.browser_download_url,size:.size})}' | ruby -ryaml -rjson -e 'puts YAML.dump(JSON.load(ARGF))'
-## curl -u bertfrees:$(pass github-tokens/curl | head -1) https://api.github.com/repos/daisy/pipeline-ui/releases | jq --arg version 1.6.0 '.[] | select(.tag_name == $version)|{app_version:$version,app_github_tag:$version,app_github_url:.html_url,files:.assets|map({platform:.browser_download_url|capture("^.+\\.(?<ext>[^\\.]+)$")["ext"]|(if .=="exe" then "windows" elif.=="dmg" then "macosx" else "?" end),package:.browser_download_url|capture("^.+\\.(?<ext>[^\\.]+)$")["ext"]|sub("exe";"installer"),content:["gui","server"],url:.browser_download_url,size:.size})}' | ruby -ryaml -rjson -e 'puts YAML.dump(JSON.load(ARGF))'
-## curl -u bertfrees:$(pass github-tokens/curl | head -1) https://api.github.com/repos/daisy/pipeline-cli-go/releases | jq --arg version 2.1.8 '.[] | select(.tag_name == ("v"+$version))|{group:"cli",version:$version,state:"stable",github_tag:("v"+$version),github_url:.html_url,files:.assets|map({platform:.browser_download_url|capture("^.+/cli-\\Q"+$version+"\\E-(?<platform>[^\\.]+)\\.zip$")["platform"]|(if .=="windows_amd64" then "windows-64" elif .=="windows_386" then "windows-32" elif .=="linux_amd64" then "linux-64" elif .=="linux_386" then "linux-32" elif .=="darwin_amd64" then "macosx" else "?" end),package:"zip",content: "cli", url:.browser_download_url,size:.size})}' | ruby -ryaml -rjson -e 'puts YAML.dump(JSON.load(ARGF))'
+## curl -u bertfrees:$(pass github-tokens/curl | head -1) https://api.github.com/repos/daisy/pipeline-assembly/releases | jq --arg version 1.15.0 '.[] | select(.tag_name == ("v"+$version))|{group:"main",version:$version,sort:$version,state:"stable",github_tag:("v"+$version),github_url:.html_url,description:"FIXME",files:.assets|map({platform:.browser_download_url|capture("^.+\\.(?<ext>[^\\.]+)$")["ext"]|(if .=="zip" then "linux" elif .=="deb" then "debian" else "?" end),package:.browser_download_url|capture("^.+\\.(?<ext>[^\\.]+)$")["ext"]|sub("exe";"installer"),content:(if .browser_download_url|endswith(".zip") then ["server", "cli"] else ["server"] end),url:.browser_download_url,size:.size})}' | ruby -ryaml -rjson -e 'puts YAML.dump(JSON.load(ARGF))'
+## curl -u bertfrees:$(pass github-tokens/curl | head -1) https://api.github.com/repos/daisy/pipeline-ui/releases | jq --arg version 1.7.0 '.[] | select(.tag_name == $version)|{app_version:$version,app_github_tag:$version,app_github_url:.html_url,files:.assets|map({platform:.browser_download_url|capture("^.+\\.(?<ext>[^\\.]+)$")["ext"]|(if .=="exe" then "windows" elif.=="dmg" then "macosx" else "?" end),package:.browser_download_url|capture("^.+\\.(?<ext>[^\\.]+)$")["ext"]|sub("exe";"installer"),content:["gui","server"],url:.browser_download_url,size:.size})}' | ruby -ryaml -rjson -e 'puts YAML.dump(JSON.load(ARGF))'
+## curl -u bertfrees:$(pass github-tokens/curl | head -1) https://api.github.com/repos/daisy/pipeline-cli-go/releases | jq --arg version 2.2.1 '.[] | select(.tag_name == ("v"+$version))|{group:"cli",version:$version,state:"stable",github_tag:("v"+$version),github_url:.html_url,files:.assets|map({platform:.browser_download_url|capture("^.+/cli-\\Q"+$version+"\\E-(?<platform>[^\\.]+)\\.zip$")["platform"]|(if .=="windows_amd64" then "windows-64" elif .=="windows_386" then "windows-32" elif .=="linux_amd64" then "linux-64" elif .=="linux_386" then "linux-32" elif .=="darwin_amd64" then "macosx" else "?" end),package:"zip",content: "cli", url:.browser_download_url,size:.size})}' | ruby -ryaml -rjson -e 'puts YAML.dump(JSON.load(ARGF))'
+
+- group: main
+  version: "1.15.0"
+  sort: "1.15.0"
+  state: stable
+  github_tag: "v1.15.0"
+  github_url: "https://github.com/daisy/pipeline-assembly/releases/tag/v1.15.0"
+  app_version: "1.7.0"
+  app_github_tag: "1.7.0"
+  app_github_url: "https://github.com/daisy/pipeline-ui/releases/tag/1.7.0"
+  description: >
+    Includes the standalone desktop application and the web server. Versions available for
+    Windows (an installer EXE) and Mac OS (an installer PKG). The Linux packages (ZIP and
+    DEB files) include only the web server. The ZIP package also includes the command line
+    interface.
+  files:
+  - platform: macosx
+    package: pkg
+    content: [gui, server]
+    url: "https://github.com/daisy/pipeline-ui/releases/download/1.7.0/daisy-pipeline-1.7.0-mac.pkg"
+    size: 245052291
+  - platform: windows
+    package: installer
+    content: [gui, server]
+    url: "https://github.com/daisy/pipeline-ui/releases/download/1.7.0/daisy-pipeline-setup-1.7.0.exe"
+    size: 197124832
+  - platform: debian
+    package: deb
+    content: [server]
+    url: "https://github.com/daisy/pipeline-assembly/releases/download/v1.15.0/pipeline2-1.15.0_debian.deb"
+    size: 130661312
+  - platform: linux
+    package: zip
+    content: [server, cli]
+    url: "https://github.com/daisy/pipeline-assembly/releases/download/v1.15.0/pipeline2-1.15.0_linux.zip"
+    size: 138762802
+
+- group: cli
+  version: "2.2.1"
+  state: stable
+  github_tag: "v2.2.1"
+  github_url: "https://github.com/daisy/pipeline-cli-go/releases/tag/v2.2.1"
+  files:
+  - platform: macosx
+    package: zip
+    content: cli
+    url: "https://github.com/daisy/pipeline-cli-go/releases/download/v2.2.1/cli-2.2.1-darwin_amd64.zip"
+    size: 6171469
+  - platform: macosx-arm64
+    package: zip
+    content: cli
+    url: "https://github.com/daisy/pipeline-cli-go/releases/download/v2.2.1/cli-2.2.1-darwin_arm64.zip"
+    size: 5851516
+  - platform: linux-32
+    package: zip
+    content: cli
+    url: "https://github.com/daisy/pipeline-cli-go/releases/download/v2.2.1/cli-2.2.1-linux_386.zip"
+    size: 5947892
+  - platform: linux-64
+    package: zip
+    content: cli
+    url: "https://github.com/daisy/pipeline-cli-go/releases/download/v2.2.1/cli-2.2.1-linux_amd64.zip"
+    size: 6193573
+  - platform: linux-arm64
+    package: zip
+    content: cli
+    url: "https://github.com/daisy/pipeline-cli-go/releases/download/v2.2.1/cli-2.2.1-linux_arm64.zip"
+    size: 5764683
+  - platform: windows-32
+    package: zip
+    content: cli
+    url: "https://github.com/daisy/pipeline-cli-go/releases/download/v2.2.1/cli-2.2.1-windows_386.zip"
+    size: 6061036
+  - platform: windows-64
+    package: zip
+    content: cli
+    url: "https://github.com/daisy/pipeline-cli-go/releases/download/v2.2.1/cli-2.2.1-windows_amd64.zip"
+    size: 6289665
 
 - group: main
   version: "1.14.20"

diff --git a/website/src/_data/modules.yml b/website/src/_data/modules.yml
@@ -48,8 +48,6 @@
   artifact: nimas-fileset-validator
 - group: org.daisy.pipeline.modules
   artifact: word-to-dtbook
-- group: org.daisy.pipeline.modules
-  artifact: word-to-epub3
 - group: org.daisy.pipeline.modules
   artifact: zedai-to-epub3
 - group: org.daisy.pipeline.modules

diff --git a/website/src/_data/versions.yml b/website/src/_data/versions.yml
@@ -1,2 +1,2 @@
-assembly: 1.14.20
+assembly: 1.15.0
 css-spec: 20210129
diff --git a/website/src/_includes/download-link b/website/src/_includes/download-link
@@ -1,16 +1,18 @@
 <a href="{{include.file.url}}" class="download">
 For
 {% case include.file.platform %}
-{% when 'windows' %}    Windows
-{% when 'windows-64' %} Windows (64-bit)
-{% when 'windows-32' %} Windows (32-bit)
-{% when 'macosx' %}     macOS
-{% when 'linux' %}      Linux
-{% when 'linux-64' %}   Linux (64-bit)
-{% when 'linux-32' %}   Linux (32-bit)
-{% when 'debian' %}     Debian/Ubuntu
-{% when 'redhat' %}     Red Hat/CentOS
-{% else %}              Other
+{% when 'windows' %}       Windows
+{% when 'windows-64' %}    Windows (64-bit)
+{% when 'windows-32' %}    Windows (32-bit)
+{% when 'macosx' %}        macOS (Intel)
+{% when 'macosx-arm64' %}  macOS (Apple silicon)
+{% when 'linux' %}         Linux
+{% when 'linux-64' %}      Linux (64-bit)
+{% when 'linux-arm64' %}   Linux (ARM)
+{% when 'linux-32' %}      Linux (32-bit)
+{% when 'debian' %}        Debian/Ubuntu
+{% when 'redhat' %}        Red Hat/CentOS
+{% else %}                 Other
 {% endcase %}
 users
 </a>

diff --git a/website/src/_wiki/Get-Help/User-Guide/Installation.md b/website/src/_wiki/Get-Help/User-Guide/Installation.md
@@ -166,7 +166,7 @@ To learn more about Docker see [https://docs.docker.com](https://docs.docker.com
 ### Java
 
 The standalone server requires a Java runtime environment. The minimum
-required version of Java is 11. We recommend installing Java from
-https://adoptium.net/. Users of the desktop application (Windows and
-macOS) do not have to worry about Java because it is included in the
-application.
+required version of Java is 11. We recommend installing [Java from
+Adopt Open JDK](https://adoptium.net/). Users of the desktop
+application (Windows and MacOS) do not have to worry about Java
+because it is included in the application.
diff --git a/website/src/_wiki/Get-Help/User-Guide/Scripts.md b/website/src/_wiki/Get-Help/User-Guide/Scripts.md
@@ -31,7 +31,7 @@ with DAISY Pipeline 2. The complete list of available scripts is:
 * [HTML to EPUB3](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/html-to-epub3/)
 * [HTML to PEF](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/html-to-pef/)
 * [NIMAS Fileset Validator](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/nimas-fileset-validator/)
-<!-- * [Word to DTBook](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/word-to-dtbook/) -->
+* [Word to DTBook](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/word-to-dtbook/)
 * [ZedAI to EPUB 3](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/zedai-to-epub3/)
 * [ZedAI to HTML](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/zedai-to-html/)
 * [ZedAI to PEF](http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/zedai-to-pef/)
@@ -42,7 +42,7 @@ with DAISY Pipeline 2. The complete list of available scripts is:
 <table id="scripts-matrix">
   <tr>
     <th colspan="2" rowspan="3">Inputs</th>
-    <th colspan="8">Outputs</th>
+    <th colspan="9">Outputs</th>
   </tr>
   <tr>
     <th colspan="2">DAISY</th>
@@ -95,6 +95,18 @@ with DAISY Pipeline 2. The complete list of available scripts is:
     <td><a href="http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/dtbook-to-rtf">DTBook to RTF</a></td>
     <td><a href="http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/dtbook-to-odt">DTBook to ODT</a></td>
   </tr>
+  <tr>
+    <th colspan="2">DOCX (MS Word)</th>
+    <td></td>
+    <td></td>
+    <td><a href="http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/word-to-dtbook">Word to DTBook</a></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+    <td></td>
+  </tr>
   <tr>
     <th rowspan="2">EPUB</th>
     <th>2</th>
@@ -125,7 +137,7 @@ with DAISY Pipeline 2. The complete list of available scripts is:
     <th colspan="2">HTML</th>
     <td></td>
     <td></td>
-    <td><a href="http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/html-to-dtbook">HTML to DTBook</td>
+    <td><a href="http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/html-to-dtbook">HTML to DTBook</a></td>
     <td><a href="http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/html-to-epub3">HTML to EPUB 3</a></td>
     <td></td>
     <td></td>

diff --git a/website/src/_wiki/_Sidebar.md b/website/src/_wiki/_Sidebar.md
@@ -42,6 +42,7 @@
       * [[HTML to EPUB3|http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/html-to-epub3/]]
       * [[HTML to PEF|http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/html-to-pef/]]
       * [[NIMAS Fileset Validator|http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/nimas-fileset-validator/]]
+      * [[Word to DTBook|http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/word-to-dtbook/]]
       * [[ZedAI to EPUB 3|http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/zedai-to-epub3/]]
       * [[ZedAI to HTML|http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/zedai-to-html/]]
       * [[ZedAI to PEF|http://daisy.github.io/pipeline/Get-Help/User-Guide/Scripts/zedai-to-pef/]]

diff --git a/website/src/index.md b/website/src/index.md
@@ -18,7 +18,7 @@ to making content accessible. It goes without saying that accessiblity
 is the main interest of the tool. There are Pipeline transformation
 for migrating from one accessible format to another, enriching an
 input format with certain accessible features, and producing formats
-targeting a specific disability.
+targeting specific disability reading systems.
 
 ## Standards
 

diff --git a/website/target/maven/pom.xml b/website/target/maven/pom.xml