metanorma-iso 1.5.4 → 1.5.9

data/lib/isodoc/iso/iso.international-standard.xsl

@@ -15,6 +15,8 @@
 	<xsl:variable name="pageWidth" select="'210mm'"/>
 	<xsl:variable name="pageHeight" select="'297mm'"/>
 
+	<xsl:variable name="docidentifierISO" select="/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso'] | /iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'ISO']"/>
+
 	<xsl:variable name="copyrightText" select="concat('© ISO ', iso:iso-standard/iso:bibdata/iso:copyright/iso:from ,' – All rights reserved')"/>
   
 	<xsl:variable name="lang-1st-letter_tmp" select="substring-before(substring-after(/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso-with-lang'], '('), ')')"/>
@@ -293,6 +295,10 @@
 
 			<xsl:call-template name="addPDFUAmeta"/>
 			
+			<xsl:call-template name="addBookmarks">
+				<xsl:with-param name="contents" select="$contents"/>
+			</xsl:call-template>
+			
 			<!-- cover page -->
 			<xsl:choose>
 				<xsl:when test="$stage-abbreviation != ''">
@@ -399,7 +405,7 @@
 											<xsl:value-of select="$stage-fullname-uppercased"/>											
 										</fo:block>
 										<fo:block font-size="20pt" font-weight="bold" text-align="right">
-											<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso']"/>
+											<xsl:value-of select="$docidentifierISO"/>
 										</fo:block>
 										
 										
@@ -539,36 +545,69 @@
 													</fo:table-cell>
 													<fo:table-cell>
 														<fo:block text-align="left">
-															<xsl:value-of select="$doctype_uppercased"/>
+															<xsl:choose>
+																<xsl:when test="$doctype = 'amendment'">
+																	<xsl:value-of select="java:toUpperCase(java:java.lang.String.new(translate(/iso:iso-standard/iso:bibdata/iso:ext/iso:updates-document-type,'-',' ')))"/>
+																</xsl:when>
+																<xsl:otherwise>
+																	<xsl:value-of select="$doctype_uppercased"/>
+																</xsl:otherwise>
+															</xsl:choose>
 														</fo:block>
 													</fo:table-cell>
 													<fo:table-cell>
 														<fo:block text-align="right" font-weight="bold" margin-bottom="13mm">
-															<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso']"/>
+															<xsl:value-of select="$docidentifierISO"/>
 														</fo:block>
 													</fo:table-cell>
 												</fo:table-row>
 												<fo:table-row height="42mm">
 													<fo:table-cell number-columns-spanned="3" font-size="10pt" line-height="1.2">
 														<fo:block text-align="right">
-															<xsl:if test="$stage-abbreviation = 'PRF' or                          $stage-abbreviation = 'IS' or                          $stage-abbreviation = 'published'">
+															<xsl:if test="$stage-abbreviation = 'PRF' or                          $stage-abbreviation = 'IS' or                          $stage-abbreviation = 'D' or                          $stage-abbreviation = 'published'">
 																<xsl:call-template name="printEdition"/>
 															</xsl:if>
 															<xsl:choose>
-																<xsl:when test="$stage-abbreviation = 'IS'">
+																<xsl:when test="$stage-abbreviation = 'IS' and /iso:iso-standard/iso:bibdata/iso:date[@type = 'published']">
 																	<xsl:value-of select="$linebreak"/>
 																	<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:date[@type = 'published']"/>
 																</xsl:when>
-																<xsl:when test="$stage-abbreviation = 'published'">
+																<xsl:when test="($stage-abbreviation = 'IS' or $stage-abbreviation = 'D') and /iso:iso-standard/iso:bibdata/iso:date[@type = 'created']">
+																	<xsl:value-of select="$linebreak"/>
+																	<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:date[@type = 'created']"/>
+																</xsl:when>
+																<xsl:when test="$stage-abbreviation = 'IS' or $stage-abbreviation = 'published'">
 																	<xsl:value-of select="$linebreak"/>
 																	<xsl:value-of select="substring(/iso:iso-standard/iso:bibdata/iso:version/iso:revision-date,1, 7)"/>
 																</xsl:when>
 															</xsl:choose>
-															<!-- <xsl:value-of select="$linebreak"/>
-															<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:version/iso:revision-date"/> -->
+														</fo:block>
+														<!-- <xsl:value-of select="$linebreak"/>
+														<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:version/iso:revision-date"/> -->
+														<xsl:if test="$doctype = 'amendment'">
+															<fo:block text-align="right" margin-right="0.5mm">
+																<fo:block font-weight="bold" margin-top="4pt">
+																	<xsl:variable name="title-amendment">
+																		<xsl:call-template name="getTitle">
+																			<xsl:with-param name="name" select="'title-amendment'"/>
+																		</xsl:call-template>
+																	</xsl:variable>
+																	<xsl:value-of select="$title-amendment"/><xsl:text> </xsl:text>
+																	<xsl:variable name="amendment-number" select="/iso:iso-standard/iso:bibdata/iso:ext/iso:structuredidentifier/iso:project-number/@amendment"/>
+																	<xsl:if test="normalize-space($amendment-number) != ''">
+																		<xsl:value-of select="$amendment-number"/><xsl:text> </xsl:text>
+																	</xsl:if>
+																</fo:block>
+																<fo:block>
+																	<xsl:if test="/iso:iso-standard/iso:bibdata/iso:date[@type = 'updated']">																		
+																	<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:date[@type = 'updated']"/>
+																	</xsl:if>
+																</fo:block>
 															</fo:block>
+														</xsl:if>
 													</fo:table-cell>
 												</fo:table-row>
+												
 											</fo:table-body>
 										</fo:table>
 										
@@ -637,6 +676,12 @@
 																		</xsl:if>
 																		<xsl:value-of select="$title-part"/>
 																	</xsl:if> -->
+																	<xsl:variable name="title-amd" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'en' and @type = 'title-amd']"/>
+																	<xsl:if test="$doctype = 'amendment' and normalize-space($title-amd) != ''">
+																		<fo:block margin-right="-5mm" margin-top="12pt">
+																			<xsl:call-template name="printAmendmentTitle"/>
+																		</fo:block>
+																	</xsl:if>
 																</fo:block>
 																			
 																<fo:block font-size="9pt"><xsl:value-of select="$linebreak"/></fo:block>
@@ -651,6 +696,15 @@
 																	
 																	<xsl:call-template name="printTitlePartFr"/>
 																	
+																	<xsl:variable name="title-amd" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'fr' and @type = 'title-amd']"/>
+																	<xsl:if test="$doctype = 'amendment' and normalize-space($title-amd) != ''">
+																		<fo:block margin-right="-5mm" margin-top="6pt">
+																			<xsl:call-template name="printAmendmentTitle">
+																				<xsl:with-param name="lang" select="'fr'"/>
+																			</xsl:call-template>
+																		</fo:block>
+																	</xsl:if>
+																	
 																</fo:block>
 															</fo:block>
 														</fo:block-container>
@@ -714,7 +768,7 @@
 											</fo:table-cell>
 											<fo:table-cell>
 												<fo:block text-align="right" font-weight="bold" margin-bottom="13mm">
-													<xsl:value-of select="/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso']"/>
+													<xsl:value-of select="$docidentifierISO"/>
 												</fo:block>
 											</fo:table-cell>
 										</fo:table-row>
@@ -891,7 +945,7 @@
 							</fo:block-container>
 							<fo:block font-size="11pt" margin-bottom="8pt"><xsl:value-of select="$linebreak"/></fo:block>
 							<fo:block-container font-size="40pt" text-align="center" margin-bottom="12pt" border="0.5pt solid black">
-								<xsl:variable name="stage-title" select="substring-after(substring-before(/iso:iso-standard/iso:bibdata/iso:docidentifier[@type = 'iso'], ' '), '/')"/>
+								<xsl:variable name="stage-title" select="substring-after(substring-before($docidentifierISO, ' '), '/')"/>
 								<fo:block padding-top="2mm"><xsl:value-of select="$stage-title"/><xsl:text> stage</xsl:text></fo:block>
 							</fo:block-container>
 							<fo:block><xsl:value-of select="$linebreak"/></fo:block>
@@ -964,7 +1018,7 @@
 								</xsl:if>
 								
 								<xsl:variable name="margin-left">12</xsl:variable>
-								<xsl:for-each select="xalan:nodeset($contents)//item"><!-- [@display = 'true'][not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
+								<xsl:for-each select="xalan:nodeset($contents)//item[@display = 'true']"><!-- [not(@level = 2 and starts-with(@section, '0'))] skip clause from preface -->
 									
 									<fo:block>
 										<xsl:if test="@level = 1">
@@ -994,9 +1048,9 @@
 												</fo:list-item-label>
 												<fo:list-item-body start-indent="body-start()">
 													<fo:block text-align-last="justify" margin-left="12mm" text-indent="-12mm">
-														<fo:basic-link internal-destination="{@id}" fox:alt-text="{text()}">
+														<fo:basic-link internal-destination="{@id}" fox:alt-text="{title}">
 														
-															<xsl:apply-templates/>
+															<xsl:apply-templates select="title"/>
 															
 															<fo:inline keep-together.within-line="always">
 																<fo:leader font-size="9pt" font-weight="normal" leader-pattern="dots"/>
@@ -1065,19 +1119,8 @@
 							
 							<xsl:variable name="title-amd" select="/iso:iso-standard/iso:bibdata/iso:title[@language = 'en' and @type = 'title-amd']"/>
 							<xsl:if test="$doctype = 'amendment' and normalize-space($title-amd) != ''">
-								<fo:block font-weight="normal" margin-top="12pt" line-height="1.1">
-									<xsl:variable name="title-amendment">
-										<xsl:call-template name="getTitle">
-											<xsl:with-param name="name" select="'title-amendment'"/>
-										</xsl:call-template>
-									</xsl:variable>
-									<xsl:value-of select="$title-amendment"/>
-									<xsl:variable name="amendment-number" select="/iso:iso-standard/iso:bibdata/iso:ext/iso:structuredidentifier/iso:project-number/@amendment"/>
-									<xsl:if test="normalize-space($amendment-number) != ''">
-										<xsl:text> </xsl:text><xsl:value-of select="$amendment-number"/>
-									</xsl:if>
-									<xsl:text>: </xsl:text>
-									<xsl:value-of select="$title-amd"/>
+								<fo:block margin-top="12pt">
+									<xsl:call-template name="printAmendmentTitle"/>
 								</fo:block>
 							</xsl:if>
 						
@@ -1172,6 +1215,27 @@
 		<xsl:apply-templates/>			
 	</xsl:template>
 	
+	<xsl:template name="printAmendmentTitle">
+		<xsl:param name="lang" select="'en'"/>
+		<xsl:variable name="title-amd" select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-amd']"/>
+		<xsl:if test="$doctype = 'amendment' and normalize-space($title-amd) != ''">
+			<fo:block font-weight="normal" line-height="1.1">
+				<xsl:variable name="title-amendment">
+					<xsl:call-template name="getTitle">
+						<xsl:with-param name="name" select="'title-amendment'"/>
+					</xsl:call-template>
+				</xsl:variable>
+				<xsl:value-of select="$title-amendment"/>
+				<xsl:variable name="amendment-number" select="/iso:iso-standard/iso:bibdata/iso:ext/iso:structuredidentifier/iso:project-number/@amendment"/>
+				<xsl:if test="normalize-space($amendment-number) != ''">
+					<xsl:text> </xsl:text><xsl:value-of select="$amendment-number"/>
+				</xsl:if>
+				<xsl:text>: </xsl:text>
+				<xsl:value-of select="$title-amd"/>
+			</fo:block>
+		</xsl:if>
+	</xsl:template>
+	
 	<!-- ============================= -->
 	<!-- CONTENTS                                       -->
 	<!-- ============================= -->
@@ -1196,9 +1260,7 @@
 		</xsl:variable>
 			
 		<xsl:variable name="display">
-			<xsl:choose>
-				<xsl:when test="ancestor-or-self::iso:bibitem">false</xsl:when>
-				<xsl:when test="ancestor-or-self::iso:term">false</xsl:when>
+			<xsl:choose>				
 				<xsl:when test="ancestor-or-self::iso:annex and $level &gt;= 2">false</xsl:when>
 				<xsl:when test="$section = '' and $type = 'clause'">false</xsl:when>
 				<xsl:when test="$level &lt;= 3">true</xsl:when>
@@ -1206,8 +1268,16 @@
 			</xsl:choose>
 		</xsl:variable>
 		
+		<xsl:variable name="skip">
+			<xsl:choose>
+				<xsl:when test="ancestor-or-self::iso:bibitem">true</xsl:when>
+				<xsl:when test="ancestor-or-self::iso:term">true</xsl:when>				
+				<xsl:otherwise>false</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		
 		
-		<xsl:if test="$display = 'true'">		
+		<xsl:if test="$skip = 'false'">		
 		
 			<xsl:variable name="title">
 				<xsl:call-template name="getName"/>
@@ -1218,12 +1288,13 @@
 				<xsl:if test="ancestor-or-self::iso:annex">annex</xsl:if>
 			</xsl:variable>
 			
-			<item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}">
-				<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
+			<item id="{@id}" level="{$level}" section="{$section}" type="{$type}" root="{$root}" display="{$display}">
+				<title>
+					<xsl:apply-templates select="xalan:nodeset($title)" mode="contents_item"/>
+				</title>
+				<xsl:apply-templates mode="contents"/>
 			</item>
-			<xsl:apply-templates mode="contents"/>
-		</xsl:if>	
-		
+		</xsl:if>
 	</xsl:template>
 	
 
@@ -1446,7 +1517,7 @@
 		</xsl:element>
 		<xsl:if test="$element-name = 'fo:inline' and not($inline = 'true') and not(local-name(..) = 'admonition')">
 			<fo:block margin-bottom="12pt">
-				 <xsl:if test="ancestor::iso:annex">
+				 <xsl:if test="ancestor::iso:annex or following-sibling::iso:table">
 					<xsl:attribute name="margin-bottom">0</xsl:attribute>
 				 </xsl:if>
 				<xsl:value-of select="$linebreak"/>
@@ -1579,7 +1650,7 @@
 	
 	
 	
-	<xsl:template match="iso:ul | iso:ol">
+	<xsl:template match="iso:ul | iso:ol" mode="ul_ol">
 		<fo:list-block provisional-distance-between-starts="7mm" margin-top="8pt"> <!-- margin-bottom="8pt" -->
 			<xsl:apply-templates/>
 		</fo:list-block>
@@ -1606,7 +1677,9 @@
 		</fo:list-item>
 	</xsl:template>
 	
-	
+	<xsl:template match="iso:note" mode="process">
+		<xsl:call-template name="note"/>
+	</xsl:template>
 	
 	<xsl:template match="iso:preferred">		
 		<fo:block line-height="1.1">
@@ -1688,8 +1761,12 @@
 	
 	<xsl:template match="mathml:math" priority="2">
 		<fo:inline font-family="Cambria Math">
+			<xsl:variable name="mathml">
+				<xsl:apply-templates select="." mode="mathml"/>
+			</xsl:variable>
 			<fo:instream-foreign-object fox:alt-text="Math">
-				<xsl:copy-of select="."/>
+				<!-- <xsl:copy-of select="."/> -->
+				<xsl:copy-of select="xalan:nodeset($mathml)"/>
 			</fo:instream-foreign-object>
 		</fo:inline>
 	</xsl:template>
@@ -1979,6 +2056,12 @@
 			
 		</title-edition>
 		
+		<title-edition lang="fr">
+			
+				<xsl:text>Édition </xsl:text>
+			
+		</title-edition>
+		
 
 		<title-toc lang="en">
 			
@@ -2025,7 +2108,12 @@
 		
 		
 		
-		<title-source lang="en">SOURCE</title-source>
+		<title-source lang="en">
+			
+				<xsl:text>SOURCE</xsl:text>
+						
+			 
+		</title-source>
 		
 		<title-keywords lang="en">Keywords</title-keywords>
 		
@@ -2068,6 +2156,10 @@
 		<title-warning lang="zh">警告</title-warning>
 		
 		<title-amendment lang="en">AMENDMENT</title-amendment>
+		
+		<title-continued lang="en">(continued)</title-continued>
+		<title-continued lang="fr">(continué)</title-continued>
+		
 	</xsl:variable><xsl:variable name="tab_zh">　</xsl:variable><xsl:template name="getTitle">
 		<xsl:param name="name"/>
 		<xsl:variable name="lang">
@@ -2082,18 +2174,20 @@
 				<xsl:value-of select="$titles/*[local-name() = $name][@lang = 'en']"/>
 			</xsl:otherwise>
 		</xsl:choose>
-	</xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable name="linebreak" select="'&#8232;'"/><xsl:attribute-set name="link-style">
+	</xsl:template><xsl:variable name="lower">abcdefghijklmnopqrstuvwxyz</xsl:variable><xsl:variable name="upper">ABCDEFGHIJKLMNOPQRSTUVWXYZ</xsl:variable><xsl:variable name="en_chars" select="concat($lower,$upper,',.`1234567890-=~!@#$%^*()_+[]{}\|?/')"/><xsl:variable name="linebreak" select="'&#8232;'"/><xsl:attribute-set name="root-style">
+		
+	</xsl:attribute-set><xsl:attribute-set name="link-style">
 		
 			<xsl:attribute name="color">blue</xsl:attribute>
 			<xsl:attribute name="text-decoration">underline</xsl:attribute>
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="sourcecode-style">
 		<xsl:attribute name="white-space">pre</xsl:attribute>
 		<xsl:attribute name="wrap-option">wrap</xsl:attribute>
 		
-			<xsl:attribute name="font-family">Courier</xsl:attribute>
-			<xsl:attribute name="font-size">9pt</xsl:attribute>
+			<xsl:attribute name="font-family">Courier</xsl:attribute>			
 			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		
 		
@@ -2103,6 +2197,7 @@
 				
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="permission-style">
 		
 	</xsl:attribute-set><xsl:attribute-set name="permission-name-style">
@@ -2153,6 +2248,7 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="example-body-style">
 		
 		
@@ -2173,6 +2269,7 @@
 		
 		
 		
+		
 				
 		
 		
@@ -2209,9 +2306,10 @@
 		
 		
 		
+			<xsl:attribute name="font-size">11pt</xsl:attribute>
 			<xsl:attribute name="font-weight">bold</xsl:attribute>
 			<xsl:attribute name="text-align">center</xsl:attribute>
-			<xsl:attribute name="margin-top">12pt</xsl:attribute>
+			<!-- <xsl:attribute name="margin-top">12pt</xsl:attribute> -->
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>			
 				
 		
@@ -2242,11 +2340,13 @@
 		
 			<xsl:attribute name="color">blue</xsl:attribute>
 			<xsl:attribute name="text-decoration">underline</xsl:attribute>
-				
+		
+		
 	</xsl:attribute-set><xsl:attribute-set name="eref-style">
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="note-style">
 		
 		
@@ -2266,20 +2366,20 @@
 		
 		
 		
+	</xsl:attribute-set><xsl:variable name="note-body-indent">10mm</xsl:variable><xsl:variable name="note-body-indent-table">5mm</xsl:variable><xsl:attribute-set name="note-name-style">
 		
 		
-	</xsl:attribute-set><xsl:attribute-set name="note-name-style">
 		
 		
 		
 		
+			<xsl:attribute name="padding-right">6mm</xsl:attribute>
+		
 		
 		
-			<xsl:attribute name="padding-right">6mm</xsl:attribute>
 		
 		
 		
-				
 		
 	</xsl:attribute-set><xsl:attribute-set name="note-p-style">
 		
@@ -2309,6 +2409,8 @@
 		
 		
 		
+	</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">		
+				
 	</xsl:attribute-set><xsl:attribute-set name="quote-style">		
 		
 		
@@ -2337,6 +2439,7 @@
 	</xsl:attribute-set><xsl:attribute-set name="origin-style">
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="term-style">
 		
 			<xsl:attribute name="margin-bottom">10pt</xsl:attribute>
@@ -2345,6 +2448,7 @@
 				
 		
 		
+		
 					
 			<xsl:attribute name="font-weight">bold</xsl:attribute>
 			<xsl:attribute name="text-align">center</xsl:attribute>
@@ -2388,14 +2492,16 @@
 	</xsl:attribute-set><xsl:attribute-set name="tt-style">
 		
 		
-			<xsl:attribute name="font-family">Courier</xsl:attribute>
-			<xsl:attribute name="font-size">10pt</xsl:attribute>			
+			<xsl:attribute name="font-family">Courier</xsl:attribute>			
+		
 		
 	</xsl:attribute-set><xsl:attribute-set name="sourcecode-name-style">
 		<xsl:attribute name="font-size">11pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
 		<xsl:attribute name="text-align">center</xsl:attribute>
 		<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
+		<xsl:attribute name="keep-with-previous">always</xsl:attribute>
+		
 	</xsl:attribute-set><xsl:attribute-set name="domain-style">
 				
 	</xsl:attribute-set><xsl:attribute-set name="admitted-style">
@@ -2461,12 +2567,10 @@
 		
 		
 		
-			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
+		<!-- $namespace = 'iso' or  -->
 		
 				
 		
-			<xsl:call-template name="fn_name_display"/>
-		
 			
 		
 		<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
@@ -2520,8 +2624,9 @@
 			
 			
 			
+						
 			
-			
+				<xsl:attribute name="margin-top">12pt</xsl:attribute>
 				<xsl:attribute name="margin-left">0mm</xsl:attribute>
 				<xsl:attribute name="margin-right">0mm</xsl:attribute>
 				<xsl:attribute name="margin-bottom">8pt</xsl:attribute>
@@ -2551,6 +2656,8 @@
 				
 				
 				
+				
+				
 				<xsl:for-each select="xalan:nodeset($colwidths)//column">
 					<xsl:choose>
 						<xsl:when test=". = 1 or . = 0">
@@ -2581,8 +2688,11 @@
 	</xsl:template><xsl:template match="*[local-name()='table']/*[local-name() = 'name']"/><xsl:template match="*[local-name()='table']/*[local-name() = 'name']" mode="presentation">
 		<xsl:if test="normalize-space() != ''">
 			<fo:block xsl:use-attribute-sets="table-name-style">
-				<xsl:apply-templates/>
-			</fo:block>			
+				
+					<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+				
+				<xsl:apply-templates/>				
+			</fo:block>
 		</xsl:if>
 	</xsl:template><xsl:template name="calculate-columns-numbers">
 		<xsl:param name="table-row"/>
@@ -2698,28 +2808,29 @@
 	</xsl:template><xsl:template match="*[local-name()='table2']"/><xsl:template match="*[local-name()='thead']"/><xsl:template match="*[local-name()='thead']" mode="process">
 		<xsl:param name="cols-count"/>
 		<!-- font-weight="bold" -->
-		<fo:table-header>			
-			
-				<fo:table-row>
-					<fo:table-cell number-columns-spanned="{$cols-count}"> <!-- border-left="1pt solid white" border-right="1pt solid white" border-top="1pt solid white" -->
-						<fo:block text-align="center" font-size="11pt" font-weight="bold">
-							<!-- (continued) -->
-							<fo:block-container position="absolute" top="-7mm">
-								<fo:block>
-									<fo:retrieve-table-marker retrieve-class-name="table_continued" retrieve-position-within-table="first-starting" retrieve-boundary-within-table="table-fragment"/>
-								</fo:block>
-							</fo:block-container>
+		<fo:table-header>
 							
-						</fo:block>
-						<!-- <fo:block>fn_name_display
-							<xsl:call-template name="fn_name_display"/>
-						</fo:block> -->
+				<xsl:call-template name="table-header-title">
+					<xsl:with-param name="cols-count" select="$cols-count"/>
+				</xsl:call-template>				
 						
-					</fo:table-cell>
-				</fo:table-row>
-			
 			<xsl:apply-templates/>
 		</fo:table-header>
+	</xsl:template><xsl:template name="table-header-title">
+		<xsl:param name="cols-count"/>		
+		<!-- row for title -->
+		<fo:table-row>
+			<fo:table-cell number-columns-spanned="{$cols-count}" border-left="1.5pt solid white" border-right="1.5pt solid white" border-top="1.5pt solid white" border-bottom="1.5pt solid black">
+				<xsl:apply-templates select="ancestor::*[local-name()='table']/*[local-name()='name']" mode="presentation"/>
+				<xsl:for-each select="ancestor::*[local-name()='table'][1]">
+					<xsl:call-template name="fn_name_display"/>
+				</xsl:for-each>				
+				<fo:block text-align="right" font-style="italic">
+					<xsl:text> </xsl:text>
+					<fo:retrieve-table-marker retrieve-class-name="table_continued"/>
+				</fo:block>
+			</fo:table-cell>
+		</fo:table-row>
 	</xsl:template><xsl:template match="*[local-name()='thead']" mode="process_tbody">		
 		<fo:table-body>
 			<xsl:apply-templates/>
@@ -2785,6 +2896,17 @@
 			</xsl:choose>
 		</xsl:variable>
 		
+		
+			<!-- if there isn't 'thead' and there is a table's title -->
+			<xsl:if test="not(ancestor::*[local-name()='table']/*[local-name()='thead']) and ancestor::*[local-name()='table']/*[local-name()='name']">
+				<fo:table-header>
+					<xsl:call-template name="table-header-title">
+						<xsl:with-param name="cols-count" select="$cols-count"/>
+					</xsl:call-template>
+				</fo:table-header>
+			</xsl:if>
+		
+		
 		<xsl:apply-templates select="../*[local-name()='thead']" mode="process">
 			<xsl:with-param name="cols-count" select="$cols-count"/>
 		</xsl:apply-templates>
@@ -2794,6 +2916,30 @@
 		</xsl:call-template>
 		
 		<fo:table-body>
