metanorma-iec 2.3.8 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 605384bfdb3b408af9009479f8f160b0350331658c2f408a7d78851eb577d576
-  data.tar.gz: fca4578c77a31a6a5baa86b821a35c3b0aa35f2c2967bdef20af3220584a4ba7
+  metadata.gz: b329047e60d24ccacf88f54b8b6cfa17d7eed313b4badcf010edd7c68428d513
+  data.tar.gz: bfb37bf61f2b60538271615b357f765254dfe11d37c8521d311957c3d04418b4
 SHA512:
-  metadata.gz: '012985f1e92f0a3629f08123049b903edc640233094f55ad449cdda33d3b8f9ed76a1d87589b8ed9e4f6ceddd55367ad337bd2fac71c15cd6178c3147d0c3f03'
-  data.tar.gz: 77ab9c5ebf5d7e252b7038471b6646c34541a9d3aaf1c660f554024765558094cb62dedd6226604a9bd9823790755e1fcbe5603d1af390ccd1820beb8dac8e16
+  metadata.gz: 516a7f7d89fb06ec86ad7d70e376c708fb623535a97e9f9441abde946b0889d98728f5e99df2fcb8951b4eaf273c47d1ebbd3a6dd34980536293aaa1e1dce29b
+  data.tar.gz: 316c640b39a4a56827d3e836e0d3ddbb752d4f7138b38d8730f62d515529c9d954921684ba9942b6012412f84d06f505d74c51509936d07d2761d63f1dca9e0b

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

@@ -3930,7 +3930,9 @@
 	</xsl:template> <!-- license-statement/p -->
 
 	<xsl:template match="*[local-name()='legal-statement']">
+		<xsl:param name="isLegacy">false</xsl:param>
 		<fo:block xsl:use-attribute-sets="legal-statement-style">
+
 			<xsl:apply-templates/>
 		</fo:block>
 	</xsl:template> <!-- legal-statement -->
@@ -6282,13 +6284,14 @@
 	<!-- ================= -->
 	<!-- Added,deleted text -->
 	<!-- ================= -->
-	<xsl:template match="*[local-name()='add']" name="tag_add">
+	<xsl:template match="*[local-name()='add'] | *[local-name() = 'change-open-tag'] | *[local-name() = 'change-close-tag']" name="tag_add">
 		<xsl:param name="skip">true</xsl:param>
 		<xsl:param name="block">false</xsl:param>
 		<xsl:param name="type"/>
 		<xsl:param name="text-align"/>
 		<xsl:choose>
-			<xsl:when test="starts-with(., $ace_tag)"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start -->
+			<xsl:when test="starts-with(., $ace_tag) or local-name() = 'change-open-tag' or local-name() = 'change-close-tag'"> <!-- examples: ace-tag_A1_start, ace-tag_A2_end, C1_start, AC_start, or
+							<change-open-tag>A<sub>1</sub></change-open-tag>, <change-close-tag>A<sub>1</sub></change-close-tag> -->
 				<xsl:choose>
 					<xsl:when test="$skip = 'true' and       ((local-name(../..) = 'note' and not(preceding-sibling::node())) or       (local-name(..) = 'title' and preceding-sibling::node()[1][local-name() = 'tab']) or      local-name(..) = 'formattedref' and not(preceding-sibling::node()))      and       ../node()[last()][local-name() = 'add'][starts-with(text(), $ace_tag)]"><!-- start tag displayed in template name="note" and title --></xsl:when>
 					<xsl:otherwise>
@@ -6296,12 +6299,32 @@
 							<xsl:call-template name="insertTag">
 								<xsl:with-param name="type">
 									<xsl:choose>
+										<xsl:when test="local-name() = 'change-open-tag'">start</xsl:when>
+										<xsl:when test="local-name() = 'change-close-tag'">end</xsl:when>
 										<xsl:when test="$type = ''"><xsl:value-of select="substring-after(substring-after(., $ace_tag), '_')"/> <!-- start or end --></xsl:when>
 										<xsl:otherwise><xsl:value-of select="$type"/></xsl:otherwise>
 									</xsl:choose>
 								</xsl:with-param>
-								<xsl:with-param name="kind" select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C -->
-								<xsl:with-param name="value" select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C -->
+								<xsl:with-param name="kind">
+									<xsl:choose>
+										<xsl:when test="local-name() = 'change-open-tag' or local-name() = 'change-close-tag'">
+											<xsl:value-of select="text()"/>
+										</xsl:when>
+										<xsl:otherwise>
+											<xsl:value-of select="substring(substring-before(substring-after(., $ace_tag), '_'), 1, 1)"/> <!-- A or C -->
+										</xsl:otherwise>
+									</xsl:choose>
+								</xsl:with-param>
+								<xsl:with-param name="value">
+									<xsl:choose>
+										<xsl:when test="local-name() = 'change-open-tag' or local-name() = 'change-close-tag'">
+											<xsl:value-of select="*[local-name() = 'sub']"/>
+										</xsl:when>
+										<xsl:otherwise>
+											<xsl:value-of select="substring(substring-before(substring-after(., $ace_tag), '_'), 2)"/> <!-- 1, 2, C -->
+										</xsl:otherwise>
+									</xsl:choose>
+								</xsl:with-param>
 							</xsl:call-template>
 						</xsl:variable>
 						<xsl:choose>
@@ -8580,11 +8603,17 @@
 			</xsl:when>
 			<xsl:otherwise>
 
+				<xsl:variable name="image_class" select="ancestor::*[local-name() = 'image']/@class"/>
+				<xsl:variable name="ancestor_table_cell" select="normalize-space(ancestor::*[local-name() = 'td'] or ancestor::*[local-name() = 'th'])"/>
+
 				<xsl:variable name="element">
 					<xsl:choose>
 						<xsl:when test="ancestor::*[local-name() = 'tr'] and $isGenerateTableIF = 'true'">
 							<fo:inline xsl:use-attribute-sets="image-style" text-align="left"/>
 						</xsl:when>
+						<xsl:when test="not(ancestor::*[local-name() = 'figure'])">
+							<fo:inline xsl:use-attribute-sets="image-style" text-align="left"/>
+						</xsl:when>
 						<xsl:otherwise>
 							<fo:block xsl:use-attribute-sets="image-style">
 								<xsl:if test="ancestor::*[local-name() = 'dt']">
@@ -8600,10 +8629,24 @@
 						<xsl:copy-of select="@*"/>
 					<!-- <fo:block xsl:use-attribute-sets="image-style"> -->
 						<fo:instream-foreign-object fox:alt-text="{$alt-text}">
-							<xsl:if test="$isGenerateTableIF = 'false'">
-								<xsl:attribute name="width">100%</xsl:attribute>
-							</xsl:if>
-							<xsl:attribute name="content-height">100%</xsl:attribute>
+
+							<xsl:choose>
+								<xsl:when test="$image_class = 'corrigenda-tag'">
+									<xsl:attribute name="fox:alt-text">CorrigendaTag</xsl:attribute>
+									<xsl:attribute name="baseline-shift">-10%</xsl:attribute>
+									<xsl:if test="$ancestor_table_cell = 'true'">
+										<xsl:attribute name="baseline-shift">-25%</xsl:attribute>
+									</xsl:if>
+									<xsl:attribute name="height">3.5mm</xsl:attribute>
+								</xsl:when>
+								<xsl:otherwise>
+									<xsl:if test="$isGenerateTableIF = 'false'">
+										<xsl:attribute name="width">100%</xsl:attribute>
+									</xsl:if>
+									<xsl:attribute name="content-height">100%</xsl:attribute>
+								</xsl:otherwise>
+							</xsl:choose>
+
 							<xsl:attribute name="content-width">scale-down-to-fit</xsl:attribute>
 							<xsl:variable name="svg_width" select="xalan:nodeset($svg_content)/*/@width"/>
 							<xsl:variable name="svg_height" select="xalan:nodeset($svg_content)/*/@height"/>
@@ -10794,14 +10837,16 @@
 
 	<xsl:template match="*[local-name() = 'annex']">
 		<fo:block break-after="page"/>
-		<fo:block id="{@id}">
+		<fo:block>
 
 			<xsl:call-template name="setBlockSpanAll"/>
 
 			<xsl:call-template name="refine_annex_style"/>
 
 		</fo:block>
