metanorma-itu 1.2.2 → 1.2.7

data/lib/asciidoctor/itu/itu.rng

@@ -68,6 +68,16 @@
             <text/>
           </element>
         </optional>
+        <optional>
+          <element name="amendment">
+            <data type="int"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="corrigendum">
+            <data type="int"/>
+          </element>
+        </optional>
       </element>
     </define>
     <define name="BibDataExtensionType">
@@ -84,6 +94,18 @@
       <optional>
         <ref name="ipnoticereceived"/>
       </optional>
+      <optional>
+        <ref name="meeting"/>
+      </optional>
+      <optional>
+        <ref name="meeting-date"/>
+      </optional>
+      <optional>
+        <ref name="intended-type"/>
+      </optional>
+      <optional>
+        <ref name="ext_source"/>
+      </optional>
       <optional>
         <ref name="structuredidentifier"/>
       </optional>
@@ -103,6 +125,44 @@
       </element>
     </define>
   </include>
+  <define name="meeting">
+    <element name="meeting">
+      <text/>
+    </element>
+  </define>
+  <define name="meeting-date">
+    <element name="meeting-date">
+      <choice>
+        <group>
+          <element name="from">
+            <ref name="ISO8601Date"/>
+          </element>
+          <optional>
+            <element name="to">
+              <ref name="ISO8601Date"/>
+            </element>
+          </optional>
+        </group>
+        <element name="on">
+          <ref name="ISO8601Date"/>
+        </element>
+      </choice>
+    </element>
+  </define>
+  <define name="intended-type">
+    <element name="intended-type">
+      <choice>
+        <value>R</value>
+        <value>C</value>
+        <value>TD</value>
+      </choice>
+    </element>
+  </define>
+  <define name="ext_source">
+    <element name="source">
+      <text/>
+    </element>
+  </define>
   <define name="TextElement" combine="choice">
     <choice>
       <ref name="add"/>
@@ -244,6 +304,13 @@
   </define>
   <define name="itu">
     <element name="itu-standard">
+      <attribute name="version"/>
+      <attribute name="type">
+        <choice>
+          <value>semantic</value>
+          <value>presentation</value>
+        </choice>
+      </attribute>
       <ref name="bibdata"/>
       <zeroOrMore>
         <ref name="termdocsource"/>

data/lib/isodoc/itu/base_convert.rb

@@ -23,12 +23,6 @@ module IsoDoc
         end
       end
 
-      def bracket_opt(b)
-        return b if b.nil?
-        return b if /^\[.+\]$/.match(b)
-        "[#{b}]"
-      end
-
       def clausedelim
         ""
       end
@@ -133,6 +127,7 @@ module IsoDoc
 
       def info(isoxml, out)
         @meta.ip_notice_received isoxml, out
+        @meta.techreport isoxml, out
         super
       end
 

data/lib/isodoc/itu/html/_coverpage.css

@@ -9,7 +9,7 @@ fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, embed,
 figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
+menu, output, ruby, section, summary,
 time, mark, audio, video {
   margin: 0;
   padding: 0; }
@@ -104,6 +104,10 @@ b, strong {
 div.document-stage-band, div.document-type-band {
   background-color: #333333; }
 
+a.FootnoteRef + a.FootnoteRef:before {
+  content: ", ";
+  vertical-align: super; }
+
 #standard-band {
   background-color: #0AC442; }
 
@@ -230,6 +234,9 @@ div.document-stage-band, div.document-type-band {
   font-weight: 800;
   display: inline; }
 
+.doc-subidentifier {
+  font-size: 20px; }
+
 .doc-info-left {
   float: right;
   padding-right: 42px; }

data/lib/isodoc/itu/html/_coverpage.scss

@@ -27,6 +27,10 @@
   font-weight: 800;
   display: inline;}
 
+.doc-subidentifier {
+  font-size: 20px;
+}
+
 .doc-info-left {
   float: right;
   padding-right: 42px;

data/lib/isodoc/itu/html/header.html

@@ -116,7 +116,7 @@ style='mso-element:field-separator'></span></span><![endif]--><span lang=FR-CH
 style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
 lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>Rec.
-ITU‑{{ bureau }} {{ docnumeric }} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
+ITU‑{{ bureau }} {{ docnumeric }} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=ef2l>
@@ -129,12 +129,12 @@ style='mso-element:field-separator'></span></span><![endif]--><span lang=FR-CH
 style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
 lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>Rec.
-ITU‑{{ bureau }} {{ docnumeric }} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
+ITU‑{{ bureau }} {{ docnumeric }} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=f2>
 <p class=FooterQP style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>Rec.
-  ITU‑{{ bureau }} {{docnumeric}} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
+  ITU‑{{ bureau }} {{docnumeric}} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-begin'></span>
 PAGE<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span
 style='mso-element:field-separator'></span></span><![endif]--><span lang=EN-GB
@@ -145,7 +145,7 @@ lang=EN-GB style='font-weight:normal'><o:p></o:p></span></p>
 
 <div style='mso-element:footer' id=f2l>
 <p class=FooterQPLandscape style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>Rec.
-  ITU‑{{ bureau }} {{docnumeric}} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
+  ITU‑{{ bureau }} {{docnumeric}} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-begin'></span>
 PAGE<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span
 style='mso-element:field-separator'></span></span><![endif]--><span lang=EN-GB
@@ -164,7 +164,7 @@ style='mso-element:field-separator'></span></span><![endif]--><span lang=FR-CH
 style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
 lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>Rec.
-ITU‑{{ bureau }} {{ docnumeric }} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
+ITU‑{{ bureau }} {{ docnumeric }} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=ef3l>
@@ -177,12 +177,12 @@ style='mso-element:field-separator'></span></span><![endif]--><span lang=FR-CH
 style='mso-ansi-language:FR-CH;font-weight:normal;mso-no-proof:yes'>ii</span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-end'></span></span><![endif]--><span
 lang=FR-CH style='mso-ansi-language:FR-CH'><span style='mso-tab-count:1'>              </span>Rec.
-ITU‑{{ bureau }} {{ docnumeric }} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
+ITU‑{{ bureau }} {{ docnumeric }} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<o:p></o:p></span></p>
 </div>
 
 <div style='mso-element:footer' id=f3>
 <p class=FooterQP style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>Rec.
-  ITU‑{{ bureau }} {{docnumeric}} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
+  ITU‑{{ bureau }} {{docnumeric}} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %}  ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-begin'></span>
 PAGE<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span
 style='mso-element:field-separator'></span></span><![endif]--><span lang=EN-GB
@@ -193,7 +193,7 @@ lang=EN-GB style='font-weight:normal'><o:p></o:p></span></p>
 
 <div style='mso-element:footer' id=f3l>
 <p class=FooterQPLandscape style='line-height:12.0pt'><span lang=EN-GB><span style='mso-tab-count:2'>                                                                                                       </span>Rec.
-  ITU‑{{ bureau }} {{docnumeric}} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
+  ITU‑{{ bureau }} {{docnumeric}} {% if amendmentid %}{{ amendmentid }}{% endif %} {% if corrigendumid %}{{ corrigendumid }}{% endif %} ({{ pubdate_monthyear }})<span style='mso-tab-count:1'>             </span></span><!--[if supportFields]><span
 lang=EN-GB style='font-weight:normal'><span style='mso-element:field-begin'></span>
 PAGE<span style='mso-spacerun:yes'>  </span>\* MERGEFORMAT <span
 style='mso-element:field-separator'></span></span><![endif]--><span lang=EN-GB

data/lib/isodoc/itu/html/html_itu_titlepage.html

@@ -16,6 +16,21 @@
   <div class="coverpage">
     <div class="wrapper-top">
 
+      {% if doctype == "Technical Report" and unpublished %}
+      <table>
+        <tr><th>Question(s):</th><td colspan="2">{{ group }}</td><th colspan="2">Meeting, date:</th><td colspan="3">{{ meeting }}{% if meeting and meeting_date %}, {% endif %}{{ meeting_date }}</td></tr>
+        <tr><th>Study Group:</th><td>{{ subgroup }}</td><th>Working Party:</th><td>{{ workgroup }}</td><th colspan="3">Intended type of document (R-C-TD):</th><td>{{ intended_type }}</td></tr>
+        <tr><th>Source:</th><td colspan="7">{{ source }}</td></tr>
+        <tr><th>Title:</th><td colspan="7">{{ doctitle }}</td></tr>
+        {% for author in authors %}
+        <tr><th rowspan="3">Contact:</th><td>Name:</td><td colspan="3">{{ author }}</td><td>Tel:</td><td colspan="2">{{ phones[forloop.index0] }}</td></tr>
+        <tr><td>Organization:</td><td colspan="3">{{ affiliations[forloop.index0] }}</td><td>Fax:</td><td colspan="2">{{ faxes[forloop.index0] }}</td></tr>
+        <tr><td>Country:</td><td colspan="3">{{ addresses[forloop.index0] }}</td><td>E-mail:</td><td colspan="2">{{ emails[forloop.index0] }}</td></tr>
+        {% endfor %}
+      </table>
+
+      {% endif %}
+
       <div class="coverpage-doc-identity">
         <div class="doc-type">
           International Telecommunications Union
@@ -27,6 +42,8 @@
         <div class="doc-info-left">
           <div class="doc-identifier">
             {{ docnumeric }}
+            {% if amendmentid %}<div class="doc-subidentifier">{{ amendmentid }}</div>{% endif %} 
+            {% if corrigendumid %}<div class="doc-subidentifier">{{ corrigendumid }}</div>{% endif %}       
             {% if edition %} <div> Revision {{ edition }}</div> {% endif %}
             <div> {{ draftinfo }}</div>
           </div>
@@ -54,6 +71,12 @@
           {% if annextitle %}
           <br/><span class="doc-annextitle">{{ annexid }}{% if annexid and annextitle %}: {% endif %}{{ annextitle }}</span>
           {% endif %}
+          {% if amendmentid %}
+          <br/><span class="doc-annextitle">{{ amendmentid }}{% if amendmenttitle %}: {{ amendmenttitle}}{% endif %}</span>
+          {% endif %} 
+          {% if corrigendumid %}
+          <br/><span class="doc-annextitle">{{ corrigendumid }}{% if corrigendumtitle %}: {{ corrigendumtitle}}{% endif %}</span>
+          {% endif %} 
         </div>
 
 

data/lib/isodoc/itu/html/htmlstyle.css

@@ -9,7 +9,7 @@ fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, embed,
 figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
+menu, output, ruby, section, summary,
 time, mark, audio, video {
   margin: 0;
   padding: 0; }
@@ -104,6 +104,10 @@ b, strong {
 div.document-stage-band, div.document-type-band {
   background-color: #333333; }
 
+a.FootnoteRef + a.FootnoteRef:before {
+  content: ", ";
+  vertical-align: super; }
+
 #recommendation-band {
   background-color: #a3d88f; }
 
@@ -763,7 +767,7 @@ fieldset, form, label, legend,
 table, caption, tbody, tfoot, thead, tr, th, td,
 article, aside, canvas, details, embed,
 figure, figcaption, footer, header, hgroup,
-menu, nav, output, ruby, section, summary,
+menu, output, ruby, section, summary,
 time, mark, audio, video {
   margin: 0;
   padding: 0; }
@@ -858,6 +862,10 @@ b, strong {
 div.document-stage-band, div.document-type-band {
   background-color: #333333; }
 
+a.FootnoteRef + a.FootnoteRef:before {
+  content: ", ";
+  vertical-align: super; }
+
 #recommendation-band {
   background-color: #a3d88f; }
 
@@ -978,6 +986,9 @@ div.document-stage-band, div.document-type-band {
   font-weight: 800;
   display: inline; }
 
+.doc-subidentifier {
+  font-size: 20px; }
+
 .doc-info-left {
   float: right;
   padding-right: 42px; }

data/lib/isodoc/itu/html/itu.css

@@ -1002,7 +1002,7 @@ div.WordSection2 {
 div.WordSection3 {
   page: WordSection3; }
 
-table.MsoISOTable {
+table.MsoISOTable, table.MsoISOTableBig {
   mso-style-name: "Table ISO";
   mso-tstyle-rowband-size: 0;
   mso-tstyle-colband-size: 0;
@@ -1023,17 +1023,17 @@ table.MsoISOTable {
   font-size: 11.0pt;
   font-family: {{bodyfont}}; }
 
-table.MsoISOTable th {
+table.MsoISOTable th, table.MsoISOTableBig th {
   border: solid windowtext 1pt;
   mso-border-alt: solid windowtext 1pt;
   padding: 0cm 2.85pt 0cm 2.85pt; }
 
-table.MsoISOTable td {
+table.MsoISOTable td, table.MsoISOTableBig td {
   border: solid windowtext 1pt;
   mso-border-alt: solid windowtext 1pt;
   padding: 0cm 2.85pt 0cm 2.85pt; }
 
-table.MsoISOTable p {
+table.MsoISOTable p, table.MsoISOTableBig p {
   font-size: 11.0pt; }
 
 table.MsoTableGrid {
@@ -1120,8 +1120,20 @@ div.example p.MsoListParagraph {
   font-size: 10.0pt; }
 
 div.Note p.MsoListParagraph {
+  font-size: 11.0pt;
+  margin-left: 1.0cm; }
+
+div.Note span.stem {
   font-size: 11.0pt; }
 
+div.Note p.Sourcecode, div.Note pre.Sourcecode {
+  font-size: 9.0pt;
+  margin-left: 1.0cm; }
+
+div.Note table.dl {
+  font-size: 11.0pt;
+  margin-left: 1.0cm; }
+
 span.note_label, span.example_label, td.example_label, td.note_label {
   font-size: 11.0pt;
   font-family: {{bodyfont}}; }

data/lib/isodoc/itu/html/itu.scss

@@ -962,7 +962,7 @@ div.WordSection2
         mso-paper-source:0;}
 div.WordSection3
 	{page:WordSection3;}
-table.MsoISOTable
+table.MsoISOTable, table.MsoISOTableBig
 	{mso-style-name:"Table ISO";
 	mso-tstyle-rowband-size:0;
 	mso-tstyle-colband-size:0;
@@ -982,15 +982,15 @@ table.MsoISOTable
 	mso-border-insidev:.75pt solid windowtext;
 	font-size:11.0pt;
 	font-family:$bodyfont;}
-table.MsoISOTable th
+table.MsoISOTable th, table.MsoISOTableBig th
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
     padding:0cm 2.85pt 0cm 2.85pt;}
-table.MsoISOTable td
+table.MsoISOTable td, table.MsoISOTableBig td
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
     padding:0cm 2.85pt 0cm 2.85pt;}
-table.MsoISOTable p
+table.MsoISOTable p, table.MsoISOTableBig p
 {font-size:11.0pt; }
 table.MsoTableGrid
 	{mso-style-name:"Table Grid";
@@ -1074,8 +1074,22 @@ div.example p.MsoListParagraph {
   font-size: 10.0pt;
 }
 
-div.Note  p.MsoListParagraph {
+div.Note p.MsoListParagraph {
   font-size: 11.0pt;
+  margin-left: 1.0cm;
+}
+
+div.Note span.stem {
+  font-size: 11.0pt; }
+
+div.Note p.Sourcecode, div.Note pre.Sourcecode  {
+  font-size: 9.0pt;
+  margin-left: 1.0cm;
+}
+
+div.Note table.dl  {
+  font-size: 11.0pt;
+  margin-left: 1.0cm;
 }
 
 span.note_label, span.example_label, td.example_label, td.note_label

data/lib/isodoc/itu/html/word_itu_intro.html

@@ -15,6 +15,22 @@
   <p class=Rectitle align="center"><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
       style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ annextitle }}<o:p></o:p></span></span></p>
   {% endif %}
+  {% if amendmentid %}
+  <p class=Rectitle align="center"><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
+      style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ amendmentid }}<o:p></o:p></span></span></p>
+  {% endif %}
+  {% if amendmenttitle %}
+  <p class=Rectitle align="center"><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
+      style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ amendmenttitle }}<o:p></o:p></span></span></p>
+  {% endif %}
+  {% if corrigendumid %}
+  <p class=Rectitle align="center"><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
+      style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ corrigendumid }}<o:p></o:p></span></span></p>
+  {% endif %}
+  {% if corrigendumtitle %}
+  <p class=Rectitle align="center"><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
+      style='mso-ansi-language:FR-CH;font-size:14pt;font-weight:bold;'>{{ corrigendumtitle }}<o:p></o:p></span></span></p>
+  {% endif %}
   <span style='mso-bookmark:_Hlk526346232'></span>
   <p class=MsoNormal><span style='mso-bookmark:_Hlk526346232'><span lang=FR-CH
   style='mso-ansi-language:FR-CH'><o:p>&nbsp;</o:p></span></span></p>

data/lib/isodoc/itu/html/word_itu_titlepage.html

@@ -1,3 +1,120 @@
+{% if doctype == "Technical Report" and unpublished %}
+
+<table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0" width="662"
+ style='border-collapse:collapse;mso-table-layout-alt:fixed;mso-padding-alt:
+ 0cm 2.85pt 0cm 2.85pt'>
+ <tr style='mso-yfti-irow:0;mso-yfti-firstrow:yes;page-break-inside:avoid;
+  height:17.85pt'>
+  <td width="108" valign="top" style='width:80.85pt;border:none;border-top:solid windowtext 1.5pt;
+  padding:0cm 2.85pt 0cm 2.85pt;height:17.85pt'>
+  <p class="MsoNormal"><b><span lang="EN-US">Question(s):</span></b></p>
+  </td>
+  <td width="170" colspan="2" valign="top" style='width:127.55pt;border:none;
+  border-top:solid windowtext 1.5pt;padding:0cm 2.85pt 0cm 2.85pt;height:17.85pt'>
+    <p class="MsoNormal"><span lang="EN-US">{{ group }}</span></p>
+  </td>
+  <td width="113" colspan="2" valign="top" style='width:3.0cm;border:none;border-top:
+  solid windowtext 1.5pt;padding:0cm 2.85pt 0cm 2.85pt;height:17.85pt'>
+  <p class="MsoNormal"><b><span lang="EN-US">Meeting, date:<o:p></o:p></span></b></p>
+  </td>
+  <td width="270" colspan="2" valign="top" style='width:202.7pt;border:none;
+  border-top:solid windowtext 1.5pt;padding:0cm 2.85pt 0cm 2.85pt;height:17.85pt'>
+  <p class="MsoNormal" align="right" style='text-align:right'><span lang="EN-US">{{ meeting }}{% if meeting and meeting_date %}, {% endif %}{{ meeting_date }}</span></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:1;page-break-inside:avoid;height:17.85pt'>
+  <td width="108" valign="top" style='width:80.85pt;padding:0cm 2.85pt 0cm 2.85pt;
+  height:17.85pt'>
+  <p class="MsoNormal"><b><span lang="EN-US">Study Group:<o:p></o:p></span></b></p>
+  </td>
+  <td width="38" valign="top" style='width:1.0cm;padding:0cm 2.85pt 0cm 2.85pt;
+  height:17.85pt'>
+    <p class="MsoNormal"><span lang="EN-US">{{ subgroup }}</span></p>
+  </td>
+  <td width="132" valign="top" style='width:99.2pt;padding:0cm 2.85pt 0cm 2.85pt;
+  height:17.85pt'>
+  <p class="MsoNormal"><b><span lang="EN-US">Working Party:<o:p></o:p></span></b></p>
+  </td>
+  <td width="38" valign="top" style='width:1.0cm;padding:0cm 2.85pt 0cm 2.85pt;
+  height:17.85pt'>
+    <p class="MsoNormal"><span lang="EN-US">{{ workgroup }}</span></p>
+  </td>
+  <td width="312" colspan="2" valign="top" style='width:233.9pt;padding:0cm 2.85pt 0cm 2.85pt;
+  height:17.85pt'>
+  <p class="MsoNormal"><b><span lang="EN-US">Intended type of document</span></b><span
+  lang="EN-US"> (R-C-TD):</span></p>
+  </td>
+  <td width="34" valign="top" style='width:25.5pt;padding:0cm 2.85pt 0cm 2.85pt;
+  height:17.85pt'>
+    <p class="MsoNormal"><span lang="EN-US">{{ intended_type }}</span></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:2;page-break-inside:avoid;height:17.85pt'>
+  <td width="108" valign="top" style='width:80.85pt;padding:0cm 2.85pt 0cm 2.85pt;
+  height:17.85pt'>
+  <p class="MsoNormal"><b><span lang="EN-US">Source:<o:p></o:p></span></b></p>
+  </td>
+  <td width="554" colspan="6" valign="top" style='width:415.3pt;padding:0cm 2.85pt 0cm 2.85pt;
+  height:17.85pt'>
+    <p class="MsoNormal"><span lang="EN-US">{{ source }}</span></p>
+  </td>
+ </tr>
+ <tr style='mso-yfti-irow:3;page-break-inside:avoid;height:17.85pt'>
+  <td width="108" valign="top" style='width:80.85pt;border:none;border-bottom:solid windowtext 1.5pt;
+  padding:0cm 2.85pt 0cm 2.85pt;height:17.85pt'>
+  <p class="MsoNormal"><b><span lang="EN-US">Title: <o:p></o:p></span></b></p>
+  </td>
+  <td width="554" colspan="6" valign="top" style='width:415.3pt;border:none;
+  border-bottom:solid windowtext 1.5pt;padding:0cm 2.85pt 0cm 2.85pt;
+  height:17.85pt'>
+    <p class="MsoNormal"><span lang="EN-US">{{ doctitle }}</span></p>
+  </td>
+ </tr>
+         {% for author in authors %}
+ <tr style='mso-yfti-irow:4;page-break-inside:avoid;height:10.2pt'>
+  <td width="108" valign="top" style='width:80.85pt;border:none;mso-border-top-alt:
+  solid windowtext 1.5pt;padding:0cm 2.85pt 0cm 2.85pt;height:10.2pt'>
+  <p class="MsoNormal"><a name="dcontact"><b><span lang="EN-US">Contact:<o:p></o:p></span></b></a></p>
+  </td>
+  <span style='mso-bookmark:dcontact'></span>
+  <td width="283" colspan="4" valign="top" style='width:212.6pt;border:none;
+  mso-border-top-alt:solid windowtext 1.5pt;padding:0cm 2.85pt 0cm 2.85pt;
+  height:10.2pt'>
+    <p class="MsoNormal" style="text-align:left;"><span style='mso-bookmark:dcontact'><span lang="EN-US">{{ author }}<br/>
+  {{ affiliations[forloop.index0] }}<br/>
+  {{ addresses[forloop.index0] }}</span></span></p>
+  </td>
+  <span style='mso-bookmark:dcontact'></span>
+  <td width="270" colspan="2" valign="top" style='width:202.7pt;border:none;
+  mso-border-top-alt:solid windowtext 1.5pt;padding:0cm 2.85pt 0cm 2.85pt;
+  height:10.2pt'>
+    <p class="MsoNormal" style="text-align:left;"><span style='mso-bookmark:dcontact'><span lang="EN-US">Tel: {{ phones[forloop.index0] }}<br/>
+  Fax: {{ faxes[forloop.index0] }}<br/>
+  E-mail: {{ emails[forloop.index0] }}</span></span></p>
+  </td>
+  <span style='mso-bookmark:dcontact'></span>
+ </tr>
+ {% endfor %}
+ <tr style='mso-yfti-irow:6;mso-yfti-lastrow:yes;page-break-inside:avoid;
+  height:10.2pt'>
+  <td width="662" colspan="7" valign="top" style='width:496.15pt;border:none;
+  border-top:solid windowtext 1.5pt;padding:0cm 2.85pt 0cm 2.85pt;height:10.2pt'>
+  <p class="MsoNormal" style='margin-top:0cm'><span lang="EN-US" style='font-size:
+  9.0pt'>Please do not change the structure of this table, just insert the
+  necessary information.<o:p></o:p></span></p>
+  </td>
+ </tr>
+</table>
+
+<p class="MsoNormal"><span lang="EN-US">&lt;INSERT TEXT&gt;</span></p>
+
+<p><br clear="all" style="page-break-before:always"/></p>
+
+{% endif %}
+
+
+
+
 <table class="MsoNormalTable" border="0" cellspacing="0" cellpadding="0" width="663"
  style='border-collapse:collapse;mso-table-layout-alt:fixed;mso-padding-alt:
  0cm 5.4pt 0cm 5.4pt'>
@@ -89,7 +206,7 @@
   <p class="MsoNormal" align="right" style='margin-top:12.0pt;text-align:right'><span
   style='mso-bookmark:_Hlk526346232'><a name="dnume"><b style='mso-bidi-font-weight:
   normal'><span lang="EN-US" style='font-size:30.0pt;mso-bidi-font-size:10.0pt;
-  font-family:"Arial",sans-serif;mso-ansi-language:EN-US'>{{ docnumeric }}<o:p></o:p></span></b></a></span></p>
+  font-family:"Arial",sans-serif;mso-ansi-language:EN-US'>{% if doctype == "Recommendation" %}{{ docnumeric }}{% else %}{{ doctype }}{% endif %}<o:p></o:p></span></b></a></span></p>
   </td>
   <span style='mso-bookmark:_Hlk526346232'><span style='mso-bookmark:dnume'></span></span>
  </tr>
@@ -142,11 +259,23 @@
   <span style='mso-bookmark:_Hlk526346232'></span>
   <td width="265" valign="top" style='width:198.55pt;padding:0cm 4.25pt 0cm 4.25pt;
   height:48.7pt'>
+  {% if amendmentid %}
+<p class="MsoNormal" align="right" style='margin-top:12.0pt;text-align:right'><span
+  style='mso-bookmark:_Hlk526346232'><a name="dnume"><b style='mso-bidi-font-weight:
+  normal'><span lang="EN-US" style='font-size:16.0pt;mso-bidi-font-size:10.0pt;
+  font-family:"Arial",sans-serif;mso-ansi-language:EN-US'>{{ amendmentid }}<o:p></o:p></span></b></a></span></p>
+  {% endif %}
+  {% if corrigendumid %}
+<p class="MsoNormal" align="right" style='margin-top:12.0pt;text-align:right'><span
+  style='mso-bookmark:_Hlk526346232'><a name="dnume"><b style='mso-bidi-font-weight:
+  normal'><span lang="EN-US" style='font-size:16.0pt;mso-bidi-font-size:10.0pt;
+  font-family:"Arial",sans-serif;mso-ansi-language:EN-US'>{{ corrigendumid }}<o:p></o:p></span></b></a></span></p>
+  {% endif %}
   <p class="MsoNormal" align="right" style='margin-top:0cm;text-align:right'>
   <span
   style='mso-bookmark:_Hlk526346232'><a name="ddatee"><span lang="EN-US"
   style='font-size:14.0pt;mso-bidi-font-size:10.0pt;font-family:"Arial",sans-serif;
-  mso-ansi-language:EN-US'>{% if pubdate_monthyear %}({{ pubdate_monthyear }}){% endif %}<span style='mso-spacerun:yes'>   </span><o:p></o:p></span></a></span></p>
+  mso-ansi-language:EN-US'>{% if pubdate_monthyear %}({{ pubdate_monthyear }}){% else %}{% if revdate %}({{ revdate }}){% endif %}{% endif %}<span style='mso-spacerun:yes'>   </span><o:p></o:p></span></a></span></p>
   </td>
   <span style='mso-bookmark:_Hlk526346232'><span style='mso-bookmark:ddatee'></span></span>
  </tr>
@@ -195,7 +324,11 @@
   style='mso-bookmark:_Hlk526346232'><a name="c1tite">
     <span lang="EN-GB"
   style='font-size:18.0pt;mso-bidi-font-size:10.0pt;font-family:"Arial",sans-serif;
-  mso-bidi-font-family:"Times New Roman"'>{% if annextitle %}{{ doctitle }}<br/><b>{{ annexid }}{% if annexid and annextitle %}: {% endif %}{{ annextitle }}</b>{% else %}<b>{{ doctitle }}</b>{% endif %}</span>
+  mso-bidi-font-family:"Times New Roman"'>{% if annexid or amendmentid or corrigendumid %}{% if doctype != "Recommendation" %}{{ docnumeric }}<br/>{% endif %}{{ doctitle }}
+  {% if annexid %}<br/><b>{{ annexid }}{% if annextitle %}: {{ annextitle }}{% endif %}</b>{% endif %}
+  {% if amendmentid %}<br/><b>{{ amendmentid }}{% if amendmenttitle %}: {{ amendmenttitle }}{% endif %}</b>{% endif %}
+  {% if corrigendumid %}<br/><b>{{ corrigendumid }}{% if corrigendumtitle %}: {{ corrigendumtitle }}{% endif %}</b>{% endif %}
+  {% else %}<b>{% if doctype != "Recommendation" %}{{ docnumeric }}<br/>{% endif %}{{ doctitle }}</b>{% endif %}</span>
   </a></span><span
   style='mso-bookmark:_Hlk526346232'><span style='mso-bookmark:c1tite'><b><span
   lang="EN-US" style='font-size:18.0pt;mso-bidi-font-size:10.0pt;font-family: