isodoc 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3369c7722ffc0923f81c46088f759c811375571e062877a7bfbf2d06f2bb126b
-  data.tar.gz: 6112987ce5342f328f9c2cf376636258b5700f0eff46ee0297992339b46b8578
+  metadata.gz: '00160137956d6bf94a5ae197a7cb4b88ad74c0a4c60b421cb37bbe23abe8cd31'
+  data.tar.gz: aaeb75e3aecc1cf19729b046332dcab2ca732357f08c22f2631eddf65ec5bf5f
 SHA512:
-  metadata.gz: 1dab35da108b9168fa49e32a36632a8781e9046cd65a066ea42a4fd6de82e7d7596ae000c33bb0ddd3c450541cbe749b5f97c9ed56f9bf12ffc1ecb7ad44f129
-  data.tar.gz: 5fb411b350d0792a908d2444ad37f2d40ac8728d39943fe7925d6a7939949d635250434217d58f37c15cf37e0facca020de6af441ad91605e0365875f57c61e1
+  metadata.gz: f2ebe7192825e49355716ec580fc6da530d48475a6da2a9d4896c0a7d36927967b02f0f1f1a1cc198d91f0f4a1839d257bdc1b9d6e4d0b73ecc288ee08db3709
+  data.tar.gz: 01e04c0e9c669c5d6746fc5618f517bda045258202e234550223d37180d4db5d2dea873df2e651733f64cbf942d7963b5d4634a236f7e21949ee4467c536dcf1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    isodoc (0.9.10)
+    isodoc (0.9.11)
       asciimath
       html2doc (~> 0.8.6)
       htmlentities (~> 4.3.4)
@@ -61,7 +61,7 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.13)
-    metanorma (0.3.1)
+    metanorma (0.3.2)
     method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)

data/lib/isodoc/function/i18n.rb

@@ -3,24 +3,27 @@ require "yaml"
 # TODO: Cleanup and generalize
 module IsoDoc::Function
   module I18n
+    def load_yaml(lang, script)
+      if @i18nyaml then YAML.load_file(@i18nyaml)
+      elsif lang == "en"
+        YAML.load_file(File.join(File.dirname(__FILE__),
+                                 "../../isodoc-yaml/i18n-en.yaml"))
+      elsif lang == "fr"
+        YAML.load_file(File.join(File.dirname(__FILE__),
+                                 "../../isodoc-yaml/i18n-fr.yaml"))
+      elsif lang == "zh" && script == "Hans"
+        YAML.load_file(File.join(File.dirname(__FILE__),
+                                 "../../isodoc-yaml/i18n-zh-Hans.yaml"))
+      else
+        YAML.load_file(File.join(File.dirname(__FILE__),
+                                 "../../isodoc-yaml/i18n-en.yaml"))
+      end
+    end
+
     def i18n_init(lang, script)
       @lang = lang
       @script = script
-      y = if @i18nyaml
-            YAML.load_file(@i18nyaml)
-          elsif lang == "en"
-            YAML.load_file(File.join(File.dirname(__FILE__),
-                                     "../../isodoc-yaml/i18n-en.yaml"))
-          elsif lang == "fr"
-            YAML.load_file(File.join(File.dirname(__FILE__),
-                                     "../../isodoc-yaml/i18n-fr.yaml"))
-          elsif lang == "zh" && script == "Hans"
-            YAML.load_file(File.join(File.dirname(__FILE__),
-                                     "../../isodoc-yaml/i18n-zh-Hans.yaml"))
-          else
-            YAML.load_file(File.join(File.dirname(__FILE__),
-                                     "../../isodoc-yaml/i18n-en.yaml"))
-          end
+      y = load_yaml(lang, script)
       @term_def_boilerplate = y["term_def_boilerplate"]
       @scope_lbl = y["scope"]
       @symbols_lbl = y["symbols"]

data/lib/isodoc/function/inline.rb

@@ -50,8 +50,9 @@ module IsoDoc::Function
     end
 
     def xref_parse(node, out)
-      linkend = get_linkend(node)
-      out.a(**{ "href": "#" + node["target"] }) { |l| l << linkend }
+      target = /#/.match(node["target"]) ? node["target"].sub(/#/, ".html#") :
+        "##{node["target"]}"
+      out.a(**{ "href": target }) { |l| l << get_linkend(node) }
     end
 
     def eref_localities(refs, target)

data/lib/isodoc/function/to_word_html.rb

@@ -93,6 +93,7 @@ module IsoDoc::Function
       @meta.bibdate isoxml, out
       @meta.relations isoxml, out
       @meta.version isoxml, out
+      @meta.url isoxml, out
       @meta.get
     end
 
