metanorma-ogc 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 51962d5ce3484e09e78005d6c5dd1cb09e26494022f6b613817e6b443b2894c8
-  data.tar.gz: eb789d6e500b4d7fbd79553bc2e903dbf87699af5e86c8be579a2834dd440a21
+  metadata.gz: 18c2e2b68390a84fba7753454f984a996799ae9ea3e891fbba07dbd438e8ce0f
+  data.tar.gz: 4fe3ad3bbd6bf5ae7a5d167a8545db551eacb365810938cd1a9cf734809d95d1
 SHA512:
-  metadata.gz: fc0f027c30f0b8c1e5df245db5f682b00f1c5778b9f85673dde2804f2843727a08efcceb64aa5544b2aec91d8689b5250896c17b9c5b643c39602c4669e8086f
-  data.tar.gz: 39f6aafd21c67b0a82a347dbf92bdd4978f517217d2e607f72082f02f8d3941cb8e69788bbc43d7a9a86fdf39d365f7fc6a2f0db7817063c9b8199a002fcbf22
+  metadata.gz: a26c5a35ccfb0f5da5da9f43bb8adfe2109f9f6fcd6fc8fff218ee40a0a09cc1f3b769b3d2d89909f9e8b67913f2f674a97759416bf168cf225079614fa2eefd
+  data.tar.gz: fa851cf8acab3e484e6b06a1a39c2fe7989db0189977cd3e5fb62c793b0ffbb56fe31005a2c6ebbc71b5eeb15865a65a36cb8ff8595b64edc680f8c802e93eb2

data/lib/asciidoctor/ogc/converter.rb

@@ -27,7 +27,7 @@ module Asciidoctor
         result << noko { |ixml| front node, ixml }
         result << noko { |ixml| middle node, ixml }
         result << "</ogc-standard>"
-        result = textcleanup(result.flatten * "\n")
+        result = textcleanup(result)
         ret1 = cleanup(Nokogiri::XML(result))
         validate(ret1)
         ret1.root.add_namespace(nil, Metanorma::Ogc::DOCUMENT_NAMESPACE)
@@ -122,7 +122,7 @@ module Asciidoctor
         names = seqcheck(names, SEQ[1][:msg], SEQ[1][:val]) || return
         names = seqcheck(names, SEQ[2][:msg], SEQ[2][:val]) || return
         n = names.shift
-        if n == { tag: "definitions", title: nil }
+        if !n.nil? && n[:tag] == "definitions"
           n = names.shift
         end
         unless n

data/lib/asciidoctor/ogc/isodoc.rng

@@ -493,6 +493,9 @@
       <attribute name="id">
         <data type="ID"/>
       </attribute>
+      <optional>
+        <attribute name="lang"/>
+      </optional>
       <optional>
         <ref name="tname"/>
       </optional>

data/lib/isodoc/ogc/html/html_ogc_titlepage.html

@@ -17,52 +17,59 @@
     <div class="wrapper-top">
 
   <div class="coverpage-doc-identity">
+
+    <div class="coverpage-title">
+      <span class="title-first">{{ doctitle }}</span>
+      <!--<span class="title-second">{{ docsubtitle }}</span>-->
+    </div>
+  </div>
+
+  <div class="coverpage-logo">
+    <span>Open Geospatial Consortium {{ docyear }}</span>
+  </div>
+
+  <div class="coverpage-tc-name">
+    <span>{{ tc | capitalize }}</span>
+  </div>
+
+  <div class="authors">
+    {% if editors %}
+    {% for editor in editors %}
+    <span>{{ editor }} <span class="roletag">Editor</span></span>
+    {% endfor %}
+    {% endif %}
+  </div>
+
     <div class="coverpage-metadata">
-      <span>Submission Date: {{ receiveddate }}</span>
-      <span>Approval Date: {{ issueddate }}</span>
-      <span>Publication Date: {{ publisheddate }}</span>
-      <span>External identifier of this OGC® document: <span class="docnumber">{{ externalid }}</span></span>
-      <span>Internal identifier of this OGC® document: <span class="docnumber">{{ docnumber }}</span></span>
+      <span class="label">Submission Date: </span> <span class="value">{{ receiveddate }}</span>
+      <span class="label">Approval Date: </span> <span class="value">{{ issueddate }}</span>
+      <span class="label">Publication Date: </span> <span class="value">{{ publisheddate }}</span>
+      <span class="label">External identifier of this OGC® document: <span class="docnumber value">{{ externalid }}</span></span>
+      <span class="label">Internal identifier of this OGC® document: <span class="docnumber value">{{ docnumber }}</span></span>
       {% if url or html %}
-      <span>URL for this OGC® document: <a href="{{ url or html }}">{{ url or html }}</a></span>
+      <span class="label">URL for this OGC® document:</span> <span class="value"><a href="{{ url or html }}">{{ url or html }}</a></span>
       {% endif %}
       {% if previousuri %}
-      <span>Previous URI: <a href="{{ previousuri }}">{{previousuri}}</a></span>
-      {% endif %}
-      {% if editors %}
-      <span>Editor: {{ editors | join: ", " }}</span>
+      <span class="label">Previous URI: </span> <span class="value"><a href="{{ previousuri }}">{{previousuri}}</a></span>
       {% endif %}
     </div>
 
     {% if xml or pdf or doc %}
     <div class="coverpage-alt-formats">
-      <span>Additional Formats: </span>
+      <span class="label">Additional Formats: </span>
       {% if xml %}
-      <span><a href="{{ xml }}"><i class="far fa-file-code"></i>XML</a></span>
+      <span class="value"><a href="{{ xml }}"><i class="far fa-file-code"></i>XML</a></span>
       {% endif %}
       {% if pdf %}
-      <span><a href="{{ pdf }}"><i class="far fa-file-pdf"></i>PDF</a></span>
+      <span class="value"><a href="{{ pdf }}"><i class="far fa-file-pdf"></i>PDF</a></span>
       {% endif %}
       {% if doc %}
-      <span><a href="{{ doc }}"><i class="far fa-file-word"></i>DOC</a></span>
+      <span class="value"><a href="{{ doc }}"><i class="far fa-file-word"></i>DOC</a></span>
       {% endif %}
       </span>
     </div>
     {% endif %}
 
-    <div class="coverpage-title">
-      <span class="title-first">{{ doctitle }}</span>
-      <!--<span class="title-second">{{ docsubtitle }}</span>-->
-    </div>
-  </div>
-
-  <div class="coverpage-logo">
-    <span>Open Geospatial Consortium {{ docyear }}</span>
-  </div>
-
-  <div class="coverpage-tc-name">
-    <span>{{ tc | capitalize }}</span>
-  </div>
   </div>
 
     <div class="wrapper-top-bottom"></div>
@@ -74,6 +81,7 @@
 
   <div class="coverpage-stage-block" >
     <p><span class="coverpage-maturity" id="{{ status | replace: ' ', '-' | downcase }}">{{ status }}</span></p>
+  </div>
 </div>
 
 {% if doctype == "Standard" or doctype == "Standard With Suite" %}
@@ -167,6 +175,6 @@
 <div class="rule"></div>
 </div>
   </div>
-
+</div>
 
 </header>

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

@@ -137,11 +137,11 @@ table {
     margin-left: auto;
     margin-right: auto;
     max-width: 100%;
-    color: #1d1d1d;
+    color: #00335b;
     font-weight: 300;
-    font-size: 15px;
-    line-height: 1.4em;
-    background-color: #ffffff;
+    font-size: 16px;
+    line-height: 1.5;
+    background-color: #f6f8fa;
   }
 
   main {margin: 0 3em 0 6em;}
@@ -167,7 +167,7 @@ table {
         overflow: auto;
         padding: 0 0 0 45px;
         margin-right: 30px;
-        background-color:#f6f6f6;
+        background-color:#f1f8ff;
     }
 
     #toggle {
@@ -229,10 +229,11 @@ table {
 
 #toc li {
     padding: 5px 10px;
+    font-size: 14px;
 }
 
 #toc a {
-    color: #2e81c2;
+    color: #00335b;
     text-decoration: none;
     display: block;
 }
@@ -256,7 +257,7 @@ table {
 #toc .toc-active, #toc li:hover {
     background: #00335b;
     box-shadow: inset -5px 0px 10px -5px #00335b!important;
-
+    font-weight: 600;
 }
 
 #toc li:hover a {
@@ -266,7 +267,7 @@ table {
 }
 
 #toc li a {
