metanorma-iec 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0fa6687e3e29e5536c7a58e61de634c61e3d74a4cc452be1368456e4f59c090
-  data.tar.gz: 10a74908e1e2ef8217ddb6208f48f83ca12228e965804a8e675b074aab96efb9
+  metadata.gz: 48263a7614294561a2577b0e4ba1cc0b7e059ca9828d17c74c463a6c844fe0cd
+  data.tar.gz: 7e07b0cd665b25c1f53d69df8f8468e0ea94aa295450611e997165c6b8a01c8d
 SHA512:
-  metadata.gz: 12b0d50e87fc114cdb2094da1b111e1439719a5b318ae4846f197a60c33d20dd31076f1af212daf323170f4beb0c25d2d2a16fb782fc630fe3bb0e1dd96ef4de
-  data.tar.gz: 7fe0fa49671b375ac8e53938f52f4b38b3544ab539fd7aef977f422af2ce7a25b898c950c2dd1db48ae4f9032e1a56b5a3248e0965eb68f84ec97dee433732fa
+  metadata.gz: 11d8b762d159293e32cdc2d71d539eaa728c5e89788a8ed628e03f56af35f79dfe91d6a2327b7879934e76a4e602b21692171fae2b943f71e081656392313cb0
+  data.tar.gz: b206a77da3013cfbf41f5e886575cb4a9cb13013b69f015d4e68c6253047643dff7d2640fb61c1d2da5dcc21d501fc8839ad5238add7badfb2990eec675f98ab

data/README.adoc

@@ -77,11 +77,8 @@ Please refer to the Metanorma-ISO documentation for general documentation.
 
 See https://www.metanorma.com/author/iso/[Write ISO documents with Metanorma]
 
-////
 == Examples
 
-* link:spec/examples/rfc6350.adoc[] is an Metanorma AsciiDoc version of https://tools.ietf.org/html/rfc6350[RFC 6350].
-* link:spec/examples/rfc6350.html[] is an HTML file generated from the Asciidoctor.
-* link:spec/examples/rfc6350.doc[] is a Word document generated from the Asciidoctor.
-////
+* Example documents are avalable at the https://github.com/metanorma/mn-samples-iec[mn-samples-iec] repository.
+* Document templates are available at the https://github.com/metanorma/mn-templates-iec[mn-templates-iec] repository.
 

data/lib/asciidoctor/iec/basicdoc.rng

@@ -284,6 +284,9 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="alt"/>
+      </optional>
       <optional>
         <ref name="tname"/>
       </optional>

data/lib/asciidoctor/iec/biblio.rng

@@ -278,10 +278,12 @@
   </define>
   <define name="organization">
     <element name="organization">
-      <ref name="orgname"/>
-      <optional>
+      <oneOrMore>
+        <ref name="orgname"/>
+      </oneOrMore>
+      <zeroOrMore>
         <ref name="subdivision"/>
-      </optional>
+      </zeroOrMore>
       <optional>
         <ref name="abbreviation"/>
       </optional>
@@ -357,6 +359,9 @@
   </define>
   <define name="phone">
     <element name="phone">
+      <optional>
+        <attribute name="type"/>
+      </optional>
       <text/>
     </element>
   </define>
@@ -1024,6 +1029,8 @@
       <value>correctedBy</value>
       <value>revises</value>
       <value>revisedBy</value>
+      <value>describes</value>
+      <value>describedBy</value>
     </choice>
   </define>
   <define name="docrelation">

data/lib/asciidoctor/iec/converter.rb

@@ -39,6 +39,14 @@ module Asciidoctor
         end
       end
 
+      def iso_id(node, xml)
+        return unless node.attr("docnumber")
+        part, subpart = node&.attr("partnumber")&.split(/-/)
+        dn = add_id_parts(node.attr("docnumber"), part, subpart)
+        dn = id_stage_prefix(dn, node)
+        xml.docidentifier dn, **attr_code(type: "iso")
+      end
+
       def make_preface(x, s)
         s.previous = boilerplate(x)
         super

data/lib/asciidoctor/iec/isostandard.rng

@@ -6,7 +6,9 @@
     </start>
     <define name="organization">
       <element name="organization">
-        <ref name="orgname"/>
+        <oneOrMore>
+          <ref name="orgname"/>
+        </oneOrMore>
         <optional>
           <ref name="abbreviation"/>
         </optional>

data/lib/metanorma/iec/version.rb

@@ -1,6 +1,6 @@
 module Metanorma
   module Iec
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end
 

data/spec/asciidoctor-iec/table_spec.rb

@@ -130,14 +130,14 @@ RSpec.describe Asciidoctor::Iec do
       | Husked rice, parboiled | 1,0 | 1,0 | Not applicable | 1,0
       | Milled rice, parboiled | 1,0 | 1,0 | 1,0 | Not applicable
       | Chips | 0,1 | 0,1 | 0,1 | 0,1
-      | HDK | 2,0 footnoteref:[defectsmass,The maximum permissible mass fraction of defects shall be determined with respect to the mass fraction obtained after milling.] | 2,0 | 2,0 footnoteref:[defectsmass] | 2,0
+      | HDK | 2,0 footnote:defectsmass[The maximum permissible mass fraction of defects shall be determined with respect to the mass fraction obtained after milling.] | 2,0 | 2,0 footnote:defectsmass[] | 2,0
       | Damaged kernels | 4,0 | 3,0 | 4,0 | 3,0
       | Immature and/or malformed kernels | 8,0 | 2,0 | 8,0 | 2,0
-      | Chalky kernels | 5,0 footnoteref:[defectsmass] | 5,0 | Not applicable | Not applicable
-      | Red kernels and red-streaked kernels | 12,0 | 12,0 | 12,0 footnoteref:[defectsmass] | 12,0
-      | Partly gelatinized kernels | Not applicable | Not applicable | 11,0 footnoteref:[defectsmass] | 11,0
+      | Chalky kernels | 5,0 footnote:defectsmass[] | 5,0 | Not applicable | Not applicable
+      | Red kernels and red-streaked kernels | 12,0 | 12,0 | 12,0 footnote:defectsmass[] | 12,0
+      | Partly gelatinized kernels | Not applicable | Not applicable | 11,0 footnote:defectsmass[] | 11,0
       | Pecks | Not applicable | Not applicable | 4,0 | 2,0
-      | Waxy rice | 1,0 footnoteref:[defectsmass] | 1,0 | 1,0 footnoteref:[defectsmass] | 1,0
+      | Waxy rice | 1,0 footnote:defectsmass[] | 1,0 | 1,0 footnote:defectsmass[] | 1,0
       
       5+a| Live insects shall not be present. Dead insects shall be included in extraneous matter.
       |===

data/spec/isodoc/postproc_spec.rb

@@ -264,7 +264,8 @@ RSpec.describe IsoDoc do
                <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
              </p>
              <div class="Section3"><a name="P" id="P"></a>
-               <p class="Sourcecode"><a name="A" id="A"></a>puts "Hello, world."</p>
+               <p class="Sourcecode" style='page-break-after:avoid;'><a name="A" id="A"></a>puts "Hello, world."</p>
+               <p class='SourceTitle' style='text-align:center;'>Figure A.1</p>
                <p class="TableTitle" style="text-align:center;">Table A.1</p>
                           <div align='center' class='table_container'>
              <table class='MsoISOTable' style='mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;'>
@@ -272,7 +273,8 @@ RSpec.describe IsoDoc do
                    <tbody>
                      <tr>
                        <td style="border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;" class="TABLE-cell">
-           <p class="CODE-TableCell"><a name="B" id="B"></a>puts "Hello, world."</p>
+           <p class="CODE-TableCell"  style='page-break-after:avoid;'><a name="B" id="B"></a>puts "Hello, world."</p>
+           <p class='SourceTitle' style='text-align:center;'>Figure A.2</p>
            </td>
                      </tr>
                    </tbody>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-iec
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2019-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-jing