isodoc 1.0.16 → 1.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b8b0f152601a2bbeb84c54de21063c1c8a3153b80a8d7c9e7e72af587afadf2
-  data.tar.gz: 8e3f19d7bc9d426db9bd2bd49ebd4005bc24ba03ce9add831341780cf2f24b7d
+  metadata.gz: 10a62178041dae35a25c840c632a5b2bc6dc60e16c30db960e6d6781fbb3e7a6
+  data.tar.gz: 201fe7bf7a28f28e76115f8085f4bbce97e10d84395c46064a7e592776146bfa
 SHA512:
-  metadata.gz: fac36a308df3caa41ed65253c0248f74d6bd21cd1341f7996ef30195ac8cadbd2679ac6806c82dbabe9b2f355c39e42c2687d0569c35de8a29e3f16d8f077755
-  data.tar.gz: ad99d78fcce5692491b593e3d415f1520120e32a2440d350504040a779dc2bd9b636a316d6e27851c72fb5ec314dab4ad4c41abf06e87b773102ee950a681c3a
+  metadata.gz: c5cd5437cdd28778c167fef661f99dbeb2f290ab767046c0e0ffb944c83e8aebde8e5e96920dd2f09b6240d9f727478292127ad9aac3c44b76c7a81eba0fee37
+  data.tar.gz: 74105a704d901c656aa19b06718803bac9bd76bf5209277c96dfabbe7fed23ac561b0d938295a32f224b1ec25056cd3b6c88e568df4f98ed15739145f04173bd

data/lib/isodoc.rb

@@ -19,6 +19,7 @@ require "isodoc/metadata"
 require "isodoc/html_convert"
 require "isodoc/word_convert"
 require "isodoc/pdf_convert"
+require "isodoc/xslfo_convert"
 require "isodoc/headlesshtml_convert"
 
 module IsoDoc

data/lib/isodoc/function/cleanup.rb

@@ -159,34 +159,7 @@ module IsoDoc::Function
       docxml
     end
 
-    # We assume AsciiMath is being used in the terms & definitions.
-    # Indices sort after letter but before any following
-    # letter (x, x_m, x_1, xa); we use colon to force that sort order.
-    # Numbers sort *after* letters; we use thorn to force that sort order.
-    def symbol_key(x)
-      HTMLEntities.new.decode(x.text).gsub(/_/, ":").gsub(/`/, "").
-        gsub(/[0-9]+/, "þ\\1")
-    end
-
-    def extract_symbols_list(dl)
-      dl_out = []
-      dl.xpath("./dt | ./dd").each do |dtd|
-        if dtd.name == "dt"
-          dl_out << { dt: dtd.remove, key: symbol_key(dtd) }
-        else
-          dl_out.last[:dd] = dtd.remove
-        end
-      end
-      dl_out
-    end
-
     def symbols_cleanup(docxml)
-      dl = docxml.at("//div[@class = 'Symbols']/dl")
-      return docxml unless dl
-      dl_out = extract_symbols_list(dl)
-      dl_out.sort! { |a, b| a[:key] <=> b[:key] }
-      dl.children = dl_out.map { |d| d[:dt].to_s + d[:dd].to_s }.join("\n")
-      docxml
     end
   end
 end

data/lib/isodoc/function/to_word_html.rb

@@ -94,6 +94,7 @@ module IsoDoc::Function
       @meta.subtitle isoxml, out
       @meta.docstatus isoxml, out
       @meta.docid isoxml, out
+      @meta.docnumeric isoxml, out
       @meta.doctype isoxml, out
       @meta.author isoxml, out
       @meta.bibdate isoxml, out

data/lib/isodoc/function/utils.rb

@@ -138,7 +138,7 @@ module IsoDoc::Function
       v
     end
 
-    def populate_template(docxml, _format)
+    def populate_template(docxml, _format = nil)
       meta = @meta.get.merge(@labels || {})
       template = liquid(docxml)
       template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h).

data/lib/isodoc/metadata.rb

@@ -113,9 +113,16 @@ module IsoDoc
         i = isoxml&.at(ns("//bibdata/status/iteration"))&.text and
           set(:iteration, i)
         set(:unpublished, unpublished(docstatus.text))
+        unpublished(docstatus.text) and
+          set(:stageabbr, stage_abbr(docstatus.text))
       end
     end
 
+    def stage_abbr(docstatus)
+      status_print(docstatus).split(/ /).
+        map { |s| s[0].upcase }.join("")
+    end
+
     def unpublished(status)
       !(status.downcase == "published")
     end
@@ -129,6 +136,11 @@ module IsoDoc
       set(:docnumber, dn&.text)
     end
 
+    def docnumeric(isoxml, _out)
+      dn = isoxml.at(ns("//bibdata/docnumber"))
+      set(:docnumeric, dn&.text)
+    end
+
     def draftinfo(draft, revdate)
       draftinfo = ""
       if draft

data/lib/isodoc/version.rb

@@ -1,3 +1,3 @@
 module IsoDoc
-  VERSION = "1.0.16".freeze
+  VERSION = "1.0.17".freeze
 end

data/lib/isodoc/xslfo_convert.rb

@@ -0,0 +1,29 @@
+require "metanorma"
+
+module IsoDoc
+  class XslfoPdfConvert < ::IsoDoc::Convert
+
+    def initialize(options)
+      super
+      @maxwidth = 500
+      @maxheight = 800
+    end
+
+    def tmpimagedir_suffix
+      "_pdfimages"
+    end
+
+    def convert(filename, file = nil, debug = false)
+      file = File.read(filename, encoding: "utf-8") if file.nil?
+      docxml, outname_html, dir = convert_init(file, filename, debug)
+      FileUtils.rm_rf dir
+      ::Metanorma::Output::XslfoPdf.new.convert(filename, outname_html + ".pdf", nil)
+    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/spec/isodoc/cleanup_spec.rb

@@ -715,52 +715,4 @@ INPUT
     OUTPUT
   end
 
-  it "cleans up symbols lists" do
-    expect(xmlpp(IsoDoc::WordConvert.new({}).cleanup(Nokogiri::XML(<<~"INPUT")).to_s)).to be_equivalent_to xmlpp(<<~"OUTPUT")
-  <div id="L" class="Symbols">
-                 <h1>4.<span style="mso-tab-count:1">&#160; </span>Symbols and Abbreviated Terms</h1>
-                 <dl>
-                   <dt><p><span class="stem">(#(&#x3b1;)#)</span></p></dt><dd>Definition 1</dd>
-                   <dt><p><span class="stem">(#(xa)#)</span></p></dt><dd>Definition 2</dd>
-                   <dt><p><span class="stem">(#(x_1)#)</span></p></dt><dd>Definition 3</dd>
-                   <dt><p><span class="stem">(#(x_m)#)</span></p></dt><dd>Definition 4</dd>
-                   <dt><p><span class="stem">(#(x)#)</span></p></dt><dd>Definition 5</dd>
-                 </dl>
-               </div>
-               INPUT
-                      <?xml version="1.0"?>
-       <div id="L" class="Symbols">
-                      <h1>4.<span style="mso-tab-count:1">&#xA0; </span>Symbols and Abbreviated Terms</h1>
-                      <dl>
-                      <dt>
-         <p>
-           <span class="stem">(#(x)#)</span>
-         </p>
-       </dt><dd>Definition 5</dd>
-       <dt>
-         <p>
-           <span class="stem">(#(x_m)#)</span>
-         </p>
-       </dt><dd>Definition 4</dd>
-       <dt>
-         <p>
-           <span class="stem">(#(x_1)#)</span>
-         </p>
-       </dt><dd>Definition 3</dd>
-       <dt>
-         <p>
-           <span class="stem">(#(xa)#)</span>
-         </p>
-       </dt><dd>Definition 2</dd>
-       <dt>
-         <p>
-           <span class="stem">(#(&#x3B1;)#)</span>
-         </p>
-       </dt><dd>Definition 1</dd>
-       </dl>
-                    </div>
-
-    OUTPUT
-  end
-
 end

data/spec/isodoc/metadata_spec.rb

@@ -92,7 +92,7 @@ RSpec.describe IsoDoc do
 </bibdata>
 </iso-standard>
 INPUT
-{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>["Barney Rubble", "Fred Flintstone"], :authors_affiliations=>{"Slate Inc., Bedrock"=>["Barney Rubble"], ""=>["Fred Flintstone"]}, :circulateddate=>"2015", :confirmeddate=>"2017", :copieddate=>"2016", :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", :html=>"URL B", :implementeddate=>"XXX", :issueddate=>"XXX", :iteration=>"2", :obsoleteddate=>"2014", :pdf=>"URL D", :publisheddate=>"2011", :receiveddate=>"XXX", :revdate=>"2016-05-01", :stage=>"Committee draft", :substage=>"Withdrawn", :transmitteddate=>"2020", :unchangeddate=>"2019", :unpublished=>true, :updateddate=>"2018", :url=>"URL A", :xml=>"URL C"}
+{:accesseddate=>"2012", :activateddate=>"2013", :agency=>"ISO", :authors=>["Barney Rubble", "Fred Flintstone"], :authors_affiliations=>{"Slate Inc., Bedrock"=>["Barney Rubble"], ""=>["Fred Flintstone"]}, :circulateddate=>"2015", :confirmeddate=>"2017", :copieddate=>"2016", :createddate=>"2010&ndash;2011", :doc=>"URL E", :docnumber=>"17301-1", :docnumeric=>"17301", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"0.4", :draftinfo=>" (draft 0.4, 2016-05-01)", :edition=>"2", :html=>"URL B", :implementeddate=>"XXX", :issueddate=>"XXX", :iteration=>"2", :obsoleteddate=>"2014", :pdf=>"URL D", :publisheddate=>"2011", :receiveddate=>"XXX", :revdate=>"2016-05-01", :stage=>"Committee draft", :stageabbr=>"CD", :substage=>"Withdrawn", :transmitteddate=>"2020", :unchangeddate=>"2019", :unpublished=>true, :updateddate=>"2018", :url=>"URL A", :xml=>"URL C"}
 OUTPUT
   end
 
@@ -153,7 +153,7 @@ OUTPUT
 </version>
 </iso-standard>
 INPUT
-{:accesseddate=>"XXX", :agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :circulateddate=>"XXX", :confirmeddate=>"XXX", :copieddate=>"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, :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :partof=>"IEC 8122", :publisheddate=>"XXX", :receiveddate=>"XXX", :revdate=>"2016-05-01", :stage=>"Published", :transmitteddate=>"XXX", :unchangeddate=>"XXX", :unpublished=>false, :updateddate=>"XXX"}
+{:accesseddate=>"XXX", :agency=>"ISO/IEC", :authors=>[], :authors_affiliations=>{}, :circulateddate=>"XXX", :confirmeddate=>"XXX", :copieddate=>"XXX", :createddate=>"XXX", :docnumber=>"17301-1-3", :docnumeric=>"17301", :doctitle=>"Cereals and pulses", :doctype=>"International Standard", :docyear=>"2016", :draft=>"12", :draftinfo=>" (draft 12, 2016-05-01)", :edition=>nil, :implementeddate=>"XXX", :issueddate=>"XXX", :obsoleteddate=>"XXX", :obsoletes=>"IEC 8121", :obsoletes_part=>"3.1", :partof=>"IEC 8122", :publisheddate=>"XXX", :receiveddate=>"XXX", :revdate=>"2016-05-01", :stage=>"Published", :transmitteddate=>"XXX", :unchangeddate=>"XXX", :unpublished=>false, :updateddate=>"XXX"}
 OUTPUT
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: isodoc
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 1.0.17
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-08 00:00:00.000000000 Z
+date: 2020-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciimath
@@ -353,6 +353,7 @@ files:
 - lib/isodoc/word_function/postprocess.rb
 - lib/isodoc/word_function/postprocess_cover.rb
 - lib/isodoc/word_function/table.rb
+- lib/isodoc/xslfo_convert.rb
 - spec/assets/header.html
 - spec/assets/html.css
 - spec/assets/htmlcover.html