diff --git a/Doc/Makefile b/Doc/Makefile index ad0828caa8ba640c85e9639adb776e9873238280..1d6b852b22fb0f838e07a705841ffcd964cfe424 100644 --- a/Doc/Makefile +++ b/Doc/Makefile @@ -48,7 +48,6 @@ ${BUILDROOT}/${SCRIPTBASENAME}.xml: ${SCRIPTBASENAME}.xml Common/glossary.xml Co ${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 for module in ${DOCMODULES}; do \ tar c- $$module/Ref| tar -x -C ${BUILDROOT}; \ @@ -81,7 +80,7 @@ ${BUILDROOT}/webhelp/printversion.pdf: ${BUILDROOT}/${SCRIPTBASENAME}_print.xml ${BUILDROOT}/webhelp/lectures.epub: ${BUILDROOT}/${SCRIPTBASENAME}.xml cd ${BUILDROOT};\ /usr/share/xmlmind/bin/xxetool convert ${XSLPARAM} \ - db5.toEpub ${SCRIPTBASENAME}_epub.xml -u webhelp/lectures.epub + db5.toEpub ${SCRIPTBASENAME}.xml -u webhelp/lectures.epub clean: rm -rf ${BUILDROOT} diff --git a/ws/Docbook/Extensions/Tdata/Makefile b/ws/Docbook/Extensions/Tdata/Makefile index 0169a66afeb3d81c85d4eb45dbcb1ddb2ad263b8..309e5b1349be6773dd2f85d8e4a6e35f630c1c52 100644 --- a/ws/Docbook/Extensions/Tdata/Makefile +++ b/ws/Docbook/Extensions/Tdata/Makefile @@ -39,12 +39,10 @@ ${BUILDROOT}/${SCRIPTBASENAME}.xml: ${SCRIPTBASENAME}.xml ${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 + /usr/share/xmlmind/bin/xxetool convert $(DEBUG) db5.toEpub fig.xml -u $(TARGETDIR)/fig.epub webhelp:fig.xml /usr/share/xmlmind/bin/xxetool convert $(DEBUG) \ diff --git a/ws/Docbook/Extensions/Xsl/docbook2epub.xsl b/ws/Docbook/Extensions/Xsl/docbook2epub.xsl deleted file mode 100644 index e3754e4d1a3e12023f35c5e79d8702fa809aa92e..0000000000000000000000000000000000000000 --- a/ws/Docbook/Extensions/Xsl/docbook2epub.xsl +++ /dev/null @@ -1,20 +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> - - <!-- dirty hack, should better not be generated in the first place! --> - <xsl:template match="db:para[db:uri/text()='(Animated PDF Version)']"/> - -</xsl:stylesheet> diff --git a/ws/Docbook/Extensions/Xsl/docbook2print.xsl b/ws/Docbook/Extensions/Xsl/docbook2print.xsl index 703ce6186decda75134b95f07278cf28f67d4fe0..c711041db6a1f52d160f90917d85e280ea57735a 100644 --- a/ws/Docbook/Extensions/Xsl/docbook2print.xsl +++ b/ws/Docbook/Extensions/Xsl/docbook2print.xsl @@ -63,11 +63,5 @@ </mediaobject> </xsl:template> - - <!-- dirty hack, should better not be generated in the first place! --> - <xsl:template match="db:para[db:uri/text()='(Animated PDF Version)']"/> - - - - + </xsl:stylesheet>