metanorma-bipm 2.1.9 → 2.1.11

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

@@ -1193,10 +1193,10 @@
 
 							</fo:block>
 
-							<xsl:variable name="part_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:part)"/>
-							<xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part']">
+							<!-- <xsl:variable name="part_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:part)"/> -->
+							<xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part-with-numbering']">
 								<fo:block role="H2">
-									<xsl:if test="$part_num != ''">
+									<!-- <xsl:if test="$part_num != ''">
 										<xsl:call-template name="getLocalizedString">
 											<xsl:with-param name="key">Part.sg</xsl:with-param>
 											<xsl:with-param name="lang" select="$curr_lang"/>
@@ -1204,18 +1204,18 @@
 										<xsl:text> </xsl:text>
 										<xsl:value-of select="$part_num"/>
 									</xsl:if>
-									<xsl:text>: </xsl:text>
-									<xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part']" mode="title"/>
+									<xsl:text>: </xsl:text> -->
+									<xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part-with-numbering']" mode="title"/>
 								</fo:block>
 							</xsl:if>
-							<xsl:variable name="subpart_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:subpart)"/>
-							<xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart']">
+							<!-- <xsl:variable name="subpart_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:subpart)"/> -->
+							<xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart-with-numbering']">
 								<fo:block role="H3">
-									<xsl:if test="$subpart_num != ''">
+									<!-- <xsl:if test="$subpart_num != ''">
 										<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-subpart[@lang=$curr_lang]),'#',$subpart_num)"/>
 									</xsl:if>
-									<xsl:text>: </xsl:text>
-									<xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart']" mode="title"/>
+									<xsl:text>: </xsl:text> -->
+									<xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart-with-numbering']" mode="title"/>
 								</fo:block>
 							</xsl:if>
 
@@ -2927,16 +2927,18 @@
 	<xsl:template match="bipm:note[not(ancestor::bipm:preface)]/bipm:name" priority="2">
 		<xsl:choose>
 			<xsl:when test="not(../preceding-sibling::bipm:note) and not((../following-sibling::bipm:note))">
-				<xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
+				<!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
 				<xsl:choose>
 					<xsl:when test="$curr_lang = 'fr'">
 						<xsl:choose>
-							<xsl:when test="ancestor::bipm:li">Remarque : </xsl:when>
-							<xsl:otherwise>Note : </xsl:otherwise>
+							<xsl:when test="ancestor::bipm:li">Remarque&#xa0;: </xsl:when>
+							<xsl:otherwise>Note&#xa0;: </xsl:otherwise>
 						</xsl:choose>
 					</xsl:when>
 					<xsl:otherwise>Note: </xsl:otherwise>
-				</xsl:choose>
+				</xsl:choose> -->
+				<xsl:apply-templates/>
+				<xsl:text> </xsl:text>
 			</xsl:when>
 			<xsl:when test="ancestor::bipm:table and count(ancestor::bipm:table//bipm:note) &gt; 0">
 				<xsl:variable name="table_id" select="ancestor::bipm:table/@id"/>
@@ -2968,6 +2970,10 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'name']/text()" priority="2">
+		<xsl:value-of select="."/>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'sup_fn']">
 		<fo:inline font-size="65%" keep-with-previous.within-line="always" vertical-align="super">
 			<xsl:apply-templates/>
@@ -4330,8 +4336,8 @@
 			<xsl:attribute name="font-weight">bold</xsl:attribute>
 			<xsl:attribute name="text-align">left</xsl:attribute>
 			<xsl:attribute name="margin-top">24pt</xsl:attribute>
-			<xsl:attribute name="margin-left">25mm</xsl:attribute>
-			<xsl:attribute name="text-indent">-25mm</xsl:attribute>
+			<!-- <xsl:attribute name="margin-left">25mm</xsl:attribute>
+			<xsl:attribute name="text-indent">-25mm</xsl:attribute> -->
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 
 	</xsl:attribute-set> <!-- table-name-style -->
