metanorma-ogc 2.8.9 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dec3dc50e132ee4bd40085164615736d9f0f69205f2dad6e12eaf31c4c9c140b
-  data.tar.gz: 34cd722fe70225f76e1501bf8793d8b07ae90a772f2d14940b1d26e4876e6ded
+  metadata.gz: 065450d18c49c89724b52b0db86721eb2abe6fc843322b043f92e3c7082aac4f
+  data.tar.gz: fb90b5aba879eb33d3c6debfebbd171dd4b33cc387450048e0ad247992cd2243
 SHA512:
-  metadata.gz: 7d8d334d2ed79cf6965e2076b3ea5ec744c615299ced4715cf39df4a347b89e91f03394a54b93fcc3fec59164ca822585d5e8847f29274d011f46bb962db0cb8
-  data.tar.gz: cc0ec7155b376e85edc75b72211409b175b0d549a41ea919d0083739a776911d9b399d53974b1cbea5375d3e1d7c41474155f22d69279c3c622255499e76017c
+  metadata.gz: 6df39210730df8aa755c8c536b212957c69d5474ecbdbeb2173c4ef6febd813bc0c2864647e998b047ed8dbedccf38fbf3c244473c82b0f46ef341b042cdbf97
+  data.tar.gz: d22994f820930f4fc86af8db65d2d6dc009900b02b56386b0f0de227d507f47a49e2256e76ae0724abbcb4ecb0195e7ea670be8984bd6bb388b1f9ecad009277

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

@@ -1139,6 +1139,10 @@ table th, table td {
 table td.header {
   font-weight: 400;
 }
+table table.plain, table table.plain th, table table.plain td {
+  border: none !important;
+  font-size: 0.95em;
+}
 table {
   /*color: #010d16;*/
 }
@@ -1176,6 +1180,10 @@ table.modspec th, table.modspec td {
 table.modspec td.header {
   font-weight: 400;
 }
+table.modspec table.plain, table.modspec table.plain th, table.modspec table.plain td {
+  border: none !important;
+  font-size: 0.95em;
+}
 table.modspec {
   color: #010d16;
 }
@@ -1258,7 +1266,7 @@ a:hover {
 }
 
 /* Bibliograhy */
-p.Biblio, p.NormRef {
+p.Biblio, p.NormRef, div.Biblio, div.NormRef {
   margin-top: 1em;
   margin-left: 2em;
 }

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

@@ -416,7 +416,7 @@ span.AdmittedLabel, span.DeprecatedLabel {
 
 /* Bibliograhy */
 
-p.Biblio, p.NormRef {
+p.Biblio, p.NormRef, div.Biblio, div.NormRef {
   margin-top: 1em;
   margin-left: 2em;
 }

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

@@ -768,6 +768,11 @@ table.MsoISOTable td, table.MsoISOTableBig td {
   padding: 0cm 2.85pt 0cm 2.85pt;
 }
 
+table.MsoNormalTable th, table.MsoNormalTable td {
+  border: none;
+  mso-border-alt: none;
+}
+
 table.MsoISOTable p, table.MsoISOTableBig p {
   font-size: {{smallerfontsize}};
 }

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

@@ -688,6 +688,10 @@ table.MsoISOTable td, table.MsoISOTableBig td
     {border:solid windowtext 1pt;
     mso-border-alt:solid windowtext 1pt;
     padding:0cm 2.85pt 0cm 2.85pt;}
+table.MsoNormalTable th, table.MsoNormalTable td {
+  border: none;
+  mso-border-alt: none;
+} 
 table.MsoISOTable p, table.MsoISOTableBig p
 {font-size:$smallerfontsize; }
 table.recommendclass, table.recommendclass p

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

@@ -695,6 +695,11 @@ table.MsoISOTable td, table.MsoISOTableBig td {
   padding: 0cm 5.4pt 0cm 5.4pt;
 }
 
+table.MsoNormalTable th, table.MsoNormalTable td {
+  border: none;
+  mso-border-alt: none;
+}
+
 table.MsoISOTable p, table.MsoISOTableBig p {
   font-size: {{normalfontsize}};
 }

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

@@ -625,6 +625,10 @@ table.MsoISOTable td, table.MsoISOTableBig td
     {border:solid windowtext 1pt;
     mso-border-alt:solid #999999 .5pt;
     padding:0cm 5.4pt 0cm 5.4pt;}
+table.MsoNormalTable th, table.MsoNormalTable td {
+  border: none;
+  mso-border-alt: none;
+} 
 table.MsoISOTable p, table.MsoISOTableBig p
 {font-size:$normalfontsize; }
 table.MsoTableGrid

data/lib/isodoc/ogc/init.rb

@@ -22,7 +22,8 @@ module IsoDoc
 
       def bibrenderer(options = {})
         ::Relaton::Render::Ogc::General.new(options
-          .merge(language: @lang, script: @script, i18nhash: @i18n.get))
+          .merge(language: @lang, script: @script, i18nhash: @i18n.get,
+                 config: @relatonrenderconfig))
       end
 
       def fileloc(loc)

data/lib/isodoc/ogc/metadata.rb

@@ -36,14 +36,18 @@ module IsoDoc
     }.freeze
 
     class Metadata < IsoDoc::Metadata
-      def initialize(lang, script, locale, i18n)
-        super
-        here = File.dirname(__FILE__)
-        set(:logo_old,
-            File.expand_path(File.join(here, "html", "logo.png")))
-        set(:logo_new,
-            File.expand_path(File.join(here, "html",
-                                       "logo.2021.svg")))
+      def logo_old
+        File.expand_path(File.join(File.dirname(__FILE__), "html", "logo.png"))
+      end
+
+      def logo_new
+        File.expand_path(File.join(File.dirname(__FILE__), "html",
+                                       "logo.2021.svg"))
+      end
+
+      def images(_isoxml, _out)
+        set(:logo_old, logo_old)
+        set(:logo_new, logo_new)
       end
 
       def title(isoxml, _out)
@@ -156,7 +160,7 @@ module IsoDoc
         rescue StandardError
           old = false
         end
-        set(:logo_word, old ? get[:logo_old] : get[:logo_new])
+        set(:logo_word, old ? logo_old : logo_new)
       end
 
       def presentation(xml, _out)