metanorma-ogc 2.3.0 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b9e35e003903e7672a0ee7d84881c84b79fa2ad88d4d64874c59f64158d1bac
-  data.tar.gz: 26720e23bc8f29703580e55d66cef66cf93bc117832c0f10f2e375b61d329ce8
+  metadata.gz: 523a668a24241842252e5a034f9825a2e6220003fc594525af7853d99a11e046
+  data.tar.gz: 80174add4c9360e203a93d9ceb01a743481720573fa0edb92c6ae40d3b09ec4e
 SHA512:
-  metadata.gz: 14fd6a6cf3778bd7a7ae74dc90f4de5cef10bbec26d105d275b9b5716e4cb5cfb63b6cf14ce692f73a7d621777abdb8a4110b5dad9abc2b268d1f9d3b570a6cd
-  data.tar.gz: 99fdc7b8ee2f1b86d45df83c980d403f0ad24de15f45537bdb1ccb90fda30ecf169e80bdcf16d46ec68451fce2eddbf1b1a851b3b1b783a98cdef0719eada40f
+  metadata.gz: 13f160e265a7b1904a8cd7b72eb0186b6a2211167cea603d82f220881b191233ebb63a0250c2b49c2f0aa8cc4f168feacdbd4792faef15aeb99a9d87f02dbe94
+  data.tar.gz: 9de185795ba454b753c7353de691df99a9a1a9f89996afb470a9f8edf8d357f82847d77c7cf53b88fd817b2529e289fc4c46c798f6095b51a24a176cab198408

data/lib/isodoc/ogc/base_convert.rb

@@ -1,5 +1,4 @@
 require "isodoc"
-require_relative "biblio"
 require_relative "sections"
 require "fileutils"
 
@@ -117,7 +116,7 @@ module IsoDoc
         ret
       end
 
-      def make_tr_attr(cell, row, totalrows, header)
+      def make_tr_attr(cell, row, totalrows, header, bordered)
         ret = super
         if cell.at("./ancestor::xmlns:table[@class = 'recommendation'] | "\
                    "./ancestor::xmlns:table[@class = 'requirement'] | "\

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

@@ -124,6 +124,35 @@ a.FootnoteRef + a.FootnoteRef:before {
   color: red;
   text-decoration: line-through; }
 
+/* code highlighting with line numbers */
+table.rouge-line-table td.rouge-gutter {
+  -moz-user-select: none;
+  -ms-user-select: none;
+  -webkit-user-select: none;
+  user-select: none;
+  padding-right: 1em; }
+
+table.rouge-line-table td.rouge-code {
+  -moz-user-select: all;
+  -ms-user-select: all;
+  -webkit-user-select: all;
+  user-select: all; }
+
+table.rouge-line-table,
+table.rouge-line-table th,
+table.rouge-line-table td {
+  width: auto;
+  border: none;
+  margin: 0;
+  padding: 0;
+  font-size: 100%; }
+
+table.rouge-line-table pre {
+  margin: 0;
+  padding: 0;
+  overflow-x: visible;
+  font-size: 100%; }
+
 #standard-band {
   background-color: #3D9970; }
 
@@ -607,7 +636,7 @@ dl {
 
 @media screen and (min-width: 768px) {
   nav {
-    marign-right: 30px; } }
+    margin-right: 30px; } }
 
 @media screen and (min-width: 768px) {
   #toggle {
@@ -848,7 +877,7 @@ table {
   table th, table td {
     padding: 1em; }
   table td.header {
-    font-weigth: 400; }
+    font-weight: 400; }
   table thead tr th {
     background-color: #5d99d6; }
   table td, table th {
@@ -875,7 +904,7 @@ table.modspec {
   table.modspec th, table.modspec td {
     padding: 1em; }
   table.modspec td.header {
-    font-weigth: 400; }
+    font-weight: 400; }
   table.modspec tr:nth-child(even) {
     background: #ffffff; }
   table.modspec tr:nth-child(odd) {
@@ -926,12 +955,15 @@ a, a:visited {
 
 a:hover {
   color: #00335b;
-  background: white;
-  box-shadow: 3px 0 0 white, -3px 0 0 white; }
+  background: #39CCCC;
+  box-shadow: 3px 0 0 #39CCCC, -3px 0 0 #39CCCC; }
+
+*::selection {
+  background: #39CCCC;
+  color: #00335b; }
 
-::selection,
-::-moz-selection {
-  background: white;
+*::-moz-selection {
+  background: #39CCCC;
   color: #00335b; }
 
 /* Bibliograhy */
@@ -951,7 +983,7 @@ p.Biblio, p.NormRef {
   text-align: center;
   text-align: left; }
 
-pre {
+pre, .sourcecode {
   font-family: {{monospacefont}};
   font-variant-ligatures: none;
   background-color: #f7f7f7;
@@ -985,7 +1017,7 @@ pre {
   .Admonition p, .Admonition.Important p, .Admonition.Warning p {
     margin: 0; }
 
-.figure, pre, .pseudocode {
+.figure, pre, .pseudocode, .sourcecode {
   background-color: #e1eef1;
   color: #424242;
   font-size: {{monospacefontsize}}; }

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

@@ -97,7 +97,7 @@ nav {
   @include sidebarNav(#f1f8ff, 323px, 45px);
 
   @media screen and (min-width: $bigscreenBreakpoint) {
-    marign-right: 30px;
+    margin-right: 30px;
   }
 }
 
@@ -392,7 +392,7 @@ span.AdmittedLabel {
 
 /* Links, selection */
 
-@include elementStyles(#2e81c2, white, #00335b);
+@include elementStyles(#2e81c2, #39CCCC, #00335b);
 
 
 /* Bibliograhy */
@@ -411,7 +411,7 @@ p.Biblio, p.NormRef {
 
 @include listBlock();
 
-pre {
+pre, .sourcecode {
   @include sourceBlock(#f7f7f7);
 
   font-family: $monospacefont;
@@ -444,7 +444,7 @@ pre {
   }
 }
 
-.figure, pre, .pseudocode {
+.figure, pre, .pseudocode, .sourcecode {
   background-color: #e1eef1;
   color: #424242;
   font-size: $monospacefontsize;

data/lib/isodoc/ogc/html_convert.rb

@@ -36,9 +36,9 @@ module IsoDoc
 
       def googlefonts
         <<~HEAD.freeze
-          <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">
+          <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"/>
         HEAD
       end
 
@@ -46,8 +46,7 @@ module IsoDoc
         case node["type"]
         when "important" then "Admonition.Important"
         when "warning" then "Admonition.Warning"
-        else
-          "Admonition"
+        else "Admonition"
         end
       end
 
@@ -62,7 +61,7 @@ module IsoDoc
       end
 
       def make_body3(body, docxml)
-        body.div **{ class: "main-section" } do |div3|
+        body.div class: "main-section" do |div3|
           @prefacenum = 0
           boilerplate docxml, div3
           preface_block docxml, div3
@@ -87,6 +86,16 @@ module IsoDoc
         super
       end
 
+      def html_head
+        ret = super
+        k = @meta.get[:keywords].join(", ")
+        k.empty? or ret += "<meta name='keywords' content='#{k}'/>"
+        k = @meta.get[:abstract]
+        (k.nil? || k.empty?) or
+          ret += "<meta name='description' content='#{k}'/>"
+        ret
+      end
+
       include BaseConvert
       include Init
     end

data/lib/isodoc/ogc/metadata.rb

@@ -47,8 +47,10 @@ module IsoDoc
       end
 
       def title(isoxml, _out)
-        main = isoxml&.at(ns("//bibdata/title[@language='en']"))&.text
+        main = isoxml.at(ns("//bibdata/title[@language='en']"))&.text
         set(:doctitle, main)
+        main = isoxml.at(ns("//bibdata/abstract"))&.text&.strip&.gsub(/\s+/, " ")
+        set(:abstract, main)
       end
 
       def subtitle(_isoxml, _out)