From d60b6a03ba5403dfd6adc8001e6315b3cb398598 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Wed, 10 Apr 2019 17:53:43 +0200
Subject: [PATCH 1/4] make xml: Include XEP XSL in output

This is referenced by XML files so should be included
---
 Makefile | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 13a4bde2..1c62e7ac 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,7 @@ all_xeps=$(xeps) $(proto_xeps)
 xep_xmls=$(patsubst %.xml,$(OUTDIR)/%.xml,$(xeps))
 proto_xep_xmls=$(patsubst %.xml,$(OUTDIR)/%.xml,$(proto_xeps))
 all_xep_xmls=$(xep_xmls) $(proto_xep_xmls)
+xep_ancillary=$(patsubst %,$(OUTDIR)/%,xep.xsl)
 
 xep_htmls=$(patsubst %.xml,$(OUTDIR)/%.html,$(xeps))
 proto_xep_htmls=$(patsubst %.xml,$(OUTDIR)/%.html,$(proto_xeps))
@@ -64,7 +65,7 @@ xeplist: $(OUTDIR)/xeplist.xml
 html: $(xep_htmls)
 
 .PHONY: xml
-xml: $(xep_xmls)
+xml: $(xep_xmls) $(xep_ancillary)
 
 .PHONY: inbox-html
 inbox-html: $(proto_xep_htmls)
@@ -90,7 +91,10 @@ xep-%.html: $(OUTDIR)/xep-%.html ;
 .PHONY: xep-%.pdf
 xep-%.pdf: $(OUTDIR)/xep-%.pdf ;
 
-$(all_xep_xmls): $(OUTDIR)/%.xml: %.xml
+$(all_xep_xmls): $(OUTDIR)/%.xml: %.xml $(OUTDIR)
+	cp $< $@
+
+$(OUTDIR)/xep.xsl: xep.xsl $(OUTDIR)
 	cp $< $@
 
 $(OUTDIR)/xeplist.xml: $(wildcard *.xml) $(wildcard inbox/*.xml)

From 03940e8796bd7ff4b9090adea59d42d4dadd17d9 Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 20 Apr 2019 00:34:41 +0200
Subject: [PATCH 2/4] Inline XML entities

Browsers do not expand external XML entities so they must be inlined.
---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 1c62e7ac..f194daa4 100644
--- a/Makefile
+++ b/Makefile
@@ -91,8 +91,8 @@ xep-%.html: $(OUTDIR)/xep-%.html ;
 .PHONY: xep-%.pdf
 xep-%.pdf: $(OUTDIR)/xep-%.pdf ;
 
-$(all_xep_xmls): $(OUTDIR)/%.xml: %.xml $(OUTDIR)
-	cp $< $@
+$(all_xep_xmls): $(OUTDIR)/%.xml: %.xml $(XMLDEPS)
+	xmllint --nonet --noent --loaddtd --dropdtd $< --output $@
 
 $(OUTDIR)/xep.xsl: xep.xsl $(OUTDIR)
 	cp $< $@

From 696b2332e39d9d75721f6445ec7184537699fc2a Mon Sep 17 00:00:00 2001
From: Kim Alvefur <zash@zash.se>
Date: Sat, 20 Apr 2019 00:41:31 +0200
Subject: [PATCH 3/4] xsl: Set output mode to HTML

This makes the XEP XML viewable in browsers.
---
 xep.xsl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xep.xsl b/xep.xsl
index 80015866..b9888572 100644
--- a/xep.xsl
+++ b/xep.xsl
@@ -34,7 +34,7 @@ OR OTHER DEALINGS IN THE SOFTWARE.
 
 <xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
 
-  <xsl:output doctype-public='-//W3C//DTD XHTML 1.0 Transitional//EN' doctype-system='http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd' method='xml'/>
+  <xsl:output doctype-public='-//W3C//DTD XHTML 1.0 Transitional//EN' doctype-system='http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd' method='html'/>
 
   <xsl:template name="status-notice">
     <xsl:param name="thestatus"/>

From dbf46b7a5926c01a84efbfc87d5d4189b552b2d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Sch=C3=A4fer?= <j.wielicki@sotecware.net>
Date: Wed, 15 May 2019 18:07:42 +0200
Subject: [PATCH 4/4] Ensure that inbox subdirectory exists

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index f194daa4..c97101dc 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,7 @@ xml: $(xep_xmls) $(xep_ancillary)
 inbox-html: $(proto_xep_htmls)
 
 .PHONY: inbox-xml
-inbox-xml: $(proto_xep_xmls)
+inbox-xml: $(OUTDIR)/inbox $(proto_xep_xmls)
 
 .PHONY: pdf
 pdf: $(xep_pdfs)