-		<xsl:apply-templates/>
+		<fo:block id="{@id}">
+			<xsl:apply-templates/>
+		</fo:block>
 	</xsl:template>
 
 	<xsl:template name="refine_annex_style">
@@ -10821,13 +10866,19 @@
 				<fo:block id="{@id}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
 			</xsl:when>
 			<!-- if there isn't element with id 'from', then create 'bookmark' here -->
-			<xsl:when test="not(ancestor::*[contains(local-name(), '-standard')]//*[@id = $id_from])">
+			<xsl:when test="ancestor::*[contains(local-name(), '-standard')] and not(ancestor::*[contains(local-name(), '-standard')]//*[@id = $id_from])">
+				<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
+			</xsl:when>
+			<xsl:when test="not(//*[@id = $id_from]) and not(preceding-sibling::*[@id = $id_from])">
 				<fo:block id="{@from}" font-size="1pt"><xsl:value-of select="$hair_space"/></fo:block>
 			</xsl:when>
 		</xsl:choose>
 
 	</xsl:template>
 
+	<!-- https://github.com/metanorma/mn-samples-bsi/issues/312 -->
+	<xsl:template match="*[local-name() = 'review'][@type = 'other']"/>
+
 	<xsl:template match="*[local-name() = 'name']/text()">
 		<!-- 0xA0 to space replacement -->
 		<xsl:value-of select="java:replaceAll(java:java.lang.String.new(.),' ',' ')"/>
@@ -12440,7 +12491,7 @@
 
 	<xsl:template name="printEdition">
 		<xsl:variable name="edition_i18n" select="normalize-space((//*[contains(local-name(), '-standard')])[1]/*[local-name() = 'bibdata']/*[local-name() = 'edition'][normalize-space(@language) != ''])"/>
-		<xsl:text> </xsl:text>
+
 		<xsl:choose>
 			<xsl:when test="$edition_i18n != ''">
 				<!-- Example: <edition language="fr">deuxième édition</edition> -->

data/lib/metanorma/iec/basicdoc.rng

@@ -95,8 +95,89 @@
       <ref name="pagebreak"/>
       <ref name="hr"/>
       <ref name="bookmark"/>
+      <ref name="amend"/>
     </choice>
   </define>
+  <define name="amend">
+    <element name="amend">
+      <ref name="AmendType"/>
+    </element>
+  </define>
+  <define name="AmendType">
+    <optional>
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+    </optional>
+    <attribute name="change">
+      <choice>
+        <value>add</value>
+        <value>modify</value>
+        <value>delete</value>
+        <value>replace</value>
+      </choice>
+    </attribute>
+    <optional>
+      <attribute name="path"/>
+    </optional>
+    <optional>
+      <attribute name="path_end"/>
+    </optional>
+    <optional>
+      <attribute name="title"/>
+    </optional>
+    <optional>
+      <element name="location">
+        <zeroOrMore>
+          <choice>
+            <ref name="locality"/>
+            <ref name="localityStack"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </optional>
+    <optional>
+      <element name="description">
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
+      </element>
+    </optional>
+    <optional>
+      <element name="newcontent">
+        <optional>
+          <attribute name="id">
+            <data type="ID"/>
+          </attribute>
+        </optional>
+        <zeroOrMore>
+          <ref name="BasicBlock"/>
+        </zeroOrMore>
+      </element>
+    </optional>
+    <zeroOrMore>
+      <ref name="classification"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="contributor"/>
+    </zeroOrMore>
+  </define>
+  <define name="classification">
+    <element name="classification">
+      <ref name="classification_tag"/>
+      <ref name="classification_value"/>
+    </element>
+  </define>
+  <define name="classification_tag">
+    <element name="tag">
+      <text/>
+    </element>
+  </define>
+  <define name="classification_value">
+    <element name="value">
+      <text/>
+    </element>
+  </define>
   <define name="paragraph">
     <element name="p">
       <ref name="ParagraphType"/>
@@ -163,6 +244,9 @@
         <data type="ID"/>
       </attribute>
       <attribute name="reviewer"/>
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <optional>
         <attribute name="date">
           <data type="dateTime"/>
