isodoc 3.1.6 → 3.1.9

data/lib/isodoc/presentation_function/terms.rb

@@ -1,23 +1,29 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
+    DESIGNATION_ELEMS =
+      %w(preferred admitted deprecates related definition source).freeze
+
+    def target_desgn_elem(name)
+      target = "fmt-#{name}"
+      name == "source" and target = "fmt-termsource"
+      target
+    end
+
     def termcontainers(docxml)
       docxml.xpath(ns("//term")).each do |t|
-        %w(preferred admitted deprecates related definition termsource)
-          .each do |w|
-          d = t.at(ns("./#{w}[last()]")) and d.after("<fmt-#{w}/>")
+        DESIGNATION_ELEMS.each do |w|
+          target = target_desgn_elem(w)
+          d = t.at(ns("./#{w}[last()]")) and d.after("<#{target}/>")
         end
       end
-      docxml.xpath(ns("//termsource")).each do |s|
-        s["id"] ||= "_#{UUIDTools::UUID.random_create}"
-      end
     end
 
     def termcleanup(docxml)
       docxml.xpath(ns("//term")).each do |t|
-        %w(preferred admitted deprecates related definition termsource)
-          .each do |w|
+        DESIGNATION_ELEMS.each do |w|
+          target = target_desgn_elem(w)
           t.xpath(ns("./#{w}//fmt-name | ./#{w}//fmt-xref-label")).each(&:remove)
-          f = t.at(ns(".//fmt-#{w}"))
+          f = t.at(ns(".//#{target}"))
           f&.children&.empty? and f.remove
         end
       end
@@ -55,6 +61,11 @@ module IsoDoc
       else singledef(elem, d, d1)
       end
       unwrap_definition(elem, d1)
+      s1 = d.xpath(ns(".//source"))
+      s2 = d1.xpath(ns(".//source"))
+      s1.each_with_index do |s, i|
+        modification_dup_align(s, s2[i])
+      end
       termdomain(elem, d1)
     end
 
@@ -88,7 +99,8 @@ module IsoDoc
     def termsource(docxml)
       copy_baselevel_termsource(docxml)
       # TODO should I wrap fmt-definition//termsource in fmt-termsource, in order to preserve termsource attributes?
-      docxml.xpath(ns("//fmt-termsource/termsource | //fmt-definition//termsource | //fmt-preferred//termsource | //fmt-admitted//termsource | //fmt-deprecates//termsource"))
+      # differentiating term and nonterm source under designations is not worth it
+      docxml.xpath(ns("//fmt-termsource/source | //fmt-definition//source | //fmt-preferred//source | //fmt-admitted//source | //fmt-deprecates//source"))
         .each do |f|
         termsource_modification(f)
       end
@@ -96,7 +108,7 @@ module IsoDoc
         .each do |f|
           termsource_designation(f)
         end
-      docxml.xpath(ns("//fmt-termsource/termsource | //fmt-definition//termsource | //fmt-preferred//termsource | //fmt-admitted//termsource | //fmt-deprecates//termsource"))
+      docxml.xpath(ns("//fmt-termsource/source | //fmt-definition//source | //fmt-preferred//source | //fmt-admitted//source | //fmt-deprecates//source"))
         .each do |f|
         f.parent and termsource1(f)
       end
@@ -104,24 +116,39 @@ module IsoDoc
 
     def termsource_designation(fmtsource)
       p = fmtsource.previous_element
-          p&.name == "p" or return
-          p << " "
-          p << fmtsource.children
+      p&.name == "p" or return
+      p << " "
+      p << fmtsource.children
     end
 
     def copy_baselevel_termsource(docxml)
-      docxml.xpath(ns("//term[termsource]")).each do |x|
-        s = x.xpath(ns("./termsource"))
+      docxml.xpath(ns("//term[source]")).each do |x|
+        s = x.xpath(ns("./source"))
         s1 = x.at(ns("./fmt-termsource"))
-        s.each { |ss| s1 << ss.clone }
+        s.each do |ss|
+          dup = ss.clone
+          modification_dup_align(ss, dup)
+          s1 << dup
+        end
         strip_duplicate_ids(nil, s, s1)
         %w(status type).each { |a| s[0][a] and s1[a] = s[0][a] }
       end
     end
 
+    def modification_dup_align(sem, pres)
+      m = sem&.at(ns("./modification")) or return
+      m1 = pres.at(ns("./modification"))
+      if m["original-id"]
+        m["id"] = m["original-id"]
+        m.delete("original-id")
+      end
+      new_m1 = semx_fmt_dup(m)
+      m1.replace("<modification>#{to_xml(new_m1)}</modification>")
+    end
+
     def termsource1(elem)
       ret = [semx_fmt_dup(elem)]
-      while elem&.next_element&.name == "termsource"
+      while elem&.next_element&.name == "source"
         ret << semx_fmt_dup(elem.next_element.remove)
       end
       s = ret.map { |x| to_xml(x) }.map(&:strip).join("; ")
@@ -136,7 +163,8 @@ module IsoDoc
       elem.xpath(".//text()[normalize-space() = '']").each(&:remove)
       origin = elem.at(ns("./origin"))
       s = termsource_status(elem["status"]) and origin.next = l10n(", #{s}")
-      termsource_add_modification_text(elem.at(ns("./modification")))
+      mod = elem.at(ns("./modification")) or return
+      termsource_add_modification_text(mod)
     end
 
     def termsource_add_modification_text(mod)
@@ -146,8 +174,9 @@ module IsoDoc
         return
       end
       mod.previous = " &#x2014; "
-      mod.elements.size == 1 and mod.children = to_xml(mod.elements[0].children)
-      mod.replace(semx_fmt_dup(mod))
+      c = mod.at(ns("./semx")) || mod
+      c.elements.size == 1 and c.children = to_xml(c.elements[0].children)
+      mod.replace(mod.children)
     end
 
     def termsource_status(status)

data/lib/isodoc/presentation_function/title.rb

@@ -25,7 +25,6 @@ module IsoDoc
 
     # TODO not currently doing anything with the @depth attribute of floating-title
     def floattitle1(elem)
-      elem["id"] ||= "_#{UUIDTools::UUID.random_create}"
       p = elem.dup
       p.children = "<semx element='floating-title' source='#{elem['id']}'>" \
         "#{to_xml(p.children)}</semx>"
@@ -41,9 +40,8 @@ module IsoDoc
         %w(note admonition p floating-title).include?(p.name) or break m
         m << p
       end
-      #require 'debug'; out.empty? or binding.b
       out.reject { |c| c["displayorder"] }.reverse_each do |c|
-          skip_display_order?(c) and next
+        skip_display_order?(c) and next
         c["displayorder"] = idx
         idx += 1
       end

data/lib/isodoc/presentation_function/xrefs.rb

@@ -26,8 +26,8 @@ module IsoDoc
     end
 
     def anchor_value(id)
-      @xrefs.anchor(id, :bare_xref) || @xrefs.anchor(id, :label) ||
-        @xrefs.anchor(id, :value) || @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

@@ -12,6 +12,7 @@ require_relative "presentation_function/index"
 require_relative "presentation_function/bibdata"
 require_relative "presentation_function/metadata"
 require_relative "presentation_function/footnotes"
+require_relative "presentation_function/ids"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -25,8 +26,7 @@ module IsoDoc
       presxml_convert_init(docxml, filename, dir)
       conversions(docxml)
       docxml.root["type"] = "presentation"
-      repeat_id_validate(docxml.root)
-      idref_validate(docxml.root)
+      id_validate(docxml.root)
       docxml.to_xml.gsub("&lt;", "&#x3c;").gsub("&gt;", "&#x3e;")
     end
 
@@ -38,56 +38,13 @@ module IsoDoc
       @outputdir = dir
       @outputfile = Pathname.new(filename).basename.to_s
       docid_prefixes(docxml) # feeds @xrefs.parse citation processing
+      provide_ids docxml # feeds @xrefs.parse
       @xrefs.parse docxml
       @xrefs.klass.meta = @meta
       @xrefs.klass.info docxml, nil
       counter_init
     end
 
-    def repeat_id_validate1(elem)
-      if @doc_ids[elem["id"]]
-        @log.add("Anchors", elem,
-                 "Anchor #{elem['id']} has already been " \
-                 "used at line #{@doc_ids[elem['id']]}", severity: 0)
-      end
-      @doc_ids[elem["id"]] = elem.line
-    end
-
-    def repeat_id_validate(doc)
-      @log or return
-      @doc_ids = {}
-      doc.xpath("//*[@id]").each do |x|
-        repeat_id_validate1(x)
-      end
-    end
-
-    IDREF =
-      [%w(review from), %w(review to), %w(index to), %w(xref target),
-       %w(callout target), %w(eref bibitemid), %w(citation bibitemid),
-       %w(admonition target), %w(label for), %w(semx source),
-       %w(fmt-title source), %w(fmt-xref-label container), %w(fn target),
-       %w(fmt-fn-body target), %w(fmt-review-start source),
-       %w(fmt-review-start end), %w(fmt-review-start target),
-       %w(fmt-review-end source), %w(fmt-review-end start),
-       %w(fmt-review-end target)].freeze
-
-    def idref_validate(doc)
-      @log or return
-      IDREF.each do |e|
-        doc.xpath("//xmlns:#{e[0]}[@#{e[1]}]").each do |x|
-          idref_validate1(x, e[1])
-        end
-      end
-    end
-
-    def idref_validate1(node, attr)
-      node[attr].strip.empty? and return
-      @doc_ids[node[attr]] and return
-      @log.add("Anchors", node,
-               "Anchor #{node[attr]} pointed to by #{node.name} " \
-               "is not defined in the document", severity: 1)
-    end
-
     def bibitem_lookup(docxml)
       @bibitem_lookup ||= docxml.xpath(ns("//references/bibitem"))
         .each_with_object({}) do |b, m|
@@ -185,35 +142,6 @@ module IsoDoc
           .previous_element
     end
 
-    def embedable_semantic_xml(xml)
-      xml = embedable_semantic_xml_tags(xml)
-      embedable_semantic_xml_attributes(xml)
-    end
-
-    def embedable_semantic_xml_tags(xml)
-      ret = to_xml(xml)
-        .sub(/ xmlns=['"][^"']+['"]/, "") # root XMLNS
-        .split(/(?=[<> \t\r\n\f\v])/).map do |x|
-          case x
-          when /^<[^:]+:/ then x.sub(":", ":semantic__")
-          when /^<[^:]+$/ then x.sub(%r{(</?)([[:alpha:]])},
-                                     "\\1semantic__\\2")
-          else x end
-        end
-      Nokogiri::XML(ret.join).root
-    end
-
-    def embedable_semantic_xml_attributes(xml)
-      Metanorma::Utils::anchor_attributes.each do |(tag_name, attr_name)|
-        tag_name == "*" or tag_name = "semantic__#{tag_name}"
-        xml.xpath("//#{tag_name}[@#{attr_name}]").each do |elem|
-          elem.attributes[attr_name].value =
-            "semantic__#{elem.attributes[attr_name].value}"
-        end
-      end
-      xml
-    end
-
     def postprocess(result, filename, _dir)
       to_xml_file(result, filename)
       @files_to_delete.each { |f| FileUtils.rm_rf f }

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.1.6".freeze
+  VERSION = "3.1.9".freeze
 end

data/lib/isodoc/word_function/comments.rb

@@ -29,7 +29,7 @@ module IsoDoc
             s2.a style: "mso-comment-reference:SMC_#{fnote};" \
                             "mso-comment-date:#{node['date'].gsub(/[:-]+/,
                                                                   '')}"
-            s2.span style: "mso-special-character:comment", target: fnote # do |s|
+            s2.span style: "mso-special-character:comment", target: fnote
           end
         end
       end
@@ -126,7 +126,6 @@ module IsoDoc
       end
 
       def insert_comment_cont(from, upto, target)
-        # includes_to = from.at(".//*[@id='#{upto}']")
         while !from.nil? && from["id"] != upto
           following = from.xpath("./following::*")
           (from = following.shift) && incl_to = from.at(".//*[@id='#{upto}']")

data/lib/isodoc/word_function/footnotes.rb

@@ -10,14 +10,6 @@ module IsoDoc
         sprintf "%09d", ret
       end
 
-      def make_table_footnote_link(out, fnid, node)
-        attrs = { href: "##{fnid}", class: "TableFootnoteRef" }
-        sup = node.at(ns("./sup")) and sup.replace(sup.children)
-        out.a **attrs do |a|
-          children_parse(node, a)
-        end
-      end
-
       def fmt_fn_body_parse(node, out)
         node.at(ns(".//fmt-fn-label"))&.remove
         aside = node.parent.name == "fmt-footnote-container"
@@ -28,27 +20,6 @@ module IsoDoc
         end
       end
 
