From 954af046f741d94e4b747f9895df05a3765d2f9f Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Wed, 26 Jul 2017 12:09:46 +0200
Subject: [PATCH] Topic generation flaw corrected, better default
---
.../CustomLayer/webhelp/positioning.css.patch | 19 +++++++++++++++----
.../Extensions/Tdata/Components/intro.xml | 15 +++------------
ws/Docbook/Extensions/Tdata/Makefile.in | 2 +-
ws/Docbook/Preprocess/make.rules | 2 +-
4 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/ws/Docbook/CustomLayer/webhelp/positioning.css.patch b/ws/Docbook/CustomLayer/webhelp/positioning.css.patch
index ae6afe469..ccdd56d21 100644
--- a/ws/Docbook/CustomLayer/webhelp/positioning.css.patch
+++ b/ws/Docbook/CustomLayer/webhelp/positioning.css.patch
@@ -1,5 +1,5 @@
---- positioning.css.orig 2017-07-25 16:30:04.625862444 +0200
-+++ positioning.css 2017-07-25 16:29:29.898388468 +0200
+--- positioning.css.orig 2017-07-26 08:31:17.880119353 +0200
++++ positioning.css 2017-07-25 17:39:11.215083986 +0200
@@ -1,3 +1,8 @@
+/*
+ * patched by: /usr/share/hdm-docbook-xsl/CustomLayer/webhelp/positioning.css.patch
@@ -9,7 +9,7 @@
tr th .added { color: #E6E6FA; }
tr th .changed {color: #99ff99; }
div.added tr, div.added { background-color: #E6E6FA; }
-@@ -328,9 +333,12 @@
+@@ -328,9 +333,16 @@
div#toolbar-left img {vertical-align: text-top;}
div.note *, div.caution *, div.important *, div.tip *, div.warning * {
@@ -20,11 +20,15 @@
+ background: var(--admonitionBackgroundColor) !important;
color: inherit !important;
- border: inherit !important;
++ border-style: solid;
++ border-color: #AAAAAA;
++ border-width: 1px;
++
+ /* border: inherit !important; */
}
#content table thead, #content table th{
-@@ -375,3 +383,102 @@
+@@ -375,3 +387,109 @@
}
@@ -43,6 +47,10 @@
+ border-radius: 10px;
+ padding: 5px;
+ background-color: var(--screenBackgroundColor);
++ border-style: solid;
++ border-color: #AAAAAA;
++ border-width: 1px;
++
+}
+
+.programlisting {
@@ -50,6 +58,9 @@
+ border-radius: 10px;
+ padding: 5px;
+ background-color: var(--programlistingBackgroundColor);
++ border-style: solid;
++ border-color: #AAAAAA;
++ border-width: 1px;
+}
+
+table {
diff --git a/ws/Docbook/Extensions/Tdata/Components/intro.xml b/ws/Docbook/Extensions/Tdata/Components/intro.xml
index 644e56fc0..19f0ef7ba 100644
--- a/ws/Docbook/Extensions/Tdata/Components/intro.xml
+++ b/ws/Docbook/Extensions/Tdata/Components/intro.xml
@@ -1,13 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<chapter annotations="slide" version="5.1" xml:id="intro"
- xmlns="http://docbook.org/ns/docbook"
- xmlns:xlink="http://www.w3.org/1999/xlink"
- xmlns:xi="http://www.w3.org/2001/XInclude"
- xmlns:svg="http://www.w3.org/2000/svg"
- xmlns:ns2="http://docbook.org/ns/docbook"
- xmlns:ns="http://docbook.org/ns/transclusion"
- xmlns:m="http://www.w3.org/1998/Math/MathML"
- xmlns:html="http://www.w3.org/1999/xhtml">
+<chapter annotations="slide" version="5.1" xml:id="intro" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:svg="http://www.w3.org/2000/svg" xmlns:ns2="http://docbook.org/ns/docbook" xmlns:ns="http://docbook.org/ns/transclusion" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:html="http://www.w3.org/1999/xhtml">
<title>Introduction</title>
<para>Some MathML:</para>
@@ -114,7 +106,7 @@
<para>Some sql code:</para>
- <programlisting language="none">SELECT * FROM Table</programlisting>
+ <programlisting language="sql">SELECT * FROM Table</programlisting>
<para>A <filename>Fig</filename> figure:</para>
@@ -148,8 +140,7 @@
</imageobject>
</mediaobject>
- <para>What about <acronym
- xlink:href="http://www.w3.org/TR/SVG">SVG</acronym>?</para>
+ <para>What about <acronym xlink:href="http://www.w3.org/TR/SVG">SVG</acronym>?</para>
<mediaobject>
<imageobject>
diff --git a/ws/Docbook/Extensions/Tdata/Makefile.in b/ws/Docbook/Extensions/Tdata/Makefile.in
index 174a1b8e2..3f86a8c38 100644
--- a/ws/Docbook/Extensions/Tdata/Makefile.in
+++ b/ws/Docbook/Extensions/Tdata/Makefile.in
@@ -2,6 +2,6 @@ SCRIPTBASENAME=fig
#localDbookXslCommonParam=draft.mode=yes
# Update Bulletin board topics
-updateTopics=no
+updateTopics=yes
include /usr/share/hdm-docbook-xsl/Preprocess/make.rules
diff --git a/ws/Docbook/Preprocess/make.rules b/ws/Docbook/Preprocess/make.rules
index 7a92c5b4e..c4f694611 100644
--- a/ws/Docbook/Preprocess/make.rules
+++ b/ws/Docbook/Preprocess/make.rules
@@ -86,7 +86,7 @@ SAXONCMD=java -cp "${DBOOK_XSL}/tools/lib/saxon9he.jar:/usr/share/java/xercesImp
-xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2docbook.xsl > ${*}.xml
${SAXONCMD} -s:$*.xml \
-xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2topics.xsl ${dbookXslWebhelpParam} > ${@D}/topics.xml
- if [ $(updateTopics) = 'yes' ]; then ${CMDID2TOPIC} ${@D}/topicsi;fi # Only basename without .xml extension
+ if [ $(updateTopics) = 'yes' ]; then ${CMDID2TOPIC} ${@D}/topics;fi # Only basename without .xml extension
${SAXONCMD} -s:$*.xml \
-xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbook2html.xsl > ${*}.html.xml
${SAXONCMD} -s:$*.xml \
--
GitLab