isodoc 3.6.4 → 3.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbef10c1b48e76bcdc86a92373281615568abc1071f9cdec9da4573abf977389
-  data.tar.gz: 673b18c0b04aab2fdb06430c7aa048b8dd89cf2a9ef8d7dcde05c0593153c832
+  metadata.gz: 7afaca0661a1ca0321fb479d3f1d1db9b2687bf63d668c69778cb13ac8caaec9
+  data.tar.gz: 822fe85bb3ffd7966aac0ff7f6bbbc5cc8e79759664f81c1df804767e2b1ce86
 SHA512:
-  metadata.gz: 8ca8e03077152b0ad5cd65b7662bb3955d058d7fd8d9e8d64ee9ce9d657290379b7e961ee3acd21726a128fdf307780faa125304f77fdb15b94475d3ac2fee9c
-  data.tar.gz: b128cec20abd8b0557497cac5f63784a228d1ff7a28cc0d849e73af99fa6486325ced1d3a9ebd4903e9206840ca10cc58cc74c0ccec31b11e60408b02cecbad2
+  metadata.gz: 4840fd50ec5c71c4bf7202bc9ffcc87bdd1f756ae2c58212b627f78633e87333c935926f921b0c276a83fd4c1ab279ed9d3a3b3b34605ac215261506f59dc600
+  data.tar.gz: 9afda013dcdfb71c8ee962cfe787b2b24e997613b2b1fd644e0e751cf521290aad51ec1c0859254c0c27ba087abe2839ad9419b846c33ae287f5784bb4e6b319

data/isodoc.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   # spec.add_dependency "metanorma-utils", "~> 1.5.0" # already in isodoc-i18n
   spec.add_dependency "mn2pdf", ">= 2.13"
   spec.add_dependency "mn-requirements", "~> 0.5.0"
-  spec.add_dependency "relaton-render", "~> 1.2.0"
+  spec.add_dependency "relaton-render", "~> 1.3.0"
   spec.add_dependency "roman-numerals"
   spec.add_dependency "rouge", "~> 4.0"
   spec.add_dependency "thread_safe"

data/lib/isodoc/convert.rb

@@ -45,6 +45,7 @@ module IsoDoc
     # tocfigures: add ToC for figures
     # toctables: add ToC for tables
     # tocrecommendations: add ToC for rcommendations
+    # tocexamples: add ToC for examples
     # fonts: fontist fonts to install
     # fontlicenseagreement: fontist font license agreement
     # modspecidentifierbase: base prefix for any Modspec identifiers

data/lib/isodoc/function/blocks_example_note.rb

@@ -51,7 +51,26 @@ module IsoDoc
       end
 
       def example_parse(node, out)
-        example_div_parse(node, out)
+        if node["collapsible"] == "true"
+          example_collapsible_parse(node, out)
+        else
+          example_div_parse(node, out)
+        end
+      end
+
+      # HTML5 collapsible example: label in <summary>, body in the example div
+      def example_collapsible_parse(node, out)
+        out.details(open: "open") do |det|
+          name = node.at(ns("./fmt-name"))
+          det.summary do |s|
+            name and children_parse(name, s)
+          end
+          det.div(**example_div_attr(node)) do |div|
+            node.children.each do |n|
+              parse(n, div) unless n.name == "fmt-name"
+            end
+          end
+        end
       end
 
       def block_body_first_elem(node)

data/lib/isodoc/init.rb

@@ -169,6 +169,7 @@ module IsoDoc
       @tocfigures = options[:tocfigures]
       @toctables = options[:toctables]
       @tocrecommendations = options[:tocrecommendations]
+      @tocexamples = options[:tocexamples]
     end
 
     AGENCIES = %w(ISO IEC ITU IETF NIST OGC IEEE BIPM BSI BS JIS IANA UN W3C

data/lib/isodoc/presentation_function/metadata.rb

@@ -93,15 +93,17 @@ module IsoDoc
     end
 
     def toc_metadata(docxml)
-      @tocfigures || @toctables || @tocrecommendations or return
+      @tocfigures || @toctables || @tocrecommendations || @tocexamples or return
       ins = extension_insert(docxml)
       @tocfigures and
         ins.add_child "<toc type='figure'><title>#{@i18n.toc_figures}</title></toc>"
       @toctables and
         ins << "<toc type='table'><title>#{@i18n.toc_tables}</title></toc>"
-      @tocfigures and
+      @tocrecommendations and
         ins << "<toc type='recommendation'><title>#{@i18n.toc_recommendations}" \
         "</title></toc>"
+      @tocexamples and
+        ins << "<toc type='example'><title>#{@i18n.toc_examples}</title></toc>"
     end
 
     def fonts_metadata(xmldoc)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "3.6.4".freeze
+  VERSION = "3.6.6".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -161,6 +161,7 @@ module IsoDoc
         @toctablestitle = xml.at(ns("//#{toc}[@type = 'table']/title"))&.text
         @tocrecommendationstitle =
           xml.at(ns("//#{toc}[@type = 'recommendation']/title"))&.text
+        @tocexamplestitle = xml.at(ns("//#{toc}[@type = 'example']/title"))&.text
       end
 
       def table_of_contents(clause, out)

data/lib/isodoc/word_function/postprocess_toc.rb

@@ -27,6 +27,7 @@ module IsoDoc
         toc += make_table_word_toc(docxml)
         toc += make_figure_word_toc(docxml)
         toc += make_recommendation_word_toc(docxml)
+        toc += make_example_word_toc(docxml)
         toc
       end
 
@@ -91,6 +92,10 @@ module IsoDoc
            recommendationtitle recommendationtesttitle)
       end
 
+      def example_toc_class
+        %w(example-title)
+      end
+
       def toc_word_class_list(classes)
         classes.map { |x| "#{x},1" }.join(",")
       end
@@ -117,6 +122,13 @@ module IsoDoc
         TOC
       end
 
+      def word_toc_example_preface1
+        <<~TOC
+          <span lang="EN-GB"><span style='mso-element:field-begin'></span><span style='mso-spacerun:yes'>&#xA0;</span>TOC
+          \\h \\z \\t "#{toc_word_class_list example_toc_class}" <span style='mso-element:field-separator'></span></span>
+        TOC
+      end
+
       def table_toc_xpath
         attr = table_toc_class.map { |x| "@class = '#{x}'" }
         "//p[#{attr.join(' or ')}]"
