metanorma-gb 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50f41f8857b91e9118b5222b8743350a9d24a47c17aabfc24698a2583bb8f2c4
-  data.tar.gz: d83655fd972b34b5a332ef8431037b146b480518e7b00a34ff19f07490b7d136
+  metadata.gz: 031a1821b8f3b4510e1411068cbbe18ca5e1dc5d69d0072fc87e9dc009aeb796
+  data.tar.gz: 75aabd60d69f737c2ecdfdda8abb1e438d01adf55f259be346793932db80c419
 SHA512:
-  metadata.gz: 5295ea4488d1b514794e600d6c68496bbfd560226b48e7c3ed8487fcc7890fece87e9fa9badd7da04cbd2da15d297fee98b9c6b3b25b7f025ba2ee1c3da0a292
-  data.tar.gz: 6b70f19a03da1e39d0786313d68630278a1e5c41ecb35975e2069e583bbd9f167f53e66f5e1bd827b97659ffe9e22cb26ff9ec8f74e3e57aa7b51e64b9f4c97f
+  metadata.gz: a5e63ce13f2bf2e792336c7ccd16c595b831af86f0750f16d0fdf877ebc7e5889c708bfd22295b99f7b321c0933cf8a51ec67da5e62b3c8ca95c5d01142e81a3
+  data.tar.gz: f44544a34db3b2bc9709c6366e272c8cc0e3b888fe51f741a64f285ff24cd92fe40815ed2341fac5a9e0bcd330b4a641b7797228723fe44ce98fe9eee353a36e

data/lib/asciidoctor/gb/biblio.rng

@@ -414,6 +414,20 @@
       <ref name="BibliographicItem"/>
     </element>
   </define>
+  <define name="relaton_collection">
+    <element name="relaton-collection">
+      <optional>
+        <attribute name="type"/>
+      </optional>
+      <ref name="btitle"/>
+      <zeroOrMore>
+        <ref name="contributor"/>
+      </zeroOrMore>
+      <zeroOrMore>
+        <ref name="docrelation"/>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="BibItemType" combine="choice">
     <choice>
       <value>article</value>
@@ -531,7 +545,10 @@
   </define>
   <define name="fetched">
     <element name="fetched">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="validity">
@@ -549,17 +566,26 @@
   </define>
   <define name="validityBegins">
     <element name="validityBegins">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="validityEnds">
     <element name="validityEnds">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="validityRevision">
     <element name="revision">
-      <data type="dateTime"/>
+      <choice>
+        <data type="dateTime"/>
+        <data type="date"/>
+      </choice>
     </element>
   </define>
   <define name="TypedTitleString">
@@ -744,6 +770,7 @@
     <element name="from">
       <choice>
         <data type="dateTime"/>
+        <data type="date"/>
         <data type="gYear"/>
       </choice>
     </element>
@@ -752,6 +779,7 @@
     <element name="to">
       <choice>
         <data type="dateTime"/>
+        <data type="date"/>
         <data type="gYear"/>
       </choice>
     </element>

data/lib/asciidoctor/gb/converter.rb

