Adjusting type reference to # hash prefix instead of < > brackets as type would be too close to elements look

Author: svanteschubert

generator/schema2template/src/main/java/schema2template/grammar/MSVExpressionVisitorDescendantsAsHTMLString.java

@@ -258,11 +258,11 @@ public void onData(DataExp exp) {
         builder.append(
             "<a href=\"https://www.w3.org/TR/xmlschema-2/#"
                 + dti.getName()
-                + "\">&lt;"
+                + "\">#"
                 + dti.getName()
-                + "&gt;</a>");
+                + "</a>");
       } else if (exp.name.equals("anyIRI")) {
-        builder.append("<a href=\"https://www.rfc-editor.org/rfc/rfc3987\">&lt;anyIRI\"&gt;</a>");
+        builder.append("<a href=\"https://www.rfc-editor.org/rfc/rfc3987\">#anyIRI</a>");
       } else if (isPredefinedType(dt)) {
         // it's a MSV pre-defined type.
         builder.append("<!" + dti.getName() + "!>");
@@ -294,11 +294,11 @@ public void onRef(ReferenceExp exp) {
         builder.append(
             "<a href=\"https://www.w3.org/TR/xmlschema-2/#"
                 + exp.name
-                + "\">&lt;"
+                + "\">#"
                 + exp.name
-                + "&gt;</a>");
+                + "</a>");
       } else if (exp.name.equals("anyIRI")) {
-        builder.append("<a href=\"https://www.rfc-editor.org/rfc/rfc3987\">&lt;anyIRI&gt;</a>");
+        builder.append("<a href=\"https://www.rfc-editor.org/rfc/rfc3987\">#anyIRI</a>");
       } else {
         exp.exp.visit(this);
       }
@@ -311,11 +311,11 @@ public void onRef(ReferenceExp exp) {
         builder.append(
             "<a href=\"https://www.w3.org/TR/xmlschema-2/#"
                 + exp.name
-                + "\">&lt;"
+                + "\">#"
                 + exp.name
-                + "&gt;</a>");
+                + "</a>");
       } else if (exp.name.equals("anyIRI")) {
-        builder.append("<a href=\"https://www.rfc-editor.org/rfc/rfc3987\">&lt;anyIRI&gt;</a>");
+        builder.append("<a href=\"https://www.rfc-editor.org/rfc/rfc3987\">#anyIRI</a>");
       } else {
         builder.append("&lt;xsd:ref name=\"" + exp.name + "\"/&gt;");
       }

generator/schema2template/src/test/resources/test-reference/odf/generation/odf-reference/odf-package-manifest-1.0/OdfReference.html

@@ -51,7 +51,7 @@ <h3><a name="element_manifest:algorithm_1">manifest:algorithm Element</a></h3>
 </tr>
 <tr>
 	<td class="left">Child Relations</td>
-	<td class="right">&lt;manifest:algorithm manifest:algorithm-name="<a href="https://www.w3.org/TR/xmlschema-2/#string">&lt;string&gt;</a>" manifest:initialisation-vector="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">&lt;base64Binary&gt;</a>" &gt;&nbsp;</td>
+	<td class="right">&lt;manifest:algorithm manifest:algorithm-name="<a href="https://www.w3.org/TR/xmlschema-2/#string">#string</a>" manifest:initialisation-vector="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">#base64Binary</a>" &gt;&nbsp;</td>
 </tr>
 </table>
 <br />
@@ -80,7 +80,7 @@ <h3><a name="element_manifest:encryption-data_1">manifest:encryption-data Elemen
 </tr>
 <tr>
 	<td class="left">Child Relations</td>
-	<td class="right">&lt;manifest:encryption-data manifest:checksum-type="<a href="https://www.w3.org/TR/xmlschema-2/#string">&lt;string&gt;</a>" manifest:checksum="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">&lt;base64Binary&gt;</a>" &lt;manifest:algorithm  ... &gt;&lt;manifest:key-derivation  ... &gt;&gt;&nbsp;</td>
+	<td class="right">&lt;manifest:encryption-data manifest:checksum-type="<a href="https://www.w3.org/TR/xmlschema-2/#string">#string</a>" manifest:checksum="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">#base64Binary</a>" &lt;manifest:algorithm  ... &gt;&lt;manifest:key-derivation  ... &gt;&gt;&nbsp;</td>
 </tr>
 </table>
 <br />
@@ -109,8 +109,8 @@ <h3><a name="element_manifest:file-entry_1">manifest:file-entry Element</a></h3>
 </tr>
 <tr>
 	<td class="left">Child Relations</td>
-	<td class="right">&lt;manifest:file-entry manifest:full-path="<a href="https://www.w3.org/TR/xmlschema-2/#string">&lt;string&gt;</a>"  (manifest:size="<a href="https://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">&lt;nonNegativeInteger&gt;</a>" )?
-	manifest:media-type="<a href="https://www.w3.org/TR/xmlschema-2/#string">&lt;string&gt;</a>"  (&lt;manifest:encryption-data  ... &gt;)?
+	<td class="right">&lt;manifest:file-entry manifest:full-path="<a href="https://www.w3.org/TR/xmlschema-2/#string">#string</a>"  (manifest:size="<a href="https://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">#nonNegativeInteger</a>" )?
+	manifest:media-type="<a href="https://www.w3.org/TR/xmlschema-2/#string">#string</a>"  (&lt;manifest:encryption-data  ... &gt;)?
 	&gt;&nbsp;</td>
 </tr>
 </table>
@@ -139,7 +139,7 @@ <h3><a name="element_manifest:key-derivation_1">manifest:key-derivation Element<
 </tr>
 <tr>
 	<td class="left">Child Relations</td>
-	<td class="right">&lt;manifest:key-derivation manifest:key-derivation-name="<a href="https://www.w3.org/TR/xmlschema-2/#string">&lt;string&gt;</a>" manifest:salt="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">&lt;base64Binary&gt;</a>" manifest:iteration-count="<a href="https://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">&lt;nonNegativeInteger&gt;</a>" &gt;&nbsp;</td>
+	<td class="right">&lt;manifest:key-derivation manifest:key-derivation-name="<a href="https://www.w3.org/TR/xmlschema-2/#string">#string</a>" manifest:salt="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">#base64Binary</a>" manifest:iteration-count="<a href="https://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">#nonNegativeInteger</a>" &gt;&nbsp;</td>
 </tr>
 </table>
 <br />
@@ -189,7 +189,7 @@ <h3><a name="attribute_manifest:algorithm-name_1">manifest:algorithm-name Attrib
 </tr>
 <tr>
 	<td class="left">RNG Relations</td>
-	<td class="right">manifest:algorithm-name="<a href="https://www.w3.org/TR/xmlschema-2/#string">&lt;string&gt;</a>" &nbsp;</td>
+	<td class="right">manifest:algorithm-name="<a href="https://www.w3.org/TR/xmlschema-2/#string">#string</a>" &nbsp;</td>
 </tr>
 </table>
 <br />
@@ -214,7 +214,7 @@ <h3><a name="attribute_manifest:checksum_1">manifest:checksum Attribute</a></h3>
 </tr>
 <tr>
 	<td class="left">RNG Relations</td>
-	<td class="right">manifest:checksum="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">&lt;base64Binary&gt;</a>" &nbsp;</td>
+	<td class="right">manifest:checksum="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">#base64Binary</a>" &nbsp;</td>
 </tr>
 </table>
 <br />
@@ -239,7 +239,7 @@ <h3><a name="attribute_manifest:checksum-type_1">manifest:checksum-type Attribut
 </tr>
 <tr>
 	<td class="left">RNG Relations</td>
-	<td class="right">manifest:checksum-type="<a href="https://www.w3.org/TR/xmlschema-2/#string">&lt;string&gt;</a>" &nbsp;</td>
+	<td class="right">manifest:checksum-type="<a href="https://www.w3.org/TR/xmlschema-2/#string">#string</a>" &nbsp;</td>
 </tr>
 </table>
 <br />
@@ -264,7 +264,7 @@ <h3><a name="attribute_manifest:full-path_1">manifest:full-path Attribute</a></h
 </tr>
 <tr>
 	<td class="left">RNG Relations</td>
