From 489ab0a598371ea2ddd3041041221b9f7c03cb5d Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Tue, 6 Nov 2018 13:40:06 +0100
Subject: [PATCH] Cosmetics

---
 Doc/Sd1/statements.xml |  2 +-
 Doc/Sda1/xmlschema.xml | 57 +++++++++++++++++++++++-------------------
 2 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/Doc/Sd1/statements.xml b/Doc/Sd1/statements.xml
index f2bbac029..9622aa592 100644
--- a/Doc/Sd1/statements.xml
+++ b/Doc/Sd1/statements.xml
@@ -2298,7 +2298,7 @@ while (i &lt; 5 <co linkends="sd1_callout_whileLoopJustCounting-2"
 
                 <callout arearefs="sd1_callout_whileLoopJustCounting-3-co"
                          xml:id="sd1_callout_whileLoopJustCounting-3">
-                  <para>Progressing loop control</para>
+                  <para>Loop progression control</para>
                 </callout>
               </calloutlist></td>
           </tr>
diff --git a/Doc/Sda1/xmlschema.xml b/Doc/Sda1/xmlschema.xml
index 284a6c08b..2c2e7aa79 100644
--- a/Doc/Sda1/xmlschema.xml
+++ b/Doc/Sda1/xmlschema.xml
@@ -1279,31 +1279,33 @@ String s1 = new String(), s2 = new String();</programlisting>
                   role="red">contactCategoryType</emphasis>"&gt;
   &lt;xs:restriction base="xs:string"&gt; <emphasis role="red"> â–²</emphasis> 
     &lt;xs:enumeration value="<emphasis role="red">friend</emphasis>"/&gt; <emphasis
-                  role="red">┗━━━━━━━━━━━━━┓</emphasis>
-    &lt;xs:enumeration value="<emphasis role="red">colleague</emphasis>"/&gt;            <emphasis
+                  role="red">┗━━┓</emphasis>
+    &lt;xs:enumeration value="<emphasis role="red">colleague</emphasis>"/&gt; <emphasis
                   role="red">┃</emphasis>
-    &lt;xs:enumeration value="<emphasis role="red">businessPartner</emphasis>"/&gt;      <emphasis
+    &lt;xs:enumeration                     <emphasis role="red">┃</emphasis>
+              value="<emphasis role="red">businessPartner</emphasis>"/&gt; <emphasis
                   role="red">┃</emphasis>
-  &lt;/xs:restriction&gt;                                <emphasis role="red">┃</emphasis>
-&lt;/xs:simpleType&gt;                                   <emphasis role="red">┃</emphasis>
-                                                   <emphasis role="red">┃</emphasis>
-&lt;xs:element name="contact"&gt;                        <emphasis role="red">┃</emphasis>
-  &lt;xs:complexType&gt;                                 <emphasis role="red">┃</emphasis>
-    &lt;xs:sequence&gt; ...  &lt;/xs:sequence&gt;              <emphasis
-                  role="red">┃</emphasis>
-    &lt;xs:attribute name="birthDate" type="<emphasis role="red">contactCategoryType</emphasis>"
+  &lt;/xs:restriction&gt;                     <emphasis role="red">┃</emphasis>
+&lt;/xs:simpleType&gt;                        <emphasis role="red">┃</emphasis>
+                                        <emphasis role="red">┃</emphasis>
+&lt;xs:element name="contact"&gt;             <emphasis role="red">┃</emphasis>
+  &lt;xs:complexType&gt;                      <emphasis role="red">┃</emphasis>
+    &lt;xs:sequence&gt; ...                   <emphasis role="red">┃</emphasis>
+    &lt;/xs:sequence&gt;                      <emphasis role="red">┃</emphasis>
+    &lt;xs:attribute name="birthDate"      <emphasis role="red">┃</emphasis>
+                 type="<emphasis role="red">contactCategoryType</emphasis>"
                    use="optional"/&gt;
   &lt;/xs:complexType&gt;
 &lt;/xs:element&gt;</programlisting></td>
 
-            <td valign="top"><programlisting language="none">&lt;contact category="<emphasis
-                  role="red">author</emphasis>"&gt;
-  &lt;firstName&gt;Joe&lt;/firstName&gt;
-  &lt;lastName&gt;Simpson&lt;/lastName&gt;
-&lt;/contact&gt;</programlisting><para>Value '<emphasis
-            role="red">author</emphasis>' is not facet-valid</para><para>with
-            respect to enumeration</para><para>'[friend, colleague,
-            businessPartner]'...</para></td>
+            <td valign="top"><programlisting language="none">&lt;contact
+  category="<emphasis role="red">author</emphasis>"&gt;
+  &lt;firstName&gt;...
+&lt;/contact&gt;</programlisting><screen>Value '<emphasis role="red">author</emphasis>' is not
+facet-valid with respect
+to enumeration'
+[friend, colleague,
+  businessPartner]'...</screen></td>
           </tr>
         </informaltable>
       </figure>
@@ -1313,11 +1315,13 @@ String s1 = new String(), s2 = new String();</programlisting>
 
         <informaltable border="0">
           <tr>
-            <td valign="top"><programlisting language="none">&lt;a href="https://my.com"&gt;Some text&lt;/a&gt;
-                             <emphasis role="red">â–²</emphasis>
-                             <emphasis role="red">┃</emphasis>
-                             <emphasis role="red">┃</emphasis>
-                  &lt;!-- Just a string --&gt;</programlisting></td>
+            <td valign="top"><programlisting language="none">&lt;a 
+href="https://my.com"
+   &gt;Some text&lt;/a&gt;
+  <emphasis role="red">       â–²</emphasis>
+         <emphasis role="red">┃</emphasis>
+         <emphasis role="red">┃</emphasis>
+ &lt;!-- Just a string --&gt;</programlisting></td>
 
             <td valign="top"><programlisting language="none">&lt;xs:element name="a"&gt;
   &lt;xs:complexType&gt;
@@ -1325,7 +1329,8 @@ String s1 = new String(), s2 = new String();</programlisting>
       &lt;xs:extension base="xs:string"&gt; <co
                   linkends="sda1_xmlschema_fig_textContentAttribute-1"
                   xml:id="sda1_xmlschema_fig_textContentAttribute-1-co"/>
-        &lt;xs:attribute name="href" type="<emphasis role="red">xs:anyURI</emphasis>"/&gt; <co
+        &lt;xs:attribute name="href" 
+                   type="<emphasis role="red">xs:anyURI</emphasis>"/&gt; <co
                   linkends="sda1_xmlschema_fig_textContentAttribute-2"
                   xml:id="sda1_xmlschema_fig_textContentAttribute-2-co"/>
       &lt;/xs:extension&gt;
@@ -2947,7 +2952,7 @@ public class Memo {
               be able addressing a <emphasis>set</emphasis> of recipients.
               Thus we have to disallow duplicates. Note that this is an
               <emphasis>informal</emphasis> constraint not being handled by
-              our schema: </para>
+              our schema:</para>
 
               <itemizedlist>
                 <listitem>
-- 
GitLab