metanorma-iso 1.5.5 → 1.5.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bcabff05127bffd43a5d6ebdf493e749261b503d4ea4c74e1695bd60fbbc296f
-  data.tar.gz: 9fd41efb199ed745ef98c7ccddec6601c4ed6346ac925f572fde2b6525c0dc01
+  metadata.gz: bcacb0045dc41c1bd31e2623205d83815c60dc4e020bbe6c0485ee0abd2f24d6
+  data.tar.gz: 795cf80c9d0c18c0aebfeff25f7e919c790b47fbf3352746e5f28cf90701a728
 SHA512:
-  metadata.gz: b2b4b8a9cf7350d82696a4872993319ae18df5ac2db23929177518522c63f1e0742c0368a326986579c40df1ff071406806af6ccb7bd2c103db59dac8923c8c7
-  data.tar.gz: 30232402dfe7f6a7e86cc13337003c794ef3754cbb1a44986647526cee9bafb25e8cbac5838576ca04f242a2f47978e835dcfd5bec91cc252c9ac682d9dae50a
+  metadata.gz: 72ebb4928526e51d726f697c99798f2375f3e26c34b7e641e463a074a9d467a3e94e4d60c68a129ac71552e7826a757af0f20c871aefe5f7b27a2f21e0e17b74
+  data.tar.gz: 8507e683e4534458a8a3af9908862608e6e07675b2c6cdd9f29788b84ef36b3456fb4a859c33efd8a89f1f91206b2bc6e3dd00ef281ffbcebe8cad5599d08fe7

data/lib/asciidoctor/iso/basicdoc.rng

@@ -402,6 +402,16 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="valign">
+          <choice>
+            <value>top</value>
+            <value>middle</value>
+            <value>bottom</value>
+            <value>baseline</value>
+          </choice>
+        </attribute>
+      </optional>
       <choice>
         <zeroOrMore>
           <ref name="TextElement"/>
@@ -429,6 +439,16 @@
           </choice>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="valign">
+          <choice>
+            <value>top</value>
+            <value>middle</value>
+            <value>bottom</value>
+            <value>baseline</value>
+          </choice>
+        </attribute>
+      </optional>
       <choice>
         <zeroOrMore>
           <ref name="TextElement"/>
@@ -998,6 +1018,9 @@
           <value>alphabet_upper</value>
         </choice>
       </attribute>
+      <optional>
+        <attribute name="start"/>
+      </optional>
       <oneOrMore>
         <ref name="li"/>
       </oneOrMore>

data/lib/asciidoctor/iso/front.rb

@@ -18,18 +18,9 @@ module Asciidoctor
           xml.updates_document_type a
       end
 
-      def organization(org, orgname)
-        if ["ISO",
-            "International Organization for Standardization"].include? orgname
-          org.name "International Organization for Standardization"
-          org.abbreviation "ISO"
-        elsif ["IEC",
-               "International Electrotechnical Commission"].include? orgname
-          org.name "International Electrotechnical Commission"
-          org.abbreviation "IEC"
-        else
-          org.name orgname
-        end
+      def org_abbrev
+        { "International Organization for Standardization" => "ISO",
+          "International Electrotechnical Commission" => "IEC" }
       end
 
       def metadata_author(node, xml)
@@ -37,7 +28,7 @@ module Asciidoctor
         csv_split(publishers).each do |p|
           xml.contributor do |c|
             c.role **{ type: "author" }
-            c.organization { |a| organization(a, p) }
+            c.organization { |a| organization(a, p, node, !node.attr("publisher")) }
           end
         end
       end
@@ -47,7 +38,7 @@ module Asciidoctor
         csv_split(publishers).each do |p|
           xml.contributor do |c|
             c.role **{ type: "publisher" }
-            c.organization { |a| organization(a, p) }
+            c.organization { |a| organization(a, p, node, !node.attr("publisher")) }
           end
         end
       end
@@ -58,7 +49,10 @@ module Asciidoctor
           xml.copyright do |c|
             c.from (node.attr("copyright-year") || Date.today.year)
             c.owner do |owner|