@@ -181,7 +181,7 @@ module Asciidoctor
         code = "CN(#{code})" if !/^CN\(/.match(code) && /^#{GBCODE}[^A-Za-z]/.match(code)
         hit = @bibdb&.fetch(code, year, opts)
         return nil if hit.nil?
-        xml.parent.add_child(hit.to_xml)
+        xml.parent.add_child(Asciidoctor::Standoc::Utils::smart_render_xml(hit))
         xml
       rescue Algolia::AlgoliaProtocolError
         nil # Render reference without an Internet connection.

data/lib/asciidoctor/gb/front.rb

@@ -191,6 +191,7 @@ module Asciidoctor
 
       def metadata(node, xml)
         title node, xml
+        metadata_source(node, xml)
         metadata_id(node, xml)
         metadata_date(node, xml)
         metadata_contributors(node, xml)

data/lib/isodoc/gb/gbconvert.rb

@@ -22,12 +22,12 @@ module IsoDoc
       end
 
       def format_agency(agency, format)
-        return "<img src='#{@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 = "gb-issuer-default.gif"
           FileUtils.cp fileloc(File.join('html/gb-logos', logo)), logo
-          return "<img src='#{logo}' alt='#{agency.join(",")}'></img>"
+          return "<img class='logo' src='#{logo}' alt='#{agency.join(",")}'></img>"
         end
         format_agency1(agency, format)
       end
@@ -60,12 +60,12 @@ module IsoDoc
 
       def format_logo1(logo, prefix, scope)
         local = local_logo_suffix(scope)
-        return "<img width='113' height='56' src='#{@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
         #@files_to_delete << logo
-        "<img width='113' height='56' src='#{logo}' alt='#{prefix}'></img>"\
+        "<img class='logo' width='113' height='56' src='#{logo}' alt='#{prefix}'></img>"\
           "#{local}"
       end
     end

data/lib/isodoc/gb/gbhtmlrender.rb

@@ -136,7 +136,6 @@ module IsoDoc
         meta = @meta.get.merge(@labels)
         logo = @common.format_logo(meta[:gbprefix], meta[:gbscope], format)
         logofile = @meta.standard_logo(meta[:gbprefix])
-        @files_to_delete << logofile + ".gif" unless logofile.nil?
         docxml = termref_resolve(docxml)
         meta[:standard_agency_formatted] =
           @common.format_agency(meta[:standard_agency], format)
@@ -183,7 +182,9 @@ module IsoDoc
       def annex_name(annex, name, div)
         div.h1 **{ class: "Annex" } do |t|
           t << "#{get_anchors[annex['id']][:label]}<br/><br/>"
-          t << name.text
+          t.b do |b|
+          name&.children&.each { |c2| parse(c2, b) }
+        end
         end
       end
 

data/lib/isodoc/gb/gbwordrender.rb

@@ -183,7 +183,7 @@ module IsoDoc
       def annex_name(annex, name, div)
         div.h1 **{ class: "Annex" } do |t|
           t << "#{get_anchors[annex['id']][:label]}<br/><br/>"
-          t << name.text
+          name&.children&.each { |c2| parse(c2, t) }
         end
       end
 

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

@@ -354,6 +354,8 @@ table.MsoISOTable
 	mso-yfti-tbllook:480;
 	mso-border-insideh:.75pt solid windowtext;
 	mso-border-insidev:.75pt solid windowtext;
+        mso-table-anchor-vertical:paragraph;
+        mso-table-bspace:12.0pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;}
@@ -381,6 +383,8 @@ table.MsoTableGrid
 	mso-para-margin:0cm;
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
+        mso-table-anchor-vertical:paragraph;
+        mso-table-bspace:12.0pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;}
@@ -445,6 +449,11 @@ div.example {
 table.example, table.Note {
     margin-left: 21.0pt;
 }
+
+table.example {
+        margin-bottom:12pt;
+}
+
 p.example, li.example, div.example, td.example
 	{mso-style-name:示例;  /* NAME: Example */
 	mso-style-unhide:no;
@@ -461,6 +470,11 @@ p.example, li.example, div.example, td.example
 	font-family:$bodyfont;
 	mso-hansi-font-family:$bodyfont;
 	mso-bidi-font-family:$bodyfont;}
+
+td.example p.MsoListParagraph {
+  font-size: 9.0pt;
+}
+
 p.leftpagenumber, li.leftpagenumber, div.leftpagenumber
 	{mso-style-name:leftpagenumber;
 	mso-style-priority:99;

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

@@ -726,6 +726,13 @@ p.DeprecatedTerms {
     }
 }
 
+@media screen {
+  img:not(.logo) { 
+      width: 100%;   
+      height: auto;
+  }
+}
+    
 
 #toc ul {
     margin: 0;

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

@@ -564,6 +564,13 @@ p.DeprecatedTerms {
     }
 }
 
+@media screen {
+  img:not(.logo) { 
+      width: 100%;   
+      height: auto;
+  }
+}
+    
 
 
 #toc ul {

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

