isodoc 3.2.7 → 3.3.1

data/lib/isodoc/xref/xref_util.rb

@@ -1,7 +1,9 @@
 module Enumerable
   def noblank
     reject do |n|
-      n["id"].nil? || n["id"].empty?
+      (n["id"].nil? || n["id"].empty?) &&
+        # deal with possible temporary swap of id to original-id
+        (n["original-id"].nil? || n["original-id"].empty?)
     end
   end
 end
@@ -122,7 +124,7 @@ module IsoDoc
       # leave alone, else wrap in semx
       def semx(node, label, element = "autonum")
         label = label.to_s
-        id = node["id"] || node[:id]
+        id = node["id"] || node[:id] || node["original-id"]
         /<semx element='[^']+' source='#{id}'/.match?(label) and return label
         l = stripsemx(label)
         %(<semx element='#{element}' source='#{id}'>#{l}</semx>)
@@ -136,7 +138,7 @@ module IsoDoc
 
       def delim_wrap(delim, klass = "fmt-autonum-delim")
         delim.blank? and return ""
-        "<span class='#{klass}'>#{delim}</span>"
+        "<span class='#{klass}'><esc>#{delim}</esc></span>"
       end
 
       def stripsemx(elem)
@@ -153,7 +155,7 @@ module IsoDoc
 
       def labelled_autonum(label, autonum)
         label.blank? and return autonum
-        l10n("<span class='fmt-element-name'>#{label}</span> #{autonum}")
+        "<span class='fmt-element-name'>#{label}</span> #{autonum}"
       end
 
       def increment_label(elems, node, counter, increment: true)

data/lib/isodoc/xref.rb

@@ -78,11 +78,13 @@ module IsoDoc
       @parse_settings = {}
     end
 
-    def localise_anchors
+    def localise_anchors(type = nil)
       @anchors.each_value do |v|
-        v[:label] &&= l10n(v[:label])
-        v[:value] &&= l10n(v[:value])
-        v[:xref] &&= l10n(v[:xref])
+        type && v[:type] != type and next
+        %i(label value xref xref_bare modspec).each do |t|
+          v[t] && !v[t].empty? or next
+          v[t] = @i18n.l10n(v[t])
+        end
       end
     end
 
@@ -90,8 +92,9 @@ module IsoDoc
       Common::ns(xpath)
     end
 
-    def l10n(text, lang = @lang, script = @script, locale = @locale)
-      @i18n.l10n(text, lang, script, locale)
+    def l10n(expr, lang = @lang, script = @script, opt = {})
+      opt[:locale] ||= @locale
+      @i18n.l10n(expr, lang, script, opt)
     end
 
     include ::IsoDoc::XrefGen::Util

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

@@ -39,9 +39,9 @@ internal_external_terms_boilerplate: |
 no_information_available: "[情報はありません]"
 term_defined_in: "(%)"
 binary_and: "%1 <conn>及び</conn> %2"
-multiple_and: "%1<enum-comma>、</enum-comma>%2"
+multiple_and: "%1<enum-comma>#{ self.punct['enum-comma'] }</enum-comma>%2"
 binary_or: "%1 <conn>または</conn> %2"
-multiple_or: "%1<enum-comma>、</enum-comma> <conn>または</conn> %2"
+multiple_or: "%1<enum-comma>#{ self.punct['enum-comma'] }</enum-comma> <conn>または</conn> %2"
 chain_and: "%1 <conn>及び</conn> %2"
 chain_or: "%1 <conn>または</conn> %2"
 chain_from: "%1 <conn>から</conn> %2"
@@ -96,7 +96,6 @@ no_identifier: (識別子なし)
 all_parts: 規格群
 edition_ordinal: "第{{ var1 }}版"
 edition: 版
-version: version
 toc_figures: List of figures
 toc_tables: List of tables
 toc_recommendations: List of recommendations
@@ -225,3 +224,26 @@ doctype_dict:
   amendment: 追補
   technical-corrigendum: Technical Corrigendum
   directive: Directive
+punct:
+  colon: "："
+  comma: "、"
+  enum-comma: "、"
+  semicolon: "；"
+  period: "。"
+  close-paren: "）"
+  open-paren: "（"
+  close-bracket: "］"
+  open-bracket: "［"
+  question-mark: "？"
+  exclamation-mark: "！"
+  emphasis-mark: •
+  em-dash: ⸺
+  en-dash: "〜"
+  number-en-dash: "〜"
+  open-quote: "「"
+  close-quote: "」"
+  open-nested-quote: "『"
+  close-nested-quote: "』"
+  ellipse: ⋯⋯
+  cjk-latin-separator: "&#x2005;"
+

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

@@ -0,0 +1,22 @@
+punct:
+  colon: ":"
+  comma: ","
+  enum-comma: ","
+  semicolon: ";"
+  period: "."
+  close-paren: "）"
+  open-paren: "（"
+  close-bracket: "］"
+  open-bracket: "［"
+  question-mark: "?"
+  exclamation-mark: "!"
+  emphasis-mark: •
+  em-dash: ⸺
+  en-dash: "–"
+  number-en-dash: "〜"
+  open-quote: "“"
+  close-quote: "”"
+  open-nested-quote: "’"
+  close-nested-quote: "’"
+  ellipse: ⋯⋯
+

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

@@ -41,9 +41,9 @@ internal_external_terms_boilerplate: |
 no_information_available: "[无资料]"
 term_defined_in: "（%）"
 binary_and: "%1<conn>和</conn>%2"
-multiple_and: "%1<enum-comma>、</enum-comma><conn>和</conn>%2"
+multiple_and: "%1<enum-comma>#{ self.punct['enum-comma'] }</enum-comma><conn>和</conn>%2"
 binary_or: "%1<conn>或</conn>%2"
-multiple_or: "%1<enum-comma>、</enum-comma><conn>或</conn>%2"
+multiple_or: "%1<enum-comma>#{ self.punct['enum-comma'] }</enum-comma><conn>或</conn>%2"
 chain_and: "%1<conn>和</conn>%2"
 chain_or: "%1<conn>或</conn>%2"
 chain_from: "%1<conn>从</conn>%2"
@@ -147,4 +147,26 @@ relatedterms:
   contrast: 对比
   see: 见
   seealso: 参见
+punct:
+  colon: "："
+  comma: "，"
+  enum-comma: "、"
+  semicolon: "；"
+  period: "。"
+  close-paren: "）"
+  open-paren: "（"
+  close-bracket: "］"
+  open-bracket: "［"
+  question-mark: "？"
+  exclamation-mark: "！"
+  emphasis-mark: •
+  em-dash: ⸺
+  en-dash: "–"
+  number-en-dash: "〜"
+  open-quote: "“"
+  close-quote: "”"
+  open-nested-quote: "’"
+  close-nested-quote: "’"
+  ellipse: ⋯⋯
+  cjk-latin-separator: ""
 

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

@@ -0,0 +1,22 @@
+punct:
+  colon: "："
+  comma: "，"
+  enum-comma: "、"
+  semicolon: "；"
+  period: "。"
+  close-paren: "）"
+  open-paren: "（"
+  close-bracket: "］"
+  open-bracket: "［"
+  question-mark: "？"
+  exclamation-mark: "！"
+  emphasis-mark: •
+  em-dash: ⸺
+  en-dash: "–"
+  number-en-dash: "〜"
+  open-quote: "「"
+  close-quote: "」"
+  open-nested-quote: "『"
+  close-nested-quote: "』"
+  ellipse: ⋯⋯
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 3.2.7
+  version: 3.3.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-15 00:00:00.000000000 Z
+date: 2025-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: roman-numerals
   requirement: !ruby/object:Gem::Requirement
@@ -372,8 +372,10 @@ files:
 - lib/isodoc-yaml/i18n-es.yaml
 - lib/isodoc-yaml/i18n-fr.yaml
 - lib/isodoc-yaml/i18n-ja.yaml
+- lib/isodoc-yaml/i18n-ko.yaml
 - lib/isodoc-yaml/i18n-ru.yaml
 - lib/isodoc-yaml/i18n-zh-Hans.yaml
+- lib/isodoc-yaml/i18n-zh-Hant.yaml
 - lib/isodoc.rb
 - lib/isodoc/base_style/all.css
 - lib/isodoc/base_style/all.scss
@@ -440,8 +442,10 @@ files:
 - lib/isodoc/presentation_function/block.rb
 - lib/isodoc/presentation_function/cleanup.rb
 - lib/isodoc/presentation_function/concepts.rb
+- lib/isodoc/presentation_function/designations.rb
 - lib/isodoc/presentation_function/docid.rb
 - lib/isodoc/presentation_function/erefs.rb
+- lib/isodoc/presentation_function/erefs_locality.rb
 - lib/isodoc/presentation_function/footnotes.rb
 - lib/isodoc/presentation_function/ids.rb
 - lib/isodoc/presentation_function/image.rb