From f3d3c51c239d4cf5445ee98e1a263d736dfa78da Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Fri, 12 May 2017 14:46:09 +0200
Subject: [PATCH] Better mak support
---
ws/Docbook/CustomLayer/slide/slideHdm.xsl | 4 +-
.../CustomLayer/webhelp/hdmextensions.xsl | 2 +-
ws/Docbook/Extensions/Tdata/Makefile | 155 ++++++++++--------
ws/Docbook/Extensions/Tdata/Makefile.makro | 149 -----------------
ws/Docbook/Preprocess/Xsl/docbook2html.xsl | 2 +-
.../Preprocess/Xsl/docbookExtractFig.xsl | 2 +-
ws/Docbook/Preprocess/make.image | 2 +-
7 files changed, 92 insertions(+), 224 deletions(-)
delete mode 100644 ws/Docbook/Extensions/Tdata/Makefile.makro
diff --git a/ws/Docbook/CustomLayer/slide/slideHdm.xsl b/ws/Docbook/CustomLayer/slide/slideHdm.xsl
index d5164491c..894fdf75e 100644
--- a/ws/Docbook/CustomLayer/slide/slideHdm.xsl
+++ b/ws/Docbook/CustomLayer/slide/slideHdm.xsl
@@ -34,7 +34,7 @@
<xsl:template name="slideUnit">
<xsl:param name="rootId"/>
<xsl:param name="sections"/>
- <xsl:result-document method="xhtml" encoding="utf-8" href="Slides/{$rootId}.html" indent="no">
+ <xsl:result-document method="xhtml" encoding="utf-8" href="__slide{$rootId}.html" indent="no">
<html lang="en">
<head>
<title>
@@ -71,7 +71,7 @@
transition: 'slide', // none/fade/slide/convex/concave/zoom
math: {
- mathjax: 'https://prog.mi.hdm-stuttgart.de/mathjax/MathJax.js',
+ mathjax: 'mathjax/MathJax.js',
config: 'TeX-AMS-MML_HTMLorMML', // See http://docs.mathjax.org/en/latest/config-files.html
},
// Optional reveal.js plugins
diff --git a/ws/Docbook/CustomLayer/webhelp/hdmextensions.xsl b/ws/Docbook/CustomLayer/webhelp/hdmextensions.xsl
index a10d49d7c..429910c93 100644
--- a/ws/Docbook/CustomLayer/webhelp/hdmextensions.xsl
+++ b/ws/Docbook/CustomLayer/webhelp/hdmextensions.xsl
@@ -15,7 +15,7 @@
<xsl:if test="//m:math">
<script type="text/x-mathjax-config">MathJax.Hub.Config({tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}});</script>
- <script src="https://prog.mi.hdm-stuttgart.de/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
+ <script src="mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
<xsl:comment>Self closing tags disallowed!</xsl:comment>
</script>
</xsl:if>
diff --git a/ws/Docbook/Extensions/Tdata/Makefile b/ws/Docbook/Extensions/Tdata/Makefile
index 64dfc0f2e..81f4c9e08 100644
--- a/ws/Docbook/Extensions/Tdata/Makefile
+++ b/ws/Docbook/Extensions/Tdata/Makefile
@@ -1,12 +1,14 @@
SHELL = /bin/bash
SCRIPTBASENAME=fig
-
-include ../../../../Doc/make.xsl
+BUILDROOT=target
#+++ no changes below this line ++++++++++++++++++++++++++++++++++++
-BUILDROOT=target
-BUILDROOT_SRC=${BUILDROOT}/src
+#
+DIR := ${CURDIR}
+numCores=$(shell nproc --all)
+
+BUILDROOT_PROFILE=${BUILDROOT}/profile
BUILDROOT_WEBHELP=${BUILDROOT}/webhelp
BUILDROOT_EPUB=${BUILDROOT}/epub
@@ -36,7 +38,7 @@ dbookXslSlideParam=${dbookXslCommonParam}
# Epub related Docbook transformation parameter
dbookXslEpubParam=${dbookXslCommonParam} \
generate.manifest=1 \
-base.dir=target/epub
+base.dir=.
# Webhelp related Docbook transformation parameter
dbookXslWebhelpParam=${dbookXslCommonParam} \
@@ -56,10 +58,7 @@ sect4 toc \
sect5 toc \
section toc \
set toc,title' \
-webhelp.base.dir=target/webhelp
-
-DIR := ${CURDIR}
-numCores=$(shell nproc --all)
+webhelp.base.dir=.
# Required for docbook Xsl 1.0 based stylesheets
SAXON6CMD=java -cp "/usr/share/java/saxon.jar:/usr/share/java/xslthl-2.1.3.jar" \
@@ -72,74 +71,92 @@ SAXONCMD=java -cp "/usr/share/hdm-docbook-xsl/docbook-xsl/tools/lib/saxon9he.jar
-Djavax.xml.parsers.SAXParserFactory=org.apache.xerces.jaxp.SAXParserFactoryImpl \
-Dorg.apache.xerces.xni.parser.XMLParserConfiguration=org.apache.xerces.parsers.XIncludeParserConfiguration \
-Dxslthl.config=file://${DBOOK_XSL}/highlighting/xslthl-config.xml \
- net.sf.saxon.Transform
-
-all: epub webhelp pdf slides
-
-${BUILDROOT_SRC}/${SCRIPTBASENAME}_print.xml \
-${BUILDROOT_SRC}/${SCRIPTBASENAME}_html.xml \
-${BUILDROOT_SRC}/${SCRIPTBASENAME}.xml: ${SCRIPTBASENAME}.xml
- mkdir -p ${BUILDROOT_SRC}; ln -sf /usr/share/hdmwebhelp/extern ${BUILDROOT}
- ${SAXONCMD} -s:$< \
- -xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2docbook.xsl > ${BUILDROOT_SRC}/${SCRIPTBASENAME}.xml
- ${SAXONCMD} -s:${BUILDROOT_SRC}/${SCRIPTBASENAME}.xml \
- -xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2html.xsl > ${BUILDROOT_SRC}/${SCRIPTBASENAME}_html.xml
- ${SAXONCMD} -s:${BUILDROOT_SRC}/${SCRIPTBASENAME}.xml \
- -xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2print.xsl > ${BUILDROOT_SRC}/${SCRIPTBASENAME}_print.xml
- cd ${BUILDROOT_SRC}; ${SAXONCMD} -s:${SCRIPTBASENAME}.xml -xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbookExtractFig.xsl
- mkdir -p ${BUILDROOT_SRC}/Resources; tar cv- `find . -name Ref -and -type d|grep -v ^\./target`|tar -x -C ${BUILDROOT_SRC}/Resources
- cp ${DBOOK_XSL_PREPROCESS}/make.image ${BUILDROOT_SRC}
- cd ${BUILDROOT_SRC}/Resources; $(MAKE) -f ../make.image; rm -rf `find . -name Generate`
-
-webhelp:${BUILDROOT_SRC}/${SCRIPTBASENAME}_html.xml
+ net.sf.saxon.Transform
+
+# Docbook related build rules
+#
+# Basic profiling
+%.print.xml %.html.xml: %.xml
+ mkdir -p $(@D); ln -sf /usr/share/hdmwebhelp/extern $(@D)/..
+ ${SAXONCMD} -s:$(<F) \
+ -xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2docbook.xsl > ${*}.xml
+ ${SAXONCMD} -s:$(<F) \
+ -xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2html.xsl > ${*}.html.xml
+ ${SAXONCMD} -s:$(<F) \
+ -xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2print.xsl > ${*}.print.xml
+ cd $(@D); ${SAXONCMD} -s:$(<F) -xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbookExtractFig.xsl
+ tar cv- `find . -name Ref -and -type d|grep -v ^\./target`|tar -x -C $(@D)
+ cp -f ${DBOOK_XSL_PREPROCESS}/make.image $(@D)
+ cd $(@D); $(MAKE) -j ${numCores} -f make.image; rm -rf `find . -name Generate`
+
+# Webhelp and indexing
+%.webhelp: %.html.xml
${SAXON6CMD} $< ${DBOOK_XSL_CUSTOM}/webhelp/webhelpHdm.xsl ${dbookXslWebhelpParam}
- cd ${BUILDROOT_SRC}/Resources; rsync -av * ${DIR}/${BUILDROOT_WEBHELP}
- cp -r ${DBOOK_XSL}/webhelp/template/* ${BUILDROOT_WEBHELP} # Images, Css
- cat ${DBOOK_XSL_CUSTOM}/webhelp/common/css/positioning.supp.css >> ${BUILDROOT_WEBHELP}/common/css/positioning.css # highlighting supplements
- cp ${DBOOK_XSL_CUSTOM}/webhelp/common/images/hdmlogo.svg ${BUILDROOT_WEBHELP}/common/images
+ rsync -a ${DBOOK_XSL}/webhelp/template/* . # Images, Css
+ cat ${DBOOK_XSL_CUSTOM}/webhelp/common/css/positioning.supp.css >> common/css/positioning.css # highlighting supplements
+ cp ${DBOOK_XSL_CUSTOM}/webhelp/common/images/hdmlogo.svg common/images
+ rsync -a /usr/share/hdmwebhelp/extern/libs/mathjax .
cd ${DBOOK_XSL}/webhelp/template/search; \
- cp nwSearchFnt.js default.props punctuation.props en-us.props stemmers/en_stemmer.js \
- ${DIR}/${BUILDROOT_WEBHELP}/search
+ cp nwSearchFnt.js default.props punctuation.props en-us.props stemmers/en_stemmer.js \
+ ${DIR}/search
java \
- -DhtmlDir=${BUILDROOT_WEBHELP} \
- '-DindexerLanguage=en' \
- '-DhtmlExtension=html' \
- '-DdoStem=true' \
- '-DtocFile=$${toc.file}' \
- '-DindexerExcludedFiles=index.html' \
- '-Dorg.xml.sax.driver=org.ccil.cowan.tagsoup.Parser' \
- '-Djavax.xml.parsers.SAXParserFactory=org.ccil.cowan.tagsoup.jaxp.SAXFactoryImpl' \
- -cp '${DBOOK_XSL}/extensions/webhelpindexer.jar:${DBOOK_XSL}/extensions/lucene-analyzers-3.0.0.jar:${DBOOK_XSL}/extensions/lucene-core-3.0.0.jar:${DBOOK_XSL}/extensions/tagsoup-1.2.1.jar' \
- com.nexwave.nquindexer.IndexerMain
- ln -sf ../Slides ${BUILDROOT_WEBHELP} || true
-
-epub: ${BUILDROOT_SRC}/${SCRIPTBASENAME}_html.xml
+ -DhtmlDir=. \
+ '-DindexerLanguage=en' \
+ '-DhtmlExtension=html' \
+ '-DdoStem=true' \
+ '-DtocFile=$${toc.file}' \
+ '-DindexerExcludedFiles=index.html' \
+ '-Dorg.xml.sax.driver=org.ccil.cowan.tagsoup.Parser' \
+ '-Djavax.xml.parsers.SAXParserFactory=org.ccil.cowan.tagsoup.jaxp.SAXFactoryImpl' \
+ -cp '${DBOOK_XSL}/extensions/webhelpindexer.jar:${DBOOK_XSL}/extensions/lucene-analyzers-3.0.0.jar:${DBOOK_XSL}/extensions/lucene-core-3.0.0.jar:${DBOOK_XSL}/extensions/tagsoup-1.2.1.jar' \
+ com.nexwave.nquindexer.IndexerMain
+ touch $*.webhelp
+
+# Epub
+%.epub: %.html.xml
${SAXON6CMD} $< ${DBOOK_XSL_CUSTOM}/epub/chunkHdm.xsl ${dbookXslEpubParam}
- rsync -av --delete ${BUILDROOT_SRC}/Resources/* ${BUILDROOT_EPUB}/OEBPS
- rsync -av --delete ${DBOOK_XSL}/images ${BUILDROOT_EPUB}/OEBPS # Images, Css
- cat ${DBOOK_XSL_CUSTOM}/webhelp/common/css/positioning.supp.css >> ${BUILDROOT_EPUB}/OEBPS/docbook-epub.css # highlighting supplements
- cd ${BUILDROOT_EPUB}; zip -rX ${SCRIPTBASENAME}.epub mimetype META-INF OEBPS
+ cd ..; rm -rf mimetype META-INF ${*}.epub
+ mv mimetype META-INF ..
+ rsync -av --delete ${DBOOK_XSL}/images . # Images, Css
+ cat ${DBOOK_XSL_CUSTOM}/webhelp/common/css/positioning.supp.css >> docbook-epub.css # highlighting supplements
+ cd ..; zip -rX ${*}.epub mimetype META-INF OEBPS
+
+%.slides: %.html.xml
+ ${SAXONCMD} -s:$< -xsl:${DBOOK_XSL_CUSTOM}/slide/slideHdm.xsl ${dbookXslSlideParam}
+ rsync -a /usr/share/reveal.js .
+ touch $*.slides
+
+# PDF
+# See http://stackoverflow.com/questions/39786947/how-to-convert-to-pdf-from-xsl-fo-with-mathml/39796975
+%.pdf: %.print.xml
+ ${SAXON6CMD} $*.print.xml ${DBOOK_XSL_CUSTOM}/pdf/docbookHdm.xsl ${dbookXslPdfParam} > $*.fo
+ /usr/share/hdm-fop/fop-2.2/fop/fop -fo $*.fo -pdf ${*}.pdf
-slides: ${BUILDROOT}/src/${SCRIPTBASENAME}_html.xml
- cd ${BUILDROOT}; ${SAXONCMD} -s:../$< -xsl:${DBOOK_XSL_CUSTOM}/slide/slideHdm.xsl ${dbookXslSlideParam}
- cd ${BUILDROOT_SRC}/Resources; rsync -av * ${DIR}/${BUILDROOT}/Slides
- ln -sf /usr/share/reveal.js ${BUILDROOT}/Slides
+all: ${BUILDROOT_WEBHELP}/fig.webhelp ${BUILDROOT_WEBHELP}/fig.epub ${BUILDROOT_WEBHELP}/fig.slides ${BUILDROOT_WEBHELP}/fig.pdf
-# See http://stackoverflow.com/questions/39786947/how-to-convert-to-pdf-from-xsl-fo-with-mathml/39796975
-pdf: ${BUILDROOT_SRC}/${SCRIPTBASENAME}_print.xml
- mkdir -p ${BUILDROOT}/pdf
- cd ${BUILDROOT_SRC}/Resources; tar cv- `find . -name Ref -and -type d|grep -v ^\./target`|tar -x -C ${DIR}/${BUILDROOT}/pdf
- ${SAXON6CMD} $< ${DBOOK_XSL}/fo/docbook.xsl ${dbookXslPdfParam} > ${BUILDROOT}/pdf/${SCRIPTBASENAME}.fo
- /usr/share/hdm-fop/fop-2.2/fop/fop -fo ${BUILDROOT}/pdf/${SCRIPTBASENAME}.fo -pdf ${BUILDROOT}/pdf/${SCRIPTBASENAME}.pdf
+${BUILDROOT_PROFILE}/${SCRIPTBASENAME}.print.xml \
+${BUILDROOT_PROFILE}/${SCRIPTBASENAME}.html.xml \
+${BUILDROOT_PROFILE}/${SCRIPTBASENAME}.xml: ${SCRIPTBASENAME}.xml
+
+${BUILDROOT_WEBHELP}/fig.xml \
+${BUILDROOT_WEBHELP}/fig.html.xml \
+${BUILDROOT_WEBHELP}/fig.print.xml :\
+ ${BUILDROOT_PROFILE}/${SCRIPTBASENAME}.html.xml
+ rsync -a --delete ${BUILDROOT_PROFILE}/* ${BUILDROOT_WEBHELP}
+
+${BUILDROOT_WEBHELP}/fig.webhelp: ${BUILDROOT_WEBHELP}/${SCRIPTBASENAME}.html.xml
+ cd ${BUILDROOT_WEBHELP}; ${MAKE} -f ../../Makefile fig.webhelp
+
+${BUILDROOT_WEBHELP}/fig.epub: ${BUILDROOT_WEBHELP}/fig.html.xml
+ cp -r ${BUILDROOT_PROFILE} ${BUILDROOT_WEBHELP}/OEBPS
+ cd ${BUILDROOT_WEBHELP}/OEBPS; ${MAKE} -f ../../../Makefile fig.epub
-xsl:
- rm -rf $(XSLTESTDIR); mkdir $(XSLTESTDIR)
- cd $(XSLTESTDIR); saxon-xslt ../fig.xml /usr/share/xmlmind/addon/config/docbook5/xslCustom/webhelpHdm.xsl
+${BUILDROOT_WEBHELP}/fig.slides: ${BUILDROOT_WEBHELP}/fig.html.xml
+ cd ${BUILDROOT_WEBHELP}; ${MAKE} -f ../../Makefile fig.slides
-lectures:
- rm -rf $(LECTUREDIR);mkdir $(LECTUREDIR)
- cd $(LECTUREDIR); saxon-xslt ../../../../../Doc/target/lectures.xml $(WEBHELPXSL)
+${BUILDROOT_WEBHELP}/fig.pdf: ${BUILDROOT_WEBHELP}/fig.print.xml
+ cd ${BUILDROOT_WEBHELP}; ${MAKE} -f ../../Makefile fig.pdf
clean:
- rm -rf $(TARGETDIR) $(DESTDIR) $(LECTUREDIR) $(XSLTESTDIR)
+ rm -rf ${BUILDROOT}
#end
diff --git a/ws/Docbook/Extensions/Tdata/Makefile.makro b/ws/Docbook/Extensions/Tdata/Makefile.makro
deleted file mode 100644
index b1702526e..000000000
--- a/ws/Docbook/Extensions/Tdata/Makefile.makro
+++ /dev/null
@@ -1,149 +0,0 @@
-SHELL = /bin/bash
-
-SCRIPTBASENAME=fig
-
-include ../../../../Doc/make.xsl
-
-#+++ no changes below this line ++++++++++++++++++++++++++++++++++++
-BUILDROOT=target
-BUILDROOT_SRC=${BUILDROOT}/src
-BUILDROOT_WEBHELP=${BUILDROOT}/webhelp
-BUILDROOT_EPUB=${BUILDROOT}/epub
-
-DBOOK=/usr/share/hdm-docbook-xsl
-DBOOK_XSL=${DBOOK}/docbook-xsl
-DBOOK_XSL_CUSTOM=${DBOOK}/CustomLayer
-DBOOK_XSL_PREPROCESS=${DBOOK}/Preprocess
-
-# Common Docbook transformation parameter
-dbookXslCommonParam=\
-keep.relative.image.uris=0 \
-callout.graphics=0 \
-callout.unicode=1 \
-graphicsize.use.img.src.path=1 \
-highlight.source=1 \
-id.warnings=1 \
-olink.debug=1
-
-# Pdf related Docbook transformation parameter
-dbookXslPdfParam=${dbookXslCommonParam} \
-fop1.extensions=1 \
-paper.type=A4
-
-# Slide related Docbook transformation parameter
-dbookXslSlideParam=${dbookXslCommonParam}
-
-# Epub related Docbook transformation parameter
-dbookXslEpubParam=${dbookXslCommonParam} \
-generate.manifest=1 \
-base.dir=target/epub
-
-# Webhelp related Docbook transformation parameter
-dbookXslWebhelpParam=${dbookXslCommonParam} \
-generate.toc='appendix toc,title \
-article/appendix nop \
-article toc,title \
-book toc,title,figure,table,example,equation \
-chapter toc,title \
-appendix toc,title \
-part toc,title \
-preface toc,title \
-reference toc,title \
-sect1 toc \
-sect2 toc \
-sect3 toc \
-sect4 toc \
-sect5 toc \
-section toc \
-set toc,title' \
-webhelp.base.dir=target/webhelp
-
-DIR := ${CURDIR}
-numCores=$(shell nproc --all)
-
-# Required for docbook Xsl 1.0 based stylesheets
-SAXON6CMD=java -cp "/usr/share/java/saxon.jar:/usr/share/java/xslthl-2.1.3.jar" \
- '-Dxslthl.config=file://${DBOOK_XSL}/highlighting/xslthl-config.xml' \
- com.icl.saxon.StyleSheet
-
-# XSL 2.0 processor
-SAXONCMD=java -cp "/usr/share/hdm-docbook-xsl/docbook-xsl/tools/lib/saxon9he.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/xslthl-2.1.3.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 \
- -Dxslthl.config=file://${DBOOK_XSL}/highlighting/xslthl-config.xml \
- net.sf.saxon.Transform
-
-# Docbook related build rules
-%.print.xml %.html.xml: %.xml
- mkdir -p $(@D); ln -sf /usr/share/hdmwebhelp/extern $(@D)/..
- ${SAXONCMD} -s:$(<F) \
- -xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2docbook.xsl > ${*}.xml
- ${SAXONCMD} -s:$(<F) \
- -xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2html.xsl > ${*}.html.xml
- ${SAXONCMD} -s:$(<F) \
- -xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2print.xsl > ${*}.print.xml
- cd $(@D); ${SAXONCMD} -s:$(<F) -xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbookExtractFig.xsl
- mkdir -p $(@D)/Resources; tar cv- `find . -name Ref -and -type d|grep -v ^\./target`|tar -x -C $(@D)/Resources
- cp ${DBOOK_XSL_PREPROCESS}/make.image $(@D)
- cd $(@D)/Resources; $(MAKE) -f ../make.image; rm -rf `find . -name Generate`
-
-
-all: epub webhelp pdf slides
-
-${BUILDROOT_SRC}/${SCRIPTBASENAME}.print.xml \
-${BUILDROOT_SRC}/${SCRIPTBASENAME}.html.xml \
-${BUILDROOT_SRC}/${SCRIPTBASENAME}.xml: ${SCRIPTBASENAME}.xml
-
-webhelp:${BUILDROOT_SRC}/${SCRIPTBASENAME}.html.xml
- ${SAXON6CMD} $< ${DBOOK_XSL_CUSTOM}/webhelp/webhelpHdm.xsl ${dbookXslWebhelpParam}
- cd ${BUILDROOT_SRC}/Resources; rsync -av * ${DIR}/${BUILDROOT_WEBHELP}
- cp -r ${DBOOK_XSL}/webhelp/template/* ${BUILDROOT_WEBHELP} # Images, Css
- cat ${DBOOK_XSL_CUSTOM}/webhelp/common/css/positioning.supp.css >> ${BUILDROOT_WEBHELP}/common/css/positioning.css # highlighting supplements
- cp ${DBOOK_XSL_CUSTOM}/webhelp/common/images/hdmlogo.svg ${BUILDROOT_WEBHELP}/common/images
- cd ${DBOOK_XSL}/webhelp/template/search; \
- cp nwSearchFnt.js default.props punctuation.props en-us.props stemmers/en_stemmer.js \
- ${DIR}/${BUILDROOT_WEBHELP}/search
- java \
- -DhtmlDir=${BUILDROOT_WEBHELP} \
- '-DindexerLanguage=en' \
- '-DhtmlExtension=html' \
- '-DdoStem=true' \
- '-DtocFile=$${toc.file}' \
- '-DindexerExcludedFiles=index.html' \
- '-Dorg.xml.sax.driver=org.ccil.cowan.tagsoup.Parser' \
- '-Djavax.xml.parsers.SAXParserFactory=org.ccil.cowan.tagsoup.jaxp.SAXFactoryImpl' \
- -cp '${DBOOK_XSL}/extensions/webhelpindexer.jar:${DBOOK_XSL}/extensions/lucene-analyzers-3.0.0.jar:${DBOOK_XSL}/extensions/lucene-core-3.0.0.jar:${DBOOK_XSL}/extensions/tagsoup-1.2.1.jar' \
- com.nexwave.nquindexer.IndexerMain
- ln -sf ../Slides ${BUILDROOT_WEBHELP} || true
-
-epub: ${BUILDROOT_SRC}/${SCRIPTBASENAME}.html.xml
- ${SAXON6CMD} $< ${DBOOK_XSL_CUSTOM}/epub/chunkHdm.xsl ${dbookXslEpubParam}
- rsync -av --delete ${BUILDROOT_SRC}/Resources/* ${BUILDROOT_EPUB}/OEBPS
- rsync -av --delete ${DBOOK_XSL}/images ${BUILDROOT_EPUB}/OEBPS # Images, Css
- cat ${DBOOK_XSL_CUSTOM}/webhelp/common/css/positioning.supp.css >> ${BUILDROOT_EPUB}/OEBPS/docbook-epub.css # highlighting supplements
- cd ${BUILDROOT_EPUB}; zip -rX ${SCRIPTBASENAME}.epub mimetype META-INF OEBPS
-
-slides: ${BUILDROOT}/src/${SCRIPTBASENAME}.html.xml
- cd ${BUILDROOT}; ${SAXONCMD} -s:../$< -xsl:${DBOOK_XSL_CUSTOM}/slide/slideHdm.xsl ${dbookXslSlideParam}
- cd ${BUILDROOT_SRC}/Resources; rsync -av * ${DIR}/${BUILDROOT}/Slides
- ln -sf /usr/share/reveal.js ${BUILDROOT}/Slides
-
-# See http://stackoverflow.com/questions/39786947/how-to-convert-to-pdf-from-xsl-fo-with-mathml/39796975
-pdf: ${BUILDROOT_SRC}/${SCRIPTBASENAME}.print.xml
- mkdir -p ${BUILDROOT}/pdf
- cd ${BUILDROOT_SRC}/Resources; tar cv- `find . -name Ref -and -type d|grep -v ^\./target`|tar -x -C ${DIR}/${BUILDROOT}/pdf
- ${SAXON6CMD} $< ${DBOOK_XSL}/fo/docbook.xsl ${dbookXslPdfParam} > ${BUILDROOT}/pdf/${SCRIPTBASENAME}.fo
- /usr/share/hdm-fop/fop-2.2/fop/fop -fo ${BUILDROOT}/pdf/${SCRIPTBASENAME}.fo -pdf ${BUILDROOT}/pdf/${SCRIPTBASENAME}.pdf
-
-xsl:
- rm -rf $(XSLTESTDIR); mkdir $(XSLTESTDIR)
- cd $(XSLTESTDIR); saxon-xslt ../fig.xml /usr/share/xmlmind/addon/config/docbook5/xslCustom/webhelpHdm.xsl
-
-lectures:
- rm -rf $(LECTUREDIR);mkdir $(LECTUREDIR)
- cd $(LECTUREDIR); saxon-xslt ../../../../../Doc/target/lectures.xml $(WEBHELPXSL)
-
-clean:
- rm -rf $(TARGETDIR) $(DESTDIR) $(LECTUREDIR) $(XSLTESTDIR)
-#end
diff --git a/ws/Docbook/Preprocess/Xsl/docbook2html.xsl b/ws/Docbook/Preprocess/Xsl/docbook2html.xsl
index c7bcaf7a1..a13078354 100644
--- a/ws/Docbook/Preprocess/Xsl/docbook2html.xsl
+++ b/ws/Docbook/Preprocess/Xsl/docbook2html.xsl
@@ -19,7 +19,7 @@
<xsl:copy-of select="."/>
<xsl:for-each select="parent::*[contains(@annotations, 'slide') or descendant::*[contains(@annotations, 'slide')]]">
<para>
- <link xlink:href="Slides/{@xml:id}.html">Related slides on offer</link>
+ <link xlink:href="__slide{@xml:id}.html">Related slides on offer</link>
</para>
</xsl:for-each>
diff --git a/ws/Docbook/Preprocess/Xsl/docbookExtractFig.xsl b/ws/Docbook/Preprocess/Xsl/docbookExtractFig.xsl
index 75d9529e0..e64b37b12 100644
--- a/ws/Docbook/Preprocess/Xsl/docbookExtractFig.xsl
+++ b/ws/Docbook/Preprocess/Xsl/docbookExtractFig.xsl
@@ -85,7 +85,7 @@
<xsl:text>.tex
</xsl:text>
- <xsl:result-document method="text" encoding="utf-8" href="Resources/{$fullGenerateBasename}.tex" >
+ <xsl:result-document method="text" encoding="utf-8" href="{$fullGenerateBasename}.tex" >
<xsl:text>\input{/usr/share/hdm-docbook-xsl/Preprocess/pre.tex}
\begin{mycenterframe}{</xsl:text>
<xsl:apply-templates select="." mode="object.title.markup.textonly"/>
diff --git a/ws/Docbook/Preprocess/make.image b/ws/Docbook/Preprocess/make.image
index 2de0c9f29..4b62e28f8 100644
--- a/ws/Docbook/Preprocess/make.image
+++ b/ws/Docbook/Preprocess/make.image
@@ -1,4 +1,4 @@
-include ../mediaobjects.list
+include mediaobjects.list
# image and video generating rules
--
GitLab