Index: makefile ================================================================== --- makefile +++ makefile @@ -18,11 +18,11 @@ # ~~~ Rules ~~ # # The order of these dependencies is important. They will be processed left to right. -web: _article_htmls.mark $(articles-html) $(series-html) blog-pg1.html keyword-index.html +web: _article_htmls.mark $(articles-html) $(series-html) blog-pg1.html keyword-index.html web-extra/martin.css web: ## Rebuild all web content (not PDFs) # The file article_htmls.mark is a zero-byte file that serves only as a marker. If it is older than # any of its dependencies (or missing) all of the articles will be rebuilt. Its dependencies are # also on the Pollen cache watchlist (see pollen.rkt) @@ -30,36 +30,39 @@ raco pollen setup articles/ raco pollen render -p -t html articles/*.poly.pm raco pollen setup series/ raco pollen render -p -t html series/*.poly.pm rm -f template.html series/template.html - tidy -quiet -modify -indent --wrap 100 --tidy-mark no articles/*.html || true - tidy -quiet -modify -indent --wrap 100 --tidy-mark no series/*.html || true + # tidy -quiet -modify -indent --wrap 100 --wrap-attributes no --tidy-mark no articles/*.html || true + # tidy -quiet -modify -indent --wrap 100 --wrap-attributes no --tidy-mark no series/*.html || true touch _article_htmls.mark # If the rule for article_htmls.mark was triggered, all the article HTML files will already have # been re-rendered. (That rule comes before this one in the list of dependencies for "all") But if # not, any individual files that have been edited will get re-rendered. $(articles-html): %.html: %.poly.pm raco pollen render $@ - tidy -quiet -modify -indent --wrap 100 --tidy-mark no $@ || true + # tidy -quiet -modify -indent --wrap 100 --wrap-attributes no --tidy-mark no $@ || true # Note that if any article is part of a series, it will touch its series .poly.pm file during its # render, triggering this rule for that series. $(series-html): %.html: %.poly.pm raco pollen render $@ - tidy -quiet -modify -indent --wrap 100 --tidy-mark no $@ || true + # tidy -quiet -modify -indent --wrap 100 --wrap-attributes no --tidy-mark no $@ || true # This target will also rebuild pg2, pg3, etc. as needed blog-pg1.html: $(core-files) $(html-deps) $(articles-html) blog.rkt rm -f blog*.html racket -tm blog.rkt - tidy -quiet -modify -indent --wrap 100 --tidy-mark no blog*.html || true + # tidy -quiet -modify -indent --wrap 100 --wrap-attributes no --tidy-mark no blog*.html || true keyword-index.html: $(core-files) $(html-deps) $(articles-html) keyword-index.rkt racket -tm keyword-index.rkt - tidy -quiet -modify -indent --wrap 100 --tidy-mark no $@ || true + # tidy -quiet -modify -indent --wrap 100 --wrap-attributes no --tidy-mark no $@ || true + +web-extra/martin.css: web-extra/martin.css.pp + raco pollen render $@ spritz: ## Clear Pollen and Scribble cache, and remove all HTML output raco pollen reset rm -f *.html articles/*.html series/*.html _article_htmls.mark