metanorma-bipm 1.1.8 → 1.2.0

data/lib/isodoc/bipm/bipm.mise-en-pratique.xsl

@@ -200,7 +200,9 @@
 			<xsl:apply-templates select="/*/bipm:sections/*" mode="contents"/>
 			<xsl:apply-templates select="/*/bipm:bibliography/bipm:references[@normative='true']" mode="contents"/>
 			<xsl:apply-templates select="/*/bipm:annex" mode="contents"/>
-			<xsl:apply-templates select="/*/bipm:bibliography/bipm:references[not(@normative='true')]" mode="contents"/> 
+			<xsl:if test="/*/bipm:bibliography/bipm:references[not(@normative='true')]/bipm:bibitem[not(contains(bipm:docidentifier, 'si-brochure-'))]">
+				<xsl:apply-templates select="/*/bipm:bibliography/bipm:references[not(@normative='true')]" mode="contents"/> 
+			</xsl:if>
 			
 			<!-- Index -->
 			<!-- <xsl:apply-templates select="//bipm:clause[@type = 'index']" mode="contents"/> -->
@@ -345,6 +347,7 @@
 				<xsl:call-template name="addPDFUAmeta"/>
 				
 				<xsl:if test="$add_math_as_attachment = 'true'">
+					<!-- DEBUG: mathml_attachments=<xsl:copy-of select="$mathml_attachments"/> -->
 					<xsl:for-each select="xalan:nodeset($mathml_attachments)//attachment">
 						
 						<xsl:variable name="mathml_filename" select="@filename"/>
@@ -527,6 +530,10 @@
 			<xsl:apply-templates select="@*|node()" mode="flatxml"/>
 		</xsl:copy>
 	</xsl:template>
+	
+	<xsl:template match="mathml:math" mode="flatxml" priority="2">
+		<xsl:copy-of select="."/>
+	</xsl:template>
 
 	<!-- enclosing starting elements annex/... in clause -->
 	<xsl:template match="bipm:annex" mode="flatxml">
@@ -792,6 +799,10 @@
 		</xsl:copy>
 	</xsl:template>	
 	
+	<xsl:template match="mathml:math" mode="flatxml_list" priority="2">
+		<xsl:copy-of select="."/>
+	</xsl:template>
+	
 	<!-- copy 'ol' 'ul' properties to each 'li' -->
 	<!-- OBSOLETE: move note for list (list level note)  into latest 'li' -->
 	<!-- NOW: move note for list (list level note)  into first 'li' -->
@@ -1283,7 +1294,9 @@
 				<xsl:apply-templates select="bipm:annex" mode="sections"/>
 				
 				<!-- Bibliography -->
-				<xsl:apply-templates select="bipm:bibliography/bipm:references[not(@normative='true')]" mode="sections"/> 
+				<xsl:if test="bipm:bibliography/bipm:references[not(@normative='true')]/bipm:bibitem[not(contains(bipm:docidentifier, 'si-brochure-'))]">
+					<xsl:apply-templates select="bipm:bibliography/bipm:references[not(@normative='true')]" mode="sections"/> 
+				</xsl:if>
 				
 				<!-- Document Control -->
 				<xsl:apply-templates select="bipm:doccontrol" mode="sections"/> 
@@ -1449,8 +1462,9 @@
 
 				<xsl:apply-templates select="bipm:annex" mode="sections"/>
 				
-				
-				<xsl:apply-templates select="bipm:bibliography/bipm:references[not(@normative='true')]" mode="sections"/> 
+				<xsl:if test="bipm:bibliography/bipm:references[not(@normative='true')]/bipm:bibitem[not(contains(bipm:docidentifier, 'si-brochure-'))]">
+					<xsl:apply-templates select="bipm:bibliography/bipm:references[not(@normative='true')]" mode="sections"/> 
+				</xsl:if>
 				
 				<!-- Document Control -->
 				<xsl:apply-templates select="bipm:doccontrol" mode="sections"/> 
@@ -2360,8 +2374,10 @@
 				<!-- <xsl:when test="$level = 1 and $independentAppendix != ''">11.5pt</xsl:when>
 				<xsl:when test="$level &gt;= 2 and $independentAppendix != ''">10.5pt</xsl:when> -->
 				<xsl:when test="$level = 1">16pt</xsl:when>
