diff --git a/lib/isodoc/function/inline.rb b/lib/isodoc/function/inline.rb index 17f868a8..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"] diff --git a/lib/isodoc/presentation_function/concepts.rb b/lib/isodoc/presentation_function/concepts.rb index 34958f78..15cd5cf3 100644 --- a/lib/isodoc/presentation_function/concepts.rb +++ b/lib/isodoc/presentation_function/concepts.rb @@ -188,10 +188,10 @@ def designation_boldface(desgn) end def designation_field(desgn, name, orig) - f = desgn.xpath(ns("./field-of-application | ./usage-info")) - &.map { |u| to_xml(u.children) }&.join(", ") + 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}>" + name << ", <#{f}>" end def designation_grammar(grammar) diff --git a/spec/isodoc/terms_spec.rb b/spec/isodoc/terms_spec.rb index aa879970..2699db98 100644 --- a/spec/isodoc/terms_spec.rb +++ b/spec/isodoc/terms_spec.rb @@ -209,8 +209,8 @@ paddy - in agriculture - dated + in agriculture + dated @@ -226,22 +226,28 @@

paddy - , <in agriculture, dated> + + , < + in agriculture + , + dated + > +

- [SOURCE: - - - - 3.1 - - ISO 7301:2011, Clause 3.1 - - , modified — The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here - - ] - + [SOURCE: + + + + 3.1 + + ISO 7301:2011, Clause 3.1 + + , modified — The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here + + ] + rice @@ -376,7 +382,7 @@ paddy rice - in agriculture + in agriculture @@ -385,7 +391,14 @@

- paddy rice, <in agriculture> + + paddy rice + + , < + in agriculture + > + +

rough rice @@ -398,7 +411,7 @@

- DEPRECATED: + DEPRECATED: cargo rice

@@ -1870,14 +1883,20 @@ Second Term - Field - Usage Info 1 + Field + Usage Info 1

Second Term - , <Field, Usage Info 1> + + , < + Field + , + Usage Info 1 + > +