Merge branch 'master' of https://version.mi.hdm-stuttgart.de/git/GoikLectures

Sd1/swd1.xml

@@ -1574,13 +1574,12 @@ public class Circle {
 
           <qandaentry>
             <question>
-              <para> Our current Circle and Rectangle instances are only
-              shapes yet and do not allow to be moved in a coordinate
-              system:</para>
+              <para>Our current Circle and Rectangle instances are only shapes
+              yet and do not allow to be moved in a coordinate system:</para>
 
               <itemizedlist>
                 <listitem>
-                  <para> Add two more instance variables x and y and
+                  <para>Add two more instance variables x and y and
                   corresponding setter methods to account for a shapes origin
                   being different from (0,0). The following hint may be
                   helpful:</para>
@@ -1646,7 +1645,29 @@ public class Circle {
               <para>Implement the method <methodname>void
               writeSvg()</methodname> in both classes
               <classname>Rectangle</classname> and
-              <classname>Circle</classname>.</para>
+              <classname>Circle</classname>. This should produce an output
+              result like:</para>
+
+              <programlisting>&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+  &lt;body&gt;
+    &lt;svg width='300' height='200' &gt;
+      <emphasis role="bold">&lt;rect width='100.0' height='80.0' x='40.0' y='20.0'' style='fill:rgb(0,255,0);stroke-width:3;stroke:rgb(0,0,0)'/&gt;</emphasis>
+      <emphasis role="bold">&lt;circle r='60.0' cx='60.0' cy='20.0' style='fill:rgb(0,0,255);stroke-width:3;stroke:rgb(0,0,0)'/&gt;</emphasis>
+      &lt;/svg &gt;
+  &lt;/body&gt;
+&lt;/html&gt;</programlisting>
+
+              <para>You may enter this output into a file sfg.html. A web
+              browser should visualize this output as:</para>
+
+              <informalfigure>
+                <mediaobject>
+                  <imageobject>
+                    <imagedata fileref="Ref/Fig/svgGeometry.png"/>
+                  </imageobject>
+                </mediaobject>
+              </informalfigure>
             </question>
 
             <answer>