metanorma-gb 1.3.13 → 1.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9f2afc72c01018a9f90be17973daf80e9e52897e482f613295fe0c48b4a0c85a
-  data.tar.gz: 425341234ece59b30474763deb0bc3a854fa3f988e5918459eafd3e2ccdc1085
+  metadata.gz: 0e1e9ae0dee1840e2d4825ec6623f720a58f1cefaf7c0603759b5efca9f5620e
+  data.tar.gz: 2f66fe7d4c00bae4f465c738a4ad8813d41f4aa3450206d1a51a7a11e1c07745
 SHA512:
-  metadata.gz: 6540b1d142ab824d177c51ac56ef98d9f9a9a2a8acf7a8d3eed2805023ac4f39908284bd64eb0039a544016b3c220a2d7b217c7daf909ab0a304fbb089a4c887
-  data.tar.gz: d6769819cdd1fe2bd2068c0c3fa0b7bd7d58b92c0f28088ae9c7ee61987317446db6f9b371372430c9d3e969b55a2379621b20951174dd7e7ad1f20f901a39c8
+  metadata.gz: 92b7df3a9e1fafe9a01d735ee2e1975cc207a41cb06ece5d10c98de33fd27af61c7e311db8bab6c74be3cfdf8ced1e831e0edd69f6e5372a7853f8976f3792ac
+  data.tar.gz: 6dd14b6d35925f34195e98f752dceb549a0f4fa96f68daf2c36483710b41c3d0fcfafe3060b68edde4cbe04ff03aa7ceb66dbc4383f3f0b737838a478e7d7af8

data/lib/asciidoctor/gb/boilerplate.xml

@@ -0,0 +1,13 @@
+<boilerplate>
+  {% if stage == 30 %}
+  <legal-statement>
+    <clause>
+      {% if language == "en" %}
+      <p>When submitting feedback, please attach any relevant patents that you are aware of, together with supporting documents.</p>
+      {% else %}
+      <p>在提交反馈意见时，请将您知道的相关专利连同支持文件一并附上。</p>
+      {% endif %}
+    </clause>
+  </legal-statement>
+  {% endif %}
+</boilerplate>

data/lib/asciidoctor/gb/converter.rb

@@ -161,16 +161,16 @@ module Asciidoctor
         "YD|YS|YY|YZ|ZY|GB|GBZ|GJB|GBn|GHZB|GWKB|GWPB|JJF|JJG|Q|T)(/Z|/T)?)"
 
       ISO_REF = %r{^<ref\sid="(?<anchor>[^"]+)">
-      \[(?<code>(ISO|IEC|#{GBCODE})[^0-9]*\s[0-9-]+?)
+      \[(?<usrlbl>\([^)]+\))?(?<code>(ISO|IEC|#{GBCODE})[^0-9]*\s[0-9-]+?)
       ([:-](?<year>(19|20)[0-9][0-9]))?\]</ref>,?\s
       (?<text>.*)$}xm
 
       ISO_REF_NO_YEAR = %r{^<ref\sid="(?<anchor>[^"]+)">
-      \[(?<code>(ISO|IEC|#{GBCODE})[^0-9]*\s[0-9-]+):--\]</ref>,?\s?
+      \[(?<usrlbl>\([^)]+\))?(?<code>(ISO|IEC|#{GBCODE})[^0-9]*\s[0-9-]+):--\]</ref>,?\s?
       <fn[^>]*>\s*<p>(?<fn>[^\]]+)</p>\s*</fn>,?\s?(?<text>.*)$}xm
 
       ISO_REF_ALL_PARTS = %r{^<ref\sid="(?<anchor>[^"]+)">
-      \[(?<code>(ISO|IEC|#{GBCODE})[^0-9]*\s[0-9]+)\s
+      \[(?<usrlbl>\([^)]+\))?(?<code>(ISO|IEC|#{GBCODE})[^0-9]*\s[0-9]+)\s
       \(all\sparts\)\]</ref>(<p>)?,?\s?
       (?<text>.*)(</p>)?$}xm
 
@@ -242,11 +242,16 @@ module Asciidoctor
       end
 
       def boilerplate_cleanup(xmldoc)
+        isodoc = boilerplate_isodoc(xmldoc)
+        initial_boilerplate(xmldoc, isodoc)
         return if @keepboilerplate
-        super
-      end
-
-      def initial_boilerplate(xmldoc)
+        f = xmldoc.at(self.class::TERM_CLAUSE) and
+          term_defs_boilerplate(f.at("./title"),
+                                xmldoc.xpath(".//termdocsource"),
+                                f.at(".//term"), f.at(".//p"), isodoc)
+        f = xmldoc.at(self.class::NORM_REF) and
+          norm_ref_preface(f)
+        initial_boilerplate(xmldoc, isodoc)
       end
     end
   end

data/lib/isodoc/gb/gbwordconvert.rb

@@ -40,7 +40,7 @@ module IsoDoc
       end 
 
       ENDLINE = <<~END.freeze
-      <v:line id="_x0000_s1026"
+      <v:line 
  alt="" style='position:absolute;left:0;text-align:left;z-index:251662848;
  mso-wrap-edited:f;mso-width-percent:0;mso-height-percent:0;
  mso-width-percent:0;mso-height-percent:0'
@@ -56,6 +56,14 @@ module IsoDoc
         word_preface(docxml)
         word_annex_cleanup(docxml)
         @cleanup.title_cleanup(docxml.at('//div[@class="WordSection2"]'))
+        word_table_align(docxml)
+      word_table_separator(docxml)
+      word_admonition_images(docxml)
+      word_list_continuations(docxml)
+      word_example_cleanup(docxml)
+      word_pseudocode_cleanup(docxml)
+      word_image_caption(docxml)
+      authority_cleanup(docxml)
         docxml
       end
 

data/lib/isodoc/gb/html/html_compliant_gb_titlepage.html

@@ -94,7 +94,7 @@
     <span class="stage-if-draft">（{{ stageabbr }}）</span> <br/>
     {% if stage == 30 %}
     <div class="coverpage_warning">
-    {{ patent_request }}
+      <div id="boilerplate-legal-destination"/>
     </div>
     {% endif %}
     {% if revdate %}

data/lib/isodoc/gb/html/html_gb_titlepage.html

@@ -76,7 +76,7 @@
     {% endif %}
     {% if stage == 30 %}
     <div class="coverpage_warning">
-    {{ patent_request }}
+            <div id="boilerplate-legal-destination"/>
     </div>
     {% endif %}
     {% endif %}

data/lib/isodoc/gb/html/word_gb_titlepage.html

@@ -219,10 +219,7 @@ width:263494459px;height:28675px'>
     lang=ZH-CN>（{{ stageabbr }}）</span></p>
   <p class=draft_type>
     {% if stage == 30 %}
-  <a name=YZBS></a><span
-  style='mso-bookmark:YZBS'><span lang=ZH-CN style='mso-no-proof:yes'>{{ patent_request }}</span><span
-  lang=EN-US></span></span><span
-  style='mso-bookmark:YZBS'></span>
+        <div id="boilerplate-legal-destination"/>
     {% endif %}
   </p>
     <p class=draft_editorial><span lang=EN-US>

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

@@ -108,6 +108,28 @@ div.WordSection1
 	mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2;
 	mso-paper-source:0;
 	layout-grid:15.6pt;}
+@page WordSection2L
+        {size:841.9pt 595.3pt;
+        margin:2.50cm 2.0cm 2.0cm 2.50cm;
+        mso-header-margin:2.50cm;
+        mso-footer-margin:1.50cm;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2;
+        mso-paper-source:0;
+        layout-grid:15.6pt;}
+@page WordSection2P
+        {size:595.3pt 841.9pt;
+        margin:2.50cm 2.0cm 2.0cm 2.50cm;
+        mso-header-margin:2.50cm;
+        mso-footer-margin:1.50cm;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef2;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f2;
+        mso-paper-source:0;
+        layout-grid:15.6pt;}
 div.WordSection2
 	{page:WordSection2;}
 @page WordSection3
@@ -122,6 +144,28 @@ div.WordSection2
 	mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
 	mso-paper-source:0;
 	layout-grid:15.6pt;}
+@page WordSection3L
+        {size:841.9pt 595.3pt;
+        margin:2.50cm 2.0cm 2.0cm 2.50cm;
+        mso-header-margin:2.50cm;
+        mso-footer-margin:1.50cm;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
+        mso-paper-source:0;
+        layout-grid:15.6pt;}
+@page WordSection3P
+        {size:595.3pt 841.9pt;
+        margin:2.50cm 2.0cm 2.0cm 2.50cm;
+        mso-header-margin:2.50cm;
+        mso-footer-margin:1.50cm;
+        mso-even-header:url("file:///C:/Doc/FILENAME_files/header.html") eh2;
+        mso-header:url("file:///C:/Doc/FILENAME_files/header.html") h2;
+        mso-even-footer:url("file:///C:/Doc/FILENAME_files/header.html") ef3;
+        mso-footer:url("file:///C:/Doc/FILENAME_files/header.html") f3;
+        mso-paper-source:0;
+        layout-grid:15.6pt;}
 div.WordSection3
 	{page:WordSection3;}
  /* Style Definitions */
@@ -594,7 +638,6 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle, h1.IntroTitle
 	margin-left:0cm;
 	text-align:center;
 	line-height:15.5pt;
-	page-break-before:always;
 	mso-pagination:widow-orphan;
 	page-break-after:avoid;
 	mso-outline-level:1;
@@ -607,7 +650,34 @@ p.IntroTitle, li.IntroTitle, div.IntroTitle, h1.IntroTitle
 	mso-bidi-font-family:$headerfont;
 	mso-ansi-language:EN-GB;
 	mso-fareast-language:ZH-CN;
+        page-break-before:always;
 	mso-bidi-font-weight:normal;}
+p.TitlePageSubhead, li.TitlePageSubhead, div.TitlePageSubhead {
+mso-style-noshow:yes;
+        mso-style-unhide:no;
+        margin-top:0.7cm;
+    mso-element:frame;
+    mso-element-wrap:no-wrap-beside;
+    mso-element-anchor-vertical:paragraph;
+    mso-element-left:center;
+        margin-right:0cm;
+        margin-bottom:0.9cm;
+        margin-left:0cm;
+        text-align:center;
+        line-height:15.5pt;
+        mso-pagination:widow-orphan;
+        page-break-after:avoid;
+        mso-hyphenate:none;
+        tab-stops:20.15pt;
+        font-size:16.0pt;
+        mso-bidi-font-size:11.0pt;
+        font-family:$headerfont;
+        mso-fareast-font-family:$headerfont;
+        mso-bidi-font-family:$headerfont;
+        mso-ansi-language:EN-GB;
+        mso-fareast-language:ZH-CN;
+        mso-bidi-font-weight:normal;
+}   
 .h2Annex
     {mso-style-priority:2;
 	mso-style-unhide:no;
@@ -1696,7 +1766,6 @@ ol li li li, ol li li li p, ol li li li div, ol li li li .MsoNormal
 	mso-endnote-separator:url("file:///C:/Doc/FILENAME_files/header.html") es;
 	mso-endnote-continuation-separator:url("file:///C:/Doc/FILENAME_files/header.html") ecs;
 	mso-facing-pages:yes;
-    mso-page-orientation: portrait;
 	}
   /* List Definitions */
 @list l0

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

@@ -2,11 +2,10 @@ publicationdate_lbl: Issuance Date
 implementationdate_lbl: Implementation Date
 supercedes_lbl: Supercedes
 partly_supercedes_lbl: Partly Supercedes
-patent_request: When submitting feedback, please attach any relevant patents that you are aware of, together with supporting documents.
 completion_date: 'Completion date for this manuscript: '
 PRC: "People's Republic of China "
 industry_standard: " Industry Standard"
 local_standard: " Local Standard"
 local_issuer: " Quality and Technical Inspection Bureau"
 enterprise_standard: " Enterprise Standard"
-social_standard: Social Standard
+social_standard: Social Standard

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

@@ -2,11 +2,10 @@ publicationdate_lbl: 发布
 implementationdate_lbl: 实施
 supercedes_lbl: 代替
 partly_supercedes_lbl: 部分代替
-patent_request: 在提交反馈意见时，请将您知道的相关专利连同支持文件一并附上。
 completion_date: 本稿完成日期：
 PRC: 中华人民共和国
 industry_standard: 行业标准
 local_standard: 地方标准
 local_issuer: 质量技术检测局
 enterprise_standard: 企业标准
-social_standard: 团体标准
+social_standard: 团体标准

data/lib/isodoc/gb/metadata.rb

@@ -220,14 +220,14 @@ module IsoDoc
         m = get
         if @lang == "zh"
           set(:labelled_publisheddate, m[:publisheddate] + " " +
-              @labels["publicationdate_lbl"])
+              (@labels["publicationdate_lbl"] || ""))
           set(:labelled_implementeddate, m[:implementeddate] + " " +
-              @labels["implementationdate_lbl"])
+              (@labels["implementationdate_lbl"] || ""))
         else
-          set(:labelled_publisheddate, @labels["publicationdate_lbl"] +
+          set(:labelled_publisheddate, (@labels["publicationdate_lbl"] || "") +
               ": " + m[:publisheddate])
           set(:labelled_implementeddate,
-              @labels["implementationdate_lbl"] + ": " +
+              (@labels["implementationdate_lbl"] || "") + ": " +
               m[:implementeddate])
         end
       end

data/lib/metanorma/gb/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Gb
-    VERSION = "1.3.13"
+    VERSION = "1.3.14"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-gb
 version: !ruby/object:Gem::Version
-  version: 1.3.13
+  version: 1.3.14
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-17 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metanorma-iso
@@ -252,6 +252,7 @@ files:
 - lib/asciidoctor/gb.rb
 - lib/asciidoctor/gb/basicdoc.rng
 - lib/asciidoctor/gb/biblio.rng
+- lib/asciidoctor/gb/boilerplate.xml
 - lib/asciidoctor/gb/converter.rb
 - lib/asciidoctor/gb/front.rb
 - lib/asciidoctor/gb/gbstandard.rng