metanorma-gb 1.3.7 → 1.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 580362b463e0c7ffcf4d77a497200965759a166acfa97121575bb1f523e9da84
-  data.tar.gz: abb46c02461a869386ed88f341bf2b81e8d9af886241d9c897932fbf519b2807
+  metadata.gz: f3c960e42aa12c2999e3573db069d9ee84ac5060f2a601464f9e29d5571905ad
+  data.tar.gz: fed678dfe316d727aaa1040dd7f1992b1edf75f042ef26759248ac647f77043e
 SHA512:
-  metadata.gz: 2826426ba46067a0f7323e7b43ea3bbe254a40e40b0ecc3631da99c87c6478f23bfc6cc5a6e8d8c6c85bbdd043e1786b834d8a56db29cc1ef8812242e5bcda55
-  data.tar.gz: 3674d420f281f1c130d6dad2224722c6188ed1e09aaa8460d324bfd97bd0ec51abad48474457b4ad5f51f42d097f16f80b719500b603626d82768afc6284590e
+  metadata.gz: c00996dbc64fb86ed7ccbcb8a1676313537dbc3308dced79d9ea8c3a6c9d29c2e8d10401903bd9be71e7d7319276bd496e7ed69f6fcccddf2d7307bd3ff87e7e
+  data.tar.gz: 8142018a693a9b47f2a307c1867504ea3b0db549b740366b81a5ba472733f488fabaa541dd708d52a02e39dce564f29c36f94bd108c49a2b932a01b6dbcaeaeb

data/lib/asciidoctor/gb/basicdoc.rng

@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <include href="biblio.rng"/>
-  <start>
-    <ref name="document"/>
-  </start>
+  <include href="biblio.rng">
+    <start>
+      <ref name="document"/>
+    </start>
+  </include>
   <define name="document">
     <element name="document">
       <optional>

data/lib/asciidoctor/gb/biblio.rng

@@ -33,6 +33,9 @@
       <param name="pattern">([\+\-]?\d{4})((-?)((0[1-9]|1[0-2])((-?)([12]\d|0[1-9]|3[01]))?|W([0-4]\d|5[0-2])(-?[1-7])?|(00[1-9]|0[1-9]\d|[12]\d{2}|3([0-5]\d|6[1-6]))))?</param>
     </data>
   </define>
+  <start>
+    <ref name="relaton_collection"/>
+  </start>
   <define name="status">
     <element name="status">
       <ref name="stage"/>

data/lib/isodoc/gb/gbconvert.rb

@@ -12,22 +12,22 @@ module IsoDoc
 
       def initialize(options)
         @meta = options[:meta]
-        @standardlogoimg = options[:standardlogoimg]
-        @standardclassimg = options[:standardclassimg]
-        @standardissuerimg = options[:standardissuerimg]
+        @standardlogoimg = options[:standardlogoimg]&.sub(%r{^(?=/|[A-Z]:/)}, "#{@localdir}/")
+        @standardclassimg = options[:standardclassimg]&.sub(%r{^(?=/|[A-Z]:/)}, "#{@localdir}/")
+        @standardissuerimg = options[:standardissuerimg]&.sub(%r{^(?=/|[A-Z]:/)}, "#{@localdir}/")
       end
 
       def fileloc(loc)
-        File.join(File.dirname(__FILE__), loc)
+        File.expand_path(File.join(File.dirname(__FILE__), loc))
       end
 
       def format_agency(agency, format, localdir)
-        return "<img class='logo' src='#{localdir}/#{@standardissuerimg}' alt='#{agency.join(",")}'></img>" if @standardissuerimg
+        return "<img class='logo' src='#{@standardissuerimg}' alt='#{agency.join(",")}'></img>" if @standardissuerimg
         return agency unless agency.is_a?(Array)
         if agency == ["中华人民共和国国家质量监督检验检疫总局", "中国国家标准化管理委员会"]
-          logo = "#{localdir}/gb-issuer-default.gif"
-          FileUtils.cp fileloc(File.join('html/gb-logos', logo)), logo
-          return "<img class='logo' src='#{logo}' alt='#{agency.join(",")}'></img>"
+          logo = "gb-issuer-default.gif"
+          #FileUtils.cp fileloc(File.join('html/gb-logos', logo)), logo
+          return "<img class='logo' src='#{fileloc(File.join('html/gb-logos', logo))}' alt='#{agency.join(",")}'></img>"
         end
         format_agency1(agency, format)
       end
@@ -47,7 +47,7 @@ module IsoDoc
         if logo.nil?
           "<span style='font-size:36pt;font-weight:bold'>#{prefix}</span>"
         else
-          format_logo1("#{localdir}/#{logo}", prefix, scope, localdir)
+          format_logo1(logo, prefix, scope, localdir)
         end
       end
 
@@ -60,12 +60,12 @@ module IsoDoc
 
       def format_logo1(logo, prefix, scope, localdir)
         local = local_logo_suffix(scope)
-        return "<img class='logo' width='113' height='56' src='#{localdir}/#{@standardlogoimg}' alt='#{prefix}'></img>"\
+        return "<img class='logo' width='113' height='56' src='#{@standardlogoimg}' alt='#{prefix}'></img>"\
           "#{local}" if  @standardlogoimg
         logo += ".gif"
-        FileUtils.cp fileloc(File.join('html/gb-logos', logo)), logo
+        #FileUtils.cp fileloc(File.join('html/gb-logos', logo)), logo
         #@files_to_delete << logo
-        "<img class='logo' width='113' height='56' src='#{logo}' alt='#{prefix}'></img>"\
+        "<img class='logo' width='113' height='56' src='#{fileloc(File.join('html/gb-logos', logo))}' alt='#{prefix}'></img>"\
           "#{local}"
       end
     end

data/lib/isodoc/gb/gbwordconvert.rb

@@ -76,7 +76,7 @@ module IsoDoc
         meta = @meta.get.merge(@labels)
         logo = @common.format_logo(meta[:gbprefix], meta[:gbscope], format, @localdir)
         logofile = @meta.standard_logo(meta[:gbprefix])
-        @files_to_delete << logofile + ".gif" unless logofile.nil?
+        #@files_to_delete << logofile + ".gif" unless logofile.nil?
         docxml = termref_resolve(docxml)
         meta[:standard_agency_formatted] =
           @common.format_agency(meta[:standard_agency], format, @localdir)

data/lib/isodoc/gb/html/gb.scss

@@ -384,10 +384,6 @@ p.Formula, li.Formula, div.Formula
 	mso-fareast-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;
 	mso-ansi-language:EN-GB;}
-ol
-	{margin-bottom:0cm;}
-ul
-	{margin-bottom:0cm;}
 table.MsoISOTable
 	{mso-style-name:"Table ISO";
 	mso-tstyle-rowband-size:0;
@@ -410,8 +406,6 @@ table.MsoISOTable
 	font-size:10.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;}
-table.MsoISOTable tr
-    {page-break-inside:avoid;}
 table.MsoISOTable th
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
@@ -439,21 +433,11 @@ table.MsoTableGrid
 	font-size:10.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;}
-td { page-break-inside:avoid; }
-tr { page-break-after:avoid; }
-span.stem
-    {font-family:"Cambria Math",serif;
-    mso-ascii-font-family:"Cambria Math";
-    font-style:
-    italic;}
 div.formula
     {tab-stops:center 212.65pt right 487.45pt;}
 body 
     {tab-interval:21.0pt;
     text-justify-trim:punctuation}
-dt
-    {page-break-inside:avoid;
-    page-break-after:avoid}
 .coverpage_docnumber
     {text-align:center;
     font-size:14.0pt;

data/lib/isodoc/gb/html/wordstyle.scss

@@ -2083,107 +2083,43 @@ ol li li li, ol li li li p, ol li li li div, ol li li li .MsoNormal
 	margin-left:209.95pt;
 	text-indent:-20.95pt;}
 
-p.ListContLevel1, li.ListContLevel1, div.ListContLevel1
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:41.65pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel2, li.ListContLevel2, div.ListContLevel2
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:63.2pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel3, li.ListContLevel3, div.ListContLevel3
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:83.9pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel4, li.ListContLevel4, div.ListContLevel4
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:94.2pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel5, li.ListContLevel5, div.ListContLevel5
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:109.8pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel6, li.ListContLevel6, div.ListContLevel6
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:125.4pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel7, li.ListContLevel7, div.ListContLevel7
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:141.0pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel8, li.ListContLevel8, div.ListContLevel8
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:156.6pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-p.ListContLevel9, li.ListContLevel9, div.ListContLevel9
-	{mso-style-priority:34;
-	margin-top:0cm;
-	margin-left:172.2pt;
-	margin-right:0cm;
-	margin-bottom:12.0pt;
-	mso-pagination:widow-orphan;
-	font-size:11.0pt;
-	font-family:$bodyfont;
-	mso-ansi-language:EN-AU;
-	mso-fareast-language:EN-US;}
-
-
+div.ListContLevel1
+        {mso-style-priority:34;
+        margin-left:41.65pt;
+        margin-right:0cm;}
+div.ListContLevel2
+        {mso-style-priority:34;
+        margin-top:0cm;
+        margin-left:63.2pt;
+        margin-right:0cm;}
+div.ListContLevel3
+        {mso-style-priority:34;
+        margin-left:83.9pt;
+        margin-right:0cm;}
+div.ListContLevel4
+        {mso-style-priority:34;
+        margin-left:94.2pt;
+        margin-right:0cm;}
+div.ListContLevel5
+        {mso-style-priority:34;
+        margin-left:109.8pt;
+        margin-right:0cm;}
+div.ListContLevel6
+        {mso-style-priority:34;
+        margin-left:125.4pt;
+        margin-right:0cm;}
+div.ListContLevel7
+        {mso-style-priority:34;
+        margin-left:141.0pt;
+        margin-right:0cm;}
+div.ListContLevel8
+        {mso-style-priority:34;
+        margin-left:156.6pt;
+        margin-right:0cm;}
+div.ListContLevel9
+        {mso-style-priority:34;
+        margin-left:172.2pt;
+        margin-right:0cm;}
 
 p.standard_number, li.standard_number, div.standard_number
 	{mso-style-name:封面标准号2; //  NAME: Cover page Standard Number 2 
@@ -2697,12 +2633,6 @@ a:visited, span.MsoHyperlinkFollowed
 	color:black;
 	text-decoration:none;
 	text-underline:none;}
-br.section
-    {page-break-before:always;
-    mso-break-type:section-break;}
-br.pagebreak
-    {page-break-before:always;
-    mso-special-character:line-break;}
 body
     {font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;}

data/lib/isodoc/gb/metadata.rb

@@ -160,7 +160,7 @@ module IsoDoc
       def standard_class(scope, prefix, mandate)
         standardclassimg = get[:standardclassimg]
         ret = @agencies.standard_class(scope, prefix, mandate)
-        return "<img class='logo' src='#{@localdir}/#{standardclassimg}' alt='#{ret}'></img>" if standardclassimg
+        return "<img class='logo' src='#{standardclassimg}' alt='#{ret}'></img>" if standardclassimg
         ret
       end
 

data/lib/metanorma/gb/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Gb
-    VERSION = "1.3.7"
+    VERSION = "1.3.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.3.7
+  version: 1.3.8
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2019-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso