diff --git a/Doc/Makefile b/Doc/Makefile
index a76b649a975051f4d2de784c9a015b3174f00f4e..5f2c8b4c3bbdee45f7f934df54c5253e9a6d065a 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -82,6 +82,8 @@ SAXONCMD=java -cp "/usr/share/hdm-docbook-xsl/docbook-xsl/tools/lib/saxon9he.jar
-xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2docbook.xsl > ${*}.xml
${SAXONCMD} -s:$*.xml \
-xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2html.xsl > ${*}.html.xml
+ ${SAXONCMD} -s:$*.xml \
+ -xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2slide.xsl > ${*}.slide.xml
${SAXONCMD} -s:$*.xml \
-xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2print.xsl > ${*}.print.xml
cd $(@D); ${SAXONCMD} -s:$(<F) -xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbookExtractFig.xsl
@@ -120,10 +122,10 @@ SAXONCMD=java -cp "/usr/share/hdm-docbook-xsl/docbook-xsl/tools/lib/saxon9he.jar
cat ${DBOOK_XSL_CUSTOM}/webhelp/common/css/positioning.supp.css >> OEBPS/docbook-epub.css # highlighting supplements
zip -rX ${*}.epub mimetype META-INF OEBPS
-%.slides: %.html.xml
+%.slide: %.slide.xml
${SAXONCMD} -s:$< -xsl:${DBOOK_XSL_CUSTOM}/slide/slideHdm.xsl ${dbookXslSlideParam}
rsync -a /usr/share/reveal.js .
- touch $*.slides
+ touch $*.slide
# PDF
# See http://stackoverflow.com/questions/39786947/how-to-convert-to-pdf-from-xsl-fo-with-mathml/39796975
@@ -131,7 +133,7 @@ SAXONCMD=java -cp "/usr/share/hdm-docbook-xsl/docbook-xsl/tools/lib/saxon9he.jar
${SAXON6CMD} $*.print.xml ${DBOOK_XSL_CUSTOM}/pdf/docbookHdm.xsl ${dbookXslPdfParam} > $*.fo
/usr/share/hdm-fop/fop-2.2/fop/fop -fo $*.fo -pdf ${*}.pdf
-all: ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.webhelp ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.epub ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.slides ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.pdf
+all: ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.webhelp ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.epub ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.slide ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.pdf
${BUILDROOT_PROFILE}/${SCRIPTBASENAME}.print.xml \
${BUILDROOT_PROFILE}/${SCRIPTBASENAME}.html.xml \
@@ -151,8 +153,8 @@ ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.epub: ${BUILDROOT_WEBHELP}/${SCRIPTBASEN
rsync -a ${BUILDROOT_PROFILE}/* ${BUILDROOT_WEBHELP}/OEBPS
cd ${BUILDROOT_WEBHELP}; ${MAKE} -f ../../Makefile ${SCRIPTBASENAME}.epub
-${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.slides: ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.html.xml
- cd ${BUILDROOT_WEBHELP}; ${MAKE} -f ../../Makefile ${SCRIPTBASENAME}.slides
+${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.slide: ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.html.xml
+ cd ${BUILDROOT_WEBHELP}; ${MAKE} -f ../../Makefile ${SCRIPTBASENAME}.slide
${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.pdf: ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.print.xml
cd ${BUILDROOT_WEBHELP}; ${MAKE} -f ../../Makefile ${SCRIPTBASENAME}.pdf
diff --git a/Doc/Sd1/objectsClasses.xml b/Doc/Sd1/objectsClasses.xml
index c25447f2db7cb9bf6138075b477cfed6cea82ea2..51daf7bba394eb85ec248b5bd955988d297a3882 100644
--- a/Doc/Sd1/objectsClasses.xml
+++ b/Doc/Sd1/objectsClasses.xml
@@ -18,7 +18,8 @@
<title>Classes in OO languages</title>
<informalfigure>
- <para>In object oriented languages classes:</para>
+ <para>In object oriented languages <emphasis
+ role="bold">classes</emphasis>:</para>
<itemizedlist>
<listitem>
diff --git a/ws/Docbook/CustomLayer/slide/slideHdm.xsl b/ws/Docbook/CustomLayer/slide/slideHdm.xsl
index 894fdf75e42ef35ac6bcb8e7f8483e22545271c8..e2c5f654c816a2d555b410a4c72b269858b0f7cc 100644
--- a/ws/Docbook/CustomLayer/slide/slideHdm.xsl
+++ b/ws/Docbook/CustomLayer/slide/slideHdm.xsl
@@ -51,6 +51,7 @@
<body>
<!-- Wrap the entire slide show in a div using the "reveal" class. -->
+ <p> Back to <a href="{$rootId}.html">lecture notes</a></p>
<div class="reveal">
<!-- Wrap all slides in a single "slides" class -->
<div class="slides">
diff --git a/ws/Docbook/Extensions/Tdata/Makefile b/ws/Docbook/Extensions/Tdata/Makefile
index 40c816ee3cfe35e3f8e0af53bdad806c1cd16e1b..7e663597a4a40743cb5558285b36a421e499d1bc 100644
--- a/ws/Docbook/Extensions/Tdata/Makefile
+++ b/ws/Docbook/Extensions/Tdata/Makefile
@@ -82,6 +82,8 @@ SAXONCMD=java -cp "/usr/share/hdm-docbook-xsl/docbook-xsl/tools/lib/saxon9he.jar
-xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2docbook.xsl > ${*}.xml
${SAXONCMD} -s:$*.xml \
-xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2html.xsl > ${*}.html.xml
+ ${SAXONCMD} -s:$*.xml \
+ -xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2slide.xsl > ${*}.slide.xml
${SAXONCMD} -s:$*.xml \
-xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2print.xsl > ${*}.print.xml
cd $(@D); ${SAXONCMD} -s:$(<F) -xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbookExtractFig.xsl
@@ -120,10 +122,10 @@ SAXONCMD=java -cp "/usr/share/hdm-docbook-xsl/docbook-xsl/tools/lib/saxon9he.jar
cat ${DBOOK_XSL_CUSTOM}/webhelp/common/css/positioning.supp.css >> OEBPS/docbook-epub.css # highlighting supplements
zip -rX ${*}.epub mimetype META-INF OEBPS
-%.slides: %.html.xml
+%.slide: %.slide.xml
${SAXONCMD} -s:$< -xsl:${DBOOK_XSL_CUSTOM}/slide/slideHdm.xsl ${dbookXslSlideParam}
rsync -a /usr/share/reveal.js .
- touch $*.slides
+ touch $*.slide
# PDF
# See http://stackoverflow.com/questions/39786947/how-to-convert-to-pdf-from-xsl-fo-with-mathml/39796975
@@ -131,7 +133,7 @@ SAXONCMD=java -cp "/usr/share/hdm-docbook-xsl/docbook-xsl/tools/lib/saxon9he.jar
${SAXON6CMD} $*.print.xml ${DBOOK_XSL_CUSTOM}/pdf/docbookHdm.xsl ${dbookXslPdfParam} > $*.fo
/usr/share/hdm-fop/fop-2.2/fop/fop -fo $*.fo -pdf ${*}.pdf
-all: ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.webhelp ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.epub ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.slides ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.pdf
+all: ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.webhelp ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.epub ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.slide ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.pdf
${BUILDROOT_PROFILE}/${SCRIPTBASENAME}.print.xml \
${BUILDROOT_PROFILE}/${SCRIPTBASENAME}.html.xml \
@@ -151,8 +153,8 @@ ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.epub: ${BUILDROOT_WEBHELP}/${SCRIPTBASEN
rsync -a ${BUILDROOT_PROFILE}/* ${BUILDROOT_WEBHELP}/OEBPS
cd ${BUILDROOT_WEBHELP}; ${MAKE} -f ../../Makefile ${SCRIPTBASENAME}.epub
-${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.slides: ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.html.xml
- cd ${BUILDROOT_WEBHELP}; ${MAKE} -f ../../Makefile ${SCRIPTBASENAME}.slides
+${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.slide: ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.html.xml
+ cd ${BUILDROOT_WEBHELP}; ${MAKE} -f ../../Makefile ${SCRIPTBASENAME}.slide
${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.pdf: ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.print.xml
cd ${BUILDROOT_WEBHELP}; ${MAKE} -f ../../Makefile ${SCRIPTBASENAME}.pdf
diff --git a/ws/Docbook/Preprocess/Xsl/docbook2html.xsl b/ws/Docbook/Preprocess/Xsl/docbook2html.xsl
index a1307835477de452b337b0c47c28de61b1fa76d1..ad8dc8fcb63639ace7ad5c02fbbc5c5385f63364 100644
--- a/ws/Docbook/Preprocess/Xsl/docbook2html.xsl
+++ b/ws/Docbook/Preprocess/Xsl/docbook2html.xsl
@@ -77,12 +77,4 @@
</xsl:template>
- <xsl:template match="db:annotation[@role='slide']">
- <db:para>
- <db:link xlink:href="../Slides/{parent::db:*/@xml:id}.html">
- <xsl:text>Slide version of this section</xsl:text>
- </db:link>
- </db:para>
- </xsl:template>
-
</xsl:stylesheet>
diff --git a/ws/Docbook/Preprocess/Xsl/docbook2slide.xsl b/ws/Docbook/Preprocess/Xsl/docbook2slide.xsl
new file mode 100644
index 0000000000000000000000000000000000000000..cfdf321784d1b141815fa5fb186ae11ea952d5c0
--- /dev/null
+++ b/ws/Docbook/Preprocess/Xsl/docbook2slide.xsl
@@ -0,0 +1,29 @@
+<?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="http://docbook.org/ns/docbook" xmlns:db="http://docbook.org/ns/docbook">
+
+ <xsl:import href="../../docbook-xsl/xhtml/chunk.xsl"/>
+ <xsl:include href="common.xsl"/>
+
+ <xsl:output indent="no"/>
+
+ <xsl:template match="@* | node()">
+ <xsl:copy>
+ <xsl:apply-templates select="node()| @*"/>
+ </xsl:copy>
+ </xsl:template>
+
+ <xsl:template match="db:imagedata[ends-with(@fileref, '.fig')]">
+
+ <xsl:copy>
+ <xsl:attribute name="fileref">
+ <xsl:value-of select="@fileref"/>
+ <xsl:text>.svg</xsl:text>
+ </xsl:attribute>
+ <xsl:apply-templates select="@*[not(name(.) = 'fileref')] | node()"/>
+ </xsl:copy>
+
+ </xsl:template>
+
+</xsl:stylesheet>