metanorma-iso 2.4.7 → 2.5.0

data/lib/isodoc/iso/iso.amendment.xsl

@@ -719,10 +719,20 @@
 															<fo:block> </fo:block>
 														</fo:table-cell>
 														<fo:table-cell>
-															<fo:block>Voting begins on:</fo:block>
+															<fo:block>
+																<!-- Voting begins on: -->
+																<xsl:call-template name="getLocalizedString">
+																	<xsl:with-param name="key">voting_begins_on</xsl:with-param>
+																</xsl:call-template><xsl:text>:</xsl:text>
+															</fo:block>
 														</fo:table-cell>
 														<fo:table-cell>
-															<fo:block>Voting terminates on:</fo:block>
+															<fo:block>
+																<!-- Voting terminates on: -->
+																<xsl:call-template name="getLocalizedString">
+																	<xsl:with-param name="key">voting_terminates_on</xsl:with-param>
+																</xsl:call-template><xsl:text>:</xsl:text>
+															</fo:block>
 														</fo:table-cell>
 													</fo:table-row>
 													<fo:table-row>
@@ -955,7 +965,12 @@
 																		<fo:block margin="2mm" role="SKIP">
 																				<fo:block margin-bottom="8pt"><xsl:copy-of select="$editorialgroup"/></fo:block>
 																				<fo:block margin-bottom="6pt"><xsl:copy-of select="$secretariat"/></fo:block>
-																				<fo:block margin-bottom="6pt">Voting begins on:<xsl:value-of select="$linebreak"/>
+																				<fo:block margin-bottom="6pt">
+																					<!-- Voting begins on: -->
+																					<xsl:call-template name="getLocalizedString">
+																						<xsl:with-param name="key">voting_begins_on</xsl:with-param>
+																					</xsl:call-template><xsl:text>:</xsl:text>
+																					<xsl:value-of select="$linebreak"/>
 																					<fo:inline font-weight="bold">
 																						<xsl:choose>
 																							<xsl:when test="/iso:iso-standard/iso:bibdata/iso:date[@type = 'vote-started']/iso:on">
@@ -965,7 +980,12 @@
 																						</xsl:choose>
 																					</fo:inline>
 																				</fo:block>
-																				<fo:block>Voting terminates on:<xsl:value-of select="$linebreak"/>
+																				<fo:block>
+																					<!-- Voting terminates on: -->
+																					<xsl:call-template name="getLocalizedString">
+																						<xsl:with-param name="key">voting_terminates_on</xsl:with-param>
+																					</xsl:call-template><xsl:text>:</xsl:text>
+																					<xsl:value-of select="$linebreak"/>
 																					<fo:inline font-weight="bold">
 																						<xsl:choose>
 																							<xsl:when test="/iso:iso-standard/iso:bibdata/iso:date[@type = 'vote-ended']/iso:on">
@@ -1333,38 +1353,35 @@
 						<xsl:call-template name="insertHeaderFooter"/>
 						<fo:flow flow-name="xsl-region-body">
 
-							<fo:block-container>
-								<!-- Information and documentation — Codes for transcription systems -->
-								<!-- <fo:block font-size="16pt" font-weight="bold" margin-bottom="18pt">
-									<xsl:value-of select="$title-en"/>
-								</fo:block>
-								 -->
+							<!-- Information and documentation — Codes for transcription systems -->
+							<!-- <fo:block-container>
+								
 								<fo:block font-size="18pt" font-weight="bold" margin-top="40pt" margin-bottom="20pt" line-height="1.1" role="H1">
-
+								
 									<fo:block role="SKIP">
-
+									
 										<xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-intro']"/>
-
+										
 										<xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-main']"/>
-
+										
 										<xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-part']">
 											<xsl:with-param name="isMainLang">true</xsl:with-param>
 											<xsl:with-param name="isMainBody">true</xsl:with-param>
 										</xsl:apply-templates>
-
+										
 									</fo:block>
 									<fo:block role="SKIP">
 										<xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-part']/node()"/>
 									</fo:block>
-
+									
 									<xsl:apply-templates select="/iso:iso-standard/iso:bibdata/iso:title[@language = $lang and @type = 'title-amd']">
 										<xsl:with-param name="isMainLang">true</xsl:with-param>
 										<xsl:with-param name="isMainBody">true</xsl:with-param>
 									</xsl:apply-templates>
-
+									
 								</fo:block>
-
-							</fo:block-container>
+							
+							</fo:block-container> -->
 							<!-- Clause(s) -->
 							<fo:block>
 
@@ -1446,8 +1463,8 @@
 										<xsl:if test="/iso:iso-standard/iso:bibdata/iso:keyword">
 											<fo:block font-size="9pt" margin-bottom="6pt">
 												<xsl:variable name="title-descriptors">
-													<xsl:call-template name="getTitle">
-														<xsl:with-param name="name" select="'title-descriptors'"/>
+													<xsl:call-template name="getLocalizedString">
+														<xsl:with-param name="key">Descriptor.pl</xsl:with-param>
 													</xsl:call-template>
 												</xsl:variable>
 												<fo:inline font-weight="bold"><xsl:value-of select="$title-descriptors"/>: </fo:inline>
@@ -1737,6 +1754,31 @@
 		</xsl:if>
 	</xsl:template>
 
+	<xsl:template match="iso:sections/iso:p[@class = 'zzSTDTitle1']" priority="4">
+		<fo:block font-size="18pt" font-weight="bold" margin-top="40pt" margin-bottom="20pt" line-height="1.1" role="H1">
+			<xsl:if test="following-sibling::*[1][self::iso:p][starts-with(@class, 'zzSTDTitle')]">
+				<xsl:attribute name="margin-bottom">0pt</xsl:attribute>
+			</xsl:if>
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
+	<xsl:template match="iso:sections/iso:p[@class = 'zzSTDTitle1']/iso:span[@class = 'nonboldtitle']" priority="3">
+		<!-- Example: <span class="nonboldtitle">Part 1:</span> -->
+		<fo:block font-weight="normal" margin-top="12pt" line-height="1.1" role="SKIP">
+			<xsl:apply-templates/>
+		</fo:block>
+	</xsl:template>
+
+	<xsl:template match="iso:sections/iso:p[@class = 'zzSTDTitle2']" priority="4">
+		<!-- Example: <p class="zzSTDTitle2" displayorder="3">AMENDMENT 1: Mass fraction of extraneous matter, milled rice (nonglutinous), sample dividers and recommendations relating to storage and transport conditions</p> -->
+		<xsl:if test="$doctype = 'amendment'">
+			<fo:block font-size="18pt" margin-top="12pt" margin-bottom="20pt" margin-right="0mm" font-weight="normal" line-height="1.1" role="H1">
+				<xsl:apply-templates/>
+			</fo:block>
+		</xsl:if>
+	</xsl:template>
+
 	<!-- ==================== -->
 	<!-- END display titles   -->
 	<!-- ==================== -->
@@ -2047,10 +2089,17 @@
 			<xsl:if test="ancestor::*[local-name() = 'li' or local-name() = 'td' or local-name() = 'th' or local-name() = 'dd']">
 				<xsl:attribute name="role">SKIP</xsl:attribute>
 			</xsl:if>
-			<xsl:apply-templates>
+			<!-- <xsl:apply-templates>
+				<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
+			</xsl:apply-templates> -->
+			<!-- <xsl:apply-templates select="node()[not(self::iso:note[not(following-sibling::*) or count(following-sibling::*) = count(../iso:note) - 1])]"> -->
+			<xsl:apply-templates select="node()[not(self::iso:note)]"> <!-- note renders below paragraph for correct PDF tags order (see https://github.com/metanorma/metanorma-iso/issues/1003) -->
 				<xsl:with-param name="split_keep-within-line" select="$split_keep-within-line"/>
 			</xsl:apply-templates>
 		</xsl:element>
+
+		<xsl:apply-templates select="iso:note"/> <!-- [not(following-sibling::*) or count(following-sibling::*) = count(../iso:note) - 1] -->
+
 		<xsl:if test="$element-name = 'fo:inline' and not($inline = 'true') and not(local-name(..) = 'admonition')">
 			<fo:block margin-bottom="12pt" role="SKIP">
 				 <xsl:if test="ancestor::iso:annex or following-sibling::iso:table">
@@ -2444,19 +2493,32 @@
 	<xsl:variable name="titles_">
 
 		<!-- These titles of Table of contents renders different than determined in localized-strings -->
-		<title-toc lang="en">
-
-		</title-toc>
-		<title-toc lang="fr">
+		<!-- <title-toc lang="en">
+			<xsl:if test="$namespace = 'csd' or $namespace = 'ieee' or $namespace = 'iho' or $namespace = 'mpfd' or $namespace = 'ogc' or $namespace = 'unece-rec'">
+				<xsl:text>Contents</xsl:text>
+			</xsl:if>
+			<xsl:if test="$namespace = 'csa' or $namespace = 'm3d' or $namespace = 'nist-sp' or $namespace = 'ogc-white-paper'">
+				<xsl:text>Table of Contents</xsl:text>
+			</xsl:if>
+			<xsl:if test="$namespace = 'gb'">
+				<xsl:text>Table of contents</xsl:text>
+			</xsl:if>
+		</title-toc> -->
+		<title-toc lang="en">Table of contents</title-toc>
+		<!-- <title-toc lang="fr">
 			<xsl:text>Sommaire</xsl:text>
-		</title-toc>
-		<title-toc lang="zh">
-
+		</title-toc> -->
+		<!-- <title-toc lang="zh">
+			<xsl:choose>
+				<xsl:when test="$namespace = 'gb'">
+					<xsl:text>目次</xsl:text>
+				</xsl:when>
+				<xsl:otherwise>
 					<xsl:text>Contents</xsl:text>
-
-		</title-toc>
-
-		<title-descriptors lang="en">Descriptors</title-descriptors>
+				</xsl:otherwise>
+			</xsl:choose>
+		</title-toc> -->
+		<title-toc lang="zh">目次</title-toc>
 
 		<title-part lang="en">
 
@@ -2478,20 +2540,6 @@
 		<title-subpart lang="en">Sub-part #</title-subpart>
 		<title-subpart lang="fr">Partie de sub #</title-subpart>
 
-		<title-list-tables lang="en">List of Tables</title-list-tables>
-
-		<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-summary lang="en">Summary</title-summary>
-
-		<title-continued lang="ru">(продолжение)</title-continued>
-		<title-continued lang="en">(continued)</title-continued>
-		<title-continued lang="fr">(continué)</title-continued>
-
 	</xsl:variable>
 	<xsl:variable name="titles" select="xalan:nodeset($titles_)"/>
 
@@ -2499,8 +2547,8 @@
 		<xsl:variable name="toc_table_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='table']/*[local-name() = 'title']"/>
 		<xsl:value-of select="$toc_table_title"/>
 		<xsl:if test="normalize-space($toc_table_title) = ''">
-			<xsl:call-template name="getTitle">
-				<xsl:with-param name="name" select="'title-list-tables'"/>
+			<xsl:call-template name="getLocalizedString">
+				<xsl:with-param name="key">toc_tables</xsl:with-param>
 			</xsl:call-template>
 		</xsl:if>
 	</xsl:variable>
@@ -2509,8 +2557,8 @@
 		<xsl:variable name="toc_figure_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='figure']/*[local-name() = 'title']"/>
 		<xsl:value-of select="$toc_figure_title"/>
 		<xsl:if test="normalize-space($toc_figure_title) = ''">
-			<xsl:call-template name="getTitle">
-				<xsl:with-param name="name" select="'title-list-figures'"/>
+			<xsl:call-template name="getLocalizedString">
+				<xsl:with-param name="key">toc_figures</xsl:with-param>
 			</xsl:call-template>
 		</xsl:if>
 	</xsl:variable>
@@ -2519,8 +2567,8 @@
 		<xsl:variable name="toc_requirement_title" select="//*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'toc'][@type='requirement']/*[local-name() = 'title']"/>
 		<xsl:value-of select="$toc_requirement_title"/>
 		<xsl:if test="normalize-space($toc_requirement_title) = ''">
-			<xsl:call-template name="getTitle">
-				<xsl:with-param name="name" select="'title-list-recommendations'"/>
+			<xsl:call-template name="getLocalizedString">
+				<xsl:with-param name="key">toc_recommendations</xsl:with-param>
 			</xsl:call-template>
 		</xsl:if>
 	</xsl:variable>
@@ -5064,13 +5112,13 @@
 		<fo:table-body>
 
 				<xsl:variable name="title_continued_">
-					<xsl:call-template name="getTitle">
-						<xsl:with-param name="name" select="'title-continued'"/>
+					<xsl:call-template name="getLocalizedString">
+						<xsl:with-param name="key">continued</xsl:with-param>
 					</xsl:call-template>
 				</xsl:variable>
-
+				<xsl:variable name="title_continued_in_parenthesis" select="concat('(',$title_continued_,')')"/>
 				<xsl:variable name="title_continued">
-					<xsl:value-of select="$title_continued_"/>
+					<xsl:value-of select="$title_continued_in_parenthesis"/>
 
 				</xsl:variable>
 
@@ -6403,6 +6451,9 @@
 	<!-- END Definition List -->
 	<!-- ===================== -->
 
+	<!-- default: ignore title in sections/p -->
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]" priority="3"/>
+
 	<!-- ========================= -->
 	<!-- Rich text formatting -->
 	<!-- ========================= -->
@@ -6486,7 +6537,7 @@
 	<xsl:variable name="regex_url_start">^(http://|https://|www\.)?(.*)</xsl:variable>
 	<xsl:template match="*[local-name()='tt']/text()" priority="2">
 		<xsl:choose>
-			<xsl:when test="java:replaceAll(java:java.lang.String.new(.), '$2', '') != ''">
+			<xsl:when test="java:replaceAll(java:java.lang.String.new(.), $regex_url_start, '$2') != ''">
 				 <!-- url -->
 				<xsl:call-template name="add-zero-spaces-link-java"/>
 			</xsl:when>
@@ -7019,10 +7070,13 @@
 			</xsl:choose>
 		</xsl:variable>
 
+		<!-- replace sequence #x200B to one &#x200B -->
+		<xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b{2,}', '​')"/>
+
 		<!-- replace sequence #x200B and space TO space -->
-		<xsl:variable name="text10" select="java:replaceAll(java:java.lang.String.new($text9), '\u200b ', ' ')"/>
+		<xsl:variable name="text11" select="java:replaceAll(java:java.lang.String.new($text10), '\u200b ', ' ')"/>
 
-		<xsl:value-of select="$text10"/>
+		<xsl:value-of select="$text11"/>
 	</xsl:template>
 
 	<xsl:template name="add-zero-spaces-link-java">
@@ -7032,8 +7086,12 @@
 		<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, comma, slash, @  -->
 		<xsl:variable name="url" select="java:replaceAll(java:java.lang.String.new($url_continue),'(-|\.|:|=|_|—| |,|/|@)','$1​')"/>
+
+		<!-- replace sequence #x200B to one &#x200B -->
+		<xsl:variable name="url2" select="java:replaceAll(java:java.lang.String.new($url), '\u200b{2,}', '​')"/>
+
 		<!-- remove zero-width space at the end -->
-		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url), '​$', '')"/>
+		<xsl:value-of select="java:replaceAll(java:java.lang.String.new($url2), '​$', '')"/>
 	</xsl:template>
 
 	<!-- add zero space after dash character (for table's entries) -->
@@ -8303,7 +8361,7 @@
 
 							<xsl:call-template name="refine_note_block_style"/>
 
-							<fo:inline xsl:use-attribute-sets="note-name-style">
+							<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
 
 								<xsl:call-template name="refine_note-name-style"/>
 
@@ -8340,12 +8398,12 @@
 		<xsl:variable name="num"><xsl:number/></xsl:variable>
 		<xsl:choose>
 			<xsl:when test="$num = 1"> <!-- display first NOTE's paragraph in the same line with label NOTE -->
-				<fo:inline xsl:use-attribute-sets="note-p-style">
+				<fo:inline xsl:use-attribute-sets="note-p-style" role="SKIP">
 					<xsl:apply-templates/>
 				</fo:inline>
 			</xsl:when>
 			<xsl:otherwise>
-				<fo:block xsl:use-attribute-sets="note-p-style">
+				<fo:block xsl:use-attribute-sets="note-p-style" role="SKIP">
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:otherwise>
@@ -8564,25 +8622,45 @@
 							<fo:external-graphic src="{$src}" fox:alt-text="Image {@alt}" xsl:use-attribute-sets="image-graphic-style">
 								<xsl:if test="not(@mimetype = 'image/svg+xml') and ../*[local-name() = 'name'] and not(ancestor::*[local-name() = 'table'])">
 
-									<xsl:variable name="img_src">
-										<xsl:choose>
-											<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
-											<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
-										</xsl:choose>
-									</xsl:variable>
+									<xsl:if test="@width != '' and @width != 'auto'">
+										<xsl:attribute name="width">
+											<xsl:value-of select="@width"/>
+										</xsl:attribute>
+									</xsl:if>
 
-									<xsl:variable name="image_width_effective">
+									<xsl:if test="@height != '' and @height != 'auto'">
+										<xsl:attribute name="height">
+											<xsl:value-of select="@height"/>
+										</xsl:attribute>
+									</xsl:if>
 
-												<xsl:value-of select="$width_effective"/>
+									<xsl:choose>
+										<xsl:when test="@width != '' and @width != 'auto' and @height != '' and @height != 'auto'">
+											<xsl:attribute name="scaling">non-uniform</xsl:attribute>
+										</xsl:when>
+										<xsl:otherwise>
 
-									</xsl:variable>
+											<xsl:variable name="img_src">
+												<xsl:choose>
+													<xsl:when test="not(starts-with(@src, 'data:'))"><xsl:value-of select="concat($basepath, @src)"/></xsl:when>
+													<xsl:otherwise><xsl:value-of select="@src"/></xsl:otherwise>
+												</xsl:choose>
+											</xsl:variable>
 
-									<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
-									<xsl:if test="number($scale) &lt; 100">
+											<xsl:variable name="image_width_effective">
 
-												<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+														<xsl:value-of select="$width_effective"/>
 
-									</xsl:if>
+											</xsl:variable>
+
+											<xsl:variable name="scale" select="java:org.metanorma.fop.Util.getImageScale($img_src, $image_width_effective, $height_effective)"/>
+											<xsl:if test="number($scale) &lt; 100">
+
+														<xsl:attribute name="content-width"><xsl:value-of select="$scale"/>%</xsl:attribute>
+
+											</xsl:if>
+										</xsl:otherwise>
+									</xsl:choose>
 
 								</xsl:if>
 
@@ -12240,7 +12318,7 @@
 	<xsl:template match="*[local-name() = 'span']" mode="update_xml_step1">
 		<xsl:apply-templates mode="update_xml_step1"/>
 	</xsl:template>
-	<xsl:template match="*[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
+	<xsl:template match="*[local-name() = 'sections']/*[local-name() = 'p'][starts-with(@class, 'zzSTDTitle')]/*[local-name() = 'span'][@class] | *[local-name() = 'sourcecode']//*[local-name() = 'span'][@class]" mode="update_xml_step1" priority="2">
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<xsl:apply-templates mode="update_xml_step1"/>