metanorma-itu 1.3.10 → 1.4.0

data/lib/asciidoctor/itu/itu.rng

@@ -171,14 +171,9 @@
       </optional>
       <group>
         <choice>
-          <group>
-            <zeroOrMore>
-              <ref name="BasicBlock"/>
-            </zeroOrMore>
-            <zeroOrMore>
-              <ref name="note"/>
-            </zeroOrMore>
-          </group>
+          <zeroOrMore>
+            <ref name="BasicBlock"/>
+          </zeroOrMore>
           <ref name="amend"/>
         </choice>
         <zeroOrMore>

data/lib/asciidoctor/itu/reqt.rng

@@ -58,6 +58,14 @@
     <optional>
       <attribute name="type"/>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <optional>
       <ref name="reqtitle"/>
     </optional>
@@ -101,7 +109,9 @@
   </define>
   <define name="label">
     <element name="label">
-      <text/>
+      <oneOrMore>
+        <ref name="TextElement"/>
+      </oneOrMore>
     </element>
   </define>
   <define name="subject">
@@ -175,8 +185,19 @@
         <data type="boolean"/>
       </attribute>
     </optional>
+    <optional>
+      <attribute name="tag"/>
+    </optional>
+    <optional>
+      <attribute name="multilingual-rendering">
+        <ref name="MultilingualRenderingType"/>
+      </attribute>
+    </optional>
     <oneOrMore>
-      <ref name="BasicBlock"/>
+      <choice>
+        <ref name="BasicBlock"/>
+        <ref name="component"/>
+      </choice>
     </oneOrMore>
   </define>
   <define name="ObligationType">

data/lib/asciidoctor/itu/validate.rb

@@ -8,18 +8,19 @@ module Asciidoctor
 
       def doctype_validate(xmldoc)
         doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
-        %w(recommendation recommendation-supplement recommendation-amendment 
-        recommendation-corrigendum recommendation-errata recommendation-annex 
-        focus-group implementers-guide technical-paper technical-report 
-        joint-itu-iso-iec service-publication).include? doctype or
-        @log.add("Document Attributes", nil, "#{doctype} is not a recognised document type")
+        %w(recommendation recommendation-supplement recommendation-amendment
+           recommendation-corrigendum recommendation-errata recommendation-annex
+           focus-group implementers-guide technical-paper technical-report
+           joint-itu-iso-iec service-publication).include? doctype or
+          @log.add("Document Attributes", nil,
+                   "#{doctype} is not a recognised document type")
       end
 
       def stage_validate(xmldoc)
         stage = xmldoc&.at("//bibdata/status/stage")&.text
-        %w(in-force superseded in-force-prepublished withdrawn 
-        draft).include? stage or
-          @log.add("Document Attributes", nil, 
+        %w(in-force superseded in-force-prepublished withdrawn
+           draft).include? stage or
+          @log.add("Document Attributes", nil,
                    "#{stage} is not a recognised status")
       end
 
@@ -40,12 +41,14 @@ module Asciidoctor
         xmldoc.xpath("//bibdata/series/title").each do |s|
           series = s.text.sub(/^[A-Z]: /, "")
           t.downcase.include?(series.downcase) and
-            @log.add("Document Attributes", nil, "Title includes series name #{series}")
+            @log.add("Document Attributes", nil,
+                     "Title includes series name #{series}")
         end
       end
 
       def extract_text(node)
         return "" if node.nil?
+
         node1 = Nokogiri::XML.fragment(node.to_s)
         node1.xpath("//link | //locality | //localityStack").each(&:remove)
         ret = ""
@@ -58,7 +61,7 @@ module Asciidoctor
         xmldoc.xpath("//preface/*").each do |c|
           extract_text(c).split(/\.\s+/).each do |t|
             /\b(shall|must)\b/i.match(t) and
-              @log.add("Style", c, 
+              @log.add("Style", c,
                        "Requirement possibly in preface: #{t.strip}")
           end
         end
@@ -66,17 +69,17 @@ module Asciidoctor
 
       # Editing Guidelines 9.4.3
       # Supplanted by rendering
-      def numbers_validate(xmldoc)
-      end
+      def numbers_validate(xmldoc); end
 
-      def style_two_regex_not_prev(n, text, re, re_prev, warning)
+      def style_two_regex_not_prev(node, text, regex, regex_prev, warning)
         return if text.nil?
+
         arr = text.split(/\W+/)
         arr.each_index do |i|
-          m = re.match arr[i]
-          m_prev = i.zero? ? nil : re_prev.match(arr[i - 1])
+          m = regex.match arr[i]
+          m_prev = i.zero? ? nil : regex_prev.match(arr[i - 1])
           if !m.nil? && m_prev.nil?
-            @log.add("Style", n, "#{warning}: #{m[:num]}")
+            @log.add("Style", node, "#{warning}: #{m[:num]}")
           end
         end
       end
@@ -85,21 +88,19 @@ module Asciidoctor
         s = xmldoc.at("//bibdata/ext/recommendationstatus/approvalstage") or
           return
         process = s["process"]
-        if process == "aap" and %w(determined in-force).include? s.text
-          @log.add("Document Attributes", nil, 
+        (process == "aap") && %w(determined in-force).include?(s.text) and
+          @log.add("Document Attributes", nil,
                    "Recommendation Status #{s.text} inconsistent with AAP")
-        end
-        if process == "tap" and !%w(determined in-force).include? s.text
-          @log.add("Document Attributes", nil, 
+        (process == "tap") && !%w(determined in-force).include?(s.text) and
+          @log.add("Document Attributes", nil,
                    "Recommendation Status #{s.text} inconsistent with TAP")
-        end
       end
 
       def itu_identifier_validate(xmldoc)
-        s = xmldoc.xpath("//bibdata/docidentifier[@type = 'ITU']").each do |x|
+        xmldoc.xpath("//bibdata/docidentifier[@type = 'ITU']").each do |x|
           /^ITU-[RTD] [AD-VX-Z]\.[0-9]+$/.match(x.text) or
             @log.add("Style", nil, "#{x.text} does not match ITU document "\
-                     "identifier conventions")
+                                   "identifier conventions")
         end
       end
 
@@ -112,8 +113,9 @@ module Asciidoctor
       def unnumbered_check(xmldoc)
         doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
         xmldoc.xpath("//clause[@unnumbered = 'true']").each do |c|
-          next if doctype == "resolution" and c.parent.name == "sections" and
+          next if (doctype == "resolution") && (c.parent.name == "sections") &&
             !c.at("./preceding-sibling::clause")
+
           @log.add("Style", c, "Unnumbered clause out of place")
         end
       end
@@ -128,18 +130,18 @@ module Asciidoctor
 
       def termdef_style(xmldoc)
         xmldoc.xpath("//term").each do |t|
-          para = t.at("./definition") || return
-          term = t.at("./preferred").text
+          para = t.at("./definition/verbaldefinition") || return
+          term = t.at("./preferred//name").text
           termdef_warn(term, /^[A-Z][a-z]+/, t, term, "term is not lowercase")
-          termdef_warn(para.text, /^[a-z]/, t, term, 
+          termdef_warn(para.text, /^[a-z]/, t, term,
                        "term definition does not start with capital")
-          termdef_warn(para.text, /[^.]$/, t, term, 
+          termdef_warn(para.text, /[^.]$/, t, term,
                        "term definition does not end with period")
         end
       end
 
-      def termdef_warn(text, re, t, term, msg)
-        re.match(text) && @log.add("Style", t, "#{term}: #{msg}")
+      def termdef_warn(text, regex, node, term, msg)
+        regex.match(text) && @log.add("Style", node, "#{term}: #{msg}")
       end
     end
   end

data/lib/asciidoctor/itu.rb

@@ -2,6 +2,5 @@ require "asciidoctor/itu/converter"
 
 module Asciidoctor
   module ITU
-
   end
 end

data/lib/isodoc/itu/base_convert.rb

@@ -9,7 +9,7 @@ module IsoDoc
   module ITU
     module BaseConvert
       FRONT_CLAUSE = "//*[parent::preface]"\
-        "[not(local-name() = 'abstract')]".freeze
+                     "[not(local-name() = 'abstract')]".freeze
 
       def preface(isoxml, out)
         isoxml.xpath(ns(FRONT_CLAUSE)).each do |c|
@@ -124,7 +124,10 @@ module IsoDoc
 
       def middle_title_recommendation(isoxml, out)
         out.p(**{ class: "zzSTDTitle1" }) do |p|
-          id = @meta.get[:docnumber] and p << "#{@meta.get[:doctype]} #{id}"
+          type = @meta.get[:doctype]
+          @meta.get[:unpublished] && @meta.get[:draft_new_doctype] and
+            type = @meta.get[:draft_new_doctype]
+          id = @meta.get[:docnumber] and p << "#{type} #{id}"
         end
         out.p(**{ class: "zzSTDTitle2" }) do |p|
           p << @meta.get[:doctitle]

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

@@ -1005,6 +1005,12 @@ ul > li {
   ul > li:first-child {
     margin-top: 1em; }
 
+ul ul > li:first-child {
+  margin-top: 0; }
+
+ol ul > li:first-child {
+  margin-top: 0; }
+
 /* Bibliograhy */
 p.Biblio, p.NormRef {
   margin-top: 1em;

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

@@ -358,6 +358,13 @@ ul {
   }
 }
 
+ul ul > li:first-child {
+      margin-top: 0;
+}
+ol ul > li:first-child {
+      margin-top: 0;
+}
+
 
 /* Bibliograhy */
 

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

@@ -170,6 +170,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
 p.MsoCommentText, li.MsoCommentText, div.MsoCommentText {
   mso-style-noshow: yes;
   mso-style-unhide: no;
+  mso-style-name: "Comment Text";
   mso-style-link: "Comment Text Char";
   margin: 0cm;
   margin-bottom: .0001pt;
@@ -212,6 +213,7 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape {
 
 p.MsoFooter, li.MsoFooter, div.MsoFooter {
   mso-style-unhide: no;
+  mso-style-name: "Footer";
   margin: 0cm;
   margin-bottom: .0001pt;
   text-align: justify;
@@ -464,6 +466,7 @@ h1 {
   mso-style-priority: 1;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 1";
   mso-style-link: "Heading 1 Char";
   mso-style-next: Normal;
   margin-top: 18.0pt;
@@ -649,6 +652,7 @@ h2 {
   mso-style-priority: 2;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 2";
   mso-style-parent: "Heading 1";
   mso-style-link: "Heading 2 Char";
   mso-style-next: Normal;
@@ -680,7 +684,8 @@ h3 {
   mso-style-priority: 3;
   mso-style-unhide: no;
   mso-style-qformat: yes;
-  mso-style-parent: "Heading 1";
+  mso-style-name: "Heading 3";
+  mso-style-parent: "Heading 2";
   mso-style-link: "Heading 3 Char";
   mso-style-next: Normal;
   margin-top: 8.0pt;
@@ -709,6 +714,7 @@ h4 {
   mso-style-priority: 4;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 4";
   mso-style-parent: "Heading 3";
   mso-style-link: "Heading 4 Char";
   mso-style-next: Normal;
@@ -741,6 +747,7 @@ h5 {
   mso-style-priority: 5;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 5";
   mso-style-parent: "Heading 4";
   mso-style-link: "Heading 5 Char";
   mso-style-next: Normal;
@@ -773,6 +780,7 @@ h6 {
   mso-style-priority: 6;
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 6";
   mso-style-parent: "Heading 5";
   mso-style-link: "Heading 6 Char";
   mso-style-next: Normal;
@@ -804,6 +812,7 @@ h6 {
 p.MsoHeading7, li.MsoHeading7, div.MsoHeading7 {
   mso-style-unhide: no;
   mso-style-qformat: yes;
+  mso-style-name: "Heading 7";
   mso-style-parent: "Heading 6";
   mso-style-next: Normal;
   margin-top: 8.0pt;
@@ -831,7 +840,8 @@ p.MsoHeading7, li.MsoHeading7, div.MsoHeading7 {
 p.MsoHeading8, li.MsoHeading8, div.MsoHeading8 {
   mso-style-unhide: no;
   mso-style-qformat: yes;
-  mso-style-parent: "Heading 6";
+  mso-style-name: "Heading 8";
+  mso-style-parent: "Heading 7";
   mso-style-next: Normal;
   margin-top: 8.0pt;
   margin-right: 0cm;
@@ -858,8 +868,9 @@ p.MsoHeading8, li.MsoHeading8, div.MsoHeading8 {
 p.MsoHeading9, li.MsoHeading9, div.MsoHeading9 {
   mso-style-unhide: no;
   mso-style-qformat: yes;
-  mso-style-parent: "Normal 6";
-  mso-style-next: Βασικό;
+  mso-style-name: "Heading 9";
+  mso-style-parent: "Heading 8";
+  mso-style-next: Normal;
   margin-top: 8.0pt;
   margin-right: 0cm;
   margin-bottom: 6pt;
@@ -947,6 +958,7 @@ p.MsoIndex3, li.MsoIndex3, div.MsoIndex3 {
 
 p.MsoToc1, li.MsoToc1, div.MsoToc1 {
   mso-style-priority: 39;
+  mso-style-name: "TOC 1";
   mso-style-unhide: no;
   margin-top: 6.0pt;
   margin-right: 42.55pt;
@@ -972,6 +984,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2 {
   mso-style-noshow: yes;
   mso-style-priority: 39;
   mso-style-unhide: no;
+  mso-style-name: "TOC 2";
   mso-style-parent: "TOC 1";
   mso-style-next: Normal;
   margin-top: 4.0pt;
@@ -998,6 +1011,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
   mso-style-noshow: yes;
   mso-style-priority: 39;
   mso-style-unhide: no;
+  mso-style-name: "TOC 3";
   mso-style-parent: "TOC 2";
   mso-style-next: Normal;
   margin-top: 4.0pt;
@@ -1023,6 +1037,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
 p.MsoToc4, li.MsoToc4, div.MsoToc4 {
   mso-style-noshow: yes;
   mso-style-unhide: no;
+  mso-style-name: "TOC 4";
   mso-style-parent: "TOC 3";
   margin-top: 4.0pt;
   margin-right: 42.55pt;
@@ -1047,6 +1062,7 @@ p.MsoToc4, li.MsoToc4, div.MsoToc4 {
 p.MsoToc5, li.MsoToc5, div.MsoToc5 {
   mso-style-noshow: yes;
   mso-style-unhide: no;
+  mso-style-name: "TOC 5";
   mso-style-parent: "TOC 4";
   margin-top: 4.0pt;
   margin-right: 42.55pt;
@@ -1071,7 +1087,8 @@ p.MsoToc5, li.MsoToc5, div.MsoToc5 {
 p.MsoToc6, li.MsoToc6, div.MsoToc6 {
   mso-style-noshow: yes;
   mso-style-unhide: no;
-  mso-style-parent: "TOC 4";
+  mso-style-name: "TOC 6";
+  mso-style-parent: "TOC 5";
   margin-top: 4.0pt;
   margin-right: 42.55pt;
   margin-bottom: 0cm;
@@ -1095,7 +1112,8 @@ p.MsoToc6, li.MsoToc6, div.MsoToc6 {
 p.MsoToc7, li.MsoToc7, div.MsoToc7 {
   mso-style-noshow: yes;
   mso-style-unhide: no;
-  mso-style-parent: "TOC 4";
+  mso-style-name: "TOC 7";
+  mso-style-parent: "TOC 6";
   margin-top: 4.0pt;
   margin-right: 42.55pt;
   margin-bottom: 0cm;
@@ -1119,7 +1137,8 @@ p.MsoToc7, li.MsoToc7, div.MsoToc7 {
 p.MsoToc8, li.MsoToc8, div.MsoToc8 {
   mso-style-noshow: yes;
   mso-style-unhide: no;
-  mso-style-parent: "TOC 4";
+  mso-style-name: "TOC 8";
+  mso-style-parent: "TOC 7";
   margin-top: 4.0pt;
   margin-right: 42.55pt;
   margin-bottom: 0cm;
@@ -1143,7 +1162,8 @@ p.MsoToc8, li.MsoToc8, div.MsoToc8 {
 p.MsoToc9, li.MsoToc9, div.MsoToc9 {
   mso-style-noshow: yes;
   mso-style-unhide: no;
-  mso-style-parent: "TOC 3";
+  mso-style-name: "TOC 9";
+  mso-style-parent: "TOC 8";
   margin-top: 4.0pt;
   margin-right: 42.55pt;
   margin-bottom: 0cm;
@@ -1167,6 +1187,7 @@ p.MsoToc9, li.MsoToc9, div.MsoToc9 {
 span.MsoFootnoteReference {
   mso-style-noshow: yes;
   mso-style-unhide: no;
+  mso-style-name: "Footnote Reference";
   mso-ansi-font-size: 9.0pt;
   position: relative;
   top: -3.0pt;

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

@@ -156,6 +156,7 @@ p.MsoListParagraphCxSpLast, li.MsoListParagraphCxSpLast, div.MsoListParagraphCxS
 p.MsoCommentText, li.MsoCommentText, div.MsoCommentText
 	{mso-style-noshow:yes;
 	mso-style-unhide:no;
+	mso-style-name:"Comment Text";
 	mso-style-link:"Comment Text Char";
 	margin:0cm;
 	margin-bottom:.0001pt;
@@ -195,6 +196,7 @@ p.MsoHeaderLandscape, li.MsoHeaderLandscape, div.MsoHeaderLandscape
         mso-fareast-language:EN-US;}
 p.MsoFooter, li.MsoFooter, div.MsoFooter
         {mso-style-unhide:no;
+        mso-style-name:"Footer";
 	margin:0cm;
 	margin-bottom:.0001pt;
 	text-align:justify;
@@ -432,6 +434,7 @@ h1
 	{mso-style-priority:1;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
+	mso-style-name:"Heading 1";
 	mso-style-link:"Heading 1 Char";
 	mso-style-next:Normal;
 	margin-top:18.0pt;
@@ -613,6 +616,7 @@ h2
 	{mso-style-priority:2;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
+	mso-style-name:"Heading 2";
 	mso-style-parent:"Heading 1";
 	mso-style-link:"Heading 2 Char";
 	mso-style-next:Normal;
@@ -643,7 +647,8 @@ h3
 	{mso-style-priority:3;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
-	mso-style-parent:"Heading 1";
+	mso-style-name:"Heading 3";
+	mso-style-parent:"Heading 2";
 	mso-style-link:"Heading 3 Char";
 	mso-style-next:Normal;
 	margin-top:8.0pt;
@@ -671,6 +676,7 @@ h4
 	{mso-style-priority:4;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
+	mso-style-name:"Heading 4";
 	mso-style-parent:"Heading 3";
 	mso-style-link:"Heading 4 Char";
 	mso-style-next:Normal;
@@ -702,6 +708,7 @@ h5
 	{mso-style-priority:5;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
+	mso-style-name:"Heading 5";
 	mso-style-parent:"Heading 4";
 	mso-style-link:"Heading 5 Char";
 	mso-style-next:Normal;
@@ -733,6 +740,7 @@ h6
 	{mso-style-priority:6;
 	mso-style-unhide:no;
 	mso-style-qformat:yes;
+	mso-style-name:"Heading 6";
 	mso-style-parent:"Heading 5";
 	mso-style-link:"Heading 6 Char";
 	mso-style-next:Normal;
@@ -763,6 +771,7 @@ h6
 p.MsoHeading7, li.MsoHeading7, div.MsoHeading7
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
+	mso-style-name:"Heading 7";
 	mso-style-parent:"Heading 6";
 	mso-style-next:Normal;
 	margin-top:8.0pt;
@@ -789,7 +798,8 @@ p.MsoHeading7, li.MsoHeading7, div.MsoHeading7
 p.MsoHeading8, li.MsoHeading8, div.MsoHeading8
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
-	mso-style-parent:"Heading 6";
+	mso-style-name:"Heading 8";
+	mso-style-parent:"Heading 7";
 	mso-style-next:Normal;
 	margin-top:8.0pt;
 	margin-right:0cm;
@@ -815,8 +825,9 @@ p.MsoHeading8, li.MsoHeading8, div.MsoHeading8
 p.MsoHeading9, li.MsoHeading9, div.MsoHeading9
 	{mso-style-unhide:no;
 	mso-style-qformat:yes;
-	mso-style-parent:"Normal 6";
-	mso-style-next:Βασικό;
+	mso-style-name:"Heading 9";
+	mso-style-parent:"Heading 8";
+	mso-style-next:Normal;
 	margin-top:8.0pt;
 	margin-right:0cm;
 	margin-bottom:6pt;
@@ -900,6 +911,7 @@ p.MsoIndex3, li.MsoIndex3, div.MsoIndex3
 	mso-fareast-language:EN-US;}
 p.MsoToc1, li.MsoToc1, div.MsoToc1
 	{mso-style-priority:39;
+	mso-style-name:"TOC 1";
 	mso-style-unhide:no;
 	margin-top:6.0pt;
 	margin-right:42.55pt;
@@ -923,6 +935,7 @@ p.MsoToc2, li.MsoToc2, div.MsoToc2
 	{mso-style-noshow:yes;
 	mso-style-priority:39;
 	mso-style-unhide:no;
+	mso-style-name:"TOC 2";
 	mso-style-parent:"TOC 1";
 	mso-style-next:Normal;
    margin-top:4.0pt;
@@ -947,6 +960,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
 	{mso-style-noshow:yes;
 	mso-style-priority:39;
 	mso-style-unhide:no;
+	mso-style-name:"TOC 3";
 	mso-style-parent:"TOC 2";
 	mso-style-next:Normal;
     margin-top:4.0pt;
@@ -970,6 +984,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
 p.MsoToc4, li.MsoToc4, div.MsoToc4
 	{mso-style-noshow:yes;
 	mso-style-unhide:no;
+	mso-style-name:"TOC 4";
 	mso-style-parent:"TOC 3";
 	margin-top:4.0pt;
 	margin-right:42.55pt;
@@ -992,6 +1007,7 @@ p.MsoToc4, li.MsoToc4, div.MsoToc4
 p.MsoToc5, li.MsoToc5, div.MsoToc5
 	{mso-style-noshow:yes;
 	mso-style-unhide:no;
+	mso-style-name:"TOC 5";
 	mso-style-parent:"TOC 4";
 	margin-top:4.0pt;
 	margin-right:42.55pt;
@@ -1014,7 +1030,8 @@ p.MsoToc5, li.MsoToc5, div.MsoToc5
 p.MsoToc6, li.MsoToc6, div.MsoToc6
 	{mso-style-noshow:yes;
 	mso-style-unhide:no;
-	mso-style-parent:"TOC 4";
+	mso-style-name:"TOC 6";
+	mso-style-parent:"TOC 5";
 	margin-top:4.0pt;
 	margin-right:42.55pt;
 	margin-bottom:0cm;
@@ -1036,7 +1053,8 @@ p.MsoToc6, li.MsoToc6, div.MsoToc6
 p.MsoToc7, li.MsoToc7, div.MsoToc7
 	{mso-style-noshow:yes;
 	mso-style-unhide:no;
-	mso-style-parent:"TOC 4";
+	mso-style-name:"TOC 7";
+	mso-style-parent:"TOC 6";
 	margin-top:4.0pt;
 	margin-right:42.55pt;
 	margin-bottom:0cm;
@@ -1058,7 +1076,8 @@ p.MsoToc7, li.MsoToc7, div.MsoToc7
 p.MsoToc8, li.MsoToc8, div.MsoToc8
 	{mso-style-noshow:yes;
 	mso-style-unhide:no;
-	mso-style-parent:"TOC 4";
+	mso-style-name:"TOC 8";
+	mso-style-parent:"TOC 7";
 	margin-top:4.0pt;
 	margin-right:42.55pt;
 	margin-bottom:0cm;
@@ -1080,7 +1099,8 @@ p.MsoToc8, li.MsoToc8, div.MsoToc8
 p.MsoToc9, li.MsoToc9, div.MsoToc9
 	{mso-style-noshow:yes;
 	mso-style-unhide:no;
-	mso-style-parent:"TOC 3";
+	mso-style-name:"TOC 9";
+	mso-style-parent:"TOC 8";
 	margin-top:4.0pt;
 	margin-right:42.55pt;
 	margin-bottom:0cm;
@@ -1102,6 +1122,7 @@ p.MsoToc9, li.MsoToc9, div.MsoToc9
 span.MsoFootnoteReference
 	{mso-style-noshow:yes;
 	mso-style-unhide:no;
+        mso-style-name:"Footnote Reference";
 	mso-ansi-font-size:9.0pt;
 	position:relative;
 	top:-3.0pt;

data/lib/isodoc/itu/i18n-ar.yaml

@@ -58,6 +58,7 @@ tsb_full: مكتب تقييس الاتصالات
 br_full: مكتب الاتصالات الراديوية
 bdt_full: مكتب تنمية الاتصالات
 prepub: نسخة منشورة مسبقا
+draft_new: مشروع % جديدة
 doctype_dict:
   resolution: قرار
   recommendation: توصية

data/lib/isodoc/itu/i18n-de.yaml

@@ -58,6 +58,7 @@ tsb_full: Büro für Telekommunikations-<br/>Standardisierung<br/>der ITU
 br_full: Büro für Funkkommunikation<br/>der ITU
 bdt_full: Büro für Entwicklungen<br/>in der Telekommunikation<br/>der ITU
 prepub: Vorveröffentlichte Version
+draft_new: Entwurf neuen %
 doctype_dict:
   resolution: Auflösung
   recommendation: Empfehlung

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

@@ -59,6 +59,7 @@ tsb_full: Telecommunication<br/>Standardization Bureau<br/>of ITU
 br_full: Radiocommunication Bureau<br/>of ITU
 bdt_full: Telecommunication<br/>Development Bureau<br/>of ITU
 prepub: Prepublished version
+draft_new: Draft new %
 doctype_dict:
   resolution: Resolution
   recommendation: Recommendation

data/lib/isodoc/itu/i18n-es.yaml

@@ -59,6 +59,7 @@ tsb_full: <br/>Oficina de Normalización<br/>de las Telecomunicaciones de la UIT
 br_full: Oficina de Radiocomunicaciones<br/>de la UIT
 bdt_full: <br/>Oficina de Desarrollo<br/>de las Telecomunicaciones de la UIT
 prepub: Versión prepublicada
+draft_new: Borrador de nueva %
 doctype_dict:
   resolution: Resolución
   recommendation: Recomendación

data/lib/isodoc/itu/i18n-fr.yaml

@@ -59,6 +59,7 @@ tsb_full: Bureau de la normalisation<br/>des télécommunications<br/>de l’UIT
 br_full: Bureau des radiocommunications<br/>de l’UIT
 bdt_full: Bureau de développement<br/>des télécommunications<br/>de l’UIT
 prepub: Version pré-publiée
+draft_new: Projet de nouvelle %
 doctype_dict:
   resolution: Résolution
   recommendation: Recommandation

data/lib/isodoc/itu/i18n-ru.yaml

@@ -59,6 +59,7 @@ tsb_full: Бюро стандартизации электросвязи<br/>М
 br_full: Бюро радиосвязи<br/>МСЭ
 bdt_full: Бюро развития электросвязи<br/>МСЭ
 prepub: Предварительно опубликованная версия
+draft_new: Проект новой %
 doctype_dict:
   resolution: Резолюция
   recommendation: Рекомендация

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

@@ -52,6 +52,7 @@ tsb_full: 国际电信联盟<br/>电信标准化局
 br_full: 国际电信联盟<br/>电信发展部门
 bdt_full: 国际电信联盟<br/>电信发展局
 prepub: 预发布版本
+draft_new: 新%草案
 doctype_dict:
   resolution: 决议
   recommendation: 建议书