metanorma-standoc 2.9.2 → 2.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afbcf21ea1b8e99868178616c755a4dcef811f631326c65f6835ad491d1f2835
-  data.tar.gz: 9d3499adf6025521d2683f4456e64b1cd27dd63722c231de8fab7aa47fe79973
+  metadata.gz: 49c6dfeea46b38b2e162f13b0e5b8f1e57f446c433e2e30313fff2e4c5b4e96e
+  data.tar.gz: 188590c9c73a87e1ba73322a540986836b256541764ef4e45ba1a1a134eda1df
 SHA512:
-  metadata.gz: 46a8beb31cb6230dccdcdb36352dd05e705a3114d0b1b6e04b46b1a445aa1fe30249426c81be8a441f615c95fe633cc078bd70c030616cdc25ff4c50eb45ab76
-  data.tar.gz: 300aeca29fa514e88535c4f60577f9a6e83446f195b76e7e15029ae912d0beb06c0f6f028b098e4662ab53fbf83fc8e675a920ef7c3269f1e501afa835ba127f
+  metadata.gz: cc6aed2b8ca43330882c41c8a00e2bc679ff5de30e9c1f914eca253ecc7900368b4c1968a2dbeceeae9db025798a15fe73a68892d83c4c0dcc6080477e66327a
+  data.tar.gz: 0bf3a151f8dd22a2c28ee6ed158df5f8d8c6f2afe0d27cad2d8ec3234746d1994354ab52dbd1735b8c54ab99e44c3d3b7b10249a464205fc29c453d996e377c9

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/anchor.rb

@@ -15,7 +15,7 @@ module Metanorma
       def inline_anchor_ref(node)
         noko do |xml|
           xml.bookmark nil, **attr_code(id: node.id)
-        end.join
+        end
       end
 
       def inline_anchor_xref(node)
@@ -26,7 +26,7 @@ module Metanorma
           xml.xref **attr_code(attrs) do |x|
             x << c
           end
-        end.join
+        end
       end
 
       def inline_anchor_xref_attrs(node)
@@ -83,7 +83,7 @@ module Metanorma
           xml.link **attr_code(attributes) do |l|
             l << contents
           end
-        end.join
+        end
       end
 
       def inline_anchor_link_attrs(node)
@@ -103,7 +103,7 @@ module Metanorma
           xml.ref **attr_code(id: node.target || node.id) do |r|
             r << eref_contents
           end
-        end.join
+        end
       end
 
       def inline_anchor_bibref_contents(node)
@@ -114,7 +114,7 @@ module Metanorma
       def inline_callout(node)
         noko do |xml|
           xml.callout node.text
-        end.join
+        end
       end
 
       def inline_footnote(node)
@@ -124,7 +124,7 @@ module Metanorma
           xml.fn reference: @fn_number do |fn|
             fn.p { |p| p << node.text }
           end
-        end.join
+        end
       end
     end
   end

data/lib/metanorma/standoc/blocks.rb

@@ -90,7 +90,7 @@ module Metanorma
             )) do |ex|
             wrap_in_para(node, ex)
           end
-        end.join("")
+        end
       end
 
       def example(node)
@@ -128,7 +128,7 @@ module Metanorma
             figure_title(node, ex)
             wrap_in_para(node, ex)
           end
-        end.join("")
+        end
       end
 
       def example_attrs(node)
@@ -141,7 +141,7 @@ module Metanorma
             node.title.nil? or ex.name { |name| name << node.title }
             wrap_in_para(node, ex)
           end
-        end.join("")
+        end
       end
 
       def para_attrs(node)
@@ -158,7 +158,7 @@ module Metanorma
           xml.p **para_attrs(node) do |xml_t|
             xml_t << node.content
           end
-        end.join("")
+        end
       end
 
       def quote_attrs(node)
@@ -183,7 +183,7 @@ module Metanorma
             quote_attribution(node, q)
             wrap_in_para(node, q)
           end
-        end.join("")
+        end
       end
 
       def listing_attrs(node)
@@ -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/blocks_image.rb

@@ -17,7 +17,7 @@ module Metanorma
             figure_title(node, ex)
             ex << node.content
           end
-        end.join("\n")
+        end
       end
 
       def figure_example(node)
@@ -26,7 +26,7 @@ module Metanorma
             node.title.nil? or ex.name { |name| name << node.title }
             wrap_in_para(node, ex)
           end
-        end.join("")
+        end
       end
 
       def figure_title(node, out)

data/lib/metanorma/standoc/blocks_notes.rb

@@ -32,7 +32,7 @@ module Metanorma
           xml.review **sidebar_attrs(node) do |r|
             wrap_in_para(node, r)
           end
-        end.join("")
+        end
       end
 
       def todo_attrs(node)