@@ -5605,25 +5611,38 @@
 		<xsl:param name="continued"/>
 		<xsl:if test="normalize-space() != ''">
 
-					<fo:block xsl:use-attribute-sets="table-name-style">
-
-							<xsl:if test="not(*[local-name()='tab'])"> <!-- table without number -->
-								<xsl:attribute name="margin-top">0pt</xsl:attribute>
-							</xsl:if>
-							<xsl:if test="not(../preceding-sibling::*) and ancestor::node()[@orientation]">
-								<xsl:attribute name="margin-top">0pt</xsl:attribute>
-							</xsl:if>
+					<fo:list-block xsl:use-attribute-sets="table-name-style">
 
-						<xsl:choose>
-							<xsl:when test="$continued = 'true'">
+						<xsl:if test="not(*[local-name()='tab'])"> <!-- table without number -->
+							<xsl:attribute name="margin-top">0pt</xsl:attribute>
+						</xsl:if>
+						<xsl:if test="not(../preceding-sibling::*) and ancestor::node()[@orientation]">
+							<xsl:attribute name="margin-top">0pt</xsl:attribute>
+						</xsl:if>
 
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:apply-templates/>
-							</xsl:otherwise>
-						</xsl:choose>
+						<xsl:attribute name="provisional-distance-between-starts">25mm</xsl:attribute>
 
-					</fo:block>
+						<fo:list-item>
+							<fo:list-item-label end-indent="label-end()">
+								<fo:block>
+									<xsl:apply-templates select="./*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
+								</fo:block>
+							</fo:list-item-label>
+							<fo:list-item-body start-indent="body-start()">
+								<fo:block>
+									<xsl:choose>
+										<xsl:when test="./*[local-name() = 'tab']">
+											<xsl:apply-templates select="./*[local-name() = 'tab'][1]/following-sibling::node()"/>
+										</xsl:when>
+										<xsl:otherwise>
+											<xsl:apply-templates/>
+										</xsl:otherwise>
+									</xsl:choose>
+								</fo:block>
+							</fo:list-item-body>
+						</fo:list-item>
+					</fo:list-block>
+					<!-- bipm -->
 
 		</xsl:if>
 	</xsl:template> <!-- table/name -->
@@ -7323,8 +7342,17 @@
 		</fo:inline>
 	</xsl:template> <!-- tt -->
 
+	<xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
 	<xsl:template match="*[local-name()='tt']/text()" priority="2">
-		<xsl:call-template name="add_spaces_to_sourcecode"/>
+		<xsl:choose>
+			<xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
+				 <!-- url -->
+				<xsl:call-template name="add-zero-spaces-link-java"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:call-template name="add_spaces_to_sourcecode"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template match="*[local-name()='underline']">
@@ -7680,8 +7708,11 @@
 
 	<xsl:template name="add-zero-spaces-link-java">
 		<xsl:param name="text" select="."/>
+
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$1')"/> <!-- http://. https:// or www. -->
+		<xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
 		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space  -->
-		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |,)','$1​')"/>
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/)','$1​')"/>
 	</xsl:template>
 
 	<!-- add zero space after dash character (for table's entries) -->
@@ -8714,11 +8745,12 @@
 				</xsl:when>
 				<xsl:otherwise>
 
-						<xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
+						<!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
 						<xsl:choose>
-							<xsl:when test="$curr_lang = 'fr'"><xsl:text> : </xsl:text></xsl:when>
+							<xsl:when test="$curr_lang = 'fr'"><xsl:text>&#xa0;: </xsl:text></xsl:when>
 							<xsl:otherwise><xsl:text>: </xsl:text></xsl:otherwise>
-						</xsl:choose>
+						</xsl:choose> -->
+						<xsl:text> </xsl:text>
 
 				</xsl:otherwise>
 			</xsl:choose>
@@ -8738,11 +8770,12 @@
 				</xsl:when>
 				<xsl:otherwise>
 
-						<xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
+						<!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
 						<xsl:choose>
-							<xsl:when test="$curr_lang = 'fr'"><xsl:text> : </xsl:text></xsl:when>
+							<xsl:when test="$curr_lang = 'fr'"><xsl:text>&#xa0;: </xsl:text></xsl:when>
 							<xsl:otherwise><xsl:text>: </xsl:text></xsl:otherwise>
-						</xsl:choose>
+						</xsl:choose> -->
+						<xsl:text> </xsl:text>
 
 				</xsl:otherwise>
 			</xsl:choose>
@@ -10707,7 +10740,7 @@
 	<!-- ====== -->
 	<!-- eref -->
 	<!-- ====== -->
-	<xsl:template match="*[local-name() = 'eref']">
+	<xsl:template match="*[local-name() = 'eref']" name="eref">
 		<xsl:variable name="current_bibitemid" select="@bibitemid"/>
 		<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
 		<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
@@ -12181,7 +12214,7 @@
 
 	<xsl:variable name="element_name_keep-together_within-line">keep-together_within-line</xsl:variable>
 
-	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'])]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
+	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or      ancestor::*[local-name() = 'link'][not(contains(.,' '))] or      ancestor::*[local-name() = 'sourcecode'] or      ancestor::*[local-name() = 'math'] or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
 
 		<!-- enclose standard's number into tag 'keep-together_within-line' -->
 		<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>

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

@@ -1193,10 +1193,10 @@
 
 							</fo:block>
 
-							<xsl:variable name="part_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:part)"/>
-							<xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part']">
+							<!-- <xsl:variable name="part_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:part)"/> -->
+							<xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part-with-numbering']">
 								<fo:block role="H2">
-									<xsl:if test="$part_num != ''">
+									<!-- <xsl:if test="$part_num != ''">
 										<xsl:call-template name="getLocalizedString">
 											<xsl:with-param name="key">Part.sg</xsl:with-param>
 											<xsl:with-param name="lang" select="$curr_lang"/>
@@ -1204,18 +1204,18 @@
 										<xsl:text> </xsl:text>
 										<xsl:value-of select="$part_num"/>
 									</xsl:if>
-									<xsl:text>: </xsl:text>
-									<xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part']" mode="title"/>
+									<xsl:text>: </xsl:text> -->
+									<xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'part-with-numbering']" mode="title"/>
 								</fo:block>
 							</xsl:if>
-							<xsl:variable name="subpart_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:subpart)"/>
-							<xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart']">
+							<!-- <xsl:variable name="subpart_num" select="normalize-space(/bipm:bipm-standard/bipm:bibdata/bipm:ext/bipm:structuredidentifier/bipm:subpart)"/> -->
+							<xsl:if test="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart-with-numbering']">
 								<fo:block role="H3">
-									<xsl:if test="$subpart_num != ''">
+									<!-- <xsl:if test="$subpart_num != ''">
 										<xsl:value-of select="java:replaceAll(java:java.lang.String.new($titles/title-subpart[@lang=$curr_lang]),'#',$subpart_num)"/>
 									</xsl:if>
-									<xsl:text>: </xsl:text>
-									<xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart']" mode="title"/>
+									<xsl:text>: </xsl:text> -->
+									<xsl:apply-templates select="/bipm:bipm-standard/bipm:bibdata/bipm:title[@language = $curr_lang and @type = 'subpart-with-numbering']" mode="title"/>
 								</fo:block>
 							</xsl:if>
 
@@ -2927,16 +2927,18 @@
 	<xsl:template match="bipm:note[not(ancestor::bipm:preface)]/bipm:name" priority="2">
 		<xsl:choose>
 			<xsl:when test="not(../preceding-sibling::bipm:note) and not((../following-sibling::bipm:note))">
-				<xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
+				<!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
 				<xsl:choose>
 					<xsl:when test="$curr_lang = 'fr'">
 						<xsl:choose>
-							<xsl:when test="ancestor::bipm:li">Remarque : </xsl:when>
-							<xsl:otherwise>Note : </xsl:otherwise>
+							<xsl:when test="ancestor::bipm:li">Remarque&#xa0;: </xsl:when>
+							<xsl:otherwise>Note&#xa0;: </xsl:otherwise>
 						</xsl:choose>
 					</xsl:when>
 					<xsl:otherwise>Note: </xsl:otherwise>
-				</xsl:choose>
+				</xsl:choose> -->
+				<xsl:apply-templates/>
+				<xsl:text> </xsl:text>
 			</xsl:when>
 			<xsl:when test="ancestor::bipm:table and count(ancestor::bipm:table//bipm:note) &gt; 0">
 				<xsl:variable name="table_id" select="ancestor::bipm:table/@id"/>
@@ -2968,6 +2970,10 @@
 		</xsl:choose>
 	</xsl:template>
 
+	<xsl:template match="*[local-name() = 'name']/text()" priority="2">
+		<xsl:value-of select="."/>
+	</xsl:template>
+
 	<xsl:template match="*[local-name() = 'sup_fn']">
 		<fo:inline font-size="65%" keep-with-previous.within-line="always" vertical-align="super">
 			<xsl:apply-templates/>
@@ -4330,8 +4336,8 @@
 			<xsl:attribute name="font-weight">bold</xsl:attribute>
 			<xsl:attribute name="text-align">left</xsl:attribute>
 			<xsl:attribute name="margin-top">24pt</xsl:attribute>
-			<xsl:attribute name="margin-left">25mm</xsl:attribute>
-			<xsl:attribute name="text-indent">-25mm</xsl:attribute>
+			<!-- <xsl:attribute name="margin-left">25mm</xsl:attribute>
+			<xsl:attribute name="text-indent">-25mm</xsl:attribute> -->
 			<xsl:attribute name="margin-bottom">6pt</xsl:attribute>
 
 	</xsl:attribute-set> <!-- table-name-style -->
@@ -5605,25 +5611,38 @@
 		<xsl:param name="continued"/>
 		<xsl:if test="normalize-space() != ''">
 
-					<fo:block xsl:use-attribute-sets="table-name-style">
-
-							<xsl:if test="not(*[local-name()='tab'])"> <!-- table without number -->
-								<xsl:attribute name="margin-top">0pt</xsl:attribute>
-							</xsl:if>
-							<xsl:if test="not(../preceding-sibling::*) and ancestor::node()[@orientation]">
-								<xsl:attribute name="margin-top">0pt</xsl:attribute>
-							</xsl:if>
+					<fo:list-block xsl:use-attribute-sets="table-name-style">
 
-						<xsl:choose>
-							<xsl:when test="$continued = 'true'">
+						<xsl:if test="not(*[local-name()='tab'])"> <!-- table without number -->
+							<xsl:attribute name="margin-top">0pt</xsl:attribute>
+						</xsl:if>
+						<xsl:if test="not(../preceding-sibling::*) and ancestor::node()[@orientation]">
+							<xsl:attribute name="margin-top">0pt</xsl:attribute>
+						</xsl:if>
 
-							</xsl:when>
-							<xsl:otherwise>
-								<xsl:apply-templates/>
-							</xsl:otherwise>
-						</xsl:choose>
+						<xsl:attribute name="provisional-distance-between-starts">25mm</xsl:attribute>
 
-					</fo:block>
+						<fo:list-item>
+							<fo:list-item-label end-indent="label-end()">
+								<fo:block>
+									<xsl:apply-templates select="./*[local-name() = 'tab'][1]/preceding-sibling::node()"/>
+								</fo:block>
+							</fo:list-item-label>
+							<fo:list-item-body start-indent="body-start()">
+								<fo:block>
+									<xsl:choose>
+										<xsl:when test="./*[local-name() = 'tab']">
+											<xsl:apply-templates select="./*[local-name() = 'tab'][1]/following-sibling::node()"/>
+										</xsl:when>
+										<xsl:otherwise>
+											<xsl:apply-templates/>
+										</xsl:otherwise>
+									</xsl:choose>
+								</fo:block>
+							</fo:list-item-body>
+						</fo:list-item>
+					</fo:list-block>
+					<!-- bipm -->
 
 		</xsl:if>
 	</xsl:template> <!-- table/name -->
@@ -7323,8 +7342,17 @@
 		</fo:inline>
 	</xsl:template> <!-- tt -->
 
+	<xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
 	<xsl:template match="*[local-name()='tt']/text()" priority="2">
-		<xsl:call-template name="add_spaces_to_sourcecode"/>
+		<xsl:choose>
+			<xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
+				 <!-- url -->
+				<xsl:call-template name="add-zero-spaces-link-java"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:call-template name="add_spaces_to_sourcecode"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template match="*[local-name()='underline']">
@@ -7680,8 +7708,11 @@
 
 	<xsl:template name="add-zero-spaces-link-java">
 		<xsl:param name="text" select="."/>
+
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$1')"/> <!-- http://. https:// or www. -->
+		<xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
 		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space  -->
-		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |,)','$1​')"/>
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/)','$1​')"/>
 	</xsl:template>
 
 	<!-- add zero space after dash character (for table's entries) -->
@@ -8714,11 +8745,12 @@
 				</xsl:when>
 				<xsl:otherwise>
 
-						<xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
+						<!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
 						<xsl:choose>
-							<xsl:when test="$curr_lang = 'fr'"><xsl:text> : </xsl:text></xsl:when>
+							<xsl:when test="$curr_lang = 'fr'"><xsl:text>&#xa0;: </xsl:text></xsl:when>
 							<xsl:otherwise><xsl:text>: </xsl:text></xsl:otherwise>
-						</xsl:choose>
+						</xsl:choose> -->
+						<xsl:text> </xsl:text>
 
 				</xsl:otherwise>
 			</xsl:choose>
@@ -8738,11 +8770,12 @@
 				</xsl:when>
 				<xsl:otherwise>
 
-						<xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
+						<!-- <xsl:variable name="curr_lang" select="ancestor::bipm:bipm-standard/bipm:bibdata/bipm:language[@current = 'true']"/>
 						<xsl:choose>
-							<xsl:when test="$curr_lang = 'fr'"><xsl:text> : </xsl:text></xsl:when>
+							<xsl:when test="$curr_lang = 'fr'"><xsl:text>&#xa0;: </xsl:text></xsl:when>
 							<xsl:otherwise><xsl:text>: </xsl:text></xsl:otherwise>
-						</xsl:choose>
+						</xsl:choose> -->
+						<xsl:text> </xsl:text>
 
 				</xsl:otherwise>
 			</xsl:choose>
@@ -10707,7 +10740,7 @@
 	<!-- ====== -->
 	<!-- eref -->
 	<!-- ====== -->
-	<xsl:template match="*[local-name() = 'eref']">
+	<xsl:template match="*[local-name() = 'eref']" name="eref">
 		<xsl:variable name="current_bibitemid" select="@bibitemid"/>
 		<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
 		<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
@@ -12181,7 +12214,7 @@
 
 	<xsl:variable name="element_name_keep-together_within-line">keep-together_within-line</xsl:variable>
 
-	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'])]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
+	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or      ancestor::*[local-name() = 'link'][not(contains(.,' '))] or      ancestor::*[local-name() = 'sourcecode'] or      ancestor::*[local-name() = 'math'] or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
 
 		<!-- enclose standard's number into tag 'keep-together_within-line' -->
 		<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>

data/lib/isodoc/bipm/html/htmlstyle.css

@@ -372,7 +372,7 @@ div.figure {
     font-weight: 700;
     font-size: 1em;
     text-align: center; }
-  div.figure > img {
+  div.figure > img, div.figure > svg {
     margin-left: auto;
     margin-right: auto;
     display: block;

data/lib/isodoc/bipm/i18n-en.yaml

@@ -19,3 +19,7 @@ norm_with_refs_pref:
 all_rights_reserved: All rights reserved
 table_of_contents: Contents
 source: Adapted from
+note: "Note:"
+prefacenote: "NOTE:"
+listnote: "Note:"
+termnote: "Note % to entry"

data/lib/isodoc/bipm/i18n-fr.yaml

@@ -3,7 +3,7 @@ appendix: Appendice
 iso_annex: Annexe
 see: voir
 see_also: voir aussi
-clause: chapître
+clause: chapitre
 subclause: section
 clause_jcgm: Article
 subclause_jcgm: Article
@@ -42,3 +42,7 @@ norm_with_refs_pref:
 all_rights_reserved: Tous droits réservés
 table_of_contents: Table des matières
 source: Adapté de
+note: "Note:"
+prefacenote: "NOTE:"
+listnote: "Remarque:"
+termnote: "Note % à l’article:"

data/lib/isodoc/bipm/jcgm.standard.xsl

@@ -5242,8 +5242,17 @@
 		</fo:inline>
 	</xsl:template> <!-- tt -->
 
+	<xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
 	<xsl:template match="*[local-name()='tt']/text()" priority="2">
-		<xsl:call-template name="add_spaces_to_sourcecode"/>
+		<xsl:choose>
+			<xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
+				 <!-- url -->
+				<xsl:call-template name="add-zero-spaces-link-java"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<xsl:call-template name="add_spaces_to_sourcecode"/>
+			</xsl:otherwise>
+		</xsl:choose>
 	</xsl:template>
 
 	<xsl:template match="*[local-name()='underline']">
@@ -5599,8 +5608,11 @@
 
 	<xsl:template name="add-zero-spaces-link-java">
 		<xsl:param name="text" select="."/>
+
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$1')"/> <!-- http://. https:// or www. -->
+		<xsl:variable name="url_continue" select="java:replaceAll(java:java.lang.String.new($text), $regex_url_start, '$2')"/>
 		<!-- add zero-width space (#x200B) after characters: dash, dot, colon, equal, underscore, em dash, thin space  -->
-		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($text),'(-|\.|:|=|_|—| |,)','$1​')"/>
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/)','$1​')"/>
 	</xsl:template>
 
 	<!-- add zero space after dash character (for table's entries) -->
@@ -8574,7 +8586,7 @@
 	<!-- ====== -->
 	<!-- eref -->
 	<!-- ====== -->
-	<xsl:template match="*[local-name() = 'eref']">
+	<xsl:template match="*[local-name() = 'eref']" name="eref">
 		<xsl:variable name="current_bibitemid" select="@bibitemid"/>
 		<!-- <xsl:variable name="external-destination" select="normalize-space(key('bibitems', $current_bibitemid)/*[local-name() = 'uri'][@type = 'citation'])"/> -->
 		<xsl:variable name="external-destination" select="normalize-space($bibitems/*[local-name() ='bibitem'][@id = $current_bibitemid]/*[local-name() = 'uri'][@type = 'citation'])"/>
@@ -10035,7 +10047,7 @@
 
 	<xsl:variable name="element_name_keep-together_within-line">keep-together_within-line</xsl:variable>
 
-	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or ancestor::*[local-name() = 'sourcecode'] or ancestor::*[local-name() = 'math'])]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
+	<xsl:template match="text()[not(ancestor::*[local-name() = 'bibdata'] or      ancestor::*[local-name() = 'link'][not(contains(.,' '))] or      ancestor::*[local-name() = 'sourcecode'] or      ancestor::*[local-name() = 'math'] or     starts-with(., 'http://') or starts-with(., 'https://') or starts-with(., 'www.') )]" name="keep_together_standard_number" mode="update_xml_enclose_keep-together_within-line">
 
 		<!-- enclose standard's number into tag 'keep-together_within-line' -->
 		<xsl:variable name="regex_standard_reference">([A-Z]{2,}(/[A-Z]{2,})* \d+(-\d+)*(:\d{4})?)</xsl:variable>

data/lib/isodoc/bipm/presentation_xml_convert.rb

@@ -104,6 +104,7 @@ module IsoDoc
       def bibdata_i18n(bibdata)
         super
         bibdata_dates(bibdata)
+        bibdata_titles(bibdata)
       end
 
       def bibdata_dates(bibdata)
@@ -116,6 +117,20 @@ module IsoDoc
         pubdate.next.children = meta.monthyr(pubdate.text)
       end
 
+      def bibdata_titles(bibdata)
+        return unless app = bibdata.at(ns("//bibdata/ext/"\
+                                          "structuredidentifier/part"))
+
+        bibdata.xpath(ns("//bibdata/title[@type = 'part']")).each do |t|
+          t.previous = t.dup
+          t["type"] = "part-with-numbering"
+          part = t["language"] == "en" ? "Part" : "Partie"
+          # not looking up in YAML
+          t.children = l10n("#{part} #{app.text}: #{t.children.to_xml}",
+                            t["language"])
+        end
+      end
+
       def eref(docxml)
         super
         jcgm_eref(docxml, "//eref")
@@ -148,13 +163,13 @@ module IsoDoc
       def extract_brackets(node)
         start = node.at("./text()[1]")
         finish = node.at("./text()[last()]")
-        if /^\[/.match?(start.text) && /\]$/.match?(finish.text)
-          start.replace(start.text[1..-1])
-          node.previous = "["
-          finish = node.at("./text()[last()]")
-          finish.replace(finish.text[0..-2])
-          node.next = "]"
-        end
+        (/^\[/.match?(start.text) && /\]$/.match?(finish.text)) or return
+
+        start.replace(start.text[1..-1])
+        node.previous = "["
+        finish = node.at("./text()[last()]")
+        finish.replace(finish.text[0..-2])
+        node.next = "]"
       end
 
       def quotedtitles(docxml)
@@ -164,6 +179,29 @@ module IsoDoc
         end
       end
 
+      # notes and remarques (list notes) are not numbered
+      def note1(elem)
+        return if elem.parent.name == "bibitem" || elem["notag"] == "true"
+
+        # n = @xrefs.get[elem["id"]]
+        lbl = l10n(note_label(elem))
+        # (n.nil? || n[:label].nil? || n[:label].empty?) or
+        #  lbl = l10n("#{lbl} #{n[:label]}")
+        prefix_name(elem, "", lbl, "name")
+      end
+
+      def note_label(elem)
+        if elem.ancestors("preface").empty?
+          if elem.ancestors("ul, ol, dl").empty?
+            @i18n.note
+          else
+            @i18n.listnote
+          end
+        else
+          @i18n.prefacenote
+        end
+      end
+
       def termsource1(elem)
         while elem&.next_element&.name == "termsource"
           elem << "; #{elem.next_element.remove.children.to_xml}"

data/lib/metanorma/bipm/basicdoc.rng

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <include href="biblio.rng">
-    <start>
-      <ref name="document"/>
-    </start>
-  </include>
   <define name="document">
     <element name="document">
       <optional>
@@ -1125,26 +1120,4 @@
       </zeroOrMore>
     </element>
   </define>
-  <define name="ext">
-    <element name="ext">
-      <ref name="BibDataExtensionType"/>
-    </element>
-  </define>
-  <define name="BibDataExtensionType">
-    <ref name="doctype"/>
-  </define>
-  <define name="doctype">
-    <element name="doctype">
-      <ref name="DocumentType"/>
-    </element>
-  </define>
-  <define name="DocumentType">
-    <value>document</value>
-  </define>
-  <define name="BibData">
-    <ref name="BibliographicItem"/>
-    <optional>
-      <ref name="ext"/>
-    </optional>
-  </define>
 </grammar>