diff --git a/Gemfile.devel b/Gemfile.devel
new file mode 100644
index 0000000..ad72d40
--- /dev/null
+++ b/Gemfile.devel
@@ -0,0 +1 @@
+gem "isodoc", git: "https://github.com/metanorma/isodoc", branch: "fix/publisher-multilingual"
diff --git a/lib/isodoc/jis/i18n-en.yaml b/lib/isodoc/jis/i18n-en.yaml
index 36969f3..27a4191 100644
--- a/lib/isodoc/jis/i18n-en.yaml
+++ b/lib/isodoc/jis/i18n-en.yaml
@@ -6,6 +6,9 @@ commentary_page: Comm.
JIS: 日本工業規格
permission_footer: Duplication, reprinting, etc. without permission is prohibited by copyright law.
chairperson: chairperson
+membership_table: Membership Table
+full_name: Full Name
+affiliation: Affiliation
doctype_dict:
international-standard: International standard
japanese-industrial-standard: International standard
diff --git a/lib/isodoc/jis/i18n-ja.yaml b/lib/isodoc/jis/i18n-ja.yaml
index 3cfcf16..f755a43 100644
--- a/lib/isodoc/jis/i18n-ja.yaml
+++ b/lib/isodoc/jis/i18n-ja.yaml
@@ -11,6 +11,9 @@ JIS: 日本工業規格
draft_label: 案
white-paper: 白紙
chairperson: 委員会長
+membership_table: 構成表
+full_name: 氏名
+affiliation: 所属
doctype_dict:
international-standard: 日本産業規格
japanese-industrial-standard: 日本産業規格
diff --git a/lib/isodoc/jis/metadata.rb b/lib/isodoc/jis/metadata.rb
index 66a09a5..e5bc19f 100644
--- a/lib/isodoc/jis/metadata.rb
+++ b/lib/isodoc/jis/metadata.rb
@@ -73,20 +73,23 @@ def agency(xml)
investigative_committee(xml)
end
+ def extract_role(role, desc)
+ <<~XPATH
+ //bibdata/contributor[xmlns:role/@type = '#{role}'][xmlns:role/description = '#{desc}' or xmlns:role/description = '#{desc.downcase}']
+ XPATH
+ end
+
def investigative_organisation(xml)
- xpath = "//bibdata/contributor" \
- "[xmlns:role/@type = 'authorizer'][xmlns:role/description = " \
- "'investigative organization']/organization/name"
- org = xml.at(ns(xpath))
+ p = extract_role("authorizer", "Investigative organization")
+ org = xml.at(ns("#{p}/organization/name[@language = '#{@lang}']"))
+ org ||= xml.at(ns("#{p}/organization/name"))
if org then set_encoded(:"investigative-organization", org)
else set(:"investigative-organization", get[:publisher])
end
end
def investigative_committee(xml)
- xpath = "//bibdata/contributor" \
- "[xmlns:role/@type = 'authorizer'][xmlns:role/description = " \
- "'investigative committee']"
+ xpath = extract_role("authorizer", "Investigative committee")
if o = xml.at(ns("#{xpath}/organization/name"))
set_encoded(:"investigative-committee", o)
elsif p = xml.at(ns("#{xpath}/person"))
diff --git a/lib/isodoc/jis/presentation_section.rb b/lib/isodoc/jis/presentation_section.rb
index 601af4d..f97928f 100644
--- a/lib/isodoc/jis/presentation_section.rb
+++ b/lib/isodoc/jis/presentation_section.rb
@@ -42,17 +42,22 @@ def commentary_title_hdr(elem)
elem.previous = ret
end
- def toc_title_insert_pt(docxml)
- ins = docxml.at(ns("//preface")) ||
+ def make_preface(docxml)
+ docxml.at(ns("//preface")) ||
docxml.at(ns("//sections | //annex | //bibliography"))
&.before(" ")
- &.previous_element or return nil
+ &.previous_element
+ end
+
+ def toc_title_insert_pt(docxml)
+ ins = make_preface(docxml) or return nil
ins.children.last.after(" ").next
end
def preface_rearrange(doc)
move_introduction(doc)
super
+ move_participants(doc)
end
def move_introduction(doc)
@@ -63,6 +68,45 @@ def move_introduction(doc)
dest.children.first.next = source
end
+ def move_participants(doc)
+ p = doc.at(ns("//clause[@type = 'participants']")) or return
+ t = participant_table(p) or return
+ p.remove
+ ins = make_preface(doc) or return nil
+ ins.children.first.previous = t
+ end
+
+ def participant_table(clause)
+ s = clause.at(ns("./sourcecode")) or return nil
+ y = YAML.safe_load(s.children.to_xml(encoding: "UTF-8")) or return nil
+ y.is_a?(Array) or return nil
+ out1 = <<~OUTPUT
+ #{@meta.get[:"investigative-committee"]} #{@i18n.membership_table}
+
+
+ | #{@i18n.full_name} | #{@i18n.affiliation} |
|---|
+
+
+ OUTPUT
+ out2 = <<~OUTPUT
+
+ OUTPUT
+ "#{out1}#{participant_rows(y)}#{out2}"
+ end
+
+ def participant_rows(yaml)
+ yaml.map do |y|
+ r = y["role"] ? @i18n.l10n("(#{y['role']})") : ""
+ n = y["name"]
+ if n.is_a?(Hash)
+ n =
+ if @lang == "ja" then "#{n['surname']} #{n['givenname']}"
+ else "#{n['givenname']} #{n['surname']}" end
+ end
+ "| #{r} | #{n} | #{y['affiliation']} |
"
+ end.join("\n")
+ end
+
def middle_title(docxml)
s = docxml.at(ns("//sections")) or return
elem = s.children.first
diff --git a/lib/metanorma/jis/front.rb b/lib/metanorma/jis/front.rb
index 8005a05..8a91992 100644
--- a/lib/metanorma/jis/front.rb
+++ b/lib/metanorma/jis/front.rb
@@ -92,9 +92,9 @@ def extract_org_attrs_address(node, opts, suffix)
def multiling_noko_value(value, tag, xml)
if value.is_a?(Hash)
- xml.send tag do |t|
- value.each do |k, v|
- t.variant v, language: k
+ value.each do |k, v|
+ xml.send tag, language: k do |x|
+ x << v
end
end
elsif value.is_a?(Array)
diff --git a/spec/isodoc/metadata_spec.rb b/spec/isodoc/metadata_spec.rb
index cd0a2f3..10d8aed 100644
--- a/spec/isodoc/metadata_spec.rb
+++ b/spec/isodoc/metadata_spec.rb
@@ -39,15 +39,13 @@
Investigative organization
-
- 日本産業標準調査会
- Japanese Industrial Standards Committee
-
+ 日本産業標準調査会
+ Japanese Industrial Standards Committee
- investigative committee
+ Investigative committee
@@ -62,7 +60,7 @@
- investigative committee
+ Investigative committee
@@ -155,7 +153,7 @@
:"investigative-committee"=>"Committee 123",
:"investigative-committee-representative-name"=>"KUROSAWA Akira",
:"investigative-committee-representative-role"=>"chairperson",
- :"investigative-organization"=>"Japanese Industrial Standards",
+ :"investigative-organization"=>"Japanese Industrial Standards Committee",
:lang=>"en",
:publisher=>"Japanese Industrial Standards",
:revdate=>"2000-01-01",
diff --git a/spec/isodoc/section_spec.rb b/spec/isodoc/section_spec.rb
index 6ca5425..1883012 100644
--- a/spec/isodoc/section_spec.rb
+++ b/spec/isodoc/section_spec.rb
@@ -405,157 +405,158 @@