isodoc 3.6.3 → 3.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e9e4612fb1a8151ba500dfc561dca2f22434b6b4981b842a3188d1203226a85
-  data.tar.gz: d7cd554782c88320a59b7bf5d0240c7d81deffdfb4e90861618d01e9f6690c7d
+  metadata.gz: bbef10c1b48e76bcdc86a92373281615568abc1071f9cdec9da4573abf977389
+  data.tar.gz: 673b18c0b04aab2fdb06430c7aa048b8dd89cf2a9ef8d7dcde05c0593153c832
 SHA512:
-  metadata.gz: 3fc09b5a526d031454b9c28f43e1bd1d682120bc9c3014ecc49deb9b9d82728e79f6b0e6410e1b3c5c0913a06499bc6b36b21ee447c8597e37152bd571182a54
-  data.tar.gz: 8dac1e10327f3b69ec52011f5ab4754726cc0973b31bcfebf594778672b5f487b3caba951bb636df3266959853c00fcdbf1b40940ab6e71885dc2c23c1a554f3
+  metadata.gz: 8ca8e03077152b0ad5cd65b7662bb3955d058d7fd8d9e8d64ee9ce9d657290379b7e961ee3acd21726a128fdf307780faa125304f77fdb15b94475d3ac2fee9c
+  data.tar.gz: b128cec20abd8b0557497cac5f63784a228d1ff7a28cc0d849e73af99fa6486325ced1d3a9ebd4903e9206840ca10cc58cc74c0ccec31b11e60408b02cecbad2

data/lib/isodoc/function/blocks_example_note.rb

@@ -109,8 +109,10 @@ module IsoDoc
       end
 
       def note_attrs(node)
-        attr_code(id: node["id"], class: "Note", style: keep_style(node),
-                  coverpage: node["coverpage"])
+        classes = node["type"]&.split(",") || []
+        classes << "Note"
+        attr_code(id: node["id"], class: classes.join(" "),
+                  style: keep_style(node), coverpage: node["coverpage"])
       end
 
       def note_parse(node, out)

data/lib/isodoc/presentation_function/block.rb

@@ -74,32 +74,46 @@ module IsoDoc
     end
 
     def admonition1(elem)
-      if elem["type"] == "box"
-        admonition_numbered1(elem)
-      elsif elem["notag"] == "true" || elem.at(ns("./name"))
-        prefix_name(elem, { label: admonition_delim(elem) }, nil, "name")
-      else
-        label = admonition_label(elem, nil)
-        prefix_name(elem, { label: admonition_delim(elem) }, label, "name")
-      end
-    end
-
-    def admonition_numbered1(elem)
-      label = admonition_label(elem,
+      lbl = if elem["type"] == "box"
+              admonition_label(elem,
                                @xrefs.anchor(elem["id"] || elem["original-id"],
                                              :label, false))
-      prefix_name(elem, { caption: block_delim }, label, "name")
+            elsif elem["notag"] == "true" then nil
+            elsif elem.at(ns("./name"))
+              admonition_icon(elem)
+            else admonition_label(elem, nil)
+            end
+      prefix_name(elem, admonition_options(elem), lbl, "name")
+    end
+
+    def admonition_options(elem)
+      options = { label: admonition_delim(elem) }
+      elem["type"] == "box" and options = { caption: block_delim }
+      options
     end
 
     def admonition_label(elem, num)
       lbl = if elem["type"] == "box" then @i18n.box
-            else @i18n.admonition[elem["type"]]&.upcase
+            else @i18n.labels.dig("admonition", elem["type"])&.upcase
             end
+      icon = admonition_icon(elem)
+      lbl = (icon || "") + (lbl || "")
       labelled_autonum(lbl, elem["id"] || elem["original-id"], num)
     end
 
-    def admonition_delim(_elem)
-      ""
+    def admonition_icon(elem)
+      icon = elem.document
+        .at(ns("//presentation-metadata/admonition-icon-#{elem['type']}"))&.text
+      icon ||= @i18n.labels.dig("admonition-icon", elem["type"])
+      icon and return "<span class='fmt-admonition-icon'>#{icon}</span>"
+    end
+
+    def admonition_delim(elem)
+      if elem["type"] == "box"
+        block_delim
+      else
+        ""
+      end
     end
 
     def table(docxml)

data/lib/isodoc/presentation_function/designations.rb

@@ -104,7 +104,6 @@ module IsoDoc
     end
 
     def designation_annotate(desgn, name, orig)
-      # designation_boldface(desgn)
       designation_expression(desgn, name, orig)
       designation_field(desgn, name, orig)
       designation_grammar(desgn, name)
@@ -114,13 +113,6 @@ module IsoDoc
       desgn.children = name.children
     end
 
-    # KILL
-    def designation_boldfacex(desgn)
-      desgn["element"] == "preferred" or return
-      name = desgn.at(ns("./expression/name | ./letter-symbol/name")) or return
-      name.children = "<strong>#{name.children}</strong>"
-    end
-
     def designation_expression(desgn, name, orig)
       if origname = orig.at(ns("./expression/name"))
         element = "expression/name"

data/lib/isodoc/version.rb

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

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

@@ -22,14 +22,14 @@ preface: 序文
 section: セクション
 clause: 箇条
 annex: 附属書
-appendix: Appendix
+appendix: 付録
 continued: 続き
 no_terms_boilerplate: |
           この規格には，定義する用語はない。
 internal_terms_boilerplate: |
         この規格で用いる主な用語及び定義は，次による。
 norm_with_refs_pref: 
-      次に掲げる引用規格は，この規格に引用されることによって，その一部又は全部がこの規格の要 求事項を構成している。これらの引用規格のうち，西暦年を付記してあるものは，記載の年の版を適 用し，その後の改正版(追補を含む。)は適用しない。西暦年の付記がない引用規格は，その最新版(追 補を含む。)を適用する。
+      次に掲げる引用規格は，この規格に引用されることによって，その一部又は全部がこの規格の要求事項を構成している。これらの引用規格のうち，西暦年を付記してあるものは，記載の年の版を適用し，その後の改正版(追補を含む。)は適用しない。西暦年の付記がない引用規格は，その最新版(追補を含む。)を適用する。
 norm_empty_pref: 
           この規格には，引用規格はない。
 external_terms_boilerplate: |
@@ -59,15 +59,14 @@ para_xref: 段落
 list: リスト
 deflist: 定義リスト
 figure: 図
-diagram: Diagram
+diagram: 図式
 formula: 式
 inequality: 式
 table: 表
 requirement: 要求
 recommendation: 推奨
 permission: 許可
-box: Box
-index: 索引
+box: 枠
 standard_no: 規格番号
 number: 番号
 # Modspec
@@ -84,24 +83,24 @@ example: 例
 example_xref: 例
 where: ここで，
 where_one: ここで，
-wholeoftext: Whole of text
-draft_label: draft
+wholeoftext: 全文
+draft_label: 案
 inform_annex: 参考
 norm_annex: 規定
 modified: を変更
 adapted: 適合しました
 deprecated: 推奨しない用語
 source: 出典
-and: and
+and: 及び
 no_identifier: (識別子なし)
 all_parts: 規格群
 edition_ordinal: "第{{ var1 }}版"
 edition_cardinal: "第{{ var1 }}版"
 edition: 版
 version: 版
-toc_figures: List of figures
-toc_tables: List of tables
-toc_recommendations: List of recommendations
+toc_figures: 図一覧
+toc_tables: 表一覧
+toc_recommendations: 推奨一覧
 month_january: 1月
 month_february: 2月
 month_march: 3月
@@ -114,7 +113,7 @@ month_september: 9月
 month_october: 10月
 month_november: 11月
 month_december: 12月
-obligation: Obligation
+obligation: 義務
 admonition: {
   danger: 危険です,
   warning: 警告,
@@ -124,20 +123,20 @@ admonition: {
   editorial: 編集者注
 }
 title_prefixes:
-  part: その
-  amendment: Amendment
-  corrigendum: Corrigendum
-  addendum: Addendum
-  supplement: Supplement
-  annex: Annex
-  appendix: Appendix
+  part: "第{{ var1 }}部"
+  amendment: "追補{{ var1 }}"
+  corrigendum: "正誤票{{ var1 }}"
+  addendum: "追録{{ var1 }}"
+  supplement: "補遺{{ var1 }}"
+  annex: "附属書{{ var1 }}"
+  appendix: "付録{{ var1 }}"
 locality: {
                       section: セクション,
                       clause: 箇条,
                       subclause: 細分箇条,
                       part: 部,
                       paragraph: 段落,
-                      chapter: 第章,
+                      chapter: 章,
                       page: ページ,
                       table: 表,
                       annex: 附属書,
@@ -147,94 +146,39 @@ locality: {
                       formula: 式,
                     }
 grammar_abbrevs:
-  masculine: m
-  feminine: f
-  neuter: n
-  common: common
-  singular: sg
-  dual: dual
-  pl: pl
-  isPreposition: prep
-  isParticiple: part
-  isAdjective: adj
-  isAdverb: adv
-  isNoun: noun
-  isVerb: verb
+  masculine: 男
+  feminine: 女
+  neuter: 中
+  common: 通
+  singular: 単
+  dual: 双
+  pl: 複
+  isPreposition: 前
+  isParticiple: 分
+  isAdjective: 形
+  isAdverb: 副
+  isNoun: 名
+  isVerb: 動
 relatedterms:
-  deprecates: deprecates
-  supersedes: supersedes
-  narrower: narrower
-  broader: broader
-  equivalent: equivalent
-  compare: compare
-  contrast: contrast
+  deprecates: 廃止
+  supersedes: 置換
+  narrower: 下位語
+  broader: 上位語
+  equivalent: 等価
+  compare: 比較
+  contrast: 対比
   see: 参照
-  seealso: see also
-inflection:
-  Clause:
-    sg: Clause
-    pl: Clauses
-  Annex:
-    sg: Annex
-    pl: Annexes
-  Appendix:
-    sg: Appendix
-    pl: Appendixes
-  Note:
-    sg: Note
-    pl: Notes
-  "Note % to entry":
-    sg: Note % to entry
-    pl: Notes % to entry
-  List:
-    sg: List
-    pl: Lists
-  Figure:
-    sg: Figure
-    pl: Figures
-  Formula:
-    sg: Formula
-    pl: Formulas
-  Table:
-    sg: Table
-    pl: Tables
-  Requirement:
-    sg: Requirement
-    pl: Requirements
-  Recommendation:
-    sg: Recommendation
-    pl: Recommendations
-  Permission:
-    sg: Permission
-    pl: Permissions
-  Example:
-    sg: Example
-    pl: Examples
-  Part:
-    sg: Part
-    pl: Parts
-  Section:
-    sg: Section
-    pl: Sections
-  Paragraph:
-    sg: Paragraph
-    pl: Paragraphs
-  Chapter:
-    sg: Chapter
-    pl: Chapters
-  Page:
-    sg: Page
-    pl: Pages
+  seealso: 追加参照
 doctype_dict:
   international-standard: 日本産業規格
   technical-specification: 標準仕様書
   technical-report: 標準報告書
-  publicly-available-specification: Publicly Available Specification
-  international-workshop-agreement: International Workshop Agreement
-  guide: Guide
+  publicly-available-specification: 公開仕様書
+  international-workshop-agreement: 国際ワークショップ協定
+  guide: 指針
   amendment: 追補
-  technical-corrigendum: Technical Corrigendum
-  directive: Directive
+  technical-corrigendum: 技術正誤票
+  directive: 指令
 punct:
   colon: "："
   comma: "、"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.6.3
+  version: 3.6.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-05-25 00:00:00.000000000 Z
+date: 2026-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64