4 Commits

Author SHA1 Message Date
Ced
bc9d1838f2 Use extractbb instead of ebb
ebb was the old tool and looks like it is on its way out, a very least
from Debian and for pdfTeX.

From manpage:
-------------
 Here are more details about the bb and xbb formats:

 The original  ebb  (from dvipdfm) ignored density information in bitmap
 images, and generated bounding boxes with 100px = 72bp = 1in.  Unfortu‐
 nately, screenshots (especially) tend to look bad with this approach.

 So, extractbb (from dvipdfmx) uses density information if present.
 Otherwise, it generates bounding box with 100px = 100bp.  This is what
 pdfTeX does.
2025-12-29 14:04:04 +00:00
Ced
75287c955d Revert "Fix the chemical equation."
Let's use upstream rather than local fixes, texlive has been updated
since.

This reverts commit 263eb74afe.
2025-12-29 14:04:04 +00:00
Ced
278ce9f659 Revert "Add warning on future breakage"
Did not really break but let's use upstream rather than local fixes
This reverts commit cbf67246e5.
2025-12-29 14:04:04 +00:00
Ced
428cf075f5 Remove old targets from Makefile
we got rid of those a while ago.

Also light cleaning/reorg
2025-12-29 14:04:03 +00:00
4 changed files with 8 additions and 68 deletions

View File

@@ -97,7 +97,7 @@ ruby_pkg := ../website/Gemfile ../website/Gemfile.lock
figures/export_figures.sh $@.pdf figures/export_figures.sh $@.pdf
%.xbb: %.jpg %.xbb: %.jpg
ebb -x $< extractbb -x $<
# }}} # }}}
# Pdf {{{ # Pdf {{{
@@ -202,27 +202,6 @@ bw_ebook: epub/bw_book.epub
low_res_ebook: epub/low_res_book.epub low_res_ebook: epub/low_res_book.epub
# }}} # }}}
# Old target names are disabled with helpful help message {{{
build_pdf:
@echo "build_pdf target is not supported anymore, please use make pdf"
@exit
build_serif_pdf:
@echo "build_serif_pdf target is not supported anymore, please use make serif"
@exit
build_sans_serif_pdf:
@echo "build_sans_serif_pdf target is not supported anymore, please use make sans_serif"
@exit
build_ebook:
@echo "build_ebook target is not supported anymore, please use make ebook"
@exit
build_bw_ebook:
@echo "build_bw_ebook target is not supported anymore, please use make bw_ebook"
@exit
build_low_res_ebook:
@echo "build_low_res_ebook target is not supported anymore, please use make low_res_ebook"
@exit
# }}}
# Top level releases rules {{{ # Top level releases rules {{{
.PHONY: bake release_serif release_sans_serif .PHONY: bake release_serif release_sans_serif
bake: release_serif release_sans_serif website bake: release_serif release_sans_serif website
@@ -326,7 +305,8 @@ help:
@echo "figures: build TikZ figures only" @echo "figures: build TikZ figures only"
@echo "" @echo ""
@echo "Quick builds:" @echo "Quick builds:"
@echo " quick: compiles serif_pdf but runs lulatex only once" @echo " quick: compiles serif but runs lulatex only once"
@echo " will halt on first error"
@echo " quick_ebook: compiles ebook but runs lulatex only once" @echo " quick_ebook: compiles ebook but runs lulatex only once"
@echo "" @echo ""
@echo "Checks:" @echo "Checks:"

View File

@@ -19,27 +19,4 @@
font-family: 'Open Sans'; font-family: 'Open Sans';
} }
</style>}} </style>}}
% Deal with chemical equations in a single svg
\ExplSyntaxOn
\def\standaloneenv#1{}
\pend:def\schemestart{\Picture+{}}
\append:def\CF_schemestop{\EndPicture}
\ExplSyntaxOff
\makeatletter
\def\texfourht@tikz@begin{
\protect\csname nested:math\endcsname% support display math
\Picture+[\csname a:Picture-alt\endcsname]{}%
}
\makeatother
% Warnig from Michal: Note that once you get the updated TeX Live with a new
% `chemfig.4ht` file, you can remove this from the config file:
%
%```latex \pend:def\schemestart{\Picture+{}}
%\append:def\CF_schemestop{\EndPicture} ```
%
%You could get an error otherwise, as there would be nested `\Picture+{}` and
%`\EndPicture` commands.
\EndPreamble \EndPreamble

View File

@@ -47,17 +47,5 @@
} }
\ConfigureToc{loc}{\HCode{<span class="lofToc">}}{\ }{}{\HCode{</span><br />}} \ConfigureToc{loc}{\HCode{<span class="lofToc">}}{\ }{}{\HCode{</span><br />}}
\ExplSyntaxOn
\def\standaloneenv#1{}
\pend:def\schemestart{\Picture+{}}
\append:def\CF_schemestop{\EndPicture}
\ExplSyntaxOff
\makeatletter
\def\texfourht@tikz@begin{
\protect\csname nested:math\endcsname% support display math
\Picture+[\csname a:Picture-alt\endcsname]{}%
}
\makeatother
\begin{document} \begin{document}
\EndPreamble \EndPreamble

View File

@@ -1,11 +1,11 @@
.DEFAULT_GOAL := build_pdf .DEFAULT_GOAL := pdf
DOCKER_IMAGE := ghcr.io/hendricius/the-sourdough-framework DOCKER_IMAGE := ghcr.io/hendricius/the-sourdough-framework
DOCKER_CMD := docker run --rm -it -v $(PWD):/opt/repo --platform linux/x86_64 $(DOCKER_IMAGE) /bin/bash -c DOCKER_CMD := docker run --rm -it -v $(PWD):/opt/repo --platform linux/x86_64 $(DOCKER_IMAGE) /bin/bash -c
.PHONY: bake build_pdf build_docker_image push_docker_image validate website .PHONY: build_docker_image push_docker_image
.PHONY: print_os_version start_shell printvars show_tools_version mrproper .PHONY: print_os_version start_shell printvars show_tools_version mrproper
.PHONY: build_serif_pdf build_ebook .PHONY: ebook serif website bake
# Dockers targets # Dockers targets
build_docker_image: build_docker_image:
@@ -15,8 +15,8 @@ push_docker_image: build_docker_image
docker push $(DOCKER_IMAGE):latest docker push $(DOCKER_IMAGE):latest
# Books/website # Books/website
serif_pdf: serif:
$(DOCKER_CMD) "cd /opt/repo/book && make serif_pdf" $(DOCKER_CMD) "cd /opt/repo/book && make serif"
ebook: ebook:
$(DOCKER_CMD) "cd /opt/repo/book && make ebook" $(DOCKER_CMD) "cd /opt/repo/book && make ebook"
@@ -45,8 +45,3 @@ print_os_version:
start_shell: start_shell:
docker run -it -v $(PWD):/opt/repo $(DOCKER_IMAGE) /bin/bash docker run -it -v $(PWD):/opt/repo $(DOCKER_IMAGE) /bin/bash
# Old names for backward compatibility
build_serif_pdf: serif_pdf
build_ebook: ebook
build_pdf: pdf