Merge branch 'main' into 225-ebook-situation

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

@@ -1,5 +1,11 @@
 name: Validate LaTeX Document
-on: [ push, pull_request ]
+on:
+  push:
+    branches:
+      - '**'  # All branches
+      - '!main' # But main as will do it anyway and more in release_book
+  pull_request:
+
 jobs:
   test_building_book:
     runs-on: ubuntu-latest
@@ -30,3 +36,24 @@ jobs:
           run: |
             cd /app/book
             make -j build_serif_pdf build_ebook
+      - name: Test building website
+        uses: addnab/docker-run-action@v3
+        with:
+          image: ghcr.io/hendricius/the-sourdough-framework:latest
+          options: -v ${{ github.workspace }}:/app
+          run: |
+            cd /app/book
+            make -j website
+      - name: Upload book Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: books
+          path: |
+            book/book_serif/book.log
+            book/book_serif/book.pdf
+            book/book-epub/book.epub
+      - name: Upload website Artifacts
+        uses: actions/upload-artifact@v3
+        with:
+          name: website
+          path: website/static_website_html

book/history/sourdough-history.tex

@@ -21,17 +21,6 @@ addition to our planet, so young that we made our first appearance on
 the evening of December~31.  It seems that humans managed to arrive just
 in time to join the celebration at the end of the year.
 
-The story of sourdough bread begins in ancient oceans. These oceans were the
-birthplace of all Earth's life. To better envision the vast history of
-our planet lets create a timeline of 1~year. On this scale, January~1 signifies Earth's
-formation 4.54~billion years ago. Midnight on December~31 is our present.
-Each day represents roughly 12~million years. This technique simplifies the
-complexity of time but also renders the extraordinary expanse of our planet's
-history into a more graspable frame. We humans are in fact a recent addition
-to our planet, so young that we made appearance on the evening of December~31.
-It seems that humans managed to arrive just in time to join
-the celebration at year's end.
-
 On March~25, the oceans birthed the first single-celled bacteria. In these
 waters, another single-celled life form, \emph{archaea}, also thrived. These
 organisms inhabit extreme environments, from boiling vents to icy waters.
@@ -47,7 +36,7 @@ organisms inhabit extreme environments, from boiling vents to icy waters.
 \end{center}
 \end{figure}
 
-Whoever comes first first, bacteria or archaea, remains debated. For three
+Whoever comes first, bacteria or archaea, remains debated. For three
 months (or approximately 1.1~billion years), these life forms dominated
 the oceans. Then, on June~25 in an highly unlikely event, an archaeon consumed a bacterium.
 Instead of digesting it, they formed a symbiotic relationship. This led to the
@@ -101,10 +90,11 @@ Little did the people back then know that tiny microorganisms
 were the reason the bread was better. It is not clear when
 they started using a bit of the dough from the previous
 day for the next batch of dough. But by doing so, sourdough
-bread making was born: Wild yeast in the flour and in the air
+bread making---as we know it today---was born: Wild yeast
-plus bacteria start to decompose the flour-water mixture, also
+in the flour and in the air, with bacteria
-known as your dough. The yeast makes the dough fluffy, and
+starting to decompose the flour-water mixture.
-the bacteria primarily creates acidity. The different
+The yeast makes the dough fluffy,
+and the bacteria primarily creates acidity. The different
 microorganisms work in a symbiotic relationship. Humans
 appreciated the enhanced airy structure and slight acidity
 of the dough. Furthermore, the shelf life of such bread

book/tables/table-starter-usage-activity.tex

@@ -1,8 +1,10 @@
-\begin{tabular}{@{}crr@{}}
+\begin{tabular}{@{}c
+    S[table-format=2.0]
+    S[table-format=2.1]@{}}
 \toprule
-                &\multicolumn{2}{c}{\textbf{Amount (\%) of a starter}}\\
+                 &\multicolumn{2}{c}{\textbf{Amount (\%) for a starter}}\\
                           \cmidrule(rl){2-3}
-\thead{°C / °F} & \thead{Recently fed} & \thead{Starving}\\ \midrule
+\textbf{°C / °F} & \textbf{Recently fed} & \textbf{Starving}\\ \midrule
         30 / 86  &  5 &  2.5 \\ 
         25 / 77  & 10 &  5   \\ 
         20 / 68  & 15 & 10   \\ \bottomrule

book/wheat-sourdough/wheat-sourdough.tex

@@ -18,7 +18,7 @@ making this type of bread requires a lot more effort, patience,
 and technique than other types of bread. You have to perfectly
 balance the fermentation process. You cannot ferment for too
 short and also not for too long. The techniques you need to
-learn to require a bit more skill. It took me several attempts
+learn also require a bit more skill. It took me several attempts
 to get this right. One of the challenges I~faced was that
 I~had the wrong flour. I~didn't properly know how to use my oven.
 When should I~stop the fermentation? There is a lot of information
@@ -233,7 +233,7 @@ recipe would look like this:
 
 This is the beauty of baker's math. Simply recalculate the percentages, and you
 are good to go. If you are unsure about how this works, please check out the
-full Chapter~\ref{section:bakers-math} which looks at the topic in detail.
+full Section~\ref{section:bakers-math} which looks at the topic in detail.
 
 \section{Hydration}
 
@@ -392,8 +392,8 @@ difficulty.
 \section{How much starter?}
 
 Most bakers use around \qty{20}{\percent} sourdough starter based on the
-flour weight.  I~recommend going much lower,
+flour weight.  I~recommend going much lower, to around
-to around 5 to \qty{10}{\percent}.
+\qtyrange{5}{10}{\percent}.
 
 By adjusting the amount of pre-ferment you can influence the time your dough
 requires in the bulk fermentation stage. The more starter you use, the faster

makefile

@@ -14,10 +14,11 @@ push_docker_image: build_docker_image
 	docker push $(DOCKER_IMAGE):latest
 
 # Books/website
+build_serif_pdf:
+	$(DOCKER_CMD) "cd /opt/repo/book && make build_serif_pdf"
 
-# Quicker run for each commit, shall catch most problems
+build_ebook:
-validate:
+	$(DOCKER_CMD) "cd /opt/repo/book && make build_ebook"
-	$(DOCKER_CMD) "cd /opt/repo/book && make -j build_serif_pdf build_ebook"
 
 build_pdf:
 	$(DOCKER_CMD) "cd /opt/repo/book && make"

website/modify_build.rb

@@ -504,8 +504,10 @@ class ModifyBuild
 
     <p class="noindent">
       EPUB: <a href="https://www.the-bread-code.io/book.epub">https://www.the-bread-code.io/book.epub</a><br>
+      EPUB in Black & White, size optimized for screen readers : <a href="https://www.the-bread-code.io/bw-book.epub">https://www.the-bread-code.io/bw-book.epub</a><br>
     </p>
 
+
     <p class="noindent">
       The full source code of the book can be found here:
       <a href="https://www.github.com/hendricius/the-sourdough-framework">https://www.github.com/hendricius/the-sourdough-framework</a>