isodoc 0.8.11 → 0.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ae7f6c154716e6a0096058610667183d6f1b963bcc53349384bfc467266bf25
-  data.tar.gz: 0bc77874b82d3ab7212d15a3334402070e7c5d54e9f3b32a66c664535761901c
+  metadata.gz: 3dcfbcdf85aacca4db89d1d07e4ec3f6e79ac4d28b9f45a5bf492c0140140738
+  data.tar.gz: 83450383455cb7d112a2e01d511dcf67e3fccba73b83191561849d4e7160bb01
 SHA512:
-  metadata.gz: 32ff1b4b21ee64655f5c8f5fc85654322934342fe2800a99b7f3f01c4c47e259e2aa707c6ba60c2f8181bdb3a280e8652ccc841fca04d2c4b0a6794dbecfd654
-  data.tar.gz: e9a3bf1c450308324e884095aff193e92b7c77ed114d0c35790a47dcb618e70e433199031bd76ba448fbd01b4ca59076e0d29231e2d0a5c6c78738f1405e3426
+  metadata.gz: 7dd24994b056371af1e7f6df7163681b392cf87473200036bd61036244ca97fc62c3d1ee8cd5ab23dbd3e252e6cdcc73767921cb9d19cbea4264c20ca0408d44
+  data.tar.gz: 9a56c3dc70f1139639749b11c875372447c53656705827d7450492f43476e9f4589953e7cc4a305d8e4523a80daa4be0c6bb8b6cbaa78917d2c2cf8c9ac9ee66

data/README.adoc

@@ -24,6 +24,7 @@ htmlstylesheet:: Stylesheet for HTML output
 htmlcoverpage:: Cover page for HTML output
 htmlintropage:: Introductory page for HTML output
 scripts:: Scripts page for HTML output
+scripts-pdf:: Scripts page for HTML > PDF output
 wordstylesheet:: Stylesheet for Word output
 standardstylesheet:: Secondary stylesheet for Word output
 header:: Header file for Word output

data/lib/isodoc-yaml/i18n-en.yaml

@@ -51,7 +51,7 @@ example: EXAMPLE
 example_xref: Example
 where: where
 wholeoftext: Whole of text
-draft: draft
+draft_label: draft
 inform_annex: informative
 norm_annex: normative
 modified: modified

data/lib/isodoc-yaml/i18n-fr.yaml

@@ -44,7 +44,7 @@ example: EXEMPLE
 example_xref: Exemple
 where: où
 wholeoftext: Ensemble du texte
-draft: brouillon
+draft_label: brouillon
 inform_annex: informative
 norm_annex: normative
 modified: modifié

data/lib/isodoc-yaml/i18n-zh-Hans.yaml

@@ -44,7 +44,7 @@ example: 示例
 example_xref: 示例
 where: 式中
 wholeoftext: 全部
-draft: 稿
+draft_label: 稿
 inform_annex: 资料性附录
 norm_annex: 规范性附录
 modified: 改写

data/lib/isodoc/convert.rb

@@ -34,6 +34,7 @@ module IsoDoc
       @htmlintropage = options[:htmlintropage]
       @wordintropage = options[:wordintropage]
       @scripts = options[:scripts]
+      @scripts_pdf = options[:scripts_pdf]
       @i18nyaml = options[:i18nyaml]
       @ulstyle = options[:ulstyle]
       @olstyle = options[:olstyle]

data/lib/isodoc/function/i18n.rb

@@ -53,7 +53,7 @@ module IsoDoc::Function
       @example_xref_lbl = y["example_xref"]
       @where_lbl = y["where"]
       @wholeoftext_lbl = y["wholeoftext"]
-      @draft_lbl = y["draft"]
+      @draft_lbl = y["draft_label"]
       @inform_annex_lbl = y["inform_annex"]
       @norm_annex_lbl = y["norm_annex"]
       @modified_lbl = y["modified"]

data/lib/isodoc/function/references.rb

@@ -5,16 +5,16 @@ module IsoDoc::Function
     # references anyway; keeping here instead of in IsoDoc::Iso for now
     def docid_l10n(x)
       return x if x.nil?
-      x.gsub(/All Parts/, @all_parts_lbl)
+      x.gsub(/All Parts/, @all_parts_lbl.downcase)
     end
 
     def iso_bibitem_ref_code(b)
       isocode = b.at(ns("./docidentifier")).text
       isodate = b.at(ns("./date[@type = 'published']"))
-      iso_allparts = b.at(ns("./allparts"))
+      allparts = b.at(ns("./allparts"))
       reference = docid_l10n(isocode)
       reference += ":#{date_range(isodate)}" if isodate
-      reference += " (#{@all_parts_lbl})" if iso_allparts&.text == "true"
+      reference += " (#{@all_parts_lbl.downcase})" if allparts&.text == "true"
       reference
     end
 

data/lib/isodoc/function/utils.rb

@@ -128,6 +128,11 @@ module IsoDoc::Function
       Liquid::Template.parse(doc)
     end
 
+    def empty2nil(v)
+      return nil if !v.nil? && v.is_a?(String) && v.empty?
+      v
+    end
+
     def populate_template(docxml, _format)
       meta = @meta.get.merge(@labels)
       docxml = docxml.
@@ -135,7 +140,7 @@ module IsoDoc::Function
         gsub(/\s*\[\/TERMREF\]\s*/, l10n("]")).
         gsub(/\s*\[MODIFICATION\]/, l10n(", #{@modified_lbl} — "))
       template = liquid(docxml)
-      template.render(meta.map { |k, v| [k.to_s, v] }.to_h)
+      template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h)
     end
   end
 end

data/lib/isodoc/html_function/html.rb

@@ -204,7 +204,6 @@ module IsoDoc::HtmlFunction
     end
 
     def move_image1(i, new_full_filename)
-      #system "cp #{i['src']} #{new_full_filename}"
       FileUtils.cp i["src"], new_full_filename
       i["src"] = new_full_filename
       i["width"], i["height"] = Html2Doc.image_resize(i, @maxheight, @maxwidth)

data/lib/isodoc/metadata.rb

@@ -41,8 +41,8 @@ module IsoDoc
     end
 
     def tc(xml)
-      tc_num = xml.at(ns("//editorialgroup/technical-committee/@number"))
-      tc_type = xml.at(ns("//editorialgroup/technical-committee/@type"))&.
+      tc_num = xml.at(ns("//bibdata/editorialgroup/technical-committee/@number"))
+      tc_type = xml.at(ns("//bibdata/editorialgroup/technical-committee/@type"))&.
         text || "TC"
       if tc_num
         tcid = "#{tc_type} #{tc_num.text}"
@@ -52,8 +52,8 @@ module IsoDoc
     end
 
     def sc(xml)
-      sc_num = xml.at(ns("//editorialgroup/subcommittee/@number"))
-      sc_type = xml.at(ns("//editorialgroup/subcommittee/@type"))&.text || "SC"
+      sc_num = xml.at(ns("//bibdata/editorialgroup/subcommittee/@number"))
+      sc_type = xml.at(ns("//bibdata/editorialgroup/subcommittee/@type"))&.text || "SC"
       if sc_num
         scid = "#{sc_type} #{sc_num.text}"
         set(:sc, scid)
@@ -62,8 +62,8 @@ module IsoDoc
     end
 
     def wg(xml)
-      wg_num = xml.at(ns("//editorialgroup/workgroup/@number"))
-      wg_type = xml.at(ns("//editorialgroup/workgroup/@type"))&.text || "WG"
+      wg_num = xml.at(ns("//bibdata/editorialgroup/workgroup/@number"))
+      wg_type = xml.at(ns("//bibdata/editorialgroup/workgroup/@type"))&.text || "WG"
       if wg_num
         wgid = "#{wg_type} #{wg_num.text}"
         set(:wg, wgid)
@@ -72,7 +72,7 @@ module IsoDoc
     end
 
     def secretariat(xml)
-      sec = xml.at(ns("//editorialgroup/secretariat"))
+      sec = xml.at(ns("//bibdata/editorialgroup/secretariat"))
       set(:secretariat, sec.text) if sec
     end
 
@@ -112,9 +112,9 @@ module IsoDoc
     end
 
     def docnumber(isoxml)
-      docnumber = isoxml.at(ns("//project-number"))
-      partnumber = isoxml.at(ns("//project-number/@part"))
-      subpartnumber = isoxml.at(ns("//project-number/@subpart"))
+      docnumber = isoxml.at(ns("//bibdata/docidentifier/project-number"))
+      partnumber = isoxml.at(ns("//bibdata/docidentifier/project-number/@part"))
+      subpartnumber = isoxml.at(ns("//bibdata/docidentifier/project-number/@subpart"))
       dn = docnumber&.text || ""
       dn += "-#{partnumber.text}" if partnumber
       dn += "-#{subpartnumber.text}" if subpartnumber
@@ -144,7 +144,7 @@ module IsoDoc
     def draftinfo(draft, revdate)
       draftinfo = ""
       if draft
-        draftinfo = " (#{@labels["draft"]} #{draft}"
+        draftinfo = " (#{@labels["draft_label"]} #{draft}"
         draftinfo += ", #{revdate}" if revdate
         draftinfo += ")"
       end
@@ -152,7 +152,7 @@ module IsoDoc
     end
 
     def version(isoxml, _out)
-      set(:docyear, isoxml&.at(ns("//copyright/from"))&.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)
       set(:draftinfo,
@@ -160,7 +160,7 @@ module IsoDoc
     end
 
     def title(isoxml, _out)
-      main = isoxml&.at(ns("//title[@language='en']"))&.text
+      main = isoxml&.at(ns("//bibdata/title[@language='en']"))&.text
       set(:doctitle, main)
     end
 

data/lib/isodoc/pdf_convert.rb

@@ -11,7 +11,9 @@ module IsoDoc
     include HtmlFunction::Html
 
     def initialize(options)
+      @standardstylesheet = nil
       super
+      @scripts = @scripts_pdf if @scripts_pdf
       @tmpimagedir = "_pdfimages"
       @maxwidth = 500
       @maxheight = 800

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "0.8.11".freeze
+  VERSION = "0.8.13".freeze
 end

data/spec/isodoc/postproc_spec.rb

@@ -6,7 +6,9 @@ RSpec.describe IsoDoc do
     system "rm -f test.html"
     IsoDoc::HtmlConvert.new({wordstylesheet: "spec/assets/word.css", htmlstylesheet: "spec/assets/html.css", filename: "test"}).convert("test", <<~"INPUT", false)
         <iso-standard xmlns="http://riboseinc.com/isoxml">
+        <bibdata>
         <title language="en">test</title>
+        </bibdata>
     <preface><foreword>
     <note>
   <p id="_f06fd0d1-a203-4f3d-a515-0bdba0f8d83f">These results are based on a study carried out on three different types of kernel.</p>

data/spec/isodoc/ref_spec.rb

@@ -94,7 +94,7 @@ RSpec.describe IsoDoc do
                  <h1>1.&#160; Normative references</h1>
                  <p>The following documents are referred to in the text in such a way that some or all of their content constitutes requirements of this document. For dated references, only the edition cited applies. For undated references, the latest edition of the referenced document (including any amendments) applies.</p>
                  <p id="ISO712" class="NormRef">ISO 712, <i> Cereals and cereal products</i></p>
-                 <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="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&#8211;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>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.8.13
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-01 00:00:00.000000000 Z
+date: 2018-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath