metanorma-bipm 1.1.3 → 1.1.4

data/lib/isodoc/bipm/bipm.rapport.xsl

@@ -1112,8 +1112,11 @@
 					
 					<xsl:variable name="title-toc">
 						<fo:inline>
-							<xsl:call-template name="getTitle">
+							<!-- <xsl:call-template name="getTitle">
 								<xsl:with-param name="name" select="'title-toc'"/>
+							</xsl:call-template> -->
+							<xsl:call-template name="getLocalizedString">
+								<xsl:with-param name="key">table_of_contents</xsl:with-param>
 							</xsl:call-template>
 						</fo:inline>
 					</xsl:variable>
@@ -2406,8 +2409,17 @@
 
 	</xsl:template>
 	
+	<!-- <xsl:variable name="zero-width-space" select="'&#x200b;'"/> -->
 	<xsl:template match="*" mode="header">
 		<xsl:apply-templates mode="header"/>
+		<!-- <xsl:choose>
+			<xsl:when test="contains(preceding-sibling::node()[1], $zero-width-space)"> -->
+				<!-- stop further processing -->
+			<!-- </xsl:when>
+			<xsl:otherwise>
+				<xsl:apply-templates mode="header"/>
+			</xsl:otherwise>
+		</xsl:choose> -->
 	</xsl:template>
 
 	<xsl:template match="*[local-name() = 'stem']" mode="header">
@@ -2418,6 +2430,11 @@
 		<xsl:text> </xsl:text>
 	</xsl:template>
 	
+	<!-- zero-width space - separator for full/short titles. Short titles using in headers -->
+	<!-- <xsl:template match="text()[contains(., $zero-width-space)]" mode="header"> 
+		<xsl:value-of select="substring-before(., $zero-width-space)"/>
+	</xsl:template> -->
+	
 	<!-- ====== -->
 	<!-- ====== -->
 
@@ -2900,11 +2917,13 @@
 		<xsl:choose>
 			<xsl:when test="$num = 1">
 				<fo:inline xsl:use-attribute-sets="note-p-style">
+					<xsl:attribute name="text-align">left</xsl:attribute>
 					<xsl:apply-templates/>
 				</fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
 				<fo:block xsl:use-attribute-sets="note-p-style">						
+					<xsl:attribute name="text-align">left</xsl:attribute>
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:otherwise>
@@ -2968,6 +2987,7 @@
 			<xsl:attribute name="text-align">
 				<xsl:choose>
 					<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
+					<xsl:when test="ancestor::*[local-name() = 'note_side']">left</xsl:when>
 					<xsl:when test="../@align"><xsl:value-of select="../@align"/></xsl:when>
 					<xsl:otherwise>justify</xsl:otherwise>
 				</xsl:choose>
@@ -3477,6 +3497,12 @@
 				<xsl:attribute name="separators"/>
 			</xsl:if>
 			<mathml:mspace width="-0.15em"/> <!-- decrease space between opening brackets  and inside text-->
+			
+			<!-- if there is previous or next mfenced with superscript, then increase height of Parentheses -->
+			<xsl:if test="following-sibling::mathml:mfenced[.//mathml:msup] or preceding-sibling::mathml:mfenced[.//mathml:msup] or    ancestor::*[following-sibling::mathml:mfenced[.//mathml:msup] or preceding-sibling::mathml:mfenced[.//mathml:msup]]">
+				<mathml:mspace height="1.15em"/> <!-- increase height of parentheses -->
+			</xsl:if>
+			
 			<xsl:apply-templates mode="mathml"/>
 			<mathml:mspace width="-0.1em"/> <!-- decrease space between inside text and closing brackets -->
 		</xsl:copy>
@@ -3501,12 +3527,41 @@
 	</xsl:template> -->
 
 	<!-- Decrease height of / and | -->
+	<!-- Decrease space before and after / -->
 	<xsl:template match="mathml:mo[normalize-space(text()) = '/' or normalize-space(text()) = '|']" mode="mathml">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="mathml"/>
-				<xsl:if test="not(@stretchy) and not(preceding-sibling::*[1][local-name() = 'mfrac'] and following-sibling::*[1][local-name() = 'mfrac'])">
-					<xsl:attribute name="stretchy">false</xsl:attribute>
+			<xsl:if test="not(@stretchy) and not(preceding-sibling::*[1][local-name() = 'mfrac'] and following-sibling::*[1][local-name() = 'mfrac'])">
+				<xsl:attribute name="stretchy">false</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="normalize-space(text()) = '/'">
+				<xsl:if test="not(@lspace)">
+					<xsl:attribute name="lspace">0em</xsl:attribute>
+					<xsl:if test="preceding-sibling::*[1][local-name() = 'msub']">
+						<xsl:attribute name="lspace">0.1em</xsl:attribute>
+					</xsl:if>
+				</xsl:if>
+				<xsl:if test="not(@rspace)">
+					<xsl:attribute name="rspace">0em</xsl:attribute>
+					<xsl:if test="following-sibling::*[1][local-name() = 'mfenced']">
+						<xsl:attribute name="rspace">-0.1em</xsl:attribute>
+					</xsl:if>
 				</xsl:if>
+			</xsl:if>
+			<xsl:apply-templates mode="mathml"/>
+		</xsl:copy>
+	</xsl:template>
+	
+	<!-- Increase space before and after multiplication sign -->
+	<xsl:template match="mathml:mo[normalize-space(text()) = '×']" mode="mathml"> <!-- multiplication sign -->
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="mathml"/>
+			<xsl:if test="not(@lspace)">
+				<xsl:attribute name="lspace">0.5em</xsl:attribute>
+			</xsl:if>
+			<xsl:if test="not(@rspace)">
+				<xsl:attribute name="rspace">0.5em</xsl:attribute>
+			</xsl:if>
 			<xsl:apply-templates mode="mathml"/>
 		</xsl:copy>
 	</xsl:template>
@@ -3525,6 +3580,29 @@
 		</xsl:copy>
 	</xsl:template>
 	
+	<!-- decrease space before and after sign 'minus' -->
+	<xsl:template match="mathml:mo[normalize-space(text()) = '−']" mode="mathml"> <!-- minus sign -->
+		<xsl:copy>
+			<xsl:apply-templates select="@*" mode="mathml"/>
+			<xsl:choose>
+				<xsl:when test="not(preceding-sibling::*)"><!-- example: -0.234 -->
+					<xsl:if test="not(@rspace)">
+						<xsl:attribute name="rspace">0em</xsl:attribute>
+					</xsl:if>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:if test="not(@lspace)">
+						<xsl:attribute name="lspace">0.2em</xsl:attribute>
+					</xsl:if>
+					<xsl:if test="not(@rspace)">
+						<xsl:attribute name="rspace">0.2em</xsl:attribute>
+					</xsl:if>
+				</xsl:otherwise>
+			</xsl:choose>
+			<xsl:apply-templates mode="mathml"/>
+		</xsl:copy>
+	</xsl:template>
+	
 	<xsl:template match="mathml:mi[string-length(normalize-space()) &gt; 1]" mode="mathml" priority="2">
 		<xsl:if test="preceding-sibling::* and preceding-sibling::*[1][not(local-name() = 'mfenced' or local-name() = 'mo')]">
 			<mathml:mspace width="0.3em"/>
@@ -3535,6 +3613,10 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template match="mathml:mn/text()" mode="mathml">
+		<xsl:value-of select="translate(., ' ', ' ')"/>
+	</xsl:template>
+
 	<xsl:template name="insertHeaderFooter">
 		<xsl:param name="header-title"/>
 		<xsl:param name="orientation"/>
@@ -4396,7 +4478,7 @@
 		
 		
 		
-		
+
 	</xsl:attribute-set><xsl:attribute-set name="example-style">
 		
 		
@@ -4456,6 +4538,7 @@
 		
 		
 				
+				
 	</xsl:attribute-set><xsl:attribute-set name="table-name-style">
 		<xsl:attribute name="keep-with-next">always</xsl:attribute>
 			
@@ -4479,6 +4562,8 @@
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>			
 		
 		
+	</xsl:attribute-set><xsl:attribute-set name="table-footer-cell-style">
+		
 	</xsl:attribute-set><xsl:attribute-set name="appendix-style">
 		
 		
@@ -4517,6 +4602,7 @@
 		
 			<xsl:attribute name="margin-bottom">12pt</xsl:attribute>
 		
+		
 	</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">
 		
 		
@@ -4554,12 +4640,14 @@
 		
 		
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="termnote-name-style">		
 		
 				
 		
 			<xsl:attribute name="padding-right">1mm</xsl:attribute>
 		
+		
 	</xsl:attribute-set><xsl:attribute-set name="quote-style">		
 		
 		
@@ -4609,6 +4697,7 @@
 		
 		
 		
+
 		
 		
 		
@@ -4678,6 +4767,8 @@
 		<xsl:attribute name="font-family">STIX Two Math</xsl:attribute>
 		
 		
+	</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:apply-templates select="/*/*[local-name()='preface']/*[local-name()='abstract']" mode="contents"/>
 		<xsl:apply-templates select="/*/*[local-name()='preface']/*[local-name()='foreword']" mode="contents"/>
@@ -4731,11 +4822,11 @@
 		<xsl:variable name="table">
 	
 			<xsl:variable name="simple-table">	
-				<xsl:call-template name="getSimpleTable"/>			
+				<xsl:call-template name="getSimpleTable"/>
 			</xsl:variable>
 		
 			<!-- <xsl:if test="$namespace = 'bipm'">
-				<fo:block>&#xA0;</fo:block>				
+				<fo:block>&#xA0;</fo:block>
 			</xsl:if> -->
 			
 			<!-- $namespace = 'iso' or  -->
@@ -4860,6 +4951,8 @@
 						</xsl:if>
 						<attribute name="margin-left">0mm</attribute>
 						<attribute name="margin-right">0mm</attribute>					
+						<!-- <attribute name="keep-together.within-column">1</attribute> --> <!-- integer value  instead 'always'! -->
+					
 					
 				</xsl:variable>
 				
@@ -5006,6 +5099,9 @@
 						<xsl:attribute name="margin-top">0pt</xsl:attribute>
 					</xsl:if>
 				
+				
+				
+				
 				<xsl:choose>
 					<xsl:when test="$continued = 'true'"> 
 						<!-- <xsl:if test="$namespace = 'bsi'"></xsl:if> -->
@@ -5153,6 +5249,7 @@
 		<!-- font-weight="bold" -->
 		<fo:table-header>
 			
+			
 			<xsl:apply-templates/>
 		</fo:table-header>
 	</xsl:template><xsl:template name="table-header-title">
@@ -5313,7 +5410,6 @@
 							
 							
 							
-							
 								<xsl:if test="count(ancestor::bipm:table//*[local-name()='note']) &gt; 1">
 									<fo:block font-weight="bold">
 										<xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language"/>
@@ -5325,6 +5421,7 @@
 								</xsl:if>
 							
 							
+							
 							<!-- except gb  -->
 							
 								<xsl:apply-templates select="../*[local-name()='note']" mode="process"/>
@@ -5419,6 +5516,10 @@
 					 <xsl:attribute name="min-height">5mm</xsl:attribute>
 					 </xsl:if>
 				
+				
+				
+				
+				
 				<!-- <xsl:if test="$namespace = 'bipm'">
 					<xsl:attribute name="height">8mm</xsl:attribute>
 				</xsl:if> -->
@@ -5538,6 +5639,9 @@
 					<xsl:attribute name="display-align">before</xsl:attribute>
 				</xsl:if>
 			
+			
+			
+			
 			<xsl:if test=".//*[local-name() = 'table']">
 				<xsl:attribute name="padding-right">1mm</xsl:attribute>
 			</xsl:if>
@@ -5557,6 +5661,11 @@
 					<xsl:if test="not(.//bipm:image)">
 						<xsl:attribute name="line-stacking-strategy">font-height</xsl:attribute>
 					</xsl:if>
+					<!-- hanging indent for left column -->
+					<xsl:if test="not(preceding-sibling::*[local-name() = 'td'])">
+						<xsl:attribute name="text-indent">-3mm</xsl:attribute>
+						<xsl:attribute name="start-indent">3mm</xsl:attribute>
+					</xsl:if>
 								
 				<xsl:apply-templates/>
 			</fo:block>			
@@ -5788,6 +5897,7 @@
 				<xsl:attribute name="vertical-align">super</xsl:attribute>
 				<xsl:attribute name="font-style">italic</xsl:attribute>
 			
+			
 			<fo:basic-link internal-destination="{@reference}_{ancestor::*[@id][1]/@id}" fox:alt-text="{@reference}"> <!-- @reference   | ancestor::*[local-name()='clause'][1]/@id-->
 				
 				
@@ -6098,6 +6208,7 @@
 		
 		<fo:table-row>
 			
+			
 			<fo:table-cell>
 				
 				<fo:block margin-top="6pt">
@@ -6116,6 +6227,7 @@
 						<xsl:attribute name="margin-top">0pt</xsl:attribute>
 						<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 					
+					
 					<xsl:apply-templates/>
 					<!-- <xsl:if test="$namespace = 'gb'">
 						<xsl:if test="ancestor::*[local-name()='formula']">
@@ -6655,6 +6767,9 @@
 						<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
 						<xsl:attribute name="scaling">uniform</xsl:attribute>
 					</xsl:if>
+					<!-- <xsl:attribute name="fox:alt-text">
+						put AsciiMath/LaTeX math
+					</xsl:attribute> -->
 				
 				
 				<!-- <xsl:copy-of select="."/> -->
@@ -6674,7 +6789,15 @@
 		<xsl:copy>
 			<xsl:apply-templates select="@*|node()" mode="mathml"/>
 		</xsl:copy>
-		<mathml:mspace width="0.5ex"/>
+		<xsl:choose>
+			<!-- if in msub, then don't add space -->
+			<xsl:when test="ancestor::mathml:mrow[parent::mathml:msub and preceding-sibling::*[1][self::mathml:mrow]]"/>
+			<!-- if next char in digit,  don't add space -->
+			<xsl:when test="translate(substring(following-sibling::*[1]/text(),1,1),'0123456789','') = ''"/>
+			<xsl:otherwise>
+				<mathml:mspace width="0.5ex"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template><xsl:template match="mathml:math/*[local-name()='unit']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='prefix']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='dimension']" mode="mathml"/><xsl:template match="mathml:math/*[local-name()='quantity']" mode="mathml"/><xsl:template match="*[local-name()='localityStack']"/><xsl:template match="*[local-name()='link']" name="link">
 		<xsl:variable name="target">
 			<xsl:choose>
@@ -6698,6 +6821,7 @@
 		</xsl:variable>
 		<fo:inline xsl:use-attribute-sets="link-style">
 			
+			
 			<xsl:choose>
 				<xsl:when test="$target_text = ''">
 					<xsl:apply-templates/>
@@ -6856,6 +6980,7 @@
 		</xsl:choose>
 	</xsl:template><xsl:template match="*[local-name() = 'termnote']">
 		<fo:block id="{@id}" xsl:use-attribute-sets="termnote-style">			
+			
 			<fo:inline xsl:use-attribute-sets="termnote-name-style">
 				
 				<xsl:apply-templates select="*[local-name() = 'name']" mode="presentation"/>
@@ -6937,6 +7062,7 @@
 			</xsl:call-template>
 			
 			<fo:block>
+				
 				<xsl:apply-templates/>
 			</fo:block>
 			<xsl:call-template name="fn_display_figure"/>
@@ -7235,6 +7361,7 @@
 		<xsl:if test="normalize-space() != ''">			
 			<fo:block xsl:use-attribute-sets="figure-name-style">
 				
+				
 				<xsl:apply-templates/>
 			</fo:block>
 		</xsl:if>
@@ -7315,6 +7442,7 @@
 	
 		<fo:block-container margin-left="0mm">
 			<xsl:copy-of select="@id"/>
+			
 			<xsl:if test="parent::*[local-name() = 'note']">
 				<xsl:attribute name="margin-left">
 					<xsl:choose>
@@ -7325,7 +7453,9 @@
 				
 			</xsl:if>
 			<fo:block-container margin-left="0mm">
-	
+		
+				
+				
 				<fo:block xsl:use-attribute-sets="sourcecode-style">
 					<xsl:variable name="_font-size">
 						
@@ -7354,10 +7484,14 @@
 						</xsl:choose>
 					</xsl:attribute>
 				</xsl:if>
-					<xsl:apply-templates/>			
-				</fo:block>
+				
+				<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">
@@ -7702,6 +7836,8 @@
 					
 					
 					
+					
+					
 						<xsl:value-of select="$localized.source"/>
 						<xsl:text> </xsl:text>
 					
@@ -7931,6 +8067,7 @@
 				<xsl:attribute name="keep-with-next">always</xsl:attribute>
 			
 			
+			
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template><xsl:template match="*[local-name() = 'definitions']">
@@ -8207,17 +8344,17 @@
 		<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: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:if> -->
 				<xsl:value-of select="$_doc_ident"/>
 			</xsl:when>
 			<xsl:otherwise>
-				<xsl:variable name="type" select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]/@type"/>
+				<!-- <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:if> -->
 				<xsl:value-of select="*[local-name() = 'docidentifier'][not(@type = 'metanorma')]"/>
 			</xsl:otherwise>
 		</xsl:choose>
@@ -8723,4 +8860,14 @@
 				<xsl:value-of select="$align"/>
 			</xsl:when>
 		</xsl:choose>
+	</xsl:template><xsl:template name="setTextAlignment">
+		<xsl:param name="default">left</xsl:param>
+		<xsl:attribute name="text-align">
+			<xsl:choose>
+				<xsl:when test="@align"><xsl:value-of select="@align"/></xsl:when>
+				<xsl:when test="ancestor::*[local-name() = 'td']/@align"><xsl:value-of select="ancestor::*[local-name() = 'td']/@align"/></xsl:when>
+				<xsl:when test="ancestor::*[local-name() = 'th']/@align"><xsl:value-of select="ancestor::*[local-name() = 'th']/@align"/></xsl:when>
+				<xsl:otherwise><xsl:value-of select="$default"/></xsl:otherwise>
+			</xsl:choose>
+		</xsl:attribute>
 	</xsl:template></xsl:stylesheet>