metanorma-iec 2.1.1 → 2.1.2

data/lib/metanorma/iec/biblio.rng

@@ -614,12 +614,12 @@
     <optional>
       <ref name="fetched"/>
     </optional>
-    <choice>
-      <oneOrMore>
-        <ref name="btitle"/>
-      </oneOrMore>
+    <optional>
       <ref name="formattedref"/>
-    </choice>
+    </optional>
+    <oneOrMore>
+      <ref name="btitle"/>
+    </oneOrMore>
     <zeroOrMore>
       <ref name="bsource"/>
     </zeroOrMore>
@@ -986,36 +986,34 @@
           <ref name="SeriesType"/>
         </attribute>
       </optional>
-      <choice>
+      <optional>
         <ref name="formattedref"/>
-        <group>
-          <ref name="btitle"/>
-          <optional>
-            <ref name="bplace"/>
-          </optional>
-          <optional>
-            <ref name="seriesorganization"/>
-          </optional>
-          <optional>
-            <ref name="abbreviation"/>
-          </optional>
-          <optional>
-            <ref name="seriesfrom"/>
-          </optional>
-          <optional>
-            <ref name="seriesto"/>
-          </optional>
-          <optional>
-            <ref name="seriesnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriespartnumber"/>
-          </optional>
-          <optional>
-            <ref name="seriesrun"/>
-          </optional>
-        </group>
-      </choice>
+      </optional>
+      <ref name="btitle"/>
+      <optional>
+        <ref name="bplace"/>
+      </optional>
+      <optional>
+        <ref name="seriesorganization"/>
+      </optional>
+      <optional>
+        <ref name="abbreviation"/>
+      </optional>
+      <optional>
+        <ref name="seriesfrom"/>
+      </optional>
+      <optional>
+        <ref name="seriesto"/>
+      </optional>
+      <optional>
+        <ref name="seriesnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriespartnumber"/>
+      </optional>
+      <optional>
+        <ref name="seriesrun"/>
+      </optional>
     </element>
   </define>
   <define name="SeriesType">

data/lib/metanorma/iec/converter.rb

@@ -131,6 +131,11 @@ module Metanorma
                    "#{t.children.to_xml}</variant-title>"
         end
       end
+
+      def ol_attrs(node)
+        attr_code(keep_attrs(node)
+                  .merge(id: ::Metanorma::Utils::anchor_or_uuid(node)))
+      end
     end
   end
 end

data/lib/metanorma/iec/front.rb

@@ -213,6 +213,8 @@ module Metanorma
         a = node.attr("secretary") and xml.secretary a
         a = node.attr("interest-to-committees") and xml.interest_to_committees a
       end
+
+      def metadata_approval_committee(node, xml); end
     end
   end
 end

data/lib/metanorma/iec/isodoc.rng

@@ -282,6 +282,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="ul_li"/>
         </oneOrMore>
@@ -324,6 +327,9 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="li"/>
         </oneOrMore>
@@ -360,6 +366,9 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <ref name="tname"/>
+        </optional>
         <oneOrMore>
           <ref name="dt"/>
           <ref name="dd"/>

data/lib/metanorma/iec/isostandard.rng

@@ -45,6 +45,7 @@
         <ref name="horizontal"/>
       </optional>
       <ref name="editorialgroup"/>
+      <ref name="approvalgroup"/>
       <zeroOrMore>
         <ref name="ics"/>
       </zeroOrMore>
@@ -249,6 +250,7 @@
         <value>warning</value>
         <value>important</value>
         <value>safety precautions</value>
+        <value>editorial</value>
       </choice>
     </define>
     <define name="preface">
@@ -308,18 +310,7 @@
     </define>
     <define name="editorialgroup">
       <element name="editorialgroup">
-        <oneOrMore>
-          <ref name="technical-committee"/>
-        </oneOrMore>
-        <zeroOrMore>
-          <ref name="subcommittee"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="workgroup"/>
-        </zeroOrMore>
-        <optional>
-          <ref name="secretariat"/>
-        </optional>
+        <ref name="ISOProjectGroup"/>
       </element>
     </define>
     <define name="Content-Section">
@@ -367,6 +358,33 @@
     </define>
   </include>
   <!-- end overrides -->
+  <define name="ISOProjectGroup">
+    <zeroOrMore>
+      <ref name="agency"/>
+    </zeroOrMore>
+    <oneOrMore>
+      <ref name="technical-committee"/>
+    </oneOrMore>
+    <zeroOrMore>
+      <ref name="subcommittee"/>
+    </zeroOrMore>
+    <zeroOrMore>
+      <ref name="workgroup"/>
+    </zeroOrMore>
+    <optional>
+      <ref name="secretariat"/>
+    </optional>
+  </define>
+  <define name="approvalgroup">
+    <element name="approvalgroup">
+      <ref name="ISOProjectGroup"/>
+    </element>
+  </define>
+  <define name="agency">
+    <element name="agency">
+      <text/>
+    </element>
+  </define>
   <!--
     We display the Normative References between scope and terms; but to keep the
     grammar simple, we keep the references together
@@ -428,6 +446,11 @@
       <data type="int"/>
     </element>
   </define>
+  <define name="approvalgroup">
+    <element name="approvalgroup">
+      <ref name="IsoWorkgroup"/>
+    </element>
+  </define>
   <define name="subcommittee">
     <element name="subcommittee">
       <ref name="IsoWorkgroup"/>

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "2.1.1".freeze
+    VERSION = "2.1.2".freeze
   end
 end
 

data/spec/isodoc/blocks_spec.rb

@@ -160,4 +160,41 @@ RSpec.describe IsoDoc::Iec do
       .gsub(%r{</body>.*}m, "</body>")))
       .to be_equivalent_to xmlpp(output)
   end
+
+  it "does not ignore intervening ul in numbering ol" do
+        input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <preface><foreword>
+      <ul>
+      <li>A</li>
+      <li>
+      <ol>
+      <li>List</li>
+      </ol>
+      </li>
+      </ul>
+      </foreword></preface>
+      </iso-standard>
+    INPUT
+    presxml = <<~INPUT
+           <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+         <preface>
+           <foreword displayorder='1'>
+             <ul>
+               <li>A</li>
+               <li>
+                 <ol type='arabic'>
+                   <li>List</li>
+                 </ol>
+               </li>
+             </ul>
+           </foreword>
+         </preface>
+       </iso-standard>
+    INPUT
+    expect(xmlpp(IsoDoc::Iec::PresentationXMLConvert.new({})
+      .convert("test", input, true)))
+      .to be_equivalent_to xmlpp(presxml)
+
+  end
 end

data/spec/isodoc/iev_spec.rb

@@ -109,7 +109,7 @@ RSpec.describe IsoDoc do
                   </owner>
                 </copyright>
                 <ext>
-                  <doctype>article</doctype>
+                  <doctype>international-standard</doctype>
                   <editorialgroup>
                     <technical-committee/>
                     <subcommittee/>
@@ -170,7 +170,7 @@ RSpec.describe IsoDoc do
           <status>
             <stage language="">60</stage>
                   <stage language='fr'>Norme internationale</stage>
-                  <stage language='en'>International standard</stage>
+                  <stage language='en'>International Standard</stage>
             <substage>60</substage>
           </status>
           <copyright>
@@ -183,8 +183,10 @@ RSpec.describe IsoDoc do
             </owner>
           </copyright>
           <ext>
-            <doctype>article</doctype>
-            <editorialgroup>
+            <doctype language=''>international-standard</doctype>
+            <doctype language='fr'>Norme internationale</doctype>
+            <doctype language='en'>International Standard</doctype>
+             <editorialgroup identifier=' / / '>
               <technical-committee/>
               <subcommittee/>
               <workgroup/>