+							
+				<xsl:variable name="title_continued">
+					<xsl:call-template name="getTitle">
+						<xsl:with-param name="name" select="'title-continued'"/>
+					</xsl:call-template>
+				</xsl:variable>				
+				<fo:table-row height="0" keep-with-next.within-page="always">
+					<fo:table-cell>
+						<fo:marker marker-class-name="table_continued"/>							
+						<fo:block/>
+					</fo:table-cell>
+				</fo:table-row>
+				<fo:table-row height="0" keep-with-next.within-page="always">
+					<fo:table-cell>
+						 <fo:marker marker-class-name="table_continued">
+								<!-- <fo:inline font-style="italic" font-weight="normal"> -->
+									<xsl:value-of select="$title_continued"/>
+							 <!-- </fo:inline> -->
+						 </fo:marker>
+						 <fo:block/>
+					</fo:table-cell>
+				</fo:table-row>
+			
+
 			<xsl:apply-templates/>
 			<!-- <xsl:apply-templates select="../*[local-name()='tfoot']" mode="process"/> -->
 		
@@ -2835,6 +2981,8 @@
 					
 				</xsl:if>
 				
+								
+								
 				
 			<xsl:apply-templates/>
 		</fo:table-row>
@@ -2859,6 +3007,7 @@
 			
 			
 			
+			
 			<xsl:if test="@colspan">
 				<xsl:attribute name="number-columns-spanned">
 					<xsl:value-of select="@colspan"/>
@@ -2869,10 +3018,22 @@
 					<xsl:value-of select="@rowspan"/>
 				</xsl:attribute>
 			</xsl:if>
+			<xsl:call-template name="display-align"/>
 			<fo:block>
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:table-cell>
+	</xsl:template><xsl:template name="display-align">
+		<xsl:if test="@valign">
+			<xsl:attribute name="display-align">
+				<xsl:choose>
+					<xsl:when test="@valign = 'top'">before</xsl:when>
+					<xsl:when test="@valign = 'middle'">center</xsl:when>
+					<xsl:when test="@valign = 'bottom'">after</xsl:when>
+					<xsl:otherwise>before</xsl:otherwise>
+				</xsl:choose>					
+			</xsl:attribute>
+		</xsl:if>
 	</xsl:template><xsl:template match="*[local-name()='td']">
 		<fo:table-cell text-align="{@align}" display-align="center" border="solid black 1pt" padding-left="1mm">
 			<xsl:attribute name="text-align">
@@ -2898,6 +3059,7 @@
 			
 			
 			
+			
 			<xsl:if test="@colspan">
 				<xsl:attribute name="number-columns-spanned">
 					<xsl:value-of select="@colspan"/>
@@ -2908,20 +3070,8 @@
 					<xsl:value-of select="@rowspan"/>
 				</xsl:attribute>
 			</xsl:if>
-			<fo:block>
-				
-					<xsl:variable name="row_number">
-						<xsl:number format="1" count="*[local-name() = 'tr'] | *[local-name() = 'th']"/>
-					</xsl:variable>
-					<fo:marker marker-class-name="table_continued">						
-						<xsl:if test="$row_number &gt; 1">
-								<fo:inline>
-									<xsl:apply-templates select="ancestor::*[local-name() = 'table']/*[local-name() = 'name']" mode="contents"/>									
-									<fo:inline font-style="italic" font-weight="normal">(continued)</fo:inline>
-								</fo:inline>
-						</xsl:if>
-					</fo:marker>
-								
+			<xsl:call-template name="display-align"/>
+			<fo:block>								
 				<xsl:apply-templates/>
 			</fo:block>			
 		</fo:table-cell>
@@ -3110,6 +3260,7 @@
 			
 			
 			
+			
 			<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
 				
 				<xsl:value-of select="@reference"/>
@@ -3120,129 +3271,143 @@
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='dl']">
-		<xsl:variable name="parent" select="local-name(..)"/>
-		
-		<xsl:variable name="key_iso">
-			
-				<xsl:if test="$parent = 'figure' or $parent = 'formula'">true</xsl:if>
-			 <!-- and  (not(../@class) or ../@class !='pseudocode') -->
-		</xsl:variable>
-		
-		<xsl:choose>
-			<xsl:when test="$parent = 'formula' and count(*[local-name()='dt']) = 1"> <!-- only one component -->
-				
+		<fo:block-container margin-left="0mm">
+			<xsl:if test="parent::*[local-name() = 'note']">
+				<xsl:attribute name="margin-left">
+					<xsl:choose>
+						<xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
+						<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
+					</xsl:choose>
+				</xsl:attribute>
 				
-					<fo:block margin-bottom="12pt" text-align="left">
-						
-							<xsl:attribute name="margin-bottom">0</xsl:attribute>
-						
-						<xsl:variable name="title-where">
-							<xsl:call-template name="getTitle">
-								<xsl:with-param name="name" select="'title-where'"/>
-							</xsl:call-template>
-						</xsl:variable>
-						<xsl:value-of select="$title-where"/><xsl:text> </xsl:text>
-						<xsl:apply-templates select="*[local-name()='dt']/*"/>
-						<xsl:text/>
-						<xsl:apply-templates select="*[local-name()='dd']/*" mode="inline"/>
-					</fo:block>
+			</xsl:if>
+			<fo:block-container margin-left="0mm">
+	
+				<xsl:variable name="parent" select="local-name(..)"/>
 				
-			</xsl:when>
-			<xsl:when test="$parent = 'formula'"> <!-- a few components -->
-				<fo:block margin-bottom="12pt" text-align="left">
-					
-						<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+				<xsl:variable name="key_iso">
 					
-					
-					
-					
-					<xsl:variable name="title-where">
-						<xsl:call-template name="getTitle">
-							<xsl:with-param name="name" select="'title-where'"/>
-						</xsl:call-template>
-					</xsl:variable>
-					<xsl:value-of select="$title-where"/>
-				</fo:block>
-			</xsl:when>
-			<xsl:when test="$parent = 'figure' and  (not(../@class) or ../@class !='pseudocode')">
-				<fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
-					
-						<xsl:attribute name="font-size">10pt</xsl:attribute>
-						<xsl:attribute name="margin-bottom">0</xsl:attribute>
-					
-					
-					
-					<xsl:variable name="title-key">
-						<xsl:call-template name="getTitle">
-							<xsl:with-param name="name" select="'title-key'"/>
-						</xsl:call-template>
-					</xsl:variable>
-					<xsl:value-of select="$title-key"/>
-				</fo:block>
-			</xsl:when>
-		</xsl:choose>
-		
-		<!-- a few components -->
-		<xsl:if test="not($parent = 'formula' and count(*[local-name()='dt']) = 1)">
-			<fo:block>
-				
-					<xsl:if test="$parent = 'formula'">
-						<xsl:attribute name="margin-left">4mm</xsl:attribute>
-					</xsl:if>
-					<xsl:attribute name="margin-top">12pt</xsl:attribute>
-				
-				
-				
+						<xsl:if test="$parent = 'figure' or $parent = 'formula'">true</xsl:if>
+					 <!-- and  (not(../@class) or ../@class !='pseudocode') -->
+				</xsl:variable>
 				
-				<fo:block>
-					
-					
-					
-					
-					<fo:table width="95%" table-layout="fixed">
+				<xsl:choose>
+					<xsl:when test="$parent = 'formula' and count(*[local-name()='dt']) = 1"> <!-- only one component -->
 						
-						<xsl:choose>
-							<xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'">
-								<!-- <xsl:attribute name="font-size">11pt</xsl:attribute> -->
-							</xsl:when>
-							<xsl:when test="normalize-space($key_iso) = 'true'">
+						
+							<fo:block margin-bottom="12pt" text-align="left">
+								
+									<xsl:attribute name="margin-bottom">0</xsl:attribute>
+								
+								<xsl:variable name="title-where">
+									<xsl:call-template name="getTitle">
+										<xsl:with-param name="name" select="'title-where'"/>
+									</xsl:call-template>
+								</xsl:variable>
+								<xsl:value-of select="$title-where"/><xsl:text> </xsl:text>
+								<xsl:apply-templates select="*[local-name()='dt']/*"/>
+								<xsl:text/>
+								<xsl:apply-templates select="*[local-name()='dd']/*" mode="inline"/>
+							</fo:block>
+						
+					</xsl:when>
+					<xsl:when test="$parent = 'formula'"> <!-- a few components -->
+						<fo:block margin-bottom="12pt" text-align="left">
+							
+								<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
+							
+							
+							
+							
+							<xsl:variable name="title-where">
+								<xsl:call-template name="getTitle">
+									<xsl:with-param name="name" select="'title-where'"/>
+								</xsl:call-template>
+							</xsl:variable>
+							<xsl:value-of select="$title-where"/>
+						</fo:block>
+					</xsl:when>
+					<xsl:when test="$parent = 'figure' and  (not(../@class) or ../@class !='pseudocode')">
+						<fo:block font-weight="bold" text-align="left" margin-bottom="12pt" keep-with-next="always">
+							
 								<xsl:attribute name="font-size">10pt</xsl:attribute>
+								<xsl:attribute name="margin-bottom">0</xsl:attribute>
+							
+							
+							
+							<xsl:variable name="title-key">
+								<xsl:call-template name="getTitle">
+									<xsl:with-param name="name" select="'title-key'"/>
+								</xsl:call-template>
+							</xsl:variable>
+							<xsl:value-of select="$title-key"/>
+						</fo:block>
+					</xsl:when>
+				</xsl:choose>
+				
+				<!-- a few components -->
+				<xsl:if test="not($parent = 'formula' and count(*[local-name()='dt']) = 1)">
+					<fo:block>
+						
+							<xsl:if test="$parent = 'formula'">
+								<xsl:attribute name="margin-left">4mm</xsl:attribute>
+							</xsl:if>
+							<xsl:attribute name="margin-top">12pt</xsl:attribute>
+						
+						
+						
+						
+						<fo:block>
+							
+							
+							
+							
+							<fo:table width="95%" table-layout="fixed">
 								
-							</xsl:when>
-						</xsl:choose>
-						<!-- create virtual html table for dl/[dt and dd] -->
-						<xsl:variable name="html-table">
-							<xsl:variable name="ns" select="substring-before(name(/*), '-')"/>
-							<xsl:element name="{$ns}:table">
-								<tbody>
-									<xsl:apply-templates mode="dl"/>
-								</tbody>
-							</xsl:element>
-						</xsl:variable>
-						<!-- html-table<xsl:copy-of select="$html-table"/> -->
-						<xsl:variable name="colwidths">
-							<xsl:call-template name="calculate-column-widths">
-								<xsl:with-param name="cols-count" select="2"/>
-								<xsl:with-param name="table" select="$html-table"/>
-							</xsl:call-template>
-						</xsl:variable>
-						<!-- colwidths=<xsl:value-of select="$colwidths"/> -->
-						<xsl:variable name="maxlength_dt">							
-							<xsl:call-template name="getMaxLength_dt"/>							
-						</xsl:variable>
-						<xsl:call-template name="setColumnWidth_dl">
-							<xsl:with-param name="colwidths" select="$colwidths"/>							
-							<xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
-						</xsl:call-template>
-						<fo:table-body>
-							<xsl:apply-templates>
-								<xsl:with-param name="key_iso" select="normalize-space($key_iso)"/>
-							</xsl:apply-templates>
-						</fo:table-body>
-					</fo:table>
-				</fo:block>
-			</fo:block>
-		</xsl:if>
+								<xsl:choose>
+									<xsl:when test="normalize-space($key_iso) = 'true' and $parent = 'formula'">
+										<!-- <xsl:attribute name="font-size">11pt</xsl:attribute> -->
+									</xsl:when>
+									<xsl:when test="normalize-space($key_iso) = 'true'">
+										<xsl:attribute name="font-size">10pt</xsl:attribute>
+										
+									</xsl:when>
+								</xsl:choose>
+								<!-- create virtual html table for dl/[dt and dd] -->
+								<xsl:variable name="html-table">
+									<xsl:variable name="ns" select="substring-before(name(/*), '-')"/>
+									<xsl:element name="{$ns}:table">
+										<tbody>
+											<xsl:apply-templates mode="dl"/>
+										</tbody>
+									</xsl:element>
+								</xsl:variable>
+								<!-- html-table<xsl:copy-of select="$html-table"/> -->
+								<xsl:variable name="colwidths">
+									<xsl:call-template name="calculate-column-widths">
+										<xsl:with-param name="cols-count" select="2"/>
+										<xsl:with-param name="table" select="$html-table"/>
+									</xsl:call-template>
+								</xsl:variable>
+								<!-- colwidths=<xsl:value-of select="$colwidths"/> -->
+								<xsl:variable name="maxlength_dt">							
+									<xsl:call-template name="getMaxLength_dt"/>							
+								</xsl:variable>
+								<xsl:call-template name="setColumnWidth_dl">
+									<xsl:with-param name="colwidths" select="$colwidths"/>							
+									<xsl:with-param name="maxlength_dt" select="$maxlength_dt"/>
+								</xsl:call-template>
+								<fo:table-body>
+									<xsl:apply-templates>
+										<xsl:with-param name="key_iso" select="normalize-space($key_iso)"/>
+									</xsl:apply-templates>
+								</fo:table-body>
+							</fo:table>
+						</fo:block>
+					</fo:block>
+				</xsl:if>
+			</fo:block-container>
+		</fo:block-container>
 	</xsl:template><xsl:template name="setColumnWidth_dl">
 		<xsl:param name="colwidths"/>		
 		<xsl:param name="maxlength_dt"/>
@@ -3339,6 +3504,7 @@
 		<xsl:param name="key_iso"/>
 		
 		<fo:table-row>
+			
 			<fo:table-cell>
 				
 				<fo:block margin-top="6pt">
@@ -3366,14 +3532,36 @@
 			<fo:table-cell>
 				<fo:block>
 					
-					
+					<!-- <xsl:if test="$namespace = 'nist-cswp'  or $namespace = 'nist-sp'">
+						<xsl:if test="local-name(*[1]) != 'stem'">
+							<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
+						</xsl:if>
+					</xsl:if> -->
 					
 						<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
 					
 				</fo:block>
 			</fo:table-cell>
 		</fo:table-row>
-		
+		<!-- <xsl:if test="$namespace = 'nist-cswp'  or $namespace = 'nist-sp'">
+			<xsl:if test="local-name(*[1]) = 'stem'">
+				<fo:table-row>
+				<fo:table-cell>
+					<fo:block margin-top="6pt">
+						<xsl:if test="normalize-space($key_iso) = 'true'">
+							<xsl:attribute name="margin-top">0</xsl:attribute>
+						</xsl:if>
+						<xsl:text>&#xA0;</xsl:text>
+					</fo:block>
+				</fo:table-cell>
+				<fo:table-cell>
+					<fo:block>
+						<xsl:apply-templates select="following-sibling::*[local-name()='dd'][1]" mode="process"/>
+					</fo:block>
+				</fo:table-cell>
+			</fo:table-row>
+			</xsl:if>
+		</xsl:if> -->
 	</xsl:template><xsl:template match="*[local-name()='dd']" mode="dl"/><xsl:template match="*[local-name()='dd']" mode="dl_process">
 		<xsl:apply-templates/>
 	</xsl:template><xsl:template match="*[local-name()='dd']"/><xsl:template match="*[local-name()='dd']" mode="process">
@@ -3398,6 +3586,31 @@
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='tt']">
 		<fo:inline xsl:use-attribute-sets="tt-style">
+			<xsl:variable name="_font-size">
+								
+								
+								
+				
+				
+				10
+				
+				
+				
+								
+				
+								
+				
+						
+			</xsl:variable>
+			<xsl:variable name="font-size" select="normalize-space($_font-size)"/>		
+			<xsl:if test="$font-size != ''">
+				<xsl:attribute name="font-size">
+					<xsl:choose>
+						<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
+						<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
+					</xsl:choose>
+				</xsl:attribute>
+			</xsl:if>
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template><xsl:template match="*[local-name()='del']">
@@ -3724,10 +3937,23 @@
 		<xsl:value-of select="substring($str, 2)"/>		
 	</xsl:template><xsl:template match="mathml:math">
 		<fo:inline font-family="STIX2Math">
-			<fo:instream-foreign-object fox:alt-text="Math"> 
-				<xsl:copy-of select="."/>
-			</fo:instream-foreign-object>
+			<xsl:variable name="mathml">
+				<xsl:apply-templates select="." mode="mathml"/>
+			</xsl:variable>
+			<fo:instream-foreign-object fox:alt-text="Math">
+				<!-- <xsl:copy-of select="."/> -->
+				<xsl:copy-of select="xalan:nodeset($mathml)"/>
+			</fo:instream-foreign-object>			
 		</fo:inline>
+	</xsl:template><xsl:template match="@*|node()" mode="mathml">
+		<xsl:copy>
+				<xsl:apply-templates select="@*|node()" mode="mathml"/>
+		</xsl:copy>
+	</xsl:template><xsl:template match="mathml:mtext" mode="mathml">
+		<xsl:copy>
+			<!-- replace start and end spaces to non-break space -->
+			<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),'(^ )|( $)',' ')"/>
+		</xsl:copy>
 	</xsl:template><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
 		<xsl:variable name="target">
 			<xsl:choose>
@@ -3808,9 +4034,22 @@
 			<xsl:apply-templates/>
 		</fo:basic-link>
 	</xsl:template><xsl:template match="*[local-name() = 'formula']" name="formula">
-		<fo:block id="{@id}" xsl:use-attribute-sets="formula-style">
-			<xsl:apply-templates/>
-		</fo:block>
+		<fo:block-container margin-left="0mm">
+			<xsl:if test="parent::*[local-name() = 'note']">
+				<xsl:attribute name="margin-left">
+					<xsl:choose>
+						<xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
+						<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
+					</xsl:choose>
+				</xsl:attribute>
+				
+			</xsl:if>
+			<fo:block-container margin-left="0mm">	
+				<fo:block id="{@id}" xsl:use-attribute-sets="formula-style">
+					<xsl:apply-templates/>
+				</fo:block>
+			</fo:block-container>
+		</fo:block-container>
 	</xsl:template><xsl:template match="*[local-name() = 'formula']/*[local-name() = 'dt']/*[local-name() = 'stem']">
 		<fo:inline>
 			<xsl:apply-templates/>
