Commit ed48bc03 authored by Dr. Martin Goik's avatar Dr. Martin Goik

Updating reveal.js, fixing minor bugs

parent 3b364820
......@@ -2,7 +2,7 @@
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:ns1="https://launchpad.net/jessyink"
xmlns:jessyink="https://launchpad.net/jessyink"
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#"
......@@ -16,8 +16,8 @@
viewBox="0 0 170.00002 75"
version="1.1"
id="svg8"
inkscape:version="0.92.1 r15371"
sodipodi:docname="circleDistinctJavadoc.svg">
inkscape:version="0.92.3 (2405546, 2018-03-11)"
sodipodi:docname="circleDistinctJavadoc.multi.svg">
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
......@@ -26,15 +26,15 @@
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.8101934"
inkscape:cx="327.78627"
inkscape:cy="135.98166"
inkscape:cx="260.51453"
inkscape:cy="136.44787"
inkscape:document-units="mm"
inkscape:current-layer="g2381"
showgrid="true"
inkscape:window-width="1583"
inkscape:window-height="1071"
inkscape:window-height="1042"
inkscape:window-x="15"
inkscape:window-y="0"
inkscape:window-y="27"
inkscape:window-maximized="0"
fit-margin-top="0"
fit-margin-left="0"
......@@ -2665,12 +2665,12 @@
width="81.491669" />
</g>
<g
ns1:masterSlide="masterSlide"
jessyink:masterSlide="masterSlide"
transform="translate(-14.010514,-21.232287)"
inkscape:label="Master"
inkscape:groupmode="layer"
id="layer1"
style="display:none"
style="display:inline"
sodipodi:insensitive="true">
<text
xml:space="preserve"
......
......@@ -106,7 +106,7 @@
<mediaobject>
<imageobject>
<imagedata fileref="Ref/ObjectsAndClasses/classRectangle.svg"/>
<imagedata fileref="Ref/ObjectsAndClasses/classRectangle.multi.svg"/>
</imageobject>
</mediaobject>
</figure>
......@@ -1820,8 +1820,7 @@ void main(void) {
<programlisting language="java">public class Person {
String getDetails() { return "dummy";}
int getDetails() { return 1;} // Error: 'getDetails()' is already
// defined in 'Person'
}</programlisting>
} // defined in 'Person'</programlisting>
<informaltable border="1">
<tr>
......@@ -1853,8 +1852,8 @@ void main(void) {
</tr>
</informaltable>
<para>Return type irrelevant, only method signature support in <xref
linkend="glo_Java"/>.</para>
<para>Only method signature support in <xref linkend="glo_Java"/>
ignoring return type.</para>
</figure>
<figure xml:id="sd1_fig_methodSignatureRatio">
......@@ -2094,12 +2093,10 @@ r.hasSolidBorder = false;</programlisting></td>
<tr>
<td valign="top"><programlisting language="java">int a = 33; // works!</programlisting></td>
<td valign="top"><programlisting language="java">Rectangle r = new Rectangle(28, 10, false); // <emphasis
<td valign="top"><programlisting language="java">Rectangle r = new Rectangle(28, 10, false);//<emphasis
role="red">how ???</emphasis></programlisting></td>
</tr>
</informaltable>
<para>How to get this work?</para>
</figure>
<figure xml:id="sd1_fig_createRectangleDefineConstruct">
......@@ -2337,15 +2334,19 @@ Rectangle individual = new Rectangle(2, 7); // 2 x 7</programlisting></td>
}
}</programlisting></td>
<td valign="top"><programlisting language="java">Rectangle r =
new Rectangle(3, 6, false);</programlisting><para>o.K.: Using non-default
constructor.</para></td>
<td valign="top"><programlisting language="java">// o.K.: Using non-default
// constructor.
Rectangle r =
new Rectangle(3, 6, false);</programlisting></td>
</tr>
<tr>
<td valign="top"><programlisting language="java">Rectangle r = new Rectangle();</programlisting><para>Wrong:
Default constructor undefined, but non-default constructor
present.</para></td>
<td valign="top"><programlisting language="java">// Wrong: Default constructor
// undefined, but non-default
// constructor present.
Rectangle r = new Rectangle();</programlisting></td>
</tr>
</informaltable>
</figure>
......@@ -3690,7 +3691,7 @@ public class Main {
</figure>
<figure xml:id="sd1_fig_circleClassDistinctDocument">
<title><classname>Documenting class and methods</classname></title>
<title><classname>Documenting classes and methods</classname></title>
<programlisting language="java">/** Representing circles.
*/
......@@ -3993,13 +3994,13 @@ seconds = 23</screen></td>
<itemizedlist>
<listitem>
<para><emphasis role="red">Class level:</emphasis> Advance the
overall member count for every new member.</para>
<para><emphasis role="red">Class level:</emphasis> Advance club's
member count by each new member.</para>
</listitem>
<listitem>
<para><emphasis role="red">Instance level:</emphasis> Assign the
current member count to each new instance.</para>
<para><emphasis role="red">Instance level:</emphasis> New instances
receive current member count.</para>
</listitem>
</itemizedlist>
</figure>
......@@ -4176,9 +4177,10 @@ Member Karen, member number 2</screen></td>
System.out.println(karen.getDetails());
System.out.println("Club's member count:" +
ClubMember.getMemberCount());// Good: Prevent tampering
// memberCount variable.</programlisting></td>
System.out.println("Club's member count:"
+ ClubMember.getMemberCount());
// Good: Prevent tampering memberCount
// variable.</programlisting></td>
<td valign="top"><screen>Member Karen, member number 2
Club's member count:3</screen></td>
......@@ -9758,7 +9760,7 @@ After call: <emphasis role="red">6</emphasis></screen></td>
linkends="sd1_fig_callingMethods-3"
xml:id="sd1_fig_callingMethods-3-co"/>;
return <co linkends="sd1_fig_callingMethods-4"
xml:id="sd1_fig_callingMethods-4-co"/> r<co
xml:id="sd1_fig_callingMethods-4-co"/> r <co
linkends="sd1_fig_callingMethods-5"
xml:id="sd1_fig_callingMethods-5-co"/> = Math.sqrt(val);
}
......@@ -10258,10 +10260,12 @@ held each Illegal day's code: <emphasis role="red">88</emphasis></screen></td>
* Charge double prices on weekends
* @param day Day of week
* @param amount
* @return the effective amount for given day of week.
* @return the effective amount for
* given day of week.
*/
static public int <link
xlink:href="https://gitlab.mi.hdm-stuttgart.de/goik/GoikLectures/tree/master/Doc/Sd1/Ref/ObjectsAndClasses/Intro/Enum/src/main/java/de/hdm_stuttgart/mi/sd1/integer_representation/Screwed2.java">getPrice</link>(final int day, final int amount) {
xlink:href="https://gitlab.mi.hdm-stuttgart.de/goik/GoikLectures/tree/master/Doc/Sd1/Ref/ObjectsAndClasses/Intro/Enum/src/main/java/de/hdm_stuttgart/mi/sd1/integer_representation/Screwed2.java">getPrice</link>(
final int day, final int amount) {
switch (day) {
case Day.SATURDAY:
case Day.SUNDAY: return 2 * amount;
......
This diff is collapsed.
diff -Naur css.orig/reveal.css css/reveal.css
--- css.orig/reveal.css 2018-06-03 15:00:16.973881804 +0200
+++ css/reveal.css 2018-06-03 14:58:57.710924018 +0200
@@ -1,3 +1,13 @@
diff --git a/css/reveal.css b/css/reveal.css
index 1b9651b..1b620af 100644
--- a/css/reveal.css
+++ b/css/reveal.css
@@ -1,3 +1,8 @@
+/*
+ * patched by: /usr/share/hdm-docbook-xsl/CustomLayer/slide/reveal.css.patch
+ * source file: /usr/share/reveal.js/css/reveal.css
+ * sources: /usr/share/reveal.js
+ */
+.footer {
+ position:absolute;
+ bottom: -10%;
+ left: 50%;
+}
+
/*!
* reveal.js
* http://revealjs.com
@@ -16,7 +26,7 @@
.reveal b, .reveal u, .reveal center,
.reveal dl, .reveal dt, .reveal dd, .reveal ol, .reveal ul, .reveal li,
.reveal fieldset, .reveal form, .reveal label, .reveal legend,
-.reveal table, .reveal caption, .reveal tbody, .reveal tfoot, .reveal thead, .reveal tr, .reveal th, .reveal td,
+.reveal table, .reveal caption, .reveal tbody, .reveal tfoot, .reveal thead, .reveal tr,
.reveal article, .reveal aside, .reveal canvas, .reveal details, .reveal embed,
.reveal figure, .reveal figcaption, .reveal footer, .reveal header, .reveal hgroup,
.reveal menu, .reveal nav, .reveal output, .reveal ruby, .reveal section, .reveal summary,
@@ -28,6 +38,14 @@
font: inherit;
vertical-align: baseline; }
@@ -1420,6 +1425,15 @@ body {
padding-top: 20px;
padding-bottom: 20px; }
+.reveal th, .reveal td {
+ margin: 0;
......@@ -34,24 +21,17 @@ diff -Naur css.orig/reveal.css css/reveal.css
+ border: 0;
+ font-size: 100%;
+ font: inherit;
+ vertical-align: top; }
+
.reveal article, .reveal aside, .reveal details, .reveal figcaption, .reveal figure,
.reveal footer, .reveal header, .reveal hgroup, .reveal menu, .reveal nav, .reveal section {
display: block; }
diff -Naur css.orig/theme/serif.css css/theme/serif.css
--- css.orig/theme/serif.css 2018-06-03 15:00:16.973881804 +0200
+++ css/theme/serif.css 2018-06-03 14:56:44.644742215 +0200
@@ -1,3 +1,8 @@
+/*
+ * patched by: /usr/share/hdm-docbook-xsl/CustomLayer/slide/reveal.css.patch
+ * source file: /usr/share/reveal.js/css/theme/serif.css
+ */
+ vertical-align: top;
+}
+
/**
* A simple theme for reveal.js presentations, similar
* to the default theme. The accent color is brown.
@@ -12,6 +17,10 @@
/*********************************************
* PLAYBACK COMPONENT
*********************************************/
diff --git a/css/theme/serif.css b/css/theme/serif.css
index 6514a6f..fc58705 100644
--- a/css/theme/serif.css
+++ b/css/theme/serif.css
@@ -12,6 +12,10 @@
*********************************************/
body {
background: #F0F1EB;
......@@ -62,7 +42,7 @@ diff -Naur css.orig/theme/serif.css css/theme/serif.css
background-color: #F0F1EB; }
.reveal {
@@ -140,10 +149,11 @@
@@ -140,10 +144,10 @@ body {
font-style: italic; }
.reveal pre {
......@@ -70,13 +50,12 @@ diff -Naur css.orig/theme/serif.css css/theme/serif.css
+ display: inline-block;
position: relative;
- width: 90%;
+ width: auto;
margin: 20px auto;
+ padding: 1em;
text-align: left;
font-size: 0.55em;
font-family: monospace;
@@ -208,7 +218,7 @@
@@ -210,7 +214,7 @@ body {
*********************************************/
.reveal a {
color: #51483D;
......
......@@ -54,16 +54,19 @@
</xsl:for-each>
</div>
<div class ="hdmfooter">
<p>
<div class="tooltip">
<a target="_blank">
<xsl:attribute name="href">
<xsl:for-each select="$nodes[$currentPosition]">
<xsl:call-template name="href.target.uri"/>
</xsl:for-each>
</xsl:attribute>
<xsl:text>Lecture notes</xsl:text>
<img src="common/images/book.svg" width="60"
style="border: 0mm; margin-top: 0mm; margin-bottom: 0mm;"></img>
</a>
</p>
<p class="tooltiptext">Lecture notes</p>
</div>
</div>
</xsl:otherwise>
</xsl:choose>
......@@ -123,7 +126,7 @@
</xsl:variable>
<!-- Writing slide series -->
<xsl:document href="{$slideFileName}" method="html" encoding="utf-8" indent="yes">
<xsl:document href="{$slideFileName}" method="html" encoding="utf-8" indent="yes" doctype-system="none">
<html lang="en">
<head>
......@@ -200,7 +203,6 @@
</div>
</div>
<script src="reveal.js/lib/js/head.min.js"></script>
<script src="reveal.js/js/reveal.js"></script>
<script>/*<![CDATA[*/
......
--- /usr/share/hdm-docbook-xsl/docbook-xsl-1.79.2/webhelp/template/common/css/positioning.css 2016-12-09 23:39:10.000000000 +0100
+++ positioning.css 2019-05-11 12:28:00.610579125 +0200
+++ positioning.css 2019-05-12 09:55:50.043473442 +0200
@@ -1,3 +1,8 @@
+/*
+ * patched by: /usr/share/hdm-docbook-xsl/CustomLayer/webhelp/positioning.css.patch
......@@ -9,6 +9,15 @@
tr th .added { color: #E6E6FA; }
tr th .changed {color: #99ff99; }
div.added tr, div.added { background-color: #E6E6FA; }
@@ -14,7 +19,7 @@
body { font: 12px Verdana, Geneva, sans-serif; }
-p, ul, ol, li { font: 10pt Verdana, Geneva, sans-serif; }
+
h1 { font: 15pt Arial, Helvetica, geneva;
color: black!important;
}
@@ -24,7 +29,7 @@
background: url("../images/header-bg.png") scroll top left repeat-x #4d8c83;
position: fixed;
......
......@@ -143,7 +143,7 @@ SAXONCMD=java -cp "${DBOOK_XSL}/tools/lib/saxon9he.jar:/usr/share/java/xercesImp
%.slide: %.slide.xml
${SAXON6CMD} $< ${DBOOK_XSL_CUSTOM}/slide/slideHdm.xsl ${dbookXslSlideParam}
rsync -a /usr/share/reveal.js .
cd reveal.js; patch -p0 < ${DBOOK_XSL_CUSTOM}/slide/reveal.css.patch
cd reveal.js; patch -p1 < ${DBOOK_XSL_CUSTOM}/slide/reveal.css.patch
touch $*.slide
# PDF
......
Markdown is supported
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