isodoc 1.2.0 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d265dd427dc9c2951b63676d191d3dd6ff1c64cc08b78accfdd563ee88092bdf
-  data.tar.gz: 77eed20b4c98ce8e30c0f69d848978543cd507c1ca6cf338dbe8871ad8c7a022
+  metadata.gz: 1f76ecc765fd3176ab1e46bd2b91b2a1d5746554772047b7137581ecc54a1ab9
+  data.tar.gz: b98fe5eee6522b4d5992c4213f3180e1c95f92f358b0c56ff3a2b5f66973a900
 SHA512:
-  metadata.gz: cc72270b9610c9ce3e411e969308bbd47f6c9984afd80ff3dc926dc6eb5ffd9c4d596c93f4ccd0e9c349e8a5c58235c876b6dac8c648ae0be87148b881ac9e42
-  data.tar.gz: a039fada53654ad08f55315b8383224f095a141fc758ce50f70c03ccd4e4963cc2824a5433265fa1c90e1909c1e69569789f5c5ee052db491639bd0532c7a75f
+  metadata.gz: 1a2649fdf7365e2554c0e0bdec19aa0cf6e50fad624d4252dd99aa88d436b95b1ff24e823c6a0a9be4afa7e875921b11310e67595b308a9c81c8758b6e8cf302
+  data.tar.gz: d21cdae8851e757e999a54809868e15a8004fcc387afa78e79e60a4605df07108c454fc3c04e0a3e79f3a5c14af9ca8cdbbb855eca9fa47e254e3ff4a40d3ac4

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

@@ -1,6 +1,6 @@
 term_def_boilerplate: 
 scope: Domaine d'application
-symbolabbrev: Symboles et termes abrégés
+symbolsabbrev: Symboles et termes abrégés
 abbrev: Termes abrégés
 symbols: Symboles
 table_of_contents: Sommaire

data/lib/isodoc/base_style/metanorma_word.css

@@ -16,6 +16,12 @@ td {
 tr {
   page-break-after: avoid; }
 
+table.MsoISOTableBig tr {
+  page-break-inside: auto; }
+
+table.MsoISOTableBig td {
+  page-break-inside: auto; }
+
 span.stem {
   font-family: "Cambria Math",serif;
   mso-ascii-font-family: "Cambria Math";

data/lib/isodoc/base_style/metanorma_word.scss

@@ -13,6 +13,12 @@ table.MsoISOTable tr
 td { page-break-inside:avoid; }
 tr { page-break-after:avoid; }
 
+table.MsoISOTableBig tr
+    {page-break-inside:auto;}
+
+table.MsoISOTableBig td
+    {page-break-inside:auto;}
+
 span.stem
     {font-family:"Cambria Math",serif;
     mso-ascii-font-family:"Cambria Math";

data/lib/isodoc/convert.rb

@@ -6,7 +6,7 @@ require_relative "i18n"
 
 module IsoDoc
   class Convert < ::IsoDoc::Common
-    attr_reader :options
+    attr_accessor :options
     attr_accessor :i18n
 
     # htmlstylesheet: Generic stylesheet for HTML

data/lib/isodoc/function/blocks.rb

@@ -181,6 +181,7 @@ module IsoDoc::Function
     def quote_attribution(node, out)
       author = node.at(ns("./author"))
       source = node.at(ns("./source"))
+      return if author.nil? && source.nil?
       out.p **{ class: "QuoteAttribution" } do |p|
         p << "&mdash; #{author.text}" if author
         p << ", " if author && source

data/lib/isodoc/function/cleanup.rb

@@ -6,9 +6,9 @@ module IsoDoc::Function
 
     def termref_cleanup(docxml)
       docxml.
+        gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/, l10n(", #{@i18n.modified} [/TERMREF]")).
         gsub(%r{\s*\[/TERMREF\]\s*</p>\s*<p>\s*\[TERMREF\]}, "; ").
         gsub(/\[TERMREF\]\s*/, l10n("[#{@i18n.source}: ")).
-        gsub(/\s*\[MODIFICATION\]\s*\[\/TERMREF\]/, l10n(", #{@i18n.modified} [/TERMREF]")).
         gsub(%r{\s*\[\/TERMREF\]\s*}, l10n("]")).
         gsub(/\s*\[MODIFICATION\]/, l10n(", #{@i18n.modified} &mdash; "))
     end

data/lib/isodoc/function/references.rb

@@ -54,7 +54,8 @@ module IsoDoc::Function
     def bibitem_ref_code(b)
       id = b.at(ns("./docidentifier[@type = 'metanorma']"))
       id1 = pref_ref_code(b)
-      id2 = b.at(ns("./docidentifier[@type = 'DOI' or @type = 'ISSN' or @type = 'ISBN']")) 
+      id2 = b.at(ns("./docidentifier[@type = 'DOI' or @type = 'ISSN' or "\
+                    "@type = 'ISBN']")) 
       return [id, id1, id2] if id || id1 || id2
       id = Nokogiri::XML::Node.new("docidentifier", b.document)
       id << "(NO ID)"
@@ -193,7 +194,8 @@ module IsoDoc::Function
     def bibliography_parse(node, out)
       title = node&.at(ns("./title"))&.text || ""
       out.div do |div|
-        clause_parse_title(node, div, node.at(ns("./title")), out, { class: "Section3" })
+        clause_parse_title(node, div, node.at(ns("./title")), out,
+                           { class: "Section3" })
         biblio_list(node, div, true)
       end
     end

data/lib/isodoc/function/section.rb

@@ -182,7 +182,6 @@ module IsoDoc::Function
       page_break(out)
       out.div **attr_code(id: f["id"]) do |s|
         clause_name(nil, f.at(ns("./title")), s, { class: "AbstractTitle" })
-        #s.h1(**{ class: "AbstractTitle" }) { |h1| h1 << @i18n.abstract }
         f.elements.each { |e| parse(e, s) unless e.name == "title" }
       end
     end
@@ -201,6 +200,19 @@ module IsoDoc::Function
       end
     end
 
+    def is_clause?(name)
+      %w(clause references definitions terms foreword introduction abstract
+      acknowledgements).include? name
+    end
+
+    def preface_block(isoxml, out)
+      p = isoxml.at(ns("//preface")) or return
+      p.elements.each do |e|
+        next if is_clause?(e.name)
+        parse(e, out)
+      end
+    end
+
     def copyright_parse(node, out)
       out.div **{class: "boilerplate-copyright"} do |div|
         node.children.each { |n| parse(n, div) }

data/lib/isodoc/function/table.rb

@@ -82,6 +82,7 @@ module IsoDoc::Function
     def make_tr_attr(td, row, totalrows, header)
       style = td.name == "th" ? "font-weight:bold;" : ""
       td["align"] and style += "text-align:#{td['align']};"
+      td["valign"] and style += "vertical-align:#{td['valign']};"
       rowmax = td["rowspan"] ? row + td["rowspan"].to_i - 1 : row
       style += <<~STYLE
         border-top:#{row.zero? ? "#{SW} 1.5pt;" : 'none;'}

data/lib/isodoc/function/to_word_html.rb

@@ -80,6 +80,7 @@ module IsoDoc::Function
     def make_body3(body, docxml)
       body.div **{ class: "main-section" } do |div3|
         boilerplate docxml, div3
+        preface_block docxml, div3
         abstract docxml, div3
         foreword docxml, div3
         introduction docxml, div3
@@ -220,6 +221,7 @@ module IsoDoc::Function
         when "feedback-statement" then feedback_parse(node, out)
         when "passthrough" then passthrough_parse(node, out)
         when "variant" then variant_parse(node, out)
+        when "amend" then amend_parse(node, out)
         when "tab" then clausedelimspace(out) # in Presentation XML only
         else
           error_parse(node, out)

data/lib/isodoc/function/utils.rb

@@ -154,7 +154,7 @@ module IsoDoc::Function
              .get
              .merge(@labels || {})
              .merge(@meta.labels || {})
-             .merge(@meta.fonts_options || {})
+             .merge(fonts_options || {})
       template = liquid(docxml)
       template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h)
               .gsub('<', '<').gsub('>', '>').gsub('&', '&')
@@ -184,7 +184,7 @@ module IsoDoc::Function
 
     def labelled_ancestor(node)
       !node.ancestors('example, requirement, recommendation, permission, '\
-                             'table, figure, sourcecode').empty?
+                             'note, table, figure, sourcecode').empty?
     end
   end
 end

data/lib/isodoc/html_function/html.rb

@@ -31,6 +31,7 @@ module IsoDoc::HtmlFunction
     def make_body3(body, docxml)
       body.div **{ class: "main-section" } do |div3|
         boilerplate docxml, div3
+        preface_block docxml, div3
         abstract docxml, div3
         foreword docxml, div3
         introduction docxml, div3

data/lib/isodoc/i18n.rb

@@ -1,6 +1,5 @@
 require "yaml"
 
-# TODO: Cleanup and generalize
 module IsoDoc
   class I18n
     def load_yaml(lang, script, i18nyaml = nil)

data/lib/isodoc/metadata.rb

@@ -98,8 +98,9 @@ module IsoDoc
 
     def doctype(isoxml, _out)
       b = isoxml&.at(ns('//bibdata/ext/doctype'))&.text || return
-      t = b.split(/[- ]/).map(&:capitalize).join(' ')
-      set(:doctype, t)
+      set(:doctype, status_print(b))
+      b = isoxml&.at(ns('//local_bibdata/ext/doctype'))&.text || return
+      set(:doctype_display, status_print(b))
     end
 
     def iso?(org)
@@ -135,9 +136,14 @@ module IsoDoc
       docstatus = isoxml.at(ns('//bibdata/status/stage'))
       set(:unpublished, true)
       if docstatus
+        docstatus_local = isoxml.at(ns('//local_bibdata/status/stage'))
         set(:stage, status_print(docstatus.text))
+        docstatus_local and
+          set(:stage_display, status_print(docstatus_local.text))
         (i = isoxml&.at(ns('//bibdata/status/substage'))&.text) &&
           set(:substage, i)
+        (i = isoxml&.at(ns('//local_bibdata/status/substage'))&.text) &&
+          set(:substage_display, i)
         (i = isoxml&.at(ns('//bibdata/status/iteration'))&.text) &&
           set(:iteration, i)
         set(:unpublished, unpublished(docstatus.text))
@@ -148,7 +154,7 @@ module IsoDoc
 
     def stage_abbr(docstatus)
       status_print(docstatus).split(/ /)
-                             .map { |s| s[0].upcase }.join('')
+        .map { |s| s[0].upcase }.join('')
     end
 
     def unpublished(status)
@@ -156,7 +162,7 @@ module IsoDoc
     end
 
     def status_print(status)
-      status.split(/-/).map(&:capitalize).join(' ')
+      status.split(/[- ]/).map(&:capitalize).join(' ')
     end
 
     def docid(isoxml, _out)

data/lib/isodoc/presentation_function/bibdata.rb

@@ -0,0 +1,24 @@
+module IsoDoc
+  class PresentationXMLConvert < ::IsoDoc::Convert
+    def bibdata(docxml)
+      a = docxml.at(ns("//bibdata")) or return
+      b = a.dup
+      b.name = "local_bibdata"
+      bibdata_i18n(b)
+      a.next = b
+    end
+
+    def bibdata_i18n(b)
+      hash_translate(b, @i18n.get["doctype_dict"], "./ext/doctype")
+      hash_translate(b, @i18n.get["stage_dict"], "./status/stage")
+      hash_translate(b, @i18n.get["substage_dict"], "./status/substage")
+    end
+
+    def hash_translate(bibdata, hash, xpath)
+      hash.is_a? Hash or return
+      x = bibdata.at(ns(xpath)) or return
+      hash[x.text] or return
+      x.children = hash[x.text]
+    end
+  end
+end

data/lib/isodoc/presentation_function/block.rb

@@ -134,5 +134,19 @@ module IsoDoc
       n = @xrefs.anchor(f['id'], :label, false)
       prefix_name(f, " — ", l10n("#{@i18n.table} #{n}"), "name")
     end
+
+    # we use this to eliminate the semantic amend blocks from rendering
+    def amend(docxml)
+      docxml.xpath(ns("//amend")).each do |f|
+        amend1(f)
+      end
+    end
+
+    def amend1(f)
+      f.xpath(ns("./autonumber")).each { |a| a.remove }
+      f.xpath(ns("./newcontent")).each { |a| a.name = "quote" }
+      f.xpath(ns("./description")).each { |a| a.replace(a.children) }
+      f.replace(f.children)
+    end
   end
 end

data/lib/isodoc/presentation_function/inline.rb

@@ -7,17 +7,25 @@ module IsoDoc
     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) || "???"
       elsif node["target"] && !/.#./.match(node["target"])
-        linkend = @xrefs.anchor(node["target"], :xref)
-        container = @xrefs.anchor(node["target"], :container, false)
-        (container && get_note_container_id(node) != container &&
-         @xrefs.get[node["target"]]) &&
-        linkend = prefix_container(container, linkend, node["target"])
-        linkend = capitalise_xref(node, linkend)
+        linkend = anchor_linkend1(node)
       end
       linkend || "???"
     end
 
+    def anchor_linkend1(node)
+      linkend = @xrefs.anchor(node["target"], :xref)
+      container = @xrefs.anchor(node["target"], :container, false)
+      (container && get_note_container_id(node) != container &&
+       @xrefs.get[node["target"]]) &&
+      linkend = prefix_container(container, linkend, node["target"])
+      capitalise_xref(node, linkend)
+    end
+
     def capitalise_xref(node, linkend)
       return linkend unless %w(Latn Cyrl Grek).include? @script
       return linkend&.capitalize if node["case"] == "capital"
@@ -59,14 +67,19 @@ module IsoDoc
       refs.each_with_index do |r, i|
         delim = ","
         delim = ";" if r.name == "localityStack" && i>0
-        if r.name == "localityStack"
-          r.elements.each_with_index do |rr, j|
-            ret += eref_localities0(rr, j, target, delim)
-            delim = ","
-          end
-        else
-          ret += eref_localities0(r, i, target, delim)
+        ret = eref_locality_stack(r, i, target, delim, ret)
+      end
+      ret
+    end
+
+    def eref_locality_stack(r, i, target, delim, ret)
+      if r.name == "localityStack"
+        r.elements.each_with_index do |rr, j|
+          ret += eref_localities0(rr, j, target, delim)
+          delim = ","
         end
+      else
+        ret += eref_localities0(r, i, target, delim)
       end
       ret
     end
@@ -79,7 +92,7 @@ module IsoDoc
       end
     end
 
-     # TODO: move to localization file
+    # TODO: move to localization file
     def eref_localities1_zh(target, type, from, to, delim)
       ret = "#{delim} 第#{from.text}" if from
       ret += "–#{to.text}" if to

data/lib/isodoc/presentation_xml_convert.rb

@@ -1,6 +1,7 @@
 require_relative "presentation_function/block"
 require_relative "presentation_function/inline"
 require_relative "presentation_function/section"
+require_relative "presentation_function/bibdata"
 
 module IsoDoc
   class PresentationXMLConvert < ::IsoDoc::Convert
@@ -14,10 +15,12 @@ module IsoDoc
       @xrefs.parse docxml
       info docxml, nil
       conversions(docxml)
+      docxml.root["type"] = "presentation"
       docxml.to_xml
     end
 
     def conversions(docxml)
+      bibdata docxml
       section docxml
       block docxml
       inline docxml
@@ -30,6 +33,7 @@ module IsoDoc
     end
 
     def block(docxml)
+      amend docxml
       table docxml
       figure docxml
       sourcecode docxml

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.2.0".freeze
+  VERSION = "1.2.5".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -27,6 +27,7 @@ module IsoDoc::WordFunction
     def make_body2(body, docxml)
       body.div **{ class: "WordSection2" } do |div2|
         boilerplate docxml, div2
+        preface_block docxml, div2
         abstract docxml, div2
         foreword docxml, div2
         introduction docxml, div2

data/lib/isodoc/word_function/postprocess.rb

@@ -127,7 +127,7 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
     def list_add(xpath, lvl)
       xpath.each do |list|
         (list.xpath(".//li") - list.xpath(".//ol//li | .//ul//li")).each do |l|
-          l.xpath("./p | ./div").each_with_index do |p, i|
+          l.xpath("./p | ./div | ./table").each_with_index do |p, i|
             next if i == 0
             p.wrap(%{<div class="ListContLevel#{lvl}"/>})
           end

data/lib/isodoc/word_function/table.rb

@@ -29,7 +29,7 @@ module IsoDoc::WordFunction
         border-bottom:#{SW1} #{rowmax == totalrows ? '1.5' : '1.0'}pt;
         mso-border-bottom-alt:#{SW1} #{rowmax == totalrows ? '1.5' : '1.0'}pt;
       STYLE
-      { rowspan: td["rowspan"], colspan: td["colspan"],
+      { rowspan: td["rowspan"], colspan: td["colspan"], valign: td["valign"],
         align: td["align"], style: style.gsub(/\n/, "") }
     end
 
@@ -38,7 +38,8 @@ module IsoDoc::WordFunction
         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)}"
+        "mso-table-overlap:never;border-spacing:0;border-width:1px;#{keep_style(node)}",
+        class: (node.text.length > 4000 ? "MsoISOTableBig" : "MsoISOTable")
       }))
     end
 

data/lib/isodoc/xref.rb

@@ -41,6 +41,7 @@ module IsoDoc
 
     # extract names for all anchors, xref and label
     def parse(docxml)
+      amend_preprocess(docxml)
       initial_anchor_names(docxml)
       back_anchor_names(docxml)
       # preempt clause notes with all other types of note (ISO default)

data/lib/isodoc/xref/xref_anchor.rb

@@ -35,11 +35,15 @@ module IsoDoc::XrefGen
     end
 
     def anchor_struct_xref(lbl, elem)
+      l10n("#{elem} #{anchor_struct_value(lbl, elem)}")
+    end
+
+    def anchor_struct_value(lbl, elem)
       case elem
-      when @labels["formula"] then l10n("#{elem} (#{lbl})")
-      when @labels["inequality"] then l10n("#{elem} (#{lbl})")
+      when @labels["formula"] then "(#{lbl})"
+      when @labels["inequality"] then "(#{lbl})"
       else
-        l10n("#{elem} #{lbl}")
+        lbl
       end
     end
 
@@ -50,6 +54,7 @@ module IsoDoc::XrefGen
       ret[:xref].gsub!(/ $/, "")
       ret[:container] = @klass.get_clause_id(container) unless container.nil?
       ret[:type] = type
+      ret[:value] = anchor_struct_value(lbl, elem)
       ret
     end
   end