isodoc 2.0.8 → 2.1.0

data/lib/isodoc/word_function/table.rb

@@ -2,8 +2,8 @@ module IsoDoc::WordFunction
   module Body
     def remove_bottom_border(td)
       td["style"] =
-        td["style"].gsub(/border-bottom:[^;]+;/, "border-bottom:0pt;").
-        gsub(/mso-border-bottom-alt:[^;]+;/, "mso-border-bottom-alt:0pt;")
+        td["style"].gsub(/border-bottom:[^;]+;/, "border-bottom:0pt;")
+          .gsub(/mso-border-bottom-alt:[^;]+;/, "mso-border-bottom-alt:0pt;")
     end
 
     SW1 = "solid windowtext".freeze
@@ -15,7 +15,7 @@ module IsoDoc::WordFunction
         cols += (td["colspan"] ? td["colspan"].to_i : 1)
       end
       style = "border-top:0pt;mso-border-top-alt:0pt;"\
-        "border-bottom:#{SW1} 1.5pt;mso-border-bottom-alt:#{SW1} 1.5pt;"
+              "border-bottom:#{SW1} 1.5pt;mso-border-bottom-alt:#{SW1} 1.5pt;"
       tfoot.add_child("<tr><td colspan='#{cols}' style='#{style}'/></tr>")
       tfoot.xpath(".//td").last
     end
@@ -34,13 +34,15 @@ module IsoDoc::WordFunction
     end
 
     def table_attrs(node)
-      super.merge(attr_code({
-        summary: node["summary"],
-        width: node["width"],
-        style: "mso-table-anchor-horizontal:column;"\
-        "mso-table-overlap:never;border-spacing:0;border-width:1px;#{keep_style(node)}",
-        class: (node.text.length > 4000 ? "MsoISOTableBig" : "MsoISOTable")
-      }))
+      super.merge(attr_code(
+                    {
+                      summary: node["summary"],
+                      width: node["width"],
+                      style: "mso-table-anchor-horizontal:column;"\
+                             "mso-table-overlap:never;border-spacing:0;border-width:1px;#{keep_style(node)}",
+                      class: (node.text.length > 4000 ? "MsoISOTableBig" : "MsoISOTable"),
+                    },
+                  ))
     end
 
     def colgroup(node, t)

data/lib/isodoc/xref/xref_anchor.rb

@@ -3,7 +3,7 @@ require "singleton"
 module IsoDoc
   module XrefGen
     module Anchor
-      class Seen_Anchor
+      class SeenAnchor
         include Singleton
 
         def initialize

data/lib/isodoc/xref/xref_counter.rb

@@ -4,6 +4,7 @@ module IsoDoc
   module XrefGen
     class Counter
       def initialize(num = 0, opts = { numerals: :arabic })
+        @unnumbered = false
         @num = num
         @letter = ""
         @subseq = ""
@@ -112,7 +113,7 @@ module IsoDoc
       end
 
       def increment(node)
-        return self if node["unnumbered"]
+        @unnumbered = (node["unnumbered"] || node["hidden"]) and return self
 
         @letter_override = nil
         @number_override = nil
@@ -126,6 +127,8 @@ module IsoDoc
       end
 
       def print
+        return nil if @unnumbered
+
         num = @number_override || @num
         out = @style == :roman && !num.nil? ? RomanNumerals.to_roman(num) : num
         "#{@base}#{out}#{@letter_override || @letter}"

data/lib/isodoc/xref/xref_gen_seq.rb

@@ -25,11 +25,11 @@ module IsoDoc
         j = 0
         clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]"))
           .each do |t|
-          # next if labelled_ancestor(t) && t.ancestors("figure").empty?
+          next if blank?(t["id"])
 
           j = subfigure_increment(j, c, t)
-          label = c.print + (j.zero? ? "" : "-#{j}")
-          next if t["id"].nil? || t["id"].empty?
+          label = c.print
+          label &&= label + (j.zero? ? "" : "-#{j}")
 
           @anchors[t["id"]] = anchor_struct(
             label, nil, @labels["figure"], "figure", t["unnumbered"]

data/lib/isodoc/xref/xref_sect_gen.rb

@@ -2,14 +2,16 @@ module IsoDoc
   module XrefGen
     module Sections
       def back_anchor_names(docxml)
-        i = Counter.new("@")
-        docxml.xpath(ns("//annex")).each do |c|
-          annex_names(c, i.increment(c).print)
-        end
-        docxml.xpath(ns(@klass.bibliography_xpath)).each do |b|
-          preface_names(b)
+        if @parse_settings.empty? || @parse_settings[:clauses]
+          i = Counter.new("@")
+          docxml.xpath(ns("//annex")).each do |c|
+            annex_names(c, i.increment(c).print)
+          end
+          docxml.xpath(ns(@klass.bibliography_xpath)).each do |b|
+            preface_names(b)
+          end
         end
-        references(docxml)
+        references(docxml) if @parse_settings.empty? || @parse_settings[:refs]
       end
 
       def references(docxml)
@@ -19,21 +21,25 @@ module IsoDoc
       end
 
       def initial_anchor_names(doc)
-        doc.xpath(ns("//preface/*")).each do |c|
-          c.element? and preface_names(c)
+        if @parse_settings.empty? || @parse_settings[:clauses]
+          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)
+        end
+        if @parse_settings.empty?
+          middle_section_asset_names(doc)
+          termnote_anchor_names(doc)
+          termexample_anchor_names(doc)
         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
 
       def preface_clause_name(clause)
@@ -112,26 +118,18 @@ module IsoDoc
         l10n("<strong>#{title} #{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 annex_name_anchors(clause, num)
         { label: annex_name_lbl(clause, num),
-          elem: @labels["annex"],
-          type: "clause", value: num.to_s, level: 1,
+          elem: @labels["annex"], type: "clause",
+          subtype: "annex", value: num.to_s, level: 1,
           xref: "#{@labels['annex']} #{num}" }
       end
 
       def annex_names(clause, num)
         @anchors[clause["id"]] = annex_name_anchors(clause, num)
-        if a = single_annex_special_section(clause)
-          annex_names1(a, num.to_s, 1)
+        if @klass.single_term_clause?(clause)
+          annex_names1(clause.at(ns("./references | ./terms | ./definitions")),
+                       num.to_s, 1)
         else
           i = Counter.new
           clause.xpath(ns(SUBCLAUSES)).each do |c|
@@ -143,8 +141,8 @@ module IsoDoc
 
       def annex_names1(clause, num, level)
         @anchors[clause["id"]] = { xref: "#{@labels['annex']} #{num}",
-                                   elem: @labels["annex"],
-                                   label: num, level: level, type: "clause" }
+                                   elem: @labels["annex"], type: "clause",
+                                   label: num, level: level, subtype: "annex" }
         i = Counter.new
         clause.xpath(ns(SUBCLAUSES)).each do |c|
           annex_names1(c, "#{num}.#{i.increment(c).print}", level + 1)

data/lib/isodoc/xref.rb

@@ -24,17 +24,25 @@ module IsoDoc
       @i18n = i18n
       @labels = @i18n.get
       @klass.i18n = @i18n
+      @parse_settings = {}
     end
 
     def get
       @anchors
     end
 
+    # parse only the elements set, if any are set
+    # defined are: clause: true, refs: true
+    def parse_inclusions(options)
+      @parse_settings.merge!(options)
+      self
+    end
+
     def anchor(ident, lbl, warning = true)
       return nil if ident.nil? || ident.empty?
 
       if warning && !@anchors[ident]
-        @seen ||= Seen_Anchor.instance
+        @seen ||= SeenAnchor.instance
         @seen.seen(ident) or warn "No label has been processed for ID #{ident}"
         @seen.add(ident)
         return "[#{ident}]"
@@ -44,16 +52,19 @@ module IsoDoc
 
     # extract names for all anchors, xref and label
     def parse(docxml)
-      amend_preprocess(docxml)
+      amend_preprocess(docxml) if  @parse_settings.empty?
       initial_anchor_names(docxml)
       back_anchor_names(docxml)
       # preempt clause notes with all other types of note (ISO default)
-      note_anchor_names(docxml.xpath(ns("//table | //figure")))
-      note_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
-      example_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
-      list_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
-      deflist_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
-      bookmark_anchor_names(docxml)
+      if @parse_settings.empty?
+        note_anchor_names(docxml.xpath(ns("//table | //figure")))
+        note_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
+        example_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
+        list_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
+        deflist_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
+        bookmark_anchor_names(docxml)
+      end
+      @parse_settings = {}
     end
 
     def ns(xpath)

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

@@ -38,6 +38,10 @@ chain_and: "%1 و %2"
 chain_or: "%1 او %2"
 chain_from: "%1 %من 2"
 chain_to: "من %1 إلى %2"
+ordinal_keys: [gender]
+SpelloutRules:
+  f: spellout-ordinal-feminine
+  m: spellout-ordinal-masculine
 note: ملاحظة
 note_xref: ملاحظة
 termnote: ملاحظة % للقيد
@@ -63,6 +67,9 @@ deprecated: مهمل
 source: مصدر
 and: و
 all_parts: كل الأجزاء
+edition_ordinal: "الطبعة؜ %Spellout؜"
+edition: الطبعة؜ ؜
+version: الإصدار
 toc_figures: جدول الأرقام
 toc_tables: جدول الجداول
 toc_recommendations: جدول التوصيات
@@ -180,3 +187,5 @@ inflection:
   صفحة:
     sg: صفحة
     pl: صفحات
+  الطبعة؜:
+    gender: f

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

@@ -40,6 +40,14 @@ chain_and: "%1 und %2"
 chain_or: "%1 oder %2"
 chain_from: "%1 von %2"
 chain_to: "%1 bis %2"
+ordinal_keys: [gender,number]
+SpelloutRules:
+  m.sg: spellout-ordinal-r
+  f.sg: spellout-ordinal
+  n.sg: spellout-ordinal-s
+  m.pl: spellout-ordinal
+  f.pl: spellout-ordinal
+  n.pl: spellout-ordinal
 note: HINWEIS
 note_xref: Hinweis
 termnote: Hinweis % zum Eintrag
@@ -65,6 +73,9 @@ deprecated: DEPRECATED
 source: QUELLE
 and: und
 all_parts: Alle Teile
+edition_ordinal: "%Spellout Auflage"
+edition: Auflage
+version: Version
 toc_figures: Abbildungsverzeichnis
 toc_tables: Tabellenverzeichnis
 toc_recommendations: Empfehlungenverzeichnis
@@ -182,3 +193,5 @@ inflection:
   Seite:
     sg: Seite
     pl: Seiten
+  Auflage:
+    gender: f

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

@@ -46,6 +46,8 @@ chain_and: "%1 and %2"
 chain_or: "%1 or %2"
 chain_from: "%1 from %2"
 chain_to: "%1 to %2"
+ordinal_keys: []
+SpelloutRules: spellout-ordinal
 note: NOTE
 note_xref: Note
 termnote: Note % to entry
@@ -71,6 +73,9 @@ deprecated: DEPRECATED
 source: SOURCE
 and: and
 all_parts: All Parts
+edition_ordinal: "%Spellout edition"
+edition: edition
+version: version
 toc_figures: List of figures
 toc_tables: List of tables
 toc_recommendations: List of recommendations

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

@@ -42,6 +42,12 @@ chain_and: "%1 y %2"
 chain_or: "%1 o %2"
 chain_from: "%1 del %2"
 chain_to: "%1 al %2"
+ordinal_keys: [gender,number]
+SpelloutRules:
+  m.sg: spellout-ordinal-masculine
+  f.sg: spellout-ordinal-feminine
+  m.pl: spellout-ordinal-masculine-plural
+  f.pl: spellout-ordinal-feminine-plural
 note: NOTA
 note_xref: Nota
 termnote: Nota % a la entrada
@@ -67,6 +73,9 @@ deprecated: OBSOLETO
 source: FUENTE
 and: y
 all_parts: Todas las partes
+edition_ordinal: "%Spellout edición"
+edition: edición
+version: versión
 toc_figures: Table de figuras
 toc_tables: Tabla de tablas
 toc_recommendations: Tabla de recomendaciones
@@ -184,3 +193,5 @@ inflection:
   Página:
     sg: Página
     pl: Páginas
+  edición:
+    gender: f

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

@@ -39,6 +39,12 @@ chain_and: "%1 et %2"
 chain_or: "%1 ou %2"
 chain_from: "%1 de %2"
 chain_to: "%1 à %2"
+ordinal_keys: [gender,number]
+SpelloutRules:
+  m.sg: spellout-ordinal-masculine
+  f.sg: spellout-ordinal-feminine
+  m.pl: spellout-ordinal-masculine-plural
+  f.pl: spellout-ordinal-feminine-plural
 note: NOTE
 note_xref: Note
 termnote: Note % à l’article
@@ -62,8 +68,12 @@ norm_annex: normative
 modified: modifié
 deprecated: DÉCONSEILLÉ
 source: SOURCE
+edition: édition
+version: version
 and: et
 all_parts: toutes les parties
+edition_ordinal: "%Spellout édition"
+edition: édition
 toc_figures: Table des figures
 toc_tables: Table des tableaux
 toc_recommendations: Table de recommandations
@@ -181,4 +191,5 @@ inflection:
   Page:
     sg: Page
     pl: Pages
-
+  édition:
+    gender: f

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

@@ -45,6 +45,14 @@ chain_and: "%1 и %2"
 chain_or: "%1 или %2"
 chain_from: "%1 от %2"
 chain_to: "%1 до %2"
+ordinal_keys: [gender,number]
+SpelloutRules:
+  m.sg: spellout-ordinal-masculine
+  f.sg: spellout-ordinal-feminine
+  n.sg: spellout-ordinal-neuter
+  m.pl: spellout-ordinal-plural
+  f.pl: spellout-ordinal-plural
+  n.pl: spellout-ordinal-plural
 note: ПРИМЕЧАНИЕ
 note_xref: Примечание
 termnote: Примечание % к определению
@@ -70,6 +78,9 @@ deprecated: НЕ РЕКОМЕНДУЕТСЯ
 source: ИСТОЧНИК
 and: и
 all_parts: Все части
+edition_ordinal: "%Spellout издание"
+edition: издание
+version: версия
 toc_figures: Таблица фигур
 toc_tables: Таблица таблиц
 toc_recommendations: Таблица рекомендаций
@@ -187,3 +198,5 @@ inflection:
   "Стр.":
     sg: Стр.
     pl: Стр.
+  издание:
+    gender: n

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

@@ -41,6 +41,8 @@ chain_and: "%1和%2"
 chain_or: "%1或%2"
 chain_from: "%1从%2"
 chain_to: "%1到%2"
+ordinal_keys: []
+SpelloutRules: spellout-ordinal
 note: 注
 note_xref: 注
 termnote: 注%
@@ -66,6 +68,9 @@ deprecated: 被取代
 source: 定义
 and: 和
 all_parts: 所有部分
+edition_ordinal: "第%Spellout版"
+edition: 版
+version: 版本
 toc_figures: 数字列表
 toc_tables: 表列表
 toc_recommendations: 建议清单

data/lib/relaton/render/config.yml

@@ -0,0 +1,4 @@
+template:
+  # skip standardidentifier, it is inserted in front of formattedref within metanorma
+  standard: "{{ creatornames }} ({{ role}}) . <em>{{ title }}</em> . {{ labels['in'] | capitalize }}:_{{ series_title }}. {{ medium | capitalize }}. {{ edition | capitalize_first }}. {{date}}. {{place}} : {%if  creatornames == publisher %}{% else %}{{publisher}}{% endif %} . {{size}}. {{ extent }}. {{ uri }}. {{ labels['at'] | capitalize}}:_{{ access_location }}. [{{ labels['viewed'] }}:_{{date_accessed}}]."
+

data/lib/relaton/render/general.rb

@@ -0,0 +1,35 @@
+require "relaton-render"
+
+module Relaton
+  module Render
+    module IsoDoc
+      class General < ::Relaton::Render::General
+        def config_loc
+          YAML.load_file(File.join(File.dirname(__FILE__), "config.yml"))
+        end
+
+        def read_config
+          super.deep_merge(config_loc)
+        end
+      end
+    end
+  end
+end
+
+class ::Hash
+  def deep_merge(second)
+    merger = proc { |_, v1, v2|
+      if Hash === v1 && Hash === v2
+        v1.merge(v2, &merger)
+      elsif Array === v1 && Array === v2
+        v1 | v2
+      elsif [:undefined, nil,
+             :nil].include?(v2)
+        v1
+      else
+        v2
+      end
+    }
+    merge(second.to_h, &merger)
+  end
+end

data/spec/assets/i18n.yaml

@@ -33,3 +33,9 @@ array:
     - elem2
     - {elem3: elem4, elem5: elem6}
 void:
+ordinal_keys: [number]
+SpelloutRules: 
+  sg: spellout-ordinal
+  pl: spellout-ordinal
+edition_ordinal: "eldono %Spellout"
+edition: eldono