metanorma-iso 2.0.5 → 2.0.6

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

@@ -3,9 +3,9 @@ term_def_boilerplate: |
 
       <ul>
       <li> <p>ИСО, Интернет-онлайн-платформа: доступна на 
-        <link target="http://www.iso.org/obp"/>.</p></li>
+        <link target="https://www.iso.org/obp"/></p></li>
       <li> <p>МЭК Electropedia: доступна на
-      <link target="http://www.electropedia.org"/>.
+      <link target="https://www.electropedia.org"/>
       </p> </li> </ul>
 all_rights_reserved: Все права защищены
 reference_number: Ссылочный номер

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

@@ -2,9 +2,9 @@ term_def_boilerplate: |
       <p>ISO和IEC用于标准化的术语数据库地址如下：</p>
       <ul>
       <li> <p>ISO在线浏览平台:
-        位于<link target="http://www.iso.org/obp"/>。</p></li>
+        位于<link target="https://www.iso.org/obp"/></p></li>
       <li> <p>IEC Electropedia:
-        位于<link target="http://www.electropedia.org"/>。
+        位于<link target="https://www.electropedia.org"/>
       </p> </li> </ul>
 all_rights_reserved: 版权所有
 reference_number: 参考编号

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

@@ -1939,7 +1939,7 @@
 	</xsl:template>
 
 	
-<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:key name="bibitems" match="*[local-name() = 'bibitem']" use="@id"/><xsl:key name="bibitems_hidden" match="*[local-name() = 'bibitem'][@hidden='true'] | *[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']" use="@id"/><xsl:variable name="lang">
+<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:variable name="lang">
 		<xsl:call-template name="getLang"/>
 	</xsl:variable><xsl:variable name="pageWidth_">
 		210
@@ -6577,7 +6577,51 @@
 				<xsl:with-param name="text" select="$text_step1"/>
 			</xsl:call-template>
 		</xsl:variable>
-		<xsl:value-of select="$text_step2"/>
+		
+		<!-- <xsl:value-of select="$text_step2"/> -->
+		
+		<!-- add zero-width space after space -->
+		<xsl:variable name="text_step3" select="java:replaceAll(java:java.lang.String.new($text_step2),' ',' ​')"/>
+		
+		<!-- split text by zero-width space -->
+		<xsl:variable name="text_step4">
+			<xsl:call-template name="split">
+				<xsl:with-param name="pText" select="$text_step3"/>
+				<xsl:with-param name="sep" select="$zero_width_space"/>
+				<xsl:with-param name="normalize-space">false</xsl:with-param>
+				<xsl:with-param name="keep_sep">true</xsl:with-param>
+			</xsl:call-template>
+		</xsl:variable>
+		
+		<xsl:for-each select="xalan:nodeset($text_step4)/item">
+			<xsl:choose>
+				<xsl:when test="string-length() &gt; 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
+					<xsl:call-template name="interspers">
+						<xsl:with-param name="str" select="."/>
+					</xsl:call-template>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="."/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:for-each>
+		
+	</xsl:template><xsl:template name="interspers">
+		<xsl:param name="str"/>
+		<xsl:param name="char" select="$zero_width_space"/>
+		<xsl:if test="$str != ''">
+			<xsl:value-of select="substring($str, 1, 1)"/>
+			
+			<xsl:variable name="next_char" select="substring($str, 2, 1)"/>
+			<xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
+				<xsl:value-of select="$char"/>
+			</xsl:if>
+			
+			<xsl:call-template name="interspers">
+				<xsl:with-param name="str" select="substring($str, 2)"/>
+				<xsl:with-param name="char" select="$char"/>
+			</xsl:call-template>
+		</xsl:if>
 	</xsl:template><xsl:template match="*" mode="syntax_highlight">
 		<xsl:apply-templates mode="syntax_highlight"/>
 	</xsl:template><xsl:variable name="syntax_highlight_styles_">
@@ -7090,11 +7134,24 @@
 	</xsl:template><xsl:template match="*[local-name() = 'author']">
 		<xsl:text>— </xsl:text>
 		<xsl:apply-templates/>
-	</xsl:template><xsl:template match="*[local-name() = 'eref']">
+	</xsl:template><xsl:variable name="bibitems_">
+		<xsl:for-each select="//*[local-name() = 'bibitem']">
+			<xsl:copy-of select="."/>
+		</xsl:for-each>
+	</xsl:variable><xsl:variable name="bibitems" select="xalan:nodeset($bibitems_)"/><xsl:variable name="bibitems_hidden_">
+		<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
+			<xsl:copy-of select="."/>
+		</xsl:for-each>
+		<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']">
+			<xsl:copy-of select="."/>
+		</xsl:for-each>
+	</xsl:variable><xsl:variable name="bibitems_hidden" select="xalan:nodeset($bibitems_hidden_)"/><xsl:template match="*[local-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(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'])"/>
 		<xsl:choose>
-			<xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
+			<!-- <xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> --> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
+			<xsl:when test="$external-destination != '' or not($bibitems_hidden/*[local-name() ='bibitem'][@id = $current_bibitemid])"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
 				<fo:inline xsl:use-attribute-sets="eref-style">
 					<xsl:if test="@type = 'footnote'">
 						<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
@@ -8201,7 +8258,7 @@
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
-			<xsl:for-each select="*[not(@normative='true') and not(*[*[@normative='true']])]">
+			<xsl:for-each select="*[not(@normative='true') and not(*[@normative='true'])]">
 				<xsl:sort select="@displayorder" data-type="number"/>
 				<xsl:apply-templates select="." mode="update_xml_step1"/>
 			</xsl:for-each>
@@ -8240,7 +8297,8 @@
 			<xsl:variable name="position"><xsl:number count="*[local-name() = $local_name][@bibitemid = $bibitemid]" level="any"/></xsl:variable>
 			<xsl:if test="normalize-space($position) = '1'">
 				<xsl:variable name="fn_text">
-					<xsl:copy-of select="key('bibitems', $bibitemid)[1]/*[local-name() = 'note'][not(@type='Unpublished-Status')][normalize-space() = $localized_string_withdrawn or starts-with(normalize-space(), $localized_string_cancelled_and_replaced)]/node()"/>
+					<!-- <xsl:copy-of select="key('bibitems', $bibitemid)[1]/*[local-name() = 'note'][not(@type='Unpublished-Status')][normalize-space() = $localized_string_withdrawn or starts-with(normalize-space(), $localized_string_cancelled_and_replaced)]/node()" /> -->
+					<xsl:copy-of select="$bibitems/*[local-name() ='bibitem'][@id = $bibitemid][1]/*[local-name() = 'note'][not(@type='Unpublished-Status')][normalize-space() = $localized_string_withdrawn or starts-with(normalize-space(), $localized_string_cancelled_and_replaced)]/node()"/>
 				</xsl:variable>
 				<xsl:if test="normalize-space($fn_text) != ''">
 					<xsl:element name="fn" namespace="{$namespace_full}">
@@ -8511,22 +8569,25 @@
 		<xsl:param name="pText" select="."/>
 		<xsl:param name="sep" select="','"/>
 		<xsl:param name="normalize-space" select="'true'"/>
+		<xsl:param name="keep_sep" select="'false'"/>
 		<xsl:if test="string-length($pText) &gt;0">
-		<item>
-			<xsl:choose>
-				<xsl:when test="$normalize-space = 'true'">
-					<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</item>
-		<xsl:call-template name="split">
-			<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
-			<xsl:with-param name="sep" select="$sep"/>
-			<xsl:with-param name="normalize-space" select="$normalize-space"/>
-		</xsl:call-template>
+			<item>
+				<xsl:choose>
+					<xsl:when test="$normalize-space = 'true'">
+						<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</item>
+			<xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
+			<xsl:call-template name="split">
+				<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
+				<xsl:with-param name="sep" select="$sep"/>
+				<xsl:with-param name="normalize-space" select="$normalize-space"/>
+				<xsl:with-param name="keep_sep" select="$keep_sep"/>
+			</xsl:call-template>
 		</xsl:if>
 	</xsl:template><xsl:template name="getDocumentId">		
 		<xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>

data/lib/isodoc/iso/iso.international-standard.xsl

@@ -1939,7 +1939,7 @@
 	</xsl:template>
 
 	
