isodoc 1.0.3 → 1.0.4

data/lib/isodoc/function/references.rb

@@ -13,8 +13,7 @@ module IsoDoc::Function
       list.p **attr_code(iso_bibitem_entry_attrs(b, bibliography)) do |r|
         id = bibitem_ref_code(b)
         identifier = render_identifier(id)
-        if bibliography
-          ref_entry_code(r, ordinal, identifier, id)
+        if bibliography then ref_entry_code(r, ordinal, identifier, id)
         else
           r << "#{identifier}, "
         end
@@ -48,8 +47,10 @@ module IsoDoc::Function
     end
 
     def bibitem_ref_code(b)
-      id = b.at(ns("./docidentifier[not(@type = 'DOI' or @type = 'metanorma' or @type = 'ISSN' or @type = 'ISBN')]"))
-      id ||= b.at(ns("./docidentifier[not(@type = 'DOI' or @type = 'ISSN' or @type = 'ISBN')]"))
+      id = b.at(ns("./docidentifier[not(@type = 'DOI' or @type = 'metanorma' "\
+                   "or @type = 'ISSN' or @type = 'ISBN')]"))
+      id ||= b.at(ns("./docidentifier[not(@type = 'DOI' or @type = 'ISSN' or "\
+                     "@type = 'ISBN')]"))
       id ||= b.at(ns("./docidentifier")) 
       return id if id
       id = Nokogiri::XML::Node.new("docidentifier", b.document)
@@ -122,19 +123,22 @@ module IsoDoc::Function
     def is_standard(b)
       ret = false
       b.xpath(ns("./docidentifier")).each do |id|
-        next if id["type"].nil? || %w(metanorma DOI ISSN ISBN).include?(id["type"])
+        next if id["type"].nil? ||
+          %w(metanorma DOI ISSN ISBN).include?(id["type"])
         ret = true
       end
       ret
     end
 
-    def biblio_list(f, div, bibliography)
-      f.xpath(ns("./bibitem")).each_with_index do |b, i|
+    def biblio_list(f, div, biblio)
+      i = 0
+      f.xpath(ns("./bibitem | ./note")).each do |b|
         next if implicit_reference(b)
-        if(is_standard(b))
-          std_bibitem_entry(div, b, i + 1, bibliography)
+        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)
         else
-          nonstd_bibitem(div, b, i + 1, bibliography)
+          nonstd_bibitem(div, b, i, biblio)
         end
       end
     end
@@ -147,7 +151,7 @@ module IsoDoc::Function
         num = num + 1
         clause_name(num, @normref_lbl, div, nil)
         f.elements.reject do |e|
-          ["reference", "title", "bibitem"].include? e.name
+          %w(reference title bibitem note).include? e.name
         end.each { |e| parse(e, div) }
         biblio_list(f, div, false)
       end
@@ -157,14 +161,13 @@ module IsoDoc::Function
     BIBLIOGRAPHY_XPATH = "//bibliography/clause[title = 'Bibliography'] | "\
       "//bibliography/references[title = 'Bibliography']".freeze
 
-
     def bibliography(isoxml, out)
       f = isoxml.at(ns(BIBLIOGRAPHY_XPATH)) || return
       page_break(out)
       out.div do |div|
         div.h1 @bibliography_lbl, **{ class: "Section3" }
         f.elements.reject do |e|
-          ["reference", "title", "bibitem"].include? e.name
+          %w(reference title bibitem note).include? e.name
         end.each { |e| parse(e, div) }
         biblio_list(f, div, true)
       end
@@ -173,26 +176,21 @@ module IsoDoc::Function
     def bibliography_parse(node, out)
       title = node&.at(ns("./title"))&.text || ""
       out.div do |div|
-        div.h2 title, **{ class: "Section3" }
+        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|
-          ["reference", "title", "bibitem"].include? e.name
+          %w(reference title bibitem note).include? e.name
         end.each { |e| parse(e, div) }
         biblio_list(node, div, true)
       end
     end
 
     def format_ref(ref, prefix, isopub, date, allparts)
-      if isopub
-        #if date
-        #on = date.at(ns("./on"))
-        #ref += on&.text == "--" ? ":--" : "" # ":#{date_range(date)}"
-        #ref += " (all parts)" if allparts
-        # ref = docid_prefix(prefix, ref)
-        #end
-      end
       ref = docid_prefix(prefix, ref)
-      return "[#{ref}]" if /^\d+$/.match(ref) && !prefix && !/^\[.*\]$/.match(ref)
-      ref
+      return "[#{ref}]" if /^\d+$/.match(ref) && !prefix &&
+        !/^\[.*\]$/.match(ref)
+        ref
     end
 
     def reference_names(ref)
@@ -201,7 +199,8 @@ module IsoDoc::Function
       prefix = docid["type"]
       date = ref.at(ns("./date[@type = 'published']"))
       allparts = ref.at(ns("./extent[@type='part'][referenceFrom='all']"))
-      reference = format_ref(docid_l10n(docid.text), prefix, isopub, date, allparts)
+      reference = format_ref(docid_l10n(docid.text), prefix, isopub, date,
+                             allparts)
       @anchors[ref["id"]] = { xref: reference }
     end
 

data/lib/isodoc/function/utils.rb

@@ -40,12 +40,16 @@ module IsoDoc::Function
       end.to_h
     end
 
+    DOCTYPE_HDR = '<!DOCTYPE html SYSTEM
+          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'.freeze
+
     def to_xhtml(xml)
       xml.gsub!(/<\?xml[^>]*>/, "")
-      unless /<!DOCTYPE /.match xml
-        xml = '<!DOCTYPE html SYSTEM
-          "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' + xml
-      end
+      /<!DOCTYPE /.match xml or xml = DOCTYPE_HDR + xml
+      xml = xml.split(/(\&[^ \r\n\t#;]+;)/).map do |t|
+        /^(\&[^ \t\r\n#;]+;)/.match(t) ? 
+          HTMLEntities.new.encode(HTMLEntities.new.decode(t), :hexadecimal) : t
+      end.join("")
       Nokogiri::XML.parse(xml)
     end
 
@@ -85,11 +89,11 @@ module IsoDoc::Function
 
     def sentence_join(array)
       return "" if array.nil? || array.empty?
-      if array.length == 1
-        array[0]
+      if array.length == 1 then array[0]
       else
-        IsoDoc::Function::I18n::l10n("#{array[0..-2].join(', ')} #{@and_lbl} #{array.last}",
-                                    @lang, @script)
+        IsoDoc::Function::I18n::l10n("#{array[0..-2].join(', ')} "\
+                                     "#{@and_lbl} #{array.last}",
+                                     @lang, @script)
       end
     end
 

data/lib/isodoc/function/xref_sect_gen.rb

@@ -102,7 +102,7 @@ module IsoDoc::Function
     def annex_names(clause, num)
       @anchors[clause["id"]] = { label: annex_name_lbl(clause, num), type: "clause",
                                  xref: "#{@annex_lbl} #{num}", level: 1 }
-      clause.xpath(ns("./clause")).each_with_index do |c, i|
+      clause.xpath(ns("./clause | ./references")).each_with_index do |c, i|
         annex_names1(c, "#{num}.#{i + 1}", 2)
       end
       hierarchical_asset_names(clause, num)
@@ -111,7 +111,7 @@ module IsoDoc::Function
     def annex_names1(clause, num, level)
       @anchors[clause["id"]] = { label: num, xref: "#{@annex_lbl} #{num}",
                                  level: level, type: "clause" }
-      clause.xpath(ns("./clause")).each_with_index do |c, i|
+      clause.xpath(ns("./clause | ./references")).each_with_index do |c, i|
         annex_names1(c, "#{num}.#{i + 1}", level + 1)
       end
     end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.0.3".freeze
+  VERSION = "1.0.4".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -213,6 +213,7 @@ module IsoDoc::WordFunction
     def image_parse(node, out, caption)
       attrs = { src: imgsrc(node["src"]),
                 height: node["height"],
+                alt: node["alt"],
                 width: node["width"] }
       if node["height"] == "auto" || node["width"] == "auto"
         attrs[:height] = nil
@@ -238,13 +239,13 @@ module IsoDoc::WordFunction
     end
 
     def make_table_attr(node)
-      super.merge({
+      super.merge(attr_code({
         summary: node["summary"],
         style: "mso-table-lspace:15.0cm;margin-left:423.0pt;"\
         "mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;"\
         "mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;"\
         "mso-table-overlap:never;border-spacing:0;border-width:1px;"
-      })
+      }))
     end
 
     def table_parse(node, out)

data/spec/isodoc/blocks_spec.rb

@@ -349,6 +349,7 @@ B</pre>
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface><foreword>
     <example id="samplecode">
+    <name>Title</name>
   <p>Hello</p>
 </example>
     </foreword></preface>
@@ -359,7 +360,7 @@ B</pre>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
                  <div id="samplecode" class="example">
-                 <p class="example-title">EXAMPLE</p>
+                 <p class="example-title">EXAMPLE&#160;&#8212; Title</p>
          <p>Hello</p>
                  </div>
                </div>
@@ -379,6 +380,7 @@ B</pre>
   <p>Hello</p>
 </example>
     <example id="samplecode2">
+    <name>Title</name>
   <p>Hello</p>
 </example>
     <example id="samplecode3" unnumbered="true">
@@ -396,7 +398,7 @@ B</pre>
          <p>Hello</p>
                  </div>
                  <div id="samplecode2" class="example">
-                 <p class="example-title">EXAMPLE  2</p>
+                 <p class="example-title">EXAMPLE  2&#160;&#8212; Title</p>
                  <p>Hello</p>
                  </div>
                  <div id="samplecode3" class="example">

data/spec/isodoc/postproc_spec.rb

@@ -263,7 +263,7 @@ RSpec.describe IsoDoc do
                <div><a name="_terms_and_definitions" id="_terms_and_definitions"></a><h1>1.<span style="mso-tab-count:1">&#xA0; </span>Terms and definitions</h1>
        <p class="TermNum"><a name="paddy1" id="paddy1"></a>1.1.</p><p class="Terms" style="text-align:left;">paddy</p>
        <p class="MsoNormal"><a name="_eb29b35e-123e-4d1c-b50b-2714d41e747f" id="_eb29b35e-123e-4d1c-b50b-2714d41e747f"></a>rice retaining its husk after threshing</p>
-       <p class="MsoNormal">[SOURCE: <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]</p></div>
+       <p class="MsoNormal">[SOURCE: <a href="#ISO7301">ISO 7301:2011, Clause 3.1</a>, modified &#x2014; The term "cargo rice" is shown as deprecated, and Note 1 to entry is not included here]</p></div>
              </div>
     OUTPUT
   end

data/spec/isodoc/ref_spec.rb

@@ -63,6 +63,7 @@ RSpec.describe IsoDoc do
   <formattedref format="application/x-isodoc+xml"><smallcap>Standard No I.C.C 167</smallcap>. <em>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</em> (see <link target="http://www.icc.or.at"/>)</formattedref>
   <docidentifier type="ICC">167</docidentifier>
 </bibitem>
+<note><p>This is an annotation of ISO 20483:2013-2014</p></note>
 
 </references><references id="_bibliography" obligation="informative">
   <title>Bibliography</title>
@@ -88,6 +89,8 @@ RSpec.describe IsoDoc do
     </organization>
   </contributor>
 </bibitem>
+<note><p>This is an annotation of document ISSN.</p></note>
+<note><p>This is another annotation of document ISSN.</p></note>
 <bibitem id="ISO3696" type="standard">
   <title format="text/plain">Water for analytical laboratory use</title>
   <docidentifier type="ISO">ISO 3696</docidentifier>
@@ -138,12 +141,21 @@ RSpec.describe IsoDoc do
                <p id="ISO16634" class="NormRef">ISO 16634:-- (all parts)<a rel="footnote" href="#fn:1" epub:type="footnote"><sup>1</sup></a>, <i>Cereals, pulses, milled cereal products, oilseeds and animal feeding stuffs</i></p>
                <p id="ISO20483" class="NormRef">ISO 20483:2013-2014, <i>Cereals and pulses</i></p>
                <p id="ref1" class="NormRef">ICC 167, <span style="font-variant:small-caps;">Standard No I.C.C 167</span>. <i>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</i> (see <a href="http://www.icc.or.at">http://www.icc.or.at</a>)</p>
+               <div id="" class="Note">
+                 <p><span class="note_label">NOTE</span>&#160; This is an annotation of ISO 20483:2013-2014</p>
+               </div>
              </div>
              <br/>
              <div>
                <h1 class="Section3">Bibliography</h1>
                <p id="ISBN" class="Biblio">[1]&#160; <i>Chemicals for analytical laboratory use</i></p>
                <p id="ISSN" class="Biblio">[2]&#160; <i>Instruments for analytical laboratory use</i></p>
+               <div id="" class="Note">
+  <p><span class="note_label">NOTE</span>&#160; This is an annotation of document ISSN.</p>
+</div>
+<div id="" class="Note">
+  <p><span class="note_label">NOTE</span>&#160; This is another annotation of document ISSN.</p>
+</div>
                <p id="ISO3696" class="Biblio">[3]&#160; ISO 3696, <i>Water for analytical laboratory use</i></p>
                <p id="ref10" class="Biblio">[10]&#160; <span style="font-variant:small-caps;">Standard No I.C.C 167</span>. <i>Determination of the protein content in cereal and cereal products for food and animal feeding stuffs according to the Dumas combustion method</i> (see <a href="http://www.icc.or.at">http://www.icc.or.at</a>)</p>
                <p id="ref11" class="Biblio">[5]&#160; IETF RFC 10, <i>Internet Calendaring and Scheduling Core Object Specification (iCalendar)</i></p>

data/spec/isodoc/section_spec.rb

@@ -84,6 +84,7 @@ RSpec.describe IsoDoc do
          <clause id="Q1" inline-header="false" obligation="normative">
          <title>Annex A.1a</title>
          </clause>
+         <references id="Q2"><title>Annex Bibliography</title></references>
        </clause>
        </annex><bibliography><references id="R" obligation="informative">
          <title>Normative References</title>
@@ -160,6 +161,7 @@ RSpec.describe IsoDoc do
            <div id="Q1">
            <h3>A.1.1. Annex A.1a</h3>
            </div>
+           <div><h3>A.1.2. Annex Bibliography</h3></div>
          </div>
 
                 </div>

data/spec/isodoc/table_spec.rb

@@ -142,6 +142,9 @@ RSpec.describe IsoDoc do
     <iso-standard xmlns="http://riboseinc.com/isoxml">
     <preface>
     <foreword>
+      <table id="tableD-0">
+      <tbody><tr><td>A</td></tr></tbody>
+      </table>
       <table id="tableD-1" alt="tool tip" summary="long desc">
   <name>Repeatability and reproducibility of husked rice yield</name>
   <thead>
@@ -206,8 +209,18 @@ RSpec.describe IsoDoc do
                <p><br clear="all" style="mso-special-character:line-break;page-break-before:always"/></p>
                <div>
                  <h1 class="ForewordTitle">Foreword</h1>
-                 <p class="TableTitle" style="text-align:center;">Table 1&#160;&#8212; Repeatability and reproducibility of husked rice yield</p>
+                 <p class="TableTitle" style="text-align:center;">Table 1</p>
                  <div align="center">
+                 <table id="tableD-0" class="MsoISOTable" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;">
+                   <tbody>
+                     <tr>
+                       <td style="border-top:solid windowtext 1.5pt;mso-border-top-alt:solid windowtext 1.5pt;border-bottom:solid windowtext 1.5pt;mso-border-bottom-alt:solid windowtext 1.5pt;">A</td>
+                     </tr>
+                   </tbody>
+                 </table>
+                 </div>
+                 <p class="TableTitle" style="text-align:center;">Table 2&#160;&#8212; Repeatability and reproducibility of husked rice yield</p>
+                  <div align="center">
                  <table id="tableD-1" class="MsoISOTable" style="mso-table-lspace:15.0cm;margin-left:423.0pt;mso-table-rspace:15.0cm;margin-right:423.0pt;mso-table-bspace:14.2pt;mso-table-anchor-vertical:paragraph;mso-table-anchor-horizontal:column;mso-table-overlap:never;border-spacing:0;border-width:1px;" title="tool tip" summary="long desc">
                    <thead>
                      <tr>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-27 00:00:00.000000000 Z
+date: 2019-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -301,25 +301,34 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/macos.yml"
+- ".github/workflows/ubuntu.yml"
+- ".github/workflows/windows.yml"
 - ".hound.yml"
 - ".oss-guides.rubocop.yml"
 - ".rubocop.ribose.yml"
 - ".rubocop.tb.yml"
 - ".rubocop.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
 - LICENSE
 - README.adoc
 - Rakefile
-- appveyor.yml
 - bin/rspec
 - isodoc.gemspec
 - lib/isodoc-yaml/i18n-en.yaml
 - lib/isodoc-yaml/i18n-fr.yaml
 - lib/isodoc-yaml/i18n-zh-Hans.yaml
 - lib/isodoc.rb
+- lib/isodoc/base_style/all.scss
+- lib/isodoc/base_style/bands.scss
+- lib/isodoc/base_style/blocks.scss
+- lib/isodoc/base_style/coverpage.scss
+- lib/isodoc/base_style/defaults.scss
+- lib/isodoc/base_style/nav.scss
+- lib/isodoc/base_style/reset.scss
+- lib/isodoc/base_style/typography.scss
 - lib/isodoc/class_utils.rb
 - lib/isodoc/common.rb
 - lib/isodoc/convert.rb

data/.travis.yml

@@ -1,22 +0,0 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
-language: ruby
-cache: bundler
-os:
-- linux
-- osx
-rvm:
-- 2.6
-- 2.5
-- 2.4
-- ruby-head
-before_install: 
-- nvm install 8
-- npm install -g puppeteer
-- npm install
-- gem install bundler -v "~> 2"
-- bundle update
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-

data/appveyor.yml

@@ -1,37 +0,0 @@
-# Auto-generated !!! Do not edit it manually
-# use ci-master https://github.com/metanorma/metanorma-build-scripts
-version: '{build}'
-
-cache:
-  - vendor/bundle
-
-environment:
-  matrix:
-    - RUBY_VERSION: 26
-    - RUBY_VERSION: 25
-    - RUBY_VERSION: 24
-    - RUBY_VERSION: _trunk
-
-matrix:
-  allow_failures:
-    - RUBY_VERSION: _trunk
-
-install:
-  - ps: . { iwr -useb https://raw.githubusercontent.com/metanorma/metanorma-build-scripts/master/appveyor.ps1 } | iex
-  - refreshenv
-
-build_script:
-  - set PATH=C:\Ruby%RUBY_VERSION%\bin;%PATH%
-  - set GIT_TERMINAL_PROMPT=0
-  - gem install bundler -v "~> 2"
-  - bundle config --local path vendor/bundle
-  - bundle update
-  - bundle install
-
-before_test:
-  - ruby -v
-  - gem -v
-  - bundle -v
-
-test_script:
-  - bundle exec rake