-	<td class="right">manifest:full-path="<a href="https://www.w3.org/TR/xmlschema-2/#string">&lt;string&gt;</a>" &nbsp;</td>
+	<td class="right">manifest:full-path="<a href="https://www.w3.org/TR/xmlschema-2/#string">#string</a>" &nbsp;</td>
 </tr>
 </table>
 <br />
@@ -289,7 +289,7 @@ <h3><a name="attribute_manifest:initialisation-vector_1">manifest:initialisation
 </tr>
 <tr>
 	<td class="left">RNG Relations</td>
-	<td class="right">manifest:initialisation-vector="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">&lt;base64Binary&gt;</a>" &nbsp;</td>
+	<td class="right">manifest:initialisation-vector="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">#base64Binary</a>" &nbsp;</td>
 </tr>
 </table>
 <br />
@@ -314,7 +314,7 @@ <h3><a name="attribute_manifest:iteration-count_1">manifest:iteration-count Attr
 </tr>
 <tr>
 	<td class="left">RNG Relations</td>
-	<td class="right">manifest:iteration-count="<a href="https://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">&lt;nonNegativeInteger&gt;</a>" &nbsp;</td>
+	<td class="right">manifest:iteration-count="<a href="https://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">#nonNegativeInteger</a>" &nbsp;</td>
 </tr>
 </table>
 <br />
@@ -339,7 +339,7 @@ <h3><a name="attribute_manifest:key-derivation-name_1">manifest:key-derivation-n
 </tr>
 <tr>
 	<td class="left">RNG Relations</td>
-	<td class="right">manifest:key-derivation-name="<a href="https://www.w3.org/TR/xmlschema-2/#string">&lt;string&gt;</a>" &nbsp;</td>
+	<td class="right">manifest:key-derivation-name="<a href="https://www.w3.org/TR/xmlschema-2/#string">#string</a>" &nbsp;</td>
 </tr>
 </table>
 <br />
@@ -364,7 +364,7 @@ <h3><a name="attribute_manifest:media-type_1">manifest:media-type Attribute</a><
 </tr>
 <tr>
 	<td class="left">RNG Relations</td>
-	<td class="right">manifest:media-type="<a href="https://www.w3.org/TR/xmlschema-2/#string">&lt;string&gt;</a>" &nbsp;</td>
+	<td class="right">manifest:media-type="<a href="https://www.w3.org/TR/xmlschema-2/#string">#string</a>" &nbsp;</td>
 </tr>
 </table>
 <br />
@@ -389,7 +389,7 @@ <h3><a name="attribute_manifest:salt_1">manifest:salt Attribute</a></h3>
 </tr>
 <tr>
 	<td class="left">RNG Relations</td>
-	<td class="right">manifest:salt="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">&lt;base64Binary&gt;</a>" &nbsp;</td>
+	<td class="right">manifest:salt="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">#base64Binary</a>" &nbsp;</td>
 </tr>
 </table>
 <br />
@@ -414,7 +414,7 @@ <h3><a name="attribute_manifest:size_1">manifest:size Attribute</a></h3>
 </tr>
 <tr>
 	<td class="left">RNG Relations</td>
-	<td class="right">manifest:size="<a href="https://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">&lt;nonNegativeInteger&gt;</a>" &nbsp;</td>
+	<td class="right">manifest:size="<a href="https://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">#nonNegativeInteger</a>" &nbsp;</td>
 </tr>
 </table>
 <br />

generator/schema2template/src/test/resources/test-reference/odf/generation/odf-reference/odf-package-manifest-1.1/OdfReference.html

@@ -51,7 +51,7 @@ <h3><a name="element_manifest:algorithm_1">manifest:algorithm Element</a></h3>
 </tr>
 <tr>
 	<td class="left">Child Relations</td>
-	<td class="right">&lt;manifest:algorithm manifest:algorithm-name="<a href="https://www.w3.org/TR/xmlschema-2/#string">&lt;string&gt;</a>" manifest:initialisation-vector="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">&lt;base64Binary&gt;</a>" &gt;&nbsp;</td>
+	<td class="right">&lt;manifest:algorithm manifest:algorithm-name="<a href="https://www.w3.org/TR/xmlschema-2/#string">#string</a>" manifest:initialisation-vector="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">#base64Binary</a>" &gt;&nbsp;</td>
 </tr>
 </table>
 <br />
@@ -80,7 +80,7 @@ <h3><a name="element_manifest:encryption-data_1">manifest:encryption-data Elemen
 </tr>
 <tr>
 	<td class="left">Child Relations</td>
-	<td class="right">&lt;manifest:encryption-data manifest:checksum-type="<a href="https://www.w3.org/TR/xmlschema-2/#string">&lt;string&gt;</a>" manifest:checksum="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">&lt;base64Binary&gt;</a>" &lt;manifest:algorithm  ... &gt;&lt;manifest:key-derivation  ... &gt;&gt;&nbsp;</td>
+	<td class="right">&lt;manifest:encryption-data manifest:checksum-type="<a href="https://www.w3.org/TR/xmlschema-2/#string">#string</a>" manifest:checksum="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">#base64Binary</a>" &lt;manifest:algorithm  ... &gt;&lt;manifest:key-derivation  ... &gt;&gt;&nbsp;</td>
 </tr>
 </table>
 <br />
@@ -109,8 +109,8 @@ <h3><a name="element_manifest:file-entry_1">manifest:file-entry Element</a></h3>
 </tr>
 <tr>
 	<td class="left">Child Relations</td>
-	<td class="right">&lt;manifest:file-entry manifest:full-path="<a href="https://www.w3.org/TR/xmlschema-2/#string">&lt;string&gt;</a>"  (manifest:size="<a href="https://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">&lt;nonNegativeInteger&gt;</a>" )?
-	manifest:media-type="<a href="https://www.w3.org/TR/xmlschema-2/#string">&lt;string&gt;</a>"  (&lt;manifest:encryption-data  ... &gt;)?
+	<td class="right">&lt;manifest:file-entry manifest:full-path="<a href="https://www.w3.org/TR/xmlschema-2/#string">#string</a>"  (manifest:size="<a href="https://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">#nonNegativeInteger</a>" )?
+	manifest:media-type="<a href="https://www.w3.org/TR/xmlschema-2/#string">#string</a>"  (&lt;manifest:encryption-data  ... &gt;)?
 	&gt;&nbsp;</td>
 </tr>
 </table>
@@ -139,7 +139,7 @@ <h3><a name="element_manifest:key-derivation_1">manifest:key-derivation Element<
 </tr>
 <tr>
 	<td class="left">Child Relations</td>
-	<td class="right">&lt;manifest:key-derivation manifest:key-derivation-name="<a href="https://www.w3.org/TR/xmlschema-2/#string">&lt;string&gt;</a>" manifest:salt="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">&lt;base64Binary&gt;</a>" manifest:iteration-count="<a href="https://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">&lt;nonNegativeInteger&gt;</a>" &gt;&nbsp;</td>
+	<td class="right">&lt;manifest:key-derivation manifest:key-derivation-name="<a href="https://www.w3.org/TR/xmlschema-2/#string">#string</a>" manifest:salt="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">#base64Binary</a>" manifest:iteration-count="<a href="https://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">#nonNegativeInteger</a>" &gt;&nbsp;</td>
 </tr>
 </table>
 <br />
@@ -189,7 +189,7 @@ <h3><a name="attribute_manifest:algorithm-name_1">manifest:algorithm-name Attrib
 </tr>
 <tr>
 	<td class="left">RNG Relations</td>
-	<td class="right">manifest:algorithm-name="<a href="https://www.w3.org/TR/xmlschema-2/#string">&lt;string&gt;</a>" &nbsp;</td>
+	<td class="right">manifest:algorithm-name="<a href="https://www.w3.org/TR/xmlschema-2/#string">#string</a>" &nbsp;</td>
 </tr>
 </table>
 <br />
@@ -214,7 +214,7 @@ <h3><a name="attribute_manifest:checksum_1">manifest:checksum Attribute</a></h3>
 </tr>
 <tr>
 	<td class="left">RNG Relations</td>
-	<td class="right">manifest:checksum="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">&lt;base64Binary&gt;</a>" &nbsp;</td>
+	<td class="right">manifest:checksum="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">#base64Binary</a>" &nbsp;</td>
 </tr>
 </table>
 <br />
@@ -239,7 +239,7 @@ <h3><a name="attribute_manifest:checksum-type_1">manifest:checksum-type Attribut
 </tr>
 <tr>
 	<td class="left">RNG Relations</td>
