Skip to content
Snippets Groups Projects
Commit a0fac243 authored by Goik Martin's avatar Goik Martin
Browse files

Updating patch state

parent 03416721
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 52 additions and 270 deletions
ws/Xmlmind/Patch/010_docbookCss.patch
+ 2
− 4
View file @ a0fac243
diff -Naur xmlmind.7_4_1/addon/config/docbook/css/block1.imp xmlmind/addon/config/docbook/css/block1.imp
--- xmlmind.7_4_1/addon/config/docbook/css/block1.imp 2017-06-12 15:37:30.000000000 +0200
--- xmlmind.orig/addon/config/docbook/css/block1.imp 2017-06-12 15:37:30.000000000 +0200
+++ xmlmind/addon/config/docbook/css/block1.imp 2017-07-12 13:38:49.444807614 +0200
@@ -492,12 +492,12 @@
mathphrase,
......@@ -16,8 +15,7 @@ diff -Naur xmlmind.7_4_1/addon/config/docbook/css/block1.imp xmlmind/addon/confi
}
alt {
diff -Naur xmlmind.7_4_1/addon/config/docbook/css/inline1.imp xmlmind/addon/config/docbook/css/inline1.imp
--- xmlmind.7_4_1/addon/config/docbook/css/inline1.imp 2017-06-12 15:37:30.000000000 +0200
--- xmlmind.orig/addon/config/docbook/css/inline1.imp 2017-06-12 15:37:30.000000000 +0200
+++ xmlmind/addon/config/docbook/css/inline1.imp 2017-06-25 21:10:43.543252755 +0200
@@ -11,6 +11,22 @@
* Note that default display is inline, so there is no need to specify it.
......
ws/Xmlmind/Patch/020_excludeFromSpellCheck.patch
+ 11
− 4
View file @ a0fac243
--- xmlmind.orig/addon/config/docbook5/docbook5_support_base.incl 2015-06-09 17:12:26.000000000 +0200
+++ xmlmind/addon/config/docbook5/docbook5_support_base.incl 2015-10-16 23:31:25.235536007 +0200
--- xmlmind.orig/addon/config/docbook5/docbook5_support_base.incl 2017-05-02 11:08:16.000000000 +0200
+++ xmlmind/addon/config/docbook5/docbook5_support_base.incl 2017-07-12 11:08:17.832048391 +0200
@@ -6,6 +6,7 @@
xmlns:svg="http://www.w3.org/2000/svg"
xmlns:xi="http://www.w3.org/2001/XInclude"
......@@ -8,7 +8,15 @@
xmlns:html="http://www.w3.org/1999/xhtml">
<translation location="docbook-config:docbook_en.properties" />
@@ -70,6 +71,35 @@
@@ -54,6 +55,7 @@
db:lhs
db:literal
db:methodname
+ db:mathphrase
db:modifier
db:nonterminal
db:orgname
@@ -70,6 +72,35 @@
db:tag
db:type
db:varname
......@@ -32,7 +40,6 @@
+ db:keycode
+ db:keysym
+ db:markup
+ db:mathphrase
+ db:mousebutton
+ db:option
+ db:productnumber
......
ws/Xmlmind/Patch/030_includeUnixImageTools.patch
+ 2
− 2
View file @ a0fac243
--- xmlmind.orig/addon/config/docbook5/docbook5.xxe 2015-06-05 15:52:30.000000000 +0200
+++ xmlmind/addon/config/docbook5/docbook5.xxe 2015-10-16 23:31:25.263535581 +0200
--- xmlmind.orig/addon/config/docbook5/docbook5.xxe 2016-12-07 11:43:52.000000000 +0100
+++ xmlmind/addon/config/docbook5/docbook5.xxe 2017-06-23 08:09:25.320328614 +0200
@@ -52,4 +52,5 @@
<template name="Modular Book" location="template/V5.0/modular_book.zip" />
-->
......
ws/Xmlmind/Patch/040_hdmBusinessIntegrityRules.patch
+ 4
− 4
View file @ a0fac243
--- xmlmind.7_4_1/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 2017-06-23 08:22:14.265273054 +0200
--- xmlmind.orig/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 2017-06-23 08:25:10.698871911 +0200
@@ -244,4 +244,42 @@
<s:assert test="not(.//db:sidebar)">sidebar must not occur in the descendants of sidebar</s:assert>
</s:rule>
......@@ -45,8 +45,8 @@
+
+<!-- End Goik's additions -->
+</s:schema>
--- xmlmind.7_4_1/addon/config/docbook51/rng/V5.1/docbook.sch 2016-11-22 18:00:00.000000000 +0100
+++ xmlmind/addon/config/docbook51/rng/V5.1/docbook.sch 2017-07-14 15:04:10.283398111 +0200
--- xmlmind.orig/addon/config/docbook51/rng/V5.1/docbook.sch 2016-11-22 18:00:00.000000000 +0100
+++ xmlmind/addon/config/docbook51/rng/V5.1/docbook.sch 2017-07-20 13:22:37.938109564 +0200
@@ -196,4 +196,49 @@
<s:assert test="parent::*[@xlink:type='extended'] or parent::*[@xlink:type='locator'] or parent::*[@xlink:type='arc']">An XLink title type element must occur as the direct child of an XLink extended, locator, or arc type element.</s:assert>
</s:rule>
......
ws/Xmlmind/Patch/060_videoEmbedding.patch deleted 100644 → 0
+ 0
− 72
View file @ 03416721
--- xmlmind.orig/addon/config/docbook5/xsl/html/graphics.xsl 2013-03-17 21:08:27.000000000 +0100
+++ xmlmind/addon/config/docbook5/xsl/html/graphics.xsl 2015-10-16 23:31:25.259535639 +0200
@@ -1447,19 +1447,20 @@
</xsl:template>
<xsl:template match="d:videodata">
- <xsl:call-template name="process.image">
- <xsl:with-param name="tag" select="'embed'"/>
- <xsl:with-param name="alt">
- <xsl:choose>
- <xsl:when test="ancestor::d:mediaobject/d:alt">
- <xsl:apply-templates select="ancestor::d:mediaobject/d:alt"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates select="(ancestor::d:mediaobject/d:textobject/d:phrase)[1]"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:with-param>
- </xsl:call-template>
+ <video controls="controls" preload="auto">
+ <xsl:attribute name="title">
+ <xsl:value-of select="normalize-space(../../../d:title)"/>
+ </xsl:attribute>
+
+ <xsl:variable name="hdm_ImageFilename"> <!-- hdm_ prefix: do not mess with docbook! -->
+ <xsl:call-template name="mediaobject.filename">
+ <xsl:with-param name="object" select=".."/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <source src="{$hdm_ImageFilename}" type='video/mp4' />
+ <source src="{$hdm_ImageFilename}.ogv"/>
+ </video>
</xsl:template>
<!-- ==================================================================== -->
--- xmlmind.orig/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-10-16 23:31:25.263535581 +0200
@@ -1358,19 +1358,20 @@
</xsl:template>
<xsl:template match="d:videodata">
- <xsl:call-template name="process.image">
- <xsl:with-param name="tag" select="'embed'"/>
- <xsl:with-param name="alt">
- <xsl:choose>
- <xsl:when test="ancestor::d:mediaobject/d:alt">
- <xsl:apply-templates select="ancestor::d:mediaobject/d:alt"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:apply-templates select="(ancestor::d:mediaobject/d:textobject/d:phrase)[1]"/>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:with-param>
- </xsl:call-template>
+ <video controls="controls" preload="auto">
+ <xsl:attribute name="title">
+ <xsl:value-of select="normalize-space(../../../d:title)"/>
+ </xsl:attribute>
+
+ <xsl:variable name="hdm_ImageFilename"> <!-- hdm_ prefix: do not mess with docbook! -->
+ <xsl:call-template name="mediaobject.filename">
+ <xsl:with-param name="object" select=".."/>
+ </xsl:call-template>
+ </xsl:variable>
+
+ <source src="{$hdm_ImageFilename}" type='video/mp4' />
+ <source src="{$hdm_ImageFilename}.ogv"/>
+ </video>
</xsl:template>
<!-- ==================================================================== -->
ws/Xmlmind/Patch/070_QandaJavascriptClickOpen.patch deleted 100644 → 0
+ 0
− 37
View file @ 03416721
--- xmlmind.orig/addon/config/docbook5/xsl/html/qandaset.xsl 2013-03-17 21:08:28.000000000 +0100
+++ xmlmind/addon/config/docbook5/xsl/html/qandaset.xsl 2016-01-11 18:24:49.846635343 +0100
@@ -236,6 +236,8 @@
</xsl:if>
</td>
<td align="{$direction.align.start}" valign="top">
+ <input onclick="toggleDisplay(this)" type="button" value="+"/> <!--goik: start clickable answer modification -->
+ <div style="visibility:hidden;">
<xsl:apply-templates select="*[local-name(.) != 'label'
and local-name(.) != 'qandaentry']"/>
<!-- * handle nested answer/qandaentry instances -->
@@ -243,6 +245,7 @@
<xsl:if test="descendant::d:question">
<xsl:call-template name="process.qandaset"/>
</xsl:if>
+ </div> <!--goik: end clickable answer modification -->
</td>
</tr>
</xsl:template>
--- xmlmind.srv2/addon/config/docbook5/xsl/xhtml/qandaset.xsl 2015-12-03 23:00:13.000000000 +0100
+++ xmlmind/addon/config/docbook5/xsl/xhtml/qandaset.xsl 2016-01-11 18:34:54.826013857 +0100
@@ -223,12 +223,15 @@
</xsl:if>
</td>
<td align="{$direction.align.start}" valign="top">
+ <input onclick="toggleDisplay(this)" type="button" value="+"/> <!--goik: start clickable answer modification -->
+ <div style="visibility:hidden;">
<xsl:apply-templates select="*[local-name(.) != 'label' and local-name(.) != 'qandaentry']"/>
<!-- * handle nested answer/qandaentry instances -->
<!-- * (bug 1509043 from Daniel Leidert) -->
<xsl:if test="descendant::d:question">
<xsl:call-template name="process.qandaset"/>
</xsl:if>
+ </div> <!--goik: end clickable answer modification -->
</td>
</tr>
</xsl:template>
ws/Xmlmind/Patch/080_matmlJaxVisualization.patch deleted 100644 → 0
+ 0
− 75
View file @ 03416721
--- xxe-pro-7_1_0/addon/config/docbook5/xsl/html/docbook.xsl 2015-12-27 00:15:38.000000000 +0100
+++ xmlmind/addon/config/docbook5/xsl/html/docbook.xsl 2016-08-28 08:13:55.935543407 +0200
@@ -5,6 +5,7 @@
exclude-result-prefixes="exsl d"
version='1.0'>
+<xsl:import href="../../xslCustom/hdmextensions.xsl"/>
<xsl:output method="html"
encoding="ISO-8859-1"
indent="no"/>
--- xxe-pro-7_1_0/addon/config/docbook5/xsl/html/math.xsl 2015-12-27 00:15:38.000000000 +0100
+++ xmlmind/addon/config/docbook5/xsl/html/math.xsl 2016-08-27 07:45:09.737053052 +0200
@@ -33,10 +33,10 @@
<!-- "Support" for MathML -->
<xsl:template match="mml:*" xmlns:mml="http://www.w3.org/1998/Math/MathML">
- <xsl:copy>
+ <xsl:element name="{local-name()}">
<xsl:copy-of select="@*"/>
<xsl:apply-templates/>
- </xsl:copy>
+ </xsl:element>
</xsl:template>
<!-- Support for TeX math in alt -->
--- xxe-pro-7_1_0/addon/config/docbook5/xsl/xhtml/docbook.xsl 2015-12-27 00:15:40.000000000 +0100
+++ xmlmind/addon/config/docbook5/xsl/xhtml/docbook.xsl 2016-08-28 08:15:05.906598471 +0200
@@ -4,6 +4,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:d="http://docbook.org/ns/docbook"
xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="exsl d" version="1.0">
+<xsl:import href="../../xslCustom/hdmextensions.xsl"/>
<xsl:output method="xml" encoding="UTF-8" indent="no" doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN" doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
<!-- ********************************************************************
--- xxe-pro-7_1_0/addon/config/docbook5/xsl/xhtml/math.xsl 2015-12-27 00:15:40.000000000 +0100
+++ xmlmind/addon/config/docbook5/xsl/xhtml/math.xsl 2016-08-27 07:45:09.737053052 +0200
@@ -32,10 +32,10 @@
<!-- "Support" for MathML -->
<xsl:template match="mml:*">
- <xsl:copy>
+ <xsl:element name="{local-name()}">
<xsl:copy-of select="@*"/>
<xsl:apply-templates/>
- </xsl:copy>
+ </xsl:element>
</xsl:template>
<!-- Support for TeX math in alt -->
--- xxe-pro-7_1_0/addon/config/docbook5/xsl/xhtml-1_1/docbook.xsl 2016-01-06 16:39:30.000000000 +0100
+++ xmlmind/addon/config/docbook5/xsl/xhtml-1_1/docbook.xsl 2016-08-28 08:21:36.333331944 +0200
@@ -4,6 +4,7 @@
<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:d="http://docbook.org/ns/docbook"
xmlns:exsl="http://exslt.org/common" xmlns="http://www.w3.org/1999/xhtml" exclude-result-prefixes="exsl d" version="1.0">
+<xsl:import href="../../xslCustom/hdmextensions.xsl"/>
<xsl:output method="xml" encoding="UTF-8" indent="no" />
<!-- ********************************************************************
--- xxe-pro-7_1_0/addon/config/docbook5/xsl/xhtml-1_1/math.xsl 2015-12-27 00:15:36.000000000 +0100
+++ xmlmind/addon/config/docbook5/xsl/xhtml-1_1/math.xsl 2016-08-27 07:45:09.737053052 +0200
@@ -32,10 +32,10 @@
<!-- "Support" for MathML -->
<xsl:template match="mml:*">
- <xsl:copy>
+ <xsl:element name="{local-name()}">
<xsl:copy-of select="@*"/>
<xsl:apply-templates/>
- </xsl:copy>
+ </xsl:element>
</xsl:template>
<!-- Support for TeX math in alt -->
ws/Xmlmind/Patch/090_pdfFromFigFormat.patch deleted 100644 → 0
+ 0
− 11
View file @ 03416721
--- xmlmind.current/addon/config/docbook5/docbook5_convert_input.incl 2015-10-19 08:23:19.504848712 +0200
+++ xmlmind/addon/config/docbook5/docbook5_convert_input.incl 2015-10-19 08:58:48.341862242 +0200
@@ -181,6 +181,8 @@
copyTo="resources" referenceAs="resources/$1.$2" />
<resources include="image" match="(?:.+/)?(.+)\.tex"
copyTo="raw" referenceAs="resources/$1.%0" />
+ <resources include="image" match="(?:.+/)?(.+)\.fig"
+ copyTo="raw" referenceAs="resources/$1.pdf" />
<resources include="image" match="(?:.+/)?(.+)\.(\w+)"
copyTo="raw" referenceAs="resources/$1.png" />
ws/Xmlmind/Patch/100_pdfXepMathml.patch deleted 100644 → 0
+ 0
− 39
View file @ 03416721
--- xmlmind.current/addon/config/docbook5/docbook5_convert_input.incl 2015-10-21 13:25:42.153070334 +0200
+++ xmlmind/addon/config/docbook5/docbook5_convert_input.incl 2015-10-21 16:20:04.689346622 +0200
@@ -170,15 +170,24 @@
xpath="//db5:imagedata/mml:math" toDir="resources" >
<cfg:attribute name="fileref" value="{$url}" />
</cfg:extract>
-
+ <cfg:extract xmlns=""
+ xmlns:db5="http://docbook.org/ns/docbook"
+ xmlns:mml="http://www.w3.org/1998/Math/MathML"
+ xpath="//db5:equation/mml:math |
+ //db5:informalequation/mml:math |
+ //db5:inlineequation/mml:math" toDir="raw" >
+ <db5:imagedata fileref="resources/{$url.rootName}.svg" />
+ </cfg:extract>
<resources match="^[a-zA-Z][a-zA-Z0-9.+-]*:/.+" />
<resources include="text" match=".+"
resolve="true" />
<resources include="image"
- match="(?:.+/)?(.+)\.(png|jpg|jpeg|gif|mml|svg|svgz%1)"
+ match="(?:.+/)?(.+)\.(png|jpg|jpeg|gif|svg|svgz%1)"
copyTo="resources" referenceAs="resources/$1.$2" />
+ <resources match="(?:.+/)?(.+)\.mml"
+ copyTo="raw" referenceAs="%w/resources/$1.svg" />
<resources include="image" match="(?:.+/)?(.+)\.tex"
copyTo="raw" referenceAs="resources/$1.%0" />
<resources include="image" match="(?:.+/)?(.+)\.fig"
@@ -190,7 +199,8 @@
copyTo="resources" />
</copyDocument>
- <convertImage from="raw" to="resources" format="%0 png" />
+ <convertImage from="raw/*.mml" to="resources" format="svg" />
+ <convertImage from="raw" skip="mml" to="resources" format="%0 png" />
</process>
</command>
ws/Xmlmind/Patch/110_googleapisHttps.patch deleted 100644 → 0
+ 0
− 22
View file @ 03416721
diff -Naur xmlmind_7.0.0_plugins/addon/config/common/whc/whc_template/page.html xmlmind/addon/config/common/whc/whc_template/page.html
--- xmlmind_7.0.0_plugins/addon/config/common/whc/whc_template/page.html 2016-07-25 08:41:08.854555826 +0200
+++ xmlmind/addon/config/common/whc/whc_template/page.html 2016-07-25 09:13:41.174255676 +0200
@@ -31,15 +31,15 @@
<title>Page</title>
- <link href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.css"
+ <link href="/ajax/libs/jqueryui/1.11.4/themes/smoothness/jquery-ui.css"
rel="stylesheet" type="text/css" id="wh-jquery-css" />
<link href="_wh/wh.css"
rel="stylesheet" type="text/css" />
- <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.2/jquery.min.js"
+ <script src="/ajax/libs/jquery/1.12.0/jquery.min.js"
type="text/javascript" id="wh-jquery">
</script>
- <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"
+ <script src="/ajax/libs/jqueryui/1.11.4/jquery-ui.min.js"
type="text/javascript" id="wh-jquery-ui">
</script>
<script src="_wh/wh.min.js"
ws/Xmlmind/Patch/create.sh 0 → 100755
+ 33
− 0
View file @ a0fac243
#!/bin/sh
cd /usr/share
#CSS
#
# Mathphrase
diff -Naur xmlmind.orig/addon/config/docbook/css/block1.imp xmlmind/addon/config/docbook/css/block1.imp > \
~/workspace/GoikLectures/ws/Xmlmind/Patch/010_docbookCss.patch
# Blue links
diff -Naur xmlmind.orig/addon/config/docbook/css/inline1.imp xmlmind/addon/config/docbook/css/inline1.imp >> \
~/workspace/GoikLectures/ws/Xmlmind/Patch/010_docbookCss.patch
# Spell check
diff -Naur xmlmind.orig/addon/config/docbook5/docbook5_support_base.incl xmlmind/addon/config/docbook5/docbook5_support_base.incl > \
~/workspace/GoikLectures/ws/Xmlmind/Patch/020_excludeFromSpellCheck.patch
# UNIX graphics tools
diff -Naur xmlmind.orig/addon/config/docbook5/docbook5.xxe xmlmind/addon/config/docbook5/docbook5.xxe > \
~/workspace/GoikLectures/ws/Xmlmind/Patch/030_includeUnixImageTools.patch
# HdM Dbook 5.0 and 5.1 extra business integrity rules
#
# Docbook 5.0
diff -Naur xmlmind.orig/addon/config/docbook5/rng/V5.0/docbook.sch xmlmind/addon/config/docbook5/rng/V5.0/docbook.sch > \
~/workspace/GoikLectures/ws/Xmlmind/Patch/040_hdmBusinessIntegrityRules.patch
# Docbook 5.1
diff -Naur xmlmind.orig/addon/config/docbook51/rng/V5.1/docbook.sch xmlmind/addon/config/docbook51/rng/V5.1/docbook.sch >> \
~/workspace/GoikLectures/ws/Xmlmind/Patch/040_hdmBusinessIntegrityRules.patch
#end
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment