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

Slide overview sections, additional navigation hints

parent edfc56f0
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Doc/Sd1/objectsClasses.xml
+ 406
− 200
View file @ 6a129a98
This diff is collapsed.
ws/Docbook/CustomLayer/slide/slideHdm.xsl
+ 69
− 9
View file @ 6a129a98
......@@ -14,13 +14,52 @@
<xsl:variable name="topicLookup" select="document('topics.tid.xml', .)"/>
<xsl:param name="slide2lectureref"/>
<xsl:template match="/">
<xsl:apply-templates select="(//d:chapter | //d:section | //d:appendix) [contains(@annotations, 'slide') or descendant::*[contains(@annotations, 'slide')]]"
mode = "slideUnit"/>
mode = "slideUnit"/>
</xsl:template>
<xsl:template name="createBreadcrumbHierarchy">
<xsl:param name="nodes"/>
<xsl:param name="currentPosition"/>
<ul>
<xsl:if test="$currentPosition = 1">
<h3>Overview <img src="common/images/compass.svg" width="30ex"
style="border: 0mm; margin-top: 0mm; margin-bottom: 0mm;"/></h3>
</xsl:if>
<li style="list-style-type: none;">
<xsl:if test="not($currentPosition = 1)">
<xsl:text>➟ </xsl:text>
</xsl:if>
<xsl:value-of select="$nodes[$currentPosition]/d:title"/>
<xsl:choose>
<xsl:when test="$currentPosition &lt; count($nodes)">
<xsl:variable name="nextPosition" select="$currentPosition + 1"/>
<xsl:call-template name="createBreadcrumbHierarchy" >
<xsl:with-param name="nodes" select="$nodes"/>
<xsl:with-param name="currentPosition" select="$nextPosition"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:for-each select="$nodes[$currentPosition]/d:info/d:abstract/d:para">
<p>
<xsl:value-of select="."/>
</p>
</xsl:for-each>
</xsl:otherwise>
</xsl:choose>
</li>
</ul>
</xsl:template>
<xsl:template match="*" mode="slideUnit">
<xsl:message>
<xsl:text>No template matching '</xsl:text>
......@@ -29,6 +68,16 @@
</xsl:message>
</xsl:template>
<xsl:template match="d:section" mode="slideDescendants">
<section id="{@xml:id}">
<xsl:call-template name="createBreadcrumbHierarchy">
<xsl:with-param name="nodes"
select="ancestor-or-self::d:section|ancestor-or-self::d:chapter|ancestor-or-self::d:appendix"/>
<xsl:with-param name="currentPosition" select="1"/>
</xsl:call-template>
</section>
</xsl:template>
<xsl:template match="d:chapter | d:section | d:appendix" mode="slideUnit">
<xsl:variable name="slideFileName">
......@@ -37,6 +86,7 @@
</xsl:call-template>
</xsl:variable>
<!-- Writing slide series -->
<xsl:document href="{$slideFileName}" method="html" encoding="utf-8" indent="no">
<html lang="en">
......@@ -58,7 +108,8 @@
<div class="reveal">
<!-- Wrap all slides in a single "slides" class -->
<div class="slides">
<xsl:apply-templates select=".//d:figure[not (ancestor::d:qandaset)]" mode="slideDescendants"/>
<xsl:apply-templates select=".//d:figure[not (ancestor::d:qandaset)] | .//d:section[d:figure[not (ancestor::d:qandaset)]]"
mode="slideDescendants"/>
</div>
</div>
......@@ -118,7 +169,7 @@
<xsl:variable name="webhelpLink">
<xsl:call-template name="href.target.uri"/>
</xsl:variable>
<xsl:variable name="titleNode" select="d:title"/>
<xsl:variable name="baseSupplementDir">
......@@ -151,7 +202,7 @@
<xsl:choose>
<xsl:when test="1 &lt; count($xfigBasenameSet/*)"> <!-- More than one image: Animation -->
<section>
<xsl:for-each select="$xfigBasenameSet/*">
<xsl:for-each select="$xfigBasenameSet/*">
<section>
<xsl:choose>
<xsl:when test="1 = position()">
......@@ -183,11 +234,16 @@
<div class ="hdmfooter">
<p>
<a target="_blank" href="{$webhelpLink}">Lecture notes</a>
<xsl:text> </xsl:text>
<a target="_blank" href="#{parent::*/@xml:id}">
<img src="common/images/compass.svg" width="30ex"
style="border: 0mm; margin-top: 0mm; margin-bottom: 0mm;"/>
</a>
</p>
</div>
</xsl:if>
</section>
</xsl:for-each>
</xsl:for-each>
</section>
</xsl:when>
......@@ -200,6 +256,11 @@
<div class ="hdmfooter">
<p>
<a target="_blank" href="{$webhelpLink}">Lecture notes</a>
<xsl:text> </xsl:text>
<a target="_blank" href="#{parent::*/@xml:id}">
<img src="common/images/compass.svg" width="30ex"
style="border: 0mm; margin-top: 0mm; margin-bottom: 0mm;"/>
</a>
<xsl:variable name="qandaId" select="@xml:id"/>
<xsl:if test="$topicLookup/map/entry[@id = $qandaId]">
<xsl:text> | </xsl:text>
......@@ -219,7 +280,7 @@
</section>
</xsl:otherwise>
</xsl:choose>
<xsl:variable name="currentFigureId" select="generate-id()"/>
<xsl:variable name="followupQandasets"
select="following::d:qandaset[generate-id(preceding::d:figure[not(ancestor::d:qandaset)][1]) = $currentFigureId]"/>
......@@ -260,8 +321,7 @@
<xsl:template match="d:qandaset" mode="qandaNumber">
<xsl:variable name="parentId" select="ancestor::d:part/@xml:id"/>
<xsl:value-of select="count(preceding::d:qandaset[ancestor::d:part/@xml:id = $parentId]) + 1"/>
</xsl:template>
</xsl:template>
<xsl:template match="d:qandaset" mode="createTitleLink">
<xsl:variable name="linkTarget">
......
ws/Docbook/CustomLayer/webhelp/common/images/compass.svg 0 → 100644
+ 106
− 0
View file @ 6a129a98
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
viewBox="0 0 50 50"
width="50px"
height="50px"
version="1.1"
id="svg76"
sodipodi:docname="compass.svg"
inkscape:version="0.92.3 (2405546, 2018-03-11)">
<metadata
id="metadata82">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs80" />
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1600"
inkscape:window-height="1044"
id="namedview78"
showgrid="true"
inkscape:zoom="181.01934"
inkscape:cx="25.432425"
inkscape:cy="2.9274978"
inkscape:window-x="0"
inkscape:window-y="27"
inkscape:window-maximized="1"
inkscape:current-layer="svg76"
inkscape:snap-global="true">
<inkscape:grid
type="xygrid"
id="grid908" />
</sodipodi:namedview>
<circle
style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.9993701;stroke-miterlimit:4;stroke-dasharray:none"
id="path910"
cy="25.28219"
cx="24.620337"
r="22.5" />
<g
id="g918"
transform="translate(4,5)">
<path
inkscape:connector-curvature="0"
id="path912"
d="m 8.3983153,31.601685 13.9999997,-10 -4,-4 z"
style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
id="path914"
d="M 23,21 19,17 33,7 Z"
style="fill:#000000;fill-opacity:1;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
<ellipse
style="opacity:0.68399999;fill:#000000;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none"
id="path30"
cx="24.965082"
cy="3.8530304"
rx="0.5"
ry="0.89109504" />
<ellipse
style="opacity:0.68399999;fill:#000000;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none"
id="path30-3"
cx="25.018192"
cy="-3.1618671"
rx="0.5"
ry="0.89109504"
transform="rotate(90)" />
<ellipse
style="opacity:0.68399999;fill:#000000;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none"
id="path30-6"
cx="24.998405"
cy="-46.076389"
rx="0.5"
ry="0.89109504"
transform="rotate(90)" />
<ellipse
style="opacity:0.68399999;fill:#000000;stroke:#000000;stroke-width:0.1;stroke-miterlimit:4;stroke-dasharray:none"
id="path30-7"
cx="24.999353"
cy="46.771572"
rx="0.5"
ry="0.89109504" />
</svg>
ws/Docbook/Extensions/Tdata/Common/Components/exampleSlides.xml
+ 5
− 0
View file @ 6a129a98
......@@ -229,6 +229,11 @@ drwxr-xr-x 100 goik fb1prof 12288 Jul 13 07:43 ..
<section xml:id="MathML">
<title>Mathematical formulas</title>
<info>
<abstract>
<para>Examples displaying both inline and block formulas.</para>
</abstract>
</info>
<figure xml:id="fig_Gaussian">
<title>Gaussian integral</title>
......
ws/Docbook/Preprocess/Xsl/slideReference.xsl
+ 7
− 0
View file @ 6a129a98
......@@ -11,6 +11,13 @@
<xsl:text>.html</xsl:text>
</xsl:template>
<xsl:template name="breadcrumbFilename">
<xsl:param name="slideContainerId"/>
<xsl:text>__breadcrumb</xsl:text>
<xsl:value-of select="$slideContainerId"/>
<xsl:text>.html</xsl:text>
</xsl:template>
<xsl:template name="slideReference">
<xsl:param name="slideContainerId"/>
<xsl:param name="slideObjectId"/>
......
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