@@ -939,18 +1023,12 @@
     </optional>
     <optional>
       <attribute name="width">
-        <choice>
-          <data type="int"/>
-          <value>auto</value>
-        </choice>
+        <ref name="ImageSize"/>
       </attribute>
     </optional>
     <optional>
       <attribute name="height">
-        <choice>
-          <data type="int"/>
-          <value>auto</value>
-        </choice>
+        <ref name="ImageSize"/>
       </attribute>
     </optional>
     <optional>
@@ -965,6 +1043,14 @@
       </attribute>
     </optional>
   </define>
+  <define name="ImageSize">
+    <choice>
+      <data type="string">
+        <param name="pattern">\d+([.]\d+)?(%?)</param>
+      </data>
+      <value>auto</value>
+    </choice>
+  </define>
   <define name="video">
     <element name="video">
       <attribute name="id">

data/lib/metanorma/iec/biblio-standoc.rng

@@ -9,11 +9,42 @@
   -->
   <include href="biblio.rng">
     <define name="BibData">
-      <ref name="BibliographicItem"/>
+      <ref name="StandardBibliographicItem"/>
       <optional>
         <ref name="ext"/>
       </optional>
     </define>
+    <define name="docrelation">
+      <element name="relation">
+        <attribute name="type">
+          <ref name="DocRelationType"/>
+        </attribute>
+        <optional>
+          <element name="description">
+            <ref name="FormattedString"/>
+          </element>
+        </optional>
+        <element name="bibitem">
+          <ref name="StandardReducedBibliographicItem"/>
+        </element>
+        <choice>
+          <zeroOrMore>
+            <ref name="locality"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="localityStack"/>
+          </zeroOrMore>
+        </choice>
+        <choice>
+          <zeroOrMore>
+            <ref name="sourceLocality"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="sourceLocalityStack"/>
+          </zeroOrMore>
+        </choice>
+      </element>
+    </define>
   </include>
   <define name="ext">
     <element name="ext">
@@ -161,4 +192,16 @@
       </optional>
     </element>
   </define>
+  <define name="StandardBibliographicItem">
+    <ref name="BibliographicItem"/>
+    <zeroOrMore>
+      <ref name="amend"/>
+    </zeroOrMore>
+  </define>
+  <define name="StandardReducedBibliographicItem">
+    <ref name="ReducedBibliographicItem"/>
+    <zeroOrMore>
+      <ref name="amend"/>
+    </zeroOrMore>
+  </define>
 </grammar>

data/lib/metanorma/iec/biblio.rng

@@ -241,6 +241,9 @@
     </element>
   </define>
   <define name="FullNameType">
+    <optional>
+      <ref name="name_abbreviation"/>
+    </optional>
     <choice>
       <group>
         <zeroOrMore>
@@ -266,6 +269,11 @@
       <ref name="variantname"/>
     </zeroOrMore>
   </define>
+  <define name="name_abbreviation">
+    <element name="abbreviation">
+      <ref name="LocalizedString"/>
+    </element>
+  </define>
   <define name="prefix">
     <element name="prefix">
       <ref name="LocalizedString"/>
@@ -870,6 +878,9 @@
     <optional>
       <ref name="validity"/>
     </optional>
+    <optional>
+      <ref name="depiction"/>
+    </optional>
   </define>
   <define name="btitle">
     <element name="title">

data/lib/metanorma/iec/converter.rb

@@ -28,6 +28,10 @@ module Metanorma
         File.join(@libdir, "iec_intro_#{lang}.xml")
       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
@@ -150,6 +154,10 @@ module Metanorma
         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

data/lib/metanorma/iec/front.rb

@@ -7,200 +7,154 @@ module Metanorma
         "IEC"
       end
 
-      def iso_id(node, xml)
-        node.attr("docnumber") || node.attr("docidentifier") or return
-        unless dn = node.attr("docidentifier")
-          part, subpart = node&.attr("partnumber")&.split(/-/)
-          dn = add_id_parts(node.attr("docnumber"), part, subpart)
-          dn = id_stage_prefix(dn, node)
-          dn = id_edition_suffix(dn, node)
+      def metadata_stagename(id)
+        if @amd
+          id.amendments&.first&.stage&.name ||
+            id.corrigendums&.first&.stage&.name
+        else
+          begin
+            id.typed_stage_name
+          rescue StandardError
+            id.stage&.name
+          end
         end
-        xml.docidentifier dn, **attr_code(type: "ISO")
       end
 
-      def add_id_parts(docnum, part, subpart)
-        docnum += "-#{part}" if part
-        docnum += "-#{subpart}" if subpart
-        docnum
+      def metadata_status(node, xml)
+        x = iso_id_default(iso_id_params(node)).stage
+        xml.status do |s|
+          s.stage x.harmonized_code.stage, **attr_code(abbreviation: x.abbr)
+          s.substage x.harmonized_code.substage
+        end
+      rescue *STAGE_ERROR
+        report_illegal_stage(get_stage(node), get_substage(node))
       end
 
-      def id_stage_prefix(docnum, node)
-        stage = get_stage(node)
-        typeabbr = get_typeabbr(node)&.upcase
-        if stage && (stage.to_i < 60)
-          docnum = unpub_stage_prefix(docnum, stage, typeabbr, node)
-        elsif typeabbr == "DIR " then docnum = "#{typeabbr}#{docnum}"
-        elsif typeabbr && !@amd then docnum = "/#{typeabbr}#{docnum}"
+      def get_typeabbr(node, amd: false)
+        node.attr("amendment-number") and return :amd
+        node.attr("corrigendum-number") and return :cor
+        case doctype(node)
+        when "directive" then :dir
+        when "white-paper" then :wp
+        when "technology-report" then :tec
+        when "social-technology-trend-report" then :sttr
+        when "component-specification" then :cs
+        when "systems-reference-document" then :srd
+        when "operational-document" then :od
+        when "conformity-assessment" then :ca
+        when "test-report-form" then :trf
+        when "technical-report" then :tr
+        when "technical-specification" then :ts
+        when "publicly-available-specification" then :pas
+        when "guide" then :guide
+        else :is
         end
