From a15765df7b9f9914b72ad4adbc05d0c150bf5ff0 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Wed, 5 Jul 2017 10:44:27 -0400
Subject: [PATCH] Use xsltproc instead of fop to generate XSL-FO

---
 Documentation/Makefile                | 5 +++--
 Documentation/docbook/xsl/sogo-fo.xsl | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index ee7246fba..03a484995 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -2,7 +2,8 @@ all: $(patsubst %.asciidoc,%.pdf,$(wildcard *.asciidoc))
 
 %.pdf : %.asciidoc
 	asciidoc -a docinfo1 -b docbook -d book -o $<.docbook $<
-	fop -c fonts/fop-config.xml -xsl docbook/xsl/sogo-fo.xsl -xml $<.docbook -pdf $@
+	xsltproc -o $<.fo docbook/xsl/sogo-fo.xsl $<.docbook
+	fop -c fonts/fop-config.xml $<.fo -pdf $@
 
 clean:
-	rm *.asciidoc.docbook *.pdf
+	rm -f *.asciidoc.fo *.asciidoc.docbook *.pdf
diff --git a/Documentation/docbook/xsl/sogo-fo.xsl b/Documentation/docbook/xsl/sogo-fo.xsl
index 5ab3c7396..e8635b714 100644
--- a/Documentation/docbook/xsl/sogo-fo.xsl
+++ b/Documentation/docbook/xsl/sogo-fo.xsl
@@ -121,9 +121,9 @@
     </xsl:choose>
   </xsl:template>
   <xsl:template name="next.itemsymbol">
-    <xsl:param name="itemsymbol" select="'default'"/>
+    <xsl:param name="itemsymbol" select="'square'"/>
     <xsl:choose>
-      <xsl:otherwise>square</xsl:otherwise>
+      <xsl:when test="$itemsymbol='square'">square</xsl:when>
     </xsl:choose>
   </xsl:template>