metanorma-standoc 2.9.3 → 2.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e946ea4ef470077763b56b2435a231a884ddede3c32f9bd09dde4fd912b15bfc
-  data.tar.gz: 80511a11e935c1e090be377db8180907835895d5507e8b4e88df6c2dee7d4f9a
+  metadata.gz: 81a040f93adb31ed93c820fafd3fd6e6a52f4495dfc718133c92625c09a7c454
+  data.tar.gz: fe0dfb411b0f884c433a7788c739d9507269ebfc8374c5892a2a2d34e3a4039c
 SHA512:
-  metadata.gz: a72d55869cbd272db4c6818cd8aadd3057021bf4b876c595ecb6c10d98008c7da98368189df23ad25297eaa68119c2c2cdc3efeb9b573812b9a200974458d703
-  data.tar.gz: 6710ac348b46e662a77ec202ec26944c3d0956a5b984546995444f352f661fefff3995c328ee6c7b2448137d690a7091db2b873584a277279f1c01e549c8a099
+  metadata.gz: e27143dc3445a8d74a4fa9a7f8b42d98789e434a05c590b9ecf03169b71a8b51892d80b9bf7a7b75a7f5806794a647ea7d50b64c5e87d461de1e501216b91d5f
+  data.tar.gz: 877f0be683c2f5829f2f6a19156e0cbb5e1b30fe84f1a50a63626f148da0745648a4a08904acfe9ab574842b973a607aa791ab3176a86567667ce6b3161e3400

data/lib/isodoc/html/htmlstyle.css

@@ -229,6 +229,46 @@ h6:hover > a.anchor,
 .inline-header:hover > a.anchor {
   visibility: visible; }
 
