isodoc 1.8.1 → 1.8.3

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -1,181 +1,192 @@
-module IsoDoc::XrefGen
-  module Blocks
-    def hiersep
-      "."
-    end
-
-    def hierfigsep
-      "-"
-    end
+require_relative "../function/utils"
 
-    def subfigure_increment(idx, counter, elem)
-      if elem.parent.name == "figure" then idx += 1
-      else
-        idx = 0
-        counter.increment(elem)
+module IsoDoc
+  module XrefGen
+    module Blocks
+      def hiersep
+        "."
       end
-      idx
-    end
-
-    def sequential_figure_names(clause)
-      c = Counter.new
-      j = 0
-      clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]"))
-        .each do |t|
-        j = subfigure_increment(j, c, t)
-        label = c.print + (j.zero? ? "" : "-#{j}")
-        next if t["id"].nil? || t["id"].empty?
 
-        @anchors[t["id"]] = anchor_struct(
-          label, nil, @labels["figure"], "figure", t["unnumbered"]
-        )
+      def hierfigsep
+        "-"
       end
-    end
-
-    def sequential_table_names(clause)
-      c = Counter.new
-      clause.xpath(ns(".//table")).reject { |n| blank?(n["id"]) }.each do |t|
 
-        @anchors[t["id"]] = anchor_struct(
-          c.increment(t).print, nil,
-          @labels["table"], "table", t["unnumbered"]
-        )
+      def subfigure_increment(idx, counter, elem)
+        if elem.parent.name == "figure" then idx += 1
+        else
+          idx = 0
+          counter.increment(elem)
+        end
+        idx
       end
-    end
 
-    def sequential_formula_names(clause)
-      c = Counter.new
-      clause.xpath(ns(".//formula")).reject { |n| blank?(n["id"]) }.each do |t|
-
-        @anchors[t["id"]] = anchor_struct(
-          c.increment(t).print, t,
-          t["inequality"] ? @labels["inequality"] : @labels["formula"],
-          "formula", t["unnumbered"]
-        )
+      def sequential_figure_names(clause)
+        c = Counter.new
+        j = 0
+        clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]"))
+          .each do |t|
+          next if labelled_ancestor(t) && t.ancestors("figure").empty?
+
+          j = subfigure_increment(j, c, t)
+          label = c.print + (j.zero? ? "" : "-#{j}")
+          next if t["id"].nil? || t["id"].empty?
+
+          @anchors[t["id"]] = anchor_struct(
+            label, nil, @labels["figure"], "figure", t["unnumbered"]
+          )
+        end
       end
-    end
 
-    FIRST_LVL_REQ = "[not(ancestor::permission or ancestor::requirement or "\
-      "ancestor::recommendation)]".freeze
+      def sequential_table_names(clause)
+        c = Counter.new
+        clause.xpath(ns(".//table")).reject { |n| blank?(n["id"]) }.each do |t|
+          next if labelled_ancestor(t)
 
-    def sequential_permission_names(clause, klass, label)
-      c = Counter.new
-      clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}"))
-        .reject { |n| blank?(n["id"]) }.each do |t|
-
-        id = c.increment(t).print
-        @anchors[t["id"]] = anchor_struct(id, t, label, klass, t["unnumbered"])
-        sequential_permission_names2(t, id)
+          @anchors[t["id"]] = anchor_struct(
+            c.increment(t).print, nil,
+            @labels["table"], "table", t["unnumbered"]
+          )
+        end
       end
-    end
-
-    def sequential_permission_names2(elem, ident)
-      sequential_permission_names1(elem, ident, "permission",
-                                   @labels["permission"])
-      sequential_permission_names1(elem, ident, "requirement",
-                                   @labels["requirement"])
-      sequential_permission_names1(elem, ident, "recommendation",
-                                   @labels["recommendation"])
-    end
-
-    def sequential_permission_names1(block, lbl, klass, label)
-      c = Counter.new
-      block.xpath(ns("./#{klass}")).reject { |n| blank?(n["id"]) }.each do |t|
 