@@ -149,9 +149,8 @@ p.MsoListParagraph, li.MsoListParagraph, div.MsoListParagraph
         mso-style-qformat:yes;
         margin-top:0cm;
         margin-right:0cm;
-        margin-bottom:0cm;
+        margin-bottom:12.0pt;
         /* do not put in margin-left, it is specific to list level */
-        margin-bottom:.0001pt;
         mso-add-space:auto;
         mso-pagination:widow-orphan;
         font-size:10.5pt;
@@ -165,9 +164,8 @@ p.MsoListParagraphCxSpFirst, li.MsoListParagraphCxSpFirst, div.MsoListParagraphC
         mso-style-type:export-only;
         margin-top:0cm;
         margin-right:0cm;
-        margin-bottom:0cm;
+        margin-bottom:12.0pt;
         /* do not put in margin-left, it is specific to list level */
-        margin-bottom:.0001pt;
         mso-add-space:auto;
         mso-pagination:widow-orphan;
         font-size:10.5pt;
@@ -181,9 +179,8 @@ p.MsoListParagraphCxSpMiddle, li.MsoListParagraphCxSpMiddle, div.MsoListParagrap
         mso-style-type:export-only;
         margin-top:0cm;
         margin-right:0cm;
-        margin-bottom:0cm;
+        margin-bottom:12.0pt;
         /* do not put in margin-left, it is specific to list level */
-        margin-bottom:.0001pt;
         mso-add-space:auto;
         mso-pagination:widow-orphan;
         font-size:10.5pt;
@@ -197,9 +194,8 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
         mso-style-type:export-only;
         margin-top:0cm;
         margin-right:0cm;
-        margin-bottom:0cm;
-        /* do not put in margin-left, it is specific to list level */
         margin-bottom:12.0pt;
+        /* do not put in margin-left, it is specific to list level */
         mso-add-space:auto;
         mso-pagination:widow-orphan;
         font-size:10.5pt;
@@ -2499,6 +2495,8 @@ table.MsoNormalTable
 	mso-para-margin:0cm;
 	mso-para-margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
+        mso-table-anchor-vertical:paragraph;
+        mso-table-bspace:12.0pt;
 	font-size:10.0pt;
 	font-family:$bodyfont;
 	mso-fareast-font-family:$bodyfont;}

data/lib/isodoc/gb/metadata.rb

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

data/lib/metanorma/gb/processor.rb

@@ -22,8 +22,8 @@ module Metanorma
         "Metanorma::Gb #{Metanorma::Gb::VERSION}"
       end
 
-      def input_to_isodoc(file)
-        Metanorma::Input::Asciidoc.new.process(file, @asciidoctor_backend)
+      def input_to_isodoc(file, filename)
+        Metanorma::Input::Asciidoc.new.process(file, filename, @asciidoctor_backend)
       end
 
       def extract_options(file)
@@ -33,10 +33,10 @@ module Metanorma
         /\n:standard-issuer-img: (?<standardissuerimg>[^\n]+)\n/ =~ head
         /\n:title-font: (?<titlefont>[^\n]+)\n/ =~ head
         new_options = {
-          standardlogoimg: defined(standardlogoimg) ? standardlogoimg : nil,
-          standardclassimg: defined(standardclassimg) ? standardclassimg : nil,
-          standardissuerimg: defined(standardissuerimg) ? standardissuerimg : nil,
-          titlefont: defined(titlefont) ? titlefont : nil,
+          standardlogoimg: defined?(standardlogoimg) ? standardlogoimg : nil,
+          standardclassimg: defined?(standardclassimg) ? standardclassimg : nil,
+          standardissuerimg: defined?(standardissuerimg) ? standardissuerimg : nil,
+          titlefont: defined?(titlefont) ? titlefont : nil,
         }.reject { |_, val| val.nil? }
         super.merge(new_options)
       end

data/lib/metanorma/gb/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Gb
-    VERSION = "1.0.6"
+    VERSION = "1.0.7"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-08 00:00:00.000000000 Z
+date: 2018-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso