metanorma-bsi 0.0.1 → 0.1.0

data/lib/asciidoctor/bsi/converter.rb

@@ -22,16 +22,18 @@ module Asciidoctor
 
       def note(node)
         return commentary(node) if node.attr("type") == "commentary"
+
         super
       end
 
       def commentary_attrs(node)
+        b = node.attr("beforeclauses") == "true" ? "true" : nil
         attr_code(keep_attrs(node).merge(
-          id: Metanorma::Utils::anchor_or_uuid(node),
-          type: "commentary",
-          target: node.attr("target"),
-          beforeclauses: node.attr("beforeclauses") == "true" ? "true" : nil
-        ))
+                    id: Metanorma::Utils::anchor_or_uuid(node),
+                    type: "commentary",
+                    target: node.attr("target"),
+                    beforeclauses: b,
+                  ))
       end
 
       def commentary(node)

data/lib/asciidoctor/bsi/front.rb

@@ -2,7 +2,7 @@ module Asciidoctor
   module BSI
     class Converter < ISO::Converter
       def org_abbrev
-        super.merge("British Standards Institute" => "BSI")
+        super.merge("British Standards Institution" => "BSI")
       end
 
       def metadata_author(node, xml)
@@ -11,7 +11,7 @@ module Asciidoctor
           xml.contributor do |c|
             c.role **{ type: "author" }
             c.organization do |a|
-              organization(a, p, node, !node.attr("publisher"))
+              organization(a, p, false, node, !node.attr("publisher"))
             end
           end
         end
@@ -23,7 +23,7 @@ module Asciidoctor
           xml.contributor do |c|
             c.role **{ type: "publisher" }
             c.organization do |a|
-              organization(a, p, node, !node.attr("publisher"))
+              organization(a, p, true, node, !node.attr("publisher"))
             end
           end
         end
@@ -36,7 +36,7 @@ module Asciidoctor
             c.from (node.attr("copyright-year") || Date.today.year)
             c.owner do |owner|
               owner.organization do |o|
-                organization(o, p, node, !node.attr("copyright-holder") ||
+                organization(o, p, true, node, !node.attr("copyright-holder") ||
                              node.attr("publisher"))
               end
             end
@@ -58,7 +58,28 @@ module Asciidoctor
       end
 
       def relaton_relations
-        super + %w(obsoletes adopted-from)
+        super + %w(obsoletes adopted-from bsi-related)
+      end
+
+      def get_typeabbr(node, amd = false)
+        case doctype(node)
+        when "publicly-available-specification" then "PAS "
+        when "british-standard" then "BS "
+        when "draft-for-development" then "DD "
+        when "privately-subscribed-standard" then "PSS "
+        when "flex-standard" then "Flex "
+        else
+          super
+        end
+      end
+
+      def id_stage_abbr(stage, substage, node, bare = false)
+        ret = super
+        if %w(publicly-available-specification).include?(doctype(node)) &&
+            !%w(D FD).include?(ret)
+          ret = "#{ret} "
+        end
+        ret
       end
 
       # TODO: not yet implemented prefixes for subsectors explicitly, Rules for Structure Annex F

data/lib/asciidoctor/bsi/isodoc.rng

@@ -45,6 +45,11 @@
         <optional>
           <attribute name="alt"/>
         </optional>
+        <optional>
+          <attribute name="updatetype">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <text/>
       </element>
     </define>
@@ -543,6 +548,9 @@
     </define>
     <define name="BibDataExtensionType">
       <ref name="doctype"/>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
       <optional>
         <ref name="editorialgroup"/>
       </optional>
@@ -876,8 +884,28 @@
         </zeroOrMore>
       </element>
     </define>
+    <define name="pagebreak">
+      <element name="pagebreak">
+        <optional>
+          <attribute name="orientation">
+            <choice>
+              <value>landscape</value>
+              <value>portrait</value>
+            </choice>
+          </attribute>
+        </optional>
+      </element>
+    </define>
   </include>
   <!-- end overrides -->
+  <define name="docsubtype">
+    <element name="docsubtype">
+      <ref name="DocumentSubtype"/>
+    </element>
+  </define>
+  <define name="DocumentSubtype">
+    <text/>
+  </define>
   <define name="colgroup">
     <element name="colgroup">
       <oneOrMore>
@@ -943,8 +971,170 @@
       <ref name="permission"/>
       <ref name="imagemap"/>
       <ref name="svgmap"/>
+      <ref name="inputform"/>
+    </choice>
+  </define>
+  <define name="inputform">
+    <element name="form">
+      <attribute name="id">
+        <data type="ID"/>
+      </attribute>
+      <attribute name="name"/>
+      <attribute name="action"/>
+      <zeroOrMore>
+        <choice>
+          <ref name="TextElement"/>
+          <ref name="FormInput"/>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="FormInput">
+    <choice>
+      <ref name="input"/>
+      <ref name="formlabel"/>
+      <ref name="select"/>
+      <ref name="textarea"/>
+    </choice>
+  </define>
+  <define name="InputType">
+    <choice>
+      <value>button</value>
+      <value>checkbox</value>
+      <value>date</value>
+      <value>file</value>
+      <value>password</value>
+      <value>radio</value>
+      <value>submit</value>
+      <value>text</value>
     </choice>
   </define>
+  <define name="input">
+    <element name="input">
+      <attribute name="type">
+        <ref name="InputType"/>
+      </attribute>
+      <optional>
+        <attribute name="checked">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="disabled">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="readonly">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="maxlength">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="minlength">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="name"/>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+    </element>
+  </define>
+  <define name="formlabel">
+    <element name="label">
+      <attribute name="for">
+        <data type="IDREF"/>
+      </attribute>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="select">
+    <element name="select">
+      <optional>
+        <attribute name="name"/>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="disabled">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="multiple">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="size">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <oneOrMore>
+        <ref name="option"/>
+      </oneOrMore>
+    </element>
+  </define>
+  <define name="option">
+    <element name="option">
+      <optional>
+        <attribute name="disabled">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <zeroOrMore>
+        <ref name="PureTextElement"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="textarea">
+    <element name="textarea">
+      <optional>
+        <attribute name="name"/>
+      </optional>
+      <optional>
+        <attribute name="value"/>
+      </optional>
+      <optional>
+        <attribute name="id">
+          <data type="ID"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="rows">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="cols">
+          <data type="int"/>
+        </attribute>
+      </optional>
+    </element>
+  </define>
   <define name="bibliography">
     <element name="bibliography">
       <oneOrMore>
@@ -1017,9 +1207,7 @@
   </define>
   <define name="IsoWorkgroup">
     <optional>
-      <attribute name="number">
-        <data type="int"/>
-      </attribute>
+      <attribute name="number"/>
     </optional>
     <optional>
       <attribute name="type"/>

data/lib/asciidoctor/bsi/isostandard.rng

@@ -38,6 +38,9 @@
     </define>
     <define name="BibDataExtensionType">
       <ref name="doctype"/>
+      <optional>
+        <ref name="docsubtype"/>
+      </optional>
       <optional>
         <ref name="horizontal"/>
       </optional>
@@ -256,6 +259,15 @@
         <value>guide</value>
         <value>amendment</value>
         <value>technical-corrigendum</value>
+        <value>directive</value>
+      </choice>
+    </define>
+    <define name="DocumentSubtype">
+      <choice>
+        <value>specification</value>
+        <value>method-of-test</value>
+        <value>vocabulary</value>
+        <value>code-of-practice</value>
       </choice>
     </define>
     <define name="structuredidentifier">

data/lib/asciidoctor/bsi/validate.rb

@@ -105,10 +105,10 @@ module Asciidoctor
       # Rules for Structure 20.4
       def annex_ordering_validate(root)
         ids = citation_order(root.xpath("//annex"))
-        cite_order = ids.keys.sort { |a, b| ids[a] <=> ids[b] }
+        cite_order = ids.keys.sort_by { |a| ids[a] || 999999 }
         annex_order = root.xpath("//annex").map { |x| x["id"] }
         cite_order.each_with_index do |a, i|
-          next if annex_order[i] == a
+          next if annex_order[i] == a || ids[a].nil?
 
           annex = root.at("//annex[@id = '#{a}']")
           title = annex&.at("./title")&.text || "Annex #{a}"
@@ -134,10 +134,9 @@ module Asciidoctor
           /^9.$/.match?(status) and
             @log.add("Style", b,
                      "Do not cite withdrawn standards as normative: #{b.text}")
-          /^[0-5].$/.match?(status) and @log.add(
-            "Style", b,
-            "Do not cite unpublished standards as normative: #{b.text}"
-          )
+          /^[0-5].$/.match?(status) and
+            @log.add("Style", b, "Do not cite unpublished standards "\
+                     "as normative: #{b.text}")
         end
       end
 

data/lib/asciidoctor/bsi/validate_list.rb

@@ -25,13 +25,13 @@ module Asciidoctor
           prec&.name == "p" or
             style_warning(list, "All lists must be preceded by "\
                           "introductory phrase", nil)
-          list_punctuation1(list, prec.text)
+          list_punctuation1(list, prec&.text)
         end
       end
 
       def list_punctuation1(list, prectext)
         entries = list.xpath(".//li")
-        case prectext.sub(/^.*?(\S)\s*$/, "\\1")
+        case prectext&.sub(/^.*?(\S)\s*$/, "\\1")
         when ":"
           list.xpath(".//li").each_with_index do |li, i|
             list_semicolon_phrase(li, i == entries.size - 1)

data/lib/isodoc/bsi/base_convert.rb

@@ -66,7 +66,8 @@ module IsoDoc
       end
 
       def admonition_parse(node, div)
-        commentary_parse(node, div) if node["type"] == "commentary"
+        return commentary_parse(node, div) if node["type"] == "commentary"
+
         super
       end