From 13b7fe94e1ecb736ec60d39ae005c6bb68135bc8 Mon Sep 17 00:00:00 2001
From: Intelligent2013 <dyuzhev@gmail.com>
Date: Sat, 7 Nov 2020 19:15:54 +0300
Subject: [PATCH] xslt updated for #1

---
 .../resources/stepmod.base_xsl/common.xsl     |   3 +-
 .../stepmod.base_xsl/res_doc/common.xsl       |  25 +-
 .../stepmod.base_xsl/res_doc/express_code.xsl | 901 ++++++++++++++++++
 .../stepmod.base_xsl/res_doc/express_link.xsl |  20 +-
 .../stepmod.base_xsl/res_doc/resource.xsl     |  46 +-
 .../res_doc/sect_4_express.xsl                |   6 +-
 .../res_doc/sect_a_short_names.xsl            |   4 +-
 .../res_doc/sect_c_exp_schema.xsl             | 227 +++++
 src/main/resources/stepmod2mn.adoc.xsl        | 272 ++++--
 9 files changed, 1398 insertions(+), 106 deletions(-)
 create mode 100644 src/main/resources/stepmod.base_xsl/res_doc/express_code.xsl
 create mode 100644 src/main/resources/stepmod.base_xsl/res_doc/sect_c_exp_schema.xsl

diff --git a/src/main/resources/stepmod.base_xsl/common.xsl b/src/main/resources/stepmod.base_xsl/common.xsl
index c86fc9c..6f18fec 100644
--- a/src/main/resources/stepmod.base_xsl/common.xsl
+++ b/src/main/resources/stepmod.base_xsl/common.xsl
@@ -1912,7 +1912,8 @@ width="20" height="20"/> -->
 							<xsl:variable name="schema_position">
 								<xsl:apply-templates select="$resdoc_xml//resource/schema[@name=$schema_name]" mode="position"/>
 							</xsl:variable>
-							<xsl:value-of select="concat($baselink,'resource_docs/',$resource_doc,'/sys/', $schema_position, '_schema',$FILE_EXT,'#',$express_ref)"/><!-- FOO -->
+							<!-- <xsl:value-of select="concat($baselink,'resource_docs/',$resource_doc,'/sys/', $schema_position, '_schema',$FILE_EXT,'#',$express_ref)"/> --><!-- FOO -->
+							<xsl:value-of select="concat('/resource_docs/',$resource_doc,'#',$express_ref)"/>
 						</xsl:when>
 						<xsl:otherwise>
 							<xsl:value-of select="concat($baselink,'resources/',$module,'/', $module,$FILE_EXT,'#',$express_ref)"/>
diff --git a/src/main/resources/stepmod.base_xsl/res_doc/common.xsl b/src/main/resources/stepmod.base_xsl/res_doc/common.xsl
index 9c2039e..c569730 100644
--- a/src/main/resources/stepmod.base_xsl/res_doc/common.xsl
+++ b/src/main/resources/stepmod.base_xsl/res_doc/common.xsl
@@ -156,14 +156,35 @@ $Id: common.xsl,v 1.33 2008/05/21 20:50:25 abf Exp $
 				</xsl:variable>
 				
 				<xsl:choose>
+				
 					<xsl:when test="contains($href, concat('/', $current_module, '/'))"><!-- if link inside current module -->
 						<xsl:text>&lt;&lt;</xsl:text><xsl:value-of select="substring-after($href,'#')"/><xsl:text>&gt;&gt;</xsl:text>
 					</xsl:when>
-					<xsl:otherwise>
 					
+					<xsl:otherwise>
 						<xsl:call-template name="insertHyperlink">
 							<xsl:with-param name="a">
-								<a href="{$href}"><xsl:value-of select="$link_text"/></a>							
+								<!-- <a href="{$href}"><xsl:value-of select="$link_text"/></a> -->
+								<a>
+									<xsl:attribute name="href">
+										<xsl:choose>
+											<xsl:when test="contains($href, '#')">
+												<xsl:value-of select="substring-before($href, '#')"/>
+											</xsl:when>
+											<xsl:otherwise>
+												<xsl:value-of select="$href"/>
+											</xsl:otherwise>
+										</xsl:choose>
+									</xsl:attribute>
+									<xsl:choose>
+										<xsl:when test="contains($href, '#')">
+											<xsl:value-of select="substring-after($href, '#')"/>
+										</xsl:when>
+										<xsl:otherwise>
+											<xsl:value-of select="$link_text"/>
+										</xsl:otherwise>
+									</xsl:choose>
+								</a>
 							</xsl:with-param>
 						</xsl:call-template>						
 					
