isodoc 2.5.8 → 2.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69483536ae8b9bb773ddbb3e3d38660784c9e01ad1eb810ecfc045b721bcd3c3
-  data.tar.gz: 43212277b0d8b7fec3551bf234ff31288eaf2f1fe63e494ed82ab7438d3a8c3c
+  metadata.gz: 2637af525bf848e58c6d65897b549ea7f108df761204a637580845c0285cf350
+  data.tar.gz: 104fc1eeddb8180b12ad78e118162a37afb333c64479c3f23d838e6b6021e3f6
 SHA512:
-  metadata.gz: 230b47645cebcda1c1d56df140a8a1aced48807e0188270bbc25034c91ea3b612cbd004000bef00a7e81ca0de57b63463665d5679cb5de3ef14ed264ed971f46
-  data.tar.gz: 50f2cf4ca7215a501b9999601aec898b4c4006f468ceba9481b9ad5d7820481650dd21ddb68da3fe632571e4bde708a5d1877598b20ba484ceff72c768672247
+  metadata.gz: 314eb1f0f742b35262623ba20cf3bfc996f7e58a046e1826e20fbef6aac20cc811fcf6480f9f20b68dc4e99b77a55b08260c9a8e23d013eec8cdf933f2c82e6a
+  data.tar.gz: 3a08add2909e527ff63479ba29ed6809ef4eab3148c8493f4444f2606420dc504701973f51bb60bd403071929346319d3d8c24965629194614c79fa6cda06d85

data/lib/isodoc/base_style/all.css

@@ -90,7 +90,7 @@ h1, h2, h3, h4, h5, h6 {
 
 blockquote, q {
   quotes: none; }
-  blockquote:before, blockquote:after, q:before, q:after {
+  blockquote::before, blockquote::after, q::before, q::after {
     content: '';
     content: none; }
 
@@ -113,14 +113,18 @@ b, strong {
 div.document-stage-band, div.document-type-band {
   background-color: #333333; }
 
-a.FootnoteRef + a.FootnoteRef:before {
+a.FootnoteRef + a.FootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
-a.TableFootnoteRef + a.TableFootnoteRef:before {
+a.TableFootnoteRef + a.TableFootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
+a.TableFootnoteRef, span.TableFootnoteRef,
+a.FootnoteRef, span.FootnoteRef {
+  vertical-align: super; }
+
 .addition {
   color: blue; }
 

data/lib/isodoc/base_style/reset.css

@@ -90,7 +90,7 @@ h1, h2, h3, h4, h5, h6 {
 
 blockquote, q {
   quotes: none; }
-  blockquote:before, blockquote:after, q:before, q:after {
+  blockquote::before, blockquote::after, q::before, q::after {
     content: '';
     content: none; }
 
@@ -113,14 +113,18 @@ b, strong {
 div.document-stage-band, div.document-type-band {
   background-color: #333333; }
 
-a.FootnoteRef + a.FootnoteRef:before {
+a.FootnoteRef + a.FootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
-a.TableFootnoteRef + a.TableFootnoteRef:before {
+a.TableFootnoteRef + a.TableFootnoteRef::before {
   content: ", ";
   vertical-align: super; }
 
+a.TableFootnoteRef, span.TableFootnoteRef,
+a.FootnoteRef, span.FootnoteRef {
+  vertical-align: super; }
+
 .addition {
   color: blue; }
 

data/lib/isodoc/base_style/reset.scss

@@ -102,7 +102,7 @@ h1, h2, h3, h4, h5, h6 {
 blockquote, q {
   quotes: none;
 
-  &:before, &:after {
+  &::before, &::after {
     content: '';
     content: none;
   }
@@ -139,16 +139,20 @@ div.document-stage-band, div.document-type-band {
   background-color: #333333;
 }
 
-a.FootnoteRef + a.FootnoteRef:before {
+a.FootnoteRef + a.FootnoteRef::before {
     content: ", ";
     vertical-align: super;
   }
 
-a.TableFootnoteRef + a.TableFootnoteRef:before { 
+a.TableFootnoteRef + a.TableFootnoteRef::before { 
     content: ", ";
     vertical-align: super; 
   }
 
+a.TableFootnoteRef, span.TableFootnoteRef, 
+a.FootnoteRef, span.FootnoteRef {
+  vertical-align: super; 
+}
 
 .addition {
   color: blue;

data/lib/isodoc/function/cleanup.rb

@@ -25,47 +25,6 @@ module IsoDoc
         admonition_cleanup(docxml)
       end
 
-      def table_long_strings_cleanup(docxml)
-        return unless @break_up_urls_in_tables
-
-        docxml.xpath("//td | //th").each do |d|
-          d.traverse do |n|
-            n.text? or next
-            ret = break_up_long_str(n.text)
-            n.content = ret
-          end
-        end
-      end
-
-      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 < LONGSTR_THRESHOLD) then w
-          else
-            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
-
-      # 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] = "\u200b#{s[-1]}"
-          s.join
-        end
-      end
-
       def admonition_cleanup(docxml)
         docxml.xpath("//div[@class = 'Admonition'][title]").each do |d|
           title = d.at("./title")
@@ -214,7 +173,6 @@ module IsoDoc
       def table_cleanup(docxml)
         table_footnote_cleanup(docxml)
         table_note_cleanup(docxml)
-        table_long_strings_cleanup(docxml)
         docxml
       end
 

data/lib/isodoc/function/lists.rb

@@ -96,6 +96,10 @@ module IsoDoc
             dl_parse1(v, dt, dd)
           end
         end
+        dl_parse_notes(node, out)
+      end
+
+      def dl_parse_notes(node, out)
         node.elements.reject { |n| dt_dd?(n) || n.name == "name" }
           .each { |n| parse(n, out) }
       end

data/lib/isodoc/function/section.rb

@@ -1,4 +1,4 @@
-require_relative "./section_titles"
+require_relative "section_titles"
 
 module IsoDoc
   module Function
@@ -20,7 +20,7 @@ module IsoDoc
       def clause(isoxml, out)
         isoxml.xpath(ns(middle_clause(isoxml))).each do |c|
           out.div **attr_code(clause_attrs(c)) do |s|
-            clause_name(c, c&.at(ns("./title")), s, nil)
+            clause_name(c, c.at(ns("./title")), s, nil)
             c.elements.reject { |c1| c1.name == "title" }.each do |c1|
               parse(c1, s)
             end
@@ -64,7 +64,7 @@ module IsoDoc
         f = isoxml.at(ns(TERM_CLAUSE)) or return num
         out.div **attr_code(id: f["id"]) do |div|
           num = num + 1
-          clause_name(f, f&.at(ns("./title")), div, nil)
+          clause_name(f, f.at(ns("./title")), div, nil)
           f.elements.each do |e|
             parse(e, div) unless %w{title source}.include? e.name
           end

data/lib/isodoc/function/utils.rb

@@ -60,7 +60,7 @@ module IsoDoc
 
       def to_xhtml_prep(xml)
         xml.gsub!(/<\?xml[^>]*>/, "")
-        /<!DOCTYPE /.match(xml) || (xml = DOCTYPE_HDR + xml)
+        xml.include?("<!DOCTYPE ") || (xml = DOCTYPE_HDR + xml)
         numeric_escapes(xml)
       end
 
@@ -130,7 +130,7 @@ module IsoDoc
           .gsub(%r{</?p(\s[^>]+)?>}, "")
           .gsub(/<\/?h[123456][^>]*>/, "").gsub(/<\/?b[^>]*>/, "").dup)
         h1.traverse do |x|
-          if x.name == "span" && /mso-tab-count/.match(x["style"])
+          if x.name == "span" && x["style"]&.include?("mso-tab-count")
             x.replace(" ")
           elsif header_strip_elem?(x) then x.remove
           elsif x.name == "a" then x.replace(x.children)
@@ -143,7 +143,7 @@ module IsoDoc
         elem.name == "img" ||
           (elem.name == "span" && elem["class"] == "MsoCommentReference") ||
           (elem.name == "a" && elem["class"] == "FootnoteRef") ||
-          (elem.name == "span" && /mso-bookmark/.match(elem["style"]))
+          (elem.name == "span" && elem["style"]&.include?("mso-bookmark"))
       end
 
       def liquid(doc)
@@ -202,9 +202,15 @@ module IsoDoc
         end
       end
 
-      def labelled_ancestor(node)
-        !node.ancestors("example, requirement, recommendation, permission, " \
-                        "note, table, figure, sourcecode").empty?
+      LABELLED_ANCESTOR_ELEMENTS =
+        %w(example requirement recommendation permission
+           note table figure sourcecode).freeze
+
+      def labelled_ancestor(elem)
+        #require  "debug"; binding.b
+        #!elem.path.gsub(/\[\d+\]/, "").split(%r{/})[1..-1]
+        !elem.ancestors.map(&:name)
+          .intersection(LABELLED_ANCESTOR_ELEMENTS).empty?
       end
 
       def emf?(type)

data/lib/isodoc/presentation_function/block.rb

@@ -1,12 +1,11 @@
-require_relative "./image"
-require_relative "./sourcecode"
+require_relative "image"
+require_relative "sourcecode"
 require "rouge"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def lower2cap(text)
-      return text if /^[[:upper:]][[:upper:]]/.match?(text)
-
+      /^[[:upper:]][[:upper:]]/.match?(text) and return text
       text.capitalize
     end
 
@@ -89,31 +88,8 @@ module IsoDoc
       prefix_name(elem, block_delim, l10n("#{@i18n.box} #{n}"), "name")
     end
 
-    def recommendation(docxml)
-      docxml.xpath(ns("//recommendation")).each do |f|
-        recommendation1(f, lower2cap(@i18n.recommendation))
-      end
-    end
-
-    def requirement(docxml)
-      docxml.xpath(ns("//requirement")).each do |f|
-        recommendation1(f, lower2cap(@i18n.requirement))
-      end
-    end
-
-    def permission(docxml)
-      docxml.xpath(ns("//permission")).each do |f|
-        recommendation1(f, lower2cap(@i18n.permission))
-      end
-    end
-
-    def recommendation1(elem, type)
-      lbl = @reqt_models.model(elem["model"])
-        .recommendation_label(elem, type, xrefs)
-      prefix_name(elem, "", l10n(lbl), "name")
-    end
-
     def table(docxml)
+      table_long_strings_cleanup(docxml)
       docxml.xpath(ns("//table")).each { |f| table1(f) }
     end
 
@@ -125,6 +101,74 @@ module IsoDoc
                   "name")
     end
 
+    def table_long_strings_cleanup(docxml)
+      @break_up_urls_in_tables or return
+      docxml.xpath("//td | //th").each do |d|
+        d.traverse do |n|
+          n.text? or next
+          ret = break_up_long_str(n.text)
+          n.content = ret
+        end
+      end
+    end
+
+    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 < LONGSTR_THRESHOLD) then w
+        else
+          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
+
+    STR_BREAKUP_RE = %r{
+     (?<=[=_—–\u2009→?+;]) | # break after any of these
+     (?<=[,.:])(?!\d) | # break on punct only if not preceding digit
+     (?<=[>])(?![>]) | # > not >->
+     (?<=[\]])(?![\]]) | # ] not ]-]
+     (?<=//) | # //
+     (?<=[/])(?![/]) | # / not /-/
+     (?<![<])(?=[<]) | # < not <-<
+     (?<=\p{L})(?=[(\{\[]\p{L}) # letter and bracket, followed by letter
+    }x.freeze
+
+
+    CAMEL_CASE_RE = %r{
+      (?<=\p{Ll}\p{Ll})(?=\p{Lu}\p{Ll}\p{Ll}) # 2 lowerc / upperc, 2 lowerc
+    }x.freeze
+
+    # break on punct every LONGSTRING_THRESHOLD chars, with zero width space
+    # if punct fails, try break on camel case, with soft hyphen
+    # break regardless every LONGSTRING_THRESHOLD * LONGSTR_NOPUNCT,
+    # with soft hyphen
+    def break_up_long_str1(text, iteration)
+      s, separator = break_up_long_str2(text)
+      if s.size == 1 # could not break up
+        (iteration % LONGSTR_NOPUNCT).zero? and
+          text += "\u00ad" # force soft hyphen
+        text
+      else
+        s[-1] = "#{separator}#{s[-1]}"
+        s.join
+      end
+    end
+
+    def break_up_long_str2(text)
+      s = text.split(STR_BREAKUP_RE, -1)
+      separator = "\u200b"
+      if s.size == 1
+        s = text.split(CAMEL_CASE_RE)
+        separator = "\u00ad"
+      end
+      [s, separator]
+    end
+
     # we use this to eliminate the semantic amend blocks from rendering
     def amend(docxml)
       docxml.xpath(ns("//amend")).each { |f| amend1(f) }
@@ -167,26 +211,6 @@ module IsoDoc
       elem["label"] = @xrefs.anchor(elem["id"], :label, false)
     end
 
-    def requirement_render_preprocessing(docxml); end
-
-    REQS = %w(requirement recommendation permission).freeze
-
-    def requirement_render(docxml)
-      requirement_render_preprocessing(docxml)
-      REQS.each do |x|
-        REQS.each do |y|
-          docxml.xpath(ns("//#{x}//#{y}")).each { |r| requirement_render1(r) }
-        end
-      end
-      docxml.xpath(ns("//requirement | //recommendation | //permission"))
-        .each { |r| requirement_render1(r) }
-    end
-
-    def requirement_render1(node)
-      node.replace(@reqt_models.model(node["model"])
-        .requirement_render1(node))
-    end
-
     def source(docxml)
       docxml.xpath(ns("//source/modification")).each do |f|
         source_modification(f)

data/lib/isodoc/presentation_function/reqt.rb

@@ -0,0 +1,47 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def recommendation(docxml)
+      docxml.xpath(ns("//recommendation")).each do |f|
+        recommendation1(f, lower2cap(@i18n.recommendation))
+      end
+    end
+
+    def requirement(docxml)
+      docxml.xpath(ns("//requirement")).each do |f|
+        recommendation1(f, lower2cap(@i18n.requirement))
+      end
+    end
+
+    def permission(docxml)
+      docxml.xpath(ns("//permission")).each do |f|
+        recommendation1(f, lower2cap(@i18n.permission))
+      end
+    end
+
+    def recommendation1(elem, type)
+      lbl = @reqt_models.model(elem["model"])
+        .recommendation_label(elem, type, xrefs)
+      prefix_name(elem, "", l10n(lbl), "name")
+    end
+
+    def requirement_render_preprocessing(docxml); end
+
+    REQS = %w(requirement recommendation permission).freeze
+
+    def requirement_render(docxml)
+      requirement_render_preprocessing(docxml)
+      REQS.each do |x|
+        REQS.each do |y|
+          docxml.xpath(ns("//#{x}//#{y}")).each { |r| requirement_render1(r) }
+        end
+      end
+      docxml.xpath(ns("//requirement | //recommendation | //permission"))
+        .each { |r| requirement_render1(r) }
+    end
+
+    def requirement_render1(node)
+      node.replace(@reqt_models.model(node["model"])
+        .requirement_render1(node))
+    end
+  end
+end

data/lib/isodoc/presentation_xml_convert.rb

@@ -1,4 +1,5 @@
 require_relative "presentation_function/block"
+require_relative "presentation_function/reqt"
 require_relative "presentation_function/concepts"
 require_relative "presentation_function/terms"
 require_relative "presentation_function/xrefs"
@@ -22,7 +23,7 @@ module IsoDoc
       info docxml, nil
       conversions(docxml)
       docxml.root["type"] = "presentation"
-      docxml.to_xml.gsub(/</, "<").gsub(/>/, ">")
+      docxml.to_xml.gsub("<", "<").gsub(">", ">")
     end
 
     def bibitem_lookup(docxml)
@@ -125,7 +126,7 @@ module IsoDoc
         .sub(/ xmlns=['"][^"']+['"]/, "") # root XMLNS
         .split(/(?=[<> \t\r\n\f\v])/).map do |x|
           case x
-          when /^<[^:]+:/ then x.sub(/:/, ":semantic__")
+          when /^<[^:]+:/ then x.sub(":", ":semantic__")
           when /^<[^:]+$/ then x.sub(%r{(</?)([[:alpha:]])},
                                      "\\1semantic__\\2")
           else x end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.5.8".freeze
+  VERSION = "2.5.9".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -1,5 +1,6 @@
 require_relative "./table"
 require_relative "./inline"
+require_relative "./lists"
 
 module IsoDoc
   module WordFunction
@@ -42,12 +43,6 @@ module IsoDoc
         end
       end
 
-      def insert_tab(out, count)
-        out.span **attr_code(style: "mso-tab-count:#{count}") do |span|
-          [1..count].each { span << "&#xA0; " }
-        end
-      end
-
       def para_class(_node)
         return "Sourcecode" if @annotation
         return "MsoCommentText" if @in_comment
@@ -67,58 +62,6 @@ module IsoDoc
         node.xpath(ns("./note")).each { |n| parse(n, out) }
       end
 
-      WORD_DT_ATTRS = { class: @note ? "Note" : nil, align: "left",
-                        style: "margin-left:0pt;text-align:left;" }.freeze
-
-      def dt_parse(dterm, term)
-        term.p **attr_code(WORD_DT_ATTRS) do |p|
-          if dterm.elements.empty?
-            p << dterm.text
-          else
-            dterm.children.each { |n| parse(n, p) }
-          end
-        end
-      end
-
-      def dl_parse(node, out)
-        return super unless node.ancestors("table, dl").empty?
-
-        dl_parse_table(node, out)
-      end
-
-      def dl_parse_table(node, out)
-        list_title_parse(node, out)
-        out.table class: (node["class"] || "dl") do |v|
-          node.elements.select { |n| dt_dd?(n) }
-            .each_slice(2) do |dt, dd|
-            dl_parse_table1(v, dt, dd)
-          end
-          dl_parse_notes(node, v)
-        end
-      end
-
-      def dl_parse_table1(table, dterm, ddefn)
-        table.tr do |tr|
-          tr.td valign: "top", align: "left" do |term|
-            dt_parse(dterm, term)
-          end
-          tr.td valign: "top" do |listitem|
-            ddefn.children.each { |n| parse(n, listitem) }
-          end
-        end
-      end
-
-      def dl_parse_notes(node, out)
-        remainder = node.elements.reject { |n| dt_dd?(n) || n.name == "name" }
-        return if remainder.empty?
-
-        out.tr do |tr|
-          tr.td colspan: 2 do |td|
-            remainder.each { |n| parse(n, td) }
-          end
-        end
-      end
-
       def figure_get_or_make_dl(node)
         dl = node.at(".//table[@class = 'dl']")
         if dl.nil?
@@ -130,7 +73,7 @@ module IsoDoc
 
       # get rid of footnote link, it is in diagram
       def figure_aside_process(fig, aside, key)
-        fig&.at("./a[@class='TableFootnoteRef']")&.remove
+        fig.at("./a[@class='TableFootnoteRef']")&.remove
         fnref = fig.at(".//span[@class='TableFootnoteRef']/..")
         tr = key.add_child("<tr></tr>").first
         dt = tr.add_child("<td valign='top' align='left'></td>").first
@@ -143,7 +86,7 @@ module IsoDoc
       end
 
       def note_p_parse(node, div)
-        name = node&.at(ns("./name"))&.remove
+        name = node.at(ns("./name"))&.remove
         div.p class: "Note" do |p|
           p.span class: "note_label" do |s|
             name&.children&.each { |n| parse(n, s) }
@@ -155,7 +98,7 @@ module IsoDoc
       end
 
       def note_parse1(node, div)
-        name = node&.at(ns("./name"))&.remove
+        name = node.at(ns("./name"))&.remove
         div.p class: "Note" do |p|
           p.span class: "note_label" do |s|
             name&.children&.each { |n| parse(n, s) }
@@ -211,30 +154,12 @@ module IsoDoc
         end
       end
 
-      def li_parse(node, out)
-        out.li **attr_code(id: node["id"]) do |li|
-          if node["uncheckedcheckbox"] == "true"
-            li << '<span class="zzMoveToFollowing">&#x2610; </span>'
-          elsif node["checkedcheckbox"] == "true"
-            li << '<span class="zzMoveToFollowing">&#x2611; </span>'
-          end
-          node.children.each { |n| parse(n, li) }
-        end
-      end
-
-      def suffix_url(url)
-        return url if url.nil? || %r{^https?://|^#}.match?(url)
-        return url unless File.extname(url).empty?
-
-        url.sub(/#{File.extname(url)}$/, ".doc")
-      end
-
-      def info(isoxml, out)
+      def info(xml, out)
         @tocfigurestitle =
-          isoxml.at(ns("//metanorma-extension/toc[@type = 'figure']/title"))&.text
+          xml.at(ns("//metanorma-extension/toc[@type = 'figure']/title"))&.text
         @toctablestitle =
-          isoxml.at(ns("//metanorma-extension/toc[@type = 'table']/title"))&.text
-        @tocrecommendationstitle = isoxml
+          xml.at(ns("//metanorma-extension/toc[@type = 'table']/title"))&.text
+        @tocrecommendationstitle = xml
           .at(ns("//metanorma-extension/toc[@type = 'recommendation']/title"))&.text
         super
       end

data/lib/isodoc/word_function/inline.rb

@@ -1,22 +1,28 @@
 module IsoDoc
   module WordFunction
     module Body
+      def insert_tab(out, count)
+        out.span **attr_code(style: "mso-tab-count:#{count}") do |span|
+          [1..count].each { span << "&#xA0; " }
+        end
+      end
+
       def section_break(body, continuous: false)
         body.p do |p|
           if continuous
-            p.br **{ clear: "all", style: "page-break-before:auto;"\
-                                          "mso-break-type:section-break" }
+            p.br clear: "all", style: "page-break-before:auto;" \
+                                      "mso-break-type:section-break"
           else
-            p.br **{ clear: "all", class: "section" }
+            p.br clear: "all", class: "section"
           end
         end
       end
 
       def page_break(out)
         out.p do |p|
-          p.br **{ clear: "all",
-                   style: "mso-special-character:line-break;"\
-                          "page-break-before:always" }
+          p.br clear: "all",
+               style: "mso-special-character:line-break;" \
+                      "page-break-before:always"
         end
       end
 
@@ -24,8 +30,8 @@ module IsoDoc
         return page_break(out) if node["orientation"].nil?
 
         out.p do |p|
-          p.br **{ clear: "all", class: "section",
-                   orientation: node["orientation"] }
+          p.br clear: "all", class: "section",
+               orientation: node["orientation"]
         end
       end
 
@@ -56,10 +62,17 @@ module IsoDoc
                  else
                    "##{node['target']}"
                  end
-        out.a(**{ href: target }) do |l|
+        out.a(href: target) do |l|
           node.children.each { |n| parse(n, l) }
         end
       end
+
+      def suffix_url(url)
+        return url if url.nil? || %r{^https?://|^#}.match?(url)
+        return url unless File.extname(url).empty?
+
+        url.sub(/#{File.extname(url)}$/, ".doc")
+      end
     end
   end
 end

data/lib/isodoc/word_function/lists.rb

@@ -0,0 +1,107 @@
+require_relative "./table"
+require_relative "./inline"
+
+module IsoDoc
+  module WordFunction
+    module Body
+      WORD_DT_ATTRS = { class: @note ? "Note" : nil, align: "left",
+                        style: "margin-left:0pt;text-align:left;" }.freeze
+
+      def dt_parse(dterm, term)
+        term.p **attr_code(WORD_DT_ATTRS) do |p|
+          if dterm.elements.empty?
+            p << dterm.text
+          else
+            dterm.children.each { |n| parse(n, p) }
+          end
+        end
+      end
+
+      def dl_parse(node, out)
+        node.ancestors("table, dl").empty? or
+          return dl_parse_nontable(node, out)
+        dl_parse_table(node, out)
+      end
+
+      def dl_parse_nontable(node, out)
+        node["id"] and bookmark_parse(node, out)
+        list_title_parse(node, out)
+        node.elements.select { |n| dt_dd?(n) }
+          .each_slice(2) do |dt, dd|
+          dl_parse_nontable1(out, dt, dd)
+        end
+        dl_parse_notes(node, out)
+      end
+
+      WORD_EMBED_DL_ATTRS =
+        "text-indent: -2.0cm; margin-left: 2.0cm; tab-stops: 2.0cm;".freeze
+
+      def dl_parse_nontable1(out, dterm, ddef)
+        out.p **attr_code(style: WORD_EMBED_DL_ATTRS, id: dterm["id"]) do |p|
+          dterm.children.each { |n| parse(n, p) }
+          insert_tab(p, 1)
+          ddef["id"] and bookmark_parse(ddef, out)
+          ddef_first_para(out, ddef)
+        end
+        ddef_other_paras(out, ddef)
+      end
+
+      def ddef_first_para(out, ddef)
+        if ddef.elements&.first&.name == "p"
+          ddef.children.first.children.each { |n| parse(n, out) }
+        else
+          ddef.children.each { |n| parse(n, out) }
+        end
+      end
+
+      def ddef_other_paras(out, ddef)
+        ddef.elements&.first&.name == "p" or return
+        ddef.children[1..-1].each { |n| parse(n, out) }
+      end
+
+      def dl_parse_table(node, out)
+        list_title_parse(node, out)
+        out.table **attr_code(id: node["id"],
+                              class: (node["class"] || "dl")) do |v|
+          node.elements.select { |n| dt_dd?(n) }
+            .each_slice(2) do |dt, dd|
+            dl_parse_table1(v, dt, dd)
+          end
+          dl_parse_table_notes(node, v)
+        end
+      end
+
+      def dl_parse_table1(table, dterm, ddefn)
+        table.tr do |tr|
+          tr.td valign: "top", align: "left" do |term|
+            dt_parse(dterm, term)
+          end
+          tr.td valign: "top" do |listitem|
+            ddefn.children.each { |n| parse(n, listitem) }
+          end
+        end
+      end
+
+      def dl_parse_table_notes(node, out)
+        remainder = node.elements.reject { |n| dt_dd?(n) || n.name == "name" }
+        remainder.empty? and return
+        out.tr do |tr|
+          tr.td colspan: 2 do |td|
+            remainder.each { |n| parse(n, td) }
+          end
+        end
+      end
+
+      def li_parse(node, out)
+        out.li **attr_code(id: node["id"]) do |li|
+          if node["uncheckedcheckbox"] == "true"
+            li << '<span class="zzMoveToFollowing">&#x2610; </span>'
+          elsif node["checkedcheckbox"] == "true"
+            li << '<span class="zzMoveToFollowing">&#x2611; </span>'
+          end
+          node.children.each { |n| parse(n, li) }
+        end
+      end
+    end
+  end
+end

data/lib/isodoc-yaml/i18n-ar.yaml

@@ -17,6 +17,7 @@ bibliography: بيبليوغرافيا
 clause: فقرة
 annex: ملحق
 appendix: تذييل
+continued: واصلت
 no_terms_boilerplate: |
   <p>لم يتم سرد أي مصطلحات وتعريفات في هذا المستند.</p>
 internal_terms_boilerplate: |

data/lib/isodoc-yaml/i18n-de.yaml

@@ -17,6 +17,7 @@ bibliography: Bibliographie
 clause: Klausel
 annex: Anhang
 appendix: Appendix
+continued: Fortsetzung
 no_terms_boilerplate: |
           <p>In diesem Dokument sind keine Begriffe und Definitionen aufgeführt.</p>
 internal_terms_boilerplate: |

data/lib/isodoc-yaml/i18n-en.yaml

@@ -18,6 +18,7 @@ preface: Preface
 clause: Clause
 annex: Annex
 appendix: Appendix
+continued: continued
 no_terms_boilerplate: |
           <p>No terms and definitions are listed in this document.</p>
 internal_terms_boilerplate: |

data/lib/isodoc-yaml/i18n-es.yaml

@@ -17,6 +17,7 @@ bibliography: Bibliografía
 clause: Cláusula
 annex: Anexo
 appendix: Apéndice
+continued: continuación
 no_terms_boilerplate: |
           <p>En este documento no se enumeran términos ni definiciones.</p>
 internal_terms_boilerplate: |

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -18,6 +18,7 @@ preface: Préface
 clause: Article
 annex: Annexe
 appendix: Appendice
+continued: continué
 no_terms_boilerplate: |
           <p>Aucun terme n’est défini dans le présent document.</p>
 internal_terms_boilerplate: |

data/lib/isodoc-yaml/i18n-ja.yaml

@@ -18,6 +18,7 @@ preface: Preface
 clause: 箇条
 annex: 附属書
 appendix: Appendix
+continued: 続き
 no_terms_boilerplate: |
           <p>この規格には，定義する用語はない。</p>
 internal_terms_boilerplate: |

data/lib/isodoc-yaml/i18n-ru.yaml

@@ -17,6 +17,7 @@ bibliography: Библиография
 clause: Пункт
 annex: Дополнение
 appendix: Приложение
+continued: продолжение
 no_terms_boilerplate: |
           <p>Термины и определения не перечислены в этом документе.</p>
 internal_terms_boilerplate: |

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -18,6 +18,7 @@ preface: 序言
 clause: 条
 annex: 附件
 appendix: 附录
+continued: 继续
 no_terms_boilerplate: |
           <p>本文件不提供术语和定义。</p>
 internal_terms_boilerplate: |

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.5.8
+  version: 2.5.9
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-06 00:00:00.000000000 Z
+date: 2023-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html2doc
@@ -439,6 +439,7 @@ files:
 - lib/isodoc/presentation_function/inline.rb
 - lib/isodoc/presentation_function/math.rb
 - lib/isodoc/presentation_function/refs.rb
+- lib/isodoc/presentation_function/reqt.rb
 - lib/isodoc/presentation_function/section.rb
 - lib/isodoc/presentation_function/sourcecode.rb
 - lib/isodoc/presentation_function/terms.rb
@@ -452,6 +453,7 @@ files:
 - lib/isodoc/word_function/comments.rb
 - lib/isodoc/word_function/footnotes.rb
 - lib/isodoc/word_function/inline.rb
+- lib/isodoc/word_function/lists.rb
 - lib/isodoc/word_function/postprocess.rb
 - lib/isodoc/word_function/postprocess_cover.rb
 - lib/isodoc/word_function/postprocess_table.rb