metanorma-iso 2.4.7 → 2.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2442e19642be700d61abb7ebcf13f9f4769104b50ed5cdf3ed311e04774cefe7
-  data.tar.gz: 33bce8cd62b0612e30a6379a874b3900adc665e64efde522b7abc4eb6d0a6193
+  metadata.gz: 7aaa364a3a007ab13cb425bee0b000154d5d49d394db13f37945b18eb77a7d97
+  data.tar.gz: 54974181bd0d2c29fc00299aaa0da54bc5749c741d4a63503003af1d46038c95
 SHA512:
-  metadata.gz: 30376e197fc7d1d0b216e5fdc3d3034736362d271c67f9a21b52de1358bf63e641f8ecc3c7811e0ea3cc4398d7c7dc36928c6be34a03e82d8d3c78a05006730b
-  data.tar.gz: 0171fc4f212e7413c0218e58d42fa08b9a6352bf3e927540aea7273d9069d3ea49e79aff37d5f079ced4e93a169fdd909ee0c307d619c6cd2818a22fbc5ac06e
+  metadata.gz: 85dcbabb3fd13f5020003f4e5c59d8fad34287002f3e9fc03d4cc6c0fe37d0938bcf0ce1e3a3e6a0fc5a1937c756646662cd7d48eea65e3208e1650927ab3133
+  data.tar.gz: 77268460b6cfbeda72397ec169dc82bfdfdd724214d138fe7f6621570cf01b881097baaebc36e0eadac9568e2b842e2fa068c5994f98fb228c9ef1146dfc3430

data/lib/isodoc/iso/html/style-human.css

