summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Franzke <benjaminfranzke@googlemail.com>2016-07-04 19:08:53 +0200
committerBenjamin Franzke <benjaminfranzke@googlemail.com>2016-07-04 19:14:44 +0200
commit0fa513473ce7eb0ac309db3652c7f05f99519cb1 (patch)
tree89584ac63303bacd779e705eca1c1ee5791f8bfa
parent94c562e27935d6c1cc43f9b29dd4dc73bdecdba2 (diff)
downloadmutti-web-0fa513473ce7eb0ac309db3652c7f05f99519cb1.tar.gz
mutti-web-0fa513473ce7eb0ac309db3652c7f05f99519cb1.tar.bz2
mutti-web-0fa513473ce7eb0ac309db3652c7f05f99519cb1.zip
Fix stray end tags in html output
-rw-r--r--Makefile6
1 files 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><\/br>/<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