asciidoctor-gb 0.1.5 → 0.2.2

data/lib/asciidoctor/gb/html/html_gb_intro.html

@@ -1,45 +1,9 @@
 <div class="rule"></div>
 
 <div class="toc">
-  <h1 class="toc-contents">目 次</h1>
+  <h1 class="toc-contents">{{ table_of_contents }}</h1>
   <ul id="toc-list"></ul>
 </div>
 
 <div class="rule"></div>
 
-<script type="text/javascript"
-  src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js">
-</script>
-
-<script>
-// http://tutorials.jenkov.com/jquery/generating-table-of-contents.html
-$(document).ready(function() {
-  $("#toc-list").empty();
-
-  var prevH2Item = null;
-  var prevH2List = null;
-
-  var index = 0;
-  $("h1, h2").each(function() {
-
-    if ($(this).hasClass("toc-contents")) {
-      return;
-    }
-    //insert an anchor to jump to, from the TOC link.
-    var anchor = "<a name='" + index + "'></a>";
-    $(this).before(anchor);
-
-    var li     = "<li><a href='#" + index + "'>" + $(this).text() + "</a></li>";
-
-    if ($(this).is("h1") ){
-      prevH2List = $("<ul></ul>");
-      prevH2Item = $(li);
-      prevH2Item.append(prevH2List);
-      prevH2Item.appendTo("#toc-list");
-    } else {
-      prevH2List.append(li);
-    }
-    index++;
-  });
-});
-</script>

data/lib/asciidoctor/gb/html/html_gb_titlepage.html

@@ -2,7 +2,7 @@
 
   <div class="coverpage-category">
     <span class="category-1">ICS {{ libraryid_ics }} </span>
-    <span class="category-2">L {{ libraryid_l }}</span>
+    <span class="category-2">{{ libraryid_ccs }}</span>
   </div>
 
   <div class="coverpage-logo">
@@ -72,17 +72,18 @@
     {% endif %}
   </div>
 
-  <div class="coverpage-stage-block">
-    <span class="stage">{{ stageabbr }} Stage</span>
-    {% if draft %}
-    <span class="stage-if-draft">（征求意见稿）</span>
+  <div class="coverpage-stage-block" lang="{{ language }}">
+    {% if stage and stage < 60 %}
+    <span class="stage-if-draft">（{{ stageabbr }}）</span>
     {% if revdate %}
     <span class="revision-if-draft">（本稿完成日期：{{ revdate }}）</span>
     {% endif %}
+    {% if stage == 30 %}
     <span class="warning-if-draft">
     在提交反馈意见时，请将您知道的相关专利连同支持文件一并附上
     </span>
     {% endif %}
+    {% endif %}
   </div>
 
   <div class="coverpage-dates">

data/lib/asciidoctor/gb/html/{htmlstyle.css → htmlstyle.scss}

@@ -5,7 +5,7 @@ html {
 body { 
   font-size: 1em;
   margin: 0;
-  font-family: "Source Sans Pro",sans-serif;
+  font-family: $bodyfont;
 }
 
 h1 {
@@ -171,7 +171,7 @@ p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
         line-height:12.0pt;
         tab-stops:20.15pt;
         font-size:12.0pt;
-        font-family:"Cambria",serif;
+        font-family:$bodyfont;
       }
 p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject
 {
@@ -183,5 +183,87 @@ p.MsoCommentSubject, li.MsoCommentSubject, div.MsoCommentSubject
         line-height:12.0pt;
         tab-stops:20.15pt;
         font-size:10.0pt;
-        font-family:"Cambria",serif;
+        font-family:$headerfont;
         font-weight:bold;}
+
+.coverpage-logo-text {
+        font-size:24.0pt;
+}
+
+.doc-number {
+        font-size:14.0pt;
+}
+
+.coverpage-doc-relations {
+        font-size:10.5pt;
+}
+
+.coverpage-title-zh {
+        font-size:26pt;
+        font-family:$headerfont;
+}
+.coverpage-title-en {
+        font-size:14pt;
+        font-family:$headerfont;
+}
+.coverpage-iso-relation {
+        font-size:14pt;
+}
+.coverpage-dates {
+        font-size:14.0pt;
+        font-family:$headerfont;
+}
+.coverpage_footer {
+        font-size:14.0pt;
+}
+
+p.ForewordTitle, li.ForewordTitle, div.ForewordTitle, h1.ForewordTitle {
+  margin-top: 1.5cm;
+  margin-right: 0cm;
+  margin-bottom: 1.2cm;
+  margin-left: 0cm;
+  text-align: center;
+  line-height: 15.5pt;
+  tab-stops: 20.15pt;
+  font-size: 16.0pt;
+  font-family: $headerfont;
+}
+p.IntroTitle, li.IntroTitle, div.IntroTitle, h1.IntroTitle {
+  margin-top: 1.5cm;
+  margin-right: 0cm;
+  margin-bottom: 1.2cm;
+  margin-left: 0cm;
+  text-align: center;
+  line-height: 15.5pt;
+  tab-stops: 20.15pt;
+  font-size: 16.0pt;
+  font-family: $headerfont;
+}
+.h2Annex
+    {
+    margin-top:7.8pt;
+	margin-right:0cm;
+	margin-bottom:7.8pt;
+	margin-left:0cm;
+	text-indent:0cm;
+	line-height:12.5pt;
+	mso-pagination:widow-orphan;
+	page-break-after:avoid;
+	mso-outline-level:2;
+	mso-hyphenate:none;
+	tab-stops:27.0pt 35.0pt;
+	font-size:10.5pt;
+	font-family:$headerfont;}
+p.zzContents, li.zzContents, div.zzContents
+	{
+	margin-top:48.0pt;
+	margin-right:0cm;
+	margin-bottom:15.5pt;
+	margin-left:0cm;
+	text-align:center;
+	line-height:15.5pt;
+	page-break-before:always;
+	page-break-after:avoid;
+	tab-stops:20.15pt;
+	font-size:16.0pt;
+	font-family:$headerfont;}

data/lib/asciidoctor/gb/html/word_gb_intro.html

@@ -1,3 +1,3 @@
-<p class=zzContents style='margin-top:0cm'><span lang=ZH>目 次</span></p>
+<p class=zzContents style='margin-top:0cm'>{{ table_of_contents }}</p>
 
 WORDTOC

data/lib/asciidoctor/gb/html/word_gb_titlepage.html

@@ -1,19 +1,64 @@
-<p class=MsoNormalUnindented><span lang=EN-US>ICS <a name=ICS></a></span>{{ libraryid_ics }}</p>
+<div class=coverpage>
 
-<div style='mso-element:frame;mso-element-wrap:around;mso-element-anchor-vertical:
-page;mso-element-top:27.55pt;mso-height-rule:exactly'>
+<p class=MsoNormalUnindented><!--[if gte vml 1]><v:line id="Line_x0020_10" o:spid="_x0000_s1026"
+ style='position:absolute;left:0;text-align:left;z-index:251669504;
+ visibility:visible;mso-wrap-style:square;mso-width-percent:0;
+ mso-height-percent:0;mso-wrap-distance-left:9pt;mso-wrap-distance-top:0;
+ mso-wrap-distance-right:9pt;mso-wrap-distance-bottom:0;
+ mso-position-horizontal:absolute;mso-position-horizontal-relative:text;
+ mso-position-vertical:absolute;mso-position-vertical-relative:text;
+ mso-width-percent:0;mso-height-percent:0;mso-width-relative:page;
+ mso-height-relative:page' from="0,24.7cm" to="17.00cm,24.7cm"  strokecolor="#080000" strokeweight="1pt">
+ <o:lock v:ext="edit" shapetype="f"/>
+</v:line><![endif]--></p>
 
-<table cellspacing=0 cellpadding=0 hspace=0 vspace=0 align=left>
+<p class=MsoNormalUnindented>
+<!--[if gte vml 1]><v:line id="Line_x0020_11" o:spid="_x0000_s1027"
+ style='position:absolute;left:0;text-align:left;z-index:251660800;
+ visibility:visible;mso-wrap-style:square;mso-width-percent:0;
+ mso-height-percent:0;mso-wrap-distance-left:9pt;mso-wrap-distance-top:0;
+ mso-wrap-distance-right:9pt;mso-wrap-distance-bottom:0;
+ mso-position-horizontal:absolute;mso-position-horizontal-relative:text;
+ mso-position-vertical:absolute;mso-position-vertical-relative:text;
+ mso-width-percent:0;mso-height-percent:0;mso-width-relative:page;
+ mso-height-relative:page' from="0,6.11cm" to="17.00cm,6.11cm"  strokecolor="#080000" strokeweight="1pt">
+ <o:lock v:ext="edit" shapetype="f"/>
+</v:line><![endif]--></p>
+
+<!--[if gte vml 1]><v:shape id="fmFrame1" o:spid="_x0000_s1028"
+ type="#_x0000_t202" alt="" style='position:absolute;left:0;text-align:left;
+ margin-left:0;margin-top:0;width:5.0cm;height:1.83cm;z-index:251652608;
+ mso-wrap-style:square;mso-wrap-edited:f;mso-width-percent:0;
+ mso-height-percent:0;mso-position-horizontal-relative:margin;
+ mso-position-vertical-relative:margin;mso-width-percent:0;
+ mso-height-percent:0;v-text-anchor:top' stroked="f">
+ <v:textbox style='mso-next-textbox:#fmFrame1' inset="0,0,0,0"/>
+ <w:wrap anchorx="margin" anchory="margin"/>
+ <w:anchorlock/>
+</v:shape><![endif]--><![if !vml]><span style='mso-ignore:vglayout;position:
+relative;z-index:251652608'><span style='left:0px;position:absolute;left:-10px;
+top:-5px;'>
+
+<table cellpadding=0 cellspacing=0>
  <tr>
-  <td valign=top align=left style='padding-top:9.0pt;padding-right:9.0pt;
-  padding-bottom:9.0pt;padding-left:9.0pt'>
-  <p class=affffd style='mso-element:frame;mso-element-wrap:around;mso-element-anchor-vertical:
-  page;mso-element-top:27.55pt;mso-height-rule:exactly'><a name=WXFLH></a><span lang=EN-US>L {{ libraryid_l }}</span></p>
-  </td>
+  <td bgcolor=white style='vertical-align:top;
+  background:white'><![endif]><![if !mso]><span style='position:absolute;
+  mso-ignore:vglayout;left:0pt;z-index:251652608'>
+  <table cellpadding=0 cellspacing=0 width="100%">
+   <tr>
+    <td><![endif]>
+    <div v:shape="fmFrame1" style='padding:0pt 0pt 0pt 0pt' class=shape>
+    <p class=ccs_container><span class="ccs_label">ICS</span> <span class="ccs">{{ libraryid_ics }}</span></p>
+    <p class=ccs_container><span class="ccs_label">{{ libraryid_ccs | slice: 0 }}</span> <span class="ccs">{{ libraryid_ccs | slice: 1,libraryid_ccs.size }}</span></p>
+    </div>
+    <![if !mso]></td>
+   </tr>
+  </table>
+  </span><![endif]><![if !mso & !vml]>&nbsp;<![endif]><![if !vml]></td>
  </tr>
 </table>
 
-</div>
+</span></span><![endif]>
 
 <div style='mso-element:frame;mso-element-wrap:around;mso-height-rule:exactly'>
 
@@ -22,213 +67,322 @@ page;mso-element-top:27.55pt;mso-height-rule:exactly'>
  <tr>
   <td valign=top align=left height=1751 style='padding-top:9.05pt;padding-right:
   9.05pt;padding-bottom:9.05pt;padding-left:9.05pt'>
-  <p class=af><span lang=EN-US style='mso-no-proof:yes'>{{ standard_logo }}</span></p>
+  <p class="standard_logo{% if gbscope == 'local' %}_local{% endif %}"
+   style='line-height:72.0pt;mso-line-height-rule:exactly'><span lang=EN-US style='mso-no-proof:yes'>{{ standard_logo }}</span></p>
   </td> </tr>
 </table>
 
 </div>
 
-<div style='mso-element:frame;mso-element-wrap:around;mso-height-rule:exactly'>
 
-<table cellspacing=0 cellpadding=0 hspace=0 vspace=0 width=491 height=49
- align=left>
+<!--[if gte vml 1]><v:shape
+ id="fmFrame2" o:spid="_x0000_s1029" type="#_x0000_t202" alt="" style='position:absolute;
+ left:0;text-align:left;margin-left:0;margin-top:2.81cm;width:17.00cm;height:0.80cm;
+ z-index:251653632;mso-wrap-style:square;mso-wrap-edited:f;mso-width-percent:0;
+ mso-height-percent:0;mso-position-horizontal-relative:margin;
+ mso-position-vertical-relative:margin;mso-width-percent:0;
+ mso-height-percent:0;v-text-anchor:top' stroked="f">
+ <v:textbox style='mso-next-textbox:#fmFrame2' inset="0,0,0,0"/>
+ <w:wrap anchorx="margin" anchory="margin"/>
+ <w:anchorlock/>
+</v:shape><![endif]-->
+
+<![if !vml]><span style='mso-ignore:vglayout;position:
+absolute;z-index:251653632;left:0px;margin-left:-10px;margin-top:75px;
+width:263494454px;height:28675px'>
+
+<table cellpadding=0 cellspacing=0>
  <tr>
-  <td valign=top align=left height=49 style='padding-top:9.05pt;padding-right:
-  9.05pt;padding-bottom:9.05pt;padding-left:9.05pt'>
-  <p class=afa><span lang=ZH-CN>{{ standard_class }}</span></p>
-  </td>
+  <td width=263494454 height=28675 bgcolor=white style='vertical-align:top;
+  background:white'><![endif]><![if !mso]><span style='position:absolute;
+  mso-ignore:vglayout;left:0pt;z-index:251653632'>
+  <table cellpadding=0 cellspacing=0 width="100%">
+   <tr>
+    <td><![endif]>
+    <div v:shape="fmFrame2" style='padding:0pt 0pt 0pt 0pt' class=shape>    
+    <p class=standard_class {% if language == "en" %}style='text-align:center'{% endif %}>
+    <span {% if language == "en" %}style="font-size:10.5pt"{%- endif -%}>{{ standard_class }}</span></p>
+    </div>
+    <![if !mso]></td>
+   </tr>
+  </table>
+  </span><![endif]><![if !mso & !vml]>&nbsp;<![endif]><![if !vml]></td>
  </tr>
 </table>
 
-</div>
+</span><![endif]>
 
-<div style='mso-element:frame;mso-element-wrap:around;mso-height-rule:exactly'>
 
-<table cellspacing=0 cellpadding=0 hspace=0 vspace=0 width=471 height=62
- align=left>
+<!--[if gte vml 1]><v:shape
+ id="fmFrame3" o:spid="_x0000_s1031" type="#_x0000_t202" alt="文本框: GB/T XXXX—XXXX&#13;&#10;&#13;&#10;"
+ style='position:absolute;left:0;text-align:left;margin-left:0;margin-top:4.00cm;
+ width:16.50cm;height:4.64cm;z-index:251655680;mso-wrap-style:square;
+ mso-wrap-edited:f;mso-width-percent:0;mso-height-percent:0;
+ mso-position-horizontal-relative:margin;mso-position-vertical-relative:margin;
+ mso-width-percent:0;mso-height-percent:0;v-text-anchor:top' stroked="f">
+ <v:textbox style='mso-next-textbox:#fmFrame3' inset="0,0,0,0"/>
+ <w:wrap anchorx="margin" anchory="margin"/>
+ <w:anchorlock/>
+</v:shape><![endif]--><![if !vml]><span style='mso-ignore:vglayout;position:
+absolute;z-index:251655680;left:0px;margin-left:-10px;margin-top:120px;
+width:263494454px;height:28675px'>
+
+<table cellpadding=0 cellspacing=0>
  <tr>
-  <td valign=top align=left height=62 style='padding-top:0cm;padding-right:
-  14.2pt;padding-bottom:0cm;padding-left:14.2pt'>
-  <p class=2><a
-  name=StdNo1></a><span
-  style='mso-bookmark:StdNo1'><span lang=EN-US>{{ docidentifier }}</span></span><span
-  style='mso-bookmark:StdNo1'></span><span style='mso-bookmark:StdNo1'></span><span
-  lang=EN-US style='font-family:SimHei,serif;mso-ascii-font-family:
-  SimHei'>—</span><a name=StdNo2></a><span
-  style='mso-bookmark:StdNo2'></span><span style='mso-bookmark:StdNo2'><span
-  lang=el style='mso-ansi-language:#0400;mso-fareast-language:#0400'>{{ docyear }}</span>
-    {%- if isostandard and gbequivalence == "IDT" -%}
-       /<span style='font-family:SimHei,serif;mso-ascii-font-family:
-  SimHei'>{{ isostandard }}</span>
-    {%- endif -%}
-<span
-  lang=EN-US></span></span><span
-  style='mso-bookmark:StdNo2'></span></p>
+  <td width=263494454 height=28675 bgcolor=white style='vertical-align:top;
+  background:white'><![endif]><![if !mso]><span style='position:absolute;
+  mso-ignore:vglayout;left:0pt;z-index:251655680'>
+  <table cellpadding=0 cellspacing=0 width="100%">
+   <tr>
+    <td><![endif]>
+    <div v:shape="fmFrame3" style='padding:0pt 0pt 0pt 0pt' class=shape>
+    <p class=standard_number style='line-height:9.0pt;mso-line-height-rule:exactly'><span
+    lang=FR style='mso-ansi-language:FR'>{{ docidentifier }}</span><span
+    lang=FR style='mso-ansi-language:FR'><o:p></o:p></span></p>
+    
+    
       {% if obsoletes %}
-        <p class=supersedes style='margin-top:0cm;'>
-    {% if obsoletes_part %}
-      部分代替
-    {% else %}
-      代替
-    {% endif %}
-    {{ obsoletes }}
-    </p>
-    {% endif %}
-  <table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0
-   style='border-collapse:collapse;mso-table-layout-alt:fixed;border:none;
-   mso-border-alt:solid black .5pt;mso-padding-alt:0cm 5.4pt 0cm 5.4pt;
-   mso-border-insideh:.5pt solid black;mso-border-insidev:.5pt solid black'>
-   <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes'>
-    <td width=624 valign=top style='width:467.8pt;border:none;padding:0cm 5.4pt 0cm 5.4pt'>
-    <p class=aff><!--[if gte vml 1]><v:rect id="DT" o:spid="_x0000_s1030"
-     alt="" style='position:absolute;left:0;text-align:left;margin-left:372.8pt;
-     margin-top:2.7pt;width:90pt;height:18pt;z-index:-251660800;
+    <p class=supercedes_container><!--[if gte vml 1]><v:rect id="DT" o:spid="_x0000_s1030"
+     alt="" style='position:absolute;left:0;text-align:left;margin-left:13.15cm;
+     margin-top:2.7pt;width:3.17cm;height:0.63cm;z-index:-251660800;
      mso-wrap-style:square;mso-wrap-edited:f;mso-width-percent:0;
      mso-height-percent:0;mso-width-percent:0;mso-height-percent:0;
      v-text-anchor:top' stroked="f"/><![endif]--><![if !vml]><span
     style='mso-ignore:vglayout;position:relative;z-index:-1895827968'><span
     style='left:0px;position:absolute;left:297px;top:-40px;width:90px;
-    height:18px'><img width=90 height=18
-    src="blank.png" v:shapes="DT"></span></span><![endif]><a
+    height:18px'><!--<img width=90 height=18
+    src="blank.png" v:shapes="DT">-->
+
+    {% if obsoletes_part %}
+      {{ partly_supercedes_lbl }}
+    {% else %}
+      {{ supercedes_lbl }}
+    {% endif %}
+    {{ obsoletes }}
+    
+    
+    </span></span><![endif]><a
     name=DT></a><span lang=EN-US><span style='mso-spacerun:yes'> </span></span></p>
-    </td>
+    {% endif %}
+
+
+
+    </div>
+    <![if !mso]></td>
    </tr>
   </table>
-  <p class=affc><a name=StdName></a><span
-  style='mso-bookmark:StdName'><span lang=ZH-CN>{{ docmaintitlezh }} {{ docsubtitlezh }} {{ docparttitlezh }}</span><span
-  lang=EN-US></span></span><span
-  style='mso-bookmark:StdName'></span></p>
-  <p class=affd><a name=StdEnglishName></a><span
-  style='mso-bookmark:StdEnglishName'><span lang=EN-US>{{ docmaintitleen }} {{ docsubtitleen }} {{ docparttitleen }}</span></span><span
-  style='mso-bookmark:StdEnglishName'></span></p>
+  </span><![endif]><![if !mso & !vml]>&nbsp;<![endif]><![if !vml]></td>
+ </tr>
+</table>
+
+</span><![endif]>
+
+
+<!--[if gte vml 1]><v:shape id="fmFrame4" o:spid="_x0000_s1032"
+ type="#_x0000_t202" alt="" style='position:absolute;left:0;text-align:left;
+ margin-left:-5.25pt;margin-top:10.5cm;width:16.58cm;height:12.40cm;z-index:251656704;
+ mso-wrap-style:square;mso-wrap-edited:f;mso-width-percent:0;
+ mso-height-percent:0;mso-position-horizontal-relative:margin;
+ mso-position-vertical-relative:margin;mso-width-percent:0;
+ mso-height-percent:0;v-text-anchor:top' stroked="f">
+ <v:textbox style='mso-next-textbox:#fmFrame4' inset="0,0,0,0"/>
+ <w:wrap anchorx="margin" anchory="margin"/>
+ <w:anchorlock/>
+</v:shape><![endif]--><![if !vml]><span style='mso-ignore:vglayout;position:
+absolute;z-index:251656704;left:0px;margin-left:-15px;margin-top:245px;
+width:263494459px;height:28675px'>
+
+<table cellpadding=0 cellspacing=0>
+ <tr>
+  <td width=263494459 height=28675 bgcolor=white style='vertical-align:top;
+  background:white'><![endif]><![if !mso]><span style='position:absolute;
+  mso-ignore:vglayout;left:0pt;z-index:251656704'>
+  <table cellpadding=0 cellspacing=0 width="100%">
+   <tr>
+    <td><![endif]>
+    <div v:shape="fmFrame4" style='padding:0pt 0pt 0pt 0pt' class=shape>
+    <p class=standard_name><span lang=ZH-CN>{%if language == "zh" %}{{ docmaintitlezh }}{{ docsubtitlezh }}{{ docparttitlezh }}{% else %}<span class="en">{{ docmaintitleen }}{{ docsubtitleen }}{{ docparttitleen }}</span>{% endif %}</span><span lang=EN-US style='mso-bidi-font-size:26.0pt'><o:p></o:p></span></p>
+    <p class=standard_name_english style='margin-top:1.0cm;margin-bottom:1.0cm;mso-line-height-rule:
+    exactly'><span lang=EN-US>{%if language == "zh" %}{{ docmaintitleen }}{{ docsubtitleen }}{{ docparttitleen }}{% else %}<span class="zh">{{ docmaintitlezh }}{{ docsubtitlezh }}{{ docparttitlezh }}</span>{% endif %}</span></p>
+
     {% if isostandard %}
-  <p class=a0>
+  <p class=identicality_label>
       <span class="iso-document-code">({{ isostandard }}</span>
-      {% if isostandardtitle != "[not supplied]" %}
+      {%- if isostandardtitle != "[not supplied]" -%}
       <span class="iso-title-first">{{ isostandardtitle }}</span>
-      {% endif %}
-      <span class="join">，</span>
-      <span class="iso-equivalence-code">{{ gbequivalence }})</span>
+      {%- endif -%}
+      <span class="join">{%if language == "zh" %}，{% else %}, {% endif %}</span><span class="iso-equivalence-code">{{ gbequivalence }})</span>
   </p>
     {% endif %}
- 
-    {% if draft %}
-  <p class=a0><a name=YZBS></a><span
-  style='mso-bookmark:YZBS'><span lang=ZH-CN style='mso-no-proof:yes'>在提交反馈意见时，请将您知道的相关专利连同支持文件一并附上。</span><span
+    {% if stage and stage < 60 %}
+    <p class=draft_type><span lang=EN-US><span style='mso-spacerun:yes'> </span></span><span
+    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></p>
-  <table class=MsoNormalTable border=1 cellspacing=0 cellpadding=0
-   style='border-collapse:collapse;mso-table-layout-alt:fixed;border:none;
-   mso-border-alt:solid black .5pt;mso-padding-alt:0cm 5.4pt 0cm 5.4pt;
-   mso-border-insideh:.5pt solid black;mso-border-insidev:.5pt solid black'>
-   <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes'>
-    <td width=657 valign=top style='width:492.75pt;border:none;padding:0cm 5.4pt 0cm 5.4pt'>
-    <p class=affe><span lang=ZH-CN>（征求意见稿）</span><!--[if gte vml 1]><v:rect
-     id="RQ" o:spid="_x0000_s1029" alt="" style='position:absolute;left:0;
-     text-align:left;margin-left:173.3pt;margin-top:45.15pt;width:150pt;
-     height:20pt;z-index:-251658752;mso-wrap-style:square;mso-wrap-edited:f;
-     mso-width-percent:0;mso-height-percent:0;
-     mso-position-horizontal-relative:text;mso-position-vertical-relative:text;
-     mso-width-percent:0;mso-height-percent:0;v-text-anchor:top' stroked="f">
-     <w:anchorlock/>
-    </v:rect><![endif]--><![if !vml]><span style='mso-ignore:vglayout;
-    position:relative;z-index:-1895825920'><span style='left:0px;position:absolute;
-    left:162px;top:-53px;width:150px;height:20px'><!--<img width=150 height=20
-    src="gbt%2020984-draft.fld/image003.png" v:shapes="RQ">--></span></span><![endif]><!--[if gte vml 1]><v:rect
-     id="LB" o:spid="_x0000_s1028" alt="" style='position:absolute;left:0;
-     text-align:left;margin-left:193.3pt;margin-top:20.15pt;width:100pt;
-     height:24pt;z-index:-251659776;mso-wrap-style:square;mso-wrap-edited:f;
-     mso-width-percent:0;mso-height-percent:0;
-     mso-position-horizontal-relative:text;mso-position-vertical-relative:text;
-     mso-width-percent:0;mso-height-percent:0;v-text-anchor:top' stroked="f"/><![endif]--><![if !vml]><span
-    style='mso-ignore:vglayout;position:relative;z-index:-1895826944'><span
-    style='left:0px;position:absolute;left:182px;top:-78px;width:100px;
-    height:24px'><!--<img width=100 height=24
-    src="gbt%2020984-draft.fld/image004.png" v:shapes="LB">--></span></span><![endif]></p>
-    </td>
-   </tr>
-   {% if revdate %}
-   <tr style='mso-yfti-irow:1;mso-yfti-lastrow:yes'>
-    <td width=657 valign=top style='width:492.75pt;border:none;padding:0cm 5.4pt 0cm 5.4pt'>
-   <p class=afff><a name=WCRQ></a><span
-    style='mso-bookmark:WCRQ'><span lang=ZH-CN>（本稿完成日期：</span><span lang=EN-US>{{ revdate }}）</span><span
-    lang=EN-US></span></span><span
-    style='mso-bookmark:WCRQ'></span></p> 
-    </td>
+  style='mso-bookmark:YZBS'></span>
+    {% endif %}
+  </p>
+    <p class=draft_editorial><span lang=EN-US>
+       {% if revdate %}
+    <span lang=ZH-CN>（{{ completion_date }}</span><span lang=EN-US>{{ revdate }}）</span>
+       {% endif %}
+   </span></p>
+        {% endif %}
+
+    </div>
+    <![if !mso]></td>
    </tr>
-   {% endif %}
   </table>
-    {% endif %}
-  </td>
+  </span><![endif]><![if !mso & !vml]>&nbsp;<![endif]><![if !vml]></td>
  </tr>
 </table>
 
-</div>
+</span><![endif]>
 
-<div style='mso-element:frame;mso-element-wrap:around;mso-height-rule:exactly'>
 
-<table cellspacing=0 cellpadding=0 hspace=0 vspace=0 width=3995 height=833
- align=left>
+<!--[if gte vml 1]><v:shape id="fmFrame6" o:spid="_x0000_s1034"
+ type="#_x0000_t202" alt="" style='position:absolute;left:0;text-align:left;
+ margin-left:9.40cm;margin-top:23.79cm;width:7.61cm;height:0.87cm;z-index:251658752;
+ mso-wrap-style:square;mso-wrap-edited:f;mso-width-percent:0;
+ mso-height-percent:0;mso-position-horizontal-relative:margin;
+ mso-position-vertical-relative:margin;mso-width-percent:0;
+ mso-height-percent:0;v-text-anchor:top' stroked="f">
+ <v:textbox style='mso-next-textbox:#fmFrame6' inset="0,0,0,0"/>
+ <w:wrap anchorx="margin" anchory="margin"/>
+ <w:anchorlock/>
+</v:shape><![endif]-->
+<![if !vml]><span style='mso-ignore:vglayout;position:
+absolute;z-index:251658752;left:0px;margin-left:313px;margin-top:669px;
+width:263494131px;height:28675px'>
+
+<table cellpadding=0 cellspacing=0>
  <tr>
-  <td valign=top align=left height=833 style='padding-top:9.05pt;padding-right:
-  0cm;padding-bottom:9.05pt;padding-left:0cm'>
-  <p class=afffff4><a name=FY></a><span
-  style='mso-bookmark:FY'><span lang=EN-US style='font-family:SimHei;
-  mso-hansi-font-family:SimHei'>{{ publisheddate }}</span></span>
-  <span
-  lang=ZH-CN style='font-family:SimHei;mso-ascii-font-family:SimHei;
-  mso-hansi-font-family:SimHei'>发布</span><!--[if gte vml 1]><v:line
-   id="直线_x0020_10" o:spid="_x0000_s1027" alt="" style='position:absolute;
-   z-index:251658752;mso-wrap-edited:f;mso-width-percent:0;
-   mso-height-percent:0;mso-position-horizontal-relative:text;
-   mso-position-vertical-relative:page;mso-width-percent:0;
-   mso-height-percent:0' from="-.05pt,728.5pt" to="481.85pt,728.5pt">
-   <w:wrap anchory="page"/>
-   <w:anchorlock/>
-  </v:line><![endif]--></p>
-  </td>
+  <td width=263494131 height=28675 bgcolor=white style='vertical-align:top;
+  background:white'><![endif]><![if !mso]><span style='position:absolute;
+  mso-ignore:vglayout;left:0pt;z-index:251658752'>
+  <table cellpadding=0 cellspacing=0 width="100%">
+   <tr>
+    <td><![endif]>
+    <div v:shape="fmFrame6" style='padding:0pt 0pt 0pt 0pt' class=shape>
+    <p class=activated_date>{{ labelled_implementeddate }}</p>
+    </div>
+    <![if !mso]></td>
+   </tr>
+  </table>
+  </span><![endif]><![if !mso & !vml]>&nbsp;<![endif]><![if !vml]></td>
  </tr>
 </table>
 
-</div>
-
-<div style='mso-element:frame;mso-element-wrap:around;mso-height-rule:exactly'>
+</span><![endif]><span style='mso-bookmark:SectionMark4'><span
+style='mso-bookmark:SectionMark0'></span></span><!--[if gte vml 1]><v:shape
+ id="fmFrame5" o:spid="_x0000_s1033" type="#_x0000_t202" alt="" style='position:absolute;
+ left:0;text-align:left;margin-left:0;margin-top:23.79cm;width:5.61cm;height:0.87cm;
+ z-index:251657728;mso-wrap-style:square;mso-wrap-edited:f;mso-width-percent:0;
+ mso-height-percent:0;mso-position-horizontal-relative:margin;
+ mso-position-vertical-relative:margin;mso-width-percent:0;
+ mso-height-percent:0;v-text-anchor:top' stroked="f">
+ <v:textbox style='mso-next-textbox:#fmFrame5' inset="0,0,0,0"/>
+ <w:wrap anchorx="margin" anchory="margin"/>
+ <w:anchorlock/>
+</v:shape><![endif]--><![if !vml]><span style='mso-ignore:vglayout;position:
+absolute;z-index:251657728;left:0px;margin-left:-10px;margin-top:669px;
+width:263494454px;height:28675px'>
 
-<table cellspacing=0 cellpadding=0 hspace=0 vspace=0 width=3995 height=833
- align=left>
+<table cellpadding=0 cellspacing=0>
  <tr>
-  <td valign=top align=left height=833 style='padding-top:9.05pt;padding-right:
-  0cm;padding-bottom:9.05pt;padding-left:0cm'>
-  <p class=afffff5><a name=SY></a><span
-  style='mso-bookmark:SY'><span lang=EN-US style='font-family:SimHei;
-  mso-hansi-font-family:SimHei'>{{ activateddate }}</span></span>
-  <span
-  lang=ZH-CN style='font-family:SimHei;mso-ascii-font-family:SimHei;
-  mso-hansi-font-family:SimHei'>实施</span></p>
-  </td>
+  <td width=263494454 height=28675 bgcolor=white style='vertical-align:top;
+  background:white'><![endif]><![if !mso]><span style='position:absolute;
+  mso-ignore:vglayout;left:0pt;z-index:251657728'>
+  <table cellpadding=0 cellspacing=0 width="100%">
+   <tr>
+    <td><![endif]>
+    <div v:shape="fmFrame5" style='padding:0pt 0pt 0pt 0pt' class=shape>
+    <p class=publish_date>{{ labelled_publisheddate }}</p>
+    </div>
+    <![if !mso]></td>
+   </tr>
+  </table>
+  </span><![endif]><![if !mso & !vml]>&nbsp;<![endif]><![if !vml]></td>
  </tr>
 </table>
 
-</div>
+</span><![endif]>
 
-<div style='mso-element:frame;mso-element-wrap:around;mso-height-rule:exactly'>
 
-<table cellspacing=0 cellpadding=0 hspace=0 vspace=0 width=8061 height=1496
- align=left>
+<!--[if gte vml 1]><v:shapetype
+ id="_x0000_t202" coordsize="21600,21600" o:spt="202" path="m,l,21600r21600,l21600,xe">
+ <v:stroke joinstyle="miter"/>
+ <v:path gradientshapeok="t" o:connecttype="rect"/>
+</v:shapetype><v:shape id="fmFrame7" o:spid="_x0000_s1035" type="#_x0000_t202"
+ alt="" style='position:absolute;left:0;text-align:left;margin-left:0.0cm;
+ margin-top:25.00cm;width:17.00cm;height:1.7cm;z-index:251659776;
+ mso-wrap-style:square;mso-wrap-edited:f;mso-width-percent:0;
+ mso-height-percent:0;mso-position-horizontal-relative:margin;
+ mso-position-vertical-relative:margin;mso-width-percent:0;
+ mso-height-percent:0;v-text-anchor:top' stroked="f">
+ <v:textbox style='mso-next-textbox:#fmFrame7' inset="0,0,0,0"/>
+ <w:wrap anchorx="margin" anchory="margin"/>
+ <w:anchorlock/>
+</v:shape><![endif]--><![if !vml]><span style='mso-ignore:vglayout;position:
+absolute;z-index:251659776;left:0px;margin-left:0px;margin-top:712px;
+width:263494433px;height:28675px'>
+
+<table cellpadding=0 cellspacing=0>
  <tr>
-  <td valign=top align=left height=1496 style='padding-top:9.05pt;padding-right:
-  6.25pt;padding-bottom:9.05pt;padding-left:6.25pt'>
-  <p class=aff7><span lang=ZH-CN style='mso-no-proof:yes'>{{ standard_agency_formatted }}</span></p>
-  </td>
+  <td width=263494433 height=28675 bgcolor=white style='vertical-align:top;
+  background:white'><![endif]><![if !mso]><span style='position:absolute;
+  mso-ignore:vglayout;left:0pt;z-index:251659776'>
+  <table cellpadding=0 cellspacing=0 width="100%">
+   <tr>
+    <td><![endif]>
+    <div v:shape="fmFrame7" style='padding:0pt 0pt 0pt 0pt' class=shape>
+
+      <table class=MsoNormalTable border=0 cellspacing=0 cellpadding=0 width="16.20cm" align=center
+     style='border-collapse:collapse;mso-table-layout-alt:
+     fixed;mso-padding-alt:0cm;'>
+     <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;mso-yfti-lastrow:yes;
+      height:1.38cm'>
+      {% if language == "en" %}
+            <td valign=middle style='padding:0cm 0.3cm 0cm {% if gbscope == "national" %}0.5cm{% else %}1.0cm{% endif %}'><p class=standard_agency style='layout-grid-mode:char;mso-layout-grid-align:none'><span style="font-size:10.5pt">Issued by:</span></p></td>
+      {% endif %}
+      <td valign=middle style='padding:0cm;
+      height:1.38cm'>
+      <p class=standard_agency {% if language == "en" %}style='text-align:center;font-size:10.5pt'{% else %}style='text-align:justify;text-justify:distribute-all-lines;
+      layout-grid-mode:char;mso-layout-grid-align:none'{%- endif -%}>{{ standard_agency_formatted }}</p>
+            </td>
+            {% if language == "zh" %}
+            <td valign=middle style='padding:0cm 0.3cm 0cm {% if gbscope == "national" %}0.5cm{% else %}1.0cm{% endif %}'><p class=standard_agency style='text-align:justify;text-justify:distribute-all-lines;
+      layout-grid-mode:char;mso-layout-grid-align:none'>发</p></td><td valign=middle><p class=standard_agency style='text-align:justify;text-justify:distribute-all-lines;
+      layout-grid-mode:char;mso-layout-grid-align:none'>布</p></td>
+            {% endif %}
+      </tr></table>
+     </tr>
+    </table>
+    
+    <p class=MsoNormal align=left style='text-align:left'><span lang=EN-US><o:p>&nbsp;</o:p></span></p>
+    </div>
+    <![if !mso]></td>
+   </tr>
+  </table>
+  </span><![endif]><![if !mso & !vml]>&nbsp;<![endif]><![if !vml]></td>
  </tr>
 </table>
 
+</span><![endif]>
+
+
 </div>
 
-<p class=ad><!--[if gte vml 1]><o:wrapblock><v:line id="直线_x0020_11" o:spid="_x0000_s1026"
-  alt="" style='position:absolute;left:0;text-align:left;z-index:251659776;
-  mso-wrap-edited:f;mso-width-percent:0;mso-height-percent:0;
-  mso-width-percent:0;mso-height-percent:0' from="-.05pt,184.25pt" to="481.85pt,184.25pt"/>
- <![endif]--><!--[if gte vml 1]></o:wrapblock><![endif]--></p>
+
 
 </div>
+
+
+<br style='mso-ignore:vglayout' clear=ALL>
+
+<p class=MsoNormal style='tab-stops:311.25pt'><span style='mso-bookmark:SectionMark4'><span
+style='mso-bookmark:SectionMark0'><span lang=EN-US><span style='mso-tab-count:
+1'>                                                                                                        </span></span></span></span></p>