metanorma-standoc 1.8.6 → 1.9.2

data/lib/asciidoctor/standoc/front_contributor.rb

@@ -21,7 +21,7 @@ module Asciidoctor
         end
       end
 
-      def organization(org, orgname, node = nil, default_org = nil)
+      def organization(org, orgname, is_pub, node = nil, default_org = nil)
         abbrevs = org_abbrev
         n = abbrevs.invert[orgname] and orgname = n
         org.name orgname
@@ -29,7 +29,7 @@ module Asciidoctor
         abbr = org_abbrev[orgname]
         default_org && b = node.attr("subdivision-abbr") and abbr = b
         abbr and org.abbreviation abbr
-        default_org and org_address(node, org)
+        is_pub && node and org_address(node, org)
       end
 
       def org_address(node, p)
@@ -59,7 +59,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
@@ -144,7 +144,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
@@ -157,7 +157,7 @@ module Asciidoctor
             c.from (node.attr("copyright-year") || Date.today.year)
             p.match(/[A-Za-z]/).nil? or c.owner do |owner|
               owner.organization do |a|
-                organization(a, p, node, !pub)
+                organization(a, p, true, node, !pub)
               end
             end
           end

data/lib/asciidoctor/standoc/inline.rb

@@ -45,7 +45,7 @@ module Asciidoctor
 
       def inline_anchor_xref_attrs(node)
         m = /^(?<drop>droploc%)?(?<case>capital%|lowercase%)?(?<drop2>droploc%)?
-          (?<fn>fn(:\s*(?<text>.*))?)?$/x.match node.text
+          (?<fn>fn:?\s*)?(?<text>.*)$/x.match node.text
         casing = m.nil? ? nil : m[:case]&.sub(/%$/, "")
         droploc = m.nil? ? nil : ((m[:drop].nil? && m[:drop2].nil?) ? nil: true)
         f = (m.nil? || m[:fn].nil?) ? "inline" : "footnote"

data/lib/asciidoctor/standoc/isodoc.rng

@@ -86,6 +86,35 @@
         <text/>
       </element>
     </define>
+    <define name="erefType">
+      <optional>
+        <attribute name="normative">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <attribute name="citeas"/>
+      <attribute name="type">
+        <ref name="ReferenceFormat"/>
+      </attribute>
+      <optional>
+        <attribute name="alt"/>
+      </optional>
+      <optional>
+        <attribute name="case">
+          <choice>
+            <value>capital</value>
+            <value>lowercase</value>
+          </choice>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="droploc">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
+      <ref name="CitationType"/>
+      <text/>
+    </define>
     <define name="ul">
       <element name="ul">
         <attribute name="id">
@@ -775,6 +804,90 @@
         <ref name="paragraph"/>
       </element>
     </define>
+    <define name="em">
+      <element name="em">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="strong">
+      <element name="strong">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="stem"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="tt">
+      <element name="tt">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="keyword">
+      <element name="keyword">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="strike">
+      <element name="strike">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="underline">
+      <element name="underline">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </zeroOrMore>
+      </element>
+    </define>
+    <define name="smallcap">
+      <element name="smallcap">
+        <zeroOrMore>
+          <choice>
+            <ref name="PureTextElement"/>
+            <ref name="index"/>
+          </choice>
+        </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="colgroup">
@@ -793,7 +906,35 @@
     <value>internal</value>
   </define>
   <define name="TextElement" combine="choice">
-    <ref name="concept"/>
+    <choice>
+      <ref name="concept"/>
+      <ref name="add"/>
+      <ref name="del"/>
+    </choice>
+  </define>
+  <define name="add">
+    <element name="add">
+      <choice>
+        <ref name="PureTextElement"/>
+        <ref name="eref"/>
+        <ref name="stem"/>
+        <ref name="keyword"/>
+        <ref name="xref"/>
+        <ref name="hyperlink"/>
+      </choice>
+    </element>
+  </define>
+  <define name="del">
+    <element name="del">
+      <choice>
+        <ref name="PureTextElement"/>
+        <ref name="eref"/>
+        <ref name="stem"/>
+        <ref name="keyword"/>
+        <ref name="xref"/>
+        <ref name="hyperlink"/>
+      </choice>
+    </element>
   </define>
   <define name="concept">
     <element name="concept">
