Merge remote-tracking branch 'upstream/main' into bread-types

.github/workflows/validate-book-build.yml

@@ -29,4 +29,4 @@ jobs:
           options: -v ${{ github.workspace }}:/app
           run: |
             cd /app/book
-            make -j build_pdf build_serif_ebook
+            make -j build_pdf build_ebook

.gitignore

@@ -58,6 +58,7 @@ book_serif/
 release_sans_serif/
 book/book_sans_serif-epub/
 book/static_website_html/*
+book/bw-book-epub/*
 epub/
 *.opf
 website/static_website_html/*

Dockerfile

@@ -20,6 +20,7 @@ RUN apt-get update && \
     wget \
     ruby3.1 \
     ruby-dev \
+    imagemagick \
     build-essential
 
 WORKDIR /root
@@ -31,9 +32,4 @@ COPY website/Gemfile /root
 COPY website/.ruby-version /root
 RUN bundle install
 
-# Install support to build amazon kindle books
-RUN wget https://archive.org/download/kindlegen_linux_2_6_i386_v2_9/kindlegen_linux_2.6_i386_v2_9.tar.gz && \
-    tar xzf kindlegen_linux_2.6_i386_v2_9.tar.gz && \
-    mv kindlegen /usr/bin
-
 CMD ["/bin/bash"]

README.md

@@ -32,7 +32,8 @@ make
 
 Then you can check out the file `book/book.pdf`
 
-If you want to 🍞 bake all the versions including ebook formats (.pdf, .epub, .mobi, .azw3) run:
+If you want to 🍞 bake all the versions including ebook variants (.pdf, .epub
+in colour or size optimized Black&White), run:
 
 ```console
 make bake
@@ -50,7 +51,8 @@ cd book/
 make
 ```
 
-If you want to 🍞 bake all the versions including ebook formats (.pdf, .epub, .mobi, .azw3) run:
+If you want to 🍞 bake all the versions including ebook variants (.pdf, .epub
+in colour or size optimized Black&White), run:
 
 ```console
 cd book/
@@ -76,8 +78,10 @@ There's an additional enhanced accessibility version using a sans serif font:
 
 * [Download compiled .pdf version](https://www.the-bread-code.io/book-sans-serif.pdf)
 
-**The ebook files in .mobi and .azw3 have been retired, please let us know if
-you were using them.**
+An additional black and white ebook is provided with a greatly reduced file size. This
+shrinks the book from more than 50MB down to ~5MB:
+
+* [Download compiled .epub version](https://www.the-bread-code.io/bw-book.epub)
 
 ## Online HTML version (WIP)
 

book/baking/baking.tex

@@ -27,7 +27,7 @@
 \begin{table}[htp!]
     \begin{center}
         \input{tables/table-baking-process-stages.tex}
-        \caption[Stages of dough during backing]{The different stages that
+        \caption[Stages of dough during baking]{The different stages that
             your dough undergoes during the baking process.}
     \end{center}
 \end{table}
@@ -127,12 +127,12 @@ \section{The role of steam}
 increases in size. The water in your dough evaporates and pushes
 the whole dough upwards.
 
-\begin{flowchart}[!htb]
+\begin{figure}[!htb]
   \includegraphics[width=\textwidth]{baking-process-steam.jpg}
   \caption[Steam building with inverted tray]{How steam builds in your oven
       using the later described inverted tray method.}%
       \label{flc:inverted-tray}
-\end{flowchart}
+\end{figure}
 
 Normally, under high heat a crust would form. Just like
 if you were to bake vegetables in your home oven, at some point
@@ -271,14 +271,14 @@ \section{Inverted tray method}
 created from the dough and water source stays
 around your dough.
 
-\begin{figure}[!htb]
+\begin{flowchart}[!htb]
 \begin{center}
   \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{figure}
+\end{flowchart}
 
 
 The biggest advantage of this method compared to the

book/book.tex

@@ -40,23 +40,20 @@ \chapter{Wheat sourdough}%
 \label{chapter:wheat-sourdough}
 \input{wheat-sourdough/wheat-sourdough}
 
-\chapter{Non wheat sourdough}%
-\label{chapter:non-wheat-sourdough}
 \input{non-wheat-sourdough/non-wheat-sourdough}
 
 % \input{mix-ins/mix-ins.tex}
 \chapter{Baking}%
 \label{chapter:baking}
 \input{baking/baking}
 
-\chapter{Storing bread}%
-\label{chapter:storing-bread}
 \input{storing-bread/storing-bread}
 
 \chapter{Troubleshooting}
 \input{troubleshooting/misc}
 
 \backmatter
+\input{glossary/glossary}
 \printbibliography
 {%
 \hypersetup{hidelinks}

book/figures/fig-non-wheat-process.tex

@@ -1,13 +1,13 @@
-\begin{tikzpicture}[node distance = 3cm, auto]
-  \node [start] (init) {Mix ingredients};
-  \node [block, below of=init, node distance=3cm] (bulk_ferment) {Bulk ferment};
-  \node [block, right of=init, node distance=3cm] (divide) {Divide};
-  \node [block, below of=divide, node distance=3cm] (shape) {Shape};
-  \node [block, right of=divide, node distance=3cm] (proof) {Proof};
-  \node [success, below of=proof, node distance=3cm] (bake) {Bake};
+\begin{tikzpicture}[node distance = 3.8cm, auto]
+  \node [start] (init) {Mix \\ingredients};
+  \node [block, below of=init, node distance = 3cm] (bulk_ferment) {Bulk ferment};
+  \node [block, right of=init] (divide) {Divide};
+  \node [block] at (divide |- bulk_ferment) (shape) {Shape};
+  \node [block, right of=divide] (proof) {Proof};
+  \node [success] at (proof |- bulk_ferment) (bake) {Bake};
   \path [line] (init) -- (bulk_ferment);
-  \path [line] (bulk_ferment) -- (divide);
+  \path [line] (bulk_ferment.north east) -- (divide.south west);
   \path [line] (divide) -- (shape);
-  \path [line] (shape) -- (proof);
+  \path [line] (shape.north east) -- (proof.south west);
   \path [line] (proof) -- (bake);
 \end{tikzpicture}