diff --git a/Doc/Makefile b/Doc/Makefile
index 3969140c35c39e0aab0cf5567a498ec49b8cd410..ad0828caa8ba640c85e9639adb776e9873238280 100644
--- a/Doc/Makefile
+++ b/Doc/Makefile
@@ -1,6 +1,5 @@
SHELL = /bin/bash
-WWWBASE=freedocs.mi.hdm-stuttgart.de:/home/info1/doc
SCRIPTBASENAME=lectures
#
@@ -8,16 +7,9 @@ SCRIPTBASENAME=lectures
# http://docbook.sourceforge.net/release/xsl/current/doc/param.html
#
-PLUGINID=de.hdm_stuttgart.mi.lectures
-
XSLPARAM=-p callout.graphics 0 \
-p callout.unicode 1
-XSLPARAM_html=-p use.extensions 1 \
- -p eclipse.plugin.name Lectures \
- -p eclipse.plugin.id $(PLUGINID) \
- -p eclipse.plugin.provider 'Martin Goik, goik@hdm-stuttgart.de'
-
XSLPARAM_pdf=-p xep.extensions 1\
-p highlight.source 1
@@ -35,14 +27,6 @@ SAXONCMD=java -cp "/usr/share/java/Saxon-HE.jar:/usr/share/java/xercesImpl.jar"
-Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XIncludeParserConfiguration \
net.sf.saxon.Transform
-#
-# Dependent destinations
-#
-BUILDBASE=$(BUILDROOT)/$(SCRIPTBASENAME)
-BUILDNAVI=navi/$(PLUGINID)
-BUILDNONAVI=nonavi/$(PLUGINID)
-JAVADOCDESTDIR=${BUILDNAVI}/Ref/api
-
#Video webm-->mp4 conversion rule
#
%.webm.mp4:%.webm
@@ -57,12 +41,12 @@ videoformats:$(mp4Set)
all: ${BUILDROOT}/stage1
cd ${BUILDROOT}; tar c- ${DOCMODULES} | tar -x -C webhelp
cd ${BUILDROOT};zip -r webhelp/lectures.zip webhelp -x webhelp/lectures.zip
-# cd ${BUILDROOT}; tar c- ${DOCMODULES} | tar -x -C ${BUILDNAVI}
${BUILDROOT}/${SCRIPTBASENAME}_print.xml \
${BUILDROOT}/${SCRIPTBASENAME}.xml: ${SCRIPTBASENAME}.xml Common/glossary.xml Common/bibliography.xml
mkdir -p ${BUILDROOT};
${SAXONCMD} -s:${SCRIPTBASENAME}.xml -xsl:../ws/Docbook/Extensions/Xsl/docbook2docbook.xsl > ${BUILDROOT}/${SCRIPTBASENAME}.xml
+ ${SAXONCMD} -s:${BUILDROOT}/${SCRIPTBASENAME}.xml -xsl:../Xsl/docbook2html.xsl > ${BUILDROOT}/${SCRIPTBASENAME}_html.xml
${SAXONCMD} -s:${BUILDROOT}/${SCRIPTBASENAME}.xml -xsl:../ws/Docbook/Extensions/Xsl/docbook2print.xsl > ${BUILDROOT}/${SCRIPTBASENAME}_print.xml
${SAXONCMD} -s:${BUILDROOT}/${SCRIPTBASENAME}.xml -xsl:../ws/Docbook/Extensions/Xsl/docbook2epub.xsl > ${BUILDROOT}/${SCRIPTBASENAME}_epub.xml
cd ${BUILDROOT}; ${SAXONCMD} -s:${SCRIPTBASENAME}.xml -xsl:../../ws/Docbook/Extensions/Xsl/docbookExtractFig.xsl
@@ -82,12 +66,12 @@ ${BUILDROOT}/stage1:\
${BUILDROOT}/webhelp/index.html:${BUILDROOT}/${SCRIPTBASENAME}.xml
cd ${BUILDROOT};\
/usr/share/xmlmind/bin/xxetool convert ${XSLPARAM} db5.toWebHelp \
- ${SCRIPTBASENAME}.xml -u webhelp
+ ${SCRIPTBASENAME}_html.xml -u webhelp
${BUILDROOT}/mobil/index.html:${BUILDROOT}/${SCRIPTBASENAME}.xml
cd ${BUILDROOT};\
/usr/share/xmlmind/bin/xxetool convert ${XSLPARAM} db5.toEclipseHelp \
- ${SCRIPTBASENAME}.xml -u mobil
+ ${SCRIPTBASENAME}_html.xml -u mobil
${BUILDROOT}/webhelp/printversion.pdf: ${BUILDROOT}/${SCRIPTBASENAME}_print.xml
cd ${BUILDROOT};\
@@ -99,18 +83,6 @@ ${BUILDROOT}/webhelp/lectures.epub: ${BUILDROOT}/${SCRIPTBASENAME}.xml
/usr/share/xmlmind/bin/xxetool convert ${XSLPARAM} \
db5.toEpub ${SCRIPTBASENAME}_epub.xml -u webhelp/lectures.epub
-#${BUILDROOT}/${BUILDNAVI}/index.html: ${BUILDROOT}/${SCRIPTBASENAME}.xml
-# cd ${BUILDROOT};\
-# /usr/share/xmlmind/bin/xxetool convert ${XSLPARAM} ${XSLPARAM_html} db5.toEclipseHelp \
-# ${SCRIPTBASENAME}.xml -u $(BUILDNAVI)
-# perl -i -p -e '$$/=undef;s/\n[ \t]*<!DOCTYPE[^>]+\n[^>]*>$$//m' ${BUILDNAVI}/*.xml
-# cp -r META-INF ${BUILDROOT}/${BUILDNAVI}
-
-#${BUILDROOT}/${BUILDNONAVI}/index.html: ${BUILDROOT}/${SCRIPTBASENAME}.xml
-# cd ${BUILDROOT};\
-# /usr/share/xmlmind/bin/xxetool convert -p suppress.navigation 1 ${XSLPARAM} ${XSLPARAM_html} \
-# db5.toEclipseHelp ${SCRIPTBASENAME}.xml -u $(BUILDNONAVI);
-
clean:
rm -rf ${BUILDROOT}
#end
diff --git a/ws/Docbook/Extensions/Tdata/Makefile b/ws/Docbook/Extensions/Tdata/Makefile
index 1d24594cc040bea6f669dd302b1e3ee49608eab8..0169a66afeb3d81c85d4eb45dbcb1ddb2ad263b8 100644
--- a/ws/Docbook/Extensions/Tdata/Makefile
+++ b/ws/Docbook/Extensions/Tdata/Makefile
@@ -1,22 +1,48 @@
-DESTDIR=webhelp
-TARGETDIR=/tmp/$(DESTDIR)
-WEBHELPXSL=/usr/share/xmlmind/addon/config/docbook5/xslCustom/webhelpHdm.xsl
+SHELL = /bin/bash
-LECTUREDIR=lectures
-XSLTESTDIR=xsltest
+SCRIPTBASENAME=fig
-# Invoke with debugging option like e.g.:
-# make DEBUG='-d -vvv' webhelp
+#
+# Eclipse Help XSL related plugin parameters, see
+# http://docbook.sourceforge.net/release/xsl/current/doc/param.html
+#
+
+XSLPARAM=-p callout.graphics 0 \
+-p callout.unicode 1
XSLPARAM_pdf=-p xep.extensions 1\
-p highlight.source 1
-#
-# -p ulink.show 1
-# -p ulink.footnotes 1
-#
+
+DOCMODULES=Sd1 Sda1 Sda2 Sdi
+
+BUILDROOT=target
+
+#+++ no changes below this line ++++++++++++++++++++++++++++++++++++
+
+numCores=$(shell nproc --all)
+
+SAXONCMD=java -cp "/usr/share/java/Saxon-HE.jar:/usr/share/java/xercesImpl.jar" \
+-Djavax.xml.parsers.DocumentBuilderFactory=org.apache.xerces.jaxp.DocumentBuilderFactoryImpl \
+ -Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
+ -Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XIncludeParserConfiguration \
+ net.sf.saxon.Transform
+
+
all: epub webhelp pdf
+
+
+${BUILDROOT}/${SCRIPTBASENAME}_print.xml \
+${BUILDROOT}/${SCRIPTBASENAME}.xml: ${SCRIPTBASENAME}.xml
+ mkdir -p ${BUILDROOT};
+ ${SAXONCMD} -s:${SCRIPTBASENAME}.xml -xsl:../Xsl/docbook2docbook.xsl > ${BUILDROOT}/${SCRIPTBASENAME}.xml
+ ${SAXONCMD} -s:${BUILDROOT}/${SCRIPTBASENAME}.xml -xsl:../Xsl/docbook2html.xsl > ${BUILDROOT}/${SCRIPTBASENAME}_html.xml
+ ${SAXONCMD} -s:${BUILDROOT}/${SCRIPTBASENAME}.xml -xsl:../Xsl/docbook2print.xsl > ${BUILDROOT}/${SCRIPTBASENAME}_print.xml
+ ${SAXONCMD} -s:${BUILDROOT}/${SCRIPTBASENAME}.xml -xsl:../Xsl/docbook2epub.xsl > ${BUILDROOT}/${SCRIPTBASENAME}_epub.xml
+ cd ${BUILDROOT}; ${SAXONCMD} -s:${SCRIPTBASENAME}.xml -xsl:../../Xsl/docbookExtractFig.xsl
+
+
epub:
/usr/share/xmlmind/bin/xxetool convert $(DEBUG) db5.toEpub fig.xml -u $(TARGETDIR)/fig.epub
diff --git a/ws/Docbook/Extensions/Tdata/fig.xml b/ws/Docbook/Extensions/Tdata/fig.xml
index 77da3bb7fba69895cfce7bec24ddefaf79ba040f..f194e1aaa8fe4e82e42bf10eb1e29677ae3597ff 100644
--- a/ws/Docbook/Extensions/Tdata/fig.xml
+++ b/ws/Docbook/Extensions/Tdata/fig.xml
@@ -131,8 +131,8 @@
<para>A <filename>.fig</filename> figure:</para>
- <figure xml:id="figJdbcRead">
- <title><acronym>JDBC</acronym> read process</title>
+ <figure xml:id="xslAxisDefinitions">
+ <title>XSL axis directions</title>
<mediaobject>
<imageobject>
@@ -177,11 +177,15 @@
<para>SVG slide example:</para>
- <mediaobject>
- <imageobject>
- <imagedata fileref="../../../../Doc/Sd1/Ref/Fig/hashing.svg"/>
- </imageobject>
- </mediaobject>
+ <figure xml:id="hashingPrinciple">
+ <title>Hashing principle</title>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="../../../../Doc/Sd1/Ref/Fig/hashing.svg"/>
+ </imageobject>
+ </mediaobject>
+ </figure>
<para>This is a cross reference to <xref linkend="callouts"/>.</para>
</chapter>
diff --git a/ws/Docbook/Extensions/Xsl/docbook2docbook.xsl b/ws/Docbook/Extensions/Xsl/docbook2docbook.xsl
index e8e6a0dd22e18f255de3d08433f6e89c92b89c00..31b1d9e2b06721f7a824a82d62d848ebf4d22ea5 100644
--- a/ws/Docbook/Extensions/Xsl/docbook2docbook.xsl
+++ b/ws/Docbook/Extensions/Xsl/docbook2docbook.xsl
@@ -60,32 +60,6 @@
</db:videodata>
</xsl:template>
- <xsl:template match="db:figure[db:mediaobject/db:imageobject]/db:title">
- <xsl:copy>
- <xsl:apply-templates select="@* | node()"/>
- </xsl:copy>
- <para>
- <xsl:if test="substring-after(parent::db:figure/db:mediaobject/db:imageobject/db:imagedata/@fileref, '.') = 'fig'">
- <uri>
- <xsl:attribute name="xlink:href">
- <xsl:call-template name="hdm.get.leftmost.of.separator">
- <xsl:with-param name="path" select="ancestor::*/@xml:base"/>
- <xsl:with-param name="separator" select="'/'"/>
- </xsl:call-template>
- <xsl:text>/</xsl:text>
- <xsl:call-template name="hdm.get.leftmost.of.separator">
- <xsl:with-param name="path"
- select="parent::db:figure/db:mediaobject/db:imageobject/db:imagedata/@fileref"/>
- <xsl:with-param name="separator" select="'.'"/>
- </xsl:call-template>
- <xsl:text>.pdf</xsl:text>
- </xsl:attribute>
- <xsl:text>(Animated PDF Version)</xsl:text>
- </uri>
- </xsl:if>
- </para>
- </xsl:template>
-
<!--
<xsl:template match="db:answer">
<db:answer>
diff --git a/ws/Docbook/Extensions/Xsl/docbook2html.xsl b/ws/Docbook/Extensions/Xsl/docbook2html.xsl
new file mode 100644
index 0000000000000000000000000000000000000000..0338766b0346a1db45b840ab3ba4dcb6c1813c9f
--- /dev/null
+++ b/ws/Docbook/Extensions/Xsl/docbook2html.xsl
@@ -0,0 +1,67 @@
+<?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:include href="common.xsl"/>
+
+ <xsl:output indent="no"/>
+
+ <xsl:template match="@* | node()">
+ <xsl:copy>
+ <xsl:apply-templates select="@*[name(.) != 'xml:base'] | node()"/>
+ </xsl:copy>
+ </xsl:template>
+
+
+ <xsl:template match="db:figure[db:mediaobject/db:imageobject]/db:title">
+
+ <xsl:copy>
+ <xsl:apply-templates select="@* | node()"/>
+ </xsl:copy>
+
+ <xsl:if test="ends-with(parent::db:figure/db:mediaobject/db:imageobject/db:imagedata/@fileref, '.fig')">
+ <para>
+ <uri>
+ <xsl:attribute name="xlink:href">
+ <xsl:call-template name="hdm.get.leftmost.of.separator">
+ <xsl:with-param name="path" select="ancestor::*/@xml:base"/>
+ <xsl:with-param name="separator" select="'/'"/>
+ </xsl:call-template>
+ <xsl:text>/</xsl:text>
+ <xsl:call-template name="hdm.get.leftmost.of.separator">
+ <xsl:with-param name="path"
+ select="parent::db:figure/db:mediaobject/db:imageobject/db:imagedata/@fileref"/>
+ <xsl:with-param name="separator" select="'.'"/>
+ </xsl:call-template>
+ <xsl:text>.pdf</xsl:text>
+ </xsl:attribute>
+ <xsl:text>(Animated PDF Version)</xsl:text>
+ </uri>
+ </para>
+ </xsl:if>
+
+ <xsl:if test="ends-with(parent::db:figure/db:mediaobject/db:imageobject/db:imagedata/@fileref, '.svg')">
+ <para>
+ <uri target="_blank">
+ <xsl:attribute name="xlink:href">
+ <xsl:call-template name="hdm.get.leftmost.of.separator">
+ <xsl:with-param name="path" select="ancestor::*/@xml:base"/>
+ <xsl:with-param name="separator" select="'/'"/>
+ </xsl:call-template>
+ <xsl:text>/</xsl:text>
+ <xsl:call-template name="hdm.get.leftmost.of.separator">
+ <xsl:with-param name="path"
+ select="parent::db:figure/db:mediaobject/db:imageobject/db:imagedata/@fileref"/>
+ <xsl:with-param name="separator" select="'.'"/>
+ </xsl:call-template>
+ <xsl:text>.svg</xsl:text>
+ </xsl:attribute>
+ <xsl:text>Separate SVG image link</xsl:text>
+ </uri>
+ </para>
+ </xsl:if>
+
+ </xsl:template>
+
+</xsl:stylesheet>
diff --git a/ws/Docbook/Extensions/Xsl/docbookFigures.xsl b/ws/Docbook/Extensions/Xsl/docbookFigures.xsl
deleted file mode 100644
index 65c6cf01ac3964a3e75e174b948305b772ae0920..0000000000000000000000000000000000000000
--- a/ws/Docbook/Extensions/Xsl/docbookFigures.xsl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="2.0"
- xmlns:db="http://docbook.org/ns/docbook"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns="http://docbook.org/ns/docbook">
-
- <xsl:variable name="generateIdPrefix">__sdwordm4342cs__</xsl:variable>
-
- <xsl:output indent="no"/>
-
- <xsl:template match="@* | node()">
- <xsl:copy>
- <xsl:apply-templates select="@* | node()"/>
- </xsl:copy>
- </xsl:template>
-
-
- <xsl:template match="/">
- <section version="5.0" xml:id="someValue"
- xmlns="http://docbook.org/ns/docbook"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns:m="http://www.w3.org/1998/Math/MathML"
- xmlns:html="http://www.w3.org/1999/xhtml"
- xmlns:db="http://docbook.org/ns/docbook">
- <title>Extracted Figures</title>
-
- <para>Extracted Figures</para>
- <xsl:apply-templates select="//db:figure[db:mediaobject/db:imageobject]" mode="count"/>
-
- </section>
- </xsl:template>
-
- <xsl:template match="db:figure[db:mediaobject/db:imageobject]" mode="count">
-
- <section xml:id="sec_{@xml:id}">
- <title>
- <xsl:value-of select="position()"/>
- <xsl:text>:</xsl:text>
- <xsl:value-of select="db:mediaobject/db:imageobject/db:imagedata/@fileref"/>
- </title>
-
- <xsl:apply-templates select="."/>
- </section>
- </xsl:template>
-
-
- <xsl:template match="db:xref">
- <db:emphasis>
- <xsl:text>XREF </xsl:text>
- <xsl:value-of select="@linkend"/>
- <xsl:text> replaced</xsl:text>
-
- </db:emphasis>
- </xsl:template>
-
-
-
-</xsl:stylesheet>