@@ -814,8 +955,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>

data/lib/asciidoctor/standoc/lists.rb

@@ -28,14 +28,16 @@ module Asciidoctor
       end
 
       def ul_li_attrs(node)
+        c = node.attr?("checked")
         attr_code(
-          uncheckedcheckbox: node.attr?("checkbox") ? !node.attr?("checked") : nil,
-          checkedcheckbox: node.attr?("checkbox") ? node.attr?("checked") : nil,
+          uncheckedcheckbox: node.attr?("checkbox") ? !c : nil,
+          checkedcheckbox: node.attr?("checkbox") ? c : nil
         )
       end
 
       def ulist(node)
         return reference(node) if in_norm_ref? || in_biblio?
+
         noko do |xml|
           xml.ul **ul_attrs(node) do |xml_ul|
             node.items.each do |item|

data/lib/asciidoctor/standoc/macros.rb

@@ -2,10 +2,11 @@ require "asciidoctor/extensions"
 require "fileutils"
 require "uuidtools"
 require "yaml"
-require_relative "./macros_plantuml.rb"
-require_relative "./macros_terms.rb"
-require_relative "./datamodel/attributes_table_preprocessor.rb"
-require_relative "./datamodel/diagram_preprocessor.rb"
+require_relative "./macros_plantuml"
+require_relative "./macros_terms"
+require_relative "./macros_form"
+require_relative "./datamodel/attributes_table_preprocessor"
+require_relative "./datamodel/diagram_preprocessor"
 require "metanorma-plugin-datastruct"
 require "metanorma-plugin-lutaml"
 
@@ -29,6 +30,7 @@ module Asciidoctor
 
       def preprocess_attrs(attrs)
         return unless attrs.size > 1 && attrs.size < 5
+
         ret = { primary: attrs[1], target: attrs[attrs.size] }
         ret[:secondary] = attrs[2] if attrs.size > 2
         ret[:tertiary] = attrs[3] if attrs.size > 3
@@ -37,7 +39,8 @@ module Asciidoctor
 
       def process(_parent, target, attr)
         args = preprocess_attrs(attr) or return
-        ret = "<index-xref also='#{target == 'also'}'><primary>#{args[:primary]}</primary>"
+        ret = "<index-xref also='#{target == 'also'}'>"\
+          "<primary>#{args[:primary]}</primary>"
         ret += "<secondary>#{args[:secondary]}</secondary>" if args[:secondary]
         ret += "<tertiary>#{args[:tertiary]}</tertiary>" if args[:tertiary]
         ret + "<target>#{args[:target]}</target></index-xref>"
@@ -51,7 +54,7 @@ module Asciidoctor
 
       def process(parent, target, attr)
         text = attr["text"]
-        text = "((#{text}))" unless /^\(\(.+\)\)$/.match(text)
+        text = "((#{text}))" unless /^\(\(.+\)\)$/.match?(text)
         out = parent.sub_macros(text)
         out.sub(/<index>/, "<index to='#{target}'>")
       end
@@ -62,8 +65,8 @@ module Asciidoctor
       named :pseudocode
       on_context :example, :sourcecode
 
-      def init_indent(s)
-        /^(?<prefix>[ \t]*)(?<suffix>.*)$/ =~ s
+      def init_indent(line)
+        /^(?<prefix>[ \t]*)(?<suffix>.*)$/ =~ line
         prefix = prefix.gsub(/\t/, "\u00a0\u00a0\u00a0\u00a0")
           .gsub(/ /, "\u00a0")
         prefix + suffix
@@ -72,12 +75,12 @@ module Asciidoctor
       def supply_br(lines)
         ignore = false
         lines.each_with_index do |l, i|
-          /^(--+|====+|\|===|\.\.\.\.+|\*\*\*\*+|\+\+\+\++|\`\`\`\`+|____\+)$/.match(l) &&
-            (ignore = !ignore)
-          next if l.empty? || l.match(/ \+$/)
-          next if /^\[.*\]$/.match(l)
-          next if ignore
-          next if i == lines.size - 1 || i < lines.size - 1 && lines[i + 1].empty?
+          /^(--+|====+|\|===|\.\.\.\.+|\*\*\*\*+|\+\+\+\++|\`\`\`\`+|____\+)$/
+            .match(l) && (ignore = !ignore)
+          next if l.empty? || l.match(/ \+$/) || /^\[.*\]$/.match?(l) || ignore
+          next if i == lines.size - 1 ||
+            i < lines.size - 1 && lines[i + 1].empty?
+
           lines[i] += " +"
         end
         lines
@@ -86,9 +89,8 @@ module Asciidoctor
       def process(parent, reader, attrs)
         attrs["role"] = "pseudocode"
         lines = reader.lines.map { |m| init_indent(m) }
-        ret = create_block(parent, :example, supply_br(lines),
-                           attrs, content_model: :compound)
-        ret
+        create_block(parent, :example, supply_br(lines),
+                     attrs, content_model: :compound)
       end
     end
 
@@ -98,6 +100,7 @@ module Asciidoctor
       parse_content_as :text
       option :pos_attrs, %w(rpbegin rt rpend)
 
+      # for example, html5ruby:楽聖少女[がくせいしょうじょ]
       def process(_parent, target, attributes)
         rpbegin = "("
         rpend = ")"
@@ -105,7 +108,6 @@ module Asciidoctor
           rt = attributes["text"]
         elsif (attributes.size == 2) && attributes.key?(1) &&
           attributes.key?("rpbegin")
-          # for example, html5ruby:楽聖少女[がくせいしょうじょ]
           rt = attributes[1] || ""
         else
           rpbegin = attributes["rpbegin"]
@@ -126,21 +128,22 @@ module Asciidoctor
       def process(parent, reader, attrs)
         attrs["name"] = "todo"
         attrs["caption"] = "TODO"
-        create_block parent, :admonition, reader.lines, attrs,
-          content_model: :compound
+        create_block(parent, :admonition, reader.lines, attrs,
+                     content_model: :compound)
       end
     end
 
     class ToDoInlineAdmonitionBlock < Extensions::Treeprocessor
       def process(document)
         (document.find_by context: :paragraph).each do |para|
-          next unless /^TODO: /.match para.lines[0]
+          next unless /^TODO: /.match? para.lines[0]
+
           parent = para.parent
           para.set_attr("name", "todo")
           para.set_attr("caption", "TODO")
           para.lines[0].sub!(/^TODO: /, "")
-          todo = Block.new parent, :admonition, attributes: para.attributes,
-            source: para.lines, content_model: :compound
+          todo = Block.new(parent, :admonition, attributes: para.attributes,
+                           source: para.lines, content_model: :compound)
           parent.blocks[parent.blocks.index(para)] = todo
         end
       end
@@ -182,5 +185,29 @@ module Asciidoctor
         %{<footnoteblock>#{out}</footnoteblock>}
       end
     end
+
+    class AddMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :add
+      parse_content_as :text
+      using_format :short
+
+      def process(parent, _target, attrs)
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        %{<add>#{out}</add>}
+      end
+    end
+
+    class DelMacro < Asciidoctor::Extensions::InlineMacroProcessor
+      use_dsl
+      named :del
+      parse_content_as :text
+      using_format :short
+
+      def process(parent, _target, attrs)
+        out = Asciidoctor::Inline.new(parent, :quoted, attrs["text"]).convert
+        %{<del>#{out}</del>}
+      end
+    end
   end
 end