-              owner.organization { |o| organization(o, p) }
+              owner.organization do |o|
+                organization(o, p, node,
+                             !(node.attr("copyright-holder") || node.attr("publisher")))
+              end
             end
           end
         end

data/lib/asciidoctor/iso/isodoc.rng

@@ -42,7 +42,6 @@
     </define>
     <define name="xref">
       <element name="xref">
-        <!-- attribute target { xsd:IDREF }, -->
         <attribute name="target">
           <data type="string">
             <param name="pattern">\i\c*|\c+#\c+</param>
@@ -64,6 +63,11 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="droploc">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -581,6 +585,8 @@
             <ref name="ol"/>
             <ref name="dl"/>
             <ref name="formula"/>
+            <ref name="quote"/>
+            <ref name="sourcecode"/>
           </choice>
         </oneOrMore>
       </element>
@@ -664,6 +670,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -700,6 +716,16 @@
             </choice>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="valign">
+            <choice>
+              <value>top</value>
+              <value>middle</value>
+              <value>bottom</value>
+              <value>baseline</value>
+            </choice>
+          </attribute>
+        </optional>
         <choice>
           <zeroOrMore>
             <choice>
@@ -837,6 +863,13 @@
   </define>
   <define name="standard-document">
     <element name="standard-document">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <optional>
         <ref name="boilerplate"/>
@@ -858,7 +891,7 @@
       <oneOrMore>
         <choice>
           <ref name="content"/>
-          <ref name="preface_abstract"/>
+          <ref name="abstract"/>
           <ref name="foreword"/>
           <ref name="introduction"/>
           <ref name="acknowledgements"/>
@@ -1052,14 +1085,17 @@
       <ref name="section-title"/>
     </optional>
     <group>
-      <group>
-        <zeroOrMore>
-          <ref name="BasicBlock"/>
-        </zeroOrMore>
-        <zeroOrMore>
-          <ref name="note"/>
-        </zeroOrMore>
-      </group>
+      <choice>
+        <group>
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
+          <zeroOrMore>
+            <ref name="note"/>
+          </zeroOrMore>
+        </group>
+        <ref name="amend"/>
+      </choice>
       <zeroOrMore>
         <choice>
           <ref name="clause-subsection"/>
@@ -1456,11 +1492,6 @@
       </optional>
     </element>
   </define>
-  <define name="preface_abstract">
-    <element name="abstract">
-      <ref name="Basic-Section"/>
-    </element>
-  </define>
   <define name="term-clause">
     <element name="clause">
       <optional>
@@ -1510,4 +1541,79 @@
       <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>
+        </choice>
+      </attribute>
+      <optional>
+        <attribute name="path"/>
+      </optional>
+      <optional>
+        <attribute name="path_end"/>
+      </optional>
+      <optional>
+        <attribute name="title"/>
+      </optional>
+      <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">
+          <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">
+        <choice>
+          <value>requirement</value>
+          <value>recommendation</value>
+          <value>permission</value>
+          <value>table</value>
+          <value>figure</value>
+          <value>admonition</value>
+          <value>formula</value>
+          <value>sourcecode</value>
+          <value>example</value>
+          <value>note</value>
+        </choice>
+      </attribute>
+      <text/>
+    </element>
+  </define>
 </grammar>

data/lib/asciidoctor/iso/isostandard.rng

@@ -253,7 +253,7 @@
     <define name="preface">
       <element name="preface">
         <optional>
-          <ref name="preface_abstract"/>
+          <ref name="abstract"/>
         </optional>
         <ref name="foreword"/>
         <optional>
@@ -405,6 +405,13 @@
   -->
   <define name="iso-standard">
     <element name="iso-standard">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/asciidoctor/iso/section.rb

@@ -30,13 +30,6 @@ module Asciidoctor
         xml << node.content
       end
 
-      def section_attributes(node)
-        super.merge(
-          change: @amd ? node.attr("change") : nil,
-          locality: @amd ? node.attr("locality") : nil,
-        )
-      end
-
       def sectiontype(node, level = true)
         return nil if @amd
         super

data/lib/isodoc/iso/html/isodoc.css

@@ -652,7 +652,7 @@ div.figdl p, table.figdl p {
 table.formula_dl {
   margin-left: 20.15pt; }
 
-table.MsoISOTable {
+table.MsoISOTable, table.MsoISOTableBig {
   mso-style-name: "Table ISO";
   mso-tstyle-rowband-size: 0;
   mso-tstyle-colband-size: 0;
@@ -673,17 +673,17 @@ table.MsoISOTable {
   font-size: 10.0pt;
   font-family: {{bodyfont}}; }
 
-table.MsoISOTable th {
+table.MsoISOTable th, table.MsoISOTableBig th {
   border: solid windowtext 1pt;
   mso-border-alt: solid windowtext 1pt;
   padding: 0cm 2.85pt 0cm 2.85pt; }
 
-table.MsoISOTable td {
+table.MsoISOTable td, table.MsoISOTableBig td {
   border: solid windowtext 1pt;
   mso-border-alt: solid windowtext 1pt;
   padding: 0cm 2.85pt 0cm 2.85pt; }
 
-table.MsoISOTable p {
+table.MsoISOTable p, table.MsoISOTableBig p {
   font-size: 10.0pt; }
 
 table.MsoTableGrid {
@@ -855,8 +855,20 @@ div.example p.MsoListParagraph {
   font-size: 10.0pt; }
 
 div.Note p.MsoListParagraph {
+  font-size: 10.0pt;
+  margin-left: 1.0cm; }
+
+div.Note span.stem {
   font-size: 10.0pt; }
 
+div.Note p.Sourcecode, div.Note pre.Sourcecode {
+  font-size: 8.0pt;
+  margin-left: 1.0cm; }
+
+div.Note table.dl {
+  font-size: 10.0pt;
+  margin-left: 1.0cm; }
+
 span.note_label, span.example_label, td.example_label, td.note_label {
   font-size: 10.0pt;
   font-family: {{bodyfont}}; }

data/lib/isodoc/iso/html/isodoc.scss

@@ -627,7 +627,7 @@ table.formula_dl {
 	margin-left:20.15pt;
 }
 
-table.MsoISOTable
+table.MsoISOTable, table.MsoISOTableBig
 	{mso-style-name:"Table ISO";
 	mso-tstyle-rowband-size:0;
 	mso-tstyle-colband-size:0;
@@ -647,15 +647,15 @@ table.MsoISOTable
 	mso-border-insidev:.75pt solid windowtext;
 	font-size:10.0pt;
 	font-family:$bodyfont;}
-table.MsoISOTable th
+table.MsoISOTable th, table.MsoISOTableBig th
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
     padding:0cm 2.85pt 0cm 2.85pt;}
-table.MsoISOTable td
+table.MsoISOTable td, table.MsoISOTableBig td
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
     padding:0cm 2.85pt 0cm 2.85pt;}
-table.MsoISOTable p
+table.MsoISOTable p, table.MsoISOTableBig p
 {font-size:10.0pt; }
 table.MsoTableGrid
 	{mso-style-name:"Table Grid";
@@ -842,6 +842,20 @@ div.example p.MsoListParagraph {
 
 div.Note p.MsoListParagraph {
   font-size: 10.0pt;
+  margin-left: 1.0cm;
+}
+
+div.Note span.stem {
+  font-size: 10.0pt; }
+
+div.Note p.Sourcecode, div.Note pre.Sourcecode  {
+  font-size: 8.0pt;
+  margin-left: 1.0cm;
+}
+
+div.Note table.dl  {
+  font-size: 10.0pt;
+  margin-left: 1.0cm;
 }
 
 span.note_label, span.example_label, td.example_label, td.note_label

data/lib/isodoc/iso/html/style-human.css

@@ -16,7 +16,7 @@ fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, embed,
 figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
+menu, output, ruby, section, summary,
 time, mark, audio, video {
   margin: 0;
   padding: 0; }