-        id = "#{lbl}#{hierfigsep}#{c.increment(t).print}"
-        @anchors[t["id"]] = anchor_struct(id, t, label, klass, t["unnumbered"])
-        sequential_permission_names2(t, id)
+      def sequential_formula_names(clause)
+        c = Counter.new
+        clause.xpath(ns(".//formula")).reject do |n|
+          blank?(n["id"])
+        end.each do |t|
+          @anchors[t["id"]] = anchor_struct(
+            c.increment(t).print, t,
+            t["inequality"] ? @labels["inequality"] : @labels["formula"],
+            "formula", t["unnumbered"]
+          )
+        end
       end
-    end
-
-    def sequential_asset_names(clause)
-      sequential_table_names(clause)
-      sequential_figure_names(clause)
-      sequential_formula_names(clause)
-      sequential_permission_names(clause, "permission", @labels["permission"])
-      sequential_permission_names(clause, "requirement", @labels["requirement"])
-      sequential_permission_names(clause, "recommendation",
-                                  @labels["recommendation"])
-    end
-
-    def hierarchical_figure_names(clause, num)
-      c = Counter.new
-      j = 0
-      clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]"))
-        .each do |t|
-        j = subfigure_increment(j, c, t)
-        label = "#{num}#{hiersep}#{c.print}" +
-          (j.zero? ? "" : "#{hierfigsep}#{j}")
-        next if t["id"].nil? || t["id"].empty?
 
-        @anchors[t["id"]] = anchor_struct(label, nil, @labels["figure"],
-                                          "figure", t["unnumbered"])
+      FIRST_LVL_REQ = "[not(ancestor::permission or ancestor::requirement or "\
+                      "ancestor::recommendation)]".freeze
+
+      def sequential_permission_names(clause, klass, label)
+        c = Counter.new
+        clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}"))
+          .reject { |n| blank?(n["id"]) }.each do |t|
+          id = c.increment(t).print
+          @anchors[t["id"]] =
+            anchor_struct(id, t, label, klass, t["unnumbered"])
+          sequential_permission_names2(t, id)
+        end
       end
-    end
 
-    def hierarchical_table_names(clause, num)
-      c = Counter.new
-      clause.xpath(ns(".//table")).reject { |n| blank?(n["id"]) }.each do |t|
+      def sequential_permission_names2(elem, ident)
+        sequential_permission_names1(elem, ident, "permission",
+                                     @labels["permission"])
+        sequential_permission_names1(elem, ident, "requirement",
+                                     @labels["requirement"])
+        sequential_permission_names1(elem, ident, "recommendation",
+                                     @labels["recommendation"])
+      end
 
-        @anchors[t["id"]] =
-          anchor_struct("#{num}#{hiersep}#{c.increment(t).print}",
-                        nil, @labels["table"], "table", t["unnumbered"])
+      def sequential_permission_names1(block, lbl, klass, label)
+        c = Counter.new
+        block.xpath(ns("./#{klass}")).reject { |n| blank?(n["id"]) }.each do |t|
+          id = "#{lbl}#{hierfigsep}#{c.increment(t).print}"
+          @anchors[t["id"]] =
+            anchor_struct(id, t, label, klass, t["unnumbered"])
+          sequential_permission_names2(t, id)
+        end
       end
-    end
 
-    def hierarchical_asset_names(clause, num)
-      hierarchical_table_names(clause, num)
-      hierarchical_figure_names(clause, num)
-      hierarchical_formula_names(clause, num)
-      hierarchical_permission_names(clause, num, "permission",
-                                    @labels["permission"])
-      hierarchical_permission_names(clause, num, "requirement",
+      def sequential_asset_names(clause)
+        sequential_table_names(clause)
+        sequential_figure_names(clause)
+        sequential_formula_names(clause)
+        sequential_permission_names(clause, "permission", @labels["permission"])
+        sequential_permission_names(clause, "requirement",
                                     @labels["requirement"])
-      hierarchical_permission_names(clause, num, "recommendation",
+        sequential_permission_names(clause, "recommendation",
                                     @labels["recommendation"])
-    end
+      end
+
+      def hierarchical_figure_names(clause, num)
+        c = Counter.new
+        j = 0
+        clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]"))
+          .each do |t|
+          next if labelled_ancestor(t) && t.ancestors("figure").empty?
+
+          j = subfigure_increment(j, c, t)
+          label = "#{num}#{hiersep}#{c.print}" +
+            (j.zero? ? "" : "#{hierfigsep}#{j}")
+          next if t["id"].nil? || t["id"].empty?
+
+          @anchors[t["id"]] = anchor_struct(label, nil, @labels["figure"],
+                                            "figure", t["unnumbered"])
+        end
+      end
 
-    def hierarchical_formula_names(clause, num)
-      c = Counter.new
-      clause.xpath(ns(".//formula")).reject { |n| blank?(n["id"]) }.each do |t|
+      def hierarchical_table_names(clause, num)
+        c = Counter.new
+        clause.xpath(ns(".//table")).reject { |n| blank?(n["id"]) }.each do |t|
+          next if labelled_ancestor(t)
 
-        @anchors[t["id"]] = anchor_struct(
-          "#{num}#{hiersep}#{c.increment(t).print}", nil,
-          t["inequality"] ? @labels["inequality"] : @labels["formula"],
-          "formula", t["unnumbered"]
-        )
+          @anchors[t["id"]] =
+            anchor_struct("#{num}#{hiersep}#{c.increment(t).print}",
+                          nil, @labels["table"], "table", t["unnumbered"])
+        end
       end
-    end
 
-    def hierarchical_permission_names(clause, num, klass, label)
-      c = Counter.new
-      clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}"))
-        .reject { |n| blank?(n["id"]) }.each do |t|
+      def hierarchical_asset_names(clause, num)
+        hierarchical_table_names(clause, num)
+        hierarchical_figure_names(clause, num)
+        hierarchical_formula_names(clause, num)
+        hierarchical_permission_names(clause, num, "permission",
+                                      @labels["permission"])
+        hierarchical_permission_names(clause, num, "requirement",
+                                      @labels["requirement"])
+        hierarchical_permission_names(clause, num, "recommendation",
+                                      @labels["recommendation"])
+      end
 
-        id = "#{num}#{hiersep}#{c.increment(t).print}"
-        @anchors[t["id"]] =
-          anchor_struct(id, nil, label, klass, t["unnumbered"])
-        hierarchical_permission_names2(t, id)
+      def hierarchical_formula_names(clause, num)
+        c = Counter.new
+        clause.xpath(ns(".//formula")).reject do |n|
+          blank?(n["id"])
+        end.each do |t|
+          @anchors[t["id"]] = anchor_struct(
+            "#{num}#{hiersep}#{c.increment(t).print}", nil,
+            t["inequality"] ? @labels["inequality"] : @labels["formula"],
+            "formula", t["unnumbered"]
+          )
+        end
       end
-    end
 
-    def hierarchical_permission_names2(elem, ident)
-      hierarchical_permission_names1(elem, ident, "permission",
-                                     @labels["permission"])
-      hierarchical_permission_names1(elem, ident, "requirement",
-                                     @labels["requirement"])
-      hierarchical_permission_names1(elem, ident, "recommendation",
-                                     @labels["recommendation"])
-    end
+      def hierarchical_permission_names(clause, num, klass, label)
+        c = Counter.new
+        clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}"))
+          .reject { |n| blank?(n["id"]) }.each do |t|
+          id = "#{num}#{hiersep}#{c.increment(t).print}"
+          @anchors[t["id"]] =
+            anchor_struct(id, nil, label, klass, t["unnumbered"])
+          hierarchical_permission_names2(t, id)
+        end
+      end
 
-    def hierarchical_permission_names1(block, lbl, klass, label)
-      c = Counter.new
-      block.xpath(ns("./#{klass}")).reject { |n| blank?(n["id"]) }.each do |t|
+      def hierarchical_permission_names2(elem, ident)
+        hierarchical_permission_names1(elem, ident, "permission",
+                                       @labels["permission"])
+        hierarchical_permission_names1(elem, ident, "requirement",
+                                       @labels["requirement"])
+        hierarchical_permission_names1(elem, ident, "recommendation",
+                                       @labels["recommendation"])
+      end
 
-        id = "#{lbl}#{hierfigsep}#{c.increment(t).print}"
-        @anchors[t["id"]] =
-          anchor_struct(id, nil, label, klass, t["unnumbered"])
-        hierarchical_permission_names2(t, id)
+      def hierarchical_permission_names1(block, lbl, klass, label)
+        c = Counter.new
+        block.xpath(ns("./#{klass}")).reject { |n| blank?(n["id"]) }.each do |t|
+          id = "#{lbl}#{hierfigsep}#{c.increment(t).print}"
+          @anchors[t["id"]] =
+            anchor_struct(id, nil, label, klass, t["unnumbered"])
+          hierarchical_permission_names2(t, id)
+        end
       end
     end
   end

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -4,8 +4,7 @@ module IsoDoc
       def back_anchor_names(docxml)
         i = Counter.new("@")
         docxml.xpath(ns("//annex")).each do |c|
-          i.increment(c)
-          annex_names(c, i.print)
+          annex_names(c, i.increment(c).print)
         end
         docxml.xpath(ns(@klass.bibliography_xpath)).each do |b|
           preface_names(b)
@@ -86,8 +85,7 @@ module IsoDoc
             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)
+          section_names1(c, "#{num.print}.#{i.increment(c).print}", lvl + 1)
         end
         num
       end
@@ -98,8 +96,7 @@ module IsoDoc
             type: "clause" }
         i = Counter.new
         clause.xpath(ns(SUBCLAUSES)).each do |c|
-          i.increment(c)
-          section_names1(c, "#{num}.#{i.print}", level + 1)
+          section_names1(c, "#{num}.#{i.increment(c).print}", level + 1)
         end
       end
 
@@ -129,8 +126,7 @@ module IsoDoc
         else
           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.increment(c).print}", 2)
           end
         end
         hierarchical_asset_names(clause, num)
@@ -141,8 +137,7 @@ module IsoDoc
                                    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}", level + 1)
+          annex_names1(c, "#{num}.#{i.increment(c).print}", level + 1)
         end
       end
 

data/lib/isodoc/xref.rb

@@ -4,12 +4,14 @@ require_relative "xref/xref_gen_seq"
 require_relative "xref/xref_gen"
 require_relative "xref/xref_sect_gen"
 require_relative "class_utils"
+require_relative "function/utils"
 
 module IsoDoc
   class Xref
     include XrefGen::Anchor
     include XrefGen::Blocks
     include XrefGen::Sections
+    include Function::Utils
 
     attr_reader :klass
 

data/lib/isodoc/xslfo_convert.rb

@@ -8,9 +8,30 @@ module IsoDoc
     def initialize(options)
       @format = :pdf
       @suffix = "pdf"
+      @pdf_cmd_options = extract_cmd_options(options)
       super
     end
 
+    def extract_cmd_options(options)
+      ret = {}
+      a = options[:pdfencryptionlength] and ret["--encryption-length"] = a
+      a = options[:pdfownerpassword] and ret["--owner-password"] = a
+      a = options[:pdfuserpassword] and ret["--user-password"] = a
+      a = options[:pdfallowprint] and ret["--allow-print"] = a
+      a = options[:pdfallowcopycontent] and ret["--allow-copy-content"] = a
+      a = options[:pdfalloweditcontent] and ret["--allow-edit-content"] = a
+      a = options[:pdfalloweditannotations] and
+        ret["--allow-edit-annotations"] = a
+      a = options[:pdfallowfillinforms] and ret["--allow-fill-in-forms"] = a
+      a = options[:pdfallowaccesscontent] and
+        ret["--allow-access-content"] = a
+      a = options[:pdfallowassembledocument] and
+        ret["--allow-assemble-document"] = a
+      a = options[:pdfallowprinthq] and ret["--allow-print-hq"] = a
+      a = options[:pdfencryptmetadata] and ret["--encrypt-metadata"] = a
+      ret
+    end
+
     def tmpimagedir_suffix
       "_pdfimages"
     end
@@ -29,7 +50,7 @@ module IsoDoc
           @aligncrosselements.gsub(/,/, " ")
       @baseassetpath and
         ret["--param baseassetpath="] = @baseassetpath
-      ret
+      ret.merge(@pdf_cmd_options)
     end
 
     def convert(input_filename, file = nil, debug = false,
@@ -37,6 +58,7 @@ module IsoDoc
       file = File.read(input_filename, encoding: "utf-8") if file.nil?
       input_filename, docxml, filename = input_xml_path(input_filename,
                                                         file, debug)
+      warn pdf_options(docxml).merge(@options)
       ::Metanorma::Output::XslfoPdf.new.convert(
         input_filename,
         output_filename || "#{filename}.#{@suffix}",

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

@@ -94,6 +94,9 @@ grammar_abbrevs:
   feminine: مؤ
   neuter: محايد
   common: خنثى
+  singular: مفرد
+  dual: مزدوج
+  plural: جمع
   isPreposition: حرف جر
   isParticiple: النعت
   isAdjective: صفة

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

@@ -98,6 +98,9 @@ grammar_abbrevs:
   feminine: fem
   neuter: neutr
   common: gemein
+  singular: Sg
+  dual: Dual
+  plural: Pl
   isPreposition: Präp
   isParticiple: Part
   isAdjective: Adj

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

@@ -100,16 +100,19 @@ locality: {
                       formula: Formula
                     }
 grammar_abbrevs:
-  masculine: masc
-  feminine: fem
-  neuter: neut
+  masculine: m
+  feminine: f
+  neuter: n
   common: common
+  singular: sg
+  dual: dual
+  pl: pl
   isPreposition: prep
   isParticiple: part
   isAdjective: adj
   isAdverb: adv
-  isNoun: n
-  isVerb: v
+  isNoun: noun
+  isVerb: verb
 relatedterms:
   deprecates: deprecates
   supersedes: supersedes

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

@@ -100,6 +100,9 @@ grammar_abbrevs:
   feminine: fem
   neuter: neut
   common: epicen@
+  singular: sg
+  dual: dual
+  plural: pl
   isPreposition: prep
   isParticiple: part
   isAdjective: adj

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

@@ -97,6 +97,9 @@ grammar_abbrevs:
   feminine: fem
   neuter: neut
   common: épicène
+  singular: sg
+  dual: duel
+  plural: pl
   isPreposition: prép
   isParticiple: part
   isAdjective: adj

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

@@ -103,6 +103,9 @@ grammar_abbrevs:
   feminine: жен
   neuter: ср
   common: общего рода
+  singular: ед
+  dual: дв
+  plural: мн
   isPreposition: предл
   isParticiple: прич
   isAdjective: прил

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

@@ -98,6 +98,9 @@ grammar_abbrevs:
   feminine: 阴性
   neuter: 中性的
   common: 通性
+  singular: 单数
+  dual: 双
+  plural: 复数
   isPreposition: 介词
   isParticiple: 分词
   isAdjective: 形容词