@@ -97,7 +97,7 @@ h1, h2, h3, h4, h5, h6 {
 
 blockquote, q {
   quotes: none; }
-  blockquote:before, blockquote:after, q:before, q:after {
+  blockquote::before, blockquote::after, q::before, q::after {
     content: '';
     content: none; }
 
@@ -120,14 +120,18 @@ b, strong {
 div.document-stage-band, div.document-type-band {
   background-color: #333333; }
 
-a.FootnoteRef + a.FootnoteRef:before {
+a.FootnoteRef + a.FootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
-a.TableFootnoteRef + a.TableFootnoteRef:before {
+a.TableFootnoteRef + a.TableFootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
+a.TableFootnoteRef, span.TableFootnoteRef,
+a.FootnoteRef, span.FootnoteRef {
+  vertical-align: super; }
+
 .addition {
   color: blue; }
 
@@ -297,10 +301,10 @@ blockquote,
 q {
   quotes: none; }
 
-blockquote:before,
-blockquote:after,
-q:before,
-q:after {
+blockquote::before,
+blockquote::after,
+q::before,
+q::after {
   content: '';
   content: none; }
 
@@ -454,7 +458,7 @@ h2 p, .h2 p {
 ul > li {
   list-style: none; }
 
-ul > li > p:first-child:before {
+ul > li > p:first-child::before {
   content: "\2014";
   display: inline-block;
   width: 1em;
@@ -466,7 +470,7 @@ li p {
   margin-bottom: 0.6em;
   line-height: 1.2; }
 
-#toc li:before {
+#toc li::before {
   content: " ";
   display: none; }
 
@@ -517,7 +521,7 @@ p.Terms {
     #toc, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) {
       padding: 0 1.5em;
       overflow: visible; } }
-  #toc li:before, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:before {
+  #toc li::before, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li::before {
     content: " ";
     display: none; }
 
@@ -1026,7 +1030,7 @@ ol.footnotes-list p,
 aside.footnote {
   display: inline; }
 
-ol > li > p:before {
+ol > li > p::before {
   content: "";
   display: none; }
 

data/lib/isodoc/iso/html/style-human.scss

@@ -38,10 +38,10 @@ q {
     quotes: none;
 }
 
-blockquote:before,
-blockquote:after,
-q:before,
-q:after {
+blockquote::before,
+blockquote::after,
+q::before,
+q::after {
     content: '';
     content: none;
 }
@@ -232,7 +232,7 @@ ul>li {
     list-style: none;
 }
 
-ul>li>p:first-child:before {
+ul>li>p:first-child::before {
     content: "\2014";
     display: inline-block;
     width: 1em;
@@ -246,7 +246,7 @@ li p {
     line-height: 1.2;
 }
 
-#toc li:before {
+#toc li::before {
     content: " ";
     display: none;
 }
@@ -271,7 +271,7 @@ p.Terms {
     //     box-shadow: inset -5px 0px 10px -5px #1d1d1d !important;
     // }
 
-    li:before {
+    li::before {
         content: " ";
         display: none;
     }
@@ -694,7 +694,7 @@ aside.footnote {
     display: inline;
 }
 
-ol>li>p:before {
+ol>li>p::before {
     content: "";
     display: none;
 }

data/lib/isodoc/iso/html/style-iso.css

@@ -97,7 +97,7 @@ h1, h2, h3, h4, h5, h6 {
 
 blockquote, q {
   quotes: none; }
-  blockquote:before, blockquote:after, q:before, q:after {
+  blockquote::before, blockquote::after, q::before, q::after {
     content: '';
     content: none; }
 
@@ -120,14 +120,18 @@ b, strong {
 div.document-stage-band, div.document-type-band {
   background-color: #333333; }
 
-a.FootnoteRef + a.FootnoteRef:before {
+a.FootnoteRef + a.FootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
-a.TableFootnoteRef + a.TableFootnoteRef:before {
+a.TableFootnoteRef + a.TableFootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
+a.TableFootnoteRef, span.TableFootnoteRef,
+a.FootnoteRef, span.FootnoteRef {
+  vertical-align: super; }
+
 .addition {
   color: blue; }
 
@@ -291,8 +295,8 @@ body {
 blockquote, q {
   quotes: none; }
 
-blockquote:before, blockquote:after,
-q:before, q:after {
+blockquote::before, blockquote::after,
+q::before, q::after {
   content: '';
   content: none; }
 
@@ -406,7 +410,7 @@ h2 p, .h2 p {
 ul > li {
   list-style: none; }
 
-ul > li > p:first-child:before {
+ul > li > p:first-child::before {
   content: "\2014";
   display: inline-block;
   width: 1em;
@@ -469,7 +473,7 @@ p.Terms {
   #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:hover {
     box-shadow: 0px 1px 0px 0px black !important;
     background: none; }
-  #toc li:before, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li:before {
+  #toc li::before, #toc > ul :is(.h1, .h2, .h3, .h4, .h5, .h6) li::before {
     content: " ";
     display: none; }
 
@@ -789,57 +793,57 @@ ol > li {
   list-style: none;
   position: relative; }
 
-ol > li:before {
+ol > li::before {
   position: absolute;
   left: -1.4em; }
 
-ol[class="roman"] > li:before {
+ol[class="roman"] > li::before {
   left: -2.0em; }
 
-ol[class="roman_upper"] > li:before {
+ol[class="roman_upper"] > li::before {
   left: -2.3em; }
 
-ol[class="alphabet"] > li:before {
+ol[class="alphabet"] > li::before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha) ") "; }
 
-ol[class="arabic"] > li:before {
+ol[class="arabic"] > li::before {
   counter-increment: arabic;
   content: counter(arabic, decimal) ") "; }
 
-ol[class="roman"] > li:before {
+ol[class="roman"] > li::before {
   counter-increment: roman;
   content: counter(roman, lower-roman) ") "; }
 
-ol[class="alphabet_upper"] > li:before {
+ol[class="alphabet_upper"] > li::before {
   counter-increment: alphabet_upper;
   content: counter(alphabet_upper, upper-alpha) ") "; }
 
-ol[class="roman_upper"] > li:before {
+ol[class="roman_upper"] > li::before {
   counter-increment: roman_upper;
   content: counter(roman_upper, upper-roman) ") "; }
 
-ol > li:before {
+ol > li::before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha) ") "; }
 
-ol[class="alphabet"] ol[class="alphabet"] > li:before {
+ol[class="alphabet"] ol[class="alphabet"] > li::before {
   counter-increment: alphabet2;
   content: counter(alphabet2, lower-alpha) ") "; }
 
-ol[class="arabic"] ol[class="arabic"] > li:before {
+ol[class="arabic"] ol[class="arabic"] > li::before {
   counter-increment: arabic2;
   content: counter(arabic2, decimal) ") "; }
 
-ol[class="roman"] ol[class="roman"] > li:before {
+ol[class="roman"] ol[class="roman"] > li::before {
   counter-increment: roman2;
   content: counter(roman2, lower-roman) ") "; }
 
-ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li:before {
+ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li::before {
   counter-increment: alphabet_upper2;
   content: counter(alphabet_upper2, upper-alpha) ") "; }
 
-ol[class="roman_upper"] ol[class="roman_upper"] > li:before {
+ol[class="roman_upper"] ol[class="roman_upper"] > li::before {
   counter-increment: roman_upper2;
   content: counter(roman_upper2, upper-roman) ") "; }
 
@@ -1063,7 +1067,7 @@ ol.footnotes-list:first-child {
 ol.footnotes-list p, aside.footnote p {
   display: inline; }
 
-ol > li > p:before {
+ol > li > p::before {
   content: "";
   display: none; }
 

data/lib/isodoc/iso/html/style-iso.scss

@@ -27,8 +27,8 @@ body {
 blockquote, q {
 	quotes: none;
 }
-blockquote:before, blockquote:after,
-q:before, q:after {
+blockquote::before, blockquote::after,
+q::before, q::after {
 	content: '';
 	content: none;
 }
@@ -177,7 +177,7 @@ ul > li {
     list-style: none;
 }
 
-ul > li > p:first-child:before {
+ul > li > p:first-child::before {
     content: "\2014";
     display: inline-block;
     width: 1em;
@@ -210,7 +210,7 @@ p.Terms {
         background: none;
     }
 
-    li:before {
+    li::before {
         content: " ";
         display: none;
     }
@@ -458,57 +458,57 @@ ol > li {
   list-style: none;
   position: relative;
 }
-ol > li:before {
+ol > li::before {
   position: absolute;
   left: -1.4em;
 }
-ol[class="roman"] > li:before {
+ol[class="roman"] > li::before {
   left: -2.0em;
 }
-ol[class="roman_upper"] > li:before {
+ol[class="roman_upper"] > li::before {
   left: -2.3em;
 }
-ol[class="alphabet"] > li:before {
+ol[class="alphabet"] > li::before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha)") "
 }
-ol[class="arabic"] > li:before {
+ol[class="arabic"] > li::before {
   counter-increment: arabic;
   content: counter(arabic, decimal)") "
 }
-ol[class="roman"] > li:before {
+ol[class="roman"] > li::before {
   counter-increment: roman;
   content: counter(roman, lower-roman)") "
 }
-ol[class="alphabet_upper"] > li:before {
+ol[class="alphabet_upper"] > li::before {
   counter-increment: alphabet_upper;
   content: counter(alphabet_upper, upper-alpha)") "
 }
-ol[class="roman_upper"] > li:before {
+ol[class="roman_upper"] > li::before {
   counter-increment: roman_upper;
   content: counter(roman_upper, upper-roman)") "
 }
-ol > li:before {
+ol > li::before {
   counter-increment: alphabet;
   content: counter(alphabet, lower-alpha)") "
 }
-ol[class="alphabet"] ol[class="alphabet"] > li:before {
+ol[class="alphabet"] ol[class="alphabet"] > li::before {
   counter-increment: alphabet2;
   content: counter(alphabet2, lower-alpha)") "
 }
-ol[class="arabic"] ol[class="arabic"] > li:before {
+ol[class="arabic"] ol[class="arabic"] > li::before {
   counter-increment: arabic2;
   content: counter(arabic2, decimal)") "
 }
-ol[class="roman"] ol[class="roman"] > li:before {
+ol[class="roman"] ol[class="roman"] > li::before {
   counter-increment: roman2;
   content: counter(roman2, lower-roman)") "
 }
-ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li:before {
+ol[class="alphabet_upper"] ol[class="alphabet_upper"] > li::before {
   counter-increment: alphabet_upper2;
   content: counter(alphabet_upper2, upper-alpha)") "
 }
-ol[class="roman_upper"] ol[class="roman_upper"] > li:before {
+ol[class="roman_upper"] ol[class="roman_upper"] > li::before {
   counter-increment: roman_upper2;
   content: counter(roman_upper2, upper-roman)") "
 }
@@ -723,7 +723,7 @@ ol.footnotes-list p, aside.footnote p {
     display: inline;
 }
 
-ol > li > p:before {
+ol > li > p::before {
     content: "";
     display: none;
 }

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

@@ -11,6 +11,7 @@ term_def_boilerplate: |
 all_rights_reserved: All rights reserved
 reference_number: Reference number
 price_based_on: Price based on % pages
+descriptor: Descriptor
 under_preparation: Under preparation. (Stage at the time of publication %).
 withdrawn: Withdrawn.
 cancelled_and_replaced: Cancelled and replaced by %.
@@ -23,6 +24,8 @@ secretariat: Secretariat
 edition: edition
 termsrelated: Terms related to 
 availablefrom: Available from
+voting_begins_on: Voting begins on
+voting_terminates_on: Voting terminates on
 multiple_and: "%1 and %2"
 multiple_or: "%1 or %2"
 doctype_dict:
@@ -85,3 +88,6 @@ inflection:
   Statement:
     sg: Statement
     pl: Statements
+  Descriptor:
+    sg: Descriptor
+    pl: Descriptors

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

@@ -11,6 +11,7 @@ term_def_boilerplate: |
 all_rights_reserved: Tous droits réservés
 reference_number: Numéro de référence
 price_based_on: Prix basé sur % pages
+descriptor: Descripteur
 under_preparation: En cours d'élaboration. (Stade au moment de la publication %).
 withdrawn: Retiré.
 cancelled_and_replaced: Annulé et remplacé par %.
@@ -22,6 +23,8 @@ secretariat: Secrétariat
 edition: édition
 termsrelated: Termes liés 
 availablefrom: Disponible sur
+voting_begins_on: Le vote commence le
+voting_terminates_on: Le vote se termine le
 doctype_dict:
   international-standard: Norme internationale
   technical-specification: Spécification technique
@@ -79,3 +82,6 @@ inflection:
   Déclaration:
     sg: Déclaration
     pl: Déclarations
+  Descripteur:
+    sg: Descripteur
+    pl: Descripteurs

data/lib/isodoc/iso/i18n-ja.yaml

@@ -1,3 +1,4 @@
+descriptor: 記述子
 stage_dict:
   "00": Preliminary work item
   "10": New work item proposal

data/lib/isodoc/iso/i18n-ru.yaml

@@ -9,6 +9,7 @@ term_def_boilerplate: |
       </p> </li> </ul>
 all_rights_reserved: Все права защищены
 reference_number: Ссылочный номер
+descriptor: Дескриптор
 price_based_on: Цена рассчитана на % стр.
 under_preparation: В стадии подготовки. (Стадия на момент публикации %).
 withdrawn: Отозван.
@@ -23,6 +24,8 @@ scope: Область применения
 edition: издание
 termsrelated: Термины, связанные 
 availablefrom: Доступна с
+voting_begins_on: Голосование начинается в
+voting_terminates_on: Голосование заканчивается в
 doctype_dict:
   international-standard: Международный Стандарт
   technical-specification: Техническая Спецификация
@@ -83,3 +86,6 @@ inflection:
   Утверждение:
     sg: Утверждение
     pl: Утверждения
+  Дескриптор:
+    sg: Дескриптор
+    pl: Дескрипторы

data/lib/isodoc/iso/i18n-zh-Hans.yaml

@@ -9,6 +9,7 @@ term_def_boilerplate: |
 all_rights_reserved: 版权所有
 reference_number: 参考编号
 price_based_on: 价格基于%页
+descriptor: 描述符
 under_preparation: 制定中（出版时最新状态为%）
 withdrawn: 撤回 .
 cancelled_and_replaced: 已取消并由%取代。
@@ -20,6 +21,8 @@ secretariat: 秘书处
 edition: 版
 termsrelated: 相关术语 
 availablefrom: 可从
+voting_begins_on: 投票开始于
+voting_terminates_on: 投票终止于
 doctype_dict:
   international-standard: 国际标准
   technical-specification: 技术规格

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">
@@ -1446,8 +1466,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>
@@ -2047,10 +2067,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 +2471,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 +2518,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 +2525,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 +2535,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 +2545,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 +5090,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>
 
@@ -8303,7 +8329,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 +8366,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>

data/lib/isodoc/iso/iso.international-standard.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">
@@ -1446,8 +1466,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>
@@ -2047,10 +2067,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 +2471,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 +2518,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 +2525,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 +2535,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 +2545,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 +5090,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>
 
@@ -8303,7 +8329,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 +8366,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>

data/lib/metanorma/iso/front.rb

@@ -12,15 +12,18 @@ module Metanorma
       def metadata_ext(node, xml)
         super
         structured_id(node, xml)
-        id = iso_id_default(iso_id_params(node))
-        id.stage and metadata_stage(id, xml)
+        metadata_stage(node, xml)
         @amd && a = node.attr("updates-document-type") and
           xml.updates_document_type a
       end
 
-      def metadata_stage(id, xml)
-        xml.stagename metadata_stagename(id)&.strip,
-                      **attr_code(abbreviation: id.typed_stage_abbrev&.strip)
+      def metadata_stage(node, xml)
+        id = iso_id_default(iso_id_params(node))
+        id.stage and
+          xml.stagename metadata_stagename(id)&.strip,
+                        **attr_code(abbreviation: id.typed_stage_abbrev&.strip)
+      rescue Pubid::Core::Errors::HarmonizedStageCodeInvalidError,
+             Pubid::Core::Errors::TypeStageParseError
       end
 
       def metadata_stagename(id)
@@ -95,8 +98,17 @@ module Metanorma
         xml.status do |s|
           s.stage stage, **attr_code(abbreviation: abbrev)
           s.substage substage
-          node.attr("iteration") && (s.iteration node.attr("iteration"))
+          i = node.attr("iteration") and s.iteration i
         end
+      rescue Pubid::Core::Errors::HarmonizedStageCodeInvalidError,
+             Pubid::Core::Errors::TypeStageParseError
+        report_illegal_stage(stage, substage)
+      end
+
+      def report_illegal_stage(stage, substage)
+        err = "Illegal document stage: #{stage}.#{substage}"
+        @log.add("Document Attributes", nil, err)
+        warn err
       end
 
       def metadata_committee(node, xml)

data/lib/metanorma/iso/front_id.rb

@@ -10,41 +10,6 @@ require "pubid-iso"
 module Metanorma
   module ISO
     class Converter < Standoc::Converter
-      STAGE_ABBRS = {
-        "00": "PWI",
-        "10": "NP",
-        "20": "WD",
-        "30": "CD",
-        "40": "DIS",
-        "50": "FDIS",
-        "60": "IS",
-        "90": "(Review)",
-        "95": "(Withdrawal)",
-      }.freeze
-
-      STAGE_NAMES = {
-        "00": "Preliminary work item",
-        "10": "New work item proposal",
-        "20": "Working draft",
-        "30": "Committee draft",
-        "40": "Draft",
-        "50": "Final draft",
-        "60": "International standard",
-        "90": "Review",
-        "95": "Withdrawal",
-      }.freeze
-
-      def stage_abbr(stage, substage, _doctype)
-        return nil if stage.to_i > 60
-
-        ret = STAGE_ABBRS[stage.to_sym]
-        ret = "PRF" if stage == "60" && substage == "00"
-        ret = nil if stage == "60" && substage != "00"
-        ret = "AWI" if stage == "10" && substage == "99"
-        ret = "AWI" if stage == "20" && substage == "00"
-        ret
-      end
-
       def metadata_id(node, xml)
         if id = node.attr("docidentifier")
           xml.docidentifier id, **attr_code(type: "ISO")
@@ -103,23 +68,19 @@ module Metanorma
 
       def iso_id_params_add(node)
         stage = iso_id_stage(node)
-
         ret = { number: node.attr("amendment-number") ||
           node.attr("corrigendum-number"),
                 year: iso_id_year(node),
                 iteration: node.attr("iteration") }.compact
-        stage and ret[:stage] = stage
-        ret[:stage] == "60.00" and ret[:stage] = :PRF
+        if stage
+          ret[:stage] = stage
+          ret[:stage] == "60.00" and ret[:stage] = :PRF
+        end
         ret
       end
 
       def iso_id_stage(node)
-        stage = stage_abbr(get_stage(node), get_substage(node),
-                           doctype(node))
-        harmonised = "#{get_stage(node)}.#{get_substage(node)}"
-        harmonised = nil unless /^\d\d\.\d\d/.match?(harmonised)
-        { abbr: stage&.to_sym, harmonized_code: harmonised }
-        harmonised || stage&.to_sym
+        "#{get_stage(node)}.#{get_substage(node)}"
       end
 
       def iso_id_year(node)
@@ -195,7 +156,7 @@ module Metanorma
       def structured_id(node, xml)
         return unless node.attr("docnumber")
 
-        part, subpart = node&.attr("partnumber")&.split(/-/)
+        part, subpart = node&.attr("partnumber")&.split("-")
         xml.structuredidentifier do |i|
           i.project_number(node.attr("docnumber"), **attr_code(
             part: part, subpart: subpart,

data/lib/metanorma/iso/validate.rb

@@ -132,20 +132,6 @@ module Metanorma
                    "#{script} is not a recognised script")
       end
 
-      def stage_validate(xmldoc)
-        stage = xmldoc&.at("//bibdata/status/stage")&.text
-        %w(00 10 20 30 40 50 60 90 95).include? stage or
-          @log.add("Document Attributes", nil,
-                   "#{stage} is not a recognised stage")
-      end
-
-      def substage_validate(xmldoc)
-        substage = xmldoc&.at("//bibdata/status/substage")&.text or return
-        %w(00 20 60 90 92 93 98 99).include? substage or
-          @log.add("Document Attributes", nil,
-                   "#{substage} is not a recognised substage")
-      end
-
       def iteration_validate(xmldoc)
         iteration = xmldoc&.at("//bibdata/status/iteration")&.text or return
         /^\d+/.match(iteration) or
@@ -156,8 +142,6 @@ module Metanorma
       def bibdata_validate(doc)
         doctype_validate(doc)
         script_validate(doc)
-        stage_validate(doc)
-        substage_validate(doc)
         iteration_validate(doc)
       end
 

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.4.7".freeze
+    VERSION = "2.4.8".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.4.7
+  version: 2.4.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-06 00:00:00.000000000 Z
+date: 2023-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc