metanorma-standoc 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ec2fc072d03a60f769bd17c7cbe8fb445561d954741eef340e0b0dcf55da243
-  data.tar.gz: c2a8c57f60df58564d782e38a05d8c5ecf01be6ed39096c2689c8b143226c9ff
+  metadata.gz: 2d72f2951373ad8935a9c03fe0d06bbd4f76a77cfdd6d186aa80438f64dd6d66
+  data.tar.gz: 3bb9f924a50c9567b23d7807bc487de0eaa05ff87228d5f7a16d719239689156
 SHA512:
-  metadata.gz: f4b1ad471b48474a881578bbc6770ee1993ec249ce5aa0d38f0402630be9827227c241cb5dc128a897d5e91df2d6f763077c5c0e3a36cee0936541b3eec6d160
-  data.tar.gz: e3955ca2b8534e57cf2639d5f677d00b33deb132c63ad4a5d2c23e9edfb4523ea9a299279d2c426894a2e413de253be04a460282237d91dbc065159f3a4021dd
+  metadata.gz: 2160831ca83c2cd6be5b95b82cf99815770f50e819613377175af2640fc428a1765200af59c2110c6e3d36bc923211cbb59c6c867c9f0c5eab36bbeb2ed2d912
+  data.tar.gz: ee37fdf784424521cf87cd6318fd7531c28282383c66360bcce5b7107f5731575ebba832231e61ec5809b72ca235057490ddec989f9625aab79c20e4ee73e0e8

data/lib/isodoc/html/htmlstyle.css

@@ -544,8 +544,11 @@ a:hover {
   background: #C70039;
   box-shadow: 3px 0 0 #C70039, -3px 0 0 #C70039; }
 
-::selection,
-::-moz-selection {
+*::selection {
+  background: #C70039;
+  color: white; }
+
+*::-moz-selection {
   background: #C70039;
   color: white; }
 

data/lib/metanorma/standoc/base.rb

@@ -61,6 +61,7 @@ module Metanorma
         @embed_hdr = node.attr("embed_hdr")
         @document_scheme = node.attr("document-scheme")
         @xrefstyle = node.attr("xrefstyle")
+        @source_linenums = node.attr("source-linenums-option") == "true"
       end
 
       def init_processing(node)

data/lib/metanorma/standoc/blocks.rb

@@ -231,8 +231,10 @@ module Metanorma
       end
 
       def listing_attrs(node)
+        linenums = (node.option?("linenums") || @source_linenums)
         attr_code(id_attr(node).merge(keep_attrs(node)
                   .merge(lang: node.attr("language"),
+                         linenums: linenums ? "true" : nil,
                          unnumbered: node.option?("unnumbered") ? "true" : nil,
                          number: node.attr("number"),
                          filename: node.attr("filename"))))

data/lib/metanorma/standoc/cleanup_biblio.rb

@@ -87,7 +87,7 @@ module Metanorma
           ret[:in][:contrib] =
             spans_preprocess_org(span, ret[:in][:contrib])
         else
-          warn "unrecognised `span:#{span["key"]}`"
+          warn "unrecognised `span:#{span['key']}`"
         end
       end
 
@@ -170,7 +170,7 @@ module Metanorma
         ret = ""
         spans[:uri].each { |s| ret += span_to_docid(s, "uri") }
         spans[:docid].each { |s| ret += span_to_docid(s, "docidentifier") }
-        spans[:date].each { |s| ret += span_to_docid(s, "date") }
+        spans[:date].each { |s| ret += span_to_date(s) }
         ret
       end
 
@@ -201,6 +201,17 @@ module Metanorma
         end
       end
 
+      def span_to_date(span)
+        val = if /[-–](?=\d{4})/.match?(span[:val])
+                from, to = span[:val].split(/[-–](?=\d{4})/, 2)
+                "<from>#{from}</from><to>#{to}</to>"
+              else
+                "<on>#{span[:val]}</on>"
+              end
+        type = span[:type] ? " type='#{span[:type]}'" : ""
+        "<date#{type}>#{val}</date>"
+      end
+
       def span_to_contrib(span, title)
         e = if span[:entity] == "organization"
               "<organization><name>#{span[:name]}</name></organization>"

data/lib/metanorma/standoc/cleanup_inline.rb

@@ -77,7 +77,7 @@ module Metanorma
       def related_cleanup(xmldoc)
         xmldoc.xpath("//related[not(termxref)]").each do |x|
           term = x.at("./refterm")
-          term.replace("<preferred>#{term_expr(term.children.to_xml)}"\
+          term.replace("<preferred>#{term_expr(term.children.to_xml)}" \
                        "</preferred>")
           concept_cleanup1(x)
         end
@@ -119,8 +119,8 @@ module Metanorma
         "#{pref}##{suff}"
       end
 
-      IDREF = "//*/@id | //review/@from | //review/@to | "\
-              "//callout/@target | //citation/@bibitemid | "\
+      IDREF = "//*/@id | //review/@from | //review/@to | " \
+              "//callout/@target | //citation/@bibitemid | " \
               "//eref/@bibitemid".freeze
 
       def anchor_cleanup(elem)

data/lib/metanorma/standoc/cleanup_ref.rb

@@ -50,7 +50,7 @@ module Metanorma
       # only numeric references are renumbered
       def biblio_renumber(xmldoc)
         i = 0
-        xmldoc.xpath("//references[not(@normative = 'true')]"\
+        xmldoc.xpath("//references[not(@normative = 'true')]" \
                      "[not(@hidden = 'true')]").each do |r|
           r.xpath("./bibitem[not(@hidden = 'true')]").each do |b|
             i += 1
@@ -139,6 +139,11 @@ module Metanorma
       end
 
       def format_ref(ref, type)
+        ret = Nokogiri::XML.fragment(ref)
+        ret.traverse do |x|
+          x.remove if x.name == "fn"
+        end
+        ref = to_xml(ret)
         return @isodoc.docid_prefix(type, ref) if type != "metanorma"
         return "[#{ref}]" if /^\d+$/.match(ref) && !/^\[.*\]$/.match(ref)
 
@@ -146,9 +151,9 @@ module Metanorma
       end
 
       ISO_PUBLISHER_XPATH =
-        "./contributor[role/@type = 'publisher']/"\
-        "organization[abbreviation = 'ISO' or abbreviation = 'IEC' or "\
-        "name = 'International Organization for Standardization' or "\
+        "./contributor[role/@type = 'publisher']/" \
+        "organization[abbreviation = 'ISO' or abbreviation = 'IEC' or " \
+        "name = 'International Organization for Standardization' or " \
         "name = 'International Electrotechnical Commission']".freeze
 
       def reference_names(xmldoc)

data/lib/metanorma/standoc/cleanup_text.rb

@@ -40,7 +40,7 @@ module Metanorma
 
       def uninterrupt_quotes_around_xml_skip(elem)
         !(/\A['"]/.match?(elem.text) &&
-          elem.previous.path.split(%r{/})[1..-2]
+          elem.previous.path.gsub(/\[\d+\]/, "").split(%r{/})[1..-2]
           .intersection(IGNORE_QUOTES_ELEMENTS).empty? &&
           ((elem.previous.text.strip.empty? &&
             !empty_tag_with_text_content?(elem.previous)) ||
@@ -82,12 +82,12 @@ module Metanorma
         xmldoc.traverse do |x|
           block?(x) and prev = ""
           empty_tag_with_text_content?(x) and prev = "dummy"
-          next unless x.text?
+          x.text? or next
 
-          ancestors = x.path.split(%r{/})[1..-2]
-          ancestors.intersection(IGNORE_QUOTES_ELEMENTS).empty? and
-            dumb2smart_quotes1(x, prev)
-          prev = x.text if ancestors.intersection(IGNORE_TEXT_ELEMENTS).empty?
+          ancestors = x.path.gsub(/\[\d+\]/, "").split(%r{/})[1..-2]
+          ancestors.intersection(IGNORE_QUOTES_ELEMENTS).empty? or next
+          dumb2smart_quotes1(x, prev)
+          prev = x.text
         end
       end
 
@@ -103,7 +103,6 @@ module Metanorma
         xmldoc.traverse do |n|
           next unless n.text? && /\u2019/.match?(n.text)
 
-          # n.replace(n.text.gsub(/(?<=\p{Alnum})\u2019(?=\p{Alpha})/, "'")) # .
           n.replace(@c.encode(
                       @c.decode(n.text)
             .gsub(/(?<=\p{Alnum})\u2019(?=\p{Alpha})/, "'"),

data/lib/metanorma/standoc/isodoc.rng

@@ -571,6 +571,11 @@
             <ref name="MultilingualRenderingType"/>
           </attribute>
         </optional>
+        <optional>
+          <attribute name="linenums">
+            <data type="boolean"/>
+          </attribute>
+        </optional>
         <optional>
           <ref name="tname"/>
         </optional>
@@ -1238,6 +1243,11 @@
   </define>
   <define name="concept">
     <element name="concept">
+      <optional>
+        <attribute name="bold">
+          <data type="boolean"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="ital">
           <data type="boolean"/>
@@ -2653,7 +2663,7 @@
       <value>full</value>
       <value>short</value>
       <value>id</value>
-      <value>modspec</value>
+      <text/>
     </choice>
   </define>
   <define name="erefTypeWithConnective">

data/lib/metanorma/standoc/macros_terms.rb

@@ -129,7 +129,7 @@ module Metanorma
 
       def generate_attrs(opts)
         ret = ""
-        %w(ital ref linkmention linkref).each do |x|
+        %w(ital bold ref linkmention linkref).each do |x|
           opts.include?("no#{x}") and ret += " #{x}='false'"
           opts.include?(x) and ret += " #{x}='true'"
         end

data/lib/metanorma/standoc/ref.rb

@@ -225,7 +225,8 @@ module Metanorma
 
       def reference_normalise(refs)
         refs.each do |r|
-          r[:code] = @c.decode(r[:code]).gsub(/\u2009\u2014\u2009/, " -- ")
+          r[:code] = @c.decode(r[:code])
+            .gsub(/\u2009\u2014\u2009/, " -- ").strip
         end
       end
 

data/lib/metanorma/standoc/ref_sect.rb

@@ -107,7 +107,8 @@ module Metanorma
       end
 
       def emend_biblio_id(xml, code)
-        unless xml.at("/bibitem/docidentifier[not(@type = 'DOI')][text()]")
+        unless xml.at("/bibitem/docidentifier[not(@type = 'DOI')][text()]") ||
+            /^doi:/.match?(code)
           @log.add("Bibliography", nil,
                    "ERROR: No document identifier retrieved for #{code}")
           xml.root << "<docidentifier>#{code}</docidentifier>"

data/lib/metanorma/standoc/render.rb

@@ -20,7 +20,7 @@ module Metanorma
           htmltoclevels: node.attr("htmltoclevels") || node.attr("toclevels"),
           doctoclevels: node.attr("doctoclevels") || node.attr("toclevels"),
           breakupurlsintables: node.attr("break-up-urls-in-tables"),
-          suppressasciimathdup: node.attr("suppress-asciimath-dup"),
+          suppressasciimathdup: node.attr("suppress-asciimath-dup") == "true",
           bare: node.attr("bare"),
           sectionsplit: node.attr("sectionsplit"),
           baseassetpath: node.attr("base-asset-path"),
@@ -32,6 +32,7 @@ module Metanorma
           fontlicenseagreement: node.attr("font-license-agreement"),
           localizenumber: node.attr("localize-number"),
           modspecidentifierbase: node.attr("modspec-identifier-base"),
+          sourcehighlighter: node.attr("source-highlighter") != "false",
         }
       end
 

data/lib/metanorma/standoc/term_lookup_cleanup.rb

@@ -16,6 +16,9 @@ module Metanorma
         @log = log
         @termlookup = { term: {}, symbol: {}, secondary2primary: {} }
         @idhash = {}
+        @terms_tags = xmldoc.xpath("//terms").each_with_object({}) do |t, m|
+          m[t["id"]] = true
+        end
       end
 
       def call
@@ -42,8 +45,8 @@ module Metanorma
           refterm = n.at("./refterm") or next
           p = @termlookup[:secondary2primary][refterm.text] and
             refterm.children = p
-          refterm.replace("<preferred><expression>"\
-                          "<name>#{refterm.children.to_xml}"\
+          refterm.replace("<preferred><expression>" \
+                          "<name>#{refterm.children.to_xml}" \
                           "</name></expression></preferred>")
         end
       end
@@ -90,10 +93,9 @@ module Metanorma
         remove_missing_ref_msg1(node, target, ret)
       end
 
-      def remove_missing_ref_msg1(node, target, ret)
+      def remove_missing_ref_msg1(_node, target, ret)
         target2 = "_#{target.downcase.gsub(/-/, '_')}"
-        if node.document.at("//*[@id = '#{target}']")&.name == "terms" ||
-            node.document.at("//*[@id = '#{target2}']")&.name == "terms"
+        if @terms_tags[target] || @terms_tags[target2]
           ret.strip!
           ret += ". Did you mean to point to a subterm?"
         end
@@ -106,7 +108,7 @@ module Metanorma
         display = node.at("../renderterm")&.remove&.children
         display = [] if display.nil? || display.to_xml == node.text
         d = display.empty? ? "" : ", display <tt>#{display.to_xml}</tt>"
-        node.children = "term <tt>#{node.text}</tt>#{d} "\
+        node.children = "term <tt>#{node.text}</tt>#{d} " \
                         "not resolved via ID <tt>#{target}</tt>"
       end
 
@@ -116,7 +118,7 @@ module Metanorma
         display = node.at("../renderterm")&.remove&.children
         display = [] if display.nil? || display.to_xml == node.text
         d = display.empty? ? "" : ", display <tt>#{display.to_xml}</tt>"
-        node.children = "symbol <tt>#{node.text}</tt>#{d} "\
+        node.children = "symbol <tt>#{node.text}</tt>#{d} " \
                         "not resolved via ID <tt>#{target}</tt>"
       end
 

data/lib/metanorma/standoc/validate.rb

@@ -72,10 +72,9 @@ module Metanorma
 
       def concept_validate(doc, tag, refterm)
         found = false
+        concept_validate_ids(doc)
         doc.xpath("//#{tag}/xref").each do |x|
-          next if doc.at("//term[@id = '#{x['target']}']")
-          next if doc.at("//definitions//dt[@id = '#{x['target']}']")
-
+          @concept_ids[x["target"]] and next
           @log.add("Anchors", x, concept_validate_msg(doc, tag, refterm, x))
           found = true
         end
@@ -83,11 +82,19 @@ module Metanorma
           @fatalerror << "#{tag.capitalize} not cross-referencing term or symbol"
       end
 
-      def concept_validate_msg(doc, tag, refterm, xref)
+      def concept_validate_ids(doc)
+        @concept_ids ||= doc.xpath("//term | //definitions//dt")
+          .each_with_object({}) { |x, m| m[x["id"]] = true }
+        @concept_terms_tags ||= doc.xpath("//terms")
+          .each_with_object({}) { |t, m| m[t["id"]] = true }
+        nil
+      end
+
+      def concept_validate_msg(_doc, tag, refterm, xref)
         ret = <<~LOG
           #{tag.capitalize} #{xref.at("../#{refterm}")&.text} is pointing to #{xref['target']}, which is not a term or symbol
         LOG
-        if doc.at("//*[@id = '#{xref['target']}']")&.name == "terms"
+        if @concept_terms_tags[xref["target"]]
           ret = ret.strip
           ret += ". Did you mean to point to a subterm?"
         end

data/lib/metanorma/standoc/version.rb

@@ -19,6 +19,6 @@ module Metanorma
   end
 
   module Standoc
-    VERSION = "2.3.1".freeze
+    VERSION = "2.3.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-standoc
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-05 00:00:00.000000000 Z
+date: 2022-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor