From 87b3035577b03e3b7e009a0ebdf19c06bc8d0992 Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Sun, 17 Jul 2022 19:43:27 +0200
Subject: [PATCH] No calloutlist in mediaobject for keeping XsltNG happy
---
Doc/Sd1/gettingStarted.xml | 264 +++++++++---------
Doc/Sd1/objectsClasses.xml | 28 +-
Doc/Tdoc/general.xml | 24 +-
.../Tdata/Common/Components/exampleSlides.xml | 20 +-
ws/Docbook/Preprocess/make.rules | 2 +-
5 files changed, 166 insertions(+), 172 deletions(-)
diff --git a/Doc/Sd1/gettingStarted.xml b/Doc/Sd1/gettingStarted.xml
index aea3210fb..3bb5945c9 100644
--- a/Doc/Sd1/gettingStarted.xml
+++ b/Doc/Sd1/gettingStarted.xml
@@ -2873,18 +2873,18 @@ Generating /ma/goik/First/target/site/apidocs/help-doc.html...
<imageobject>
<imagedata fileref="Ref/Fig/NewProjectMavenIntellij/miMavenRepoUri.svg.marked.svg"/>
</imageobject>
-
- <calloutlist role="slideExclude">
- <callout arearefs="sd1_fig_mavenIdeaMiArchetypeRepo_co_10"
- xml:id="sd1_fig_mavenIdeaMiArchetypeRepo-1">
- <para>You may want to copy the archetype URI below:</para>
-
- <para><uri
- xlink:href="https://maven.mi.hdm-stuttgart.de/nexus/repository/mi-maven/archetype-catalog.xml">https://maven.mi.hdm-stuttgart.de/nexus/repository/mi-maven/archetype-catalog.xml</uri></para>
- </callout>
- </calloutlist>
</imageobjectco>
</mediaobject>
+
+ <calloutlist role="slideExclude">
+ <callout arearefs="sd1_fig_mavenIdeaMiArchetypeRepo_co_10"
+ xml:id="sd1_fig_mavenIdeaMiArchetypeRepo-1">
+ <para>You may want to copy the archetype URI below:</para>
+
+ <para><uri
+ xlink:href="https://maven.mi.hdm-stuttgart.de/nexus/repository/mi-maven/archetype-catalog.xml">https://maven.mi.hdm-stuttgart.de/nexus/repository/mi-maven/archetype-catalog.xml</uri></para>
+ </callout>
+ </calloutlist>
</figure>
<figure xml:id="sd1_fig_mavenIdeaMiArchetypeNewProject">
@@ -2923,60 +2923,60 @@ Generating /ma/goik/First/target/site/apidocs/help-doc.html...
<imageobject>
<imagedata fileref="Ref/Fig/NewProjectMavenIntellij/s200_selectMavenArchetype.png.marked.svg"/>
</imageobject>
+ </imageobjectco>
+ </mediaobject>
- <calloutlist role="slideExclude">
- <callout arearefs="sd1_fig_mavenIdeaDefineProjectMetadata-1-co"
- xml:id="sd1_fig_mavenIdeaDefineProjectMetadata-1.2">
- <para><xref linkend="glo_Soft_IntellijIDEA"/> project type
- <xref linkend="glo_Maven"/>.</para>
- </callout>
+ <calloutlist role="slideExclude">
+ <callout arearefs="sd1_fig_mavenIdeaDefineProjectMetadata-1-co"
+ xml:id="sd1_fig_mavenIdeaDefineProjectMetadata-1.2">
+ <para><xref linkend="glo_Soft_IntellijIDEA"/> project type <xref
+ linkend="glo_Maven"/>.</para>
+ </callout>
- <callout arearefs="sd1_fig_mavenIdeaDefineProjectMetadata-2-co"
- xml:id="sd1_fig_mavenIdeaDefineProjectMetadata-2.2">
- <para>Tick the <option>Create from archetype</option>
- option.</para>
- </callout>
+ <callout arearefs="sd1_fig_mavenIdeaDefineProjectMetadata-2-co"
+ xml:id="sd1_fig_mavenIdeaDefineProjectMetadata-2.2">
+ <para>Tick the <option>Create from archetype</option>
+ option.</para>
+ </callout>
- <callout arearefs="sd1_fig_mavenIdeaDefineProjectMetadata-3-co"
- xml:id="sd1_fig_mavenIdeaDefineProjectMetadata-3.2">
- <para>Choose <property>archetypeGroupId</property>:
- <option>de.hdm_stuttgart.mi</option>.</para>
+ <callout arearefs="sd1_fig_mavenIdeaDefineProjectMetadata-3-co"
+ xml:id="sd1_fig_mavenIdeaDefineProjectMetadata-3.2">
+ <para>Choose <property>archetypeGroupId</property>:
+ <option>de.hdm_stuttgart.mi</option>.</para>
+
+ <caution>
+ <para>Mind the underscore <quote>_</quote>! Do not use a dash
+ (-) as in the corresponding <uri>mi.hdm<emphasis
+ role="red">-</emphasis>stuttgart.de</uri> URL. Doing so would
+ mess with <xref linkend="glo_Java"/>'s minus operator when it
+ comes to package names.</para>
+ </caution>
+ </callout>
- <caution>
- <para>Mind the underscore <quote>_</quote>! Do not use a
- dash (-) as in the corresponding <uri>mi.hdm<emphasis
- role="red">-</emphasis>stuttgart.de</uri> URL. Doing so
- would mess with <xref linkend="glo_Java"/>'s minus operator
- when it comes to package names.</para>
- </caution>
- </callout>
-
- <callout arearefs="sd1_fig_mavenIdeaDefineProjectMetadata-4-co"
- xml:id="sd1_fig_mavenIdeaDefineProjectMetadata-4">
- <para>Within given <property>archetypeGroupId</property>
- choose archetype identified by its unique values:</para>
-
- <itemizedlist>
- <listitem>
- <para><property>archetypeArtifactId</property>:
- <option>mi-maven-archetype-helloworld</option></para>
- </listitem>
-
- <listitem>
- <para><property>archetypeVersion</property>:
- <option>1.4</option> (does not match screenshot value
- 1.1)</para>
- </listitem>
- </itemizedlist>
-
- <note>
- <para>Multiple archetypes of different versions may show up
- here.</para>
- </note>
- </callout>
- </calloutlist>
- </imageobjectco>
- </mediaobject>
+ <callout arearefs="sd1_fig_mavenIdeaDefineProjectMetadata-4-co"
+ xml:id="sd1_fig_mavenIdeaDefineProjectMetadata-4">
+ <para>Within given <property>archetypeGroupId</property> choose
+ archetype identified by its unique values:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para><property>archetypeArtifactId</property>:
+ <option>mi-maven-archetype-helloworld</option></para>
+ </listitem>
+
+ <listitem>
+ <para><property>archetypeVersion</property>:
+ <option>1.4</option> (does not match screenshot value
+ 1.1)</para>
+ </listitem>
+ </itemizedlist>
+
+ <note>
+ <para>Multiple archetypes of different versions may show up
+ here.</para>
+ </note>
+ </callout>
+ </calloutlist>
</figure>
<figure xml:id="sd1_fig_mavenIdeaDefineProjectMetadata">
@@ -3001,47 +3001,44 @@ Generating /ma/goik/First/target/site/apidocs/help-doc.html...
<imageobject>
<imagedata fileref="Ref/Fig/NewProjectMavenIntellij/s300_groupArtifactID.png.marked.svg"/>
</imageobject>
-
- <calloutlist role="slideExclude">
- <callout arearefs="__area-tzqxp6"
- xml:id="sd1_fig_mavenIdeaDefineProjectMetadata-1">
- <para><property>GroupID</property>: Typically your
- organisation's (<abbrev>e.g.</abbrev> company's) reverse
- domain name.</para>
-
- <note>
- <para>This avoids name clashes between different
- organisations.</para>
- </note>
- </callout>
-
- <callout arearefs="__area-kleqi6"
- xml:id="sd1_fig_mavenIdeaDefineProjectMetadata-2">
- <para><property>ArtifactID</property>: Your project's name
- being unique within your organisation e.g.
- <option>musicarchiver</option>.</para>
-
- <note>
- <para>This avoids name clashes within your
- organisation.</para>
- </note>
- </callout>
-
- <callout arearefs="__area-3qsv1b"
- xml:id="sd1_fig_mavenIdeaDefineProjectMetadata-3">
- <para><property>Version</property>: Your project's
- version.</para>
-
- <note>
- <para>With respect to professional software development you
- may want to ship (and sell!) different versions to your
- customers. This property allows for distinguishing
- respective software version states.</para>
- </note>
- </callout>
- </calloutlist>
</imageobjectco>
</mediaobject>
+
+ <calloutlist role="slideExclude">
+ <callout arearefs="__area-tzqxp6"
+ xml:id="sd1_fig_mavenIdeaDefineProjectMetadata-1">
+ <para><property>GroupID</property>: Typically your organisation's
+ (<abbrev>e.g.</abbrev> company's) reverse domain name.</para>
+
+ <note>
+ <para>This avoids name clashes between different
+ organisations.</para>
+ </note>
+ </callout>
+
+ <callout arearefs="__area-kleqi6"
+ xml:id="sd1_fig_mavenIdeaDefineProjectMetadata-2">
+ <para><property>ArtifactID</property>: Your project's name being
+ unique within your organisation e.g.
+ <option>musicarchiver</option>.</para>
+
+ <note>
+ <para>This avoids name clashes within your organisation.</para>
+ </note>
+ </callout>
+
+ <callout arearefs="__area-3qsv1b"
+ xml:id="sd1_fig_mavenIdeaDefineProjectMetadata-3">
+ <para><property>Version</property>: Your project's version.</para>
+
+ <note>
+ <para>With respect to professional software development you may
+ want to ship (and sell!) different versions to your customers.
+ This property allows for distinguishing respective software
+ version states.</para>
+ </note>
+ </callout>
+ </calloutlist>
</figure>
<figure xml:id="sd1_fig_mavenIdeaProjectRoot">
@@ -3062,42 +3059,41 @@ Generating /ma/goik/First/target/site/apidocs/help-doc.html...
<imageobject>
<imagedata fileref="Ref/Fig/NewProjectMavenIntellij/s400_projectRoot.png.marked.svg"/>
</imageobject>
-
- <calloutlist role="slideExclude">
- <callout arearefs="__area-t5ostd"
- xml:id="sd1_fig_mavenIdeaProjectRoot-1">
- <para>Your project's name. Should resemble your <xref
- linkend="glo_Maven"/> <property>ArtifactID</property>
- value.</para>
- </callout>
-
- <callout arearefs="__area-53fksd"
- xml:id="sd1_fig_mavenIdeaProjectRoot-2">
- <para>Your project's physical location within your
- workstation's file storage.</para>
-
- <tip>
- <para>You may want to work on your projects at different
- systems (e.g. MI pool, your laptop) and / or share your code
- with others. Options:</para>
-
- <itemizedlist>
- <listitem>
- <para>Use a cloud folder being synchronized to a central
- storage like <xref
- linkend="sd1_fig_text_MiCloud"/>.</para>
- </listitem>
-
- <listitem>
- <para>Use a version control system like <xref
- linkend="sd1_fig_text_MiGitSvnServer"/>.</para>
- </listitem>
- </itemizedlist>
- </tip>
- </callout>
- </calloutlist>
</imageobjectco>
</mediaobject>
+
+ <calloutlist role="slideExclude">
+ <callout arearefs="__area-t5ostd"
+ xml:id="sd1_fig_mavenIdeaProjectRoot-1">
+ <para>Your project's name. Should resemble your <xref
+ linkend="glo_Maven"/> <property>ArtifactID</property>
+ value.</para>
+ </callout>
+
+ <callout arearefs="__area-53fksd"
+ xml:id="sd1_fig_mavenIdeaProjectRoot-2">
+ <para>Your project's physical location within your workstation's
+ file storage.</para>
+
+ <tip>
+ <para>You may want to work on your projects at different systems
+ (e.g. MI pool, your laptop) and / or share your code with
+ others. Options:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Use a cloud folder being synchronized to a central
+ storage like <xref linkend="sd1_fig_text_MiCloud"/>.</para>
+ </listitem>
+
+ <listitem>
+ <para>Use a version control system like <xref
+ linkend="sd1_fig_text_MiGitSvnServer"/>.</para>
+ </listitem>
+ </itemizedlist>
+ </tip>
+ </callout>
+ </calloutlist>
</figure>
<figure xml:id="sd1_fig_mavenIdeaPomAutoImport">
@@ -3170,7 +3166,7 @@ Generating /ma/goik/First/target/site/apidocs/help-doc.html...
<listitem>
<para>E-Exam 113105 <foreignphrase
xml:lang="de">Softwareentwicklung</foreignphrase> 1 Test / Network
- blocked: </para>
+ blocked:</para>
<para>This installation closely resembles the real examination
environment: Local firewall rules restrict internet access to a
diff --git a/Doc/Sd1/objectsClasses.xml b/Doc/Sd1/objectsClasses.xml
index bdcc7db4f..296abcd21 100644
--- a/Doc/Sd1/objectsClasses.xml
+++ b/Doc/Sd1/objectsClasses.xml
@@ -502,22 +502,22 @@ public class Q {
<imageobject>
<imagedata fileref="Ref/ObjectsAndClasses/packageToDirectory.png.marked.svg"/>
</imageobject>
-
- <calloutlist role="slideExclude">
- <callout arearefs="sd1_imagemap_package2directory-2-co"
- xml:id="sd1_imagemap_package2directory-2.2">
- <para>A class Print defined in package
- <package>my.first.javapackage</package>.</para>
- </callout>
-
- <callout arearefs="sd1_imagemap_package2directory-1-co"
- xml:id="sd1_imagemap_package2directory-1.2">
- <para role="slideExclude">Generated byte code in corresponding
- directory hierarchy.</para>
- </callout>
- </calloutlist>
</imageobjectco>
</mediaobject>
+
+ <calloutlist role="slideExclude">
+ <callout arearefs="sd1_imagemap_package2directory-2-co"
+ xml:id="sd1_imagemap_package2directory-2.2">
+ <para>A class Print defined in package
+ <package>my.first.javapackage</package>.</para>
+ </callout>
+
+ <callout arearefs="sd1_imagemap_package2directory-1-co"
+ xml:id="sd1_imagemap_package2directory-1.2">
+ <para role="slideExclude">Generated byte code in corresponding
+ directory hierarchy.</para>
+ </callout>
+ </calloutlist>
</figure>
<figure xml:id="sd1_fig_package2directorySourceView">
diff --git a/Doc/Tdoc/general.xml b/Doc/Tdoc/general.xml
index 5f1eab538..fdc13d301 100644
--- a/Doc/Tdoc/general.xml
+++ b/Doc/Tdoc/general.xml
@@ -2011,20 +2011,18 @@ See remark at page 1.</literallayout></td>
<imageobject>
<imagedata fileref="Ref/Docbook/recumbent.png.marked.svg"/>
</imageobject>
-
- <calloutlist>
- <callout arearefs="fig_imagemapCallout_seat"
- xml:id="fig_imagemapCallout_calloutSeat">
- <para>Seat</para>
- </callout>
-
- <callout arearefs="fig_imagemapCallout_valveFront fig_imagemapCallout_valveBack"
- xml:id="fig_imagemapCallout_calloutValve">
- <para>Valves</para>
- </callout>
- </calloutlist>
</imageobjectco>
- </mediaobject></td>
+ </mediaobject><calloutlist>
+ <callout arearefs="fig_imagemapCallout_seat"
+ xml:id="fig_imagemapCallout_calloutSeat">
+ <para>Seat</para>
+ </callout>
+
+ <callout arearefs="fig_imagemapCallout_valveFront fig_imagemapCallout_valveBack"
+ xml:id="fig_imagemapCallout_calloutValve">
+ <para>Valves</para>
+ </callout>
+ </calloutlist></td>
<td valign="top"><programlisting language="xml"><mediaobject>
<imageobjectco>
diff --git a/ws/Docbook/Extensions/Tdata/Common/Components/exampleSlides.xml b/ws/Docbook/Extensions/Tdata/Common/Components/exampleSlides.xml
index d191d08ec..e933f832e 100644
--- a/ws/Docbook/Extensions/Tdata/Common/Components/exampleSlides.xml
+++ b/ws/Docbook/Extensions/Tdata/Common/Components/exampleSlides.xml
@@ -231,18 +231,18 @@ drwxr-xr-x 100 goik fb1prof 12288 Jul 13 07:43 ..
<imageobject>
<imagedata fileref="Ref/Fig/recumbent.png.marked.svg"/>
</imageobject>
-
- <calloutlist>
- <callout arearefs="seat" xml:id="calloutSeat">
- <para>Seat</para>
- </callout>
-
- <callout arearefs="valveFront valveBack" xml:id="calloutValve">
- <para>Valves</para>
- </callout>
- </calloutlist>
</imageobjectco>
</mediaobject>
+
+ <calloutlist>
+ <callout arearefs="seat" xml:id="calloutSeat">
+ <para>Seat</para>
+ </callout>
+
+ <callout arearefs="valveFront valveBack" xml:id="calloutValve">
+ <para>Valves</para>
+ </callout>
+ </calloutlist>
</figure>
</section>
diff --git a/ws/Docbook/Preprocess/make.rules b/ws/Docbook/Preprocess/make.rules
index fc20ead7b..bebbfe4fb 100644
--- a/ws/Docbook/Preprocess/make.rules
+++ b/ws/Docbook/Preprocess/make.rules
@@ -110,7 +110,7 @@ SAXONCMD=java -cp "${DBOOK_XSL}/tools/lib/saxon9he.jar:/usr/share/java/xercesImp
tar cv- `find . -name Ref -and -type d|grep -v ^\./target`|tar -x -C $(@D) || echo
cd $(@D); ${SAXONCMD} -s:$(<F) -xsl:${DBOOK_XSL_PREPROCESS}/Xsl/docbookExtractFig.xsl
cp -f ${DBOOK_XSL_PREPROCESS}/make.image ${DBOOK_XSL_PREPROCESS}/docbooksupplement.js $(@D)
- cd $(@D); $(MAKE) -j ${numCores} -f make.image;# rm -rf `find . -name Generate`
+# cd $(@D); $(MAKE) -j ${numCores} -f make.image;# rm -rf `find . -name Generate`
# Webhelp and indexing
%.webhelp: %.html.xml
--
GitLab