-      # dupe to HTML
-      def get_table_ancestor_id(node)
-        table = node.ancestors("table")
-        table.empty? and table = node.ancestors("figure")
-        table.empty? and return [nil,
-                                 UUIDTools::UUID.random_create.to_s]
-        [table.last, table.last["id"]]
-      end
-
-      # dupe to HTML
-      def table_footnote_parse(node, out)
-        fn = node["reference"] || UUIDTools::UUID.random_create.to_s
-        table, tid = get_table_ancestor_id(node)
-        make_table_footnote_link(out, tid + fn, node.at(ns("./fmt-fn-label")))
-        # do not output footnote text if we have already seen it for this table
-        return if @seen_footnote.include?(tid + fn)
-
-        update_table_fn_body_ref(node, table, tid + fn)
-        @seen_footnote << (tid + fn)
-      end
-
       def seen_footnote_parse(node, out, footnote)
         f = node.at(ns("./fmt-fn-label"))
         sup = f.at(ns(".//sup")) and sup.replace(sup.children)

data/lib/isodoc/word_function/inline.rb

@@ -61,7 +61,7 @@ module IsoDoc
       end
 
       def xref_parse(node, out)
-        target = if /#/.match?(node["target"])
+        target = if node["target"].include?("#")
                    node["target"].sub("#", ".doc#")
                  else
                    "##{node['target']}"

data/lib/isodoc/word_function/postprocess.rb

@@ -63,7 +63,6 @@ module IsoDoc
         word_section_breaks(docxml)
         word_tab_clean(docxml)
         authority_cleanup(docxml)
-        #word_footnote_format(docxml)
         word_remove_empty_toc(docxml)
         word_remove_empty_sections(docxml)
         docxml

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -100,22 +100,13 @@ module IsoDoc
             t["inequality"] ? @labels["inequality"] : @labels["formula"],
             "formula", { unnumb: t["unnumbered"], container: true }
           )
+          @anchors[t["id"]][:bare_xref] = @anchors[t["id"]][:label]
         end
       end
 
-      FIRST_LVL_REQ_RULE = <<~XPATH.freeze
-        [not(ancestor::permission or ancestor::requirement or ancestor::recommendation)]
-      XPATH
-      FIRST_LVL_REQ = <<~XPATH.freeze
-        .//permission#{FIRST_LVL_REQ_RULE} | .//requirement#{FIRST_LVL_REQ_RULE} | .//recommendation#{FIRST_LVL_REQ_RULE}
-      XPATH
-      REQ_CHILDREN = <<~XPATH.freeze
-        ./permission | ./requirement | ./recommendation
-      XPATH
-
       def sequential_permission_names(clause, container: true)
         c = ReqCounter.new
-        clause.xpath(ns(FIRST_LVL_REQ)).noblank.each do |t|
+        clause.xpath(ns(first_lvl_req)).noblank.each do |t|
           m = @reqt_models.model(t["model"])
           klass, label = reqt2class_label(t, m)
           id = c.increment(label, t).print
@@ -127,7 +118,7 @@ module IsoDoc
 
       def sequential_permission_children(elem, lbl, klass, container: false)
         c = ReqCounter.new
-        elem.xpath(ns(REQ_CHILDREN)).noblank.each do |t|
+        elem.xpath(ns(req_children)).noblank.each do |t|
           m = @reqt_models.model(t["model"])
           klass, label = reqt2class_nested_label(t, m)
           ctr = c.increment(label, t).print
@@ -177,14 +168,6 @@ container: false)
         [nil, nil]
       end
 
-      # container makes numbering be prefixed with the parent clause reference
-      def sequential_asset_names(clause, container: false)
-        sequential_table_names(clause, container:)
-        sequential_figure_names(clause, container:)
-        sequential_formula_names(clause, container:)
-        sequential_permission_names(clause, container:)
-      end
-
       # these can take a NodeSet as argument; semx will point to members of the NodeSet,
       # but numbering will be consecutive
       def hierarchical_figure_names(clauses, num)
@@ -229,23 +212,16 @@ container: false)
         end
       end
 
-      def hierarchical_asset_names(clause, num)
-        hierarchical_table_names(clause, num)
-        hierarchical_figure_names(clause, num)
-        hierarchical_formula_names(clause, num)
-        hierarchical_permission_names(clause, num)
-      end
-
       def hierarchical_formula_names(clauses, num)
         c = Counter.new
         nodeSet(clauses).each do |clause|
           clause.xpath(ns(".//formula")).noblank.each do |t|
             @anchors[t["id"]] = anchor_struct(
-              # "#{num}#{hier_separator}#{c.increment(t).print}", t,
               hiersemx(clause, num, c.increment(t), t), t,
               t["inequality"] ? @labels["inequality"] : @labels["formula"],
               "formula", { unnumb: t["unnumbered"], container: false }
             )
