From 0fa513473ce7eb0ac309db3652c7f05f99519cb1 Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Mon, 4 Jul 2016 19:08:53 +0200 Subject: Fix stray end tags in html output --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d6ac98b..159a975 100644 --- a/Makefile +++ b/Makefile @@ -5,6 +5,8 @@ xsltproc=xsltproc --stringparam stylesheet style.min.css --stringparam version $ svg2png=rsvg-convert -f png fix_doctype=sed 's/ SYSTEM "about:legacy-compat"//' +to_html=$(fix_doctype) | xsltproc xsl/convert-xhtml-to-html.xsl - | $(fix_doctype) | sed -e 's/
<\/br>/
/g' -e 's/<\/img>//g' -e 's/<\/link>//g' -e 's/<\/meta>//g' + pages=$(shell xsltproc xsl/main_filenames.xsl main.xml) pages_gen=$(pages:%.xml=%.$(suffix)) @@ -43,10 +45,10 @@ html: $(pages_gen_html) $(V_XSLT) $(xsltproc) --stringparam suffix .$(suffix) $< | $(fix_doctype) > $@ %.html: %.xml %.xsl $(common_depend) - $(V_XSLT) $(xsltproc) --stringparam suffix .html $< | $(fix_doctype) | xsltproc xsl/convert-xhtml-to-html.xsl - | $(fix_doctype) > $@ + $(V_XSLT) $(xsltproc) --stringparam suffix .html $< | $(to_html) > $@ %.html: %.xml $(common_depend) - $(V_XSLT) $(xsltproc) --stringparam suffix .html $< | $(fix_doctype) | xsltproc xsl/convert-xhtml-to-html.xsl - | $(fix_doctype) > $@ + $(V_XSLT) $(xsltproc) --stringparam suffix .html $< | $(to_html) > $@ style/style.min.css: style/style.css node_modules/.bin/postcss $(V_CSS) node_modules/.bin/postcss -u postcss-css-variables style/style.css | node_modules/.bin/cleancss > style/style.min.css -- cgit