-  text-transform: uppercase;
+  text-transform: nonce;
 }
 
 /*
@@ -305,7 +306,6 @@ table {
 }
 
 p.document-type, p.document-stage {
-  color: white;
   text-transform: uppercase;
   font-size: 0.9em;
   font-weight: 400;
@@ -313,15 +313,18 @@ p.document-type, p.document-stage {
   margin:0;
   margin-left: 6px;
   writing-mode:tb-rl;
+  -webkit-transform: rotate(180deg);
+  -moz-transform: rotate(180deg);
+  -o-transform: rotate(180deg);
   transform:rotate(180deg);
-        white-space:nowrap;
-        display:block;
+  white-space:nowrap;
+  display:block;
   bottom:0;
 }
 
 p.document-type {
     font-weight: 400;
-    height: 210px;
+    height: 150;
 }
 
 #governance-band p.document-type {
@@ -334,39 +337,40 @@ p.document-stage {
     height:160px;
 }
 
-$doctype-colors-list:(
-  standard: #0AC442,
-  standard-with-suite: #540D6E,
-  abstract-specification: #D183C9,
-  community-standard: #65AFFF,
-  profile: #3A405A,
-  best-practice: #F26430,
-  engineering-report: #C84630,
-  discussion-paper: #BFAE48,
-  reference-model: #BD9391,
-  user-guide: #303633,
-  policy: #8BE8CB,
-  guide: #7EA2AA,
-  amendment: #888DA7,
-  technical-corrigendum: #9C7A97,
-  administrative: #C4F1BE
-);
+#standard-band p {
+      height: 135px; }
+
+#proposal-band p {
+      height: 150px; }
+
+    #standard-band, #published-band {
+      color: rgb(123, 168, 18);
+      background-color: rgb(216, 236, 168); }
+
+    #standard, #published {
+      color: #9ABD48; }
+
+    #governance, #policy-and-procedures {
+      border-bottom: solid 3px #750697; }
+
+    #governance-band, #policy-and-procedures-band {
+      background-color: #750697; }
+
 
-@each $key,$val in $doctype-colors-list{
-  ##{$key}-band {
-    background-color: #{$val};
-  }
-  ##{$key} {
-    border-bottom: solid 3px #{$val};
-  }
-}
 
 $docstage-colors-list:(
-  rfc: #39A0ED,
-  candidate: #2D7393,
-  published: #069E2D,
-  deprecated: #004E64,
-  retired: #2E382E,
+  rfc: #48a0e7,
+  candidate: #fd06fd,
+  published: #9abd48,
+  deprecated: #7e0d13,
+  retired: #7e0d13,
+  working-draft: #f780ec,
+  proposal: #f780ec,
+  committee-draft: #fd06fd,
+  draft-standard: #fd06fd,
+  standard: #9abd48,
+  obsolete: #7e0d13,
+  guide: #48a0e7,
 );
 
 @each $key,$val in $docstage-colors-list{
@@ -378,16 +382,15 @@ $docstage-colors-list:(
   }
 }
 
-.coverpage-maturity {
-  font-family: $bodyfont;
+.coverpage-maturity, .coverpage-stage {
+  font-family: $headerfont;
   font-weight: 400;
-  font-size: 1em;
+  font-size: 1.3em;
   margin: 0 0 2em 0;
   text-transform: uppercase;
 }
 
 
-
 /*
     3. TYPOGRAPHY
 */