+            @anchors[t["id"]][:bare_xref] = @anchors[t["id"]][:label]
           end
         end
       end
@@ -253,10 +229,9 @@ container: false)
       def hierarchical_permission_names(clauses, num)
         c = ReqCounter.new
         nodeSet(clauses).each do |clause|
-          clause.xpath(ns(FIRST_LVL_REQ)).noblank.each do |t|
+          clause.xpath(ns(first_lvl_req)).noblank.each do |t|
             m = @reqt_models.model(t["model"])
             klass, label = reqt2class_label(t, m)
-            # id = "#{num}#{hier_separator}#{c.increment(label, t).print}"
             id = hiersemx(clause, num, c.increment(label, t), t)
             sequential_permission_body(id, nil, t, label, klass, m,
                                        container: false)

data/lib/isodoc/xref/xref_sect_asset.rb

@@ -0,0 +1,44 @@
+module IsoDoc
+  module XrefGen
+    module Sections
+      # preempt clause notes with all other types of note (ISO default)
+      def asset_anchor_names(doc)
+        (@parse_settings.empty? || @parse_settings[:assets]) or return
+        middle_section_asset_names(doc)
+        termnote_anchor_names(doc)
+        termexample_anchor_names(doc)
+        note_anchor_names(doc.xpath(ns("//table | //figure")))
+        sections = doc.xpath(ns(sections_xpath))
+        note_anchor_names(sections)
+        admonition_anchor_names(sections)
+        example_anchor_names(sections)
+        list_anchor_names(sections)
+        deflist_anchor_names(sections)
+        bookmark_anchor_names(doc)
+      end
+
+      def middle_section_asset_names(doc)
+        middle_sections =
+          "//clause[@type = 'scope'] | #{@klass.norm_ref_xpath} | " \
+          "//sections/terms | //preface/* | " \
+          "//sections/definitions | //clause[parent::sections]"
+        sequential_asset_names(doc.xpath(ns(middle_sections)))
+      end
+
+      # container makes numbering be prefixed with the parent clause reference
+      def sequential_asset_names(clause, container: false)
+        sequential_table_names(clause, container:)
+        sequential_figure_names(clause, container:)
+        sequential_formula_names(clause, container:)
+        sequential_permission_names(clause, container:)
+      end
+
+      def hierarchical_asset_names(clause, num)
+        hierarchical_table_names(clause, num)
+        hierarchical_figure_names(clause, num)
+        hierarchical_formula_names(clause, num)
+        hierarchical_permission_names(clause, num)
+      end
+    end
+  end
+end

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -1,4 +1,5 @@
 require_relative "clause_order"
+require_relative "xref_sect_asset"
 
 module IsoDoc
   module XrefGen
@@ -58,22 +59,6 @@ module IsoDoc
         end
       end
 
-      # preempt clause notes with all other types of note (ISO default)
-      def asset_anchor_names(doc)
-        (@parse_settings.empty? || @parse_settings[:assets]) or return
-        middle_section_asset_names(doc)
-        termnote_anchor_names(doc)
-        termexample_anchor_names(doc)
-        note_anchor_names(doc.xpath(ns("//table | //figure")))
-        sections = doc.xpath(ns(sections_xpath))
-        note_anchor_names(sections)
-        admonition_anchor_names(sections)
-        example_anchor_names(sections)
-        list_anchor_names(sections)
-        deflist_anchor_names(sections)
-        bookmark_anchor_names(doc)
-      end
-
       def clause_title(clause, use_elem_name: false)
         ret = clause.at(ns("./title"))&.text
         if use_elem_name && ret.blank?
@@ -83,9 +68,6 @@ module IsoDoc
         end
       end
 
-      SUBCLAUSES =
-        "./clause | ./references | ./term  | ./terms | ./definitions".freeze
-
       # in StanDoc, prefaces have no numbering; they are referenced only by title
       def preface_names(clause)
         unnumbered_names(clause)
@@ -103,7 +85,7 @@ module IsoDoc
         clause.nil? and return
         title = clause_title(clause, use_elem_name: true)
         preface_name_anchors(clause, 1, title)
-        clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
+        clause.xpath(ns(subclauses)).each_with_index do |c, i|
           t = c.at(ns("./title"))
           tt = "#{semx(clause, title, clause.name)}" \
             "<span class='fmt-comma'>,</span> #{semx(c, i + 1)}"
@@ -114,7 +96,7 @@ module IsoDoc
       def preface_names1(clause, title, parent_title, level)
         label = title || parent_title
         preface_name_anchors(clause, level, title || parent_title)
-        clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
+        clause.xpath(ns(subclauses)).each_with_index do |c, i|
           t = c.at(ns("./title"))
           preface_names1(c, t ? semx(c, t.text, c.name) : nil,
                          "#{label} #{semx(c, i + 1)}",
@@ -131,20 +113,12 @@ module IsoDoc
             type: "clause", elem: @labels["clause"] }
       end
 
-      def middle_section_asset_names(doc)
-        middle_sections =
-          "//clause[@type = 'scope'] | #{@klass.norm_ref_xpath} | " \
-          "//sections/terms | //preface/* | " \
-          "//sections/definitions | //clause[parent::sections]"
-        sequential_asset_names(doc.xpath(ns(middle_sections)))
-      end
-
       def section_names(clause, num, lvl)
         unnumbered_section_name?(clause) and return num
         num.increment(clause)
         lbl = semx(clause, num.print)
         section_name_anchors(clause, lbl, lvl)
-        clause.xpath(ns(SUBCLAUSES))
+        clause.xpath(ns(subclauses))
           .each_with_object(clause_counter(0)) do |c, i|
           section_names1(c, lbl, i.increment(c).print, lvl + 1)
         end
@@ -153,12 +127,12 @@ module IsoDoc
 
       def clause_number_semx(parentnum, clause, num)
         if clause["branch-number"]
-                semx(clause, clause["branch-number"])
+          semx(clause, clause["branch-number"])
         elsif parentnum.nil?
           semx(clause, num)
-              else
-                "#{parentnum}#{delim_wrap(clausesep)}#{semx(clause, num)}"
-              end
+        else
+          "#{parentnum}#{delim_wrap(clausesep)}#{semx(clause, num)}"
+        end
       end
 
       def section_names1(clause, parentnum, num, level)
@@ -166,7 +140,7 @@ module IsoDoc
         lbl = clause_number_semx(parentnum, clause, num)
         section_name_anchors(clause, lbl, level)
         i = clause_counter(0)
-        clause.xpath(ns(SUBCLAUSES)).each do |c|
+        clause.xpath(ns(subclauses)).each do |c|
           section_names1(c, lbl, i.increment(c).print, level + 1)
         end
       end
@@ -218,13 +192,14 @@ module IsoDoc
       end
 
       def annex_names(clause, num)
+        appendix_names(clause, num)
         label = semx(clause, num)
         annex_name_anchors(clause, label, 1)
         if @klass.single_term_clause?(clause)
           annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
                        nil, num.to_s, 1)
         else
-          clause.xpath(ns(SUBCLAUSES))
+          clause.xpath(ns(subclauses))
             .each_with_object(clause_counter(0)) do |c, i|
             annex_names1(c, label, i.increment(c).print, 2)
           end
@@ -236,7 +211,7 @@ module IsoDoc
         lbl = clause_number_semx(parentnum, clause, num)
         annex_name_anchors1(clause, lbl, level)
         i = clause_counter(0)
-        clause.xpath(ns(SUBCLAUSES)).each do |c|
+        clause.xpath(ns(subclauses)).each do |c|
           annex_names1(c, lbl, i.increment(c).print, level + 1)
         end
       end
@@ -245,6 +220,33 @@ module IsoDoc
       def annex_name_anchors1(clause, num, level)
         annex_name_anchors(clause, num, level)
       end
+
+      def appendix_names(clause, _num)
+        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, c, @labels["appendix"],
+                          "clause").merge(level: 2, subtype: "annex",
+                                          container: clause["id"])
+          j = clause_counter(0)
+          c.xpath(ns("./clause | ./references")).each do |c1|
+            appendix_names1(c1, lbl, j.increment(c1).print, 3, clause["id"])
+          end
+        end
+      end
+
+      def appendix_names1(clause, parentnum, num, level, container)
+        num = clause_number_semx(parentnum, clause, num)
+        @anchors[clause["id"]] = { label: num, xref: num, level: level,
+                                   container: container }
+        i = clause_counter(0)
+        clause.xpath(ns("./clause | ./references")).each do |c|
+          appendix_names1(c, num, i.increment(c).print, level + 1, container)
+        end
+      end
     end
   end
 end