isodoc 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae2344f96c7d3a7ca351c911b175bdfcd37e645473398772e736184e4b1efc46
-  data.tar.gz: e0c0d19b58f5fcbe662f737389760119958afa7582ae68c9bc0c5c4dd1539674
+  metadata.gz: 04b4a5b6d5f00722c0939f1b75ffaeaeb4fc4e7a6f36ebec40e19b93df9f38f1
+  data.tar.gz: 41baee0c2174ce3de7c02afdb1179e6445d37e10233f22b396089e1eb60c1a22
 SHA512:
-  metadata.gz: '0049d33cb7b840af705590e2a7253c8f3bebd6a7fc1dcabb17e61fbfbbcaeab4db2aa741245325bf1e7b5472e166682461e0ad944d75ab079de9f03826bab08b'
-  data.tar.gz: df5c3ac115b0e2493e1c84bf5e51943fd7e22bb2dea6c39d67a310b9873cd719785c4b1987e84d92614d741ae75e6712830d536629c9ab261f27bcd97ec922cd
+  metadata.gz: '0823e689e87baac6d76bd7b7622a34976418e1da41be9bdeb4a308456ba36a4ec009dc72b59e7b1da0c416c0dbb95f1e6425f436f496540803ac3e4e48baa5f1'
+  data.tar.gz: f48233075744aa6ccc52e743870a5cf8952fe248b67527e913ac0c343a868f19eafe0a3dc3aaeb056dc1f58c12c7b849748f91c548755e586e4f55bcdad84bca

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/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/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

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/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.2.2".freeze
+  VERSION = "1.2.3".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/spec/isodoc/cleanup_spec.rb

@@ -1084,6 +1084,7 @@ INPUT
            [MODIFICATION]The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here
        [/TERMREF]</p>
        <p>[TERMREF] Termbase IEV, term ID xyz [/TERMREF]</p>
+<p>[TERMREF] Termbase IEV, term ID xyz [MODIFICATION] [/TERMREF]</p>
 <p>[TERMREF] Termbase IEV, term ID xyz [MODIFICATION]with adjustments [/TERMREF]</p>
 <p class="TermNum" id="paddy">1.2.</p><p class="Terms" style="text-align:left;">paddy</p><p class="AltTerms" style="text-align:left;">paddy rice</p>
        <p class="AltTerms" style="text-align:left;">rough rice</p>
@@ -1140,7 +1141,8 @@ INPUT
           <a href='#ISO7301'>ISO 7301:2011, Clause 3.1</a>
           , modified &mdash; The term "cargo rice" is shown as deprecated, and
           Note 1 to entry is not included here; Termbase IEV, term ID xyz;
-          Termbase IEV, term ID xyz, modified &mdash; with adjustments]
+          Termbase IEV, term ID xyz, modified; Termbase IEV, term ID xyz,
+modified &mdash; with adjustments]
         </p>
         <p class='TermNum' id='paddy'>1.2.</p>
         <p class='Terms' style='text-align:left;'>paddy</p>

data/spec/isodoc/section_spec.rb

@@ -1,6 +1,131 @@
 require "spec_helper"
 
 RSpec.describe IsoDoc do
+         it "processes prefatory blocks" do
+           input = <<~INPUT
+      <iso-standard xmlns="http://riboseinc.com/isoxml">
+      <preface>
+      <abstract id="A"><title>abstract</title></abstract>
+      <introduction id="B"><title>introduction</title></introduction>
+      <note id="C">note</note>
+      </preface>
+      <sections>
+       <clause id="M" inline-header="false" obligation="normative"><title>Clause 4</title><clause id="N" inline-header="false" obligation="normative">
+         <title>Introduction</title>
+       </clause>
+       <clause id="O" inline-header="true" obligation="normative">
+         <title>Clause 4.2</title>
+       </clause></clause>
+       <admonition id="L" type="caution"><p>admonition</p></admonition>
+       </sections>
+      </iso-standard>
+    INPUT
+    expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <html lang='en'>
+  <head/>
+  <body lang='en'>
+    <div class='title-section'>
+      <p>&#160;</p>
+    </div>
+    <br/>
+    <div class='prefatory-section'>
+      <p>&#160;</p>
+    </div>
+    <br/>
+    <div class='main-section'>
+      <div id='C' class='Note'>note</div>
+      <br/>
+      <div id='A'>
+        <h1 class='AbstractTitle'>abstract</h1>
+      </div>
+      <br/>
+      <div class='Section3' id='B'>
+        <h1 class='IntroTitle'>introduction</h1>
+      </div>
+      <p class='zzSTDTitle1'/>
+      <div id='L' class='Admonition'>
+        <p class='AdmonitionTitle' style='text-align:center;'>CAUTION</p>
+        <p>admonition</p>
+      </div>
+      <div id='M'>
+        <h1>Clause 4</h1>
+        <div id='N'>
+          <h2>Introduction</h2>
+        </div>
+        <div id='O'>
+          <span class='zzMoveToFollowing'>
+            <b>Clause 4.2&#160; </b>
+          </span>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+OUTPUT
+    expect(xmlpp(IsoDoc::WordConvert.new({}).convert("test", input, true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
+    <html xmlns:epub='http://www.idpf.org/2007/ops' lang='en'>
+  <head>
+    <style>
+    </style>
+  </head>
+  <body lang='EN-US' link='blue' vlink='#954F72'>
+    <div class='WordSection1'>
+      <p>&#160;</p>
+    </div>
+    <p>
+      <br clear='all' class='section'/>
+    </p>
+    <div class='WordSection2'>
+      <div id='C' class='Note'>
+        <p class='Note'>
+          <span class='note_label'/>
+          <span style='mso-tab-count:1'>&#160; </span>
+        </p>
+        note
+      </div>
+      <p>
+        <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+      </p>
+      <div id='A'>
+        <h1 class='AbstractTitle'>abstract</h1>
+      </div>
+      <p>
+        <br clear='all' style='mso-special-character:line-break;page-break-before:always'/>
+      </p>
+      <div class='Section3' id='B'>
+        <h1 class='IntroTitle'>introduction</h1>
+      </div>
+      <p>&#160;</p>
+    </div>
+    <p>
+      <br clear='all' class='section'/>
+    </p>
+    <div class='WordSection3'>
+      <p class='zzSTDTitle1'/>
+      <div id='L' class='Admonition'>
+        <p class='AdmonitionTitle' style='text-align:center;'>CAUTION</p>
+        <p>admonition</p>
+      </div>
+      <div id='M'>
+        <h1>Clause 4</h1>
+        <div id='N'>
+          <h2>Introduction</h2>
+        </div>
+        <div id='O'>
+          <span class='zzMoveToFollowing'>
+            <b>
+              Clause 4.2
+              <span style='mso-tab-count:1'>&#160; </span>
+            </b>
+          </span>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+    OUTPUT
+    end
+
   it "processes document with no content" do
     expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true))).to be_equivalent_to xmlpp(<<~"OUTPUT")
     <iso-standard xmlns="http://riboseinc.com/isoxml">
@@ -989,5 +1114,4 @@ OUTPUT
             expect(xmlpp(IsoDoc::HtmlConvert.new({}).convert("test", presxml, true))).to be_equivalent_to xmlpp(html)
             end
 
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-14 00:00:00.000000000 Z
+date: 2020-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath