metanorma-iso 2.8.8 → 2.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3feba60243e28200db99f1d58d826226b0a6db5777abce47ae4342e75198d4d
-  data.tar.gz: 89fd5129e4a4eafdd1397e242346daf5ae24b80f62f8d63a4feb65c533878dcf
+  metadata.gz: cddf2aa3ff6244b6b2c71735ff0d0fadf3c09781f175a911acdd329fb0a1d8a4
+  data.tar.gz: c8349e9a17b898ec039710f1db1129f771e138fd3f2d1aabd10831fb37a88c31
 SHA512:
-  metadata.gz: 75e8297afc70aa9a5ae95ef2bad3178cbb9193f4ba00dee94006a3cf596493500827a14d7e35fea021bd599167412ceede99bb7c5161ce0c5e569e112f9b2ff4
-  data.tar.gz: '09486f7131b7f2d520aa825b59554010637d6f618f52a8b8434bf0ae924665def9838c708fa89dd77336d3ed3b4bd24930ee663fe4a77a355354227783446ff0'
+  metadata.gz: 044e820c2a45d6e90e0d56edbf546ee3edf9413ae4430abbcd142f56d0b4b1e0f08245b3873565aa4700b9d18f12259f4583208483cbf0377e9d3a94b0724f19
+  data.tar.gz: f14bfec47073d66be2b55a84c19be102c24797c4bbbc878bc41253d99f2f6bc6be9cd39a50f47ec341c5232f29f370dc158655974710feab7e1032de2139da34

data/lib/isodoc/iso/html/word_iso_intro-dis.html

@@ -1,7 +1,9 @@
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}
 {% else %}
 
-<div id="boilerplate-copyright-destination"/>
-
+<div id="boilerplate-copyright-destination">
+<div id="boilerplate-copyright-default-destination"/>
+<div id="boilerplate-copyright-append-destination"/>
+</div>
 
 {% endif %}

data/lib/isodoc/iso/html/word_iso_intro.html

@@ -1,8 +1,11 @@
+<div id="boilerplate-copyright-destination">
 <div style='mso-element:para-border-div;border:solid windowtext 1.0pt;
 border-bottom-alt:solid windowtext .5pt;mso-border-top-alt:solid windowtext .5pt;mso-border-left-alt:
 solid windowtext .5pt;mso-border-right-alt:solid windowtext .5pt;padding:1.0pt 4.0pt 0cm 4.0pt;
 margin-left:5.1pt;margin-right:5.1pt'>
-<div id="boilerplate-copyright-destination"/>
+<div id="boilerplate-copyright-default-destination"/>
+</div>
+<div id="boilerplate-copyright-append-destination"/>
 </div>
 
 {% if doctype == "Amendment" or doctype == "Technical Corrigendum" %}

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

@@ -9207,10 +9207,14 @@
 				<xsl:variable name="fn_styles">
 					<xsl:choose>
 						<xsl:when test="ancestor::*[local-name() = 'bibitem']">
-							<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style"/>
+							<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
+
+							</fn_styles>
 						</xsl:when>
 						<xsl:otherwise>
-							<fn_styles xsl:use-attribute-sets="fn-num-style"/>
+							<fn_styles xsl:use-attribute-sets="fn-num-style">
+
+							</fn_styles>
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:variable>
@@ -12185,6 +12189,7 @@
 					<xsl:if test="string-length(normalize-space()) &lt; 30 and not(contains(normalize-space(), 'http://')) and not(contains(normalize-space(), 'https://')) and not(ancestor::*[local-name() = 'table' or local-name() = 'dl'])">
 						<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
 					</xsl:if>
+
 					<xsl:if test="parent::*[local-name() = 'add']">
 						<xsl:call-template name="append_add-style"/>
 					</xsl:if>
@@ -12295,44 +12300,44 @@
 
 	<xsl:template match="*[local-name() = 'note']" name="note">
 
-		<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
+				<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
 
-			<xsl:call-template name="setBlockSpanAll"/>
+					<xsl:call-template name="setBlockSpanAll"/>
 
-			<xsl:call-template name="refine_note-style"/>
+					<xsl:call-template name="refine_note-style"/>
 
-			<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
+					<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 
-						<fo:block>
+								<fo:block>
 
-							<xsl:call-template name="refine_note_block_style"/>
+									<xsl:call-template name="refine_note_block_style"/>
 
-							<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
+									<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
 
-								<xsl:call-template name="refine_note-name-style"/>
+										<xsl:call-template name="refine_note-name-style"/>
 
-								<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
-								<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
-								<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
-									<xsl:call-template name="append_add-style"/>
-								</xsl:if>
+										<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
+										<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
+										<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
+											<xsl:call-template name="append_add-style"/>
+										</xsl:if>
 
-								<!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
-								<xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
-									<xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
-										<xsl:with-param name="skip">false</xsl:with-param>
-									</xsl:apply-templates>
-								</xsl:if>
+										<!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
+										<xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
+											<xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
+												<xsl:with-param name="skip">false</xsl:with-param>
+											</xsl:apply-templates>
+										</xsl:if>
 
-								<xsl:apply-templates select="*[local-name() = 'name']"/>
+										<xsl:apply-templates select="*[local-name() = 'name']"/>
 
-							</fo:inline>
+									</fo:inline>
 
-							<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
-						</fo:block>
+									<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+								</fo:block>
 
-			</fo:block-container>
-		</fo:block-container>
+					</fo:block-container>
+				</fo:block-container>
 
 	</xsl:template>
 
@@ -14770,6 +14775,7 @@
 			</xsl:when>
 			<xsl:when test="contains(normalize-space($fo_element), 'block')">
 				<fo:block xsl:use-attribute-sets="example-name-style">
+
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:when>
@@ -14785,6 +14791,7 @@
 
 	<xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name']">
 		<fo:inline xsl:use-attribute-sets="example-name-style">
+
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
@@ -15166,12 +15173,14 @@
 
 			<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'preferred'])"> <!-- if first preffered in term, then display term's name -->
 				<fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
+
 					<xsl:apply-templates select="ancestor::*[local-name() = 'term'][1]/*[local-name() = 'name']"/>
 				</fo:block>
 			</xsl:if>
 
 			<fo:block xsl:use-attribute-sets="preferred-term-style" role="SKIP">
 				<xsl:call-template name="setStyle_preferred"/>
+
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:block>
@@ -18312,9 +18321,10 @@
 	<xsl:template name="insertBackgroundPageImage">
 		<xsl:param name="number">1</xsl:param>
 		<xsl:param name="name">coverpage-image</xsl:param>
+		<xsl:param name="suffix"/>
 		<xsl:variable name="num" select="number($number)"/>
 		<!-- background image -->
-		<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0" id="__internal_layout__coverpage_{$name}_{$number}_{generate-id()}">
+		<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0" id="__internal_layout__coverpage{$suffix}_{$name}_{$number}_{generate-id()}">
 			<fo:block>
 				<xsl:for-each select="/*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = $name][1]/*[local-name() = 'value']/*[local-name() = 'image'][$num]">
 					<xsl:choose>
@@ -18380,16 +18390,29 @@
 
 	<!-- END: insert cover page image -->
 
+	<xsl:variable name="regex_ja_spec">[\uFF08\uFF09]</xsl:variable>
 	<xsl:template name="insertVerticalChar">
 		<xsl:param name="str"/>
+		<xsl:param name="writing-mode">lr-tb</xsl:param>
+		<xsl:param name="reference-orientation">90</xsl:param>
 		<xsl:if test="string-length($str) &gt; 0">
-			<fo:inline-container writing-mode="lr-tb" text-align="center" alignment-baseline="central" reference-orientation="90" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm">
+			<fo:inline-container text-align="center" alignment-baseline="central" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm">
+				<xsl:if test="normalize-space($writing-mode) != ''">
+					<xsl:attribute name="writing-mode"><xsl:value-of select="$writing-mode"/></xsl:attribute>
+					<xsl:attribute name="reference-orientation">90</xsl:attribute>
+				</xsl:if>
+				<xsl:variable name="char" select="substring($str,1,1)"/>
+				<xsl:if test="normalize-space(java:matches(java:java.lang.String.new($char), concat('(', $regex_ja_spec, '{1,})'))) = 'true'">
+					<xsl:attribute name="reference-orientation">0</xsl:attribute>
+				</xsl:if>
 				<fo:block-container width="1em">
-						<fo:block line-height="1em"><xsl:value-of select="substring($str,1,1)"/></fo:block>
+						<fo:block line-height="1em"><xsl:value-of select="$char"/></fo:block>
 				</fo:block-container>
 			</fo:inline-container>
 			<xsl:call-template name="insertVerticalChar">
 				<xsl:with-param name="str" select="substring($str, 2)"/>
+				<xsl:with-param name="writing-mode" select="$writing-mode"/>
+				<xsl:with-param name="reference-orientation" select="$reference-orientation"/>
 			</xsl:call-template>
 		</xsl:if>
 	</xsl:template>

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

@@ -9207,10 +9207,14 @@
 				<xsl:variable name="fn_styles">
 					<xsl:choose>
 						<xsl:when test="ancestor::*[local-name() = 'bibitem']">
-							<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style"/>
+							<fn_styles xsl:use-attribute-sets="bibitem-note-fn-style">
+
+							</fn_styles>
 						</xsl:when>
 						<xsl:otherwise>
-							<fn_styles xsl:use-attribute-sets="fn-num-style"/>
+							<fn_styles xsl:use-attribute-sets="fn-num-style">
+
+							</fn_styles>
 						</xsl:otherwise>
 					</xsl:choose>
 				</xsl:variable>
@@ -12185,6 +12189,7 @@
 					<xsl:if test="string-length(normalize-space()) &lt; 30 and not(contains(normalize-space(), 'http://')) and not(contains(normalize-space(), 'https://')) and not(ancestor::*[local-name() = 'table' or local-name() = 'dl'])">
 						<xsl:attribute name="keep-together.within-line">always</xsl:attribute>
 					</xsl:if>
+
 					<xsl:if test="parent::*[local-name() = 'add']">
 						<xsl:call-template name="append_add-style"/>
 					</xsl:if>
@@ -12295,44 +12300,44 @@
 
 	<xsl:template match="*[local-name() = 'note']" name="note">
 
-		<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
+				<fo:block-container id="{@id}" xsl:use-attribute-sets="note-style" role="SKIP">
 
-			<xsl:call-template name="setBlockSpanAll"/>
+					<xsl:call-template name="setBlockSpanAll"/>
 
-			<xsl:call-template name="refine_note-style"/>
+					<xsl:call-template name="refine_note-style"/>
 
-			<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
+					<fo:block-container margin-left="0mm" margin-right="0mm" role="SKIP">
 
-						<fo:block>
+								<fo:block>
 
-							<xsl:call-template name="refine_note_block_style"/>
+									<xsl:call-template name="refine_note_block_style"/>
 
-							<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
+									<fo:inline xsl:use-attribute-sets="note-name-style" role="SKIP">
 
-								<xsl:call-template name="refine_note-name-style"/>
+										<xsl:call-template name="refine_note-name-style"/>
 
-								<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
-								<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
-								<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
-									<xsl:call-template name="append_add-style"/>
-								</xsl:if>
+										<!-- if 'p' contains all text in 'add' first and last elements in first p are 'add' -->
+										<!-- <xsl:if test="*[not(local-name()='name')][1][node()[normalize-space() != ''][1][local-name() = 'add'] and node()[normalize-space() != ''][last()][local-name() = 'add']]"> -->
+										<xsl:if test="*[not(local-name()='name')][1][count(node()[normalize-space() != '']) = 1 and *[local-name() = 'add']]">
+											<xsl:call-template name="append_add-style"/>
+										</xsl:if>
 
-								<!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
-								<xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
-									<xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
-										<xsl:with-param name="skip">false</xsl:with-param>
-									</xsl:apply-templates>
-								</xsl:if>
+										<!-- if note contains only one element and first and last childs are `add` ace-tag, then move start ace-tag before NOTE's name-->
+										<xsl:if test="count(*[not(local-name() = 'name')]) = 1 and *[not(local-name() = 'name')]/node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]">
+											<xsl:apply-templates select="*[not(local-name() = 'name')]/node()[1][local-name() = 'add'][starts-with(text(), $ace_tag)]">
+												<xsl:with-param name="skip">false</xsl:with-param>
+											</xsl:apply-templates>
+										</xsl:if>
 
-								<xsl:apply-templates select="*[local-name() = 'name']"/>
+										<xsl:apply-templates select="*[local-name() = 'name']"/>
 
-							</fo:inline>
+									</fo:inline>
 
-							<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
-						</fo:block>
+									<xsl:apply-templates select="node()[not(local-name() = 'name')]"/>
+								</fo:block>
 
-			</fo:block-container>
-		</fo:block-container>
+					</fo:block-container>
+				</fo:block-container>
 
 	</xsl:template>
 
@@ -14770,6 +14775,7 @@
 			</xsl:when>
 			<xsl:when test="contains(normalize-space($fo_element), 'block')">
 				<fo:block xsl:use-attribute-sets="example-name-style">
+
 					<xsl:apply-templates/>
 				</fo:block>
 			</xsl:when>
@@ -14785,6 +14791,7 @@
 
 	<xsl:template match="*[local-name() = 'table']/*[local-name() = 'example']/*[local-name() = 'name']">
 		<fo:inline xsl:use-attribute-sets="example-name-style">
+
 			<xsl:apply-templates/>
 		</fo:inline>
 	</xsl:template>
@@ -15166,12 +15173,14 @@
 
 			<xsl:if test="parent::*[local-name() = 'term'] and not(preceding-sibling::*[local-name() = 'preferred'])"> <!-- if first preffered in term, then display term's name -->
 				<fo:block xsl:use-attribute-sets="term-name-style" role="SKIP">
+
 					<xsl:apply-templates select="ancestor::*[local-name() = 'term'][1]/*[local-name() = 'name']"/>
 				</fo:block>
 			</xsl:if>
 
 			<fo:block xsl:use-attribute-sets="preferred-term-style" role="SKIP">
 				<xsl:call-template name="setStyle_preferred"/>
+
 				<xsl:apply-templates/>
 			</fo:block>
 		</fo:block>
@@ -18312,9 +18321,10 @@
 	<xsl:template name="insertBackgroundPageImage">
 		<xsl:param name="number">1</xsl:param>
 		<xsl:param name="name">coverpage-image</xsl:param>
+		<xsl:param name="suffix"/>
 		<xsl:variable name="num" select="number($number)"/>
 		<!-- background image -->
-		<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0" id="__internal_layout__coverpage_{$name}_{$number}_{generate-id()}">
+		<fo:block-container absolute-position="fixed" left="0mm" top="0mm" font-size="0" id="__internal_layout__coverpage{$suffix}_{$name}_{$number}_{generate-id()}">
 			<fo:block>
 				<xsl:for-each select="/*[contains(local-name(), '-standard')]/*[local-name() = 'metanorma-extension']/*[local-name() = 'presentation-metadata'][*[local-name() = 'name'] = $name][1]/*[local-name() = 'value']/*[local-name() = 'image'][$num]">
 					<xsl:choose>
@@ -18380,16 +18390,29 @@
 
 	<!-- END: insert cover page image -->
 
+	<xsl:variable name="regex_ja_spec">[\uFF08\uFF09]</xsl:variable>
 	<xsl:template name="insertVerticalChar">
 		<xsl:param name="str"/>
+		<xsl:param name="writing-mode">lr-tb</xsl:param>
+		<xsl:param name="reference-orientation">90</xsl:param>
 		<xsl:if test="string-length($str) &gt; 0">
-			<fo:inline-container writing-mode="lr-tb" text-align="center" alignment-baseline="central" reference-orientation="90" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm">
+			<fo:inline-container text-align="center" alignment-baseline="central" width="1em" margin="0" padding="0" text-indent="0mm" last-line-end-indent="0mm" start-indent="0mm" end-indent="0mm">
+				<xsl:if test="normalize-space($writing-mode) != ''">
+					<xsl:attribute name="writing-mode"><xsl:value-of select="$writing-mode"/></xsl:attribute>
+					<xsl:attribute name="reference-orientation">90</xsl:attribute>
+				</xsl:if>
+				<xsl:variable name="char" select="substring($str,1,1)"/>
+				<xsl:if test="normalize-space(java:matches(java:java.lang.String.new($char), concat('(', $regex_ja_spec, '{1,})'))) = 'true'">
+					<xsl:attribute name="reference-orientation">0</xsl:attribute>
+				</xsl:if>
 				<fo:block-container width="1em">
-						<fo:block line-height="1em"><xsl:value-of select="substring($str,1,1)"/></fo:block>
+						<fo:block line-height="1em"><xsl:value-of select="$char"/></fo:block>
 				</fo:block-container>
 			</fo:inline-container>
 			<xsl:call-template name="insertVerticalChar">
 				<xsl:with-param name="str" select="substring($str, 2)"/>
+				<xsl:with-param name="writing-mode" select="$writing-mode"/>
+				<xsl:with-param name="reference-orientation" select="$reference-orientation"/>
 			</xsl:call-template>
 		</xsl:if>
 	</xsl:template>

data/lib/isodoc/iso/word_cleanup.rb

@@ -110,26 +110,44 @@ module IsoDoc
       end
 
       def authority_cleanup(docxml)
-        insert = docxml.at("//div[@id = 'boilerplate-license-destination']")
-        auth = docxml.at("//div[@class = 'boilerplate-license']")&.remove
-        auth&.xpath(".//p[not(@class)]")&.each { |p| p["class"] = "zzWarning" }
-        auth and insert and insert.children = auth
-        insert = docxml.at("//div[@id = 'boilerplate-copyright-destination']")
-        auth = docxml.at("//div[@class = 'boilerplate-copyright']")&.remove
-        auth&.xpath(".//p[not(@class)]")&.each do |p|
-          p["class"] = "zzCopyright"
-        end
-        auth&.xpath(".//p[@id = 'boilerplate-message']")&.each do |p|
+        authority_license_cleanup(docxml)
+        authority_copyright_cleanup(docxml)
+        coverpage_note_cleanup(docxml)
+      end
+
+      def authority_copyright_cleanup(docxml)
+        auth = docxml.at("//div[@class = 'boilerplate-copyright']") or return
+        authority_copyright_style(auth)
+        authority_copyright_populate(docxml, auth)
+      end
+
+      def authority_copyright_style(auth)
+        auth.xpath(".//p[not(@class)]").each { |p| p["class"] = "zzCopyright" }
+        auth.xpath(".//p[@id = 'boilerplate-message']").each do |p|
           p["class"] = "zzCopyright1"
         end
-        auth&.xpath(".//p[@id = 'boilerplate-address']")&.each do |p|
+        auth.xpath(".//p[@id = 'boilerplate-address']").each do |p|
           p["class"] = "zzAddress"
         end
-        auth&.xpath(".//p[@id = 'boilerplate-place']")&.each do |p|
+        auth.xpath(".//p[@id = 'boilerplate-place']").each do |p|
           p["class"] = "zzCopyright1"
         end
-        auth and insert and insert.children = auth
-        coverpage_note_cleanup(docxml)
+      end
+
+      def authority_copyright_populate(doc, auth)
+        i = doc.at("//div[@id = 'boilerplate-copyright-default-destination']")
+        j = doc.at("//div[@id = 'boilerplate-copyright-append-destination']")
+        default = auth.at(".//div[@id = 'boilerplate-copyright-default']")
+        default and i and i.children = default.remove
+        j and j.children = auth.remove
+      end
+
+      def authority_license_cleanup(docxml)
+        dest = docxml.at("//div[@id = 'boilerplate-license-destination']") or
+          return
+        auth = docxml.at("//div[@class = 'boilerplate-license']") or return
+        auth.xpath(".//p[not(@class)]").each { |p| p["class"] = "zzWarning" }
+        dest.children = auth.remove
       end
 
       def word_cleanup(docxml)
@@ -142,9 +160,7 @@ module IsoDoc
       # supply missing annex title
       def make_WordToC(docxml, level)
         toc = ""
-        if source = docxml.at("//div[@class = 'TOC']")
-          toc = to_xml(source.children)
-        end
+        s = docxml.at("//div[@class = 'TOC']") and toc = to_xml(s.children)
         xpath = (1..level).each.map { |i| "//h#{i}" }.join (" | ")
         docxml.xpath(xpath).each do |h|
           x = ""

data/lib/isodoc/iso/xref_section.rb

@@ -7,7 +7,7 @@ module IsoDoc
         clause.at(ns("./clause")) and
           @anchors[clause["id"]] = { label: nil, level: 1, type: "clause",
                                      xref: clause.at(ns("./title"))&.text }
-        i = Counter.new(0, prefix: "0.")
+        i = Counter.new(0, prefix: "0")
         clause.xpath(ns("./clause")).each do |c|
           section_names1(c, i.increment(c).print, 2)
         end
@@ -26,7 +26,7 @@ module IsoDoc
             anchor_struct(i.print, nil, @labels["appendix"],
                           "clause").merge(level: 2, subtype: "annex",
                                           container: clause["id"])
-          j = Counter.new(0, prefix: "#{i.print}.")
+          j = Counter.new(0, prefix: i.print)
           c.xpath(ns("./clause | ./references")).each do |c1|
             lbl = "#{@labels['appendix']} #{j.increment(c1).print}"
             appendix_names1(c1, l10n(lbl), 3, clause["id"])
@@ -62,7 +62,7 @@ module IsoDoc
 
       def annex_names1(clause, num, level)
         annex_name_anchors1(clause, num, level)
-        i = Counter.new(0, prefix: "#{num}.")
+        i = Counter.new(0, prefix: num)
         clause.xpath(ns("./clause | ./references")).each do |c|
           annex_names1(c, i.increment(c).print, level + 1)
         end
@@ -71,7 +71,7 @@ module IsoDoc
       def appendix_names1(clause, num, level, container)
         @anchors[clause["id"]] = { label: num, xref: num, level: level,
                                    container: container }
-        i = Counter.new(0, prefix: "#{num}.")
+        i = Counter.new(0, prefix: num)
         clause.xpath(ns("./clause | ./references")).each do |c|
           appendix_names1(c, i.increment(c).print, level + 1, container)
         end

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

@@ -1,6 +1,7 @@
 == copyright-statement
 {% if document_scheme == "1951" %}
 
+[[boilerplate-copyright-default]]
 === REPRODUCTION INTERDITE
 
 [[boilerplate-message]]
@@ -20,6 +21,7 @@ nationales de normalisation.
 
 {% elsif document_scheme == "1972" or document_scheme == "1987" %}
 
+[[boilerplate-copyright-default]]
 === {blank}
 
 [[boilerplate-year]]
@@ -31,6 +33,7 @@ Publié en Suisse
 
 {% elsif document_scheme == "1989" %}
 
+[[boilerplate-copyright-default]]
 === {blank}
 
 [[boilerplate-year]]
@@ -53,6 +56,7 @@ Imprimé en Suisse
 
 
 {% else %}
+[[boilerplate-copyright-default]]
 === {% if stage_int >= 40 %}DOCUMENT PROTÉGÉ PAR COPYRIGHT{%else%}{blank}{%endif%}
 
 [[boilerplate-year]]

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

@@ -2,6 +2,7 @@
 
 {% if document_scheme == "1972" or document_scheme == "1987" %}
 
+[[boilerplate-copyright-default]]
 === {blank}
 
 [[boilerplate-year]]
@@ -12,6 +13,7 @@
 
 {% elsif document_scheme == "1989" %}
 
+[[boilerplate-copyright-default]]
 === {blank}
 
 [[boilerplate-year]]
@@ -34,6 +36,7 @@ X.400          c=ch; a=400net;
 
 {% else %}
 
+[[boilerplate-copyright-default]]
 === {% if stage_int >= 40 %}ДОКУМЕНТ, ОХРАНЯЕМЫЙ АВТОРСКИМ ПРАВОМ{% else %}{blank}{% endif %}
 
 [[boilerplate-year]]

data/lib/metanorma/iso/boilerplate.adoc

@@ -2,6 +2,7 @@
 
 {% if document_scheme == "1951" %}
 
+[[boilerplate-copyright-default]]
 === COPYRIGHT RESERVED
 
 [[boilerplate-message]]
@@ -20,6 +21,7 @@ Also issued in French and Russian. Copies to be obtained through the national st
 
 {% elsif document_scheme == "1972" or document_scheme == "1987" %}
 
+[[boilerplate-copyright-default]]
 === {blank}
 
 [[boilerplate-year]]
@@ -31,6 +33,7 @@ Printed in Switzerland
 
 {% elsif document_scheme == "1989" %}
 
+[[boilerplate-copyright-default]]
 === {blank}
 
 [[boilerplate-year]]
@@ -53,6 +56,7 @@ Printed in Switzerland
 
 {% else %}
 
+[[boilerplate-copyright-default]]
 === {% if stage_int >= 40 %}COPYRIGHT PROTECTED DOCUMENT{% else %}{blank}{% endif %}
 
 [[boilerplate-year]]

data/lib/metanorma/iso/front.rb

@@ -12,6 +12,10 @@ module Metanorma
     class Converter < Standoc::Converter
       def metadata_ext(node, xml)
         super
+        metadata_ext_iso(node, xml)
+      end
+
+      def metadata_ext_iso(node, xml)
         structured_id(node, xml)
         metadata_stage(node, xml)
         @amd && a = node.attr("updates-document-type") and

data/lib/metanorma/iso/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Iso
-    VERSION = "2.8.8".freeze
+    VERSION = "2.8.9".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iso
 version: !ruby/object:Gem::Version
-  version: 2.8.8
+  version: 2.8.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-14 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-standoc