metanorma-gb 1.3.22 → 1.3.27

data/lib/isodoc/gb/gbbaseconvert.rb

@@ -12,7 +12,8 @@ module IsoDoc
         h = options[:headerfont] || "Arial"
         m = options[:monospacefont] || "Courier"
         t = options[:titlefont] || "Arial"
-        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n$titlefont: #{t};\n"
+        "$bodyfont: #{b};\n$headerfont: #{h};\n$monospacefont: #{m};\n"\
+          "$titlefont: #{t};\n"
       end   
 
       def metadata_init(lang, script, labels)
@@ -45,7 +46,8 @@ module IsoDoc
               YAML.load_file(File.join(File.dirname(__FILE__),
                                        "i18n-zh-Hans.yaml"))
             else
-              YAML.load_file(File.join(File.dirname(__FILE__), "i18n-zh-Hans.yaml"))
+              YAML.load_file(File.join(File.dirname(__FILE__),
+                                       "i18n-zh-Hans.yaml"))
             end
         @labels = @labels.merge(y)
       end
@@ -55,16 +57,18 @@ module IsoDoc
       end
 
       def formula_parse(node, out)
-        out.div **attr_code(id: node["id"], class: "formula") do |div|
+        out.div **formula_attrs(node) do |div1|
+         div1.div **attr_code(class: "formula") do |div|
           insert_tab(div, 1)
-          parse(node.at(ns("./stem")), out)
+          parse(node.at(ns("./stem")), div)
           lbl = anchor(node['id'], :label, false)
           unless lbl.nil?
             insert_tab(div, 1)
             div << "(#{lbl})"
           end
         end
-        formula_where(node.at(ns("./dl")), out)
+        formula_where(node.at(ns("./dl")), div1)
+        end
       end
 
       def formula_where(dl, out)
@@ -100,12 +104,16 @@ module IsoDoc
       end
 
       def note_parse(node, out)
+        note_parse_table(node, out, note_label(node) + ":")
+      end
+
+      def note_parse_table(node, out, label)
         @note = true
-        out.table **attr_code(id: node["id"], class: "Note") do |t|
+        out.table **note_attrs(node) do |t|
           t.tr do |tr|
             @libdir = File.dirname(__FILE__)
             tr.td **EXAMPLE_TBL_ATTR do |td|
-              td << l10n(note_label(node) + ":")
+              td << l10n(label)
             end
             tr.td **{ style: "vertical-align:top;", class: "Note" } do |td|
               node.children.each { |n| parse(n, td) }
@@ -116,18 +124,7 @@ module IsoDoc
       end
 
       def termnote_parse(node, out)
-        @note = true
-        out.table **attr_code(id: node["id"], class: "Note") do |t|
-          t.tr do |tr|
-            tr.td **EXAMPLE_TBL_ATTR do |td|
-              td << l10n("#{anchor(node['id'], :label)}:")
-            end
-            tr.td **{ style: "vertical-align:top;", class: "Note" } do |td|
-              node.children.each { |n| parse(n, td) }
-            end
-          end
-        end
-        @note = false
+        note_parse_table(node, out, "#{anchor(node['id'], :label)}:")
       end
 
       def middle(isoxml, out)
@@ -168,15 +165,17 @@ module IsoDoc
       def termref_render(x)
         x.sub!(%r{\s*\[MODIFICATION\]\s*$}m, l10n(", #{@modified_lbl}"))
         parts = x.split(%r{(\s*\[MODIFICATION\]|,)}m)
-        parts[1] = l10n(", #{@source_lbl}") if parts.size > 1 && parts[1] == "," &&
-          !/^\s*#{@modified_lbl}/.match(parts[2])
+        parts[1] = l10n(", #{@source_lbl}") if parts.size > 1 &&
+          parts[1] == "," && !/^\s*#{@modified_lbl}/.match(parts[2])
           parts.map do |p|
-            /\s*\[MODIFICATION\]/.match(p) ? l10n(", #{@modified_lbl} &mdash; ") : p
+            /\s*\[MODIFICATION\]/.match(p) ?
+              l10n(", #{@modified_lbl} &mdash; ") : p
           end.join.sub(/\A\s*/m, l10n("[")).sub(/\s*\z/m, l10n("]"))
       end
 
       def termref_resolve(docxml)
-        docxml.split(%r{(\[TERMREF\]|\[/TERMREF\])}).each_slice(4).
+        docxml.gsub(%r{\s*\[/TERMREF\]\s*</p>\s*<p>\s*\[TERMREF\]}, l10n("; ")).
+          split(%r{(\[TERMREF\]|\[/TERMREF\])}).each_slice(4).
           map do |a|
           a.size < 3 ? a[0] : a[0] + termref_render(a[2])
         end.join
@@ -251,11 +250,8 @@ module IsoDoc
 
       def example_parse(node, out)
         out.div **{ id: node["id"], class: "example" } do |div|
-          if node_begins_with_para(node)
-            example_p_parse(node, div)
-          else
-            example_parse1(node, div)
-          end
+          node_begins_with_para(node) ?
+            example_p_parse(node, div) : example_parse1(node, div)
         end
       end
 

data/lib/isodoc/gb/html/scripts.html

@@ -53,5 +53,20 @@ $('#toggle').on('click', function(){
 });
 */
 </script>
-
-
+  <script>
+// @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat
+//
+// AnchorJS - v4.2.2 - 2020-04-20
+// https://www.bryanbraun.com/anchorjs/
+// Copyright (c) 2020 Bryan Braun; Licensed MIT
+//
+// @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat
+!function(A,e){"use strict";"function"==typeof define&&define.amd?define([],e):"object"==typeof module&&module.exports?module.exports=e():(A.AnchorJS=e(),A.anchors=new A.AnchorJS)}(this,function(){"use strict";return function(A){function f(A){A.icon=A.hasOwnProperty("icon")?A.icon:"",A.visible=A.hasOwnProperty("visible")?A.visible:"hover",A.placement=A.hasOwnProperty("placement")?A.placement:"right",A.ariaLabel=A.hasOwnProperty("ariaLabel")?A.ariaLabel:"Anchor",A.class=A.hasOwnProperty("class")?A.class:"",A.base=A.hasOwnProperty("base")?A.base:"",A.truncate=A.hasOwnProperty("truncate")?Math.floor(A.truncate):64,A.titleText=A.hasOwnProperty("titleText")?A.titleText:""}function p(A){var e;if("string"==typeof A||A instanceof String)e=[].slice.call(document.querySelectorAll(A));else{if(!(Array.isArray(A)||A instanceof NodeList))throw new Error("The selector provided to AnchorJS was invalid.");e=[].slice.call(A)}return e}this.options=A||{},this.elements=[],f(this.options),this.isTouchDevice=function(){return!!("ontouchstart"in window||window.DocumentTouch&&document instanceof DocumentTouch)},this.add=function(A){var e,t,i,n,o,s,a,r,c,h,l,u,d=[];if(f(this.options),"touch"===(l=this.options.visible)&&(l=this.isTouchDevice()?"always":"hover"),0===(e=p(A=A||"h2, h3, h4, h5, h6")).length)return this;for(!function(){if(null!==document.head.querySelector("style.anchorjs"))return;var A,e=document.createElement("style");e.className="anchorjs",e.appendChild(document.createTextNode("")),void 0===(A=document.head.querySelector('[rel="stylesheet"],style'))?document.head.appendChild(e):document.head.insertBefore(e,A);e.sheet.insertRule(".anchorjs-link{opacity:0;text-decoration:none;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}",e.sheet.cssRules.length),e.sheet.insertRule(":hover>.anchorjs-link,.anchorjs-link:focus{opacity:1}",e.sheet.cssRules.length),e.sheet.insertRule("[data-anchorjs-icon]::after{content:attr(data-anchorjs-icon)}",e.sheet.cssRules.length),e.sheet.insertRule('@font-face{font-family:anchorjs-icons;src:url(data:n/a;base64,AAEAAAALAIAAAwAwT1MvMg8yG2cAAAE4AAAAYGNtYXDp3gC3AAABpAAAAExnYXNwAAAAEAAAA9wAAAAIZ2x5ZlQCcfwAAAH4AAABCGhlYWQHFvHyAAAAvAAAADZoaGVhBnACFwAAAPQAAAAkaG10eASAADEAAAGYAAAADGxvY2EACACEAAAB8AAAAAhtYXhwAAYAVwAAARgAAAAgbmFtZQGOH9cAAAMAAAAAunBvc3QAAwAAAAADvAAAACAAAQAAAAEAAHzE2p9fDzz1AAkEAAAAAADRecUWAAAAANQA6R8AAAAAAoACwAAAAAgAAgAAAAAAAAABAAADwP/AAAACgAAA/9MCrQABAAAAAAAAAAAAAAAAAAAAAwABAAAAAwBVAAIAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAMCQAGQAAUAAAKZAswAAACPApkCzAAAAesAMwEJAAAAAAAAAAAAAAAAAAAAARAAAAAAAAAAAAAAAAAAAAAAQAAg//0DwP/AAEADwABAAAAAAQAAAAAAAAAAAAAAIAAAAAAAAAIAAAACgAAxAAAAAwAAAAMAAAAcAAEAAwAAABwAAwABAAAAHAAEADAAAAAIAAgAAgAAACDpy//9//8AAAAg6cv//f///+EWNwADAAEAAAAAAAAAAAAAAAAACACEAAEAAAAAAAAAAAAAAAAxAAACAAQARAKAAsAAKwBUAAABIiYnJjQ3NzY2MzIWFxYUBwcGIicmNDc3NjQnJiYjIgYHBwYUFxYUBwYGIwciJicmNDc3NjIXFhQHBwYUFxYWMzI2Nzc2NCcmNDc2MhcWFAcHBgYjARQGDAUtLXoWOR8fORYtLTgKGwoKCjgaGg0gEhIgDXoaGgkJBQwHdR85Fi0tOAobCgoKOBoaDSASEiANehoaCQkKGwotLXoWOR8BMwUFLYEuehYXFxYugC44CQkKGwo4GkoaDQ0NDXoaShoKGwoFBe8XFi6ALjgJCQobCjgaShoNDQ0NehpKGgobCgoKLYEuehYXAAAADACWAAEAAAAAAAEACAAAAAEAAAAAAAIAAwAIAAEAAAAAAAMACAAAAAEAAAAAAAQACAAAAAEAAAAAAAUAAQALAAEAAAAAAAYACAAAAAMAAQQJAAEAEAAMAAMAAQQJAAIABgAcAAMAAQQJAAMAEAAMAAMAAQQJAAQAEAAMAAMAAQQJAAUAAgAiAAMAAQQJAAYAEAAMYW5jaG9yanM0MDBAAGEAbgBjAGgAbwByAGoAcwA0ADAAMABAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAH//wAP) format("truetype")}',e.sheet.cssRules.length)}(),t=document.querySelectorAll("[id]"),i=[].map.call(t,function(A){return A.id}),o=0;o<e.length;o++)if(this.hasAnchorJSLink(e[o]))d.push(o);else{if(e[o].hasAttribute("id"))n=e[o].getAttribute("id");else if(e[o].hasAttribute("data-anchor-id"))n=e[o].getAttribute("data-anchor-id");else{for(c=r=this.urlify(e[o].textContent),a=0;void 0!==s&&(c=r+"-"+a),a+=1,-1!==(s=i.indexOf(c)););s=void 0,i.push(c),e[o].setAttribute("id",c),n=c}(h=document.createElement("a")).className="anchorjs-link "+this.options.class,h.setAttribute("aria-label",this.options.ariaLabel),h.setAttribute("data-anchorjs-icon",this.options.icon),this.options.titleText&&(h.title=this.options.titleText),u=document.querySelector("base")?window.location.pathname+window.location.search:"",u=this.options.base||u,h.href=u+"#"+n,"always"===l&&(h.style.opacity="1"),""===this.options.icon&&(h.style.font="1em/1 anchorjs-icons","left"===this.options.placement&&(h.style.lineHeight="inherit")),"left"===this.options.placement?(h.style.position="absolute",h.style.marginLeft="-1em",h.style.paddingRight="0.5em",e[o].insertBefore(h,e[o].firstChild)):(h.style.paddingLeft="0.375em",e[o].appendChild(h))}for(o=0;o<d.length;o++)e.splice(d[o]-o,1);return this.elements=this.elements.concat(e),this},this.remove=function(A){for(var e,t,i=p(A),n=0;n<i.length;n++)(t=i[n].querySelector(".anchorjs-link"))&&(-1!==(e=this.elements.indexOf(i[n]))&&this.elements.splice(e,1),i[n].removeChild(t));return this},this.removeAll=function(){this.remove(this.elements)},this.urlify=function(A){return this.options.truncate||f(this.options),A.trim().replace(/\'/gi,"").replace(/[& +$,:;=?@"#{}|^~[`%!'<>\]\.\/\(\)\*\\\n\t\b\v]/g,"-").replace(/-{2,}/g,"-").substring(0,this.options.truncate).replace(/^-+|-+$/gm,"").toLowerCase()},this.hasAnchorJSLink=function(A){var e=A.firstChild&&-1<(" "+A.firstChild.className+" ").indexOf(" anchorjs-link "),t=A.lastChild&&-1<(" "+A.lastChild.className+" ").indexOf(" anchorjs-link ");return e||t||!1}}});
+// @license-end
+  </script>
+  <script>
+  anchors.options = {
+  placement: 'left'
+};
+anchors.add('h1, h2, h3, h4');
+</script>

data/lib/isodoc/gb/metadata.rb

@@ -90,8 +90,8 @@ module IsoDoc
         "95": "obsolete",
       }
 
-      def status_abbrev_cn(stage, _substage, iter, draft)
-        return status_abbrev(stage, _substage, iter, draft) if @lang != "zh"
+      def status_abbrev_cn(stage, _substage, iter, draft, doctype)
+        return status_abbrev(stage, _substage, iter, draft, doctype) if @lang != "zh"
         stage_num = stage == "PRF" ? "60" : 
           (Asciidoctor::Gb::Converter::STAGE_ABBRS&.invert[stage]&.to_s || "??")
         stage = STAGE_ABBRS_CN[stage_num.to_sym] || "??"
@@ -109,7 +109,8 @@ module IsoDoc
           set(:statusabbr, status_abbrev_cn(docstatus["abbreviation"],
                                             isoxml&.at(ns("//bibdata/status/substage"))&.text,
                                             isoxml&.at(ns("//bibdata/status/iteration"))&.text,
-                                            isoxml&.at(ns("//version/draft"))&.text))
+                                            isoxml&.at(ns("//version/draft"))&.text,
+                                            isoxml&.at(ns("//bibdata/ext/doctype"))&.text))
           set(:status, STATUS_CSS[docstatus.text.to_sym])
           unpublished(docstatus.text) and
             set(:stageabbr, docstatus["abbreviation"])

data/lib/isodoc/gb/pdf_convert.rb

@@ -0,0 +1,30 @@
+require "isodoc"
+
+module IsoDoc
+  module Gb
+
+    # A {Converter} implementation that generates HTML output, and a document
+    # schema encapsulation of the document for validation
+    #
+    class PdfConvert < IsoDoc::XslfoPdfConvert
+      def initialize(options)
+        @libdir = File.dirname(__FILE__)
+        super
+      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)
+        /\.xml$/.match(filename) or
+          filename = Tempfile.open([outname_html, ".xml"], encoding: "utf-8") do |f|
+          f.write file
+          f.path
+        end
+        FileUtils.rm_rf dir
+        ::Metanorma::Output::XslfoPdf.new.convert(
+          filename, outname_html + ".pdf", File.join(@libdir, "gb.recommendation.xsl"))
+      end
+    end
+  end
+end
+

data/lib/metanorma-gb.rb

@@ -4,6 +4,7 @@ require_relative "metanorma/gb/version"
 require "isodoc/gb/gbconvert"
 require "isodoc/gb/gbhtmlconvert"
 require "isodoc/gb/gbwordconvert"
+require "isodoc/gb/pdf_convert"
 
 if defined? Metanorma
   require_relative "metanorma/gb"

data/lib/metanorma/gb/processor.rb

@@ -2,6 +2,15 @@ require "metanorma/processor"
 
 module Metanorma
   module Gb
+    def self.fonts_used
+      {
+        compliant_html: ["SimSun", "Cambria", "SimHei", "Calibri", "Courier New"],
+        html: ["SimSun", "Cambria", "SimHei", "Calibri", "Courier New"],
+        doc: ["SimSun", "Cambria", "SimHei", "Calibri", "Courier New"],
+        pdf: ["SimSun", "Cambria", "SimHei", "Calibri", "Courier New"],
+      }
+    end
+
     class Processor < Metanorma::Processor
 
       def initialize
@@ -14,7 +23,8 @@ module Metanorma
         super.merge(
           html: "html",
           compliant_html: "compliant.html",
-          doc: "doc"
+          doc: "doc",
+          pdf: "pdf",
         )
       end
 
@@ -49,6 +59,8 @@ module Metanorma
           IsoDoc::Gb::HtmlConvert.new(options.merge(compliant: true)).convert(outname, isodoc_node)
         when :doc
           IsoDoc::Gb::WordConvert.new(options).convert(outname, isodoc_node)
+        when :doc
+          IsoDoc::Gb::PdfConvert.new(options).convert(outname, isodoc_node)
         else
           super
         end

data/lib/metanorma/gb/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Gb
-    VERSION = "1.3.22"
+    VERSION = "1.3.27"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.3.22
+  version: 1.3.27
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -255,12 +255,14 @@ files:
 - lib/asciidoctor/gb/boilerplate.xml
 - lib/asciidoctor/gb/converter.rb
 - lib/asciidoctor/gb/front.rb
+- lib/asciidoctor/gb/front_id.rb
 - lib/asciidoctor/gb/gbstandard.rng
 - lib/asciidoctor/gb/isodoc.rng
 - lib/asciidoctor/gb/isostandard.rng
 - lib/asciidoctor/gb/reqt.rng
 - lib/asciidoctor/gb/section_input.rb
 - lib/asciidoctor/gb/validate.rb
+- lib/isodoc/gb/gb.recommendation.xsl
 - lib/isodoc/gb/gbbaseconvert.rb
 - lib/isodoc/gb/gbcleanup.rb
 - lib/isodoc/gb/gbconvert.rb
@@ -305,6 +307,7 @@ files:
 - lib/isodoc/gb/i18n-en.yaml
 - lib/isodoc/gb/i18n-zh-Hans.yaml
 - lib/isodoc/gb/metadata.rb
+- lib/isodoc/gb/pdf_convert.rb
 - lib/metanorma-gb.rb
 - lib/metanorma/gb.rb
 - lib/metanorma/gb/processor.rb