@@ -399,13 +402,13 @@ $docstage-colors-list:(
   h1,h2,h3,h4,h5,h6 {
     font-family: $headerfont;
     color: #00335b;
-    font-weight: 300;
+    font-weight: 400;
     margin-top: 1.6em;
     margin-bottom: 0.3em;
   }
 
   h1 {
-    font-size: 1.6em;
+    font-size: 1.8em;
     text-transform: uppercase;
     margin-top: 2em;
   }
@@ -416,37 +419,44 @@ $docstage-colors-list:(
 
   h2 {
     margin-top: 1.3em;
-    font-size: 1.3em;
-    font-weight: 400;
+    font-size: 1.7em;
+    font-weight: 300;
   }
 
   h3 {
-    margin-top: 1.1em;
-    font-size: 1.1em;
+    margin-top: 1.3em;
+    font-size: 1.5em;
     font-weight: 100;
   }
 
+  h4 {
+    font-size: 1.4em;
+  }
+
   .TermNum, .Terms, .AltTerms {
     color: #00335b;
-    font-weight: 100;
+    font-weight: 300;
+    font-family: $headerfont;
   }
 
   h2.TermNum {
     margin-bottom: 0;
   }
 
+  /*
   p.Terms {
     font-size: 1.1em;
     line-height: 1.5em;
     margin: 0;
   }
+  */
 
   p.AltTerms {
     /*
     font-style: italic;
      */
-    font-size: 1.1em;
-    margin: 0;
+    font-size: 24px;
+    margin-top: 1em;
   }
 
 /*
@@ -495,8 +505,9 @@ $docstage-colors-list:(
 
    ul > li:before {
     content: "\2014";
-    display: inline-block; width: 1em;
-    margin-left: -1.2em;
+    display: inline-block; 
+    width: 1em;
+    margin-left: -1em;
   }
 
   ul > li p:first-child {
@@ -544,7 +555,8 @@ p.Biblio, p.NormRef {
 .figure, .Sourcecode {
     font-family: $monospacefont;
     font-variant-ligatures: none;
-    background-color: #f6f6f6;
+    background-color: #e1eef1;
+    color: #424242;
     font-size: 0.8em;
     line-height: 1.6em;
     padding: 1.5em;
@@ -563,8 +575,8 @@ p.Biblio, p.NormRef {
 */
 
 .Note {
-    background-color: #fff495;
-    color: #47430c;
+    background-color: #fff8bb;
+    color: #7d760b;
     padding: 1.2em;
     margin: 1em 0 1em 0;
 
@@ -573,16 +585,30 @@ p.Biblio, p.NormRef {
     }
 }
 
-.Admonition {
-    background-color: #ffcccc;
-    color: #47430c;
-    padding: 1.2em;
-    margin: 1em 0 1em 0;
+    .Admonition {
+      padding: 1em 1.2em 1.2em 1.2em;
+      margin: 1em 0 1em 0;
+      background-color: #fcad88;
+      border-top: 10px solid #eb5a06;
+      color:#290404;
+      }
 
-    p {
+    .Admonition.Important {
+      background-color: #f58cff;
+      color: #5d1364;
+      border-top: 10px solid #9503a8;
+    }
+
+    .Admonition.Warning {
+      background-color: #ff989d;
+      color: #270204;
+      border-top: 10px solid #e4010c;
+    }
+
+
+      .Admonition p, .Admonition.Important p, .Admonition.Warning p {
         margin: 0;
     }
-}
 
 
 /*
@@ -591,6 +617,7 @@ p.Biblio, p.NormRef {
 
 .example {
     background-color: #e1eef1;
+    color: #424242;
     padding: 1.2em;
     margin: 2em 0 1em 0;
     padding-left: 2em;
@@ -603,11 +630,34 @@ p.Biblio, p.NormRef {
     margin-left:-1.5em;
 }
 
-.recommend {
-    background-color: #ccffcc;
-    padding: 1.2em;
-    margin: 2em 0 1em 0;
-}
+    .example .Sourcecode {
+      background: none;
+    }
+
+    .recommend, .recommend .example_label {
+      background-color: #f8ffbd;
+    }
+
+    .recommend .example_label {
+      font-weight: bold;
+    }
+
+    .permission, .permission .example_label {
+      background-color: #cdfdbe;
+    }
+
+    .permission .example_label {
+      font-weight: bold;
+    }
+
+    .require, .require .example_label {
+      background-color: #d3e6ff;
+    }
+
+    .require .example_label {
+      font-weight: bold;
+    }
+
 
 
 /*
@@ -617,6 +667,7 @@ p.Biblio, p.NormRef {
 table {
   border-collapse: collapse;
   width: 100%;
+  color: #010d16;
   font-weight: 300;
   margin: 1em 0 2em 0;
   margin-left: auto;
@@ -625,10 +676,17 @@ table {
 }
 
 table, th, td {
-  border: 1px solid black;
+  border: none!important;
   font-size: 0.95em;
 }
 
+tr:nth-child(even) {background: #f1f8ff}
+tr:nth-child(odd) {background: #cfe6fd}
+
+thead tr th {
+  background-color: #5d99d6;
+}
+
 td, th {
   padding: 1em;
 }
@@ -662,7 +720,7 @@ a.footnote-number {
 */
 
 .Quote {
-    background-color: #f6f6f6;
+    background-color: #e1eef1;
     font-style: italic;
     width: 80%;
     padding: 1.5em;
@@ -756,9 +814,10 @@ h2 p {
 }
 
 .wrapper-top {
-  background: linear-gradient(135deg, #00335b, #00335b, #93c0d6);
+  background: rgb(0,51,91);
+  background: linear-gradient(130deg, rgba(0,51,91,1) 45%, rgba(241,248,255,1) 100%);
   color: #ffffff;
-  padding: 2em 0;
+  padding: 5em 0;
   width: 100%;
 }
 
@@ -770,43 +829,72 @@ h2 p {
   position: absolute;
 }
 
+.coverpage-metadata {
+      margin-top: 35px;
+      padding-top: 15px;
+      margin-right: 25px;
+      border-top: solid 1px white;
+}
+
 .coverpage-metadata,
 .coverpage-alt-formats {
-  line-height: 1.5em;
-  padding: 0 1em 1em 1em;
-  text-align: right;
+  font-size: 12px;
+  font-family: $headerfont;
+  margin-left: 1em;
+  text-align: left;
 }
 
-.coverpage-metadata > span {
+.coverpage-metadata span,
+.coverpage-alt-formats span {
   display: block;
-  text-align: right;
+  text-align: left;
 }
 
-.coverpage-alt-formats > span {
-  display: inline-block;
-  text-align: right;
+.coverpage-metadata .value,
+.coverpage-alt-formats .value {
+  font-size: 15px;
+  margin-bottom: 15px;
+}
+.coverpage-metadata .label,
+.coverpage-alt-formats .label {
+  font-size: 12px;
+  padding:0;
+}
+.coverpage-alt-formats span {
+  display: inline;
+  text-align: left;
 }
 
-.coverpage-metadata a,
-.coverpage-alt-formats a,
-.coverpage-metadata a:visited,
-.coverpage-alt-formats a:visited {
-  color: #fff;
+.coverpage-metadata span a,
+.coverpage-alt-formats span a {
+  color: white;
+}
+.coverpage-alt-formats span a {
+  padding-right: 5px;
+}
+.coverpage-metadata span a:hover,
+.coverpage-alt-formats span a:hover {
   text-decoration: underline;
+  background: none;
+  box-shadow: none !important;
+  font-weight: 400;
 }
 
-
 .coverpage-title {
   padding-bottom: 0.5em;
   font-family: $headerfont;
-  font-size: 2.3em;
-  line-height: 1.5em;
   font-weight: 100;
   padding-left: 1em;
   padding-right: 1em;
   text-transform: uppercase;
 }
 
+.coverpage-title span {
+  font-family: $headerfont;
+  font-size: 1.8em;
+  line-height: 1;
+}
+
   .WordSection11 {
     padding: 0 2em 0 3em;
   }
@@ -818,12 +906,10 @@ h2 p {
     padding: 0 3em 0 6em;
   }
 
-
   .zzSTDTitle1, .MsoCommentText {
     display: none;
   }
 
-
   .coverpage {
     text-align: center;
     padding-left: 1.5em;
@@ -833,6 +919,7 @@ h2 p {
     font-family: $bodyfont;
       text-transform: none;
       font-weight: 300;
+      margin-left: 1em;
   }
 
   .coverpage-tc-name {
@@ -846,6 +933,7 @@ h2 p {
 */
 
   .coverpage-doc-identity {
+    font-size: 2em;
     line-height: 2em;
   }
 
@@ -854,13 +942,32 @@ h2 p {
   }
 
   .coverpage-stage-block {
-    font-family: $bodyfont;
+    font-family: $headerfont;
     font-weight: 600;
     font-size: 1.25em;
     margin: 2em 0em 2em 0em;
     text-transform: uppercase;
   }
 
+          .authors {
+      margin-top: 2em;
+    }
+
+    .authors span{
+      display: block;
+      line-height: 2;
+    }
+
+    .authors span.roletag {
+      display: inline-block;
+      font-size: 12px;
+      color: #00335b;
+      background-color: white;
+      padding: 2px 5px;
+      margin-left: 7px;
+      border-radius: 5px;
+    }
+
 /*
     4.3 Draft Warning
 */
@@ -918,7 +1025,7 @@ To top button
     font-size: 12px;
     border: none;
     outline: none;
-    background-color: #1f8ca0;
+    background-color: #00335b;
     opacity: 0.15;
     color: white;
     cursor: pointer;

data/lib/isodoc/ogc/html/word_ogc_titlepage.html

@@ -141,7 +141,7 @@ page;mso-element-left:39.9pt;mso-element-top:693.25pt;mso-height-rule:exactly'>
   lang=EN-GB style='font-size:10.0pt;mso-color-alt:windowtext;font-weight:normal'>Document
   type:&nbsp;&nbsp;&nbsp;<span style='mso-tab-count:1'>         </span><span
   class=SpellE>OGC</span><sup>®</sup> </span><span lang=EN-GB
-  style='font-size:10.0pt;font-weight:normal'>{{ doctype }}}</span><span lang=EN-GB style='font-size:10.0pt;
+  style='font-size:10.0pt;font-weight:normal'>{{ doctype }}</span><span lang=EN-GB style='font-size:10.0pt;
   mso-color-alt:windowtext;font-weight:normal'><o:p></o:p></span></p>
   
 {% if docsubstatus %}  

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

@@ -1074,6 +1074,107 @@ p.Tablebody, li.Tablebody, div.Tablebody
 	margin-left:162.0pt;
 	text-indent:-18.0pt;}
 
+p.ListContLevel1, li.ListContLevel1, div.ListContLevel1
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:18.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel2, li.ListContLevel2, div.ListContLevel2
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:36.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel3, li.ListContLevel3, div.ListContLevel3
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:54.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel4, li.ListContLevel4, div.ListContLevel4
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:72.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel5, li.ListContLevel5, div.ListContLevel5
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:90.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel6, li.ListContLevel6, div.ListContLevel6
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:108.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel7, li.ListContLevel7, div.ListContLevel7
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:126.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel8, li.ListContLevel8, div.ListContLevel8
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:144.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+p.ListContLevel9, li.ListContLevel9, div.ListContLevel9
+	{mso-style-priority:34;
+	margin-top:0cm;
+	margin-left:162.0pt;
+	margin-right:0cm;
+	margin-bottom:12.0pt;
+	mso-pagination:widow-orphan;
+	font-size:11.0pt;
+	font-family:$bodyfont;
+	mso-ansi-language:EN-AU;
+	mso-fareast-language:EN-US;}
+
+
 table.MsoNormalTable
 	{mso-style-name:"Table Normal";
 	mso-tstyle-rowband-size:0;

data/lib/isodoc/ogc/html_convert.rb

@@ -19,7 +19,7 @@ module IsoDoc
       def default_fonts(options)
         {
           bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Overpass",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Overpass",sans-serif'),
+          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Teko",sans-serif'),
           monospacefont: '"Space Mono",monospace'
         }
       end
@@ -46,7 +46,8 @@ module IsoDoc
     <script type="text/javascript" src="https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js"></script>
 
     <!--Google fonts-->
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet" />
+    <link href="https://fonts.googleapis.com/css?family=Teko:300,400,500" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
     <!--Font awesome import for the link icon-->
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/solid.css" integrity="sha384-rdyFrfAIC05c5ph7BKz3l5NG5yEottvO/DQ0dCrwD8gzeQDjYBHNr1ucUpQuljos" crossorigin="anonymous">
@@ -55,6 +56,15 @@ module IsoDoc
         HEAD
       end
 
+      def admonition_class(node)
+        case node["type"]
+        when "important" then "Admonition.Important"
+        when "warning" then "Admonition.Warning"
+        else
+          "Admonition"
+        end
+      end
+
       def make_body(xml, docxml)
         body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
         xml.body **body_attr do |body|
@@ -205,16 +215,7 @@ module IsoDoc
       def example_parse(node, out)
         name = node.at(ns("./name"))
         sourcecode_name_parse(node, out, name) if name
-        out.table **example_table_attr(node) do |t|
-          t.tr do |tr|
-            tr.td **EXAMPLE_TBL_ATTR do |td| 
-              td << example_label(node) 
-            end
-            tr.td **{ valign: "top", class: "example" } do |td|
-              node.children.each { |n| parse(n, td) unless n.name == "name" }
-            end
-          end
-        end
+        super
       end
 
       def error_parse(node, out)

data/lib/isodoc/ogc/pdf_convert.rb

@@ -17,7 +17,7 @@ module IsoDoc
       def default_fonts(options)
         {
           bodyfont: (options[:script] == "Hans" ? '"SimSun",serif' : '"Overpass",sans-serif'),
-          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Overpass",sans-serif'),
+          headerfont: (options[:script] == "Hans" ? '"SimHei",sans-serif' : '"Teko",sans-serif'),
           monospacefont: '"Space Mono",monospace'
         }
       end
@@ -44,8 +44,9 @@ module IsoDoc
     <script type="text/javascript"  src="https://cdn.rawgit.com/jgallen23/toc/0.3.2/dist/toc.min.js"></script>
 
     <!--Google fonts-->
-    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet">
-    <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Open+Sans:300,300i,400,400i,600,600i|Space+Mono:400,700" rel="stylesheet" />
+    <link href="https://fonts.googleapis.com/css?family=Overpass:300,300i,600,900" rel="stylesheet" />
+    <link href="https://fonts.googleapis.com/css?family=Teko:300,400,500" rel="stylesheet">
     <!--Font awesome import for the link icon-->
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/solid.css" integrity="sha384-rdyFrfAIC05c5ph7BKz3l5NG5yEottvO/DQ0dCrwD8gzeQDjYBHNr1ucUpQuljos" crossorigin="anonymous">
     <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.5.0/css/fontawesome.css" integrity="sha384-u5J7JghGz0qUrmEsWzBQkfvc8nK3fUT7DCaQzNQ+q4oEXhGSx+P2OqjWsfIRB8QT" crossorigin="anonymous">
@@ -53,6 +54,15 @@ module IsoDoc
         HEAD
       end
 
+      def admonition_class(node)
+        case node["type"]
+        when "important" then "Admonition.Important"
+        when "warning" then "Admonition.Warning"
+        else
+          "Admonition"
+        end
+      end
+
       def make_body(xml, docxml)
         body_attr = { lang: "EN-US", link: "blue", vlink: "#954F72", "xml:lang": "EN-US", class: "container" }
         xml.body **body_attr do |body|
@@ -71,8 +81,8 @@ module IsoDoc
           t << "#{get_anchors[annex['id']][:label]} "
           t.br
           t.b do |b|
-          name&.children&.each { |c2| parse(c2, b) }
-        end
+            name&.children&.each { |c2| parse(c2, b) }
+          end
         end
       end
 
@@ -150,7 +160,7 @@ module IsoDoc
 
       def submitters(docxml, out)
         f = docxml.at(ns("//submitters")) || return
-         out.div **{ class: "Section3" } do |div|
+        out.div **{ class: "Section3" } do |div|
           clause_name(get_anchors[f['id']][:label], "Submitters", div,  class: "IntroTitle")
           f.elements.each { |e| parse(e, div) unless e.name == "title" }
         end
@@ -181,7 +191,7 @@ module IsoDoc
         end
       end
 
-            def abstract(isoxml, out)
+      def abstract(isoxml, out)
         f = isoxml.at(ns("//preface/abstract")) || return
         @prefacenum += 1
         page_break(out)
@@ -204,16 +214,7 @@ module IsoDoc
       def example_parse(node, out)
         name = node.at(ns("./name"))
         sourcecode_name_parse(node, out, name) if name
-        out.table **example_table_attr(node) do |t|
-          t.tr do |tr|
-            tr.td **EXAMPLE_TBL_ATTR do |td|
-              td << example_label(node)
-            end
-            tr.td **{ valign: "top", class: "example" } do |td|
-              node.children.each { |n| parse(n, td) unless n.name == "name" }
-            end
-          end
-        end
+        super
       end
 
       def error_parse(node, out)
@@ -239,7 +240,7 @@ module IsoDoc
         end
       end
 
-            def requirement_anchor_names(docxml)
+      def requirement_anchor_names(docxml)
         docxml.xpath(ns("//requirement")).each_with_index do |x, i|
           @anchors[x["id"]] = anchor_struct(i+1, nil, "Requirement", "requirement")
         end
@@ -302,7 +303,7 @@ module IsoDoc
         end
       end
 
-            def requirement_label(node)
+      def requirement_label(node)
         n = get_anchors[node["id"]]
         return "Requirement" if n.nil? || n[:label].empty?
         l10n("#{"Requirement"} #{n[:label]}")
@@ -335,11 +336,11 @@ module IsoDoc
         @prefacenum += 1 if d.at(ns("//keyword"))
         preface_names(d.at(ns("//foreword")))
         #preface_names(d.at(ns("//introduction")))
-         @prefacenum += 1 if d.at(ns(SUBMITTINGORGS))
+        @prefacenum += 1 if d.at(ns(SUBMITTINGORGS))
         preface_names(d.at(ns("//submitters")))
         sequential_asset_names(d.xpath(ns("//preface/abstract | //foreword | //introduction | //submitters")))
         n = section_names(d.at(ns("//clause[title = 'Scope']")), 0, 1)
-                n = section_names(d.at(ns("//clause[title = 'Conformance']")), n, 1)
+        n = section_names(d.at(ns("//clause[title = 'Conformance']")), n, 1)
         n = section_names(d.at(ns(
           "//references[title = 'Normative References' or title = 'Normative references']")), n, 1)
         n = section_names(d.at(ns("//sections/terms | "\

data/lib/isodoc/ogc/word_convert.rb

@@ -195,16 +195,7 @@ module IsoDoc
       def example_parse(node, out)
         name = node.at(ns("./name"))
         sourcecode_name_parse(node, out, name) if name
-        out.table **example_table_attr(node) do |t|
-          t.tr do |tr|
-            tr.td **EXAMPLE_TBL_ATTR do |td|
-              td << example_label(node)
-            end
-            tr.td **{ valign: "top", class: "example" } do |td|
-              node.children.each { |n| parse(n, td) unless n.name == "name" }
-            end
-          end
-        end
+        super
       end
 
       def error_parse(node, out)
@@ -217,7 +208,7 @@ module IsoDoc
         end
       end
 
-            def anchor_names(docxml)
+      def anchor_names(docxml)
         super
         recommendation_anchor_names(docxml)
         requirement_anchor_names(docxml)
@@ -263,7 +254,7 @@ module IsoDoc
         out.table **recommend_table_attr(node) do |t|
           t.tr do |tr|
             tr.td **REQ_TBL_ATTR do |td|
-              td << recommendation_label(node)
+              recommendation_label(node, td)
             end
             tr.td **{ valign: "top", class: "recommend" } do |td|
               recommend_name_parse(node, td)
@@ -273,17 +264,20 @@ module IsoDoc
         end
       end
 
-      def recommendation_label(node)
+      def recommendation_label(node, out)
         n = get_anchors[node["id"]]
-        return "Recommendation" if n.nil? || n[:label].empty?
-        l10n("#{"Recommendation"} #{n[:label]}")
+        label = (n.nil? || n[:label].empty?) ?
+          "Recommendation" : l10n("#{"Recommendation"} #{n[:label]}")
+        out.p **{class: "RecommendationLabel" } do |p|
+          p << label
+        end
       end
 
       def requirement_parse(node, out)
         out.table **recommend_table_attr(node) do |t|
           t.tr do |tr|
             tr.td **REQ_TBL_ATTR do |td|
-              td << requirement_label(node)
+              requirement_label(node, td)
             end
             tr.td **{ valign: "top", class: "recommend" } do |td|
               recommend_name_parse(node, td)
@@ -293,17 +287,20 @@ module IsoDoc
         end
       end
 
-            def requirement_label(node)
+      def requirement_label(node)
         n = get_anchors[node["id"]]
-        return "Requirement" if n.nil? || n[:label].empty?
-        l10n("#{"Requirement"} #{n[:label]}")
+        label = (n.nil? || n[:label].empty?) ?
+          "Requirement" : l10n("#{"Requirement"} #{n[:label]}")
+        out.p **{class: "RecommendationLabel" } do |p|
+          p << label
+        end
       end
 
       def permission_parse(node, out)
         out.table **recommend_table_attr(node) do |t|
           t.tr do |tr|
             tr.td **REQ_TBL_ATTR do |td|
-              td << permission_label(node)
+              permission_label(node, td)
             end
             tr.td **{ valign: "top", class: "recommend" } do |td|
               recommend_name_parse(node, td)
@@ -315,14 +312,17 @@ module IsoDoc
 
       def permission_label(node)
         n = get_anchors[node["id"]]
-        return "Permission" if n.nil? || n[:label].empty?
-        l10n("#{"Permission"} #{n[:label]}")
+        label = (n.nil? || n[:label].empty?) ?
+          "Permission" : l10n("#{"Permission"} #{n[:label]}")
+        out.p **{class: "RecommendationLabel" } do |p|
+          p << label
+        end
       end
 
       def initial_anchor_names(d)
         @prefacenum = 0
         preface_names(d.at(ns("//preface/abstract")))
-                @prefacenum += 1 if d.at(ns("//keyword"))
+        @prefacenum += 1 if d.at(ns("//keyword"))
         preface_names(d.at(ns("//foreword")))
         #preface_names(d.at(ns("//introduction")))
         @prefacenum += 1 if d.at(ns(SUBMITTINGORGS))

data/lib/metanorma/ogc/version.rb

@@ -1,5 +1,5 @@
 module Metanorma
   module Ogc
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metanorma-ogc
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-21 00:00:00.000000000 Z
+date: 2019-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor