isodoc 3.4.1 → 3.4.3

data/lib/isodoc/xref/xref_gen.rb

@@ -1,6 +1,3 @@
-require_relative "xref_gen_seq"
-require_relative "xref_util"
-
 module IsoDoc
   module XrefGen
     module Blocks
@@ -10,13 +7,17 @@ module IsoDoc
 
       def amend_preprocess(xmldoc)
         xmldoc.xpath(ns("//amend[newcontent]")).each do |a|
-          autonum = amend_autonums(a)
-          NUMBERED_BLOCKS.each do |b|
-            a.xpath(ns("./newcontent//#{b}")).each_with_index do |e, i|
-              autonum[b] && i.zero? and e["number"] = autonum[b]
-              !autonum[b] and e["unnumbered"] = "true"
-            end
-          end
+          amend_preprocess1(a)
+        end
+      end
+
+      def amend_preprocess1(amend, subclause: false)
+        autonum = amend_autonums(amend)
+        NUMBERED_BLOCKS.each do |b|
+          amend_blocks(amend, autonum, b, subclause)
+        end
+        amend.xpath(ns(".#{amend_newcontent(subclause)}/clause")).each do |c|
+          amend_preprocess1(c, subclause: true)
         end
       end
 
@@ -28,6 +29,20 @@ module IsoDoc
         autonum
       end
 
+      def amend_blocks(amend, autonum, blocktype, subclause)
+        newc = amend_newcontent(subclause)
+        (amend.xpath(ns(".#{newc}//#{blocktype}")) -
+         amend.xpath(ns(".#{newc}/clause//#{blocktype}")))
+          .each_with_index do |e, i|
+            autonum[blocktype] && i.zero? and e["number"] = autonum[blocktype]
+            !autonum[blocktype] and e["unnumbered"] = "true"
+        end
+      end
+
+      def amend_newcontent(subclause)
+        subclause ? "" : "/newcontent"
+      end
+
       def termnote_label(node, label)
         if label.blank?
           @labels["termnote"].gsub(/%\s?/, "")
@@ -50,17 +65,42 @@ module IsoDoc
         end
       end
 
+      # processed from Presentation XML notes_inside_bibitem(),
+      # after notes moved: need docid from references processing
+      def bibitem_note_names(bib)
+        notes = bib.xpath(ns("./formattedref/note"))
+        counter = Counter.new
+        notes.noblank.each do |n|
+          lbl = increment_label(notes, n, counter)
+          @anchors[n["id"]] =
+            { label: lbl, value: lbl, container: bib["id"],
+              xref: anchor_struct_xref(lbl, n, @labels["note_xref"]),
+              elem: @labels["note_xref"], type: "note" }
+        end
+      end
+
+      # note within an asset: table, figure, provision
+      def nested_notes(asset, container: true)
+        notes = asset.xpath(ns(".//note"))
+        counter = Counter.new
+        notes.noblank.each do |n|
+          lbl = increment_label(notes, n, counter)
+          @anchors[n["id"]] =
+            { label: lbl, value: lbl, container: container ? asset["id"] : nil,
+              xref: anchor_struct_xref(lbl, n, @labels["note_xref"]),
+              elem: @labels["note_xref"], type: "note" }.compact
+        end
+      end
+
       def termexample_anchor_names(docxml)
         docxml.xpath(ns("//*[termexample]")).each do |t|
           examples = t.xpath(ns("./termexample"))
-          c = Counter.new
-          examples.noblank.each do |n|
+          examples.noblank.each_with_object(Counter.new) do |n, c|
             c.increment(n)
             idx = increment_label(examples, n, c, increment: false)
             @anchors[n["id"]] =
