fix(filters): Separate pandoc filter arguments from normalization arg…

…uments

rules/mdbook.mk

@@ -5,11 +5,11 @@ $(MDBOOKS): %.mdbook: $(BUILDDIR)/%.mdbook/src/SUMMARY.md $(BUILDDIR)/%.mdbook/b
 
 DISTDIRS += $(MDBOOKS)
 
-$(BUILDDIR)/%-mdbook.md: private PANDOCFILTERARGS = --wrap=none --to=commonmark_x-smart
+$(BUILDDIR)/%-mdbook.md: private PANDOCNORMALIZEARGS = --wrap=none --to=commonmark_x-smart
 $(BUILDDIR)/%-mdbook.md: private PANDOCFILTERS += --lua-filter=$(CASILEDIR)/pandoc-filters/strip_for_mdbook.lua
 $(BUILDDIR)/%-mdbook.md: $(BUILDDIR)/%-$(_processed).md
 	$(PANDOC) \
-		$(PANDOCARGS) $(PANDOCFILTERS) $(PANDOCFILTERARGS) \
+		$(PANDOCARGS) $(PANDOCFILTERS) $(PANDOCFILTERSARGS) $(PANDOCNORMALIZEARGS) \
 		$(filter %.md,$^) -o $@
 
 $(BUILDDIR)/%.mdbook/src/SUMMARY.md: $(BUILDDIR)/%-mdbook.md

rules/rules.mk

@@ -181,10 +181,13 @@ endif
 SILEPATH += $(CASILEDIR)
 
 # Extra arguments to pass to Pandoc
-PANDOCARGS ?= --wrap=preserve --markdown-headings=atx --top-level-division=chapter
+PANDOCARGS ?= --top-level-division=chapter
+PANDOCARGS += --wrap=preserve
+PANDOCARGS += --markdown-headings=atx
 PANDOCARGS += --reference-location=section
+PANDOCNORMALIZEARGS ?= --from markdown-space_in_atx_header+ascii_identifiers+four_space_rule --to markdown-smart-four_space_rule
 PANDOCFILTERS ?=
-PANDOCFILTERARGS ?= --from markdown-space_in_atx_header+ascii_identifiers+four_space_rule --to markdown-smart-four_space_rule
+PANDOCFILTERARGS ?=
 
 # For when perl one-liners need Unicode compatibility
 PERLARGS ?= -Mutf8 -CS
@@ -519,7 +522,7 @@ SOURCESWITHEDITS := $(SOURCESWITHVERSES) $(SOURCESWITHOUTFOOTNOTES) $(SOURCESWIT
 $(SOURCESWITHEDITS): $$(call strip_edits,$$@)
 	: $(or $(filter %.md,$^),$(error No sources with expected edits defined))
 	$(PANDOC) \
-		$(PANDOCARGS) $(PANDOCFILTERS) $(PANDOCFILTERARGS) \
+		$(PANDOCARGS) $(PANDOCFILTERS) $(PANDOCFILTERARGS) $(PANDOCNORMALIZEARGS) \
 		$(filter %.md,$^) -o $@
 
 # Configure SILE arguments to include common Lua libraries
@@ -540,7 +543,7 @@ $(BUILDDIR)/%-$(_processed).md: %.md $$(wildcard $(PROJECT)*.md $$*-$(_chapters)
 		$(PERL) $(PERLARGS) -pne "s/(?<=[\)\}])'/’/g" | # Work around Pandoc bug, see https://github.com/jgm/pandoc/issues/5385
 		$(call criticToSile) |
 		$(PANDOC) \
-			$(PANDOCARGS) $(PANDOCFILTERS) $(PANDOCFILTERARGS) |
+			$(PANDOCARGS) $(PANDOCFILTERS) $(PANDOCFILTERARGS) $(PANDOCNORMALIZEARGS) |
 		$(call markdown_hook) > $@
 
 %-$(_booklet).pdf: $(BUILDDIR)/%-$(_spineless).pdf

rules/utilities.mk

@@ -184,7 +184,7 @@ normalize_files:
 			basename $${src} | $(PERL) -pne 's/-.*$$//' | read chapno
 			dirname $${src} | read dir
 			$(SED) -n '/^#/{s/ı/i/g;p}' $${src} |
-				$(PANDOC) $(PANDOCARGS) $(PANDOCFILTERS) $(PANDOCFILTERARGS) | read identifier
+				$(PANDOC) $(PANDOCARGS) $(PANDOCFILTERS) $(PANDOCFILTERARGS) $(PANDOCNORMALIZEARGS) | read identifier
 				target="$${dir}/$${chapno}-$${identifier}.md"
 				[[ $${src} == $${target} ]] || $(GIT) mv "$${src}" "$${target}"
 		done