isodoc 1.7.6 → 1.8.1

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

@@ -3,7 +3,7 @@ require "metanorma"
 module IsoDoc
   class XslfoPdfConvert < ::IsoDoc::Convert
     MN2PDF_OPTIONS = :mn2pdf
-    MN2PDF_FONT_MANIFEST = :font_manifest_file
+    MN2PDF_FONT_MANIFEST = :font_manifest
 
     def initialize(options)
       @format = :pdf
@@ -20,12 +20,16 @@ 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 = @options.dig(MN2PDF_OPTIONS,
+                                   MN2PDF_FONT_MANIFEST) and
+        ret[MN2PDF_FONT_MANIFEST] = font_manifest
+      @aligncrosselements && !@aligncrosselements.empty? and
+        ret["--param align-cross-elements="] =
+          @aligncrosselements.gsub(/,/, " ")
+      @baseassetpath and
+        ret["--param baseassetpath="] = @baseassetpath
+      ret
     end
 
     def convert(input_filename, file = nil, debug = false,

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

@@ -89,6 +89,28 @@ locality:
   example: مثال
   note: ملحوظة, ملاحظة
   formula: معادلة
+grammar_abbrevs:
+  masculine: مذكر
+  feminine: مؤ
+  neuter: محايد
+  common: خنثى
+  isPreposition: حرف جر
+  isParticiple: النعت
+  isAdjective: صفة
+  isAdverb: ظرف
+  isNoun: اسم
+  isVerb: الفعل
+relatedterms:
+  deprecates: يهمل
+  supersedes: حل محل
+  # حل محل
+  narrower: أضيق
+  broader: أوسع
+  equivalent: مُعادل
+  compare: قارن
+  contrast: مضاد
+  # تباين
+  see: انظر
 inflection:
   فقرة:
     sg: فقرة

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

@@ -93,6 +93,26 @@ locality: {
   note: Hinweis,
   formula: Formel
 }
+grammar_abbrevs:
+  masculine: mask
+  feminine: fem
+  neuter: neutr
+  common: gemein
+  isPreposition: Präp
+  isParticiple: Part
+  isAdjective: Adj
+  isAdverb: Adv
+  isNoun: Subs
+  isVerb: V
+relatedterms:
+  deprecates: veraltet
+  supersedes: ersetzt
+  narrower: enger
+  broader: breiter
+  equivalent: entspricht
+  compare: vergleiche
+  contrast: dagegen
+  see: siehe
 inflection:
   Klausel:
     sg: Klausel

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

@@ -99,6 +99,26 @@ locality: {
                       note: Note,
                       formula: Formula
                     }
+grammar_abbrevs:
+  masculine: masc
+  feminine: fem
+  neuter: neut
+  common: common
+  isPreposition: prep
+  isParticiple: part
+  isAdjective: adj
+  isAdverb: adv
+  isNoun: n
+  isVerb: v
+relatedterms:
+  deprecates: deprecates
+  supersedes: supersedes
+  narrower: narrower
+  broader: broader
+  equivalent: equivalent
+  compare: compare
+  contrast: contrast
+  see: see
 inflection:
   Clause:
     sg: Clause

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

@@ -95,6 +95,26 @@ locality: {
                       note: Nota,
                       formula: Fórmula
                     }
+grammar_abbrevs:
+  masculine: masc
+  feminine: fem
+  neuter: neut
+  common: epicen@
+  isPreposition: prep
+  isParticiple: part
+  isAdjective: adj
+  isAdverb: adv
+  isNoun: sust
+  isVerb: v
+relatedterms:
+  deprecates: obsoleto
+  supersedes: reemplaza
+  narrower: incluye
+  broader: extiende
+  equivalent: equivalente
+  compare: relacionado
+  contrast: difiere
+  see: véase
 inflection:
   Cláusula:
     sg: Cláusula

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

@@ -92,6 +92,26 @@ locality: {
                       note: Note,
                       formula: Formule
                     }
+grammar_abbrevs:
+  masculine: masc
+  feminine: fem
+  neuter: neut
+  common: épicène
+  isPreposition: prép
+  isParticiple: part
+  isAdjective: adj
+  isAdverb: adv
+  isNoun: subst
+  isVerb: vb
+relatedterms:
+  deprecates: déprécie
+  supersedes: remplace
+  narrower: plus étroit
+  broader: plus large
+  equivalent: équivalent
+  compare: comparez
+  contrast: contrastez
+  see: voir
 inflection:
   Clause:
     sg: Article

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

@@ -97,7 +97,27 @@ locality: {
                       example: Пример,
                       note: Примечание,
                       formula: Формула
-                    }
+}
+grammar_abbrevs:
+  masculine: муж
+  feminine: жен
+  neuter: ср
+  common: общего рода
+  isPreposition: предл
+  isParticiple: прич
+  isAdjective: прил
+  isAdverb: нар
+  isNoun: сущ
+  isVerb: глаг
+relatedterms:
+  deprecates: устаревший
+  supersedes: заменяет
+  narrower: более узкий
+  broader: более широкий
+  equivalent: эквивалент
+  compare: наравне
+  contrast: противоположный
+  see: см.
 inflection:
   Пункт:
     sg: Пункт

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -93,3 +93,24 @@ locality: {
   example: 示例,
   note: 注
 }
+grammar_abbrevs:
+  masculine: 男性性别
+  feminine: 阴性
+  neuter: 中性的
+  common: 通性
+  isPreposition: 介词
+  isParticiple: 分词
+  isAdjective: 形容词
+  isAdverb: 副词
+  isNoun: 名词
+  isVerb: 动词
+relatedterms:
+  deprecates: 旧词
+  supersedes: 取替
+  narrower: 狭义
+  broader: 广义
+  equivalent: 同义
+  compare: 比较
+  contrast: 对比
+  see: 见
+

data/lib/metanorma/output/xslfo.rb

@@ -1,21 +1,14 @@
-require 'mn2pdf'
-require_relative "./utils.rb"
+require "mn2pdf"
+require_relative "./utils"
 
 module Metanorma
   module Output
     class XslfoPdf < Base
-      def convert(url_path, output_path, xsl_stylesheet, options = "")
+      def convert(url_path, output_path, xsl_stylesheet, options = {})
         return if url_path.nil? || output_path.nil? || xsl_stylesheet.nil?
 
-        Mn2pdf.convert(quote(url_path), quote(output_path), quote(xsl_stylesheet), options)
-      end
-
-      def quote(x)
-        return x if /^'.*'$/.match(x)
-        return x if /^".*"$/.match(x)
-        %("#{x}")
+        Mn2pdf.convert(url_path, output_path, xsl_stylesheet, options)
       end
     end
   end
 end
-

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/blocks_spec.rb

@@ -809,8 +809,11 @@ RSpec.describe IsoDoc do
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
       .convert("test", input, true)
       .gsub(/</, "<")
-    .gsub(%r{data:application/x-msmetafile[^"']+}, 'data:application/x-msmetafile')
-                )).to be_equivalent_to xmlpp(presxml.gsub(%r{data:application/x-msmetafile[^"']+}, 'data:application/x-msmetafile'))
+    .gsub(%r{data:application/x-msmetafile[^"']+},
+          "data:application/x-msmetafile")))
+      .to be_equivalent_to xmlpp(presxml
+      .gsub(%r{data:application/x-msmetafile[^"']+},
+            "data:application/x-msmetafile"))
     expect(xmlpp(strip_guid(IsoDoc::HtmlConvert.new({})
       .convert("test", presxml, true)))).to be_equivalent_to xmlpp(html)
     expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
@@ -900,9 +903,11 @@ RSpec.describe IsoDoc do
     expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
      .convert("test", input, true)
      .gsub(/</, "<")
-    .gsub(%r{data:application/x-msmetafile[^"']+}, 'data:application/x-msmetafile')))
+    .gsub(%r{data:application/x-msmetafile[^"']+},
+          "data:application/x-msmetafile")))
       .to be_equivalent_to xmlpp(presxml
-      .gsub( %r{data:application/x-msmetafile[^"']+}, 'data:application/x-msmetafile'))
+      .gsub(%r{data:application/x-msmetafile[^"']+},
+            "data:application/x-msmetafile"))
     expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
       .convert("test", presxml, true)
       .gsub(/['"][^'".]+(?<!odf1)(?<!odf)\.emf['"]/, "'_.emf'")
@@ -991,9 +996,11 @@ RSpec.describe IsoDoc do
       expect(xmlpp(IsoDoc::PresentationXMLConvert.new({})
        .convert("test", input, true)
        .gsub(/&lt;/, "&#x3c;")
-        .gsub(%r{data:application/x-msmetafile[^"']+}, 'data:application/x-msmetafile')))
+        .gsub(%r{data:application/x-msmetafile[^"']+},
+              "data:application/x-msmetafile")))
         .to be_equivalent_to xmlpp(presxml
-        .gsub( %r{data:application/x-msmetafile[^"']+}, 'data:application/x-msmetafile'))
+        .gsub(%r{data:application/x-msmetafile[^"']+},
+              "data:application/x-msmetafile"))
       expect(xmlpp(strip_guid(IsoDoc::WordConvert.new({})
         .convert("test", presxml, true)
         .gsub(/['"][^'".]+(?<!odf1)(?<!odf)\.svg['"]/, "'_.svg'")
@@ -2521,8 +2528,7 @@ RSpec.describe IsoDoc do
       .convert("test", input, true))
       .sub(%r{<localized-strings>.*</localized-strings>}m, "")
       .gsub(%r{"\.\\}, '"./')
-      .gsub(%r{'\.\\}, "'./")
-      )
+      .gsub(%r{'\.\\}, "'./"))
       .to be_equivalent_to xmlpp(output)
   end