feat(scripts): Use all regular m4 filters when generating branch diffs

sile-typesetter · Oct 14, 2023 · c05caff · c05caff
1 parent cda8ca8
commit c05caff
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/rules/rules.mk b/rules/rules.mk
@@ -507,6 +507,7 @@ preprocess_macros = $(CASILEDIR)/casile.m4 $(M4MACROS) $(PROJECTMACRO) $(TARGETM
 
 $(BUILDDIR)/%-$(_processed).md: %.md $$(wildcard $(PROJECT)*.md $$*-$(_chapters)/*.md) $$(call preprocess_macros,$$*) | $(BUILDDIR) figures
 	if $(HIGHLIGHT_DIFF) && $(if $(PARENT),true,false); then
+		export FILTERS="$(filter %.m4,$^)"
 		branch2criticmark.zsh $(PARENT) $<
 	else
 		$(M4) $(filter %.m4,$^) $<

diff --git a/scripts/branch2criticmark.zsh.in b/scripts/branch2criticmark.zsh.in
@@ -11,8 +11,8 @@ trap 'rm -rf ${WT}' EXIT SIGHUP SIGTERM
 @GIT@ worktree prune > /dev/null
 @GIT@ worktree add --detach ${WT} ${BRANCH} > /dev/null
 
-@M4@ ${WT}/${FILE} | @GIT@ hash-object --stdin -w | read A
-@M4@ ${FILE} | @GIT@ hash-object --stdin -w | read B
+@M4@ ${FILTERS} ${WT}/${FILE} | @GIT@ hash-object --stdin -w | read A
+@M4@ ${FILTERS} ${FILE} | @GIT@ hash-object --stdin -w | read B
 
 if @GIT@ diff ${A}..${B} --quiet; then
     @GIT@ show ${B}