-        docnum
-      end
-
-      def unpub_stage_prefix(docnum, stage, typeabbr, node)
-        abbr = id_stage_abbr(stage, get_substage(node), node)
-        %w(40 50).include?(stage) && i = node.attr("iteration") and
-          itersuffix = ".#{i}"
-        return docnum if abbr.nil? || abbr.empty? # prefixes added in cleanup
-
-        typeabbr = "" if %w(DTS FDTS).include?(abbr.sub(/\s+$/, ""))
-        return "/#{abbr}#{typeabbr} #{docnum}#{itersuffix}" unless @amd
-
-        a = docnum.split(%r{/})
-        a[-1] = "#{abbr}#{a[-1]}#{itersuffix}"
-        a.join("/")
-      end
-
-      def id_edition_suffix(docnum, node)
-        ed = node.attr("edition") || 1
-        docnum += " ED #{ed}"
-        docnum
-      end
-
-      STAGE_CODES = {
-        "PNW" => "1000", "ANW" => "2000", "CAN" => "2098", "ACD" => "2099",
-        "CD" => "3020", "BWG" => "3092", "A2CD" => "3099", "2CD" => "3520",
-        "3CD" => "3520", "4CD" => "3520", "5CD" => "3520", "6CD" => "3520",
-        "7CD" => "3520", "8CD" => "3520", "9CD" => "3520", "CDM" => "3591",
-        "A3CD" => "3592", "A4CD" => "3592", "A5CD" => "3592", "A6CD" => "3592",
-        "A7CD" => "3592", "A8CD" => "3592", "A9CD" => "3592", "ACDV" => "3599",
-        "CCDV" => "4020", "CDVM" => "4091", "NCDV" => "4092",
-        "NADIS" => "4093", "ADIS" => "4099", "ADTR" => "4099",
-        "ADTS" => "4099", "RDISH" => "5000", "RFDIS" => "5000",
-        "CDISH" => "5020", "CDPAS" => "5020", "CDTR" => "5020",
-        "CDTS" => "5020", "CFDIS" => "5020", "DTRM" => "5092",
-        "DTSM" => "5092", "NDTR" => "5092", "NDTS" => "5092",
-        "NFDIS" => "5092", "APUB" => "5099", "BPUB" => "6000",
-        "PPUB" => "6060", "RR" => "9092", "AMW" => "9220", "WPUB" => "9599",
-        "DELPUB" => "9960", "PWI" => "0000", "NWIP" => "1000", "WD" => "2000",
-        "CDV" => "4000", "FDIS" => "5000"
-      }.freeze
-
-      DOC_STAGE = {
-        "00": "PWI",
-        "10": "NWIP",
-        "20": "WD",
-        "30": "CD",
-        "40": "CDV",
-        "50": "FDIS",
-        "60": "PPUB",
-        "90": "RR",
-        "92": "AMW",
-        "95": "WPUB",
-        "99": "DELPUB",
-      }.freeze
-
-      STAGE_ABBRS = {
-        "00" => { "00" => "PWI" },
-        "10" => { "00" => "PNW" },
-        "20" => { "00" => "ANW", "98" => "CAN", "99" => "ACD" },
-        "30" => { "00" => "CD", "20" => "CD", "92" => "BWG", "97" => "MERGED",
-                  "98" => "DREJ", "99" => "A2CD" },
-        "35" => { "00" => "CD", "20" => "CD", "91" => "CDM", "92" => "ACD",
-                  "99" => "ACDV" },
-        "40" => { "00" => "CCDV", "20" => "CCDV", "91" => "CDVM",
-                  "92" => "NCDV", "93" => "NADIS",
-                  "95" => "ADISSB", "99" => "ADIS" },
-        "50" => { "00" => "RFDIS", "20" => "CFDIS", "92" => "NFDIS",
-                  "95" => "APUBSB", "99" => "APUB" },
-        "60" => { "00" => "BPUB", "60" => "PPUB" },
-        "90" => { "00" => "RR", "92" => "RR" },
-        "92" => { "00" => "AMW", "20" => "AMW" },
-        "95" => { "00" => "WPUB", "99" => "WPUB" },
-        "99" => { "00" => "DELPUB", "60" => "DELPUB" },
-      }.freeze
-
-      STAGE_NAMES = {
-        "00": "Preliminary work item",
-        "10": "New work item proposal",
-        "20": "Working draft",
-        "30": "Committee draft",
-        "35": "Committee draft",
-        "40": "Committed draft for vote",
-        "50": "Final draft international standard",
-        "60": "International standard",
-        "90": "Review",
-        "92": "Review",
-        "95": "Withdrawal",
-        "99": "Deleted",
-      }.freeze
-
-      def status_abbrev1(stage, substage, iter, doctype, _draft)
-        return "" unless stage
-
-        abbr = STAGE_ABBRS.dig(stage, substage) || "??"
-        if stage == "35" && substage == "92"
-          iter = (iter.to_i + 1) % "02"
-        end
-        case doctype
-        when "technical-report"
-          abbr = "ADTR" if stage == "40" && substage == "99"
-          abbr = "CDTR" if stage == "50" && substage == "20"
-          abbr = "DTRM" if stage == "50" && substage == "92"
-        when "technical-specification"
-          abbr = "ADTS" if stage == "40" && substage == "99"
-          abbr = "CDTS" if stage == "50" && substage == "20"
-          abbr = "DTSM" if stage == "50" && substage == "92"
-        when "interpretation-sheet"
-          abbr = "RDISH" if stage == "50" && substage == "00"
-          abbr = "CDISH" if stage == "50" && substage == "20"
-        when "publicly-available-specification"
-          abbr = "CDPAS" if stage == "50" && substage == "20"
+      end
+
+      def base_pubid
+        Pubid::Iec::Identifier
+      end
+
+      def iso_id_params_core(node)
+        pub = iso_id_pub(node)
+        ret = { number: node.attr("docnumber"),
+                part: node.attr("partnumber"),
+                language: node.attr("language")&.split(/,\s*/) || "en",
+                type: get_typeabbr(node),
+                edition: node.attr("edition"), publisher: pub[0],
+                unpublished: /^[0-5]/.match?(get_stage(node)),
+                copublisher: pub[1..-1] }.compact
+        ret[:copublisher].empty? and ret.delete(:copublisher)
+        ret
+      end
+
+      def iso_id_stage(node)
+        ret = "#{get_stage(node)}.#{get_substage(node)}"
+        if /[A-Z]/.match?(ret) # abbreviation
+          ret = get_stage(node)
         end
-        abbr = abbr.sub(/CD$/, "#{iter}CD") if iter
-        abbr
+        ret
+      end
+
+      def iso_id_params_resolve(params, params2, node, orig_id)
+        ret = super
+        params[:number].nil? && !@amd and ret[:number] = "0"
+        ret
       end
 
-      def stage_abbr(stage, _substage, _doctype)
-        return "PPUB" if stage == "60"
+      def iso_id_out(xml, params, _with_prf)
+        params[:stage] == "60.60" and params.delete(:stage)
+        super
+      end
+
+      def iso_id_out_common(xml, params, _with_prf)
+        xml.docidentifier iso_id_default(params).to_s,
+                          **attr_code(type: "ISO")
+        xml.docidentifier iso_id_reference(params).to_s,
+                          **attr_code(type: "iso-reference")
+        @id_revdate and
+          xml.docidentifier iso_id_revdate(params.merge(year: @id_revdate))
+            .to_s(with_edition_month_date: true),
+                            **attr_code(type: "iso-revdate")
+        xml.docidentifier iso_id_reference(params).urn,
+                          **attr_code(type: "URN")
+      end
+
+      def iso_id_out_non_amd(xml, params, _with_prf)
+        xml.docidentifier iso_id_undated(params).to_s,
+                          **attr_code(type: "iso-undated")
+        xml.docidentifier iso_id_with_lang(params).to_s,
+                          **attr_code(type: "iso-with-lang")
+      end
 
-        DOC_STAGE[stage.to_sym] || "??"
+      def iso_id_revdate(params)
+        params1 = params.dup.tap { |hs| hs.delete(:unpublished) }
+        m = params1[:year].match(/^(\d{4})(-\d{2})?(-\d{2})?/)
+        params1[:year] = m[1]
+        params1[:month] = m[2].sub(/^-/, "")
+        # skipping day for now
+        pubid_select(params1).create(**params1)
       end
 
-      def stage_name(stage, _substage, _doctype, _iteration)
-        STAGE_NAMES[stage.to_sym]
+      def status_abbrev1(node)
+        id = iso_id_default({ stage: "60.60" }.merge(iso_id_params(node)))
+        id.stage or return ""
+        id.stage.abbr
       end
 
       def get_stage(node)
         stage = node.attr("status") || node.attr("docstage") || "60"
         m = /([0-9])CD$/.match(stage) and node.set_attr("iteration", m[1])
-        STAGE_CODES[stage] and stage = STAGE_CODES[stage][0..1]
         stage
       end
 
       def get_substage(node)
-        st = node.attr("status") || node.attr("docstage")
-        stage = get_stage(node)
-        node.attr("docsubstage") ||
-          (if stage == "60"
-             "60"
-           else
-             STAGE_CODES[st] ? STAGE_CODES[st][2..3] : "00"
-           end)
+        ret = node.attr("docsubstage") and return ret
+        st = get_stage(node)
+        case st
+        when "60" then "60"
+        when "30", "40", "50" then "20"
+        else "00"
+        end
       end
 
-      def id_stage_abbr(stage, _substage, node)
-        return "" if stage == "60"
-
-        abbr = DOC_STAGE[stage.to_sym] || ""
-        abbr = node.attr("iteration") + abbr if node.attr("iteration")
-        abbr
+      def iso_id_params_add(node)
+        stage = iso_id_stage(node)
+        @id_revdate = node.attr("revdate")
+        ret = { number: node.attr("amendment-number") ||
+          node.attr("corrigendum-number"),
+                year: iso_id_year(node) }.compact
+        if stage && !cen?(node.attr("publisher"))
+          ret[:stage] = stage
+        end
+        ret
       end
 
-      # TODO: replace by ISO call
-      def metadata_status(node, xml)
-        stage = get_stage(node)
-        substage = get_substage(node)
-        xml.status do |s|
-          s.stage stage,
-                  **attr_code(abbreviation: stage_abbr(stage, substage, nil))
-          subst = status_abbrev1(stage, substage, node.attr("iteration"),
-                                 doctype(node), node.attr("draft"))
-          s.substage substage, **attr_code(abbreviation: subst)
-          node.attr("iteration") && (s.iteration node.attr("iteration"))
-        end
-        iso_id_default(iso_id_params(node))
-        rescue Pubid::Core::Errors::HarmonizedStageCodeInvalidError,
-             Pubid::Core::Errors::TypeStageParseError
-        report_illegal_stage(stage, substage)
+      def report_illegal_stage(stage, substage)
+        out = stage || ""
+        /[A-Z]/.match?(out) or out += ".#{substage}"
+        err = "Illegal document stage: #{out}"
+        @log.add("Document Attributes", nil, err)
       end
 
       def metadata_subdoctype(node, xml)

data/lib/metanorma/iec/isodoc.rng

@@ -17,10 +17,19 @@
   these elements; we just want one namespace for any child grammars
   of this.
 -->
-<!-- VERSION v1.2.9 -->
+<!-- VERSION v1.3.0 -->
 <grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <include href="reqt.rng"/>
   <include href="basicdoc.rng">
+    <define name="amend">
+      <element name="amend">
+        <ref name="BlockAttributes"/>
+        <ref name="AmendType"/>
+        <zeroOrMore>
+          <ref name="autonumber"/>
+        </zeroOrMore>
+      </element>
+    </define>
     <define name="admonition">
       <element name="admonition">
         <attribute name="type">
@@ -137,6 +146,9 @@
             <data type="boolean"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="style"/>
+        </optional>
         <oneOrMore>
           <ref name="PureTextElement"/>
         </oneOrMore>
@@ -2319,69 +2331,6 @@
       <ref name="CitationType"/>
     </element>
   </define>
-  <define name="amend">
-    <element name="amend">
-      <optional>
-        <attribute name="id">
-          <data type="ID"/>
-        </attribute>
-      </optional>
-      <attribute name="change">
-        <choice>
-          <value>add</value>
-          <value>modify</value>
-          <value>delete</value>
-          <value>replace</value>
-        </choice>
-      </attribute>
-      <optional>
-        <attribute name="path"/>
-      </optional>
-      <optional>
-        <attribute name="path_end"/>
-      </optional>
-      <optional>
-        <attribute name="title"/>
-      </optional>
-      <ref name="BlockAttributes"/>
-      <optional>
-        <element name="location">
-          <zeroOrMore>
-            <ref name="locality"/>
-          </zeroOrMore>
-        </element>
-      </optional>
-      <zeroOrMore>
-        <ref name="autonumber"/>
-      </zeroOrMore>
-      <optional>
-        <element name="description">
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-        </element>
-      </optional>
-      <optional>
-        <element name="newcontent">
-          <optional>
-            <attribute name="id">
-              <data type="ID"/>
-            </attribute>
-          </optional>
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-        </element>
-      </optional>
-      <optional>
-        <element name="description">
-          <zeroOrMore>
-            <ref name="BasicBlock"/>
-          </zeroOrMore>
-        </element>
-      </optional>
-    </element>
-  </define>
   <define name="autonumber">
     <element name="autonumber">
       <attribute name="type">

data/lib/metanorma/iec/reqt.rng

@@ -207,20 +207,4 @@
       <value>permission</value>
     </choice>
   </define>
-  <define name="classification">
-    <element name="classification">
-      <ref name="classification_tag"/>
-      <ref name="classification_value"/>
-    </element>
-  </define>
-  <define name="classification_tag">
-    <element name="tag">
-      <text/>
-    </element>
-  </define>
-  <define name="classification_value">
-    <element name="value">
-      <text/>
-    </element>
-  </define>
 </grammar>

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.3.8".freeze
+    VERSION = "2.4.1".freeze
   end
 end
 

data/metanorma-iec.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.add_dependency "metanorma-iso", "~> 2.6.0"
+  spec.add_dependency "metanorma-iso", "~> 2.7.0"
   spec.add_dependency "pubid-iec"
   spec.add_dependency "ruby-jing"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 2.3.8
+  version: 2.4.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-22 00:00:00.000000000 Z
+date: 2024-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: pubid-iec
   requirement: !ruby/object:Gem::Requirement