@@ -49,7 +49,7 @@ module Metanorma
           xml.review **todo_attrs(node) do |r|
             wrap_in_para(node, r)
           end
-        end.join("")
+        end
       end
 
       def termnote(node)
@@ -57,7 +57,7 @@ module Metanorma
           xml.termnote **termnote_attrs(node) do |ex|
             wrap_in_para(node, ex)
           end
-        end.join("")
+        end
       end
 
       def note(node)
@@ -67,7 +67,7 @@ module Metanorma
           xml.note **note_attrs(node) do |c|
             wrap_in_para(node, c)
           end
-        end.join("")
+        end
       end
 
       def boilerplate_note(node)
@@ -101,7 +101,7 @@ module Metanorma
             node.title.nil? or a.name { |name| name << node.title }
             wrap_in_para(node, a)
           end
-        end.join("")
+        end
       end
 
       def admonition_alternatives(node)

data/lib/metanorma/standoc/cleanup.rb

@@ -82,6 +82,7 @@ module Metanorma
         boilerplate_cleanup(xmldoc)
         toc_cleanup(xmldoc)
         smartquotes_cleanup(xmldoc)
+        linebreak_cleanup(xmldoc)
         variant_cleanup(xmldoc)
         para_cleanup(xmldoc)
         empty_element_cleanup(xmldoc)
@@ -137,7 +138,7 @@ module Metanorma
       end
 
       def element_name_cleanup(xmldoc)
-        xmldoc.traverse { |n| n.name = n.name.gsub("_", "-") }
+        xmldoc.traverse { |n| n.name = n.name.tr("_", "-") }
       end
 
       # allows us to deal with doc relation localities,

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

@@ -161,10 +161,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 +185,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_symbols.rb

@@ -10,7 +10,7 @@ module Metanorma
       def symbol_key(sym)
         @c.decode(asciimath_key(sym).text)
           .gsub(/[\[\]{}<>()]/, "").gsub(/\s/m, "")
-          .gsub(/[[:punct:]]|[_^]/, ":\\0").gsub("`", "")
+          .gsub(/[[:punct:]]|[_^]/, ":\\0").delete("`")
           .gsub(/[0-9]+/, "þ\\0")
           .tr("AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz",
               "ABCFEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")

data/lib/metanorma/standoc/cleanup_terms_designations.rb

@@ -46,7 +46,7 @@ module Metanorma
         %w(absent geographic-area).each do |a|
           dl_to_attrs(prev, dlist, a)
         end
-        %w(field-of-application usage-info).reverse.each do |a|
+        %w(field-of-application usage-info).reverse_each do |a|
           dl_to_elems(prev.at("./expression"), prev, dlist, a)
         end
       end
@@ -78,7 +78,7 @@ module Metanorma
       end
 
       def term_dl_to_expression_name_metadata(prev, dlist)
-        %w(abbreviation-type pronunciation).reverse.each do |a|
+        %w(abbreviation-type pronunciation).reverse_each do |a|
           dl_to_elems(prev.at("./expression/name"), prev, dlist, a)
         end
         g = dlist.at("./dt[text()='grammar']/following::dd//dl") and
@@ -89,7 +89,7 @@ module Metanorma
         prev.at(".//expression") or return
         prev.at(".//expression") << "<grammar><sentinel/></grammar>"
         %w(gender number isPreposition isParticiple isAdjective isAdverb isNoun
-           grammar-value).reverse.each do |a|
+           grammar-value).reverse_each do |a|
           dl_to_elems(prev.at(".//expression/grammar/*"), prev.elements.last,
                       dlist, a)
         end

data/lib/metanorma/standoc/cleanup_text.rb

@@ -11,6 +11,54 @@ module Metanorma
         text
       end
 
+      def ancestor_include?(elem, ancestors)
+        path = elem.path.gsub(/\[\d+\]/, "").split(%r{/})[1..-2]
+        !path.intersection(ancestors).empty?
+      end
+
+      def linebreak_cleanup(xmldoc)
+        xmldoc.traverse do |x|
+          x.text? && x.text.include?("\n") or next
+          ancestor_include?(x, PRESERVE_LINEBREAK_ELEMENTS) and next
+          ancestor_include?(x, STRIP_LINEBREAK_ELEMENTS) or next
+          x.replace(Metanorma::Utils
+            .line_sanitise(x.text.lines.map(&:rstrip)).join)
+        end
+      end
+
+      # process example/p, example/sourcecode, not example on its own:
+      # this is about stripping lines for blocks containing inline elems & text
+      def linebreak_cleanup(xmldoc)
+        xmldoc.xpath(STRIP_LINEBREAK_ELEMENTS.map { |e| "//#{e}" }.join(" | "))
+          .each do |b|
+            b.xpath(STRIP_LINEBREAK_ELEMENTS.map { |e| ".//#{e}" }.join(" | "))
+              .empty? or next
+            linebreak_cleanup_block(gather_text_for_linebreak_cleanup(b))
+          end
+      end
+
+      def linebreak_cleanup_block(block)
+        block.each_with_index do |e, i|
+          e[:skip] and next
+          lines = e[:text].lines.map(&:rstrip)
+          e[:last] or lines << block[i + 1][:text].lines.first # next token context
+          out = Metanorma::Utils.line_sanitise(lines)
+          e[:last] or out.pop
+          e[:elem].replace(out.join)
+        end
+      end
+
+      def gather_text_for_linebreak_cleanup(block)
+        x = block.xpath(".//text()").map do |e|
+          { elem: e, text: e.text,
+            skip: ancestor_include?(e, PRESERVE_LINEBREAK_ELEMENTS) }
+        end
+        x.empty? and return x
+        x.each { |e| e[:skip] ||= !e[:text].include?("\n") }
+        x[-1][:last] = true
+        x
+      end
+
       def smartquotes_cleanup(xmldoc)
         xmldoc.xpath("//date").each { |d| Metanorma::Utils::endash_date(d) }
         if @smartquotes then smartquotes_cleanup1(xmldoc)
@@ -37,10 +85,20 @@ module Metanorma
         %w(pre tt sourcecode stem asciimath figure bibdata passthrough
            identifier metanorma-extension).freeze
 
+      PRESERVE_LINEBREAK_ELEMENTS =
+        %w(pre sourcecode passthrough metanorma-extension).freeze
+
+      STRIP_LINEBREAK_ELEMENTS =
+        %w(title name variant-title figure example review admonition
+           note li th td dt dd p quote label annotation
+           preferred admitted related deprecates field-of-application
+           usage-info expression pronunciation grammar-value domain
+           definition termnote termexample modification description
+           newcontent floating-title).freeze
+
       def uninterrupt_quotes_around_xml_skip(elem)
         !(/\A['"]/.match?(elem.text) &&
-          elem.previous.path.gsub(/\[\d+\]/, "").split(%r{/})[1..-2]
-          .intersection(IGNORE_QUOTES_ELEMENTS).empty? &&
+        !ancestor_include?(elem.previous, IGNORE_QUOTES_ELEMENTS) &&
           ((elem.previous.text.strip.empty? &&
             !empty_tag_with_text_content?(elem.previous)) ||
            ignoretext?(elem.previous)))
@@ -50,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:]]*)/, "")
@@ -69,7 +128,7 @@ module Metanorma
            abstract preferred admitted related deprecates field-of-application
            usage-info expression pronunciation grammar-value domain
            definition termnote termexample modification description
-           newcontent floating-title tab).include? elem.name
+           newcontent floating-title tab review admonition annotation).include? elem.name
       end
 
       def empty_tag_with_text_content?(elem)
@@ -83,8 +142,9 @@ module Metanorma
           empty_tag_with_text_content?(x) and prev = "dummy"
           x.text? or next
 
-          ancestors = x.path.gsub(/\[\d+\]/, "").split(%r{/})[1..-2]
-          ancestors.intersection(IGNORE_QUOTES_ELEMENTS).empty? or next
+          # ancestors = x.path.gsub(/\[\d+\]/, "").split(%r{/})[1..-2]
+          # ancestors.intersection(IGNORE_QUOTES_ELEMENTS).empty? or next
+          ancestor_include?(x, IGNORE_QUOTES_ELEMENTS) and next
           dumb2smart_quotes1(x, prev)
           prev = x.text
         end

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/inline.rb

@@ -11,19 +11,19 @@ module Metanorma
         noko do |xml|
           xml << node.text
           xml.br
-        end.join
+        end
       end
 
       def page_break(node)
         attrs = {}
         node.option?("landscape") and attrs[:orientation] = "landscape"
         node.option?("portrait") and attrs[:orientation] = "portrait"
-        noko { |xml| xml.pagebreak **attr_code(attrs) }.join
+        noko { |xml| xml.pagebreak **attr_code(attrs) }
       end
 
       def thematic_break(_node)
         # noko(&:hr).join # Do not do this, noko blows up
-        noko { |xml| xml.hr }.join # rubocop:disable Style/SymbolProc
+        noko { |xml| xml.hr } # rubocop:disable Style/SymbolProc
       end
 
       def latex_parse1(text, block)
@@ -102,7 +102,7 @@ module Metanorma
               xml << node.text
             end
           end
-        end.join
+        end
       end
 
       def hash2styles(role)
@@ -146,7 +146,7 @@ module Metanorma
       def inline_image(node)
         noko do |xml|
           xml.image **image_attributes(node)
-        end.join
+        end
       end
 
       def inline_indexterm(node)
@@ -154,7 +154,7 @@ module Metanorma
           node.type == :visible and xml << node.text
           terms = (node.attr("terms") || [node.text]).map { |x| xml_encode(x) }
           inline_indexterm1(xml, terms)
-        end.join
+        end
       end
 
       def inline_indexterm1(xml, terms)

data/lib/metanorma/standoc/lists.rb

@@ -41,7 +41,7 @@ module Metanorma
             list_caption(node, xml_ul)
             node.items.each { |item| ul_li(xml_ul, item) }
           end
-        end.join("")
+        end
       end
 
       def olist_style(style)
@@ -67,7 +67,7 @@ module Metanorma
             list_caption(node, xml_ol)
             node.items.each { |item| li(xml_ol, item) }
           end
-        end.join("")
+        end
       end
 
       def dt(terms, xml_dl)
@@ -107,7 +107,7 @@ module Metanorma
               dd(dd, xml_dl)
             end
           end
-        end.join("")
+        end
       end
 
       def colist(node)
@@ -117,7 +117,7 @@ module Metanorma
               xml_li.p { |p| p << item.text }
             end
           end
-        end.join("")
+        end
       end
 
       def list_caption(node, out)

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/ref_queue.rb

@@ -24,7 +24,7 @@ module Metanorma
 
       def references2xml(ret)
         out = ret.map do |b|
-          b.nil? ? nil : noko { |xml| reference1out(b, xml) }.join
+          b.nil? ? nil : noko { |xml| reference1out(b, xml) }
         end
         out.map { |x| x.nil? ? nil : Nokogiri::XML(x).root }
       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/section.rb

@@ -141,7 +141,7 @@ module Metanorma
               clause_parse(a, xml, node)
             end
           end
-        end.join("\n")
+        end
       end
 
       def set_obligation(attrs, node)
@@ -162,7 +162,7 @@ module Metanorma
             end
             xml_abstract << node.content
           end
-        end.join("\n")
+        end
       end
 
       def misccontainer_parse(_attrs, xml, node)
@@ -243,7 +243,7 @@ module Metanorma
           xml.floating_title **floating_title_attrs(node) do |xml_t|
             xml_t << node.title
           end
-        end.join("\n")
+        end
       end
     end
   end

data/lib/metanorma/standoc/spans_to_bibitem.rb

@@ -131,7 +131,7 @@ module Metanorma
           span[:surname] and return
           msg = "Missing surname: issue with bibliographic markup " \
                 "in \"#{title}\": #{span}"
-          @err << { msg: msg, fatal: true }
+          @err << { msg:, fatal: true }
         end
 
         def span_to_person(span, title)

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/terms.rb

@@ -170,7 +170,7 @@ module Metanorma
             seen_xref = Nokogiri::XML.fragment(matched[:xref])
             add_term_source(node, xml_t, seen_xref, matched)
           end
-        end.join("")
+        end
       end
 
       def termdefinition(node)
@@ -178,7 +178,7 @@ module Metanorma
           xml.definition **attr_code(type: node.attr("type")) do |d|
             d << node.content
           end
-        end.join("")
+        end
       end
     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.2".freeze
+    VERSION = "2.9.4".freeze
   end
 end

data/metanorma-standoc.gemspec

@@ -32,12 +32,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "asciidoctor", "~> 2.0.0"
   spec.add_dependency "crass", "~> 1.0.0"
   spec.add_dependency "iev", "~> 0.3.0"
-  spec.add_dependency "isodoc", "~> 2.10.5"
+  spec.add_dependency "isodoc", "~> 2.11.0"
   spec.add_dependency "metanorma", ">= 1.6.0"
   spec.add_dependency "metanorma-plugin-datastruct", "~> 0.3.0"
   spec.add_dependency "metanorma-plugin-glossarist", "~> 0.2.0"
   spec.add_dependency "metanorma-plugin-lutaml", "~> 0.7.0"
-  spec.add_dependency "metanorma-utils", "~> 1.9.0"
+  spec.add_dependency "metanorma-utils", "~> 1.10.0"
   spec.add_dependency "ruby-jing"
   # relaton-cli not just relaton, to avoid circular reference in metanorma
   spec.add_dependency "asciimath2unitsml", "~> 0.4.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.9.2
+  version: 2.9.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-05 00:00:00.000000000 Z
+date: 2024-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.5
+        version: 2.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.10.5
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: metanorma
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.9.0
+        version: 1.10.0
 - !ruby/object:Gem::Dependency
   name: ruby-jing
   requirement: !ruby/object:Gem::Requirement