isodoc 0.9.15 → 0.9.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63d1745c833e13e8fb6301154c1f888c3b107ec0a51409d00bba57920f049ad4
-  data.tar.gz: a4c41afb2aac271ca31976e5b44bc1cd9bbe06e9c4d7448ea58d20efd89e5053
+  metadata.gz: b26664ab07349891d3a840f0c98f4a9bea787bc176dd6beb8580608564d4cd1c
+  data.tar.gz: aa45cdbd35faeed78af75730ec6cac6275e7b91e40bcc8f9e1d08f7484de8846
 SHA512:
-  metadata.gz: e74800b697fab3fe77b6e0a03ffd698fa1dfc6c1c1312102aa4a6bc8b29fcd084662e8a0640dd75d553d1cc67ce8a66c96a0ee09f7972a414b29da218bf19a33
-  data.tar.gz: f8b77e105d81db551d503e86e386fe3de1192a7596db641db926f620a743494fe182d7e412ed4c17152c0842cd3fb4d0281c9a7b238accb42aa696b4a275a96f
+  metadata.gz: fc0285784f98018d1d9c333fd5fa3e54ef5de5867447cbbcb5c1749038b5c749169c1d9c69a72af9ef6dc6a4073a62c5bedcabca23a88a943171e1e8f08b796b
+  data.tar.gz: 94e7ec97ed84bcece612a9e3237c053780de2d6b2e534049a7147a5409699b3129ba3c07e5c88fa9464a851b10133c70d9001d795102e065af2b827a4230afb2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (0.9.15)
+    isodoc (0.9.16)
       asciimath
       html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
@@ -19,7 +19,7 @@ GEM
   remote: https://rubygems.org/
   specs:
     asciidoctor (1.5.8)
-    asciimath (1.0.7)
+    asciimath (1.0.8)
     ast (2.4.0)
     byebug (9.1.0)
     coderay (1.1.2)
@@ -43,7 +43,7 @@ GEM
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    html2doc (0.8.8)
+    html2doc (0.8.9)
       asciimath (~> 1.0.7)
       htmlentities (~> 4.3.4)
       image_size

data/lib/isodoc/function/blocks.rb

@@ -78,7 +78,7 @@ module IsoDoc::Function
 
     EXAMPLE_TBL_ATTR =
       { valign: "top", class: "example_label",
-        style: "width:82.8pt;padding:0 0 0 1em;margin-left:0pt" }.freeze
+        style: "width:82.8pt;padding:0 0 0 0;margin-left:0pt" }.freeze
 
     # used if we are boxing examples
     def example_div_parse(node, out)
@@ -147,9 +147,13 @@ module IsoDoc::Function
       @annotation = false
     end
 
+    def admonition_class(node)
+      "Admonition"
+    end
+
     def admonition_parse(node, out)
       name = node["type"]
-      out.div **{ class: "Admonition" } do |t|
+      out.div **{ class: admonition_class(node) } do |t|
         t.title { |b| b << @admonition[name].upcase } if name
         node.children.each do |n|
           parse(n, t)
@@ -163,12 +167,18 @@ module IsoDoc::Function
       parse(dl, out)
     end
 
-    def formula_parse(node, out)
+    def formula_parse1(node, out)
       out.div **attr_code(id: node["id"], class: "formula") do |div|
-        parse(node.at(ns("./stem")), out)
-        insert_tab(div, 1)
-        div << "(#{get_anchors[node['id']][:label]})"
+        div.p do |p|
+          parse(node.at(ns("./stem")), div)
+          insert_tab(div, 1)
+          div << "(#{get_anchors[node['id']][:label]})"
+        end
       end
+    end
+
+    def formula_parse(node, out)
+      formula_parse1(node, out)
       formula_where(node.at(ns("./dl")), out)
       node.children.each do |n|
         next if %w(stem dl).include? n.name

data/lib/isodoc/function/section.rb

@@ -158,7 +158,7 @@ module IsoDoc::Function
       f = isoxml.at(ns("//sections/definitions")) or return num
       out.div **attr_code(id: f["id"], class: "Symbols") do |div|
         num = num + 1
-        clause_name(num, @symbols_lbl, div, nil)
+        clause_name(num, f&.at(ns("./title"))&.content || @symbols_lbl, div, nil)
         f.elements.each do |e|
           parse(e, div) unless e.name == "title"
         end
@@ -168,8 +168,8 @@ module IsoDoc::Function
 
     # subclause
     def symbols_parse(isoxml, out)
-      isoxml.children.first.previous =
-        "<title>#{@symbols_lbl}</title>"
+      isoxml.at(ns("./title")) or
+        isoxml.children.first.previous = "<title>#{@symbols_lbl}</title>"
       clause_parse(isoxml, out)
     end
 

data/lib/isodoc/function/xref_gen.rb

@@ -42,12 +42,13 @@ module IsoDoc::Function
 
     SECTIONS_XPATH =
       "//foreword | //introduction | //sections/terms | //annex | "\
-      "//sections/clause | //bibliography/references | "\
-      "//bibliography/clause".freeze
+      "//sections/clause | //sections/definitions | "\
+      "//bibliography/references | //bibliography/clause".freeze
 
     CHILD_NOTES_XPATH =
-      "./*[not(self::xmlns:clause) and "\
-      "not(self::xmlns:appendix)]//xmlns:note | ./xmlns:note".freeze
+      "./*[not(self::xmlns:clause) and not(self::xmlns:appendix) and "\
+      "not(self::xmlns:terms) and not(self::xmlns:definitions)]//xmlns:note | "\
+      "./xmlns:note".freeze
 
     def note_anchor_names(sections)
       sections.each do |s|
@@ -58,14 +59,17 @@ module IsoDoc::Function
           idx = notes.size == 1 ? "" : " #{i + 1}"
           @anchors[n["id"]] = anchor_struct(idx, n, @note_xref_lbl, "note")
         end
-        note_anchor_names(s.xpath(ns("./clause | ./appendix")))
+        note_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
       end
     end
 
     CHILD_EXAMPLES_XPATH =
-      "./*[not(self::xmlns:clause) and not(self::xmlns:appendix)]//"\
+      "./*[not(self::xmlns:clause) and not(self::xmlns:appendix) and "\
+      "not(self::xmlns:terms) and not(self::xmlns:definitions)]//"\
       "xmlns:example | ./xmlns:example".freeze
 
+    CHILD_SECTIONS = "./clause | ./appendix | ./terms | ./definitions"
+
     def example_anchor_names(sections)
       sections.each do |s|
         notes = s.xpath(CHILD_EXAMPLES_XPATH)
@@ -73,9 +77,10 @@ module IsoDoc::Function
           next if @anchors[n["id"]]
           next if n["id"].nil? || n["id"].empty?
           idx = notes.size == 1 ? "" : " #{i + 1}"
-          @anchors[n["id"]] = anchor_struct(idx, n, @example_xref_lbl, "example")
+          @anchors[n["id"]] = anchor_struct(idx, n, @example_xref_lbl,
+                                            "example")
         end
-        example_anchor_names(s.xpath(ns("./clause | ./appendix")))
+        example_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
       end
     end
 
@@ -89,7 +94,7 @@ module IsoDoc::Function
           @anchors[n["id"]] = anchor_struct(idx, n, @list_lbl, "list")
           list_item_anchor_names(n, @anchors[n["id"]], 1, "", notes.size != 1)
         end
-        list_anchor_names(s.xpath(ns("./clause | ./appendix")))
+        list_anchor_names(s.xpath(ns(CHILD_SECTIONS)))
       end
     end
 

data/lib/isodoc/metadata.rb

@@ -182,6 +182,7 @@ module IsoDoc
     end
 
     def version(isoxml, _out)
+      set(:edition, isoxml&.at(ns("//bibdata/edition"))&.text)
       set(:docyear, isoxml&.at(ns("//bibdata/copyright/from"))&.text)
       set(:draft, isoxml&.at(ns("//version/draft"))&.text)
       set(:revdate, isoxml&.at(ns("//version/revision-date"))&.text)

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.9.15".freeze
+  VERSION = "0.9.16".freeze
 end

data/lib/isodoc/word_function/postprocess.rb

@@ -59,9 +59,28 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
       word_annex_cleanup(docxml)
       word_table_separator(docxml)
       word_admonition_images(docxml)
+      word_list_continuations(docxml)
       docxml
     end
 
+    def word_list_continuations(docxml)
+      list_add(docxml.xpath("//ul[not(ancestor::ul) and not(ancestor::ol)]"), 1)
+      list_add(docxml.xpath("//ol[not(ancestor::ul) and not(ancestor::ol)]"), 1)
+    end
+
+    def list_add(xpath, level)
+      xpath.each do |list|
+        (list.xpath(".//li") - list.xpath(".//ol//li | .//ul//li")).each do |li|
+          li.xpath("./p | ./div/p").each_with_index do |p, i|
+            next if p == 0
+            p["class"] = "ListContLevel#{level}"
+          end
+          list_add(li.xpath(".//ul") - li.xpath(".//ul//ul | .//ol//ul"), level + 1)
+          list_add(li.xpath(".//ol") - li.xpath(".//ul//ol | .//ol//ol"), level + 1)
+        end
+      end
+    end
+
     EMPTY_PARA = "<p style='margin-top:0cm;margin-right:0cm;"\
       "margin-bottom:0cm;margin-left:0.0pt;margin-bottom:.0001pt;"\
       "line-height:1.0pt;mso-line-height-rule:exactly'>"\
@@ -95,9 +114,12 @@ xmlns:m="http://schemas.microsoft.com/office/2004/12/omml">
         coverxml.to_xml(encoding: "US-ASCII")
     end
 
+    def insert_toc(intro, docxml)
+      intro.sub(/WORDTOC/, make_WordToC(docxml))
+    end
+
     def word_intro(docxml)
-      intro = File.read(@wordintropage, encoding: "UTF-8").
-        sub(/WORDTOC/, make_WordToC(docxml))
+      intro = insert_toc(File.read(@wordintropage, encoding: "UTF-8"), docxml)
       intro = populate_template(intro, :word)
       introxml = to_word_xhtml_fragment(intro)
       docxml.at('//div[@class="WordSection2"]').children.first.previous =

data/spec/isodoc/blocks_spec.rb

@@ -523,7 +523,7 @@ B</pre>
                <br/>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <div id="_be9158af-7e93-4ee2-90c5-26d31c181934" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</div><p>where</p><dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d"><dt>
+                 <div id="_be9158af-7e93-4ee2-90c5-26d31c181934" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</p></div><p>where</p><dl id="_e4fe94fe-1cde-49d9-b1ad-743293b7e21d"><dt>
            <span class="stem">(#(r)#)</span>
          </dt><dd>
            <p id="_1b99995d-ff03-40f5-8f2e-ab9665a69b77">is the repeatability limit.</p>

data/spec/isodoc/metadata_spec.rb

@@ -24,6 +24,11 @@ RSpec.describe IsoDoc do
   <date type="created"><from>2010</from><to>2011</to></date>
   <date type="activated"><on>2013</on></date>
   <date type="obsoleted"><on>2014</on></date>
+  <edition>2</edition>
+<version>
+  <revision-date>2016-05-01</revision-date>
+  <draft>0.4</draft>
+</version>
   <contributor>
     <role type="author"/>
     <organization>
@@ -73,14 +78,10 @@ RSpec.describe IsoDoc do
     <workgroup number="3">Rice Group</workgroup>
     <secretariat>GB</secretariat>
   </editorialgroup>
-</bibdata><version>
-  <edition>2</edition>
-  <revision-date>2016-05-01</revision-date>
-  <draft>0.4</draft>
-</version>
+</bibdata>
 </iso-standard>
 INPUT
-{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>["Barney Rubble", "Fred Flintstone"], :authors_affiliations=>{"Bedrock Inc."=>["Barney Rubble"], ""=>["Fred Flintstone"]}, :confirmeddate=>"XXX", :createddate=>"2010&ndash;2011", :doc=>"URL E", :docnumber=>"17301-1", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :html=>"URL B", :ics=>"XXX", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :pdf=>"URL D", :publisheddate=>"2011", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :status=>"Committee draft", :tc=>"TC 34", :unpublished=>true, :updateddate=>"XXX", :url=>"URL A", :wg=>"WG 3", :xml=>"URL C"}
+{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>["Barney Rubble", "Fred Flintstone"], :authors_affiliations=>{"Bedrock Inc."=>["Barney Rubble"], ""=>["Fred Flintstone"]}, :confirmeddate=>"XXX", :createddate=>"2010&ndash;2011", :doc=>"URL E", :docnumber=>"17301-1", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :edition=>"2", :editorialgroup=>["TC 34", "SC 4", "WG 3"], :html=>"URL B", :ics=>"XXX", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :pdf=>"URL D", :publisheddate=>"2011", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :status=>"Committee draft", :tc=>"TC 34", :unpublished=>true, :updateddate=>"XXX", :url=>"URL A", :wg=>"WG 3", :xml=>"URL C"}
 OUTPUT
   end
 
@@ -137,13 +138,12 @@ OUTPUT
   <ics><code>1.2.3</code></ics>
   <ics><code>1.2.3</code></ics>
 </bibdata><version>
-  <edition>2</edition>
   <revision-date>2016-05-01</revision-date>
   <draft>12</draft>
 </version>
 </iso-standard>
 INPUT
-{:accesseddate=>"XXX", :agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :confirmeddate=>"XXX", :createddate=>"XXX", :docnumber=>"17301-1-3", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" (draft 12, 2016-05-01)", :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :ics=>"1.2.3, 1.2.3", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :publisheddate=>"XXX", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"DEF 4", :secretariat=>"XXXX", :status=>"Published", :tc=>"ABC 34", :unpublished=>false, :updateddate=>"XXX", :wg=>"GHI 3"}
+{:accesseddate=>"XXX", :agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :confirmeddate=>"XXX", :createddate=>"XXX", :docnumber=>"17301-1-3", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" (draft 12, 2016-05-01)", :edition=>nil, :editorialgroup=>["ABC 34", "DEF 4", "GHI 3"], :ics=>"1.2.3, 1.2.3", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :publisheddate=>"XXX", :receiveddate=>"XXX", :revdate=>"2016-05-01", :sc=>"DEF 4", :secretariat=>"XXXX", :status=>"Published", :tc=>"ABC 34", :unpublished=>false, :updateddate=>"XXX", :wg=>"GHI 3"}
 OUTPUT
   end
 

data/spec/isodoc/postproc_spec.rb

@@ -625,4 +625,62 @@ ICAgICAgIDogRU5EIERPQyBJRAoKRklMRU5BTUU6IHRlc3QKCg==
     expect(html).to match(%r{<h2 class="TermNum" id="paddy">1\.2</h2>})
   end
 
+  it "creates continuation styles for multiparagraph list items in Word" do
+    FileUtils.rm_f "test.doc"
+    FileUtils.rm_f "test.html"
+    IsoDoc::WordConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css"}).convert("test", <<~"INPUT", false)
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface><foreword>
+    <ul>
+    <li><p>A</p>
+    <p>B</p></li>
+    <li><ol><li><p>C</p>
+    <p>D</p></li>
+    </ol></li>
+    </ul>
+    <ol>
+    <li><p>A1</p>
+    <p>B1</p></li>
+    <li><ul><li><p>C1</p>
+    <formula id="_5fc1ef0f-75d2-4b54-802c-b1bad4a53b62">
+    <stem type="AsciiMath">D1</stem>
+    </formula>
+    </ul></li>
+    </ol>
+    </foreword></preface>
+    </iso-standard>
+    INPUT
+    word = File.read("test.doc").sub(/^.*<div class="WordSection2">/m, '<div class="WordSection2">').
+      sub(%r{<p class="MsoNormal">\s*<br clear="all" class="section"/>\s*</p>\s*<div class="WordSection3">.*$}m, "")
+    expect(word).to be_equivalent_to <<~"OUTPUT"
+           <div class="WordSection2">
+             <p class="MsoNormal">
+               <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+             </p>
+             <div>
+               <h1 class="ForewordTitle">Foreword</h1>
+
+       <p class="MsoListParagraphCxSpFirst">A
+       <p class="ListContLevel1">B</p></p>
+       <p class="MsoListParagraphCxSpLast"><p class="MsoListParagraphCxSpFirst">C
+       <p class="ListContLevel2">D</p></p>
+       </p>
+
+
+       <p class="MsoListParagraphCxSpFirst">A1
+       <p class="ListContLevel1">B1</p></p>
+       <p class="MsoListParagraphCxSpLast">C1
+       <div class="formula"><a name="_5fc1ef0f-75d2-4b54-802c-b1bad4a53b62" id="_5fc1ef0f-75d2-4b54-802c-b1bad4a53b62"></a><p class="ListContLevel2"><span class="stem"><m:oMath>
+  <m:r><m:t>D1</m:t></m:r>
+
+</m:oMath>
+</span><span style="mso-tab-count:1">&#xA0; </span>(1)</p></div>
+       </p>
+
+             </div>
+             <p class="MsoNormal">&#xA0;</p>
+           </div>
+    OUTPUT
+  end
+
 end

data/spec/isodoc/section_spec.rb

@@ -54,6 +54,7 @@ RSpec.describe IsoDoc do
        </term>
        </terms>
        <definitions id="K">
+         <title>Definitions</title>
          <dl>
          <dt>Symbol</dt>
          <dd>Definition</dd>
@@ -138,7 +139,7 @@ RSpec.describe IsoDoc do
            <p class="TermNum" id="J">3.1.1</p>
            <p class="Terms" style="text-align:left;">Term2</p>
       
-         </div><div id="K"><h2>3.2. Symbols and abbreviated terms</h2>
+         </div><div id="K"><h2>3.2. Definitions</h2>
            <dl><dt><p>Symbol</p></dt><dd>Definition</dd></dl>
          </div></div>
                 <div id="L" class="Symbols">

data/spec/isodoc/xref_spec.rb

@@ -713,15 +713,15 @@ RSpec.describe IsoDoc do
                             <br/>
              <div class="Section3" id="intro">
                <h1 class="IntroTitle">Introduction</h1>
-               <div id="N1" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</div>
+               <div id="N1" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (1)</p></div>
                        <div id="xyz"><h2>Preparatory</h2>
-    <div id="N2" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (2)</div>
+    <div id="N2" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (2)</p></div>
                 </div>
              </div>
                <p class="zzSTDTitle1"/>
                <div id="scope">
                  <h1>1.&#160; Scope</h1>
-                 <div id="N" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (3)</div>
+                 <div id="N" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (3)</p></div>
                  <p>
                    <a href="#N">Formula (3)</a>
                  </p>
@@ -740,19 +740,19 @@ RSpec.describe IsoDoc do
                <div id="widgets">
                  <h1>3.&#160; Widgets</h1>
                  <div id="widgets1"><h2>3.1. </h2>
-           <div id="note1" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (4)</div>
-           <div id="note2" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (5)</div>
+           <div id="note1" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (4)</p></div>
+           <div id="note2" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (5)</p></div>
          <p>    <a href="#note1">Formula (4)</a> <a href="#note2">Formula (5)</a> </p>
            </div>
                </div>
                <br/>
                <div id="annex1" class="Section3">
                  <div id="annex1a"><h2>A.1. </h2>
-           <div id="AN" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (A.1)</div>
+           <div id="AN" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (A.1)</p></div>
            </div>
                  <div id="annex1b"><h2>A.2. </h2>
-           <div id="Anote1" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (A.2)</div>
-           <div id="Anote2" class="formula"><span class="stem">(#(r = 1 %)#)</span>&#160; (A.3)</div>
+           <div id="Anote1" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (A.2)</p></div>
+           <div id="Anote2" class="formula"><p><span class="stem">(#(r = 1 %)#)</span>&#160; (A.3)</p></div>
            </div>
                </div>
              </div>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.9.15
+  version: 0.9.16
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath