isodoc 1.8.0 → 1.8.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e798df14fbf858fd0540d3fb2837774ec6a1924d5590ad4a628699888eff8425
-  data.tar.gz: 8f3e143a4c3cbcba0c4c349c315c6bf7b067164cd4cc22bd06a85dce71268e73
+  metadata.gz: acaea1b02c6f852beb40a1344fff745a7ff335cebba6484151acc0e73d4146a4
+  data.tar.gz: 23fce1207ac948de9b61c487dc8a91c2fd8ceeddb1a522b3608a85aad02c1923
 SHA512:
-  metadata.gz: 6a0fbbabc25df62e19eeefecbf3369188194e28348ac6758f59024b58c0e4e23695440e41263c049455a12b1ce210e602c58e6142e9b8b95ac79d2fa8a64d341
-  data.tar.gz: 888429742fbf4ee0ab902b1a34d5edb8d7657b2fb561ecf3fe872fe48de14267e0e7edcae1e27c86ed5b36dc8d0becccd0ca6f96f6f1239936fb1bd287dc0130
+  metadata.gz: ad28bd8420ad35320fc9f67470bf5e4b44b3dc7e27c48867e50bfc6446ed0b57709bc4576518337e87bf72f8920a8035e4a34dd7486c7f739c2edcfc348b709e
+  data.tar.gz: 3c04a7a2eb965caeda51cd538a770387bb7d0a610893f46b6c09f4ef44178024b493c077390f0a6e765b17330e3af5004e2308964920061eef3f10c73e894b2e

data/isodoc.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "twitter_cldr", ">= 6.6.0"
   spec.add_dependency "uuidtools"
 
-  spec.add_development_dependency "byebug", "~> 9.1"
+  spec.add_development_dependency "debug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6"
   spec.add_development_dependency "guard", "~> 2.14"
   spec.add_development_dependency "guard-rspec", "~> 4.7"

data/lib/isodoc/class_utils.rb

@@ -16,7 +16,7 @@ module IsoDoc
       xpath.gsub(%r{/([a-zA-z])}, "/xmlns:\\1")
         .gsub(%r{::([a-zA-z])}, "::xmlns:\\1")
         .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/]* ?=)}, "[xmlns:\\1")
-        .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/]*\])}, "[xmlns:\\1")
+        .gsub(%r{\[([a-zA-z][a-z0-9A-Z@/]*[/\]])}, "[xmlns:\\1")
     end
 
     def liquid(doc)

data/lib/isodoc/convert.rb

@@ -119,6 +119,7 @@ module IsoDoc
 
     def convert1(docxml, filename, dir)
       @xrefs.parse docxml
+      bibitem_lookup(docxml)
       noko do |xml|
         xml.html **{ lang: @lang.to_s } do |html|
           html.parent.add_namespace("epub", "http://www.idpf.org/2007/ops")
@@ -130,6 +131,13 @@ module IsoDoc
       end.join("\n")
     end
 
+    def bibitem_lookup(docxml)
+      @bibitems = docxml.xpath(ns("//references/bibitem"))
+        .each_with_object({}) do |b, m|
+        m[b["id"]] = b
+      end
+    end
+
     def metadata_init(lang, script, i18n)
       @meta = Metadata.new(lang, script, i18n)
     end

data/lib/isodoc/function/inline.rb

@@ -5,7 +5,7 @@ module IsoDoc
     module Inline
       def link_parse(node, out)
         url = node["target"]
-        node["updatetype"] == "true" and url = suffix_url(url)
+        node["update-type"] == "true" and url = suffix_url(url)
         out.a **attr_code(href: url, title: node["alt"]) do |l|
           if node.text.empty?
             l << node["target"].sub(/^mailto:/, "")
@@ -41,10 +41,8 @@ module IsoDoc
       end
 
       def eref_target(node)
-        href = "##{node['bibitemid']}"
-        url = node.at(ns("//bibitem[@id = '#{node['bibitemid']}']/"\
-                         "uri[@type = 'citation']"))
-        return href unless url
+        return "##{node['bibitemid']}" unless url = @bibitems[node["bibitemid"]]
+          &.at(ns("./uri[@type = 'citation']"))
 
         href = suffix_url(url.text)
         anchor = node&.at(ns(".//locality[@type = 'anchor']"))&.text&.strip

data/lib/isodoc/html_function/html.rb

@@ -5,6 +5,7 @@ module IsoDoc
   module HtmlFunction
     module Html
       def convert1(docxml, filename, dir)
+        bibitem_lookup(docxml)
         noko do |xml|
           xml.html **{ lang: @lang.to_s } do |html|
             info docxml, nil

data/lib/isodoc/html_function/postprocess.rb

@@ -1,5 +1,6 @@
 require "isodoc/html_function/mathvariant_to_plain"
 require_relative "postprocess_footnotes"
+require "metanorma-utils"
 
 module IsoDoc
   module HtmlFunction
@@ -74,7 +75,8 @@ module IsoDoc
         head = docxml.at("//*[local-name() = 'head']")
         head << htmlstylesheet(@htmlstylesheet)
         s = htmlstylesheet(@htmlstylesheet_override) and head << s
-        @bare and head << "<style>body {margin-left: 2em; margin-right: 2em;}</style>"
+        @bare and
+          head << "<style>body {margin-left: 2em; margin-right: 2em;}</style>"
         docxml
       end
 
@@ -167,11 +169,7 @@ module IsoDoc
       end
 
       def datauri(img)
-        type = img["src"].split(".")[-1]
-        supertype = type == "xml" ? "application" : "image"
-        bin = IO.binread(image_localfile(img))
-        data = Base64.strict_encode64(bin)
-        img["src"] = "data:#{supertype}/#{type};base64,#{data}"
+        img["src"] = Metanorma::Utils::datauri(img["src"], @localdir)
       end
 
       def image_suffix(img)

data/lib/isodoc/metadata_date.rb

@@ -6,7 +6,7 @@ module IsoDoc
                    vote-ended}.freeze
 
     def months
-    {
+      {
         "01": @labels["month_january"],
         "02": @labels["month_february"],
         "03": @labels["month_march"],
@@ -19,30 +19,32 @@ module IsoDoc
         "10": @labels["month_october"],
         "11": @labels["month_november"],
         "12": @labels["month_december"],
-    }
+      }
     end
 
     def monthyr(isodate)
       m = /(?<yr>\d\d\d\d)-(?<mo>\d\d)/.match isodate
       return isodate unless m && m[:yr] && m[:mo]
+
       l10n("#{months[m[:mo].to_sym]} #{m[:yr]}",
-                                   @lang, @script)
+           @lang, @script)
     end
 
     def MMMddyyyy(isodate)
       return nil if isodate.nil?
+
       arr = isodate.split("-")
-      date = if arr.size == 1 and (/^\d+$/.match isodate)
-               Date.new(*arr.map(&:to_i)).strftime("%Y")
-             elsif arr.size == 2
-               Date.new(*arr.map(&:to_i)).strftime("%B %Y")
-             else
-               Date.parse(isodate).strftime("%B %d, %Y")
-             end
+      if arr.size == 1 && (/^\d+$/.match isodate)
+        Date.new(*arr.map(&:to_i)).strftime("%Y")
+      elsif arr.size == 2
+        Date.new(*arr.map(&:to_i)).strftime("%B %Y")
+      else
+        Date.parse(isodate).strftime("%B %d, %Y")
+      end
     end
 
     def bibdate(isoxml, _out)
-      isoxml.xpath(ns('//bibdata/date')).each do |d|
+      isoxml.xpath(ns("//bibdata/date")).each do |d|
         set("#{d['type'].gsub(/-/, '_')}date".to_sym, Common::date_range(d))
       end
     end

data/lib/isodoc/presentation_function/bibdata.rb

@@ -10,7 +10,7 @@ module IsoDoc
         "</localized-strings>"
     end
 
-     def docid_prefixes(docxml)
+    def docid_prefixes(docxml)
       docxml.xpath(ns("//references/bibitem/docidentifier")).each do |i|
         i.children = @xrefs.klass.docid_prefix(i["type"], i.text)
       end
@@ -97,7 +97,7 @@ module IsoDoc
 
     # https://stackoverflow.com/a/31822406
     def blank?(elem)
-      elem.nil? || elem.respond_to?(:empty?) && elem.empty?
+      elem.nil? || (elem.respond_to?(:empty?) && elem.empty?)
     end
 
     def trim_hash(hash)

data/lib/isodoc/presentation_function/terms.rb

@@ -28,11 +28,7 @@ module IsoDoc
       ref = node.at(ns("./xref | ./eref | ./termref"))
       ref && opts[:ref] != "false" and r&.next = " "
       opts[:ital] == "true" and r&.name = "em"
-      if opts[:linkmention] == "true" && !r.nil? && !ref.nil?
-        ref2 = ref.clone
-        r2 = r.clone
-        r.replace(ref2).children = r2
-      end
+      concept1_linkmention(ref, r, opts)
       concept1_ref(node, ref, opts)
       if opts[:ital] == "false"
         r = node.at(ns(".//renderterm"))
@@ -41,6 +37,14 @@ module IsoDoc
       node.replace(node.children)
     end
 
+    def concept1_linkmention(ref, renderterm, opts)
+      if opts[:linkmention] == "true" && !renderterm.nil? && !ref.nil?
+        ref2 = ref.clone
+        r2 = renderterm.clone
+        renderterm.replace(ref2).children = r2
+      end
+    end
+
     def concept1_ref(_node, ref, opts)
       ref.nil? and return
       return ref.remove if opts[:ref] == "false"
@@ -78,39 +82,71 @@ module IsoDoc
     end
 
     def designation(docxml)
-      docxml.xpath(ns("//preferred | //admitted | //deprecates")).each do |p|
-        designation1(p)
-      end
       docxml.xpath(ns("//term")).each do |t|
         merge_second_preferred(t)
       end
+      docxml.xpath(ns("//preferred | //admitted | //deprecates")).each do |p|
+        designation1(p)
+      end
     end
 
     def merge_second_preferred(term)
       pref = nil
-      term.xpath(ns("./preferred")).each_with_index do |p, i|
+      term.xpath(ns("./preferred[expression/name]")).each_with_index do |p, i|
         if i.zero? then pref = p
-        else
-          pref << l10n("; #{p.children.to_xml}")
+        elsif merge_preferred_eligible?(pref, p)
+          pref.at(ns("./expression/name")) <<
+            l10n("; #{p.at(ns('./expression/name')).children.to_xml}")
           p.remove
         end
       end
     end
 
+    def merge_preferred_eligible?(first, second)
+      firstex = first.at(ns("./expression")) || {}
+      secondex = second.at(ns("./expression")) || {}
+      first["geographic-area"] == second["geographic-area"] &&
+        firstex["language"] == secondex["language"] &&
+        !first.at(ns("./pronunciation | ./grammar")) &&
+        !second.at(ns("./pronunciation | ./grammar"))
+    end
+
     def designation1(desgn)
       s = desgn.at(ns("./termsource"))
       name = desgn.at(ns("./expression/name | ./letter-symbol/name | "\
                          "./graphical-symbol")) or return
 
+      designation_annotate(desgn, name)
+      s and desgn.next = s
+    end
+
+    def designation_annotate(desgn, name)
+      designation_field(desgn, name)
+      designation_boldface(desgn)
       g = desgn.at(ns("./expression/grammar")) and
-        name << " #{designation_grammar(g).join(', ')}"
+        name << ", #{designation_grammar(g).join(', ')}"
+      designation_localization(desgn, name)
+      designation_pronunciation(desgn, name)
       desgn.children = name.children
-      s and desgn.next = s
+    end
+
+    def designation_boldface(desgn)
+      desgn.name == "preferred" or return
+      name = desgn.at(ns("./expression/name | ./letter-symbol/name")) or return
+      name.children = "<strong>#{name.children}</strong>"
+    end
+
+    def designation_field(desgn, name)
+      f = desgn.xpath(ns("./field-of-application | ./usage-info"))
+        &.map { |u| u.children.to_xml }&.join(", ")
+      return nil if f&.empty?
+
+      name << ", &#x3c;#{f}&#x3e;"
     end
 
     def designation_grammar(grammar)
       ret = []
-      grammar.xpath(ns("./gender")).each do |x|
+      grammar.xpath(ns("./gender | ./number")).each do |x|
         ret << @i18n.grammar_abbrevs[x.text]
       end
       %w(isPreposition isParticiple isAdjective isVerb isAdverb isNoun)
@@ -121,20 +157,28 @@ module IsoDoc
       ret
     end
 
-        def definition1(elem)
-          nodes = Nokogiri::XML::NodeSet.new(elem.document)
-          v = elem&.at(ns("./verbaldefinition"))&.children and nodes += v
-          n = elem&.at(ns("./nonverbalrepresentation"))&.children and nodes += n
-          elem.children = nodes
-        end
+    def designation_localization(desgn, name)
+      loc = [desgn&.at(ns("./expression/@language"))&.text,
+             desgn&.at(ns("./expression/@script"))&.text,
+             desgn&.at(ns("./@geographic-area"))&.text].compact
+      return if loc.empty?
+
+      name << ", #{loc.join(' ')}"
+    end
+
+    def designation_pronunciation(desgn, name)
+      f = desgn.at(ns("./expression/pronunciation")) or return
+
+      name << ", /#{f.children.to_xml}/"
+    end
 
-            def termexample(docxml)
+    def termexample(docxml)
       docxml.xpath(ns("//termexample")).each do |f|
         example1(f)
       end
     end
 
-                def termnote(docxml)
+    def termnote(docxml)
       docxml.xpath(ns("//termnote")).each do |f|
         termnote1(f)
       end
@@ -155,7 +199,7 @@ module IsoDoc
     def termdefinition1(elem)
       unwrap_definition(elem)
       multidef(elem) if elem.xpath(ns("./definition")).size > 1
-      end
+    end
 
     def multidef(elem)
       d = elem.at(ns("./definition"))
@@ -167,13 +211,13 @@ module IsoDoc
       d.wrap("<definition></definition>")
     end
 
-           def unwrap_definition(elem)
-             elem.xpath(ns("./definition")).each do |d|
-          nodes = Nokogiri::XML::NodeSet.new(elem.document)
-          v = d&.at(ns("./verbaldefinition"))&.children and nodes += v
-          n = d&.at(ns("./nonverbalrepresentation"))&.children and nodes += n
-          d.children = nodes
-             end
+    def unwrap_definition(elem)
+      elem.xpath(ns("./definition")).each do |d|
+        %w(verbal-definition non-verbal-representation).each do |e|
+          v = d&.at(ns("./#{e}"))
+          v&.replace(v.children)
         end
+      end
+    end
   end
 end

data/lib/isodoc/presentation_xml_convert.rb

@@ -18,7 +18,7 @@ module IsoDoc
       info docxml, nil
       conversions(docxml)
       docxml.root["type"] = "presentation"
-      docxml.to_xml
+      docxml.to_xml.gsub(/</, "<").gsub(/>/, ">")
     end
 
     def conversions(docxml)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.8.0".freeze
+  VERSION = "1.8.2.2".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -54,11 +54,11 @@ module IsoDoc
       end
 
       def para_class(_node)
-        classtype = nil
-        classtype = "Note" if @note
-        classtype = "MsoCommentText" if in_comment
-        classtype = "Sourcecode" if @annotation
-        classtype
+        return "Sourcecode" if @annotation
+        return "MsoCommentText" if @in_comment
+        return "Note" if @note
+
+        nil
       end
 
       def para_parse(node, out)
@@ -86,21 +86,31 @@ module IsoDoc
       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)
         out.table **{ class: "dl" } do |v|
           node.elements.select { |n| dt_dd? n }.each_slice(2) do |dt, dd|
-            v.tr do |tr|
-              tr.td **{ valign: "top", align: "left" } do |term|
-                dt_parse(dt, term)
-              end
-              tr.td **{ valign: "top" } do |listitem|
-                dd.children.each { |n| parse(n, listitem) }
-              end
-            end
+            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)
         return if node.elements.reject { |n| dt_dd? n }.empty?
 
@@ -120,8 +130,8 @@ module IsoDoc
         dl
       end
 
+      # get rid of footnote link, it is in diagram
       def figure_aside_process(fig, aside, key)
-        # get rid of footnote link, it is in diagram
         fig&.at("./a[@class='TableFootnoteRef']")&.remove
         fnref = fig.at(".//span[@class='TableFootnoteRef']/..")
         tr = key.add_child("<tr></tr>").first

data/lib/isodoc/word_function/comments.rb

@@ -1,10 +1,6 @@
 module IsoDoc
   module WordFunction
     module Comments
-      def in_comment
-        @in_comment
-      end
-
       def comments(div)
         return if @comments.empty?
 

data/lib/isodoc/xref/xref_gen.rb

@@ -7,6 +7,10 @@ module IsoDoc
                            recommendation permission figure table formula
                            admonition sourcecode).freeze
 
+      def blank?(text)
+        text.nil? || text.empty?
+      end
+
       def amend_preprocess(xmldoc)
         xmldoc.xpath(ns("//amend[newcontent]")).each do |a|
           autonum = amend_autonums(a)
@@ -39,11 +43,9 @@ module IsoDoc
       end
 
       def termnote_anchor_names(docxml)
-        docxml.xpath(ns("//term[descendant::termnote]")).each do |t|
+        docxml.xpath(ns("//term[termnote]")).each do |t|
           c = Counter.new
-          t.xpath(ns(".//termnote")).each do |n|
-            next if n["id"].nil? || n["id"].empty?
-
+          t.xpath(ns("./termnote")).reject { |n| blank?(n["id"]) }.each do |n|
             c.increment(n)
             @anchors[n["id"]] =
               { label: termnote_label(c.print), type: "termnote", value: c.print,
@@ -54,18 +56,18 @@ module IsoDoc
       end
 
       def termexample_anchor_names(docxml)
-        docxml.xpath(ns("//term[descendant::termexample]")).each do |t|
-          examples = t.xpath(ns(".//termexample"))
+        docxml.xpath(ns("//term[termexample]")).each do |t|
+          examples = t.xpath(ns("./termexample"))
           c = Counter.new
-          examples.each do |n|
-            next if n["id"].nil? || n["id"].empty?
-
+          examples.reject { |n| blank?(n["id"]) }.each do |n|
             c.increment(n)
             idx = increment_label(examples, n, c, false)
             @anchors[n["id"]] =
-              { type: "termexample", label: idx, value: c.print,
-                xref: l10n("#{anchor(t['id'], :xref)}, "\
-                           "#{@labels['example_xref']} #{c.print}") }
+              # { type: "termexample", label: idx, value: c.print,
+              # xref: l10n("#{anchor(t['id'], :xref)}, "\
+              # "#{@labels['example_xref']} #{c.print}") }
+              anchor_struct(idx, n,
+                            @labels["example_xref"], "termexample", n["unnumbered"])
           end
         end
       end
@@ -127,9 +129,7 @@ module IsoDoc
           notes = s.xpath(ns(".//ol")) - s.xpath(ns(".//clause//ol")) -
             s.xpath(ns(".//appendix//ol")) - s.xpath(ns(".//ol//ol"))
           c = Counter.new
-          notes.each do |n|
-            next if n["id"].nil? || n["id"].empty?
-
+          notes.reject { |n| blank?(n["id"]) }.each do |n|
             @anchors[n["id"]] = anchor_struct(increment_label(notes, n, c), n,
                                               @labels["list"], "list", false)
             list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
@@ -158,9 +158,7 @@ module IsoDoc
           notes = s.xpath(ns(".//dl")) - s.xpath(ns(".//clause//dl")) -
             s.xpath(ns(".//appendix//dl")) - s.xpath(ns(".//dl//dl"))
           c = Counter.new
-          notes.each do |n|
-            next if n["id"].nil? || n["id"].empty?
-
+          notes.reject { |n| blank?(n["id"]) }.each do |n|
             @anchors[n["id"]] =
               anchor_struct(increment_label(notes, n, c), n,
                             @labels["deflist"], "deflist", false)
@@ -183,10 +181,8 @@ module IsoDoc
         end
       end
 
-      def bookmark_anchor_names(docxml)
-        docxml.xpath(ns(".//bookmark")).each do |n|
-          next if n["id"].nil? || n["id"].empty?
-
+      def bookmark_anchor_names(xml)
+        xml.xpath(ns(".//bookmark")).reject { |n| blank?(n["id"]) }.each do |n|
           parent = nil
           n.ancestors.each do |a|
             next unless a["id"] && parent = @anchors.dig(a["id"], :xref)

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -34,8 +34,7 @@ module IsoDoc::XrefGen
 
     def sequential_table_names(clause)
       c = Counter.new
-      clause.xpath(ns(".//table")).each do |t|
-        next if t["id"].nil? || t["id"].empty?
+      clause.xpath(ns(".//table")).reject { |n| blank?(n["id"]) }.each do |t|
 
         @anchors[t["id"]] = anchor_struct(
           c.increment(t).print, nil,
@@ -46,8 +45,7 @@ module IsoDoc::XrefGen
 
     def sequential_formula_names(clause)
       c = Counter.new
-      clause.xpath(ns(".//formula")).each do |t|
-        next if t["id"].nil? || t["id"].empty?
+      clause.xpath(ns(".//formula")).reject { |n| blank?(n["id"]) }.each do |t|
 
         @anchors[t["id"]] = anchor_struct(
           c.increment(t).print, t,
@@ -62,8 +60,8 @@ module IsoDoc::XrefGen
 
     def sequential_permission_names(clause, klass, label)
       c = Counter.new
-      clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}")).each do |t|
-        next if t["id"].nil? || t["id"].empty?
+      clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}"))
+        .reject { |n| blank?(n["id"]) }.each do |t|
 
         id = c.increment(t).print
         @anchors[t["id"]] = anchor_struct(id, t, label, klass, t["unnumbered"])
@@ -82,8 +80,7 @@ module IsoDoc::XrefGen
 
     def sequential_permission_names1(block, lbl, klass, label)
       c = Counter.new
-      block.xpath(ns("./#{klass}")).each do |t|
-        next if t["id"].nil? || t["id"].empty?
+      block.xpath(ns("./#{klass}")).reject { |n| blank?(n["id"]) }.each do |t|
 
         id = "#{lbl}#{hierfigsep}#{c.increment(t).print}"
         @anchors[t["id"]] = anchor_struct(id, t, label, klass, t["unnumbered"])
@@ -118,8 +115,7 @@ module IsoDoc::XrefGen
 
     def hierarchical_table_names(clause, num)
       c = Counter.new
-      clause.xpath(ns(".//table")).each do |t|
-        next if t["id"].nil? || t["id"].empty?
+      clause.xpath(ns(".//table")).reject { |n| blank?(n["id"]) }.each do |t|
 
         @anchors[t["id"]] =
           anchor_struct("#{num}#{hiersep}#{c.increment(t).print}",
@@ -141,8 +137,7 @@ module IsoDoc::XrefGen
 
     def hierarchical_formula_names(clause, num)
       c = Counter.new
-      clause.xpath(ns(".//formula")).each do |t|
-        next if t["id"].nil? || t["id"].empty?
+      clause.xpath(ns(".//formula")).reject { |n| blank?(n["id"]) }.each do |t|
 
         @anchors[t["id"]] = anchor_struct(
           "#{num}#{hiersep}#{c.increment(t).print}", nil,
@@ -154,8 +149,8 @@ module IsoDoc::XrefGen
 
     def hierarchical_permission_names(clause, num, klass, label)
       c = Counter.new
-      clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}")).each do |t|
-        next if t["id"].nil? || t["id"].empty?
+      clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}"))
+        .reject { |n| blank?(n["id"]) }.each do |t|
 
         id = "#{num}#{hiersep}#{c.increment(t).print}"
         @anchors[t["id"]] =
@@ -175,8 +170,7 @@ module IsoDoc::XrefGen
 
     def hierarchical_permission_names1(block, lbl, klass, label)
       c = Counter.new
-      block.xpath(ns("./#{klass}")).each do |t|
-        next if t["id"].nil? || t["id"].empty?
+      block.xpath(ns("./#{klass}")).reject { |n| blank?(n["id"]) }.each do |t|
 
         id = "#{lbl}#{hierfigsep}#{c.increment(t).print}"
         @anchors[t["id"]] =

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

@@ -94,6 +94,9 @@ grammar_abbrevs:
   feminine: مؤ
   neuter: محايد
   common: خنثى
+  singular: مفرد
+  dual: مزدوج
+  plural: جمع
   isPreposition: حرف جر
   isParticiple: النعت
   isAdjective: صفة

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

@@ -98,6 +98,9 @@ grammar_abbrevs:
   feminine: fem
   neuter: neutr
   common: gemein
+  singular: Sg
+  dual: Dual
+  plural: Pl
   isPreposition: Präp
   isParticiple: Part
   isAdjective: Adj