metanorma-iso 2.8.9 → 2.9.1

data/lib/isodoc/iso/presentation_bibdata.rb

@@ -4,35 +4,6 @@ module IsoDoc
       def bibdata(docxml)
         super
         editorialgroup_identifier(docxml)
-        warning_for_missing_metadata(docxml)
-      end
-
-      def warning_for_missing_metadata(docxml)
-        @meta.get[:unpublished] or return
-        ret = warning_for_missing_metadata_create(docxml)
-        ret.empty? and return
-        warning_for_missing_metadata_post(docxml, ret)
-      end
-
-      def warning_for_missing_metadata_create(docxml)
-        ret = ""
-        docxml.at(ns("//bibdata/ext//secretariat")) or
-          ret += "<p>Secretariat is missing.</p>"
-        docxml.at(ns("//bibdata/ext//editorialgroup")) or
-          ret += "<p>Editorial groups are missing.</p>"
-        docxml.at(ns("//bibdata/date[@type = 'published' or @type = 'issued' " \
-                     "or @type = 'created']")) ||
-          docxml.at(ns("//bibdata/version/revision-date")) or
-          ret += "<p>Document date is missing.</p>"
-        ret
-      end
-
-      def warning_for_missing_metadata_post(docxml, ret)
-        id = UUIDTools::UUID.random_create
-        ret = "<review date='#{Date.today}' reviewer='Metanorma' id='_#{id}'>" \
-              "<p><strong>Metadata warnings:<strong></p> #{ret}</review>"
-        ins = docxml.at(ns("//sections//title")) or return
-        ins.children.first.previous = ret
       end
 
       def editorialgroup_identifier(docxml)

data/lib/isodoc/iso/presentation_terms.rb

@@ -52,19 +52,6 @@ module IsoDoc
                      node.children)
       end
 
-      def termdefinition1(elem)
-        prefix_domain_to_definition(elem)
-        super
-      end
-
-      def prefix_domain_to_definition(elem)
-        ((d = elem.at(ns("./domain"))) &&
-          (v = elem.at(ns("./definition/verbal-definition"))) &&
-          v.elements.first.name == "p") or return
-        v.elements.first.children.first.previous =
-          "<#{to_xml(d.remove.children)}> "
-      end
-
       def insertall_after_here(node, insert, name)
         node.children.each do |n|
           n.name == name or next

data/lib/isodoc/iso/presentation_xml_convert.rb

@@ -23,6 +23,39 @@ module IsoDoc
         super
       end
 
+      def section(docxml)
+        super
+        warning_for_missing_metadata(docxml)
+      end
+
+      def warning_for_missing_metadata(docxml)
+        @meta.get[:unpublished] or return
+        ret = warning_for_missing_metadata_create(docxml)
+        ret.empty? and return
+        warning_for_missing_metadata_post(docxml, ret)
+      end
+
+      def warning_for_missing_metadata_create(docxml)
+        ret = ""
+        docxml.at(ns("//bibdata/ext//secretariat")) or
+          ret += "<p>Secretariat is missing.</p>"
+        docxml.at(ns("//bibdata/ext//editorialgroup")) or
+          ret += "<p>Editorial groups are missing.</p>"
+        docxml.at(ns("//bibdata/date[@type = 'published' or @type = 'issued' " \
+                     "or @type = 'created']")) ||
+          docxml.at(ns("//bibdata/version/revision-date")) or
+          ret += "<p>Document date is missing.</p>"
+        ret
+      end
+
+      def warning_for_missing_metadata_post(docxml, ret)
+        id = UUIDTools::UUID.random_create
+        ret = "<review date='#{Date.today}' reviewer='Metanorma' id='_#{id}'>" \
+              "<p><strong>Metadata warnings:<strong></p> #{ret}</review>"
+        ins = docxml.at(ns("//sections//fmt-title")) or return
+        ins.add_first_child ret
+      end
+
       def block(docxml)
         amend docxml
         figure docxml
@@ -30,40 +63,58 @@ module IsoDoc
         formula docxml
         admonition docxml
         source docxml
+        ul docxml
         ol docxml
+        quote docxml
         permission docxml
         requirement docxml
         recommendation docxml
         requirement_render docxml
         @xrefs.anchors_previous = @xrefs.anchors.dup # store old xrefs of reqts
         @xrefs.parse docxml
+        # TODO move this dependency around: requirements at root should be processed before everything else
         table docxml # have table include requirements newly converted to tables
+        # table feeds dl
+        dl docxml
         example docxml
         note docxml
       end
 
+      # Redo Amendment annex titles as numbered
       def annex(isoxml)
         amd?(isoxml) and @suppressheadingnumbers = @oldsuppressheadingnumbers
         super
-        isoxml.xpath(ns("//annex//clause | //annex//appendix")).each do |f|
+        amd?(isoxml) and @suppressheadingnumbers = true
+      end
+
+      # Redo Amendment annex subclause titles as numbered
+      def clause(docxml)
+        super
+        docxml.xpath(ns("//annex//appendix")).each { |f| clause1(f) }
+        amd?(docxml) or return
+        @suppressheadingnumbers = @oldsuppressheadingnumbers
+        docxml.xpath(ns("//annex//clause | //annex//appendix")).each do |f|
+          f.xpath(ns("./fmt-title | ./fmt-xref-label")).each(&:remove)
           clause1(f)
         end
-        amd?(isoxml) and @suppressheadingnumbers = true
+        @suppressheadingnumbers = true
+      end
+
+      def subfigure_delim
+        "<span class='fmt-label-delim'>)</span>"
       end
 
-      def figure1(node)
-        lbl = @xrefs.anchor(node["id"], :label, false) or return
-        figname = node.parent.name == "figure" ? "" : "#{@i18n.figure} "
-        conn = node.parent.name == "figure" ? "&#xa0; " : "&#xa0;&#x2014; "
-        prefix_name(node, conn, l10n("#{figname}#{lbl}"), "name")
+      def figure_delim(elem)
+        elem.parent.name == "figure" ? "&#xa0; " : "&#xa0;&#x2014; "
       end
 
-      def example1(node)
-        n = @xrefs.get[node["id"]]
-        lbl = if n.nil? || blank?(n[:label]) then @i18n.example
-              else l10n("#{@i18n.example} #{n[:label]}")
-              end
-        prefix_name(node, block_delim, lbl, "name")
+      def figure_name(elem)
+        elem.parent.name == "figure" and return ""
+        super
+      end
+
+      def figure_label?(_elem)
+        true
       end
 
       def example_span_label(_node, div, name)
@@ -74,30 +125,36 @@ module IsoDoc
       end
 
       def clause1(node)
-        if !node.at(ns("./title")) &&
-            !%w(sections preface bibliography).include?(node.parent.name)
+        !node.at(ns("./title")) &&
+          !%w(sections preface bibliography).include?(node.parent.name) and
           node["inline-header"] = "true"
-        end
         super
-        if node["type"] == "section"
-          t = node.at(ns("./title/tab")) and
-            t.previous = @i18n.l10n(": ").sub(/\p{Zs}$/, "")
-        end
+        clause1_section_prefix(node)
       end
 
-      def clause(docxml)
-        docxml.xpath(ns("//clause[not(ancestor::annex)] | " \
-                        "//terms | //definitions | //references | " \
-                        "//preface/introduction[clause]")).each do |f|
-          f.parent.name == "annex" &&
-            @xrefs.klass.single_term_clause?(f.parent) and next
-          clause1(f)
+      def clause1_section_prefix(node)
+        if node["type"] == "section" &&
+            c = node.at(ns("./fmt-title//span[@class = 'fmt-caption-delim']"))
+          c.add_first_child(":")
+          t = node.at(ns("./fmt-title"))
+          # French l10n needs tab to be treated as space
+          t.replace @i18n.l10n(to_xml(t).gsub("<tab/>", "<tab> </tab>"))
+            .gsub(%r{<tab>[^<]+</tab>}, "<tab/>")
         end
       end
 
+      #       def clause(docxml)
+      #         docxml.xpath(ns("//clause[not(ancestor::annex)] | " \
+      #                         "//terms | //definitions | //references | " \
+      #                         "//preface/introduction[clause]")).each do |f|
+      #           f.parent.name == "annex" &&
+      #             @xrefs.klass.single_term_clause?(f.parent) and next
+      #           clause1(f)
+      #         end
+      #       end
+
       def admonition1(elem)
         super
-        admonition_inline_name(elem)
         admonition_outside_clauses(elem)
       end
 
@@ -113,17 +170,6 @@ module IsoDoc
         cell.children.each { |p| wrap_in_bold(p) }
       end
 
-      def admonition_inline_name(elem)
-        n = elem.at(ns("./name")) or return
-        if (p = n.next_element) && p&.name == "p"
-          p.children.first.previous = admonition_name(to_xml(n.remove.children))
-        end
-      end
-
-      def admonition_name(xml)
-        "#{xml} &#x2014; "
-      end
-
       def bibrender_formattedref(formattedref, xml)
         %w(techreport standard).include? xml["type"] and return
         super
@@ -146,10 +192,9 @@ module IsoDoc
 
       def formula_where(dlist)
         dlist.nil? and return
-        return super unless dlist.xpath(ns("./dt")).size == 1 &&
+        dlist.xpath(ns("./dt")).size == 1 &&
           dlist.at(ns("./dd"))&.elements&.size == 1 &&
-          dlist.at(ns("./dd/p"))
-
+          dlist.at(ns("./dd/p")) or return super
         formula_where_one(dlist)
       end
 
@@ -161,10 +206,22 @@ module IsoDoc
       end
 
       def table1(elem)
+        table1_key(elem)
+        if elem["class"] == "modspec"
+          n = elem.at(ns(".//fmt-name")).remove
+          n.name = "name"
+          elem.add_first_child(n)
+          elem.at(ns("./thead"))&.remove
+          super
+          elem.at(ns("./name")).remove
+        else super
+        end
+      end
+
+      def table1_key(elem)
         elem.xpath(ns(".//dl[@key = 'true'][not(./name)]")).each do |dl|
-          dl.children.first.previous = "<name>#{@i18n.key}</name>"
+          dl.add_first_child "<name>#{@i18n.key}</name>"
         end
-        super
       end
 
       def toc_title(docxml)
@@ -177,7 +234,7 @@ module IsoDoc
           return
         s = docxml.at(ns("//sections")) or return
         ret = "#{middle_title_main}#{middle_title_amd}"
-        s.children.first.previous = ret
+        s.add_first_child ret
       end
 
       def middle_title_main
@@ -214,9 +271,7 @@ module IsoDoc
       end
 
       def move_norm_ref_to_sections(docxml)
-        if amd?(docxml)
-        else super
-        end
+        amd?(docxml) or super
       end
 
       def twitter_cldr_localiser_symbols
@@ -224,6 +279,25 @@ module IsoDoc
           fraction_group_digits: 3 }
       end
 
+      def implicit_reference(bib)
+        bib.at(ns("./docidentifier"))&.text == "IEV" and return true
+        super
+      end
+
+      def render_identifier(ident)
+        ret = super
+        ret[:sdo] = std_docid_semantic(ret[:sdo])
+        ret
+      end
+
+      def admonition_delim(elem)
+        if elem.at("./*[not(self::xmlns:name)]")&.name == "p"
+          " &#x2014; "
+        else
+          ""
+        end
+      end
+
       include Init
     end
   end

data/lib/isodoc/iso/presentation_xref.rb

@@ -74,7 +74,7 @@ module IsoDoc
 
       def locality_span_wrap(ret, type)
         type or return ret
-        m = /^(\s*)(?=\S)(.+?)(\s*)$/.match(ret) or return ret
+        m = /\A(\s*)(?=\S)(.+?)(\s*)\Z/m.match(ret) or return ret
         ret = [m[1], m[2], m[3]]
         spanclass = LOCALITY2SPAN[type.to_sym] and
           ret[1] = "<span class='#{spanclass}'>#{ret[1]}</span>"
@@ -115,7 +115,9 @@ module IsoDoc
           prefix_container_template(container, node, target)
         container_label = prefix_container(container_container,
                                            container_label, node, target)
-        l10n(nested_xref.sub("%1", container_label).sub("%2", linkend))
+        l10n(connectives_spans(nested_xref
+          .sub("%1", "<span class='fmt-xref-container'>#{container_label}</span>")
+          .sub("%2", linkend)))
       end
 
       def prefix_container_template(container, node, target)
@@ -130,6 +132,8 @@ module IsoDoc
       end
 
       def expand_citeas(text)
+        ret = super or return
+        ret.include?("<span") and return ret
         std_docid_semantic(super)
       end
 

data/lib/isodoc/iso/sections.rb

@@ -12,9 +12,9 @@ module IsoDoc
         @foreword = true
         page_break(out)
         out.div **attr_code(id: clause["id"]) do |s|
-          clause_name(nil, clause.at(ns("./title")) || @i18n.foreword, s,
+          clause_name(nil, clause.at(ns("./fmt-title")), s,
                       { class: "ForewordTitle" })
-          clause.elements.each { |e| parse(e, s) unless e.name == "title" }
+          clause.elements.each { |e| parse(e, s) unless e.name == "fmt-title" }
         end
         @foreword = false
       end

data/lib/isodoc/iso/word_convert.rb

@@ -108,7 +108,7 @@ module IsoDoc
         br(out, "auto")
         out.div class: "index" do |div|
           elem.children.each do |e|
-            parse(e, div) unless e.name == "title"
+            parse(e, div) unless e.name == "fmt-title"
           end
         end
       end
@@ -116,7 +116,7 @@ module IsoDoc
       def indexsect_title(clause, out)
         br(out, "always")
         out.div class: "WordSection3" do |div|
-          clause_name(clause, clause.at(ns("./title")), div, nil)
+          clause_name(clause, clause.at(ns("./fmt-title")), div, nil)
         end
       end
 
@@ -145,7 +145,7 @@ module IsoDoc
         page_break(out)
         out.div do |div|
           div.h1 **bibliography_attrs do |h1|
-            node&.at(ns("./title"))&.children&.each { |c2| parse(c2, h1) }
+            node&.at(ns("./fmt-title"))&.children&.each { |c2| parse(c2, h1) }
           end
           biblio_list(node, div, true)
         end
@@ -154,7 +154,7 @@ module IsoDoc
       def bibliography_parse(node, out)
         node["hidden"] != true or return
         out.div do |div|
-          clause_parse_title(node, div, node.at(ns("./title")), out,
+          clause_parse_title(node, div, node.at(ns("./fmt-title")), out,
                              bibliography_attrs)
           biblio_list(node, div, true)
         end
@@ -201,7 +201,7 @@ module IsoDoc
       end
 
       def table_title_parse(node, out)
-        name = node.at(ns("./name")) or return
+        name = node.at(ns("./fmt-name")) or return
         out.p **table_title_attrs(node) do |p|
           name&.children&.each { |n| parse(n, p) }
         end
@@ -209,7 +209,7 @@ module IsoDoc
 
       def annex_name(_annex, name, div)
         name.nil? and return
-        name&.at(ns("./strong"))&.remove # supplied by CSS list numbering
+        name&.at(ns(".//strong"))&.remove # label supplied by CSS list numbering
         div.h1 class: "Annex" do |t|
           annex_name1(name, t)
           clause_parse_subtitle(name, t)
@@ -217,14 +217,12 @@ module IsoDoc
       end
 
       def annex_name1(name, out)
-        name.children.each do |c2|
-          if c2.name == "span" && c2["class"] == "obligation"
-            out.span style: "font-weight:normal;" do |s|
-              c2.children.each { |c3| parse(c3, s) }
-            end
-          else parse(c2, out)
-          end
+        n = name.dup
+        n.xpath(ns(".//span[@class = 'fmt-obligation']")).each do |s|
+          s.delete("class")
+          s["style"] = "font-weight:normal;"
         end
+        children_parse(n, out)
       end
 
       def table_attrs(node)

data/lib/isodoc/iso/word_dis_convert.rb

@@ -111,10 +111,7 @@ module IsoDoc
           out.span **attr_code(style: st) do |s|
             node.children.each { |n| parse(n, s) }
           end
-        else
-          out.span **attr_code(class: node["class"], style: st) do |x|
-            node.children.each { |n| parse(n, x) }
-          end
+        else super
         end
       end
 

data/lib/isodoc/iso/xref.rb

@@ -48,25 +48,56 @@ module IsoDoc
         c = IsoDoc::XrefGen::Counter.new
         clause.xpath(ns(".//formula")).noblank.each do |t|
           @anchors[t["id"]] = anchor_struct(
-            "#{num}#{hiersep}#{c.increment(t).print}", t,
+            #"#{num}#{hier_separator}#{c.increment(t).print}", t,
+            hiersemx(clause, num, c.increment(t), t), t,
             t["inequality"] ? @labels["inequality"] : @labels["formula"],
-            "formula", t["unnumbered"]
+            "formula", { unnumb: t["unnumbered"], container: true }
           )
         end
       end
 
+      def subfigure_delim
+        ")"
+      end
+
       def figure_anchor(elem, sublabel, label, klass, container: false)
+        if sublabel
+          subfigure_anchor(elem, sublabel, label, klass, container: container)
+        else
+          @anchors[elem["id"]] = anchor_struct(
+            label, elem, @labels[klass] || klass.capitalize, klass,
+            { unnumb: elem["unnumbered"], container: }
+          )
+        end
+      end
+
+      def fig_subfig_label(label, sublabel)
+        "#{label} #{sublabel}"
+      end
+
+      def subfigure_anchor(elem, sublabel, label, klass, container: false)
+        figlabel = fig_subfig_label(label, sublabel)
         @anchors[elem["id"]] = anchor_struct(
-          "#{label}#{sublabel}", container ? elem : nil,
-          @labels[klass] || klass.capitalize, klass, elem["unnumbered"]
+          figlabel, elem, @labels[klass] || klass.capitalize, klass,
+          { unnumb: elem["unnumbered"] }
         )
-        !sublabel.empty? && elem["unnumbered"] != "true" and
+        if elem["unnumbered"] != "true"
+          # Dropping the parent figure label is specific to ISO
           @anchors[elem["id"]][:label] = sublabel
+          @anchors[elem["id"]][:xref] = @anchors[elem.parent["id"]][:xref] +
+            " " + semx(elem, sublabel) + delim_wrap(subfigure_delim)
+                    x = @anchors[elem.parent["id"]][:container] and
+          @anchors[elem["id"]][:container] = x
+        end
       end
 
       def subfigure_label(subfignum)
-        subfignum.zero? and return ""
-        " #{(subfignum + 96).chr})"
+        subfignum.zero? and return
+        (subfignum + 96).chr
+      end
+
+      def hierfigsep
+        " "
       end
 
       def sequential_figure_names(clause, container: false)
@@ -97,9 +128,9 @@ module IsoDoc
         j = 0
         clause.xpath(ns(FIGURE_NO_CLASS)).noblank.each do |t|
           j = subfigure_increment(j, c, t)
-          label = "#{num}#{hiersep}#{c.print}"
+          #label = "#{num}#{hier_separator}#{c.print}"
           sublabel = subfigure_label(j)
-          figure_anchor(t, sublabel, label, "figure")
+          figure_anchor(t, sublabel, hiersemx(clause, num, c, t), "figure")
         end
         hierarchical_figure_class_names(clause, num)
       end
@@ -111,9 +142,9 @@ module IsoDoc
           .noblank.each do |t|
           c[t["class"]] ||= IsoDoc::XrefGen::Counter.new
           j = subfigure_increment(j, c[t["class"]], t)
-          label = "#{num}#{hiersep}#{c.print}"
+          #label = "#{num}#{hier_separator}#{c.print}"
           sublabel = j.zero? ? nil : "#{(j + 96).chr})"
-          figure_anchor(t, sublabel, label, t["class"])
+          figure_anchor(t, sublabel, hiersemx(clause, num, c[t["class"]], t), t["class"])
         end
       end
 
@@ -129,8 +160,10 @@ module IsoDoc
             s.xpath(ns(".//appendix//ol")) - s.xpath(ns(".//ol//ol"))
           c = Counter.new
           notes.noblank.each do |n|
+            n["id"] ||= "_#{UUIDTools::UUID.random_create}"
             @anchors[n["id"]] = anchor_struct(increment_label(notes, n, c), n,
-                                              @labels["list"], "list", false)
+                                              @labels["list"], "list",
+                                              { unnumb: false, container: true })
             list_item_anchor_names(n, @anchors[n["id"]], 1, "",
                                    !single_ol_for_xrefs?(notes))
           end
@@ -174,7 +207,11 @@ module IsoDoc
         (@anchors[id] && !@anchors[id][:has_modspec]) or return
         @anchors[id][:has_modspec] = true
         x = @anchors_previous[id][:xref_bare] || @anchors_previous[id][:xref]
-        @anchors[id][:xref] = l10n("#{table_label}, #{x}")
+        # @anchors[id][:xref] = l10n("#{table_label}<span class='fmt-comma'>,</span> #{x}")
+
+        @anchors[id][:xref] = l10n(@klass.connectives_spans(@i18n.nested_xref
+          .sub("%1", table_label).sub("%2", x)))
+
         @anchors[id][:modspec] = @anchors_previous[id][:modspec]
         @anchors[id][:subtype] = "modspec" # prevents citetbl style from beign applied
         true
@@ -194,7 +231,8 @@ module IsoDoc
         countable.each do |n|
           @anchors[n["id"]] =
             anchor_struct(increment_label(countable, n, counter), n,
-                          @labels["note_xref"], "note", false)
+                          @labels["note_xref"], "note",
+                          { unnum: false, container: true })
         end
       end
     end

data/lib/isodoc/iso/xref_section.rb

@@ -7,9 +7,10 @@ module IsoDoc
         clause.at(ns("./clause")) and
           @anchors[clause["id"]] = { label: nil, level: 1, type: "clause",
                                      xref: clause.at(ns("./title"))&.text }
-        i = Counter.new(0, prefix: "0")
+        #i = Counter.new(0, prefix: "0")
+        i = clause_counter(0)
         clause.xpath(ns("./clause")).each do |c|
-          section_names1(c, i.increment(c).print, 2)
+          section_names1(c, semx(clause, "0"), i.increment(c).print, 2)
         end
       end
 
@@ -19,17 +20,18 @@ module IsoDoc
       end
 
       def appendix_names(clause, _num)
-        i = Counter.new
+        i = clause_counter(0)
         clause.xpath(ns("./appendix")).each do |c|
           i.increment(c)
+          num = semx(c, i.print)
+          lbl = labelled_autonum(@labels["appendix"], num)
           @anchors[c["id"]] =
-            anchor_struct(i.print, nil, @labels["appendix"],
+            anchor_struct(i.print, c, @labels["appendix"],
                           "clause").merge(level: 2, subtype: "annex",
                                           container: clause["id"])
-          j = Counter.new(0, prefix: i.print)
+          j = clause_counter(0)
           c.xpath(ns("./clause | ./references")).each do |c1|
-            lbl = "#{@labels['appendix']} #{j.increment(c1).print}"
-            appendix_names1(c1, l10n(lbl), 3, clause["id"])
+            appendix_names1(c1, lbl, j.increment(c1).print, 3, clause["id"])
           end
         end
       end
@@ -38,48 +40,41 @@ module IsoDoc
       # retaining subtype for the semantics
       def section_name_anchors(clause, num, level)
         if clause["type"] == "section"
+          xref = labelled_autonum(@labels["section"], num)
+          label = labelled_autonum(@labels["section"], num)
           @anchors[clause["id"]] =
-            { label: l10n("#{@labels['section']} #{num}"),
-              xref: l10n("#{@labels['section']} #{num}"),
-              title: clause_title(clause), level: level, type: "clause",
-              elem: @labels["section"] }
+            { label:, xref:, elem: @labels["section"],
+              title: clause_title(clause), level: level, type: "clause" }
         elsif level > 1
+          #num = semx(clause, num)
           @anchors[clause["id"]] =
             { label: num, level: level, xref: num, subtype: "clause" }
         else super end
       end
 
       def annex_name_anchors1(clause, num, level)
+        level == 1 and return annex_name_anchors(clause, num, level)
         ret = { label: num, level: level, subtype: "annex" }
         ret2 = if level == 2
-                 { xref: l10n("#{@labels['clause']} #{num}"),
+                 xref = labelled_autonum(@labels["clause"], num)
+                 { xref:, # l10n("#{@labels['clause']} #{num}"),
                    elem: @labels["clause"] }
                else
-                 { xref: num }
+                 { xref: semx(clause, num) }
                end
         @anchors[clause["id"]] = ret.merge(ret2)
       end
 
-      def annex_names1(clause, num, level)
-        annex_name_anchors1(clause, num, level)
-        i = Counter.new(0, prefix: num)
-        clause.xpath(ns("./clause | ./references")).each do |c|
-          annex_names1(c, i.increment(c).print, level + 1)
-        end
-      end
-
-      def appendix_names1(clause, num, level, container)
+      def appendix_names1(clause, parentnum, num, level, container)
+        #num = labelled_autonum(@labels["appendix"], num)
+        num = clause_number_semx(parentnum, clause, num)
         @anchors[clause["id"]] = { label: num, xref: num, level: level,
                                    container: container }
-        i = Counter.new(0, prefix: num)
+        i = clause_counter(0)
         clause.xpath(ns("./clause | ./references")).each do |c|
-          appendix_names1(c, i.increment(c).print, level + 1, container)
+          appendix_names1(c, num, i.increment(c).print, level + 1, container)
         end
       end
-
-      def annex_name_lbl(clause, num)
-        super.sub(%r{<br/>(.*)$}, "<br/><span class='obligation'>\\1</span>")
-      end
     end
   end
 end