@@ -3870,7 +4109,9 @@
 		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'termnote']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="termnote-style">			
-			<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
+			<fo:inline xsl:use-attribute-sets="termnote-name-style">
+				<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
+			</fo:inline>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'note']/*[local-name() = 'name'] |               *[local-name() = 'termnote']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'note']/*[local-name() = 'name']" mode="presentation">
@@ -3967,12 +4208,101 @@
 			
 			<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style"/>
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">
+	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="contents">		
 		<xsl:apply-templates mode="contents"/>
 		<xsl:text> </xsl:text>
-	</xsl:template><xsl:template match="text()" mode="contents">
+	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |                *[local-name() = 'table']/*[local-name() = 'name'] |               *[local-name() = 'permission']/*[local-name() = 'name'] |               *[local-name() = 'recommendation']/*[local-name() = 'name'] |               *[local-name() = 'requirement']/*[local-name() = 'name']" mode="bookmarks">		
+		<xsl:apply-templates mode="bookmarks"/>
+		<xsl:text> </xsl:text>
+	</xsl:template><xsl:template match="*[local-name() = 'name']/text()" mode="contents" priority="2">
 		<xsl:value-of select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |         *[local-name() = 'image']/*[local-name() = 'name']" mode="presentation">
+	</xsl:template><xsl:template match="*[local-name() = 'name']/text()" mode="bookmarks" priority="2">
+		<xsl:value-of select="."/>
+	</xsl:template><xsl:template match="node()" mode="contents">
+		<xsl:apply-templates mode="contents"/>
+	</xsl:template><xsl:template match="node()" mode="bookmarks">
+		<xsl:apply-templates mode="bookmarks"/>
+	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="contents">
+		<xsl:apply-templates select="."/>
+	</xsl:template><xsl:template match="*[local-name() = 'stem']" mode="bookmarks">
+		<xsl:apply-templates mode="bookmarks"/>
+	</xsl:template><xsl:template name="addBookmarks">
+		<xsl:param name="contents"/>
+		<xsl:if test="xalan:nodeset($contents)//item">
+			<fo:bookmark-tree>
+				<xsl:choose>
+					<xsl:when test="xalan:nodeset($contents)/doc">
+						<xsl:choose>
+							<xsl:when test="count(xalan:nodeset($contents)/doc) &gt; 1">
+								<xsl:for-each select="xalan:nodeset($contents)/doc">
+									<fo:bookmark internal-destination="{contents/item[1]/@id}" starting-state="hide">
+										<fo:bookmark-title>
+											<xsl:variable name="bookmark-title_">
+												<xsl:choose>
+													<xsl:when test="@lang = 'en'">
+														
+														
+														</xsl:when>
+													<xsl:when test="@lang = 'fr'">
+														
+														
+													</xsl:when>
+													<xsl:when test="@lang = 'de'">Deutsche</xsl:when>
+													<xsl:otherwise><xsl:value-of select="@lang"/> version</xsl:otherwise>
+												</xsl:choose>
+											</xsl:variable>
+											<xsl:choose>
+												<xsl:when test="normalize-space($bookmark-title_) != ''">
+													<xsl:value-of select="normalize-space($bookmark-title_)"/>
+												</xsl:when>
+												<xsl:otherwise>
+													<xsl:choose>
+														<xsl:when test="@lang = 'en'">English</xsl:when>
+														<xsl:when test="@lang = 'fr'">Français</xsl:when>
+														<xsl:when test="@lang = 'de'">Deutsche</xsl:when>
+														<xsl:otherwise><xsl:value-of select="@lang"/> version</xsl:otherwise>
+													</xsl:choose>
+												</xsl:otherwise>
+											</xsl:choose>
+										</fo:bookmark-title>
+										<xsl:apply-templates select="contents/item" mode="bookmark"/>
+									</fo:bookmark>
+									
+								</xsl:for-each>
+							</xsl:when>
+							<xsl:otherwise>
+								<xsl:for-each select="xalan:nodeset($contents)/doc">
+									<xsl:apply-templates select="contents/item" mode="bookmark"/>
+								</xsl:for-each>
+							</xsl:otherwise>
+						</xsl:choose>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:apply-templates select="xalan:nodeset($contents)/contents/item" mode="bookmark"/>				
+					</xsl:otherwise>
+				</xsl:choose>
+				
+				
+				
+				
+				
+				
+				
+				
+			</fo:bookmark-tree>
+		</xsl:if>
+	</xsl:template><xsl:template match="item" mode="bookmark">
+		<fo:bookmark internal-destination="{@id}" starting-state="hide">
+				<fo:bookmark-title>
+					<xsl:if test="@section != ''">
+						<xsl:value-of select="@section"/> 
+						<xsl:text> </xsl:text>
+					</xsl:if>
+					<xsl:value-of select="normalize-space(title)"/>
+				</fo:bookmark-title>
+				<xsl:apply-templates mode="bookmark"/>				
+		</fo:bookmark>
+	</xsl:template><xsl:template match="title" mode="bookmark"/><xsl:template match="text()" mode="bookmark"/><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'name'] |         *[local-name() = 'image']/*[local-name() = 'name']" mode="presentation">
 		<xsl:if test="normalize-space() != ''">			
 			<fo:block xsl:use-attribute-sets="figure-name-style">
 								
@@ -4030,7 +4360,7 @@
 					<xsl:apply-templates/>
 				</xsl:otherwise>
 			</xsl:choose>
-	</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
+	</xsl:template><xsl:template match="*[local-name() = 'fn']" mode="contents"/><xsl:template match="*[local-name() = 'fn']" mode="bookmarks"/><xsl:template match="*[local-name() = 'fn']" mode="contents_item"/><xsl:template match="*[local-name() = 'tab']" mode="contents_item">
 		<xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name() = 'strong']" mode="contents_item">
 		<xsl:copy>
@@ -4039,21 +4369,61 @@
 	</xsl:template><xsl:template match="*[local-name() = 'br']" mode="contents_item">
 		<xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name()='sourcecode']" name="sourcecode">
-		<fo:block xsl:use-attribute-sets="sourcecode-style">			
-			<xsl:apply-templates/>			
-		</fo:block>
-		<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
-	</xsl:template><xsl:template match="*[local-name()='sourcecode']/text()">
+	
+		<fo:block-container margin-left="0mm">
+			<xsl:if test="parent::*[local-name() = 'note']">
+				<xsl:attribute name="margin-left">
+					<xsl:choose>
+						<xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
+						<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
+					</xsl:choose>
+				</xsl:attribute>
+				
+			</xsl:if>
+			<fo:block-container margin-left="0mm">
+	
+				<fo:block xsl:use-attribute-sets="sourcecode-style">
+					<xsl:variable name="_font-size">
+						
+												
+						
+						
+						
+						9
+						
+								
+						
+						
+						
+												
+						
+								
+				</xsl:variable>
+				<xsl:variable name="font-size" select="normalize-space($_font-size)"/>		
+				<xsl:if test="$font-size != ''">
+					<xsl:attribute name="font-size">
+						<xsl:choose>
+							<xsl:when test="ancestor::*[local-name()='note']"><xsl:value-of select="$font-size * 0.91"/>pt</xsl:when>
+							<xsl:otherwise><xsl:value-of select="$font-size"/>pt</xsl:otherwise>
+						</xsl:choose>
+					</xsl:attribute>
+				</xsl:if>
+					<xsl:apply-templates/>			
+				</fo:block>
+				<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
+				
+			</fo:block-container>
+		</fo:block-container>
+	</xsl:template><xsl:template match="*[local-name()='sourcecode']/text()" priority="2">
 		<xsl:variable name="text">
 			<xsl:call-template name="add-zero-spaces-equal"/>
 		</xsl:variable>
-		<xsl:call-template name="add-zero-spaces">
+		<xsl:call-template name="add-zero-spaces-java">
 			<xsl:with-param name="text" select="$text"/>
 		</xsl:call-template>
 	</xsl:template><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']"/><xsl:template match="*[local-name() = 'sourcecode']/*[local-name() = 'name']" mode="presentation">
 		<xsl:if test="normalize-space() != ''">		
-			<fo:block xsl:use-attribute-sets="sourcecode-name-style">
-				
+			<fo:block xsl:use-attribute-sets="sourcecode-name-style">				
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -4123,22 +4493,30 @@
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
 		<fo:block-container margin-left="0mm" margin-right="0mm" margin-bottom="12pt">
+			<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
+				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+			</xsl:if>
 			<fo:block-container margin-left="0mm" margin-right="0mm">
-				<fo:table id="{@id}" table-layout="fixed" width="100%" border="0pt solid black">					
+				<fo:table id="{@id}" table-layout="fixed" width="100%"> <!-- border="1pt solid black" -->
+					<xsl:if test="ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
+						<!-- <xsl:attribute name="border">0.5pt solid black</xsl:attribute> -->
+					</xsl:if>
 					<xsl:variable name="simple-table">	
 						<xsl:call-template name="getSimpleTable"/>			
 					</xsl:variable>					
 					<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)//tr[1]/td)"/>
 					<xsl:if test="$cols-count = 2 and not(ancestor::*[local-name()='table'])">
-						<fo:table-column column-width="35mm"/>
-						<fo:table-column column-width="115mm"/>
+						<!-- <fo:table-column column-width="35mm"/>
+						<fo:table-column column-width="115mm"/> -->
+						<fo:table-column column-width="30%"/>
+						<fo:table-column column-width="70%"/>
 					</xsl:if>
 					<xsl:apply-templates mode="requirement"/>
 				</fo:table>
 				<!-- fn processing -->
 				<xsl:if test=".//*[local-name() = 'fn']">
 					<xsl:for-each select="*[local-name() = 'tbody']">
-						<fo:block font-size="90%" border-bottom="1.pt solid black">
+						<fo:block font-size="90%" border-bottom="1pt solid black">
 							<xsl:call-template name="fn_display"/>
 						</fo:block>
 					</xsl:for-each>
@@ -4154,17 +4532,27 @@
 			<xsl:apply-templates mode="requirement"/>
 		</fo:table-body>
 	</xsl:template><xsl:template match="*[local-name()='tr']" mode="requirement">
-		<fo:table-row>			
+		<fo:table-row height="7mm" border-bottom="0.5pt solid grey">			
+			<xsl:if test="parent::*[local-name()='thead']"> <!-- and not(ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']) -->
+				<!-- <xsl:attribute name="border">1pt solid black</xsl:attribute> -->
+				<xsl:attribute name="background-color">rgb(33, 55, 92)</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="starts-with(*[local-name()='td'][1], 'Requirement ')">
+				<xsl:attribute name="background-color">rgb(252, 246, 222)</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="starts-with(*[local-name()='td'][1], 'Recommendation ')">
+				<xsl:attribute name="background-color">rgb(233, 235, 239)</xsl:attribute>
+			</xsl:if>
 			<xsl:apply-templates mode="requirement"/>
 		</fo:table-row>
 	</xsl:template><xsl:template match="*[local-name()='th']" mode="requirement">
-		<fo:table-cell text-align="{@align}">
+		<fo:table-cell text-align="{@align}" display-align="center" padding="1mm" padding-left="2mm"> <!-- border="0.5pt solid black" -->
 			<xsl:attribute name="text-align">
 				<xsl:choose>
 					<xsl:when test="@align">
 						<xsl:value-of select="@align"/>
 					</xsl:when>
-					<xsl:otherwise>center</xsl:otherwise>
+					<xsl:otherwise>left</xsl:otherwise>
 				</xsl:choose>
 			</xsl:attribute>
 			<xsl:if test="@colspan">
@@ -4177,22 +4565,27 @@
 					<xsl:value-of select="@rowspan"/>
 				</xsl:attribute>
 			</xsl:if>
+			<xsl:call-template name="display-align"/>
 			
-			<xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
+			<!-- <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
 				<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
 				<xsl:attribute name="background-color">rgb(165, 165, 165)</xsl:attribute>				
 			</xsl:if>
 			<xsl:if test="ancestor::*[local-name()='table']/@type = 'recommendtest'">
 				<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
 				<xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>				
-			</xsl:if>
+			</xsl:if> -->
 			
 			<fo:block>
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:table-cell>
 	</xsl:template><xsl:template match="*[local-name()='td']" mode="requirement">
-		<fo:table-cell text-align="{@align}">
+		<fo:table-cell text-align="{@align}" display-align="center" padding="1mm" padding-left="2mm"> <!-- border="0.5pt solid black" -->
+			<xsl:if test="*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']">
+				<xsl:attribute name="padding">0mm</xsl:attribute>
+				<xsl:attribute name="padding-left">0mm</xsl:attribute>
+			</xsl:if>
 			<xsl:attribute name="text-align">
 				<xsl:choose>
 					<xsl:when test="@align">
@@ -4201,6 +4594,9 @@
 					<xsl:otherwise>left</xsl:otherwise>
 				</xsl:choose>
 			</xsl:attribute>
+			<xsl:if test="following-sibling::*[local-name()='td'] and not(preceding-sibling::*[local-name()='td'])">
+				<xsl:attribute name="font-weight">bold</xsl:attribute>
+			</xsl:if>
 			<xsl:if test="@colspan">
 				<xsl:attribute name="number-columns-spanned">
 					<xsl:value-of select="@colspan"/>
@@ -4211,25 +4607,27 @@
 					<xsl:value-of select="@rowspan"/>
 				</xsl:attribute>
 			</xsl:if>
+			<xsl:call-template name="display-align"/>
 			
-			<xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
+			<!-- <xsl:if test="ancestor::*[local-name()='table']/@type = 'recommend'">
 				<xsl:attribute name="padding-left">0.5mm</xsl:attribute>
-				<xsl:attribute name="padding-top">0.5mm</xsl:attribute>
-				<xsl:if test="parent::*[local-name()='tr']/preceding-sibling::*[local-name()='tr'] and not(*[local-name()='table'])"> <!-- 2nd line and below -->
+				<xsl:attribute name="padding-top">0.5mm</xsl:attribute>				 
+				<xsl:if test="parent::*[local-name()='tr']/preceding-sibling::*[local-name()='tr'] and not(*[local-name()='table'])">
 					<xsl:attribute name="background-color">rgb(201, 201, 201)</xsl:attribute>					
 				</xsl:if>
-			</xsl:if>
+			</xsl:if> -->
+			<!-- 2nd line and below -->
 			
 			<fo:block>			
 				<xsl:apply-templates/>
 			</fo:block>			
 		</fo:table-cell>
 	</xsl:template><xsl:template match="*[local-name() = 'p'][@class='RecommendationTitle' or @class = 'RecommendationTestTitle']" priority="2">
-		<fo:block font-size="11pt" font-weight="bold" text-align="center" margin-bottom="4pt">
+		<fo:block font-size="11pt" color="rgb(237, 193, 35)"> <!-- font-weight="bold" margin-bottom="4pt" text-align="center"  -->
 			<xsl:apply-templates/>
 		</fo:block>
-	</xsl:template><xsl:template match="*[local-name() = 'p'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
-		<fo:block margin-bottom="10pt">
+	</xsl:template><xsl:template match="*[local-name() = 'p2'][ancestor::*[local-name() = 'table'][@class = 'recommendation' or @class='requirement' or @class='permission']]">
+		<fo:block> <!-- margin-bottom="10pt" -->
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'termexample']">
@@ -4251,12 +4649,13 @@
 			<xsl:apply-templates select="*[local-name()='name']" mode="presentation"/>
 			
 			<xsl:variable name="element">
-				block
+				block				
 				
+				<xsl:if test=".//*[local-name() = 'table']">block</xsl:if> 
 			</xsl:variable>
 			
 			<xsl:choose>
-				<xsl:when test="normalize-space($element) = 'block'">
+				<xsl:when test="contains(normalize-space($element), 'block')">
 					<fo:block xsl:use-attribute-sets="example-body-style">
 						<xsl:apply-templates/>
 					</fo:block>
@@ -4293,25 +4692,44 @@
 			</xsl:otherwise>
 		</xsl:choose>
 
-	</xsl:template><xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']">		
-		<fo:block xsl:use-attribute-sets="example-p-style">
+	</xsl:template><xsl:template match="*[local-name() = 'example']/*[local-name() = 'p']">
+	
+		<xsl:variable name="element">
+			block
 			
-			<xsl:apply-templates/>
-		</fo:block>
+		</xsl:variable>		
+		<xsl:choose>			
+			<xsl:when test="normalize-space($element) = 'block'">
+				<fo:block xsl:use-attribute-sets="example-p-style">
+					
+					<xsl:apply-templates/>
+				</fo:block>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:inline xsl:use-attribute-sets="example-p-style">
+					<xsl:apply-templates/>					
+				</fo:inline>
+			</xsl:otherwise>
+		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']">
 		<fo:block xsl:use-attribute-sets="termsource-style">
 			<!-- Example: [SOURCE: ISO 5127:2017, 3.1.6.02] -->			
 			<xsl:variable name="termsource_text">
 				<xsl:apply-templates/>
 			</xsl:variable>
+			
 			<xsl:choose>
 				<xsl:when test="starts-with(normalize-space($termsource_text), '[')">
 					<xsl:apply-templates/>
 				</xsl:when>
-				<xsl:otherwise>
-					<xsl:text>[</xsl:text>
-					<xsl:apply-templates/>
-					<xsl:text>]</xsl:text>
+				<xsl:otherwise>					
+					
+						<xsl:text>[</xsl:text>
+					
+					<xsl:apply-templates/>					
+					
+						<xsl:text>]</xsl:text>
+					
 				</xsl:otherwise>
 			</xsl:choose>
 		</fo:block>
@@ -4322,10 +4740,13 @@
 	</xsl:template><xsl:template match="*[local-name() = 'origin']">
 		<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
 			
-				<xsl:call-template name="getTitle">
-					<xsl:with-param name="name" select="'title-source'"/>
-				</xsl:call-template>
-				<xsl:text>: </xsl:text>
+				<fo:inline>
+					
+					<xsl:call-template name="getTitle">
+						<xsl:with-param name="name" select="'title-source'"/>
+					</xsl:call-template>
+					<xsl:text>: </xsl:text>
+				</fo:inline>
 			
 			<fo:inline xsl:use-attribute-sets="origin-style">
 				<xsl:apply-templates/>
@@ -4337,18 +4758,29 @@
 		<xsl:if test="normalize-space() != ''">
 			<xsl:value-of select="."/>
 		</xsl:if>
-	</xsl:template><xsl:template match="*[local-name() = 'quote']">
+	</xsl:template><xsl:template match="*[local-name() = 'quote']">		
+		<fo:block-container margin-left="0mm">
+			<xsl:if test="parent::*[local-name() = 'note']">
+				<xsl:if test="not(ancestor::*[local-name() = 'table'])">
+					<xsl:attribute name="margin-left">5mm</xsl:attribute>
+				</xsl:if>
+			</xsl:if>
+			
+			<fo:block-container margin-left="0mm">
 		
-		<fo:block xsl:use-attribute-sets="quote-style">
-			<xsl:apply-templates select=".//*[local-name() = 'p']"/>
-		</fo:block>
-		<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
-			<fo:block xsl:use-attribute-sets="quote-source-style">
-				<!-- — ISO, ISO 7301:2011, Clause 1 -->
-				<xsl:apply-templates select="*[local-name() = 'author']"/>
-				<xsl:apply-templates select="*[local-name() = 'source']"/>				
-			</fo:block>
-		</xsl:if>
+				<fo:block xsl:use-attribute-sets="quote-style">
+					<xsl:apply-templates select=".//*[local-name() = 'p']"/>
+				</fo:block>
+				<xsl:if test="*[local-name() = 'author'] or *[local-name() = 'source']">
+					<fo:block xsl:use-attribute-sets="quote-source-style">
+						<!-- — ISO, ISO 7301:2011, Clause 1 -->
+						<xsl:apply-templates select="*[local-name() = 'author']"/>
+						<xsl:apply-templates select="*[local-name() = 'source']"/>				
+					</fo:block>
+				</xsl:if>
+				
+			</fo:block-container>
+		</fo:block-container>
 	</xsl:template><xsl:template match="*[local-name() = 'source']">
 		<xsl:if test="../*[local-name() = 'author']">
 			<xsl:text>, </xsl:text>
@@ -4376,6 +4808,7 @@
 				<xsl:if test="@type = 'inline'">
 					
 					
+					
 				</xsl:if>
 			
 			
@@ -4413,6 +4846,7 @@
 			
 			
 			
+			
 		</xsl:variable>
 		
 		<xsl:variable name="padding-right">
@@ -4532,6 +4966,30 @@
 	</xsl:template><xsl:template match="*[local-name() = 'name']/text()">
 		<!-- 0xA0 to space replacement -->
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
+	</xsl:template><xsl:template match="*[local-name() = 'ul'] | *[local-name() = 'ol']">
+		<xsl:choose>
+			<xsl:when test="parent::*[local-name() = 'note']">
+				<fo:block-container>
+					<xsl:attribute name="margin-left">
+						<xsl:choose>
+							<xsl:when test="not(ancestor::*[local-name() = 'table'])"><xsl:value-of select="$note-body-indent"/></xsl:when>
+							<xsl:otherwise><xsl:value-of select="$note-body-indent-table"/></xsl:otherwise>
+						</xsl:choose>
+					</xsl:attribute>
+					
+					<fo:block-container margin-left="0mm">
+						<fo:block>
+							<xsl:apply-templates select="." mode="ul_ol"/>
+						</fo:block>
+					</fo:block-container>
+				</fo:block-container>
+			</xsl:when>
+			<xsl:otherwise>
+				<fo:block>
+					<xsl:apply-templates select="." mode="ul_ol"/>
+				</fo:block>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'errata']">
 		<!-- <row>
 					<date>05-07-2013</date>
@@ -4563,6 +5021,65 @@
 		<fo:table-cell border="1pt solid black" padding-left="1mm" padding-top="0.5mm">
 			<fo:block><xsl:apply-templates/></fo:block>
 		</fo:table-cell>
+	</xsl:template><xsl:template name="processBibitem">
+		 
+		
+		
+		 
+	</xsl:template><xsl:template name="processBibitemDocId">
+		<xsl:variable name="_doc_ident" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]"/>
+		<xsl:choose>
+			<xsl:when test="normalize-space($_doc_ident) != ''">
+				<xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN' or @type = 'rfc-anchor')]/@type"/>
+				<xsl:if test="$type != '' and not(contains($_doc_ident, $type))">
+					<xsl:value-of select="$type"/><xsl:text> </xsl:text>
+				</xsl:if>
+				<xsl:value-of select="$_doc_ident"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]/@type"/>
+				<xsl:if test="$type != ''">
+					<xsl:value-of select="$type"/><xsl:text> </xsl:text>
+				</xsl:if>
+				<xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template name="processPersonalAuthor">
+		<xsl:choose>
+			<xsl:when test="*[local-name() = 'name']/*[local-name() = 'completename']">
+				<author>
+					<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'completename']"/>
+				</author>
+			</xsl:when>
+			<xsl:when test="*[local-name() = 'name']/*[local-name() = 'surname'] and *[local-name() = 'name']/*[local-name() = 'initial']">
+				<author>
+					<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'surname']"/>
+					<xsl:text> </xsl:text>
+					<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'initial']" mode="strip"/>
+				</author>
+			</xsl:when>
+			<xsl:when test="*[local-name() = 'name']/*[local-name() = 'surname'] and *[local-name() = 'name']/*[local-name() = 'forename']">
+				<author>
+					<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'surname']"/>
+					<xsl:text> </xsl:text>
+					<xsl:apply-templates select="*[local-name() = 'name']/*[local-name() = 'forename']" mode="strip"/>
+				</author>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template><xsl:template name="renderDate">		
+			<xsl:if test="normalize-space(*[local-name() = 'on']) != ''">
+				<xsl:value-of select="*[local-name() = 'on']"/>
+			</xsl:if>
+			<xsl:if test="normalize-space(*[local-name() = 'from']) != ''">
+				<xsl:value-of select="concat(*[local-name() = 'from'], '–', *[local-name() = 'to'])"/>
+			</xsl:if>
+	</xsl:template><xsl:template match="*[local-name() = 'name']/*[local-name() = 'initial']/text()" mode="strip">
+		<xsl:value-of select="translate(.,'. ','')"/>
+	</xsl:template><xsl:template match="*[local-name() = 'name']/*[local-name() = 'forename']/text()" mode="strip">
+		<xsl:value-of select="substring(.,1,1)"/>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>
@@ -4770,6 +5287,7 @@
 						
 			
 			
+			
 		</xsl:variable>
 		<xsl:if test="$documentNS != $XSLNS">
 			<xsl:message>[WARNING]: Document namespace: '<xsl:value-of select="$documentNS"/>' doesn't equal to xslt namespace '<xsl:value-of select="$XSLNS"/>'</xsl:message>
@@ -4795,4 +5313,21 @@
 				</xsl:otherwise>
 			</xsl:choose>					
 		</xsl:attribute>
+	</xsl:template><xsl:template name="add-letter-spacing">
+		<xsl:param name="text"/>
+		<xsl:param name="letter-spacing" select="'0.15'"/>
+		<xsl:if test="string-length($text) &gt; 0">
+			<xsl:variable name="char" select="substring($text, 1, 1)"/>
+			<fo:inline padding-right="{$letter-spacing}mm">
+				<xsl:if test="$char = '®'">
+					<xsl:attribute name="font-size">58%</xsl:attribute>
+					<xsl:attribute name="baseline-shift">30%</xsl:attribute>
+				</xsl:if>				
+				<xsl:value-of select="$char"/>
+			</fo:inline>
+			<xsl:call-template name="add-letter-spacing">
+				<xsl:with-param name="text" select="substring($text, 2)"/>
+				<xsl:with-param name="letter-spacing" select="$letter-spacing"/>
+			</xsl:call-template>
+		</xsl:if>
 	</xsl:template></xsl:stylesheet>