From 4be4eff4dee1b2c2a4a5deb5614331bc0e16738c Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Sun, 29 Dec 2024 22:43:27 +0200 Subject: [PATCH 01/18] Presentation XML refactor, terms: https://github.com/metanorma/isodoc/issues/630 --- lib/isodoc/function/inline.rb | 1 + lib/isodoc/function/terms.rb | 40 +- lib/isodoc/function/to_word_html.rb | 15 +- lib/isodoc/presentation_function/autonum.rb | 17 +- lib/isodoc/presentation_function/concepts.rb | 146 +- lib/isodoc/presentation_function/inline.rb | 2 + lib/isodoc/presentation_function/terms.rb | 185 +- lib/isodoc/presentation_xml_convert.rb | 2 + spec/isodoc/terms_spec.rb | 2330 ++++++++++++------ 9 files changed, 1786 insertions(+), 952 deletions(-) diff --git a/lib/isodoc/function/inline.rb b/lib/isodoc/function/inline.rb index 6d299a5f..17f868a8 100644 --- a/lib/isodoc/function/inline.rb +++ b/lib/isodoc/function/inline.rb @@ -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..1eb1f081 100644 --- a/lib/isodoc/function/terms.rb +++ b/lib/isodoc/function/terms.rb @@ -10,21 +10,42 @@ 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 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 +72,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..fe090cbb 100644 --- a/lib/isodoc/function/to_word_html.rb +++ b/lib/isodoc/function/to_word_html.rb @@ -215,12 +215,17 @@ 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 "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..b118fcdb 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,10 @@ def autonum(id, num) "#{num}" end + def semx_orig(node) + node.parent.parent.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..d6e90f98 100644 --- a/lib/isodoc/presentation_function/concepts.rb +++ b/lib/isodoc/presentation_function/concepts.rb @@ -71,13 +71,12 @@ 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}: " \ "#{to_xml(p)} (#{Common::to_xml(ref)})

")) @@ -86,5 +85,144 @@ def related1(node) "**RELATED TERM NOT FOUND**

")) end end + + def related1_prep(node) + p = node.at(ns("./fmt-preferred")) + 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 + out << d1 + end + + def designation(docxml) + docxml.xpath(ns("//related")).each { |p| related_designation1(p) } + docxml.xpath(ns("//preferred | //admitted | //deprecates")) + .each { |p| designation1(p) } + docxml.xpath(ns("//fmt-preferred | //fmt-admitted | //fmt-deprecates")) + .each { |t| merge_second_preferred(t) } + docxml.xpath(ns("//fmt-deprecates")).each { |d| deprecates(d) } + docxml.xpath(ns("//fmt-admitted")).each { |d| admits(d) } + end + + def deprecates(elem) + ins = elem.at(ns("./p")) || elem + ins.add_first_child @i18n.l10n("#{@i18n.deprecated}: ") + end + + def admits(elem); end + + def merge_second_preferred(term) + pref = nil + out = term.xpath(ns("./semx")).each_with_index + .with_object([]) do |(p, i), m| + if (i.zero? && (pref = p)) || merge_preferred_eligible?(pref, p) + m << p + else + p.wrap("

") + 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.next = s.wrap("") + end + + def designation_annotate(desgn, name, orig) + designation_boldface(desgn) + designation_field(desgn, name) + g = desgn.at(ns("./expression/grammar")) and + name << ", #{designation_grammar(g).join(', ')}" + designation_localization(desgn, name, orig) + designation_pronunciation(desgn, name) + designation_bookmarks(desgn, name) + desgn.children = name.children + end + + def designation_boldface(desgn) + desgn["element"] == "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] + end + %w(isPreposition isParticiple isAdjective isVerb isAdverb isNoun) + .each do |x| + grammar.at(ns("./#{x}[text() = 'true']")) and + ret << @i18n.grammar_abbrevs[x] + end + ret + 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/terms.rb b/lib/isodoc/presentation_function/terms.rb index 1a439962..91d7a01b 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("") + end end - %w(isPreposition isParticiple isAdjective isVerb isAdverb isNoun) - .each do |x| - grammar.at(ns("./#{x}[text() = 'true']")) and - ret << @i18n.grammar_abbrevs[x] + docxml.xpath(ns("//termsource")).each do |s| + s["id"] ||= "_#{UUIDTools::UUID.random_create}" end - ret - end - - def designation_localization(desgn, name) - loc = [desgn&.at(ns("./expression/@language"))&.text, - desgn&.at(ns("./expression/@script"))&.text, - desgn&.at(ns("./@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 + def termcleanup(docxml) + docxml.xpath(ns("//term")).each do |t| + %w(preferred admitted deprecates related definition termsource) + .each do |w| + t.xpath(ns("./#{w}//fmt-name | ./#{w}//fmt-xref-label")).each(&:remove) + f = t.at(ns("./fmt-#{w}")) + f&.children&.empty? and f.remove + end end end @@ -123,29 +45,32 @@ def termnote_label(elem) end def termdefinition(docxml) - docxml.xpath(ns("//term[definition]")).each do |f| - termdefinition1(f) - end + docxml.xpath(ns("//term[definition]")).each { |f| termdefinition1(f) } end def termdefinition1(elem) - unwrap_definition(elem) - multidef(elem) if elem.xpath(ns("./definition")).size > 1 - termdomain(elem) + d = elem.xpath(ns("./definition")) + d1 = elem.at(ns("./fmt-definition")) + if d.size > 1 then multidef(elem, d, d1) + else singledef(elem, d, d1) + end + unwrap_definition(elem, d1) + termdomain(elem, d1) end - def multidef(elem) - d = elem.at(ns("./definition")) - d = d.replace("
  1. #{to_xml(d.children)}
").first - elem.xpath(ns("./definition")).each do |f| - f = f.replace("
  • #{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("") + fmt_defn << "
      #{ret.join("\n")}
    " + end + + def singledef(_elem, defn, fmt_defn) + fmt_defn << semx_fmt_dup(defn.first) end - def unwrap_definition(elem) - elem.xpath(ns("./definition")).each do |d| + 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,47 @@ 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")) + .each do |f| + termsource_modification(f) + end + docxml.xpath(ns("//fmt-termsource/termsource | //fmt-definition//termsource")) + .each do |f| + f.parent and termsource1(f) + end + 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("; ") + elem.replace(l10n("[#{@i18n.source}: #{s}]")) 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"))) @@ -181,9 +127,8 @@ 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) + mod.elements.size == 1 and mod.children = to_xml(mod.elements[0].children) + mod.replace(to_xml(mod.children)) 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/terms_spec.rb b/spec/isodoc/terms_spec.rb index 6ee78810..a0047e5e 100644 --- a/spec/isodoc/terms_spec.rb +++ b/spec/isodoc/terms_spec.rb @@ -15,24 +15,24 @@ INPUT presxml = <<~OUTPUT - - - - Table of contents - - - + + + + Table of contents + + + Terms, Definitions, Symbols and Abbreviated Terms 1 . - - - - - Terms, Definitions, Symbols and Abbreviated Terms + + + + + Terms, Definitions, Symbols and Abbreviated Terms Clause @@ -50,12 +50,21 @@ Clause 1 - . - 1 + . + 1 - - Term2 + + + Term2 + + +

    + + Term2 + +

    +     @@ -158,305 +167,438 @@ presxml = <<~PRESXML - - - Table of contents - - - - - Terms and Definitions - - - 1 - . - - - - - Terms and Definitions - - - Clause - 1 - -

    For the purposes of this document, the following terms and definitions apply.

    - - - - 1 - . - 1 - . - - - - Clause - 1 - . - 1 - - - paddy - , <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] - - - -

    - < - rice - > rice retaining its husk after threshing -

    -     - - - - EXAMPLE - 1 - - - - Example - 1 - - - - Clause - 1 - . - 1 - - , - Example - 1 - -

    Foreign seeds, husks, bran, sand, dust.

    -
      -
    • A
      • -
    -     - - - - EXAMPLE - 2 - - - - Example - 2 - - - - Clause - 1 - . - 1 - - , - Example - 2 - -
      -
    • A
      • -
    -     - - [SOURCE: - - t1 - - — comment ; - - - - , modified — with adjustments] - -     - - - - 1 - . - 2 - . - - - - Clause - 1 - . - 2 - - - paddy - - paddy rice, <in agriculture> - rough rice - DEPRECATED: cargo rice - -

    rice retaining its husk after threshing

    -     - - - - EXAMPLE - - - - Example - - - - Clause - 1 - . - 2 - - , - Example - -
      -
    • A
      • -
    -     - - - - Note - 1 - to entry - - : - - - Note - 1 - - - - Clause - 1 - . - 2 - - , - Note - 1 - -

    The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.

    -     - - - - Note - 2 - to entry - - : - - - Note - 2 - - - - Clause - 1 - . - 2 - - , - Note - 2 - -
      -
    • A
      • -
    -

    The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.

    -     - - [SOURCE: - - - 3.1 - - ISO 7301:2011, 3.1 - - - - 3.1 - - ISO 7301:2011, clause 3.1 - - ] - -     -     -     -     + + + Table of contents + + + + + Terms and Definitions + + + 1 + . + + + + + Terms and Definitions + + + Clause + 1 + +

    For the purposes of this document, the following terms and definitions apply.

    + + + + 1 + . + 1 + . + + + + Clause + 1 + . + 1 + + + + paddy + + in agriculture + dated + + + + 3.1 + + + +

    The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here

    +     +     +     + +

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

    +     + + + + 3.1 + + + +

    The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here

    +     +     + rice + + +

    rice retaining its husk after threshing

    +     +     + + +

    + < + rice + > rice retaining its husk after threshing +

    +     +     + + + + EXAMPLE + 1 + + + + Example + 1 + + + + Clause + 1 + . + 1 + + , + Example + 1 + +

    Foreign seeds, husks, bran, sand, dust.

    +
      +
    • A
      • +
    +     + + + + EXAMPLE + 2 + + + + Example + 2 + + + + Clause + 1 + . + 1 + + , + Example + 2 + +
      +
    • A
      • +
    +     + + + t1 + + +

    comment

    +     +     + + + + + +

    with adjustments

    +     +     + + [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 + + ; + + + t1 + + — comment + + ; + + + + + , modified — with adjustments + + ] + +     + + + + 1 + . + 2 + . + + + + Clause + 1 + . + 2 + + + + paddy + + + +

    + + paddy + +

    +     + + + paddy rice + + in agriculture + + + + rough rice + + + +

    + paddy rice, <in agriculture> +

    +

    + rough rice +

    +     + + + cargo rice + + + +

    + DEPRECATED: + cargo rice +

    +     + + +

    rice retaining its husk after threshing

    +     +     + + +

    rice retaining its husk after threshing

    +     +     + + + + EXAMPLE + + + + Example + + + + Clause + 1 + . + 2 + + , + Example + +
      +
    • A
      • +
    +     + + + + Note + 1 + to entry + + : + + + Note + 1 + + + + Clause + 1 + . + 2 + + , + Note + 1 + +

    The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.

    +     + + + + Note + 2 + to entry + + : + + + Note + 2 + + + + Clause + 1 + . + 2 + + , + Note + 2 + +
      +
    • A
      • +
    +

    The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.

    +     + + + + 3.1 + + + + + 3.1 + + + + + [SOURCE: + + + + 3.1 + + ISO 7301:2011, 3.1 + + + + 3.1 + + ISO 7301:2011, clause 3.1 + + + ] + +     +     +     +     PRESXML html = <<~"OUTPUT" #{HTML_HDR} -

    1.  Terms and Definitions

    For the purposes of this document, the following terms and definitions apply.

    1.1.

    paddy, <in agriculture, dated>

    [SOURCE: 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> rice retaining its husk after threshing

    -

    EXAMPLE 1

    -

    Foreign seeds, husks, bran, sand, dust.

    -
    -
      -
    • A
      • -
    -
    -
    -

    EXAMPLE 2

    -
    -
      -
    • A
      • -
    -
    -
    -

    [SOURCE: t1 - — - comment - - ; - Termbase IEV, term ID xyz, modified - — - with adjustments]

    -

    1.2.

    paddy

    -

    paddy rice, <in agriculture>

    -

    rough rice

    -

    DEPRECATED: cargo rice

    -

    rice retaining its husk after threshing

    -

    EXAMPLE

    -
    -
      -
    • A
      • -
    -
    -
    -

    Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.

    -

    Note 2 to entry:

    -
    • A
    -

    The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.

    -

    [SOURCE: ISO 7301:2011, 3.1 - ISO 7301:2011, clause 3.1]

    - - +
    +

    1.  Terms and Definitions

    +

    For the purposes of this document, the following terms and definitions apply.

    +

    1.1.

    +

    + paddy + , <in agriculture, dated> +

    +

    <rice> rice retaining its husk after threshing

    +
    +

    EXAMPLE 1

    +

    Foreign seeds, husks, bran, sand, dust.

    +
    +
      +
    • A
      • +
    +
    +
    +
    +

    EXAMPLE 2

    +
    +
      +
    • A
      • +
    +
    +
    +

    [SOURCE: ISO 7301:2011, Clause 3.1, modified — The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here; t1 — comment; Termbase IEV, term ID xyz, modified — with adjustments]

    +

    1.2.

    +

    + paddy +

    +

    paddy rice, <in agriculture>

    +

    rough rice

    +

    DEPRECATED: cargo rice

    +

    rice retaining its husk after threshing

    +
    +

    EXAMPLE

    +
    +
      +
    • A
      • +
    +
    +
    +
    +

    + Note 1 to entry: + The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking. +

    +
    +
    +

    + Note 2 to entry: +

    +
    +
      +
    • A
      • +
    +
    +

    The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.

    +
    +

    [SOURCE: ISO 7301:2011, 3.1ISO 7301:2011, clause 3.1]

    +
    + + OUTPUT @@ -467,55 +609,75 @@


    -
    -

    1.  Terms and Definitions

    For the purposes of this document, the following terms and definitions apply.

    1.1.

    paddy, <in agriculture, dated>

    [SOURCE: 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> rice retaining its husk after threshing

    -

    EXAMPLE 1

    -

    Foreign seeds, husks, bran, sand, dust.

    -
    -
      -
    • A
      • -
    -
    -
    -

    EXAMPLE 2

    -
    -
      -
    • A
      • -
    -
    -
    -

    [SOURCE: t1 - — - comment - - ; - Termbase IEV, term ID xyz, modified - — - with adjustments]

    -

    1.2.

    paddy

    -

    paddy rice, <in agriculture>

    -

    rough rice

    -

    DEPRECATED: cargo rice

    -

    rice retaining its husk after threshing

    -

    EXAMPLE

    -
    -
      -
    • A
      • -
    -
    -
    -

    Note 1 to entry: The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.

    -

    Note 2 to entry:

    -
    • A
    -

    The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.

    -

    [SOURCE: ISO 7301:2011, 3.1 - ISO 7301:2011, clause 3.1]

    -
    - +
    +
    +

    + 1. +   + Terms and Definitions +

    +

    For the purposes of this document, the following terms and definitions apply.

    +

    1.1.

    +

    + paddy + , <in agriculture, dated> +

    +

    <rice> rice retaining its husk after threshing

    +
    +

    EXAMPLE 1

    +

    Foreign seeds, husks, bran, sand, dust.

    +
    +
      +
    • A
      • +
    +
    +
    +
    +

    EXAMPLE 2

    +
    +
      +
    • A
      • +
    +
    +
    +

    [SOURCE: ISO 7301:2011, Clause 3.1, modified — The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here; t1 — comment; Termbase IEV, term ID xyz, modified — with adjustments]

    +

    1.2.

    +

    + paddy +

    +

    paddy rice, <in agriculture>

    +

    rough rice

    +

    DEPRECATED: cargo rice

    +

    rice retaining its husk after threshing

    +
    +

    EXAMPLE

    +
    +
      +
    • A
      • +
    +
    +
    +
    +

    + Note 1 to entry: + The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking. +

    +
    +
    +

    + Note 2 to entry: +

    +
    +
      +
    • A
      • +
    +
    +

    The starch of waxy rice consists almost entirely of amylopectin. The kernels have a tendency to stick together after cooking.

    +
    +

    [SOURCE: ISO 7301:2011, 3.1ISO 7301:2011, clause 3.1]

    +
    +
    + WORD pres_output = IsoDoc::PresentationXMLConvert @@ -576,132 +738,184 @@ INPUT presxml = <<~PRESXML - - Terms and Definitions - - - 1 - . - - - - - Terms and Definitions - - - Clause - 1 - -

    For the purposes of this document, the following terms and definitions apply.

    - - - - 1 - . - 1 - . - - - - Clause - 1 - . - 1 - - - paddy - - - -
      -
    1. -

      - < - rice - > rice retaining its husk after threshing -

      -
      2. -
    2. -

      rice retaining its husk after threshing, mark 2

      - - [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] - -
      3. -
    -     - - - - EXAMPLE - 1 - - - - Example - 1 - - - - Clause - 1 - . - 1 - - , - Example - 1 - -

    Foreign seeds, husks, bran, sand, dust.

    -
      -
    • A
      • -
    -     - - - - EXAMPLE - 2 - - - - Example - 2 - - - - Clause - 1 - . - 1 - - , - Example - 2 - -
      -
    • A
      • -
    -     - - [SOURCE: - - t1 - - ; - - - - , modified — with adjustments] - -     -     + + Terms and Definitions + + + 1 + . + + + + + Terms and Definitions + + + Clause + 1 + +

    For the purposes of this document, the following terms and definitions apply.

    + + + + 1 + . + 1 + . + + + + Clause + 1 + . + 1 + + + + paddy + + + +

    + + paddy + +

    +     + rice + + +

    rice retaining its husk after threshing

    +     +     + + +

    rice retaining its husk after threshing, mark 2

    + + + + 3.1 + + + +

    The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here

    +     +     +     +     + +
      +
    1. + +

      + < + rice + > rice retaining its husk after threshing +

      +       +
      2. +
    2. + +

      rice retaining its husk after threshing, mark 2

      + [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 + + ] +       +
      3. +
    +     + + + + EXAMPLE + 1 + + + + Example + 1 + + + + Clause + 1 + . + 1 + + , + Example + 1 + +

    Foreign seeds, husks, bran, sand, dust.

    +
      +
    • A
      • +
    +     + + + + EXAMPLE + 2 + + + + Example + 2 + + + + Clause + 1 + . + 1 + + , + Example + 2 + +
      +
    • A
      • +
    +     + + + t1 + + + + + + + +

    with adjustments

    +     +     + + [SOURCE: + + + t1 + + + ; + + + + + , modified — with adjustments + + ] + +     +     PRESXML expect(Xml::C14n.format(strip_guid(Nokogiri::XML(IsoDoc::PresentationXMLConvert .new(presxml_options) @@ -750,11 +964,11 @@ 1 . - - - - - Terms and Definitions + + + + + Terms and Definitions Clause @@ -775,17 +989,42 @@ . 1 - - paddy; muddy rice + + + paddy + - - -

    - < - rice - > rice retaining its husk after threshing + + + muddy rice + + + +

    + + paddy + + ; + + muddy rice +

    + + rice + + +

    rice retaining its husk after threshing

    +     + + +

    + < + rice + > rice retaining its husk after threshing +

    +     +     @@ -802,17 +1041,42 @@ . 2 - - paddy; muddy rice + + + paddy + + + + + muddy rice + - - -

    - < - rice - > rice retaining its husk after threshing + +

    + + paddy + + ; + + muddy rice +

    + + rice + + +

    rice retaining its husk after threshing

    +     + + +

    + < + rice + > rice retaining its husk after threshing +

    +     +     @@ -829,21 +1093,44 @@ . 3 - - paddy - , US + + + paddy + - - muddy rice + + + muddy rice + - - -

    - < - rice - > rice retaining its husk after threshing + +

    + + paddy + , US + +

    +

    + + muddy rice +

    + + rice + + +

    rice retaining its husk after threshing

    +     + + +

    + < + rice + > rice retaining its husk after threshing +

    +     +     @@ -860,22 +1147,45 @@ . 4 - - paddy - , eng + + + paddy + - - muddy rice - , fra + + + muddy rice + - - -

    - < - rice - > rice retaining its husk after threshing + +

    + + paddy + , eng +

    +

    + + muddy rice + , fra + +

    + + rice + + +

    rice retaining its husk after threshing

    +     + + +

    + < + rice + > rice retaining its husk after threshing +

    +     +     PRESXML @@ -918,17 +1228,17 @@     INPUT presxml = <<~PRESXML - + Terms and Definitions 1 . - - - - - Terms and Definitions + + + + + Terms and Definitions Clause @@ -949,22 +1259,59 @@ . 1 - - paddy - , m, f, sg, noun, en Latn US, /pædiː/ + + + paddy + pædiː + + masculine + feminine + singular + false + true + irregular declension + + - - muddy rice - , n, noun + + + muddy rice + + neuter + true + irregular declension + + - - -

    - < - rice - > rice retaining its husk after threshing -

    + +

    + + paddy + , m, f, sg, noun, en Latn US, /pædiː/ + +

    +

    + + muddy rice + , n, noun + +

    +     + rice + + +

    rice retaining its husk after threshing

    +     + + +

    + < + rice + > rice retaining its husk after threshing +

    +     +     PRESXML @@ -993,17 +1340,17 @@ INPUT presxml = <<~PRESXML - + Terms and Definitions 1 . - - - - - Terms and Definitions + + + + + Terms and Definitions Clause @@ -1024,32 +1371,56 @@ . 1 - - + + + + - -
    - - + + +
    + 
    <LITERAL> FIGURATIVE
    +
    +     +     + +

    + + +

    +

    + +

    + + + Figure + 1 + + + Figure 1 - - - - Figure - 1 - - 
    <LITERAL> FIGURATIVE
    -
    - - - -

    - < - rice - > rice retaining its husk after threshing + + 

    <LITERAL> FIGURATIVE
    +
    +

    + + rice + + +

    rice retaining its husk after threshing

    +     + + +

    + < + rice + > rice retaining its husk after threshing +

    +     +     PRESXML @@ -1150,165 +1521,264 @@ INPUT presxml = <<~PRESXML - - Terms and definitions + + Terms and definitions 1 . - - - - - Terms and definitions + + + + + Terms and definitions Clause 1 -

    For the purposes of this document, the following terms and definitions apply.

    - - - - 1 - . - 1 - . - - - - Clause - 1 - . - 1 - - Term - -

    Definition

    - [SOURCE: - - - - 1 - - - , Section 1 - ] - - - - - Table - 1 - - - - Table - 1 - - - - - - - - - - - - - -
    AB
    CD
    -     - [SOURCE: - - - - 2 - - - , Section 2 - ] - -     - - - - 1 - . - 2 - . - - - - Clause +

    For the purposes of this document, the following terms and definitions apply.

    + + + + 1 + . + 1 + . + + + + Clause 1 - . - 2 - - Term 2 - -
    - - - Figure - 1 - - - - Figure - 1 - - 
    Literal
    -
    - - - - ( - 1 - ) - - - - Formula - ( - 1 - ) - - - - Clause - 1 - . - 2 - - , - Formula - ( - 1 - ) - - - - x - = - y - - x = y - - - [SOURCE: - - - - 3 - - - , Section 3 - ] + . + 1 +     + + + Term + + + +

    + + Term + +

    +     + + +

    Definition

    + + + + + 1 + + + + +     + + + + + + + + + + + + + + +
    AB
    CD
    +     +     + + +

    Definition

    + [SOURCE: + + + + + 1 + + + , Section 1 + + + ] + + + + Table + 1 + + + + Table + 1 + + + + + + + + + + + + + +
    AB
    CD
    +     +     + + + + + 2 + + + - -     + + [SOURCE: + + + + + 2 + + + , Section 2 + + + ] + + + + + + 1 + . + 2 + . + + + + Clause + 1 + . + 2 + + + + Term 2 + + + +

    + + Term 2 + +

    +     + + +
    + 
    Literal
    +
    + + + + x + = + y + + x = y + + + + + + + 3 + + + + +     +     + + +
    + + + Figure + 1 + + + + Figure + 1 + + 
    Literal
    +
    + + + + ( + 1 + ) + + + + Formula + ( + 1 + ) + + + + Clause + 1 + . + 2 + + , + Formula + ( + 1 + ) + + + + x + = + y + + x = y + + + [SOURCE: + + + + + 3 + + + , Section 3 + + + ] +     +     +     PRESXML expect(Xml::C14n.format(strip_guid(Nokogiri::XML(IsoDoc::PresentationXMLConvert @@ -1370,17 +1840,17 @@ INPUT output = <<~OUTPUT - + Terms and definitions 1 . - - - - - Terms and definitions + + + + + Terms and definitions Clause @@ -1401,11 +1871,27 @@ . 1 - - Second Term - , <Field, Usage Info 1> + + + Second Term + + Field + Usage Info 1 - Definition 1 + +

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

    +     + + Definition 1 + + + Definition 1 + @@ -1422,35 +1908,77 @@ . 2 - - First Designation + + + First Designation + +

    - CONTRAST: - - - Fifth Designation - , n - - - ( - - Clause - 1 - . - 1 - - ) + + First Designation +

    -

    - SEE: - **RELATED TERM NOT FOUND** -

    -

    - SEE ALSO: - **RELATED TERM NOT FOUND** -

    - Definition 2 +     + + + + Fifth Designation + + neuter + + + + + + + + + Fifth Designation + + neuter + + + + + + + + +

    + CONTRAST: + + + + Fifth Designation + , n + + + + ( + + Clause + 1 + . + 1 + + ) +

    +

    + SEE: + **RELATED TERM NOT FOUND** +

    +

    + SEE ALSO: + **RELATED TERM NOT FOUND** +

    +     + + Definition 2 + + + Definition 2 +     OUTPUT @@ -1519,11 +2047,11 @@ 1 . - - - - - Terms and Definitions + + + + + Terms and Definitions Clause @@ -1545,39 +2073,111 @@ . 1 - - paddy + + + paddy + - -

    rice retaining its husk after threshing

    + +

    + + paddy + +

    +     + + +

    rice retaining its husk after threshing

    +     - - [SOURCE: + + +

    rice retaining its husk after threshing

    +     +     + t1 - — with adjustments ; + +

    with adjustments

    +     +     + - , adapted — with adjustments ; + +

    with adjustments

    +     +     + - , modified — with adjustments ; + +

    with adjustments

    +     +     + t1 - ; + + - , adapted ; + + - , modified] + + [SOURCE: + + + t1 + + — with adjustments + + ; + + + + + , adapted — with adjustments + + ; + + + + + , modified — with adjustments + + ; + + + t1 + + + ; + + + + + , adapted + + ; + + + + + , modified + + ] +     OUTPUT @@ -1587,17 +2187,17 @@ .at("//xmlns:terms").to_xml))) .to be_equivalent_to Xml::C14n.format(output) output = <<~OUTPUT - + Terms and Definitions 1 . - - - - - Terms and Definitions + + + + + Terms and Definitions Klausel @@ -1619,39 +2219,111 @@ . 1 - - paddy + + + paddy + - -

    rice retaining its husk after threshing

    + +

    + + paddy + +

    +     + + +

    rice retaining its husk after threshing

    +     - - [QUELLE: + + +

    rice retaining its husk after threshing

    +     +     + t1 - — with adjustments ; + +

    with adjustments

    +     +     + - , angepasst — with adjustments ; + +

    with adjustments

    +     +     + - , geändert — with adjustments ; + +

    with adjustments

    +     +     + t1 - ; + + - , angepasst ; + + - , geändert] + + [QUELLE: + + + t1 + + — with adjustments + + ; + + + + + , angepasst — with adjustments + + ; + + + + + , geändert — with adjustments + + ; + + + t1 + + + ; + + + + + , angepasst + + ; + + + + + , geändert + + ] +     OUTPUT @@ -1681,17 +2353,17 @@ INPUT output = <<~OUTPUT - + Terms and Definitions 1 . - - - - - Terms and Definitions + + + + + Terms and Definitions Clause @@ -1713,13 +2385,30 @@ . 1 - - paddy - + + + paddy + + - -

    rice retaining its husk after threshing

    + +

    + + paddy + + +

    +     + + +

    rice retaining its husk after threshing

    +     + + +

    rice retaining its husk after threshing

    +     +     @@ -1736,13 +2425,32 @@ . 2 - - muddy - + + + + muddy + + + - -

    rice not retaining its husk after threshing

    + +

    + + muddy + + +

    +     + + +

    rice not retaining its husk after threshing

    +     + + +

    rice not retaining its husk after threshing

    +     +     OUTPUT From ace7c1b41b2f7f59940bf0a2e323dd8526c68ad5 Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Sun, 29 Dec 2024 22:56:31 +0200 Subject: [PATCH 02/18] rspec --- spec/isodoc/figures_spec.rb | 6 +- spec/isodoc/i18n_spec.rb | 2852 +++++++++++++++-------------- spec/isodoc/section_spec.rb | 657 +++---- spec/isodoc/section_title_spec.rb | 1571 ++++++++-------- spec/isodoc/table_spec.rb | 6 +- 5 files changed, 2600 insertions(+), 2492 deletions(-) diff --git a/spec/isodoc/figures_spec.rb b/spec/isodoc/figures_spec.rb index 7efad136..17ed2137 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

    -

    [SOURCE: ISO 712, Section 1 — with adjustments ; ISO 712, Section 2]

    +

    [SOURCE: ISO 712, Section 1 — with adjustments; ISO 712, Section 2]

    Figure 1 — Split-it-right sample divider @@ -361,7 +361,7 @@

    A

    B

    -

    [SOURCE: ISO 712, Section 1 — with adjustments ; ISO 712, Section 2]

    +

    [SOURCE: ISO 712, Section 1 — with adjustments; ISO 712, Section 2]

    Figure 1 — Split-it-right sample divider diff --git a/spec/isodoc/i18n_spec.rb b/spec/isodoc/i18n_spec.rb index 0ef94dc6..d74b8b09 100644 --- a/spec/isodoc/i18n_spec.rb +++ b/spec/isodoc/i18n_spec.rb @@ -76,339 +76,348 @@ INPUT presxml = <<~PRESXML - - - en - - published - withdrawn - - 2 - second edition - - brochure - - - - - Table of contents - - - Foreword - - Foreword - -

    - See - - Clause - 5 - -

    - - - Introduction - - Introduction - - - Introduction Subsection - - Introduction Subsection - - - - - - - Scope - - - 1 - . - - - - - Scope - - - Clause - 1 - -

    Text

    -     - - Terms, definitions, symbols and abbreviated terms - - - 3 - . - - - - - Terms, definitions, symbols and abbreviated terms - - - Clause - 3 - - - Normal Terms - - - 3 - . - 1 - . - - - - - Normal Terms - - - Clause - 3 - . - 1 - - - - - 3 - . - 1 - . - 1 - . - - - - Clause - 3 - . - 1 - . - 1 - - - Term2 - - - - - Symbols - - - 3 - . - 2 - . - - - - - Symbols - - - Clause - 3 - . - 2 - -
    -
    Symbol
    -
    Definition
    -
    -     -     - - Symbols - - - 4 - . - - - - - Symbols - - - Clause - 4 - -
    -
    Symbol
    -
    Definition
    -
    -     - - Clause 4 - - - 5 - . - - - - - Clause 4 - - - Clause - 5 - - - Introduction - - - 5 - . - 1 - . - - - - - Introduction - - - Clause - 5 - . - 1 - - - - Clause 4.2 - - - 5 - . - 2 - . - - - - - Clause 4.2 - - - Clause - 5 - . - 2 - - - - - Normative References - - - 2 - . - - - - - Normative References - - - Clause - 2 - - -     - - - <strong>Annex</strong> - - - - - Annex - A - - -
    - (normative) - -
    -
    -     - - Annex - -     - - Annex - A - - - Annex A.1 - - - A - . - 1 - . - - - - - Annex A.1 - - - Annex - A - . - 1 - - - Annex A.1a - - - A - . - 1 - . - 1 - . - - - - - Annex A.1a - - - Annex - A - . - 1 - . - 1 - - - -     - - - Bibliography - - Bibliography - - - Bibliography Subsection - - Bibliography Subsection - - - - - + + + en + + published + withdrawn + + 2 + second edition + + brochure + + + + + Table of contents + + + Foreword + + Foreword + +

    + See + + Clause + 5 + +

    +     + + Introduction + + Introduction + + + Introduction Subsection + + Introduction Subsection + + + +     + + + Scope + + + 1 + . + + + + + Scope + + + Clause + 1 + +

    Text

    +     + + Terms, definitions, symbols and abbreviated terms + + + 3 + . + + + + + Terms, definitions, symbols and abbreviated terms + + + Clause + 3 + + + Normal Terms + + + 3 + . + 1 + . + + + + + Normal Terms + + + Clause + 3 + . + 1 + + + + + 3 + . + 1 + . + 1 + . + + + + Clause + 3 + . + 1 + . + 1 + + + + Term2 + + + +

    + + Term2 + +

    +     +     +     + + Symbols + + + 3 + . + 2 + . + + + + + Symbols + + + Clause + 3 + . + 2 + +
    +
    Symbol
    +
    Definition
    +
    +     +     + + Symbols + + + 4 + . + + + + + Symbols + + + Clause + 4 + +
    +
    Symbol
    +
    Definition
    +
    +     + + Clause 4 + + + 5 + . + + + + + Clause 4 + + + Clause + 5 + + + Introduction + + + 5 + . + 1 + . + + + + + Introduction + + + Clause + 5 + . + 1 + + + + Clause 4.2 + + + 5 + . + 2 + . + + + + + Clause 4.2 + + + Clause + 5 + . + 2 + + + + + Normative References + + + 2 + . + + + + + Normative References + + + Clause + 2 + + +     + + + <strong>Annex</strong> + + + + + Annex + A + + +
    + (normative) + +
    +
    +     + + Annex + +     + + Annex + A + + + Annex A.1 + + + A + . + 1 + . + + + + + Annex A.1 + + + Annex + A + . + 1 + + + Annex A.1a + + + A + . + 1 + . + 1 + . + + + + + Annex A.1a + + + Annex + A + . + 1 + . + 1 + + + +     + + + Bibliography + + Bibliography + + + Bibliography Subsection + + Bibliography Subsection + + + + +     PRESXML html = <<~"OUTPUT" @@ -634,339 +643,348 @@ INPUT presxml = <<~PRESXML - - - fr - - published - withdrawn - - 2 - deuxième édition - - brochure - - - - - Sommaire - - - Foreword - - Foreword - -

    - See - - Article - 5 - -

    -     - - Introduction - - Introduction - - - Introduction Subsection - - Introduction Subsection - - - -     - - - Scope - - - 1 - . - - - - - Scope - - - Article - 1 - -

    Text

    -     - - Terms, definitions, symbols and abbreviated terms - - - 3 - . - - - - - Terms, definitions, symbols and abbreviated terms - - - Article - 3 - - - Normal Terms - - - 3 - . - 1 - . - - - - - Normal Terms - - - Article - 3 - . - 1 - - - - - 3 - . - 1 - . - 1 - . - - - - Article - 3 - . - 1 - . - 1 - - - Term2 - - - - - Symboles - - - 3 - . - 2 - . - - - - - Symboles - - - Article - 3 - . - 2 - -
    -
    Symbol
    -
    Definition
    -
    -     -     - - Symboles - - - 4 - . - - - - - Symboles - - - Article - 4 - -
    -
    Symbol
    -
    Definition
    -
    -     - - Clause 4 - - - 5 - . - - - - - Clause 4 - - - Article - 5 - - - Introduction - - - 5 - . - 1 - . - - - - - Introduction - - - Article - 5 - . - 1 - - - - Clause 4.2 - - - 5 - . - 2 - . - - - - - Clause 4.2 - - - Article - 5 - . - 2 - - - - - Normative References - - - 2 - . - - - - - Normative References - - - Article - 2 - - -     - - - <strong>Annex</strong> - - - - - Annexe - A - - -
    - (normative) - -
    -
    -     - - Annex - -     - - Annexe - A - - - Annex A.1 - - - A - . - 1 - . - - - - - Annex A.1 - - - Annexe - A - . - 1 - - - Annex A.1a - - - A - . - 1 - . - 1 - . - - - - - Annex A.1a - - - Annexe - A - . - 1 - . - 1 - - - -     - - - Bibliographie - - Bibliographie - - - Bibliography Subsection - - Bibliography Subsection - - - - -     + + + fr + + published + withdrawn + + 2 + deuxième édition + + brochure + + + + + Sommaire + + + Foreword + + Foreword + +

    + See + + Article + 5 + +

    +     + + Introduction + + Introduction + + + Introduction Subsection + + Introduction Subsection + + + +     + + + Scope + + + 1 + . + + + + + Scope + + + Article + 1 + +

    Text

    +     + + Terms, definitions, symbols and abbreviated terms + + + 3 + . + + + + + Terms, definitions, symbols and abbreviated terms + + + Article + 3 + + + Normal Terms + + + 3 + . + 1 + . + + + + + Normal Terms + + + Article + 3 + . + 1 + + + + + 3 + . + 1 + . + 1 + . + + + + Article + 3 + . + 1 + . + 1 + + + + Term2 + + + +

    + + Term2 + +

    +     +     +     + + Symboles + + + 3 + . + 2 + . + + + + + Symboles + + + Article + 3 + . + 2 + +
    +
    Symbol
    +
    Definition
    +
    +     +     + + Symboles + + + 4 + . + + + + + Symboles + + + Article + 4 + +
    +
    Symbol
    +
    Definition
    +
    +     + + Clause 4 + + + 5 + . + + + + + Clause 4 + + + Article + 5 + + + Introduction + + + 5 + . + 1 + . + + + + + Introduction + + + Article + 5 + . + 1 + + + + Clause 4.2 + + + 5 + . + 2 + . + + + + + Clause 4.2 + + + Article + 5 + . + 2 + + + + + Normative References + + + 2 + . + + + + + Normative References + + + Article + 2 + + +     + + + <strong>Annex</strong> + + + + + Annexe + A + + +
    + (normative) + +
    +
    +     + + Annex + +     + + Annexe + A + + + Annex A.1 + + + A + . + 1 + . + + + + + Annex A.1 + + + Annexe + A + . + 1 + + + Annex A.1a + + + A + . + 1 + . + 1 + . + + + + + Annex A.1a + + + Annexe + A + . + 1 + . + 1 + + + +     + + + Bibliographie + + Bibliographie + + + Bibliography Subsection + + Bibliography Subsection + + + + +     PRESXML html = <<~"OUTPUT" @@ -1140,350 +1158,359 @@ presxml = <<~PRESXML - - zh - - - published - withdrawn - - 2 - 第第二版 - - brochure - - - - - 目　次 - - - Foreword - - Foreword - -

    - See - - 条 - 5 - -

    -     - - Introduction - - Introduction - - - Introduction Subsection - - Introduction Subsection - - - -     - - - Scope - - - 1 - . - - - - - Scope - - - 条 - 1 - -

    - ISO 712，第1～1表 -

    -     - - Terms, definitions, symbols and abbreviated terms - - - 3 - . - - - - - Terms, definitions, symbols and abbreviated terms - - - 条 - 3 - - - Normal Terms - - - 3 - . - 1 - . - - - - - Normal Terms - - - 条 - 3 - . - 1 - - - - - 3 - . - 1 - . - 1 - . - - - - 条 - 3 - . - 1 - . - 1 - - - Term2 - - - - - 符号 - - - 3 - . - 2 - . - - - - - 符号 - - - 条 - 3 - . - 2 - -
    -
    Symbol
    -
    Definition
    -
    -     -     - - 符号 - - - 4 - . - - - - - 符号 - - - 条 - 4 - -
    -
    Symbol
    -
    Definition
    -
    -     - - Clause 4 - - - 5 - . - - - - - Clause 4 - - - 条 - 5 - - - Introduction - - - 5 - . - 1 - . - - - - - Introduction - - - 条 - 5 - . - 1 - - - - Clause 4.2 - - - 5 - . - 2 - . - - - - - Clause 4.2 - - - 条 - 5 - . - 2 - - - - - Normative References - - - 2 - . - - - - - Normative References - - - 条 - 2 - - - - Cereals and cereal products - . - - ISO 712 - ISO 712 - ISO 712, - - -     - - - <strong>Annex</strong> - - - - - 附件 - A - - -
    - （规范性附录） - -
    -
    -     - - Annex - -     - - 附件 - A - - - Annex A.1 - - - A - . - 1 - . - - - - - Annex A.1 - - - 附件 - A - . - 1 - - - Annex A.1a - - - A - . - 1 - . - 1 - . - - - - - Annex A.1a - - - 附件 - A - . - 1 - . - 1 - - - -     - - - Bibliography - - Bibliography - - - Bibliography Subsection - - Bibliography Subsection - - - - -     + + zh + + + published + withdrawn + + 2 + 第第二版 + + brochure + + + + + 目　次 + + + Foreword + + Foreword + +

    + See + + 条 + 5 + +

    +     + + Introduction + + Introduction + + + Introduction Subsection + + Introduction Subsection + + + +     + + + Scope + + + 1 + . + + + + + Scope + + + 条 + 1 + +

    + ISO 712，第1～1表 +

    +     + + Terms, definitions, symbols and abbreviated terms + + + 3 + . + + + + + Terms, definitions, symbols and abbreviated terms + + + 条 + 3 + + + Normal Terms + + + 3 + . + 1 + . + + + + + Normal Terms + + + 条 + 3 + . + 1 + + + + + 3 + . + 1 + . + 1 + . + + + + 条 + 3 + . + 1 + . + 1 + + + + Term2 + + + +

    + + Term2 + +

    +     +     +     + + 符号 + + + 3 + . + 2 + . + + + + + 符号 + + + 条 + 3 + . + 2 + +
    +
    Symbol
    +
    Definition
    +
    +     +     + + 符号 + + + 4 + . + + + + + 符号 + + + 条 + 4 + +
    +
    Symbol
    +
    Definition
    +
    +     + + Clause 4 + + + 5 + . + + + + + Clause 4 + + + 条 + 5 + + + Introduction + + + 5 + . + 1 + . + + + + + Introduction + + + 条 + 5 + . + 1 + + + + Clause 4.2 + + + 5 + . + 2 + . + + + + + Clause 4.2 + + + 条 + 5 + . + 2 + + + + + Normative References + + + 2 + . + + + + + Normative References + + + 条 + 2 + + + + Cereals and cereal products + . + + ISO 712 + ISO 712 + ISO 712, + + +     + + + <strong>Annex</strong> + + + + + 附件 + A + + +
    + （规范性附录） + +
    +
    +     + + Annex + +     + + 附件 + A + + + Annex A.1 + + + A + . + 1 + . + + + + + Annex A.1 + + + 附件 + A + . + 1 + + + Annex A.1a + + + A + . + 1 + . + 1 + . + + + + + Annex A.1a + + + 附件 + A + . + 1 + . + 1 + + + +     + + + Bibliography + + Bibliography + + + Bibliography Subsection + + Bibliography Subsection + + + + + PRESXML html = <<~"OUTPUT" @@ -1671,404 +1698,413 @@ INPUT presxml = <<~OUTPUT - - - eo - - - published - publikigita - withdrawn - fortirita - - 2 - eldono dua - - brochure - broŝuro - - - - - - - - Foreword - - Foreword - -

    - See - - klaŭzo - 5 - -

    -

    - See - - tabelo - 1 - -

    - - - - Tabelo - 1 - - - - tabelo - 1 - -
    -     - - Introduction - - Introduction - - - Introduction Subsection - - Introduction Subsection - - - -     - - - Scope - - - 1 - . - - - - - Scope - - - klaŭzo - 1 - -

    - ISO 712, Tabelo 1–1 -

    -     - - Terms, definitions, symbols and abbreviated terms - - - 3 - . - - - - - Terms, definitions, symbols and abbreviated terms - - - klaŭzo - 3 - - - Normal Terms - - - 3 - . - 1 - . - - - - - Normal Terms - - - klaŭzo - 3 - . - 1 - - - - - 3 - . - 1 - . - 1 - . - - - - klaŭzo - 3 - . - 1 - . - 1 - - - Term2 - - - - - Simboloj kai mallongigitaj terminoj - - - 3 - . - 2 - . - - - - - Simboloj kai mallongigitaj terminoj - - - klaŭzo - 3 - . - 2 - -
    -
    Symbol
    -
    Definition
    -
    -     -     - - Simboloj kai mallongigitaj terminoj - - - 4 - . - - - - - Simboloj kai mallongigitaj terminoj - - - klaŭzo - 4 - -
    -
    Symbol
    -
    Definition
    -
    -     - - Clause 4 - - - 5 - . - - - - - Clause 4 - - - klaŭzo - 5 - - - Introduction - - - 5 - . - 1 - . - - - - - Introduction - - - klaŭzo - 5 - . - 1 - - - - - NOTO - - - - - - - noto - - - - klaŭzo - 5 - . - 1 - - — - noto - - - - - Clause 4.2 - - - 5 - . - 2 - . - - - - - Clause 4.2 - - - klaŭzo - 5 - . - 2 - - - - - Normative References - - - 2 - . - - - - - Normative References - - - klaŭzo - 2 - - - - Cereals and cereal products - . - - ISO 712 - ISO 712 - ISO 712, - - -     - - - <strong>Annex</strong> - - - - - - Aldono - - A - - -
    - (normative) - -
    -
    -     - - Annex - -     - - - aldono - - A - - - Annex A.1 - - - A - . - 1 - . - - - - - Annex A.1 - - - - aldono - - A - . - 1 - - - Annex A.1a - - - A - . - 1 - . - 1 - . - - - - - Annex A.1a - - - - aldono - - A - . - 1 - . - 1 - - - -     - - - Bibliography - - Bibliography - - - Bibliography Subsection - - Bibliography Subsection - - - - -     + + + eo + + + published + publikigita + withdrawn + fortirita + + 2 + eldono dua + + brochure + broŝuro + + + + + + + + Foreword + + Foreword + +

    + See + + klaŭzo + 5 + +

    +

    + See + + tabelo + 1 + +

    + + + + Tabelo + 1 + + + + tabelo + 1 + +
    +     + + Introduction + + Introduction + + + Introduction Subsection + + Introduction Subsection + + + +     + + + Scope + + + 1 + . + + + + + Scope + + + klaŭzo + 1 + +

    + ISO 712, Tabelo 1–1 +

    +     + + Terms, definitions, symbols and abbreviated terms + + + 3 + . + + + + + Terms, definitions, symbols and abbreviated terms + + + klaŭzo + 3 + + + Normal Terms + + + 3 + . + 1 + . + + + + + Normal Terms + + + klaŭzo + 3 + . + 1 + + + + + 3 + . + 1 + . + 1 + . + + + + klaŭzo + 3 + . + 1 + . + 1 + + + + Term2 + + + +

    + + Term2 + +

    +     +     +     + + Simboloj kai mallongigitaj terminoj + + + 3 + . + 2 + . + + + + + Simboloj kai mallongigitaj terminoj + + + klaŭzo + 3 + . + 2 + +
    +
    Symbol
    +
    Definition
    +
    +     +     + + Simboloj kai mallongigitaj terminoj + + + 4 + . + + + + + Simboloj kai mallongigitaj terminoj + + + klaŭzo + 4 + +
    +
    Symbol
    +
    Definition
    +
    +     + + Clause 4 + + + 5 + . + + + + + Clause 4 + + + klaŭzo + 5 + + + Introduction + + + 5 + . + 1 + . + + + + + Introduction + + + klaŭzo + 5 + . + 1 + + + + + NOTO + + + + + + + noto + + + + klaŭzo + 5 + . + 1 + + — + noto + + + + + Clause 4.2 + + + 5 + . + 2 + . + + + + + Clause 4.2 + + + klaŭzo + 5 + . + 2 + + + + + Normative References + + + 2 + . + + + + + Normative References + + + klaŭzo + 2 + + + + Cereals and cereal products + . + + ISO 712 + ISO 712 + ISO 712, + + +     + + + <strong>Annex</strong> + + + + + + Aldono + + A + + +
    + (normative) + +
    +
    +     + + Annex + +     + + + aldono + + A + + + Annex A.1 + + + A + . + 1 + . + + + + + Annex A.1 + + + + aldono + + A + . + 1 + + + Annex A.1a + + + A + . + 1 + . + 1 + . + + + + + Annex A.1a + + + + aldono + + A + . + 1 + . + 1 + + + +     + + + Bibliography + + Bibliography + + + Bibliography Subsection + + Bibliography Subsection + + + + +     OUTPUT html = <<~OUTPUT diff --git a/spec/isodoc/section_spec.rb b/spec/isodoc/section_spec.rb index c9f08e96..a7f63e44 100644 --- a/spec/isodoc/section_spec.rb +++ b/spec/isodoc/section_spec.rb @@ -213,312 +213,357 @@ INPUT presxml = <<~OUTPUT - - - - Table of contents - - - - - <strong>Glossary</strong> - - - - - Annex - A - - -
    - (normative) - -
    -
    -     - - Glossary - -     - - Annex - A - - - - - - A - . - 1 - . - - - - Annex - A - . - 1 - - - Glossary - - - -     - - - <strong>Glossary</strong> - - - - - Annex - B - - -
    - (normative) - -
    -
    -     - - Glossary - -     - - Annex - B - - - Term Collection - - - B - . - 1 - . - - - - - Term Collection - - - Annex - B - . - 1 - - - - - B - . - 1 - . - 1 - . - - - - Annex - B - . - 1 - . - 1 - - - Term - - - - - Term Collection 2 - - - B - . - 2 - . - - - - - Term Collection 2 - - - Annex - B - . - 2 - - - - - B - . - 2 - . - 1 - . - - - - Annex - B - . - 2 - . - 1 - - - Term - - - -     - - - <strong>Glossary</strong> - - - - - Annex - C - - -
    - (normative) - -
    -
    -     - - Glossary - -     - - Annex - C - - - Term Collection - - - C - . - 1 - . - - - - - Term Collection - - - Annex - C - . - 1 - - - - - C - . - 1 - . - 1 - . - - - - Annex - C - . - 1 - . - 1 - - - Term - - - - - References - - - C - . - 2 - . - - - - - References - - - Annex - C - . - 2 - - -     - - - <strong>Term Collection</strong> - - - - - Annex - D - - -
    - (normative) - -
    -
    -     - - Term Collection - -     - - Annex - D - - - - - - D - . - 1 - . - - - - Annex - D - . - 1 - - - Term - - - -     -     + + + + Table of contents + + + + + <strong>Glossary</strong> + + + + + Annex + A + + +
    + (normative) + +
    +
    +     + + Glossary + +     + + Annex + A + + + + + + A + . + 1 + . + + + + Annex + A + . + 1 + + + + Glossary + + + +

    + + Glossary + +

    +     +     +     +     + + + <strong>Glossary</strong> + + + + + Annex + B + + +
    + (normative) + +
    +
    +     + + Glossary + +     + + Annex + B + + + Term Collection + + + B + . + 1 + . + + + + + Term Collection + + + Annex + B + . + 1 + + + + + B + . + 1 + . + 1 + . + + + + Annex + B + . + 1 + . + 1 + + + + Term + + + +

    + + Term + +

    +     +     +     + + Term Collection 2 + + + B + . + 2 + . + + + + + Term Collection 2 + + + Annex + B + . + 2 + + + + + B + . + 2 + . + 1 + . + + + + Annex + B + . + 2 + . + 1 + + + + Term + + + +

    + + Term + +

    +     +     +     +     + + + <strong>Glossary</strong> + + + + + Annex + C + + +
    + (normative) + +
    +
    +     + + Glossary + +     + + Annex + C + + + Term Collection + + + C + . + 1 + . + + + + + Term Collection + + + Annex + C + . + 1 + + + + + C + . + 1 + . + 1 + . + + + + Annex + C + . + 1 + . + 1 + + + + Term + + + +

    + + Term + +

    +     +     +     + + References + + + C + . + 2 + . + + + + + References + + + Annex + C + . + 2 + + +     + + + <strong>Term Collection</strong> + + + + + Annex + D + + +
    + (normative) + +
    +
    +     + + Term Collection + +     + + Annex + D + + + + + + D + . + 1 + . + + + + Annex + D + . + 1 + + + + Term + + + +

    + + Term + +

    +     +     +     +     +     OUTPUT expect(Xml::C14n.format(strip_guid(IsoDoc::PresentationXMLConvert .new(presxml_options) diff --git a/spec/isodoc/section_title_spec.rb b/spec/isodoc/section_title_spec.rb index 9ad5e5c0..ccd28138 100644 --- a/spec/isodoc/section_title_spec.rb +++ b/spec/isodoc/section_title_spec.rb @@ -119,467 +119,476 @@ presxml = <<~PRESXML - - - - Copyright - - Copyright - - - - - - License - - License - - - - - - Legal - - Legal - - - - - - Feedback - - Feedback - - - - - - - Table of contents - - - Abstract - - Abstract - - - - Foreword - - Foreword - -

    This is a preamble

    -     - - Introduction - - Introduction - - - Introduction Subsection - - Introduction Subsection - - - - - Dedication - - Dedication - - - - Note to reader - - Note to reader - - - - Acknowledgements - - Acknowledgements - - -     - - - - - NOTE - - - - - -

    Initial note

    -     - - WARNING - - WARNING - -

    Initial admonition

    -     - - Scope - - - 1 - . - - - - - Scope - - - Clause - 1 - -

    Text

    -     - - Terms, Definitions, Symbols and Abbreviated Terms - - - 3 - . - - - - - Terms, Definitions, Symbols and Abbreviated Terms - - - Clause - 3 - - - Normal Terms - - - 3 - . - 1 - . - - - - - Normal Terms - - - Clause - 3 - . - 1 - - - - - 3 - . - 1 - . - 1 - . - - - - Clause - 3 - . - 1 - . - 1 - - - Term2 - - - - - Symbols - - - 3 - . - 2 - . - - - - - Symbols - - - Clause - 3 - . - 2 - -
    -
    Symbol
    -
    Definition
    -
    -     -     - - Symbols and abbreviated terms - - - 4 - . - - - - - Symbols and abbreviated terms - - - Clause - 4 - -
    -
    Symbol
    -
    Definition
    -
    -     - - Clause 4 - - - 5 - . - - - - - Clause 4 - - - Clause - 5 - - - Introduction - - - 5 - . - 1 - . - - - - - Introduction - - - Clause - 5 - . - 1 - - - - Clause 4.2 - - - 5 - . - 2 - . - - - - - Clause 4.2 - - - Clause - 5 - . - 2 - - - - - - 5 - . - 3 - . - - - - Clause - 5 - . - 3 - - - - - Normative References - - - 2 - . - - - - - Normative References - - - Clause - 2 - - -     - - - <strong>Annex</strong> - - - - - Annex - A - - -
    - (normative) - -
    -
    -     - - Annex - -     - - Annex - A - - - Annex A.1 - - - A - . - 1 - . - - - - - Annex A.1 - - - Annex - A - . - 1 - - - Annex A.1a - - - A - . - 1 - . - 1 - . - - - - - Annex A.1a - - - Annex - A - . - 1 - . - 1 - - - - Annex Bibliography - - - A - . - 1 - . - 2 - . - - - - - Annex Bibliography - - - Annex - A - . - 1 - . - 2 - - - -     - - - - - Annex - B - - -
    - (normative) -     - - Annex - B - -     - - - Bibliography - - Bibliography - - - Bibliography Subsection - - Bibliography Subsection - - - - - - - Postface 1 - - Postface 1 - - - - Postface 2 - - Postface 2 - - - -     + + + + Copyright + + Copyright + + + + + + License + + License + + + + + + Legal + + Legal + + + + + + Feedback + + Feedback + + + + + + + Table of contents + + + Abstract + + Abstract + + + + Foreword + + Foreword + +

    This is a preamble

    +     + + Introduction + + Introduction + + + Introduction Subsection + + Introduction Subsection + + + + + Dedication + + Dedication + + + + Note to reader + + Note to reader + + + + Acknowledgements + + Acknowledgements + + +     + + + + + NOTE + + + + + +

    Initial note

    +     + + WARNING + + WARNING + +

    Initial admonition

    +     + + Scope + + + 1 + . + + + + + Scope + + + Clause + 1 + +

    Text

    +     + + Terms, Definitions, Symbols and Abbreviated Terms + + + 3 + . + + + + + Terms, Definitions, Symbols and Abbreviated Terms + + + Clause + 3 + + + Normal Terms + + + 3 + . + 1 + . + + + + + Normal Terms + + + Clause + 3 + . + 1 + + + + + 3 + . + 1 + . + 1 + . + + + + Clause + 3 + . + 1 + . + 1 + + + + Term2 + + + +

    + + Term2 + +

    +     +     +     + + Symbols + + + 3 + . + 2 + . + + + + + Symbols + + + Clause + 3 + . + 2 + +
    +
    Symbol
    +
    Definition
    +
    +     +     + + Symbols and abbreviated terms + + + 4 + . + + + + + Symbols and abbreviated terms + + + Clause + 4 + +
    +
    Symbol
    +
    Definition
    +
    +     + + Clause 4 + + + 5 + . + + + + + Clause 4 + + + Clause + 5 + + + Introduction + + + 5 + . + 1 + . + + + + + Introduction + + + Clause + 5 + . + 1 + + + + Clause 4.2 + + + 5 + . + 2 + . + + + + + Clause 4.2 + + + Clause + 5 + . + 2 + + + + + + 5 + . + 3 + . + + + + Clause + 5 + . + 3 + + + + + Normative References + + + 2 + . + + + + + Normative References + + + Clause + 2 + + +     + + + <strong>Annex</strong> + + + + + Annex + A + + +
    + (normative) + +
    +
    +     + + Annex + +     + + Annex + A + + + Annex A.1 + + + A + . + 1 + . + + + + + Annex A.1 + + + Annex + A + . + 1 + + + Annex A.1a + + + A + . + 1 + . + 1 + . + + + + + Annex A.1a + + + Annex + A + . + 1 + . + 1 + + + + Annex Bibliography + + + A + . + 1 + . + 2 + . + + + + + Annex Bibliography + + + Annex + A + . + 1 + . + 2 + + + +     + + + + + Annex + B + + +
    + (normative) +     + + Annex + B + +     + + + Bibliography + + Bibliography + + + Bibliography Subsection + + Bibliography Subsection + + + + + + + Postface 1 + + Postface 1 + + + + Postface 2 + + Postface 2 + + + + PRESXML html = <<~"OUTPUT" @@ -1581,179 +1590,188 @@ - - - Annex - - Annex A.1 - - Annex A.1a - - - - Normative References - - Bibliography - - Bibliography Subsection - - - + + + Annex + + Annex A.1 + + Annex A.1a + + + + Normative References + + Bibliography + + Bibliography Subsection + + + + + INPUT + output = <<~OUTPUT + + + + Table of contents + + + Foreword + + Foreword + +

    This is a preamble

    +     + + Introduction + + Introduction + + + Introduction Subsection + + Introduction Subsection + + + +     + + + Scope + + Scope + +

    Text

    +     + + Terms, Definitions, Symbols and Abbreviated Terms + + Terms, Definitions, Symbols and Abbreviated Terms + + + Normal Terms + + Normal Terms + + + + + 3 + . + 1 + . + 1 + . + + + + Clause + 3 + . + 1 + . + 1 + + + + Term2 + + + +

    + + Term2 + +

    +     +     +     + + Symbols + + Symbols + +
    +
    Symbol
    +
    Definition
    +
    +     +     + + Symbols + + Symbols + +
    +
    Symbol
    +
    Definition
    +
    +     + + Clause 4 + + Clause 4 + + + Introduction + + Introduction + + + + Clause 4.2 + + Clause 4.2 + + + + + + + Normative References + + Normative References + + +     + + + <strong>Annex</strong> + + + + Annex + + + + Annex A.1 + + Annex A.1 + + + Annex A.1a + + Annex A.1a + + + + + + + Bibliography + + Bibliography + + + Bibliography Subsection + + Bibliography Subsection + + + +     - INPUT - output = <<~OUTPUT - - - - Table of contents - - - Foreword - - Foreword - -

    This is a preamble

    -     - - Introduction - - Introduction - - - Introduction Subsection - - Introduction Subsection - - - -     - - - Scope - - Scope - -

    Text

    -     - - Terms, Definitions, Symbols and Abbreviated Terms - - Terms, Definitions, Symbols and Abbreviated Terms - - - Normal Terms - - Normal Terms - - - - - 3 - . - 1 - . - 1 - . - - - - Clause - 3 - . - 1 - . - 1 - - - Term2 - - - - - Symbols - - Symbols - -
    -
    Symbol
    -
    Definition
    -
    -     -     - - Symbols - - Symbols - -
    -
    Symbol
    -
    Definition
    -
    -     - - Clause 4 - - Clause 4 - - - Introduction - - Introduction - - - - Clause 4.2 - - Clause 4.2 - - - - - - - Normative References - - Normative References - - -     - - - <strong>Annex</strong> - - - - Annex - - - - Annex A.1 - - Annex A.1 - - - Annex A.1a - - Annex A.1a - - - - - - - Bibliography - - Bibliography - - - Bibliography Subsection - - Bibliography Subsection - - - - -     OUTPUT expect(Xml::C14n.format(strip_guid(IsoDoc::PresentationXMLConvert .new({ suppressheadingnumbers: true } @@ -1824,145 +1842,154 @@ INPUT output = <<~OUTPUT - - - - Table of contents - - - - - Scope - - Scope - -

    Text

    -     - - Terms, Definitions, Symbols and Abbreviated Terms - - Terms, Definitions, Symbols and Abbreviated Terms - - - Normal Terms - - Normal Terms - - - - Term2 - - - - - Symbols - - Symbols - -
    -
    Symbol
    -
    Definition
    -
    -     -     - - Symbols - - Symbols - -
    -
    Symbol
    -
    Definition
    -
    -     - - Clause 4 - - Clause 4 - - - Introduction - - Introduction - - - - Clause 4.2 - - Clause 4.2 - - - - - - - 1 - . - - - - Clause - 1 - - - - - - - - 2 - . - - - - Clause - 2 - - - - Normative References - - Normative References - - -     - - - <strong>Annex</strong> - - - - Annex - - - - Annex A.1 - - Annex A.1 - - - Annex A.1a - - Annex A.1a - - - - - - - Bibliography - - Bibliography - - - Bibliography Subsection - - Bibliography Subsection - - - - -     + + + + Table of contents + + + + + Scope + + Scope + +

    Text

    +     + + Terms, Definitions, Symbols and Abbreviated Terms + + Terms, Definitions, Symbols and Abbreviated Terms + + + Normal Terms + + Normal Terms + + + + + Term2 + + + +

    + + Term2 + +

    +     +     +     + + Symbols + + Symbols + +
    +
    Symbol
    +
    Definition
    +
    +     +     + + Symbols + + Symbols + +
    +
    Symbol
    +
    Definition
    +
    +     + + Clause 4 + + Clause 4 + + + Introduction + + Introduction + + + + Clause 4.2 + + Clause 4.2 + + + + + + + 1 + . + + + + Clause + 1 + + + + + + + + 2 + . + + + + Clause + 2 + + + + Normative References + + Normative References + + +     + + + <strong>Annex</strong> + + + + Annex + + + + Annex A.1 + + Annex A.1 + + + Annex A.1a + + Annex A.1a + + + + + + + Bibliography + + Bibliography + + + Bibliography Subsection + + Bibliography Subsection + + + + +     OUTPUT expect(Xml::C14n.format(strip_guid(IsoDoc::PresentationXMLConvert .new(presxml_options) diff --git a/spec/isodoc/table_spec.rb b/spec/isodoc/table_spec.rb index 33fd298e..cdf08a10 100644 --- a/spec/isodoc/table_spec.rb +++ b/spec/isodoc/table_spec.rb @@ -228,7 +228,7 @@ [SOURCE: ISO 712, Section 1 - — with adjustments ; + — with adjustments; ISO 712, Section 2 ] @@ -416,7 +416,7 @@

    [SOURCE: ISO 712, Section 1 — - with adjustments ; ISO 712, Section 2]

    + with adjustments; ISO 712, Section 2]

    NOTE  This is a table about rice

    @@ -547,7 +547,7 @@

    [SOURCE: ISO 712, Section 1 - — with adjustments ; ISO 712, Section 2]

    + — with adjustments; ISO 712, Section 2]

    NOTE  This is a table about rice

    From 7693cb0cbbfda23103aa6f986fd709ca73cb358f Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Wed, 1 Jan 2025 01:02:59 +0200 Subject: [PATCH 03/18] In bibliography, do not number bibitem embedded within bibitem: https://github.com/metanorma/mn-samples-plateau/issues/282 --- lib/isodoc/presentation_function/refs.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From a01c8302d1923313a34b5fbfd041030a3eef5fe6 Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Wed, 1 Jan 2025 02:53:27 +0200 Subject: [PATCH 04/18] https://github.com/metanorma/isodoc/issues/630 --- lib/isodoc/presentation_function/concepts.rb | 4 +- spec/isodoc/terms_spec.rb | 82 +++++++++++--------- 2 files changed, 46 insertions(+), 40 deletions(-) diff --git a/lib/isodoc/presentation_function/concepts.rb b/lib/isodoc/presentation_function/concepts.rb index d6e90f98..426bb910 100644 --- a/lib/isodoc/presentation_function/concepts.rb +++ b/lib/isodoc/presentation_function/concepts.rb @@ -78,10 +78,10 @@ def related1(node) 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 diff --git a/spec/isodoc/terms_spec.rb b/spec/isodoc/terms_spec.rb index a0047e5e..98c696d6 100644 --- a/spec/isodoc/terms_spec.rb +++ b/spec/isodoc/terms_spec.rb @@ -1879,12 +1879,12 @@ Usage Info 1 -

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

    +

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

    Definition 1 @@ -1914,11 +1914,11 @@ -

    - - First Designation - -

    +

    + + First Designation + +

    @@ -1945,33 +1945,39 @@ -

    - CONTRAST: - - - - Fifth Designation - , n - - - - ( - - Clause - 1 - . - 1 - - ) -

    -

    - SEE: - **RELATED TERM NOT FOUND** -

    -

    - SEE ALSO: - **RELATED TERM NOT FOUND** -

    + +

    + CONTRAST: + + + + Fifth Designation + , n + + + + ( + + Clause + 1 + . + 1 + + ) +

    +     + +

    + SEE: + **RELATED TERM NOT FOUND** +

    +     + +

    + SEE ALSO: + **RELATED TERM NOT FOUND** +

    +     Definition 2 From 1f2bf52fed43a5cbc3e4bbed9c7a6c26cdd2739b Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Wed, 1 Jan 2025 19:00:10 +0200 Subject: [PATCH 05/18] refactor: https://github.com/metanorma/isodoc/issues/630 --- lib/isodoc/presentation_function/concepts.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/isodoc/presentation_function/concepts.rb b/lib/isodoc/presentation_function/concepts.rb index 426bb910..8655cc16 100644 --- a/lib/isodoc/presentation_function/concepts.rb +++ b/lib/isodoc/presentation_function/concepts.rb @@ -171,7 +171,7 @@ def designation1(desgn) def designation_annotate(desgn, name, orig) designation_boldface(desgn) - designation_field(desgn, name) + designation_field(desgn, name, orig) g = desgn.at(ns("./expression/grammar")) and name << ", #{designation_grammar(g).join(', ')}" designation_localization(desgn, name, orig) @@ -186,7 +186,7 @@ def designation_boldface(desgn) name.children = "#{name.children}" end - def designation_field(desgn, name) + def designation_field(desgn, name, orig) f = desgn.xpath(ns("./field-of-application | ./usage-info")) &.map { |u| to_xml(u.children) }&.join(", ") f&.empty? and return nil From 464bbdfcdbbb3a5282bee46c2fd516e66cc9a5fb Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Thu, 2 Jan 2025 00:28:49 +0200 Subject: [PATCH 06/18] fix processing of termsource within designation: https://github.com/metanorma/isodoc/issues/630 --- lib/isodoc/presentation_function/concepts.rb | 2 +- lib/isodoc/presentation_function/terms.rb | 4 +- spec/isodoc/terms_spec.rb | 41 +++++++++----------- 3 files changed, 21 insertions(+), 26 deletions(-) diff --git a/lib/isodoc/presentation_function/concepts.rb b/lib/isodoc/presentation_function/concepts.rb index 8655cc16..a73b42bc 100644 --- a/lib/isodoc/presentation_function/concepts.rb +++ b/lib/isodoc/presentation_function/concepts.rb @@ -166,7 +166,7 @@ def designation1(desgn) "./graphical-symbol")) or return designation_annotate(d1, name, desgn) out << d1 - s and out.next = s.wrap("") + s and out << s.wrap("").parent end def designation_annotate(desgn, name, orig) diff --git a/lib/isodoc/presentation_function/terms.rb b/lib/isodoc/presentation_function/terms.rb index 91d7a01b..5c511b11 100644 --- a/lib/isodoc/presentation_function/terms.rb +++ b/lib/isodoc/presentation_function/terms.rb @@ -17,7 +17,7 @@ def termcleanup(docxml) %w(preferred admitted deprecates related definition termsource) .each do |w| t.xpath(ns("./#{w}//fmt-name | ./#{w}//fmt-xref-label")).each(&:remove) - f = t.at(ns("./fmt-#{w}")) + f = t.at(ns(".//fmt-#{w}")) f&.children&.empty? and f.remove end end @@ -88,7 +88,7 @@ def termdomain(elem, fmt_defn) def termsource(docxml) 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")) + 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 diff --git a/spec/isodoc/terms_spec.rb b/spec/isodoc/terms_spec.rb index 98c696d6..de23faa0 100644 --- a/spec/isodoc/terms_spec.rb +++ b/spec/isodoc/terms_spec.rb @@ -229,17 +229,20 @@ , <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 + + ] + - - - - 3.1 - - - -

    The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here

    -     -     rice @@ -324,18 +327,8 @@

    with adjustments

    - + [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 - - ; t1 @@ -543,6 +536,7 @@ paddy , <in agriculture, dated>

    +

    [SOURCE: 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> rice retaining its husk after threshing

    EXAMPLE 1

    @@ -561,7 +555,7 @@
    -

    [SOURCE: ISO 7301:2011, Clause 3.1, modified — The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here; t1 — comment; Termbase IEV, term ID xyz, modified — with adjustments]

    +

    [SOURCE: t1 — comment; Termbase IEV, term ID xyz, modified — with adjustments]

    1.2.

    paddy @@ -622,6 +616,7 @@ paddy , <in agriculture, dated>

    +

    [SOURCE: 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> rice retaining its husk after threshing

    EXAMPLE 1

    @@ -640,7 +635,7 @@
    -

    [SOURCE: ISO 7301:2011, Clause 3.1, modified — The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here; t1 — comment; Termbase IEV, term ID xyz, modified — with adjustments]

    +

    [SOURCE: t1 — comment; Termbase IEV, term ID xyz, modified — with adjustments]

    1.2.

    paddy From c1515e155eadc7b0fa465fe2c37cd59c32ec4eec Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Thu, 2 Jan 2025 01:14:57 +0200 Subject: [PATCH 07/18] do not process concept within Semantic XML term elements: https://github.com/metanorma/isodoc/issues/632 --- lib/isodoc/presentation_function/concepts.rb | 1 + spec/isodoc/terms_spec.rb | 112 +++++++++++++++++++ 2 files changed, 113 insertions(+) diff --git a/lib/isodoc/presentation_function/concepts.rb b/lib/isodoc/presentation_function/concepts.rb index a73b42bc..34958f78 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") diff --git a/spec/isodoc/terms_spec.rb b/spec/isodoc/terms_spec.rb index de23faa0..aa879970 100644 --- a/spec/isodoc/terms_spec.rb +++ b/spec/isodoc/terms_spec.rb @@ -2461,4 +2461,116 @@ .at("//xmlns:terms").to_xml))) .to be_equivalent_to Xml::C14n.format(output) end + + it "do not process concept markup in Semantic XML" do + input = <<~INPUT + + en + + Terms and Definitions + paddy + +

      + term1 + term + + +
    • term1 + term + +
      • +
    + + +     + + INPUT + output = <<~OUTPUT + + Terms and Definitions + + + 1 + . + + + + + Terms and Definitions + + + Clause + 1 + + + + + 1 + . + 1 + . + + + + Clause + 1 + . + 1 + + + + paddy + + + +

    + + paddy + +

    +     + + +
      + + term1 + term + + +
    +
  • + + term1 + term + + +
    • +     +     + + +
      + term + ( + [clause1] + ) +
    +
  • + term + ( + [clause1] + ) +
    • +     +     +     +     + OUTPUT + expect(Xml::C14n.format(strip_guid(Nokogiri::XML(IsoDoc::PresentationXMLConvert + .new(presxml_options) + .convert("test", input, true)) + .at("//xmlns:terms").to_xml))) + .to be_equivalent_to Xml::C14n.format(output) + end + end From a2ff3befc3b07c0e3c89e812732238d6c77f819e Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Fri, 3 Jan 2025 21:33:53 +0200 Subject: [PATCH 08/18] refactor: https://github.com/metanorma/isodoc/issues/630 --- lib/isodoc/presentation_function/autonum.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/isodoc/presentation_function/autonum.rb b/lib/isodoc/presentation_function/autonum.rb index b118fcdb..aeb751e6 100644 --- a/lib/isodoc/presentation_function/autonum.rb +++ b/lib/isodoc/presentation_function/autonum.rb @@ -84,8 +84,9 @@ def autonum(id, num) "#{num}" end - def semx_orig(node) - node.parent.parent.at(".//*[@id = '#{node['source']}']") + def semx_orig(node, orig = nil) + orig ||= node.parent.parent + orig.at(".//*[@id = '#{node['source']}']") end def labelled_autonum(label, id, num) From 44a22ffd9dbc1173e20b0aec3cd8da69cf3eb358 Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Fri, 3 Jan 2025 22:45:46 +0200 Subject: [PATCH 09/18] annotate fmt-designation-field: https://github.com/metanorma/isodoc/issues/630 --- lib/isodoc/function/inline.rb | 2 +- lib/isodoc/presentation_function/concepts.rb | 6 +- spec/isodoc/terms_spec.rb | 61 +++++++++++++------- 3 files changed, 44 insertions(+), 25 deletions(-) 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 + > +

    From 2d9646e2c5bbd24328cadba9c2f79bf472a27ebc Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Sun, 5 Jan 2025 19:17:48 +0200 Subject: [PATCH 10/18] refactor: https://github.com/metanorma/isodoc/issues/630 --- lib/isodoc/presentation_function/terms.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/isodoc/presentation_function/terms.rb b/lib/isodoc/presentation_function/terms.rb index 5c511b11..e820c3fb 100644 --- a/lib/isodoc/presentation_function/terms.rb +++ b/lib/isodoc/presentation_function/terms.rb @@ -114,7 +114,11 @@ def termsource1(elem) ret << semx_fmt_dup(elem.next_element.remove) end s = ret.map { |x| to_xml(x) }.map(&:strip).join("; ") - elem.replace(l10n("[#{@i18n.source}: #{s}]")) + termsource_label(elem, s) + end + + def termsource_label(elem, sources) + elem.replace(l10n("[#{@i18n.source}: #{sources}]")) end def termsource_modification(elem) From 036bc30a496571d1e96830736ed90a3e0940e6b9 Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Wed, 8 Jan 2025 08:07:08 +0200 Subject: [PATCH 11/18] Presentation XML refactor, terms: termsource modification: https://github.com/metanorma/isodoc/issues/630 --- lib/isodoc/presentation_function/terms.rb | 2 +- spec/isodoc/figures_spec.rb | 2 +- spec/isodoc/table_spec.rb | 2 +- spec/isodoc/terms_spec.rb | 22 +++++++++++----------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/isodoc/presentation_function/terms.rb b/lib/isodoc/presentation_function/terms.rb index e820c3fb..071425b9 100644 --- a/lib/isodoc/presentation_function/terms.rb +++ b/lib/isodoc/presentation_function/terms.rb @@ -132,7 +132,7 @@ def termsource_add_modification_text(mod) mod or return mod.text.strip.empty? or mod.previous = " — " mod.elements.size == 1 and mod.children = to_xml(mod.elements[0].children) - mod.replace(to_xml(mod.children)) + mod.replace(semx_fmt_dup(mod)) end def termsource_status(status) diff --git a/spec/isodoc/figures_spec.rb b/spec/isodoc/figures_spec.rb index 17ed2137..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 ] diff --git a/spec/isodoc/table_spec.rb b/spec/isodoc/table_spec.rb index cdf08a10..3c695a12 100644 --- a/spec/isodoc/table_spec.rb +++ b/spec/isodoc/table_spec.rb @@ -228,7 +228,7 @@ [SOURCE: ISO 712, Section 1 - — with adjustments; + — with adjustments; ISO 712, Section 2 ] diff --git a/spec/isodoc/terms_spec.rb b/spec/isodoc/terms_spec.rb index 2699db98..5530259d 100644 --- a/spec/isodoc/terms_spec.rb +++ b/spec/isodoc/terms_spec.rb @@ -244,7 +244,7 @@     ISO 7301:2011, Clause 3.1     - , modified — The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here + , modified — The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here ] @@ -339,14 +339,14 @@ t1 - — comment + — comment ; - , modified — with adjustments + , modified — with adjustments ] @@ -833,7 +833,7 @@ ISO 7301:2011, Clause 3.1 - , modified — The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here + , modified — The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here ] @@ -918,7 +918,7 @@ - , modified — with adjustments + , modified — with adjustments ] @@ -2160,21 +2160,21 @@ t1 - — with adjustments + — with adjustments ; - , adapted — with adjustments + , adapted — with adjustments ; - , modified — with adjustments + , modified — with adjustments ; @@ -2306,21 +2306,21 @@ t1 - — with adjustments + — with adjustments ; - , angepasst — with adjustments + , angepasst — with adjustments ; - , geändert — with adjustments + , geändert — with adjustments ; From 12a5b3de8be06ce4f05b1e346b2bc87cb01453dc Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Wed, 8 Jan 2025 08:22:11 +0200 Subject: [PATCH 12/18] Presentation XML refactor, terms: https://github.com/metanorma/isodoc/issues/630 --- lib/isodoc/presentation_function/terms.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/isodoc/presentation_function/terms.rb b/lib/isodoc/presentation_function/terms.rb index 071425b9..beee35f0 100644 --- a/lib/isodoc/presentation_function/terms.rb +++ b/lib/isodoc/presentation_function/terms.rb @@ -132,7 +132,7 @@ def termsource_add_modification_text(mod) mod or return mod.text.strip.empty? or mod.previous = " — " mod.elements.size == 1 and mod.children = to_xml(mod.elements[0].children) - mod.replace(semx_fmt_dup(mod)) + mod.text.strip.empty? or mod.replace(semx_fmt_dup(mod)) end def termsource_status(status) From f929deb353cd2a59e2aa0a510c9c07c2483b62ad Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Wed, 8 Jan 2025 08:44:04 +0200 Subject: [PATCH 13/18] Presentation XML refactor, terms: https://github.com/metanorma/isodoc/issues/630 --- lib/isodoc/presentation_function/terms.rb | 8 +++++-- spec/isodoc/terms_spec.rb | 27 +++++++++++++++++++++-- 2 files changed, 31 insertions(+), 4 deletions(-) diff --git a/lib/isodoc/presentation_function/terms.rb b/lib/isodoc/presentation_function/terms.rb index beee35f0..4eebfe60 100644 --- a/lib/isodoc/presentation_function/terms.rb +++ b/lib/isodoc/presentation_function/terms.rb @@ -130,9 +130,13 @@ def termsource_modification(elem) def termsource_add_modification_text(mod) mod or return - mod.text.strip.empty? or mod.previous = " — " + 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.text.strip.empty? or mod.replace(semx_fmt_dup(mod)) + mod.replace(semx_fmt_dup(mod)) end def termsource_status(status) diff --git a/spec/isodoc/terms_spec.rb b/spec/isodoc/terms_spec.rb index 5530259d..aa5eda00 100644 --- a/spec/isodoc/terms_spec.rb +++ b/spec/isodoc/terms_spec.rb @@ -136,6 +136,14 @@

    with adjustments

     + + + t1 + + +

    + + paddy paddy rice @@ -333,6 +341,14 @@

    with adjustments

         + + + t1 + + +

    + + [SOURCE: @@ -347,6 +363,13 @@ , modified — with adjustments + + ; + + + t1 + + , adapted ] @@ -568,7 +591,7 @@ -

    [SOURCE: t1 — comment; Termbase IEV, term ID xyz, modified — with adjustments]

    +

    [SOURCE: t1 — comment; Termbase IEV, term ID xyz, modified — with adjustments; t1, adapted]

    1.2.

    paddy @@ -648,7 +671,7 @@ -

    [SOURCE: t1 — comment; Termbase IEV, term ID xyz, modified — with adjustments]

    +

    [SOURCE: t1 — comment; Termbase IEV, term ID xyz, modified — with adjustments; t1, adapted]

    1.2.

    paddy From 33bd342327510ead3d5e4f8a4069cda311843190 Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Wed, 8 Jan 2025 09:11:21 +0200 Subject: [PATCH 14/18] termsource in designations: https://github.com/metanorma/isodoc/issues/630 --- lib/isodoc/presentation_function/terms.rb | 13 ++++++++++++- spec/isodoc/terms_spec.rb | 10 +++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/lib/isodoc/presentation_function/terms.rb b/lib/isodoc/presentation_function/terms.rb index 4eebfe60..6d83d045 100644 --- a/lib/isodoc/presentation_function/terms.rb +++ b/lib/isodoc/presentation_function/terms.rb @@ -92,12 +92,23 @@ def termsource(docxml) .each do |f| termsource_modification(f) end - docxml.xpath(ns("//fmt-termsource/termsource | //fmt-definition//termsource")) + 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")) diff --git a/spec/isodoc/terms_spec.rb b/spec/isodoc/terms_spec.rb index aa5eda00..8918e111 100644 --- a/spec/isodoc/terms_spec.rb +++ b/spec/isodoc/terms_spec.rb @@ -242,8 +242,6 @@ > -

    - [SOURCE: @@ -255,7 +253,7 @@ , modified — The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here ] - +

    rice @@ -570,9 +568,8 @@

    1.1.

    paddy - , <in agriculture, dated> + , <in agriculture, dated> [SOURCE: 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: 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> rice retaining its husk after threshing

    EXAMPLE 1

    @@ -650,9 +647,8 @@

    1.1.

    paddy - , <in agriculture, dated> + , <in agriculture, dated> [SOURCE: 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: 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> rice retaining its husk after threshing

    EXAMPLE 1

    From eca3a012040ef30cd42846d56917e1342aecf8cc Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Wed, 8 Jan 2025 20:38:34 +0200 Subject: [PATCH 15/18] https://github.com/metanorma/isodoc/issues/630 --- lib/isodoc/presentation_function/concepts.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/isodoc/presentation_function/concepts.rb b/lib/isodoc/presentation_function/concepts.rb index 15cd5cf3..5adbcf65 100644 --- a/lib/isodoc/presentation_function/concepts.rb +++ b/lib/isodoc/presentation_function/concepts.rb @@ -114,8 +114,9 @@ def designation(docxml) end def deprecates(elem) - ins = elem.at(ns("./p")) || elem - ins.add_first_child @i18n.l10n("#{@i18n.deprecated}: ") + elem.xpath(ns(".//semx[@element = 'deprecates']")).each do |t| + t.previous = i18n.l10n("#{@i18n.deprecated}: ") + end end def admits(elem); end From e687aa2e16e2e4247bbd9975c2e47a95d954c755 Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Thu, 9 Jan 2025 00:26:35 +0200 Subject: [PATCH 16/18] https://github.com/metanorma/isodoc/issues/630 --- lib/isodoc/function/terms.rb | 2 ++ lib/isodoc/function/to_word_html.rb | 1 + lib/isodoc/presentation_function/concepts.rb | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/isodoc/function/terms.rb b/lib/isodoc/function/terms.rb index 1eb1f081..08fdacd5 100644 --- a/lib/isodoc/function/terms.rb +++ b/lib/isodoc/function/terms.rb @@ -38,6 +38,8 @@ def admitted_term_parse(node, out) def semx_term_parse(node, out); end + def semx_related_parse(node, out); end + def term_parse(node, out) node.children.each do |c| if c.name == "p" diff --git a/lib/isodoc/function/to_word_html.rb b/lib/isodoc/function/to_word_html.rb index fe090cbb..b80d053f 100644 --- a/lib/isodoc/function/to_word_html.rb +++ b/lib/isodoc/function/to_word_html.rb @@ -226,6 +226,7 @@ def 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/concepts.rb b/lib/isodoc/presentation_function/concepts.rb index 5adbcf65..f3095f3b 100644 --- a/lib/isodoc/presentation_function/concepts.rb +++ b/lib/isodoc/presentation_function/concepts.rb @@ -115,7 +115,7 @@ def designation(docxml) def deprecates(elem) elem.xpath(ns(".//semx[@element = 'deprecates']")).each do |t| - t.previous = i18n.l10n("#{@i18n.deprecated}: ") + t.previous = @i18n.l10n("#{@i18n.deprecated}: ") end end From a90c3fcff802cec31405f5d397e658996c4ba61b Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Thu, 9 Jan 2025 09:11:14 +0200 Subject: [PATCH 17/18] https://github.com/metanorma/isodoc/issues/630 --- lib/isodoc/presentation_function/concepts.rb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/isodoc/presentation_function/concepts.rb b/lib/isodoc/presentation_function/concepts.rb index f3095f3b..cc6ad509 100644 --- a/lib/isodoc/presentation_function/concepts.rb +++ b/lib/isodoc/presentation_function/concepts.rb @@ -174,8 +174,9 @@ def designation1(desgn) def designation_annotate(desgn, name, orig) designation_boldface(desgn) designation_field(desgn, name, orig) - g = desgn.at(ns("./expression/grammar")) and - name << ", #{designation_grammar(g).join(', ')}" + #g = desgn.at(ns("./expression/grammar")) and + #name << ", #{designation_grammar(g).join(', ')}" + designation_grammar(desgn, name) designation_localization(desgn, name, orig) designation_pronunciation(desgn, name) designation_bookmarks(desgn, name) @@ -195,17 +196,17 @@ def designation_field(desgn, name, orig) name << ", <#{f}>" end - def designation_grammar(grammar) + def designation_grammar(desgn, name) + g = desgn.at(ns("./expression/grammar")) or return ret = [] - grammar.xpath(ns("./gender | ./number")).each do |x| + 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| - grammar.at(ns("./#{x}[text() = 'true']")) and - ret << @i18n.grammar_abbrevs[x] + g.at(ns("./#{x}[text() = 'true']")) and ret << @i18n.grammar_abbrevs[x] end - ret + name << ", #{ret.join(', ')}" end def designation_localization(desgn, name, orig_desgn) From 6905127d347416d0a55c834e35d07795a261620b Mon Sep 17 00:00:00 2001 From: Nick Nicholas Date: Fri, 10 Jan 2025 00:20:19 +0200 Subject: [PATCH 18/18] remove redundant fmt-related//fmt-preferred: https://github.com/metanorma/isodoc/issues/630 --- lib/isodoc/presentation_function/concepts.rb | 2 +- spec/isodoc/terms_spec.rb | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/isodoc/presentation_function/concepts.rb b/lib/isodoc/presentation_function/concepts.rb index cc6ad509..abfc21b5 100644 --- a/lib/isodoc/presentation_function/concepts.rb +++ b/lib/isodoc/presentation_function/concepts.rb @@ -88,7 +88,7 @@ def related1(node) end def related1_prep(node) - p = node.at(ns("./fmt-preferred")) + p = node.at(ns("./fmt-preferred"))&.children ref = node.at(ns("./xref | ./eref | ./termref")) orig = semx_orig(node) [p, ref, orig] diff --git a/spec/isodoc/terms_spec.rb b/spec/isodoc/terms_spec.rb index 8918e111..f5d67898 100644 --- a/spec/isodoc/terms_spec.rb +++ b/spec/isodoc/terms_spec.rb @@ -1982,12 +1982,10 @@

    CONTRAST: - Fifth Designation , n - (