-	<td class="right">manifest:checksum-type="<a href="https://www.w3.org/TR/xmlschema-2/#string">&lt;string&gt;</a>" &nbsp;</td>
+	<td class="right">manifest:checksum-type="<a href="https://www.w3.org/TR/xmlschema-2/#string">#string</a>" &nbsp;</td>
 </tr>
 </table>
 <br />
@@ -264,7 +264,7 @@ <h3><a name="attribute_manifest:full-path_1">manifest:full-path Attribute</a></h
 </tr>
 <tr>
 	<td class="left">RNG Relations</td>
-	<td class="right">manifest:full-path="<a href="https://www.w3.org/TR/xmlschema-2/#string">&lt;string&gt;</a>" &nbsp;</td>
+	<td class="right">manifest:full-path="<a href="https://www.w3.org/TR/xmlschema-2/#string">#string</a>" &nbsp;</td>
 </tr>
 </table>
 <br />
@@ -289,7 +289,7 @@ <h3><a name="attribute_manifest:initialisation-vector_1">manifest:initialisation
 </tr>
 <tr>
 	<td class="left">RNG Relations</td>
-	<td class="right">manifest:initialisation-vector="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">&lt;base64Binary&gt;</a>" &nbsp;</td>
+	<td class="right">manifest:initialisation-vector="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">#base64Binary</a>" &nbsp;</td>
 </tr>
 </table>
 <br />
@@ -314,7 +314,7 @@ <h3><a name="attribute_manifest:iteration-count_1">manifest:iteration-count Attr
 </tr>
 <tr>
 	<td class="left">RNG Relations</td>
-	<td class="right">manifest:iteration-count="<a href="https://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">&lt;nonNegativeInteger&gt;</a>" &nbsp;</td>
+	<td class="right">manifest:iteration-count="<a href="https://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">#nonNegativeInteger</a>" &nbsp;</td>
 </tr>
 </table>
 <br />
@@ -339,7 +339,7 @@ <h3><a name="attribute_manifest:key-derivation-name_1">manifest:key-derivation-n
 </tr>
 <tr>
 	<td class="left">RNG Relations</td>
-	<td class="right">manifest:key-derivation-name="<a href="https://www.w3.org/TR/xmlschema-2/#string">&lt;string&gt;</a>" &nbsp;</td>
+	<td class="right">manifest:key-derivation-name="<a href="https://www.w3.org/TR/xmlschema-2/#string">#string</a>" &nbsp;</td>
 </tr>
 </table>
 <br />
@@ -364,7 +364,7 @@ <h3><a name="attribute_manifest:media-type_1">manifest:media-type Attribute</a><
 </tr>
 <tr>
 	<td class="left">RNG Relations</td>
-	<td class="right">manifest:media-type="<a href="https://www.w3.org/TR/xmlschema-2/#string">&lt;string&gt;</a>" &nbsp;</td>
+	<td class="right">manifest:media-type="<a href="https://www.w3.org/TR/xmlschema-2/#string">#string</a>" &nbsp;</td>
 </tr>
 </table>
 <br />
@@ -389,7 +389,7 @@ <h3><a name="attribute_manifest:salt_1">manifest:salt Attribute</a></h3>
 </tr>
 <tr>
 	<td class="left">RNG Relations</td>
-	<td class="right">manifest:salt="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">&lt;base64Binary&gt;</a>" &nbsp;</td>
+	<td class="right">manifest:salt="<a href="https://www.w3.org/TR/xmlschema-2/#base64Binary">#base64Binary</a>" &nbsp;</td>
 </tr>
 </table>
 <br />
@@ -414,7 +414,7 @@ <h3><a name="attribute_manifest:size_1">manifest:size Attribute</a></h3>
 </tr>
 <tr>
 	<td class="left">RNG Relations</td>
-	<td class="right">manifest:size="<a href="https://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">&lt;nonNegativeInteger&gt;</a>" &nbsp;</td>
+	<td class="right">manifest:size="<a href="https://www.w3.org/TR/xmlschema-2/#nonNegativeInteger">#nonNegativeInteger</a>" &nbsp;</td>
 </tr>
 </table>
 <br />