metanorma-ogc 1.4.1 → 1.4.4

data/lib/asciidoctor/ogc/validate.rb

@@ -1,7 +1,13 @@
 module Asciidoctor
   module Ogc
     class Converter < Standoc::Converter
-      def title_validate(root)
+      def validate(doc)
+        content_validate(doc)
+        schema_validate(formattedstr_strip(doc.dup),
+                        File.join(File.dirname(__FILE__), "ogc.rng"))
+      end
+
+      def title_validate(_root)
         nil
       end
 
@@ -18,8 +24,9 @@ module Asciidoctor
       def stage_validate(xmldoc)
         stage = xmldoc&.at("//bibdata/status/stage")&.text
         %w(swg-draft oab-review public-rfc tc-vote
-        approved deprecated retired).include? stage or
-        @log.add("Document Attributes", nil, "#{stage} is not a recognised status")
+           approved deprecated retired).include? stage or
+          @log.add("Document Attributes", nil,
+                   "#{stage} is not a recognised status")
       end
 
       def version_validate(xmldoc)
@@ -27,10 +34,12 @@ module Asciidoctor
         doctype = xmldoc&.at("//bibdata/ext/doctype")&.text
         if %w(engineering-report discussion-paper).include? doctype
           version.nil? or
-          @log.add("Document Attributes", nil, "Version not permitted for #{doctype}") 
+            @log.add("Document Attributes", nil,
+                     "Version not permitted for #{doctype}")
         else
           version.nil? and
-          @log.add("Document Attributes", nil,  "Version required for #{doctype}") 
+            @log.add("Document Attributes", nil,
+                     "Version required for #{doctype}")
         end
       end
 
@@ -41,7 +50,7 @@ module Asciidoctor
       end
 
       STANDARDTYPE = %w{standard standard-with-suite abstract-specification
-      community-standard profile}.freeze
+                        community-standard profile}.freeze
 
       # spec of permissible section sequence
       # we skip normative references, it goes to end of list
@@ -49,24 +58,25 @@ module Asciidoctor
         [
           {
             msg: "Prefatory material must be followed by (clause) Scope",
-            val: ["./self::clause[@type = 'scope']" ]
+            val: ["./self::clause[@type = 'scope']"],
           },
           {
             msg: "Scope must be followed by Conformance",
-            val: ["./self::clause[@type = 'conformance']" ]
+            val: ["./self::clause[@type = 'conformance']"],
           },
           {
             msg: "Normative References must be followed by "\
-            "Terms and Definitions",
-            val: ["./self::terms | .//terms"]
+                 "Terms and Definitions",
+            val: ["./self::terms | .//terms"],
           },
-      ].freeze
+        ].freeze
 
       def seqcheck(names, msg, accepted)
         n = names.shift
         return [] if n.nil?
+
         test = accepted.map { |a| n.at(a) }
-        if test.all? { |a| a.nil? }
+        if test.all?(&:nil?)
           @log.add("Style", nil, msg)
         end
         names
@@ -74,7 +84,9 @@ module Asciidoctor
 
       def sections_sequence_validate(root)
         return unless STANDARDTYPE.include?(
-          root&.at("//bibdata/ext/doctype")&.text)
+          root&.at("//bibdata/ext/doctype")&.text,
+        )
+
         names = root.xpath("//sections/* | //bibliography/*")
         names = seqcheck(names, SEQ[0][:msg], SEQ[0][:val])
         names = seqcheck(names, SEQ[1][:msg], SEQ[1][:val])
@@ -84,25 +96,28 @@ module Asciidoctor
           n = names.shift
         end
         if n.nil? || n.name != "clause"
-          @log.add("Style", nil, "Document must contain at least one clause")
+          @log.add("Style", nil,
+                   "Document must contain at least one clause")
           return
         end
         root.at("//references | //clause[descendant::references]"\
                 "[not(parent::clause)]") or
-        @log.add("Style", nil, "Normative References are mandatory")
+          @log.add("Style", nil, "Normative References are mandatory")
       end
 
       def preface_sequence_validate(root)
-        root.at("//preface/abstract") or @log.add("Style", nil, "Abstract is missing!")
+        root.at("//preface/abstract") or @log.add("Style", nil,
+                                                  "Abstract is missing!")
         root.at("//bibdata/keyword | //bibdata/ext/keyword") or
           @log.add("Style", nil, "Keywords are missing!")
-        root.at("//foreword") or @log.add("Style", nil,  "Preface is missing!")
+        root.at("//foreword") or @log.add("Style", nil,
+                                          "Preface is missing!")
         root.at("//bibdata/contributor[role/@type = 'author']/organization/"\
                 "name") or
-               @log.add("Style", nil, "Submitting Organizations is missing!")
-        root.at("//submitters") or @log.add("Style", nil, "Submitters is missing!")
+          @log.add("Style", nil, "Submitting Organizations is missing!")
+        root.at("//submitters") or @log.add("Style", nil,
+                                            "Submitters is missing!")
       end
     end
   end
 end
-

data/lib/isodoc/ogc/base_convert.rb

@@ -15,7 +15,7 @@ module IsoDoc
       end
 
       def hi_parse(node, out)
-        out.span **{class: "hi"} do |e|
+        out.span **{ class: "hi" } do |e|
           node.children.each { |n| parse(n, e) }
         end
       end
@@ -27,23 +27,58 @@ module IsoDoc
 
       def term_cleanup(docxml)
         docxml.xpath("//p[@class = 'Terms']").each do |d|
-          h2 = d.at("./preceding-sibling::*[@class = 'TermNum'][1]")
-          h2.add_child(" ")
-          h2.add_child(d.remove)
+          term_cleanup_merge_termnum(d)
+          term_cleanup_merge_admitted(d)
         end
         docxml
       end
 
+      def term_cleanup_merge_termnum(term)
+        h2 = term.at("./preceding-sibling::*[@class = 'TermNum'][1]")
+        term["class"] = h2["class"]
+        term["id"] = h2["id"]
+        term.children.first.previous = " "
+        term.children.first.previous = h2.remove.children
+      end
+
+      def term_cleanup_merge_admitted(term)
+        term.xpath("./following-sibling::p[@class = 'AltTerms' or "\
+                   "@class = 'DeprecatedTerms']").each do |a|
+          term << " "
+          term << a.children
+          a.remove
+        end
+      end
+
+      def deprecated_term_parse(node, out)
+        out.p **{ class: "DeprecatedTerms" } do |p|
+          node.children.each { |c| parse(c, p) }
+          p << "&#xa0;"
+          p.span **{ class: "AdmittedLabel" } do |s|
+            s << l10n(@i18n.deprecated)
+          end
+        end
+      end
+
+      def admitted_term_parse(node, out)
+        out.p **{ class: "AltTerms" } do |p|
+          node.children.each { |c| parse(c, p) }
+          p << "&#xa0;"
+          p.span **{ class: "AdmittedLabel" } do |s|
+            s << l10n(@i18n.admitted)
+          end
+        end
+      end
+
       def example_parse(node, out)
         name = node.at(ns("./name"))
-        example_name_parse(node, out, name) #if name
+        example_name_parse(node, out, name) # if name
         super
       end
 
-      def example_label(node, div, name)
-      end
+      def example_label(node, div, name); end
 
-      def example_name_parse(node, div, name)
+      def example_name_parse(_node, div, name)
         div.p **{ class: "SourceTitle", style: "text-align:center;" } do |p|
           name&.children&.each { |n| parse(n, p) }
         end
@@ -56,6 +91,7 @@ module IsoDoc
 
       def is_clause?(name)
         return true if name == "submitters"
+
         super
       end
 
@@ -84,8 +120,8 @@ module IsoDoc
       def make_tr_attr(td, row, totalrows, header)
         ret = super
         if td.at("./ancestor::xmlns:table[@class = 'recommendation'] | "\
-            "./ancestor::xmlns:table[@class = 'requirement'] | "\
-            "./ancestor::xmlns:table[@class = 'permission']")
+                 "./ancestor::xmlns:table[@class = 'requirement'] | "\
+                 "./ancestor::xmlns:table[@class = 'permission']")
           ret[:style] = "vertical-align:top;"
           ret[:class] = "recommend"
         end
@@ -94,6 +130,7 @@ module IsoDoc
 
       def para_class(node)
         return node["class"] if node["class"]
+
         super
       end
     end

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

@@ -784,6 +784,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; }
+
 span.keyword {
   font-weight: 600; }
 
@@ -865,6 +871,10 @@ p.AltTerms {
   font-size: 24px;
   margin-top: 1em; }
 
+span.AdmittedLabel {
+  color: #00335b;
+  background-color: #CFE2F3; }
+
 /* Links, selection */
 a, a:visited {
   text-decoration: none;

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

@@ -273,6 +273,13 @@ ul {
   }
 }
 
+ul ul > li:first-child {
+      margin-top: 0;
+}
+ol ul > li:first-child {
+      margin-top: 0;
+}
+
 
 span.keyword {
   font-weight: 600;
@@ -363,6 +370,11 @@ p.AltTerms {
   margin-top: 1em;
 }
 
+span.AdmittedLabel {
+    color: #00335b;
+    background-color: #CFE2F3;
+}
+
 
 /* Links, selection */
 

data/lib/isodoc/ogc/html/ogc.css

@@ -851,3 +851,7 @@ div.warning p {
 
 span.hi {
   background-color: yellow; }
+
+span.AdmittedLabel {
+  color: #00335b;
+  background-color: #CFE2F3; }

data/lib/isodoc/ogc/html/ogc.scss

@@ -809,3 +809,7 @@ padding:0cm;mso-padding-alt:1.0pt 4.0pt 1.0pt 4.0pt;
 span.hi {
   background-color: yellow;
 }
+span.AdmittedLabel {
+    color: #00335b;
+    background-color: #CFE2F3;
+}

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

@@ -153,6 +153,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";
   margin: 0cm;
   margin-bottom: .0001pt;
   mso-pagination: widow-orphan;
@@ -373,6 +374,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: 13.5pt;
@@ -459,6 +461,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;
@@ -487,7 +490,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: 3.0pt;
@@ -514,6 +518,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;
@@ -541,6 +546,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;
@@ -568,6 +574,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;
@@ -594,6 +601,7 @@ h6 {
 p.MsoToc1, li.MsoToc1, div.MsoToc1 {
   mso-style-priority: 39;
   mso-style-unhide: no;
+  mso-style-name: "TOC 1";
   mso-style-next: Normal;
   margin-top: 6.0pt;
   margin-right: 25.0pt;
@@ -617,6 +625,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: 0cm;
@@ -641,6 +650,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: 0cm;
@@ -663,6 +673,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
 
 span.MsoFootnoteReference {
   mso-style-priority: 99;
+  mso-style-name: "Footnote Reference";
   vertical-align: super; }
 
 p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {

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

@@ -139,6 +139,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";
 	margin:0cm;
 	margin-bottom:.0001pt;
 	mso-pagination:widow-orphan;
@@ -342,6 +343,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:13.5pt;
@@ -425,6 +427,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;
@@ -452,7 +455,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:3.0pt;
@@ -478,6 +482,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;
@@ -504,6 +509,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;
@@ -530,6 +536,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;
@@ -555,6 +562,7 @@ h6
 p.MsoToc1, li.MsoToc1, div.MsoToc1
 	{mso-style-priority:39;
 	mso-style-unhide:no;
+	mso-style-name:"TOC 1";
 	mso-style-next:Normal;
 	margin-top:6.0pt;
 	margin-right:25.0pt;
@@ -577,6 +585,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:0cm;
@@ -600,6 +609,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:0cm;
@@ -621,6 +631,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
 	mso-bidi-font-weight:normal;}
 span.MsoFootnoteReference
 	{mso-style-priority:99;
+        mso-style-name:"Footnote Reference";
 	vertical-align:super;}
 p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
 	{mso-style-noshow:yes;

data/lib/isodoc/ogc/html/wordstyle_wp.css

@@ -161,6 +161,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";
   margin-top: 8.0pt;
   margin-right: 0cm;
   margin-bottom: 0cm;
@@ -470,6 +471,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;
@@ -539,6 +541,7 @@ h1.Annex
   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;
@@ -568,7 +571,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: 2.0pt;
@@ -594,6 +598,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;
@@ -620,6 +625,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;
@@ -645,6 +651,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;
@@ -674,6 +681,7 @@ h6 {
 p.MsoToc1, li.MsoToc1, div.MsoToc1 {
   mso-style-priority: 39;
   mso-style-unhide: no;
+  mso-style-name: "TOC 1";
   mso-style-next: Normal;
   margin-top: 8.0pt;
   margin-right: 0cm;
@@ -693,6 +701,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;
   mso-pagination: widow-orphan;
@@ -714,6 +723,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: 8.0pt;
@@ -732,6 +742,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3 {
 
 span.MsoFootnoteReference {
   mso-style-priority: 99;
+  mso-style-name: "Footnote Reference";
   vertical-align: super; }
 
 p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText {

data/lib/isodoc/ogc/html/wordstyle_wp.scss

@@ -147,6 +147,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";
         margin-top:8.0pt;
 	margin-right:0cm;
 	margin-bottom:0cm;
@@ -438,6 +439,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;
@@ -506,6 +508,7 @@ h1.Annex
         {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;
@@ -535,7 +538,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:2.0pt;
@@ -560,6 +564,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;
@@ -585,6 +590,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;
@@ -609,6 +615,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;
@@ -637,6 +644,7 @@ h6
 p.MsoToc1, li.MsoToc1, div.MsoToc1
 	{mso-style-priority:39;
 	mso-style-unhide:no;
+	mso-style-name:"TOC 1";
 	mso-style-next:Normal;
         margin-top:8.0pt;
 	margin-right:0cm;
@@ -655,6 +663,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;
 	mso-pagination:widow-orphan;
@@ -675,6 +684,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:8.0pt;
@@ -692,6 +702,7 @@ p.MsoToc3, li.MsoToc3, div.MsoToc3
 	mso-bidi-font-weight:normal;}
 span.MsoFootnoteReference
 	{mso-style-priority:99;
+        mso-style-name:"Footnote Reference";
 	vertical-align:super;}
 p.MsoFootnoteText, li.MsoFootnoteText, div.MsoFootnoteText
 	{mso-style-noshow:yes;

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

@@ -1,13 +1,14 @@
+admitted: ADMITTED
 foreword: Preface
 submitters: Submitters
-recommendationtest: Recommendation Test
-requirementtest: Requirement Test
-permissiontest: Permission Test
-recommendationclass: Recommendations Class
-requirementclass: Requirements Class
-permissionclass: Permissions Class
-abstracttest: Abstract Test
-conformanceclass: Conformance Class
+recommendationtest: Recommendation test
+requirementtest: Requirement test
+permissiontest: Permission test
+recommendationclass: Recommendations class
+requirementclass: Requirements class
+permissionclass: Permissions class
+abstracttest: Abstract test
+conformanceclass: Conformance class
 example: Example
 security_empty: No security considerations have been made for this %.
 internal_terms_boilerplate: |
@@ -24,6 +25,7 @@ internal_external_terms_boilerplate: |
         <p>This document also uses terms defined in the OGC Standard for Modular specifications (<link target="https://portal.opengeospatial.org/files/?artifact_id=34762">OGC 08-131r3</link>), also known as the 'ModSpec'. The definitions of terms such as standard, specification, requirement, and conformance test are provided in the ModSpec.</p>
           <p>For the purposes of this document, the terms and definitions
             given in % and the following additionally apply.</p>
+term_defined_in: "(%)"
 stage_dict:
   swg-draft: Candidate SWG Draft
   oab-review: Candidate OAB Review Draft