+/* collapsible snippets: collapsible before hidable */
+.hidable {
+  max-height: 0;
+  overflow: hidden;
+  transition: max-height 0.2s ease-out; }
+
+.collapsible {
+  background-color: #777;
+  color: white;
+  cursor: pointer;
+  padding: 12px 0;
+  margin: 0;
+  width: 100%;
+  border: none;
+  text-align: left;
+  outline: none;
+  font-size: 15px; }
+
+.active, .collapsible:hover {
+  background-color: #555; }
+
+.collapsible:after {
+  content: '\25bc';
+  color: white;
+  font-weight: bold;
+  float: right;
+  margin-left: 12px;
+  margin-right: 12px; }
+
+.active:after {
+  content: "\25b2"; }
+
+/* collapsible: */
+.collapsible + .hidable {
+  margin-top: 0; }
+
+.collapsible:not(.active) + .hidable {
+  overflow: hidden;
+  padding: 0; }
+
 #brochure-band {
   background-color: #0AC442; }
 

data/lib/metanorma/standoc/blocks.rb

@@ -212,7 +212,8 @@ module Metanorma
         noko do |xml|
           xml.passthrough **attr_code(formats:
                                       node.attr("format") || "metanorma") do |p|
-            p << @c.encode(@c.decode(node.content), :basic, :hexadecimal)
+            # p << @c.encode(@c.decode(node.content), :basic, :hexadecimal)
+            p << @c.encode(node.content, :basic, :hexadecimal)
           end
         end
       end

data/lib/metanorma/standoc/cleanup_bibdata.rb

@@ -144,8 +144,7 @@ module Metanorma
         yaml.is_a?(Hash) && !yaml["contributor"] and yaml = [yaml]
         yaml.is_a?(Array) and yaml = { "contributor" => yaml }
         r = yaml2relaton(yaml)
-        Nokogiri::XML(r).xpath("//contributor").reverse
-          .each do |c|
+        Nokogiri::XML(r).xpath("//contributor").reverse_each do |c|
           ins.next = c
         end
       end

data/lib/metanorma/standoc/cleanup_bibitem.rb

@@ -131,6 +131,9 @@ module Metanorma
         xmldoc.xpath("//bibitem//bibitem").each do |b|
           b.delete("id")
         end
+        xmldoc.xpath("//bibdata//bibitem").each do |b|
+          b.delete("id")
+        end
       end
 
       def attachment_cleanup(xmldoc)
@@ -161,10 +164,12 @@ module Metanorma
       def datauri_attachment(path, doc)
         @datauriattachment or return
         m = add_misc_container(doc)
-        f = File.basename(path)
-        d = Vectory::Utils::datauri(path, @localdir)
-        m << "<attachment name='#{f}'/>"
-        m.last_element_child << d
+        f = File.join(@attachmentsdir, File.basename(path))
+        f = Pathname.new(File.expand_path(f))
+          .relative_path_from(Pathname.new(File.expand_path(@localdir)))
+        e = (m << "<attachment name='#{f}'/>").last_element_child
+        Vectory::Utils::datauri(path, @localdir).scan(/.{1,60}/)
+          .each { |dd| e << "#{dd}\n" }
       end
 
       def valid_attachment?(path, bib)
@@ -183,8 +188,28 @@ module Metanorma
         FileUtils.mkdir_p(@attachmentsdir)
       end
 
+      # remove dupes if both same ID and same docid, in case dupes introduced
+      # through termbases
+      def remove_dup_bibtem_id(xmldoc)
+        bibitem_id_docid_hash(xmldoc).each_value do |v|
+          v.each_value do |v1|
+            v1[1..].each(&:remove)
+          end
+        end
+      end
+
+      def bibitem_id_docid_hash(xmldoc)
+        xmldoc.xpath("//bibitem[@id]").each_with_object({}) do |b, m|
+          m[b["id"]] ||= {}
+          docid = b.at("./docidentifier")&.text || "NO ID"
+          m[b["id"]][docid] ||= []
+          m[b["id"]][docid] << b
+        end
+      end
+
       def bibitem_cleanup(xmldoc)
-        bibitem_nested_id(xmldoc)
+        bibitem_nested_id(xmldoc) # feeds remove_dup_bibtem_id
+        remove_dup_bibtem_id(xmldoc)
         ref_dl_cleanup(xmldoc)
         formattedref_spans(xmldoc)
         fetch_local_bibitem(xmldoc)

data/lib/metanorma/standoc/cleanup_text.rb

@@ -108,6 +108,7 @@ module Metanorma
         prev = elem.at(".//preceding::text()[1]") or return
         /\S\Z/.match?(prev.text) or return
         foll = elem.at(".//following::text()[1]")
+        /"$/.match?(prev.text) and /^"/.match?(foll&.text) and return # "<tag/>"
         m = /\A(["'][[:punct:]]*)(\s|\Z)/
           .match(@c.decode(foll&.text)) or return
         foll.content = foll.text.sub(/\A(["'][[:punct:]]*)/, "")

data/lib/metanorma/standoc/cleanup_toc.rb

@@ -10,7 +10,7 @@ module Metanorma
 
       def toc_cleanup_para(xmldoc)
         xmldoc.xpath("//p[toc]").each do |x|
-          x.xpath("./toc").reverse.each do |t|
+          x.xpath("./toc").reverse_each do |t|
             x.next = t
           end
           x.remove if x.text.strip.empty?

data/lib/metanorma/standoc/converter.rb

@@ -29,7 +29,10 @@ module Metanorma
         inline_macro Metanorma::Plugin::Lutaml::LutamlFigureInlineMacro
         inline_macro Metanorma::Plugin::Lutaml::LutamlTableInlineMacro
         block_macro Metanorma::Plugin::Lutaml::LutamlDiagramBlockMacro
+        block_macro Metanorma::Plugin::Lutaml::LutamlEaDiagramBlockMacro
         block Metanorma::Plugin::Lutaml::LutamlDiagramBlock
+        block_macro Metanorma::Plugin::Lutaml::LutamlGmlDictionaryBlockMacro
+        block Metanorma::Plugin::Lutaml::LutamlGmlDictionaryBlock
         preprocessor Metanorma::Standoc::EmbedIncludeProcessor
         preprocessor Metanorma::Standoc::LinkProtectPreprocessor
         preprocessor Metanorma::Standoc::Datamodel::AttributesTablePreprocessor

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

@@ -21,8 +21,8 @@ module Metanorma
       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
 
@@ -46,7 +46,7 @@ module Metanorma
           '******* CLASS DEFINITIONS ********************************************
           #{join_as_plantuml(
             classes_to_classes_plantuml(yml['classes']),
-            enums_to_enums_plantuml(yml['enums'])
+            enums_to_enums_plantuml(yml['enums']),
           )}
         TEMPLATE
       end
@@ -57,7 +57,7 @@ module Metanorma
         <<~TEMPLATE
           '******* CLASS GROUPS *************************************************
           #{join_as_plantuml(
-            groups_to_plantuml(yml['groups'])
+            groups_to_plantuml(yml['groups']),
           )}
         TEMPLATE
       end
@@ -69,7 +69,7 @@ module Metanorma
           '******* CLASS RELATIONS **********************************************
           #{join_as_plantuml(
             classes_to_relations_plantuml(yml['classes']),
-            relations_to_plantuml(nil, yml['relations'])
+            relations_to_plantuml(nil, yml['relations']),
           )}
         TEMPLATE
       end
@@ -80,7 +80,7 @@ module Metanorma
         <<~TEMPLATE
           '******* DIAGRAM SPECIFIC CONFIG **************************************
           #{join_as_plantuml(
-            diagram_options_to_plantuml(yml['diagram_options'])
+            diagram_options_to_plantuml(yml['diagram_options']),
           )}
         TEMPLATE
       end
@@ -122,7 +122,7 @@ module Metanorma
           class #{class_name}#{model_stereotype_to_plantuml(class_hash['type'])} {
           #{join_as_plantuml(
             attributes_to_plantuml(class_hash['attributes']),
-            constraints_to_plantuml(class_hash['constraints'])
+            constraints_to_plantuml(class_hash['constraints']),
           )}
           }
         TEMPLATE
@@ -165,7 +165,7 @@ module Metanorma
         <<~TEMPLATE
             __ constraints __
           #{join_as_plantuml(
-            *constraints_output
+            *constraints_output,
           )}
         TEMPLATE
       end
@@ -218,14 +218,14 @@ module Metanorma
 
       def source_arrow_end(source, relationship)
         source_attribute = relationship_cardinality_to_plantuml(
-          relationship["source"]["attribute"]
+          relationship["source"]["attribute"],
         )
         [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(" "),
@@ -283,7 +283,7 @@ module Metanorma
         if attribute_cardinality
           cardinality = attribute_cardinality_plantuml(
             attribute_cardinality,
-            false
+            false,
           )
           cardinality = " #{cardinality}"
         end

data/lib/metanorma/standoc/front.rb

@@ -74,7 +74,7 @@ module Metanorma
 
       def metadata_date1(node, xml, type)
         date = node.attr("#{type}-date")
-        date and xml.date type: type do |d|
+        date and xml.date(type:) do |d|
           d.on date
         end
       end
@@ -91,7 +91,7 @@ module Metanorma
           a == "date" || /^date_\d+$/.match(a) or next
           type, date = node.attr(a).split(/ /, 2)
           type or next
-          xml.date type: type do |d|
+          xml.date(type:) do |d|
             d.on date
           end
         end
@@ -139,7 +139,7 @@ module Metanorma
       def metadata_getrelation1(doc, xml, type, desc)
         id = doc.split(/,\s*/)
         xml.relation type: relation_normalise(type) do |r|
-          desc.nil? or r.description desc.gsub(/-/, " ")
+          desc.nil? or r.description desc.tr("-", " ")
           fetch_ref(r, doc, nil, **{}) or r.bibitem do |b|
             b.title id[1] || "--"
             b.docidentifier id[0]

data/lib/metanorma/standoc/macros.rb

@@ -24,7 +24,7 @@ module Metanorma
       def init_indent(line)
         /^(?<prefix>[ \t]*)(?<suffix>.*)$/ =~ line
         prefix = prefix.gsub("\t", "\u00a0\u00a0\u00a0\u00a0")
-          .gsub(/ /, "\u00a0")
+          .tr(" ", "\u00a0")
         prefix + suffix
       end
 
@@ -126,19 +126,49 @@ module Metanorma
 
       def inlinelink_escape(text)
         text.gsub(InlineLinkRx) do
-          body, suffix = $4.nil? ? [$3 + $6, "[]"] : [$3, ""]
-          p = $1 and s = $2 and b = $4
-          if p == "link:" then "#{p}++#{s}#{body}++#{b}#{suffix}"
-          elsif p == "<"
-            "#{p}link:++#{s}#{body.sub(/>$/, '')}++#{b}#{suffix}>"
-          else "#{p}link:++#{s}#{body}++#{b}#{suffix}"
+          p = $1 and s = $2 and body = $3
+          suffix = $4.nil? ? "[]" : ""
+          wrapper = $6
+          if (!/^(&lt;|[<\(\["'])$/.match?($1) || $6 != BRACKETS[$1]) && $4.nil?
+            body += $6
+            wrapper = ""
           end
+          # body, suffix = $4.nil? ? [$3 + $6, "[]"] : [$3, ""]
+          b = linkcontents_escape($4)
+          if p == "link:"
+            "#{p}++#{s}#{body}++#{b}#{suffix}"
+          else
+            "#{p}link:++#{s}#{body}++#{b}#{suffix}#{wrapper}"
+          end
+        end
+      end
+
+      BRACKETS = {
+        "<" => ">",
+        "&lt;" => "&gt;",
+        "[" => "]",
+        '"' => '"',
+        "'" => "'",
+      }.freeze
+
+      # because links are escaped, https within link text also need
+      # to be escaped, # otherwise they will be treated as links themselves
+      def linkcontents_escape(text)
+        text.nil? and return nil
+        text
+          # .gsub(InlineLinkMacroRx) do
+          # $1.empty? ? "\\#{$2}#{$3}#{$4}" : text
+          # end
+          .gsub(InlineLinkRx) do
+          esc = $1 == "link:" ? "" : "\\"
+          x = $4 || "#{$5}#{$6}"
+          "#{$1}#{esc}#{$2}#{$3}#{x}"
         end
       end
 
       # InlineLinkMacroRx = /\\?(?:link|(mailto)):(|[^:\s\[][^\s\[]*)\[(|#{CC_ALL}*?[^\\])\]/m
       InlineLinkMacroRx1 = <<~REGEX.freeze
-        (\\\\?\\b(?<!-)                  # optional backslash, no hyphen, word boundary
+        (\\\\?)(\\b(?<!-)                  # optional backslash, no hyphen, word boundary
           (?:link|mailto):)              # link: or mailto:
         (?!\\+)                          # no link:+ passthrough
         (|[^:\\s\\[][^\\s\\[]*)          # link: ... up to [
@@ -151,7 +181,7 @@ module Metanorma
           ((text.include? "link:") || (text.include? "ilto:"))) or return text
         pass_inline_split(text) do |x|
           x.gsub(InlineLinkMacroRx) do
-            "#{$1}++#{$2}++#{$3}"
+            "#{$1}#{$2}++#{$3}++#{linkcontents_escape($4)}"
           end
         end.join
       end

data/lib/metanorma/standoc/reqt.rb

@@ -34,7 +34,7 @@ module Metanorma
 
       def requirement_validate(docxml)
         docxml.xpath("//requirement | //recommendation | //permission")
-          .each_with_object([]) do |r, m|
+          .each do |r|
           @reqt_models.model(r["model"]).validate(r, @log)
         end
       end

data/lib/metanorma/standoc/spans_to_bibitem_preprocessing.rb

@@ -38,7 +38,7 @@ module Metanorma
           case span[:key]
           when "uri", "docid"
             val = link_unwrap(Nokogiri::XML.fragment(span[:val])).to_xml
-            ret[span[:key].to_sym] << { type: span[:type], val: val }
+            ret[span[:key].to_sym] << { type: span[:type], val: }
           when "date"
             ret[span[:key].to_sym] << { type: span[:type] || "published",
                                         val: span[:val] }
@@ -79,7 +79,7 @@ module Metanorma
           else
             msg = "unrecognised key '#{span[:key]}' in " \
                   "`span:#{span[:key]}[#{span[:val]}]`"
-            @err << { msg: msg }
+            @err << { msg: }
           end
         end
 

data/lib/metanorma/standoc/validate_term.rb

@@ -62,22 +62,24 @@ module Metanorma
       end
 
       def preferred_validate(doc)
-        out = []
         ret = doc.xpath("//term").each_with_object({}) do |t, m|
           prefix = t.at("./domain")&.text
           t.xpath("./preferred//name").each do |n|
             ret = n.text
             prefix and ret = "<#{prefix}> #{ret}"
-            (m[ret] and out << ret) or m[ret] = t
+            m[ret] ||= []
+            m[ret] << t
           end
         end
-        preferred_validate_report(out, ret)
+        preferred_validate_report(ret)
       end
 
-      def preferred_validate_report(terms, locations)
-        terms.each do |e|
-          err = "Term #{e} occurs twice as preferred designation"
-          @log.add("Terms", locations[e], err, severity: 1)
+      def preferred_validate_report(terms)
+        terms.each do |k, v|
+          v.size > 1 or next
+          loc = v.map { |x| x["id"] }.join(", ")
+          err = "Term #{k} occurs twice as preferred designation: #{loc}"
+          @log.add("Terms", v.first, err, severity: 1)
         end
       end
     end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.9.3".freeze
+    VERSION = "2.9.5".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.9.3
+  version: 2.9.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-06 00:00:00.000000000 Z
+date: 2024-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable