metanorma-itu 2.0.7 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7db89ad5d9d4b7e95fabe204b31d0483a5aa2aff9b8b44b3928c950ee386298f
-  data.tar.gz: d811c5e55c05040a3dea4ce55c4bda15b1ec8d4d3bc32ea9c450114e7586761a
+  metadata.gz: 0e30e3335fc27b626ca6cba25b687f537aac08babe91e60664b75cdf3d15b297
+  data.tar.gz: 35647c71c2143a270867b3ac28df029132b57d7aa6f06775eb86f54ed2d2e4b4
 SHA512:
-  metadata.gz: e9f972facda295bc86b330f579673aa5b8dcc506db6a1b042867db5845527e4d806bc4abdfefb1266fadd955b323990f2ab4d8cc9a0d9c6dd3c57b888aa07e2f
-  data.tar.gz: 6eb2bd17053707a2c85d49f4b10841a69b6d69e739c85c0ab37a73d2d2f11821ae0e3c20201d0484b61ee78d75b0a8a2e7f844696840af6b6f6bf796d99c2914
+  metadata.gz: 4d5973cea39ad61788f98e1176eae971ab0e7cf680e6aac7fd823d8a240055d73a672f2fcf7484b293dcaf6e6c6bca58dc3732cfdc1a7d1a2ca1f14620dd1768
+  data.tar.gz: de137661607d004bd80e2b119f2932abaae1ffc78b4cc57789ecde1c7b20c295ddf6369184c55c6b82774f1d42e2e0f3c54efe97c9a633e070bc7737c12021e5

data/lib/isodoc/itu/itu.implementers-guide.xsl

@@ -114,21 +114,29 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
-			<!-- <xsl:if test="$lang != 'ar'">
-				<xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
-			</xsl:if> -->
-			<xsl:if test="$doctype = 'resolution'">
-				<xsl:attribute name="font-size">11pt</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="$doctype = 'service-publication'">
-				<xsl:attribute name="font-size">11pt</xsl:attribute>
-				<xsl:attribute name="font-family">Arial, STIX Two Math</xsl:attribute>
-			</xsl:if>
-			<xsl:call-template name="setWritingMode"/>
-			<xsl:if test="$lang = 'ar'">
-				<xsl:attribute name="font-family">Traditional Arabic, Times New Roman, STIX Two Math</xsl:attribute>
-			</xsl:if>
+		<fo:root xml:lang="{$lang}">
+			<xsl:variable name="root-style">
+				<root-style xsl:use-attribute-sets="root-style">
+					<!-- <xsl:if test="$lang != 'ar'">
+						<xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
+					</xsl:if> -->
+					<xsl:if test="$doctype = 'resolution'">
+						<xsl:attribute name="font-size">11pt</xsl:attribute>
+					</xsl:if>
+					<xsl:if test="$doctype = 'service-publication'">
+						<xsl:attribute name="font-size">11pt</xsl:attribute>
+						<xsl:attribute name="font-family">Arial, STIX Two Math</xsl:attribute>
+					</xsl:if>
+					<xsl:call-template name="setWritingMode"/>
+					<xsl:if test="$lang = 'ar'">
+						<xsl:attribute name="font-family">Traditional Arabic, Times New Roman, STIX Two Math</xsl:attribute>
+					</xsl:if>
+				</root-style>
+			</xsl:variable>
+			<xsl:call-template name="insertRootStyle">
+				<xsl:with-param name="root-style" select="$root-style"/>
+			</xsl:call-template>
+			
 			<fo:layout-master-set>
 			
 				<!-- Technical Report first page -->
@@ -2210,7 +2218,30 @@
 		
 		
 		
-	</xsl:attribute-set><xsl:attribute-set name="copyright-statement-style">
+	</xsl:attribute-set><xsl:template name="insertRootStyle">
+		<xsl:param name="root-style"/>
+		<xsl:variable name="root-style_" select="xalan:nodeset($root-style)"/>
+		
+		<xsl:variable name="additional_fonts_">
+			<xsl:for-each select="//*[local-name() = 'misc-container'][1]/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value']">
+				<xsl:value-of select="."/><xsl:if test="position() != last()">, </xsl:if>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:variable name="additional_fonts" select="normalize-space($additional_fonts_)"/>
+		
+		<xsl:for-each select="$root-style_/root-style/@*">
+			<xsl:choose>
+				<xsl:when test="local-name() = 'font-family' and $additional_fonts != ''">
+					<xsl:attribute name="{local-name()}">
+						<xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
+					</xsl:attribute>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:copy-of select="."/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:for-each>
+	</xsl:template><xsl:attribute-set name="copyright-statement-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="copyright-statement-title-style">
 		
@@ -2720,7 +2751,7 @@
 		
 		
 		
-	</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">		
+	</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
 		
 				
 		
@@ -5176,24 +5207,28 @@
 	</xsl:template><xsl:template name="add-zero-spaces-equal">
 		<xsl:param name="text" select="."/>
 		<xsl:variable name="zero-space-after-equals">==========</xsl:variable>
+		<xsl:variable name="regex_zero-space-after-equals">(==========)</xsl:variable>
 		<xsl:variable name="zero-space-after-equal">=</xsl:variable>
+		<xsl:variable name="regex_zero-space-after-equal">(=)</xsl:variable>
 		<xsl:variable name="zero-space">​</xsl:variable>
 		<xsl:choose>
 			<xsl:when test="contains($text, $zero-space-after-equals)">
-				<xsl:value-of select="substring-before($text, $zero-space-after-equals)"/>
+				<!-- <xsl:value-of select="substring-before($text, $zero-space-after-equals)"/>
 				<xsl:value-of select="$zero-space-after-equals"/>
 				<xsl:value-of select="$zero-space"/>
 				<xsl:call-template name="add-zero-spaces-equal">
 					<xsl:with-param name="text" select="substring-after($text, $zero-space-after-equals)"/>
-				</xsl:call-template>
+				</xsl:call-template> -->
+				<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),$regex_zero-space-after-equals,concat('$1',$zero_width_space))"/>
 			</xsl:when>
 			<xsl:when test="contains($text, $zero-space-after-equal)">
-				<xsl:value-of select="substring-before($text, $zero-space-after-equal)"/>
+				<!-- <xsl:value-of select="substring-before($text, $zero-space-after-equal)"/>
 				<xsl:value-of select="$zero-space-after-equal"/>
 				<xsl:value-of select="$zero-space"/>
 				<xsl:call-template name="add-zero-spaces-equal">
 					<xsl:with-param name="text" select="substring-after($text, $zero-space-after-equal)"/>
-				</xsl:call-template>
+				</xsl:call-template> -->
+				<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),$regex_zero-space-after-equal,concat('$1',$zero_width_space))"/>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:value-of select="$text"/>
@@ -5673,7 +5708,12 @@
 			
 			<fo:inline xsl:use-attribute-sets="termnote-name-style">
 			
+				<xsl:if test="not(*[local-name() = 'name']/following-sibling::node()[1][self::text()][normalize-space()=''])">
+					<xsl:attribute name="padding-right">1mm</xsl:attribute>
+				</xsl:if>
+			
 				
+
 				
 				<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 				<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
@@ -6655,17 +6695,15 @@
 		
 		<!-- split text by zero-width space -->
 		<xsl:variable name="text_step4">
-			<xsl:call-template name="split">
+			<xsl:call-template name="split_for_interspers">
 				<xsl:with-param name="pText" select="$text_step3"/>
 				<xsl:with-param name="sep" select="$zero_width_space"/>
-				<xsl:with-param name="normalize-space">false</xsl:with-param>
-				<xsl:with-param name="keep_sep">true</xsl:with-param>
 			</xsl:call-template>
 		</xsl:variable>
 		
-		<xsl:for-each select="xalan:nodeset($text_step4)/item">
+		<xsl:for-each select="xalan:nodeset($text_step4)/node()">
 			<xsl:choose>
-				<xsl:when test="string-length() &gt; 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
+				<xsl:when test="local-name() = 'interspers'"> <!-- word with length more than 30 will be interspersed with zero-width space -->
 					<xsl:call-template name="interspers">
 						<xsl:with-param name="str" select="."/>
 					</xsl:call-template>
@@ -6676,6 +6714,30 @@
 			</xsl:choose>
 		</xsl:for-each>
 		
