diff --git a/lib/isodoc/function/inline.rb b/lib/isodoc/function/inline.rb
index 6d299a5f..dc64f512 100644
--- a/lib/isodoc/function/inline.rb
+++ b/lib/isodoc/function/inline.rb
@@ -21,7 +21,7 @@ def location_parse(node, out); end
SPAN_UNWRAP_CLASSES =
%w[fmt-caption-label fmt-label-delim fmt-caption-delim fmt-autonum-delim
fmt-element-name fmt-conn fmt-comma fmt-enum-comma fmt-obligation
- fmt-xref-container].freeze
+ fmt-xref-container fmt-designation-field].freeze
def span_parse(node, out)
klass = node["style"] || node["class"]
@@ -203,6 +203,7 @@ def children_parse(node, out)
def xref_label_parse(node, out); end
def name_parse(node, out); end
+ def semx_definition_parse(node, out); end
def floating_title_parse(node, out); end
diff --git a/lib/isodoc/function/terms.rb b/lib/isodoc/function/terms.rb
index fbb1e352..08fdacd5 100644
--- a/lib/isodoc/function/terms.rb
+++ b/lib/isodoc/function/terms.rb
@@ -10,21 +10,44 @@ def modification_parse(node, out)
para.children.each { |n| parse(n, out) }
end
+ def semx_deprecated_term_parse(node, out); end
+
def deprecated_term_parse(node, out)
- out.p class: "DeprecatedTerms", style: "text-align:left;" do |p|
- node.children.each { |c| parse(c, p) }
+ node.children.each do |c|
+ if c.name == "p"
+ out.p class: "DeprecatedTerms", style: "text-align:left;" do |p|
+ c.children.each { |c1| parse(c1, p) }
+ end
+ else parse(c, out)
+ end
end
end
+ def semx_admitted_term_parse(node, out); end
+
def admitted_term_parse(node, out)
- out.p class: "AltTerms", style: "text-align:left;" do |p|
- node.children.each { |c| parse(c, p) }
+ node.children.each do |c|
+ if c.name == "p"
+ out.p class: "AltTerms", style: "text-align:left;" do |p|
+ c.children.each { |c1| parse(c1, p) }
+ end
+ else parse(c, out)
+ end
end
end
+ def semx_term_parse(node, out); end
+
+ def semx_related_parse(node, out); end
+
def term_parse(node, out)
- out.p class: "Terms", style: "text-align:left;" do |p|
- node.children.each { |c| parse(c, p) }
+ node.children.each do |c|
+ if c.name == "p"
+ out.p class: "Terms", style: "text-align:left;" do |p|
+ c.children.each { |c1| parse(c1, p) }
+ end
+ else parse(c, out)
+ end
end
end
@@ -51,16 +74,15 @@ def termnote_parse1(node, para, div)
para&.name != "p" and parse(para, div)
end
+ def semx_termref_parse(node, out); end
+
def termref_parse(node, out)
out.p do |p|
node.children.each { |n| parse(n, p) }
end
end
- def termdomain_parse(node, out)
- node["hidden"] == "true" and return
- node.children.each { |n| parse(n, out) }
- end
+ def termdomain_parse(node, out); end
def termdef_parse(node, out)
name = node.at(ns("./fmt-name"))&.remove
diff --git a/lib/isodoc/function/to_word_html.rb b/lib/isodoc/function/to_word_html.rb
index c2f63d13..b80d053f 100644
--- a/lib/isodoc/function/to_word_html.rb
+++ b/lib/isodoc/function/to_word_html.rb
@@ -215,12 +215,18 @@ def parse(node, out)
when "pre" then pre_parse(node, out)
when "annotation" then annotation_parse(node, out)
when "term" then termdef_parse(node, out)
- when "preferred" then term_parse(node, out)
- when "admitted" then admitted_term_parse(node, out)
- when "deprecates" then deprecated_term_parse(node, out)
+ when "preferred" then semx_term_parse(node, out)
+ when "fmt-preferred" then term_parse(node, out)
+ when "admitted" then semx_admitted_term_parse(node, out)
+ when "fmt-admitted" then admitted_term_parse(node, out)
+ when "deprecates" then semx_deprecated_term_parse(node, out)
+ when "fmt-deprecates" then deprecated_term_parse(node, out)
when "domain" then termdomain_parse(node, out)
- when "definition" then definition_parse(node, out)
- when "termsource" then termref_parse(node, out)
+ when "definition" then semx_definition_parse(node, out)
+ when "fmt-definition" then definition_parse(node, out)
+ when "termsource" then semx_termref_parse(node, out)
+ when "fmt-termsource" then termref_parse(node, out)
+ when "related" then semx_related_parse(node, out)
when "modification" then modification_parse(node, out)
when "termnote" then termnote_parse(node, out)
when "terms" then terms_parse(node, out)
diff --git a/lib/isodoc/presentation_function/autonum.rb b/lib/isodoc/presentation_function/autonum.rb
index afdc8032..aeb751e6 100644
--- a/lib/isodoc/presentation_function/autonum.rb
+++ b/lib/isodoc/presentation_function/autonum.rb
@@ -44,14 +44,23 @@ def transfer_id(old, new)
old.delete("id")
end
+ def semx_fmt_dup(elem)
+ elem["id"] ||= "_#{UUIDTools::UUID.random_create}"
+ new = Nokogiri::XML(<<~XML).root
+ #{to_xml(elem.children)}
+ XML
+ strip_duplicate_ids(nil, elem, new)
+ new
+ end
+
def gather_all_ids(elem)
elem.xpath(".//*[@id]").each_with_object([]) do |i, m|
m << i["id"]
end
end
- # remove ids duplicated between title and fmt-title
- # index terms are assumed transferred to fmt-title from title
+ # remove ids duplicated between sem_title and pres_title
+ # index terms are assumed transferred to pres_title from sem_title
def strip_duplicate_ids(_node, sem_title, pres_title)
sem_title && pres_title or return
ids = gather_all_ids(pres_title)
@@ -75,6 +84,11 @@ def autonum(id, num)
"#{num} "
end
+ def semx_orig(node, orig = nil)
+ orig ||= node.parent.parent
+ orig.at(".//*[@id = '#{node['source']}']")
+ end
+
def labelled_autonum(label, id, num)
elem = "#{label} "
num.blank? and return elem
diff --git a/lib/isodoc/presentation_function/concepts.rb b/lib/isodoc/presentation_function/concepts.rb
index 8d49a4ed..abfc21b5 100644
--- a/lib/isodoc/presentation_function/concepts.rb
+++ b/lib/isodoc/presentation_function/concepts.rb
@@ -7,6 +7,7 @@ def concept(docxml)
end
def concept1(node)
+ node.ancestors("definition, termsource, related").empty? or return
xref = node&.at(ns("./xref/@target"))&.text or
return concept_render(node, ital: "true", ref: "true", bold: "false",
linkref: "true", linkmention: "false")
@@ -71,20 +72,160 @@ def concept1_ref_content(ref)
end
def related(docxml)
- docxml.xpath(ns("//related")).each { |f| related1(f) }
+ docxml.xpath(ns("//fmt-related/semx")).each { |f| related1(f) }
end
def related1(node)
- p = node.at(ns("./preferred"))
- ref = node.at(ns("./xref | ./eref | ./termref"))
- label = @i18n.relatedterms[node["type"]].upcase
+ p, ref, orig = related1_prep(node)
+ label = @i18n.relatedterms[orig["type"]].upcase
if p && ref
- node.replace(l10n("#{label}: " \
+ node.children =(l10n("
#{label}: " \
"#{to_xml(p)} (#{Common::to_xml(ref)})
"))
else
- node.replace(l10n("#{label}: " \
+ node.children = (l10n("
#{label}: " \
"**RELATED TERM NOT FOUND**
"))
end
end
+
+ def related1_prep(node)
+ p = node.at(ns("./fmt-preferred"))&.children
+ ref = node.at(ns("./xref | ./eref | ./termref"))
+ orig = semx_orig(node)
+ [p, ref, orig]
+ end
+
+ def related_designation1(desgn)
+ out = desgn.parent.at(ns("./fmt-#{desgn.name}"))
+ d1 = semx_fmt_dup(desgn)
+ %w(preferred admitted deprecates).each do |w|
+ d = d1.at(ns("./#{w}[last()]")) and d.after("
")
+ end
+ end
+ pref&.replace(merge_second_preferred1(out, term))
+ end
+
+ def merge_second_preferred1(desgns, term)
+ desgns[1..].each(&:remove)
+ ret = l10n(desgns.map { |x| to_xml(x) }.join("; "))
+ term.ancestors("fmt-related").empty? and ret = "#{ret}
"
+ ret
+ end
+
+ def merge_preferred_eligible?(first, second)
+ orig_first, orig_second, firstex, secondex =
+ merge_preferred_eligible_prep(first, second)
+ orig_first["geographic-area"] == orig_second["geographic-area"] &&
+ firstex["language"] == secondex["language"] &&
+ !orig_first.at(ns("./pronunciation | ./grammar | ./graphical-symbol")) &&
+ !orig_second.at(ns("./pronunciation | ./grammar | ./graphical-symbol")) &&
+ orig_first.name == "preferred" && orig_second.name == "preferred"
+ end
+
+ def merge_preferred_eligible_prep(first, second)
+ orig_first = semx_orig(first)
+ orig_second = semx_orig(second)
+ firstex = orig_first.at(ns("./expression")) || {}
+ secondex = orig_second.at(ns("./expression")) || {}
+ [orig_first, orig_second, firstex, secondex]
+ end
+
+ def designation1(desgn)
+ desgn.parent.name == "related" and return
+ out = desgn.parent.at(ns("./fmt-#{desgn.name}"))
+ d1 = semx_fmt_dup(desgn)
+ s = d1.at(ns("./termsource"))
+ name = d1.at(ns("./expression/name | ./letter-symbol/name | " \
+ "./graphical-symbol")) or return
+ designation_annotate(d1, name, desgn)
+ out << d1
+ s and out << s.wrap("#{name.children} "
+ end
+
+ def designation_field(desgn, name, orig)
+ f = orig.xpath(ns("./field-of-application | ./usage-info"))
+ &.map { |u| to_xml(semx_fmt_dup(u)) }&.join(", ")
+ f&.empty? and return nil
+ name << ", <#{f}> "
+ end
+
+ def designation_grammar(desgn, name)
+ g = desgn.at(ns("./expression/grammar")) or return
+ ret = []
+ g.xpath(ns("./gender | ./number")).each do |x|
+ ret << @i18n.grammar_abbrevs[x.text]
+ end
+ %w(isPreposition isParticiple isAdjective isVerb isAdverb isNoun)
+ .each do |x|
+ g.at(ns("./#{x}[text() = 'true']")) and ret << @i18n.grammar_abbrevs[x]
+ end
+ name << ", #{ret.join(', ')}"
+ end
+
+ def designation_localization(desgn, name, orig_desgn)
+ loc = [desgn.at(ns("./expression/@language"))&.text,
+ desgn.at(ns("./expression/@script"))&.text,
+ orig_desgn.at("./@geographic-area")&.text].compact
+ loc.empty? and return
+ name << ", #{loc.join(' ')}"
+ end
+
+ def designation_pronunciation(desgn, name)
+ f = desgn.at(ns("./expression/pronunciation")) or return
+ name << ", /#{to_xml(f.children)}/"
+ end
+
+ def designation_bookmarks(desgn, name)
+ desgn.xpath(ns(".//bookmark")).each do |b|
+ name << b.remove
+ end
+ end
end
end
diff --git a/lib/isodoc/presentation_function/inline.rb b/lib/isodoc/presentation_function/inline.rb
index 022fa39d..36f64508 100644
--- a/lib/isodoc/presentation_function/inline.rb
+++ b/lib/isodoc/presentation_function/inline.rb
@@ -61,6 +61,8 @@ def quotesource(docxml)
end
def xref1(node)
+ # Semantic XML
+ node.ancestors("related, definition, termsource").empty? or return
get_linkend(node)
end
diff --git a/lib/isodoc/presentation_function/refs.rb b/lib/isodoc/presentation_function/refs.rb
index bacd47d8..7c51f98f 100644
--- a/lib/isodoc/presentation_function/refs.rb
+++ b/lib/isodoc/presentation_function/refs.rb
@@ -107,7 +107,7 @@ def bibliography_bibitem_number_skip(bibitem)
def bibliography_bibitem_number(docxml)
i = 0
docxml.xpath(ns("//references")).each do |r|
- r.xpath(ns(".//bibitem")).each do |b|
+ r.xpath(ns("./bibitem")).each do |b|
i = bibliography_bibitem_number1(b, i, r["normative"] == "true")
end
end
diff --git a/lib/isodoc/presentation_function/terms.rb b/lib/isodoc/presentation_function/terms.rb
index 1a439962..6d83d045 100644
--- a/lib/isodoc/presentation_function/terms.rb
+++ b/lib/isodoc/presentation_function/terms.rb
@@ -1,103 +1,25 @@
module IsoDoc
class PresentationXMLConvert < ::IsoDoc::Convert
- def designation(docxml)
- docxml.xpath(ns("//term")).each { |t| merge_second_preferred(t) }
- docxml.xpath(ns("//preferred | //admitted | //deprecates"))
- .each { |p| designation1(p) }
- docxml.xpath(ns("//deprecates")).each { |d| deprecates(d) }
- docxml.xpath(ns("//admitted")).each { |d| admits(d) }
- end
-
- def deprecates(elem)
- elem.add_first_child @i18n.l10n("#{@i18n.deprecated}: ")
- end
-
- def admits(elem); end
-
- def merge_second_preferred(term)
- pref = nil
- term.xpath(ns("./preferred[expression/name]")).each_with_index do |p, i|
- (i.zero? and pref = p) or merge_second_preferred1(pref, p)
- end
- end
-
- def merge_second_preferred1(pref, second)
- merge_preferred_eligible?(pref, second) or return
- n1 = pref.at(ns("./expression/name"))
- n2 = second.remove.at(ns("./expression/name"))
- n1.children = l10n("#{to_xml(n1.children)}; #{Common::to_xml(n2.children)}")
- end
-
- def merge_preferred_eligible?(first, second)
- firstex = first.at(ns("./expression")) || {}
- secondex = second.at(ns("./expression")) || {}
- first["geographic-area"] == second["geographic-area"] &&
- firstex["language"] == secondex["language"] &&
- !first.at(ns("./pronunciation | ./grammar")) &&
- !second.at(ns("./pronunciation | ./grammar"))
- end
-
- def designation1(desgn)
- s = desgn.at(ns("./termsource"))
- name = desgn.at(ns("./expression/name | ./letter-symbol/name | " \
- "./graphical-symbol")) or return
- designation_annotate(desgn, name)
- s and desgn.next = s
- end
-
- def designation_annotate(desgn, name)
- designation_boldface(desgn)
- designation_field(desgn, name)
- g = desgn.at(ns("./expression/grammar")) and
- name << ", #{designation_grammar(g).join(', ')}"
- designation_localization(desgn, name)
- designation_pronunciation(desgn, name)
- designation_bookmarks(desgn, name)
- desgn.children = name.children
- end
-
- def designation_boldface(desgn)
- desgn.name == "preferred" or return
- name = desgn.at(ns("./expression/name | ./letter-symbol/name")) or return
- name.children = "#{name.children} "
- end
-
- def designation_field(desgn, name)
- f = desgn.xpath(ns("./field-of-application | ./usage-info"))
- &.map { |u| to_xml(u.children) }&.join(", ")
- f&.empty? and return nil
- name << ", <#{f}>"
- end
-
- def designation_grammar(grammar)
- ret = []
- grammar.xpath(ns("./gender | ./number")).each do |x|
- ret << @i18n.grammar_abbrevs[x.text]
+ def termcontainers(docxml)
+ docxml.xpath(ns("//term")).each do |t|
+ %w(preferred admitted deprecates related definition termsource)
+ .each do |w|
+ d = t.at(ns("./#{w}[last()]")) and d.after("#{to_xml(d.children)} #{to_xml(f.children)} ").first
- d << f
+ def multidef(_elem, defn, fmt_defn)
+ ret = defn.each_with_object([]) do |f, m|
+ m << "#{to_xml(semx_fmt_dup(f))} "
end
- d.wrap("#{ret.join("\n")} "
end
- def unwrap_definition(elem)
- elem.xpath(ns("./definition")).each do |d|
+ def singledef(_elem, defn, fmt_defn)
+ fmt_defn << semx_fmt_dup(defn.first)
+ end
+
+ def unwrap_definition(_elem, fmt_defn)
+ fmt_defn.xpath(ns(".//semx[@element = 'definition']")).each do |d|
%w(verbal-definition non-verbal-representation).each do |e|
v = d&.at(ns("./#{e}"))
v&.replace(v.children)
@@ -153,26 +78,62 @@ def unwrap_definition(elem)
end
end
- def termdomain(elem)
+ def termdomain(elem, fmt_defn)
d = elem.at(ns(".//domain")) or return
- p = elem.at(ns(".//definition//p")) or return
- p.add_first_child "<#{d.to_xml}> "
- d["hidden"] = true
+ p = fmt_defn.at(ns(".//p")) or return
+ d1 = semx_fmt_dup(d)
+ p.add_first_child "<#{to_xml(d1)}> "
end
def termsource(docxml)
- docxml.xpath(ns("//termsource")).each { |f| termsource_modification(f) }
- docxml.xpath(ns("//termsource")).each { |f| termsource1(f) }
+ copy_baselevel_termsource(docxml)
+ # TODO should I wrap fmt-definition//termsource in fmt-termsource, in order to preserve termsource attributes?
+ docxml.xpath(ns("//fmt-termsource/termsource | //fmt-definition//termsource | //fmt-preferred//termsource | //fmt-admitted//termsource | //fmt-deprecates//termsource"))
+ .each do |f|
+ termsource_modification(f)
+ end
+ docxml.xpath(ns("//fmt-preferred//fmt-termsource | //fmt-admitted//fmt-termsource | //fmt-deprecates//fmt-termsource"))
+ .each do |f|
+ termsource_designation(f)
+ end
+ docxml.xpath(ns("//fmt-termsource/termsource | //fmt-definition//termsource | //fmt-preferred//termsource | //fmt-admitted//termsource | //fmt-deprecates//termsource"))
+ .each do |f|
+ f.parent and termsource1(f)
+ end
+ end
+
+ def termsource_designation(fmtsource)
+ p = fmtsource.previous_element
+ p&.name == "p" or return
+ p << " "
+ p << fmtsource.children
+ end
+
+ def copy_baselevel_termsource(docxml)
+ docxml.xpath(ns("//term[termsource]")).each do |x|
+ s = x.xpath(ns("./termsource"))
+ s1 = x.at(ns("./fmt-termsource"))
+ s.each { |ss| s1 << ss.clone }
+ strip_duplicate_ids(nil, s, s1)
+ %w(status type).each { |a| s[0][a] and s1[a] = s[0][a] }
+ end
end
def termsource1(elem)
+ ret = [semx_fmt_dup(elem)]
while elem&.next_element&.name == "termsource"
- elem << "; #{to_xml(elem.next_element.remove.children)}"
+ ret << semx_fmt_dup(elem.next_element.remove)
end
- elem.children = l10n("[#{@i18n.source}: #{to_xml(elem.children).strip}]")
+ s = ret.map { |x| to_xml(x) }.map(&:strip).join("; ")
+ termsource_label(elem, s)
+ end
+
+ def termsource_label(elem, sources)
+ elem.replace(l10n("[#{@i18n.source}: #{sources}]"))
end
def termsource_modification(elem)
+ elem.xpath(".//text()[normalize-space() = '']").each(&:remove)
origin = elem.at(ns("./origin"))
s = termsource_status(elem["status"]) and origin.next = l10n(", #{s}")
termsource_add_modification_text(elem.at(ns("./modification")))
@@ -180,10 +141,13 @@ def termsource_modification(elem)
def termsource_add_modification_text(mod)
mod or return
- mod.text.strip.empty? or mod.previous = " — "
- mod.elements.size == 1 and
- mod.elements[0].replace(mod.elements[0].children)
- mod.replace(mod.children)
+ if mod.text.strip.empty?
+ mod.remove
+ return
+ end
+ mod.previous = " — "
+ mod.elements.size == 1 and mod.children = to_xml(mod.elements[0].children)
+ mod.replace(semx_fmt_dup(mod))
end
def termsource_status(status)
diff --git a/lib/isodoc/presentation_xml_convert.rb b/lib/isodoc/presentation_xml_convert.rb
index 571ebfcb..af9a36c3 100644
--- a/lib/isodoc/presentation_xml_convert.rb
+++ b/lib/isodoc/presentation_xml_convert.rb
@@ -108,6 +108,7 @@ def inline(docxml)
end
def terms(docxml)
+ termcontainers docxml
termexample docxml
termnote docxml
termdefinition docxml
@@ -115,6 +116,7 @@ def terms(docxml)
termsource docxml
concept docxml
related docxml
+ termcleanup docxml
end
def semantic_xml_insert(xml)
diff --git a/spec/isodoc/figures_spec.rb b/spec/isodoc/figures_spec.rb
index 7efad136..658fcba5 100644
--- a/spec/isodoc/figures_spec.rb
+++ b/spec/isodoc/figures_spec.rb
@@ -150,7 +150,7 @@
[SOURCE:
ISO 712, Section 1
- — with adjustments ;
+ — with adjustments ;
ISO 712, Section 2
]
@@ -275,7 +275,7 @@
A
B
Figure 1 — Split-it-right sample divider
+