diff --git a/ws/Docbook/Extensions/Xmlmind/stock2mi.patch b/ws/Docbook/Extensions/Xmlmind/stock2mi.patch
index 42e7f54afd68e09901dfdd6e5837cae41519ea2d..d9817beb56ee9bc1566e1e4436741e7fa162873d 100644
--- a/ws/Docbook/Extensions/Xmlmind/stock2mi.patch
+++ b/ws/Docbook/Extensions/Xmlmind/stock2mi.patch
@@ -1,6 +1,6 @@
diff -Naur xmlmind-6.2.addons/addon/config/docbook/css/inline1.imp xmlmind/addon/config/docbook/css/inline1.imp
--- xmlmind-6.2.addons/addon/config/docbook/css/inline1.imp 2014-03-17 12:50:24.000000000 +0100
-+++ xmlmind/addon/config/docbook/css/inline1.imp 2015-02-02 14:55:01.064205760 +0100
++++ xmlmind/addon/config/docbook/css/inline1.imp 2015-02-02 14:55:01.000000000 +0100
@@ -11,6 +11,15 @@
* Note that default display is inline, so there is no need to specify it.
*/
@@ -19,7 +19,7 @@ diff -Naur xmlmind-6.2.addons/addon/config/docbook/css/inline1.imp xmlmind/addon
}
diff -Naur xmlmind-6.2.addons/addon/config/docbook5/docbook5_support_base.incl xmlmind/addon/config/docbook5/docbook5_support_base.incl
--- xmlmind-6.2.addons/addon/config/docbook5/docbook5_support_base.incl 2014-12-29 16:46:37.000000000 +0100
-+++ xmlmind/addon/config/docbook5/docbook5_support_base.incl 2015-02-02 12:10:21.193419558 +0100
++++ xmlmind/addon/config/docbook5/docbook5_support_base.incl 2015-02-02 12:10:21.000000000 +0100
@@ -6,6 +6,7 @@
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:xi="http://www.w3.org/2001/XInclude"
@@ -32,9 +32,9 @@ diff -Naur xmlmind-6.2.addons/addon/config/docbook5/docbook5_support_base.incl x
db:tag
db:type
db:varname
-+ mml:math
+ db:abbrev
+ db:accel
++ mml:math
+ db:acronym
+ db:application
+ db:command
@@ -66,7 +66,7 @@ diff -Naur xmlmind-6.2.addons/addon/config/docbook5/docbook5_support_base.incl x
<attributeVisibility>
diff -Naur xmlmind-6.2.addons/addon/config/docbook5/docbook5.xxe xmlmind/addon/config/docbook5/docbook5.xxe
--- xmlmind-6.2.addons/addon/config/docbook5/docbook5.xxe 2014-03-07 12:10:44.000000000 +0100
-+++ xmlmind/addon/config/docbook5/docbook5.xxe 2015-02-02 11:54:10.228260710 +0100
++++ xmlmind/addon/config/docbook5/docbook5.xxe 2015-02-02 11:54:10.000000000 +0100
@@ -50,4 +50,5 @@
<template name="Modular Book" location="template/V5.0/modular_book.zip" />
-->
@@ -75,7 +75,7 @@ diff -Naur xmlmind-6.2.addons/addon/config/docbook5/docbook5.xxe xmlmind/addon/c
</configuration>
diff -Naur xmlmind-6.2.addons/addon/config/docbook5/rng/V5.0/docbook.sch xmlmind/addon/config/docbook5/rng/V5.0/docbook.sch
--- xmlmind-6.2.addons/addon/config/docbook5/rng/V5.0/docbook.sch 2008-05-09 09:09:10.000000000 +0200
-+++ xmlmind/addon/config/docbook5/rng/V5.0/docbook.sch 2015-02-02 11:47:18.019678759 +0100
++++ xmlmind/addon/config/docbook5/rng/V5.0/docbook.sch 2015-02-02 11:47:18.000000000 +0100
@@ -244,4 +244,36 @@
<s:assert test="not(.//db:sidebar)">sidebar must not occur in the descendants of sidebar</s:assert>
</s:rule>
@@ -117,8 +117,8 @@ diff -Naur xmlmind-6.2.addons/addon/config/docbook5/rng/V5.0/docbook.sch xmlmind
+</s:schema>
diff -Naur xmlmind-6.2.addons/addon/config/docbook5/xsl/common/hdmextensions.xsl xmlmind/addon/config/docbook5/xsl/common/hdmextensions.xsl
--- xmlmind-6.2.addons/addon/config/docbook5/xsl/common/hdmextensions.xsl 1970-01-01 01:00:00.000000000 +0100
-+++ xmlmind/addon/config/docbook5/xsl/common/hdmextensions.xsl 2015-02-02 12:15:53.976230373 +0100
-@@ -0,0 +1,83 @@
++++ xmlmind/addon/config/docbook5/xsl/common/hdmextensions.xsl 2015-02-11 11:28:45.000000000 +0100
+@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+ xmlns:d="http://docbook.org/ns/docbook"
@@ -148,10 +148,18 @@ diff -Naur xmlmind-6.2.addons/addon/config/docbook5/xsl/common/hdmextensions.xsl
+ </xsl:call-template>
+ </xsl:variable>
+
++ <xsl:variable name="moduleBaseName">
++ <xsl:call-template name="hdm.get.leftmost.of.seperator">
++ <xsl:with-param name="path" select="ancestor::*/@xml:base"/>
++ <xsl:with-param name="seperator" select="'/'"/>
++ </xsl:call-template>
++ </xsl:variable>
+
+ <xsl:variable name="fullGenerateBasename" >
+ <xsl:value-of select="$dirPath"/>
+ <xsl:text>/Generate/</xsl:text>
++ <xsl:value-of select="$moduleBaseName"/>
++ <xsl:text>/</xsl:text>
+ <xsl:value-of select="$fileBaseName"/>
+ </xsl:variable>
+
@@ -202,10 +210,9 @@ diff -Naur xmlmind-6.2.addons/addon/config/docbook5/xsl/common/hdmextensions.xsl
+ </xsl:template>
+
+</xsl:stylesheet>
-\ No newline at end of file
diff -Naur xmlmind-6.2.addons/addon/config/docbook5/xsl/eclipse/eclipse.xsl xmlmind/addon/config/docbook5/xsl/eclipse/eclipse.xsl
--- xmlmind-6.2.addons/addon/config/docbook5/xsl/eclipse/eclipse.xsl 2013-03-17 21:08:23.000000000 +0100
-+++ xmlmind/addon/config/docbook5/xsl/eclipse/eclipse.xsl 2015-02-02 12:17:54.892892829 +0100
++++ xmlmind/addon/config/docbook5/xsl/eclipse/eclipse.xsl 2015-02-02 12:17:54.000000000 +0100
@@ -7,7 +7,7 @@
version="1.0"
exclude-result-prefixes="exsl db ng d">
@@ -217,7 +224,7 @@ diff -Naur xmlmind-6.2.addons/addon/config/docbook5/xsl/eclipse/eclipse.xsl xmlm
$Id: eclipse.xsl 9149 2011-11-12 00:12:07Z bobstayton $
diff -Naur xmlmind-6.2.addons/addon/config/docbook5/xsl/html/formal.xsl xmlmind/addon/config/docbook5/xsl/html/formal.xsl
--- xmlmind-6.2.addons/addon/config/docbook5/xsl/html/formal.xsl 2013-03-17 21:08:27.000000000 +0100
-+++ xmlmind/addon/config/docbook5/xsl/html/formal.xsl 2015-02-02 12:25:55.175630021 +0100
++++ xmlmind/addon/config/docbook5/xsl/html/formal.xsl 2015-02-02 12:25:55.000000000 +0100
@@ -13,7 +13,7 @@
copyright and other information.
@@ -237,7 +244,7 @@ diff -Naur xmlmind-6.2.addons/addon/config/docbook5/xsl/html/formal.xsl xmlmind/
concat(local-name(.), ' '))"/>
diff -Naur xmlmind-6.2.addons/addon/config/docbook5/xsl/html/graphics.xsl xmlmind/addon/config/docbook5/xsl/html/graphics.xsl
--- xmlmind-6.2.addons/addon/config/docbook5/xsl/html/graphics.xsl 2013-03-17 21:08:27.000000000 +0100
-+++ xmlmind/addon/config/docbook5/xsl/html/graphics.xsl 2015-02-02 12:43:41.382142939 +0100
++++ xmlmind/addon/config/docbook5/xsl/html/graphics.xsl 2015-02-02 12:43:41.000000000 +0100
@@ -1447,19 +1447,20 @@
</xsl:template>
@@ -274,7 +281,7 @@ diff -Naur xmlmind-6.2.addons/addon/config/docbook5/xsl/html/graphics.xsl xmlmin
<!-- ==================================================================== -->
diff -Naur xmlmind-6.2.addons/addon/config/docbook5/xsl/xhtml-1_1/formal.xsl xmlmind/addon/config/docbook5/xsl/xhtml-1_1/formal.xsl
--- xmlmind-6.2.addons/addon/config/docbook5/xsl/xhtml-1_1/formal.xsl 2013-03-17 21:08:24.000000000 +0100
-+++ xmlmind/addon/config/docbook5/xsl/xhtml-1_1/formal.xsl 2015-02-02 12:49:21.736737321 +0100
++++ xmlmind/addon/config/docbook5/xsl/xhtml-1_1/formal.xsl 2015-02-02 12:49:21.000000000 +0100
@@ -15,6 +15,7 @@
******************************************************************** -->
@@ -293,7 +300,7 @@ diff -Naur xmlmind-6.2.addons/addon/config/docbook5/xsl/xhtml-1_1/formal.xsl xml
<xsl:variable name="placement">
diff -Naur xmlmind-6.2.addons/addon/config/docbook5/xsl/xhtml-1_1/graphics.xsl xmlmind/addon/config/docbook5/xsl/xhtml-1_1/graphics.xsl
--- xmlmind-6.2.addons/addon/config/docbook5/xsl/xhtml-1_1/graphics.xsl 2013-03-24 11:54:01.000000000 +0100
-+++ xmlmind/addon/config/docbook5/xsl/xhtml-1_1/graphics.xsl 2015-02-02 12:52:46.855070196 +0100
++++ xmlmind/addon/config/docbook5/xsl/xhtml-1_1/graphics.xsl 2015-02-02 12:52:46.000000000 +0100
@@ -1358,19 +1358,20 @@
</xsl:template>
@@ -330,7 +337,7 @@ diff -Naur xmlmind-6.2.addons/addon/config/docbook5/xsl/xhtml-1_1/graphics.xsl x
<!-- ==================================================================== -->
diff -Naur xmlmind-6.2.addons/addon/config/docbook5/xsl/xhtml-1_1/qandaset.xsl xmlmind/addon/config/docbook5/xsl/xhtml-1_1/qandaset.xsl
--- xmlmind-6.2.addons/addon/config/docbook5/xsl/xhtml-1_1/qandaset.xsl 2013-03-17 21:08:23.000000000 +0100
-+++ xmlmind/addon/config/docbook5/xsl/xhtml-1_1/qandaset.xsl 2015-02-02 14:42:40.316709717 +0100
++++ xmlmind/addon/config/docbook5/xsl/xhtml-1_1/qandaset.xsl 2015-02-02 14:42:40.000000000 +0100
@@ -223,12 +223,34 @@
</xsl:if>
</td>
@@ -368,7 +375,7 @@ diff -Naur xmlmind-6.2.addons/addon/config/docbook5/xsl/xhtml-1_1/qandaset.xsl x
</xsl:template>
diff -Naur xmlmind-6.2.addons/addon/config/docbook5/xslMenu.incl xmlmind/addon/config/docbook5/xslMenu.incl
--- xmlmind-6.2.addons/addon/config/docbook5/xslMenu.incl 2014-05-06 16:03:45.000000000 +0200
-+++ xmlmind/addon/config/docbook5/xslMenu.incl 2015-02-02 11:58:00.817880833 +0100
++++ xmlmind/addon/config/docbook5/xslMenu.incl 2015-02-02 11:58:00.000000000 +0100
@@ -917,9 +917,23 @@
xpath="//db5:imagedata/mml:math" toDir="resources" >
<cfg:attribute name="fileref" value="{$url}" />
@@ -1586,7 +1593,7 @@ diff -Naur xmlmind-6.2.addons/addon/config/unix/imagetoolkits.incl xmlmind/addon
+</configuration>
diff -Naur xmlmind-6.2.addons/xmlmind.files xmlmind/xmlmind.files
--- xmlmind-6.2.addons/xmlmind.files 1970-01-01 01:00:00.000000000 +0100
-+++ xmlmind/xmlmind.files 2015-02-02 14:43:59.702512023 +0100
++++ xmlmind/xmlmind.files 2015-02-02 14:43:59.000000000 +0100
@@ -0,0 +1,14 @@
+/usr/bin/xxe
+/usr/bin/createTexModifier.sh