+	</xsl:template><xsl:variable name="interspers_tag_open">###interspers123###</xsl:variable><xsl:variable name="interspers_tag_close">###/interspers123###</xsl:variable><xsl:template name="split_for_interspers">
+		<xsl:param name="pText" select="."/>
+		<xsl:param name="sep" select="','"/>
+		<!-- word with length more than 30 will be interspersed with zero-width space -->
+		<xsl:variable name="regex" select="concat('([^', $zero_width_space, ']{31,})')"/> <!-- sequence of characters (more 31), that doesn't contains zero-width space -->
+		<xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new($pText),$regex,concat($interspers_tag_open,'$1',$interspers_tag_close))"/>
+		<xsl:call-template name="replace_tag_interspers">
+			<xsl:with-param name="text" select="$text"/>
+		</xsl:call-template>
+	</xsl:template><xsl:template name="replace_tag_interspers">
+		<xsl:param name="text"/>
+		<xsl:choose>
+			<xsl:when test="contains($text, $interspers_tag_open)">
+				<xsl:value-of select="substring-before($text, $interspers_tag_open)"/>
+				<xsl:variable name="text_after" select="substring-after($text, $interspers_tag_open)"/>
+				<interspers>
+					<xsl:value-of select="substring-before($text_after, $interspers_tag_close)"/>
+				</interspers>
+				<xsl:call-template name="replace_tag_interspers">
+					<xsl:with-param name="text" select="substring-after($text_after, $interspers_tag_close)"/>
+				</xsl:call-template>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template name="interspers">
 		<xsl:param name="str"/>
 		<xsl:param name="char" select="$zero_width_space"/>
@@ -7123,7 +7185,7 @@
 				</xsl:otherwise>
 			</xsl:choose> -->
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ')]" priority="2">
+	</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ') or     starts-with(., '[SOURCE: Quoted from: ') or     starts-with(., '[SOURCE: Modified from: ')]" priority="2">
 		<xsl:text>[</xsl:text><xsl:value-of select="substring-after(., '[SOURCE: ')"/>
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()">
 		<xsl:if test="normalize-space() != ''">

data/lib/isodoc/itu/itu.in-force.xsl

@@ -114,21 +114,29 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
-			<!-- <xsl:if test="$lang != 'ar'">
-				<xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
-			</xsl:if> -->
-			<xsl:if test="$doctype = 'resolution'">
-				<xsl:attribute name="font-size">11pt</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="$doctype = 'service-publication'">
-				<xsl:attribute name="font-size">11pt</xsl:attribute>
-				<xsl:attribute name="font-family">Arial, STIX Two Math</xsl:attribute>
-			</xsl:if>
-			<xsl:call-template name="setWritingMode"/>
-			<xsl:if test="$lang = 'ar'">
-				<xsl:attribute name="font-family">Traditional Arabic, Times New Roman, STIX Two Math</xsl:attribute>
-			</xsl:if>
+		<fo:root xml:lang="{$lang}">
+			<xsl:variable name="root-style">
+				<root-style xsl:use-attribute-sets="root-style">
+					<!-- <xsl:if test="$lang != 'ar'">
+						<xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
+					</xsl:if> -->
+					<xsl:if test="$doctype = 'resolution'">
+						<xsl:attribute name="font-size">11pt</xsl:attribute>
+					</xsl:if>
+					<xsl:if test="$doctype = 'service-publication'">
+						<xsl:attribute name="font-size">11pt</xsl:attribute>
+						<xsl:attribute name="font-family">Arial, STIX Two Math</xsl:attribute>
+					</xsl:if>
+					<xsl:call-template name="setWritingMode"/>
+					<xsl:if test="$lang = 'ar'">
+						<xsl:attribute name="font-family">Traditional Arabic, Times New Roman, STIX Two Math</xsl:attribute>
+					</xsl:if>
+				</root-style>
+			</xsl:variable>
+			<xsl:call-template name="insertRootStyle">
+				<xsl:with-param name="root-style" select="$root-style"/>
+			</xsl:call-template>
+			
 			<fo:layout-master-set>
 			
 				<!-- Technical Report first page -->
@@ -2210,7 +2218,30 @@
 		
 		
 		
-	</xsl:attribute-set><xsl:attribute-set name="copyright-statement-style">
+	</xsl:attribute-set><xsl:template name="insertRootStyle">
+		<xsl:param name="root-style"/>
+		<xsl:variable name="root-style_" select="xalan:nodeset($root-style)"/>
+		
+		<xsl:variable name="additional_fonts_">
+			<xsl:for-each select="//*[local-name() = 'misc-container'][1]/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value']">
+				<xsl:value-of select="."/><xsl:if test="position() != last()">, </xsl:if>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:variable name="additional_fonts" select="normalize-space($additional_fonts_)"/>
+		
+		<xsl:for-each select="$root-style_/root-style/@*">
+			<xsl:choose>
+				<xsl:when test="local-name() = 'font-family' and $additional_fonts != ''">
+					<xsl:attribute name="{local-name()}">
+						<xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
+					</xsl:attribute>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:copy-of select="."/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:for-each>
+	</xsl:template><xsl:attribute-set name="copyright-statement-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="copyright-statement-title-style">
 		
@@ -2720,7 +2751,7 @@
 		
 		
 		
-	</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">		
+	</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
 		
 				
 		
@@ -5176,24 +5207,28 @@
 	</xsl:template><xsl:template name="add-zero-spaces-equal">
 		<xsl:param name="text" select="."/>
 		<xsl:variable name="zero-space-after-equals">==========</xsl:variable>
+		<xsl:variable name="regex_zero-space-after-equals">(==========)</xsl:variable>
 		<xsl:variable name="zero-space-after-equal">=</xsl:variable>
+		<xsl:variable name="regex_zero-space-after-equal">(=)</xsl:variable>
 		<xsl:variable name="zero-space">​</xsl:variable>
 		<xsl:choose>
 			<xsl:when test="contains($text, $zero-space-after-equals)">
-				<xsl:value-of select="substring-before($text, $zero-space-after-equals)"/>
+				<!-- <xsl:value-of select="substring-before($text, $zero-space-after-equals)"/>
 				<xsl:value-of select="$zero-space-after-equals"/>
 				<xsl:value-of select="$zero-space"/>
 				<xsl:call-template name="add-zero-spaces-equal">
 					<xsl:with-param name="text" select="substring-after($text, $zero-space-after-equals)"/>
-				</xsl:call-template>
+				</xsl:call-template> -->
+				<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),$regex_zero-space-after-equals,concat('$1',$zero_width_space))"/>
 			</xsl:when>
 			<xsl:when test="contains($text, $zero-space-after-equal)">
-				<xsl:value-of select="substring-before($text, $zero-space-after-equal)"/>
+				<!-- <xsl:value-of select="substring-before($text, $zero-space-after-equal)"/>
 				<xsl:value-of select="$zero-space-after-equal"/>
 				<xsl:value-of select="$zero-space"/>
 				<xsl:call-template name="add-zero-spaces-equal">
 					<xsl:with-param name="text" select="substring-after($text, $zero-space-after-equal)"/>
-				</xsl:call-template>
+				</xsl:call-template> -->
+				<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),$regex_zero-space-after-equal,concat('$1',$zero_width_space))"/>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:value-of select="$text"/>
@@ -5673,7 +5708,12 @@
 			
 			<fo:inline xsl:use-attribute-sets="termnote-name-style">
 			
+				<xsl:if test="not(*[local-name() = 'name']/following-sibling::node()[1][self::text()][normalize-space()=''])">
+					<xsl:attribute name="padding-right">1mm</xsl:attribute>
+				</xsl:if>
+			
 				
+
 				
 				<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 				<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
@@ -6655,17 +6695,15 @@
 		
 		<!-- split text by zero-width space -->
 		<xsl:variable name="text_step4">
-			<xsl:call-template name="split">
+			<xsl:call-template name="split_for_interspers">
 				<xsl:with-param name="pText" select="$text_step3"/>
 				<xsl:with-param name="sep" select="$zero_width_space"/>
-				<xsl:with-param name="normalize-space">false</xsl:with-param>
-				<xsl:with-param name="keep_sep">true</xsl:with-param>
 			</xsl:call-template>
 		</xsl:variable>
 		
-		<xsl:for-each select="xalan:nodeset($text_step4)/item">
+		<xsl:for-each select="xalan:nodeset($text_step4)/node()">
 			<xsl:choose>
-				<xsl:when test="string-length() &gt; 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
+				<xsl:when test="local-name() = 'interspers'"> <!-- word with length more than 30 will be interspersed with zero-width space -->
 					<xsl:call-template name="interspers">
 						<xsl:with-param name="str" select="."/>
 					</xsl:call-template>
@@ -6676,6 +6714,30 @@
 			</xsl:choose>
 		</xsl:for-each>
 		
+	</xsl:template><xsl:variable name="interspers_tag_open">###interspers123###</xsl:variable><xsl:variable name="interspers_tag_close">###/interspers123###</xsl:variable><xsl:template name="split_for_interspers">
+		<xsl:param name="pText" select="."/>
+		<xsl:param name="sep" select="','"/>
+		<!-- word with length more than 30 will be interspersed with zero-width space -->
+		<xsl:variable name="regex" select="concat('([^', $zero_width_space, ']{31,})')"/> <!-- sequence of characters (more 31), that doesn't contains zero-width space -->
+		<xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new($pText),$regex,concat($interspers_tag_open,'$1',$interspers_tag_close))"/>
+		<xsl:call-template name="replace_tag_interspers">
+			<xsl:with-param name="text" select="$text"/>
+		</xsl:call-template>
+	</xsl:template><xsl:template name="replace_tag_interspers">
+		<xsl:param name="text"/>
+		<xsl:choose>
+			<xsl:when test="contains($text, $interspers_tag_open)">
+				<xsl:value-of select="substring-before($text, $interspers_tag_open)"/>
+				<xsl:variable name="text_after" select="substring-after($text, $interspers_tag_open)"/>
+				<interspers>
+					<xsl:value-of select="substring-before($text_after, $interspers_tag_close)"/>
+				</interspers>
+				<xsl:call-template name="replace_tag_interspers">
+					<xsl:with-param name="text" select="substring-after($text_after, $interspers_tag_close)"/>
+				</xsl:call-template>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template name="interspers">
 		<xsl:param name="str"/>
 		<xsl:param name="char" select="$zero_width_space"/>
@@ -7123,7 +7185,7 @@
 				</xsl:otherwise>
 			</xsl:choose> -->
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ')]" priority="2">
+	</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ') or     starts-with(., '[SOURCE: Quoted from: ') or     starts-with(., '[SOURCE: Modified from: ')]" priority="2">
 		<xsl:text>[</xsl:text><xsl:value-of select="substring-after(., '[SOURCE: ')"/>
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()">
 		<xsl:if test="normalize-space() != ''">

data/lib/isodoc/itu/itu.recommendation-annex.xsl

@@ -114,21 +114,29 @@
 	
 	<xsl:template match="/">
 		<xsl:call-template name="namespaceCheck"/>
-		<fo:root xsl:use-attribute-sets="root-style" xml:lang="{$lang}">
-			<!-- <xsl:if test="$lang != 'ar'">
-				<xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
-			</xsl:if> -->
-			<xsl:if test="$doctype = 'resolution'">
-				<xsl:attribute name="font-size">11pt</xsl:attribute>
-			</xsl:if>
-			<xsl:if test="$doctype = 'service-publication'">
-				<xsl:attribute name="font-size">11pt</xsl:attribute>
-				<xsl:attribute name="font-family">Arial, STIX Two Math</xsl:attribute>
-			</xsl:if>
-			<xsl:call-template name="setWritingMode"/>
-			<xsl:if test="$lang = 'ar'">
-				<xsl:attribute name="font-family">Traditional Arabic, Times New Roman, STIX Two Math</xsl:attribute>
-			</xsl:if>
+		<fo:root xml:lang="{$lang}">
+			<xsl:variable name="root-style">
+				<root-style xsl:use-attribute-sets="root-style">
+					<!-- <xsl:if test="$lang != 'ar'">
+						<xsl:attribute name="xml:lang"><xsl:value-of select="$lang"/></xsl:attribute>
+					</xsl:if> -->
+					<xsl:if test="$doctype = 'resolution'">
+						<xsl:attribute name="font-size">11pt</xsl:attribute>
+					</xsl:if>
+					<xsl:if test="$doctype = 'service-publication'">
+						<xsl:attribute name="font-size">11pt</xsl:attribute>
+						<xsl:attribute name="font-family">Arial, STIX Two Math</xsl:attribute>
+					</xsl:if>
+					<xsl:call-template name="setWritingMode"/>
+					<xsl:if test="$lang = 'ar'">
+						<xsl:attribute name="font-family">Traditional Arabic, Times New Roman, STIX Two Math</xsl:attribute>
+					</xsl:if>
+				</root-style>
+			</xsl:variable>
+			<xsl:call-template name="insertRootStyle">
+				<xsl:with-param name="root-style" select="$root-style"/>
+			</xsl:call-template>
+			
 			<fo:layout-master-set>
 			
 				<!-- Technical Report first page -->
@@ -2210,7 +2218,30 @@
 		
 		
 		
-	</xsl:attribute-set><xsl:attribute-set name="copyright-statement-style">
+	</xsl:attribute-set><xsl:template name="insertRootStyle">
+		<xsl:param name="root-style"/>
+		<xsl:variable name="root-style_" select="xalan:nodeset($root-style)"/>
+		
+		<xsl:variable name="additional_fonts_">
+			<xsl:for-each select="//*[local-name() = 'misc-container'][1]/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = 'fonts']/*[local-name() = 'value']">
+				<xsl:value-of select="."/><xsl:if test="position() != last()">, </xsl:if>
+			</xsl:for-each>
+		</xsl:variable>
+		<xsl:variable name="additional_fonts" select="normalize-space($additional_fonts_)"/>
+		
+		<xsl:for-each select="$root-style_/root-style/@*">
+			<xsl:choose>
+				<xsl:when test="local-name() = 'font-family' and $additional_fonts != ''">
+					<xsl:attribute name="{local-name()}">
+						<xsl:value-of select="."/>, <xsl:value-of select="$additional_fonts"/>
+					</xsl:attribute>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:copy-of select="."/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:for-each>
+	</xsl:template><xsl:attribute-set name="copyright-statement-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="copyright-statement-title-style">
 		
@@ -2720,7 +2751,7 @@
 		
 		
 		
-	</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">		
+	</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">
 		
 				
 		
@@ -5176,24 +5207,28 @@
 	</xsl:template><xsl:template name="add-zero-spaces-equal">
 		<xsl:param name="text" select="."/>
 		<xsl:variable name="zero-space-after-equals">==========</xsl:variable>
+		<xsl:variable name="regex_zero-space-after-equals">(==========)</xsl:variable>
 		<xsl:variable name="zero-space-after-equal">=</xsl:variable>
+		<xsl:variable name="regex_zero-space-after-equal">(=)</xsl:variable>
 		<xsl:variable name="zero-space">​</xsl:variable>
 		<xsl:choose>
 			<xsl:when test="contains($text, $zero-space-after-equals)">
-				<xsl:value-of select="substring-before($text, $zero-space-after-equals)"/>
+				<!-- <xsl:value-of select="substring-before($text, $zero-space-after-equals)"/>
 				<xsl:value-of select="$zero-space-after-equals"/>
 				<xsl:value-of select="$zero-space"/>
 				<xsl:call-template name="add-zero-spaces-equal">
 					<xsl:with-param name="text" select="substring-after($text, $zero-space-after-equals)"/>
-				</xsl:call-template>
+				</xsl:call-template> -->
+				<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),$regex_zero-space-after-equals,concat('$1',$zero_width_space))"/>
 			</xsl:when>
 			<xsl:when test="contains($text, $zero-space-after-equal)">
-				<xsl:value-of select="substring-before($text, $zero-space-after-equal)"/>
+				<!-- <xsl:value-of select="substring-before($text, $zero-space-after-equal)"/>
 				<xsl:value-of select="$zero-space-after-equal"/>
 				<xsl:value-of select="$zero-space"/>
 				<xsl:call-template name="add-zero-spaces-equal">
 					<xsl:with-param name="text" select="substring-after($text, $zero-space-after-equal)"/>
-				</xsl:call-template>
+				</xsl:call-template> -->
+				<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),$regex_zero-space-after-equal,concat('$1',$zero_width_space))"/>
 			</xsl:when>
 			<xsl:otherwise>
 				<xsl:value-of select="$text"/>
@@ -5673,7 +5708,12 @@
 			
 			<fo:inline xsl:use-attribute-sets="termnote-name-style">
 			
+				<xsl:if test="not(*[local-name() = 'name']/following-sibling::node()[1][self::text()][normalize-space()=''])">
+					<xsl:attribute name="padding-right">1mm</xsl:attribute>
+				</xsl:if>
+			
 				
+
 				
 				<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
 				<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
@@ -6655,17 +6695,15 @@
 		
 		<!-- split text by zero-width space -->
 		<xsl:variable name="text_step4">
-			<xsl:call-template name="split">
+			<xsl:call-template name="split_for_interspers">
 				<xsl:with-param name="pText" select="$text_step3"/>
 				<xsl:with-param name="sep" select="$zero_width_space"/>
-				<xsl:with-param name="normalize-space">false</xsl:with-param>
-				<xsl:with-param name="keep_sep">true</xsl:with-param>
 			</xsl:call-template>
 		</xsl:variable>
 		
-		<xsl:for-each select="xalan:nodeset($text_step4)/item">
+		<xsl:for-each select="xalan:nodeset($text_step4)/node()">
 			<xsl:choose>
-				<xsl:when test="string-length() &gt; 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
+				<xsl:when test="local-name() = 'interspers'"> <!-- word with length more than 30 will be interspersed with zero-width space -->
 					<xsl:call-template name="interspers">
 						<xsl:with-param name="str" select="."/>
 					</xsl:call-template>
@@ -6676,6 +6714,30 @@
 			</xsl:choose>
 		</xsl:for-each>
 		
+	</xsl:template><xsl:variable name="interspers_tag_open">###interspers123###</xsl:variable><xsl:variable name="interspers_tag_close">###/interspers123###</xsl:variable><xsl:template name="split_for_interspers">
+		<xsl:param name="pText" select="."/>
+		<xsl:param name="sep" select="','"/>
+		<!-- word with length more than 30 will be interspersed with zero-width space -->
+		<xsl:variable name="regex" select="concat('([^', $zero_width_space, ']{31,})')"/> <!-- sequence of characters (more 31), that doesn't contains zero-width space -->
+		<xsl:variable name="text" select="java:replaceAll(java:java.lang.String.new($pText),$regex,concat($interspers_tag_open,'$1',$interspers_tag_close))"/>
+		<xsl:call-template name="replace_tag_interspers">
+			<xsl:with-param name="text" select="$text"/>
+		</xsl:call-template>
+	</xsl:template><xsl:template name="replace_tag_interspers">
+		<xsl:param name="text"/>
+		<xsl:choose>
+			<xsl:when test="contains($text, $interspers_tag_open)">
+				<xsl:value-of select="substring-before($text, $interspers_tag_open)"/>
+				<xsl:variable name="text_after" select="substring-after($text, $interspers_tag_open)"/>
+				<interspers>
+					<xsl:value-of select="substring-before($text_after, $interspers_tag_close)"/>
+				</interspers>
+				<xsl:call-template name="replace_tag_interspers">
+					<xsl:with-param name="text" select="substring-after($text_after, $interspers_tag_close)"/>
+				</xsl:call-template>
+			</xsl:when>
+			<xsl:otherwise><xsl:value-of select="$text"/></xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template name="interspers">
 		<xsl:param name="str"/>
 		<xsl:param name="char" select="$zero_width_space"/>
@@ -7123,7 +7185,7 @@
 				</xsl:otherwise>
 			</xsl:choose> -->
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ')]" priority="2">
+	</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()[starts-with(., '[SOURCE: Adapted from: ') or     starts-with(., '[SOURCE: Quoted from: ') or     starts-with(., '[SOURCE: Modified from: ')]" priority="2">
 		<xsl:text>[</xsl:text><xsl:value-of select="substring-after(., '[SOURCE: ')"/>
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']/text()">
 		<xsl:if test="normalize-space() != ''">