-              { label: idx, type: "termexample",
-                value: idx, elem: @labels["example_xref"],
-                container: t["id"],
+              { label: idx, type: "termexample", value: idx,
+                elem: @labels["example_xref"], container: t["id"],
                 xref: anchor_struct_xref(idx, n, @labels["example_xref"]) }
           end
         end
@@ -69,7 +109,8 @@ module IsoDoc
       def note_anchor_names(sections)
         sections.each do |s|
           notes = s.xpath(child_asset_path("note")) -
-            s.xpath(ns(".//figure//note | .//table//note"))
+            s.xpath(ns(".//figure//note | .//table//note | //permission//note | " \
+              "//recommendation//note | //requirement//note"))
           note_anchor_names1(notes, Counter.new)
           note_anchor_names(s.xpath(ns(child_sections)))
         end
@@ -102,9 +143,23 @@ module IsoDoc
         end
       end
 
+      # note within an asset: provision
+      def nested_examples(asset, container: true)
+        notes = asset.xpath(ns(".//example"))
+        notes.noblank.each_with_object(Counter.new) do |n, counter|
+          @anchors[n["id"]] ||=
+            anchor_struct(increment_label(notes, n, counter), n,
+                          @labels["example_xref"], "example",
+                          { unnumb: n["unnumbered"] })
+          @anchors[n["id"]][:container] = container ? asset["id"] : nil
+        end
+      end
+
       def example_anchor_names(sections)
         sections.each do |s|
-          notes = s.xpath(child_asset_path("example"))
+          notes = s.xpath(child_asset_path("example")) -
+            s.xpath(ns("//permission//note | " \
+              "//recommendation//note | //requirement//note"))
           example_anchor_names1(notes, Counter.new)
           example_anchor_names(s.xpath(ns(child_sections)))
         end
@@ -119,108 +174,6 @@ module IsoDoc
         end
       end
 
-      def list_anchor_names(sections)
-        sections.each do |s|
-          notes = s.xpath(ns(".//ol")) - s.xpath(ns(".//clause//ol")) -
-            s.xpath(ns(".//appendix//ol")) - s.xpath(ns(".//ol//ol"))
-          c = list_counter(0, {})
-          notes.noblank.each do |n|
-            @anchors[n["id"]] =
-              anchor_struct(increment_label(notes, n, c), n,
-                            @labels["list"], "list",
-                            { unnumb: false, container: true })
-            list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
-          end
-          list_anchor_names(s.xpath(ns(child_sections)))
-        end
-      end
-
-      def list_item_delim
-        ")"
-      end
-
-      def list_item_anchor_names(list, list_anchor, depth, prev_label,
-refer_list)
-        c = list_counter(list["start"] ? list["start"].to_i - 1 : 0, {})
-        list.xpath(ns("./li")).each do |li|
-          bare_label, label =
-            list_item_value(li, c, depth,
-                            { list_anchor:, prev_label:,
-                              refer_list: depth == 1 ? refer_list : nil })
-          @anchors[li["id"]] =
-            { label: bare_label, bare_xref: "#{label})", type: "listitem",
-              xref: %[#{label}#{delim_wrap(list_item_delim)}], refer_list:,
-              container: list_anchor[:container] }
-          (li.xpath(ns(".//ol")) - li.xpath(ns(".//ol//ol"))).each do |ol|
-            list_item_anchor_names(ol, list_anchor, depth + 1, label,
-                                   refer_list)
-          end
-        end
-      end
-
-      def list_item_value(entry, counter, depth, opts)
-        label = counter.increment(entry).listlabel(entry.parent, depth)
-        s = semx(entry, label)
-        [label,
-         list_item_anchor_label(s, opts[:list_anchor], opts[:prev_label],
-                                opts[:refer_list])]
-      end
-
-      def list_item_anchor_label(label, list_anchor, prev_label, refer_list)
-        prev_label.empty? or
-          label = @klass.connectives_spans(@i18n.list_nested_xref
-            .sub("%1", %[#{prev_label}#{delim_wrap(list_item_delim)}])
-            .sub("%2", label))
-        refer_list and
-          label = @klass.connectives_spans(@i18n.list_nested_xref
-            .sub("%1", list_anchor[:xref])
-            .sub("%2", label))
-        label
-      end
-
-      def deflist_anchor_names(sections)
-        sections.each do |s|
-          notes = s.xpath(ns(".//dl")) - s.xpath(ns(".//clause//dl")) -
-            s.xpath(ns(".//appendix//dl")) - s.xpath(ns(".//dl//dl"))
-          deflist_anchor_names1(notes, Counter.new)
-          deflist_anchor_names(s.xpath(ns(child_sections)))
-        end
-      end
-
-      def deflist_anchor_names1(notes, counter)
-        notes.noblank.each do |n|
-          @anchors[n["id"]] =
-            anchor_struct(increment_label(notes, n, counter), n,
-                          @labels["deflist"], "deflist",
-                          { unnumb: false, container: true })
-          deflist_term_anchor_names(n, @anchors[n["id"]])
-        end
-      end
-
-      def deflist_term_anchor_names(list, list_anchor)
-        list.xpath(ns("./dt")).each do |li|
-          label = deflist_term_anchor_lbl(li, list_anchor)
-          li["id"] and @anchors[li["id"]] =
-                         { xref: label, type: "deflistitem",
-                           container: list_anchor[:container] }
-          li.xpath(ns("./dl")).each do |dl|
-            deflist_term_anchor_names(dl, list_anchor)
-          end
-        end
-      end
-
-      def deflist_term_anchor_lbl(listitem, list_anchor)
-        s = semx(listitem, dt2xreflabel(listitem))
-        %(#{list_anchor[:xref]}#{delim_wrap(":")} #{s}</semx>)
-      end
-
-      def dt2xreflabel(dterm)
-        label = dterm.dup
-        label.xpath(ns(".//p")).each { |x| x.replace(x.children) }
-        label.xpath(ns(".//index")).each(&:remove)
-        Common::to_xml(label.children)
-      end
-
       def id_ancestor(node)
         parent = nil
         node.ancestors.each do |a|

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -56,6 +56,7 @@ module IsoDoc
             { unnumb: elem["unnumbered"], container: }
           )
         end
+        nested_notes(elem)
       end
 
       def fig_subfig_label(label, sublabel)
@@ -87,6 +88,7 @@ module IsoDoc
             c.increment(t).print, t, @labels["table"], "table",
             { unnumb: t["unnumbered"], container: container }
           )
+          nested_notes(t)
         end
       end
 
@@ -114,11 +116,6 @@ module IsoDoc
         end
       end
 
-      def delim_wrap(delim, klass = "fmt-autonum-delim")
-        delim.blank? and return ""
-        "<span class='#{klass}'><esc>#{delim}</esc></span>"
-      end
-
       def sequential_permission_children(elem, lbl, klass, container: false)
         elem.xpath(ns(req_children)).noblank
           .each_with_object(ReqCounter.new) do |t, c|
@@ -137,23 +134,29 @@ container: false)
         lbl = parent_id ? "#{parent_id}#{subreqt_separator}#{id}" : id
         e = elem["id"] || elem["original-id"]
         @anchors[e] = model.postprocess_anchor_struct(
-          elem, anchor_struct(lbl, elem,
-                              label, klass, { unnumb: elem["unnumbered"], container: })
+          elem, anchor_struct(lbl, elem, label, klass,
+                              { unnumb: elem["unnumbered"], container: })
         )
+        nested_notes(elem)
+        nested_examples(elem)
         @anchors[e][:semx] = semx(elem, lbl)
-        if parent_id
-          x = "#{subreqt_separator(markup: true)}#{semx(elem, id)}"
-          @anchors[e][:semx] = @anchors[elem.parent["id"] || elem.parent["original-id"]][:semx] + x
-          @anchors[e][:label] =
-            "<span class='fmt-element-name'>#{label}</span> #{@anchors[e][:semx]}"
-          @anchors[e][:xref] = @anchors[e][:label]
-        end
+        sequential_permission_body_parent_id(id, parent_id, elem, label, e)
         model.permission_parts(elem, id, label, klass).each do |n|
           @anchors[n[:id]] = anchor_struct(n[:number], n[:elem], n[:label],
                                            n[:klass], { unnumb: false, container: })
         end
       end
 
+      def sequential_permission_body_parent_id(id, parent_id, elem, label, e)
+        parent_id or return
+        x = "#{subreqt_separator(markup: true)}#{semx(elem, id)}"
+        @anchors[e][:semx] =
+          @anchors[elem.parent["id"] || elem.parent["original-id"]][:semx] + x
+        @anchors[e][:label] =
+          "<span class='fmt-element-name'>#{label}</span> #{@anchors[e][:semx]}"
+        @anchors[e][:xref] = @anchors[e][:label]
+      end
+
       def reqt2class_label(elem, model)
         elem["class"] and return [elem["class"], elem["class"]]
         model.req_class_paths.each do |n|
@@ -207,6 +210,7 @@ container: false)
               anchor_struct(hiersemx(clause, num, c.increment(t), t),
                             t, @labels["table"], "table",
                             { unnumb: t["unnumbered"], container: false })
+            nested_notes(t)
           end
         end
       end

data/lib/isodoc/xref/xref_list_gen.rb

@@ -0,0 +1,107 @@
+module IsoDoc
+  module XrefGen
+    module Blocks
+      def list_anchor_names(sections)
+        sections.each do |s|
+          notes = s.xpath(ns(".//ol")) - s.xpath(ns(".//clause//ol")) -
+            s.xpath(ns(".//appendix//ol")) - s.xpath(ns(".//ol//ol"))
+          c = list_counter(0, {})
+          notes.noblank.each do |n|
+            @anchors[n["id"]] =
+              anchor_struct(increment_label(notes, n, c), n,
+                            @labels["list"], "list",
+                            { unnumb: false, container: true })
+            list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
+          end
+          list_anchor_names(s.xpath(ns(child_sections)))
+        end
+      end
+
+      def list_item_delim
+        ")"
+      end
+
+      def list_item_anchor_names(list, list_anchor, depth, prev_label,
+refer_list)
+        c = list_counter(list["start"] ? list["start"].to_i - 1 : 0, {})
+        list.xpath(ns("./li")).each do |li|
+          bare_label, label =
+            list_item_value(li, c, depth,
+                            { list_anchor:, prev_label:,
+                              refer_list: depth == 1 ? refer_list : nil })
+          @anchors[li["id"]] =
+            { label: bare_label, bare_xref: "#{label})", type: "listitem",
+              xref: %[#{label}#{delim_wrap(list_item_delim)}], refer_list:,
+              container: list_anchor[:container] }
+          (li.xpath(ns(".//ol")) - li.xpath(ns(".//ol//ol"))).each do |ol|
+            list_item_anchor_names(ol, list_anchor, depth + 1, label,
+                                   refer_list)
+          end
+        end
+      end
+
+      def list_item_value(entry, counter, depth, opts)
+        label = counter.increment(entry).listlabel(entry.parent, depth)
+        s = semx(entry, label)
+        [label,
+         list_item_anchor_label(s, opts[:list_anchor], opts[:prev_label],
+                                opts[:refer_list])]
+      end
+
+      def list_item_anchor_label(label, list_anchor, prev_label, refer_list)
+        prev_label.empty? or
+          label = @klass.connectives_spans(@i18n.list_nested_xref
+            .sub("%1", %[#{prev_label}#{delim_wrap(list_item_delim)}])
+            .sub("%2", label))
+        refer_list and
+          label = @klass.connectives_spans(@i18n.list_nested_xref
+            .sub("%1", list_anchor[:xref])
+            .sub("%2", label))
+        label
+      end
+
+      def deflist_anchor_names(sections)
+        sections.each do |s|
+          notes = s.xpath(ns(".//dl")) - s.xpath(ns(".//clause//dl")) -
+            s.xpath(ns(".//appendix//dl")) - s.xpath(ns(".//dl//dl"))
+          deflist_anchor_names1(notes, Counter.new)
+          deflist_anchor_names(s.xpath(ns(child_sections)))
+        end
+      end
+
+      def deflist_anchor_names1(notes, counter)
+        notes.noblank.each do |n|
+          @anchors[n["id"]] =
+            anchor_struct(increment_label(notes, n, counter), n,
+                          @labels["deflist"], "deflist",
+                          { unnumb: false, container: true })
+          deflist_term_anchor_names(n, @anchors[n["id"]])
+        end
+      end
+
+      def deflist_term_anchor_names(list, list_anchor)
+        list.xpath(ns("./dt")).each do |li|
+          label = deflist_term_anchor_lbl(li, list_anchor)
+          li["id"] and @anchors[li["id"]] =
+                         { xref: label, type: "deflistitem",
+                           container: list_anchor[:container] }
+          li.xpath(ns("./dl")).each do |dl|
+            deflist_term_anchor_names(dl, list_anchor)
+          end
+        end
+      end
+
+      def deflist_term_anchor_lbl(listitem, list_anchor)
+        s = semx(listitem, dt2xreflabel(listitem))
+        %(#{list_anchor[:xref]}#{delim_wrap(":")} #{s}</semx>)
+      end
+
+      def dt2xreflabel(dterm)
+        label = dterm.dup
+        label.xpath(ns(".//p")).each { |x| x.replace(x.children) }
+        label.xpath(ns(".//index")).each(&:remove)
+        Common::to_xml(label.children)
+      end
+    end
+  end
+end

data/lib/isodoc/xref/xref_sect_asset.rb

@@ -7,7 +7,6 @@ module IsoDoc
         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)

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -162,7 +162,6 @@ module IsoDoc
         xref = labelled_autonum(@labels["clause"], num)
         label = num
         c = clause_title(clause) and title = semx(clause, c, "title")
-        #clause["id"] ||= "_#{UUIDTools::UUID.random_create}"
         @anchors[clause["id"]] =
           { label:, xref:, title:, level:, type: "clause",
             elem: @labels["clause"] }
@@ -184,7 +183,6 @@ module IsoDoc
         level == 1 && clause.name == "annex" and
           label = annex_name_lbl(clause, label)
         c = clause_title(clause) and title = semx(clause, c, "title")
-        #clause["id"] ||= "_#{UUIDTools::UUID.random_create}"
         @anchors[clause["id"]] =
           { label:, xref: labelled_autonum(@labels["annex"], num), title:,
             elem: @labels["annex"], type: "clause",

data/lib/isodoc/xref.rb

@@ -3,6 +3,7 @@ require_relative "xref/xref_counter"
 require_relative "xref/xref_counter_types"
 require_relative "xref/xref_gen_seq"
 require_relative "xref/xref_gen"
+require_relative "xref/xref_list_gen"
 require_relative "xref/xref_sect_gen"
 require_relative "xref/xref_util"
 require_relative "class_utils"

data/lib/isodoc/xslfo_convert.rb

@@ -15,7 +15,11 @@ module IsoDoc
                        pdfallowprinthq: "--allow-print-hq",
                        pdfstylesheet: "--xsl-file",
                        pdfstylesheet_override: "--xsl-file-override",
-                       pdfencryptmetadata: "--encrypt-metadata" }.freeze
+                       pdfportfolio: "--pdf-portfolio",
+                       pdfencryptmetadata: "--encrypt-metadata",
+                       pdfkeystore: "--keystore",
+                       pdfkeystorepassword: "--keystore-password",
+                         }.freeze
     MN2PDF_DEFAULT_ARGS = { "--syntax-highlight": nil }.freeze
 
     def initialize(options)

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

@@ -83,6 +83,7 @@ no_identifier: (لا يوجد معرف)
 and: و
 all_parts: كل الأجزاء
 edition_ordinal: "ﺎﻠﻄﺒﻋﺓ؜ {{ var1 | ordinal_word: 'edition', '' }}"
+edition_cardinal: "ﺎﻠﻄﺒﻋﺓ؜ {{ var1' }}"
 edition: الطبعة؜ ؜
 version: الإصدار
 toc_figures: جدول الأرقام
@@ -108,6 +109,14 @@ admonition:
   important: مهم
   safety precautions: احتياطات السلامة
   editorial: ملاحظة تحريرية
+title_prefixes:
+  part: الجملة
+  amendment: مسودة التعديل
+  corrigendum: التصحيح
+  addendum: الملحق
+  supplement: ملحق
+  annex: ملحق
+  appendix: ملحق
 locality:
   section: قسم
   clause: فقرة

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

@@ -95,6 +95,7 @@ and: und
 no_identifier: (KEIN KENNUNG)
 all_parts: Alle Teile
 edition_ordinal: "{{ var1 | ordinal_word: 'edition', '' }} Auflage"
+edition_cardinal: "Auflage {{ var1 }}"
 edition: Auflage
 version: Version
 toc_figures: Abbildungsverzeichnis
@@ -121,6 +122,14 @@ admonition: {
   safety precautions: Sicherheitsvorkehrungen,
   editorial: Redaktioneller Hinweis
 }
+title_prefixes:
+  part: Satz
+  amendment: Änderungsentwurf
+  corrigendum: Berichtigung
+  addendum: Nachtrag
+  supplement: Ergänzung
+  annex: Anhang
+  appendix: Anhang
 locality: {
   section: Abschnitt,
   clause: Klausel,

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

@@ -95,6 +95,7 @@ source: SOURCE
 and: and
 all_parts: All Parts
 edition_ordinal: "{{ var1 | ordinal_word: '', '' }} edition"
+edition_cardinal: "edition {{ var1 }}"
 edition: edition
 version: version
 toc_figures: List of figures
@@ -121,6 +122,14 @@ admonition: {
   safety precautions: Safety Precautions,
   editorial: Editorial Note
 }
+title_prefixes:
+  part: Part
+  amendment: Amendment
+  corrigendum: Corrigendum
+  addendum: Addendum
+  supplement: Supplement
+  annex: Annex
+  appendix: Appendix
 locality: {
                       section: Section,
                       clause: Clause,

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

@@ -93,6 +93,7 @@ and: y
 no_identifier: (SIN IDENTIFICADOR)
 all_parts: Todas las partes
 edition_ordinal: "{{ var1 | ordinal_word: 'edition', '' }} edición"
+edition_cardinal: "edición {{ var1 }}"
 edition: edición
 version: versión
 toc_figures: Table de figuras
@@ -119,6 +120,14 @@ admonition: {
   safety precautions: Precauciones de seguridad,
   editorial: Note editorial
 }
+title_prefixes:
+  part: Parte
+  amendment: Nnmienda
+  corrigendum: Corrección
+  addendum: Apéndice
+  supplement: Suplemento
+  annex: Anexo
+  appendix: Apéndice
 locality: {
                       section: Sección,
                       clause: Cláusula,

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

@@ -92,6 +92,7 @@ and: et
 no_identifier: (PAS D'IDENTIFIANT)
 all_parts: toutes les parties
 edition_ordinal: "{{ var1 | ordinal_word: 'edition', '' }} édition"
+edition_cardinal: "édition {{ var1 }}"
 edition: édition
 toc_figures: Table des figures
 toc_tables: Table des tableaux
@@ -117,6 +118,14 @@ admonition: {
   safety precautions: Précautions de Sécurité,
   editorial: Note éditoriale
 }
+title_prefixes:
+  part: Partie
+  amendment: Amendement
+  corrigendum: Rectificatif
+  addendum: Additif
+  supplement: Supplément
+  annex: Annexe
+  appendix: Appendice
 locality: {
                       section: Section,
                       clause: Article,

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

@@ -95,6 +95,7 @@ and: and
 no_identifier: (識別子なし)
 all_parts: 規格群
 edition_ordinal: "第{{ var1 }}版"
+edition_cardinal: "第{{ var1 }}版"
 edition: 版
 version: 版
 toc_figures: List of figures
@@ -121,6 +122,14 @@ admonition: {
   safety precautions: 安全上の注意,
   editorial: 編集者注
 }
+title_prefixes:
+  part: その
+  amendment: Amendment
+  corrigendum: Corrigendum
+  addendum: Addendum
+  supplement: Supplement
+  annex: Annex
+  appendix: Appendix
 locality: {
                       section: セクション,
                       clause: 箇条,

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

@@ -157,6 +157,7 @@ and: и
 no_identifier: (БЕЗ ИДЕНТИФИКАТОРА)
 all_parts: Все части
 edition_ordinal: "{{ var1 | ordinal_word: 'edition', '' }} издание"
+edition_cardinal: "издание {{ var1 }}"
 edition: издание
 version: версия
 toc_figures: Таблица фигур
@@ -183,6 +184,14 @@ admonition: {
   safety precautions: Меры безопасности,
   editorial: Редакционная Заметка
 }
+title_prefixes:
+  part: Часть
+  amendment: Поправка
+  corrigendum: Исправление
+  addendum: Дополнение
+  supplement: Дополнение
+  annex: Приложение
+  appendix: Приложение
 locality: {
                       section: Раздел,
                       clause: Пункт,

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -84,6 +84,7 @@ and: 和
 no_identifier: （无标识符）
 all_parts: 所有部分
 edition_ordinal: "第{{ var1 | ordinal_word: '', '' }}版"
+edition_cardinal: "第{{ var1 }}版"
 edition: 版
 version: 版本
 toc_figures: 数字列表
@@ -110,6 +111,14 @@ admonition: {
   safety precautions: 安全须知,
   editorial: 编辑说明
 }
+title_prefixes:
+  part: 部分
+  amendment: 修正
+  corrigendum: 更正
+  addendum: 附录
+  supplement: 补充文件
+  annex: 附件
+  appendix: 附录
 locality: {
   section: 条,
   clause: 条,