#{pref}
" + ins.next = boilerplate_snippet_convert(pref) end def norm_ref_process_boilerplate_note(ref) @@ -69,16 +36,15 @@ def norm_ref_boilerplate_insert_location(ref) ref.at("./title") end - TERM_CLAUSE = - "//sections//terms[not(.//ancestor::clause[@type = 'terms'])] | " \ - "//sections/clause[descendant::terms][@type = 'terms'] | " \ - "//sections/clause[not(@type = 'terms')]//terms".freeze - NORM_REF = "//bibliography/references[@normative = 'true'][not(@hidden)] | " \ "//bibliography/clause[.//references[@normative = 'true']]".freeze def boilerplate_isodoc(xmldoc) + # prevent infinite recursion of asciidoc boilerplate processing + # in termdef_boilerplate_insert and initial_boilerplate + xmldoc.at("//metanorma-extension/semantic-metadata/" \ + "headless[text() = 'true']") and return nil x = xmldoc.dup x.root.add_namespace(nil, self.class::XML_NAMESPACE) xml = Nokogiri::XML(x.to_xml) @@ -87,14 +53,6 @@ def boilerplate_isodoc(xmldoc) @isodoc end - def termdef_boilerplate_cleanup(xmldoc) - # termdef_remove_initial_paras(xmldoc) - end - - def termdef_remove_initial_paras(xmldoc) - xmldoc.xpath("//terms/p | //terms/ul").each(&:remove) - end - def unwrap_boilerplate_clauses(xmldoc, xpath) xmldoc.xpath(xpath).each do |f| f.xpath(".//clause[@type = 'boilerplate'] | " \ @@ -105,51 +63,8 @@ def unwrap_boilerplate_clauses(xmldoc, xpath) end end - def termdef_boilerplate_insert(xmldoc, isodoc, once = false) - if once - f = termdef_boilerplate_insert_location(xmldoc) and - termdef_boilerplate_insert1(f, xmldoc, isodoc) - else - xmldoc.xpath(self.class::TERM_CLAUSE).each do |f| - termdef_boilerplate_insert1(f, xmldoc, isodoc) - end - end - end - - def termdef_boilerplate_insert_location(xmldoc) - f = xmldoc.at(self.class::TERM_CLAUSE) - root = xmldoc.at("//sections/terms | //sections/clause[@type = 'terms']") - if f && root && f["id"] != root["id"] - f = termdef_boilerplate_climb_up(f, root) - elsif !f && root then f = root - end - f - end - - def termdef_boilerplate_climb_up(clause, container) - container.at(".//*[@id = '#{clause['id']}']") or return clause - while (n = clause.parent) - n.at(".//definitions") and break - clause = n - n["id"] == container["id"] and break - end - clause - end - - def termdef_boilerplate_insert1(sect, xmldoc, isodoc) - ins = sect.at("./title") - if (ins2 = sect.at("./clause[@type = 'boilerplate'] | " \ - "./note[@type = 'boilerplate']")) - ins2.text.strip.downcase == "(default)" or return - ins2.children = " " - ins = ins2.children.first - end - term_defs_boilerplate(ins, xmldoc.xpath(".//termdocsource"), - sect.at(".//term"), sect.at(".//p"), isodoc) - end - def boilerplate_cleanup(xmldoc) - isodoc = boilerplate_isodoc(xmldoc) + isodoc = boilerplate_isodoc(xmldoc) or return termdef_boilerplate_cleanup(xmldoc) termdef_boilerplate_insert(xmldoc, isodoc) unwrap_boilerplate_clauses(xmldoc, self.class::TERM_CLAUSE) @@ -245,6 +160,7 @@ def boilerplate_xml_cleanup(xml) /^_\d+$/.match?(n["id"]) and n["id"] = "_#{UUIDTools::UUID.random_create}" end + xml end def boilerplate_top_elements(xml) diff --git a/lib/metanorma/standoc/cleanup_terms.rb b/lib/metanorma/standoc/cleanup_terms.rb index c4874313..b8551702 100644 --- a/lib/metanorma/standoc/cleanup_terms.rb +++ b/lib/metanorma/standoc/cleanup_terms.rb @@ -73,11 +73,14 @@ def termdocsource_cleanup(xmldoc) xmldoc.xpath("//termdocsource").each { |s| f.previous = s.remove } end - def term_children_cleanup(xmldoc) + def terms_terms_cleanup(xmldoc) xmldoc.xpath("//terms[terms][not(term)]").each do |t| t.name = "clause" t["type"] = "terms" end + end + + def term_children_cleanup(xmldoc) xmldoc.xpath("//term").each do |t| %w(termnote termexample termsource term).each do |w| t.xpath("./#{w}").each { |n| t << n.remove } diff --git a/lib/metanorma/standoc/cleanup_terms_boilerplate.rb b/lib/metanorma/standoc/cleanup_terms_boilerplate.rb new file mode 100644 index 00000000..d569eb8a --- /dev/null +++ b/lib/metanorma/standoc/cleanup_terms_boilerplate.rb @@ -0,0 +1,106 @@ +module Metanorma + module Standoc + module Cleanup + def external_terms_boilerplate(sources) + e = @i18n.external_terms_boilerplate + e.gsub(/%(?=\p{P}|\p{Z}|$)/, sources || "???") + end + + def internal_external_terms_boilerplate(sources) + e = @i18n.internal_external_terms_boilerplate + e.gsub(/%(?=\p{P}|\p{Z}|$)/, sources || "??") + end + + def boilerplate_snippet_convert(adoc) + ret = boilerplate_xml_cleanup(adoc2xml(adoc, backend.to_sym)) + @i18n.l10n(ret.children.to_xml, @lang, @script) + end + + def term_defs_boilerplate(div, source, term, _preface, isodoc) + verify_term_defs_source(source) + a = @i18n.term_def_boilerplate and + div.next = boilerplate_snippet_convert(a) + a = if source.empty? && term.nil? then @i18n.no_terms_boilerplate + else term_defs_boilerplate_cont(source, term, isodoc) + end + a and div.next = boilerplate_snippet_convert(a) + end + + def verify_term_defs_source(source) + source.each do |s| + @anchors[s["bibitemid"]] or + @log.add("Crossreferences", nil, + "term source #{s['bibitemid']} not referenced", + severity: 1) + end + end + + def term_defs_boilerplate_cont(src, term, isodoc) + sources = isodoc.sentence_join(src.map do |s| + %{<<#{s['bibitemid']}>>} + end) + if src.empty? then @i18n.internal_terms_boilerplate + elsif term.nil? then external_terms_boilerplate(sources) + else + internal_external_terms_boilerplate(sources) + end + end + + TERM_CLAUSE = + "//sections//terms[not(.//ancestor::clause[@type = 'terms'])] | " \ + "//sections/clause[descendant::terms][@type = 'terms'] | " \ + "//sections/clause[not(@type = 'terms')]//terms".freeze + + def termdef_boilerplate_cleanup(xmldoc) + # termdef_remove_initial_paras(xmldoc) + end + + def termdef_remove_initial_paras(xmldoc) + xmldoc.xpath("//terms/p | //terms/ul").each(&:remove) + end + + def termdef_boilerplate_insert(xmldoc, isodoc, once = false) + if once + f = termdef_boilerplate_insert_location(xmldoc) and + termdef_boilerplate_insert1(f, xmldoc, isodoc) + else + xmldoc.xpath(self.class::TERM_CLAUSE).each do |f| + termdef_boilerplate_insert1(f, xmldoc, isodoc) + end + end + end + + def termdef_boilerplate_insert_location(xmldoc) + f = xmldoc.at(self.class::TERM_CLAUSE) + root = xmldoc.at("//sections/terms | //sections/clause[@type = 'terms']") + if f && root && f["id"] != root["id"] + f = termdef_boilerplate_climb_up(f, root) + elsif !f && root then f = root + end + f + end + + def termdef_boilerplate_climb_up(clause, container) + container.at(".//*[@id = '#{clause['id']}']") or return clause + while (n = clause.parent) + n.at(".//definitions") and break + clause = n + n["id"] == container["id"] and break + end + clause + end + + def termdef_boilerplate_insert1(sect, xmldoc, isodoc) + ins = sect.at("./title") + if (ins2 = sect.at("./clause[@type = 'boilerplate'] | " \ + "./note[@type = 'boilerplate']")) + ins2.text.strip.downcase == "(default)" or return + ins2.children = " " + ins = ins2.children.first + end + term_defs_boilerplate(ins, xmldoc.xpath(".//termdocsource"), + sect.at(".//term"), sect.at(".//p"), isodoc) + end + end + end +end diff --git a/lib/metanorma/standoc/cleanup_terms_designations.rb b/lib/metanorma/standoc/cleanup_terms_designations.rb index e71b5eac..e1a1d659 100644 --- a/lib/metanorma/standoc/cleanup_terms_designations.rb +++ b/lib/metanorma/standoc/cleanup_terms_designations.rb @@ -156,8 +156,7 @@ def term_termsource_to_designation(xmldoc) while %w(domain subject).include? p&.name p = p.previous_element end - DESIGNATOR.include?(p&.name) or - next + DESIGNATOR.include?(p&.name) or next related2pref(p) << t.remove end end diff --git a/lib/metanorma/standoc/cleanup_xref.rb b/lib/metanorma/standoc/cleanup_xref.rb index 32511310..68761e59 100644 --- a/lib/metanorma/standoc/cleanup_xref.rb +++ b/lib/metanorma/standoc/cleanup_xref.rb @@ -176,7 +176,7 @@ def xref_compound_cleanup(xmldoc) def xref_compound_cleanup1(xref, locations) xref.children.empty? and xref.children = "Foreword
-For the purposes of this document, the terms and definitions
- given in
+ For the purposes of this document, the terms and definitions given in
+
Foreword
-For the purposes of this document,
- the terms and definitions given in
+ For the purposes of this document, the terms and definitions given in
+
Foreword
-Pour les besoins du présent document, les termes et définitions de
+ Pour les besoins du présent document, les termes et définitions de
+
Foreword
-
+
Terms-and-Definitions missing: "Terms-and-Definitions" is not defined in document. Did you mean to point to a subterm))
+ .to include(%(Term reference to Terms-and-Definitions missing: "Terms-and-Definitions" is not defined in document))
expect(File.read("test.err.html"))
.to include("Concept term1 is pointing to jkl, which is not a term or symbol. Did you mean to point to a subterm?")
expect(File.read("test.err.html"))