@@ -164,6 +176,21 @@ module IsoDoc
                 %{\\1#{word_toc_reqt_preface1}}) + WORD_TOC_SUFFIX1
       end
 
+      def example_toc_xpath
+        attr = example_toc_class.map { |x| "@class = '#{x}'" }
+        "//p[#{attr.join(' or ')}]"
+      end
+
+      def make_example_word_toc(docxml)
+        (docxml.at(example_toc_xpath) && @tocexamplestitle) or return ""
+        toc = %{<p class="TOCTitle">#{@tocexamplestitle}</p>}
+        docxml.xpath(example_toc_xpath).each do |h|
+          toc += word_toc_entry(1, header_strip(h))
+        end
+        toc.sub(/(<p class="MsoToc1">)/,
+                %{\\1#{word_toc_example_preface1}}) + WORD_TOC_SUFFIX1
+      end
+
       def recommmendation_sort_key(header)
         m = /^([^0-9]+) (\d+)/.match(header) || /^([^:]+)/.match(header)
         m ||= [header, nil]

data/lib/isodoc/xslfo_convert.rb

@@ -20,7 +20,7 @@ module IsoDoc
                        pdfkeystore: "--keystore",
                        pdfkeystorepassword: "--keystore-password",
                          }.freeze
-    MN2PDF_DEFAULT_ARGS = { "--syntax-highlight": nil }.freeze
+    MN2PDF_DEFAULT_ARGS = { }.freeze
 
     def initialize(options)
       @format = :pdf

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

@@ -90,6 +90,7 @@ version: الإصدار
 toc_figures: جدول الأرقام
 toc_tables: جدول الجداول
 toc_recommendations: جدول التوصيات
+toc_examples: جدول الأمثلة
 month_january: يناير
 month_february: فبراير
 month_march: مارس
@@ -111,13 +112,13 @@ admonition:
   safety precautions: احتياطات السلامة
   editorial: ملاحظة تحريرية
 title_prefixes:
-  part: الجملة
-  amendment: مسودة التعديل
-  corrigendum: التصحيح
-  addendum: الملحق
-  supplement: ملحق
-  annex: ملحق
-  appendix: ملحق
+  part: "{{ var1 }}الجملة"
+  amendment: "{{ var1 }}مسودة التعديل"
+  corrigendum: "{{ var1 }}التصحيح"
+  addendum: "{{ var1 }}الملحق"
+  supplement: "{{ var1 }}ملحق"
+  annex: "{{ var1 }}ملحق"
+  appendix: "{{ var1 }}ملحق"
 locality:
   section: قسم
   clause: فقرة

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

@@ -102,6 +102,7 @@ version: Version
 toc_figures: Abbildungsverzeichnis
 toc_tables: Tabellenverzeichnis
 toc_recommendations: Empfehlungenverzeichnis
+toc_examples: Beispielverzeichnis
 month_january: Januar
 month_february: Februar
 month_march: März
@@ -124,13 +125,13 @@ admonition: {
   editorial: Redaktioneller Hinweis
 }
 title_prefixes:
-  part: Satz
-  amendment: Änderungsentwurf
-  corrigendum: Berichtigung
-  addendum: Nachtrag
-  supplement: Ergänzung
-  annex: Anhang
-  appendix: Anhang
+  part: "Satz {{ var1 }}"
+  amendment: "Änderungsentwurf {{ var1 }}"
+  corrigendum: "Berichtigung {{ var1 }}"
+  addendum: "Nachtrag {{ var1 }}"
+  supplement: "Ergänzung {{ var1 }}"
+  annex: "Anhang {{ var1 }}"
+  appendix: "Anhang {{ var1 }}"
 locality: {
   section: Abschnitt,
   clause: Klausel,

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

@@ -102,6 +102,7 @@ version: version
 toc_figures: List of figures
 toc_tables: List of tables
 toc_recommendations: List of recommendations
+toc_examples: List of examples
 month_january: January
 month_february: February
 month_march: March
@@ -124,13 +125,13 @@ admonition: {
   editorial: Editorial Note
 }
 title_prefixes:
-  part: Part
-  amendment: Amendment
-  corrigendum: Corrigendum
-  addendum: Addendum
-  supplement: Supplement
-  annex: Annex
-  appendix: Appendix
+  part: "Part {{ var1 }}"
+  amendment: "Amendment {{ var1 }}"
+  corrigendum: "Corrigendum {{ var1 }}"
+  addendum: "Addendum {{ var1 }}"
+  supplement: "Supplement {{ var1 }}"
+  annex: "Annex {{ var1 }}"
+  appendix: "Appendix {{ var1 }}"
 locality: {
                       section: Section,
                       clause: Clause,

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

@@ -100,6 +100,7 @@ version: versión
 toc_figures: Table de figuras
 toc_tables: Tabla de tablas
 toc_recommendations: Tabla de recomendaciones
+toc_examples: Tabla de ejemplos
 month_january: Enero
 month_february: Febrero
 month_march: Marzo
@@ -122,13 +123,13 @@ admonition: {
   editorial: Note editorial
 }
 title_prefixes:
-  part: Parte
-  amendment: Nnmienda
-  corrigendum: Corrección
-  addendum: Apéndice
-  supplement: Suplemento
-  annex: Anexo
-  appendix: Apéndice
+  part: "Parte {{ var1 }}"
+  amendment: "Enmienda {{ var1 }}"
+  corrigendum: "Corrección {{ var1 }}"
+  addendum: "Apéndice {{ var1 }}"
+  supplement: "Suplemento {{ var1 }}"
+  annex: "Anexo {{ var1 }}"
+  appendix: "Apéndice {{ var1 }}"
 locality: {
                       section: Sección,
                       clause: Cláusula,

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

@@ -98,6 +98,7 @@ edition: édition
 toc_figures: Table des figures
 toc_tables: Table des tableaux
 toc_recommendations: Table de recommandations
+toc_examples: Table des exemples
 month_january: Janvier
 month_february: Février
 month_march: Mars
@@ -120,13 +121,13 @@ admonition: {
   editorial: Note éditoriale
 }
 title_prefixes:
-  part: Partie
-  amendment: Amendement
-  corrigendum: Rectificatif
-  addendum: Additif
-  supplement: Supplément
-  annex: Annexe
-  appendix: Appendice
+  part: "Partie {{ var1 }}"
+  amendment: "Amendement {{ var1 }}"
+  corrigendum: "Rectificatif {{ var1 }}"
+  addendum: "Additif {{ var1 }}"
+  supplement: "Supplément {{ var1 }}"
+  annex: "Annexe {{ var1 }}"
+  appendix: "Appendice {{ var1 }}"
 locality: {
                       section: Section,
                       clause: Article,

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

@@ -101,6 +101,7 @@ version: 版
 toc_figures: 図一覧
 toc_tables: 表一覧
 toc_recommendations: 推奨一覧
+toc_examples: 例一覧
 month_january: 1月
 month_february: 2月
 month_march: 3月

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

@@ -164,6 +164,7 @@ version: версия
 toc_figures: Таблица фигур
 toc_tables: Таблица таблиц
 toc_recommendations: Таблица рекомендаций
+toc_examples: Таблица примеров
 month_january: Январь
 month_february: Февраль
 month_march: Март
@@ -186,13 +187,13 @@ admonition: {
   editorial: Редакционная Заметка
 }
 title_prefixes:
-  part: Часть
-  amendment: Поправка
-  corrigendum: Исправление
-  addendum: Дополнение
-  supplement: Дополнение
-  annex: Приложение
-  appendix: Приложение
+  part: "Часть {{ var1 }}"
+  amendment: "Поправка {{ var1 }}"
+  corrigendum: "Исправление {{ var1 }}"
+  addendum: "Добавление {{ var1 }}"
+  supplement: "Дополнительный документ {{ var1 }}"
+  annex: "Приложение {{ var1 }}"
+  appendix: "Дополнение {{ var1 }}"
 locality: {
                       section: Раздел,
                       clause: Пункт,

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

@@ -91,6 +91,7 @@ version: 版本
 toc_figures: 数字列表
 toc_tables: 表列表
 toc_recommendations: 建议清单
+toc_examples: 示例列表
 month_january: 一月
 month_february: 二月
 month_march: 三月
@@ -113,13 +114,13 @@ admonition: {
   editorial: 编辑说明
 }
 title_prefixes:
-  part: 部分
-  amendment: 修正
-  corrigendum: 更正
-  addendum: 附录
-  supplement: 补充文件
-  annex: 附件
-  appendix: 附录
+  part: "第{{ var1 }}部分"
+  amendment: "修正案{{ var1 }}"
+  corrigendum: "技术勘误{{ var1 }}"
+  addendum: "增编{{ var1 }}"
+  supplement: "补充件{{ var1 }}"
+  annex: "附件{{ var1 }}"
+  appendix: "附录{{ var1 }}"
 locality: {
   section: 条,
   clause: 条,

data/lib/relaton/render-isodoc/config.yml

@@ -1,4 +1,4 @@
 template:
   # skip authoritative identifier, it is inserted in front of formattedref within metanorma
-  standard: "{% if creatornames %}{{ creatornames }} ({{ role}}){%else%}{{publisher}}{%endif%} $$$ <em>{{ title }}</em> $$$ {{ medium | capitalize }}$$$ {{ edition | capitalize_first }}$$$ {{date}}$$$ {{place}}: {%if  creatornames %}{{publisher}}{% endif %} $$$ {{size}}$$$ {{ extent }}$$$ {{ uri }}$$$ {{ labels['at'] | capitalize}}:_{{ access_location }}$$$ [{{ labels['viewed'] }}:_{{date_accessed}}]"
+  standard: "{% if creatornames %}{{ creatornames }} ({{ role}}){%else%}{{publisher}}{%endif%} $$$ <em>{{ title }}</em> $$$ {{ medium | capitalize }}$$$ {{ edition | capitalize_first }}$$$ {{date}}$$$ {{place}}: {%if  creatornames %}{{publisher}}{% endif %} $$$ {{size}}$$$ {{ extent }}$$$ {{ uri }}$$$ {{ labels['at_url'] | capitalize}}:_{{ access_location }}$$$ [{{ labels['viewed'] }}:_{{date_accessed}}]"
 

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.6.4
+  version: 3.6.6
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -86,14 +85,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: roman-numerals
   requirement: !ruby/object:Gem::Requirement
@@ -324,7 +323,6 @@ homepage: https://github.com/metanorma/isodoc
 licenses:
 - BSD-2-Clause
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -339,8 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Convert documents in IsoDoc into Word and HTML in AsciiDoc.
 test_files: []