From 7c6812d32a9bfd0acb1efe689ef9bc0090666b1a Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Fri, 5 May 2017 13:40:31 +0200
Subject: [PATCH] Removing @fileref
---
ws/Docbook/Extensions/Tdata/Components/exampleSlides.xml | 2 +-
ws/Docbook/Extensions/Tdata/Components/intro.xml | 8 ++++----
ws/Docbook/Extensions/Tdata/Makefile | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/ws/Docbook/Extensions/Tdata/Components/exampleSlides.xml b/ws/Docbook/Extensions/Tdata/Components/exampleSlides.xml
index c1d694c08..cc6fabaa4 100644
--- a/ws/Docbook/Extensions/Tdata/Components/exampleSlides.xml
+++ b/ws/Docbook/Extensions/Tdata/Components/exampleSlides.xml
@@ -40,7 +40,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="../Ref/Fig/class.svg"/>
+ <imagedata fileref="Ref/Fig/class.svg"/>
</imageobject>
</mediaobject>
</section>
diff --git a/ws/Docbook/Extensions/Tdata/Components/intro.xml b/ws/Docbook/Extensions/Tdata/Components/intro.xml
index dcec7fbb3..96372eb89 100644
--- a/ws/Docbook/Extensions/Tdata/Components/intro.xml
+++ b/ws/Docbook/Extensions/Tdata/Components/intro.xml
@@ -132,7 +132,7 @@
<db:mediaobject>
<db:imageobject>
- <db:imagedata fileref="../Ref/Fig/carSlope.fig"/>
+ <db:imagedata fileref="Ref/Fig/carSlope.fig"/>
</db:imageobject>
</db:mediaobject>
@@ -141,7 +141,7 @@
<db:mediaobject>
<db:imageobject>
- <db:imagedata fileref="../Ref/Fig/freedocs.svg"/>
+ <db:imagedata fileref="Ref/Fig/freedocs.svg"/>
</db:imageobject>
</db:mediaobject>
@@ -149,7 +149,7 @@
<db:mediaobject>
<db:imageobject>
- <db:imagedata fileref="../../../../../Doc/Sd1/Ref/Fig/codingbatSleepExample.bmp"/>
+ <db:imagedata fileref="Ref/Fig/codingbatSleepExample.bmp"/>
</db:imageobject>
</db:mediaobject>
@@ -160,7 +160,7 @@
<db:mediaobject>
<db:imageobject>
- <db:imagedata fileref="../../../../../Doc/Sd1/Ref/Fig/hashing.svg"/>
+ <db:imagedata fileref="Ref/Fig/hashing.svg"/>
</db:imageobject>
</db:mediaobject>
</db:figure>
diff --git a/ws/Docbook/Extensions/Tdata/Makefile b/ws/Docbook/Extensions/Tdata/Makefile
index e3efe7b5d..1c50d204d 100644
--- a/ws/Docbook/Extensions/Tdata/Makefile
+++ b/ws/Docbook/Extensions/Tdata/Makefile
@@ -11,7 +11,7 @@ BUILDROOT_WEBHELP=${BUILDROOT}/webhelp
BUILDROOT_EPUB=${BUILDROOT}/epub
DBOOK=/usr/share/hdm-docbook-xsl
-DBOOK_XSL=${DBOOK}/docbook-xsl-1.79.2
+DBOOK_XSL=${DBOOK}/docbook-xsl
DBOOK_XSL_CUSTOM=${DBOOK}/CustomLayer
DBOOK_XSL_PREPROCESS=${DBOOK}/Preprocess
@@ -53,7 +53,7 @@ webhelp.base.dir=target/webhelp
DIR := ${CURDIR}
numCores=$(shell nproc --all)
-SAXONCMD=java -cp "/usr/share/hdm-docbook-xsl/docbook-xsl-1.79.2/tools/lib/saxon9he.jar:/usr/share/java/xercesImpl.jar:/usr/share/java/xslthl-2.1.3.jar" \
+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 \
--
GitLab