isodoc 2.2.0 → 2.2.3

data/lib/isodoc/presentation_function/refs.rb

@@ -0,0 +1,102 @@
+require_relative "../../relaton/render/general"
+
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def references(docxml)
+      bibliography_bibitem_number(docxml)
+      renderings = references_render(docxml)
+      docxml.xpath(ns("//references/bibitem")).each do |x|
+        bibitem(x, renderings)
+      end
+      docxml.xpath(ns("//references[bibitem/@hidden = 'true']")).each do |x|
+        x.at(ns("./bibitem[not(@hidden = 'true')]")) and next
+        x["hidden"] = "true"
+      end
+      @xrefs.parse_inclusions(refs: true).parse(docxml)
+    end
+
+    def references_render(docxml)
+      d = docxml.clone
+      d.remove_namespaces!
+      refs = d.xpath("//references/bibitem").each_with_object([]) do |b, m|
+        prep_for_rendering(b)
+        m << b.to_xml
+      end.join
+      bibrenderer.render_all("<references>#{refs}</references>",
+                             type: citestyle)
+    end
+
+    def prep_for_rendering(bib)
+      bib["suppress_identifier"] == true and
+        bib.xpath(ns("./docidentifier")).each(&:remove)
+      bib["type"] ||= "standard"
+    end
+
+    def bibitem(xml, renderings)
+      @xrefs.klass.implicit_reference(xml) and xml["hidden"] = "true"
+      bibrender(xml, renderings)
+    end
+
+    def bibrender(xml, renderings)
+      if f = xml.at(ns("./formattedref"))
+        bibrender_formattedref(f, xml)
+      else bibrender_relaton(xml, renderings)
+      end
+    end
+
+    def bibrender_formattedref(formattedref, xml)
+      code = render_identifier(bibitem_ref_code(xml))
+      (code[:sdo] && xml["suppress_identifier"] != "true") and
+        formattedref << " [#{code[:sdo]}] "
+    end
+
+    def bibrender_relaton(xml, renderings)
+      f = renderings[xml["id"]][:formattedref]
+      f &&= "<formattedref>#{f}</formattedref>"
+      xml.children =
+        "#{f}#{xml.xpath(ns('./docidentifier | ./uri | ./note')).to_xml}"
+    end
+
+    def bibrenderer
+      ::Relaton::Render::IsoDoc::General.new(language: @lang)
+    end
+
+    def citestyle
+      nil
+    end
+
+    def bibliography_bibitem_number_skip(bibitem)
+      @xrefs.klass.implicit_reference(bibitem) ||
+        bibitem.at(ns(".//docidentifier[@type = 'metanorma']")) ||
+        bibitem.at(ns(".//docidentifier[@type = 'metanorma-ordinal']")) ||
+        bibitem["hidden"] == "true" || bibitem.parent["hidden"] == "true"
+    end
+
+    def bibliography_bibitem_number(docxml)
+      i = 0
+      docxml.xpath(ns("//references[@normative = 'false']/bibitem")).each do |b|
+        i = bibliography_bibitem_number1(b, i)
+      end
+      @xrefs.references docxml
+    end
+
+    def bibliography_bibitem_number1(bibitem, idx)
+      ins = bibitem.at(ns(".//docidentifier")).previous_element
+      mn = bibitem.at(ns(".//docidentifier[@type = 'metanorma']")) and
+        /^\[?\d+\]?$/.match?(mn.text) and
+        mn.remove # ignore numbers already inserted
+      unless bibliography_bibitem_number_skip(bibitem)
+        idx += 1
+        ins.next =
+          "<docidentifier type='metanorma-ordinal'>[#{idx}]</docidentifier>"
+      end
+      idx
+    end
+
+    def docid_prefixes(docxml)
+      docxml.xpath(ns("//references/bibitem/docidentifier")).each do |i|
+        i.children = @xrefs.klass.docid_prefix(i["type"], i.text)
+      end
+    end
+  end
+end

data/lib/isodoc/presentation_function/section.rb

@@ -1,4 +1,4 @@
-require_relative "../../relaton/render/general"
+require_relative "refs"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -76,85 +76,6 @@ module IsoDoc
       prefix_name(elem, "", "#{lbl}#{clausedelim}", "name")
     end
 
