isodoc 2.0.0.1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cf2e2e18bcb28744fc2f4cf2525267935dc981281ab4642c7b0e57ea8b68b6d
-  data.tar.gz: 12f9afbb69bd5e9903dd15ace22e5a3357520dfc8c58e4a316bc8e92a42e34bb
+  metadata.gz: 201d6214562a3056d1a1e6d1346a39c91bd73edf2e4bdc8dc5539a0398e6c3ff
+  data.tar.gz: 103e2fddde68956154632f9619b6edbe04a1df4087faf6088b69649fcd7e2569
 SHA512:
-  metadata.gz: b3996461e5a31740161f1bf08c0305b7e9faa229f263da26deaaf9fd50924c9cb39f2eaffacf4b6e69992a197d81c10b130a82b06d0c630917b3c22b34eca615
-  data.tar.gz: 7c3a9fe8073d10c915e56f06bf973b6e7dfbd2e6296604598d93b90267496f74ebf5cbb2bcfd970eafafc0c808dc69e9273b0a1e1975a459e32993bfe0f57de6
+  metadata.gz: 197e770551602d75f6890ea1258a861a19e8a6f116450889da86107b529373d43c016ef41cb965b3cb01d44ddbaef2bcd7c3cd84b414f9a40cde522055e2b4f5
+  data.tar.gz: 0fce2fe86f4facea7ba594a2425c0c66a4c1577ed1bf828d3c7bd61943dad0b314fedb8513ff3fb3d027e45832490cdaa90a607db749d5cbcc5931a704f6acc9

data/lib/isodoc/function/section_titles.rb

@@ -54,11 +54,12 @@ module IsoDoc
         end
       end
 
+      # top level clause names
       def clause_name(_num, title, div, header_class)
+        preceding_floating_titles(title, div)
         header_class = {} if header_class.nil?
         div.h1 **attr_code(header_class) do |h1|
-          if title.is_a?(String)
-            h1 << title
+          if title.is_a?(String) then h1 << title
           else
             title&.children&.each { |c2| parse(c2, h1) }
             clause_parse_subtitle(title, h1)
@@ -68,6 +69,7 @@ module IsoDoc
       end
 
       def annex_name(_annex, name, div)
+        preceding_floating_titles(name, div)
         return if name.nil?
 
         div.h1 **{ class: "Annex" } do |t|
@@ -82,6 +84,18 @@ module IsoDoc
           node.children.each { |c| parse(c, p) }
         end
       end
+
+      def preceding_floating_titles(name, div)
+        return if name.nil? || name.is_a?(String)
+
+        out = name.parent.xpath("./preceding-sibling::*")
+          .reverse.each_with_object([]) do |p, m|
+          break m unless p.name == "p"
+
+          m << p
+        end or return
+        out.each { |c| parse(c, div) }
+      end
     end
   end
 end

data/lib/isodoc/presentation_function/section.rb

@@ -26,6 +26,8 @@ module IsoDoc
         .each do |f|
         floattitle1(f)
       end
+      # top-level
+      docxml.xpath(ns("//sections | //preface")).each { |f| floattitle1(f) }
     end
 
     def floattitle1(elem)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "2.0.0.1".freeze
+  VERSION = "2.0.1".freeze
 end

data/spec/isodoc/section_spec.rb

@@ -1,6 +1,7 @@
 require "spec_helper"
 
 RSpec.describe IsoDoc do
+=begin
   it "processes prefatory blocks" do
     input = <<~INPUT
       <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -1495,11 +1496,12 @@ RSpec.describe IsoDoc do
       .new({ suppressheadingnumbers: true })
       .convert("test", input, true))).to be_equivalent_to xmlpp(output)
   end
-
+=end
   it "processes floating titles" do
     input = <<~INPUT
           <iso-standard xmlns="http://riboseinc.com/isoxml">
       <preface>
+        <floating-title depth="1">A0</p>
         <introduction id="B" obligation="informative">
         <title>Introduction</title>
         <floating-title depth="1">A</p>
@@ -1513,18 +1515,35 @@ RSpec.describe IsoDoc do
        </clause>
        </introduction>
        </preface>
+       <sections>
+        <clause id="C" obligation="informative">
+        <title>Introduction</title>
+        <floating-title depth="1">A</p>
+        <clause id="C1" obligation="informative">
+         <title>Introduction Subsection</title>
+        <floating-title depth="2">B</p>
+        <clause id="C2" obligation="informative">
+         <title>Introduction Sub-subsection</title>
+        <floating-title depth="1">C</p>
+       </clause>
+       </clause>
+       </clause>
+        <floating-title depth="1">D</p>
+       <clause id="C4"><title>Clause 2</title></clause>
+       </sections>
        </iso-standard>
     INPUT
 
     presxml = <<~PRESXML
-         <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
+           <iso-standard xmlns='http://riboseinc.com/isoxml' type='presentation'>
          <preface>
-           <introduction id='B' obligation='informative' displayorder='1'>
+           <p depth='1' type='floating-title' displayorder='1'>A0</p>
+           <introduction id='B' obligation='informative' displayorder='2'>
              <title>Introduction</title>
              <p depth='1' type='floating-title'>A</p>
              <clause id='B1' obligation='informative'>
                <title depth='2'>Introduction Subsection</title>
-               <p type='floating-title' depth="2">B</p>
+               <p depth='2' type='floating-title'>B</p>
                <clause id='B2' obligation='informative'>
                  <title depth='3'>Introduction Sub-subsection</title>
                  <p depth='1' type='floating-title'>C</p>
@@ -1532,13 +1551,49 @@ RSpec.describe IsoDoc do
              </clause>
            </introduction>
          </preface>
+         <sections>
+           <clause id='C' obligation='informative' displayorder='3'>
+             <title depth='1'>
+               1.
+               <tab/>
+               Introduction
+             </title>
+             <p depth='1' type='floating-title'>A</p>
+             <clause id='C1' obligation='informative'>
+               <title depth='2'>
+                 1.1.
+                 <tab/>
+                 Introduction Subsection
+               </title>
+               <p depth='2' type='floating-title'>B</p>
+               <clause id='C2' obligation='informative'>
+                 <title depth='3'>
+                   1.1.1.
+                   <tab/>
+                   Introduction Sub-subsection
+                 </title>
+                 <p depth='1' type='floating-title'>C</p>
+               </clause>
+             </clause>
+           </clause>
+           <p depth='1' type='floating-title'>D</p>
+           <clause id='C4' displayorder='4'>
+             <title depth='1'>
+               2.
+               <tab/>
+               Clause 2
+             </title>
+           </clause>
+         </sections>
        </iso-standard>
     PRESXML
 
     html = <<~OUTPUT
       #{HTML_HDR}
+             <p class='h1'>A0</p>
              <br/>
              <div class='Section3' id='B'>
+              <p class='h1'>A0</p>
                <h1 class='IntroTitle'>Introduction</h1>
                <p class='h1'>A</p>
                <div id='B1'>
@@ -1551,6 +1606,22 @@ RSpec.describe IsoDoc do
                </div>
              </div>
              <p class='zzSTDTitle1'/>
+                   <div id='C'>
+        <h1> 1. &#160; Introduction </h1>
+        <p class='h1'>A</p>
+        <div id='C1'>
+          <h2> 1.1. &#160; Introduction Subsection </h2>
+          <p class='h2'>B</p>
+          <div id='C2'>
+            <h3> 1.1.1. &#160; Introduction Sub-subsection </h3>
+            <p class='h1'>C</p>
+          </div>
+        </div>
+      </div>
+      <div id='C4'>
+      <p class='h1'>D</p>
+        <h1> 2. &#160; Clause 2 </h1>
+      </div>
            </div>
          </body>
        </html>
@@ -1569,10 +1640,12 @@ RSpec.describe IsoDoc do
              <br clear='all' class='section'/>
            </p>
            <div class='WordSection2'>
+            <p>A0</p>
              <p>
                <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
              </p>
              <div class='Section3' id='B'>
+             <p>A0</p>
                <h1 class='IntroTitle'>Introduction</h1>
                <p>A</p>
                <div id='B1'>
@@ -1591,6 +1664,38 @@ RSpec.describe IsoDoc do
            </p>
            <div class='WordSection3'>
              <p class='zzSTDTitle1'/>
+                  <div id='C'>
+       <h1>
+          1.
+         <span style='mso-tab-count:1'>&#160; </span>
+          Introduction
+       </h1>
+       <p>A</p>
+       <div id='C1'>
+         <h2>
+            1.1.
+           <span style='mso-tab-count:1'>&#160; </span>
+            Introduction Subsection
+         </h2>
+         <p>B</p>
+         <div id='C2'>
+           <h3>
+              1.1.1.
+             <span style='mso-tab-count:1'>&#160; </span>
+              Introduction Sub-subsection
+           </h3>
+           <p>C</p>
+         </div>
+       </div>
+     </div>
+     <div id='C4'>
+       <p>D</p>
+       <h1>
+          2.
+         <span style='mso-tab-count:1'>&#160; </span>
+          Clause 2
+       </h1>
+     </div>
            </div>
          </body>
        </html>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 2.0.0.1
+  version: 2.0.1
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2022-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath