From 4950897188bc07584340de445c1b82e998b7c70a Mon Sep 17 00:00:00 2001 From: Ced Date: Thu, 28 Sep 2023 09:47:09 +0100 Subject: [PATCH 1/5] Right align numbers in flour-types table --- book/tables/table-flour-types.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/tables/table-flour-types.tex b/book/tables/table-flour-types.tex index d113132..dcf35a0 100644 --- a/book/tables/table-flour-types.tex +++ b/book/tables/table-flour-types.tex @@ -1,4 +1,4 @@ -\begin{tabular}{@{}lllll@{}} +\begin{tabular}{@{}llrrr@{}} \toprule \textbf{USA} & \textbf{UK} & {\textbf{Germany}} & {\textbf{France}} & {\textbf{Italy}} \\ \midrule Cake & Soft flour & T405 & T45 & 00 \\ From 4e4c4e9048ffc0d8845ddd8dc8163a99f70b1115 Mon Sep 17 00:00:00 2001 From: Nikola Nedic Date: Tue, 3 Oct 2023 09:34:42 +0200 Subject: [PATCH 2/5] Fix typo --- book/baking/baking.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/baking/baking.tex b/book/baking/baking.tex index 6c6155f..f7154e1 100644 --- a/book/baking/baking.tex +++ b/book/baking/baking.tex @@ -27,7 +27,7 @@ extensible and can be stretched. \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} From 97f3a044c20515bf34d5c20ca9449dcaad7a1be8 Mon Sep 17 00:00:00 2001 From: Ced Date: Tue, 3 Oct 2023 23:42:38 +0100 Subject: [PATCH 3/5] Enforce bash as shell in makefile Was not the case on my debian machine for some reason... --- book/makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/book/makefile b/book/makefile index c6a4423..05a6ff8 100644 --- a/book/makefile +++ b/book/makefile @@ -6,6 +6,11 @@ CLEAN := latexmk -cd -lualatex -c -use-make CHECK_1 := lacheck CHECK_2 := chktex +# we want bash as shell +SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ + else if [ -x /bin/bash ]; then echo /bin/bash; \ + else echo sh; fi; fi) + ifdef DEBUG EBOOK += -a debug WEBSITE += -a debug From 1eb305a3fe5bf6ad91da7ef5cb08cbd3bab5a563 Mon Sep 17 00:00:00 2001 From: Ced Date: Tue, 3 Oct 2023 23:48:33 +0100 Subject: [PATCH 4/5] Add shell version to the show_version_target --- book/makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/book/makefile b/book/makefile index 05a6ff8..e13cd74 100644 --- a/book/makefile +++ b/book/makefile @@ -258,6 +258,8 @@ quick_ebook: cover/cover-page.xbb # run latex only once no biber, refe etc.. show_tools_version: # Show version of tools used on the build machine - git log -n 1 @echo "" + - ${SHELL} --version + @echo "" - latexmk --version @echo "" - lualatex --version From bdae960144c7c3ae201b802aa175e201d0e5e026 Mon Sep 17 00:00:00 2001 From: Ced Date: Tue, 3 Oct 2023 23:00:12 +0100 Subject: [PATCH 5/5] Add latexmk diagnostic in debug mode --- book/makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/book/makefile b/book/makefile index e13cd74..e997fcc 100644 --- a/book/makefile +++ b/book/makefile @@ -12,6 +12,7 @@ SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ else echo sh; fi; fi) ifdef DEBUG +LATEX += -diagnostics EBOOK += -a debug WEBSITE += -a debug endif