diff --git a/src/main/resources/stepmod.base_xsl/res_doc/express_code.xsl b/src/main/resources/stepmod.base_xsl/res_doc/express_code.xsl
new file mode 100644
index 0000000..86011a2
--- /dev/null
+++ b/src/main/resources/stepmod.base_xsl/res_doc/express_code.xsl
@@ -0,0 +1,901 @@
+<?xml version="1.0"?>
+
+<!--
+     $Id: express_code.xsl,v 1.16 2011/03/02 21:30:39 lothartklein Exp $
+
+  Author: Rob Bodington, Eurostep Limited
+  Owner:  Developed by Eurostep and supplied to NIST under contract.
+  Purpose: 
+     Used to display the XML encoded Express as Express code
+     i.e. hyper linked plain express with no descriptions.
+-->
+
+<xsl:stylesheet 
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	version="1.0"
+>
+
+<!--   <xsl:import href="common.xsl"/>
+
+  <xsl:import href="express_application.xsl"/>
+  <xsl:import href="express_link.xsl"/>
+
+
+  <xsl:output method="html"/>           -->
+
+
+  <!-- +++++++++++++++++++
+         Templates
+       +++++++++++++++++++ -->
+
+
+<xsl:template match="schema" mode="code">
+  <xsl:variable name="aname">
+    <xsl:call-template name="express_a_name">
+      <xsl:with-param name="section1" select="@name"/>
+    </xsl:call-template>
+  </xsl:variable>    
+
+  <!-- <code> -->
+	<xsl:call-template name="insertLutaMLCodeStart"/>
+    <!-- <br/><br/> -->
+		
+    <!-- <a name="{$aname}">
+      SCHEMA <b><xsl:value-of select="@name"/></b>;</a> -->
+		<xsl:text>[[</xsl:text><xsl:value-of select="$aname"/>
+		<xsl:text>]]</xsl:text>
+		<xsl:text>SCHEMA *</xsl:text><xsl:value-of select="@name"/><xsl:text>*;</xsl:text>
+		
+		<xsl:call-template name="insertCodeEnd"/>
+		<xsl:text>&#xa;</xsl:text>
+  <!-- <br/><br/>
+</code> -->
+  <xsl:apply-templates select="./interface" mode="code"/>
+  <xsl:apply-templates select="./constant" mode="code"/>
+  <xsl:apply-templates select="./type" mode="code"/>
+  <xsl:apply-templates select="./entity" mode="code"/>
+  <xsl:apply-templates select="./subtype.constraint" mode="code">
+    <xsl:sort select="@name"/>
+  </xsl:apply-templates>
+  <xsl:apply-templates select="./rule" mode="code"/>
+  <xsl:apply-templates select="./function" mode="code"/>
+  <xsl:apply-templates select="./procedure" mode="code"/>
+  <!-- <code>
+  <br/> -->
+	<xsl:call-template name="insertLutaMLCodeStart"/>
+  <xsl:text>END_SCHEMA;&#160;&#160;--&#160;</xsl:text><xsl:value-of select="@name"/>
+  <!-- <br/> --><xsl:text>&#xa;</xsl:text>
+	<xsl:call-template name="insertCodeEnd"/>
+  <!-- </code> -->
+</xsl:template>
+
+
+<xsl:template match="interface" mode="code">
+  <xsl:variable 
+    name="schema_name" 
+    select="../@name"/>
+  <!-- <code> -->      
+	<xsl:call-template name="insertLutaMLCodeStart"/>
+  <xsl:choose>
+    <xsl:when test="@kind='reference'">
+      <xsl:text>REFERENCE FROM </xsl:text>
+      <xsl:call-template name="link_schema">
+        <xsl:with-param name="schema_name" select="@schema"/>
+        <xsl:with-param name="clause" select="'annexe'"/>
+      </xsl:call-template>
+
+      <xsl:choose>
+        <xsl:when test="./interfaced.item">
+          <!-- if interface items then out put source tail comment now -->
+          <xsl:apply-templates select="." mode="source"/>
+          <xsl:apply-templates select="./interfaced.item" mode="code"/>;
+         <!--  <br/><br/>       -->    
+					<xsl:text>&#xa;&#xa;</xsl:text>
+        </xsl:when>
+        <xsl:otherwise><xsl:text>;</xsl:text>
+          <xsl:apply-templates select="." mode="source"/>
+          <!-- <br/><br/> --><xsl:text>&#xa;&#xa;</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>      
+
+    </xsl:when>
+    <xsl:when test="@kind='use'">
+      <xsl:text>USE FROM </xsl:text>
+      <xsl:call-template name="link_schema">
+        <!-- defined in sect_4_express_link.xsl -->
+        <xsl:with-param name="schema_name" select="@schema"/>
+        <xsl:with-param name="clause" select="'annexe'"/>
+      </xsl:call-template>
+
+      <xsl:choose>
+        <xsl:when test="./interfaced.item">
+          <!-- if interface items then out put source tail comment now -->
+          <xsl:apply-templates select="." mode="source"/>
+          <xsl:apply-templates select="./interfaced.item" mode="code"/><xsl:text>;</xsl:text>
+          <!--  <br/><br/>       -->    
+					<xsl:text>&#xa;&#xa;</xsl:text>
+        </xsl:when>
+        <xsl:otherwise><xsl:text>;</xsl:text>
+          <xsl:apply-templates select="." mode="source"/>
+          <!--  <br/><br/>       -->    
+					<xsl:text>&#xa;&#xa;</xsl:text>
+        </xsl:otherwise>
+      </xsl:choose>      
+
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:call-template name="error_message">
+        <xsl:with-param 
+          name="message" 
+          select="concat('Error ec1: Interface in schema ', 
+                  $schema_name, 
+                  ' is incorrectly specified')"/>
+      </xsl:call-template>
+    </xsl:otherwise>
+  </xsl:choose>
+	<xsl:call-template name="insertCodeEnd"/>
+<!-- </code> -->
+</xsl:template>
+
+<!-- output the trailing comment that shows where the express came from -->
+<xsl:template match="interface" mode="source_2"> <!-- there is in sect_4_express.xsl already -->
+  <xsl:variable name="resource" select="string(@schema)"/> 
+      <!-- In our case it is always  an integrated resource -->
+
+      <xsl:variable name="resource_ok">
+        <xsl:call-template name="check_resource_exists">
+          <xsl:with-param name="schema" select="$resource"/>
+        </xsl:call-template>
+      </xsl:variable>
+
+      <xsl:choose>
+        <xsl:when test="$resource_ok='true'">
+
+          <!-- the IR directory must be all lower case - the schema itself
+               sometimes is mixed case -->
+          <xsl:variable name="LOWER" select="'abcdefghijklmnopqrstuvwxyz_'"/>
+          <xsl:variable name="UPPER" select="'ABCDEFGHIJKLMNOPQRSTUVWXYZ'"/>
+          <xsl:variable name="lmodule" 
+            select="translate($resource,$UPPER,$LOWER)"/>
+
+          <!-- found integrated resource schema, so get IR title -->
+          <xsl:variable name="reference">
+            <xsl:value-of
+              select="document(concat('../../data/resources/',$lmodule,'/',$lmodule,'.xml'))/express/@reference"/>
+          </xsl:variable>
+
+          <xsl:choose>
+            <xsl:when test="string-length($reference)>0">
+              <xsl:if test="not(starts-with($reference,'ISO 10303-')) and
+                            not(starts-with($reference,'ISO 13584-')) and
+                            not(starts-with($reference,'ISO 15926-'))">
+              <xsl:call-template name="error_message">
+                <xsl:with-param name="message">
+                  <xsl:value-of select="concat('Error IF-3a: The reference parameter for ',
+                            $resource,' is incorrectly specified. It should
+                    be of the form ISO 10303-*** (or ISO 13584-*** or ISO 15926-***) . Change @reference in
+                            data/resources/',$resource,'/',$resource,'.xml.')"/>
+                  </xsl:with-param>
+                </xsl:call-template>
+              </xsl:if>
+
+              <xsl:value-of select="concat('&#160;&#160;&#160;-- ',$reference)"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:call-template name="error_message">
+                <xsl:with-param name="message">
+                  <xsl:value-of 
+                    select="concat('Error IF-3: The reference parameter for ',
+                            $resource,' has not been specified ','Add
+                            @reference (e.g. ISO 10303-***) to
+data/resources/',$resource,'/',$resource,'.xml.')"/>
+                </xsl:with-param>
+              </xsl:call-template>
+            </xsl:otherwise>
+          </xsl:choose>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:call-template name="error_message">
+            <xsl:with-param name="message" 
+              select="concat('Error IF-2: ',$resource_ok)"/>
+          </xsl:call-template>
+        </xsl:otherwise>
+      </xsl:choose>
+
+</xsl:template>
+
+
+<xsl:template match="interfaced.item" mode="code">
+  <xsl:choose>
+    <xsl:when test="position()=1">
+      <!-- <br/> --><xsl:text>&#xa;&#160;&#160;(</xsl:text>
+    </xsl:when>
+    <xsl:otherwise>
+        <xsl:text>&#160;&#160;</xsl:text>
+    </xsl:otherwise>
+  </xsl:choose>
+
+  <xsl:call-template name="link_object">
+    <xsl:with-param name="object_name" select="@name"/>
+    <xsl:with-param name="object_used_in_schema_name" 
+      select="../../@name"/>
+    <xsl:with-param name="clause" select="'annexe'"/>
+  </xsl:call-template>
+
+  <xsl:if test="@alias">
+    <xsl:text>AS&#160;</xsl:text><xsl:value-of select="@alias"/>
+  </xsl:if>
+
+  <xsl:if test="position()!=last()">,<xsl:text>&#xa;</xsl:text><!-- <br/> --></xsl:if>
+
+  <xsl:if test="position()=last()">)</xsl:if>
+
+</xsl:template>
+
+<xsl:template match="constant" mode="code">
+  <!-- <code> -->
+	<xsl:call-template name="insertLutaMLCodeStart"/>
+    <xsl:variable 
+      name="schema_name" 
+      select="../@name"/>      
+    
+    <xsl:variable name="aname">
+      <xsl:call-template name="express_a_name">
+        <xsl:with-param name="section1" select="$schema_name"/>
+        <xsl:with-param name="section2" select="@name"/>
+      </xsl:call-template>
+    </xsl:variable>    
+    <br/>
+    <xsl:if test="position()=1">CONSTANT<xsl:text>&#xa;</xsl:text><!-- <br/> --></xsl:if>
+    <!-- <A NAME="{$aname}"></A> -->
+		<xsl:text>[[</xsl:text><xsl:value-of select="$aname"/><xsl:text>]]</xsl:text>
+    <xsl:text>&#160;&#160;</xsl:text><xsl:value-of select="@name"/> : <xsl:apply-templates select="./*" mode="underlyingconstant"/><xsl:apply-templates select="./*" mode="underlying"/> := <xsl:choose>
+    
+    <xsl:when test="./aggregate and contains(@expression,',')"><xsl:text>&#xa;</xsl:text><!-- <br/> -->
+      <xsl:text>&#160;&#160;&#160;</xsl:text><xsl:value-of select="concat(substring-before(@expression,','),',')"/>
+      <xsl:call-template name="output_constant_expression">
+        <xsl:with-param name="expression" select="substring-after(@expression,',')"/>
+      </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="@expression"/>;
+      </xsl:otherwise>
+  </xsl:choose>
+    <xsl:if test="position()=last()">
+      <xsl:text>&#xa;</xsl:text><!-- <br/> -->
+      <xsl:text>END_CONSTANT;</xsl:text>
+      <!-- <br/> -->
+			<xsl:text>&#xa;</xsl:text>
+    </xsl:if>
+  <!-- </code> -->
+	<xsl:call-template name="insertCodeEnd"/>
+</xsl:template>
+
+<!-- THX added to support constants that are aggregates -->
+
+
+<xsl:template name="output_constant_expression_2"> <!-- there is in sect_4_express.xsl yet -->
+  <xsl:param name="expression"/>
+  <!--  <xsl:value-of select="','" /> -->
+    <br/>
+    &#160;&#160;&#160;&#160;<xsl:value-of select="substring-before($expression,',')"/>
+    
+    <xsl:choose>
+      <xsl:when test="contains($expression,',')">,
+        <xsl:call-template name="output_constant_expression">
+          <xsl:with-param name="expression" select="substring-after($expression,',')"/>
+        </xsl:call-template>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="$expression"/>;
+      </xsl:otherwise>
+    </xsl:choose>
+
+
+</xsl:template>
+
+<xsl:template match="description" mode="underlyingconstant">
+<!-- keeps description if any from printing out -->
+</xsl:template>
+<xsl:template match="aggregate" mode="underlyingconstant">
+  <xsl:choose>
+    <xsl:when test="@lower">
+      <xsl:value-of select="concat(@type, '[', @lower, ':', @upper, '] OF ')"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="concat(@type, ' OF ')"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+
+<xsl:template match="type" mode="code">
+  <!-- <code> -->
+	<xsl:call-template name="insertLutaMLCodeStart"/>
+  <xsl:variable 
+    name="schema_name" 
+    select="../@name"/>      
+
+  <xsl:variable name="aname">
+    <xsl:call-template name="express_a_name">
+      <xsl:with-param name="section1" select="$schema_name"/>
+      <xsl:with-param name="section2" select="@name"/>
+    </xsl:call-template>
+  </xsl:variable>    
+
+  <!-- <br/>
+  <A NAME="{$aname}">TYPE </A> -->
+	<xsl:text>[[</xsl:text><xsl:value-of select="$aname"/><xsl:text>]]</xsl:text>
+	<xsl:text>TYPE </xsl:text>
+	<!-- <b><xsl:value-of select="@name"/></b> = -->
+	<xsl:text>*</xsl:text><xsl:value-of select="@name"/><xsl:text>* =</xsl:text>
+      <xsl:apply-templates select="./aggregate" mode="code"/>        
+      <xsl:choose>
+        <xsl:when test="./where">
+          <xsl:apply-templates select="./*" mode="underlying"/><xsl:text>;&#xa;</xsl:text><!-- <br/> -->
+          <xsl:apply-templates select="./where" mode="code"/>
+        </xsl:when>
+        <xsl:otherwise>
+          <xsl:apply-templates select="./*" mode="underlying"/><xsl:text>;&#xa;</xsl:text><!-- <br/> -->
+        </xsl:otherwise>
+      </xsl:choose>
+    <xsl:text>END_TYPE;&#xa;</xsl:text>
+  <!-- <br/> -->
+<!-- </code> -->
+<xsl:call-template name="insertCodeEnd"/>
+</xsl:template>
+
+<!-- empty template to prevent the description element being output along
+     with the code -->
+<xsl:template match="description" mode="underlying2"/> <!-- there is in sect_4_express.xsl already -->
+
+
+<xsl:template match="typename" mode="underlying2">  <!-- there is in sect_4_express.xsl already -->
+  <xsl:call-template name="link_object">
+    <xsl:with-param name="object_name" select="@name"/>
+    <xsl:with-param name="object_used_in_schema_name" 
+      select="../../../@name"/>
+    <xsl:with-param name="clause" select="'annexe'"/>
+  </xsl:call-template>
+</xsl:template>
+
+
+
+<xsl:template match="builtintype" mode="underlying2">
+  <xsl:choose>
+    <xsl:when test="@type='GENERICENTITY'">GENERIC_ENTITY</xsl:when>
+    <xsl:otherwise>  
+      <xsl:value-of select="@type"/>
+    </xsl:otherwise>
+  </xsl:choose> 
+  <xsl:variable name="type_label" select="@typelabel"/>
+	<xsl:if test="$type_label">
+		<xsl:value-of select="concat( ' : ', $type_label)"/>
+	</xsl:if>
+</xsl:template>
+
+
+<xsl:template match="select" mode="underlying2"> <!-- there is in sect_4_express.xsl already -->
+  <xsl:if test="@extensible='YES' or @extensible='yes'">
+    EXTENSIBLE
+  </xsl:if>
+
+  <xsl:if test="@genericentity='YES' or @genericentity='yes'">
+    GENERIC_ENTITY
+  </xsl:if>
+
+  SELECT<xsl:if test="@basedon">
+    BASED_ON
+      <xsl:call-template name="link_object">
+        <xsl:with-param name="object_name" select="@basedon"/>
+        <xsl:with-param name="object_used_in_schema_name" 
+          select="../../@name"/>
+        <xsl:with-param name="clause" select="'annexe'"/>
+      </xsl:call-template>  
+  </xsl:if>
+  <!-- need to check for NULL as some XML outputs attribute as null of not
+       known -->
+  <xsl:if test="@selectitems and 
+                (string-length(@selectitems)!=0)">
+    <xsl:if test="@basedon">
+      WITH 
+    </xsl:if><br/>
+    &#160;&#160;&#160;(<xsl:call-template name="link_list">
+    <xsl:with-param name="linebreak" select="'yes'"/>
+    <xsl:with-param name="suffix" select="', '"/>
+    <xsl:with-param name="prefix" select="'&#160;&#160;&#160;&#160;'"/>
+    <xsl:with-param name="first_prefix" select="'no'"/>
+    <xsl:with-param name="list" select="@selectitems"/>
+    <xsl:with-param name="object_used_in_schema_name"
+      select="../../@name"/>
+    <xsl:with-param name="clause" select="'annexe'"/>
+  </xsl:call-template>)</xsl:if></xsl:template>
+
+
+<xsl:template match="enumeration" mode="underlying2"> <!-- there is in sect_4_express.xsl already -->
+  <xsl:if test="@extensible='YES' or @extensible='yes'">
+    EXTENSIBLE
+  </xsl:if>
+  ENUMERATION
+  <xsl:if test="@basedon">
+    BASED_ON 
+    <xsl:call-template name="link_object">
+      <xsl:with-param name="object_name" select="@basedon"/>
+      <xsl:with-param name="object_used_in_schema_name" 
+        select="../../@name"/>
+      <xsl:with-param name="clause" select="'section'"/>
+    </xsl:call-template>  
+  </xsl:if>
+
+  <xsl:if test="@items and (string-length(@items)!=0)">
+    <xsl:choose>
+      <xsl:when test="@basedon">
+        WITH 
+      </xsl:when>
+      <xsl:otherwise>
+        OF
+      </xsl:otherwise>
+    </xsl:choose>
+    <br/>
+    &#160;&#160; 
+    <xsl:variable name="enum"
+      select="concat('(',translate(normalize-space(@items),' ',','),')')"/>
+    <xsl:call-template name="output_line_breaks">
+      <xsl:with-param name="str" select="$enum"/>
+      <xsl:with-param name="break_char" select="','"/>
+    </xsl:call-template>
+  </xsl:if>
+</xsl:template>
+
+
+
+<xsl:template match="entity" mode="code">
+  <code>
+	<xsl:call-template name="insertLutaMLCodeStart"/>
+    <xsl:variable 
+      name="schema_name" 
+      select="../@name"/>      
+    
+    <xsl:variable name="aname">
+      <xsl:call-template name="express_a_name">
+        <xsl:with-param name="section1" select="$schema_name"/>
+        <xsl:with-param name="section2" select="@name"/>
+      </xsl:call-template>
+    </xsl:variable>
+    
+    <!-- <br/> -->
+    <!-- <A NAME="{$aname}">ENTITY <b><xsl:value-of select="@name"/></b></A> -->
+		<xsl:text>[[</xsl:text><xsl:value-of select="$aname"/><xsl:text>]]</xsl:text>
+		<xsl:text>ENTITY </xsl:text>
+		<xsl:text>*</xsl:text><xsl:value-of select="@name"/><xsl:text>*</xsl:text>
+		
+    <xsl:call-template name="abstract.entity"/>
+    <xsl:call-template name="super.expression-code"/>
+    <xsl:call-template name="supertypes-code"/><xsl:text>;</xsl:text>  
+    <!-- <br/> --><xsl:text>&#xa;</xsl:text>
+    <xsl:apply-templates select="./explicit" mode="code"/>
+    <xsl:apply-templates select="./derived" mode="code"/>
+    <xsl:apply-templates select="./inverse" mode="code"/>
+    <xsl:apply-templates select="./unique" mode="code"/>
+    <xsl:apply-templates select="./where[@expression]" mode="code"/>
+    <!-- <xsl:call-template name="output_where_formal"/> -->
+    <xsl:text>END_ENTITY;&#xa;</xsl:text><!-- <br/> -->
+  </code>
+	<xsl:call-template name="insertCodeEnd"/>
+</xsl:template>
+
+
+<xsl:template name="abstract.entity2"> <!-- there is in sect_4_express.xsl already -->
+  <xsl:if test="@abstract.entity='YES' or @abstract.entity='yes'">
+    ABSTRACT</xsl:if>
+</xsl:template>
+
+
+<xsl:template name="super.expression-code2"> <!-- there is in sect_4_express.xsl already -->
+  <!-- Always enclose the expression in parentheses -->
+  <xsl:variable name="sup_expr"
+    select="concat('(',@super.expression,')')"/>
+  <xsl:choose>
+    <xsl:when test="@abstract.supertype='YES' or @abstract.supertype='yes'">
+      <br/>
+&#160;&#160;ABSTRACT SUPERTYPE
+      <xsl:if test="@super.expression">
+        OF&#160;<xsl:call-template name="link_super_expression_list">
+          <xsl:with-param name="list" select="$sup_expr"/>
+          <xsl:with-param name="object_used_in_schema_name" select="../@name"/>
+          <xsl:with-param name="clause" select="'section'"/>
+          <xsl:with-param name="indent" select="25"/>
+        </xsl:call-template>
+      </xsl:if>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:if test="@super.expression">
+        <br/>
+&#160;&#160;SUPERTYPE OF 
+      <xsl:call-template name="link_super_expression_list">
+        <xsl:with-param name="list" select="$sup_expr"/>
+        <xsl:with-param name="object_used_in_schema_name" select="../@name"/>
+        <xsl:with-param name="clause" select="'section'"/>
+        <xsl:with-param name="indent" select="16"/>
+      </xsl:call-template>
+    </xsl:if>      
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template name="supertypes-code2"> <!-- there is in sect_4_express.xsl already -->
+  <xsl:if test="@supertypes">
+    <br/>
+    &#160;&#160;SUBTYPE OF (<xsl:call-template name="link_list">
+    <xsl:with-param name="list" select="@supertypes"/>
+    <xsl:with-param name="suffix" select="', '"/>
+      <xsl:with-param name="object_used_in_schema_name" select="../@name"/>
+      <xsl:with-param name="clause" select="'annexe'"/>
+    </xsl:call-template><xsl:text>)</xsl:text>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="explicit" mode="code2"> <!-- there is in sect_4_express.xsl already -->
+  <xsl:variable name="aname">
+    <xsl:call-template name="express_a_name">
+      <xsl:with-param name="section1" select="../../@name"/>
+      <xsl:with-param name="section2" select="../@name"/>
+      <xsl:with-param name="section3" select="@name"/>
+    </xsl:call-template>
+  </xsl:variable>
+&#160;&#160;<xsl:apply-templates select="./redeclaration" mode="code"/>
+  <A NAME="{$aname}"><xsl:value-of select="concat(@name, ' : ')"/></A>
+  <xsl:if test="@optional='YES' or @optional='yes'">
+    OPTIONAL 
+  </xsl:if>
+  <xsl:apply-templates select="./aggregate" mode="code"/>
+  <xsl:apply-templates select="./*" mode="underlying"/>;<br/>
+</xsl:template>
+
+ <!-- there is in sect_4_express.xsl already -->
+<xsl:template match="redeclaration" mode="code2">SELF\<xsl:call-template name="link_object">
+      <xsl:with-param name="object_name" select="@entity-ref"/>
+      <xsl:with-param name="object_used_in_schema_name" 
+        select="../../@name"/>
+      <xsl:with-param name="clause" select="'annexe'"/>
+    </xsl:call-template>
+    <xsl:choose>
+      <xsl:when test="@old_name">
+        <xsl:value-of select="concat('.',@old_name,' RENAMED ')"/>        
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:text>.</xsl:text>
+      </xsl:otherwise>
+    </xsl:choose>
+</xsl:template>
+
+<xsl:template match="derived" mode="code2"> <!-- there is in sect_4_express.xsl already -->
+  <xsl:variable name="aname">
+    <xsl:call-template name="express_a_name">
+      <xsl:with-param name="section1" select="../../@name"/>
+      <xsl:with-param name="section2" select="../@name"/>
+      <xsl:with-param name="section3" select="@name"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="position()=1">DERIVE<br/>
+  </xsl:if>
+&#160;&#160;<xsl:apply-templates select="./redeclaration" mode="code"/>
+  <!-- need to clarify the XML for derive --> 
+<A NAME="{$aname}"><xsl:value-of select="concat(@name, ' : ')"/></A>
+  <xsl:apply-templates select="./aggregate" mode="code"/>
+  <xsl:apply-templates select="./*" mode="underlying"/> 
+  <xsl:value-of select="concat(' := ',@expression,';')"/><br/>
+</xsl:template>
+
+<xsl:template match="inverse" mode="code2"> <!-- there is in sect_4_express.xsl already -->
+  <xsl:variable name="aname">
+    <xsl:call-template name="express_a_name">
+      <xsl:with-param name="section1" select="../../@name"/>
+      <xsl:with-param name="section2" select="../@name"/>
+      <xsl:with-param name="section3" select="@name"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="position()=1">INVERSE<br/>
+  </xsl:if>
+&#160;&#160;<xsl:apply-templates select="./redeclaration" mode="code"/>
+  <A NAME="{$aname}"><xsl:value-of select="concat(@name, ' : ')"/></A>
+  <xsl:apply-templates select="./inverse.aggregate" mode="code"/>
+  <xsl:call-template name="link_object">
+    <xsl:with-param name="object_name" select="@entity"/>
+    <xsl:with-param name="object_used_in_schema_name" 
+      select="../../@name"/>
+    <xsl:with-param name="clause" select="'annexe'"/>
+  </xsl:call-template>  
+  <xsl:value-of select="concat(' FOR ', @attribute)"/>;<br/>
+</xsl:template>
+
+<xsl:template match="inverse.aggregate" mode="code2"> <!-- there is in sect_4_express.xsl already -->
+  <xsl:choose>
+    <xsl:when test="@lower">
+      <xsl:value-of select="concat(@type, '[', @lower, ':', @upper, '] OF ')"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="concat(@type, ' OF ')"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<xsl:template match="unique" mode="code2"> <!-- there is in sect_4_express.xsl already -->
+  <xsl:variable name="aname">
+    <xsl:call-template name="express_a_name">
+      <xsl:with-param name="section1" select="../../@name"/>
+      <xsl:with-param name="section2" select="../@name"/>
+      <xsl:with-param name="section3" select="concat('ur:',@label)"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="position()=1">UNIQUE<br/>
+  </xsl:if>
+&#160;&#160;<A NAME="{$aname}"><xsl:value-of select="concat(@label, ': ')"/></A>
+  <xsl:apply-templates select="./unique.attribute" mode="code"/>
+  <br/>
+</xsl:template>
+
+
+<xsl:template match="unique.attribute" mode="code2"> <!-- there is in sect_4_express.xsl already -->
+  <xsl:variable name="suffix">
+    <xsl:choose>
+      <xsl:when test="position()!=last()">
+        <xsl:value-of select="', '"/>
+      </xsl:when>
+      <xsl:otherwise>
+        <xsl:value-of select="';'"/>
+      </xsl:otherwise>
+    </xsl:choose>
+  </xsl:variable>
+  <xsl:choose>
+    <xsl:when test="@entity-ref">
+      SELF\<xsl:call-template name="link_object">
+      <xsl:with-param name="object_name" select="@entity-ref"/>
+      <xsl:with-param name="object_used_in_schema_name" 
+        select="../../@name"/>
+      <xsl:with-param name="clause" select="'annexe'"/>
+    </xsl:call-template><xsl:value-of select="concat('.',@attribute,$suffix)"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="concat(@attribute,$suffix)"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+
+<xsl:template match="aggregate" mode="code2"> <!-- there is in sect_4_express.xsl already -->
+  <xsl:choose>
+    <xsl:when test="@lower">
+      <xsl:value-of select="concat(@type, '[', @lower, ':', @upper, '] OF ')"/>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="concat(@type, ' OF ')"/>
+    </xsl:otherwise>
+  </xsl:choose>
+  <xsl:if test="@optional='YES'">
+    OPTIONAL
+  </xsl:if>
+  <xsl:if test="@unique='YES'">
+    UNIQUE
+  </xsl:if>
+</xsl:template>
+
+<xsl:template name="output_where_formal2"> <!-- there is in sect_4_express.xsl already -->
+  <xsl:if test="./where[@expression] and not(./unique)">
+    <xsl:apply-templates select="./where[@expression]" mode="code"/>
+  </xsl:if>
+</xsl:template>
+
+<xsl:template match="where" mode="code2"> <!-- there is in sect_4_express.xsl already -->
+  <xsl:variable name="aname">
+    <xsl:call-template name="express_a_name">
+      <xsl:with-param name="section1" select="../../@name"/>
+      <xsl:with-param name="section2" select="../@name"/>
+      <xsl:with-param name="section3" select="concat('wr:',@label)"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <xsl:if test="position()=1">WHERE<br/>
+	</xsl:if>
+&#160;&#160;<A NAME="{$aname}"><xsl:value-of select="concat(@label, ': ', @expression, ';')"/></A>
+  <br/>
+</xsl:template>
+
+
+<xsl:template match="function" mode="code2"> <!-- there is in sect_4_express.xsl already -->
+  <xsl:variable 
+    name="schema_name" 
+    select="../@name"/>      
+
+  <xsl:variable name="aname">
+    <xsl:call-template name="express_a_name">
+      <xsl:with-param name="section1" select="$schema_name"/>
+      <xsl:with-param name="section2" select="@name"/>
+    </xsl:call-template>
+  </xsl:variable>
+  <code>             
+  <br/>
+  <A NAME="{$aname}">FUNCTION <b><xsl:value-of select="@name"/></b> </A>
+  <br/>
+  <xsl:apply-templates select="./parameter" mode="code"/><xsl:text> : </xsl:text>
+  <xsl:apply-templates select="./aggregate" mode="code"/>
+  <xsl:apply-templates select="./*" mode="underlying"/>;
+</code>
+  <xsl:apply-templates select="./algorithm" mode="code"/>
+	<!-- <br/> -->
+        <code>
+  END_FUNCTION;
+</code>
+  <br/>
+</xsl:template>
+
+
+<!-- empty template to prevent the algorithm element being out put along
+     with the code -->
+<xsl:template match="parameter" mode="underlying2"/> <!-- there is in sect_4_express.xsl already -->
+
+<xsl:template match="parameter" mode="code2"> <!-- there is in sect_4_express.xsl already -->
+  <xsl:if test="position()=1">&#160;(</xsl:if>
+  <xsl:value-of select="@name"/><xsl:text> : </xsl:text>
+  <xsl:apply-templates select="./aggregate" mode="code"/>
+  <xsl:apply-templates select="./*" mode="underlying"/>
+  <xsl:choose>
+    <xsl:when test="position()!=last()">
+      <xsl:text>; </xsl:text>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:text>)</xsl:text>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+
+<xsl:template match="algorithm" mode="code2"> <!-- there is in sect_4_express.xsl already -->
+  <!-- empty algorithms are sometimes output so ignore -->
+  <xsl:if test="string-length(normalize-space(.))>0">
+    <pre>
+      <xsl:value-of select="."/>
+    </pre>
+  </xsl:if>
+</xsl:template>
+
+<!-- empty template to prevent the algorithm element being out put along
+     with the code -->
+<xsl:template match="algorithm" mode="underlying2"/> <!-- there is in sect_4_express.xsl already -->
+
+
+
+<xsl:template match="procedure" mode="code2">     <!-- there is in sect_4_express.xsl already -->
+  <xsl:variable 
+    name="schema_name" 
+    select="../@name"/>      
+
+  <xsl:variable name="aname">
+    <xsl:call-template name="express_a_name">
+      <xsl:with-param name="section1" select="$schema_name"/>
+      <xsl:with-param name="section2" select="@name"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <br/>
+  <code>
+  <A NAME="{$aname}">PROCEDURE <b><xsl:value-of select="@name"/></b> </A>
+  <xsl:apply-templates select="./parameter" mode="code"/><xsl:text> : </xsl:text>
+  <xsl:apply-templates select="./aggregate" mode="code"/>
+  <xsl:apply-templates select="./*" mode="underlying"/>;
+</code>
+  <xsl:apply-templates select="./algorithm" mode="code"/><br/>
+  <code>
+  END_PROCEDURE;
+  </code>
+  <br/>
+
+</xsl:template>
+
+<xsl:template match="rule" mode="code2">   <!-- there is in sect_4_express.xsl already -->
+<code>
+  <xsl:variable 
+    name="schema_name" 
+    select="../@name"/>      
+
+  <xsl:variable name="aname">
+    <xsl:call-template name="express_a_name">
+      <xsl:with-param name="section1" select="$schema_name"/>
+      <xsl:with-param name="section2" select="@name"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <br/>
+  <A NAME="{$aname}">RULE 
+  <b>
+    <xsl:value-of select="@name"/>
+  </b></A><xsl:text> FOR </xsl:text>
+  <br/>
+  (<xsl:value-of select="translate(@appliesto,' ',', ')"/>);<br/>
+</code>
+  <xsl:apply-templates select="./algorithm" mode="code"/>
+  <code>
+  <xsl:apply-templates select="./where" mode="code"/>
+</code>
+<code>
+  END_RULE;
+</code>
+  <br/>
+</xsl:template>
+
+<xsl:template match="subtype.constraint" mode="code2"> <!-- there is in sect_4_express.xsl already -->
+  <code>
+  <xsl:variable 
+    name="schema_name" 
+    select="../@name"/>      
+
+  <xsl:variable name="aname">
+    <xsl:call-template name="express_a_name">
+      <xsl:with-param name="section1" select="$schema_name"/>
+      <xsl:with-param name="section2" select="@name"/>
+    </xsl:call-template>
+  </xsl:variable>
+
+  <!--
+  <br/>
+  <A NAME="{$aname}">SUBTYPE_CONSTRAINT <b>
+	<xsl:value-of select="@name"/></b></A>
+  <xsl:text> FOR </xsl:text>
+	<xsl:value-of select="@entity"/>
+  ;<br/>
+
+    <xsl:if test="@abstract.supertype='YES' or @abstract.supertype='yes'">
+&#160;&#160;ABSTRACT SUPERTYPE;<br/>
+      </xsl:if>
+   <xsl:if test="@super.expression">
+&#160;&#160; <xsl:value-of select="@super.expression"/>;<br/>
+    </xsl:if>      
+  END_SUBTYPE_CONSTRAINT;<br/>
+-->
+<br/>
+  <A NAME="{$aname}">SUBTYPE_CONSTRAINT <b>
+	<xsl:value-of select="@name"/></b></A>
+  <xsl:text> FOR </xsl:text>
+  <xsl:call-template name="link_object">
+    <xsl:with-param name="object_name" select="@entity"/>
+    <xsl:with-param name="object_used_in_schema_name" 
+      select="../@name"/>
+    <xsl:with-param name="clause" select="'annexe'"/>
+  </xsl:call-template>;<br/>
+
+  <xsl:if test="@abstract.supertype='YES' or @abstract.supertype='yes'">
+      &#160;&#160;ABSTRACT SUPERTYPE;<br/>
+  </xsl:if>
+
+  <xsl:if test="@totalover and 
+                (string-length(@totalover)!=0)">
+    &#160;&#160;TOTAL_OVER&#160;(<xsl:call-template name="link_list">
+    <xsl:with-param name="list" select="@totalover"/>
+    <xsl:with-param name="linebreak" select="'yes'"/>
+    <xsl:with-param name="prefix" select="'&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;'"/>
+    <xsl:with-param name="first_prefix" select="'no'"/>
+    <xsl:with-param name="suffix" select="', '"/>
+    <xsl:with-param name="object_used_in_schema_name" select="../@name"/>
+    <xsl:with-param name="clause" select="'annexe'"/>
+  </xsl:call-template>);<br/>
+  </xsl:if>
+
+  
+  <xsl:variable name="sup_expr" select="@super.expression"/>
+  <xsl:if test="@super.expression">
+    &#160;&#160;<xsl:call-template name="link_super_expression_list">
+        <xsl:with-param name="list" select="$sup_expr"/>
+        <xsl:with-param name="object_used_in_schema_name" select="../@name"/>
+        <xsl:with-param name="clause" select="'annexe'"/>
+        <xsl:with-param name="indent" select="3"/>
+      </xsl:call-template>;<br/>
+    </xsl:if>      
+  END_SUBTYPE_CONSTRAINT;<br/>
+  </code>
+
+
+</xsl:template>
+</xsl:stylesheet>
diff --git a/src/main/resources/stepmod.base_xsl/res_doc/express_link.xsl b/src/main/resources/stepmod.base_xsl/res_doc/express_link.xsl
index 5e88244..2ec759f 100644
--- a/src/main/resources/stepmod.base_xsl/res_doc/express_link.xsl
+++ b/src/main/resources/stepmod.base_xsl/res_doc/express_link.xsl
@@ -47,7 +47,7 @@
 			 This variable is overwritten when express_link.xsl is imported
 			 into another stylesheet.
 			 -->
-		<xsl:variable name="global_xref_list"/>
+		<xsl:variable name="global_xref_list_2"/> <!-- there is sect_4_express.xsl yet -->
 	
 	
 	<xsl:template name="build_schema_xref_list">
@@ -336,7 +336,8 @@
 		</xsl:variable>
 		
 		<xsl:variable name="xref" select="concat($express_file_to_ref,'#',$aname)"/>
-		<xsl:value-of select="$xref"/>
+		<!-- <xsl:value-of select="$xref"/> -->
+		<xsl:value-of select="$express_file_to_ref"/>
 	</xsl:template>
 
 	<!-- called from template name="get_object_xref" -->
@@ -446,8 +447,12 @@
 			
 				<xsl:call-template name="insertHyperlink">
 					<xsl:with-param name="a">
-						 <A HREF="{$express_file_to_ref}#{$xref}">
-							<xsl:value-of select="$schema_name"/>
+						 <A HREF="{$express_file_to_ref}"> <!-- #{$xref} -->
+							<!-- <xsl:value-of select="$schema_name"/> -->
+							<xsl:if test="$express_file_to_ref != $xref">
+								<xsl:value-of select="$xref"/>
+							</xsl:if>
+							
 						</A>
 					</xsl:with-param>
 				</xsl:call-template>
@@ -1169,13 +1174,14 @@
 							</xsl:apply-templates>
 					</xsl:variable>
 					
-					<xsl:value-of select="concat($data_path,'/resource_docs/',$resdoc_name,'/sys/',$clauseno,'_schema',$FILE_EXT)"/>
+					<!-- <xsl:value-of select="concat($data_path,'/resource_docs/',$resdoc_name,'/sys/',$clauseno,'_schema',$FILE_EXT)"/> -->
+					<xsl:value-of select="concat('/resource_docs/',$resdoc_name)"/>
 					
 				</xsl:when>
 
 				<xsl:otherwise>
-					<xsl:value-of 
-						select="concat($data_path,'/resources/',$schema_name,'/',$schema_name,$FILE_EXT)"/>
+					<!-- <xsl:value-of select="concat($data_path,'/resources/',$schema_name,'/',$schema_name,$FILE_EXT)"/> -->
+					<xsl:value-of select="concat('/resources/',$schema_name)"/>
 				</xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
diff --git a/src/main/resources/stepmod.base_xsl/res_doc/resource.xsl b/src/main/resources/stepmod.base_xsl/res_doc/resource.xsl
index f6c4e4e..1d3eb09 100644
--- a/src/main/resources/stepmod.base_xsl/res_doc/resource.xsl
+++ b/src/main/resources/stepmod.base_xsl/res_doc/resource.xsl
@@ -1398,6 +1398,7 @@ Purpose:
 				<xsl:with-param name="a">
 					<a href="{$names_url}"   target="_blank"><xsl:value-of select="$names_url"/></a>
 				</xsl:with-param>
+				<xsl:with-param name="asText">true</xsl:with-param>
 			</xsl:call-template>
 		<xsl:text>&#xa;</xsl:text>
 		<xsl:text>EXPRESS::: </xsl:text>
@@ -1405,6 +1406,7 @@ Purpose:
 				<xsl:with-param name="a">
 					<a href="{$parts_url}"   target="_blank"><xsl:value-of select="$parts_url"/></a>
 				</xsl:with-param>
+				<xsl:with-param name="asText">true</xsl:with-param>
 			</xsl:call-template>		
 		<xsl:text>&#xa;&#xa;</xsl:text>
 		
@@ -1417,7 +1419,7 @@ Purpose:
 		</div> -->
 		
 		
-		<xsl:text>[#table_e1]</xsl:text>
+		<!-- <xsl:text>[#table_e1]</xsl:text>
 		<xsl:text>&#xa;</xsl:text>
 		<xsl:text>[cols="^,^",options="header"]</xsl:text>
 		<xsl:text>&#xa;</xsl:text>
@@ -1425,7 +1427,11 @@ Purpose:
 		<xsl:text>&#xa;</xsl:text>
 		
 		<xsl:text>|===</xsl:text>
-		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>&#xa;</xsl:text> -->
+			
+		<xsl:text>EXPRESS listings:</xsl:text>
+			
+		<xsl:text>&#xa;&#xa;</xsl:text>
 			
 		<!-- <br/> -->
 
@@ -1451,7 +1457,7 @@ Purpose:
 				
 				<!-- table header -->
 				
-				<xsl:text>| </xsl:text>
+				<!-- <xsl:text>| </xsl:text>
 				<xsl:choose>
 					<xsl:when test="$FILE_EXT='.xml'">
 						<xsl:text>XML file</xsl:text>
@@ -1462,15 +1468,21 @@ Purpose:
 				</xsl:choose>
 				<xsl:text> | ASCII file</xsl:text>
 				<xsl:text>&#xa;&#xa;</xsl:text>
+				
+				<xsl:text>| </xsl:text>
+				<xsl:text>file</xsl:text>
+				<xsl:text>&#xa;&#xa;</xsl:text> -->
+
 
 			<xsl:variable name="wgnumber" select="./@wg.number.express"/>
 
 			<xsl:for-each select="./schema" >
 
 				<xsl:variable name="resource_dir">
-					<xsl:call-template name="resource_directory">
+					<!-- <xsl:call-template name="resource_directory">
 						<xsl:with-param name="resource" select="@name"/>
-					</xsl:call-template>
+					</xsl:call-template> -->
+					<xsl:value-of select="concat('/resources/', @name)"/>
 				</xsl:variable>
 
 				<xsl:variable name="express_exp" select="concat($resource_dir,'/',@name,'.exp')"/>
@@ -1500,11 +1512,11 @@ Purpose:
 					</td> -->
 					
 					
-					<xsl:text>| </xsl:text>
+					<!-- <xsl:text>| </xsl:text>
 					<xsl:call-template name="insertHyperlink">
 						<xsl:with-param name="a">
 							<a href="{$schema_url}">
-								<xsl:value-of select="concat($schema_file,$FILE_EXT)"/>
+								<xsl:value-of select="concat($schema_file,$FILE_EXT)"/>								
 							</a>
 						</xsl:with-param>
 					</xsl:call-template>					
@@ -1513,8 +1525,9 @@ Purpose:
 						<xsl:with-param name="a">
 							<a href="{$express_exp}"><xsl:value-of select="$schema_file"/>.exp</a>
 						</xsl:with-param>
-					</xsl:call-template>					
-					<xsl:text>&#xa;</xsl:text>
+					</xsl:call-template>					 
+
+					<xsl:text>&#xa;</xsl:text>-->
 					
 					<!--<xsl:if test="$FILE_EXT!='.xml'">
 						<td>
@@ -1541,9 +1554,20 @@ Purpose:
 			<!-- </table> -->
 		<!-- </div> -->
 		
-		<xsl:text>|===</xsl:text>
-		<xsl:text>&#xa;</xsl:text>
+		<!-- resource -->
+		<xsl:for-each select="schema">
+			<xsl:variable name="schema_pos" select="position()"/>
+				<xsl:apply-templates select="../../resource" mode="express_listings">
+					<xsl:with-param name="pos" select="$schema_pos"/>
+				</xsl:apply-templates>
+		</xsl:for-each>
+		
+		
+		
+		
+		<!-- <xsl:text>|===</xsl:text>
 		<xsl:text>&#xa;</xsl:text>
+		<xsl:text>&#xa;</xsl:text> -->
 		
 		<!--<p>
 		If there is difficulty accessing these sites, contact ISO Central
diff --git a/src/main/resources/stepmod.base_xsl/res_doc/sect_4_express.xsl b/src/main/resources/stepmod.base_xsl/res_doc/sect_4_express.xsl
index 5b6e15a..3296081 100644
--- a/src/main/resources/stepmod.base_xsl/res_doc/sect_4_express.xsl
+++ b/src/main/resources/stepmod.base_xsl/res_doc/sect_4_express.xsl
@@ -3533,7 +3533,9 @@
 				</xsl:call-template>
 				<xsl:value-of select="concat(' ',$lkind)"/>
 				is specified in 
-				
+			</xsl:with-param>
+		</xsl:call-template>
+		
 				<xsl:call-template name="insertHyperlink">
 					<xsl:with-param name="a">
 						<a href="{$resource_href}">
@@ -3542,6 +3544,8 @@
 					</xsl:with-param>
 				</xsl:call-template>
 				
+		<xsl:call-template name="insertParagraph">
+			<xsl:with-param name="text">
 				The following modifications apply to this part of ISO 10303.
 			</xsl:with-param>
 		</xsl:call-template>
diff --git a/src/main/resources/stepmod.base_xsl/res_doc/sect_a_short_names.xsl b/src/main/resources/stepmod.base_xsl/res_doc/sect_a_short_names.xsl
index ae54ba5..35b8263 100644
--- a/src/main/resources/stepmod.base_xsl/res_doc/sect_a_short_names.xsl
+++ b/src/main/resources/stepmod.base_xsl/res_doc/sect_a_short_names.xsl
@@ -123,6 +123,7 @@ $Id: sect_a_short_names.xsl,v 1.10 2018/01/18 20:20:21 mike Exp $
 									<xsl:value-of select="$names_url"/>
 								</a>
 							</xsl:with-param>
+							<xsl:with-param name="asText">true</xsl:with-param>
 						</xsl:call-template>
 									
 					</xsl:with-param>
@@ -165,7 +166,7 @@ $Id: sect_a_short_names.xsl,v 1.10 2018/01/18 20:20:21 mike Exp $
 		
 		<xsl:text>[align=center]</xsl:text>
 		<xsl:text>&#xa;</xsl:text>
-		<xsl:variable name="names_url" select="'http://standards.iso.org/iso/10303/tech/short_names/short-names.txt'"/>
+		<xsl:variable name="names_url" select="'http://standards.iso.org/iso/10303/tech/short_names/short-names.txt'"/>		
 		<xsl:call-template name="insertParagraph">
 			<xsl:with-param name="text">
 			
@@ -175,6 +176,7 @@ $Id: sect_a_short_names.xsl,v 1.10 2018/01/18 20:20:21 mike Exp $
 							<xsl:value-of select="$names_url"/>
 						</a>
 					</xsl:with-param>
+					<xsl:with-param name="asText">true</xsl:with-param>
 				</xsl:call-template>
 				
 			</xsl:with-param>
diff --git a/src/main/resources/stepmod.base_xsl/res_doc/sect_c_exp_schema.xsl b/src/main/resources/stepmod.base_xsl/res_doc/sect_c_exp_schema.xsl
new file mode 100644
index 0000000..82f7260
--- /dev/null
+++ b/src/main/resources/stepmod.base_xsl/res_doc/sect_c_exp_schema.xsl
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+$Id: sect_c_exp_schema.xsl,v 1.7 2014/05/29 20:31:13 nigelshaw Exp $
+	Author:  Rob Bodington, Eurostep Limited
+	Owner:   Developed by Eurostep and supplied to NIST under contract.
+	Purpose: Display the ARM short form express 
+		 
+-->
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+								version="1.0">
+
+<!--   <xsl:import href="resource.xsl"/>
+	<xsl:import href="express_code.xsl"/> -->
+
+
+	<!-- 
+			 the stylesheet that allows different stylesheets to be applied 
+			 -->
+<!--   <xsl:import href="resource_clause.xsl"/>
+
+
+	<xsl:output method="html"/> -->
+
+	<!-- +++++++++++++++++++
+				 Global variables
+			 +++++++++++++++++++ -->
+
+	<!-- 
+			 Global variable used in express_link.xsl by:
+				 link_object
+				 link_list
+			 Provides a lookup table of all the references for the entities and
+			 types indexed through all the interface specifications in the
+			 express.
+			 Note:  This variable must defined in each XSL that is used for
+			 formatting express. (TEH guessing here at the list)
+				 sect_4_schema.xsl
+				 sect_e_exp.xsl
+				 sect_e_exp_1.xsl
+			 build_xref_list is defined in express_link
+			 -->
+	<xsl:variable name="global_xref_list_2"> <!-- there is in sect_4_express -->
+		<!-- debug 
+		<xsl:message>
+			global_xref_list defined in sect_4_express.xsl
+		</xsl:message> -->
+		<xsl:choose>
+			<xsl:when test="/resource_clause">
+				<xsl:variable name="resdoc_dir">
+					<xsl:call-template name="resdoc_directory">
+						<xsl:with-param name="resdoc" select="/resource_clause/@directory"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:variable name="resdoc_name">
+					<xsl:value-of select="/resource_clause/@directory" />
+				</xsl:variable>
+				<!--
+				<xsl:message>
+					resdoc_dir  :<xsl:value-of select="$resdoc_dir"/>: resdoc_dir
+				</xsl:message>
+-->
+				<xsl:variable name="resdoc_xml" select="concat($resdoc_dir,'/','resource.xml')"/>
+				<!-- <xsl:message>
+					resdoc_xml  :<xsl:value-of select="$resdoc_xml"/>
+				count schemas: <xsl:value-of select="count(document($resdoc_xml)/resource/schema)"/> : sdfasd
+				</xsl:message> -->
+
+				<xsl:variable name="resdoc_node" select="document($resdoc_xml)"/>
+								
+				<!-- <xsl:for-each select="document($resdoc_xml)/resource/schema"> -->
+				<xsl:for-each select="$resdoc_node/resource/schema">
+					<xsl:variable name="resource_dir">
+						<xsl:call-template name="resource_directory">
+							<xsl:with-param name="resource" select="./@name"/>            
+						</xsl:call-template>
+					</xsl:variable>
+					<xsl:variable name="express_xml" select="concat($resource_dir,'/',@name,'.xml')"/>
+					<xsl:call-template name="build_xref_list">
+						<xsl:with-param name="express" select="document($express_xml)/express"/>
+					</xsl:call-template>
+				</xsl:for-each>
+			</xsl:when>
+			<xsl:when test="/resource">
+				<xsl:variable name="resdoc_dir">
+					<xsl:call-template name="resdoc_directory">
+						<xsl:with-param name="resource" select="/resource/@name"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:variable name="resdoc_name">
+					<xsl:value-of select="/resource_clause/@directory" />
+				</xsl:variable>
+				<!--
+				<xsl:message>
+					resdoc_dir  :<xsl:value-of select="$resdoc_dir"/>: resdoc_dir
+				</xsl:message>
+				-->
+				<xsl:variable name="resdoc_xml" select="concat($resdoc_dir,'/','resource.xml')"/>
+				<!--
+				<xsl:message>
+					resdoc_xml  :<xsl:value-of select="$resdoc_xml"/>
+				count schemas: <xsl:value-of select="count(document($resdoc_xml)/resource/schema)"/> 
+				</xsl:message>
+-->
+				<xsl:variable name="resdoc_node" select="document($resdoc_xml)"/>
+								
+				<!-- <xsl:for-each select="document($resdoc_xml)/resource/schema"> -->
+				<xsl:for-each select="$resdoc_node/resource/schema">
+					<xsl:variable name="resource_dir">
+						<xsl:call-template name="resource_directory">
+							<xsl:with-param name="resource" select="./@name"/>
+						
+						</xsl:call-template>
+					</xsl:variable>
+					<xsl:variable name="express_xml" select="concat($resource_dir,'/',$resource_dir,'.xml')"/>
+					<xsl:call-template name="build_xref_list">
+						<xsl:with-param name="express" select="document($express_xml)/express"/>
+					</xsl:call-template>
+				</xsl:for-each>
+			</xsl:when>
+		</xsl:choose>
+	</xsl:variable>
+
+
+	<!-- A global variable used by the express_file_to_ref template defined
+			 in express_link.xsl.
+			 It defines the relative path from the file applying the stylesheet
+			 to the root of the stepmod repository.
+			 sect_e_exp_arm.xsl stylesheet is normally used
+				 stepmod/data/module/?module?/sys/e_exp_arm.xml
+			 Hence the relative root is: ../../../
+			 -->
+
+	<xsl:variable 
+		name="relative_root"
+		select="'../../../../'"/>
+
+	<!-- +++++++++++++++++++
+				 Templates
+			 +++++++++++++++++++ -->
+
+<!-- overwrites the template declared in resource.xsl -->
+<xsl:template match="resource" mode="express_listings">
+	<xsl:param name="pos" />
+	<!-- debug <xsl:value-of select="$global_xref_list"/> -->
+	<xsl:call-template name="clause_header">
+		<xsl:with-param name="heading" select="''"/>
+		<xsl:with-param name="aname" select="'annexc-express'"/>
+	</xsl:call-template>
+	
+	<xsl:variable name="stdnumber">
+		<xsl:call-template name="get_resdoc_iso_number">
+			<xsl:with-param name="resdoc" select="./@name"/>
+		</xsl:call-template>
+	</xsl:variable>
+
+	<xsl:variable name="resource_name">
+		<xsl:call-template name="res_display_name">
+			<xsl:with-param name="res" select="./@name"/>
+		</xsl:call-template>
+	</xsl:variable>
+
+
+	 <!--  <xsl:message>
+			<xsl:value-of select="'&#010;___________________________________________________________'"/>
+			<xsl:value-of select="concat('&#010;Processing: data/resource_docs/',./@name,'/sys/c_exp_schema_',$pos+3,'.xml','&#010;')"/>
+		</xsl:message> -->
+
+
+
+	<!-- <code> -->
+	<xsl:call-template name="insertCodeStart"/>
+		<xsl:text>(*&#xa;</xsl:text><!-- <br/> -->
+		<xsl:value-of 
+			select="concat('ISO/TC 184/SC 4/WG 12 N',./schema[number($pos)]/@number, ' - ',
+			$stdnumber,' ', $resource_name, ' - EXPRESS')"/>
+		<xsl:if test="string-length(normalize-space(./schema[number($pos)]/@number.supersedes))>0">
+			<xsl:text>&#xa;</xsl:text><!-- <br/> -->Supersedes 
+			<xsl:value-of 
+				select="concat('ISO/TC 184/SC 4/WG 12','&#160;N',./schema[number($pos)]/@number.supersedes)"/>
+		</xsl:if>
+		<xsl:text>&#xa;</xsl:text><!-- <br/> --><xsl:text>*)</xsl:text>
+	<!-- </code> -->
+	<xsl:call-template name="insertCodeEnd"/>
+	
+	<!-- <br/> -->
+
+	<!-- output all the EXPRESS specifications -->
+	<xsl:variable name="schema_name" select="./schema[number($pos)]/@name"/>
+
+		<!--  <xsl:variable name="schema_name" select="./schema[2]/@name" /> -->
+
+		   <!-- <xsl:message>
+		schema_name :<xsl:value-of select="$schema_name" />: schema_name
+	</xsl:message>
+	<xsl:message>
+		pos :<xsl:value-of select="$pos" />: pos
+	</xsl:message> -->
+
+	<xsl:variable name="resource_dir">
+		<xsl:call-template name="resource_directory">
+			<xsl:with-param name="resource" select="$schema_name"/>
+		</xsl:call-template>
+	</xsl:variable>
+	<xsl:variable 
+		name="express_xml"
+		select="concat($resource_dir,'/',$schema_name,'.xml')"/>
+	<!-- get the express and display using the express_code.xsl stylesheet that
+			 has been imported.
+			 -->
+	
+	<!-- <xsl:message>
+		express_xml :<xsl:value-of select="$express_xml" />: express_xml
+	</xsl:message> -->
+
+	
+	<xsl:apply-templates select="document($express_xml)/express/schema" mode="code"/>
+	
+
+		<!-- <xsl:message>
+			<xsl:value-of select="'&#010;___________________________________________________________'"/>
+			<xsl:value-of select="concat('&#010;EndProcessing: data/resource_docs/',./@name,'/sys/c_exp_schema_',$pos+3,'.xml','&#010;')"/>
+		</xsl:message> -->
+
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/src/main/resources/stepmod2mn.adoc.xsl b/src/main/resources/stepmod2mn.adoc.xsl
index 7abc42c..a643d19 100644
--- a/src/main/resources/stepmod2mn.adoc.xsl
+++ b/src/main/resources/stepmod2mn.adoc.xsl
@@ -25,6 +25,8 @@
 	<xsl:import href="stepmod.base_xsl/res_doc/sect_4_express.xsl"/>
 	<xsl:import href="stepmod.base_xsl/res_doc/sect_a_short_names.xsl"/>
 	<xsl:import href="stepmod.base_xsl/res_doc/sect_b_obj_reg.xsl"/>
+	<xsl:import href="stepmod.base_xsl/res_doc/sect_c_exp_schema.xsl"/>
+	<xsl:import href="stepmod.base_xsl/res_doc/express_code.xsl"/>
 	<xsl:import href="stepmod.base_xsl/res_doc/sect_biblio.xsl"/>
 	<xsl:import href="stepmod.base_xsl/res_doc/sect_examples.xsl"/>
 	<xsl:import href="stepmod.base_xsl/res_doc/sect_tech_discussion.xsl"/>
@@ -196,93 +198,100 @@
 		<xsl:text>&#xa;&#xa;</xsl:text>
 		
 
-		<!-- Abstract -->
-		<xsl:message>[INFO] Processing Abstract ...</xsl:message>
-		<xsl:apply-templates select="resource" mode="abstract"/> <!-- res_doc/resource.xsl  -->
+		<xsl:variable name="adoc">
 
-		
-		<!-- Foreword-->
-		<!-- draughting_elements/sys/foreword.xml -->
-		<xsl:message>[INFO] Processing Foreword ...</xsl:message>
-		<xsl:apply-templates select="resource" mode="foreword"/> <!-- res_doc/resource.xsl  -->
-		
-		<!-- Introduction -->
-		<!-- draughting_elements/sys/introduction.xml -->
-		<xsl:message>[INFO] Processing Introduction ...</xsl:message>
-		<xsl:apply-templates select="resource" mode="introduction"/> <!-- res_doc/sect_introduction.xsl  -->
-				
-		<!-- 1 Scope -->
-		<!-- draughting_elements/sys/1_scope.xml -->
-		<xsl:message>[INFO] Processing Scope ...</xsl:message>
-		<xsl:apply-templates select="resource" mode="scope_resource"/>	<!-- res_doc/sect_1_scope.xsl  -->	
-		
-		<!-- 2 Normative references -->
-		<!-- sys/2_refs.xml -->
-		<xsl:message>[INFO] Processing Normative references ...</xsl:message>		
-		<xsl:apply-templates select="resource" mode="norm_refs_resource"/> <!-- res_doc/sect_2_refs.xsl  -->
-		
-		
-		<!-- 3 Terms, definitions and abbreviated terms -->
-		<!-- sys/3_defs.xml -->
-		<!-- 3.1 Terms and definitions -->
-		<!-- 3.2 Abbreviated terms -->
-		<xsl:message>[INFO] Processing Terms, definitions and abbreviated terms ...</xsl:message>		
-		<xsl:apply-templates select="resource" mode="terms_definitions_resource"/> <!-- res_doc/sect_3_defs.xsl -->
-		
-		<!-- optional section -->
-		<!--- 4 EXPRESS short listing -->
-    <!-- 4.1 General -->
-    <!-- 4.2 Fundamental concepts and assumptions -->
-    <!-- 4.3 Draughting elements entity definitions -->		
-		<xsl:for-each select="resource/schema">
-			<xsl:variable name="schema_pos" select="position()"/>
-			<xsl:message>[INFO] Processing Section <xsl:value-of select="$schema_pos + 3"/> ...</xsl:message>
-			<xsl:apply-templates select="../../resource" mode="schema_resource"> <!-- res_doc/sect_schema.xsl -->
-				 <xsl:with-param name="pos" select="$schema_pos"/>
-			 </xsl:apply-templates>		
-		</xsl:for-each>
-		
-		<!-- Annex A Short names of entities -->
-		<xsl:message>[INFO] Processing Annex A Short names of entities ...</xsl:message>		
-		<xsl:apply-templates select="resource" mode="annex_a"/> <!-- res_doc/sect_a_short_names.xsl  -->
-		
-		<!-- Annex B Information object registration -->
-		<xsl:message>[INFO] Processing Annex B Information object registration ...</xsl:message>		
-		<xsl:apply-templates select="resource" mode="annex_b"/> <!-- res_doc/sect_b_obj_reg.xsl  -->
+			<!-- Abstract -->
+			<xsl:message>[INFO] Processing Abstract ...</xsl:message>
+			<xsl:apply-templates select="resource" mode="abstract"/> <!-- res_doc/resource.xsl  -->
 
-		<!-- Annex C Computer interpretable listings -->
-		<xsl:message>[INFO] Processing Annex C Computer interpretable listings ...</xsl:message>		
-		<xsl:apply-templates select="resource" mode="annexc"/> <!-- res_doc/sect_c_exp.xsl  -->
-		
-		<!-- Annex D EXPRESS-G diagrams -->
-		<xsl:message>[INFO] Processing Annex D EXPRESS-G diagrams ...</xsl:message>		
-		<xsl:apply-templates select="resource" mode="annexd"/> <!-- res_doc/sect_d_expg.xsl  -->
 			
-		<!-- Annex E F G H -->		
-		
-		<!-- Annex Technical discussion -->		
-		<xsl:if test="string-length(normalize-space(resource/tech_discussion//text())) &gt; 0">			
-			<xsl:message>[INFO] Processing Annex Technical discussion ...</xsl:message>		
-			<xsl:apply-templates select="resource" mode="tech_discussion"/> <!-- res_doc/sect_tech_discussion.xsl -->
-		</xsl:if>
-		
-		<!-- Annex Examples -->
-		<xsl:if test="string-length(normalize-space(resource/examples//text())) &gt; 0">			
-			<xsl:message>[INFO] Processing Annex Examples ...</xsl:message>		
-			<xsl:apply-templates select="resource" mode="examples"/> <!-- res_doc/sect_examples.xsl -->
-		</xsl:if>
+			<!-- Foreword-->
+			<!-- draughting_elements/sys/foreword.xml -->
+			<xsl:message>[INFO] Processing Foreword ...</xsl:message>
+			<xsl:apply-templates select="resource" mode="foreword"/> <!-- res_doc/resource.xsl  -->
 			
-		<!-- Annex Additional scope -->
-		<xsl:if test="string-length(normalize-space(resource/add_scope//text())) &gt; 0">
-			<xsl:message>[INFO] Annex Additional scope ...</xsl:message>		
-			<xsl:apply-templates select="resource" mode="additional_scope"/> <!-- res_doc/sect_add_scope.xsl -->
-		</xsl:if>
+			<!-- Introduction -->
+			<!-- draughting_elements/sys/introduction.xml -->
+			<xsl:message>[INFO] Processing Introduction ...</xsl:message>
+			<xsl:apply-templates select="resource" mode="introduction"/> <!-- res_doc/sect_introduction.xsl  -->
+					
+			<!-- 1 Scope -->
+			<!-- draughting_elements/sys/1_scope.xml -->
+			<xsl:message>[INFO] Processing Scope ...</xsl:message>
+			<xsl:apply-templates select="resource" mode="scope_resource"/>	<!-- res_doc/sect_1_scope.xsl  -->	
+			
+			<!-- 2 Normative references -->
+			<!-- sys/2_refs.xml -->
+			<xsl:message>[INFO] Processing Normative references ...</xsl:message>		
+			<xsl:apply-templates select="resource" mode="norm_refs_resource"/> <!-- res_doc/sect_2_refs.xsl  -->
+			
+			
+			<!-- 3 Terms, definitions and abbreviated terms -->
+			<!-- sys/3_defs.xml -->
+			<!-- 3.1 Terms and definitions -->
+			<!-- 3.2 Abbreviated terms -->
+			<xsl:message>[INFO] Processing Terms, definitions and abbreviated terms ...</xsl:message>		
+			<xsl:apply-templates select="resource" mode="terms_definitions_resource"/> <!-- res_doc/sect_3_defs.xsl -->
+			
+			<!-- optional section -->
+			<!--- 4 EXPRESS short listing -->
+			<!-- 4.1 General -->
+			<!-- 4.2 Fundamental concepts and assumptions -->
+			<!-- 4.3 Draughting elements entity definitions -->		
+			<xsl:for-each select="resource/schema">
+				<xsl:variable name="schema_pos" select="position()"/>
+				<xsl:message>[INFO] Processing Section <xsl:value-of select="$schema_pos + 3"/> ...</xsl:message>
+				<xsl:apply-templates select="../../resource" mode="schema_resource"> <!-- res_doc/sect_schema.xsl -->
+					 <xsl:with-param name="pos" select="$schema_pos"/>
+				 </xsl:apply-templates>		
+			</xsl:for-each>
+			
+			<!-- Annex A Short names of entities -->
+			<xsl:message>[INFO] Processing Annex A Short names of entities ...</xsl:message>		
+			<xsl:apply-templates select="resource" mode="annex_a"/> <!-- res_doc/sect_a_short_names.xsl  -->
+			
+			<!-- Annex B Information object registration -->
+			<xsl:message>[INFO] Processing Annex B Information object registration ...</xsl:message>		
+			<xsl:apply-templates select="resource" mode="annex_b"/> <!-- res_doc/sect_b_obj_reg.xsl  -->
+
+			<!-- Annex C Computer interpretable listings -->
+			<xsl:message>[INFO] Processing Annex C Computer interpretable listings ...</xsl:message>		
+			<xsl:apply-templates select="resource" mode="annexc"/> <!-- res_doc/sect_c_exp.xsl  -->
+			
+			<!-- Annex D EXPRESS-G diagrams -->
+			<xsl:message>[INFO] Processing Annex D EXPRESS-G diagrams ...</xsl:message>		
+			<xsl:apply-templates select="resource" mode="annexd"/> <!-- res_doc/sect_d_expg.xsl  -->
+				
+			<!-- Annex E F G H -->		
+			
+			<!-- Annex Technical discussion -->		
+			<xsl:if test="string-length(normalize-space(resource/tech_discussion//text())) &gt; 0">			
+				<xsl:message>[INFO] Processing Annex Technical discussion ...</xsl:message>		
+				<xsl:apply-templates select="resource" mode="tech_discussion"/> <!-- res_doc/sect_tech_discussion.xsl -->
+			</xsl:if>
+			
+			<!-- Annex Examples -->
+			<xsl:if test="string-length(normalize-space(resource/examples//text())) &gt; 0">			
+				<xsl:message>[INFO] Processing Annex Examples ...</xsl:message>		
+				<xsl:apply-templates select="resource" mode="examples"/> <!-- res_doc/sect_examples.xsl -->
+			</xsl:if>
+				
+			<!-- Annex Additional scope -->
+			<xsl:if test="string-length(normalize-space(resource/add_scope//text())) &gt; 0">
+				<xsl:message>[INFO] Annex Additional scope ...</xsl:message>		
+				<xsl:apply-templates select="resource" mode="additional_scope"/> <!-- res_doc/sect_add_scope.xsl -->
+			</xsl:if>
+			
+			<!-- Annex x Change history -->
+			<xsl:if test="resource/changes">
+				<xsl:message>[INFO] Processing Annex Change history ...</xsl:message>		
+				<xsl:apply-templates select="resource" mode="change_history"/> <!-- res_doc/sect_g_change.xsl -->
+			</xsl:if>
+			
+		</xsl:variable>
+			
+		<xsl:apply-templates select="xalan:nodeset($adoc)" mode="text"/>
 		
-		<!-- Annex x Change history -->
-		<xsl:if test="resource/changes">
-			<xsl:message>[INFO] Processing Annex Change history ...</xsl:message>		
-			<xsl:apply-templates select="resource" mode="change_history"/> <!-- res_doc/sect_g_change.xsl -->
-		</xsl:if>
 			
 		<!-- Bibliography -->
 		<xsl:if test="resource/bibliography/*">
@@ -290,6 +299,67 @@
 				<xsl:apply-templates select="resource" mode="bibliography"/> <!-- res_doc/sect_biblio.xsl  -->	
 		</xsl:if>
 		
+		<!-- insert header, if there isn't bibliography in the document, but there are external docs refs -->
+		<xsl:if test="xalan:nodeset($adoc)//ExternalDocumentReference and not(resource/bibliography/*)">
+			<xsl:call-template name="insertHeaderADOC">
+				<xsl:with-param name="id" select="'bibliography'"/>		
+				<xsl:with-param name="level" select="1"/>
+				<xsl:with-param name="header" select="'Bibliography'"/>		
+			</xsl:call-template>		
+		</xsl:if>
+		
+		<xsl:variable name="ExternalDocumentReferences">
+			<xsl:for-each select="xalan:nodeset($adoc)//ExternalDocumentReference">
+				<xsl:copy-of select="."/>
+			</xsl:for-each>
+		</xsl:variable>
+		
+		<xsl:for-each select="xalan:nodeset($ExternalDocumentReferences)//ExternalDocumentReference">	
+			<!-- docid=<xsl:value-of select="@docid"/><xsl:text>&#xa;</xsl:text> -->
+			<xsl:if test="not(preceding-sibling::ExternalDocumentReference/@docid = current()/@docid)">
+				<xsl:text>* [[[</xsl:text>
+				<xsl:variable name="docid">
+				<xsl:choose>
+					<xsl:when test="starts-with(@docid, '/resources/')">
+						<xsl:value-of select="substring-after(@docid, '/resources/')"/>
+					</xsl:when>
+					<xsl:when test="starts-with(@docid, '/resource_docs/')">
+						<xsl:value-of select="substring-after(@docid, '/resource_docs/')"/>
+					</xsl:when>				
+					<xsl:otherwise>
+						<xsl:value-of select="@docid"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
+			<xsl:value-of select="$docid"/>			
+				<xsl:text>,repo:(current-metanorma-collection/</xsl:text>
+				<xsl:value-of select="$docid"/>
+				<xsl:text>)]]]</xsl:text>
+				<xsl:text>, _</xsl:text>
+				
+				<xsl:variable name="title">
+					<xsl:choose>
+						<xsl:when test="starts-with(@docid, '/resources/')">
+							<xsl:variable name="xmlfile" select="concat(substring-after(@docid, '/resources/'), '.xml')"/>				
+							<xsl:value-of select="document(concat($path, '../..', @docid, '/', $xmlfile))//*[@name and not(local-name() = 'application')][1]/@name"/>
+						</xsl:when>
+						<xsl:when test="starts-with(@docid, '/resource_docs/')">
+							<xsl:variable name="xmlfile" select="'resource.xml'"/>				
+							<xsl:value-of select="document(concat($path, '../..', @docid, '/', $xmlfile))/*/@name"/>
+						</xsl:when>
+					</xsl:choose>
+				</xsl:variable>
+				
+				<xsl:call-template name="module_display_name">
+					<xsl:with-param name="module" select="$title"/>
+				</xsl:call-template>
+				
+				<xsl:text>_</xsl:text>
+				<xsl:text>&#xa;&#xa;</xsl:text>
+			</xsl:if>
+		</xsl:for-each>
+		
+		
 	</xsl:template>
 
 
@@ -470,16 +540,52 @@
 	
 	<xsl:template name="insertHyperlink">
 		<xsl:param name="a"/>
+		<xsl:param name="asText" select="'false'"/>
 		<xsl:variable name="href">
 			<xsl:choose>
 				<xsl:when test="xalan:nodeset($a)/*/@HREF"><xsl:value-of select="xalan:nodeset($a)/*/@HREF"/></xsl:when>
 				<xsl:otherwise><xsl:value-of select="xalan:nodeset($a)/*/@href"/></xsl:otherwise>
 			</xsl:choose>
 		</xsl:variable>
-		<xsl:value-of select="$href"/><xsl:text>[</xsl:text><xsl:value-of select="normalize-space(xalan:nodeset($a)/*/text())"/><xsl:text>]</xsl:text>
+		<xsl:choose>
+			<xsl:when test="$asText = 'true'">
+				<xsl:value-of select="$href"/><xsl:text>[</xsl:text><xsl:value-of select="normalize-space(xalan:nodeset($a)/*/text())"/><xsl:text>]</xsl:text>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:element name="ExternalDocumentReference">
+					<xsl:attribute name="docid">
+						<xsl:value-of select="$href"/>
+					</xsl:attribute>
+					<xsl:attribute name="anchor">
+						<xsl:value-of select="normalize-space(xalan:nodeset($a)/*/text())"/>
+					</xsl:attribute>
+				</xsl:element>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+	
+	<xsl:template match="ExternalDocumentReference" mode="text">
+		<xsl:text>&lt;&lt;</xsl:text>
 		
+		<xsl:choose>
+			<xsl:when test="starts-with(@docid, '/resources/')">
+				<xsl:value-of select="substring-after(@docid, '/resources/')"/>
+			</xsl:when>
+			<xsl:when test="starts-with(@docid, '/resource_docs/')">
+				<xsl:value-of select="substring-after(@docid, '/resource_docs/')"/>
+			</xsl:when>				
+			<xsl:otherwise>
+				<xsl:value-of select="@docid"/>
+			</xsl:otherwise>
+		</xsl:choose>
+		
+		<xsl:if test="normalize-space(@anchor) != ''">
+			<xsl:text>,#</xsl:text><xsl:value-of select="@anchor"/>
+		</xsl:if>
+		<xsl:text>&gt;&gt;</xsl:text>
 	</xsl:template>
 	
+	
 	<xsl:template name="repeat">
 		<xsl:param name="char" select="'='"/>
 		<xsl:param name="count" />