Eliminates duplication (#467 )

I tripped over the 'around all around' it sounds wrong to me. I propose to either have 'all around' or 'around your'.
Bump ruby version there too
2025-12-03 08:13:58 -06:00 · 2025-08-06 17:04:58 +02:00 · 2025-06-09 18:39:13 +01:00 · 2025-06-09 18:20:16 +01:00 · 2025-06-09 14:26:09 +01:00 · 2025-06-09 14:25:58 +01:00
9 changed files with 274 additions and 54 deletions
--- a/.github/workflows/release-book-website.yml
+++ b/.github/workflows/release-book-website.yml
@@ -65,15 +65,16 @@ jobs:
          run: |
            cd /app/book
            make -j -O bake
-      - name: Release baked book to S3
-        uses: shallwefootball/s3-upload-action@master
+      - name: Copy book to downloads server
+        uses: burnett01/rsync-deployments@7.0.2
        with:
-          aws_key_id: ${{ secrets.AWS_KEY_ID }}
-          aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
-          aws_bucket: ${{ secrets.AWS_BUCKET_BOOK }}
-          source_dir: book/release
-          destination_dir: release
-      - name: Upload book Artifacts
+          switches: "-avzr"
+          remote_host: ${{ secrets.SSH_HOST }}
+          remote_user: ${{ secrets.SSH_USERNAME }}
+          remote_key: ${{ secrets.SSH_KEY }}
+          path: "book/release/*"
+          remote_path: "~/downloads/the-sourdough-framework/"
+      - name: Upload book artifacts to GitHub
        uses: actions/upload-artifact@v4
        with:
          name: books
@@ -81,36 +82,17 @@ jobs:
            book/book_serif/book.log
            book/book_serif/book.pdf
            book/book-epub/book.epub
-      - name: Release baked website to S3
-        uses: shallwefootball/s3-upload-action@master
+      - name: Copy website to downloads server
+        uses: burnett01/rsync-deployments@7.0.2
        with:
-          aws_key_id: ${{ secrets.AWS_KEY_ID }}
-          aws_secret_access_key: ${{ secrets.AWS_SECRET_ACCESS_KEY}}
-          aws_bucket: ${{ secrets.AWS_BUCKET_WEBSITE }}
-          source_dir: website/static_website_html
-          destination_dir: static_html_root
-      - name: Upload website Artifacts
+          switches: "-avzr --delete"
+          remote_host: ${{ secrets.SSH_HOST }}
+          remote_user: ${{ secrets.SSH_USERNAME }}
+          remote_key: ${{ secrets.SSH_KEY }}
+          path: "website/static_website_html/*"
+          remote_path: "~/the-sourdough-framework/"
+      - name: Upload website artifacts to GitHub
        uses: actions/upload-artifact@v4
        with:
          name: website
-          path: website/static_website_html
-  invalidate-book-website-cache:
-    needs: release-book-website
-    runs-on: ubuntu-latest
-    steps:
-      - name: Invalidate Cloudfront book cache
-        uses: chetan/invalidate-cloudfront-action@v2
-        env:
-          DISTRIBUTION: ${{ secrets.CLOUDFRONT_DISTRIBUTION_BOOK }}
-          PATHS: "/*"
-          AWS_REGION: "us-east-1"
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-      - name: Invalidate Cloudfront website cache
-        uses: chetan/invalidate-cloudfront-action@v2
-        env:
-          DISTRIBUTION: ${{ secrets.CLOUDFRONT_DISTRIBUTION_WEBSITE }}
-          PATHS: "/*"
-          AWS_REGION: "us-east-1"
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          path: website/static_website_html
--- a/.github/workflows/test-book-website.yml
+++ b/.github/workflows/test-book-website.yml
@@ -41,7 +41,7 @@ jobs:
          run: |
            cd /app/book
            make -j -O serif ebook website
-      - name: Upload book Artifacts
+      - name: Upload book artifacts to GitHub
        uses: actions/upload-artifact@v4
        with:
          name: books
@@ -49,7 +49,7 @@ jobs:
            book/book_serif/book.log
            book/book_serif/book.pdf
            book/book-epub/book.epub
-      - name: Upload website Artifacts
+      - name: Upload website artifacts to GitHub
        uses: actions/upload-artifact@v4
        with:
          name: website
--- a/book/history/sourdough-history.tex
+++ b/book/history/sourdough-history.tex
@@ -229,7 +229,7 @@ During World~War~II the first packaged dry yeast was developed. This would
 ultimately allow bakeries and home bakers to make bread much faster and more
 consistently. Thanks to pure yeast, building industrial bread making machines
 was now possible. Provided you maintain the same temperature, same flour and
-yeast strains fermentation became precisely reproducible. This ultimately lead
+yeast strains fermentation became precisely reproducible. This ultimately led
 to the development of giga bakeries and flour blenders. The bakeries demanded
 the same flour from year to year to bake bread in their machines.  For this
 reason, none of the supermarket flour you buy today is single origin.  It is
--- a/book/makefile
+++ b/book/makefile
@@ -35,21 +35,21 @@ chapters = baking basics bread-types cover flour-types history intro mix-ins\
 		non-wheat-sourdough sourdough-starter storing-bread troubleshooting\
 		wheat-sourdough glossary

-# Actual book text and LaTeX code {{{
-src_tex := $(foreach directory, $(chapters), $(wildcard $(directory)/*.tex))
-src_tex += book.tex book_sans_serif.tex references.bib figures/vars.tex
-src_tex += supporters.csv sourdough.sty colors.tex abbreviations.tex
-src_tex += $(src_recipes)
-# }}}
-
 # Tables and TikZ flowcharts/plots/drawings... {{{
 src_tables  := $(wildcard tables/table-*.tex)
-src_figures := $(wildcard figures/fig-*.tex) figures/flowcharts_tikz.tex
+src_figures := $(wildcard figures/fig-*.tex) figures/flowcharts_tikz.tex figures/vars.tex
 src_figures += $(wildcard plots/fig-*.tex) abbreviations.tex colors.tex
 src_recipes := $(wildcard recipes/*.tex)
 src_plots   := $(wildcard plots/*.table)
 # }}}

+# Actual book text and LaTeX code {{{
+src_tex := $(foreach directory, $(chapters), $(wildcard $(directory)/*.tex))
+src_tex += book.tex book_sans_serif.tex colors.tex abbreviations.tex
+src_tex += $(src_recipes) supporters.csv references.bib
+src_tex += sourdough.sty
+# }}}
+
 tgt_figures := $(patsubst %.tex, %.png,$(src_figures))

 # Photos {{{
@@ -76,7 +76,7 @@ low_res_images := $(filter-out %.png, $(low_res_images))
 src_all := $(src_tex) $(src_figures) $(src_tables) $(images) $(src_plots)

 # Format specific configuration files
-ebook_src := $(src_all) tex4ebook.cfg book.mk4 book-ebook.css
+ebook_src := $(src_all) tex4ebook.cfg book.mk4 book-ebook.css nameref.4ht

 website_src := $(src_all) website.cfg style.css
 website_dir := static_website_html
--- a/book/nameref.4ht
+++ b/book/nameref.4ht
@@ -0,0 +1,238 @@
+% nameref.4ht (2024-06-15-13:36), generated from tex4ht-4ht.tex
+% Copyright 2005-2009 Eitan M. Gurari
+% Copyright 2009-2024 TeX Users Group
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either
+% version 1.3c of this license or (at your option) any
+% later version. The latest version of this license is in
+%   http://www.latex-project.org/lppl.txt
+% and version 1.3c or later is part of all distributions
+% of LaTeX version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status "maintained".
+%
+% The Current Maintainer of this work
+% is the TeX4ht Project <http://tug.org/tex4ht>.
+%
+% If you modify this program, changing the
+% version identification would be appreciated.
+\immediate\write-1{version 2024-06-15-13:36}
+
+   \let\NR:Type\relax
+\let\ltx@label\label
+\def\prf:label{{\ifx \NR:Title\:UnDef \a:newlabel{\@currentlabelname}\else \NR:Title\fi}%
+               {\ifx \NR:Type\relax \else \NR:Type .1\fi}{}}%
+
+\append:defI\label{\let\NR:Title\undefined}
+
+\let\NR:StartSec\:StartSec
+\let\NR:no@sect\no@sect
+\def\no@sect#1#2#3#4#5#6[#7]#8{\gdef\NR:Title{\a:newlabel{#7}}%
+    \gdef\NR:Type{#1}%
+    \NR:no@sect{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]{#8}}
+\def\:StartSec#1#2#3{%
+   \gdef\NR:Title{\a:newlabel{#3}}%
+   \gdef\NR:Type{#1}%
+   \NR:StartSec{#1}{#2}{#3}%
+}
+
+\def\:tempc#1#2#3#4#5#6[#7]#8{%
+   \gdef\NR:Title{\a:newlabel{#7}}%
+   \gdef\NR:Type{#1}%
+   \o:NR@sect:{#1}{#2}{#3}{#4}{#5}{#6}[{#7}]{#8}}
+\HLet\NR@sect\:tempc
+
+\def\:tempc#1#2#3#4#5{%
+   \gdef\NR:Title{\a:newlabel\ssect:ttl}%
+   \gdef\NR:Type{#1}%
+   \o:NR@ssect:{#1}{#2}{#3}{#4}{#5}%
+}
+\HLet\NR@ssect\:tempc
+
+\def\:tempc[#1]#2{%
+   \gdef\NR:Title{\a:newlabel{#1}}%
+   \gdef\NR:Type{part}%
+   \o:no@part:[{#1}]{#2}}
+
+% this definition clashes with asmart and amsproc classes, so we
+% need to skip if these are active
+\@ifundefined{opt@amsart.cls}{%
+\@ifundefined{opt@amsproc.cls}{%
+\HLet\no@part\:tempc
+}{}}{}
+
+
+\def\:tempc#1{%
+   \gdef\NR:Title{\a:newlabel{#1}}%
+   \gdef\NR:Type{part}%
+   \o:no@spart:{#1}}
+\HLet\no@spart\:tempc
+
+\def\:tempc[#1]#2{%
+   \gdef\NR:Title{\a:newlabel{#1}}%
+   \gdef\NR:Type{chapter}%
+   \o:NR@chapter:[{#1}]{#2}}
+\HLet\NR@chapter\:tempc
+
+\def\:tempc#1{%
+   \gdef\NR:Title{\a:newlabel\sch:ttl}%
+   \o:NR@schapter:{#1}%
+   \gdef\NR:Type{chapter}%
+}
+\HLet\NR@schapter\:tempc
+
+\let\o:NR@@caption\@caption
+
+\ifdefined\scr@makechapterhead
+% fixes for Komascript
+\def\:tempa[#1]#2{%
+  \gdef\NR:Title{\a:newlabel{#1}}%
+  \gdef\NR:Type{chapter}%
+  \o:@chapter:[#1]{#2}%
+}
+\HLet\@chapter\:tempa
+
+\def\:tempa#1{%
+  \gdef\NR:Title{\a:newlabel{#1}}%
+  \gdef\NR:Type{chapter}%
+  \o:@schapter:{#1}%
+}
+\HLet\@schapter\:tempa
+
+\fi
+%
+%
+% Keith Andrews <kandrews@iicm.edu> reported that \@captype as
+% \NR:Type threw an undefined control sequence error. I think
+% \@currenvir is safe, there is nothing special about \@captype.
+%
+% use of \index and \label inside caption results in a fatal error
+% we need to disable them in \NR:Title
+
+% there can be more problematic commands, so we provide a configuration
+% that can be used multiple times - the default value fixes known commands
+% but a user can add more of them
+
+\def\a:captioncommandsfix{}
+\NewConfigure{CaptionCommandsFix}[1]{\concat:config\a:captioncommandsfix{#1}}
+\Configure{CaptionCommandsFix}{
+  \let\index\:gobble%
+  \let\label\:gobble%
+  \let\\\relax% causes issues when \centering is active
+}
+
+\long\def\@caption#1[#2]{%
+    \gdef\NR:Type{\@currenvir}%
+    \begingroup%
+    \a:captioncommandsfix
+    \protected@xdef\NR:Title{\a:newlabel{#2}}%
+    \endgroup%
+   \o:NR@@caption{#1}[{#2}]%
+}
+
+\let\o:NRorg@opargbegintheorem\@opargbegintheorem
+  \def\@opargbegintheorem#1#2#3{%
+    \gdef\NR:Title{\a:newlabel{#3}}%
+    \gdef\NR:Type{\@currenvir}%
+    \NR@gettitle{#3}%
+    \defineautorefname{\@currenvir}{#1}%
+    \o:NRorg@opargbegintheorem{#1}{#2}{#3}%
+  }%
+
+\let\o:NRorg@begintheorem\@begintheorem
+  \def\@begintheorem#1#2{%
+    \gdef\NR:Title{\a:newlabel{#1 #2}}%
+    \gdef\NR:Type{\@currenvir}%
+    \defineautorefname{\@currenvir}{#1}%
+    \NR@gettitle{}%
+    \o:NRorg@begintheorem{#1}{#2}%
+  }%
+
+% I don't know if this was useful for anything
+% but we cannot use it anymore
+% \AtBeginDocument{%
+\@ifpackageloaded{listings}{%
+      \def\:tempc#1{%
+         \gdef\NR:Title{\a:newlabel{listing}}%
+         \gdef\NR:Type{lstlisting}%
+         \o:NROrg@lst@MakeCaption:{#1}%
+         \gdef\@currentlabelname{listing}}
+      \HLet\NROrg@lst@MakeCaption\:tempc
+}{}%
+  % bug [348]
+\def\:tempams{%
+    \gdef\NR:Title{\a:newlabel{equation}}%
+    \gdef\NR:Type{equation}%
+    \gdef\@currentlabelname{equation}%
+}
+
+% https://tex.stackexchange.com/a/581856/2891
+\@ifpackageloaded{caption}{
+  \pend:defIII\caption@beginex{%
+    \gdef\NR:Type{\@currenvir}%
+    % handle \label and \index in Caption's package
+    % version of \caption
+    \begingroup%
+    \a:captioncommandsfix
+    \protected@xdef\NR:Title{\a:newlabel{##2}}%
+    \endgroup%
+  }
+}{}
+
+
+\@ifpackageloaded{amsmath}{%
+     \Configure{@begin}{align}{\:tempams}
+     \Configure{@begin}{multline}{\:tempams}
+     \Configure{@begin}{equation}{\:tempams}
+     \Configure{@begin}{boxed}{\:tempams}
+     \Configure{@begin}{equations}{\:tempams}
+     \Configure{@begin}{equation}{\:tempams}
+     \Configure{@begin}{gather*}{\:tempams}
+     \Configure{@begin}{gather}{\:tempams}
+     \Configure{@begin}{genfrac}{\:tempams}
+     \Configure{@begin}{measure@}{\:tempams}
+     \Configure{@begin}{multline*}{\:tempams}
+     \Configure{@begin}{multline}{\:tempams}
+     \Configure{@begin}{overset}{\:tempams}
+     \Configure{@begin}{smallmatrix}{\:tempams}
+     \Configure{@begin}{split}{\:tempams}
+     \Configure{@begin}{subarray}{\:tempams}
+     \Configure{@begin}{substack}{\:tempams}
+     \Configure{@begin}{underset}{\:tempams}
+     \Configure{@begin}{xleftarrow}{\:tempams}
+     \Configure{@begin}{xrightarrow}{\:tempams}
+  }{
+     \Configure{@begin}{equation}{\:tempams}
+}
+
+\let\T:ref=\::ref
+\def\::ref{\@ifstar{\protect\T@ref}{\protect\T@ref}}
+\def\T@ref#1{%
+  \@safe@activestrue%
+  \let\::ref\T:ref%
+  \expandafter\@setref\csname r@#1\endcsname\@firstoffive{#1}%
+  \def\::ref{\@ifstar{\protect\T@ref}{\protect\T@ref}}%
+  \@safe@activesfalse%
+}
+
+\gdef\defineautorefname#1#2{%
+    \expandafter\gdef\csname #1autorefname\endcsname{#2}}
+\defineautorefname{theorem}{Theorem}
+
+\Configure{newlabel}
+   {\csname cur:th\endcsname \csname :currentlabel\endcsname}
+   {\string\csname\space :autoref\string\endcsname
+     {\NR:Type}#1}
+
+\ifx \@currentlabelname\:UnDef
+   \let\@currentlabelname\empty
+\fi
+
+\pend:defIII\@setref{\edef\RefArg{##3}}
+\append:defIII\@setref{\let\:autoref\:gobble}
+\let\:autoref\:gobble
+
+
+\Hinput{nameref}
+\endinput
--- a/book/sourdough-starter/sourdough-starter.tex
+++ b/book/sourdough-starter/sourdough-starter.tex
@@ -4,7 +4,7 @@
 In this chapter you will learn how to make your
 own sourdough starter, but before doing so you will
 quickly learn about baker's math. Don't worry,
-it's a very simple way how to write a recipe which
+it's a very simple way to write a recipe which
 is cleaner and more scalable. Once you get the hang
 of it you will want to write every recipe this way.
 You will learn to understand the signs indicating
@@ -125,7 +125,7 @@ values are just shown as a reference.
 Don't use chlorinated water when setting up your starter.
 Ideally, you should use bottled water. In certain regions
 like Germany, tap water is perfectly fine. Chlorine is added
-to water as a disinfectant to kill microorganisms, you will
+to water as a disinfectant to kill microorganisms; you will
 not be able to grow a starter with chlorinated water.

 In this process, the hydration of your starter is \qty{100}{\percent}.
--- a/book/troubleshooting/crumb-structures.tex
+++ b/book/troubleshooting/crumb-structures.tex
@@ -300,7 +300,7 @@ Similar to baking too hot, when baking without enough steam, your dough's crust
 forms too quickly. It's hard to spot the difference between the two mistakes.
 I~typically first ask about the temperature and then about the steaming technique
 to determine what might be wrong with the baking process. Too little steam can
-typically be spotted by having a thick crust around all around your dough paired
+typically be spotted by having a thick crust all around your dough paired
 with large alveoli towards the edges.

 The steam essentially prevents the Maillard reaction from happening too quickly
--- a/website/.ruby-version
+++ b/website/.ruby-version
@@ -1 +1 @@
-3.3.7
+3.3.8
--- a/website/Gemfile.lock
+++ b/website/Gemfile.lock
@@ -23,7 +23,7 @@ DEPENDENCIES
  pry

 RUBY VERSION
-   ruby 3.3.7p123
+   ruby 3.3.8

 BUNDLED WITH
   2.4.12
Author	SHA1	Message	Date
Henrik Wist	17b667f4b4	Eliminates duplication (#467 ) Some checks failed Release the book and website / build-and-push-image (push) Has been cancelled Details Release the book and website / release-book-website (push) Has been cancelled Details I tripped over the 'around all around' it sounds wrong to me. I propose to either have 'all around' or 'around your'.	2025-08-06 17:04:58 +02:00
Ced	93006f34c7	Bump ruby version there too Some checks failed Release the book and website / build-and-push-image (push) Has been cancelled Details Release the book and website / release-book-website (push) Has been cancelled Details so it is coherent...	2025-06-09 18:39:13 +01:00
Ced	cc044c7776	Bump the ruby version As CI is broken right now... let's try that.	2025-06-09 18:20:16 +01:00
Adam Liechty	505abb15b4	Grammar: "led" is past tense of "lead" Some checks failed Release the book and website / build-and-push-image (push) Has been cancelled Details Release the book and website / release-book-website (push) Has been cancelled Details	2025-06-09 14:26:09 +01:00
Adam Liechty	134e423277	Sourdough starter: grammar nits - Idiomatic phrase - Independent clauses separated by ; or .	2025-06-09 14:25:58 +01:00
Ced	91b073e0fd	Fix dependencies in makefile Some checks failed Release the book and website / build-and-push-image (push) Has been cancelled Details Release the book and website / release-book-website (push) Has been cancelled Details - Add the tex4ht workaround - define src_recipe before adding it to src_tex - have vars.tex as dependencies for figures even if we use it only for standalone	2025-03-26 23:05:47 +00:00
Hendrik Kleinwaechter	cef0d9c8f7	Rename action & final cleanups Some checks failed Release the book and website / build-and-push-image (push) Has been cancelled Details Release the book and website / release-book-website (push) Has been cancelled Details	2025-03-14 13:12:24 +01:00
Hendrik Kleinwaechter	656404782a	Update website deployment script	2025-03-14 13:01:45 +01:00
Hendrik Kleinwaechter	ea75a1ac8a	switch to rsync	2025-03-14 12:37:19 +01:00
Hendrik Kleinwaechter	9e4e03bcfa	Attempt #2	2025-03-14 12:24:37 +01:00
Hendrik Kleinwaechter	b783b1e274	Fix	2025-03-14 12:12:04 +01:00
Hendrik Kleinwaechter	fb5f526b2f	Begin migration away from S3 and Cloudfront	2025-03-14 12:10:32 +01:00
cedounet	8b83e1c5b6	Merge pull request #461 from hendricius/Fix-456-clean Some checks failed Release the book and website / build-and-push-image (push) Has been cancelled Details Release the book and website / release-book-website (push) Has been cancelled Details Release the book and website / invalidate-book-website-cache (push) Has been cancelled Details Fix wrong text in html with nameref	2025-03-11 09:57:37 +00:00
Ced	25f91cd7a1	Fix wrong text in html with nameref Some checks failed Test book and website for given image / test-book-website (push) Has been cancelled Details Chapters with Komascript need a special treatment. See: https://github.com/michal-h21/make4ht/issues/166#issuecomment-2695488065	2025-03-11 09:17:15 +00:00
@@ -1 +1 @@
 .3.7
 .3.8