hl support for slides

45868600 · Goik Martin · ae2833b1 · 45868600 · 45868600
Commit 45868600 authored 7 years ago by Goik Martin
--- a/ws/Docbook/CustomLayer/slide/slideHdm.xsl
+++ b/ws/Docbook/CustomLayer/slide/slideHdm.xsl
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"
 		xmlns:xlink="http://www.w3.org/1999/xlink"
-		xmlns:simg="http://nwalsh.com/xslt/ext/com.nwalsh.saxon.ImageIntrinsics"
-		xmlns:ximg="xalan://com.nwalsh.xalan.ImageIntrinsics"
-  xmlns:d="http://docbook.org/ns/docbook">
+    xmlns:d="http://docbook.org/ns/docbook">
  
  <xsl:import href="../../docbook-xsl/xhtml/chunk.xsl"/>
  <xsl:import href="../../docbook-xsl/xhtml/highlight.xsl"/>
@@ -36,13 +34,20 @@
  <xsl:template name="slideUnit">
    <xsl:param name="rootId"/>
    <xsl:param name="sections"/>
+
+<!-- 
    <xsl:result-document method="xhtml" encoding="utf-8" href="__slide{$rootId}.html" indent="no">
+      
+      -->
+
+    <xsl:document href="__slide{$rootId}.html" method="html" encoding="utf-8" indent="yes">
+        
      <html lang="en">
        <head>
          <title>
            <xsl:value-of select="d:title"/>
          </title>
-          <link href="mi.css" rel="stylesheet" />
+          <link href="common/css/positioning.css" rel="stylesheet" />
          <link href="reveal.js/css/reveal.css" rel="stylesheet" />
          <link href="reveal.js/css/theme/solarized.css" id="theme" rel="stylesheet" />
          
@@ -91,7 +96,7 @@
            /*]]>*/</script>
        </body>
      </html>
-    </xsl:result-document>
+    </xsl:document>
  </xsl:template>
  
  <xsl:template match="d:chapter|d:section" mode="slideDescendants">

--- a/ws/Docbook/Preprocess/make.rules
+++ b/ws/Docbook/Preprocess/make.rules
@@ -124,7 +124,8 @@ SAXONCMD=java -cp "${DBOOK_XSL}/tools/lib/saxon9he.jar:/usr/share/java/xercesImp
 	zip -rX ${*}.epub mimetype META-INF OEBPS

 %.slide: %.slide.xml
-	${SAXONCMD} -s:$< -xsl:${DBOOK_XSL_CUSTOM}/slide/slideHdm.xsl ${dbookXslSlideParam}
+	${SAXON6CMD} $< ${DBOOK_XSL_CUSTOM}/slide/slideHdm.xsl ${dbookXslSlideParam}
+#	${SAXONCMD} -s:$< -xsl:${DBOOK_XSL_CUSTOM}/slide/slideHdm.xsl ${dbookXslSlideParam}
 	rsync -a /usr/share/reveal.js .
 	touch $*.slide