+				<xsl:when test="$level = 2 and ancestor::bipm:annex and ../@type = 'toc'">16pt</xsl:when>
 				<xsl:when test="$level = 2 and ancestor::bipm:annex">10.5pt</xsl:when>
 				<xsl:when test="$level = 2">14pt</xsl:when>
+				<xsl:when test="$level &gt;= 3 and ancestor::bipm:annex and ../@type = 'toc'">9pt</xsl:when>
 				<xsl:when test="$level = 3 and ancestor::bipm:annex">10pt</xsl:when>
 				<xsl:when test="$level &gt;= 4 and ancestor::bipm:annex">9pt</xsl:when>
 				<xsl:when test="$level = 3">12pt</xsl:when>
@@ -2385,6 +2401,7 @@
 				<xsl:choose>
 					<xsl:when test="$level = 1 and (parent::bipm:annex or ancestor::bipm:annex or parent::bipm:abstract or ancestor::bipm:preface)">84pt</xsl:when>
 					<xsl:when test="$level = 1">6pt</xsl:when>
+					<xsl:when test="$level = 2 and ancestor::bipm:annex and ../@type = 'toc'">29mm</xsl:when>
 					<xsl:when test="$level = 2 and ancestor::bipm:annex">6pt</xsl:when> <!-- 6pt 12pt -->					
 					<!-- <xsl:when test="$level = 2 and $independentAppendix != ''">6pt</xsl:when> -->
 					<xsl:when test="$level = 2">10pt</xsl:when>
@@ -2415,6 +2432,14 @@
 				<xsl:attribute name="space-before">20pt</xsl:attribute>
 			</xsl:if>
 			
+			<xsl:if test="$level &gt;= 3 and ancestor::bipm:annex and ../@type = 'toc'">
+				<xsl:attribute name="space-before">0pt</xsl:attribute>
+			</xsl:if>
+			
+			<xsl:if test="@type = 'quoted'">
+				<xsl:attribute name="font-weight">normal</xsl:attribute>
+			</xsl:if>
+			
 			<fo:block-container margin-left="0mm">
 				
 				<!-- marker not working for math -->
@@ -2463,19 +2488,17 @@
 									<xsl:if test="$level &gt;= 3">
 										<xsl:attribute name="margin-left">14mm</xsl:attribute>
 									</xsl:if>
-									<xsl:if test="$level = 3">
-										<fo:inline padding-right="2.5mm" baseline-shift="15%">
-											<fo:instream-foreign-object content-height="2mm" content-width="2mm" fox:alt-text="Quad">
-													<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" viewBox="0 0 2 2">
-														<rect x="0" y="0" width="2" height="2" fill="black"/>
-													</svg>
-												</fo:instream-foreign-object>	
-										</fo:inline>
+									<xsl:if test="$level = 3 and not(../@type = 'toc')">
+										<!-- <xsl:call-template name="blacksquare"/> -->
 									</xsl:if>
 									<xsl:if test="$level = 4">
 										<xsl:attribute name="text-align">center</xsl:attribute>
 									</xsl:if>
-									<xsl:call-template name="extractTitle"/>
+									<xsl:if test="../@type = 'toc'">
+										<xsl:attribute name="text-align">left</xsl:attribute>
+									</xsl:if>
+									<!-- <xsl:call-template name="extractTitle"/> -->
+									<xsl:apply-templates/>
 									<xsl:apply-templates select="following-sibling::*[1][local-name() = 'variant-title'][@type = 'sub']" mode="subtitle"/>
 								</xsl:when>
 								<xsl:otherwise>
@@ -2505,6 +2528,7 @@
 
 	</xsl:template>
 	
+	
 	<xsl:template match="*" mode="header">
 		<xsl:apply-templates mode="header"/>
 	</xsl:template>
@@ -3736,6 +3760,7 @@
 			<xsl:variable name="mathml_content">
 				<xsl:apply-templates select="." mode="mathml_actual_text"/>
 			</xsl:variable>
+			<!-- DEBUG: mathml_content=<xsl:value-of select="$mathml_content"/> -->
 			
 			<xsl:variable name="comment_text_following" select="following-sibling::node()[1][self::comment()]"/>
 			<xsl:variable name="comment_text_">
@@ -3748,27 +3773,26 @@
 					</xsl:otherwise>
 				</xsl:choose>
 			</xsl:variable> 
-			<xsl:variable name="comment_text" select="java:org.metanorma.fop.Util.unescape($comment_text_)"/>
+			<xsl:variable name="comment_text_2" select="java:org.metanorma.fop.Util.unescape($comment_text_)"/>
+			<xsl:variable name="comment_text" select="java:trim(java:java.lang.String.new($comment_text_2))"/>
 			
+			<xsl:variable name="filename" select="xalan:nodeset($mathml_attachments)//attachment[. = $mathml_content]/@filename"/>
 			<xsl:choose>
-				<xsl:when test="$add_math_as_attachment = 'true'">
-					
-					<xsl:variable name="filename" select="xalan:nodeset($mathml_attachments)//attachment[. = $mathml_content]/@filename"/>
-					<xsl:if test="$filename != ''">
-						<xsl:variable name="url" select="concat('url(embedded-file:', $filename, ')')"/>
-						<fo:basic-link external-destination="{$url}" fox:alt-text="MathLink">
-							<xsl:if test="normalize-space($comment_text) != ''">
-							<!-- put Mathin Alternate Text -->
-								<xsl:attribute name="fox:alt-text">
-									<xsl:value-of select="$comment_text"/>
-								</xsl:attribute>
-							</xsl:if>
-							<xsl:call-template name="mathml_instream_object">
-								<xsl:with-param name="mathml_content" select="$mathml_content"/>
-								<xsl:with-param name="comment_text" select="$comment_text"/>
-							</xsl:call-template>
-						</fo:basic-link>
-					</xsl:if>
+				<xsl:when test="$add_math_as_attachment = 'true' and normalize-space($filename) != ''">
+					<xsl:variable name="url" select="concat('url(embedded-file:', $filename, ')')"/>
+					<fo:basic-link external-destination="{$url}" fox:alt-text="MathLink">
+						<xsl:if test="normalize-space($comment_text) != ''">
+						<!-- put Mathin Alternate Text -->
+							<xsl:attribute name="fox:alt-text">
+								<xsl:value-of select="$comment_text"/>
+							</xsl:attribute>
+						</xsl:if>
+						<xsl:call-template name="mathml_instream_object">
+							<xsl:with-param name="mathml_content" select="$mathml_content"/>
+							<xsl:with-param name="comment_text" select="$comment_text"/>
+						</xsl:call-template>
+					</fo:basic-link>
+					<!-- </xsl:if> -->
 				</xsl:when>
 				<xsl:otherwise>
 					<xsl:call-template name="mathml_instream_object">
@@ -3816,6 +3840,71 @@
 	</fo:instream-foreign-object>
 	</xsl:template>
 
+
+	<!-- =================== -->
+	<!-- Table of Contents (ToC) processing -->
+	<!-- =================== -->
+	<xsl:template match="bipm:clause[@type = 'toc']" priority="3">
+		<fo:block role="TOC">
+			<xsl:copy-of select="@id"/>
+			<xsl:apply-templates select="bipm:title[1]"/>
+			
+			<!-- create virtual table to determine column's width -->
+			<xsl:variable name="toc_table_simple">
+				<tbody>
+					<xsl:apply-templates mode="toc_table_width"/>
+				</tbody>
+			</xsl:variable>
+			<xsl:variable name="cols-count" select="count(xalan:nodeset($toc_table_simple)/*/tr[1]/td)"/>
+			<xsl:variable name="colwidths">
+				<xsl:call-template name="calculate-column-widths">
+					<xsl:with-param name="cols-count" select="$cols-count"/>
+					<xsl:with-param name="table" select="$toc_table_simple"/>
+				</xsl:call-template>
+			</xsl:variable>
+			
+			<fo:table width="100%" table-layout="fixed">
+				<fo:table-column column-width="100%"/>
+				<fo:table-header>
+					<fo:table-row font-weight="bold">
+						<fo:table-cell text-align="right" font-size="9pt" font-family="Arial">
+							<fo:block>
+								<xsl:variable name="page">
+									<xsl:call-template name="getLocalizedString">
+										<xsl:with-param name="key">Page.sg</xsl:with-param>
+									</xsl:call-template>
+								</xsl:variable>
+								<xsl:value-of select="java:toLowerCase(java:java.lang.String.new($page))"/>
+							</fo:block>
+						</fo:table-cell>
+					</fo:table-row>
+				</fo:table-header>
+				<fo:table-body>
+					<fo:table-row>
+						<fo:table-cell>
+							<fo:block>
+								<xsl:variable name="title_id" select="generate-id(bipm:title[1])"/>
+								<xsl:apply-templates select="*[not(generate-id() = $title_id)]">
+									<xsl:with-param name="colwidths" select="$colwidths"/>
+								</xsl:apply-templates>
+							</fo:block>
+						</fo:table-cell>
+					</fo:table-row>
+				</fo:table-body>
+			</fo:table>
+		</fo:block>
+	</xsl:template>
+	
+	
+	<!-- ignore section number before tab -->
+	<xsl:template match="bipm:clause[@type = 'toc']//bipm:title/text()[1][not(preceding-sibling::bipm:tab) and following-sibling::*[1][self::bipm:tab]]"/>
+	<xsl:template match="bipm:clause[@type = 'toc']//bipm:title/bipm:tab" priority="2"/>
+
+	<!-- =================== -->
+	<!-- End Table of Contents (ToC) processing -->
+	<!-- =================== -->
+
+
 	<xsl:template name="insertHeaderFooter">
 		<xsl:param name="header-title"/>
 		<xsl:param name="orientation"/>
