isodoc 2.5.10 → 2.6.1

data/lib/isodoc/presentation_function/image.rb

@@ -108,25 +108,37 @@ module IsoDoc
 
     def svg_to_emf(node)
       uri = svg_to_emf_uri(node)
-      if node.elements&.first&.name == "svg" &&
-          (!node["height"] || node["height"] == "auto")
-        node["height"] = node.elements.first["height"]
-        node["width"] = node.elements.first["width"]
-      end
+      svg_impose_height_attr(node)
       ret = imgfile_suffix(uri, "emf")
-      File.exist?(ret) and return ret
+      if File.exist?(ret) && File.exist?(node["src"])
+        warn "Exists: #{ret}, Exists: #{node['src']}"
+        return ret
+      end
+      warn "Converting..."
       inkscape_convert(uri, ret, '--export-type="emf"')
     end
 
+    def svg_impose_height_attr(node)
+      e = node.elements&.first or return
+      (e.name == "svg" &&
+        (!node["height"] || node["height"] == "auto")) or return
+      node["height"] = e["height"]
+      node["width"] = e["width"]
+    end
+
     def inkscape_convert(uri, file, option)
       exe = inkscape_installed? or raise "Inkscape missing in PATH, unable" \
                                          "to convert image #{uri}. Aborting."
       uri = Metanorma::Utils::external_path uri
       exe = Metanorma::Utils::external_path exe
-      system(%(#{exe} #{option} #{uri})) and
-        return Metanorma::Utils::datauri(file)
-
-      raise %(Fail on #{exe} #{option} #{uri})
+      warn %(#{exe} #{option} #{uri})
+      err = system %(#{exe} #{option} #{uri})
+      File.exist?(file) and return Metanorma::Utils::datauri(file)
+      file2 = uri + File.extname(file)
+      warn "Checking #{file2}"
+      warn `ls #{File.dirname(file2)}`
+      File.exist?(file2) and return Metanorma::Utils::datauri(file2)
+      raise %(Fail on #{exe} #{option} #{uri} outputting #{file}: status #{err})
     end
 
     def svg_to_emf_uri(node)

data/lib/isodoc/presentation_function/inline.rb

@@ -10,10 +10,10 @@ module IsoDoc
 
     def get_linkend(node)
       node["style"] == "id" and anchor_id_postprocess(node)
-      return unless xref_empty?(node)
-
-      link = anchor_linkend(node, docid_l10n(node["target"] ||
-                                             expand_citeas(node["citeas"])))
+      xref_empty?(node) or return
+      target = docid_l10n(node["target"]) ||
+        expand_citeas(docid_l10n(node["citeas"]))
+      link = anchor_linkend(node, target)
       link += eref_localities(node.xpath(ns("./locality | ./localityStack")),
                               link, node)
       non_locality_elems(node).each(&:remove)
@@ -24,8 +24,7 @@ module IsoDoc
     # <locality type="section"><reference>3.1</reference></locality></origin>
 
     def unnest_linkend(node)
-      return unless node.at(ns("./xref[@nested]"))
-
+      node.at(ns("./xref[@nested]")) or return
       node.xpath(ns("./xref[@nested]")).each { |x| x.delete("nested") }
       node.xpath(ns("./location | ./locationStack")).each(&:remove)
       node.replace(node.children)
@@ -64,15 +63,15 @@ module IsoDoc
       get_linkend(node)
     end
 
-    def variant(docxml)
-      docxml.xpath(ns("//variant")).each { |f| variant1(f) }
-      docxml.xpath(ns("//variant[@remove = 'true']")).each(&:remove)
-      docxml.xpath(ns("//variant")).each do |v|
-        next unless v&.next&.name == "variant"
-
+    def variant(xml)
+      b = xml.xpath(ns("//bibdata//variant"))
+      (xml.xpath(ns("//variant")) - b).each { |f| variant1(f) }
+      (xml.xpath(ns("//variant[@remove = 'true']")) - b).each(&:remove)
+      (xml.xpath(ns("//variant")) - b).each do |v|
+        v.next&.name == "variant" or next
         v.next = "/"
       end
-      docxml.xpath(ns("//variant")).each { |f| f.replace(f.children) }
+      (xml.xpath(ns("//variant")) - b).each { |f| f.replace(f.children) }
     end
 
     def variant1(node)

data/lib/isodoc/presentation_function/refs.rb

@@ -7,9 +7,21 @@ module IsoDoc
         bibitem(x, renderings)
       end
       hidden_items(docxml)
+      move_norm_ref_to_sections(docxml)
       @xrefs.parse_inclusions(refs: true).parse(docxml)
     end
 
+    def move_norm_ref_to_sections(docxml)
+      docxml.at(ns(@xrefs.klass.norm_ref_xpath)) or return
+      s = docxml.at(ns("//sections")) ||
+        docxml.at(ns("//preface"))&.after("<sections/>")&.next_element ||
+        docxml.at(ns("//annex | //bibliography"))&.before("<sections/>")
+        &.previous_element or return
+      docxml.xpath(ns(@xrefs.klass.norm_ref_xpath)).each do |r|
+        s << r.remove
+      end
+    end
+
     def hidden_items(docxml)
       docxml.xpath(ns("//references[bibitem/@hidden = 'true']")).each do |x|
         x.at(ns("./bibitem[not(@hidden = 'true')]")) and next
@@ -131,7 +143,8 @@ module IsoDoc
       idents = @xrefs.klass.render_identifier(ids)
       ret = if biblio then biblio_ref_entry_code(ordinal, idents, ids,
                                                  standard, datefn, bib)
-            else norm_ref_entry_code(ordinal, idents, ids, standard, datefn, bib)
+            else norm_ref_entry_code(ordinal, idents, ids, standard, datefn,
+                                     bib)
             end
       bib << "<biblio-tag>#{ret}</biblio-tag>"
     end
@@ -148,8 +161,8 @@ module IsoDoc
 
     # if ids is just a number, only use that ([1] Non-Standard)
     # else, use both ordinal, as prefix, and ids
-    def biblio_ref_entry_code(ordinal, ids, _id, standard, datefn, _bib)
-      #standard and id = nil
+    def biblio_ref_entry_code(ordinal, ids, _id, _standard, datefn, _bib)
+      # standard and id = nil
       ret = (ids[:ordinal] || ids[:metanorma] || "[#{ordinal}]")
       if ids[:sdo]
         ret = prefix_bracketed_ref(ret)

data/lib/isodoc/presentation_function/section.rb

@@ -2,6 +2,14 @@ require_relative "refs"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
+    def middle_title(docxml)
+      s = docxml.at(ns("//sections")) or return
+      t = @meta.get[:doctitle]
+      t.nil? || t.empty? and return
+      s.children.first.previous =
+        "<p class='zzSTDTitle1'>#{t}</p>"
+    end
+
     def clause(docxml)
       docxml.xpath(ns("//clause | " \
                       "//terms | //definitions | //references"))
@@ -17,19 +25,18 @@ module IsoDoc
       level = @xrefs.anchor(elem["id"], :level, false) ||
         (elem.ancestors("clause, annex").size + 1)
       t = elem.at(ns("./title")) and t["depth"] = level
-      return if !elem.ancestors("boilerplate, metanorma-extension").empty? ||
-        @suppressheadingnumbers || elem["unnumbered"]
-
+      !elem.ancestors("boilerplate, metanorma-extension").empty? ||
+        @suppressheadingnumbers || elem["unnumbered"] and return
       lbl = @xrefs.anchor(elem["id"], :label,
                           elem.parent.name != "sections") or return
       prefix_name(elem, "<tab/>", "#{lbl}#{clausedelim}", "title")
     end
 
     def floattitle(docxml)
-      docxml.xpath(ns("//clause | //annex | //appendix | //introduction | " \
-                      "//foreword | //preface/abstract | //acknowledgements | " \
-                      "//terms | //definitions | //references | //colophon"))
-        .each do |f|
+      p = "//clause | //annex | //appendix | //introduction | //foreword | " \
+          "//preface/abstract | //acknowledgements | //terms | " \
+          "//definitions | //references | //colophon | //indexsect"
+      docxml.xpath(ns(p)).each do |f|
         floattitle1(f)
       end
       # top-level
@@ -94,9 +101,9 @@ module IsoDoc
     end
 
     def display_order_at(docxml, xpath, idx)
-      return idx unless c = docxml.at(ns(xpath))
-
+      c = docxml.at(ns(xpath)) or return idx
       idx += 1
+      idx = preceding_floating_titles(c, idx)
       c["displayorder"] = idx
       idx
     end
@@ -104,24 +111,36 @@ module IsoDoc
     def display_order_xpath(docxml, xpath, idx)
       docxml.xpath(ns(xpath)).each do |c|
         idx += 1
+        idx = preceding_floating_titles(c, idx)
+        c["displayorder"] = idx
+      end
+      idx
+    end
+
+    def preceding_floating_titles(node, idx)
+      out = node.xpath("./preceding-sibling::*")
+        .reverse.each_with_object([]) do |p, m|
+        %w(note admonition p).include?(p.name) or break m
+        m << p
+      end
+      out.reject { |c| c["displayorder"] }.reverse.each do |c|
         c["displayorder"] = idx
+        idx += 1
       end
       idx
     end
 
     def display_order(docxml)
       i = 0
-      i = display_order_xpath(docxml, "//preface/*", i)
-      i = display_order_at(docxml, "//clause[@type = 'scope']", i)
-      i = display_order_at(docxml, @xrefs.klass.norm_ref_xpath, i)
-      i = display_order_at(docxml, "//sections/terms | " \
-                                   "//sections/clause[descendant::terms]", i)
-      i = display_order_at(docxml, "//sections/definitions", i)
-      i = display_order_xpath(docxml, @xrefs.klass.middle_clause(docxml), i)
-      i = display_order_xpath(docxml, "//annex", i)
-      i = display_order_xpath(docxml, @xrefs.klass.bibliography_xpath, i)
-      i = display_order_xpath(docxml, "//indexsect", i)
-      display_order_xpath(docxml, "//colophon/*", i)
+      d = @xrefs.clause_order(docxml)
+      %i(preface main annex back).each do |s|
+        d[s].each do |a|
+          i = if a[:multi]
+                display_order_xpath(docxml, a[:path], i)
+              else display_order_at(docxml, a[:path], i)
+              end
+        end
+      end
     end
 
     def clausetitle(docxml)

data/lib/isodoc/presentation_function/terms.rb

@@ -52,6 +52,7 @@ module IsoDoc
         name << ", #{designation_grammar(g).join(', ')}"
       designation_localization(desgn, name)
       designation_pronunciation(desgn, name)
+      designation_bookmarks(desgn, name)
       desgn.children = name.children
     end
 
@@ -94,6 +95,12 @@ module IsoDoc
       name << ", /#{to_xml(f.children)}/"
     end
 
+    def designation_bookmarks(desgn, name)
+      desgn.xpath(ns(".//bookmark")).each do |b|
+        name << b.remove
+      end
+    end
+
     def termexample(docxml)
       docxml.xpath(ns("//termexample")).each { |f| example1(f) }
     end

data/lib/isodoc/presentation_function/xrefs.rb

@@ -1,8 +1,8 @@
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
     def prefix_container(container, linkend, node, _target)
-      l10n(@i18n.nested_xref.sub(/%1/, anchor_xref(node, container))
-        .sub(/%2/, linkend))
+      l10n(@i18n.nested_xref.sub("%1", anchor_xref(node, container))
+        .sub("%2", linkend))
     end
 
     def anchor_value(id)
@@ -133,8 +133,8 @@ module IsoDoc
     end
 
     def i18n_chain_boolean(value, entry)
-      @i18n.send("chain_#{entry[:conn]}").sub(/%1/, value)
-        .sub(/%2/, loc2xref(entry))
+      @i18n.send("chain_#{entry[:conn]}").sub("%1", value)
+        .sub("%2", loc2xref(entry))
     end
 
     def can_conflate_xref_rendering?(locs)

data/lib/isodoc/presentation_xml_convert.rb

@@ -47,9 +47,11 @@ module IsoDoc
     # to deal with single-term and single-ref annexes
     def section(docxml)
       references docxml
+      # feeds middle_title
       # triggers xrefs reparse, so put references before all other sections,
       # which alter titles and thus can alter xrefs
-      rearrange_clauses docxml # feeds toc, display_order, clausetitle, clause
+      rearrange_clauses docxml # feeds toc, display_order, clausetitle, clause, middle_title
+      middle_title docxml
       annex docxml
       clause docxml # feeds clausetitle
       term docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.5.10".freeze
+  VERSION = "2.6.1".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -1,6 +1,6 @@
-require_relative "./table"
-require_relative "./inline"
-require_relative "./lists"
+require_relative "table"
+require_relative "inline"
+require_relative "lists"
 
 module IsoDoc
   module WordFunction
@@ -29,25 +29,34 @@ module IsoDoc
       def make_body2(body, docxml)
         body.div class: "WordSection2" do |div2|
           boilerplate docxml, div2
-          front docxml, div2
+          content(div2, docxml, ns("//preface/*[@displayorder]"))
           div2.p { |p| p << "&#xa0;" } # placeholder
         end
         section_break(body)
       end
 
+      MAIN_ELEMENTS =
+        "//sections/*[@displayorder] | //annex[@displayorder] | " \
+        "//bibliography/*[@displayorder] | //colophon/*[@displayorder] | " \
+        "//indexsect[@displayorder]".freeze
+
       def make_body3(body, docxml)
         body.div class: "WordSection3" do |div3|
-          middle docxml, div3
+          content(div3, docxml, ns(self.class::MAIN_ELEMENTS))
           footnotes div3
           comments div3
         end
       end
 
-      def para_class(_node)
+      def para_class(node)
         return "Sourcecode" if @annotation
         return "MsoCommentText" if @in_comment
         return "Note" if @note
+        if node["type"] == "floating-title"
+          return "h#{node['depth']}"
+        end
 
+        n = node["class"] and return n
         nil
       end
 

data/lib/isodoc/word_function/inline.rb

@@ -8,7 +8,7 @@ module IsoDoc
       end
 
       def section_break(body, continuous: false)
-        body.p do |p|
+        body.p class: "section-break" do |p|
           if continuous
             p.br clear: "all", style: "page-break-before:auto;" \
                                       "mso-break-type:section-break"
@@ -19,7 +19,7 @@ module IsoDoc
       end
 
       def page_break(out)
-        out.p do |p|
+        out.p class: "page-break" do |p|
           p.br clear: "all",
                style: "mso-special-character:line-break;" \
                       "page-break-before:always"
@@ -58,7 +58,7 @@ module IsoDoc
 
       def xref_parse(node, out)
         target = if /#/.match?(node["target"])
-                   node["target"].sub(/#/, ".doc#")
+                   node["target"].sub("#", ".doc#")
                  else
                    "##{node['target']}"
                  end

data/lib/isodoc/word_function/postprocess.rb

@@ -1,7 +1,7 @@
 require "fileutils"
-require_relative "./postprocess_cover"
-require_relative "./postprocess_toc"
-require_relative "./postprocess_table"
+require_relative "postprocess_cover"
+require_relative "postprocess_toc"
+require_relative "postprocess_table"
 
 module IsoDoc
   module WordFunction
@@ -16,7 +16,7 @@ module IsoDoc
 
       def toWord(result, filename, dir, header)
         result = from_xhtml(word_cleanup(to_xhtml(result)))
-          .gsub(/-DOUBLE_HYPHEN_ESCAPE-/, "--")
+          .gsub("-DOUBLE_HYPHEN_ESCAPE-", "--")
         @wordstylesheet = wordstylesheet_update
         Html2Doc.new(
           filename: filename, imagedir: @localdir,
@@ -56,6 +56,7 @@ module IsoDoc
         word_example_cleanup(docxml)
         word_pseudocode_cleanup(docxml)
         word_image_caption(docxml)
+        word_floating_titles(docxml)
         word_section_breaks(docxml)
         word_tab_clean(docxml)
         authority_cleanup(docxml)
@@ -173,6 +174,21 @@ module IsoDoc
         end
         docxml
       end
+
+      # move p.h1 (floating title) after any page, section breaks
+      def word_floating_titles(docxml)
+        docxml.xpath("//p[@class = 'section-break' or @class = 'page-break']")
+          .each do |b|
+          out = b.xpath("./preceding-sibling::*").reverse
+            .each_with_object([]) do |p, m|
+            (p.name == "p" && p["class"] == "h1") or break m
+            m << p
+          end
+          b.delete("class")
+          out.empty? and next
+          out[-1].previous = b.remove
+        end
+      end
     end
   end
 end

data/lib/isodoc/xref/xref_gen.rb

@@ -44,7 +44,7 @@ module IsoDoc
       end
 
       def termnote_label(note)
-        @labels["termnote"].gsub(/%/, note.to_s)
+        @labels["termnote"].gsub("%", note.to_s)
       end
 
       def increment_label(elems, node, counter, increment: true)
@@ -194,11 +194,11 @@ refer_list)
 
       def list_item_anchor_label(label, list_anchor, prev_label, refer_list)
         prev_label.empty? or
-          label = @i18n.list_nested_xref.sub(/%1/, "#{prev_label})")
-            .sub(/%2/, label)
+          label = @i18n.list_nested_xref.sub("%1", "#{prev_label})")
+            .sub("%2", label)
         refer_list and
-          label = @i18n.list_nested_xref.sub(/%1/, list_anchor[:xref])
-            .sub(/%2/, label)
+          label = @i18n.list_nested_xref.sub("%1", list_anchor[:xref])
+            .sub("%2", label)
         label
       end
 

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -1,18 +1,66 @@
 module IsoDoc
   module XrefGen
     module Sections
+      def clause_order(docxml)
+        { preface: clause_order_preface(docxml),
+          main: clause_order_main(docxml),
+          annex: clause_order_annex(docxml),
+          back: clause_order_back(docxml) }
+      end
+
+      def clause_order_preface(_docxml)
+        [{ path: "//preface/*", multi: true }]
+      end
+
+      def clause_order_main(docxml)
+        [
+          { path: "//clause[@type = 'scope']" },
+          { path: @klass.norm_ref_xpath },
+          { path: "//sections/terms | " \
+                  "//sections/clause[descendant::terms]" },
+          { path: "//sections/definitions | " \
+                  "//sections/clause[descendant::definitions][not(descendant::terms)]" },
+          { path: @klass.middle_clause(docxml), multi: true },
+        ]
+      end
+
+      def clause_order_annex(_docxml)
+        [{ path: "//annex", multi: true }]
+      end
+
+      def clause_order_back(_docxml)
+        [
+          { path: @klass.bibliography_xpath },
+          { path: "//indexsect", multi: true },
+          { path: "//colophon/*", multi: true },
+        ]
+      end
+
       def back_anchor_names(xml)
         if @parse_settings.empty? || @parse_settings[:clauses]
-          i = Counter.new("@")
-          xml.xpath(ns("//annex")).each do |c|
+          annex_anchor_names(xml)
+          back_clauses_anchor_names(xml)
+        end
+        references(xml) if @parse_settings.empty? || @parse_settings[:refs]
+      end
+
+      def annex_anchor_names(xml)
+        i = Counter.new("@")
+        clause_order_annex(xml).each do |a|
+          xml.xpath(ns(a[:path])).each do |c|
             annex_names(c, i.increment(c).print)
+            a[:multi] or break
           end
-          xml.xpath(ns(@klass.bibliography_xpath)).each do |b|
-            preface_names(b)
+        end
+      end
+
+      def back_clauses_anchor_names(xml)
+        clause_order_back(xml).each do |a|
+          xml.xpath(ns(a[:path])).each do |c|
+            back_names(c)
+            a[:multi] or break
           end
-          xml.xpath(ns("//colophon/clause")).each { |b| preface_names(b) }
         end
-        references(xml) if @parse_settings.empty? || @parse_settings[:refs]
       end
 
       def references(docxml)
@@ -21,20 +69,29 @@ module IsoDoc
         end
       end
 
-      def initial_anchor_names(doc)
+      def initial_anchor_names(xml)
         if @parse_settings.empty? || @parse_settings[:clauses]
-          doc.xpath(ns("//preface/*")).each do |c|
-            c.element? and preface_names(c)
+          preface_anchor_names(xml)
+          main_anchor_names(xml)
+        end
+      end
+
+      def preface_anchor_names(xml)
+        clause_order_preface(xml).each do |a|
+          xml.xpath(ns(a[:path])).each do |c|
+            preface_names(c)
+            a[:multi] or break
+          end
+        end
+      end
+
+      def main_anchor_names(xml)
+        n = Counter.new
+        clause_order_main(xml).each do |a|
+          xml.xpath(ns(a[:path])).each do |c|
+            section_names(c, n, 1)
+            a[:multi] or break
           end
-          # potentially overridden in middle_section_asset_names()
-          sequential_asset_names(doc.xpath(ns("//preface/*")))
-          n = Counter.new
-          n = section_names(doc.at(ns("//clause[@type = 'scope']")), n, 1)
-          n = section_names(doc.at(ns(@klass.norm_ref_xpath)), n, 1)
-          n = section_names(doc.at(ns("//sections/terms | " \
-                                      "//sections/clause[descendant::terms]")), n, 1)
-          n = section_names(doc.at(ns("//sections/definitions")), n, 1)
-          clause_names(doc, n)
         end
       end
 
@@ -57,8 +114,7 @@ module IsoDoc
         ret = clause.at(ns("./title"))&.text
         if use_elem_name && !ret
           clause.name.capitalize
-        else
-          ret
+        else ret
         end
       end
 
@@ -67,8 +123,15 @@ module IsoDoc
 
       # in StanDoc, prefaces have no numbering; they are referenced only by title
       def preface_names(clause)
-        return if clause.nil?
+        unnumbered_names(clause)
+      end
+
+      def back_names(clause)
+        unnumbered_names(clause)
+      end
 
+      def unnumbered_names(clause)
+        clause.nil? and return
         preface_name_anchors(clause, 1,
                              clause_title(clause, use_elem_name: true))
         clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
@@ -94,23 +157,15 @@ module IsoDoc
       end
 
       def middle_section_asset_names(doc)
-        middle_sections = "//clause[@type = 'scope'] | " \
-                          "#{@klass.norm_ref_xpath} | " \
-                          "//sections/terms | //preface/* | " \
-                          "//sections/definitions | //clause[parent::sections]"
+        middle_sections =
+          "//clause[@type = 'scope'] | #{@klass.norm_ref_xpath} | " \
+          "//sections/terms | //preface/* | " \
+          "//sections/definitions | //clause[parent::sections]"
         sequential_asset_names(doc.xpath(ns(middle_sections)))
       end
 
-      def clause_names(docxml, num)
-        docxml.xpath(ns(@klass.middle_clause(docxml)))
-          .each_with_index do |c, _i|
-          section_names(c, num, 1)
-        end
-      end
-
       def section_names(clause, num, lvl)
         clause.nil? and return num
-
         num.increment(clause)
         section_name_anchors(clause, num.print, lvl)
         clause.xpath(ns(SUBCLAUSES)).each_with_object(Counter.new) do |c, i|
@@ -138,7 +193,8 @@ module IsoDoc
         obl = l10n("(#{@labels['inform_annex']})")
         clause["obligation"] == "normative" and
           obl = l10n("(#{@labels['norm_annex']})")
-        title = Common::case_with_markup(@labels["annex"], "capital", @script)
+        title = Common::case_with_markup(@labels["annex"], "capital",
+                                         @script)
         l10n("<strong>#{title} #{num}</strong><br/>#{obl}")
       end
 

data/lib/isodoc-yaml/i18n-ar.yaml

@@ -30,7 +30,7 @@ external_terms_boilerplate: |
   <p> لأغراض هذا المستند ، تنطبق المصطلحات والتعريفات الواردة في%. </ p>
 internal_external_terms_boilerplate: |
   <p>لأغراض هذه الوثيقة ،تنطبق المصطلحات والتعاريف الواردة في % وما يلي.</p>
-term_defined_in: "[المصطلح المحدد في %]"
+term_defined_in: "(%)"
 binary_and: "%1 و %2"
 multiple_and: "%1, و %2"
 binary_or: "%1 او %2"

data/lib/isodoc-yaml/i18n-de.yaml

@@ -32,7 +32,7 @@ external_terms_boilerplate: |
           <p>Für die Zwecke dieses Dokuments gelten die in % angegebenen Begriffe und Definitionen.</p>
 internal_external_terms_boilerplate: |
           <p>Für die Zwecke dieses Dokuments gelten die in % und im Folgenden aufgeführten Begriffe und Definitionen.</p>
-term_defined_in: "[Begriff definiert in %]"
+term_defined_in: "(%)"
 binary_and: "%1 und %2"
 multiple_and: "%1, und %2"
 binary_or: "%1 oder %2"

data/lib/isodoc-yaml/i18n-en.yaml

@@ -38,7 +38,7 @@ external_terms_boilerplate: |
 internal_external_terms_boilerplate: |
           <p>For the purposes of this document, the terms and definitions 
             given in % and the following apply.</p>
-term_defined_in: "[term defined in %]"
+term_defined_in: "(%)"
 binary_and: "%1 and %2"
 multiple_and: "%1, and %2"
 binary_or: "%1 or %2"