-    def references(docxml)
-      bibliography_bibitem_number(docxml)
-      docxml.xpath(ns("//references/bibitem")).each do |x|
-        bibitem(x)
-      end
-      docxml.xpath(ns("//references[bibitem/@hidden = 'true']")).each do |x|
-        x.at(ns("./bibitem[not(@hidden = 'true')]")) and next
-        x["hidden"] = "true"
-      end
-      @xrefs.parse_inclusions(refs: true).parse(docxml)
-    end
-
-    def bibitem(xml)
-      @xrefs.klass.implicit_reference(xml) and
-        xml["hidden"] = "true"
-      bibrender(xml)
-    end
-
-    def bibrender(xml)
-      if f = xml.at(ns("./formattedref"))
-        bibrender_formattedref(f, xml)
-      else bibrender_relaton(xml)
-      end
-    end
-
-    def bibrender_formattedref(formattedref, xml)
-      code = render_identifier(bibitem_ref_code(xml))
-      (code[:sdo] && xml["suppress_identifier"] != "true") and
-        formattedref << " [#{code[:sdo]}] "
-    end
-
-    def bibrender_relaton(xml)
-      bib = xml.dup
-      bib["suppress_identifier"] == true and
-        bib.xpath(ns("./docidentifier")).each(&:remove)
-      xml.children =
-        "#{bibrenderer.render(bib.to_xml)}"\
-        "#{xml.xpath(ns('./docidentifier | ./uri | ./note')).to_xml}"
-    end
-
-    def bibrenderer
-      ::Relaton::Render::IsoDoc::General.new(language: @lang)
-    end
-
-    def bibliography_bibitem_number_skip(bibitem)
-      @xrefs.klass.implicit_reference(bibitem) ||
-        bibitem.at(ns(".//docidentifier[@type = 'metanorma']")) ||
-        bibitem.at(ns(".//docidentifier[@type = 'metanorma-ordinal']")) ||
-        bibitem["hidden"] == "true" || bibitem.parent["hidden"] == "true"
-    end
-
-    def bibliography_bibitem_number(docxml)
-      i = 0
-      docxml.xpath(ns("//references[@normative = 'false']/bibitem")).each do |b|
-        i = bibliography_bibitem_number1(b, i)
-      end
-      @xrefs.references docxml
-    end
-
-    def bibliography_bibitem_number1(bibitem, idx)
-      if mn = bibitem.at(ns(".//docidentifier[@type = 'metanorma']"))
-        /^\[?\d\]?$/.match?(mn&.text) and
-          idx = mn.text.sub(/^\[/, "").sub(/\]$/, "").to_i
-      end
-      unless bibliography_bibitem_number_skip(bibitem)
-
-        idx += 1
-        bibitem.at(ns(".//docidentifier")).previous =
-          "<docidentifier type='metanorma-ordinal'>[#{idx}]</docidentifier>"
-      end
-      idx
-    end
-
-    def docid_prefixes(docxml)
-      docxml.xpath(ns("//references/bibitem/docidentifier")).each do |i|
-        i.children = @xrefs.klass.docid_prefix(i["type"], i.text)
-      end
-    end
-
     def index(docxml)
       docxml.xpath(ns("//index | //index-xref | //indexsect")).each(&:remove)
     end

data/lib/isodoc/presentation_function/terms.rb

@@ -28,10 +28,9 @@ module IsoDoc
     end
 
     def concept1_nonital(node, opts)
-      if opts[:ital] == "false"
-        r = node.at(ns(".//renderterm"))
-        r&.replace(r&.children)
-      end
+      opts[:ital] == "false" or return
+      r = node.at(ns(".//renderterm"))
+      r&.replace(r&.children)
     end
 
     def concept_render_init(node, defaults)
@@ -43,11 +42,11 @@ module IsoDoc
     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
+      return unless opts[:linkmention] == "true" && !renderterm.nil? && !ref.nil?
+
+      ref2 = ref.clone
+      r2 = renderterm.clone
+      renderterm.replace(ref2).children = r2
     end
 
     def concept1_ref(_node, ref, opts)
@@ -92,9 +91,7 @@ module IsoDoc
     end
 
     def designation(docxml)
-      docxml.xpath(ns("//term")).each do |t|
-        merge_second_preferred(t)
-      end
+      docxml.xpath(ns("//term")).each { |t| merge_second_preferred(t) }
       docxml.xpath(ns("//preferred | //admitted | //deprecates")).each do |p|
         designation1(p)
       end
@@ -194,7 +191,6 @@ module IsoDoc
       end
     end
 
-    # introduce name element
     def termnote1(elem)
       lbl = l10n(@xrefs.anchor(elem["id"], :label) || "???")
       prefix_name(elem, "", lower2cap(lbl), "name")

data/lib/isodoc/presentation_xml_convert.rb

@@ -59,6 +59,7 @@ module IsoDoc
       permission docxml
       requirement docxml
       recommendation docxml
+      requirement_render docxml
     end
 
     def inline(docxml)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.2.0".freeze
+  VERSION = "2.2.3".freeze
 end

data/lib/isodoc/xref/xref_counter.rb

@@ -2,6 +2,18 @@ require "roman-numerals"
 
 module IsoDoc
   module XrefGen
+    class ReqCounter
+      # one counter for each requirements label
+      def initialize
+        @counters = {}
+      end
+
+      def increment(label, node)
+        @counters[label] ||= Counter.new
+        @counters[label].increment(node)
+      end
+    end
+
     class Counter
       def initialize(num = 0, opts = { numerals: :arabic })
         @unnumbered = false

data/lib/isodoc/xref/xref_gen.rb

@@ -1,5 +1,13 @@
 require_relative "xref_gen_seq"
 
+module Enumerable
+  def noblank
+    reject do |n|
+      n["id"].nil? || n["id"].empty?
+    end
+  end
+end
+
 module IsoDoc
   module XrefGen
     module Blocks
@@ -11,6 +19,10 @@ module IsoDoc
         text.nil? || text.empty?
       end
 
+      def noblank(xpath)
+        xpath.reject { |n| blank?(n["id"]) }
+      end
+
       def amend_preprocess(xmldoc)
         xmldoc.xpath(ns("//amend[newcontent]")).each do |a|
           autonum = amend_autonums(a)
@@ -45,7 +57,7 @@ module IsoDoc
       def termnote_anchor_names(docxml)
         docxml.xpath(ns("//*[termnote]")).each do |t|
           c = Counter.new
-          t.xpath(ns("./termnote")).reject { |n| blank?(n["id"]) }.each do |n|
+          t.xpath(ns("./termnote")).noblank.each do |n|
             c.increment(n)
             @anchors[n["id"]] =
               { label: termnote_label(c.print), type: "termnote",
@@ -60,7 +72,7 @@ module IsoDoc
         docxml.xpath(ns("//*[termexample]")).each do |t|
           examples = t.xpath(ns("./termexample"))
           c = Counter.new
-          examples.reject { |n| blank?(n["id"]) }.each do |n|
+          examples.noblank.each do |n|
             c.increment(n)
             idx = increment_label(examples, n, c, increment: false)
             @anchors[n["id"]] = anchor_struct(idx, n, @labels["example_xref"],
@@ -135,7 +147,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.reject { |n| blank?(n["id"]) }.each do |n|
+          notes.noblank.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)
@@ -169,7 +181,7 @@ module IsoDoc
       end
 
       def deflist_anchor_names1(notes, counter)
-        notes.reject { |n| blank?(n["id"]) }.each do |n|
+        notes.noblank.each do |n|
           @anchors[n["id"]] =
             anchor_struct(increment_label(notes, n, counter), n,
                           @labels["deflist"], "deflist", false)
@@ -197,7 +209,7 @@ module IsoDoc
       end
 
       def bookmark_anchor_names(xml)
-        xml.xpath(ns(".//bookmark")).reject { |n| blank?(n["id"]) }.each do |n|
+        xml.xpath(ns(".//bookmark")).noblank.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

@@ -24,22 +24,24 @@ module IsoDoc
         c = Counter.new
         j = 0
         clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]"))
-          .each do |t|
-          next if blank?(t["id"])
-
+          .noblank.each do |t|
           j = subfigure_increment(j, c, t)
-          label = c.print
-          label &&= label + (j.zero? ? "" : "-#{j}")
-
-          @anchors[t["id"]] = anchor_struct(
-            label, nil, @labels["figure"], "figure", t["unnumbered"]
-          )
+          sequential_figure_body(j, c, t)
         end
       end
 
+      def sequential_figure_body(subfignum, counter, block)
+        label = counter.print
+        label &&= label + (subfignum.zero? ? "" : "-#{subfignum}")
+
+        @anchors[block["id"]] = anchor_struct(
+          label, nil, @labels["figure"], "figure", block["unnumbered"]
+        )
+      end
+
       def sequential_table_names(clause)
         c = Counter.new
-        clause.xpath(ns(".//table")).reject { |n| blank?(n["id"]) }.each do |t|
+        clause.xpath(ns(".//table")).noblank.each do |t|
           next if labelled_ancestor(t)
 
           @anchors[t["id"]] = anchor_struct(
@@ -51,9 +53,7 @@ module IsoDoc
 
       def sequential_formula_names(clause)
         c = Counter.new
-        clause.xpath(ns(".//formula")).reject do |n|
-          blank?(n["id"])
-        end.each do |t|
+        clause.xpath(ns(".//formula")).noblank.each do |t|
           @anchors[t["id"]] = anchor_struct(
             c.increment(t).print, t,
             t["inequality"] ? @labels["inequality"] : @labels["formula"],
@@ -62,70 +62,98 @@ module IsoDoc
         end
       end
 
-      FIRST_LVL_REQ = "[not(ancestor::permission or ancestor::requirement or "\
-                      "ancestor::recommendation)]".freeze
+      FIRST_LVL_REQ_RULE = <<~XPATH.freeze
+        [not(ancestor::permission or ancestor::requirement or ancestor::recommendation)]
+      XPATH
 
-      def sequential_permission_names(clause, klass, label)
-        c = Counter.new
-        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"])
-          sequential_permission_names2(t, id)
+      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)
+        c = ReqCounter.new
+        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
+          sequential_permission_body(id, t, label, klass, m)
+          sequential_permission_children(t, id)
         end
       end
 
-      def sequential_permission_names2(elem, ident)
-        sequential_permission_names1(elem, ident, "permission",
-                                     @labels["permission"])
-        sequential_permission_names1(elem, ident, "requirement",
-                                     @labels["requirement"])
-        sequential_permission_names1(elem, ident, "recommendation",
-                                     @labels["recommendation"])
+      def sequential_permission_children(block, lbl)
+        c = ReqCounter.new
+        block.xpath(ns(REQ_CHILDREN)).noblank.each do |t|
+          m = @reqt_models.model(t["model"])
+          klass, label = reqt2class_nested_label(t, m)
+          id = "#{lbl}#{hierfigsep}#{c.increment(label, t).print}"
+          sequential_permission_body(id, t, label, klass, m)
+          sequential_permission_children(t, id)
+        end
       end
 
-      def sequential_permission_names1(block, lbl, klass, label)
-        c = Counter.new
-        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"])
-          sequential_permission_names2(t, id)
+      def sequential_permission_body(id, block, label, klass, model)
+        @anchors[block["id"]] = model.postprocess_anchor_struct(
+          block, anchor_struct(id, block,
+                               label, klass, block["unnumbered"])
+        )
+
+        model.permission_parts(block, id, label, klass).each do |n|
+          @anchors[n[:id]] = anchor_struct(n[:number], n[:elem], n[:label],
+                                           n[:klass], false)
         end
       end
 
+      def reqt2class_label(block, model)
+        model.req_class_paths.each do |n|
+          v1 = ns("/#{n[:xpath]}").sub(%r{^/}, "")
+          block.at("./self::#{v1}") and return [n[:klass], n[:label]]
+        end
+        [nil, nil]
+      end
+
+      def reqt2class_nested_label(block, model)
+        model.req_nested_class_paths.each do |n|
+          v1 = ns("/#{n[:xpath]}").sub(%r{^/}, "")
+          block.at("./self::#{v1}") and return [n[:klass], n[:label]]
+        end
+        [nil, nil]
+      end
+
       def sequential_asset_names(clause)
         sequential_table_names(clause)
         sequential_figure_names(clause)
         sequential_formula_names(clause)
-        sequential_permission_names(clause, "permission", @labels["permission"])
-        sequential_permission_names(clause, "requirement",
-                                    @labels["requirement"])
-        sequential_permission_names(clause, "recommendation",
-                                    @labels["recommendation"])
+        sequential_permission_names(clause)
       end
 
       def hierarchical_figure_names(clause, num)
         c = Counter.new
         j = 0
         clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]"))
-          .each do |t|
+          .noblank.each do |t|
           # next if labelled_ancestor(t) && t.ancestors("figure").empty?
 
           j = subfigure_increment(j, c, t)
-          label = "#{num}#{hiersep}#{c.print}" +
-            (j.zero? ? "" : "#{hierfigsep}#{j}")
-          next if t["id"].nil? || t["id"].empty?
-
-          @anchors[t["id"]] = anchor_struct(label, nil, @labels["figure"],
-                                            "figure", t["unnumbered"])
+          hierarchical_figure_body(num, j, c, t)
         end
       end
 
+      def hierarchical_figure_body(num, subfignum, counter, block)
+        label = "#{num}#{hiersep}#{counter.print}" +
+          (subfignum.zero? ? "" : "#{hierfigsep}#{subfignum}")
+
+        @anchors[block["id"]] = anchor_struct(label, nil, @labels["figure"],
+                                              "figure", block["unnumbered"])
+      end
+
       def hierarchical_table_names(clause, num)
         c = Counter.new
-        clause.xpath(ns(".//table")).reject { |n| blank?(n["id"]) }.each do |t|
+        clause.xpath(ns(".//table")).noblank.each do |t|
           next if labelled_ancestor(t)
 
           @anchors[t["id"]] =
@@ -138,19 +166,12 @@ module IsoDoc
         hierarchical_table_names(clause, num)
         hierarchical_figure_names(clause, num)
         hierarchical_formula_names(clause, num)
-        hierarchical_permission_names(clause, num, "permission",
-                                      @labels["permission"])
-        hierarchical_permission_names(clause, num, "requirement",
-                                      @labels["requirement"])
-        hierarchical_permission_names(clause, num, "recommendation",
-                                      @labels["recommendation"])
+        hierarchical_permission_names(clause, num)
       end
 
       def hierarchical_formula_names(clause, num)
         c = Counter.new
-        clause.xpath(ns(".//formula")).reject do |n|
-          blank?(n["id"])
-        end.each do |t|
+        clause.xpath(ns(".//formula")).noblank.each do |t|
           @anchors[t["id"]] = anchor_struct(
             "#{num}#{hiersep}#{c.increment(t).print}", nil,
             t["inequality"] ? @labels["inequality"] : @labels["formula"],
@@ -159,33 +180,37 @@ module IsoDoc
         end
       end
 
-      def hierarchical_permission_names(clause, num, klass, label)
-        c = Counter.new
-        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"]] =
-            anchor_struct(id, nil, label, klass, t["unnumbered"])
-          hierarchical_permission_names2(t, id)
+      def hierarchical_permission_names(clause, num)
+        c = ReqCounter.new
+        clause.xpath(ns(FIRST_LVL_REQ)).noblank.each do |t|
+          m = @reqt_models.model(t["model"])
+          klass, label = reqt2class_label(t, m)
+          id = "#{num}#{hiersep}#{c.increment(label, t).print}"
+          hierarchical_permission_body(id, t, label, klass, m)
+          hierarchical_permission_children(t, id)
         end
       end
 
-      def hierarchical_permission_names2(elem, ident)
-        hierarchical_permission_names1(elem, ident, "permission",
-                                       @labels["permission"])
-        hierarchical_permission_names1(elem, ident, "requirement",
-                                       @labels["requirement"])
-        hierarchical_permission_names1(elem, ident, "recommendation",
-                                       @labels["recommendation"])
+      def hierarchical_permission_children(block, lbl)
+        c = ReqCounter.new
+        block.xpath(ns(REQ_CHILDREN)).noblank.each do |t|
+          m = @reqt_models.model(t["model"])
+          klass, label = reqt2class_nested_label(t, m)
+          id = "#{lbl}#{hierfigsep}#{c.increment(label, t).print}"
+          hierarchical_permission_body(id, t, label, klass, m)
+          hierarchical_permission_children(t, id)
+        end
       end
 
-      def hierarchical_permission_names1(block, lbl, klass, label)
-        c = Counter.new
-        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, nil, label, klass, t["unnumbered"])
-          hierarchical_permission_names2(t, id)
+      def hierarchical_permission_body(id, block, label, klass, model)
+        @anchors[block["id"]] = model.postprocess_anchor_struct(
+          block, anchor_struct(id, nil,
+                               label, klass, block["unnumbered"])
+        )
+
+        model.permission_parts(block, id, label, klass).each do |n|
+          @anchors[n[:id]] = anchor_struct(n[:number], nil, n[:label],
+                                           n[:klass], false)
         end
       end
     end

data/lib/isodoc/xref.rb

@@ -24,6 +24,12 @@ module IsoDoc
       @i18n = i18n
       @labels = @i18n.get
       @klass.i18n = @i18n
+      @reqt_models = @klass.requirements_processor
+        .new({
+               default: "default", lang: lang, script: script,
+               labels: @i18n.get
+             })
+      @i18n
       @parse_settings = {}
     end
 

data/lib/isodoc/xslfo_convert.rb

@@ -1,5 +1,3 @@
-require "metanorma"
-
 module IsoDoc
   class XslfoPdfConvert < ::IsoDoc::Convert
     MN_OPTIONS_KEY = :mn2pdf

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

@@ -86,8 +86,6 @@ month_october: أكتوبر
 month_november: نوفمبر
 month_december: ديسمبر
 obligation: التزام
-subject: موضوع
-inherits: يرث
 admonition:
   danger: خطر
   warning: تحذير

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

@@ -92,8 +92,6 @@ month_october: Oktober
 month_november: November
 month_december: Dezember
 obligation: Verbindlichkeit
-subject: Thema
-inherits: Erbt
 admonition: {
   danger: Gefahr,
   warning: Warnung,