@@ -4559,6 +4648,8 @@
 		
 		<title-list-figures lang="en">List of Figures</title-list-figures>
 		
+		<title-table-figures lang="en">Table of Figures</title-table-figures>
+		
 		<title-list-recommendations lang="en">List of Recommendations</title-list-recommendations>
 		
 		<title-acknowledgements lang="en">Acknowledgements</title-acknowledgements>
@@ -4826,6 +4917,13 @@
 		
 		
 		
+	</xsl:attribute-set><xsl:attribute-set name="table-note-name-style">
+		
+			<xsl:attribute name="font-size">10pt</xsl:attribute>
+		
+		
+		
+		
 	</xsl:attribute-set><xsl:attribute-set name="note-p-style">
 		
 		
@@ -4979,13 +5077,20 @@
 		
 	</xsl:attribute-set><xsl:attribute-set name="list-style">
 		
-	</xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:template name="processPrefaceSectionsDefault_Contents">
+	</xsl:attribute-set><xsl:attribute-set name="toc-style">
+		<xsl:attribute name="line-height">135%</xsl:attribute>
+	</xsl:attribute-set><xsl:variable name="border-block-added">2.5pt solid rgb(0, 176, 80)</xsl:variable><xsl:variable name="border-block-deleted">2.5pt solid rgb(255, 0, 0)</xsl:variable><xsl:template name="OLD_processPrefaceSectionsDefault_Contents">
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']" mode="contents"/>
-	</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
+	</xsl:template><xsl:template name="processPrefaceSectionsDefault_Contents">
+		<xsl:for-each select="/*/*[local-name()='preface']/*">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="." mode="contents"/>
+		</xsl:for-each>
+	</xsl:template><xsl:template name="OLD_processMainSectionsDefault_Contents">
 		<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']" mode="contents"/>			
 		
 		<!-- Normative references  -->
@@ -4998,13 +5103,33 @@
 		<!-- Bibliography -->
 		<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')] |       /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]" mode="contents"/>
 		
-	</xsl:template><xsl:template name="processPrefaceSectionsDefault">
+	</xsl:template><xsl:template name="processMainSectionsDefault_Contents">
+		<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="." mode="contents"/>
+		</xsl:for-each>
+		
+		<xsl:for-each select="/*/*[local-name()='annex']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="." mode="contents"/>
+		</xsl:for-each>
+		
+		<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] |          /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="." mode="contents"/>
+		</xsl:for-each>
+	</xsl:template><xsl:template name="OLD_processPrefaceSectionsDefault">
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='introduction']"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name() != 'abstract' and local-name() != 'foreword' and local-name() != 'introduction' and local-name() != 'acknowledgements']"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='acknowledgements']"/>
-	</xsl:template><xsl:template name="processMainSectionsDefault">			
+	</xsl:template><xsl:template name="processPrefaceSectionsDefault">
+		<xsl:for-each select="/*/*[local-name()='preface']/*">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="."/>
+		</xsl:for-each>
+	</xsl:template><xsl:template name="OLD_processMainSectionsDefault">			
 		<xsl:apply-templates select="/*/*[local-name()='sections']/*[local-name()='clause'][@type='scope']"/>
 		
 		<!-- Normative references  -->
@@ -5016,6 +5141,22 @@
 		<xsl:apply-templates select="/*/*[local-name()='annex']"/>
 		<!-- Bibliography -->
 		<xsl:apply-templates select="/*/*[local-name()='bibliography']/*[local-name()='references'][not(@normative='true')]"/>
+	</xsl:template><xsl:template name="processMainSectionsDefault">
+		<xsl:for-each select="/*/*[local-name()='sections']/* | /*/*[local-name()='bibliography']/*[local-name()='references'][@normative='true']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="."/>
+			
+		</xsl:for-each>
+		
+		<xsl:for-each select="/*/*[local-name()='annex']">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="."/>
+		</xsl:for-each>
+		
+		<xsl:for-each select="/*/*[local-name()='bibliography']/*[not(@normative='true')] |          /*/*[local-name()='bibliography']/*[local-name()='clause'][*[local-name()='references'][not(@normative='true')]]">
+			<xsl:sort select="@displayorder" data-type="number"/>
+			<xsl:apply-templates select="."/>
+		</xsl:for-each>
 	</xsl:template><xsl:template match="text()">
 		<xsl:value-of select="."/>
 	</xsl:template><xsl:template match="*[local-name()='br']">
@@ -5950,18 +6091,16 @@
 				
 				<!-- Table's note name (NOTE, for example) -->
 
-				<fo:inline padding-right="2mm">
-					
-				
+				<fo:inline padding-right="2mm" xsl:use-attribute-sets="table-note-name-style">
 					
 					
 					
 					
-						<xsl:attribute name="font-size">10pt</xsl:attribute>
 						<xsl:if test="ancestor::bipm:preface">
 							<xsl:attribute name="text-decoration">underline</xsl:attribute>
 						</xsl:if>
 					
+					
 					<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
 						
 				</fo:inline>
@@ -6596,6 +6735,8 @@
 			<xsl:if test="$font-size != ''">
 				<xsl:attribute name="font-size">
 					<xsl:choose>
+						<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
+						<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
 						<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>
@@ -7443,6 +7584,7 @@
 			<xsl:otherwise>
 				<fo:block xsl:use-attribute-sets="image-style">
 					
+					
 					<xsl:variable name="src">
 						<xsl:call-template name="image_src"/>
 					</xsl:variable>
@@ -7690,6 +7832,13 @@
 			</xsl:attribute>
 			<xsl:apply-templates mode="svg_update"/>
 		</xsl:copy>
+	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'image'][*[local-name() = 'svg']]" priority="3">
+		<xsl:variable name="name" select="ancestor::*[local-name() = 'figure']/*[local-name() = 'name']"/>
+		<xsl:for-each select="*[local-name() = 'svg']">
+			<xsl:call-template name="image_svg">
+				<xsl:with-param name="name" select="$name"/>
+			</xsl:call-template>
+		</xsl:for-each>
 	</xsl:template><xsl:template match="*[local-name() = 'figure']/*[local-name() = 'image'][@mimetype = 'image/svg+xml' and @src[not(starts-with(., 'data:image/'))]]" priority="2">
 		<xsl:variable name="svg_content" select="document(@src)"/>
 		<xsl:variable name="name" select="ancestor::*[local-name() = 'figure']/*[local-name() = 'name']"/>
@@ -7794,7 +7943,7 @@
 			</fo:basic-link>
 		 </fo:block>
 	  </fo:block-container>
