metanorma-ogc 2.3.1 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9af69a382e188415e112d83b854c95580a8c0baf68c6c4470bbcbe8e242c253e
-  data.tar.gz: 31ebc73dce8e3248b58f147255045b9c59d4a5e927d731774b81bb4c788eeeb4
+  metadata.gz: 4fc9c0bc51e804a7f6f333abdc8f18509fda087d9ad9978d1d3f09873745b4c0
+  data.tar.gz: 75e291d2155ff6fc9b81342b8a817485f3ae283c77c407f9dd066f9d1bf4cf2c
 SHA512:
-  metadata.gz: 50d9654f1e5208d90e76b2991c3e228702da1089df1ae4800f268fb3b11a0ce67bb7eb014435c491559a845e2e81ef308c1ae2f3d9de694a0937f9e3cd3e4512
-  data.tar.gz: a4e5845363b0c8b4ae286867750cca04f91418ed8477becba552ce9c035e799f0bf024d20e25b9419b50838eb301c89b5511c3b1fa65feeb39149e51685cbe94
+  metadata.gz: d12c68acab1037cf2b67970d99d2c21ff0b9a67afcf1080518c4e5913ddba67df0e842ab545ca48fe0d9d03ace9ae512d7efcf8994400344fbefa43214aee385
+  data.tar.gz: 3d99691f22c7c95a52f00232a79eebe9e94c4be5a3938508427309d8413ab26fdc0e3d9ec40cf85b8e309481730139c62b37e25676fd56024b5e0489a58cea2d

data/lib/isodoc/ogc/base_convert.rb

@@ -14,7 +14,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
@@ -41,7 +41,7 @@ module IsoDoc
       end
 
       def term_cleanup_merge_admitted(term)
-        term.xpath("./following-sibling::p[@class = 'AltTerms' or "\
+        term.xpath("./following-sibling::p[@class = 'AltTerms' or " \
                    "@class = 'DeprecatedTerms']").each do |a|
           term << " "
           term << a.children
@@ -50,20 +50,20 @@ module IsoDoc
       end
 
       def deprecated_term_parse(node, out)
-        out.p **{ class: "DeprecatedTerms" } do |p|
+        out.p class: "DeprecatedTerms" do |p|
           node.children.each { |c| parse(c, p) }
           p << "&#xa0;"
-          p.span **{ class: "AdmittedLabel" } do |s|
+          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|
+        out.p class: "AltTerms" do |p|
           node.children.each { |c| parse(c, p) }
           p << "&#xa0;"
-          p.span **{ class: "AdmittedLabel" } do |s|
+          p.span class: "AdmittedLabel" do |s|
             s << l10n(@i18n.admitted)
           end
         end
@@ -78,13 +78,13 @@ module IsoDoc
       def example_label(node, div, name); end
 
       def example_name_parse(_node, div, name)
-        div.p **{ class: "SourceTitle", style: "text-align:center;" } do |p|
+        div.p class: "SourceTitle", style: "text-align:center;" do |p|
           name&.children&.each { |n| parse(n, p) }
         end
       end
 
       def middle_clause(_docxml)
-        "//clause[parent::sections][not(@type = 'scope' or "\
+        "//clause[parent::sections][not(@type = 'scope' or " \
           "@type = 'conformance')][not(descendant::terms)]"
       end
 
@@ -111,15 +111,15 @@ module IsoDoc
         ret = super
         %w(recommendation requirement permission).include?(node["class"]) and
           ret = ret.merge(class: node["type"], style:
-                          "border-collapse:collapse;border-spacing:0;"\
+                          "border-collapse:collapse;border-spacing:0;" \
                           "#{keep_style(node)}")
         ret
       end
 
       def make_tr_attr(cell, row, totalrows, header, bordered)
         ret = super
-        if cell.at("./ancestor::xmlns:table[@class = 'recommendation'] | "\
-                   "./ancestor::xmlns:table[@class = 'requirement'] | "\
+        if cell.at("./ancestor::xmlns:table[@class = 'recommendation'] | " \
+                   "./ancestor::xmlns:table[@class = 'requirement'] | " \
                    "./ancestor::xmlns:table[@class = 'permission']")
           ret[:style] = "vertical-align:top;"
           ret[:class] = "recommend"

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) {
@@ -954,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;
@@ -988,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;
   }
 }
 
@@ -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)