-<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:key name="bibitems" match="*[local-name() = 'bibitem']" use="@id"/><xsl:key name="bibitems_hidden" match="*[local-name() = 'bibitem'][@hidden='true'] | *[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']" use="@id"/><xsl:variable name="lang">
+<xsl:param name="svg_images"/><xsl:variable name="images" select="document($svg_images)"/><xsl:param name="basepath"/><xsl:param name="external_index"/><xsl:param name="syntax-highlight">false</xsl:param><xsl:variable name="lang">
 		<xsl:call-template name="getLang"/>
 	</xsl:variable><xsl:variable name="pageWidth_">
 		210
@@ -6577,7 +6577,51 @@
 				<xsl:with-param name="text" select="$text_step1"/>
 			</xsl:call-template>
 		</xsl:variable>
-		<xsl:value-of select="$text_step2"/>
+		
+		<!-- <xsl:value-of select="$text_step2"/> -->
+		
+		<!-- add zero-width space after space -->
+		<xsl:variable name="text_step3" select="java:replaceAll(java:java.lang.String.new($text_step2),' ',' ​')"/>
+		
+		<!-- split text by zero-width space -->
+		<xsl:variable name="text_step4">
+			<xsl:call-template name="split">
+				<xsl:with-param name="pText" select="$text_step3"/>
+				<xsl:with-param name="sep" select="$zero_width_space"/>
+				<xsl:with-param name="normalize-space">false</xsl:with-param>
+				<xsl:with-param name="keep_sep">true</xsl:with-param>
+			</xsl:call-template>
+		</xsl:variable>
+		
+		<xsl:for-each select="xalan:nodeset($text_step4)/item">
+			<xsl:choose>
+				<xsl:when test="string-length() &gt; 30"> <!-- word with length more than 30 will be interspersed with zero-width space -->
+					<xsl:call-template name="interspers">
+						<xsl:with-param name="str" select="."/>
+					</xsl:call-template>
+				</xsl:when>
+				<xsl:otherwise>
+					<xsl:value-of select="."/>
+				</xsl:otherwise>
+			</xsl:choose>
+		</xsl:for-each>
+		
+	</xsl:template><xsl:template name="interspers">
+		<xsl:param name="str"/>
+		<xsl:param name="char" select="$zero_width_space"/>
+		<xsl:if test="$str != ''">
+			<xsl:value-of select="substring($str, 1, 1)"/>
+			
+			<xsl:variable name="next_char" select="substring($str, 2, 1)"/>
+			<xsl:if test="not(contains(concat(' -.:=_— ', $char), $next_char))">
+				<xsl:value-of select="$char"/>
+			</xsl:if>
+			
+			<xsl:call-template name="interspers">
+				<xsl:with-param name="str" select="substring($str, 2)"/>
+				<xsl:with-param name="char" select="$char"/>
+			</xsl:call-template>
+		</xsl:if>
 	</xsl:template><xsl:template match="*" mode="syntax_highlight">
 		<xsl:apply-templates mode="syntax_highlight"/>
 	</xsl:template><xsl:variable name="syntax_highlight_styles_">
@@ -7090,11 +7134,24 @@
 	</xsl:template><xsl:template match="*[local-name() = 'author']">
 		<xsl:text>— </xsl:text>
 		<xsl:apply-templates/>
-	</xsl:template><xsl:template match="*[local-name() = 'eref']">
+	</xsl:template><xsl:variable name="bibitems_">
+		<xsl:for-each select="//*[local-name() = 'bibitem']">
+			<xsl:copy-of select="."/>
+		</xsl:for-each>
+	</xsl:variable><xsl:variable name="bibitems" select="xalan:nodeset($bibitems_)"/><xsl:variable name="bibitems_hidden_">
+		<xsl:for-each select="//*[local-name() = 'bibitem'][@hidden='true']">
+			<xsl:copy-of select="."/>
+		</xsl:for-each>
+		<xsl:for-each select="//*[local-name() = 'references'][@hidden='true']//*[local-name() = 'bibitem']">
+			<xsl:copy-of select="."/>
+		</xsl:for-each>
+	</xsl:variable><xsl:variable name="bibitems_hidden" select="xalan:nodeset($bibitems_hidden_)"/><xsl:template match="*[local-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(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'])"/>
 		<xsl:choose>