-	</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() = 'emf']"/><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="*[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">		
@@ -7802,7 +7951,7 @@
 		<xsl:text> </xsl:text>
 	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="contents" priority="2">
 		<xsl:value-of select="."/>
-	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[local-name() = 'name']/text()" mode="bookmarks" priority="2">
+	</xsl:template><xsl:template match="*[local-name() = 'figure' or local-name() = 'table' or local-name() = 'permission' or local-name() = 'recommendation' or local-name() = 'requirement']/*[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"/>
@@ -7900,6 +8049,8 @@
 				
 				
 				
+				
+				
 			</fo:bookmark-tree>
 		</xsl:if>
 	</xsl:template><xsl:template name="insertFigureBookmarks">
@@ -8107,12 +8258,16 @@
 				<xsl:if test="$font-size != ''">
 					<xsl:attribute name="font-size">
 						<xsl:choose>
+							<xsl:when test="$font-size = 'inherit'"><xsl:value-of select="$font-size"/></xsl:when>
+							<xsl:when test="contains($font-size, '%')"><xsl:value-of select="$font-size"/></xsl:when>
 							<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>
 				
@@ -8460,6 +8615,7 @@
 		</xsl:choose>	
 	</xsl:template><xsl:template match="*[local-name() = 'termsource']" 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/>
@@ -8488,20 +8644,22 @@
 		</xsl:if>
 	</xsl:template><xsl:variable name="localized.source">
 		<xsl:call-template name="getLocalizedString">
-				<xsl:with-param name="key">source</xsl:with-param>
-			</xsl:call-template>
+			<xsl:with-param name="key">source</xsl:with-param>
+		</xsl:call-template>
 	</xsl:variable><xsl:template match="*[local-name() = 'origin']">
 		<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
 			<xsl:if test="normalize-space(@citeas) = ''">
 				<xsl:attribute name="fox:alt-text"><xsl:value-of select="@bibitemid"/></xsl:attribute>
 			</xsl:if>
 			
+				
 				<fo:inline>
 					
 					
 					
 					
 					
+					
 						<xsl:value-of select="$localized.source"/>
 						<xsl:text> </xsl:text>
 					
@@ -8512,6 +8670,7 @@
 			<fo:inline xsl:use-attribute-sets="origin-style">
 				<xsl:apply-templates/>
 			</fo:inline>
+			
 			</fo:basic-link>
 	</xsl:template><xsl:template match="*[local-name() = 'modification']/*[local-name() = 'p']">
 		<fo:inline><xsl:apply-templates/></fo:inline>
@@ -8578,6 +8737,9 @@
 						
 					</xsl:if>	
 					
+					<xsl:variable name="citeas" select="java:replaceAll(java:java.lang.String.new(@citeas),'^\[?(.+?)\]?$','$1')"/> <!-- remove leading and trailing brackets -->
+					<xsl:variable name="text" select="normalize-space()"/>
+					
 					
             
 					<fo:basic-link internal-destination="{@bibitemid}" fox:alt-text="{@citeas}">
@@ -8599,7 +8761,9 @@
 							
 							
 						</xsl:if>
-
+						
+						
+						
 						<xsl:apply-templates/>
 					</fo:basic-link>
 							
@@ -8936,6 +9100,7 @@
 	</xsl:template><xsl:template match="*[local-name() = 'indexsect']//*[local-name() = 'li']" priority="4">
 		<xsl:variable name="level" select="count(ancestor::*[local-name() = 'ul'])"/>
 		<fo:block start-indent="{5 * $level}mm" text-indent="-5mm">
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'bookmark']" name="bookmark">
@@ -9133,9 +9298,97 @@
 		<fo:block-container border="1pt solid black" width="50%">
 			<fo:block> </fo:block>
 		</fo:block-container>
+	</xsl:template><xsl:template match="*[local-name() = 'toc']">
+		<xsl:param name="colwidths"/>
+		<xsl:variable name="colwidths_">
+			<xsl:choose>
+				<xsl:when test="not($colwidths)">
+					<xsl:variable name="toc_table_simple">
+						<tbody>
+							<xsl:apply-templates mode="toc_table_width"/>
+						</tbody>
+					</xsl:variable>
+					<xsl:variable name="cols-count" select="count(xalan:nodeset($toc_table_simple)/*/tr[1]/td)"/>
+					<xsl:call-template name="calculate-column-widths">
+						<xsl:with-param name="cols-count" select="$cols-count"/>
+						<xsl:with-param name="table" select="$toc_table_simple"/>
+					</xsl:call-template>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:copy-of select="$colwidths"/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:variable>
+		<fo:block role="TOCI" space-after="16pt">
+			<fo:table width="100%" table-layout="fixed">
+				<xsl:for-each select="xalan:nodeset($colwidths_)/column">
+					<fo:table-column column-width="proportional-column-width({.})"/>
+				</xsl:for-each>
+				<fo:table-body>
+					<xsl:apply-templates/>
+				</fo:table-body>
+			</fo:table>
+		</fo:block>
+	</xsl:template><xsl:template match="*[local-name() = 'toc']//*[local-name() = 'li']">
+		<fo:table-row min-height="5mm">
+			<xsl:apply-templates/>
+		</fo:table-row>
+	</xsl:template><xsl:template match="*[local-name() = 'toc']//*[local-name() = 'li']/*[local-name() = 'p']">
+		<xsl:apply-templates/>
+	</xsl:template><xsl:template match="*[local-name() = 'toc']//*[local-name() = 'xref']" priority="3">
+		<!-- <xref target="cgpm9th1948r6">1.6.3<tab/>&#8220;9th CGPM, 1948:<tab/>decision to establish the SI&#8221;</xref> -->
+		<xsl:variable name="target" select="@target"/>
+		<xsl:for-each select="*[local-name() = 'tab']">
+			<xsl:variable name="current_id" select="generate-id()"/>
+			<fo:table-cell>
+				<fo:block>
+					<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
+						<xsl:for-each select="following-sibling::node()[not(self::*[local-name() = 'tab']) and preceding-sibling::*[local-name() = 'tab'][1][generate-id() = $current_id]]">
+							<xsl:choose>
+								<xsl:when test="self::text()"><xsl:value-of select="."/></xsl:when>
+								<xsl:otherwise><xsl:apply-templates select="."/></xsl:otherwise>
+							</xsl:choose>
+						</xsl:for-each>
+					</fo:basic-link>
+				</fo:block>
+			</fo:table-cell>
+		</xsl:for-each>
+		<!-- last column - for page numbers -->
+		<fo:table-cell text-align="right" font-size="10pt" font-weight="bold" font-family="Arial">
+			<fo:block>
+				<fo:basic-link internal-destination="{$target}" fox:alt-text="{.}">
+					<fo:page-number-citation ref-id="{$target}"/>
+				</fo:basic-link>
+			</fo:block>
+		</fo:table-cell>
+	</xsl:template><xsl:template match="*" mode="toc_table_width">
+		<xsl:apply-templates mode="toc_table_width"/>
+	</xsl:template><xsl:template match="*[local-name() = 'clause'][@type = 'toc']/*[local-name() = 'title']" mode="toc_table_width"/><xsl:template match="*[local-name() = 'clause'][not(@type = 'toc')]/*[local-name() = 'title']" mode="toc_table_width"/><xsl:template match="*[local-name() = 'li']" mode="toc_table_width">
+		<tr>
+			<xsl:apply-templates mode="toc_table_width"/>
+		</tr>
+	</xsl:template><xsl:template match="*[local-name() = 'xref']" mode="toc_table_width">
+		<!-- <xref target="cgpm9th1948r6">1.6.3<tab/>&#8220;9th CGPM, 1948:<tab/>decision to establish the SI&#8221;</xref> -->
+		<xsl:for-each select="*[local-name() = 'tab']">
+			<xsl:variable name="current_id" select="generate-id()"/>
+			<td>
+				<xsl:for-each select="following-sibling::node()[not(self::*[local-name() = 'tab']) and preceding-sibling::*[local-name() = 'tab'][1][generate-id() = $current_id]]">
+					<xsl:copy-of select="."/>
+				</xsl:for-each>
+			</td>
+		</xsl:for-each>
+		<td>333</td> <!-- page number, just for fill -->
 	</xsl:template><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']"/><xsl:template match="*[local-name() = 'variant-title'][@type = 'sub']" mode="subtitle">
 		<fo:inline padding-right="5mm"> </fo:inline>
 		<fo:inline><xsl:apply-templates/></fo:inline>
+	</xsl:template><xsl:template match="*[local-name() = 'blacksquare']" name="blacksquare">
+		<fo:inline padding-right="2.5mm" baseline-shift="5%">
+			<fo:instream-foreign-object content-height="2mm" content-width="2mm" fox:alt-text="Quad">
+					<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" viewBox="0 0 2 2">
+						<rect x="0" y="0" width="2" height="2" fill="black"/>
+					</svg>
+				</fo:instream-foreign-object>	
+		</fo:inline>
 	</xsl:template><xsl:template name="convertDate">
 		<xsl:param name="date"/>
 		<xsl:param name="format" select="'short'"/>