metanorma-standoc 1.8.7 → 1.9.3

data/lib/asciidoctor/standoc/converter.rb

@@ -13,7 +13,7 @@ require "asciidoctor/standoc/validate"
 require "asciidoctor/standoc/utils"
 require "asciidoctor/standoc/cleanup"
 require "asciidoctor/standoc/reqt"
-require_relative "./macros.rb"
+require_relative "./macros"
 
 module Asciidoctor
   module Standoc
@@ -39,6 +39,13 @@ module Asciidoctor
         inline_macro Asciidoctor::Standoc::TermRefInlineMacro
         inline_macro Asciidoctor::Standoc::IndexXrefInlineMacro
         inline_macro Asciidoctor::Standoc::IndexRangeInlineMacro
+        inline_macro Asciidoctor::Standoc::AddMacro
+        inline_macro Asciidoctor::Standoc::DelMacro
+        inline_macro Asciidoctor::Standoc::FormInputMacro
+        inline_macro Asciidoctor::Standoc::FormLabelMacro
+        inline_macro Asciidoctor::Standoc::FormTextareaMacro
+        inline_macro Asciidoctor::Standoc::FormSelectMacro
+        inline_macro Asciidoctor::Standoc::FormOptionMacro
         block Asciidoctor::Standoc::ToDoAdmonitionBlock
         treeprocessor Asciidoctor::Standoc::ToDoInlineAdmonitionBlock
         block Asciidoctor::Standoc::PlantUMLBlockMacro
@@ -76,8 +83,8 @@ module Asciidoctor
         attr_accessor :_file
       end
 
-      def self.inherited(k)
-        k._file = caller_locations.first.absolute_path
+      def self.inherited(konv) # rubocop:disable Lint/MissingSuper
+        konv._file = caller_locations(1..1).first.absolute_path
       end
 
       # path to isodoc assets in child gems

data/lib/asciidoctor/standoc/datamodel/plantuml_renderer.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'erb'
+require "erb"
 
 module Asciidoctor
   module Datamodel
     class PlantumlRenderer
-      TEMPLATES_PATH = File.expand_path('../views/datamodel', __dir__).freeze
+      TEMPLATES_PATH = File.expand_path("../views/datamodel", __dir__).freeze
 
       attr_reader :yml, :plantuml_path
 
@@ -15,23 +15,23 @@ module Asciidoctor
       end
 
       def join_as_plantuml(*ary)
-        ary.compact.join("\n").sub(/\s+\Z/, '')
+        ary.compact.join("\n").sub(/\s+\Z/, "")
       end
 
       def render
         ERB.new(
           File.read(
-            File.join(TEMPLATES_PATH, 'plantuml_representation.adoc.erb')
+            File.join(TEMPLATES_PATH, "plantuml_representation.adoc.erb")
           )
         ).result(binding)
       end
 
       def diagram_caption
-        yml['caption']
+        yml["caption"]
       end
 
       def imports_yml_to_plantuml
-        return if empty?(yml, 'imports')
+        return if empty?(yml, "imports")
 
         <<~TEMPLATE
           '******* IMPORTS ******************************************************
@@ -40,7 +40,7 @@ module Asciidoctor
       end
 
       def class_defs_yml_to_plantuml
-        return if empty?(yml, 'classes') && empty?(yml, 'enums')
+        return if empty?(yml, "classes") && empty?(yml, "enums")
 
         <<~TEMPLATE
           '******* CLASS DEFINITIONS ********************************************
@@ -52,7 +52,7 @@ module Asciidoctor
       end
 
       def class_groups_yml_to_plantuml
-        return if empty?(yml, 'groups')
+        return if empty?(yml, "groups")
 
         <<~TEMPLATE
           '******* CLASS GROUPS *************************************************
@@ -63,7 +63,7 @@ module Asciidoctor
       end
 
       def class_relations_yml_to_plantuml
-        return if empty?(yml, 'classes') && empty?(yml, 'relations')
+        return if empty?(yml, "classes") && empty?(yml, "relations")
 
         <<~TEMPLATE
           '******* CLASS RELATIONS **********************************************
@@ -75,7 +75,7 @@ module Asciidoctor
       end
 
       def diagram_options_yml_to_plantuml
-        return if empty?(yml, 'diagram_options')
+        return if empty?(yml, "diagram_options")
 
         <<~TEMPLATE
           '******* DIAGRAM SPECIFIC CONFIG **************************************
@@ -86,7 +86,7 @@ module Asciidoctor
       end
 
       def bottom_yml_to_plantuml
-        return if empty?(yml, 'bottom')
+        return if empty?(yml, "bottom")
 
         <<~TEMPLATE
           '******* BOTTOM OVERRIDE CONFIG **************************************
@@ -95,7 +95,7 @@ module Asciidoctor
       end
 
       def fidelity_yml_to_plantuml
-        return if empty?(yml, 'fidelity')
+        return if empty?(yml, "fidelity")
 
         <<~TEMPLATE
           '******* FIDELITY *****************************************************
@@ -133,7 +133,7 @@ module Asciidoctor
 
         attributes.map do |(attr_name, attr_hash)|
           attribute_to_plantuml(attr_name, attr_hash)
-        end.join('').sub(/\n\Z/, '')
+        end.join("").sub(/\n\Z/, "")
       end
 
       def attribute_to_plantuml(attr_name, attr_hash)
@@ -143,9 +143,10 @@ module Asciidoctor
       end
 
       def attribute_cardinality_plantuml(cardinality, with_bracket = true)
-        return '' if cardinality.nil? ||
-                     (cardinality['min'] == cardinality['max'] &&
-                       cardinality['min'] == 1)
+        return "" if cardinality.nil? ||
+          (cardinality["min"] == cardinality["max"] &&
+            cardinality["min"] == 1)
+
         card = "#{cardinality['min']}..#{cardinality['max']}"
         return card unless with_bracket
 
@@ -172,7 +173,7 @@ module Asciidoctor
       def classes_to_relations_plantuml(classes)
         output_ary = classes.map do |(class_name, class_hash)|
           class_hash ||= {}
-          relations = class_hash['relations']
+          relations = class_hash["relations"]
           relations_to_plantuml(class_name, relations)
         end
 
@@ -183,9 +184,9 @@ module Asciidoctor
         return unless relations
 
         output_ary = relations.map do |relation|
-          source = class_name || relation['source']
+          source = class_name || relation["source"]
           relation_to_plantuml(source,
-                               relation['target'],
+                               relation["target"],
                                relation)
         end
 
@@ -194,41 +195,41 @@ module Asciidoctor
 
       def relation_arrow(relationship, relation)
         [
-          relationship_type_to_plantuml('source',
-                                        relationship['source']['type']),
-          (relation['direction']).to_s,
-          relationship_type_to_plantuml('target',
-                                        relationship['target']['type'])
-        ].compact.join('-')
+          relationship_type_to_plantuml("source",
+                                        relationship["source"]["type"]),
+          (relation["direction"]).to_s,
+          relationship_type_to_plantuml("target",
+                                        relationship["target"]["type"]),
+        ].compact.join("-")
       end
 
       def relation_label(action)
-        return '' unless action
+        return "" unless action
 
-        case action['direction']
-        when 'source'
+        case action["direction"]
+        when "source"
           " : < #{action['verb']}"
-        when 'target'
+        when "target"
           " : #{action['verb']} >"
         else
-          ''
+          ""
         end
       end
 
       def source_arrow_end(source, relationship)
         source_attribute = relationship_cardinality_to_plantuml(
-          relationship['source']['attribute']
+          relationship["source"]["attribute"]
         )
-        [source, source_attribute].join(' ')
+        [source, source_attribute].join(" ")
       end
 
       def target_arrow_end(target, relationship, action)
         target_attribute = relationship_cardinality_to_plantuml(
-          relationship['target']['attribute']
+          relationship["target"]["attribute"]
         )
         [
-          [target_attribute, target].join(' '),
-          relation_label(action)
+          [target_attribute, target].join(" "),
+          relation_label(action),
         ].join
       end
 
@@ -239,9 +240,9 @@ module Asciidoctor
       end
 
       def relation_to_plantuml(source, target, relation)
-        relationship = relation['relationship'] || {}
-        relationship['source'] ||= {}
-        relationship['target'] ||= {}
+        relationship = relation["relationship"] || {}
+        relationship["source"] ||= {}
+        relationship["target"] ||= {}
         relation_output_lines(source, target, relation, relationship)
       end
 
@@ -249,22 +250,22 @@ module Asciidoctor
         output_lines = [
           source_arrow_end(source, relationship),
           relation_arrow(relationship, relation),
-          target_arrow_end(target, relationship, relation['action']),
-          relation_association(source, target, relationship['association'])
-        ].join(' ')
+          target_arrow_end(target, relationship, relation["action"]),
+          relation_association(source, target, relationship["association"]),
+        ].join(" ")
 
         join_as_plantuml(*output_lines)
       end
 
       def relationship_type_to_plantuml(relation_end, relationship_type)
