Reflow XMl with xmllint after generating it, to make sure it get predictable indentation.

[text-madewithcc.git] / Makefile

diff --git a/Makefile b/Makefile
index 6cd997d87e1555725a6a5e6f24838bf3e7a90a4a..286d9349fec92beb2128d31a6b36657488aed16a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,10 +24,10 @@ all: pdf epub
 
 distclean: clean
        rm -f $(SOURCE).md
+clean:
        for LANG in $(LANGS); do \
            rm -f $(SOURCE).$$LANG.md ;\
        done
-clean:
        for EXT in aux cb cb2 glo idx lof log tex toc xml pdf epub; do \
            rm -f $(SOURCE).$$EXT ;\
            for LANG in $(LANGS); do \
@@ -80,6 +80,7 @@ $(SOURCE).xml: $(SOURCE).md fixup-docbook.rb
          pandoc -s -o $$TEMP $(PANDOC_OPTS) $(SOURCE).md && \
          ruby fixup-docbook.rb $$TEMP $@ && \
          rm $$TEMP
+       xmllint --format $@ > $@.new && mv $@.new $@
 
 pdf: $(SOURCE).pdf
        for LANG in $(LANGS); do \
@@ -101,8 +102,7 @@ DBLATEX_OPTS = -T simple -t tex -b xetex -p extra/pdf.xsl
 # handled by LaTeX/dblatex, see <URL: https://bugs.debian.org/889603 >.
 %.tex: %.xml
        dblatex $(DBLATEX_OPTS) $^
-       perl -p -i -e 's/ / /g; \
-               s/\\chapter\{(Colophon|Dedication)\}/\\chapter*{}/;' $@
+       perl -p -i -e 's/ / /g' $@
 
 XMLLINTOPTS = --nonet --noout  --xinclude --postvalid
 lint: $(SOURCE).xml