@@ -128,6 +129,12 @@ module IsoDoc::Function
       out.a **attr_code(id: node["id"])
     end
 
+    def keyword_parse(node, out)
+      out.span **{ class: "keyword" } do |s|
+        s << node.inner_html
+      end
+    end
+
     def parse(node, out)
       if node.text?
         text_parse(node, out)
@@ -139,6 +146,7 @@ module IsoDoc::Function
         when "sub" then out.sub { |e| e << node.inner_html }
         when "tt" then out.tt { |e| e << node.inner_html }
         when "strike" then out.s { |e| e << node.inner_html }
+        when "keyword" then keyword_parse(node, out)
         when "smallcap" then smallcap_parse(node, out)
         when "br" then out.br
         when "hr" then out.hr

data/lib/isodoc/html_function/html.rb

@@ -221,7 +221,22 @@ module IsoDoc::HtmlFunction
       i["width"], i["height"] = Html2Doc.image_resize(i, local_filename, @maxheight, @maxwidth)
     end
 
+    def html_toc_entry(level, header)
+      %(<li class="h#{level}"><a href="##{header['id']}">#{header_strip(header)}</a></li>)
+    end
+
     def html_toc(docxml)
+=begin
+      idx = docxml.at("//div[@id = 'toc']") or return docxml
+      toc = "<ul>"
+      tocidx = 0
+      docxml.xpath("//main//h1 | //main//h2[not(@class = 'TermNum')]").each do |h|
+        h["id"] ||= "toc#{tocidx}"
+        toc += html_toc_entry(h.name == "h1" ? 1 : 2, h)
+        tocidx += 1
+      end
+      idx.children = "#{toc}</ul>"
+=end
       docxml
     end
   end

data/lib/isodoc/metadata.rb

@@ -1,7 +1,7 @@
 module IsoDoc
   class Metadata
     DATETYPES = %w{published accessed created implemented obsoleted confirmed
-    updated issued}.freeze
+    updated issued received}.freeze
 
     def ns(xpath)
       Common::ns(xpath)
@@ -113,11 +113,17 @@ module IsoDoc
 
     def docstatus(isoxml, _out)
       docstatus = isoxml.at(ns("//bibdata/status"))
+      set(:unpublished, true)
       if docstatus
         set(:status, status_print(docstatus.text))
+        set(:unpublished, unpublished(docstatus.text))
       end
     end
 
+    def unpublished(status)
+      status.downcase == "published"
+    end
+
     def status_print(status)
       status.split(/-/).map{ |w| w.capitalize }.join(" ")
     end
@@ -161,5 +167,13 @@ module IsoDoc
       set(:obsoletes, id.text) if id
       set(:obsoletes_part, locality.text) if locality
     end
+
+    def url(xml, _out)
+      a = xml.at(ns("//bibdata/source[not(@type)]")) and set(:url, a.text)
+      a = xml.at(ns("//bibdata/source[@type = 'html']")) and set(:html, a.text)
+      a = xml.at(ns("//bibdata/source[@type = 'xml']")) and set(:xml, a.text)
+      a = xml.at(ns("//bibdata/source[@type = 'pdf']")) and set(:pdf, a.text)
+      a = xml.at(ns("//bibdata/source[@type = 'doc']")) and set(:doc, a.text)
+    end
   end
 end

data/lib/isodoc/pdf_convert.rb

@@ -30,5 +30,11 @@ module IsoDoc
       ::Metanorma::Output::Pdf.new.convert(filename + ".html", outname_html + ".pdf")
       FileUtils.rm_r ["#{filename}.html", tmpimagedir]
     end
+
+    def xref_parse(node, out)
+      target = /#/.match(node["target"]) ? node["target"].sub(/#/, ".pdf#") :
+        "##{node["target"]}"
+      out.a(**{ "href": target }) { |l| l << get_linkend(node) }
+    end
   end
 end

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.9.10".freeze
+  VERSION = "0.9.11".freeze
 end

data/lib/isodoc/word_function/body.rb

@@ -202,5 +202,11 @@ module IsoDoc::WordFunction
       out.img **attr_code(attrs)
       image_title_parse(out, caption)
     end
+
+    def xref_parse(node, out)
+      target = /#/.match(node["target"]) ? node["target"].sub(/#/, ".doc#") :
+        "##{node["target"]}"
+      out.a(**{ "href": target }) { |l| l << get_linkend(node) }
+    end
   end
 end

data/spec/isodoc/inline_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe IsoDoc do
     <preface><foreword>
     <p>
     <em>A</em> <strong>B</strong> <sup>C</sup> <sub>D</sub> <tt>E</tt>
-    <strike>F</strike> <smallcap>G</smallcap> <br/> <hr/>
+    <strike>F</strike> <smallcap>G</smallcap> <keyword>I</keyword> <br/> <hr/>
     <bookmark id="H"/> <pagebreak/>
     </p>
     </foreword></preface>
@@ -20,7 +20,7 @@ RSpec.describe IsoDoc do
                  <h1 class="ForewordTitle">Foreword</h1>
                  <p>
        <i>A</i> <b>B</b> <sup>C</sup> <sub>D</sub> <tt>E</tt>
-       <s>F</s> <span style="font-variant:small-caps;">G</span> <br/> <hr/>
+       <s>F</s> <span style="font-variant:small-caps;">G</span> <span class="keyword">I</span> <br/> <hr/>
        <a id="H"/> <br/>
        </p>
                </div>

data/spec/isodoc/metadata_spec.rb

@@ -12,6 +12,11 @@ RSpec.describe IsoDoc do
     <bibdata type="international-standard">
   <title>The Incredible Mr Ripley</title>
   <title language="en">Cereals and pulses</title>
+  <source>URL A</source>
+  <source type="html">URL B</source>
+  <source type="xml">URL C</source>
+  <source type="pdf">URL D</source>
+  <source type="doc">URL E</source>
   <docidentifier>17301-1</docidentifier>
   <docnumber>17301</docnumber>
   <date type="published"><on>2011</on></date>
@@ -55,7 +60,7 @@ RSpec.describe IsoDoc do
 </version>
 </iso-standard>
 INPUT
-{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :confirmeddate=>"XXX", :createddate=>"2010&ndash;2011", :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"], :ics=>"XXX", :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"2014", :obsoletes=>nil, :obsoletes_part=>nil, :publisheddate=>"2011", :revdate=>"2016-05-01", :sc=>"SC 4", :secretariat=>"GB", :status=>"Committee draft", :tc=>"TC 34", :updateddate=>"XXX", :wg=>"WG 3"}
+{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :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=>false, :updateddate=>"XXX", :url=>"URL A", :wg=>"WG 3", :xml=>"URL C"}
 OUTPUT
   end
 
@@ -118,7 +123,7 @@ OUTPUT
 </version>
 </iso-standard>
 INPUT
-{:accesseddate=>"XXX", :agency=>"ISO/IEC", :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", :revdate=>"2016-05-01", :sc=>"DEF 4", :secretariat=>"XXXX", :status=>"Published", :tc=>"ABC 34", :updateddate=>"XXX", :wg=>"GHI 3"}
+{:accesseddate=>"XXX", :agency=>"ISO/IEC", :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=>true, :updateddate=>"XXX", :wg=>"GHI 3"}
 OUTPUT
   end
 

data/spec/isodoc/xref_spec.rb

@@ -1,6 +1,57 @@
 require "spec_helper"
 
 RSpec.describe IsoDoc do
+  it "cross-references external documents in HTML" do
+    expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)).to be_equivalent_to <<~"OUTPUT"
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface>
+    <foreword>
+    <p>
+    <xref target="a#b"/>
+    </p>
+    </foreword>
+    </preface>
+    </iso-standard
+    INPUT
+        #{HTML_HDR}
+      <br/>
+      <div>
+        <h1 class="ForewordTitle">Foreword</h1>
+        <p>
+<a href="a.html#b">a#b</a>
+</p>
+      </div>
+      <p class="zzSTDTitle1"/>
+    </div>
+  </body>
+</html>
+    OUTPUT
+  end
+
+  it "cross-references external documents in DOC" do
+    expect(IsoDoc::WordConvert.new({}).convert("test", <<~"INPUT", true).sub(/^.*<div class="WordSection2">/m, '<div class="WordSection2">').sub(%r{</div>.*$}m, "</div>")).to be_equivalent_to <<~"OUTPUT"
+    <iso-standard xmlns="http://riboseinc.com/isoxml">
+    <preface>
+    <foreword>
+    <p>
+    <xref target="a#b"/>
+    </p>
+    </foreword>
+    </preface>
+    </iso-standard
+    INPUT
+           <div class="WordSection2">
+             <br clear="all" style="mso-special-character:line-break;page-break-before:always"/>
+             <div>
+               <h1 class="ForewordTitle">Foreword</h1>
+               <p>
+       <a href="a.doc#b">a#b</a>
+       </p>
+             </div>
+    OUTPUT
+  end
+
+
   it "cross-references notes" do
     expect(IsoDoc::HtmlConvert.new({}).convert("test", <<~"INPUT", true)). to be_equivalent_to <<~"OUTPUT"
     <iso-standard xmlns="http://riboseinc.com/isoxml">

metadata

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