Merge remote-tracking branch 'hendiricus/main' into supporters

.github/workflows/release-book-website.yml

@@ -4,12 +4,36 @@ on:
   push:
     branches:
       - main
+
 env:
-  IMAGE: ghcr.io/${{ github.repository }}:latest
+  LATEST_IMAGE: ghcr.io/${{ github.repository }}:latest
 
 jobs:
   build-and-push-image:
-    uses: ./.github/workflows/docker-build-push.yml
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      # Buildx for caching
+      - uses: docker/setup-buildx-action@v3
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          push: true
+          tags: ghcr.io/${{ github.repository }}:latest
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
 
   release-book-website:
     needs: build-and-push-image
@@ -20,27 +44,27 @@ jobs:
       - name: Print dependency versions
         uses: addnab/docker-run-action@v3
         with:
-          image: ${{ env.IMAGE }}
+          image: ${{ env.LATEST_IMAGE }}
           options: -v ${{ github.workspace }}:/app
           run: |
             cd /app/book
             make show_tools_version
       - name: Print build variables
         uses: addnab/docker-run-action@v3
         with:
-          image: ${{ env.IMAGE }}
+          image: ${{ env.LATEST_IMAGE }}
           options: -v ${{ github.workspace }}:/app
           run: |
             cd /app/book
             make printvars
       - name: Bake the book
         uses: addnab/docker-run-action@v3
         with:
-          image: ${{ env.IMAGE }}
+          image: ${{ env.LATEST_IMAGE }}
           options: -v ${{ github.workspace }}:/app
           run: |
             cd /app/book
-            make -j bake
+            make bake
       - name: Release baked book to S3
         uses: shallwefootball/s3-upload-action@master
         with:
@@ -60,7 +84,7 @@ jobs:
       - name: Bake the website
         uses: addnab/docker-run-action@v3
         with:
-          image: ${{ env.IMAGE }}
+          image: ${{ env.LATEST_IMAGE }}
           options: -v ${{ github.workspace }}:/app
           run: |
             cd /app/book

.github/workflows/test-book-website.yml

@@ -1,11 +1,9 @@
 name: Test book and website for given image
 
-on:
-  workflow_call:
-    inputs:
-      docker-image:
-        required: true
-        type: string
+on: [push, pull_request]
+
+env:
+  DOCKER_IMAGE: ghcr.io/${{ github.repository }}:latest
 
 jobs:
   test-book-website:
@@ -16,23 +14,23 @@ jobs:
       - name: Print dependency versions
         uses: addnab/docker-run-action@v3
         with:
-          image: ${{ inputs.docker-image }}
+          image: ${{ env.DOCKER_IMAGE }}
           options: -v ${{ github.workspace }}:/app
           run: |
             cd /app/book
             make show_tools_version
       - name: Print build variables
         uses: addnab/docker-run-action@v3
         with:
-          image: ${{ inputs.docker-image }}
+          image: ${{ env.DOCKER_IMAGE }}
           options: -v ${{ github.workspace }}:/app
           run: |
             cd /app/book
             make printvars
       - name: Test baking the release versions
         uses: addnab/docker-run-action@v3
         with:
-          image: ${{ inputs.docker-image }}
+          image: ${{ env.DOCKER_IMAGE }}
           options: -v ${{ github.workspace }}:/app
           run: |
             cd /app/book
@@ -48,7 +46,7 @@ jobs:
       - name: Test building website
         uses: addnab/docker-run-action@v3
         with:
-          image: ${{ inputs.docker-image }}
+          image: ${{ env.DOCKER_IMAGE }}
           options: -v ${{ github.workspace }}:/app
           run: |
             cd /app/book

Dockerfile

@@ -8,7 +8,7 @@ LABEL org.opencontainers.image.source="https://github.com/hendricius/the-sourdou
 # Print release information if needed
 RUN cat /etc/*release*
 
-# Install base depdendencies
+# Install base dependencies
 RUN apt-get update && \
     apt-get install --yes -y --no-install-recommends \
     sudo \
@@ -55,6 +55,11 @@ RUN wget https://github.com/mgieseki/dvisvgm/releases/download/3.1.2/dvisvgm-3.1
     make && \
     make install
 
+RUN git clone https://github.com/michal-h21/make4ht.git && \
+  cd make4ht && \
+  make && \
+  make install
+
 # Make sure everything is UTF-8
 RUN echo "export LC_ALL=en_US.UTF-8" >> /root/.bashrc && \
     echo "export LANG=en_US.UTF-8" >> /root/.bashrc

README.md

@@ -84,6 +84,13 @@ size. This shrinks the book from more than 50MB down to ~5MB:
 
 * [Download compiled B&W .epub version](https://www.the-bread-code.io/bw-book.epub)
 
+If you prefer a very short version (about 10 pages) with main flowcharts and
+crucial information needed while you are in the kitchen, we also provide a
+"too long;didn't read" version you could print.  Having read the full book is
+highly recommended to understand this leaflet:
+
+* [Download a condensed version](https://www.the-bread-code.io/booklet.pdf)
+
 ## Online HTML version
 
 Head over to [https://www.the-sourdough-framework.com](https://www.the-sourdough-framework.com)

book/baking/baking.tex

@@ -18,12 +18,11 @@ \section{The process of baking}
 gel-like consistency, the crust is still extensible and can be stretched.
 
 \begin{table}[htp!]
-    \begin{center}
+    \centering
         \input{tables/table-baking-process-stages.tex}
         \caption[Stages of dough during baking]{The different stages that
             your dough undergoes during the baking process.}%
         \label{tab:baking-stages}
-    \end{center}
 \end{table}
 
 At around  \qty{60}{\degreeCelsius} (\qty{140}{\degF}) the microbes in your dough start to die.
@@ -171,12 +170,11 @@ \section{The role of steam}
 
 \section{Building up steam}
 \begin{flowchart}[!htb]
-\begin{center}
+\centering
   \input{figures/fig-baking-process.tex}
   \caption[Different steaming methods]{A schematic visualization of the baking
       process using different sources of steam in a home oven.}%
   \label{fig:baking-process}
-\end{center}
 \end{flowchart}
 
 \begin{figure}[!htb]
@@ -206,7 +204,7 @@ \subsection{Dutch ovens}
 \end{figure}
 
 \begin{flowchart}[!htb]
-\begin{center}
+\centering
   \input{figures/fig-dutch-oven-process.tex}
   \caption[Baking process with a dutch oven]{A visualization of the baking
       process using a dutch oven (DO). The dough is steamed for the first half
@@ -215,7 +213,6 @@ \subsection{Dutch ovens}
       personal preference. Some bakers prefer a lighter crust and others a
       darker.}%
   \label{fig:dutch-oven-process}
-\end{center}
 \end{flowchart}
 
 Dutch ovens are an ideal way to bake with a lot of
@@ -277,12 +274,11 @@ \subsection{Inverted tray method}
 around your dough.
 
 \begin{flowchart}[!htb]
-\begin{center}
+\centering
   \input{figures/fig-inverted-tray-method.tex}
   \caption[Inverted tray baking process]{A schematic visualization the
   inverted tray baking method that works great for home ovens.}%
   \label{fig:inverted-tray-process}
-\end{center}
 \end{flowchart}
 
 
@@ -335,11 +331,10 @@ \subsection{Inverted tray method}
 \section{Conclusions}
 
 \begin{table}[!htb]
-    \begin{center}
+    \centering
         \input{tables/table-oven-baking-overview.tex}
         \caption[Different oven types]{An overview of different oven types and their
             different baking methods.}
-    \end{center}
 \end{table}
 
 Depending on your home oven, a different method

book/basics/how-sourdough-works.tex

@@ -19,7 +19,7 @@ \section{Enzymatic reactions}
 
 To understand the many enzymatic reactions that take place when flour
 and water are mixed, we must first understand seeds and their role in
-the lifecycle of wheat and other grains.
+the life cycle of wheat and other grains.
 
 Seeds are the primary means by which many plants, including wheat,
 reproduce. Each seed contains the embryo of another plant, and must
@@ -223,12 +223,11 @@ \section{Yeast}
 page~\pageref{aggressive-yeast}.}
 
 \begin{figure}[!htb]
-\begin{center}
+\centering
   \includegraphics[width=0.8\textwidth]{saccharomyces-cerevisiae-microscope}
   \caption[Brewer's yeast]{Saccharomyces cerevisiae: Brewer's yeast under the
       microscope.}%
   \label{saccharomyces-cerevisiae-microscope}
-\end{center}
 \end{figure}
 
 Yeasts are saprotrophic fungi. This means that they do not produce their own