isodoc 2.10.0 → 3.0.0

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -1,56 +1,20 @@
+require_relative "clause_order"
+
 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: "//sections/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]
           annex_anchor_names(xml)
           back_clauses_anchor_names(xml)
         end
-        if @klass.bibrender && (@parse_settings.empty? || @parse_settings[:refs])
-          references(xml)
-        end
       end
 
       def annex_anchor_names(xml)
         i = Counter.new("@")
         clause_order_annex(xml).each do |a|
           xml.xpath(ns(a[:path])).each do |c|
+            unnumbered_section_name?(c) and next
             annex_names(c, i.increment(c).print)
             a[:multi] or break
           end
@@ -66,11 +30,7 @@ module IsoDoc
         end
       end
 
-      def references(docxml)
-        docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
-          reference_names(ref)
-        end
-      end
+      # NOTE: references processing has moved to Presentation XML
 
       def initial_anchor_names(xml)
         if @parse_settings.empty? || @parse_settings[:clauses]
@@ -89,7 +49,7 @@ module IsoDoc
       end
 
       def main_anchor_names(xml)
-        n = Counter.new
+        n = clause_counter
         clause_order_main(xml).each do |a|
           xml.xpath(ns(a[:path])).each do |c|
             section_names(c, n, 1)
@@ -116,8 +76,9 @@ module IsoDoc
 
       def clause_title(clause, use_elem_name: false)
         ret = clause.at(ns("./title"))&.text
-        if use_elem_name && !ret
-          clause.name.capitalize
+        if use_elem_name && ret.blank?
+          @i18n.labels[clause.name]&.capitalize ||
+            clause.name.capitalize
         else ret
         end
       end
@@ -140,11 +101,13 @@ module IsoDoc
 
       def unnumbered_names(clause)
         clause.nil? and return
-        preface_name_anchors(clause, 1,
-                             clause_title(clause, use_elem_name: true))
+        title = clause_title(clause, use_elem_name: true)
+        preface_name_anchors(clause, 1, title)
         clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
-          preface_names1(c, c.at(ns("./title"))&.text,
-                         "#{clause_title(clause)}, #{i + 1}", 2)
+          t = c.at(ns("./title"))
+          tt = "#{semx(clause, title, clause.name)}" \
+            "<span class='fmt-comma'>,</span> #{semx(c, i + 1)}"
+          preface_names1(c, t ? semx(c, t.text, c.name) : nil, tt, 2)
         end
       end
 
@@ -152,15 +115,19 @@ module IsoDoc
         label = title || parent_title
         preface_name_anchors(clause, level, title || parent_title)
         clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
-          preface_names1(c, c.at(ns("./title"))&.text, "#{label} #{i + 1}",
+          t = c.at(ns("./title"))
+          preface_names1(c, t ? semx(c, t.text, c.name) : nil,
+                         "#{label} #{semx(c, i + 1)}",
                          level + 1)
         end
       end
 
       def preface_name_anchors(clause, level, title)
+        xref = semx(clause, title, clause.name)
+        clause["id"] ||= "_#{UUIDTools::UUID.random_create}"
         @anchors[clause["id"]] =
-          { label: nil, level: level,
-            xref: title, title: nil,
+          { label: nil, level:,
+            xref:, title: nil,
             type: "clause", elem: @labels["clause"] }
       end
 
@@ -173,81 +140,110 @@ module IsoDoc
       end
 
       def section_names(clause, num, lvl)
-        clause.nil? and return num
+        unnumbered_section_name?(clause) and return num
         num.increment(clause)
-        section_name_anchors(clause, num.print, lvl)
+        lbl = semx(clause, num.print)
+        section_name_anchors(clause, lbl, lvl)
         clause.xpath(ns(SUBCLAUSES))
-          .each_with_object(Counter.new(0, prefix: "#{num.print}.")) do |c, i|
-          section_names1(c, i.increment(c).print, lvl + 1)
+          .each_with_object(clause_counter(0)) do |c, i|
+          section_names1(c, lbl, i.increment(c).print, lvl + 1)
         end
         num
       end
 
-      def section_names1(clause, num, level)
-        section_name_anchors(clause, num, level)
-        i = Counter.new(0, prefix: "#{num}.")
+      def clause_number_semx(parentnum, clause, num)
+        if clause["branch-number"]
+                semx(clause, clause["branch-number"])
+        elsif parentnum.nil?
+          semx(clause, num)
+              else
+                "#{parentnum}#{delim_wrap(clausesep)}#{semx(clause, num)}"
+              end
+      end
+
+      def section_names1(clause, parentnum, num, level)
+        unnumbered_section_name?(clause) and return num
+        lbl = clause_number_semx(parentnum, clause, num)
+        section_name_anchors(clause, lbl, level)
+        i = clause_counter(0)
         clause.xpath(ns(SUBCLAUSES)).each do |c|
-          section_names1(c, i.increment(c).print, level + 1)
+          section_names1(c, lbl, i.increment(c).print, level + 1)
+        end
+      end
+
+      def unnumbered_section_name?(clause)
+        clause.nil? and return true
+        if clause["unnumbered"] == "true"
+          unnumbered_names(clause)
+          return true
         end
+        false
+      end
+
+      def clausesep
+        "."
       end
 
       def section_name_anchors(clause, num, level)
+        xref = labelled_autonum(@labels["clause"], num)
+        label = num
+        c = clause_title(clause) and title = semx(clause, c, "title")
+        clause["id"] ||= "_#{UUIDTools::UUID.random_create}"
         @anchors[clause["id"]] =
-          { label: num, xref: l10n("#{@labels['clause']} #{num}"),
-            title: clause_title(clause), level: level, type: "clause",
+          { label:, xref:, title:, level:, type: "clause",
             elem: @labels["clause"] }
       end
 
       def annex_name_lbl(clause, num)
-        obl = l10n("(#{@labels['inform_annex']})")
+        obl = "(#{@labels['inform_annex']})"
         clause["obligation"] == "normative" and
-          obl = l10n("(#{@labels['norm_annex']})")
+          obl = "(#{@labels['norm_annex']})"
+        obl = "<span class='fmt-obligation'>#{l10n obl}</fmt>"
         title = Common::case_with_markup(@labels["annex"], "capital",
                                          @script)
-        l10n("<strong>#{title} #{num}</strong><br/>#{obl}")
+        s = labelled_autonum(title, num)
+        "<strong><span class='fmt-caption-label'>#{s}</span></strong><br/>#{obl}"
       end
 
       def annex_name_anchors(clause, num, level)
         label = num
         level == 1 && clause.name == "annex" and
-          label = annex_name_lbl(clause, num)
+          label = annex_name_lbl(clause, label)
+        c = clause_title(clause) and title = semx(clause, c, "title")
+        clause["id"] ||= "_#{UUIDTools::UUID.random_create}"
         @anchors[clause["id"]] =
-          { label: label,
+          { label:, xref: labelled_autonum(@labels["annex"], num), title:,
             elem: @labels["annex"], type: "clause",
-            subtype: "annex", value: num.to_s, level: level,
-            title: clause_title(clause),
-            xref: "#{@labels['annex']} #{num}" }
+            subtype: "annex", value: num.to_s, level: }
       end
 
       def annex_names(clause, num)
-        annex_name_anchors(clause, num, 1)
+        label = semx(clause, num)
+        annex_name_anchors(clause, label, 1)
         if @klass.single_term_clause?(clause)
           annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
-                       num.to_s, 1)
+                       nil, num.to_s, 1)
         else
           clause.xpath(ns(SUBCLAUSES))
-            .each_with_object(Counter.new(0, prefix: "#{num}.")) do |c, i|
-            annex_names1(c, i.increment(c).print, 2)
+            .each_with_object(clause_counter(0)) do |c, i|
+            annex_names1(c, label, i.increment(c).print, 2)
           end
         end
-        hierarchical_asset_names(clause, num)
+        hierarchical_asset_names(clause, label)
       end
 
-      def annex_names1(clause, num, level)
-        annex_name_anchors(clause, num, level)
-        i = Counter.new(0, prefix: "#{num}.")
+      def annex_names1(clause, parentnum, num, level)
+        lbl = clause_number_semx(parentnum, clause, num)
+        annex_name_anchors1(clause, lbl, level)
+        i = clause_counter(0)
         clause.xpath(ns(SUBCLAUSES)).each do |c|
-          annex_names1(c, i.increment(c).print, level + 1)
+          annex_names1(c, lbl, i.increment(c).print, level + 1)
         end
       end
 
-      def reference_names(ref)
-        ids = @klass.bibitem_ref_code(ref)
-        identifiers = @klass.render_identifier(ids)
-        reference = @klass
-          .docid_l10n(identifiers[:metanorma] || identifiers[:sdo] ||
-                      identifiers[:ordinal] || identifiers[:doi])
-        @anchors[ref["id"]] = { xref: reference }
+      # subclauses of Annexes
+      def annex_name_anchors1(clause, num, level)
+        annex_name_anchors(clause, num, level)
       end
     end
   end

data/lib/isodoc/xref/xref_util.rb

@@ -6,9 +6,15 @@ module Enumerable
   end
 end
 
+class Object
+  def blank?
+    nil? || empty?
+  end
+end
+
 module IsoDoc
   module XrefGen
-    module Blocks
+    module Util
       def blank?(text)
         text.nil? || text.empty?
       end
@@ -19,7 +25,8 @@ module IsoDoc
 
       SECTIONS_XPATH =
         "//foreword | //introduction | //acknowledgements | " \
-        "//preface/terms | preface/definitions | preface/references | " \
+        "//preface/abstract | " \
+        "//preface/terms | //preface/definitions | //preface/references | " \
         "//preface/clause | //sections/terms | //annex | " \
         "//sections/clause | //sections/definitions | " \
         "//bibliography/references | //bibliography/clause".freeze
@@ -34,8 +41,50 @@ module IsoDoc
         "./xmlns:X".gsub("X", asset)
       end
 
-            CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions | " \
-                       "./references".freeze
+      CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions | " \
+                 "./references".freeze
+
+      def child_sections
+        CHILD_SECTIONS
+      end
+
+      # if hierarchically marked up node in label already,
+      # leave alone, else wrap in semx
+      def semx(node, label, element = "autonum")
+        label = label.to_s
+        id = node["id"] || node[:id]
+        /<semx element='[^']+' source='#{id}'/.match?(label) and return label
+        l = stripsemx(label)
+        %(<semx element='#{element}' source='#{id}'>#{l}</semx>)
+      end
+
+      # assume parent is already semantically annotated with semx
+      def hiersemx(parent, parentlabel, counter, element, sep: nil)
+        sep ||= hier_separator(markup: true)
+        "#{semx(parent, parentlabel)}#{sep}#{semx(element, counter.print)}"
+      end
+
+      def delim_wrap(delim, klass = "fmt-autonum-delim")
+        delim.blank? and return ""
+        "<span class='#{klass}'>#{delim}</span>"
+      end
+
+      def stripsemx(elem)
+        elem.nil? and return elem
+        xml = Nokogiri::XML::DocumentFragment.parse(elem)
+        xml.traverse do |x|
+          x.name == "semx" ||
+            (x.name == "span" && /^fmt-/.match?(x["class"])) and
+            x.replace(x.children)
+        end
+        xml.to_xml(indent: 0, encoding: "UTF-8",
+                   save_with: Nokogiri::XML::Node::SaveOptions::AS_XML)
+      end
+
+      def labelled_autonum(label, autonum)
+        label.blank? and return autonum
+        l10n("<span class='fmt-element-name'>#{label}</span> #{autonum}")
+      end
     end
   end
 end

data/lib/isodoc/xref.rb

@@ -1,8 +1,10 @@
 require_relative "xref/xref_anchor"
 require_relative "xref/xref_counter"
+require_relative "xref/xref_counter_types"
 require_relative "xref/xref_gen_seq"
 require_relative "xref/xref_gen"
 require_relative "xref/xref_sect_gen"
+require_relative "xref/xref_util"
 require_relative "class_utils"
 require_relative "function/utils"
 
@@ -17,25 +19,31 @@ module IsoDoc
 
     # Note: if bibrender is no passed in, do not parse references
     def initialize(lang, script, klass, i18n, options = {})
-      @anchors = {}
+      initialize_empty
       @lang = lang
       @script = script
       @klass = klass
       @options = options
-      @i18n = i18n
-      @labels = @i18n.get
-      @klass.i18n = @i18n
+      initialize_i18n(i18n)
       @klass.bibrender ||= options[:bibrender]
-      @locale = options[:locale]
       @reqt_models = @klass.requirements_processor
-        .new({
-               default: "default", lang: lang, script: script,
-               labels: @i18n.get
-             })
-      @i18n
+        .new({ default: "default", lang:, script:,
+               labels: @i18n.get })
+    end
+
+    def initialize_empty
+      @c = HTMLEntities.new
+      @anchors = {}
       @parse_settings = {}
     end
 
+    def initialize_i18n(i18n)
+      @i18n = i18n
+      @labels = @i18n.get
+      @klass.i18n = @i18n
+      @locale = @options[:locale]
+    end
+
     def get
       @anchors
     end
@@ -66,9 +74,18 @@ module IsoDoc
       initial_anchor_names(docxml)
       back_anchor_names(docxml)
       asset_anchor_names(docxml)
+      localise_anchors
       @parse_settings = {}
     end
 
+    def localise_anchors
+      @anchors.each_value do |v|
+        v[:label] &&= l10n(v[:label])
+        v[:value] &&= l10n(v[:value])
+        v[:xref] &&= l10n(v[:xref])
+      end
+    end
+
     def ns(xpath)
       Common::ns(xpath)
     end
@@ -76,5 +93,7 @@ module IsoDoc
     def l10n(text, lang = @lang, script = @script, locale = @locale)
       @i18n.l10n(text, lang, script, locale)
     end
+
+    include ::IsoDoc::XrefGen::Util
   end
 end

data/lib/isodoc/xslfo_convert.rb

@@ -39,13 +39,19 @@ module IsoDoc
       nil
     end
 
-    def pdf_options(_docxml)
+    def baseassetpath(filename)
+      !@baseassetpath && filename and
+        @baseassetpath = File.expand_path(Pathname.new(filename).parent.to_s)
+    end
+
+    def pdf_options(_docxml, filename)
+      baseassetpath(filename)
       ret = {}
       font_manifest = @options.dig(MN_OPTIONS_KEY, MN2PDF_FONT_MANIFEST) and
         ret[MN2PDF_FONT_MANIFEST] = font_manifest
       @aligncrosselements && !@aligncrosselements.empty? and
         ret["--param align-cross-elements="] =
-          @aligncrosselements.gsub(/,/, " ")
+          @aligncrosselements.tr(",", " ")
       @baseassetpath and
         ret["--param baseassetpath="] = @baseassetpath
       ret.merge(@pdf_cmd_options)
@@ -54,15 +60,14 @@ module IsoDoc
     # input_file: keep-alive tempfile
     def convert(input_fname, file = nil, debug = false,
                 output_fname = nil)
-      file = File.read(input_fname, encoding: "utf-8") if file.nil?
-      input_file, docxml, filename =
-        input_xml_path(input_fname, file, debug)
+      file ||= File.read(input_fname, encoding: "utf-8")
+      _, docxml, filename = input_xml_path(input_fname, file, debug)
+      xsl = pdf_stylesheet(docxml) or return
+      Pathname.new(xsl).absolute? or xsl = File.join(@libdir, xsl)
       @doctype = Nokogiri::XML(file).at(ns("//bibdata/ext/doctype"))&.text
       ::Metanorma::Output::XslfoPdf.new.convert(
-        filename,
-        output_fname || output_filename(input_fname),
-        File.join(@libdir, pdf_stylesheet(docxml)),
-        pdf_options(docxml),
+        filename, output_fname || output_filename(input_fname),
+        xsl, pdf_options(docxml, input_fname)
       )
     end
 

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

@@ -15,33 +15,36 @@ termsdefsymbols: المصطلحات والتعريفات والرموز
 termsdefabbrev: المصطلحات والتعريفات والاختصارات
 normref: المراجع المعيارية
 bibliography: بيبليوغرافيا
+index: الفهرس
+see: انظر
+see_also: انظر أيضًا
 clause: فقرة
 annex: ملحق
 appendix: تذييل
 continued: واصلت
 no_terms_boilerplate: |
-  <p>لم يتم سرد أي مصطلحات وتعريفات في هذا المستند.</p>
+  لم يتم سرد أي مصطلحات وتعريفات في هذا المستند.
 internal_terms_boilerplate: |
-  <p>لأغراض هذا المستند، تنطبق المصطلحات والتعريفات التالية.</p>
+  لأغراض هذا المستند، تنطبق المصطلحات والتعريفات التالية.
 norm_with_refs_pref:
   تتم الإشارة إلى المستندات التالية في النص بحيث يشكل بعض أو كل محتوياتها متطلبات هذا المستند. للحصول على مراجع مؤرخة، تطبق النسخة المشار إليها فقط. بالنسبة للمراجع غير المؤرخة ، تنطبق أحدث طبعة من الوثيقة المشار إليها (بما في ذلك أي تعديلات).
 norm_empty_pref:
   لا توجد مراجع معيارية في هذه الوثيقة.
 external_terms_boilerplate: |
-  <p> لأغراض هذا المستند ، تنطبق المصطلحات والتعريفات الواردة في%. </ p>
+   لأغراض هذا المستند ، تنطبق المصطلحات والتعريفات الواردة في%. 
 internal_external_terms_boilerplate: |
-  <p>لأغراض هذه الوثيقة ،تنطبق المصطلحات والتعاريف الواردة في % وما يلي.</p>
+  لأغراض هذه الوثيقة ،تنطبق المصطلحات والتعاريف الواردة في % وما يلي.
 no_information_available: "[لا توجد معلومات متاحة]"
 term_defined_in: "(%)"
-binary_and: "%1 و %2"
-multiple_and: "%1, و %2"
-binary_or: "%1 او %2"
-multiple_or: "%1, او %2"
-chain_and: "%1 و %2"
-chain_or: "%1 او %2"
-chain_from: "%1 %من 2"
-chain_to: "من %1 إلى %2"
-nested_xref: "%1, %2"
+binary_and: "%1 <conn>ﻭ</conn> %2"
+multiple_and: "%1<enum-comma>,</enum-comma> <conn>ﻭ</conn> %2"
+binary_or: "%1 <conn>ﺍﻭ</conn> %2"
+multiple_or: "%1<enum-comma>,</enum-comma> <conn>ﺍﻭ</conn> %2"
+chain_and: "%1 <conn>ﻭ</conn> %2"
+chain_or: "%1 <conn>ﺍﻭ</conn> %2"
+chain_from: "%1 <conn>%ﻢﻧ</conn> 2"
+chain_to: "<conn>ﻢﻧ</conn> %1 <conn>ﺈﻟﻯ</conn> %2"
+nested_xref: "%1<comma>,</comma> %2"
 list_nested_xref: "%1 %2"
 ordinal_keys: [gender]
 SpelloutRules:
@@ -75,6 +78,7 @@ modified: معدلة
 adapted: تكيف
 deprecated: مهمل
 source: مصدر
+no_identifier: (لا يوجد معرف)
 and: و
 all_parts: كل الأجزاء
 edition_ordinal: "ﺎﻠﻄﺒﻋﺓ؜ {{ var1 | ordinal_word: 'edition', '' }}"

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

@@ -15,14 +15,17 @@ termsdefsymbols: Begriffe, Definitionen und Symbole
 termsdefabbrev: Begriffe, Definitionen und abgekürzte Begriffe
 normref: Normative Verweise
 bibliography: Bibliographie
+index: Index
+see: schau
+see_also: siehe auch
 clause: Klausel
 annex: Anhang
 appendix: Appendix
 continued: Fortsetzung
 no_terms_boilerplate: |
-          <p>In diesem Dokument sind keine Begriffe und Definitionen aufgeführt.</p>
+        In diesem Dokument sind keine Begriffe und Definitionen aufgeführt.
 internal_terms_boilerplate: |
-        <p>Für die Zwecke dieses Dokuments gelten die folgenden Begriffe und Definitionen</p>
+        Für die Zwecke dieses Dokuments gelten die folgenden Begriffe und Definitionen.
 norm_with_refs_pref:
   Auf die folgenden Dokumente wird im Text so verwiesen, dass ihr Inhalt ganz oder
   teilweise Anforderungen dieses Dokuments darstellt. Bei datierten Verweisen gilt
@@ -30,20 +33,20 @@ norm_with_refs_pref:
   referenzierten Dokuments (einschließlich eventueller Änderungen).
 norm_empty_pref: In diesem Dokument sind keine normativen Verweise enthalten.
 external_terms_boilerplate: |
-          <p>Für die Zwecke dieses Dokuments gelten die in % angegebenen Begriffe und Definitionen.</p>
+          Für die Zwecke dieses Dokuments gelten die in % angegebenen Begriffe und Definitionen.
 internal_external_terms_boilerplate: |
-          <p>Für die Zwecke dieses Dokuments gelten die in % und im Folgenden aufgeführten Begriffe und Definitionen.</p>
+          Für die Zwecke dieses Dokuments gelten die in % und im Folgenden aufgeführten Begriffe und Definitionen.
 no_information_available: "[KEINE INFORMATION VERFÜGBAR]"
 term_defined_in: "(%)"
-binary_and: "%1 und %2"
-multiple_and: "%1, und %2"
-binary_or: "%1 oder %2"
-multiple_or: "%1, oder %2"
-chain_and: "%1 und %2"
-chain_or: "%1 oder %2"
-chain_from: "%1 von %2"
-chain_to: "%1 bis %2"
-nested_xref: "%1, %2"
+binary_and: "%1 <conn>und</conn> %2"
+multiple_and: "%1<enum-comma>,</enum-comma> <conn>und</conn> %2"
+binary_or: "%1 <conn>oder</conn> %2"
+multiple_or: "%1<enum-comma>,</enum-comma> <conn>oder</conn> %2"
+chain_and: "%1 <conn>und</conn> %2"
+chain_or: "%1 <conn>oder</conn> %2"
+chain_from: "%1 <conn>von</conn> %2"
+chain_to: "%1 <conn>bis</conn> %2"
+nested_xref: "%1<comma>,</comma> %2"
 list_nested_xref: "%1 %2"
 ordinal_keys: [gender,number]
 SpelloutRules:
@@ -88,6 +91,7 @@ adapted: angepasst
 deprecated: VERALTET
 source: QUELLE
 and: und
+no_identifier: (KEIN KENNUNG)
 all_parts: Alle Teile
 edition_ordinal: "{{ var1 | ordinal_word: 'edition', '' }} Auflage"
 edition: Auflage

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

@@ -14,6 +14,9 @@ termsdefsymbols: Terms, definitions and symbols
 termsdefabbrev: Terms, definitions and abbreviated terms
 normref: Normative references
 bibliography: Bibliography
+index: Index
+see: see
+see_also: see also
 preface: Preface
 section: Section
 clause: Clause
@@ -21,10 +24,9 @@ annex: Annex
 appendix: Appendix
 continued: continued
 no_terms_boilerplate: |
-          <p>No terms and definitions are listed in this document.</p>
+      No terms and definitions are listed in this document.
 internal_terms_boilerplate: |
-        <p>For the purposes of this document, 
-            the following terms and definitions apply.</p>
+      For the purposes of this document, the following terms and definitions apply.
 norm_with_refs_pref: 
       The following documents are referred to in the text in such a way
       that some or all of their content constitutes requirements of this
@@ -32,24 +34,22 @@ norm_with_refs_pref:
       For undated references, the latest edition of the referenced
       document (including any amendments) applies.
 norm_empty_pref: 
-          There are no normative references in this document.
+      There are no normative references in this document.
 external_terms_boilerplate: |
-          <p>For the purposes of this document, 
-            the terms and definitions given in % apply.</p>
+      For the purposes of this document, the terms and definitions given in % apply.
 internal_external_terms_boilerplate: |
-          <p>For the purposes of this document, the terms and definitions 
-            given in % and the following apply.</p>
+      For the purposes of this document, the terms and definitions given in % and the following apply.
 no_information_available: "[NO INFORMATION AVAILABLE]"
 term_defined_in: "(%)"
-binary_and: "%1 and %2"
-multiple_and: "%1, and %2"
-binary_or: "%1 or %2"
-multiple_or: "%1, or %2"
-chain_and: "%1 and %2"
-chain_or: "%1 or %2"
-chain_from: "%1 from %2"
-chain_to: "%1 to %2"
-nested_xref: "%1, %2"
+binary_and: "%1 <conn>and</conn> %2"
+multiple_and: "%1<enum-comma>,</enum-comma> <conn>and</conn> %2"
+binary_or: "%1 <conn>or</conn> %2"
+multiple_or: "%1<enum-comma>,</enum-comma> <conn>or</conn> %2"
+chain_and: "%1 <conn>and</conn> %2"
+chain_or: "%1 <conn>or</conn> %2"
+chain_from: "%1 <conn>from</conn> %2"
+chain_to: "%1 <conn>to</conn> %2"
+nested_xref: "%1<comma>,</comma> %2"
 list_nested_xref: "%1 %2"
 ordinal_keys: []
 SpelloutRules: spellout-ordinal
@@ -68,6 +68,7 @@ requirement: Requirement
 recommendation: Recommendation
 permission: Permission
 box: Box
+no_identifier: (NO ID)
 # Modspec
 recommendationtest: Recommendation test
 requirementtest: Requirement test