metanorma-ogc 2.2.3 → 2.2.5

data/lib/isodoc/ogc/ogc.policy.xsl

@@ -2083,6 +2083,8 @@
 		<xsl:attribute name="padding-right">1mm</xsl:attribute>
 		<xsl:attribute name="display-align">center</xsl:attribute>
 
+			<xsl:attribute name="padding-top">1mm</xsl:attribute>
+			<xsl:attribute name="padding-bottom">1mm</xsl:attribute>
 			<xsl:attribute name="border">solid black 0pt</xsl:attribute>
 
 	</xsl:attribute-set> <!-- table-header-cell-style -->
@@ -3184,9 +3186,9 @@
 
 			<fo:block-container xsl:use-attribute-sets="table-container-style">
 
-					<xsl:if test="ancestor::*[local-name()='sections']">
+					<!-- <xsl:if test="ancestor::*[local-name()='sections']"> -->
 						<xsl:attribute name="font-size">9pt</xsl:attribute>
-					</xsl:if>
+					<!-- </xsl:if> -->
 
 				<!-- end table block-container attributes -->
 
@@ -3960,9 +3962,12 @@
 		<fo:table-row xsl:use-attribute-sets="table-body-row-style">
 
 				<xsl:variable name="number"><xsl:number/></xsl:variable>
-				<xsl:if test="$number mod 2 = 0">
-					<xsl:attribute name="background-color">rgb(252, 246, 222)</xsl:attribute>
-				</xsl:if>
+				<xsl:attribute name="background-color">
+					<xsl:choose>
+						<xsl:when test="$number mod 2 = 0">rgb(252, 246, 222)</xsl:when>
+						<xsl:otherwise>rgb(254, 252, 245)</xsl:otherwise>
+					</xsl:choose>
+				</xsl:attribute>
 
 			<xsl:call-template name="setTableRowAttributes"/>
 			<xsl:apply-templates/>
@@ -3983,6 +3988,12 @@
 				<xsl:with-param name="default">center</xsl:with-param>
 			</xsl:call-template>
 
+				<xsl:if test="starts-with(ancestor::*[local-name() = 'table'][1]/@type, 'recommend') and normalize-space(@align) = ''">
+					<xsl:call-template name="setTextAlignment">
+						<xsl:with-param name="default">left</xsl:with-param>
+					</xsl:call-template>
+				</xsl:if>
+
 			<xsl:if test="$lang = 'ar'">
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
 			</xsl:if>
@@ -4994,8 +5005,10 @@
 
 				 <!-- 10 -->
 
-				9.5
-
+					<xsl:choose>
+						<xsl:when test="ancestor::*[local-name() = 'table']">8.5</xsl:when>
+						<xsl:otherwise>9.5</xsl:otherwise>
+					</xsl:choose>
 
 			</xsl:variable>
 			<xsl:variable name="font-size" select="normalize-space($_font-size)"/>
@@ -5013,8 +5026,17 @@
 		</fo:inline>
 	</xsl:template> <!-- tt -->
 
+	<xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
 	<xsl:template match="*[local-name()='tt']/text()" priority="2">
-		<xsl:call-template name="add_spaces_to_sourcecode"/>
+		<xsl:choose>
+			<xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
+				 <!-- url -->
+				<xsl:call-template name="add-zero-spaces-link-java"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:call-template name="add_spaces_to_sourcecode"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template match="*[local-name()='underline']">
@@ -5370,8 +5392,11 @@
 
 	<xsl:template name="add-zero-spaces-link-java">
 		<xsl:param name="text" select="."/>
+
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$1')"/> <!-- http://. https:// or www. -->
+		<xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
 		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space  -->
-		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |,)','$1​')"/>
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/)','$1​')"/>
 	</xsl:template>
 
 	<!-- add zero space after dash character (for table's entries) -->
@@ -7483,8 +7508,10 @@
 							<xsl:if test="$current_template = 'standard'">8</xsl:if>
 						</xsl:if> -->
 
-						9.5
-
+							<xsl:choose>
+								<xsl:when test="ancestor::*[local-name() = 'table']">8.5</xsl:when>
+								<xsl:otherwise>9.5</xsl:otherwise>
+							</xsl:choose>
 
 				</xsl:variable>
 
@@ -8031,7 +8058,8 @@
 	<xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
 		<fo:block font-size="11pt">
 
-				<xsl:attribute name="color"><xsl:value-of select="$color_design"/></xsl:attribute>
+				<!-- <xsl:attribute name="color"><xsl:value-of select="$color_design"/></xsl:attribute> -->
+				<xsl:attribute name="color">white</xsl:attribute>
 
 			<xsl:apply-templates/>
 		</fo:block>
@@ -8384,7 +8412,7 @@
 	<!-- ====== -->
 	<!-- eref -->
 	<!-- ====== -->
-	<xsl:template match="*[local-name() = 'eref']">
+	<xsl:template match="*[local-name() = 'eref']" name="eref">
 		<xsl:variable name="current_bibitemid" select="@bibitemid"/>
 		<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
 		<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
@@ -9837,7 +9865,7 @@
 
 	<xsl:variable name="element_name_keep-together_within-line">keep-together_within-line</xsl:variable>
 
-	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'])]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
+	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or      ancestor::*[local-name() = 'link'][not(contains(.,' '))] or      ancestor::*[local-name() = 'sourcecode'] or      ancestor::*[local-name() = 'math'] or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
 
 		<!-- enclose standard's number into tag 'keep-together_within-line' -->
 		<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>

data/lib/isodoc/ogc/ogc.reference-model.xsl

@@ -2083,6 +2083,8 @@
 		<xsl:attribute name="padding-right">1mm</xsl:attribute>
 		<xsl:attribute name="display-align">center</xsl:attribute>
 
+			<xsl:attribute name="padding-top">1mm</xsl:attribute>
+			<xsl:attribute name="padding-bottom">1mm</xsl:attribute>
 			<xsl:attribute name="border">solid black 0pt</xsl:attribute>
 
 	</xsl:attribute-set> <!-- table-header-cell-style -->
@@ -3184,9 +3186,9 @@
 
 			<fo:block-container xsl:use-attribute-sets="table-container-style">
 
-					<xsl:if test="ancestor::*[local-name()='sections']">
+					<!-- <xsl:if test="ancestor::*[local-name()='sections']"> -->
 						<xsl:attribute name="font-size">9pt</xsl:attribute>
-					</xsl:if>
+					<!-- </xsl:if> -->
 
 				<!-- end table block-container attributes -->
 
@@ -3960,9 +3962,12 @@
 		<fo:table-row xsl:use-attribute-sets="table-body-row-style">
 
 				<xsl:variable name="number"><xsl:number/></xsl:variable>
-				<xsl:if test="$number mod 2 = 0">
-					<xsl:attribute name="background-color">rgb(252, 246, 222)</xsl:attribute>
-				</xsl:if>
+				<xsl:attribute name="background-color">
+					<xsl:choose>
+						<xsl:when test="$number mod 2 = 0">rgb(252, 246, 222)</xsl:when>
+						<xsl:otherwise>rgb(254, 252, 245)</xsl:otherwise>
+					</xsl:choose>
+				</xsl:attribute>
 
 			<xsl:call-template name="setTableRowAttributes"/>
 			<xsl:apply-templates/>
@@ -3983,6 +3988,12 @@
 				<xsl:with-param name="default">center</xsl:with-param>
 			</xsl:call-template>
 
+				<xsl:if test="starts-with(ancestor::*[local-name() = 'table'][1]/@type, 'recommend') and normalize-space(@align) = ''">
+					<xsl:call-template name="setTextAlignment">
+						<xsl:with-param name="default">left</xsl:with-param>
+					</xsl:call-template>
+				</xsl:if>
+
 			<xsl:if test="$lang = 'ar'">
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
 			</xsl:if>
@@ -4994,8 +5005,10 @@
 
 				 <!-- 10 -->
 
-				9.5
-
+					<xsl:choose>
+						<xsl:when test="ancestor::*[local-name() = 'table']">8.5</xsl:when>
+						<xsl:otherwise>9.5</xsl:otherwise>
+					</xsl:choose>
 
 			</xsl:variable>
 			<xsl:variable name="font-size" select="normalize-space($_font-size)"/>
@@ -5013,8 +5026,17 @@
 		</fo:inline>
 	</xsl:template> <!-- tt -->
 
+	<xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
 	<xsl:template match="*[local-name()='tt']/text()" priority="2">
-		<xsl:call-template name="add_spaces_to_sourcecode"/>
+		<xsl:choose>
+			<xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
+				 <!-- url -->
+				<xsl:call-template name="add-zero-spaces-link-java"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:call-template name="add_spaces_to_sourcecode"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template match="*[local-name()='underline']">
@@ -5370,8 +5392,11 @@
 
 	<xsl:template name="add-zero-spaces-link-java">
 		<xsl:param name="text" select="."/>
+
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$1')"/> <!-- http://. https:// or www. -->
+		<xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
 		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space  -->
-		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |,)','$1​')"/>
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/)','$1​')"/>
 	</xsl:template>
 
 	<!-- add zero space after dash character (for table's entries) -->
@@ -7483,8 +7508,10 @@
 							<xsl:if test="$current_template = 'standard'">8</xsl:if>
 						</xsl:if> -->
 
-						9.5
-
+							<xsl:choose>
+								<xsl:when test="ancestor::*[local-name() = 'table']">8.5</xsl:when>
+								<xsl:otherwise>9.5</xsl:otherwise>
+							</xsl:choose>
 
 				</xsl:variable>
 
@@ -8031,7 +8058,8 @@
 	<xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
 		<fo:block font-size="11pt">
 
-				<xsl:attribute name="color"><xsl:value-of select="$color_design"/></xsl:attribute>
+				<!-- <xsl:attribute name="color"><xsl:value-of select="$color_design"/></xsl:attribute> -->
+				<xsl:attribute name="color">white</xsl:attribute>
 
 			<xsl:apply-templates/>
 		</fo:block>
@@ -8384,7 +8412,7 @@
 	<!-- ====== -->
 	<!-- eref -->
 	<!-- ====== -->
-	<xsl:template match="*[local-name() = 'eref']">
+	<xsl:template match="*[local-name() = 'eref']" name="eref">
 		<xsl:variable name="current_bibitemid" select="@bibitemid"/>
 		<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
 		<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
@@ -9837,7 +9865,7 @@
 
 	<xsl:variable name="element_name_keep-together_within-line">keep-together_within-line</xsl:variable>
 
-	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'])]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
+	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or      ancestor::*[local-name() = 'link'][not(contains(.,' '))] or      ancestor::*[local-name() = 'sourcecode'] or      ancestor::*[local-name() = 'math'] or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
 
 		<!-- enclose standard's number into tag 'keep-together_within-line' -->
 		<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>

data/lib/isodoc/ogc/ogc.release-notes.xsl

@@ -2083,6 +2083,8 @@
 		<xsl:attribute name="padding-right">1mm</xsl:attribute>
 		<xsl:attribute name="display-align">center</xsl:attribute>
 
+			<xsl:attribute name="padding-top">1mm</xsl:attribute>
+			<xsl:attribute name="padding-bottom">1mm</xsl:attribute>
 			<xsl:attribute name="border">solid black 0pt</xsl:attribute>
 
 	</xsl:attribute-set> <!-- table-header-cell-style -->
@@ -3184,9 +3186,9 @@
 
 			<fo:block-container xsl:use-attribute-sets="table-container-style">
 
-					<xsl:if test="ancestor::*[local-name()='sections']">
+					<!-- <xsl:if test="ancestor::*[local-name()='sections']"> -->
 						<xsl:attribute name="font-size">9pt</xsl:attribute>
-					</xsl:if>
+					<!-- </xsl:if> -->
 
 				<!-- end table block-container attributes -->
 
@@ -3960,9 +3962,12 @@
 		<fo:table-row xsl:use-attribute-sets="table-body-row-style">
 
 				<xsl:variable name="number"><xsl:number/></xsl:variable>
-				<xsl:if test="$number mod 2 = 0">
-					<xsl:attribute name="background-color">rgb(252, 246, 222)</xsl:attribute>
-				</xsl:if>
+				<xsl:attribute name="background-color">
+					<xsl:choose>
+						<xsl:when test="$number mod 2 = 0">rgb(252, 246, 222)</xsl:when>
+						<xsl:otherwise>rgb(254, 252, 245)</xsl:otherwise>
+					</xsl:choose>
+				</xsl:attribute>
 
 			<xsl:call-template name="setTableRowAttributes"/>
 			<xsl:apply-templates/>
@@ -3983,6 +3988,12 @@
 				<xsl:with-param name="default">center</xsl:with-param>
 			</xsl:call-template>
 
+				<xsl:if test="starts-with(ancestor::*[local-name() = 'table'][1]/@type, 'recommend') and normalize-space(@align) = ''">
+					<xsl:call-template name="setTextAlignment">
+						<xsl:with-param name="default">left</xsl:with-param>
+					</xsl:call-template>
+				</xsl:if>
+
 			<xsl:if test="$lang = 'ar'">
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
 			</xsl:if>
@@ -4994,8 +5005,10 @@
 
 				 <!-- 10 -->
 
-				9.5
-
+					<xsl:choose>
+						<xsl:when test="ancestor::*[local-name() = 'table']">8.5</xsl:when>
+						<xsl:otherwise>9.5</xsl:otherwise>
+					</xsl:choose>
 
 			</xsl:variable>
 			<xsl:variable name="font-size" select="normalize-space($_font-size)"/>
@@ -5013,8 +5026,17 @@
 		</fo:inline>
 	</xsl:template> <!-- tt -->
 
+	<xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
 	<xsl:template match="*[local-name()='tt']/text()" priority="2">
-		<xsl:call-template name="add_spaces_to_sourcecode"/>
+		<xsl:choose>
+			<xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
+				 <!-- url -->
+				<xsl:call-template name="add-zero-spaces-link-java"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:call-template name="add_spaces_to_sourcecode"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template match="*[local-name()='underline']">
@@ -5370,8 +5392,11 @@
 
 	<xsl:template name="add-zero-spaces-link-java">
 		<xsl:param name="text" select="."/>
+
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$1')"/> <!-- http://. https:// or www. -->
+		<xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
 		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space  -->
-		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |,)','$1​')"/>
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/)','$1​')"/>
 	</xsl:template>
 
 	<!-- add zero space after dash character (for table's entries) -->
@@ -7483,8 +7508,10 @@
 							<xsl:if test="$current_template = 'standard'">8</xsl:if>
 						</xsl:if> -->
 
-						9.5
-
+							<xsl:choose>
+								<xsl:when test="ancestor::*[local-name() = 'table']">8.5</xsl:when>
+								<xsl:otherwise>9.5</xsl:otherwise>
+							</xsl:choose>
 
 				</xsl:variable>
 
@@ -8031,7 +8058,8 @@
 	<xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
 		<fo:block font-size="11pt">
 
-				<xsl:attribute name="color"><xsl:value-of select="$color_design"/></xsl:attribute>
+				<!-- <xsl:attribute name="color"><xsl:value-of select="$color_design"/></xsl:attribute> -->
+				<xsl:attribute name="color">white</xsl:attribute>
 
 			<xsl:apply-templates/>
 		</fo:block>
@@ -8384,7 +8412,7 @@
 	<!-- ====== -->
 	<!-- eref -->
 	<!-- ====== -->
-	<xsl:template match="*[local-name() = 'eref']">
+	<xsl:template match="*[local-name() = 'eref']" name="eref">
 		<xsl:variable name="current_bibitemid" select="@bibitemid"/>
 		<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
 		<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
@@ -9837,7 +9865,7 @@
 
 	<xsl:variable name="element_name_keep-together_within-line">keep-together_within-line</xsl:variable>
 
-	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'])]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
+	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or      ancestor::*[local-name() = 'link'][not(contains(.,' '))] or      ancestor::*[local-name() = 'sourcecode'] or      ancestor::*[local-name() = 'math'] or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
 
 		<!-- enclose standard's number into tag 'keep-together_within-line' -->
 		<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>

data/lib/isodoc/ogc/ogc.standard.xsl

@@ -2083,6 +2083,8 @@
 		<xsl:attribute name="padding-right">1mm</xsl:attribute>
 		<xsl:attribute name="display-align">center</xsl:attribute>
 
+			<xsl:attribute name="padding-top">1mm</xsl:attribute>
+			<xsl:attribute name="padding-bottom">1mm</xsl:attribute>
 			<xsl:attribute name="border">solid black 0pt</xsl:attribute>
 
 	</xsl:attribute-set> <!-- table-header-cell-style -->
@@ -3184,9 +3186,9 @@
 
 			<fo:block-container xsl:use-attribute-sets="table-container-style">
 
-					<xsl:if test="ancestor::*[local-name()='sections']">
+					<!-- <xsl:if test="ancestor::*[local-name()='sections']"> -->
 						<xsl:attribute name="font-size">9pt</xsl:attribute>
-					</xsl:if>
+					<!-- </xsl:if> -->
 
 				<!-- end table block-container attributes -->
 
@@ -3960,9 +3962,12 @@
 		<fo:table-row xsl:use-attribute-sets="table-body-row-style">
 
 				<xsl:variable name="number"><xsl:number/></xsl:variable>
-				<xsl:if test="$number mod 2 = 0">
-					<xsl:attribute name="background-color">rgb(252, 246, 222)</xsl:attribute>
-				</xsl:if>
+				<xsl:attribute name="background-color">
+					<xsl:choose>
+						<xsl:when test="$number mod 2 = 0">rgb(252, 246, 222)</xsl:when>
+						<xsl:otherwise>rgb(254, 252, 245)</xsl:otherwise>
+					</xsl:choose>
+				</xsl:attribute>
 
 			<xsl:call-template name="setTableRowAttributes"/>
 			<xsl:apply-templates/>
@@ -3983,6 +3988,12 @@
 				<xsl:with-param name="default">center</xsl:with-param>
 			</xsl:call-template>
 
+				<xsl:if test="starts-with(ancestor::*[local-name() = 'table'][1]/@type, 'recommend') and normalize-space(@align) = ''">
+					<xsl:call-template name="setTextAlignment">
+						<xsl:with-param name="default">left</xsl:with-param>
+					</xsl:call-template>
+				</xsl:if>
+
 			<xsl:if test="$lang = 'ar'">
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
 			</xsl:if>
@@ -4994,8 +5005,10 @@
 
 				 <!-- 10 -->
 
-				9.5
-
+					<xsl:choose>
+						<xsl:when test="ancestor::*[local-name() = 'table']">8.5</xsl:when>
+						<xsl:otherwise>9.5</xsl:otherwise>
+					</xsl:choose>
 
 			</xsl:variable>
 			<xsl:variable name="font-size" select="normalize-space($_font-size)"/>
@@ -5013,8 +5026,17 @@
 		</fo:inline>
 	</xsl:template> <!-- tt -->
 
+	<xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
 	<xsl:template match="*[local-name()='tt']/text()" priority="2">
-		<xsl:call-template name="add_spaces_to_sourcecode"/>
+		<xsl:choose>
+			<xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
+				 <!-- url -->
+				<xsl:call-template name="add-zero-spaces-link-java"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:call-template name="add_spaces_to_sourcecode"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template match="*[local-name()='underline']">
@@ -5370,8 +5392,11 @@
 
 	<xsl:template name="add-zero-spaces-link-java">
 		<xsl:param name="text" select="."/>
+
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$1')"/> <!-- http://. https:// or www. -->
+		<xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
 		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space  -->
-		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |,)','$1​')"/>
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/)','$1​')"/>
 	</xsl:template>
 
 	<!-- add zero space after dash character (for table's entries) -->
@@ -7483,8 +7508,10 @@
 							<xsl:if test="$current_template = 'standard'">8</xsl:if>
 						</xsl:if> -->
 
-						9.5
-
+							<xsl:choose>
+								<xsl:when test="ancestor::*[local-name() = 'table']">8.5</xsl:when>
+								<xsl:otherwise>9.5</xsl:otherwise>
+							</xsl:choose>
 
 				</xsl:variable>
 
@@ -8031,7 +8058,8 @@
 	<xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
 		<fo:block font-size="11pt">
 
-				<xsl:attribute name="color"><xsl:value-of select="$color_design"/></xsl:attribute>
+				<!-- <xsl:attribute name="color"><xsl:value-of select="$color_design"/></xsl:attribute> -->
+				<xsl:attribute name="color">white</xsl:attribute>
 
 			<xsl:apply-templates/>
 		</fo:block>
@@ -8384,7 +8412,7 @@
 	<!-- ====== -->
 	<!-- eref -->
 	<!-- ====== -->
-	<xsl:template match="*[local-name() = 'eref']">
+	<xsl:template match="*[local-name() = 'eref']" name="eref">
 		<xsl:variable name="current_bibitemid" select="@bibitemid"/>
 		<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
 		<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
@@ -9837,7 +9865,7 @@
 
 	<xsl:variable name="element_name_keep-together_within-line">keep-together_within-line</xsl:variable>
 
-	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'])]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
+	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or      ancestor::*[local-name() = 'link'][not(contains(.,' '))] or      ancestor::*[local-name() = 'sourcecode'] or      ancestor::*[local-name() = 'math'] or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
 
 		<!-- enclose standard's number into tag 'keep-together_within-line' -->
 		<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>