isodoc 2.5.5 → 2.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d6ca47f20afd4ccef8c44ce28bfca11c4803f9aa8988e950cf1842dc251dc855
-  data.tar.gz: 9f2ca8a82bb0528e05f8a6cc631cfad987c0fe8d819937af79580a119955a921
+  metadata.gz: 89b2a927f8f452dd13667b90a02e9871472784e620c85978a83d6fd52015902b
+  data.tar.gz: f76d973900f03358f4411a8b479db06544e3d7ecc52971cd0c5afe60334046bd
 SHA512:
-  metadata.gz: 10170334bf2d0bbf492237695054a1a164c8c7f056a8cec5d782cd468f4a367524fc9dc841fccf4c3f7c90038af32d83e962d5cf224d66e5f7d05323b1b65083
-  data.tar.gz: 9fc62b5c28d0baff4b369f15f8811a6be8b0bd85e1b63db6a9b36017e9a84a276c9df3034c679c0bd11ecbca0d5f7056bd2aa1627873a561be29b67f5619db9a
+  metadata.gz: aecc80230f4d1cde0232702931d07290c340f98c3a5e93a81603fed8c7775a1fca6dbf29cf09aa8141aece7fa3befb6d583c70690cf2cda02fcf50ce5bf75848
+  data.tar.gz: fc2d6d6fa85a1dc0edf1735068b940084b21fe20442158bc18307e9ae77581875dbf2b66be5cc4847bd2eb1096063b959c9df9695d356963e879c9c83e6a9e3b

data/lib/isodoc/function/cleanup.rb

@@ -30,33 +30,38 @@ module IsoDoc
 
         docxml.xpath("//td | //th").each do |d|
           d.traverse do |n|
-            next unless n.text?
-
-            n.replace(HTMLEntities.new.encode(
-                        break_up_long_strings(n.text),
-                      ))
+            n.text? or next
+            ret = break_up_long_str(n.text)
+            n.content = ret
           end
         end
       end
 
-      def break_up_long_strings(text)
-        return text if /^\s*$/.match?(text)
+      LONGSTR_THRESHOLD = 10
+      LONGSTR_NOPUNCT = 2
 
+      def break_up_long_str(text)
+        /^\s*$/.match?(text) and return text
         text.split(/(?=\s)/).map do |w|
-          if /^\s*$/.match(text) || (w.size < 30) then w
+          if /^\s*$/.match(text) || (w.size < LONGSTR_THRESHOLD) then w
           else
-            w.scan(/.{,30}/).map do |w1|
-              w1.size < 30 ? w1 : break_up_long_strings1(w1)
+            w.scan(/.{,#{LONGSTR_THRESHOLD}}/o).map.with_index do |w1, i|
+              w1.size < LONGSTR_THRESHOLD ? w1 : break_up_long_str1(w1, i + 1)
             end.join
           end
         end.join
       end
 
-      def break_up_long_strings1(text)
-        s = text.split(%r{(?<=[,.?+;/=])})
-        if s.size == 1 then "#{text} "
+      # break on punct every LONGSTRING_THRESHOLD chars
+      # break regardless every LONGSTRING_THRESHOLD * LONGSTR_NOPUNCT
+      def break_up_long_str1(text, iteration)
+        s = text.split(%r{(?<=[,.?+;/=(\[])})
+        if s.size == 1
+          (iteration % LONGSTR_NOPUNCT).zero? and
+            text += "\u200b"
+          text
         else
-          s[-1] = " #{s[-1]}"
+          s[-1] = "\u200b#{s[-1]}"
           s.join
         end
       end

data/lib/isodoc/html_function/html.rb

@@ -102,8 +102,6 @@ module IsoDoc
         end
       end
 
-      def table_long_strings_cleanup(docxml); end
-
       def table_attrs(node)
         ret = super
         node.at(ns("./colgroup")) and ret[:style] += "table-layout:fixed;"

data/lib/isodoc/presentation_function/block.rb

@@ -140,6 +140,7 @@ module IsoDoc
     def ol(docxml)
       docxml.xpath(ns("//ol")).each { |f| ol1(f) }
       @xrefs.list_anchor_names(docxml.xpath(ns(@xrefs.sections_xpath)))
+      docxml.xpath(ns("//ol/li")).each { |f| ol_label(f) }
     end
 
     # We don't really want users to specify type of ordered list;
@@ -157,6 +158,13 @@ module IsoDoc
 
     def ol1(elem)
       elem["type"] ||= ol_depth(elem).to_s
+      elem.xpath(ns("./li")).each do |li|
+        li["id"] ||= "_#{UUIDTools::UUID.random_create}"
+      end
+    end
+
+    def ol_label(elem)
+      elem["label"] = @xrefs.anchor(elem["id"], :label, false)
     end
 
     def requirement_render_preprocessing(docxml); end

data/lib/isodoc/presentation_function/inline.rb

@@ -89,6 +89,17 @@ module IsoDoc
       end
     end
 
+    def date(docxml)
+      (docxml.xpath(ns("//date")) -
+       docxml.xpath(ns("//bibdata/date | //bibitem//date"))).each do |d|
+         date1(d)
+       end
+    end
+
+    def date1(elem)
+      elem.replace(@i18n.date(elem["value"], elem["format"].strip))
+    end
+
     private
 
     def found_matching_variant_sibling(node)

data/lib/isodoc/presentation_function/xrefs.rb

@@ -6,8 +6,8 @@ module IsoDoc
     end
 
     def anchor_value(id)
-      @xrefs.anchor(id, :value) || @xrefs.anchor(id, :label) ||
-        @xrefs.anchor(id, :xref)
+      @xrefs.anchor(id, :bare_xref) || @xrefs.anchor(id, :value) ||
+        @xrefs.anchor(id, :label) || @xrefs.anchor(id, :xref)
     end
 
     def anchor_linkend(node, linkend)

data/lib/isodoc/presentation_xml_convert.rb

@@ -85,6 +85,7 @@ module IsoDoc
       mathml docxml
       variant docxml
       identifier docxml
+      date docxml
     end
 
     def terms(docxml)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.5.5".freeze
+  VERSION = "2.5.7".freeze
 end

data/lib/isodoc/xref/xref_counter.rb

@@ -107,6 +107,13 @@ module IsoDoc
       end
 
       def increment_letter
+        clock_letter
+        @letter = (@letter.ord + 1).chr.to_s
+        @skip_i && %w(i I).include?(@letter) and
+          @letter = (@letter.ord + 1).chr.to_s
+      end
+
+      def clock_letter
         case @letter
         when "Z"
           @letter = "@"
@@ -115,9 +122,6 @@ module IsoDoc
           @letter = "`"
           @base = string_inc(@base, "a")
         end
-        @letter = (@letter.ord + 1).chr.to_s
-        @skip_i && %w(i I).include?(@letter) and
-          @letter = (@letter.ord + 1).chr.to_s
       end
 
       def blank?(str)

data/lib/isodoc/xref/xref_gen.rb

@@ -171,18 +171,27 @@ module IsoDoc
 refer_list)
         c = Counter.new(list["start"] ? list["start"].to_i - 1 : 0)
         list.xpath(ns("./li")).each do |li|
-          label = c.increment(li).listlabel(list, depth)
-          label = list_item_anchor_label(label, list_anchor, prev_label,
-                                         refer_list)
+          bare_label, label =
+            list_item_value(li, c, depth, { list_anchor: list_anchor, prev_label: prev_label,
+                                            refer_list: refer_list })
           li["id"] and @anchors[li["id"]] =
-                         { xref: "#{label})", type: "listitem", refer_list:
-                           refer_list, container: list_anchor[:container] }
+                         { label: bare_label, bare_xref: "#{label})",
+                           xref: "#{label})",
+                           type: "listitem", refer_list: refer_list,
+                           container: list_anchor[:container] }
           (li.xpath(ns(".//ol")) - li.xpath(ns(".//ol//ol"))).each do |ol|
             list_item_anchor_names(ol, list_anchor, depth + 1, label, false)
           end
         end
       end
 
+      def list_item_value(entry, counter, depth, opts)
+        label = counter.increment(entry).listlabel(entry.parent, depth)
+        [label,
+         list_item_anchor_label(label, opts[:list_anchor], opts[:prev_label],
+                                opts[:refer_list])]
+      end
+
       def list_item_anchor_label(label, list_anchor, prev_label, refer_list)
         prev_label.empty? or
           label = @i18n.list_nested_xref.sub(/%1/, "#{prev_label})")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.5.5
+  version: 2.5.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-22 00:00:00.000000000 Z
+date: 2023-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html2doc