isodoc 1.7.6.1 → 1.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 411fdbd359b728afea9bcab7225c1e79a2a2698dd37c6219c70a1434cfa09286
-  data.tar.gz: 05a4997c47971d8cc74985ea8a0cf7b4e2c0d0e15a144e68eae007ce24176c9a
+  metadata.gz: 5df030f2a89267d4acde57361f2c6338b29bf5928b5bb3c7b24a18903adf1531
+  data.tar.gz: 7e1923d7293b6b0703a15799e9bc3334637145adf8219c4230c63809267770cf
 SHA512:
-  metadata.gz: 7db1599bdd9d90aada565fbb02d4744a1ac85de0798c2dfd33d2b76905e5f40894042df0e0131a282fa669509f590cf471285188f6dd8e3c091d3bf6c0809bb3
-  data.tar.gz: cd90f9f57aa3ccd37d59d7ebc14438dd37c8812e3d131d7d82618499bfd69c25f660716a508621f536e72a68b942571347fb7218a746c42e61296e4e7fef3da8
+  metadata.gz: 24e8cf7a71167da62d5bdea85b009f982996e1513db82b42d6c01edf031b045dac7f9992a10e29946368df70dc32301e5edfa5937fad11e49e661edf8311058c
+  data.tar.gz: f61bb6a9b3833c0c4080c0804ae12869f15051ebec0f3fa6b3cc7d925b44de41559d472dde0ad737f54b02b040532a0a944e90a563fd1fcec4566965bda26fa4

data/lib/isodoc/class_utils.rb

@@ -27,5 +27,28 @@ module IsoDoc
       end.join
       Liquid::Template.parse(doc)
     end
+
+    def case_strict(text, casing, script)
+      return text unless %w(Latn Cyrl Grek Armn).include?(script)
+
+      letters = text.chars
+      case casing
+      when "capital" then letters.first.upcase!
+      when "lowercase" then letters.first.downcase!
+      end
+      letters.join
+    end
+
+    def case_with_markup(linkend, casing, script)
+      seen = false
+      xml = Nokogiri::XML("<root>#{linkend}</root>")
+      xml.traverse do |b|
+        next unless b.text? && !seen
+
+        b.replace(Common::case_strict(b.text, casing, script))
+        seen = true
+      end
+      xml.root.children.to_xml
+    end
   end
 end

data/lib/isodoc/convert.rb

@@ -102,6 +102,7 @@ module IsoDoc
       @bookmarks_allocated = { "X" => true }
       @fn_bookmarks = {}
       @baseassetpath = options[:baseassetpath]
+      @aligncrosselements = options[:aligncrosselements]
     end
 
     def tmpimagedir_suffix

data/lib/isodoc/presentation_function/inline.rb

@@ -7,13 +7,16 @@ module IsoDoc
       l10n("#{@xrefs.anchor(container, :xref)}, #{linkend}")
     end
 
+    def anchor_value(id)
+      @xrefs.anchor(id, :value) || @xrefs.anchor(id, :label) ||
+        @xrefs.anchor(id, :xref)
+    end
+
     def anchor_linkend(node, linkend)
       if node["citeas"].nil? && node["bibitemid"]
         return @xrefs.anchor(node["bibitemid"], :xref) || "???"
       elsif node["target"] && node["droploc"]
-        return @xrefs.anchor(node["target"], :value) ||
-            @xrefs.anchor(node["target"], :label) ||
-            @xrefs.anchor(node["target"], :xref) || "???"
+        return anchor_value(node["target"]) || "???"
       elsif node["target"] && !/.#./.match(node["target"])
         linkend = anchor_linkend1(node)
       end
@@ -27,14 +30,15 @@ module IsoDoc
       (container && get_note_container_id(node) != container &&
        @xrefs.get[node["target"]]) and
         linkend = prefix_container(container, linkend, node["target"])
-      capitalise_xref(node, linkend)
+      capitalise_xref(node, linkend, anchor_value(node["target"]))
     end
 
-    def capitalise_xref(node, linkend)
-      return linkend unless %w(Latn Cyrl Grek).include? @script
-      return linkend&.capitalize if node["case"] == "capital"
-      return linkend&.downcase if node["case"] == "lowercase"
-      return linkend if linkend[0, 1].match?(/\p{Upper}/)
+    def capitalise_xref(node, linkend, label)
+      linktext = linkend.gsub(/<[^>]+>/, "")
+      (label && !label.empty? && /^#{Regexp.escape(label)}/.match?(linktext) ||
+          linktext[0, 1].match?(/\p{Upper}/)) and return linkend
+      node["case"] and
+        return Common::case_with_markup(linkend, node["case"], @script)
 
       capitalise_xref1(node, linkend)
     end
@@ -43,7 +47,7 @@ module IsoDoc
       prec = nearest_block_parent(node).xpath("./descendant-or-self::text()") &
         node.xpath("./preceding::text()")
       if prec.empty? || /(?!<[^.].)\.\s+$/.match(prec.map(&:text).join)
-        linkend&.capitalize
+        Common::case_with_markup(linkend, "capital", @script)
       else linkend
       end
     end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.7.6.1".freeze
+  VERSION = "1.7.7".freeze
 end

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -1,160 +1,165 @@
-module IsoDoc::XrefGen
-  module Sections
-    def back_anchor_names(docxml)
-      i = Counter.new("@")
-      docxml.xpath(ns("//annex")).each do |c|
-        i.increment(c)
-        annex_names(c, i.print)
+module IsoDoc
+  module XrefGen
+    module Sections
+      def back_anchor_names(docxml)
+        i = Counter.new("@")
+        docxml.xpath(ns("//annex")).each do |c|
+          i.increment(c)
+          annex_names(c, i.print)
+        end
+        docxml.xpath(ns(@klass.bibliography_xpath)).each do |b|
+          preface_names(b)
+        end
+        docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
+          reference_names(ref)
+        end
       end
-      docxml.xpath(ns(@klass.bibliography_xpath)).each do |b|
-        preface_names(b)
+
+      def initial_anchor_names(doc)
+        doc.xpath(ns("//preface/*")).each do |c|
+          c.element? and preface_names(c)
+        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)
+        middle_section_asset_names(doc)
+        termnote_anchor_names(doc)
+        termexample_anchor_names(doc)
       end
-      docxml.xpath(ns("//bibitem[not(ancestor::bibitem)]")).each do |ref|
-        reference_names(ref)
+
+      def preface_clause_name(clause)
+        clause.at(ns("./title"))&.text || clause.name.capitalize
       end
-    end
 
-    def initial_anchor_names(doc)
-      doc.xpath(ns("//preface/*")).each { |c| c.element? and preface_names(c) }
-      # 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)
-      middle_section_asset_names(doc)
-      termnote_anchor_names(doc)
-      termexample_anchor_names(doc)
-    end
+      SUBCLAUSES =
+        "./clause | ./references | ./term  | ./terms | ./definitions".freeze
 
-    def preface_clause_name(clause)
-      clause.at(ns("./title"))&.text || clause.name.capitalize
-    end
+      # in StanDoc, prefaces have no numbering; they are referenced only by title
+      def preface_names(clause)
+        return if clause.nil?
 
-    SUBCLAUSES =
-      "./clause | ./references | ./term  | ./terms | ./definitions".freeze
+        @anchors[clause["id"]] =
+          { label: nil, level: 1, xref: preface_clause_name(clause),
+            type: "clause" }
+        clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
+          preface_names1(c, c.at(ns("./title"))&.text,
+                         "#{preface_clause_name(clause)}, #{i + 1}", 2)
+        end
+      end
 
-    # in StanDoc, prefaces have no numbering; they are referenced only by title
-    def preface_names(clause)
-      return if clause.nil?
+      def preface_names1(clause, title, parent_title, level)
+        label = title || parent_title
+        @anchors[clause["id"]] =
+          { label: nil, level: level, xref: label, type: "clause" }
+        clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
+          preface_names1(c, c.at(ns("./title"))&.text, "#{label} #{i + 1}",
+                         level + 1)
+        end
+      end
 
-      @anchors[clause["id"]] =
-        { label: nil, level: 1, xref: preface_clause_name(clause),
-          type: "clause" }
-      clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
-        preface_names1(c, c.at(ns("./title"))&.text,
-                       "#{preface_clause_name(clause)}, #{i + 1}", 2)
+      def middle_section_asset_names(doc)
+        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
-    end
 
-    def preface_names1(clause, title, parent_title, level)
-      label = title || parent_title
-      @anchors[clause["id"]] =
-        { label: nil, level: level, xref: label, type: "clause" }
-      clause.xpath(ns(SUBCLAUSES)).each_with_index do |c, i|
-        preface_names1(c, c.at(ns("./title"))&.text, "#{label} #{i + 1}",
-                       level + 1)
+      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
-    end
 
-    def middle_section_asset_names(doc)
-      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 section_names(clause, num, lvl)
+        return num if clause.nil?
 
-    def clause_names(docxml, num)
-      docxml.xpath(ns(@klass.middle_clause(docxml))).each_with_index do |c, _i|
-        section_names(c, num, 1)
+        num.increment(clause)
+        @anchors[clause["id"]] =
+          { label: num.print, xref: l10n("#{@labels['clause']} #{num.print}"),
+            level: lvl, type: "clause" }
+        i = Counter.new
+        clause.xpath(ns(SUBCLAUSES)).each do |c|
+          i.increment(c)
+          section_names1(c, "#{num.print}.#{i.print}", lvl + 1)
+        end
+        num
       end
-    end
 
-    def section_names(clause, num, lvl)
-      return num if clause.nil?
-
-      num.increment(clause)
-      @anchors[clause["id"]] =
-        { label: num.print, xref: l10n("#{@labels['clause']} #{num.print}"),
-          level: lvl, type: "clause" }
-      i = Counter.new
-      clause.xpath(ns(SUBCLAUSES)).each do |c|
-        i.increment(c)
-        section_names1(c, "#{num.print}.#{i.print}", lvl + 1)
+      def section_names1(clause, num, level)
+        @anchors[clause["id"]] =
+          { label: num, level: level, xref: l10n("#{@labels['clause']} #{num}"),
+            type: "clause" }
+        i = Counter.new
+        clause.xpath(ns(SUBCLAUSES)).each do |c|
+          i.increment(c)
+          section_names1(c, "#{num}.#{i.print}", level + 1)
+        end
       end
-      num
-    end
 
-    def section_names1(clause, num, level)
-      @anchors[clause["id"]] =
-        { label: num, level: level, xref: l10n("#{@labels['clause']} #{num}"),
-          type: "clause" }
-      i = Counter.new
-      clause.xpath(ns(SUBCLAUSES)).each do |c|
-        i.increment(c)
-        section_names1(c, "#{num}.#{i.print}", level + 1)
+      def annex_name_lbl(clause, num)
+        obl = l10n("(#{@labels['inform_annex']})")
+        clause["obligation"] == "normative" and
+          obl = l10n("(#{@labels['norm_annex']})")
+        title = Common::case_with_markup(@labels["annex"], "capital", @script)
+        l10n("<strong>#{title} #{num}</strong><br/>#{obl}")
       end
-    end
 
-    def annex_name_lbl(clause, num)
-      obl = l10n("(#{@labels['inform_annex']})")
-      clause["obligation"] == "normative" and
-        obl = l10n("(#{@labels['norm_annex']})")
-      l10n("<strong>#{@labels['annex']} #{num}</strong><br/>#{obl}")
-    end
+      def single_annex_special_section(clause)
+        a = clause.xpath(ns("./references | ./terms | ./definitions"))
+        a.size == 1 or return nil
+        clause.xpath(ns("./clause | ./p | ./table | ./ol | ./ul | ./dl | "\
+                        "./note | ./admonition | ./figure")).empty? or
+          return nil
+        a[0]
+      end
 
-    def single_annex_special_section(clause)
-      a = clause.xpath(ns("./references | ./terms | ./definitions"))
-      a.size == 1 or return nil
-      clause.xpath(ns("./clause | ./p | ./table | ./ol | ./ul | ./dl | "\
-                      "./note | ./admonition | ./figure")).empty? or
-        return nil
-      a[0]
-    end
+      def annex_names(clause, num)
+        @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
+                                   type: "clause", value: num.to_s, level: 1,
+                                   xref: "#{@labels['annex']} #{num}" }
+        if a = single_annex_special_section(clause)
+          annex_names1(a, num.to_s, 1)
+        else
+          i = Counter.new
+          clause.xpath(ns(SUBCLAUSES)).each do |c|
+            i.increment(c)
+            annex_names1(c, "#{num}.#{i.print}", 2)
+          end
+        end
+        hierarchical_asset_names(clause, num)
+      end
 
-    def annex_names(clause, num)
-      @anchors[clause["id"]] = { label: annex_name_lbl(clause, num),
-                                 type: "clause", value: num.to_s,
-                                 xref: "#{@labels['annex']} #{num}", level: 1 }
-      if a = single_annex_special_section(clause)
-        annex_names1(a, num.to_s, 1)
-      else
+      def annex_names1(clause, num, level)
+        @anchors[clause["id"]] = { xref: "#{@labels['annex']} #{num}",
+                                   label: num, level: level, type: "clause" }
         i = Counter.new
         clause.xpath(ns(SUBCLAUSES)).each do |c|
           i.increment(c)
-          annex_names1(c, "#{num}.#{i.print}", 2)
+          annex_names1(c, "#{num}.#{i.print}", level + 1)
         end
       end
-      hierarchical_asset_names(clause, num)
-    end
 
-    def annex_names1(clause, num, level)
-      @anchors[clause["id"]] = { label: num, xref: "#{@labels['annex']} #{num}",
-                                 level: level, type: "clause" }
-      i = Counter.new
-      clause.xpath(ns(SUBCLAUSES)).each do |c|
-        i.increment(c)
-        annex_names1(c, "#{num}.#{i.print}", level + 1)
+      ISO_PUBLISHER_XPATH =
+        "./contributor[xmlns:role/@type = 'publisher']/"\
+        "organization[abbreviation = 'ISO' or xmlns:abbreviation = 'IEC' or "\
+        "xmlns:name = 'International Organization for Standardization' or "\
+        "xmlns:name = 'International Electrotechnical Commission']".freeze
+
+      def reference_names(ref)
+        # isopub = ref.at(ns(ISO_PUBLISHER_XPATH))
+        ids = @klass.bibitem_ref_code(ref)
+        identifiers = @klass.render_identifier(ids)
+        # date = ref.at(ns("./date[@type = 'published']"))
+        reference = @klass.docid_l10n(identifiers[0] || identifiers[1])
+        @anchors[ref["id"]] = { xref: reference }
       end
     end
-
-    ISO_PUBLISHER_XPATH =
-      "./contributor[xmlns:role/@type = 'publisher']/"\
-      "organization[abbreviation = 'ISO' or xmlns:abbreviation = 'IEC' or "\
-      "xmlns:name = 'International Organization for Standardization' or "\
-      "xmlns:name = 'International Electrotechnical Commission']".freeze
-
-    def reference_names(ref)
-      # isopub = ref.at(ns(ISO_PUBLISHER_XPATH))
-      ids = @klass.bibitem_ref_code(ref)
-      identifiers = @klass.render_identifier(ids)
-      # date = ref.at(ns("./date[@type = 'published']"))
-      reference = @klass.docid_l10n(identifiers[0] || identifiers[1])
-      @anchors[ref["id"]] = { xref: reference }
-    end
   end
 end

data/lib/isodoc/xslfo_convert.rb

@@ -20,12 +20,13 @@ module IsoDoc
     end
 
     def pdf_options(_docxml)
-      if font_manifest_file = @options.dig(MN2PDF_OPTIONS,
-                                           MN2PDF_FONT_MANIFEST)
-        "--font-manifest #{font_manifest_file}"
-      else
-        ""
-      end
+      ret = ""
+      font_manifest_file = @options.dig(MN2PDF_OPTIONS,
+                                        MN2PDF_FONT_MANIFEST) and
+        ret += " --font-manifest #{font_manifest_file}"
+      @aligncrosselements && !@aligncrosselements.empty? and
+        ret += %( --param align-cross-elements = "#{@aligncrosselements.gsub(/,/, ' ')}")
+      ret
     end
 
     def convert(input_filename, file = nil, debug = false,

data/spec/assets/i18n.yaml

@@ -6,12 +6,14 @@ source: SOURCE
 modified: modified
 scope: Amplekso
 symbols: Simboloj kai mallongigitaj terminoj
-annex: Aldono
+annex: <strong>aldono</strong>
 normref: Normaj citaĵoj
 bibliography: Bibliografio
 inform_annex: informa
 all_parts: ĉiuj partoj
 norm_annex: normative
+figure: figur-etikedo duvorta
+example: Ekzempl-etikedo Duvorta
 note: NOTO
 locality: {
   table: Tabelo

data/spec/isodoc/i18n_spec.rb

@@ -877,7 +877,7 @@ RSpec.describe IsoDoc do
             <ext>
             <doctype language="">brochure</doctype><doctype language="eo">bro&#x15D;uro</doctype>
             </ext>
-            </bibdata><localized-strings><localized-string key="foreword" language="eo">Anta&#x16D;parolo</localized-string><localized-string key="introduction" language="eo">Enkonduko</localized-string><localized-string key="clause" language="eo">kla&#x16D;zo</localized-string><localized-string key="table" language="eo">tabelo</localized-string><localized-string key="source" language="eo">SOURCE</localized-string><localized-string key="modified" language="eo">modified</localized-string><localized-string key="scope" language="eo">Amplekso</localized-string><localized-string key="symbols" language="eo">Simboloj kai mallongigitaj terminoj</localized-string><localized-string key="annex" language="eo">Aldono</localized-string><localized-string key="normref" language="eo">Normaj cita&#x135;oj</localized-string><localized-string key="bibliography" language="eo">Bibliografio</localized-string><localized-string key="inform_annex" language="eo">informa</localized-string><localized-string key="all_parts" language="eo">&#x109;iuj partoj</localized-string><localized-string key="norm_annex" language="eo">normative</localized-string><localized-string key="note" language="eo">NOTO</localized-string><localized-string key="locality.table" language="eo">Tabelo</localized-string><localized-string key="doctype_dict.brochure" language="eo">bro&#x15D;uro</localized-string><localized-string key="doctype_dict.conference_proceedings" language="eo">konferencaktoj</localized-string><localized-string key="stage_dict.published" language="eo">publikigita</localized-string><localized-string key="substage_dict.withdrawn" language="eo">fortirita</localized-string><localized-string key="array.0" language="eo">elem1</localized-string><localized-string key="array.1" language="eo">elem2</localized-string><localized-string key="array.2.elem3" language="eo">elem4</localized-string><localized-string key="array.2.elem5" language="eo">elem6</localized-string><localized-string key="language" language="eo">eo</localized-string><localized-string key="script" language="eo">Latn</localized-string></localized-strings>
+            </bibdata><localized-strings><localized-string key="foreword" language="eo">Anta&#x16D;parolo</localized-string><localized-string key="introduction" language="eo">Enkonduko</localized-string><localized-string key="clause" language="eo">kla&#x16D;zo</localized-string><localized-string key="table" language="eo">tabelo</localized-string><localized-string key="source" language="eo">SOURCE</localized-string><localized-string key="modified" language="eo">modified</localized-string><localized-string key="scope" language="eo">Amplekso</localized-string><localized-string key="symbols" language="eo">Simboloj kai mallongigitaj terminoj</localized-string><localized-string key="annex" language="eo"><strong>aldono</strong></localized-string><localized-string key="normref" language="eo">Normaj cita&#x135;oj</localized-string><localized-string key="bibliography" language="eo">Bibliografio</localized-string><localized-string key="inform_annex" language="eo">informa</localized-string><localized-string key="all_parts" language="eo">&#x109;iuj partoj</localized-string><localized-string key="norm_annex" language="eo">normative</localized-string><localized-string key='figure' language='eo'>figur-etikedo duvorta</localized-string><localized-string key='example' language='eo'>Ekzempl-etikedo Duvorta</localized-string><localized-string key="note" language="eo">NOTO</localized-string><localized-string key="locality.table" language="eo">Tabelo</localized-string><localized-string key="doctype_dict.brochure" language="eo">bro&#x15D;uro</localized-string><localized-string key="doctype_dict.conference_proceedings" language="eo">konferencaktoj</localized-string><localized-string key="stage_dict.published" language="eo">publikigita</localized-string><localized-string key="substage_dict.withdrawn" language="eo">fortirita</localized-string><localized-string key="array.0" language="eo">elem1</localized-string><localized-string key="array.1" language="eo">elem2</localized-string><localized-string key="array.2.elem3" language="eo">elem4</localized-string><localized-string key="array.2.elem5" language="eo">elem6</localized-string><localized-string key="language" language="eo">eo</localized-string><localized-string key="script" language="eo">Latn</localized-string></localized-strings>
             <preface>
             <foreword obligation="informative" displayorder="1">
                <title>Foreword</title>
@@ -920,7 +920,7 @@ RSpec.describe IsoDoc do
                <title depth="2">5.2.<tab/>Clause 4.2</title>
              </clause></clause>
              </sections><annex id="P" inline-header="false" obligation="normative" displayorder="8">
-               <title><strong>Aldono A</strong><br/>(normative)<br/><br/><strong>Annex</strong></title>
+               <title><strong><strong>Aldono</strong> A</strong><br/>(normative)<br/><br/><strong>Annex</strong></title>
                <clause id="Q" inline-header="false" obligation="normative">
                <title depth="2">A.1.<tab/>Annex A.1</title>
                <clause id="Q1" inline-header="false" obligation="normative">
@@ -1041,7 +1041,7 @@ RSpec.describe IsoDoc do
                    <br/>
                    <div id='P' class='Section3'>
                      <h1 class='Annex'>
-                       <b>Aldono A</b>
+                       <b><b>Aldono</b> A</b>
                        <br/>
                        (normative)
                        <br/>

data/spec/isodoc/inline_spec.rb

@@ -1505,6 +1505,122 @@ RSpec.describe IsoDoc do
   end
 
   it "cases xrefs" do
+    input = <<~INPUT
+          <iso-standard xmlns="http://riboseinc.com/isoxml">
+          <preface>
+          <clause id="CC"><title>Introduction</title></clause>
+          <sections>
+          <clause id="A">
+          <table id="B">
+          </table>
+          <figure id="B1"/>
+          <example id="B2"/>
+          </clause>
+          <clause id="C">
+          <p>This is <xref target="A"/> and <xref target="B"/>.
+          This is <xref target="A" case="capital"/> and <xref target="B" case="lowercase"/>.
+          This is <xref target="A" case="lowercase"/> and <xref target="B" case="capital"/>.
+          Downcasing an xref affects only the first letter: <xref target="B2" case="lowercase"/>.
+          Capitalising an xref affects only the first letter: <xref target="B1" case="capital"/>.
+          <xref target="A"/> is clause <em>initial.</em><br/>
+          <xref target="A"/> is too.  </p>
+          <p><xref target="A"/> is also.</p>
+          <p>Annex has formatting, and crossreferences ignore it when determining casing. <xref target="AA"/>.</p>
+          <p>Labels are not subject to casing: <xref target="CC" case="lowercase"/>
+      </clause>
+      <annex id="AA">
+      <clause id="AA1"/>
+      </annex>
+      </sections>
+      </iso-standard>
+    INPUT
+    output = <<~OUTPUT
+      <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+        <preface>
+          <clause id='CC' displayorder='1'>
+            <title depth='1'>Introduction</title>
+          </clause>
+          <sections displayorder='2'>
+            <clause id='A' displayorder='3'>
+              <title>1.</title>
+              <table id='B'>
+                <name>Tabelo 1</name>
+              </table>
+              <figure id='B1'>
+                <name>Figur-etikedo duvorta 1</name>
+              </figure>
+              <example id='B2'>
+                <name>Ekzempl-etikedo Duvorta</name>
+              </example>
+            </clause>
+            <clause id='C' displayorder='4'>
+              <title>2.</title>
+              <p>
+                This is
+                <xref target='A'>kla&#x16D;zo 1</xref>
+                 and
+                <xref target='B'>tabelo 1</xref>
+                . This is
+                <xref target='A' case='capital'>Kla&#x16D;zo 1</xref>
+                 and
+                <xref target='B' case='lowercase'>tabelo 1</xref>
+                . This is
+                <xref target='A' case='lowercase'>kla&#x16D;zo 1</xref>
+                 and
+                <xref target='B' case='capital'>Tabelo 1</xref>
+                . Downcasing an xref affects only the first letter:
+                <xref target='B2' case='lowercase'>kla&#x16D;zo 1, Example</xref>
+                . Capitalising an xref affects only the first letter:
+                <xref target='B1' case='capital'>Figur-etikedo duvorta 1</xref>
+                .
+                <xref target='A'>Kla&#x16D;zo 1</xref>
+                 is clause
+                <em>initial.</em>
+                <br/>
+                <xref target='A'>Kla&#x16D;zo 1</xref>
+                 is too.
+              </p>
+              <p>
+                <xref target='A'>Kla&#x16D;zo 1</xref>
+                 is also.
+              </p>
+              <p>
+                Annex has formatting, and crossreferences ignore it when determining
+                casing.
+                <xref target='AA'>
+                  <strong>Aldono</strong>
+                   A
+                </xref>
+                .
+              </p>
+              <p>
+                Labels are not subject to casing:
+                <xref target='CC' case='lowercase'>Introduction</xref>
+              </p>
+              <annex id='AA' displayorder='5'>
+                <title>
+                  <strong>
+                    <strong>Aldono</strong>
+                     A
+                  </strong>
+                  <br/>
+                  (informa)
+                </title>
+                <clause id='AA1'>
+                  <title>A.1.</title>
+                </clause>
+              </annex>
+            </clause>
+          </sections>
+        </preface>
+      </iso-standard>
+    OUTPUT
+    expect(xmlpp(IsoDoc::PresentationXMLConvert
+      .new({ i18nyaml: "spec/assets/i18n.yaml" })
+      .convert("test", input, true))).to be_equivalent_to xmlpp(output)
+  end
+
+  it "ignores casing of xrefs in unicameral scripts" do
     input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
           <sections>
@@ -1541,23 +1657,23 @@ RSpec.describe IsoDoc do
                and
               <xref target='B'>tabelo 1</xref>
               . This is
-              <xref target='A' case='capital'>Kla&#x16D;zo 1</xref>
+              <xref target='A' case='capital'>kla&#x16D;zo 1</xref>
                and
               <xref target='B' case='lowercase'>tabelo 1</xref>
               . This is
               <xref target='A' case='lowercase'>kla&#x16D;zo 1</xref>
                and
-              <xref target='B' case='capital'>Tabelo 1</xref>
+              <xref target='B' case='capital'>tabelo 1</xref>
               .
-              <xref target='A'>Kla&#x16D;zo 1</xref>
+              <xref target='A'>kla&#x16D;zo 1</xref>
                is clause
               <em>initial.</em>
               <br/>
-              <xref target='A'>Kla&#x16D;zo 1</xref>
+              <xref target='A'>kla&#x16D;zo 1</xref>
                is too.
             </p>
             <p>
-              <xref target='A'>Kla&#x16D;zo 1</xref>
+              <xref target='A'>kla&#x16D;zo 1</xref>
                is also.
             </p>
           </clause>
@@ -1565,7 +1681,7 @@ RSpec.describe IsoDoc do
       </iso-standard>
     OUTPUT
     expect(xmlpp(IsoDoc::PresentationXMLConvert
-      .new({ i18nyaml: "spec/assets/i18n.yaml" })
+      .new({ i18nyaml: "spec/assets/i18n.yaml", script: "Hans" })
       .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
 

data/spec/isodoc/xslfo_convert_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe IsoDoc do
     convert = IsoDoc::XslfoPdfConvert.new(
       {
         datauriimage: false,
-      }
+      },
     )
 
     expect(convert.pdf_options(nil)).to eq("")
@@ -18,7 +18,7 @@ RSpec.describe IsoDoc do
         IsoDoc::XslfoPdfConvert::MN2PDF_OPTIONS => {
           IsoDoc::XslfoPdfConvert::MN2PDF_FONT_MANIFEST => nil,
         },
-      }
+      },
     )
 
     expect(convert.pdf_options(nil)).to eq("")
@@ -31,9 +31,21 @@ RSpec.describe IsoDoc do
         IsoDoc::XslfoPdfConvert::MN2PDF_OPTIONS => {
           IsoDoc::XslfoPdfConvert::MN2PDF_FONT_MANIFEST => "/tmp/manifest.yml",
         },
-      }
+      },
     )
 
-    expect(convert.pdf_options(nil)).to eq("--font-manifest /tmp/manifest.yml")
+    expect(convert.pdf_options(nil)).to eq(" --font-manifest /tmp/manifest.yml")
+  end
+
+  it "test --param align-cross-elements pdf_options" do
+    convert = IsoDoc::XslfoPdfConvert.new(
+      {
+        datauriimage: false,
+        aligncrosselements: "clause table note",
+      },
+    )
+
+    expect(convert.pdf_options(nil))
+      .to eq(" --param align-cross-elements = \"clause table note\"")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.7.6.1
+  version: 1.7.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath