lib/isodoc/presentation_function/terms.rb in isodoc-2.3.5 vs lib/isodoc/presentation_function/terms.rb in isodoc-2.3.6
- old
+ new
@@ -22,11 +22,11 @@
ref && opts[:ref] != "false" and render&.next = " "
opts[:ital] == "true" and render&.name = "em"
concept1_linkmention(ref, render, opts)
concept1_ref(node, ref, opts)
concept1_nonital(node, opts)
- node.replace(node.children)
+ node.replace(node.children.to_xml.strip)
end
def concept1_nonital(node, opts)
opts[:ital] == "false" or return
r = node.at(ns(".//renderterm"))
@@ -52,12 +52,12 @@
def concept1_ref(_node, ref, opts)
ref.nil? and return
return ref.remove if opts[:ref] == "false"
r = concept1_ref_content(ref)
- ref = r.at("./descendant-or-self::xmlns:xref | "\
- "./descendant-or-self::xmlns:eref | "\
+ ref = r.at("./descendant-or-self::xmlns:xref | " \
+ "./descendant-or-self::xmlns:eref | " \
"./descendant-or-self::xmlns:termref")
%w(xref eref).include? ref&.name and get_linkend(ref)
if opts[:linkref] == "false" && %w(xref eref).include?(ref&.name)
ref.replace(ref.children)
end
@@ -80,14 +80,14 @@
def related1(node)
p = node.at(ns("./preferred"))
ref = node.at(ns("./xref | ./eref | ./termref"))
label = @i18n.relatedterms[node["type"]].upcase
if p && ref
- node.replace(l10n("<p><strong>#{label}:</strong> "\
+ node.replace(l10n("<p><strong>#{label}:</strong> " \
"<em>#{p.to_xml}</em> (#{ref.to_xml})</p>"))
else
- node.replace(l10n("<p><strong>#{label}:</strong> "\
+ node.replace(l10n("<p><strong>#{label}:</strong> " \
"<strong>**RELATED TERM NOT FOUND**</strong></p>"))
end
end
def designation(docxml)
@@ -123,10 +123,10 @@
!second.at(ns("./pronunciation | ./grammar"))
end
def designation1(desgn)
s = desgn.at(ns("./termsource"))
- name = desgn.at(ns("./expression/name | ./letter-symbol/name | "\
+ name = desgn.at(ns("./expression/name | ./letter-symbol/name | " \
"./graphical-symbol")) or return
designation_annotate(desgn, name)
s and desgn.next = s
end