-			<xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
+			<!-- <xsl:when test="$external-destination != '' or not(key('bibitems_hidden', $current_bibitemid))"> --> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
+			<xsl:when test="$external-destination != '' or not($bibitems_hidden/*[local-name() ='bibitem'][@id = $current_bibitemid])"> <!-- if in the bibliography there is the item with @bibitemid (and not hidden), then create link (internal to the bibitem or external) -->
 				<fo:inline xsl:use-attribute-sets="eref-style">
 					<xsl:if test="@type = 'footnote'">
 						<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
@@ -8201,7 +8258,7 @@
 		<xsl:copy>
 			<xsl:copy-of select="@*"/>
 			<!-- copy all elements from bibliography except 'Normative references' (moved to 'sections') -->
-			<xsl:for-each select="*[not(@normative='true') and not(*[*[@normative='true']])]">
+			<xsl:for-each select="*[not(@normative='true') and not(*[@normative='true'])]">
 				<xsl:sort select="@displayorder" data-type="number"/>
 				<xsl:apply-templates select="." mode="update_xml_step1"/>
 			</xsl:for-each>
@@ -8240,7 +8297,8 @@
 			<xsl:variable name="position"><xsl:number count="*[local-name() = $local_name][@bibitemid = $bibitemid]" level="any"/></xsl:variable>
 			<xsl:if test="normalize-space($position) = '1'">
 				<xsl:variable name="fn_text">
-					<xsl:copy-of select="key('bibitems', $bibitemid)[1]/*[local-name() = 'note'][not(@type='Unpublished-Status')][normalize-space() = $localized_string_withdrawn or starts-with(normalize-space(), $localized_string_cancelled_and_replaced)]/node()"/>
+					<!-- <xsl:copy-of select="key('bibitems', $bibitemid)[1]/*[local-name() = 'note'][not(@type='Unpublished-Status')][normalize-space() = $localized_string_withdrawn or starts-with(normalize-space(), $localized_string_cancelled_and_replaced)]/node()" /> -->
+					<xsl:copy-of select="$bibitems/*[local-name() ='bibitem'][@id = $bibitemid][1]/*[local-name() = 'note'][not(@type='Unpublished-Status')][normalize-space() = $localized_string_withdrawn or starts-with(normalize-space(), $localized_string_cancelled_and_replaced)]/node()"/>
 				</xsl:variable>
 				<xsl:if test="normalize-space($fn_text) != ''">
 					<xsl:element name="fn" namespace="{$namespace_full}">
@@ -8511,22 +8569,25 @@
 		<xsl:param name="pText" select="."/>
 		<xsl:param name="sep" select="','"/>
 		<xsl:param name="normalize-space" select="'true'"/>
+		<xsl:param name="keep_sep" select="'false'"/>
 		<xsl:if test="string-length($pText) &gt;0">
-		<item>
-			<xsl:choose>
-				<xsl:when test="$normalize-space = 'true'">
-					<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
-				</xsl:otherwise>
-			</xsl:choose>
-		</item>
-		<xsl:call-template name="split">
-			<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
-			<xsl:with-param name="sep" select="$sep"/>
-			<xsl:with-param name="normalize-space" select="$normalize-space"/>
-		</xsl:call-template>
+			<item>
+				<xsl:choose>
+					<xsl:when test="$normalize-space = 'true'">
+						<xsl:value-of select="normalize-space(substring-before(concat($pText, $sep), $sep))"/>
+					</xsl:when>
+					<xsl:otherwise>
+						<xsl:value-of select="substring-before(concat($pText, $sep), $sep)"/>
+					</xsl:otherwise>
+				</xsl:choose>
+			</item>
+			<xsl:if test="$keep_sep = 'true' and contains($pText, $sep)"><item><xsl:value-of select="$sep"/></item></xsl:if>
+			<xsl:call-template name="split">
+				<xsl:with-param name="pText" select="substring-after($pText, $sep)"/>
+				<xsl:with-param name="sep" select="$sep"/>
+				<xsl:with-param name="normalize-space" select="$normalize-space"/>
+				<xsl:with-param name="keep_sep" select="$keep_sep"/>
+			</xsl:call-template>
 		</xsl:if>
 	</xsl:template><xsl:template name="getDocumentId">		
 		<xsl:call-template name="getLang"/><xsl:value-of select="//*[local-name() = 'p'][1]/@id"/>

data/lib/metanorma/iso/boilerplate-fr.xml

@@ -1,11 +1,11 @@
 <boilerplate>
   <copyright-statement>
     <clause>
-      <title>DOCUMENT PROTÉGÉ PAR COPYRIGHT</title>
     <p id="boilerplate-year">&#xa9; {{ agency }} {{ docyear }}</p>
 
   <p id="boilerplate-message">
-Droits de reproduction réservés. Sauf indication contraire, aucune partie de cette publication ne
+    Droits de reproduction réservés. Sauf indication contraire, ou requise dans le cadre de sa mise en œuvre,
+    aucune partie de cette publication ne
 peut être reproduite ni utilisée sous quelque forme que ce soit et par aucun procédé, électronique
 ou mécanique, y compris la photocopie, l’affichage sur l’internet ou sur un Intranet, sans
 autorisation écrite préalable. Les demandes d’autorisation peuvent être adressées à l’ISO à
@@ -14,10 +14,9 @@ l’adresse ci-après ou au comité membre de l’ISO dans le pays du demandeur.
 
   <p id="boilerplate-address" align="left">
     ISO copyright office<br/>
-    Ch. de Blandonnet 8 &#x2022; CP 401<br/>
-    CH-1214 Vernier, Geneva, Switzerland<br/>
-    Tel.&#xa0;&#xa0;+ 41 22 749 01 11<br/>
-    Fax&#xa0;&#xa0;+ 41 22 749 09 47<br/>
+    CP 401 &#x2022; Ch. de Blandonnet 8<br/>
+    CH-1214 Vernier, Geneva<br/>
+    Tél.&#xa0;&#xa0;+ 41 22 749 01 11<br/>
     Email: copyright@iso.org<br/>
     Website: www.iso.org
   </p>

data/lib/metanorma/iso/boilerplate-ru.xml

@@ -1,21 +1,19 @@
 <boilerplate>
   <copyright-statement>
     <clause>
-      <title>ДОКУМЕНТ, ОХРАНЯЕМЫЙ АВТОРСКИМ ПРАВОМ</title>
     <p id="boilerplate-year">
     &#xa9; {{ agency }} {{ docyear }}
   </p>
 
   <p id="boilerplate-message">
-    Все права защищены. Если иначе не определено, никакая часть этой публикации не может быть воспроизведена или использована иначе в любой форме или каким-либо образом, электронным или механическим, включая фотокопирование, или публикацию в Интернете или интранете, без предварительного письменного разрешения. Разрешение может быть запрошено ISO по адресу, указанному ниже, или у органа — члена ISO страны запрашивающего.
+    Все права защищены. Если иначе не определено или не требуется в контексте его реализации, никакая часть этой публикации не может быть воспроизведена или использована иначе в любой форме или каким-либо образом, электронным или механическим, включая фотокопирование, или публикацию в Интернете или интранете, без предварительного письменного разрешения. Разрешение может быть запрошено ISO по адресу, указанному ниже, или у органа — члена ISO страны запрашивающего.
   </p>
 
   <p id="boilerplate-address" align="left">
     Бюро ISO по охране авторских прав<br/>
-    Ch. de Blandonnet 8 &#x2022; CP 401<br/>
-    CH-1214 Vernier, Geneva, Switzerland<br/>
-    Tel.&#xa0;&#xa0;+ 41 22 749 01 11<br/>
-    Fax&#xa0;&#xa0;+ 41 22 749 09 47<br/>
+    CP 401 &#x2022; Ch. de Blandonnet 8<br/>
+    CH-1214 Vernier, Geneva<br/>
+    Тел.&#xa0;&#xa0;+ 41 22 749 01 11<br/>
     Электронная почта: copyright@iso.org<br/>
     Сайт: www.iso.org
   </p>

data/lib/metanorma/iso/boilerplate.xml

@@ -1,14 +1,14 @@
 <boilerplate>
   <copyright-statement>
     <clause>
-      <title>COPYRIGHT PROTECTED DOCUMENT</title>
     <p id="boilerplate-year">
     &#xa9; {{ agency }} {{ docyear }}
   </p>
 
   <p id="boilerplate-message">
     All rights
-reserved. Unless otherwise specified, no part of this publication may be
+    reserved. Unless otherwise specified, or required in the context of its implementation,
+    no part of this publication may be
 reproduced or utilized otherwise in any form or by any means, electronic or
 mechanical, including photocopying, or posting on the internet or an intranet,
 without prior written permission. Permission can be requested from either ISO
@@ -17,10 +17,9 @@ at the address below or ISO's member body in the country of the requester.
 
   <p id="boilerplate-address" align="left">
     ISO copyright office<br/>
-    Ch. de Blandonnet 8 &#x2022; CP 401<br/>
-    CH-1214 Vernier, Geneva, Switzerland<br/>
-    Tel.&#xa0;&#xa0;+ 41 22 749 01 11<br/>
-    Fax&#xa0;&#xa0;+ 41 22 749 09 47<br/>
+    CP 401 &#x2022; Ch. de Blandonnet 8<br/>
+    CH-1214 Vernier, Geneva<br/>
+    Phone:&#xa0;&#xa0;+ 41 22 749 01 11<br/>
     Email: copyright@iso.org<br/>
     Website: www.iso.org
   </p>

data/lib/metanorma/iso/cleanup.rb

@@ -165,8 +165,7 @@ module Metanorma
       def withdrawn_note(xmldoc)
         xmldoc.xpath("//bibitem[not(note[@type = 'Unpublished-Status'])]")
           .each do |b|
-            next if pub_class(b) > 2
-            next unless (s = b.at("./status/stage")) && (s.text.to_i >= 90)
+            next unless withdrawn_ref?(b)
 
             if id = replacement_standard(b)
               insert_unpub_note(b, @i18n.cancelled_and_replaced.sub(/%/, id))
@@ -176,6 +175,13 @@ module Metanorma
           end
       end
 
+      def withdrawn_ref?(biblio)
+        return false if pub_class(biblio) > 2
+
+        (s = biblio.at("./status/stage")) && (s.text.to_i == 95) &&
+          (t = biblio.at("./status/substage")) && (t.text.to_i == 99)
+      end
+
       def replacement_standard(biblio)
         r = biblio.at("./relation[@type = 'updates']/bibitem") or return nil
         id = r.at("./formattedref | ./docidentifier[@primary = 'true'] | "\

data/lib/metanorma/iso/front_id.rb

@@ -39,6 +39,7 @@ module Metanorma
         ret = STAGE_ABBRS[stage.to_sym]
         ret = "PRF" if stage == "60" && substage == "00"
         ret = "AWI" if stage == "10" && substage == "99"
+        ret = "AWI" if stage == "20" && substage == "00"
         if %w(amendment technical-corrigendum technical-report
               technical-specification).include?(doctype)
           ret = "D" if stage == "40" && doctype == "amendment"

data/lib/metanorma/iso/validate_list.rb

@@ -43,6 +43,7 @@ module Metanorma
 
       def skip_list_punctuation(list)
         return true if list.at("./ancestor::table")
+        return true if list.at("./following-sibling::term") # terms boilerplate
 
         list.xpath(".//li").each do |entry|
           l = entry.dup
@@ -65,7 +66,7 @@ module Metanorma
 
       # if first list entry starts lowercase, treat as sentence broken up
       def list_after_colon_punctuation(list, entries)
-        lower = list.at(".//li").text.match?(/^[^A-Za-z]*[a-z]/)
+        lower = starts_lowercase?(list.at(".//li").text)
         entries.each_with_index do |li, i|
           if lower
             list_semicolon_phrase(li, i == entries.size - 1)
@@ -77,10 +78,14 @@ module Metanorma
 
       def list_semicolon_phrase(elem, last)
         text = elem.text.strip
-        text.match?(/^[^A-Za-z]*[a-z]/) or
+        starts_lowercase?(text) or
           style_warning(elem, "List entry of broken up sentence must start "\
                               "with lowercase letter", text)
-        punct = text.sub(/^.*?(\S)\s*$/, "\\1")
+        list_semicolon_phrase_punct(elem, text, last)
+      end
+
+      def list_semicolon_phrase_punct(elem, text, last)
+        punct = text.strip.sub(/^.*?(\S)$/m, "\\1")
         if last
           punct == "." or
             style_warning(elem, "Final list entry of broken up "\
@@ -94,14 +99,24 @@ module Metanorma
 
       def list_full_sentence(elem)
         text = elem.text.strip
-        text.match?(/^[^A-Za-z]*[A-Z]/) or
+        starts_uppercase?(text) or
           style_warning(elem, "List entry of separate sentences must start "\
                               "with uppercase letter", text)
-        punct = text.sub(/^.*?(\S)\s*$/, "\\1")
+        punct = text.strip.sub(/^.*?(\S)$/m, "\\1")
         punct == "." or
           style_warning(elem, "List entry of separate sentences must "\
                               "end with full stop", text)
       end
+
+      # allow that all-caps word (acronym) is agnostic as to lowercase
+      def starts_lowercase?(text)
+        text.match?(/^[^[[:upper:]][[:lower:]]]*[[:lower:]]/) ||
+          text.match?(/^[^[[:upper:]][[:lower:]]]*[[:upper:]][[:upper:]]+[^[[:alpha:]]]/)
+      end
+
+      def starts_uppercase?(text)
+        text.match?(/^[^[[:upper:]][[:lower:]]]*[[:upper:]]/)
+      end
     end
   end
 end

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module ISO
-    VERSION = "2.0.5".freeze
+    VERSION = "2.0.6".freeze
   end
 end

data/metanorma-iso.gemspec

@@ -46,6 +46,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sassc", "2.4.0"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "vcr", "~> 5.0.0"
+  spec.add_development_dependency "vcr", "~> 6.1.0"
   spec.add_development_dependency "webmock"
 end

data/spec/metanorma/base_spec.rb

@@ -890,7 +890,6 @@ RSpec.describe Metanorma::ISO do
                     </organization>
                   </contributor>
                   <edition>3</edition>
-                  <note type='Unpublished-Status'><p>Withdrawn.</p></note>
                   <language>en</language>
                   <language>fr</language>
                   <script>Latn</script>

data/spec/metanorma/cleanup_spec.rb

@@ -1247,13 +1247,13 @@ RSpec.describe Metanorma::ISO do
               <li>
                 <p id='_'>
                   ISO Online browsing platform: available at
-                  <link target='http://www.iso.org/obp'/>.
+                  <link target='https://www.iso.org/obp'/>
                 </p>
               </li>
               <li>
                 <p id='_'>
                   IEC Electropedia: available at
-                  <link target='http://www.electropedia.org'/>.
+                  <link target='https://www.electropedia.org'/>
                 </p>
               </li>
             </ul>
@@ -1296,13 +1296,13 @@ RSpec.describe Metanorma::ISO do
                 <li>
                   <p id='_'>
                     ISO Online browsing platform: available at
-                    <link target='http://www.iso.org/obp'/>.
+                    <link target='https://www.iso.org/obp'/>
                   </p>
                 </li>
                 <li>
                   <p id='_'>
                     IEC Electropedia: available at
-                    <link target='http://www.electropedia.org'/>.
+                    <link target='https://www.electropedia.org'/>
                   </p>
                 </li>
               </ul>
@@ -1360,13 +1360,13 @@ RSpec.describe Metanorma::ISO do
                   <li>
                     <p id='_'>
                       ISO Online browsing platform: available at
-                      <link target='http://www.iso.org/obp'/>.
+                      <link target='https://www.iso.org/obp'/>
                     </p>
                   </li>
                   <li>
                     <p id='_'>
                       IEC Electropedia: available at
-                      <link target='http://www.electropedia.org'/>.
+                      <link target='https://www.electropedia.org'/>
                     </p>
                   </li>
                 </ul>
@@ -1427,13 +1427,13 @@ RSpec.describe Metanorma::ISO do
                   <li>
                     <p id='_'>
                       ISO Online browsing platform: available at
-                      <link target='http://www.iso.org/obp'/>.
+                      <link target='https://www.iso.org/obp'/>
                     </p>
                   </li>
                   <li>
                     <p id='_'>
                       IEC Electropedia: available at
-                      <link target='http://www.electropedia.org'/>.
+                      <link target='https://www.electropedia.org'/>
                     </p>
                   </li>
                 </ul>
@@ -1485,13 +1485,13 @@ RSpec.describe Metanorma::ISO do
               <li>
                 <p id='_'>
                   ISO Online browsing platform: available at
-                  <link target='http://www.iso.org/obp'/>.
+                  <link target='https://www.iso.org/obp'/>
                 </p>
               </li>
               <li>
                 <p id='_'>
                   IEC Electropedia: available at
-                  <link target='http://www.electropedia.org'/>.
+                  <link target='https://www.electropedia.org'/>
                 </p>
               </li>
             </ul>