From fd683a656285a4709ed5361c17ef3433b401c763 Mon Sep 17 00:00:00 2001
From: hrennau <hrennau@yahoo.de>
Date: Wed, 22 May 2024 16:35:13 +0200
Subject: [PATCH 1/9] Fixed bug responsible for duplicated element reports
 (e.g. OJPRequest).

---
 docs/generate_tables/xco-domain.xqm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/generate_tables/xco-domain.xqm b/docs/generate_tables/xco-domain.xqm
index 4e05d49f..ba9011b0 100644
--- a/docs/generate_tables/xco-domain.xqm
+++ b/docs/generate_tables/xco-domain.xqm
@@ -195,7 +195,7 @@ declare function dm:constructDomains($customDomains as element()?,
  :    C o m p i l e    f i l t e r    d o m a i n s
  :)
 (:~
- : Compiles custom domain defintions, type "filter domain".
+ : Compiles custom domain definitions, type "filter domain".
  :)
 declare function dm:compileFilterDomains(
                             $schemaDescriptors as element()*,
@@ -211,15 +211,20 @@ declare function dm:compileFilterDomains(
             dm:filterSchemaDescriptorsByTns(., $schemaDescriptors)
     let $tnsMinus :=      
         $domain/content/exceptTargetNamespace/
-            dm:filterSchemaDescriptorsByFiles(., $schemaDescriptors)
+            dm:filterSchemaDescriptorsByTns(., $schemaDescriptors)
     let $filesPlus := $domain/content/files/
         dm:filterSchemaDescriptorsByFiles(., $schemaDescriptors)
     let $filesMinus := $domain/content/exceptFiles/
         dm:filterSchemaDescriptorsByFiles(., $schemaDescriptors)        
     let $selected := ($tnsPlus, $filesPlus)
         [not(. = ($tnsMinus, $filesMinus))] 
+    (: Remove repeated selections (2024-05-22, hjr) :)
+    let $selectedDedup :=
+        for $xsdd in $selected
+        group by $filePath := $xsdd/@filePath/lower-case(.)
+        return $xsdd[1]
     let $selectedOrdered := 
-        dm:sortSchemaDescriptors($selected, $domain) 
+        dm:sortSchemaDescriptors($selectedDedup, $domain) 
     let $id := 'd'||$pos
     let $name := ($domain/@name, $id)[1]
     let $summary := $domain/dm:filterDomainSummary(.)

From b4ad2acc78c1f395d411b0eef63698e78676ce41 Mon Sep 17 00:00:00 2001
From: hrennau <hrennau@yahoo.de>
Date: Wed, 22 May 2024 17:17:14 +0200
Subject: [PATCH 2/9] Fixed bug responsible for gaps in the numbering of
 sections.

---
 docs/generate_tables/xco-html.xqm | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/docs/generate_tables/xco-html.xqm b/docs/generate_tables/xco-html.xqm
index 065a83c7..79d8a806 100644
--- a/docs/generate_tables/xco-html.xqm
+++ b/docs/generate_tables/xco-html.xqm
@@ -110,25 +110,18 @@ declare function hl:contabReport_domain(
         let $anno := $schema/z:annotation/z:documentation/string()
         let $headline := ($anno, $schemaFileName)[1]
         let $stypes := $schema/eu:getEdescReportSimpleTypes(.)
-        let $stypesTable := eu:stypesTable($stypes, $domain, $options)[$stypes]        
+        let $stypesTable := eu:stypesTable($stypes, $domain, $options)[$stypes]    
         let $tables :=
             for $comp at $cnr in (
                 $schema/z:components/*,
                 $schema/z:components/*//z:complexType[@z:typeID] ! u:copyNode(.)
             )
+            [self::z:complexType, self::z:group, self::z:element]
             let $compNr := 
                 let $shift := if ($stypes) then 1 else 0
                 return $cnr + $shift
             return
-                typeswitch($comp)
-                case element(z:complexType) | 
-                     element(z:group) |
-                     element(z:element) return
-                    hl:contabReport_complexComp($comp, $compNr, $schemaNr, $domain, $options)
-                case element(z:simpleType) return ()
-                case element(z:attributeGroup) return ()
-                case element(z:attribute) return ()                
-                default return error('Unexpected component, elem name: '||name($comp))
+                hl:contabReport_complexComp($comp, $compNr, $schemaNr, $domain, $options)
         return
             <div class="sect1" id="schema_{$schemaName}">{
                 <h2>{$schemaNr}. {$headline}</h2>,

From 6f4dad1035caa0c42d5ad735f9627d6da82cade1 Mon Sep 17 00:00:00 2001
From: hrennau <hrennau@yahoo.de>
Date: Wed, 22 May 2024 18:27:23 +0200
Subject: [PATCH 3/9] Fixed bug responsible for escaped characters in
 Javascript.

---
 docs/generate_tables/xco-html.xqm | 12 ++++++------
 docs/generate_tables/xco-util.xqm | 32 +++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 6 deletions(-)

diff --git a/docs/generate_tables/xco-html.xqm b/docs/generate_tables/xco-html.xqm
index 79d8a806..707adcef 100644
--- a/docs/generate_tables/xco-html.xqm
+++ b/docs/generate_tables/xco-html.xqm
@@ -149,7 +149,7 @@ declare function hl:contabReport_domain(
     let $_WRITE :=
         let $reportPath := dm:getReportPath('contab', $domain, $options)
         where ($reportPath)
-        return u:writeXmlDoc($reportPath, $htmlReport)
+        return u:writeXhtmlDoc($reportPath, $htmlReport)
     return $htmlReport       
 };
 
@@ -242,11 +242,11 @@ declare function hl:contabReport_head(
     <script type="text/javascript"><![CDATA[
       document.addEventListener('DOMContentLoaded', function() {
         var headers = ['h2', 'h3', 'h4', 'h5', 'h6'];
-        for (var i = 0; i &lt; headers.length; i++) {
+        for (var i = 0; i < headers.length; i++) {
           var headerElements = document.getElementsByTagName(headers[i]);
-          for (var j = 0; j &lt; headerElements.length; j++) {
+          for (var j = 0; j < headerElements.length; j++) {
             var header = headerElements[j];
-            header.innerHTML += '&lt;a class="header-link" href="#' + header.parentNode.id + '"&gt;&lt;span class="link-icon"&gt;&lt;/span&gt;&lt;/a&gt;';
+            header.innerHTML += '<a class="header-link" href="#' + header.parentNode.id + '"><span class="link-icon"></span></a>';
           }
         }
       });
@@ -766,7 +766,7 @@ declare function hl:contabReportIndex(
        }</html>
        ! u:prettyNode(.)
        
-    let $_WRITE := u:writeXmlDoc($filePath, $htmlReport)
+    let $_WRITE := u:writeXhtmlDoc($filePath, $htmlReport)
        
     return $htmlReport       
 };
@@ -945,7 +945,7 @@ declare function hl:enumDict_domain(
     let $_WRITE :=
         let $reportPath := dm:getReportPartPath('contab', 'enum-dict', $domain, $options)
         where ($reportPath)
-        return u:writeXmlDoc($reportPath, $htmlReport)
+        return u:writeXhtmlDoc($reportPath, $htmlReport)
        
     return $htmlReport       
 };
diff --git a/docs/generate_tables/xco-util.xqm b/docs/generate_tables/xco-util.xqm
index 67e59070..345dd91a 100644
--- a/docs/generate_tables/xco-util.xqm
+++ b/docs/generate_tables/xco-util.xqm
@@ -336,3 +336,35 @@ declare function u:writeXmlDoc($path as xs:string,
     u:writeXmlDoc($path, $doc, ())
 };
 
+(:~
+ : Writes an XHTML document to the file system. If the folder does not
+ : yet exist, it is created now.
+ :
+ : If no serialization parameters are specified, the output document
+ : is indented.
+ :
+ : @param path the file system path of the output file
+ : @param doc the document to be written (document or element node)
+ : @serParams optional serialization parameters
+ : @return the empty sequence
+ :)
+declare function u:writeXhtmlDoc($path as xs:string, 
+                                $doc as node(), 
+                                $serParams as map(xs:string, item()*)?)
+        as empty-sequence() {
+    let $dir := $path ! replace(., '/[^/]*$', '')
+    let $_CRDIR := if (file:exists($dir)) then () else file:create-dir($dir)
+    let $spar := if (exists($serParams)) then $serParams else 
+        map{'method': 'xml', 
+            'cdata-section-elements': 
+            'script', 'indent': 'yes', 
+            'doctype-system': 'html'}
+    return
+        file:write($path, $doc, $spar)
+};
+
+declare function u:writeXhtmlDoc($path as xs:string, 
+                                $doc as node())
+        as empty-sequence() {
+    u:writeXhtmlDoc($path, $doc, ())
+};

From 8e1a3e12af3d6cebd8a979c5e781ca7bcfd3105f Mon Sep 17 00:00:00 2001
From: hrennau <hrennau@yahoo.de>
Date: Wed, 22 May 2024 19:07:33 +0200
Subject: [PATCH 4/9] Improved XHTML serialization.

---
 docs/generate_tables/xco-util.xqm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docs/generate_tables/xco-util.xqm b/docs/generate_tables/xco-util.xqm
index 345dd91a..a873ef59 100644
--- a/docs/generate_tables/xco-util.xqm
+++ b/docs/generate_tables/xco-util.xqm
@@ -355,10 +355,11 @@ declare function u:writeXhtmlDoc($path as xs:string,
     let $dir := $path ! replace(., '/[^/]*$', '')
     let $_CRDIR := if (file:exists($dir)) then () else file:create-dir($dir)
     let $spar := if (exists($serParams)) then $serParams else 
-        map{'method': 'xml', 
-            'cdata-section-elements': 
-            'script', 'indent': 'yes', 
-            'doctype-system': 'html'}
+        map{'method': 'xhtml', 
+            'cdata-section-elements': 'script', 
+            'indent': 'yes', 
+            'html-version': '5.0'
+            }
     return
         file:write($path, $doc, $spar)
 };

From 06c60ce71a81304067b22535e99bc2c7ddc844e4 Mon Sep 17 00:00:00 2001
From: hrennau <hrennau@yahoo.de>
Date: Wed, 22 May 2024 19:13:27 +0200
Subject: [PATCH 5/9] Fixed typo.

---
 docs/generate_tables/xco-reporter.xqm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/generate_tables/xco-reporter.xqm b/docs/generate_tables/xco-reporter.xqm
index 30e94a31..2fc4d78d 100644
--- a/docs/generate_tables/xco-reporter.xqm
+++ b/docs/generate_tables/xco-reporter.xqm
@@ -305,7 +305,7 @@ declare function rp:contabReport(
     let $_WDEBUG := $xmlReport ! dg:WRITE_FILE(., 'EDESC-REPORT.XML', 'edesc-report', 'yes', $options)
     let $_LOG := trace('Write contab reports')
     let $htmlReport := hl:htmlReport('contab', $xmlReport, $xmlReportDir, $options) ! u:prettyNode(.)
-    let $_LOG := trace('Writing of contab reports fininshed')
+    let $_LOG := trace('Writing of contab reports finished')
     return ()
 }; 
 

From 61c870bd13f7b45e167605cc7b72cd47f5f1f436 Mon Sep 17 00:00:00 2001
From: hrennau <hrennau@yahoo.de>
Date: Tue, 28 May 2024 17:27:09 +0200
Subject: [PATCH 6/9] Refine text before groups, considering minOccurs=0.

---
 docs/generate_tables/xco-edesc-util.xqm |  4 ++++
 docs/generate_tables/xco-html.xqm       | 31 ++++++++++++++++++++-----
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/docs/generate_tables/xco-edesc-util.xqm b/docs/generate_tables/xco-edesc-util.xqm
index 1c645112..0ea34b1a 100644
--- a/docs/generate_tables/xco-edesc-util.xqm
+++ b/docs/generate_tables/xco-edesc-util.xqm
@@ -259,11 +259,15 @@ declare function eu:contentTable_elemRow(
     let $startChoice := (
         array:flatten($startedChoices)/eu:getChoiceSummary(.) => string-join('; ')
         )[string()]
+    let $choiceOcc := 
+        let $values := $startedChoices?* ! @z:occ => string-join('; ')
+        return $values ! attribute startChoiceOcc {.}        
     return
         <row typeCategory="{$typeCategory}">{
             (: The @startChoice attribute will trigger a text line similar to 
                "The element contains one of ..." :)
             $startChoice ! attribute startChoice {.},
+            $choiceOcc,
             $groupCol,
             $branchCol,
             <name colspan="{$nameColspan}" rowspan="1">{
diff --git a/docs/generate_tables/xco-html.xqm b/docs/generate_tables/xco-html.xqm
index 707adcef..cfc6c632 100644
--- a/docs/generate_tables/xco-html.xqm
+++ b/docs/generate_tables/xco-html.xqm
@@ -110,13 +110,20 @@ declare function hl:contabReport_domain(
         let $anno := $schema/z:annotation/z:documentation/string()
         let $headline := ($anno, $schemaFileName)[1]
         let $stypes := $schema/eu:getEdescReportSimpleTypes(.)
-        let $stypesTable := eu:stypesTable($stypes, $domain, $options)[$stypes]    
+        let $stypesTable := eu:stypesTable($stypes, $domain, $options)[$stypes]  
+
+        (: Deduplicate and sort local types :)
+        let $localTypes :=
+            for $ltype in $schema/z:components/*//z:complexType[@z:typeID]
+            group by $typeId := $ltype/@z:typeID
+            order by $typeId ! replace(., '.*typedef-(.*)', '$1') ! xs:decimal(.)
+            return $ltype[1]! u:copyNode(.)
         let $tables :=
             for $comp at $cnr in (
-                $schema/z:components/*,
-                $schema/z:components/*//z:complexType[@z:typeID] ! u:copyNode(.)
+                $schema/z:components/*
+                    [self::z:complexType, self::z:group, self::z:element],
+                $localTypes
             )
-            [self::z:complexType, self::z:group, self::z:element]
             let $compNr := 
                 let $shift := if ($stypes) then 1 else 0
                 return $cnr + $shift
@@ -580,11 +587,13 @@ optional, single, part of a choice
                     'Inherited content is followed by ', <b>own content</b>, ':')
                 
             let $startChoiceItems := $row/@startChoice/tokenize(., ';\s*')
+            let $startChoiceOccItems := $row/@startChoiceOcc/tokenize(., ';\s*')
+            let $_DEBUG := $row[@startChoice] ! trace(.)
             return (
                 hu:tableTextLine($startOwnContentMsg, 'announceBase', ())[$startOwnContent]
                 ,                
                 if (empty($startChoiceItems)) then () else
-                for $startChoiceItem in $startChoiceItems
+                for $startChoiceItem at $choiceNr in $startChoiceItems
                 let $items := tokenize($startChoiceItem, ',\s*')
                 let $contextbranch := $items[starts-with(., 'contextbranch')] ! substring-after(., '=')
                 let $elems := $items[starts-with(., 'elems')] ! substring-after(., '=')
@@ -597,9 +606,19 @@ optional, single, part of a choice
                     $elems ! ('elements ('||$elems||')'),
                     $seqs ! ('element sequences ('||$seqs||')')
                     ), ' or ')
+                let $oneOrNoneOrOne := 
+                    let $occs := $startChoiceOccItems[$choiceNr]
+                    let $minOcc := substring-before($occs, ':')
+                    let $maxOcc := substring-after($occs, ':')
+                    return
+                        if ($minOcc eq '0') then
+                            let $alter := if ($maxOcc eq '*') then 'more' else 'one'
+                            return 'none or '||$alter
+                        else if ($maxOcc eq '*') then 'one or more'
+                        else 'one'
                 return
                     hu:tableTextLine(
-                    ($startText, 'element contains ', <em>one</em>, 
+                    ($startText, 'element contains ', <em>{$oneOrNoneOrOne}</em>, 
                      ' of the following '||$alternatives))
                 ,
                 <tr>{

From 860bb20b236eef228934f5855ba5c9121096c0d9 Mon Sep 17 00:00:00 2001
From: hrennau <hrennau@yahoo.de>
Date: Tue, 28 May 2024 19:27:02 +0200
Subject: [PATCH 7/9] Start page displaying the list of domain reports: removed
 prefix indicating indentation.

---
 docs/generate_tables/xco-edesc.xqm |  4 +++-
 docs/generate_tables/xco-html.xqm  | 33 ++++++++++++++++++++++--------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/docs/generate_tables/xco-edesc.xqm b/docs/generate_tables/xco-edesc.xqm
index a5c41f02..92c0aabc 100644
--- a/docs/generate_tables/xco-edesc.xqm
+++ b/docs/generate_tables/xco-edesc.xqm
@@ -93,13 +93,15 @@ declare function ed:writeExpandedCompDescsPerDomain(
 
         (: Create schema reports: 
         :    descriptors are grouped by schema and wrapped in schema elements :)
+        let $schemaMap := map:merge(
+            $schemas/map:entry(base-uri(.) ! u:normalizeUri(., ()), .))        
         let $schemaReports :=        
             for $edesc in $edescs
             group by $baseUri := $edesc/base-uri(.) ! u:normalizeUri(., ())
             return
                 <z:schema xml:base="{$baseUri}" filePath="{$baseUri}">{
                     if ($options?skipAnno) then () else
-                    let $schema := $schemas[base-uri(.) eq $baseUri]
+                    let $schema := $schemaMap($baseUri)
                     return $schema/xs:annotation[1]/cd:annotationDescriptor(.),
                     <z:components count="{count($edesc)}">{$edesc}</z:components>
                 }</z:schema>
diff --git a/docs/generate_tables/xco-html.xqm b/docs/generate_tables/xco-html.xqm
index cfc6c632..f37ca9c0 100644
--- a/docs/generate_tables/xco-html.xqm
+++ b/docs/generate_tables/xco-html.xqm
@@ -85,7 +85,7 @@ declare function hl:contabReport($report as element()?,
 };
 
 (:~
- : Transforms an edesc report or report domain into a contab report. 
+ : Creates a section of a contab report, describing a domain. 
  :
  : If no domains have been defined, the function creates the complete
  : report, otherwise the part corresponding to a single domain.
@@ -588,7 +588,7 @@ optional, single, part of a choice
                 
             let $startChoiceItems := $row/@startChoice/tokenize(., ';\s*')
             let $startChoiceOccItems := $row/@startChoiceOcc/tokenize(., ';\s*')
-            let $_DEBUG := $row[@startChoice] ! trace(.)
+            (: let $_DEBUG := $row[@startChoice] ! trace(.) :)
             return (
                 hu:tableTextLine($startOwnContentMsg, 'announceBase', ())[$startOwnContent]
                 ,                
@@ -845,7 +845,7 @@ declare function hl:contabReportIndex_toc(
             <h4>{$title}</h4>
             <p class="tocsubtitle">{$subtitle}</p>
         </div>
-        <ul class="sectlevel1">{
+        <ul class="sectlevel1" id="ulstartpage">{
           $linkTree
         }</ul>
     </div>
@@ -865,7 +865,16 @@ declare function hl:contabReportIndex_tocTree(
                               $domainDict as map(xs:string, item()*),
                               $options as map(xs:string, item()*)?)
         as element(li)* {
-    hl:contabReportIndex_tocTreeREC($ftree, $domainDict, $options)
+    (: Determine where file entries should have a prefix indicating
+       the level of indentation - only if different labels occur. :)
+    let $options_indentationLabel :=
+        if (empty($ftree//fi[count(ancestor::fo) gt 1])) then 'no'
+        else 'yes'
+    let $optionsTocTree := 
+        map:put($options, 'withIndentationLabel', 
+        $options_indentationLabel)
+    return        
+    hl:contabReportIndex_tocTreeREC($ftree, $domainDict, $optionsTocTree)
 };
 
 declare function hl:contabReportIndex_tocTreeREC(
@@ -876,11 +885,15 @@ declare function hl:contabReportIndex_tocTreeREC(
     typeswitch($n)
     case element(fo) return
         let $level := count($n/ancestor::fo)
-        let $prefix := (for $i in 1 to $level return '>> ') => string-join('')
+        let $prefix := 
+            if ($options?withIndentationLabel eq 'no') then () else
+            (for $i in 1 to $level return '>> ') => string-join('')
+        let $name := $n/@name/string()               
         return (
+            if (not($name)) then () else
             <li>{
-                <span class="monospace">{$prefix}</span>,
-                <span class="darkbrown">{$n/@name/string()}</span>
+                $prefix ! <span class="monospace">{.}</span>,
+                <span class="darkbrown">{$name}</span>
             }</li>,
             $n/* ! hl:contabReportIndex_tocTreeREC(., $domainDict, $options)
         )
@@ -891,7 +904,9 @@ declare function hl:contabReportIndex_tocTreeREC(
         
         let $path := $n/ancestor-or-self::*/@name => string-join('/')
         let $level := count($n/ancestor::fo)
-        let $prefix := (for $i in 1 to $level return '.  ') => string-join('')
+        let $prefix := 
+            if ($options?withIndentationLabel eq 'no') then () else
+                (for $i in 1 to $level return '.  ') => string-join('')
         let $dinfo := $domainDict($path)
         let $href := $dinfo?relPath
         let $title := $dinfo?fileName||
@@ -900,7 +915,7 @@ declare function hl:contabReportIndex_tocTreeREC(
                            [contains($href, 'enum-dict')]
         return
             <li>{
-                <span class="monospace">{$prefix}</span>,
+                $prefix ! <span class="monospace">{.}</span>,
                 <a shape="rect" href="{$href}">{$titleClass, $title}</a>
             }</li>
     default return ()            

From 2a93dd55bbaa64d510745fd5953a36e9ce123d45 Mon Sep 17 00:00:00 2001
From: hrennau <hrennau@yahoo.de>
Date: Tue, 28 May 2024 20:04:31 +0200
Subject: [PATCH 8/9] Start page displays configured domain titles.

---
 docs/generate_tables/xco-html.xqm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/generate_tables/xco-html.xqm b/docs/generate_tables/xco-html.xqm
index f37ca9c0..48181b3b 100644
--- a/docs/generate_tables/xco-html.xqm
+++ b/docs/generate_tables/xco-html.xqm
@@ -807,7 +807,7 @@ declare function hl:contabReportIndex_toc(
         let $filePath := dm:getReportPath('contab', $domain, $options)
         let $relPath := fu:getRelPath($dirPath, $filePath)        
         let $fileName := $relPath ! file:name(.)
-        let $title := $domain/processing/title/string()
+        let $title := $domain/processing/(titleToplevel, title, $fileName)[1] ! string()
         let $enumPath := 
             dm:getReportPartPath('contab', 'enum-dict', $domain, $options)[file:exists(.)]
         let $enumRelPath := $enumPath ! fu:getRelPath($dirPath, .)            
@@ -909,7 +909,7 @@ declare function hl:contabReportIndex_tocTreeREC(
                 (for $i in 1 to $level return '.  ') => string-join('')
         let $dinfo := $domainDict($path)
         let $href := $dinfo?relPath
-        let $title := $dinfo?fileName||
+        let $title := $dinfo?title||
                       ($dinfo?countEnumTypes[string()] ! (' ('||.||')'))
         let $titleClass := attribute class {'enum-dict'} 
                            [contains($href, 'enum-dict')]

From cba878bbcb8488f53b78c2bcce601fb9e5e80d13 Mon Sep 17 00:00:00 2001
From: hrennau <hrennau@yahoo.de>
Date: Wed, 19 Jun 2024 15:01:22 +0200
Subject: [PATCH 9/9] Cardinalities displayed without <code> element.

---
 docs/generate_tables/xco-html.xqm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/docs/generate_tables/xco-html.xqm b/docs/generate_tables/xco-html.xqm
index 48181b3b..14b2633f 100644
--- a/docs/generate_tables/xco-html.xqm
+++ b/docs/generate_tables/xco-html.xqm
@@ -662,9 +662,15 @@ optional, single, part of a choice
                         <p>{
                             hu:classP(),
                             if ($isMandatory) then
-                                <code><strong title="{$occTitle}">{$occValue}</strong></code>
+                                <strong title="{$occTitle}">{$occValue}</strong>
                             else
                                 <span title="{$occTitle}">{$occValue}</span>
+                            (: Alternative with <code> - not used
+                            if ($isMandatory) then
+                                <code><strong title="{$occTitle}">{$occValue}</strong></code>                                
+                            else
+                                <code><span title="{$occTitle}">{$occValue}</span></code>
+                             :)
                         }</p>
                     }</td>,
                     $row/type/