metanorma-iso 1.5.1 → 1.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4efe57fc87938f85770ed9c8a784736a25e1f69712ed770f21bf6b59a212b3f
-  data.tar.gz: ebd36532e1f6742007b4415ace26933d72670d0d376485ed7f7fe5713bca3e5c
+  metadata.gz: af5b522de99b45f3bfe7f85160164adef26c76fd3422589d47309fa9e45086b3
+  data.tar.gz: 99305967e4efd098f560a968e290ed45f687841f3246995b73e472a1776e29be
 SHA512:
-  metadata.gz: 9c44d90b036a28539859a9c291bbdb6575061196fe52f25ddb76a48b512ee284f107e82ab8aa25e57c3c95135480ecd3e48e13932e839fcd8978764b25a0693b
-  data.tar.gz: d6166c40c1003fa88abfd11ee36938bd435c58549501e321a6048ecbcf5c21f2be25ad30667d75a26845d6b63e0cc251778451d970de8c43237452327b8061d9
+  metadata.gz: 277da3d65b6fb4b0de530d152ef7c3f02cdd8aca331f8b0b8d201fd9ce99c245f80556ad9f5465d7aba7a47b0cfba3823ce98b6afb11dd8df2ef3ced774c2232
+  data.tar.gz: 767a3e807f6f26548c1535e297063a73c9b04e45c62b9f7c97929c4bde1917b33027b05a50625ee45b5fb9983f40d9e6337016978db94319bd2ce9f834c28860

data/.github/workflows/ubuntu.yml

@@ -39,7 +39,7 @@ jobs:
           polling_interval_seconds: 5
           timeout_minutes: 5
           max_attempts: 3
-          command: sudo bash -c "curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
+          command: sudo apt-get update -y && sudo bash -c "curl -L https://github.com/metanorma/plantuml-install/raw/master/ubuntu.sh | bash"
       - name: Run specs
         run: |
           bundle exec rake

data/lib/asciidoctor/iso/base.rb

@@ -46,7 +46,7 @@ module Asciidoctor
 
       def init(node)
         super
-        @amd = %w(amendment technical-corrigendum).include? node.attr("doctype")
+        @amd = %w(amendment technical-corrigendum).include? doctype(node)
       end
 
       def outputs(node, ret)

data/lib/asciidoctor/iso/basicdoc.rng

@@ -158,7 +158,17 @@
         <data type="ID"/>
       </attribute>
       <oneOrMore>
-        <ref name="paragraph"/>
+        <choice>
+          <ref name="formula"/>
+          <ref name="ul"/>
+          <ref name="ol"/>
+          <ref name="dl"/>
+          <ref name="quote"/>
+          <ref name="sourcecode"/>
+          <ref name="paragraph"/>
+          <ref name="table"/>
+          <ref name="figure"/>
+        </choice>
       </oneOrMore>
     </element>
   </define>
@@ -402,6 +412,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 +449,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"/>

data/lib/asciidoctor/iso/front.rb

@@ -13,7 +13,7 @@ module Asciidoctor
         super
         structured_id(node, xml)
         xml.stagename stage_name(get_stage(node), get_substage(node),
-                                 node.attr("doctype"), node.attr("iteration"))
+                                 doctype(node), node.attr("iteration"))
         @amd && a = node.attr("updates-document-type") and
           xml.updates_document_type a
       end
@@ -34,7 +34,7 @@ module Asciidoctor
 
       def metadata_author(node, xml)
         publishers = node.attr("publisher") || "ISO"
-        publishers.split(/,[ ]?/).each do |p|
+        csv_split(publishers).each do |p|
           xml.contributor do |c|
             c.role **{ type: "author" }
             c.organization { |a| organization(a, p) }
@@ -44,7 +44,7 @@ module Asciidoctor
 
       def metadata_publisher(node, xml)
         publishers = node.attr("publisher") || "ISO"
-        publishers.split(/,[ ]?/).each do |p|
+        csv_split(publishers).each do |p|
           xml.contributor do |c|
             c.role **{ type: "publisher" }
             c.organization { |a| organization(a, p) }
@@ -53,8 +53,8 @@ module Asciidoctor
       end
 
       def metadata_copyright(node, xml)
-        publishers = node.attr("publisher") || "ISO"
-        publishers.split(/,[ ]?/).each do |p|
+        publishers = node.attr("copyright-holder") || node.attr("publisher") || "ISO"
+        csv_split(publishers).each do |p|
           xml.copyright do |c|
             c.from (node.attr("copyright-year") || Date.today.year)
             c.owner do |owner|
@@ -68,7 +68,7 @@ module Asciidoctor
         stage = get_stage(node)
         substage = get_substage(node)
         xml.status do |s|
-          s.stage stage, **attr_code(abbreviation: stage_abbr(stage, substage, node.attr("doctype")))
+          s.stage stage, **attr_code(abbreviation: stage_abbr(stage, substage, doctype(node)))
           s.substage substage
           node.attr("iteration") && (s.iteration node.attr("iteration"))
         end

data/lib/asciidoctor/iso/front_id.rb

@@ -95,7 +95,7 @@ module Asciidoctor
       def add_amd_parts(dn, node)
         a = node.attr("amendment-number")
         c = node.attr("corrigendum-number")
-        case node.attr("doctype")
+        case doctype(node)
         when "amendment"
           "#{dn}/Amd #{node.attr('amendment-number')}"
         when "technical-corrigendum"
@@ -134,11 +134,11 @@ module Asciidoctor
 
       def id_stage_abbr(stage, substage, node)
         ret = IsoDoc::Iso::Metadata.new("en", "Latn", @i18n).
-          status_abbrev(stage_abbr(stage, substage, node.attr("doctype")),
+          status_abbrev(stage_abbr(stage, substage, doctype(node)),
                         substage, node.attr("iteration"),
-                        node.attr("draft"), node.attr("doctype"))
+                        node.attr("draft"), doctype(node))
         if %w(amendment technical-corrigendum amendment
-          technical-corrigendum).include?(node.attr("doctype"))
+          technical-corrigendum).include?(doctype(node))
           ret = ret + " " unless %w(40 50).include?(stage)
         end
         ret
@@ -184,7 +184,7 @@ module Asciidoctor
       end
 
       def get_typeabbr(node)
-        case node.attr("doctype")
+        case doctype(node)
         when "technical-report" then "TR "
         when "technical-specification" then "TS "
         else

data/lib/asciidoctor/iso/isodoc.rng

@@ -42,8 +42,11 @@
     </define>
     <define name="xref">
       <element name="xref">
+        <!-- attribute target { xsd:IDREF }, -->
         <attribute name="target">
-          <data type="IDREF"/>
+          <data type="string">
+            <param name="pattern">\i\c*|\c+#\c+</param>
+          </data>
         </attribute>
         <optional>
           <attribute name="type">
@@ -578,6 +581,8 @@
             <ref name="ol"/>
             <ref name="dl"/>
             <ref name="formula"/>
+            <ref name="quote"/>
+            <ref name="sourcecode"/>
           </choice>
         </oneOrMore>
       </element>
@@ -661,6 +666,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>
@@ -697,6 +712,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>
@@ -1049,14 +1074,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"/>
@@ -1507,4 +1535,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/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/asciidoctor/iso/validate_section.rb

@@ -7,6 +7,7 @@ module Asciidoctor
         foreword_validate(doc.root)
         normref_validate(doc.root)
         symbols_validate(doc.root)
+        sections_presence_validate(doc.root)
         sections_sequence_validate(doc.root)
         section_style(doc.root)
         subclause_validate(doc.root)
@@ -55,6 +56,15 @@ module Asciidoctor
         names
       end
 
+      def sections_presence_validate(root)
+        root.at("//sections/clause[@type = 'scope']") or
+          @log.add("Style", nil, "Scope clause missing")
+        root.at("//references[@normative = 'true']") or
+          @log.add("Style", nil, "Normative references missing")
+        root.at("//terms") or
+          @log.add("Style", nil, "Terms & definitions missing")
+      end
+
       # spec of permissible section sequence
       # we skip normative references, it goes to end of list
       SEQ =

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