-        is_source = (relation_end == 'source')
+        is_source = (relation_end == "source")
         mappings = {
-          'direct' => is_source ? '<' : '>',
-          'inheritance' => is_source ? '<|' : '|>',
-          'composition' => '*',
-          'aggregation' => 'o'
+          "direct" => is_source ? "<" : ">",
+          "inheritance" => is_source ? "<|" : "|>",
+          "composition" => "*",
+          "aggregation" => "o",
         }
-        mappings.fetch(relationship_type, '')
+        mappings.fetch(relationship_type, "")
       end
 
       def relationship_cardinality_to_plantuml(attribute)
@@ -273,12 +274,12 @@ module Asciidoctor
         return unless attribute_name
 
         attribute_hash = attribute[attribute_name] || {}
-        card = attribute_cardinality(attribute_hash['cardinality'])
+        card = attribute_cardinality(attribute_hash["cardinality"])
         "\"+#{attribute_name}#{card}\""
       end
 
       def attribute_cardinality(attribute_cardinality)
-        cardinality = ''
+        cardinality = ""
         if attribute_cardinality
           cardinality = attribute_cardinality_plantuml(
             attribute_cardinality,
@@ -308,7 +309,7 @@ module Asciidoctor
       end
 
       def model_stereotype_to_plantuml(model_stereotype)
-        return '' unless model_stereotype
+        return "" unless model_stereotype
 
         " <<#{model_stereotype}>>"
       end
@@ -325,7 +326,7 @@ module Asciidoctor
         groups ||= []
         return if groups.empty?
 
-        groups.reduce('') do |output, group|
+        groups.reduce("") do |output, group|
           output += "\ntogether {\n"
           group.each do |class_name|
             output += "\nclass #{class_name}\n"
@@ -350,9 +351,9 @@ module Asciidoctor
       end
 
       def format_hidden_class(accum, fidelity_classes, class_hash)
-        return accum if class_hash['relations'].nil?
+        return accum if class_hash["relations"].nil?
 
-        class_hash['relations'].each_with_object(accum) do |relation, acc|
+        class_hash["relations"].each_with_object(accum) do |relation, acc|
           format_source_target_relation(relation, fidelity_classes, acc)
           format_association_relation(relation, fidelity_classes, acc)
         end
@@ -367,36 +368,36 @@ module Asciidoctor
       end
 
       def format_association_relation(relation, fidelity_classes, acc)
-        return unless relation['relationship'] &&
-                      relation['relationship']['association']
+        return unless relation["relationship"] &&
+          relation["relationship"]["association"]
 
-        association = relation['relationship']['association']
+        association = relation["relationship"]["association"]
         return unless association && !fidelity_classes.key?(association)
 
         acc.merge!(association => true)
       end
 
       def hide_other_classes(fidelity)
-        return '' if fidelity.nil? || fidelity['classes'].nil?
+        return "" if fidelity.nil? || fidelity["classes"].nil?
 
-        output = ''
-        hidden_classes = fidelity['classes']
-                         .reduce({}) do |acc, (_class_name, class_hash)|
-          format_hidden_class(acc, fidelity['classes'], class_hash)
+        output = ""
+        hidden_classes = fidelity["classes"]
+          .reduce({}) do |acc, (_class_name, class_hash)|
+          format_hidden_class(acc, fidelity["classes"], class_hash)
         end
 
-        hidden_classes.keys.each do |hidden_class_name|
+        hidden_classes.each_key do |hidden_class_name|
           output += "\nhide #{hidden_class_name}\n"
         end
         output
       end
 
       def fidelity_to_plantuml(fidelity)
-        return '' if fidelity.nil?
+        return "" if fidelity.nil?
 
-        output = ''
-        output += hide_other_classes(fidelity) if fidelity['hideOtherClasses']
-        output += "\nhide members\n" if fidelity['hideMembers']
+        output = ""
+        output += hide_other_classes(fidelity) if fidelity["hideOtherClasses"]
+        output += "\nhide members\n" if fidelity["hideMembers"]
         output
       end
 

data/lib/asciidoctor/standoc/front.rb

@@ -3,7 +3,7 @@ require "nokogiri"
 require "htmlentities"
 require "pathname"
 require "open-uri"
-require_relative "./front_contributor.rb"
+require_relative "./front_contributor"
 
 module Asciidoctor
   module Standoc
@@ -40,6 +40,7 @@ module Asciidoctor
 
       def metadata_committee(node, xml)
         return unless node.attr("technical-committee")
+
         xml.editorialgroup do |a|
           committee_component("technical-committee", node, a)
         end
@@ -47,8 +48,8 @@ module Asciidoctor
 
       def metadata_ics(node, xml)
         ics = node.attr("library-ics")
-        ics && ics.split(/,\s*/).each do |i|
-          xml.ics { |ics| ics.code i }
+        ics&.split(/,\s*/)&.each do |i|
+          xml.ics { |elem| elem.code i }
         end
       end
 
@@ -71,15 +72,15 @@ module Asciidoctor
 
       def datetypes
         %w{ published accessed created implemented obsoleted
-            confirmed updated issued circulated unchanged received 
-            vote-started vote-ended
-        }
+            confirmed updated issued circulated unchanged received
+            vote-started vote-ended announced }
       end
 
       def metadata_date(node, xml)
         datetypes.each { |t| metadata_date1(node, xml, t) }
-        node.attributes.keys.each do |a|
+        node.attributes.each_key do |a|
           next unless a == "date" || /^date_\d+$/.match(a)
+
           type, date = node.attr(a).split(/ /, 2)
           type or next
           xml.date **{ type: type } do |d|
@@ -93,7 +94,8 @@ module Asciidoctor
       end
 
       def metadata_script(node, xml)
-        xml.script (node.attr("script") || default_script(node.attr("language")))
+        xml.script (node.attr("script") ||
+                    default_script(node.attr("language")))
       end
 
       def relaton_relations
@@ -114,8 +116,8 @@ module Asciidoctor
       end
 
       def relation_normalise(type)
-        type.sub(/-by$/, "By").sub(/-of$/, "Of").sub(/-from$/, "From").
-          sub(/-in$/, "In")
+        type.sub(/-by$/, "By").sub(/-of$/, "Of").sub(/-from$/, "From")
+          .sub(/-in$/, "In")
       end
 
       def metadata_getrelation(node, xml, type, desc = nil)
@@ -124,8 +126,8 @@ module Asciidoctor
           id = d.split(/,\s*/)
           xml.relation **{ type: relation_normalise(type) } do |r|
             desc.nil? or r.description relation_normalise(desc)
-            fetch_ref(r, d, nil, {}) or r.bibitem do |b|
-              b.title id[1] ? id[1] : "--"
+            fetch_ref(r, d, nil, **{}) or r.bibitem do |b|
+              b.title id[1] || "--"
               b.docidentifier id[0]
             end
           end
@@ -134,11 +136,20 @@ module Asciidoctor
 
       def metadata_keywords(node, xml)
         return unless node.attr("keywords")
-        node.attr("keywords").split(/,[ ]*/).each do |kw|
+
+        node.attr("keywords").split(/,\s*/).each do |kw|
           xml.keyword kw
         end
       end
 
+      def metadata_classifications(node, xml)
+        csv_split(node.attr("classification"), ",")&.each do |c|
+          vals = c.split(/:/, 2)
+          vals.size == 1 and vals = ["default", vals[0]]
+          xml.classification vals[1], type: vals[0]
+        end
+      end
+
       def metadata(node, xml)
         title node, xml
         metadata_source(node, xml)
@@ -155,14 +166,16 @@ module Asciidoctor
         metadata_copyright(node, xml)
         metadata_relations(node, xml)
         metadata_series(node, xml)
+        metadata_classifications(node, xml)
         metadata_keywords(node, xml)
-        xml.ext do |ext|
+        xml.ext do
           metadata_ext(node, xml)
         end
       end
 
       def metadata_ext(node, ext)
         metadata_doctype(node, ext)
+        metadata_subdoctype(node, ext)
         metadata_committee(node, ext)
         metadata_ics(node, ext)
       end
@@ -171,11 +184,13 @@ module Asciidoctor
         xml.doctype doctype(node)
       end
 
-      def metadata_note(node, xml)
+      def metadata_subdoctype(node, xml)
+        s = node.attr("docsubtype") and xml.subdoctype s
       end
 
-      def metadata_series(node, xml)
-      end
+      def metadata_note(node, xml); end
+
+      def metadata_series(node, xml); end
 
       def title(node, xml)
         title_english(node, xml)
@@ -187,7 +202,8 @@ module Asciidoctor
           at = { language: lang, format: "text/plain" }
           xml.title **attr_code(at) do |t|
             t << (Metanorma::Utils::asciidoc_sub(node.attr("title") ||
-                                      node.attr("title-en")) || node.title)
+                                                 node.attr("title-en")) ||
+            node.title)
           end
         end
       end
@@ -196,6 +212,7 @@ module Asciidoctor
         node.attributes.each do |k, v|
           next unless /^title-(?<titlelang>.+)$/ =~ k
           next if titlelang == "en"
+
           xml.title v, { language: titlelang, format: "text/plain" }
         end
       end