metanorma-iec 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d54425dc5dce149f69cd97abd6ffcc133eaaca52dca3ebec74ca874fd3e4bff0
-  data.tar.gz: 527849fb1c470bb0b1e3a0e599e56623bf95e3f0b31c8cc2291f14dbd08ceef9
+  metadata.gz: c6defcf38222ffe2ca5af4f9369778ff3e879196a8bbde0c348d0c45f8a522d3
+  data.tar.gz: f1ee1d7a0938499d67c20dedc74a3a88e6ee7064afc5ab186885784ce037417a
 SHA512:
-  metadata.gz: 3dbfdab2f070389c60c00bb3542898a5df002a6d671613bd6f1ebdbe4da48599e60e9de93a8c0a52890ebad960353971e246d1fe3dc285935f4f881287a44bcb
-  data.tar.gz: 7f99027ac8a56eeea59a7a42cb73100bfe866d60d1cedce2fd82d5aa3ba7cabf7a85d12f45b26560d8eb5d4dc65eff5e46719340685a099253634a0dba8edaeb
+  metadata.gz: 0dd0dc87b5fcd7caba2e46bbe57a66b8a1e126d78d7f2a5ef44f466afa70630aacc0495d2478f9a052117cb4452d2171f9b73ee4615c5013284dd86d4cfa918c
+  data.tar.gz: 4a821ea60263a1f5a76be53b4732693e2e1e048ae7e927461691a7b077d7dbf32fdb3255bc28185ba579b7325657bd3533e286023ee54bc25b6e030bbec10d72

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

@@ -809,7 +809,7 @@ p.TermNum {
     width: 100%;
   }
 }
-div.figure > img, div.figure > svg {
+figure > img, figure > svg {
   margin-left: auto;
   margin-right: auto;
   display: block;
@@ -817,7 +817,7 @@ div.figure > img, div.figure > svg {
   height: auto;
 }
 
-table div.figure {
+table figure {
   padding: 0;
   margin: 0;
 }
@@ -1152,17 +1152,21 @@ p.NormRef, div.Biblio, div.NormRef {
   margin-left: 2em;
 }
 
+.Biblio.note, .Biblio.Note, .NormRef.note, .NormRef.Note {
+  margin-left: 3.5em;
+}
+
 /*
 3.6 Source Code + figures
 */
-.figure .SourceTitle,
+figure .SourceTitle,
 pre .SourceTitle,
 .pseudocode .SourceTitle {
   font-weight: 700;
   font-size: 1em;
   text-align: center;
 }
-.figure,
+figure,
 pre,
 .pseudocode {
   background-color: #f5faff;
@@ -1198,7 +1202,7 @@ pre {
   text-align: left;
 }
 
-.FigureTitle,
+figcaption,
 .SourceTitle {
   font-weight: 700;
   font-size: 1em;
@@ -1301,7 +1305,7 @@ table th {
   padding: 1em !important;
 }
 
-p.TableTitle {
+table > caption {
   text-align: center;
   margin-top: 2.5em;
   font-weight: 800;

data/lib/isodoc/iec/html/htmlstyle.scss

@@ -281,7 +281,7 @@ nav {
     }
 }
 
-div.figure > img, div.figure > svg {
+figure > img, figure > svg {
     margin-left: auto;
     margin-right: auto;
     display: block;
@@ -289,7 +289,7 @@ div.figure > img, div.figure > svg {
     height: auto;
 }
 
-table div.figure {
+table figure {
   padding: 0;
   margin: 0;
 }
@@ -524,11 +524,15 @@ p.NormRef, div.Biblio, div.NormRef {
     margin-left: 2em;
 }
 
+.Biblio.note, .Biblio.Note, .NormRef.note, .NormRef.Note {
+  margin-left: 3.5em;
+}
+
 /*
 3.6 Source Code + figures
 */
 
-.figure,
+figure,
 pre,
 .pseudocode {
     @include pseudocodeBlock(#f5faff);
@@ -543,7 +547,7 @@ pre {
 @include recommendationBlock();
 @include listBlock();
 
-.FigureTitle,
+figcaption,
 .SourceTitle {
     @include blockTitle()
 }
@@ -613,7 +617,7 @@ table {
     }
 }
 
-p.TableTitle {
+table > caption {
     text-align: center;
     margin-top: 2.5em;
     font-weight: 800;

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

@@ -1859,15 +1859,14 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 
 	<xsl:template match="mn:indexsect"/>
 	<xsl:template match="mn:indexsect" mode="index">
-
 		<fo:page-sequence master-reference="document" force-page-count="no-force">
 			<xsl:call-template name="insertHeaderFooter"/>
 			<fo:flow flow-name="xsl-region-body">
 				<fo:block id="{@id}" span="all">
-					<xsl:apply-templates select="mn:title"/>
+					<xsl:apply-templates select="mn:fmt-title"/>
 				</fo:block>
 				<fo:block role="Index">
-					<xsl:apply-templates select="*[not(self::mn:title)]"/>
+					<xsl:apply-templates select="*[not(self::mn:fmt-title)]"/>
 				</fo:block>
 			</fo:flow>
 		</fo:page-sequence>
@@ -3648,7 +3647,23 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 			<xsl:sort select="@displayorder" data-type="number"/>
 			<xsl:element name="page_sequence" namespace="{$namespace_full}">
 				<xsl:attribute name="main_page_sequence"/>
-				<xsl:apply-templates select="." mode="update_xml_step_move_pagebreak"/>
+
+				<!-- from common <xsl:template name="index-pages"> -->
+				<xsl:variable name="docid">
+					<xsl:call-template name="getDocumentId"/>
+				</xsl:variable>
+
+				<xsl:variable name="current_document_index_id">
+					<xsl:apply-templates select="." mode="index_add_id">
+						<xsl:with-param name="docid" select="$docid"/>
+					</xsl:apply-templates>
+				</xsl:variable>
+				<xsl:variable name="current_document_index">
+					<xsl:apply-templates select="xalan:nodeset($current_document_index_id)" mode="index_update"/>
+				</xsl:variable>
+
+				<!-- xalan:nodeset($current_document_index) -->
+				<xsl:apply-templates select="xalan:nodeset($current_document_index)" mode="update_xml_step_move_pagebreak"/>
 			</xsl:element>
 		</xsl:for-each>
 	</xsl:template>
@@ -4705,6 +4720,7 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 
 	<xsl:attribute-set name="tt-style">
 		<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
+		<xsl:attribute name="font-family">Courier New, <xsl:value-of select="$font_noto_sans_mono"/></xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_tt-style">
@@ -6477,6 +6493,11 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 			<!-- Display table's name before table as standalone block -->
 			<!-- $namespace = 'iso' or  -->
 			<xsl:apply-templates select="mn:fmt-name"/> <!-- table's title rendered before table -->
+			<xsl:if test="not(mn:fmt-name)"> <!-- for https://github.com/metanorma/mn-samples-jis/issues/75#issuecomment-3922169930 -->
+				<xsl:apply-templates select="mn:name">
+					<xsl:with-param name="process">true</xsl:with-param>
+				</xsl:apply-templates>
+			</xsl:if>
 			<xsl:call-template name="table_name_fn_display"/>
 
 			<xsl:variable name="cols-count" select="count(xalan:nodeset($simple-table)/*/mn:tr[1]/mn:td)"/>
@@ -6729,7 +6750,13 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 	</xsl:template>
 
 	<!-- table/name-->
-	<xsl:template match="*[local-name()='table']/mn:fmt-name">
+	<xsl:template match="mn:table[not(mn:fmt-name)]/mn:name"> <!-- for https://github.com/metanorma/mn-samples-jis/issues/75#issuecomment-3922169930 -->
+		<xsl:param name="process">false</xsl:param>
+		<xsl:if test="$process = 'true'">
+			<xsl:call-template name="table_name"/>
+		</xsl:if>
+	</xsl:template>
+	<xsl:template match="*[local-name()='table']/mn:fmt-name" name="table_name">
 		<xsl:param name="continued"/>
 		<xsl:param name="cols-count"/>
 		<xsl:if test="normalize-space() != ''">
@@ -7221,12 +7248,14 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 		<xsl:param name="colwidths"/>
 		<xsl:param name="colgroup"/>
 
-		<xsl:variable name="isNoteOrFnExist" select="../mn:note[not(@type = 'units')] or ../mn:example or ../mn:dl or ../mn:key or ..//mn:fn[not(parent::mn:fmt-name)] or ../mn:fmt-source or ../mn:p"/>
+		<xsl:variable name="isNoteOrFnExist" select="../mn:note[not(@type = 'units')] or       ../mn:example or       ../mn:dl or       ../mn:key or       (..//mn:fn[not(parent::mn:fmt-name)] and not(ancestor::mn:table[1]//mn:tfoot//mn:fmt-footnote-container)) or       ../mn:fmt-source or ../mn:p"/>
+		<!-- in JIS fmt-footnote-container renders in tfoot, so no need render fn in the separate table -->
 
-		<xsl:variable name="isNoteOrFnExistShowAfterTable">
+		<xsl:variable name="isNoteOrFnExistShowAfterTable_">
 		</xsl:variable>
+		<xsl:variable name="isNoteOrFnExistShowAfterTable" select="normalize-space($isNoteOrFnExistShowAfterTable_)"/>
 
-		<xsl:if test="$isNoteOrFnExist = 'true' or normalize-space($isNoteOrFnExistShowAfterTable) = 'true'">
+		<xsl:if test="$isNoteOrFnExist = 'true' or $isNoteOrFnExistShowAfterTable = 'true'">
 
 			<xsl:variable name="cols-count">
 				<xsl:choose>
@@ -12853,10 +12882,22 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 	<!-- End Highlight syntax styles -->
 
 	<!-- Index section styles -->
+
+	<xsl:attribute-set name="indexsect-region-body-style">
+		<xsl:attribute name="column-count">2</xsl:attribute>
+		<xsl:attribute name="column-gap">10mm</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:attribute-set name="indexsect-title-block-style">
+		<xsl:attribute name="role">SKIP</xsl:attribute>
+		<xsl:attribute name="span">all</xsl:attribute>
+	</xsl:attribute-set>
+
 	<xsl:attribute-set name="indexsect-title-style">
 		<xsl:attribute name="role">H1</xsl:attribute>
-		<xsl:attribute name="font-size">12pt</xsl:attribute>
 		<xsl:attribute name="font-weight">bold</xsl:attribute>
+		<xsl:attribute name="margin-bottom">24pt</xsl:attribute>
+		<xsl:attribute name="font-size">12pt</xsl:attribute>
 		<xsl:attribute name="margin-bottom">84pt</xsl:attribute>
 	</xsl:attribute-set> <!-- indexsect-title-style -->
 
@@ -12886,6 +12927,27 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 		</xsl:for-each>
 	</xsl:variable>
 
+	<xsl:template name="index-pages">
+		<xsl:variable name="num"><xsl:number level="any" count="mn:metanorma"/></xsl:variable>
+
+		<xsl:variable name="docid">
+			<xsl:call-template name="getDocumentId"/>
+		</xsl:variable>
+
+		<xsl:variable name="current_document_index_id">
+			<xsl:apply-templates select="//mn:indexsect" mode="index_add_id">
+				<xsl:with-param name="docid" select="$docid"/>
+			</xsl:apply-templates>
+		</xsl:variable>
+		<xsl:variable name="current_document_index">
+			<xsl:apply-templates select="xalan:nodeset($current_document_index_id)" mode="index_update"/>
+		</xsl:variable>
+
+		<xsl:apply-templates select="xalan:nodeset($current_document_index)" mode="index">
+			<xsl:with-param name="num" select="$num"/>
+		</xsl:apply-templates>
+	</xsl:template>
+
 	<xsl:template match="@*|node()" mode="index_add_id">
 		<xsl:param name="docid"/>
 		<xsl:copy>
@@ -12938,7 +13000,7 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 	<xsl:template match="mn:indexsect//mn:li" mode="index_update">
 		<xsl:copy>
 			<xsl:apply-templates select="@*" mode="index_update"/>
-		<xsl:apply-templates select="node()[not(self::mn:fmt-name)][1]" mode="process_li_element"/>
+			<xsl:apply-templates select="node()[not(self::mn:fmt-name)][1]" mode="process_li_element"/>
 		</xsl:copy>
 	</xsl:template>
 
@@ -13146,11 +13208,24 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 	<!-- End of Index processing -->
 	<!-- =================== -->
 
-		<!-- =================== -->
+	<xsl:attribute-set name="form-checkbox-style">
+		<xsl:attribute name="border">0.5pt solid black</xsl:attribute>
+		<xsl:attribute name="background-color">yellow</xsl:attribute>
+	</xsl:attribute-set>
+
+	<xsl:variable name="METANORMA_FORM_START_PREFIX">_metanorma_form_start</xsl:variable>
+	<xsl:variable name="METANORMA_FORM_ITEM_PREFIX">_metanorma_form_item_</xsl:variable>
+	<xsl:variable name="METANORMA_FORM_ITEM_BORDER">1pt solid black</xsl:variable>
+
+	<!-- =================== -->
 	<!-- Form's elements processing -->
 	<!-- =================== -->
 	<xsl:template match="mn:form">
 		<fo:block>
+			<fo:inline>
+				<xsl:attribute name="id"><xsl:value-of select="concat($METANORMA_FORM_START_PREFIX, '___', @id, '___', @name)"/></xsl:attribute>
+				<xsl:value-of select="$hair_space"/>
+			</fo:inline>
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template>
@@ -13159,7 +13234,23 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 		<fo:inline><xsl:apply-templates/></fo:inline>
 	</xsl:template>
 
-	<xsl:template match="mn:form//mn:input[@type = 'text' or @type = 'date' or @type = 'file' or @type = 'password']">
+	<xsl:template match="mn:form//mn:input[@type = 'text']">
+		<!-- add helper id for mn2pdf class FOPIFFormsHandler  (_metanorma_form_item_border_) -->
+		<fo:inline>
+			<xsl:call-template name="set_id_metanorma_form_item">
+				<xsl:with-param name="add_border_prefix">true</xsl:with-param>
+			</xsl:call-template>
+			<xsl:value-of select="$hair_space"/>
+		</fo:inline>
+		<fo:inline border="{$METANORMA_FORM_ITEM_BORDER}"><!-- don't remove, this border needs for mn2pdf FOPIFFormsHandler -->
+			<fo:inline>
+				<xsl:call-template name="set_id_metanorma_form_item"/>
+				<xsl:call-template name="text_input"/>
+			</fo:inline>
+		</fo:inline>
+	</xsl:template>
+
+	<xsl:template match="mn:form//mn:input[@type = 'date' or @type = 'file' or @type = 'password']">
 		<fo:inline>
 			<xsl:call-template name="text_input"/>
 		</fo:inline>
@@ -13191,7 +13282,20 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 	</xsl:template>
 
 	<xsl:template match="mn:form//mn:input[@type = 'checkbox']">
-		<fo:inline padding-right="1mm">
+		<xsl:variable name="form_item_type">checkbox</xsl:variable>
+		<!-- add helper id for mn2pdf class FOPIFFormsHandler  (_metanorma_form_item_border_) -->
+		<fo:inline>
+			<xsl:call-template name="set_id_metanorma_form_item">
+				<xsl:with-param name="form_item_type" select="$form_item_type"/>
+				<xsl:with-param name="add_border_prefix">true</xsl:with-param>
+			</xsl:call-template>
+			<xsl:value-of select="$hair_space"/>
+		</fo:inline>
+
+		<fo:inline border="{$METANORMA_FORM_ITEM_BORDER}"><!-- don't remove 'border', this border needs for mn2pdf FOPIFFormsHandler -->
+			<xsl:call-template name="set_id_metanorma_form_item">
+				<xsl:with-param name="form_item_type" select="$form_item_type"/>
+			</xsl:call-template>
 			<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%">
 				<xsl:attribute name="height">3.5mm</xsl:attribute>
 				<xsl:attribute name="content-width">100%</xsl:attribute>
@@ -13201,11 +13305,24 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 					<polyline points="0,0 80,0 80,80 0,80 0,0" stroke="black" stroke-width="5" fill="white"/>
 				</svg>
 			</fo:instream-foreign-object>
-		</fo:inline>
+		</fo:inline><fo:inline padding-right="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
 	</xsl:template>
 
 	<xsl:template match="mn:form//mn:input[@type = 'radio']">
-		<fo:inline padding-right="1mm">
+		<xsl:variable name="form_item_type">radiobutton</xsl:variable>
+		<!-- add helper id for mn2pdf class FOPIFFormsHandler  (_metanorma_form_item_border_) -->
+		<fo:inline>
+			<xsl:call-template name="set_id_metanorma_form_item">
+				<xsl:with-param name="form_item_type" select="$form_item_type"/>
+				<xsl:with-param name="add_border_prefix">true</xsl:with-param>
+			</xsl:call-template>
+			<xsl:value-of select="$hair_space"/>
+		</fo:inline>
+
+		<fo:inline border="{$METANORMA_FORM_ITEM_BORDER}"><!-- don't remove 'border', this border needs for mn2pdf FOPIFFormsHandler -->
+			<xsl:call-template name="set_id_metanorma_form_item">
+				<xsl:with-param name="form_item_type" select="$form_item_type"/>
+			</xsl:call-template>
 			<fo:instream-foreign-object fox:alt-text="Box" baseline-shift="-10%">
 				<xsl:attribute name="height">3.5mm</xsl:attribute>
 				<xsl:attribute name="content-width">100%</xsl:attribute>
@@ -13217,6 +13334,7 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 				</svg>
 			</fo:instream-foreign-object>
 		</fo:inline>
+		<fo:inline padding-right="1mm"><xsl:value-of select="$zero_width_space"/></fo:inline>
 	</xsl:template>
 
 	<xsl:template match="mn:form//mn:select">
@@ -13226,11 +13344,28 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 	</xsl:template>
 
 	<xsl:template match="mn:form//mn:textarea">
-		<fo:block-container border="1pt solid black" width="50%">
+		<fo:block-container border="{$METANORMA_FORM_ITEM_BORDER}" width="50%">
 			<fo:block> </fo:block>
 		</fo:block-container>
 	</xsl:template>
 
+	<xsl:template name="set_id_metanorma_form_item">
+		<xsl:param name="form_item_type">textfield</xsl:param>
+		<xsl:param name="add_border_prefix">false</xsl:param>
+		<xsl:variable name="border_prefix"><xsl:if test="normalize-space($add_border_prefix) = 'true'">border_</xsl:if></xsl:variable>
+		<xsl:if test="@id">
+			<!-- _metanorma_form_item_border____form_item_type___id___name___value -->
+			<!-- split by '___': [2] - form_item_type, [3] - id, [4] - name, [5] - value -->
+			<xsl:variable name="value">
+				<xsl:choose>
+					<xsl:when test="@type = 'checkbox'"><xsl:value-of select="normalize-space(@checked = 'true')"/><!-- true or false --></xsl:when>
+					<xsl:otherwise><xsl:value-of select="@value"/></xsl:otherwise>
+				</xsl:choose>
+			</xsl:variable>
+			<xsl:attribute name="id"><xsl:value-of select="concat($METANORMA_FORM_ITEM_PREFIX, $border_prefix, '___', $form_item_type, '___', @id, '___', @name, '___', $value)"/></xsl:attribute>
+		</xsl:if>
+	</xsl:template>
+
 	<!-- =================== -->
 	<!-- End Form's elements processing -->
 	<!-- =================== -->
@@ -13310,6 +13445,7 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 	</xsl:template>
 
 	<xsl:attribute-set name="toc-pagenumber-style">
+		<xsl:attribute name="role">SKIP</xsl:attribute>
 	</xsl:attribute-set>
 
 	<xsl:template name="refine_toc-pagenumber-style">
@@ -15187,7 +15323,12 @@ les coordonnées ci-après ou contactez le Comité national de l'IEC de votre pa
 		<xsl:variable name="external-destination" select="normalize-space(count($element_node/fo:basic-link/@external-destination[. != '']) = 1)"/>
 		<xsl:variable name="internal-destination" select="normalize-space(count($element_node/fo:basic-link/@internal-destination[. != '']) = 1)"/>
 		<xsl:choose>
-			<xsl:when test="$external-destination = 'true' or $internal-destination = 'true'">
+			<xsl:when test="$internal-destination = 'true'">
+				<fo:wrapper role="Reference">
+					<xsl:copy-of select="$element_node"/>
+				</fo:wrapper>
+			</xsl:when>
+			<xsl:when test="$external-destination = 'true'">
 				<xsl:copy-of select="$element_node"/>
 			</xsl:when>
 			<xsl:otherwise>

data/lib/metanorma/iec/basicdoc.rng

@@ -208,11 +208,15 @@ Applicable to modify and delete</a:documentation>
     </zeroOrMore>
     <optional>
       <element name="newcontent">
-        <a:documentation>New content to be added to the document; applicable to add and modify</a:documentation>
+        <a:documentation>New content to be added to the document; applicable to add and modify.
+Can be blocks and/or sections</a:documentation>
         <ref name="OptionalId"/>
         <zeroOrMore>
           <ref name="BasicBlock"/>
         </zeroOrMore>
+        <zeroOrMore>
+          <ref name="section"/>
+        </zeroOrMore>
       </element>
     </optional>
     <zeroOrMore>

data/lib/metanorma/iec/cleanup.rb

@@ -0,0 +1,100 @@
+module Metanorma
+  module Iec
+    class Cleanup < ::Metanorma::Iso::Cleanup
+      extend Forwardable
+      def copied_instance_variables
+        super + %i[is_iev]
+      end
+
+      def boilerplate_file(x_orig)
+        lang = case x_orig&.at("//bibdata/language")&.text
+               when "fr" then "fr"
+               else
+                 "en"
+               end
+        File.join(@libdir, "boilerplate-#{lang}.adoc")
+      end
+
+      def term_defs_boilerplate(div, source, term, preface, isodoc)
+        super unless @is_iev
+      end
+
+      def terms_terms_cleanup(xmldoc)
+        @is_iev and return
+        super
+      end
+
+      def sections_names_pref_cleanup(xml)
+        super
+        @is_iev and replace_title(xml, "//introduction",
+                                  @i18n&.introduction_iev)
+      end
+
+      # preserve ol/@type within boilerplate, not elsewhere in doc
+      def ol_cleanup(doc)
+        doc.xpath("//ol[@type]").each { |x| x.delete("type") }
+        if doc.at("//metanorma-extension/semantic-metadata/" \
+               "headless[text() = 'true']")
+          doc.xpath("//ol[@explicit-type]").each do |x|
+            x["type"] = x["explicit-type"]
+            x.delete("explicit-type")
+          end
+        end
+        ::Metanorma::Standoc::Cleanup.instance_method(:ol_cleanup).bind(self)
+          .call(doc)
+      end
+
+      def note_cleanup(xmldoc)
+        super
+        n = xmldoc.at("//tc-sc-officers-note") and
+          xmldoc.at("//bibdata/ext").add_child(n.remove)
+      end
+
+      def toc_cleanup(xmldoc)
+        toc_iev_cleanup(xmldoc) if @is_iev
+        super
+      end
+
+      def toc_iev_cleanup(xmldoc)
+        iev_variant_titles(xmldoc)
+      end
+
+      def iev_variant_titles(xmldoc)
+        id = xmldoc&.at("//bibdata/docidentifier[@type = 'ISO']")&.text
+        m = /60050-(\d+)/.match(id) or return
+        xmldoc.xpath("//sections/clause/terms/title").each_with_index do |t, i|
+          num = "%02d" % [i + 1]
+          t.next = "<variant-title #{add_id_text} type='toc'>" \
+                   "#{@i18n.section_iev} #{m[1]}-#{num} &#x2013; " \
+                   "#{t.children.to_xml}</variant-title>"
+        end
+      end
+
+      def docidentifier_cleanup(xmldoc)
+        prefix = get_id_prefix(xmldoc)
+        id = xmldoc.at("//bibdata/docidentifier[@type = 'ISO']") or return
+        id.content = id_prefix(prefix, id)
+        id = xmldoc.at("//bibdata/ext/structuredidentifier/project-number") and
+          id.content = id_prefix(prefix, id)
+        %w(iso-with-lang iso-reference iso-undated).each do |t|
+          id = xmldoc.at("//bibdata/docidentifier[@type = '#{t}']") and
+            id.content = id_prefix(prefix, id)
+        end
+      end
+
+      # TODO remove when I adopt pubid-iec
+      def get_id_prefix(xmldoc)
+        xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']" \
+                     "/organization").each_with_object([]) do |x, prefix|
+          x1 = x.at("abbreviation")&.text || x.at("name")&.text
+          # (x1 == "IEC" and prefix.unshift("IEC")) or prefix << x1
+          prefix << x1
+        end
+      end
+
+      def id_prefix(_prefix, id)
+        id.text
+      end
+    end
+  end
+end

data/lib/metanorma/iec/converter.rb

@@ -16,34 +16,6 @@ module Metanorma
         end
       end
 
-      def boilerplate_file(x_orig)
-        lang = case x_orig&.at("//bibdata/language")&.text
-               when "fr" then "fr"
-               else
-                 "en"
-               end
-        File.join(@libdir, "boilerplate-#{lang}.adoc")
-      end
-
-      def id_prefix(_prefix, id)
-        id.text
-      end
-
-      def doctype_validate(xmldoc)
-        %w(international-standard technical-specification technical-report
-           publicly-available-specification international-workshop-agreement
-           guide interpretation-sheet).include? @doctype or
-          @log.add("IEC_2", nil, params: [@doctype])
-        if function = xmldoc.at("//bibdata/ext/function")&.text
-          %w(emc quality-assurance safety environment).include? function or
-            @log.add("IEC_3", nil, params: [function])
-        end
-      end
-
-      def schema_file
-        "iec.rng"
-      end
-
       def html_converter(node)
         if node.nil?
           IsoDoc::Iec::HtmlConvert.new({})
@@ -77,39 +49,10 @@ module Metanorma
           IsoDoc::Iec::PresentationXMLConvert
             .new(doc_extract_attributes(node)
             .merge(output_formats: ::Metanorma::Iec::Processor
-            .new.output_formats))
+              .new.output_formats))
         end
       end
 
-      def term_defs_boilerplate(div, source, term, preface, isodoc)
-        super unless @is_iev
-      end
-
-      def terms_terms_cleanup(xmldoc)
-        @is_iev and return
-        super
-      end
-
-      def sections_names_pref_cleanup(xml)
-        super
-        @is_iev and replace_title(xml, "//introduction",
-                                  @i18n&.introduction_iev)
-      end
-
-      # preserve ol/@type within boilerplate, not elsewhere in doc
-      def ol_cleanup(doc)
-        doc.xpath("//ol[@type]").each { |x| x.delete("type") }
-        if doc.at("//metanorma-extension/semantic-metadata/" \
-               "headless[text() = 'true']")
-          doc.xpath("//ol[@explicit-type]").each do |x|
-            x["type"] = x["explicit-type"]
-            x.delete("explicit-type")
-          end
-        end
-        ::Metanorma::Standoc::Converter.instance_method(:ol_cleanup).bind(self)
-          .call(doc)
-      end
-
       def note(note)
         if note.title == "Note from TC/SC Officers"
           noko do |xml|
@@ -122,59 +65,9 @@ module Metanorma
         end
       end
 
-      def note_cleanup(xmldoc)
-        super
-        n = xmldoc.at("//tc-sc-officers-note") and
-          xmldoc.at("//bibdata/ext").add_child(n.remove)
-      end
-
-      def image_name_validate(xmldoc); end
-
-      def toc_cleanup(xmldoc)
-        toc_iev_cleanup(xmldoc) if @is_iev
-        super
-      end
-
-      def toc_iev_cleanup(xmldoc)
-        iev_variant_titles(xmldoc)
-      end
-
-      def iev_variant_titles(xmldoc)
-        id = xmldoc&.at("//bibdata/docidentifier[@type = 'ISO']")&.text
-        m = /60050-(\d+)/.match(id) or return
-        xmldoc.xpath("//sections/clause/terms/title").each_with_index do |t, i|
-          num = "%02d" % [i + 1]
-          t.next = "<variant-title #{add_id_text} type='toc'>" \
-                   "#{@i18n.section_iev} #{m[1]}-#{num} &#x2013; " \
-                   "#{t.children.to_xml}</variant-title>"
-        end
-      end
-
-      # TODO remove when I adopt pubid-iec
-      def get_id_prefix(xmldoc)
-        xmldoc.xpath("//bibdata/contributor[role/@type = 'publisher']" \
-                     "/organization").each_with_object([]) do |x, prefix|
-          x1 = x.at("abbreviation")&.text || x.at("name")&.text
-          # (x1 == "IEC" and prefix.unshift("IEC")) or prefix << x1
-          prefix << x1
-        end
-      end
-
       def document_scheme(node)
         node.attr("document-scheme")
       end
-
-      def docidentifier_cleanup(xmldoc)
-        prefix = get_id_prefix(xmldoc)
-        id = xmldoc.at("//bibdata/docidentifier[@type = 'ISO']") or return
-        id.content = id_prefix(prefix, id)
-        id = xmldoc.at("//bibdata/ext/structuredidentifier/project-number") and
-          id.content = id_prefix(prefix, id)
-        %w(iso-with-lang iso-reference iso-undated).each do |t|
-          id = xmldoc.at("//bibdata/docidentifier[@type = '#{t}']") and
-            id.content = id_prefix(prefix, id)
-        end
-      end
     end
   end
 end

data/lib/metanorma/iec/validate.rb

@@ -0,0 +1,24 @@
+module Metanorma
+  module Iec
+    class Validate < ::Metanorma::Iso::Validate
+      extend Forwardable
+
+      def doctype_validate(xmldoc)
+        %w(international-standard technical-specification technical-report
+           publicly-available-specification international-workshop-agreement
+           guide interpretation-sheet).include? @doctype or
+          @log.add("IEC_2", nil, params: [@doctype])
+        if function = xmldoc.at("//bibdata/ext/function")&.text
+          %w(emc quality-assurance safety environment).include? function or
+            @log.add("IEC_3", nil, params: [function])
+        end
+      end
+
+      def schema_file
+        "iec.rng"
+      end
+
+      def image_name_validate(xmldoc); end
+    end
+  end
+end

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.8.0".freeze
+    VERSION = "2.8.1".freeze
   end
 end
 

data/lib/metanorma-iec.rb

@@ -1,5 +1,7 @@
 require "asciidoctor" unless defined? Asciidoctor::Converter
 require_relative "metanorma/iec/converter"
+require_relative "metanorma/iec/cleanup"
+require_relative "metanorma/iec/validate"
 require_relative "metanorma/iec/version"
 require "isodoc/iec/html_convert"
 require "isodoc/iec/word_convert"

data/metanorma-iec.gemspec

@@ -27,12 +27,13 @@ Gem::Specification.new do |spec|
     f.match(%r{^(test|spec|features|bin|.github)/}) \
     || f.match(%r{Rakefile|bin/rspec})
   end
-  spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
+  spec.test_files = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
 
-  spec.add_dependency "metanorma-iso", "~> 3.3.0"
+  spec.add_dependency "metanorma-iso", "~> 3.3.1"
   spec.add_dependency "pubid"
 
+  spec.add_development_dependency "canon", "= 0.1.3"
   spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
@@ -41,10 +42,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.6"
   spec.add_development_dependency "rubocop", "~> 1"
-spec.add_development_dependency "rubocop-performance"
+  spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "sassc-embedded", "~> 1"
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
-  spec.add_development_dependency "canon", "= 0.1.3"
   # spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-16 00:00:00.000000000 Z
+date: 2026-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.3.1
 - !ruby/object:Gem::Dependency
   name: pubid
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: canon
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement
@@ -206,20 +220,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: canon
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.1.3
 description: |
   metanorma-iec lets you write IEC standards in AsciiDoc syntax.
 
@@ -270,6 +270,7 @@ files:
 - lib/metanorma/iec/biblio.rng
 - lib/metanorma/iec/boilerplate-en.adoc
 - lib/metanorma/iec/boilerplate-fr.adoc
+- lib/metanorma/iec/cleanup.rb
 - lib/metanorma/iec/converter.rb
 - lib/metanorma/iec/front.rb
 - lib/metanorma/iec/iec.rng
@@ -279,6 +280,7 @@ files:
 - lib/metanorma/iec/processor.rb
 - lib/metanorma/iec/relaton-iec.rng
 - lib/metanorma/iec/reqt.rng
+- lib/metanorma/iec/validate.rb
 - lib/metanorma/iec/version.rb
 - lib/relaton/render-iec/config.yml
 - lib/relaton/render-iec/general.rb