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

---
 .../stepmod.base_xsl/res_doc/common.xsl         |  2 +-
 .../stepmod.base_xsl/res_doc/express_link.xsl   | 17 ++++++++---------
 src/main/resources/stepmod2mn.adoc.xsl          |  2 ++
 3 files changed, 11 insertions(+), 10 deletions(-)

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 c569730..c5394e3 100644
--- a/src/main/resources/stepmod.base_xsl/res_doc/common.xsl
+++ b/src/main/resources/stepmod.base_xsl/res_doc/common.xsl
@@ -157,7 +157,7 @@ $Id: common.xsl,v 1.33 2008/05/21 20:50:25 abf Exp $
 				
 				<xsl:choose>
 				
-					<xsl:when test="contains($href, concat('/', $current_module, '/'))"><!-- if link inside current module -->
+					<xsl:when test="contains($href, concat('/', $current_module, '/')) or 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>
 					
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 2ec759f..80b6b7a 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
@@ -445,18 +445,17 @@
 			</xsl:when>
 			<xsl:otherwise>
 			
-				<xsl:call-template name="insertHyperlink">
+				<xsl:call-template name="insertHyperlinkSkip">
 					<xsl:with-param name="a">
 						 <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>
+						</A>						
 					</xsl:with-param>
 				</xsl:call-template>
-				
+				<xsl:value-of select="$xref"/>
 				
 			</xsl:otherwise>
 		</xsl:choose>
@@ -466,7 +465,7 @@
 	<!-- 
 			 Output a HREF for the fundamental concepts.
 			 -->
-	<xsl:template name="link_fund_cons">
+	<xsl:template name="link_fund_cons"> <!-- NOT USING -->
 		<xsl:param name="schema_name"/>
 		<xsl:param name="clause" select="section"/>
 
@@ -516,7 +515,7 @@
 	<!-- 
 			 Output a HREF for the fundamental concepts.
 			 -->
-	<xsl:template name="link_intro">
+	<xsl:template name="link_intro"> <!-- NOT USING -->
 		<xsl:param name="schema_name"/>
 		<xsl:param name="clause" select="section"/>
 
@@ -601,14 +600,14 @@
 					</xsl:call-template>
 				</xsl:variable>
 				
-				<xsl:call-template name="insertHyperlink">
+				<xsl:call-template name="insertHyperlinkSkip">
 					<xsl:with-param name="a">
 						<A HREF="{$xref}">
 							<xsl:value-of select="$lobject_name"/>
 						</A>
 					</xsl:with-param>
 				</xsl:call-template>
-				
+				<xsl:value-of select="$lobject_name"/>
 				
 				<!-- debug 
 				<xsl:message>     
@@ -1205,7 +1204,7 @@
 
 	<!-- output the object, linked to the integrated resource
 	-->
-	<xsl:template name="link_resource_object">
+	<xsl:template name="link_resource_object"> <!-- NOT USING -->
 		<xsl:param name="object_name"/>
 		<!-- make sure that the arguments don't have any whitespace -->
 		<xsl:variable name="lobject_name" 
diff --git a/src/main/resources/stepmod2mn.adoc.xsl b/src/main/resources/stepmod2mn.adoc.xsl
index a643d19..ca0118a 100644
--- a/src/main/resources/stepmod2mn.adoc.xsl
+++ b/src/main/resources/stepmod2mn.adoc.xsl
@@ -564,6 +564,8 @@
 		</xsl:choose>
 	</xsl:template>
 	
+	<xsl:template name="insertHyperlinkSkip"/>
+	
 	<xsl:template match="ExternalDocumentReference" mode="text">
 		<xsl:text>&lt;&lt;</xsl:text>