isodoc 1.0.20 → 1.0.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0713e025f733621ae715be8cbc85d8d0af3a03cc86331204dca8185f1d7eff67
-  data.tar.gz: b2f421c4a76ca3b70781604ff47de87962ea658ba13860651a9349160508efbe
+  metadata.gz: 6ced8fa4ff249bf78fce24da52269e4745261f432e59c7a18fddfaf4ecc01d8f
+  data.tar.gz: 39f693b7397daa3ad71af07fa7133ec086aab0f39a2e090e79537be6091736d7
 SHA512:
-  metadata.gz: 696c6c79ee5da9240f6ee1834267f7f540edd3512c7961c4e7c3a1e8f30804966225433d14a4d9a91608421a00dbd119a5ad983fb4c7498a716a602de432ae0e
-  data.tar.gz: f40f777f6566e4efdc8c7c65cd56003d1edfc04a27a33004223b679e5083e8af7a165117577c4a25188ff6d9dd2fd56ac35f5492abb67b2793445a8da7397e4a
+  metadata.gz: 9d2086e3ca34a2478c59550edb4a76371e4e8fa46c92fc5b988c35ff8efc25ddffa2674861eed07bcea3f7bbe352bf2cdeee69ff1a5b67d50bdd76291d3c2fda
+  data.tar.gz: e0228c717670ed147bdaa4f0300274d51d127c28029b7c004961e258567ec293eb145accf70993fde00cc21ab6c67bffc70d140eb987309c99545061f7b43b37

data/lib/isodoc/base_style/reset.scss

@@ -124,3 +124,6 @@ b, strong {
   font-weight: bold;
 }
 
+div.document-stage-band, div.document-type-band {
+  background-color: #FFFFFF;
+}

data/lib/isodoc/function/blocks.rb

@@ -1,3 +1,5 @@
+require_relative "blocks_example"
+
 module IsoDoc::Function
   module Blocks
     @annotation = false
@@ -51,7 +53,7 @@ module IsoDoc::Function
     end
 
     def figure_key(out)
-      out.p do |p|
+      out.p **{ style: "page-break-after:avoid;"} do |p|
         p.b { |b| b << @key_lbl }
       end
     end
@@ -80,56 +82,6 @@ module IsoDoc::Function
       @in_figure = false
     end
 
-    def example_label(node, div, name)
-      n = get_anchors[node["id"]]
-      div.p **{ class: "example-title" } do |p|
-        lbl = (n.nil? || n[:label].nil? || n[:label].empty?) ? @example_lbl :
-          l10n("#{@example_lbl} #{n[:label]}")
-        p << lbl
-        name and !lbl.nil? and p << "&nbsp;&mdash; "
-        name and name.children.each { |n| parse(n, div) }
-      end
-    end
-
-    EXAMPLE_TBL_ATTR =
-      { class: "example_label", style: "width:82.8pt;padding:0 0 0 0;\
-        margin-left:0pt;vertical-align:top;" }.freeze
-
-    # used if we are boxing examples
-    def example_div_parse(node, out)
-      out.div **attr_code(id: node["id"], class: "example") do |div|
-        example_label(node, div, node.at(ns("./name")))
-        node.children.each do |n|
-          parse(n, div) unless n.name == "name"
-        end
-      end
-    end
-
-    def example_table_attr(node)
-      attr_code(id: node["id"], class: "example",
-                style: "border-collapse:collapse;border-spacing:0;" )
-    end
-
-    EXAMPLE_TD_ATTR =
-      { style: "vertical-align:top;padding:0;", class: "example" }.freeze
-
-    def example_table_parse(node, out)
-      out.table **example_table_attr(node) do |t|
-        t.tr do |tr|
-          tr.td **EXAMPLE_TBL_ATTR do |td|
-            example_label(node, td, node.at(ns("./name")))
-          end
-          tr.td **EXAMPLE_TD_ATTR do |td|
-            node.children.each { |n| parse(n, td) unless n.name == "name" }
-          end
-        end
-      end
-    end
-
-    def example_parse(node, out)
-      example_div_parse(node, out)
-    end
-
     def sourcecode_name_parse(node, div, name)
       lbl = anchor(node['id'], :label, false)
       lbl = nil if labelled_ancestor(node)
@@ -197,8 +149,11 @@ module IsoDoc::Function
 
     def formula_where(dl, out)
       return unless dl
-      out.p { |p| p << @where_lbl }
+      out.p **{ style: "page-break-after:avoid;"} do |p|
+        p << @where_lbl
+      end
       parse(dl, out)
+      out.parent.at("./dl")["class"] = "formula_dl"
     end
 
     def formula_parse1(node, out)

data/lib/isodoc/function/blocks_example.rb

@@ -0,0 +1,53 @@
+module IsoDoc::Function
+  module Blocks
+    def example_label(node, div, name)
+      n = get_anchors[node["id"]]
+      div.p **{ class: "example-title" } do |p|
+        lbl = (n.nil? || n[:label].nil? || n[:label].empty?) ? @example_lbl :
+          l10n("#{@example_lbl} #{n[:label]}")
+        p << lbl
+        name and !lbl.nil? and p << "&nbsp;&mdash; "
+        name and name.children.each { |n| parse(n, div) }
+      end
+    end
+
+    EXAMPLE_TBL_ATTR =
+      { class: "example_label", style: "width:82.8pt;padding:0 0 0 0;\
+        margin-left:0pt;vertical-align:top;" }.freeze
+
+    # used if we are boxing examples
+    def example_div_parse(node, out)
+      out.div **attr_code(id: node["id"], class: "example") do |div|
+        example_label(node, div, node.at(ns("./name")))
+        node.children.each do |n|
+          parse(n, div) unless n.name == "name"
+        end
+      end
+    end
+
+    def example_table_attr(node)
+      attr_code(id: node["id"], class: "example",
+                style: "border-collapse:collapse;border-spacing:0;" )
+    end
+
+    EXAMPLE_TD_ATTR =
+      { style: "vertical-align:top;padding:0;", class: "example" }.freeze
+
+    def example_table_parse(node, out)
+      out.table **example_table_attr(node) do |t|
+        t.tr do |tr|
+          tr.td **EXAMPLE_TBL_ATTR do |td|
+            example_label(node, td, node.at(ns("./name")))
+          end
+          tr.td **EXAMPLE_TD_ATTR do |td|
+            node.children.each { |n| parse(n, td) unless n.name == "name" }
+          end
+        end
+      end
+    end
+
+    def example_parse(node, out)
+      example_div_parse(node, out)
+    end
+  end
+end

data/lib/isodoc/function/cleanup.rb

@@ -19,6 +19,33 @@ module IsoDoc::Function
       admonition_cleanup(docxml)
     end
 
+    def table_long_strings_cleanup(docxml)
+      docxml.xpath("//td | //th").each do |d|
+        d.traverse do |n|
+          next unless n.text?
+          n.replace(break_up_long_strings(n.text))
+        end
+      end
+    end
+
+    def break_up_long_strings(t)
+      t.split(/(?=\s)/).map do |w|
+        (/^\s*$/.match(t) or w.size < 30) ? w :
+          w.scan(/.{,30}/).map do |w1|
+          (w1.size < 30) ? w1 : break_up_long_strings1(w1)
+        end.join
+      end.join
+    end
+
+    def break_up_long_strings1(w1)
+      s = w1.split(%r{(?<=[,.?+;/=])})
+      if s.size == 1 then w1 + " "
+      else
+        s[-1] = " " + s[-1]
+        s.join
+      end
+    end
+
     def admonition_cleanup(docxml)
       docxml.xpath("//div[@class = 'Admonition'][title]").each do |d|
         title = d.at("./title")
@@ -65,6 +92,7 @@ module IsoDoc::Function
     # since it is in diagram
     def figure_cleanup(docxml)
       docxml.xpath(FIGURE_WITH_FOOTNOTES).each do |f|
+        next unless f.at(".//aside[not(ancestor::p[@class = 'FigureTitle'])]")
         key = figure_get_or_make_dl(f)
         f.xpath(".//aside").each do |aside|
           figure_aside_process(f, aside, key)
@@ -156,6 +184,7 @@ module IsoDoc::Function
     def table_cleanup(docxml)
       table_footnote_cleanup(docxml)
       table_note_cleanup(docxml)
+      table_long_strings_cleanup(docxml)
       docxml
     end
 

data/lib/isodoc/function/lists.rb

@@ -43,6 +43,11 @@ module IsoDoc::Function
 
     def li_parse(node, out)
       out.li  **attr_code(id: node["id"]) do |li|
+        if node["uncheckedcheckbox"] == "true"
+          li << '<span class="zzMoveToFollowing"><input type="checkbox" checked="checked"/></span>'
+        elsif node["checkedcheckbox"] == "true"
+          li << '<span class="zzMoveToFollowing"><input type="checkbox"/></span>'
+        end
         node.children.each { |n| parse(n, li) }
       end
     end

data/lib/isodoc/function/references.rb

@@ -131,13 +131,13 @@ module IsoDoc::Function
 
     def biblio_list(f, div, biblio)
       i = 0
-      f.xpath(ns("./bibitem | ./note")).each do |b|
-        next if implicit_reference(b)
-        i += 1 if b.name == "bibitem"
-        if b.name == "note" then note_parse(b, div)
-        elsif(is_standard(b)) then std_bibitem_entry(div, b, i, biblio)
+      f.children.each do |b|
+        if b.name == "bibitem"
+          i += 1
+          (is_standard(b)) ? std_bibitem_entry(div, b, i, biblio) :
+            nonstd_bibitem(div, b, i, biblio)
         else
-          nonstd_bibitem(div, b, i, biblio)
+          parse(b, div) unless %w(title).include? b.name
         end
       end
     end
@@ -149,9 +149,6 @@ module IsoDoc::Function
       out.div do |div|
         num = num + 1
         clause_name(num, @normref_lbl, div, nil)
-        f.elements.reject do |e|
-          %w(reference title bibitem note).include? e.name
-        end.each { |e| parse(e, div) }
         biblio_list(f, div, false)
       end
       num
@@ -165,9 +162,6 @@ module IsoDoc::Function
       page_break(out)
       out.div do |div|
         div.h1 @bibliography_lbl, **{ class: "Section3" }
-        f.elements.reject do |e|
-          %w(reference title bibitem note).include? e.name
-        end.each { |e| parse(e, div) }
         biblio_list(f, div, true)
       end
     end
@@ -178,9 +172,6 @@ module IsoDoc::Function
         anchor(node['id'], :label, false) and
           clause_parse_title(node, div, node.at(ns("./title")), out) or
           div.h2 title, **{ class: "Section3" }
-        node.elements.reject do |e|
-          %w(reference title bibitem note).include? e.name
-        end.each { |e| parse(e, div) }
         biblio_list(node, div, true)
       end
     end

data/lib/isodoc/function/section.rb

@@ -20,6 +20,7 @@ module IsoDoc::Function
       end
     end
 
+    # used for subclauses
     def clause_parse_title(node, div, c1, out)
       if node["inline-header"] == "true"
         inline_header_title(out, node, c1)
@@ -33,6 +34,7 @@ module IsoDoc::Function
       end
     end
 
+    # used for subclauses
     def clause_parse(node, out)
       out.div **attr_code(id: node["id"]) do |div|
         clause_parse_title(node, div, node.at(ns("./title")), out)
@@ -84,6 +86,7 @@ module IsoDoc::Function
       isoxml.xpath(ns("//annex")).each do |c|
         page_break(out)
         out.div **attr_code(id: c["id"], class: "Section3") do |s|
+          annex_name(c, nil, s) unless c.at(ns("./title"))
           c.elements.each do |c1|
             if c1.name == "title" then annex_name(c, c1, s)
             else

data/lib/isodoc/function/table.rb

@@ -45,10 +45,11 @@ module IsoDoc::Function
     end
 
     def make_table_attr(node)
+      width = node["width"] ? "width:#{node['width']};" : nil
       attr_code(
         id: node["id"],
         class: "MsoISOTable",
-        style: "border-width:1px;border-spacing:0;",
+        style: "border-width:1px;border-spacing:0;#{width}",
         title: node["alt"]
       )
     end

data/lib/isodoc/function/xref_gen.rb

@@ -1,5 +1,6 @@
 require_relative "xref_counter"
 require_relative "xref_anchor"
+require_relative "xref_gen_seq"
 
 module IsoDoc::Function
   module XrefGen
@@ -124,138 +125,5 @@ module IsoDoc::Function
       example_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
       list_anchor_names(docxml.xpath(ns(SECTIONS_XPATH)))
     end
-
-    def sequential_figure_names(clause)
-      c = Counter.new
-      j = 0
-      clause.xpath(ns(".//figure | .//sourcecode[not(ancestor::example)]")).each do |t|
-        if t.parent.name == "figure" then j += 1
-        else
-          j = 0
-          c.increment(t)
-        end
-        label = c.print + (j.zero? ? "" : "-#{j}")
-        next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] =
-          anchor_struct(label, nil, @figure_lbl, "figure", t["unnumbered"])
-      end
-    end
-
-    def sequential_table_names(clause)
-      c = Counter.new
-      clause.xpath(ns(".//table")).each do |t|
-        next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(c.increment(t).print, nil, 
-                                          @table_lbl, "table", t["unnumbered"])
-      end
-    end
-
-    def sequential_formula_names(clause)
-      c = Counter.new
-      clause.xpath(ns(".//formula")).each do |t|
-        next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] =
-          anchor_struct(c.increment(t).print, t, 
-                        t["inequality"] ? @inequality_lbl : @formula_lbl,
-                        "formula", t["unnumbered"])
-      end
-    end
-
-    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}")).each do |t|
-        next if t["id"].nil? || t["id"].empty?
-        id = c.increment(t).print
-        @anchors[t["id"]] = anchor_struct(id, t, label, klass, t["unnumbered"])
-        sequential_permission_names2(t, id)
-      end
-    end
-
-    def sequential_permission_names2(t, id)
-      sequential_permission_names1(t, id, "permission", @permission_lbl)
-      sequential_permission_names1(t, id, "requirement", @requirement_lbl)
-      sequential_permission_names1(t, id, "recommendation", @recommendation_lbl)
-    end
-
-    def sequential_permission_names1(block, lbl, klass, label)
-      c = Counter.new
-      block.xpath(ns("./#{klass}")).each do |t|
-        next if t["id"].nil? || t["id"].empty?
-        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
-
-    def sequential_asset_names(clause)
-      sequential_table_names(clause)
-      sequential_figure_names(clause)
-      sequential_formula_names(clause)
-      sequential_permission_names(clause, "permission", @permission_lbl)
-      sequential_permission_names(clause, "requirement", @requirement_lbl)
-      sequential_permission_names(clause, "recommendation", @recommendation_lbl)
-    end
-
-    def hierarchical_figure_names(clause, num)
-      c = Counter.new
-      j = 0
-      clause.xpath(ns(".//figure |  .//sourcecode[not(ancestor::example)]")).each do |t|
-        if t.parent.name == "figure" then j += 1
-        else
-          j = 0
-          c.increment(t)
-        end
-        label = "#{num}#{hiersep}#{c.print}" +
-          (j.zero? ? "" : "#{hierfigsep}#{j}")
-        next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] = anchor_struct(label, nil, @figure_lbl, "figure",
-                                          t["unnumbered"])
-      end
-    end
-
-    def hierarchical_table_names(clause, num)
-      c = Counter.new
-      clause.xpath(ns(".//table")).each do |t|
-        next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] =
-          anchor_struct("#{num}#{hiersep}#{c.increment(t).print}",
-                        nil, @table_lbl, "table", t["unnumbered"])
-      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", @permission_lbl)
-      hierarchical_permission_names(clause, num, "requirement",
-                                    @requirement_lbl)
-      hierarchical_permission_names(clause, num, "recommendation",
-                                    @recommendation_lbl)
-    end
-
-    def hierarchical_formula_names(clause, num)
-      c = Counter.new
-      clause.xpath(ns(".//formula")).each do |t|
-        next if t["id"].nil? || t["id"].empty?
-        @anchors[t["id"]] =
-          anchor_struct("#{num}#{hiersep}#{c.increment(t).print}", t,
-                        t["inequality"] ? @inequality_lbl : @formula_lbl,
-                        "formula", t["unnumbered"])
-      end
-    end
-
-    def hierarchical_permission_names(clause, num, klass, label)
-      c = Counter.new
-      clause.xpath(ns(".//#{klass}#{FIRST_LVL_REQ}")).each do |t|
-        next if t["id"].nil? || t["id"].empty?
-        id = "#{num}#{hiersep}#{c.increment(t).print}"
-        @anchors[t["id"]] = anchor_struct(id, t, label, klass, t["unnumbered"])
-        sequential_permission_names2(t, id)
-      end
-    end
   end
 end