isodoc 3.1.3 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cc231c707c79c5af17d4a07818b64395a13328377f6ab4521e2cdfe1ad8c884
-  data.tar.gz: 1b6a810aae9f30c35eeea2f59daddc10d62d63cfd3efd3a0c0813c1c6a7b8bf0
+  metadata.gz: aab1e285713806592294433b8009ca144fe193d9a0f43019448580c8fbe1dd9d
+  data.tar.gz: 58fc680a7a698f4f714a1c9577e7d0f48c382ccadc720b2c588fe870dc643273
 SHA512:
-  metadata.gz: 4403a6d48af622fc31f0829683d4c11d2c76226a15f877deb449eaf8fcdf37e9b7fe55b25225ac1889fc2d3a15eda554d568efb9a988def3fe7bdc3e4d1632fc
-  data.tar.gz: 3365c6b7317a602ea24bf62d3ccc73cadd8ac3b872735945388172f029c0b02460e8f2337f95a192b786057ea69045acc4917a7454c4145bb670777da770ce9e
+  metadata.gz: 0fb892bcc672a38de31ab3d6fc9a3e3088d8c4ebba8c46010167a0646284747fca650de1c48c39b07b7177e7674494a05273d63204f4c0702b15a9dc09fe8c2b
+  data.tar.gz: ad8a5996bef31064b9b2fda5245f32caa2c16378468ba36bdf96933fe84c67ec6f0220907a1cde46e571d240dfc866d4363f9712b83c6544c923bea5087ae1a7

data/isodoc.gemspec

@@ -30,21 +30,19 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "base64"
   spec.add_dependency "bigdecimal"
-  spec.add_dependency "html2doc", "~> 1.8.1"
+  spec.add_dependency "html2doc", "~> 1.9.0"
   # spec.add_dependency "isodoc-i18n", "~> 1.1.0" # already in relaton-render and mn-requirements
   # spec.add_dependency "relaton-cli"
   # spec.add_dependency "metanorma-utils", "~> 1.5.0" # already in isodoc-i18n
   spec.add_dependency "mn2pdf", ">= 2.13"
   spec.add_dependency "mn-requirements", "~> 0.5.0"
 
-  spec.add_dependency "nokogiri", "<= 1.16.8"
   spec.add_dependency "relaton-render", "~> 0.9.0"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "rouge", "~> 4.0"
   spec.add_dependency "thread_safe"
   spec.add_dependency "twitter_cldr", ">= 6.6.0"
   spec.add_dependency "uuidtools"
-  spec.add_dependency "lutaml-model", "~> 0.6.0"
 
   spec.add_development_dependency "bigdecimal"
   spec.add_development_dependency "debug"
@@ -59,5 +57,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.15"
   spec.add_development_dependency "timecop", "~> 0.9"
   spec.add_development_dependency "xml-c14n"
+  # html2doc locks lutaml-model to ~ 0.7.0, but until testing of lutaml-model
+  # releases against dowmstream gems (notably Plurimath) is in place, locking at
+  # patch level
+  #spec.add_dependency "lutaml-model", "0.7.1"
   # spec.metadata["rubygems_mfa_required"] = "true"
 end

data/lib/isodoc/base_style/all.css

@@ -311,6 +311,13 @@ h6:hover > a.anchor,
   padding: 0;
 }
 
+svg {
+  width: 100%;
+  padding-bottom: 92%;
+  height: 1px;
+  overflow: visible;
+}
+
 #standard-band {
   background-color: #0AC442;
 }

data/lib/isodoc/base_style/reset.css

@@ -310,3 +310,10 @@ h6:hover > a.anchor,
   overflow: hidden;
   padding: 0;
 }
+
+svg {
+  width: 100%;
+  padding-bottom: 92%;
+  height: 1px;
+  overflow: visible;
+}

data/lib/isodoc/base_style/reset.scss

@@ -276,3 +276,7 @@ visibility:visible;
   overflow: hidden;
   padding: 0;
 }
+
+svg {
+   width: 100%; padding-bottom: 92%; height: 1px; overflow: visible;
+}

data/lib/isodoc/function/blocks.rb

@@ -198,9 +198,9 @@ module IsoDoc
       def fmt_fn_body_parse(node, out)
         node.ancestors("table, figure").empty? and
           node.at(ns(".//fmt-fn-label"))&.remove
-        aside = node.parent.name == "fmt-footnote-container"
-        tag = aside ? "aside" : "div"
-        out.send tag, id: "fn:#{node['reference']}", class: "footnote" do |div|
+        tag = node.parent.name == "fmt-footnote-container" ? "aside" : "div"
+        id = node["is_table"] ? node["reference"] : node["id"]
+        out.send tag, id: "fn:#{id}", class: "footnote" do |div|
           node.children.each { |n| parse(n, div) }
         end
       end

data/lib/isodoc/function/cleanup.rb

@@ -16,7 +16,6 @@ module IsoDoc
       def cleanup(docxml)
         @i18n ||= i18n_init(@lang, @script, @locale)
         comment_cleanup(docxml)
-        #footnote_cleanup(docxml)
         inline_header_cleanup(docxml)
         figure_cleanup(docxml)
         table_cleanup(docxml)
@@ -58,15 +57,6 @@ module IsoDoc
         docxml
       end
 
-      # KILL
-      def footnote_cleanup(docxml)
-        docxml.xpath('//a[@class = "FootnoteRef"]/sup')
-          .each_with_index do |x, i|
-          x.content = (i + 1).to_s
-        end
-        docxml
-      end
-
       def merge_fnref_into_fn_text(elem)
         fn = elem.at('.//span[@class="TableFootnoteRef"]/..') or return
         n = fn.next_element

data/lib/isodoc/function/footnotes.rb

@@ -32,6 +32,7 @@ module IsoDoc
       def update_table_fn_body_ref(fnote, table, reference)
         fnbody = table.at(ns(".//fmt-fn-body[@id = '#{fnote['target']}']")) or return
         fnbody["reference"] = reference
+        fnbody["is_table"] = true
         sup = fnbody.at(ns(".//fmt-fn-label/sup")) and sup.replace(sup.children)
         fnbody.xpath(ns(".//fmt-fn-label")).each do |s|
           s["class"] = "TableFootnoteRef"
@@ -41,17 +42,22 @@ module IsoDoc
         end
       end
 
-      def footnote_parse(node, out)
-        return table_footnote_parse(node, out) if (@in_table || @in_figure) &&
+      def table_footnote?(node)
+        (@in_table || @in_figure) &&
           !node.ancestors.map(&:name).include?("fmt-name")
+      end
 
-        fn = node["reference"] || UUIDTools::UUID.random_create.to_s
+      def footnote_parse(node, out)
+        table_footnote?(node) and return table_footnote_parse(node, out)
+        fn = node["target"] # || UUIDTools::UUID.random_create.to_s
         attrs = { class: "FootnoteRef", href: "#fn:#{fn}" }
         f = node.at(ns("./fmt-fn-label"))
         out.a **attrs do |a|
           children_parse(f, a)
         end
       end
+
+      def fmt_review_body_parse(node, out); end
     end
   end
 end

data/lib/isodoc/function/inline.rb

@@ -81,35 +81,41 @@ module IsoDoc
 
       def stem_parse(node, out)
         ret = node.at(ns("./semx[@element = 'stem']")) || node
-        ooml = case node["type"]
-               when "AsciiMath" then asciimath_parse(ret)
-               when "MathML" then mathml_parse(ret)
-               when "LaTeX" then latexmath_parse(ret)
-               else HTMLEntities.new.encode(ret.text)
-               end
-        out.span class: "stem" do |span|
+        ooml, text_only = stem_parse1(ret, node["type"])
+        klass = text_only ? {} : { class: "stem" }
+        out.span **klass do |span|
           span.parent.add_child ooml
         end
       end
 
+      def stem_parse1(ret, type)
+        case type
+        when "AsciiMath" then asciimath_parse(ret)
+        when "MathML" then mathml_parse(ret)
+        when "LaTeX" then latexmath_parse(ret)
+        else [HTMLEntities.new.encode(ret.text),
+              /^[[0-9,.+-]]*$/.match?(ret.text)]
+        end
+      end
+
       MATHML = { "m" => "http://www.w3.org/1998/Math/MathML" }.freeze
 
       def mathml_parse(node)
         # node.xpath("./m:math", MATHML).map(&:to_xml).join
         node.xpath(ns("./asciimath | ./latexmath")).each(&:remove)
         node.xpath(ns("./br")).each { |e| e.namespace = nil }
-        node.elements
+        [node.children, node.elements.empty?]
       end
 
       def asciimath_parse(node)
         a = node.at(ns("./asciimath"))&.text || node.text
-        "#{@openmathdelim}#{HTMLEntities.new.encode(a)}" \
-          "#{@closemathdelim}"
+        ["#{@openmathdelim}#{HTMLEntities.new.encode(a)}" \
+          "#{@closemathdelim}", /^[[0-9,.+-]]*$/.match?(a)]
       end
 
       def latexmath_parse(node)
         a = node.at(ns("./latexmath"))&.text || node.text
-        HTMLEntities.new.encode(a)
+        [HTMLEntities.new.encode(a), /^[[0-9,.+-]]*$/.match?(a)]
       end
 
       def image_title_parse(out, caption)
@@ -213,6 +219,7 @@ module IsoDoc
       def svgmap_parse(node, out); end
       def amend_parse(node, out); end
       def semx_sourcecode_parse(node, out); end
+      def review_note_parse(node, out); end
 
       def fmt_name_parse(node, out)
         children_parse(node, out)
@@ -237,6 +244,14 @@ module IsoDoc
       def fmt_footnote_container_parse(node, out)
         children_parse(node, out)
       end
+
+      def fmt_review_start_parse(node, out)
+        children_parse(node, out)
+      end
+
+      def fmt_review_end_parse(node, out)
+        children_parse(node, out)
+      end
     end
   end
 end

data/lib/isodoc/function/lists.rb

@@ -37,8 +37,9 @@ module IsoDoc
       # We don't really want users to specify type of ordered list;
       # we will use a fixed hierarchy as practiced by ISO (though not
       # fully spelled out): a) 1) i) A) I)
-
-      def ol_depth(node)
+      # Fallback, this is now being done in Presentation XML
+      # KILL
+      def ol_depthx(node)
         depth = node.ancestors("ul, ol").size + 1
         type = :alphabet
         type = :arabic if [2, 7].include? depth
@@ -49,7 +50,8 @@ module IsoDoc
       end
 
       def ol_attrs(node)
-        { type: node["type"] ? ol_style(node["type"].to_sym) : ol_depth(node),
+        { # type: node["type"] ? ol_style(node["type"].to_sym) : ol_depth(node),
+          type: ol_style(node["type"]&.to_sym),
           id: node["id"], style: keep_style(node) }
       end
 
@@ -62,16 +64,24 @@ module IsoDoc
         end
       end
 
+      def li_checkbox(node)
+        if node["uncheckedcheckbox"] == "true"
+          '<span class="zzMoveToFollowing">' \
+                '<input type="checkbox" checked="checked"/></span>'
+        elsif node["checkedcheckbox"] == "true"
+          '<span class="zzMoveToFollowing">' \
+                '<input type="checkbox"/></span>'
+        else ""
+        end
+      end
+
       def li_parse(node, out)
         out.li **attr_code(id: node["id"]) do |li|
-          if node["uncheckedcheckbox"] == "true"
-            li << '<span class="zzMoveToFollowing">' \
-                  '<input type="checkbox" checked="checked"/></span>'
-          elsif node["checkedcheckbox"] == "true"
-            li << '<span class="zzMoveToFollowing">' \
-                  '<input type="checkbox"/></span>'
+          li << li_checkbox(node)
+          node.children.each do |n|
+            n.name == "fmt-name" and next
+            parse(n, li)
           end
-          node.children.each { |n| parse(n, li) }
         end
       end
 

data/lib/isodoc/function/table.rb

@@ -106,6 +106,7 @@ module IsoDoc
 
       def make_tr_attr(cell, row, totalrows, header, bordered)
         style = cell.name == "th" ? "font-weight:bold;" : ""
+        cell["style"] and style += "#{cell['style']};"
         cell["align"] and style += "text-align:#{cell['align']};"
         cell["valign"] and style += "vertical-align:#{cell['valign']};"
         rowmax = cell["rowspan"] ? row + cell["rowspan"].to_i - 1 : row
@@ -125,10 +126,14 @@ module IsoDoc
         STYLE
       end
 
-      def tr_parse(node, out, ord, totalrows, header)
+      def table_bordered?(node)
         c = node.parent.parent["class"]
-        bordered = %w(modspec).include?(c) || !c
-        out.tr do |r|
+        %w(modspec).include?(c) || !c
+      end
+
+      def tr_parse(node, out, ord, totalrows, header)
+        bordered = table_bordered?(node)
+        out.tr **attr_code(style: node["style"]) do |r|
           node.elements.each do |td|
             attrs = make_tr_attr(td, ord, totalrows - 1, header, bordered)
             r.send td.name, **attr_code(attrs) do |entry|

data/lib/isodoc/function/to_word_html.rb

@@ -54,7 +54,7 @@ module IsoDoc
           boilerplate docxml, div3
           content(div3, docxml, ns(self.class::TOP_ELEMENTS))
           footnotes docxml, div3
-          comments div3
+          comments docxml, div3
         end
       end
 
@@ -234,6 +234,9 @@ module IsoDoc
           when "fmt-fn-body" then fmt_fn_body_parse(node, out)
           when "fmt-fn-label" then fmt_fn_label_parse(node, out)
           when "fmt-footnote-container" then fmt_footnote_container_parse(node, out)
+          when "fmt-review-start" then fmt_review_start_parse(node, out)
+          when "fmt-review-end" then fmt_review_end_parse(node, out)
+          when "fmt-review-body" then fmt_review_body_parse(node, out)
           else error_parse(node, out)
           end
         end

data/lib/isodoc/headlesshtml_convert.rb

@@ -1,10 +1,8 @@
-require_relative "html_function/comments"
 require_relative "html_function/html"
 require "fileutils"
 
 module IsoDoc
   class HeadlessHtmlConvert < ::IsoDoc::Convert
-    include HtmlFunction::Comments
     include HtmlFunction::Html
 
     def tmpimagedir_suffix

data/lib/isodoc/html_convert.rb

@@ -1,4 +1,3 @@
-require_relative "html_function/comments"
 require_relative "html_function/html"
 require_relative "html_function/postprocess"
 require_relative "html_function/form"
@@ -6,7 +5,6 @@ require_relative "html_function/form"
 module IsoDoc
   class HtmlConvert < ::IsoDoc::Convert
 
-    include HtmlFunction::Comments
     include HtmlFunction::Form
     include HtmlFunction::Html
 

data/lib/isodoc/html_function/html.rb

@@ -110,6 +110,13 @@ module IsoDoc
         else super
         end
       end
+
+      def in_comment
+        @in_comment
+      end
+
+      def comments(docxml, div); end
+      def comment_cleanup(docxml); end
     end
   end
 end

data/lib/isodoc/html_function/postprocess_footnotes.rb

@@ -28,11 +28,8 @@ module IsoDoc
         xdup = xref.dup
         xdup.remove["id"]
         if footnote.elements.empty?
-          #footnote.children.empty? and footnote << " "
-          #footnote.children.first.previous = xdup
           footnote.add_first_child xdup
         else
-          #footnote.elements.first.children.first.previous = xdup
           footnote.elements.first.add_first_child xdup
         end
       end
@@ -48,18 +45,6 @@ module IsoDoc
         end
         docxml
       end
-
-      # KILL
-      def footnote_formatx(docxml)
-        docxml.xpath("//a[@class = 'FootnoteRef']/sup").each do |x|
-          footnote_reference_format(x)
-        end
-        docxml.xpath("//a[@class = 'TableFootnoteRef'] | "\
-                     "//span[@class = 'TableFootnoteRef']").each do |x|
-          table_footnote_reference_format(x)
-        end
-        docxml
-      end
     end
   end
 end

data/lib/isodoc/init.rb

@@ -20,6 +20,7 @@ module IsoDoc
 
     def toc_init(docxml)
       @doctype = docxml.at(ns("//bibdata/ext/doctype"))&.text
+      @subdoctype = docxml.at(ns("//bibdata/ext/subdoctype"))&.text
       @xrefs.klass.doctype = @doctype
       x = "//metanorma-extension/presentation-metadata" \
           "[name[text() = 'TOC Heading Levels']]/value"

data/lib/isodoc/pdf_convert.rb

@@ -1,9 +1,7 @@
-require_relative "html_function/comments"
 require_relative "html_function/html"
 
 module IsoDoc
   class PdfConvert < ::IsoDoc::Convert
-    include HtmlFunction::Comments
     include HtmlFunction::Html
 
     def initialize(options)

data/lib/isodoc/presentation_function/block.rb

@@ -138,53 +138,6 @@ module IsoDoc
       elem.next = ret
     end
 
-    def dl(docxml)
-      docxml.xpath(ns("//dl")).each { |f| dl1(f) }
-    end
-
-    def dl1(elem)
-      elem.at(ns("./name")) and
-        prefix_name(elem, {}, "", "name") # copy name to fmt-name
-    end
-
-    def ul(docxml)
-      docxml.xpath(ns("//ul")).each { |f| ul1(f) }
-    end
-
-    def ul1(elem)
-      elem.at(ns("./name")) and
-        prefix_name(elem, {}, "", "name") # copy name to fmt-name
-    end
-
-    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;
-    # we will use by default a fixed hierarchy as practiced by ISO (though not
-    # fully spelled out): a) 1) i) A) I)
-    def ol_depth(node)
-      depth = node.ancestors("ul, ol").size + 1
-      type = :alphabet
-      type = :arabic if [2, 7].include? depth
-      type = :roman if [3, 8].include? depth
-      type = :alphabet_upper if [4, 9].include? depth
-      type = :roman_upper if [5, 10].include? depth
-      type
-    end
-
-    def ol1(elem)
-      elem["type"] ||= ol_depth(elem).to_s
-      elem.at(ns("./name")) and
-        prefix_name(elem, {}, "", "name") # copy name to fmt-name
-    end
-
-    def ol_label(elem)
-      elem["label"] = @xrefs.anchor(elem["id"], :label, false)
-    end
-
     def source(docxml)
       docxml.xpath(ns("//source/modification")).each do |f|
         source_modification(f)

data/lib/isodoc/presentation_function/footnotes.rb

@@ -125,10 +125,10 @@ module IsoDoc
       end
     end
 
-    def figure_fn_to_dt_dd(f)
-      label = f.at(ns(".//fmt-fn-label")).remove
+    def figure_fn_to_dt_dd(fnote)
+      label = fnote.at(ns(".//fmt-fn-label")).remove
       label.at(ns(".//span[@class = 'fmt-caption-delim']"))&.remove
-      [label, f]
+      [label, fnote]
     end
 
     def figure_key_insert_pt(elem)
@@ -136,5 +136,74 @@ module IsoDoc
         elem.at(ns(".//dl"))&.children&.first ||
         elem.add_child("<dl> </dl>").first.children.first
     end
+
+    def comments(docxml)
+      docxml.xpath(ns("//review")).each do |c|
+        c1 = comment_body(c)
+        comment_bookmarks(c1)
+      end
+    end
+
+    def comment_body(elem)
+      elem["id"] ||= "_#{UUIDTools::UUID.random_create}"
+      c1 = elem.after("<fmt-review-body/>").next
+      elem.attributes.each_key { |k| c1[k] = elem[k] }
+      c1["id"] = "_#{UUIDTools::UUID.random_create}"
+      c1 << semx_fmt_dup(elem)
+    end
+
+    def comment_bookmarks(elem)
+      from, to = comment_bookmarks_locate(elem)
+      new_from = comment_bookmark_start(from, elem)
+      new_to = comment_bookmark_end(to, elem)
+      elem["from"] = new_from["id"]
+      elem["to"] = new_to["id"]
+    end
+
+    # Do not insert a comment bookmark inside another comment bookmark
+    AVOID_COMMENT_BOOKMARKS = <<~XPATH.freeze
+      [not(ancestor::xmlns:fmt-review-start)][not(ancestor::xmlns:fmt-review-end)]
+    XPATH
+
+    def comment_bookmarks_locate(elem)
+      from = elem.document.at("//*[@id = '#{elem['from']}']")
+      f = from.at(".//text()#{AVOID_COMMENT_BOOKMARKS}") and from = f
+      to = elem.document.at("//*[@id = '#{elem['to']}']") || from
+      f = to.at(".//text()[last()]#{AVOID_COMMENT_BOOKMARKS}") and to = f
+      [from, to]
+    end
+
+    def comment_to_bookmark_attrs(elem, bookmark, start: true)
+      bookmark["target"] = elem["id"]
+      if start then bookmark["end"] = elem["to"]
+      else bookmark["start"] = elem["from"] end
+      %w(author date).each { |k| bookmark[k] = elem[k] }
+    end
+
+    def comment_bookmark_start(from, elem)
+      ret = from.before("<fmt-review-start/>").previous
+      ret["id"] = "_#{UUIDTools::UUID.random_create}"
+      ret["source"] = elem["from"]
+      comment_to_bookmark_attrs(elem, ret, start: true)
+      ret << comment_bookmark_start_label(elem)
+      ret
+    end
+
+    def comment_bookmark_end(to, elem)
+      ret = to.after("<fmt-review-end/>").next
+      ret["id"] = "_#{UUIDTools::UUID.random_create}"
+      ret["source"] = elem["to"]
+      comment_to_bookmark_attrs(elem, ret, start: false)
+      ret << comment_bookmark_end_label(elem)
+      ret
+    end
+
+    def comment_bookmark_start_label(_elem)
+      ""
+    end
+
+    def comment_bookmark_end_label(_elem)
+      ""
+    end
   end
 end

data/lib/isodoc/presentation_function/image.rb

@@ -10,15 +10,19 @@ module IsoDoc
       docxml.xpath(ns("//figure")).each { |f| figure1(f) }
       docxml.xpath(ns("//svgmap")).each { |s| svgmap_extract(s) }
       imageconvert(docxml)
+      docxml.xpath("//m:svg", SVG).each { |f| svg_scale(f) }
     end
 
     def svg_wrap(elem)
-      return if elem.parent.name == "image"
-
+      elem.parent.name == "image" and return
       elem.wrap("<image src='' mimetype='image/svg+xml' height='auto' " \
                 "width='auto'></image>")
     end
 
+    def svg_scale(elem)
+      elem["preserveaspectratio"] = "xMidYMin slice"
+    end
+
     def svgmap_extract(elem)
       if elem.at(ns("./figure"))# then elem.replace(f)
         n = semx_fmt_dup(elem)

data/lib/isodoc/presentation_function/list.rb

@@ -0,0 +1,78 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def dl(docxml)
+      docxml.xpath(ns("//dl")).each { |f| dl1(f) }
+    end
+
+    def dl1(elem)
+      elem.at(ns("./name")) and
+        prefix_name(elem, {}, "", "name") # copy name to fmt-name
+    end
+
+    def ul(docxml)
+      docxml.xpath(ns("//ul")).each { |f| ul1(f) }
+      docxml.xpath(ns("//ul/li")).each { |f| ul_label(f) }
+    end
+
+    def ul1(elem)
+      elem.at(ns("./name")) and
+        prefix_name(elem, {}, "", "name") # copy name to fmt-name
+    end
+
+    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
+
+    def ol_depth(node)
+      depth = node.ancestors("ul, ol").size + 1
+      @counter.ol_type(node, depth) # defined in Xref::Counter
+    end
+
+    def ol1(elem)
+      elem["type"] ||= ol_depth(elem).to_s # feeds ol_label_format
+      elem.at(ns("./name")) and
+        prefix_name(elem, {}, "", "name") # copy name to fmt-name
+    end
+
+    def ol_label(elem)
+      val = @xrefs.anchor(elem["id"], :label, false)
+      semx = "<semx element='autonum' source='#{elem['id']}'>#{val}</semx>"
+      lbl = "<fmt-name>#{ol_label_format(semx, elem)}</fmt-name>"
+      elem.add_first_child(lbl)
+    end
+
+    def ol_label_template(_elem)
+      {
+        alphabet: %{%<span class="fmt-label-delim">)</span>},
+        alphabet_upper: %{%<span class="fmt-label-delim">.</span>},
+        roman: %{%<span class="fmt-label-delim">)</span>},
+        roman_upper: %{%<span class="fmt-label-delim">.</span>},
+        arabic: %{%<span class="fmt-label-delim">)</span>},
+      }
+    end
+
+    def ol_label_format(semx, elem)
+      template = ol_label_template(elem)[elem.parent["type"].to_sym]
+      template.sub("%", semx)
+    end
+
+    def ul_label_list(_elem)
+      %w(&#x2014;)
+    end
+
+    def ul_label(elem)
+      val = ul_label_value(elem)
+      semx = "<semx element='autonum' source='#{elem['id']}'>#{val}</semx>"
+      lbl = "<fmt-name>#{semx}</fmt-name>"
+      elem.add_first_child(lbl)
+    end
+
+    def ul_label_value(elem)
+      depth = elem.ancestors("ul, ol").size
+      val = ul_label_list(elem)
+      val[(depth - 1) % val.size]
+    end
+  end
+end